shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

It just works

Browse Source
This commit is contained in:
TrilbySpaceClone
2019-08-26 06:32:54 -04:00
parent 4a741d4938
commit 44893b6ee7
13 changed files with 958 additions and 933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/clothesmate.dm
+2 -1
View File
@@ -117,7 +117,8 @@
/obj/item/clothing/suit/jacket/leather/overcoat = 4,
/obj/item/clothing/under/pants/mustangjeans = 3,
/obj/item/clothing/neck/necklace/dope = 5,
/obj/item/clothing/suit/jacket/letterman_nanotrasen = 5)
/obj/item/clothing/suit/jacket/letterman_nanotrasen = 5,
/obj/item/book/granter/crafting_recipe/threads = 2)
refill_canister = /obj/item/vending_refill/clothing
/obj/item/vending_refill/clothing
code/modules/vending/magivend.dm
+2 -2
View File
@@ -4,7 +4,7 @@
icon_state = "MagiVend"
product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!"
vend_reply = "Have an enchanted evening!"
product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!"
product_ads = "EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!;Now-magic proofing venders!"
products = list(/obj/item/clothing/head/wizard = 1,
/obj/item/clothing/suit/wizrobe = 1,
/obj/item/clothing/head/wizard/red = 1,
@@ -14,5 +14,5 @@
/obj/item/clothing/shoes/sandal/magic = 1,
/obj/item/staff = 2)
contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50, "magic" = 100)
resistance_flags = FIRE_PROOF
code/modules/vending/nutrimax.dm
+2 -1
View File
@@ -2,7 +2,7 @@
name = "\improper NutriMax"
desc = "A plant nutrients vendor."
product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!"
product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..."
product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil...;Now selling books to read to the plants!"
icon_state = "nutri"
icon_deny = "nutri-deny"
products = list(/obj/item/reagent_containers/glass/bottle/nutrient/ez = 30,
@@ -16,5 +16,6 @@
/obj/item/plant_analyzer = 4)
contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10,
/obj/item/reagent_containers/glass/bottle/diethylamine = 5)
premium = list(/obj/item/book/granter/crafting_recipe/threads = 2)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
code/modules/vending/wardrobes.dm
+2 -1
View File
@@ -169,7 +169,8 @@
/obj/item/clothing/suit/apron/overalls = 5,
/obj/item/clothing/under/rank/hydroponics = 5,
/obj/item/clothing/under/rank/hydroponics/skirt = 5,
/obj/item/clothing/mask/bandana = 4)
/obj/item/clothing/mask/bandana = 4,
/obj/item/book/granter/crafting_recipe/threads = 1)
refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe
/obj/item/vending_refill/wardrobe/hydro_wardrobe