Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add: Customat #5849

Merged
merged 42 commits into from
Oct 5, 2024
Merged

add: Customat #5849

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
790176b
bugfix
Anorak2024 Aug 22, 2024
1d87a2f
12312321
Anorak2024 Aug 22, 2024
fd908fd
Revert "12312321"
Anorak2024 Aug 22, 2024
651ab16
Revert "bugfix"
Anorak2024 Aug 22, 2024
b4b0f0b
Merge branch 'master220' of https://github.com/Anorak2024/Paradise in…
Anorak2024 Aug 22, 2024
3c70f80
123
Anorak2024 Aug 23, 2024
68fb23b
1232123
Anorak2024 Aug 24, 2024
b2f0c36
213
Anorak2024 Aug 26, 2024
ed51def
врвапрваыап
Anorak2024 Aug 29, 2024
b45189a
asfdasdfsdaf
Anorak2024 Aug 30, 2024
e39ff30
аывпавпы
Anorak2024 Aug 30, 2024
2e12b3d
add:customat
Anorak2024 Aug 30, 2024
2e82e74
выыавыаывав
Anorak2024 Aug 30, 2024
9f382a2
jhgkjmkhmgk
Anorak2024 Aug 30, 2024
9acf0d0
вывыывы
Anorak2024 Sep 1, 2024
bf1f081
dsfsds
Anorak2024 Sep 2, 2024
fac0c2c
смчсчмсч
Anorak2024 Sep 2, 2024
3b159ff
hdkfhjkhjk
Anorak2024 Sep 2, 2024
f89b766
mnbmbmnb
Anorak2024 Sep 2, 2024
e13f9c2
lhu8hlhhui
Anorak2024 Sep 2, 2024
3a5cf87
похуй, реди фор ревью
Anorak2024 Sep 3, 2024
db6ab38
Merge branch 'master220' into Customate
ROdenFL Sep 3, 2024
efb581d
bundle
ROdenFL Sep 3, 2024
5071b5d
baloon -> russian
Anorak2024 Sep 3, 2024
cfa28ae
bugfix
Anorak2024 Sep 4, 2024
e4b8849
bugfix
Anorak2024 Sep 4, 2024
1f188a0
rodeon
Anorak2024 Sep 4, 2024
13be4c9
rodeon2
Anorak2024 Sep 4, 2024
844c53d
del outdate comments
Anorak2024 Sep 4, 2024
e6c3dde
comments
Anorak2024 Sep 4, 2024
1aee12c
icon2base64 out of "[ ]"
Anorak2024 Sep 4, 2024
2fecdad
bugfix
Anorak2024 Sep 4, 2024
df021ab
max 50 -> 30 items inside
Anorak2024 Sep 10, 2024
d27d11b
bugfix 1
Anorak2024 Sep 15, 2024
f719655
bugfix 2
Anorak2024 Sep 16, 2024
6543f8f
forgot tgui.but
Anorak2024 Sep 16, 2024
0432132
codestyle tgui
Anorak2024 Sep 16, 2024
261b192
rebuild tgui
Anorak2024 Sep 16, 2024
7fa5fb5
bugfix 3
Anorak2024 Sep 16, 2024
213f9c7
fsdfs
Anorak2024 Sep 22, 2024
a123535
fdsfds
Anorak2024 Sep 22, 2024
12b1f39
overlays
Anorak2024 Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/game/machinery/constructable_frame.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ to destroy them and players will be able to make replacements.
"Departament Law ClothesMate" = /obj/machinery/vending/clothing/departament/law,
"Service Departament ClothesMate Botanical" = /obj/machinery/vending/clothing/departament/service/botanical,
"Service Departament ClothesMate Chaplain" = /obj/machinery/vending/clothing/departament/service/chaplain,
"RoboFriends" = /obj/machinery/vending/pai,)
"RoboFriends" = /obj/machinery/vending/pai,
"Customat" = /obj/machinery/customat,)

var/static/list/unique_vendors = list(
"ShadyCigs Ultra" = /obj/machinery/vending/cigarette/beach,
Expand Down
Loading