Skip to content

Commit

Permalink
further splitup (I want to cry)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tsar-Salat committed Apr 9, 2024
1 parent 1e8df45 commit 575b39d
Show file tree
Hide file tree
Showing 29 changed files with 362 additions and 352 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/bundle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
name = "pirate costume spawner"
items = list(
/obj/item/clothing/under/costume/pirate,
/obj/item/clothing/suit/pirate,
/obj/item/clothing/suit/costume/pirate,
/obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
/obj/item/clothing/glasses/eyepatch)

Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@

/obj/item/storage/backpack/satchel/flat/treasure/PopulateContents()
new /obj/item/dualsaber/toy(src)
new /obj/item/clothing/suit/pirate(src)
new /obj/item/clothing/suit/costume/pirate(src)
new /obj/item/clothing/head/pirate(src)
for(var/i in 1 to 3)
new /obj/item/coin/gold(src)
Expand Down Expand Up @@ -524,7 +524,7 @@
new /obj/item/stack/cable_coil/random(src)
new /obj/item/wirecutters(src)
new /obj/item/multitool(src)

/obj/item/storage/backpack/duffelbag/science
name = "science duffel bag"
desc = "A large duffel bag for holding extra tools and artifacts."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
for(var/i in 1 to 3)
new /obj/item/paper/fluff/jobs/security/court_judgment (src)
new /obj/item/pen (src)
new /obj/item/clothing/suit/judgerobe (src)
new /obj/item/clothing/suit/costume/judgerobe (src)
new /obj/item/clothing/head/powdered_wig (src)
new /obj/item/storage/briefcase(src)

Expand Down
3 changes: 3 additions & 0 deletions code/modules/antagonists/changeling/powers/mutations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@
/obj/item/clothing/suit/space/changeling
name = "flesh mass"
icon_state = "lingspacesuit"
icon = 'icons/obj/clothing/suits/costume.dmi'
worn_icon = 'icons/mob/clothing/suits/costume.dmi'
desc = "A huge, bulky mass of armored pressure and temperature-resistant organic tissue, evolved to facilitate space travel and protect from close range threats."
item_flags = DROPDEL
clothing_flags = STOPSPRESSUREDAMAGE | HEADINTERNALS //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
Expand All @@ -418,6 +420,7 @@
/obj/item/clothing/head/helmet/space/changeling
name = "flesh mass"
icon_state = "lingspacehelmet"
item_state = null
desc = "A covering of armored pressure and temperature-resistant organic tissue with a glass-like chitin front."
item_flags = DROPDEL
clothing_flags = STOPSPRESSUREDAMAGE
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/outfits/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@

uniform = /obj/item/clothing/under/costume/pirate
shoes = /obj/item/clothing/shoes/sneakers/brown
suit = /obj/item/clothing/suit/pirate
suit = /obj/item/clothing/suit/costume/pirate
head = /obj/item/clothing/head/bandana
glasses = /obj/item/clothing/glasses/eyepatch

Expand Down Expand Up @@ -364,7 +364,7 @@
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/headset_cent
glasses = /obj/item/clothing/glasses/thermal/eyepatch
suit = /obj/item/clothing/suit/pirate/captain
suit = /obj/item/clothing/suit/costume/pirate/captain
back = /obj/item/storage/backpack/satchel/leather
belt = /obj/item/gun/ballistic/revolver/mateba

Expand Down
7 changes: 5 additions & 2 deletions code/modules/clothing/suits/_suits.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
#define FOOTSTEP_COOLDOWN 3 //3 deci-seconds

/obj/item/clothing/suit
icon = 'icons/obj/clothing/suits.dmi'
name = "suit"
icon = 'icons/obj/clothing/suits/default.dmi'
var/fire_resist = T0C+100
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
allowed = list(
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman
)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, STAMINA = 0)
slot_flags = ITEM_SLOT_OCLOTHING
var/blood_overlay_type = "suit"
Expand Down
Loading

0 comments on commit 575b39d

Please sign in to comment.