cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts a bunch of items into using neck slot (#27474)

Browse Source 
* woe upon me

* update

* few changes

* critters

* critters

* THIS IS A CERTIFIED VOX CLASSIC

* removes comment from sql script

* i think i have a skill issue

* fuck

* TGUI Bundle Rebuild

* furcape

* attackby update

* cerefix

* buildstgui

* ajust size of loadout menu again

* tie layering toggle

* renames layer

* fucking map conflicts

* woe

* deconflict

* tgui

* conflicts again

* conflicts

* manual deconflict again

* oops

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* give this one more try

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* review

* scarffixforemerald

* tgui rebuild

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Bm0n
2025-01-02 22:47:50 +00:00
committed by GitHub
co-authored by Luc Bmon
parent 6f13d4432a
commit 6a63097109
60 changed files with 1058 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/leather.dm
+1 -1
View File
@@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(leather_recipes, list (
new /datum/stack_recipe("leather jacket", /obj/item/clothing/suit/jacket/leather, 7),
new /datum/stack_recipe("leather shoes", /obj/item/clothing/shoes/leather, 2),
new /datum/stack_recipe("leather overcoat", /obj/item/clothing/suit/jacket/leather/overcoat, 10),
new /datum/stack_recipe("hide mantle", /obj/item/clothing/suit/unathi/mantle, 4)))
new /datum/stack_recipe("hide mantle", /obj/item/clothing/neck/cloak/unathi, 4)))
/obj/item/stack/sheet/leather/Initialize(mapload, new_amount, merge)
. = ..()
code/game/objects/items/stacks/sheets/mineral.dm
+4 -4
View File
@@ -42,7 +42,7 @@ GLOBAL_LIST_INIT(silver_recipes, list (
new /datum/stack_recipe("Corgi Statue", /obj/structure/statue/silver/corgi, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
)),
null,
new /datum/stack_recipe("Silver Locket", /obj/item/clothing/accessory/necklace/locket/silver, 1),
new /datum/stack_recipe("Silver Locket", /obj/item/clothing/neck/necklace/locket/silver, 1),
))
GLOBAL_LIST_INIT(diamond_recipes, list (
@@ -87,9 +87,9 @@ GLOBAL_LIST_INIT(gold_recipes, list (
new /datum/stack_recipe_list("gold clothing", list(
new /datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5),
null,
new /datum/stack_recipe("Simple Necklace", /obj/item/clothing/accessory/necklace, 1),
new /datum/stack_recipe("Large Necklace", /obj/item/clothing/accessory/necklace/long, 2),
new /datum/stack_recipe("Gold Locket", /obj/item/clothing/accessory/necklace/locket, 1),
new /datum/stack_recipe("Simple Necklace", /obj/item/clothing/neck/necklace, 1),
new /datum/stack_recipe("Large Necklace", /obj/item/clothing/neck/necklace/long, 2),
new /datum/stack_recipe("Gold Locket", /obj/item/clothing/neck/necklace/locket, 1),
)),
))
code/game/objects/items/stacks/sheets/sheet_types.dm
+1 -1
View File
@@ -343,7 +343,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list(
GLOBAL_LIST_INIT(cloth_recipes, list (
new /datum/stack_recipe_list("cloth clothings", list(
new /datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 3),
new /datum/stack_recipe("white scarf", /obj/item/clothing/accessory/scarf/white, 1),
new /datum/stack_recipe("white scarf", /obj/item/clothing/neck/scarf/white, 1),
new /datum/stack_recipe("white shoes", /obj/item/clothing/shoes/white, 2),
new /datum/stack_recipe("cloth footwraps", /obj/item/clothing/shoes/footwraps, 2),
null,
code/game/objects/items/weapons/gift_wrappaper.dm
+1 -1
View File
@@ -89,7 +89,7 @@
/obj/item/instrument/violin,
/obj/item/instrument/guitar,
/obj/item/storage/belt/utility/full,
/obj/item/clothing/accessory/horrible,
/obj/item/clothing/neck/tie/horrible,
/obj/item/deck/cards,
/obj/item/deck/cards/tiny,
/obj/item/deck/unum,
code/game/objects/items/weapons/storage/briefcase.dm
+1 -1
View File
@@ -22,7 +22,7 @@
/obj/item/storage/briefcase/sniperbundle/populate_contents()
new /obj/item/gun/projectile/automatic/sniper_rifle/syndicate(src)
new /obj/item/clothing/accessory/red(src)
new /obj/item/clothing/neck/tie/red(src)
new /obj/item/clothing/under/syndicate/sniper(src)
new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
code/game/objects/items/weapons/storage/garment.dm
+10 -10
View File
@@ -39,7 +39,7 @@
new /obj/item/clothing/suit/armor/vest/capcarapace/jacket/tunic(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/coat(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/coat/white(src)
new /obj/item/clothing/suit/mantle/armor/captain(src)
new /obj/item/clothing/neck/cloak/captain_mantle(src)
new /obj/item/clothing/under/rank/captain(src)
new /obj/item/clothing/under/rank/captain/parade(src)
new /obj/item/clothing/under/rank/captain/dress(src)
@@ -60,7 +60,7 @@
new /obj/item/clothing/head/hop(src)
new /obj/item/clothing/head/beret/hop(src)
new /obj/item/clothing/neck/cloak/head_of_personnel(src)
new /obj/item/clothing/suit/mantle/armor/hop(src)
new /obj/item/clothing/neck/cloak/hop_mantle(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/suit/hopcoat(src)
new /obj/item/clothing/under/rank/civilian/hop(src)
@@ -88,7 +88,7 @@
new /obj/item/clothing/neck/cloak/head_of_security(src)
new /obj/item/clothing/suit/armor/hos(src)
new /obj/item/clothing/suit/armor/hos/alt(src)
new /obj/item/clothing/suit/mantle/armor(src)
new /obj/item/clothing/neck/cloak/hos_mantle(src)
new /obj/item/clothing/under/rank/security/head_of_security(src)
new /obj/item/clothing/under/rank/security/formal/head_of_security(src)
new /obj/item/clothing/under/rank/security/head_of_security/corporate(src)
@@ -107,7 +107,7 @@
new /obj/item/clothing/neck/cloak/research_director(src)
new /obj/item/clothing/under/rank/rnd/research_director(src)
new /obj/item/clothing/suit/storage/labcoat/rd(src)
new /obj/item/clothing/suit/mantle/labcoat(src)
new /obj/item/clothing/neck/cloak/rd_mantle(src)
new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/gloves/color/latex(src)
@@ -133,7 +133,7 @@
new /obj/item/clothing/under/rank/medical/scrubs/green(src)
new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
new /obj/item/clothing/suit/storage/labcoat/cmo(src)
new /obj/item/clothing/suit/mantle/labcoat/chief_medical_officer(src)
new /obj/item/clothing/neck/cloak/cmo_mantle(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/brown (src)
new /obj/item/clothing/gloves/color/latex/nitrile(src)
@@ -151,7 +151,7 @@
new /obj/item/clothing/neck/cloak/chief_engineer(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
new /obj/item/clothing/suit/mantle/chief_engineer(src)
new /obj/item/clothing/neck/cloak/ce_mantle(src)
new /obj/item/clothing/suit/storage/hazardvest/ce(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/glasses/welding/superior(src)
@@ -214,7 +214,7 @@
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/glasses/hud/health/sunglasses(src)
new /obj/item/clothing/glasses/hud/skills/sunglasses(src)
new /obj/item/clothing/accessory/blue(src)
new /obj/item/clothing/neck/tie/blue(src)
new /obj/item/clothing/head/helmet/space/plasmaman/blueshield(src)
new /obj/item/clothing/under/plasmaman/blueshield(src)
@@ -234,7 +234,7 @@
new /obj/item/clothing/neck/cloak/quartermaster(src)
new /obj/item/clothing/head/hardhat/orange(src)
new /obj/item/clothing/suit/qmcoat(src)
new /obj/item/clothing/suit/mantle/qm(src)
new /obj/item/clothing/neck/cloak/qm_mantle(src)
new /obj/item/clothing/suit/storage/hazardvest/qm(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/tank/internals/emergency_oxygen/double(src)
@@ -273,7 +273,7 @@
new /obj/item/clothing/head/det_hat(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/suit/armor/vest/det_suit(src)
new /obj/item/clothing/accessory/black(src)
new /obj/item/clothing/neck/tie/black(src)
new /obj/item/clothing/accessory/holster/armpit(src)
new /obj/item/clothing/glasses/sunglasses/yeah(src)
@@ -310,7 +310,7 @@
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/clothing/glasses/hud/health(src)
new /obj/item/clothing/glasses/hud/skills(src)
new /obj/item/clothing/accessory/blue(src)
new /obj/item/clothing/neck/tie/blue(src)
new /obj/item/clothing/head/helmet/space/plasmaman(src)
new /obj/item/clothing/under/plasmaman(src)
code/game/objects/items/weapons/storage/uplink_kits.dm
+2 -2
View File
@@ -222,7 +222,7 @@
/obj/item/encryptionkey/syndicate, // 10TC
/obj/item/clothing/under/syndicate/combat, //0TC
/obj/item/clothing/accessory/holster, // 0TC
/obj/item/clothing/accessory/scarf/red, //0TC
/obj/item/clothing/neck/scarf/red, //0TC
/obj/item/clothing/head/beret, // 0TC
/obj/item/clothing/gloves/combat, // 0TC
/obj/item/clothing/shoes/combat) // 0TC
@@ -455,7 +455,7 @@
/obj/item/storage/box/syndie_kit/safecracking/populate_contents()
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/clothing/mask/balaclava(src)
new /obj/item/clothing/accessory/stethoscope(src)
new /obj/item/clothing/neck/stethoscope(src)
new /obj/item/book/manual/wiki/hacking(src)
/obj/item/storage/box/syndie_kit/chameleon
code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
+1 -1
View File
@@ -73,7 +73,7 @@
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/glasses/hud/health(src)
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/clothing/accessory/stethoscope(src)
new /obj/item/clothing/neck/stethoscope(src)
new /obj/item/flashlight/pen(src)
new /obj/item/storage/firstaid/regular(src)
new /obj/item/storage/firstaid/adv(src)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+1 -1
View File
@@ -129,7 +129,7 @@
closed_door_sprite = "green"
/obj/structure/closet/wardrobe/xenos/populate_contents()
new /obj/item/clothing/suit/unathi/mantle(src)
new /obj/item/clothing/neck/cloak/unathi(src)
new /obj/item/clothing/suit/unathi/robe(src)
new /obj/item/clothing/gloves/handwraps(src)
new /obj/item/clothing/gloves/handwraps(src)
code/game/objects/structures/safe.dm
+3 -3
View File
@@ -209,7 +209,7 @@ GLOBAL_LIST_EMPTY(safes)
else
to_chat(user, "<span class='warning'>[I] won't fit in [src].</span>")
else
if(istype(I, /obj/item/clothing/accessory/stethoscope))
if(istype(I, /obj/item/clothing/neck/stethoscope))
attack_hand(user)
return
else if(istype(I, /obj/item/thermal_drill))
@@ -270,10 +270,10 @@ GLOBAL_LIST_EMPTY(safes)
var/mob/living/carbon/human/H = usr
var/list/accessories = H.w_uniform?.accessories
if(H.can_hear()) // This is cursed but is_type_in_list somehow fails
if(H.is_in_hands(/obj/item/clothing/accessory/stethoscope))
if(H.is_in_hands(/obj/item/clothing/neck/stethoscope))
canhear = TRUE
else
for(var/obj/item/clothing/accessory/stethoscope/S in accessories)
for(var/obj/item/clothing/neck/stethoscope/S in accessories)
canhear = TRUE
break