cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-27 15:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8797 from Cerebulon/holloweeb

Browse Source 
Halloween Costumes
This commit is contained in:
Atermonera
2022-10-28 15:36:36 -08:00
committed by GitHub
parent 51a70ffa95 66391d200f
commit 540b5cf648
60 changed files with 794 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonist/outsider/raider.dm
+9 -9
View File
@@ -21,11 +21,11 @@ var/global/datum/antagonist/raider/raiders
// Heist overrides check_victory() and doesn't need victory or loss strings/tags.
var/list/raider_uniforms = list(
/obj/item/clothing/under/soviet,
/obj/item/clothing/under/pirate,
/obj/item/clothing/under/redcoat,
/obj/item/clothing/under/costume/soviet,
/obj/item/clothing/under/costume/pirate,
/obj/item/clothing/under/costume/redcoat,
/obj/item/clothing/under/serviceoveralls,
/obj/item/clothing/under/captain_fly,
/obj/item/clothing/under/costume/captain_fly,
/obj/item/clothing/under/det,
/obj/item/clothing/under/color/brown,
)
@@ -44,16 +44,16 @@ var/global/datum/antagonist/raider/raiders
)
var/list/raider_helmets = list(
/obj/item/clothing/head/bearpelt,
/obj/item/clothing/head/collectable/bearpelt,
/obj/item/clothing/head/ushanka,
/obj/item/clothing/head/pirate,
/obj/item/clothing/head/collectable/pirate,
/obj/item/clothing/head/bandana,
/obj/item/clothing/head/hgpiratecap,
/obj/item/clothing/head/collectable/hgpiratecap,
)
var/list/raider_suits = list(
/obj/item/clothing/suit/pirate,
/obj/item/clothing/suit/hgpirate,
/obj/item/clothing/suit/costume,
/obj/item/clothing/suit/costume/hgpirate,
/obj/item/clothing/suit/storage/toggle/bomber,
/obj/item/clothing/suit/storage/toggle/leather_jacket,
/obj/item/clothing/suit/storage/toggle/brown_jacket,
code/modules/awaymissions/corpse.dm
+1 -1
View File
@@ -184,7 +184,7 @@
corpseuniform = /obj/item/clothing/under/rank/clown
corpseshoes = /obj/item/clothing/shoes/clown_shoes
corpseradio = /obj/item/radio/headset
corpsemask = /obj/item/clothing/mask/gas/clown_hat
corpsemask = /obj/item/clothing/mask/gas/costume
corpsepocket1 = /obj/item/bikehorn
corpseback = /obj/item/storage/backpack/clown
corpseid = 1
code/modules/client/preference_setup/loadout/loadout_head.dm
+15 -6
View File
@@ -65,7 +65,6 @@
captype["soft cap, solgov"] = /obj/item/clothing/head/soft/solgov
captype["soft cap, white"] = /obj/item/clothing/head/soft/mime
captype["soft cap, yellow"] = /obj/item/clothing/head/soft/yellow
captype["station cap, blue"] = /obj/item/clothing/head/mailman
gear_tweaks += new/datum/gear_tweak/path(captype)
/datum/gear/head/sec_cap
@@ -169,7 +168,7 @@
/datum/gear/head/wig/philosopher
display_name = "wig, natural philosopher"
path = /obj/item/clothing/head/philosopher_wig
path = /obj/item/clothing/head/collectable/philosopher_wig
/datum/gear/head/wig
display_name = "wig, powdered"
@@ -365,10 +364,6 @@
display_name = "black and gold headdress"
path = /obj/item/clothing/head/blackngoldheaddress
/datum/gear/head/plaguedoctor2
display_name = "hat, golden plague doctor"
path = /obj/item/clothing/head/plaguedoctorhat/gold
/datum/gear/head/nonla
display_name = "non la"
path = /obj/item/clothing/head/nonla
@@ -397,3 +392,17 @@
var/obj/item/clothing/head/helmet/tank/cap_type = tankercap
tankercaps[initial(cap_type.name)] = cap_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(tankercaps))
/datum/gear/head/costumes
display_name = "costume hat selection"
description = "A selection of fancy-dress hats."
path = /obj/item/clothing/head/collectable
cost = 2
/datum/gear/head/costumes/New()
..()
var/list/costumes = list()
for(var/costume in typesof(/obj/item/clothing/head/collectable))
var/obj/item/clothing/head/collectable/costume_type = costume
costumes[initial(costume_type.name)] = costume_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))
code/modules/client/preference_setup/loadout/loadout_mask.dm
+13 -2
View File
@@ -31,8 +31,6 @@
var/masks = list()
masks["gas mask"] = /obj/item/clothing/mask/gas
masks["clear gas mask"] = /obj/item/clothing/mask/gas/clear
masks["plague doctor mask"] = /obj/item/clothing/mask/gas/plaguedoctor
masks["gold plague doctor mask"] = /obj/item/clothing/mask/gas/plaguedoctor/gold
gear_tweaks += new/datum/gear_tweak/path(masks)
/datum/gear/mask/cloth
@@ -48,3 +46,16 @@
display_name = "mask, dust"
path = /obj/item/clothing/mask/surgical/dust
cost = 2
/datum/gear/mask/costumes
display_name = "mask, costume selection"
description = "A selection of fancy-dress masks."
path = /obj/item/clothing/mask/costume
/datum/gear/mask/costumes/New()
..()
var/list/costumes = list()
for(var/costume in typesof(/obj/item/clothing/mask/costume, /obj/item/clothing/mask/gas/costume))
var/obj/item/clothing/mask/costume/costume_type = costume
costumes[initial(costume_type.name)] = costume_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))
code/modules/client/preference_setup/loadout/loadout_suit.dm
+13
View File
@@ -387,3 +387,16 @@
/datum/gear/suit/cardigan/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/costumes
display_name = "costume overclothing selection"
description = "A selection of fancy-dress costumes worn on the suit slot."
path = /obj/item/clothing/suit/costume
/datum/gear/suit/costumes/New()
..()
var/list/costumes = list()
for(var/costume in typesof(/obj/item/clothing/suit/costume))
var/obj/item/clothing/suit/costume/costume_type = costume
costumes[initial(costume_type.name)] = costume_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+13 -4
View File
@@ -39,10 +39,6 @@
display_name = "cropped sweater"
path = /obj/item/clothing/under/wednesday
/datum/gear/uniform/kilt
display_name = "kilt"
path = /obj/item/clothing/under/kilt
/datum/gear/uniform/cuttop
display_name = "cut top selection"
description = "Loose, low-cut shirts with matching shorts."
@@ -643,3 +639,16 @@
display_name = "jumpsuit, chaplain striped"
path = /obj/item/clothing/under/rank/chaplain/alt
allowed_roles = list("Chaplain")
/datum/gear/uniform/costumes
display_name = "costume clothing selection"
description = "A selection of fancy-dress costumes worn on the clothing slot."
path = /obj/item/clothing/under/costume
/datum/gear/uniform/costumes/New()
..()
var/list/costumes = list()
for(var/costume in typesof(/obj/item/clothing/under/costume))
var/obj/item/clothing/under/costume/costume_type = costume
costumes[initial(costume_type.name)] = costume_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))
code/modules/clothing/chameleon.dm
+1 -1
View File
@@ -119,7 +119,7 @@
/obj/item/clothing/suit/chameleon/Initialize()
. = ..()
if(!clothing_choices)
var/blocked = list(src.type, /obj/item/clothing/suit/cyborg_suit, /obj/item/clothing/suit/justice, /obj/item/clothing/suit/greatcoat)
var/blocked = list(src.type, /obj/item/clothing/suit/costume/cyborg_suit, /obj/item/clothing/suit/costume/justice, /obj/item/clothing/suit/greatcoat)
clothing_choices = generate_chameleon_choices(/obj/item/clothing/suit, blocked)
/obj/item/clothing/suit/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown.
code/modules/clothing/head/collectable.dm
+225 -17
View File
@@ -1,9 +1,10 @@
//Hat Station 13
//Non-functional-version or costume hats
/obj/item/clothing/head/collectable
name = "collectable hat"
desc = "A rare collectable hat."
name = "collectable chef's hat"
desc = "A rare Chef's Hat meant for hat collectors!"
icon_state = "chefhat"
/obj/item/clothing/head/collectable/petehat
name = "ultra rare hat"
@@ -15,23 +16,18 @@
)
/obj/item/clothing/head/collectable/slime
name = "collectable slime cap!"
name = "collectable slime cap"
desc = "It just latches right in place!"
icon_state = "headslime"
body_parts_covered = 0
/obj/item/clothing/head/collectable/xenom
name = "collectable xenomorph helmet!"
name = "collectable xenomorph helmet"
desc = "Hiss hiss hiss!"
icon_state = "xenom"
item_state_slots = list(slot_r_hand_str = "xenos_helm", slot_l_hand_str = "xenos_helm")
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/chef
name = "collectable chef's hat"
desc = "A rare Chef's Hat meant for hat collectors!"
icon_state = "chefhat"
/obj/item/clothing/head/collectable/paper
name = "collectable paper hat"
desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians."
@@ -81,13 +77,6 @@
desc = "A Collectible farmer's Flat Cap!"
icon_state = "flat_cap"
item_state_slots = list(slot_r_hand_str = "detective", slot_l_hand_str = "detective")
/obj/item/clothing/head/collectable/pirate
name = "collectable pirate hat"
desc = "You'd make a great Dread Syndie Roberts!"
icon_state = "pirate"
body_parts_covered = 0
/obj/item/clothing/head/collectable/kitty
name = "collectable kitty ears"
desc = "The fur feels.....a bit too realistic."
@@ -126,3 +115,222 @@
name = "collectable SWAT helmet"
desc = "Now you can be in the Deathsquad too!"
icon_state = "swat"
/obj/item/clothing/head/collectable/witch
name = "witch hat"
desc = "Which hat?"
icon_state = "dark_witch_hat"
/obj/item/clothing/head/collectable/snowman
name = "snowman head"
desc = "Keepin' it cool."
icon_state = "snowman_hat"
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/pharaoh
name = "pharaoh headdress"
desc = "The ancient hat with many Nemes."
icon_state = "pharaoh_hat"
/obj/item/clothing/head/collectable/jester
name = "jester hat"
desc = "You'll look like a fool."
icon_state = "jester_hat"
/obj/item/clothing/head/collectable/bee
name = "bee antennae"
desc = "According to all known laws of aviation, there is no way a bee should be able to fly. Its wings are too small to get its fat little body off the ground. The bee, of course, flies anyway because bees don't care what humans think is impossible..."
icon_state = "bee_hat"
/obj/item/clothing/head/collectable/roman
name = "collectable legionary helmet"
desc = "Are you worth your salt?"
icon_state = "roman_hat"
/obj/item/clothing/head/collectable/griffin
name = "griffin head"
desc = "For the eagle-eyed collector."
icon_state = "griffin"
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/bunnyhead
name = "bunny head"
desc = "All the world will be your enemy, Prince with a Thousand Enemies."
icon_state = "bunny_head"
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/scarecrow
name = "scarecrow costume hat"
desc = "Awarded to those who are outstanding in their field."
icon_state = "scarecrow_hat"
/obj/item/clothing/head/collectable/lobster
name = "lobster costume head"
desc = "There's no need to be shellfish."
icon_state = "lobster_hat"
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/ice_fairy
name = "collectable ice fairy bow"
desc = "Accent a really cool hair-do."
icon_state = "ice_fairy_bow"
/obj/item/clothing/head/collectable/witchwig
name = "witch costume wig"
desc = "Eeeee~heheheheheheh!"
icon_state = "witch"
flags_inv = BLOCKHAIR
siemens_coefficient = 2.0
/obj/item/clothing/head/collectable/chicken
name = "chicken suit head"
desc = "Bkaw!"
icon_state = "chickenhead"
flags_inv = BLOCKHAIR
siemens_coefficient = 0.7
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/bearpelt
name = "bear pelt hat"
desc = "Fuzzy."
icon_state = "bearpelt"
item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black")
flags_inv = BLOCKHAIR
siemens_coefficient = 0.7
/obj/item/clothing/head/collectable/xenos
name = "xenos helmet"
icon_state = "xenos"
item_state_slots = list(slot_r_hand_str = "xenos_helm", slot_l_hand_str = "xenos_helm")
desc = "A helmet made out of chitinous alien hide."
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
siemens_coefficient = 2.0
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/philosopher_wig
name = "natural philosopher's wig"
desc = "A stylish monstrosity unearthed from Earth's Renaissance period. With this most distinguish'd wig, you'll be ready for your next soiree!"
icon_state = "philosopher_wig"
item_state_slots = list(slot_r_hand_str = "pwig", slot_l_hand_str = "pwig")
flags_inv = BLOCKHAIR
siemens_coefficient = 2.0 //why is it so conductive?!
body_parts_covered = 0
/obj/item/clothing/head/collectable/marine
name = "marine helmet"
desc = "A marine helmet prop from the popular game 'Ruin'."
icon_state = "marine"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/pirate
name = "pirate hat"
desc = "Yarr."
icon_state = "pirate"
body_parts_covered = 0
/obj/item/clothing/head/collectable/hgpiratecap
name = "pirate captain hat"
desc = "Yarr."
icon_state = "hgpiratecap"
item_state_slots = list(slot_r_hand_str = "hoscap", slot_l_hand_str = "hoscap")
body_parts_covered = 0
/obj/item/clothing/head/collectable/syndicatefake
name = "red space-helmet replica"
item_state_slots = list(slot_r_hand_str = "syndicate-helm-black-red", slot_l_hand_str = "syndicate-helm-black-red")
icon_state = "syndicate"
desc = "A plastic replica of a bloodthirsty mercenary's space helmet, you'll look just like a real murderous criminal operative in this! This is a toy, it is not made for use in space!"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
siemens_coefficient = 2.0
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/cardborg
name = "cardborg helmet"
desc = "A helmet made out of a box."
icon_state = "cardborg_h"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
body_parts_covered = HEAD|FACE|EYES
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
/obj/item/clothing/head/collectable/hasturhood
name = "hastur's hood"
desc = "It's unspeakably stylish."
icon_state = "hasturhood"
item_state_slots = list(slot_r_hand_str = "enginering_beret", slot_l_hand_str = "enginering_beret")
flags_inv = BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/collectable/mailman
name = "stationmaster's cap"
icon_state = "mailman"
item_state_slots = list(slot_r_hand_str = "hopcap", slot_l_hand_str = "hopcap")
desc = "<i>Choo-choo</i>!"
body_parts_covered = 0
/obj/item/clothing/head/collectable/plaguedoctorhat
name = "plague doctor's hat"
desc = "These were once used by Plague doctors. They're pretty much useless."
icon_state = "plaguedoctor"
item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat")
permeability_coefficient = 0.01
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/collectable/plaguedoctorhat/gold
name = "golden plague doctor's hat"
desc = "These were once used by plague doctors, allegedly. This one has gold accents."
icon_state = "plaguedoctor2"
/obj/item/clothing/head/helmet/collectable/gladiator
name = "gladiator helmet"
desc = "Ave, Imperator, morituri te salutant."
icon_state = "gladiator"
item_state_slots = list(slot_r_hand_str = "vhelmet", slot_l_hand_str = "vhelmet")
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR
siemens_coefficient = 1
valid_accessory_slots = null
/obj/item/clothing/head/collectable/ranger
var/hatcolor = "white"
name = "white ranger helmet"
desc = "A special helmet designed for the Go Go ERT-Rangers, able to withstand a pressureless environment, filter gas and provide air. It has thermal vision and sometimes \
mesons to find breaches, as well as an integrated radio... well, only in the show, of course."
icon = 'icons/obj/clothing/ranger.dmi'
icon_state = "ranger_helmet"
light_overlay = "helmet_light"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
drop_sound = 'sound/items/drop/helm.ogg'
pickup_sound = 'sound/items/pickup/helm.ogg'
w_class = ITEMSIZE_NORMAL
/obj/item/clothing/head/collectable/ranger/Initialize()
. = ..()
if(icon_state == "ranger_helmet")
name = "[hatcolor] ranger helmet"
icon_state = "[hatcolor]_ranger_helmet"
/obj/item/clothing/head/collectable/ranger/black
name = "black ranger helmet"
hatcolor = "black"
/obj/item/clothing/head/collectable/ranger/pink
name = "pink ranger helmet"
hatcolor = "pink"
/obj/item/clothing/head/collectable/ranger/green
name = "green ranger helmet"
hatcolor = "green"
/obj/item/clothing/head/collectable/ranger/cyan
name = "cyan ranger helmet"
hatcolor = "cyan"
/obj/item/clothing/head/collectable/ranger/orange
name = "orange ranger helmet"
hatcolor = "orange"
/obj/item/clothing/head/collectable/ranger/yellow
name = "yellow ranger helmet"
hatcolor = "yellow"
code/modules/clothing/head/helmet.dm
-9
View File
@@ -201,15 +201,6 @@
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 1
/obj/item/clothing/head/helmet/gladiator
name = "gladiator helmet"
desc = "Ave, Imperator, morituri te salutant."
icon_state = "gladiator"
item_state_slots = list(slot_r_hand_str = "vhelmet", slot_l_hand_str = "vhelmet")
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|BLOCKHAIR
siemens_coefficient = 1
valid_accessory_slots = null
/obj/item/clothing/head/helmet/tactical
name = "tactical helmet"
desc = "An armored helmet capable of being fitted with a multitude of attachments."
code/modules/clothing/head/misc.dm
-153
View File
@@ -115,35 +115,6 @@
desc = "Stand and deliver!"
body_parts_covered = 0
/obj/item/clothing/head/mailman
name = "station cap"
icon_state = "mailman"
item_state_slots = list(slot_r_hand_str = "hopcap", slot_l_hand_str = "hopcap")
desc = "<i>Choo-choo</i>!"
body_parts_covered = 0
/obj/item/clothing/head/plaguedoctorhat
name = "plague doctor's hat"
desc = "These were once used by Plague doctors. They're pretty much useless."
icon_state = "plaguedoctor"
item_state_slots = list(slot_r_hand_str = "tophat", slot_l_hand_str = "tophat")
permeability_coefficient = 0.01
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/plaguedoctorhat/gold
name = "golden plague doctor's hat"
desc = "These were once used by plague doctors, allegedly. This one has gold accents."
icon_state = "plaguedoctor2"
/obj/item/clothing/head/hasturhood
name = "hastur's hood"
desc = "It's unspeakably stylish"
icon_state = "hasturhood"
item_state_slots = list(slot_r_hand_str = "enginering_beret", slot_l_hand_str = "enginering_beret")
flags_inv = BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/nursehat
name = "nurse's hat"
desc = "It allows quick identification of trained medical personnel."
@@ -151,38 +122,12 @@
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/syndicatefake
name = "red space-helmet replica"
item_state_slots = list(slot_r_hand_str = "syndicate-helm-black-red", slot_l_hand_str = "syndicate-helm-black-red")
icon_state = "syndicate"
desc = "A plastic replica of a bloodthirsty mercenary's space helmet, you'll look just like a real murderous criminal operative in this! This is a toy, it is not made for use in space!"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
siemens_coefficient = 2.0
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/cueball
name = "cueball helmet"
desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?"
icon_state = "cueball"
flags_inv = BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/greenbandana
name = "green bandana"
desc = "It's a green bandana with some fine nanotech lining."
icon_state = "greenbandana"
flags_inv = 0
body_parts_covered = 0
/obj/item/clothing/head/cardborg
name = "cardborg helmet"
desc = "A helmet made out of a box."
icon_state = "cardborg_h"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
body_parts_covered = HEAD|FACE|EYES
drop_sound = 'sound/items/drop/cardboardbox.ogg'
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
/obj/item/clothing/head/justice
name = "justice hat"
desc = "fight for what's righteous!"
@@ -220,19 +165,6 @@
addblends = "flat_capw_a"
item_state_slots = list(slot_r_hand_str = "greysoft", slot_l_hand_str = "greysoft")
/obj/item/clothing/head/pirate
name = "pirate hat"
desc = "Yarr."
icon_state = "pirate"
body_parts_covered = 0
/obj/item/clothing/head/hgpiratecap
name = "pirate hat"
desc = "Yarr."
icon_state = "hgpiratecap"
item_state_slots = list(slot_r_hand_str = "hoscap", slot_l_hand_str = "hoscap")
body_parts_covered = 0
/obj/item/clothing/head/bandana
name = "pirate bandana"
desc = "Yarr."
@@ -317,47 +249,6 @@
desc = "For the tiniest of cowboys."
icon_state = "cowboy_small"
/obj/item/clothing/head/witchwig
name = "witch costume wig"
desc = "Eeeee~heheheheheheh!"
icon_state = "witch"
flags_inv = BLOCKHAIR
siemens_coefficient = 2.0
/obj/item/clothing/head/chicken
name = "chicken suit head"
desc = "Bkaw!"
icon_state = "chickenhead"
flags_inv = BLOCKHAIR
siemens_coefficient = 0.7
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/bearpelt
name = "bear pelt hat"
desc = "Fuzzy."
icon_state = "bearpelt"
item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black")
flags_inv = BLOCKHAIR
siemens_coefficient = 0.7
/obj/item/clothing/head/xenos
name = "xenos helmet"
icon_state = "xenos"
item_state_slots = list(slot_r_hand_str = "xenos_helm", slot_l_hand_str = "xenos_helm")
desc = "A helmet made out of chitinous alien hide."
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
siemens_coefficient = 2.0
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/philosopher_wig
name = "natural philosopher's wig"
desc = "A stylish monstrosity unearthed from Earth's Renaissance period. With this most distinguish'd wig, you'll be ready for your next soiree!"
icon_state = "philosopher_wig"
item_state_slots = list(slot_r_hand_str = "pwig", slot_l_hand_str = "pwig")
flags_inv = BLOCKHAIR
siemens_coefficient = 2.0 //why is it so conductive?!
body_parts_covered = 0
/obj/item/clothing/head/orangebandana //themij: Taryn Kifer
name = "orange bandana"
desc = "An orange piece of cloth, worn on the head."
@@ -511,47 +402,3 @@
desc = "You... you're not actually going to wear that, right?"
icon_state = "fishskull"
flags_inv = HIDEEARS|BLOCKHAIR
/obj/item/clothing/head/marine
name = "marine helmet"
desc = "A marine helmet prop from the popular game 'Ruin'."
icon_state = "marine"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/ranger
var/hatcolor = "white"
name = "ranger helmet"
desc = "A special helmet designed for the Go Go ERT-Rangers, able to withstand a pressureless environment, filter gas and provide air. It has thermal vision and sometimes \
mesons to find breaches, as well as an integrated radio... well, only in the show, of course."
icon = 'icons/obj/clothing/ranger.dmi'
icon_state = "ranger_helmet"
light_overlay = "helmet_light"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
drop_sound = 'sound/items/drop/helm.ogg'
pickup_sound = 'sound/items/pickup/helm.ogg'
w_class = ITEMSIZE_NORMAL
/obj/item/clothing/head/ranger/Initialize()
. = ..()
if(icon_state == "ranger_helmet")
name = "[hatcolor] ranger helmet"
icon_state = "[hatcolor]_ranger_helmet"
/obj/item/clothing/head/ranger/black
hatcolor = "black"
/obj/item/clothing/head/ranger/pink
hatcolor = "pink"
/obj/item/clothing/head/ranger/green
hatcolor = "green"
/obj/item/clothing/head/ranger/cyan
hatcolor = "cyan"
/obj/item/clothing/head/ranger/orange
hatcolor = "orange"
/obj/item/clothing/head/ranger/yellow
hatcolor = "yellow"
code/modules/clothing/masks/gasmask.dm
+63 -62
View File
@@ -60,20 +60,6 @@
qdel(src)
..()
//Plague Dr suit can be found in clothing/suits/bio.dm
/obj/item/clothing/mask/gas/plaguedoctor
name = "plague doctor mask"
desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply."
icon_state = "plaguedoctor"
item_state_slots = list(slot_r_hand_str = "gas", slot_l_hand_str = "gas")
armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0)
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/gas/plaguedoctor/gold
name = "gold plague doctor mask"
desc = "A modern version of the age old classic, this mask is both capable of filtering air, and connecting to an air supply. This one is gold."
icon_state = "plaguedoctor2"
/obj/item/clothing/mask/gas/swat
name = "\improper SWAT mask"
desc = "A close-fitting tactical mask that can be connected to an air supply."
@@ -130,60 +116,12 @@
armor = list(melee = 10, bullet = 5, laser = 5,energy = 5, bomb = 0, bio = 50, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/mask/gas/clown_hat
name = "clown wig and mask"
desc = "A true prankster's facial attire. A clown is incomplete without their wig and mask."
icon_state = "clown"
item_state_slots = list(slot_r_hand_str = "clown_hat", slot_l_hand_str = "clown_hat")
/obj/item/clothing/mask/gas/sexyclown
name = "sexy-clown wig and mask"
desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
icon_state = "sexyclown"
item_state_slots = list(slot_r_hand_str = "clown_hat", slot_l_hand_str = "clown_hat")
/obj/item/clothing/mask/gas/mime
name = "mime mask"
desc = "The traditional mime's mask. It has an eerie facial posture."
icon_state = "mime"
item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime")
/obj/item/clothing/mask/gas/monkeymask
name = "monkey mask"
desc = "A mask used when acting as a monkey."
icon_state = "monkeymask"
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/gas/sexymime
name = "sexy mime mask"
desc = "A traditional female mime's mask."
icon_state = "sexymime"
item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime")
/obj/item/clothing/mask/gas/guy
name = "guy fawkes mask"
desc = "A mask stylised to depict Guy Fawkes."
icon_state = "guyfawkes"
flags_inv = HIDEEARS|HIDEFACE
item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime")
/obj/item/clothing/mask/gas/commando
name = "commando mask"
icon_state = "fullgas"
item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
siemens_coefficient = 0.2
/obj/item/clothing/mask/gas/cyborg
name = "cyborg visor"
desc = "Beep boop"
icon_state = "death"
/obj/item/clothing/mask/gas/owl_mask
name = "owl mask"
desc = "Twoooo!"
icon_state = "owl"
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/gas/vox
name = "alien respirator"
desc = "A respiratory filter designed for an alien facial structure. The filter intakes seem nasally fitted, and the mouth covering is articulated to allow the wearer to eat."
@@ -193,3 +131,66 @@
flags_inv = 0
species_restricted = list(SPECIES_VOX)
filtered_gases = list("phoron", "nitrous_oxide", "oxygen")
//Costume masks
/obj/item/clothing/mask/gas/costume
name = "clown wig and mask"
desc = "A true prankster's facial attire. A clown is incomplete without their wig and mask."
icon_state = "clown"
item_state_slots = list(slot_r_hand_str = "clown_hat", slot_l_hand_str = "clown_hat")
/obj/item/clothing/mask/gas/costume/plaguedoctor
name = "plague doctor mask"
desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply."
icon_state = "plaguedoctor"
item_state_slots = list(slot_r_hand_str = "gas", slot_l_hand_str = "gas")
armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0)
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/gas/costume/plaguedoctor/gold
name = "gold plague doctor mask"
desc = "A modern version of the age old classic, this mask is both capable of filtering air, and connecting to an air supply. This one is gold."
icon_state = "plaguedoctor2"
/obj/item/clothing/mask/gas/costume/sexyclown
name = "sexy-clown wig and mask"
desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
icon_state = "sexyclown"
item_state_slots = list(slot_r_hand_str = "clown_hat", slot_l_hand_str = "clown_hat")
/obj/item/clothing/mask/gas/costume/mime
name = "mime mask"
desc = "The traditional mime's mask. It has an eerie facial posture."
icon_state = "mime"
item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime")
/obj/item/clothing/mask/gas/costume/monkeymask
name = "monkey mask"
desc = "A mask used when acting as a monkey."
icon_state = "monkeymask"
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/gas/costume/sexymime
name = "sexy mime mask"
desc = "A traditional female mime's mask."
icon_state = "sexymime"
item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime")
/obj/item/clothing/mask/gas/costume/guy
name = "guy fawkes mask"
desc = "A mask stylised to depict Guy Fawkes."
icon_state = "guyfawkes"
flags_inv = HIDEEARS|HIDEFACE
item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime")
/obj/item/clothing/mask/gas/costume/cyborg
name = "cyborg visor"
desc = "Beep boop"
icon_state = "death"
/obj/item/clothing/mask/gas/costume/owl_mask
name = "owl mask"
desc = "Twoooo!"
icon_state = "owl"
body_parts_covered = HEAD|FACE|EYES
code/modules/clothing/masks/miscellaneous.dm
+29 -36
View File
@@ -117,16 +117,7 @@
gas_transfer_coefficient = 0.90
siemens_coefficient = 0
/obj/item/clothing/mask/pig
name = "pig mask"
desc = "A rubber pig mask."
icon_state = "pig"
flags_inv = HIDEFACE|BLOCKHAIR
w_class = ITEMSIZE_SMALL
siemens_coefficient = 0.9
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/shark
/obj/item/clothing/mask/costume
name = "shark mask"
desc = "A rubber shark mask."
icon_state = "shark"
@@ -135,41 +126,49 @@
siemens_coefficient = 0.9
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/dolphin
/obj/item/clothing/mask/costume/mummy
name = "mummy bandages"
desc = "Who's the father?"
icon_state = "mummy"
body_parts_covered = HEAD|FACE
item_flags = FLEXIBLEMATERIAL
flags_inv = HIDEFACE|BLOCKHAIR
siemens_coefficient = 0
/obj/item/clothing/mask/costume/pig
name = "pig mask"
desc = "A rubber pig mask."
icon_state = "pig"
flags_inv = HIDEFACE|BLOCKHAIR
/obj/item/clothing/mask/costume/dolphin
name = "dolphin mask"
desc = "A rubber dolphin mask."
icon_state = "dolphin"
flags_inv = HIDEFACE
w_class = ITEMSIZE_SMALL
siemens_coefficient = 0.9
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/goblin
/obj/item/clothing/mask/costume/goblin
name = "goblin mask"
desc = "A rubber goblin mask."
icon_state = "goblin"
flags_inv = HIDEFACE
w_class = ITEMSIZE_SMALL
siemens_coefficient = 0.9
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/demon
/obj/item/clothing/mask/costume/demon
name = "demon mask"
desc = "A rubber demon mask."
icon_state = "demon"
flags_inv = HIDEFACE
w_class = ITEMSIZE_SMALL
siemens_coefficient = 0.9
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/mask/horsehead
/obj/item/clothing/mask/costume/horsehead
name = "horse head mask"
desc = "A mask made of soft vinyl and latex, representing the head of a horse."
icon_state = "horsehead"
flags_inv = HIDEFACE|BLOCKHAIR
body_parts_covered = HEAD|FACE|EYES
w_class = ITEMSIZE_SMALL
siemens_coefficient = 0.9
/obj/item/clothing/mask/costume/horsehead/Initialize()
. = ..()
// The horse mask doesn't cause voice changes by default, the wizard spell changes the flag as necessary
say_messages = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
say_verbs = list("whinnies", "neighs", "says")
//None of the Nock masks have icons.
/obj/item/clothing/mask/nock_scarab
name = "nock mask (blue, scarab)"
@@ -199,12 +198,6 @@
w_class = ITEMSIZE_SMALL
body_parts_covered = HEAD|FACE
/obj/item/clothing/mask/horsehead/Initialize()
. = ..()
// The horse mask doesn't cause voice changes by default, the wizard spell changes the flag as necessary
say_messages = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
say_verbs = list("whinnies", "neighs", "says")
/obj/item/clothing/mask/ai
name = "camera MIU"
desc = "Allows for direct mental connection to accessible camera networks."
@@ -306,4 +299,4 @@
/obj/item/clothing/mask/surgical/dust
name = "dust mask"
desc = "A dust mask designed to protect the wearer against construction and/or custodial particulate."
icon_state = "dust"
icon_state = "dust"
code/modules/clothing/suits/miscellaneous.dm
+120 -59
View File
@@ -33,14 +33,30 @@
/*
* Costume
*/
/obj/item/clothing/suit/pirate
/obj/item/clothing/suit/costume
name = "pirate coat"
desc = "Yarr."
icon_state = "pirate"
item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat")
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/hgpirate
/obj/item/clothing/suit/costume/lobster
name = "lobster costume"
desc = "Pass the butter."
icon_state = "lobster"
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET|HEAD
/obj/item/clothing/suit/costume/chickensuit
name = "Chicken Suit"
desc = "Not a costume for cowards."
icon_state = "chickensuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET
flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
siemens_coefficient = 2.0
/obj/item/clothing/suit/costume/hgpirate
name = "pirate captain coat"
desc = "Yarr."
icon_state = "hgpirate"
@@ -48,28 +64,15 @@
flags_inv = HIDEJUMPSUIT
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
/obj/item/clothing/suit/cyborg_suit
/obj/item/clothing/suit/costume/cyborg_suit
name = "cyborg suit"
desc = "Suit for a cyborg costume."
icon_state = "death"
fire_resist = T0C+5200
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
/obj/item/clothing/suit/greatcoat
name = "great coat"
desc = "A heavy great coat"
icon_state = "gentlecoat"
item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat")
flags_inv = HIDEHOLSTER
/obj/item/clothing/suit/johnny_coat
name = "johnny~~ coat"
desc = "Johnny~~"
icon_state = "gentlecoat"
item_state_slots = list(slot_r_hand_str = "johnny_coat", slot_l_hand_str = "johnny_coat")
flags_inv = HIDEHOLSTER
/obj/item/clothing/suit/justice
/obj/item/clothing/suit/costume/justice
name = "justice suit"
desc = "This pretty much looks ridiculous."
icon_state = "gentle_coat"
@@ -77,21 +80,15 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
/obj/item/clothing/suit/judgerobe
/obj/item/clothing/suit/costume/judgerobe
name = "judge's robe"
desc = "This robe commands authority."
icon_state = "judge"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/spacecash)
flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
/obj/item/clothing/suit/storage/apron/overalls
name = "coveralls"
desc = "A set of denim overalls."
icon_state = "overalls"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/suit/syndicatefake
/obj/item/clothing/suit/costume/syndicatefake
name = "red space suit replica"
icon = 'icons/obj/clothing/spacesuits.dmi'
icon_state = "syndicate"
@@ -102,31 +99,16 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET
/obj/item/clothing/suit/hastur
name = "Hastur's Robes"
desc = "Robes not meant to be worn by man"
/obj/item/clothing/suit/costume/hastur
name = "Hastur's robes"
desc = "Robes once worn in Lost Carcosa."
icon_state = "hastur"
item_state_slots = list(slot_r_hand_str = "rad", slot_l_hand_str = "rad")
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
/obj/item/clothing/suit/imperium_monk
name = "Imperium monk"
desc = "Have YOU killed a xenos today?"
icon_state = "imperium_monk"
body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
/obj/item/clothing/suit/chickensuit
name = "Chicken Suit"
desc = "A suit made long ago by the ancient empire KFC."
icon_state = "chickensuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET
flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
siemens_coefficient = 2.0
/obj/item/clothing/suit/monkeysuit
name = "Monkey Suit"
/obj/item/clothing/suit/costume/monkeysuit
name = "monkey suit"
desc = "A suit that looks like a primate"
icon_state = "monkeysuit"
item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket")
@@ -134,22 +116,22 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
siemens_coefficient = 2.0
/obj/item/clothing/suit/holidaypriest
name = "Holiday Priest"
/obj/item/clothing/suit/costume/holidaypriest
name = "priestly vestments"
desc = "This is a nice holiday my son."
icon_state = "holidaypriest"
item_state_slots = list(slot_r_hand_str = "labcoat", slot_l_hand_str = "labcoat")
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
/obj/item/clothing/suit/cardborg
/obj/item/clothing/suit/costume/cardborg
name = "cardborg suit"
desc = "An ordinary cardboard box with holes cut in the sides."
icon_state = "cardborg"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
/obj/item/clothing/suit/skeleton
/obj/item/clothing/suit/costume/skeleton
name = "skeleton costume"
desc = "A body-tight costume with the human skeleton lined out on it."
icon_state = "skelecost"
@@ -157,7 +139,7 @@
flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDEGLOVES|HIDETIE|HIDEHOLSTER
item_state_slots = list(slot_r_hand_str = "judge", slot_l_hand_str = "judge")
/obj/item/clothing/suit/engicost
/obj/item/clothing/suit/costume/engicost
name = "sexy engineering voidsuit costume"
desc = "It's supposed to look like an engineering voidsuit... It doesn't look like it could protect from much radiation."
icon_state = "engicost"
@@ -165,7 +147,7 @@
flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDETIE|HIDEHOLSTER
item_state_slots = list(slot_r_hand_str = "eng_voidsuit", slot_l_hand_str = "eng_voidsuit")
/obj/item/clothing/suit/maxman
/obj/item/clothing/suit/costume/maxman
name = "doctor maxman costume"
desc = "A costume made to look like Dr. Maxman, the famous male-enhancement salesman. Complete with red do-rag and sleeveless labcoat."
icon_state = "maxman"
@@ -173,7 +155,7 @@
flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDETIE|HIDEHOLSTER
item_state_slots = list(slot_r_hand_str = "leather_jacket", slot_l_hand_str = "leather_jacket")
/obj/item/clothing/suit/iasexy
/obj/item/clothing/suit/costume/iasexy
name = "sexy internal affairs suit"
desc = "Now where's your pen?~"
icon_state = "iacost"
@@ -181,7 +163,7 @@
flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDETIE|HIDEHOLSTER
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
/obj/item/clothing/suit/sexyminer
/obj/item/clothing/suit/costume/sexyminer
name = "sexy miner costume"
desc = "For when you need to get your rocks off."
icon_state = "sexyminer"
@@ -189,7 +171,7 @@
flags_inv = HIDEJUMPSUIT|HIDESHOES|HIDETIE|HIDEHOLSTER
item_state_slots = list(slot_r_hand_str = "miner", slot_l_hand_str = "miner")
/obj/item/clothing/suit/sumo
/obj/item/clothing/suit/costume/sumo
name = "inflatable sumo wrestler costume"
desc = "An inflated sumo wrestler costume. It's quite hot."
icon_state = "sumo"
@@ -198,7 +180,7 @@
item_state_slots = list(slot_r_hand_str = "classicponcho", slot_l_hand_str = "classicponcho")
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
/obj/item/clothing/suit/hackercost
/obj/item/clothing/suit/costume/hackercoat
name = "classic hacker costume"
desc = "You would feel insanely cool wearing this."
icon_state = "hackercost"
@@ -206,7 +188,7 @@
flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
item_state_slots = list(slot_r_hand_str = "leather_coat", slot_l_hand_str = "leather_coat")
/obj/item/clothing/suit/lumber
/obj/item/clothing/suit/costume/lumber
name = "sexy lumberjack costume"
desc = "Smells of dusky pine. Includes chest hair and beard."
icon_state = "sexylumber"
@@ -214,7 +196,7 @@
flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
item_state_slots = list(slot_r_hand_str = "red_labcoat", slot_l_hand_str = "red_labcoat")
/obj/item/clothing/suit/marine
/obj/item/clothing/suit/costume/marine
name = "marine armor"
desc = "A set of marine prop armor from the popular game 'Ruin'."
icon_state = "marine"
@@ -222,9 +204,88 @@
flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat")
/obj/item/clothing/suit/costume/hotdog
name = "hot dog costume"
desc = "Frankly ridiculous."
icon_state = "hotdog"
item_state_slots = list(slot_r_hand_str = "hotdog", slot_l_hand_str = "hotdog")
body_parts_covered = UPPER_TORSO|LOWER_TORSO
flags_inv = HIDETIE|HIDEHOLSTER|HIDEEARS|BLOCKHEADHAIR
/obj/item/clothing/suit/costume/dog
name = "dog costume"
desc = "Strangely musky."
icon_state = "dog_costume"
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET|HEAD
/obj/item/clothing/suit/costume/bunny
name = "bunny costume"
desc = "Whenever they catch you, they will kill you. But first they must catch you."
icon_state = "bunnysuit"
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET|HEAD
/obj/item/clothing/suit/costume/snowman
name = "snowman costume"
desc = "Dressed for the ball."
icon_state = "snowman"
flags_inv = HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/suit/costume/bee
name = "bee costume"
desc = "According to all known laws of aviation, there is no way a bee should be able to fly. Its wings are too small to get its fat little body off the ground. The bee, of course, flies anyway because bees don't care what humans think is impossible..."
icon_state = "bee"
flags_inv = HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/suit/costume/roman
name = "roman legionary costume"
desc = "Replica ancient armour. Hit the road."
icon_state = "roman"
flags_inv = HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/suit/costume/pharaoh
name = "pharaonic costume"
desc = "The garments of ancient kings."
icon_state = "pharaoh"
flags_inv = HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/suit/costume/vampire
name = "vampire overcoat"
desc = "This costume kind of sucks."
icon_state = "vampire"
item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat")
flags_inv = HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
/obj/item/clothing/suit/costume/icefairy
name = "icy fairy wings"
desc = "They really move!"
icon_state = "ice_fairy_wings"
flags_inv = HIDETIE|HIDEHOLSTER
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
/*
* Misc
*/
/obj/item/clothing/suit/storage/apron/overalls
name = "coveralls"
desc = "A set of denim overalls."
icon_state = "overalls"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/suit/greatcoat
name = "great coat"
desc = "A heavy great coat"
icon_state = "gentlecoat"
item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat")
flags_inv = HIDEHOLSTER
/obj/item/clothing/suit/straight_jacket //A mispelling from time immemorial...
name = "straitjacket"
desc = "A suit that completely restrains the wearer."
code/modules/clothing/under/costume.dm
+160
View File
@@ -0,0 +1,160 @@
/obj/item/clothing/under/costume
name = "jester costume"
desc = "Jingle most merrily."
icon_state = "jester"
item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "green")
/obj/item/clothing/under/costume/mummy
name = "mummy bandages"
desc = "The wrappings of the ancient dead, or somebody who walked clean through a NanoMed."
icon_state = "mummy"
item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
/obj/item/clothing/under/costume/griffin
name = "griffin costume"
desc = "The iconic outfit of classic supervillain, The Griffin."
icon_state = "griffin"
item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown")
/obj/item/clothing/under/costume/scarecrow
name = "scarecrow's rags"
desc = "Ad hominem."
icon_state = "scarecrow"
item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown")
/obj/item/clothing/under/costume/ice_fairy
name = "ice fairy dress"
desc = "Aren't you cold in that?"
icon_state = "ice_fairy_dress"
item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
/obj/item/clothing/under/costume/witch
name = "witch dress"
desc = "They don't make these from canvas anymore."
icon_state = "dark_witch"
item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
//Repathed from old files
/obj/item/clothing/under/costume/rainbow
name = "rainbow jumpsuit"
desc = "A multi-colored jumpsuit."
icon_state = "rainbow"
/obj/item/clothing/under/costume/captain_fly
name = "rogue's uniform"
desc = "For the man who doesn't care because he's still free."
icon_state = "captain_fly"
item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
/obj/item/clothing/under/costume/pirate
name = "pirate outfit"
desc = "Yarr."
icon_state = "pirate"
item_state_slots = list(slot_r_hand_str = "sl_suit", slot_l_hand_str = "sl_suit")
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/under/costume/soviet
name = "soviet uniform"
desc = "For the Motherland!"
icon_state = "soviet"
item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey")
/obj/item/clothing/under/costume/redcoat
name = "redcoat uniform"
desc = "Looks old."
icon_state = "redcoat"
item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
/obj/item/clothing/under/costume/kilt
name = "kilt"
desc = "Includes shoes and sporran."
icon_state = "kilt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET
rolled_sleeves = 0
/obj/item/clothing/under/costume/gladiator
name = "gladiator uniform"
desc = "Are you not entertained? Is that not why you are here?"
icon_state = "gladiator"
item_state_slots = list(slot_r_hand_str = "yellow", slot_l_hand_str = "yellow")
body_parts_covered = LOWER_TORSO
/obj/item/clothing/under/costume/owl
name = "owl uniform"
desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
icon_state = "owl"
/obj/item/clothing/under/costume/schoolgirl
name = "schoolgirl uniform"
desc = "It's just like one of my Japanese animes!"
icon_state = "schoolgirl"
item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/costume/sexyclown
name = "sexy-clown suit"
desc = "It makes you look HONKable!"
icon_state = "sexyclown"
item_state_slots = list(slot_r_hand_str = "clown", slot_l_hand_str = "clown")
body_parts_covered = UPPER_TORSO|LOWER_TORSO
rolled_sleeves = -1 //Please never
/obj/item/clothing/under/costume/sexymime
name = "sexy mime outfit"
desc = "The only time when you DON'T enjoy looking at someone's rack."
icon_state = "sexymime"
item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime")
body_parts_covered = UPPER_TORSO|LOWER_TORSO
rolled_sleeves = -1 //Please never
/obj/item/clothing/under/costume/sexymaid
name = "sexy maid costume"
desc = "You must be a bit risque teasing all of them in a maid uniform!"
icon_state = "sexymaid"
index = 1
body_parts_covered = UPPER_TORSO|LOWER_TORSO
//Ranger uniforms
//On-mob sprites go in icons\mob\uniform.dmi with the format "white_ranger_uniform_s" - with 'white' replaced with green, cyan, etc... of course! Note the _s - this is not optional.
//Item sprites go in icons\obj\clothing\ranger.dmi with the format "white_ranger_uniform"
/obj/item/clothing/under/costume/ranger
var/unicolor = "white"
name = "white ranger uniform"
desc = "Made from a space-proof fibre and tight fitting, this uniform usually gives the agile Rangers all kinds of protection while not inhibiting their movement. \
This costume is instead made from genuine cotton fibre and is based on the season three uniform."
icon = 'icons/obj/clothing/ranger.dmi'
icon_state = "ranger_uniform"
rolled_sleeves = FALSE
/obj/item/clothing/under/costume/ranger/Initialize()
. = ..()
if(icon_state == "ranger_uniform") //allows for custom items
name = "[unicolor] ranger uniform"
icon_state = "[unicolor]_ranger_uniform"
/obj/item/clothing/under/costume/ranger/black
name = "black ranger uniform"
unicolor = "black"
/obj/item/clothing/under/costume/ranger/pink
name = "pink ranger uniform"
unicolor = "pink"
/obj/item/clothing/under/costume/ranger/green
name = "green ranger uniform"
unicolor = "green"
/obj/item/clothing/under/costume/ranger/cyan
name = "cyan ranger uniform"
unicolor = "cyan"
/obj/item/clothing/under/costume/ranger/orange
name = "orange ranger uniform"
unicolor = "orange"
/obj/item/clothing/under/costume/ranger/yellow
name = "yellow ranger uniform"
unicolor = "yellow"
//End of old costumes
code/modules/clothing/under/miscellaneous.dm
-114
View File
@@ -10,12 +10,6 @@
icon_state = "blue_pyjamas"
item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
/obj/item/clothing/under/captain_fly
name = "rogue's uniform"
desc = "For the man who doesn't care because he's still free."
icon_state = "captain_fly"
item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
/obj/item/clothing/under/sl_suit
desc = "It's a very amish looking suit."
name = "amish suit"
@@ -43,14 +37,6 @@
item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
rolled_sleeves = 0
/obj/item/clothing/under/sexyclown
name = "sexy-clown suit"
desc = "It makes you look HONKable!"
icon_state = "sexyclown"
item_state_slots = list(slot_r_hand_str = "clown", slot_l_hand_str = "clown")
body_parts_covered = UPPER_TORSO|LOWER_TORSO
rolled_sleeves = -1 //Please never
/obj/item/clothing/under/rank/vice
name = "vice officer's jumpsuit"
desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision."
@@ -123,21 +109,10 @@
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0
/obj/item/clothing/under/owl
name = "owl uniform"
desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
icon_state = "owl"
/obj/item/clothing/under/johnny
name = "johnny~~ jumpsuit"
desc = "Johnny~~"
icon_state = "johnny"
/obj/item/clothing/under/color/rainbow
name = "rainbow jumpsuit"
desc = "A multi-colored jumpsuit."
icon_state = "rainbow"
/obj/item/clothing/under/psysuit
name = "dark undersuit"
desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm."
@@ -220,13 +195,6 @@
desc = "A red suit and blue necktie. Somewhat formal."
icon_state = "red_suit_skirt"
/obj/item/clothing/under/schoolgirl
name = "schoolgirl uniform"
desc = "It's just like one of my Japanese animes!"
icon_state = "schoolgirl"
item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/overalls
name = "laborer's overalls"
desc = "A set of durable overalls for getting the job done."
@@ -238,47 +206,6 @@
desc = "A set of modern pleather reinforced overalls."
icon_state = "overalls_sleek"
/obj/item/clothing/under/pirate
name = "pirate outfit"
desc = "Yarr."
icon_state = "pirate"
item_state_slots = list(slot_r_hand_str = "sl_suit", slot_l_hand_str = "sl_suit")
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/under/soviet
name = "soviet uniform"
desc = "For the Motherland!"
icon_state = "soviet"
item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey")
/obj/item/clothing/under/redcoat
name = "redcoat uniform"
desc = "Looks old."
icon_state = "redcoat"
item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
/obj/item/clothing/under/kilt
name = "kilt"
desc = "Includes shoes and plaid"
icon_state = "kilt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET
rolled_sleeves = 0
/obj/item/clothing/under/sexymime
name = "sexy mime outfit"
desc = "The only time when you DON'T enjoy looking at someone's rack."
icon_state = "sexymime"
item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime")
body_parts_covered = UPPER_TORSO|LOWER_TORSO
rolled_sleeves = -1 //Please never
/obj/item/clothing/under/gladiator
name = "gladiator uniform"
desc = "Are you not entertained? Is that not why you are here?"
icon_state = "gladiator"
item_state_slots = list(slot_r_hand_str = "yellow", slot_l_hand_str = "yellow")
body_parts_covered = LOWER_TORSO
/obj/item/clothing/under/moderncoat
name = "modern wrapped coat"
desc = "The cutting edge of fashion."
@@ -355,11 +282,6 @@
desc = "A simple maid uniform for housekeeping."
icon_state = "janimaid"
/obj/item/clothing/under/dress/maid/sexy
name = "sexy maid costume"
desc = "You must be a bit risque teasing all of them in a maid uniform!"
icon_state = "sexymaid"
/obj/item/clothing/under/dress/dress_fire
name = "flame dress"
desc = "A small black dress with blue flames print on it."
@@ -1275,39 +1197,3 @@ Uniforms and such
name = "hazard cohesion suit"
desc = "An orange cohesion suit with yellow hazard stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
icon_state = "cohesionsuit_hazard"
//Ranger uniforms
//On-mob sprites go in icons\mob\uniform.dmi with the format "white_ranger_uniform_s" - with 'white' replaced with green, cyan, etc... of course! Note the _s - this is not optional.
//Item sprites go in icons\obj\clothing\ranger.dmi with the format "white_ranger_uniform"
/obj/item/clothing/under/ranger
var/unicolor = "white"
name = "ranger uniform"
desc = "Made from a space-proof fibre and tight fitting, this uniform usually gives the agile Rangers all kinds of protection while not inhibiting their movement. \
This costume is instead made from genuine cotton fibre and is based on the season three uniform."
icon = 'icons/obj/clothing/ranger.dmi'
icon_state = "ranger_uniform"
rolled_sleeves = FALSE
/obj/item/clothing/under/ranger/Initialize()
. = ..()
if(icon_state == "ranger_uniform") //allows for custom items
name = "[unicolor] ranger uniform"
icon_state = "[unicolor]_ranger_uniform"
/obj/item/clothing/under/ranger/black
unicolor = "black"
/obj/item/clothing/under/ranger/pink
unicolor = "pink"
/obj/item/clothing/under/ranger/green
unicolor = "green"
/obj/item/clothing/under/ranger/cyan
unicolor = "cyan"
/obj/item/clothing/under/ranger/orange
unicolor = "orange"
/obj/item/clothing/under/ranger/yellow
unicolor = "yellow"
code/modules/food/kitchen/cooking_machines/container.dm
+1 -1
View File
@@ -15,7 +15,7 @@
/obj/item/paper,
/obj/item/clothing/head/wizard,
/obj/item/clothing/head/cakehat,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/mask/gas/costume,
/obj/item/clothing/head/beret
)
code/modules/food/recipes_grill.dm
+2 -2
View File
@@ -74,7 +74,7 @@
appliance = GRILL
items = list(
/obj/item/reagent_containers/food/snacks/bun,
/obj/item/clothing/mask/gas/clown_hat
/obj/item/clothing/mask/gas/costume
)
result = /obj/item/reagent_containers/food/snacks/clownburger
@@ -325,4 +325,4 @@
/obj/item/reagent_containers/food/snacks/chickenkatsu,
/obj/item/reagent_containers/food/snacks/bun
)
result = /obj/item/reagent_containers/food/snacks/chickenfillet
result = /obj/item/reagent_containers/food/snacks/chickenfillet
code/modules/materials/materials/organic/cloth.dm
+2 -2
View File
@@ -19,7 +19,7 @@
new /datum/stack_recipe("foot wraps", /obj/item/clothing/shoes/footwraps, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("gloves", /obj/item/clothing/gloves/white, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("wig", /obj/item/clothing/head/powdered_wig, 4, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("philosopher's wig", /obj/item/clothing/head/philosopher_wig, 50, time = 2 MINUTES, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("philosopher's wig", /obj/item/clothing/head/collectable/philosopher_wig, 50, time = 2 MINUTES, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("taqiyah", /obj/item/clothing/head/taqiyah, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("turban", /obj/item/clothing/head/turban, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("hijab", /obj/item/clothing/head/hijab, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
@@ -118,4 +118,4 @@
ignition_point = T0C+232
melting_point = T0C+300
protectiveness = 1 // 4%
conductive = 0
conductive = 0
code/modules/materials/materials/organic/leather.dm
+2 -2
View File
@@ -19,7 +19,7 @@
new /datum/stack_recipe("foot wraps", /obj/item/clothing/shoes/footwraps, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("gloves", /obj/item/clothing/gloves/white, 2, time = 5 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("wig", /obj/item/clothing/head/powdered_wig, 4, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("philosopher's wig", /obj/item/clothing/head/philosopher_wig, 50, time = 2 MINUTES, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("philosopher's wig", /obj/item/clothing/head/collectable/philosopher_wig, 50, time = 2 MINUTES, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("taqiyah", /obj/item/clothing/head/taqiyah, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("turban", /obj/item/clothing/head/turban, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("hijab", /obj/item/clothing/head/hijab, 3, time = 6 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
@@ -34,4 +34,4 @@
new /datum/stack_recipe("[display_name] armor plate", /obj/item/material/armor_plating, 1, time = 20, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE),
new /datum/stack_recipe("empty sandbag", /obj/item/stack/emptysandbag, 2, time = 2 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]"),
new /datum/stack_recipe("whip", /obj/item/material/whip, 5, time = 15 SECONDS, pass_stack_color = TRUE, supplied_material = "[name]")
)
)
code/modules/materials/materials/plastic.dm
+3 -3
View File
@@ -62,8 +62,8 @@
new /datum/stack_recipe("light tubes box", /obj/item/storage/box/lights/tubes, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("mouse traps box", /obj/item/storage/box/mousetraps, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/costume/cardborg, 3, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/collectable/cardborg, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("pizza box", /obj/item/pizzabox, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe_list("folders",list(
new /datum/stack_recipe("blue folder", /obj/item/folder/blue, recycle_material = "[name]"),
@@ -85,4 +85,4 @@
hardness = 1
weight = 1
protectiveness = 0 // 0%
conductive = 0
conductive = 0
code/modules/mining/abandonedcrates.dm
+3 -3
View File
@@ -102,7 +102,7 @@
if(88)
new/obj/item/xenos_claw(src)
if(89)
new/obj/item/clothing/head/bearpelt(src)
new/obj/item/clothing/head/collectable/bearpelt(src)
if(90)
new/obj/item/organ/internal/heart(src)
if(91)
@@ -116,7 +116,7 @@
new/obj/item/clothing/under/rank/clown(src)
new/obj/item/clothing/shoes/clown_shoes(src)
new/obj/item/pda/clown(src)
new/obj/item/clothing/mask/gas/clown_hat(src)
new/obj/item/clothing/mask/gas/costume(src)
new/obj/item/bikehorn(src)
//new/obj/item/stamp/clown(src) I'd add it, but only clowns can use it
new/obj/item/pen/crayon/rainbow(src)
@@ -126,7 +126,7 @@
new/obj/item/clothing/shoes/black(src)
new/obj/item/pda/mime(src)
new/obj/item/clothing/gloves/white(src)
new/obj/item/clothing/mask/gas/mime(src)
new/obj/item/clothing/mask/gas/costume/mime(src)
new/obj/item/clothing/head/beret(src)
new/obj/item/clothing/suit/suspenders(src)
new/obj/item/pen/crayon/mime(src)
code/modules/mob/dead/corpse.dm
+7 -7
View File
@@ -134,7 +134,7 @@
corpseuniform = /obj/item/clothing/under/rank/clown
corpseshoes = /obj/item/clothing/shoes/clown_shoes
corpseradio = /obj/item/radio/headset
corpsemask = /obj/item/clothing/mask/gas/clown_hat
corpsemask = /obj/item/clothing/mask/gas/costume
corpsepocket1 = /obj/item/bikehorn
corpseback = /obj/item/storage/backpack/clown
corpseid = 1
@@ -145,7 +145,7 @@
/obj/effect/landmark/mobcorpse/pirate
name = "Pirate"
corpseuniform = /obj/item/clothing/under/pirate
corpseuniform = /obj/item/clothing/under/costume/pirate
corpseshoes = /obj/item/clothing/shoes/boots/jackboots
corpseglasses = /obj/item/clothing/glasses/eyepatch
corpsehelmet = /obj/item/clothing/head/bandana
@@ -154,16 +154,16 @@
/obj/effect/landmark/mobcorpse/pirate/ranged
name = "Pirate Gunner"
corpsesuit = /obj/item/clothing/suit/pirate
corpsehelmet = /obj/item/clothing/head/pirate
corpsesuit = /obj/item/clothing/suit/costume
corpsehelmet = /obj/item/clothing/head/collectable/pirate
/obj/effect/landmark/mobcorpse/russian
name = "Russian"
corpseuniform = /obj/item/clothing/under/soviet
corpseuniform = /obj/item/clothing/under/costume/soviet
corpseshoes = /obj/item/clothing/shoes/boots/jackboots
corpsehelmet = /obj/item/clothing/head/bearpelt
corpsehelmet = /obj/item/clothing/head/collectable/bearpelt
/obj/effect/landmark/mobcorpse/russian/ranged
corpsehelmet = /obj/item/clothing/head/ushanka
corpsehelmet = /obj/item/clothing/head/ushanka
code/modules/spells/spellbook.dm
+1 -1
View File
@@ -406,7 +406,7 @@
/obj/item/spellbook/oneuse/horsemask/recoil(mob/living/carbon/user as mob)
if(istype(user, /mob/living/carbon/human))
to_chat(user, "<font size='15' color='red'><b>HOR-SIE HAS RISEN</b></font>")
var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
var/obj/item/clothing/mask/costume/horsehead/magichead = new /obj/item/clothing/mask/costume/horsehead
magichead.canremove = 0 //curses!
magichead.flags_inv = null //so you can still see their face
magichead.voicechange = 1 //NEEEEIIGHH
code/modules/spells/targeted/equip/horsemask.dm
+3 -3
View File
@@ -19,7 +19,7 @@
/spell/targeted/equip_item/horsemask/New()
..()
equipped_summons = list("[slot_wear_mask]" = /obj/item/clothing/mask/horsehead)
equipped_summons = list("[slot_wear_mask]" = /obj/item/clothing/mask/costume/horsehead)
/spell/targeted/equip_item/horsemask/cast(list/targets, mob/user = usr)
..()
@@ -32,8 +32,8 @@
var/obj/item/new_item = new new_type
new_item.canremove = 0 //curses!
new_item.unacidable = 1
if(istype(new_item, /obj/item/clothing/mask/horsehead))
var/obj/item/clothing/mask/horsehead/magichead = new_item
if(istype(new_item, /obj/item/clothing/mask/costume/horsehead))
var/obj/item/clothing/mask/costume/horsehead/magichead = new_item
magichead.flags_inv = null //so you can still see their face
magichead.voicechange = 1 //NEEEEIIGHH
return new_item