Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Converts a bunch of items into using neck slot #27474

Merged
merged 50 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
b480045
woe upon me
invalid-email-address Nov 28, 2024
e289f9f
update
invalid-email-address Nov 28, 2024
68b167b
Merge branch 'master' into neckslotconvert
invalid-email-address Nov 28, 2024
e8e1dc1
few changes
invalid-email-address Nov 28, 2024
e364646
critters
invalid-email-address Nov 29, 2024
3245f0c
critters
invalid-email-address Nov 29, 2024
df089b7
THIS IS A CERTIFIED VOX CLASSIC
invalid-email-address Nov 29, 2024
99b50f3
removes comment from sql script
invalid-email-address Nov 29, 2024
82fd28c
i think i have a skill issue
invalid-email-address Nov 29, 2024
7d7fbed
fuck
invalid-email-address Nov 29, 2024
fbbd6bc
Merge branch 'master' into neckslotconvert
invalid-email-address Nov 30, 2024
1bd3aa6
TGUI Bundle Rebuild
invalid-email-address Nov 30, 2024
f13de6f
furcape
invalid-email-address Nov 30, 2024
02f4b6b
Merge branch 'master' into neckslotconvert
invalid-email-address Dec 3, 2024
d941821
Merge branch 'master' into neckslotconvert
invalid-email-address Dec 3, 2024
e9d28f5
attackby update
invalid-email-address Dec 3, 2024
334ae90
cerefix
invalid-email-address Dec 3, 2024
0d54ebc
buildstgui
invalid-email-address Dec 3, 2024
2fc5aa9
Merge branch 'master' into neckslotconvert
invalid-email-address Dec 5, 2024
af5fe78
ajust size of loadout menu again
invalid-email-address Dec 5, 2024
b854f55
tie layering toggle
invalid-email-address Dec 7, 2024
4bb3f93
renames layer
invalid-email-address Dec 8, 2024
c6eff47
Merge branch 'master' into neckslotconvert
invalid-email-address Dec 8, 2024
60d9e3b
fucking map conflicts
invalid-email-address Dec 8, 2024
c0611b8
woe
invalid-email-address Dec 8, 2024
c2e43aa
Merge branch 'master' into neckslotconvert
invalid-email-address Dec 13, 2024
7ed7754
deconflict
invalid-email-address Dec 13, 2024
56618c0
tgui
invalid-email-address Dec 13, 2024
87c8e3d
conflicts again
invalid-email-address Dec 13, 2024
7822174
conflicts
invalid-email-address Dec 13, 2024
e9320d1
manual deconflict again
invalid-email-address Dec 13, 2024
50d4b62
oops
invalid-email-address Dec 13, 2024
b0c532e
Merge branch 'master' into neckslotconvert
invalid-email-address Dec 14, 2024
b0b5f76
TGUI Bundle Rebuild
invalid-email-address Dec 14, 2024
cdf4954
Merge branch 'master' into neckslotconvert
invalid-email-address Dec 14, 2024
25dc596
Merge branch 'master' into neckslotconvert
invalid-email-address Dec 15, 2024
a6ad714
TGUI Bundle Rebuild
invalid-email-address Dec 15, 2024
77a6fe1
Merge branch 'master' into neckslotconvert
invalid-email-address Dec 24, 2024
dc24a76
give this one more try
invalid-email-address Dec 24, 2024
8c15fa9
Update code/modules/clothing/neck/necklace.dm
Bm0n Dec 29, 2024
606f455
Update code/modules/clothing/neck/necklace.dm
Bm0n Dec 29, 2024
1144243
Update code/modules/clothing/neck/necklace.dm
Bm0n Dec 29, 2024
15e9aca
Update code/modules/clothing/neck/necklace.dm
Bm0n Dec 29, 2024
740d497
Update code/modules/clothing/neck/necklace.dm
Bm0n Dec 29, 2024
95cf077
Update code/modules/clothing/neck/necklace.dm
Bm0n Dec 29, 2024
1ddac82
review
invalid-email-address Dec 29, 2024
931323b
scarffixforemerald
invalid-email-address Dec 29, 2024
dc7e942
Merge branch 'master' into neckslotconvert
invalid-email-address Dec 31, 2024
7823ddf
Merge branch 'master' into neckslotconvert
invalid-email-address Jan 2, 2025
02ea7ea
tgui rebuild
invalid-email-address Jan 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading