cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +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/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