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

Sweater Weather (#236)

Browse Source 
* adds 5 new sweaters

cream blue green purple red

* fuck this didn't go through

* done

* WAIT

* Rename sweaters.dm to cit_uniforms.dm

* .dme fix

* 42
This commit is contained in:
TalkingCactus
2017-02-20 01:05:49 -05:00
committed by GitHub
parent 2ecae386bb
commit bd13d677d4
6 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending.dm
+6 -1
View File
@@ -1082,7 +1082,12 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/item/clothing/head/beanie/purple=1, /obj/item/clothing/head/beanie/yellow=1, /obj/item/clothing/head/beanie/orange=1, /obj/item/clothing/head/beanie/cyan=1, /obj/item/clothing/head/beanie/christmas=1,
/obj/item/clothing/head/beanie/striped=1, /obj/item/clothing/head/beanie/stripedred=1, /obj/item/clothing/head/beanie/stripedblue=1, /obj/item/clothing/head/beanie/stripedgreen=1,
/obj/item/clothing/suit/jacket/letterman_red=1, /obj/item/clothing/under/wintercasualwear=1, /obj/item/clothing/under/casualwear=1, /obj/item/clothing/under/casualhoodie=1,
/obj/item/clothing/under/casualhoodie/skirt=1)
/obj/item/clothing/under/casualhoodie/skirt=1,
/obj/item/clothing/under/bb_sweater=2,
/obj/item/clothing/under/bb_sweater/blue=2,
/obj/item/clothing/under/bb_sweater/green=2,
/obj/item/clothing/under/bb_sweater/purple =2,
/obj/item/clothing/under/bb_sweater/red=2)
contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=2,/obj/item/clothing/suit/jacket/letterman_syndie=1,/obj/item/clothing/under/jabroni=1, /obj/item/clothing/suit/vapeshirt=1, /obj/item/clothing/under/geisha=1,
/obj/item/clothing/under/wedding/bride_orange=1,
/obj/item/clothing/under/wedding/bride_purple=1,
code/game/objects/items/weapons/vending_items.dm
+3 -3
View File
@@ -30,7 +30,7 @@
user << "It's empty!"
//NOTE I decided to go for about 1/3 of a machine's capacity
//^ Your ideas suck. Why not just make it automatic?
/obj/item/weapon/vending_refill/boozeomat
machine_name = "Booze-O-Mat"
icon_state = "refill_booze"
@@ -69,8 +69,8 @@
/obj/item/weapon/vending_refill/clothing
machine_name = "ClothesMate"
icon_state = "refill_clothes"
charges = list(35, 13, 4)// of 101 standard, 12 contraband, 10 premium(?)
init_charges = list(35, 13, 4)
charges = list(42, 13, 4)// of 109 standard, 12 contraband, 10 premium(?) (someone fucked this number up, who wants to recount?)
init_charges = list(42, 13, 4)
/obj/item/weapon/vending_refill/kink
machine_name = "KinkMate"