mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 02:24:11 +01:00
Drip expansion: Syndicate garment bag (#29764)
* repair droid sprite update
* biochips
* syndie drip 1
* Update code/game/objects/items/weapons/storage/garment.dm
Indeed, my apologies
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/head/beret.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* Update code/modules/clothing/neck/cloaks.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
* merge conflict resolve attempt 1
* Merge conflict resolve attempt 2
* mergre conflict RESOLUTION attempt 3
* Revert "mergre conflict RESOLUTION attempt 3"
This reverts commit 06e0f77564.
* Merge conflict resolution attempt 4: hooks edition
* maybe i shouldn't have commented that one thing out
* updated garment bag description, removed stashed change
* removed garment bag contents stashed changes
* removed syndie beret stashed changes
* removed syndie cloak stashed changes
* fixing my fuckup part 1
* fixing my shit part 2
* fixing my shit part 3
* fixing my shit part 4
---------
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
@@ -369,3 +369,26 @@
|
||||
new /obj/item/clothing/shoes/workboots/smithing(src)
|
||||
new /obj/item/clothing/under/plasmaman/smith(src)
|
||||
new /obj/item/clothing/head/helmet/space/plasmaman/smith(src)
|
||||
|
||||
/obj/item/storage/bag/garment/syndie
|
||||
name = "suspicious garment bag"
|
||||
icon_state = "garment_bag_syndie"
|
||||
desc = "A bag for storing extra clothes and shoes. Judging by the colors, this one belongs to someone with malicious intent."
|
||||
|
||||
/obj/item/storage/bag/garment/syndie/populate_contents()
|
||||
new /obj/item/clothing/under/syndicate/tacticool(src)
|
||||
new /obj/item/clothing/under/syndicate(src)
|
||||
new /obj/item/clothing/under/syndicate/combat(src)
|
||||
new /obj/item/clothing/under/syndicate/greyman(src)
|
||||
new /obj/item/clothing/under/syndicate/sniper(src)
|
||||
new /obj/item/clothing/mask/gas/syndicate(src)
|
||||
new /obj/item/clothing/mask/balaclava(src)
|
||||
new /obj/item/clothing/suit/storage/iaa/blackjacket(src)
|
||||
new /obj/item/clothing/suit/blacktrenchcoat(src)
|
||||
new /obj/item/clothing/head/beret/syndicate(src)
|
||||
new /obj/item/clothing/glasses/syndie(src)
|
||||
new /obj/item/clothing/neck/cloak/syndicate(src)
|
||||
new /obj/item/clothing/gloves/color/black(src)
|
||||
new /obj/item/clothing/gloves/fingerless(src)
|
||||
new /obj/item/clothing/shoes/combat(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
|
||||
@@ -682,9 +682,11 @@
|
||||
danger_counter = 0
|
||||
|
||||
U.purchase_log += "<BIG>[bicon(src)]</BIG>"
|
||||
bought_items += /obj/item/storage/bag/garment/syndie // Guaranteed to spawn with drip (doesn't affect balance, it's only a bunch of fancy clothing)
|
||||
for(var/item in bought_items)
|
||||
var/obj/purchased = new item(src)
|
||||
U.purchase_log += "<BIG>[bicon(purchased)]</BIG>"
|
||||
itemlog += purchased.name // To make the item more readable for the log compared to just uplink_item.item
|
||||
var/item_list = jointext(sortList(itemlog), ", ")
|
||||
log_game("[key_name(user)] purchased a surplus crate with [item_list]")
|
||||
user.create_log(MISC_LOG, "Surplus crate purchase with spawned items [item_list]")
|
||||
|
||||
Reference in New Issue
Block a user