Merge pull request #472 from SmeagleDeagle/funnyjojo

hee hee hoo hoo jojo
This commit is contained in:
Dahlular
2020-09-18 05:20:59 -06:00
committed by GitHub
6 changed files with 26 additions and 2 deletions
+13 -1
View File
@@ -1,7 +1,7 @@
/obj/item/storage/box/syndicate
/obj/item/storage/box/syndicate/PopulateContents()
switch (pickweight(list("bloodyspai" = 3, "stealth" = 2, "bond" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "darklord" = 1, "sniper" = 1, "metaops" = 1, "ninja" = 1)))
switch (pickweight(list("bloodyspai" = 3, "stealth" = 2, "bond" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "darklord" = 1, "sniper" = 1, "metaops" = 1, "ninja" = 1, "stando" = 1)))
if("bloodyspai") // 30 tc now this is more right
new /obj/item/clothing/under/chameleon(src) // 2 tc since it's not the full set
new /obj/item/clothing/mask/chameleon(src) // Goes with above
@@ -144,6 +144,18 @@
new /obj/item/card/id/syndicate(src) // 2 tc
new /obj/item/chameleon(src) // 7 tc
if("stando") // 31~ tc worth
new /obj/item/clothing/head/delinquent(src) // Just like your favorite anime
new /obj/item/clothing/suit/chameleon(src) // part 2 of the outfit
new /obj/item/clothing/under/chameleon(src) // part 3 of the outfit
new /obj/item/clothing/mask/chameleon(src) // for sounding like your favorite anime protagonist
new /obj/item/encryptionkey/syndicate(src) // 2 tc
new /obj/item/card/id/syndicate(src) // 2 tc,
new /obj/item/clothing/gloves/rapid(src) // 8 tc
new /obj/item/storage/box/syndie_kit/guardian(src) // 15 tc
/obj/item/storage/box/syndie_kit
name = "box"
desc = "A sleek, sturdy box."
+5
View File
@@ -339,6 +339,11 @@
icon_state = "nemes_headdress"
icon_state = "nemes_headdress"
/obj/item/clothing/head/delinquent
name = "delinquent hat"
desc = "Good grief."
icon_state = "delinquent"
/obj/item/clothing/head/frenchberet
name = "french beret"
desc = "A quality beret, infused with the aroma of chain-smoking, wine-swilling Parisians. You feel less inclined to engage military conflict, for some reason."
+2 -1
View File
@@ -121,8 +121,9 @@
/obj/item/clothing/under/roman = 1,
/obj/item/clothing/shoes/roman = 1,
/obj/item/shield/riot/roman/fake = 1,
/obj/item/clothing/head/delinquent = 1, // One per vendor, please dear god don't mass produce these.
/obj/item/skub = 1,
/obj/item/clothing/under/lobster = 1, // CIT CHANGES
/obj/item/clothing/under/lobster = 1, // CIT CHANGES
/obj/item/clothing/head/lobsterhat = 1,
/obj/item/clothing/head/drfreezehat = 1,
/obj/item/clothing/suit/dracula = 1,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 KiB

After

Width:  |  Height:  |  Size: 207 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 97 KiB

@@ -54,6 +54,12 @@
path = /obj/item/clothing/head/flakhelm
cost = 2
/datum/gear/delinquent //Now you too can become like your favorite punchy ghost protagonist
name = "Delinquent Hat"
category = SLOT_HEAD
path = /obj/item/clothing/head/delinquent
cost = 3
/datum/gear/bunnyears
name = "Bunny Ears"
category = SLOT_HEAD