Skip to content

Commit

Permalink
Converts a bunch of items into using neck slot (#27474)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
Signed-off-by: Bm0n <[email protected]>

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

Co-authored-by: Luc <[email protected]>
Signed-off-by: Bm0n <[email protected]>

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

Co-authored-by: Luc <[email protected]>
Signed-off-by: Bm0n <[email protected]>

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

Co-authored-by: Luc <[email protected]>
Signed-off-by: Bm0n <[email protected]>

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

Co-authored-by: Luc <[email protected]>
Signed-off-by: Bm0n <[email protected]>

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

Co-authored-by: Luc <[email protected]>
Signed-off-by: Bm0n <[email protected]>

* review

* scarffixforemerald

* tgui rebuild

---------

Signed-off-by: Bm0n <[email protected]>
Co-authored-by: Bmon <[email protected]>
Co-authored-by: Luc <[email protected]>
  • Loading branch information
3 people authored Jan 2, 2025
1 parent 6f13d44 commit 6a63097
Show file tree
Hide file tree
Showing 60 changed files with 1,058 additions and 946 deletions.
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9964,7 +9964,7 @@
pixel_y = 7;
pixel_x = -3
},
/obj/item/clothing/accessory/horrible{
/obj/item/clothing/neck/tie/horrible{
pixel_y = -2;
pixel_x = 2
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@
icon_state = "0-8"
},
/obj/structure/closet/crate/medical,
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/obj/item/healthanalyzer,
/obj/item/reagent_containers/iv_bag/blood/o_minus,
/obj/item/reagent_containers/iv_bag/blood/o_minus,
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
},
/area/ruin/space/powered/bar)
"aY" = (
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/obj/item/stack/medical/bruise_pack/advanced,
/obj/item/scalpel,
/obj/structure/table,
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3435,7 +3435,7 @@
},
/area/ruin/unpowered/syndicate_space_base/storage)
"uy" = (
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
Expand Down Expand Up @@ -7950,7 +7950,7 @@
/obj/item/storage/belt/medical,
/obj/item/crowbar,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/obj/structure/table,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
Expand Down
12 changes: 6 additions & 6 deletions _maps/map_files/stations/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -27844,11 +27844,11 @@
/area/station/medical/reception)
"bSy" = (
/obj/structure/table,
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/accessory/stethoscope{
/obj/item/clothing/neck/stethoscope,
/obj/item/clothing/neck/stethoscope{
pixel_y = 6
},
/obj/item/clothing/accessory/stethoscope{
/obj/item/clothing/neck/stethoscope{
pixel_y = 3
},
/obj/item/flashlight/pen{
Expand Down Expand Up @@ -71556,7 +71556,7 @@
"pAM" = (
/obj/structure/table,
/obj/item/soap/deluxe,
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
Expand Down Expand Up @@ -77940,7 +77940,7 @@
/turf/simulated/floor/plasteel,
/area/station/public/dorms)
"sPu" = (
/obj/item/clothing/suit/mantle/old,
/obj/item/clothing/neck/cloak/old,
/turf/simulated/floor/carpet,
/area/station/maintenance/asmaint)
"sPw" = (
Expand Down Expand Up @@ -79983,7 +79983,7 @@
/area/station/hallway/primary/aft/south)
"tUd" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/neck/stethoscope,
/obj/item/crowbar,
/obj/effect/landmark/spawner/nukedisc_respawn,
/obj/effect/spawner/random/cobweb/left/frequent,
Expand Down
Loading

0 comments on commit 6a63097

Please sign in to comment.