Skip to content

Commit

Permalink
Removes some cruft from sheet construction - mainly, job statues. (sh…
Browse files Browse the repository at this point in the history
…iptest-ss13#3539)

<!-- 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:
- cardborg suit - It feels like it doesn't *exactly* fit the setting.
Can revert though.
- Karl Marx bust.
- all the job statues - the jobs no longer exist in the same sense as
before
- human/gondola/monkey skinsuits - I don't imagine parading in monkey
masks as fitting the setting

I'm actually removing all the statues listed above completely from the
code.
<!-- 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
That's the man alright.

![obraz](https://github.com/user-attachments/assets/55eb3760-da83-4c94-9d5f-11d91035b339)

<!-- 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:
del: Removed Karl Marx from the game.
del: Removed all the job statues.
del: Cardborg suit, human, gondola and monkey skinsuits are no longer
craftable.
/: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
Sadhorizon authored and zimon9 committed Oct 29, 2024
1 parent cd4d8fd commit 1110201
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 244 deletions.
6 changes: 1 addition & 5 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1698,10 +1698,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/beach/oceantown/shop)
"ww" = (
/obj/structure/statue/sandstone/assistant,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"wF" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/brflowers,
Expand Down Expand Up @@ -7687,7 +7683,7 @@ sa
sa
Ud
sa
ww
sa
sa
Ud
sa
Expand Down
4 changes: 3 additions & 1 deletion _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@
/area/overmap_encounter/planetoid/jungle/explored)
"bU" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/statue/sandstone/assistant,
/obj/item/kirbyplants{
icon_state = "plant-10"
},
/obj/machinery/light_switch{
pixel_y = 21;
pixel_x = -10
Expand Down
2 changes: 0 additions & 2 deletions _maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2024,7 +2024,6 @@
/turf/open/floor/engine/hull/interior,
/area/overmap_encounter/planetoid/lava/explored)
"Hl" = (
/obj/structure/statue/sandstone/assistant,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
Expand Down Expand Up @@ -2380,7 +2379,6 @@
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_starwalker)
"Mk" = (
/obj/structure/statue/sandstone/assistant,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/light,
Expand Down
8 changes: 2 additions & 6 deletions _maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8222,10 +8222,6 @@
},
/turf/open/floor/plasteel,
/area/ship/security/prison)
"Wi" = (
/obj/structure/statue/sandstone/assistant,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"Wj" = (
/obj/effect/decal/cleanable/food/salt,
/obj/effect/turf_decal/siding/wideplating/light,
Expand Down Expand Up @@ -10035,7 +10031,7 @@ rc
bb
yI
yI
Wi
yI
CP
nK
jY
Expand Down Expand Up @@ -10115,7 +10111,7 @@ rW
bb
yI
yI
Wi
yI
CP
nK
jY
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/sheets/glass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
null, \
new/datum/stack_recipe("directional reinforced window", /obj/structure/window/reinforced/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/reinforced/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe(" reinforced glass tile", /obj/item/stack/tile/glass/reinforced, 1, 4, 20), \
new/datum/stack_recipe("reinforced glass tile", /obj/item/stack/tile/glass/reinforced, 1, 4, 20), \
new/datum/stack_recipe("glass shard", /obj/item/shard, 1) \
))

Expand Down
26 changes: 0 additions & 26 deletions code/game/objects/items/stacks/sheets/leather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@
singular_name = "human skin piece"
novariants = FALSE

GLOBAL_LIST_INIT(human_recipes, list( \
new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/hooded/bloated_human, 5), \
))

/obj/item/stack/sheet/animalhide/human/get_main_recipes()
. = ..()
. += GLOB.human_recipes

/obj/item/stack/sheet/animalhide/generic
name = "skin"
desc = "A piece of skin."
Expand All @@ -32,12 +24,6 @@ GLOBAL_LIST_INIT(human_recipes, list( \
icon_state = "sheet-corgi"
item_state = "sheet-corgi"


GLOBAL_LIST_INIT(gondola_recipes, list ( \
new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1), \
new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/costume/gondola, 2), \
))

/obj/item/stack/sheet/animalhide/mothroach
name = "mothroach hide"
desc = "A thin layer of mothroach hide."
Expand All @@ -53,10 +39,6 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \
icon_state = "sheet-gondola"
item_state = "sheet-gondola"

/obj/item/stack/sheet/animalhide/gondola/get_main_recipes()
. = ..()
. += GLOB.gondola_recipes

/obj/item/stack/sheet/animalhide/cat
name = "cat hide"
desc = "The by-product of cat farming."
Expand All @@ -71,14 +53,6 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \
icon_state = "sheet-monkey"
item_state = "sheet-monkey"

GLOBAL_LIST_INIT(monkey_recipes, list ( \
new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \
))

/obj/item/stack/sheet/animalhide/monkey/get_main_recipes()
. = ..()
. += GLOB.monkey_recipes

/obj/item/stack/sheet/animalhide/lizard
name = "lizard skin"
desc = "Sssssss..."
Expand Down
16 changes: 0 additions & 16 deletions code/game/objects/items/stacks/sheets/mineral.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Mineral Sheets
GLOBAL_LIST_INIT(sandstone_recipes, list ( \
new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = 0, on_floor = 1) \
))

Expand Down Expand Up @@ -108,9 +107,6 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
GLOBAL_LIST_INIT(diamond_recipes, list ( \
new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), \
new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \
))

/obj/item/stack/sheet/mineral/diamond/get_main_recipes()
Expand Down Expand Up @@ -146,7 +142,6 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \
new/datum/stack_recipe("Nuke Statue", /obj/structure/statue/uranium/nuke, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, one_per_turf = 1, on_floor = 1), \
))

/obj/item/stack/sheet/mineral/uranium/get_main_recipes()
Expand Down Expand Up @@ -186,7 +181,6 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
GLOBAL_LIST_INIT(plasma_recipes, list ( \
new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \
new/datum/stack_recipe("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \
))

/obj/item/stack/sheet/mineral/plasma/get_main_recipes()
Expand Down Expand Up @@ -240,12 +234,7 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
new/datum/stack_recipe("chemical crate", /obj/structure/closet/crate/chem, 1, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \
new/datum/stack_recipe("blank plaque", /obj/item/plaque, 1), \
new/datum/stack_recipe("HoS Statue", /obj/structure/statue/gold/hos, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("HOP Statue", /obj/structure/statue/gold/head_of_personnel, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("CE Statue", /obj/structure/statue/gold/ce, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("RD Statue", /obj/structure/statue/gold/rd, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \
new/datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = 1, on_floor = 1), \
))

/obj/item/stack/sheet/mineral/gold/get_main_recipes()
Expand Down Expand Up @@ -296,11 +285,6 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
GLOBAL_LIST_INIT(silver_recipes, list ( \
new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \
new/datum/stack_recipe("Med Officer Statue", /obj/structure/statue/silver/md, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Janitor Statue", /obj/structure/statue/silver/janitor, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Sec Officer Statue", /obj/structure/statue/silver/sec, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = 1, on_floor = 1), \
))

/obj/item/stack/sheet/mineral/silver/get_main_recipes()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
null, \
new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("voting box", /obj/structure/votebox, 15, time = 50), \
new/datum/stack_recipe("voting box", /obj/structure/votebox, 5, time = 50), \
new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar/metal, 3), \
new/datum/stack_recipe("pestle", /obj/item/pestle, 1, time = 50), \
new/datum/stack_recipe("hygienebot assembly", /obj/item/bot_assembly/hygienebot, 2, time = 50), \
Expand Down
3 changes: 0 additions & 3 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,6 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
*/
GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new/datum/stack_recipe("box", /obj/item/storage/box), \
new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \
null, \
Expand Down Expand Up @@ -452,7 +450,6 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
new/datum/stack_recipe("bronze hat", /obj/item/clothing/head/bronze), \
null,
new/datum/stack_recipe("bronze chair", /obj/structure/chair/comfy/shuttle/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("Marx Bust", /obj/structure/statue/bronze/marx, 15, one_per_turf = 1, on_floor = 1), \
))

/obj/item/stack/tile/bronze
Expand Down
Loading

0 comments on commit 1110201

Please sign in to comment.