Skip to content

Commit

Permalink
Removes A Lot Of Cruft (#3447)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Removes the following:
Swarmers
Bloodcult
Soulstones
Everything Devils
Meteor Gamemode
Area/shuttle

- [x] Compiles and runs on my local

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
I'm fairly sure none of this stuff fits regardless of if it works with
the game. And area/shuttle is annoying to see in sdmm.

God I hate it when you start pulling one thing out and it's easier to
just pull the rest out than to adjust it to work in the event that
someone might use it for an event once.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
code: A large amount of cruft has been deleted.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Erikafox authored Oct 7, 2024
1 parent 0474233 commit 5cc6a00
Show file tree
Hide file tree
Showing 166 changed files with 167 additions and 12,781 deletions.
471 changes: 0 additions & 471 deletions _maps/RandomRuins/ReebeRuins/reebe_swarmers.dmm

This file was deleted.

169 changes: 84 additions & 85 deletions _maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2314,20 +2314,6 @@
/obj/item/reagent_containers/food/snacks/urinalcake,
/turf/open/floor/plasteel/white,
/area/ship/crew/toilet)
"nb" = (
/obj/structure/table/wood,
/obj/structure/window/reinforced/tinted/frosted{
dir = 8
},
/obj/structure/window/reinforced/tinted/frosted{
dir = 4
},
/obj/item/flashlight/lamp{
pixel_y = 13
},
/obj/item/book/codex_gigas,
/turf/open/floor/wood,
/area/ship/crew/dorm)
"nh" = (
/turf/closed/wall/r_wall,
/area/ship/crew/dorm/dormtwo)
Expand Down Expand Up @@ -2804,32 +2790,6 @@
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
/area/ship/crew/hydroponics)
"qe" = (
/obj/structure/closet/secure_closet/freezer{
name = "Refrigerator";
desc = "A refrigerated cabinet for food."
},
/obj/effect/turf_decal/siding/wideplating/light/end{
dir = 4
},
/obj/item/storage/fancy/egg_box,
/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/soymilk,
/obj/item/reagent_containers/condiment/soymilk,
/obj/item/reagent_containers/condiment/soymilk,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/rice,
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/tofu,
/turf/open/floor/plasteel/mono/white,
/area/ship/crew/canteen/kitchen)
"qh" = (
/obj/machinery/hydroponics/constructable{
pixel_y = 8
Expand Down Expand Up @@ -3876,27 +3836,6 @@
/obj/structure/table,
/turf/open/floor/plasteel,
/area/ship/crew/canteen/kitchen)
"xb" = (
/obj/structure/table,
/obj/item/reagent_containers/condiment/sugar{
pixel_y = 4
},
/obj/item/reagent_containers/condiment/rice{
pixel_y = 10;
pixel_x = 3
},
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -5;
pixel_y = 5
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
/turf/open/floor/plasteel/mono/white,
/area/ship/crew/canteen/kitchen)
"xc" = (
/obj/effect/turf_decal/siding/wood/end{
dir = 8
Expand Down Expand Up @@ -4100,10 +4039,6 @@
"ys" = (
/turf/closed/wall/r_wall,
/area/ship/crew/dorm)
"yu" = (
/obj/item/clothing/mask/gas/monkeymask,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"yw" = (
/obj/effect/decal/cleanable/food/tomato_smudge,
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -4460,21 +4395,6 @@
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/maintenance/starboard)
"AH" = (
/obj/structure/table,
/obj/item/toy/figure/chef,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 10;
pixel_x = -7
},
/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 8;
pixel_y = 9
},
/turf/open/floor/plasteel/mono/white,
/area/ship/crew/canteen/kitchen)
"AI" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer4{
dir = 6
Expand Down Expand Up @@ -4567,6 +4487,19 @@
},
/turf/open/floor/plasteel,
/area/ship/security/prison)
"Bf" = (
/obj/structure/table/wood,
/obj/structure/window/reinforced/tinted/frosted{
dir = 8
},
/obj/structure/window/reinforced/tinted/frosted{
dir = 4
},
/obj/item/flashlight/lamp{
pixel_y = 13
},
/turf/open/floor/wood,
/area/ship/crew/dorm)
"Bi" = (
/obj/structure/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -4921,6 +4854,27 @@
/obj/effect/spawner/lootdrop/ration,
/turf/open/floor/plasteel,
/area/ship/security/prison)
"Dj" = (
/obj/structure/table,
/obj/item/reagent_containers/condiment/sugar{
pixel_y = 4
},
/obj/item/reagent_containers/condiment/rice{
pixel_y = 10;
pixel_x = 3
},
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -5;
pixel_y = 5
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
/turf/open/floor/plasteel/mono/white,
/area/ship/crew/canteen/kitchen)
"Dm" = (
/obj/structure/window/reinforced/spawner{
dir = 1
Expand Down Expand Up @@ -5863,6 +5817,21 @@
/obj/effect/turf_decal/siding/yellow,
/turf/open/floor/plasteel,
/area/ship/security/prison)
"Ie" = (
/obj/structure/table,
/obj/item/toy/figure/chef,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/item/reagent_containers/condiment/saltshaker{
pixel_y = 10;
pixel_x = -7
},
/obj/item/reagent_containers/condiment/peppermill{
pixel_x = 8;
pixel_y = 9
},
/turf/open/floor/plasteel/mono/white,
/area/ship/crew/canteen/kitchen)
"Ig" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "quickpoint_shut";
Expand Down Expand Up @@ -6210,6 +6179,10 @@
},
/turf/open/floor/plasteel,
/area/ship/security)
"Kc" = (
/obj/item/clothing/mask/gas/monkeymask,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"Kg" = (
/obj/effect/turf_decal/siding/red{
dir = 8
Expand Down Expand Up @@ -8459,6 +8432,32 @@
},
/turf/open/floor/wood,
/area/ship/crew/dorm/dormfour)
"Xf" = (
/obj/structure/closet/secure_closet/freezer{
name = "Refrigerator";
desc = "A refrigerated cabinet for food."
},
/obj/effect/turf_decal/siding/wideplating/light/end{
dir = 4
},
/obj/item/storage/fancy/egg_box,
/obj/item/storage/fancy/egg_box,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/milk,
/obj/item/reagent_containers/condiment/soymilk,
/obj/item/reagent_containers/condiment/soymilk,
/obj/item/reagent_containers/condiment/soymilk,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/flour,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/rice,
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/tofu,
/turf/open/floor/plasteel/mono/white,
/area/ship/crew/canteen/kitchen)
"Xg" = (
/obj/machinery/door/window{
dir = 4
Expand Down Expand Up @@ -9144,7 +9143,7 @@ Mv
Lu
rq
Hm
nb
Bf
dJ
VG
oM
Expand Down Expand Up @@ -9550,8 +9549,8 @@ PP
td
VK
Fg
AH
xb
Ie
Dj
nR
zq
mU
Expand Down Expand Up @@ -9674,7 +9673,7 @@ pe
Rr
KQ
wa
qe
Xf
Ad
gZ
eF
Expand Down Expand Up @@ -10356,7 +10355,7 @@ oI
VU
Dy
nh
yu
Kc
nK
jY
jY
Expand Down
4 changes: 2 additions & 2 deletions check_regex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ standards:
- exactly: [1, "/area text paths", '"/area']
- exactly: [17, "/datum text paths", '"/datum']
- exactly: [4, "/mob text paths", '"/mob']
- exactly: [42, "/obj text paths", '"/obj']
- exactly: [36, "/obj text paths", '"/obj']
- exactly: [0, "/turf text paths", '"/turf']
- exactly: [115, "text2path uses", "text2path"]

Expand All @@ -38,7 +38,7 @@ standards:

- exactly:
[
262,
261,
"non-bitwise << uses",
'(?<!\d)(?<!\d\s)(?<!<)<<(?!=|\s\d|\d|<|\/)',
]
Expand Down
30 changes: 13 additions & 17 deletions code/__DEFINES/atom_hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,19 @@
#define DATA_HUD_FAN 10

//antag HUD defines
#define ANTAG_HUD_CULT 11
#define ANTAG_HUD_REV 12
#define ANTAG_HUD_OPS 13
#define ANTAG_HUD_WIZ 14
#define ANTAG_HUD_SHADOW 15
#define ANTAG_HUD_TRAITOR 16
#define ANTAG_HUD_NINJA 17
#define ANTAG_HUD_CHANGELING 18
#define ANTAG_HUD_ABDUCTOR 19
#define ANTAG_HUD_DEVIL 20
#define ANTAG_HUD_SINTOUCHED 21
#define ANTAG_HUD_SOULLESS 22
#define ANTAG_HUD_BROTHER 23
#define ANTAG_HUD_OBSESSED 24
#define ANTAG_HUD_FUGITIVE 25
#define ANTAG_HUD_GANGSTER 26
#define ANTAG_HUD_SPACECOP 27
#define ANTAG_HUD_REV 11
#define ANTAG_HUD_OPS 12
#define ANTAG_HUD_WIZ 13
#define ANTAG_HUD_SHADOW 14
#define ANTAG_HUD_TRAITOR 15
#define ANTAG_HUD_NINJA 16
#define ANTAG_HUD_CHANGELING 17
#define ANTAG_HUD_ABDUCTOR 18
#define ANTAG_HUD_BROTHER 19
#define ANTAG_HUD_OBSESSED 20
#define ANTAG_HUD_FUGITIVE 21
#define ANTAG_HUD_GANGSTER 22
#define ANTAG_HUD_SPACECOP 23


// Notification action types
Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/cinematics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@
#define CINEMATIC_NUKE_NO_CORE 10
#define CINEMATIC_NUKE_FAR 11
#define CINEMATIC_NUKE_CLOWNOP 12
#define CINEMATIC_CULT_NUKE 13
#define CINEMATIC_CULT_FAIL 14
29 changes: 0 additions & 29 deletions code/__DEFINES/cult.dm

This file was deleted.

4 changes: 0 additions & 4 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(

#define isalienqueen(A) (istype(A, /mob/living/carbon/alien/humanoid/royal/queen))

#define istruedevil(A) (istype(A, /mob/living/carbon/true_devil))

//Silicon mobs
#define issilicon(A) (istype(A, /mob/living/silicon))

Expand Down Expand Up @@ -138,8 +136,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(

#define ishostile(A) (istype(A, /mob/living/simple_animal/hostile))

#define isswarmer(A) (istype(A, /mob/living/simple_animal/hostile/swarmer))

#define isguardian(A) (istype(A, /mob/living/simple_animal/hostile/guardian))

#define isconstruct(A) (istype(A, /mob/living/simple_animal/hostile/construct))
Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/language.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#define LANGUAGE_APHASIA "aphasia"
#define LANGUAGE_CULTIST "cultist"
#define LANGUAGE_CURATOR "curator"
#define LANGUAGE_DEVIL "devil"
#define LANGUAGE_GLAND "gland"
#define LANGUAGE_HAT "hat"
#define LANGUAGE_HIGH "high"
Expand Down
Loading

0 comments on commit 5cc6a00

Please sign in to comment.