Skip to content

Commit

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

: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 and MrCat15352 committed Dec 24, 2024
1 parent 6fb7a6a commit 7a9598a
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 179 deletions.
26 changes: 21 additions & 5 deletions _maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_osprey.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,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 @@ -2619,7 +2620,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 @@ -5213,9 +5213,25 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"HD" = (
/obj/item/storage/photo_album/RD,
/obj/item/door_remote/research_director,
/obj/item/laser_pointer/purple,
/obj/structure/closet/secure_closet{
icon_state = "hop";
name = "\proper first officer's locker";
req_access_txt = "57"
},
/obj/structure/sign/poster/official/bless_this_spess{
pixel_y = 32
},
/obj/item/storage/backpack/duffelbag,
/obj/item/storage/backpack/messenger,
/obj/item/storage/backpack,
/obj/item/storage/backpack/satchel/leather,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/under/nanotrasen/officer/skirt,
/obj/item/clothing/under/nanotrasen/officer,
/obj/item/clothing/suit/armor/vest/hop,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/nanotrasen/officer,
/obj/item/assembly/flash/handheld,
/obj/item/clothing/suit/armor/reactive/teleport,
/obj/item/radio/headset/heads/rd,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1724,7 +1724,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
4 changes: 0 additions & 4 deletions _maps/shuttles/independent/independent_lagoon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6716,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
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
14 changes: 0 additions & 14 deletions code/game/objects/items/religion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -247,17 +247,3 @@
/obj/item/storage/box/itemset/crusader
name = "Crusader's Armour Set" //i can't into ck2 references
desc = "This armour is said to be based on the armor of kings on another world thousands of years ago, who tended to assassinate, conspire, and plot against everyone who tried to do the same to them. Some things never change."


/obj/item/storage/box/itemset/crusader/blue/PopulateContents()
new /obj/item/clothing/suit/armor/plate/crusader/blue(src)
new /obj/item/clothing/head/helmet/plate/crusader/blue(src)
new /obj/item/clothing/gloves/plate/blue(src)
new /obj/item/clothing/shoes/plate/blue(src)


/obj/item/storage/box/itemset/crusader/red/PopulateContents()
new /obj/item/clothing/suit/armor/plate/crusader/red(src)
new /obj/item/clothing/head/helmet/plate/crusader/red(src)
new /obj/item/clothing/gloves/plate/red(src)
new /obj/item/clothing/shoes/plate/red(src)
3 changes: 0 additions & 3 deletions code/game/objects/items/stacks/sheets/leather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,7 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \
new/datum/stack_recipe("leather shoes", /obj/item/clothing/shoes/laceup, 2), \
// [CELADON-ADD] - CELADON_RETURN_CONTENT
new/datum/stack_recipe("leather overcoat", /obj/item/clothing/suit/jacket/leather/overcoat, 10), \
// [/CELADON-ADD]
new/datum/stack_recipe("saddle", /obj/item/saddle, 5), \
))

/obj/item/stack/sheet/leather/get_main_recipes()
. = ..()
. += GLOB.leather_recipes
Expand Down
20 changes: 0 additions & 20 deletions code/modules/antagonists/cult/cult_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,26 +90,6 @@
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)


/obj/item/clothing/head/magus
name = "magus helm"
icon_state = "magus"
item_state = "magus"
desc = "A helm worn by the followers of Nar'Sie."
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES
armor = list("melee" = 50, "bullet" = 30, "laser" = 50,"energy" = 50, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10)
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH

/obj/item/clothing/suit/magusred
name = "magus robes"
desc = "A set of armored robes worn by the followers of Nar'Sie."
icon_state = "magusred"
item_state = "magusred"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
allowed = list(/obj/item/tome)
armor = list("melee" = 50, "bullet" = 30, "laser" = 50,"energy" = 50, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 10, "acid" = 10)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT

/obj/item/clothing/head/helmet/space/hardsuit/cult
name = "\improper Nar'Sien hardened helmet"
desc = "A heavily-armored helmet worn by warriors of the Nar'Sien cult. It can withstand hard vacuum."
Expand Down
66 changes: 0 additions & 66 deletions code/modules/clothing/suits/chaplainsuits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,69 +5,3 @@

/obj/item/clothing/suit/hooded/chaplainsuit
allowed = list(/obj/item/storage/book/bible, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)

//Suits
/obj/item/clothing/suit/chaplainsuit/holidaypriest
name = "holiday priest"
desc = "This is a nice holiday, my son."
icon_state = "holidaypriest"
item_state = "w_suit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT

/obj/item/clothing/suit/chaplainsuit/nun
name = "nun robe"
desc = "Maximum piety in this star system."
icon_state = "nun"
item_state = "nun"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
flags_inv = HIDESHOES|HIDEJUMPSUIT

/obj/item/clothing/suit/chaplainsuit/bishoprobe
name = "bishop's robes"
desc = "Glad to see the tithes you collected were well spent."
icon_state = "bishoprobe"
item_state = "bishoprobe"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT

/obj/item/clothing/suit/hooded/chaplainsuit/monkhabit
name = "monk's habit"
desc = "A few steps above rended sackcloth."
icon_state = "monkfrock"
item_state = "monkfrock"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hooded/monkhabit

/obj/item/clothing/head/hooded/monkhabit
name = "monk's hood"
desc = "For when a man wants to cover up his tonsure."
icon_state = "monkhood"
item_state = "monkhood"
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS

/obj/item/clothing/suit/chaplainsuit/monkrobeeast
name = "eastern monk's robes"
desc = "Best combined with a shaved head."
icon_state = "monkrobeeast"
item_state = "monkrobeeast"
body_parts_covered = GROIN|LEGS
flags_inv = HIDEJUMPSUIT

/obj/item/clothing/suit/chaplainsuit/whiterobe
name = "white robe"
desc = "Good for clerics and sleepy crewmembers."
icon_state = "whiterobe"
item_state = "whiterobe"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT

/obj/item/clothing/suit/chaplainsuit/clownpriest
name = "Robes of the Honkmother"
desc = "Meant for a clown of the cloth."
icon_state = "clownpriest"
item_state = "clownpriest"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/reagent_containers/food/snacks/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/reagent_containers/food/snacks/grown/banana)
18 changes: 0 additions & 18 deletions code/modules/clothing/suits/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -270,24 +270,6 @@
icon_state = "coat_terragov"
item_state = "coat_terragov"

/obj/item/clothing/suit/hooded/enginseer
name = "enginseer regalia"
desc = "You hold the secrets of the Machine."
icon_state = "enginseer"
item_state = "enginseer"
hoodtype = /obj/item/clothing/head/hooded/enginseer
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDEGLOVES
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/gun, /obj/item/melee, /obj/item/radio, /obj/item/storage/book)

/obj/item/clothing/head/hooded/enginseer
name = "enginseer's hood"
desc = "You are honored that they require your skills."
icon_state = "enginseerhood"
item_state = "enginseerhood"
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDEFACIALHAIR

/obj/item/clothing/suit/armor/witchhunter
name = "witchunter garb"
desc = "This worn outfit saw much use back in the day."
Expand Down
36 changes: 0 additions & 36 deletions code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,42 +81,6 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
resistance_flags = NONE

/obj/item/clothing/suit/hastur
name = "\improper Hastur's robe"
desc = "Robes not meant to be worn by man."
icon_state = "hastur"
item_state = "hastur"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT


/obj/item/clothing/suit/imperium_monk
name = "\improper Imperium monk suit"
desc = "Have YOU killed a xeno today?"
icon_state = "imperium_monk"
item_state = "imperium_monk"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
allowed = list(/obj/item/storage/book/bible, /obj/item/melee/sword, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)


/obj/item/clothing/suit/chickensuit
name = "chicken suit"
desc = "A suit made long ago by the ancient empire KFC."
icon_state = "chickensuit"
item_state = "chickensuit"
body_parts_covered = CHEST|ARMS|GROIN|LEGS|FEET
flags_inv = HIDESHOES|HIDEJUMPSUIT


/obj/item/clothing/suit/monkeysuit
name = "monkey suit"
desc = "A suit that looks like a primate."
icon_state = "monkeysuit"
item_state = "monkeysuit"
body_parts_covered = CHEST|ARMS|GROIN|LEGS|FEET|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT

/obj/item/clothing/suit/toggle/owlwings
name = "owl cloak"
desc = "A soft brown cloak made of synthetic feathers. Soft to the touch, stylish, and a 2 meter wing span that will drive the ladies mad."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
deathmessage = "collapses into a pile of bones, its gear clanging as it hits the ground!"
loot = list(/obj/effect/decal/remains/human,
/obj/item/clothing/suit/armor/witchhunter,
/obj/item/clothing/head/witchunter,
/obj/item/melee/sword/claymore{name = "holy sword"})

/mob/living/simple_animal/hostile/human/skeleton/ice
Expand Down
Binary file removed icons/mob/clothing/eyes.dmi
Binary file not shown.
Binary file removed icons/obj/clothing/glasses.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -678,8 +678,8 @@
#include "code\datums\elements\lazy_fishing_spot.dm"
#include "code\datums\elements\light_blocking.dm"
#include "code\datums\elements\mobappearance.dm"
#include "code\datums\elements\point_of_interest.dm"
#include "code\datums\elements\plant_backfire.dm"
#include "code\datums\elements\point_of_interest.dm"
#include "code\datums\elements\renamemob.dm"
#include "code\datums\elements\selfknockback.dm"
#include "code\datums\elements\snail_crawl.dm"
Expand Down

0 comments on commit 7a9598a

Please sign in to comment.