cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drip expansion: Syndicate garment bag (#29764)

Browse Source 
* 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:
YoursTrulyHollow
2025-08-02 12:27:06 +07:00
committed by GitHub
parent 6add63ee06
commit 072bebd088
24 changed files with 112 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm
+1 -1
View File
@@ -5,6 +5,6 @@
/obj/structure/closet/wardrobe/atmospherics_yellow/empty
/obj/structure/closet/wardrobe/atmospherics_yellow/empty/populate_contents()
/obj/structure/closet/wardrobe/atmospherics_yellow/populate_contents()
return
code/modules/clothing/glasses/glasses.dm
+31 -1
View File
@@ -335,6 +335,37 @@
)
prescription_upgradable = TRUE
/obj/item/clothing/glasses/syndie
name = "suspicious glasses"
desc = "Suspicious-looking, stylish glasses. They don't look like they could protect you from a flash, however they have a slot around their lenses where something could easily be inserted."
icon_state = "syndieglasses"
item_state = "syndieglasses"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/eyes.dmi'
)
prescription_upgradable = TRUE
/obj/item/clothing/glasses/syndie_sun
name = "suspicious shaded glasses"
desc = "Suspicious-looking, dark red, stylish glasses. They appear to have an additional eye-shielding layer over the lenses."
icon_state = "syndieglasses_sun"
item_state = "syndieglasses_sun"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/eyes.dmi'
)
see_in_dark = 1
flash_protect = FLASH_PROTECTION_FLASH
tint = FLASH_PROTECTION_FLASH
prescription_upgradable = TRUE
/obj/item/clothing/glasses/sunglasses
name = "sunglasses"
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes."
@@ -351,7 +382,6 @@
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/eyes.dmi'
)
hide_examine = TRUE
/obj/item/clothing/glasses/sunglasses_fake
code/modules/clothing/head/beret.dm
+13
View File
@@ -267,6 +267,7 @@
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
)
//NT Career Trainer
/obj/item/clothing/head/beret/nct/black
name = "\improper NT Career Trainer's beret"
@@ -307,3 +308,15 @@
icon_state = "beret_solgovcelite"
item_color = "solgovcelite"
resistance_flags = FIRE_PROOF
//Traitor
/obj/item/clothing/head/beret/syndicate
name = "syndicate beret"
desc = "A dark grey beret with the Syndicate’s unmistakable 'S' logo emblazoned on it. Wearing this just for the looks might not be the wisest idea..."
icon_state = "beret_syndie"
item_color = "beret_syndie"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi'
)
code/modules/clothing/neck/cloaks.dm
+5
View File
@@ -45,6 +45,11 @@
desc = "Worn by the Head of Personnel. It smells faintly of bureaucracy."
icon_state = "hopcloak"
/obj/item/clothing/neck/cloak/syndicate
name = "suspicious cloak"
desc = "A half-cloak worn around the neck, featuring a color scheme that's both suspicious and stylish."
icon_state = "syndiecloak"
//Mantles.
/obj/item/clothing/neck/cloak/mantle
code/modules/crafting/tailoring.dm
+18
View File
@@ -305,6 +305,24 @@
reqs = list(/obj/item/clothing/glasses/meson/sunglasses = 1)
category = CAT_CLOTHING
/datum/crafting_recipe/hudsyndiesun
name = "Suspicious sunglasses"
result = list(/obj/item/clothing/glasses/syndie_sun)
time = 1 SECONDS
tools = list(TOOL_SCREWDRIVER)
reqs = list(/obj/item/clothing/glasses/sunglasses = 1,
/obj/item/clothing/glasses/syndie = 1)
category = CAT_CLOTHING
/datum/crafting_recipe/hudsyndiesunremoval
name = "Suspicious glasses flash protection removal"
result = list(/obj/item/clothing/glasses/sunglasses = 1,
/obj/item/clothing/glasses/syndie = 1,)
time = 1 SECONDS
tools = list(TOOL_SCREWDRIVER)
reqs = list(/obj/item/clothing/glasses/syndie_sun = 1)
category = CAT_CLOTHING
/datum/crafting_recipe/beergoggles
name = "Sunscanners"
result = list(/obj/item/clothing/glasses/sunglasses/reagent)