Skip to content

Commit

Permalink
Big sprite cleanup (#3474)
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
Removing a bunch of unused stuff and cleaning up/moving/organizing
files.

## Changelog

:cl:
add: Added new things
add: Added more things
del: Removed old things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/: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
thgvr authored Oct 4, 2024
1 parent 16321ff commit 75293a3
Show file tree
Hide file tree
Showing 122 changed files with 40 additions and 2,132 deletions.
4 changes: 0 additions & 4 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1509,10 +1509,6 @@
},
/area/ruin/jungle/cavecrew/dormitories)
"sJ" = (
/obj/item/clothing/head/crown/fancy{
pixel_y = 9;
pixel_x = 6
},
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
Expand Down
4 changes: 0 additions & 4 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,6 @@
pixel_x = -5;
pixel_y = 12
},
/obj/item/clothing/head/witchunter{
pixel_y = 13;
pixel_x = -5
},
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
/area/overmap_encounter/planetoid/lava/explored)
Expand Down
2 changes: 0 additions & 2 deletions _maps/RandomRuins/ReebeRuins/reebe_floating_island.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
/obj/item/ammo_casing/caseless/arrow/bronze,
/obj/item/ammo_casing/caseless/arrow/bronze,
/obj/item/ammo_casing/caseless/arrow/bronze,
/obj/item/clothing/suit/bronze,
/obj/item/clothing/head/bronze,
/obj/item/clothing/shoes/bronze,
/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal,
/turf/open/floor/bronze,
/area/ruin/reebe)
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4356,7 +4356,6 @@
/obj/structure/window/reinforced{
dir = 1
},
/obj/effect/spawner/bundle/costume/marisawizard,
/turf/open/floor/plasteel/mono/white,
/area/ruin/rockplanet/shippingdockwarehouse)
"Kt" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@
/area/ruin)
"nZ" = (
/obj/structure/table,
/obj/item/clothing/glasses/meson/gar,
/turf/open/floor/concrete,
/area/ruin)
"ox" = (
Expand Down
4 changes: 0 additions & 4 deletions _maps/RandomRuins/SpaceRuins/astraeus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1710,10 +1710,6 @@
/turf/closed/wall/r_wall,
/area/ruin/space/has_grav/astraeus/munitions)
"TS" = (
/obj/item/clothing/shoes/clown_shoes{
pixel_x = -3;
pixel_y = 12
},
/obj/machinery/airalarm/directional/south,
/obj/item/storage/crayons{
pixel_y = -6
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/singularity_lab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7373,7 +7373,6 @@
name = "Prototype Storage"
},
/obj/item/gun/energy/laser/captain,
/obj/item/clothing/shoes/wheelys,
/obj/structure/sign/poster/retro/lasergun_new{
pixel_y = 32
},
Expand Down
14 changes: 0 additions & 14 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1268,9 +1268,6 @@
/area/ruin/space/has_grav/spacemall/dorms)
"eO" = (
/obj/effect/turf_decal/corner/opaque/blue/half,
/obj/item/clothing/suit/whitedress,
/obj/item/clothing/suit/whitedress,
/obj/item/clothing/suit/whitedress,
/obj/item/clothing/under/dress/blacktango{
pixel_y = 3
},
Expand Down Expand Up @@ -2804,12 +2801,7 @@
/area/ruin/space/has_grav/spacemall)
"kC" = (
/obj/structure/rack,
/obj/item/clothing/head/goatpelt,
/obj/item/clothing/head/hardhat/reindeer,
/obj/item/clothing/head/collectable/chef,
/obj/item/clothing/head/collectable/HoP,
/obj/item/clothing/head/collectable/rabbitears,
/obj/item/clothing/head/witchunter,
/obj/item/clothing/neck/cloak/trans,
/obj/item/clothing/neck/cloak/cap,
/obj/item/clothing/neck/beads,
Expand Down Expand Up @@ -4310,8 +4302,6 @@
/obj/item/clothing/glasses/heat{
pixel_y = -6
},
/obj/item/clothing/glasses/sunglasses/gar/supergar,
/obj/item/clothing/glasses/monocle,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
Expand Down Expand Up @@ -9805,10 +9795,6 @@
pixel_y = 5;
pixel_x = 2
},
/obj/item/clothing/head/spacepolice{
pixel_y = -3;
pixel_x = 4
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/dorms)
"Li" = (
Expand Down
16 changes: 1 addition & 15 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2107,12 +2107,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plasteel,
/area/centcom/control)
"awU" = (
/obj/item/clothing/suit/wizrobe/black,
/obj/item/clothing/head/wizard/black,
/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel,
/area/wizard_station)
"awV" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
Expand Down Expand Up @@ -2330,8 +2324,6 @@
/area/wizard_station)
"ayF" = (
/obj/structure/table/wood,
/obj/item/clothing/suit/wizrobe/magusblue,
/obj/item/clothing/head/wizard/magus,
/obj/item/staff,
/obj/structure/mirror/magic{
pixel_y = 28
Expand All @@ -2341,8 +2333,6 @@
/area/wizard_station)
"ayG" = (
/obj/structure/table/wood,
/obj/item/clothing/suit/wizrobe/magusred,
/obj/item/clothing/head/wizard/magus,
/obj/item/staff,
/turf/open/floor/plasteel,
/area/wizard_station)
Expand Down Expand Up @@ -2415,8 +2405,6 @@
/obj/structure/closet/crate{
icon_state = "crateopen"
},
/obj/item/clothing/suit/wizrobe/red,
/obj/item/clothing/head/wizard/red,
/obj/item/staff,
/obj/item/clothing/shoes/sandal/magic,
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -2472,8 +2460,6 @@
/area/wizard_station)
"azP" = (
/obj/item/clothing/shoes/sandal/marisa,
/obj/item/clothing/suit/wizrobe/marisa,
/obj/item/clothing/head/wizard/marisa,
/obj/item/staff/broom,
/turf/open/floor/plasteel,
/area/wizard_station)
Expand Down Expand Up @@ -22454,7 +22440,7 @@ aqZ
aqZ
aqZ
aqE
awU
aXi
ayg
aHq
aqE
Expand Down
1 change: 0 additions & 1 deletion _maps/outpost/nanotrasen_asteroid.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -14514,7 +14514,6 @@
"Zb" = (
/obj/structure/closet/secure_closet/freezer/wall/directional/east,
/obj/item/clothing/under/shorts/cookjorts,
/obj/item/clothing/shoes/cookflops,
/obj/item/clothing/suit/toggle/chef,
/obj/item/clothing/under/rank/civilian/chef,
/obj/item/clothing/under/rank/civilian/chef/skirt,
Expand Down
6 changes: 1 addition & 5 deletions _maps/shuttles/independent/independent_beluga.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@
/obj/item/clothing/glasses/sunglasses/big,
/obj/item/clothing/suit/toggle/lawyer/burgundy,
/obj/item/clothing/suit/toggle/lawyer/navy,
/obj/item/clothing/head/hopcap,
/obj/item/clothing/head/nanotrasen/officer,
/obj/item/gun/energy/e_gun/mini,
/obj/item/clothing/head/HoS/cowboy,
/obj/item/clothing/suit/jacket/leather/duster/command,
Expand Down Expand Up @@ -3910,7 +3910,6 @@
},
/obj/machinery/light/small/directional/west,
/obj/item/clothing/under/suit/charcoal,
/obj/item/clothing/glasses/monocle,
/obj/item/clothing/shoes/laceup{
pixel_y = -11
},
Expand Down Expand Up @@ -4985,9 +4984,6 @@
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/shoes/cookflops{
pixel_y = -11
},
/turf/open/floor/carpet/nanoweave/beige,
/area/ship/crew/dorm)
"Xn" = (
Expand Down
7 changes: 0 additions & 7 deletions _maps/shuttles/independent/independent_lagoon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1171,9 +1171,6 @@
"hT" = (
/obj/structure/table/wood,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/bikehorn,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/megaphone/clown,
/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter,
/obj/item/radio/intercom/directional/south,
/turf/open/floor/carpet/nanoweave/purple,
Expand Down Expand Up @@ -6719,10 +6716,6 @@
/area/ship/hallway/aft)
"TX" = (
/obj/structure/table,
/obj/item/clothing/shoes/wheelys{
pixel_x = 4;
pixel_y = 9
},
/obj/item/skateboard/hoverboard{
pixel_x = -4
},
Expand Down
2 changes: 0 additions & 2 deletions _maps/shuttles/independent/independent_tranquility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1329,9 +1329,7 @@
/obj/item/clothing/under/dress/skirt/red,
/obj/item/clothing/suit/longcoat,
/obj/item/clothing/suit/jacket/letterman_red,
/obj/item/clothing/head/wizard/marisa,
/obj/item/clothing/head/soft/mime,
/obj/item/clothing/shoes/wheelys,
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/shoes/sneakers/black,
/turf/open/floor/carpet/green,
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4136,7 +4136,6 @@
"pk" = (
/obj/structure/closet/secure_closet/freezer/wall/directional/east,
/obj/item/clothing/under/shorts/cookjorts,
/obj/item/clothing/shoes/cookflops,
/obj/item/clothing/suit/toggle/chef,
/obj/item/clothing/under/rank/civilian/chef,
/obj/item/clothing/under/rank/civilian/chef/skirt,
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4102,7 +4102,6 @@
/area/ship/crew/dorm)
"yu" = (
/obj/item/clothing/mask/gas/monkeymask,
/obj/item/clothing/suit/monkeysuit,
/turf/open/floor/plating,
/area/ship/maintenance/fore)
"yw" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,8 @@
/obj/item/clothing/suit/armor/nanotrasen/captain,
/obj/item/clothing/suit/armor/nanotrasen/captain/parade,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat/nt,
/obj/item/clothing/head/nanotrasen/captain/peaked,
/obj/item/clothing/head/nanotrasen/captain,
/obj/item/storage/belt/sabre,
/obj/item/assembly/flash/handheld,
/obj/item/disk/nuclear/fake{
Expand Down Expand Up @@ -2596,7 +2597,6 @@
/obj/item/clothing/suit/toggle/chef,
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/head/chefhat,
/obj/item/clothing/head/bowler,
/obj/item/storage/box/drinkingglasses,
/obj/item/storage/fancy/candle_box,
/obj/item/radio/intercom/directional/east,
Expand Down Expand Up @@ -5261,7 +5261,7 @@
/obj/item/clothing/suit/armor/vest/hop,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/hopcap/nt,
/obj/item/clothing/head/nanotrasen/officer,
/obj/item/assembly/flash/handheld,
/obj/item/storage/box/ids,
/obj/item/storage/box/PDAs,
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@
/area/ship/hallway/central)
"bw" = (
/obj/structure/closet/secure_closet/lp/security,
/obj/item/clothing/glasses/sunglasses/gar,
/obj/item/melee/classic_baton/telescopic,
/obj/item/flashlight/seclite,
/obj/item/melee/knife/survival,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1513,7 +1513,7 @@
/obj/item/storage/backpack/satchel/leather,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/suit/armor/vest/hop,
/obj/item/clothing/head/hopcap/nt,
/obj/item/clothing/head/nanotrasen/officer/fedora,
/obj/item/storage/box/ids,
/obj/item/storage/box/PDAs,
/obj/item/assembly/flash/handheld,
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/species_clothing_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define DEFAULT_HEAD_PATH 'icons/mob/clothing/head.dmi'
#define DEFAULT_NECK_PATH 'icons/mob/clothing/neck.dmi'
#define DEFAULT_GLOVES_PATH 'icons/mob/clothing/hands.dmi'
#define DEFAULT_GLASSES_PATH 'icons/mob/clothing/eyes.dmi'
#define DEFAULT_GLASSES_PATH 'icons/mob/clothing/eyes/eyes.dmi'
#define DEFAULT_BELT_PATH 'icons/mob/clothing/belt.dmi'

///VOX PATHS
Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -403,14 +403,12 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define STICKY_MOUSTACHE_TRAIT "sticky-moustache"
#define CHAINSAW_FRENZY_TRAIT "chainsaw-frenzy"
#define CHRONO_GUN_TRAIT "chrono-gun"
#define REVERSE_BEAR_TRAP_TRAIT "reverse-bear-trap"
#define CURSED_MASK_TRAIT "cursed-mask"
#define HAND_REPLACEMENT_TRAIT "magic-hand"
#define HOT_POTATO_TRAIT "hot-potato"
#define ABDUCTOR_VEST_TRAIT "abductor-vest"
#define CAPTURE_THE_FLAG_TRAIT "capture-the-flag"
#define EYE_OF_GOD_TRAIT "eye-of-god"
#define SHAMEBRERO_TRAIT "shamebrero"
#define CHRONOSUIT_TRAIT "chronosuit"
#define LOCKED_HELMET_TRAIT "locked-helmet"
#define NINJA_SUIT_TRAIT "ninja-suit"
Expand Down
7 changes: 3 additions & 4 deletions code/controllers/subsystem/traumas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ SUBSYSTEM_DEF(traumas)
/obj/machinery/door/airlock/security, /obj/effect/hallucination/simple/securitron)),

"clowns" = typecacheof(list(
/obj/item/clothing/under/rank/civilian/clown, /obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/under/rank/civilian/clown,
/obj/item/clothing/mask/gas/clown_hat, /obj/item/instrument/bikehorn,
/obj/item/pda/clown, /obj/item/grown/bananapeel, /obj/item/reagent_containers/food/snacks/cheesiehonkers,
/obj/item/trash/cheesie)),
Expand Down Expand Up @@ -113,7 +113,7 @@ SUBSYSTEM_DEF(traumas)
/obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper, /obj/machinery/stasis,
/obj/machinery/dna_scannernew, /obj/machinery/atmospherics/components/unary/cryo_cell,
/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/plaguedoctorhat, /obj/item/clothing/mask/gas/plaguedoctor)),
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/mask/gas/plaguedoctor)),

"authority" = typecacheof(list(
/obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/command/head_of_personnel,
Expand All @@ -126,7 +126,7 @@ SUBSYSTEM_DEF(traumas)
"the supernatural" = typecacheof(list(
/obj/structure/destructible/cult, /obj/item/tome,
/obj/item/restraints/legcuffs/bola/cult, /obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
/obj/effect/rune,
/obj/machinery/door/airlock/cult, /obj/singularity/narsie,
/obj/item/soulstone,
/obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard, /obj/item/spellbook, /obj/item/staff,
Expand All @@ -146,7 +146,6 @@ SUBSYSTEM_DEF(traumas)

"birds" = typecacheof(list(
/obj/item/clothing/mask/gas/plaguedoctor, /obj/item/reagent_containers/food/snacks/cracker,
/obj/item/clothing/suit/chickensuit, /obj/item/clothing/head/chicken,
/obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/costume/owl, /obj/item/clothing/mask/gas/owl_mask)),

"anime" = typecacheof(list(
Expand Down
10 changes: 0 additions & 10 deletions code/datums/components/crafting/recipes/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,3 @@
reqs = list(/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 2)
category = CAT_CLOTHING

/datum/crafting_recipe/polarbearcloak
name = "Polar Cloak"
result = /obj/item/clothing/suit/hooded/cloak/goliath/polar
time = 50
reqs = list(/obj/item/stack/sheet/leather = 2,
/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide = 2)
blacklist = list(/obj/item/stack/sheet/animalhide/goliath_hide)
category = CAT_CLOTHING
11 changes: 0 additions & 11 deletions code/datums/components/slippery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,3 @@

/datum/component/slippery/proc/Slip_on_wearer(datum/source, atom/movable/arrived)
SIGNAL_HANDLER

/// Used for making the clown PDA only slip if the clown is wearing his shoes and the elusive banana-skin belt
/datum/component/slippery/clowning

/datum/component/slippery/clowning/Slip_on_wearer(datum/source, atom/movable/AM)
var/obj/item/I = holder.get_item_by_slot(ITEM_SLOT_FEET)
if(holder.body_position == LYING_DOWN && !holder.buckled)
if(istype(I, /obj/item/clothing/shoes/clown_shoes))
Slip(source, AM)
else
to_chat(AM,"<span class='warning'>[parent] failed to slip anyone. Perhaps I shouldn't have abandoned my legacy...</span>")
11 changes: 0 additions & 11 deletions code/datums/looping_sounds/item_sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,6 @@
#undef RAD_GEIGER_MEDIUM
#undef RAD_GEIGER_HIGH

/datum/looping_sound/reverse_bear_trap
mid_sounds = list('sound/effects/clock_tick.ogg')
mid_length = 3.5
volume = 25


/datum/looping_sound/reverse_bear_trap_beep
mid_sounds = list('sound/machines/beep.ogg')
mid_length = 60
volume = 10

/datum/looping_sound/siren
mid_sounds = list('sound/items/weeoo1.ogg' = 1)
mid_length = 15
Expand Down
Loading

0 comments on commit 75293a3

Please sign in to comment.