cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improves Halloween costumes, tweaks the admin verb for equipping

Browse Source
This commit is contained in:
Anewbe
2017-10-20 16:01:09 -05:00
parent 12ae485e48
commit 3f2d996f7d
7 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/outfits/_defines.dm
View File

@@ -1,3 +1,7 @@
#define OUTFIT_HAS_JETPACK 1 #define OUTFIT_HAS_JETPACK 1
#define OUTFIT_HAS_BACKPACK 2 #define OUTFIT_HAS_BACKPACK 2
#define OUTFIT_EXTENDED_SURVIVAL 4 #define OUTFIT_EXTENDED_SURVIVAL 4
#define OUTFIT_JOB_NAME(job_name) ("Job - " + job_name)
#define OUTFIT_MILITARY(job_name) ("Military Uniform - " + job_name)
#define OUTFIT_COSTUME(job_name) ("Costume - " + job_name)

2
code/datums/outfits/costumes/costume.dm Normal file
View File

@@ -0,0 +1,2 @@
/decl/hierarchy/outfit/costume
undress = 0

56
code/datums/outfits/costumes/halloween.dm
View File

@@ -1,5 +1,5 @@
/decl/hierarchy/outfit/h_masked_killer /decl/hierarchy/outfit/costume/masked_killer
name = "Costume - Masked Killer" name = OUTFIT_COSTUME("Masked Killer")
uniform = /obj/item/clothing/under/overalls uniform = /obj/item/clothing/under/overalls
shoes = /obj/item/clothing/shoes/white shoes = /obj/item/clothing/shoes/white
gloves = /obj/item/clothing/gloves/sterile/latex gloves = /obj/item/clothing/gloves/sterile/latex
@@ -8,20 +8,20 @@
suit = /obj/item/clothing/suit/storage/apron suit = /obj/item/clothing/suit/storage/apron
r_hand = /obj/item/weapon/material/twohanded/fireaxe/foam r_hand = /obj/item/weapon/material/twohanded/fireaxe/foam
/decl/hierarchy/outfit/masked_killer/post_equip(var/mob/living/carbon/human/H) /decl/hierarchy/outfit/costume/masked_killer/post_equip(var/mob/living/carbon/human/H)
var/victim = get_mannequin(H.ckey) var/victim = get_mannequin(H.ckey)
for(var/obj/item/carried_item in H.get_equipped_items(TRUE)) for(var/obj/item/carried_item in H.get_equipped_items(TRUE))
carried_item.add_blood(victim) //Oh yes, there will be blood.. just not blood from the killer because that's odd. //If I knew how to make fake blood, I would carried_item.add_blood(victim) //Oh yes, there will be blood.. just not blood from the killer because that's odd. //If I knew how to make fake blood, I would
/decl/hierarchy/outfit/h_professional /decl/hierarchy/outfit/costume/professional
name = "Costume - Professional" name = OUTFIT_COSTUME("Professional")
uniform = /obj/item/clothing/under/suit_jacket{ starting_accessories=list(/obj/item/clothing/accessory/wcoat) } uniform = /obj/item/clothing/under/suit_jacket{ starting_accessories=list(/obj/item/clothing/accessory/wcoat) }
shoes = /obj/item/clothing/shoes/black shoes = /obj/item/clothing/shoes/black
gloves = /obj/item/clothing/gloves/black gloves = /obj/item/clothing/gloves/black
glasses = /obj/item/clothing/glasses/fakesunglasses glasses = /obj/item/clothing/glasses/fakesunglasses
l_pocket = /obj/item/toy/sword l_pocket = /obj/item/toy/sword
/decl/hierarchy/outfit/h_professional/post_equip(var/mob/living/carbon/human/H) /decl/hierarchy/outfit/costume/professional/post_equip(var/mob/living/carbon/human/H)
var/obj/item/weapon/storage/briefcase/new_briefcase = new(H) var/obj/item/weapon/storage/briefcase/new_briefcase = new(H)
for(var/obj/item/briefcase_item in new_briefcase) for(var/obj/item/briefcase_item in new_briefcase)
qdel(briefcase_item) qdel(briefcase_item)
@@ -30,9 +30,9 @@
new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat
H.equip_to_slot_or_del(new_briefcase, slot_l_hand) H.equip_to_slot_or_del(new_briefcase, slot_l_hand)
/decl/hierarchy/outfit/h_horrorcop /decl/hierarchy/outfit/costume/horrorcop
name = "Costume - Slasher Movie Cop" name = OUTFIT_COSTUME("Slasher Movie Cop")
uniform = /obj/item/clothing/under/pcrc{ starting_accessories=list(/obj/item/clothing/accessory/holster) } uniform = /obj/item/clothing/under/pcrc{ starting_accessories=list(/obj/item/clothing/accessory/holster/hip) }
shoes = /obj/item/clothing/shoes/black shoes = /obj/item/clothing/shoes/black
gloves = /obj/item/clothing/gloves/black gloves = /obj/item/clothing/gloves/black
glasses = /obj/item/clothing/glasses/fakesunglasses glasses = /obj/item/clothing/glasses/fakesunglasses
@@ -40,7 +40,7 @@
head = /obj/item/clothing/head/beret head = /obj/item/clothing/head/beret
r_hand = /obj/item/weapon/gun/projectile/revolver/capgun r_hand = /obj/item/weapon/gun/projectile/revolver/capgun
/decl/hierarchy/outfit/h_horrorcop/post_equip(var/mob/living/carbon/human/H) /decl/hierarchy/outfit/costume/horrorcop/post_equip(var/mob/living/carbon/human/H)
var/obj/item/clothing/under/U = H.w_uniform var/obj/item/clothing/under/U = H.w_uniform
if(U.accessories.len) if(U.accessories.len)
for(var/obj/item/clothing/accessory/A in U.accessories) for(var/obj/item/clothing/accessory/A in U.accessories)
@@ -48,16 +48,16 @@
var/obj/item/clothing/accessory/holster/O = A var/obj/item/clothing/accessory/holster/O = A
O.holster_verb() O.holster_verb()
/decl/hierarchy/outfit/h_cowboy /decl/hierarchy/outfit/costume/cowboy
name = "Costume - Cowboy" name = OUTFIT_COSTUME("Cowboy")
uniform = /obj/item/clothing/under/pants{ starting_accessories=list(/obj/item/clothing/accessory/holster) } uniform = /obj/item/clothing/under/pants{ starting_accessories=list(/obj/item/clothing/accessory/holster/hip) }
shoes = /obj/item/clothing/shoes/boots/cowboy shoes = /obj/item/clothing/shoes/boots/cowboy
head = /obj/item/clothing/head/cowboy_hat head = /obj/item/clothing/head/cowboy_hat
gloves = /obj/item/clothing/gloves/fingerless gloves = /obj/item/clothing/gloves/fingerless
suit = /obj/item/clothing/accessory/poncho suit = /obj/item/clothing/accessory/poncho
r_hand = /obj/item/weapon/gun/projectile/revolver/capgun r_hand = /obj/item/weapon/gun/projectile/revolver/capgun
/decl/hierarchy/outfit/h_cowboy/post_equip(var/mob/living/carbon/human/H) /decl/hierarchy/outfit/costume/cowboy/post_equip(var/mob/living/carbon/human/H)
var/obj/item/clothing/under/U = H.w_uniform var/obj/item/clothing/under/U = H.w_uniform
if(U.accessories.len) if(U.accessories.len)
for(var/obj/item/clothing/accessory/A in U.accessories) for(var/obj/item/clothing/accessory/A in U.accessories)
@@ -65,8 +65,8 @@
var/obj/item/clothing/accessory/holster/O = A var/obj/item/clothing/accessory/holster/O = A
O.holster_verb() O.holster_verb()
/decl/hierarchy/outfit/h_lumberjack /decl/hierarchy/outfit/costume/lumberjack
name = "Costume - Lumberjack" name = OUTFIT_COSTUME("Lumberjack")
uniform = /obj/item/clothing/under/pants{ starting_accessories=list(/obj/item/clothing/accessory/sweater/blackneck) } uniform = /obj/item/clothing/under/pants{ starting_accessories=list(/obj/item/clothing/accessory/sweater/blackneck) }
shoes = /obj/item/clothing/shoes/boots/workboots shoes = /obj/item/clothing/shoes/boots/workboots
head = /obj/item/clothing/head/beanie head = /obj/item/clothing/head/beanie
@@ -74,8 +74,8 @@
suit = /obj/item/clothing/suit/storage/flannel/red suit = /obj/item/clothing/suit/storage/flannel/red
r_hand = /obj/item/weapon/material/twohanded/fireaxe/foam r_hand = /obj/item/weapon/material/twohanded/fireaxe/foam
/decl/hierarchy/outfit/h_firefighter /decl/hierarchy/outfit/costume/firefighter
name = "Costume - Firefighter" name = OUTFIT_COSTUME("Firefighter")
uniform = /obj/item/clothing/under/pants uniform = /obj/item/clothing/under/pants
shoes = /obj/item/clothing/shoes/boots/workboots shoes = /obj/item/clothing/shoes/boots/workboots
head = /obj/item/clothing/head/hardhat/red head = /obj/item/clothing/head/hardhat/red
@@ -83,22 +83,22 @@
suit = /obj/item/clothing/suit/fire/firefighter suit = /obj/item/clothing/suit/fire/firefighter
mask = /obj/item/clothing/mask/gas mask = /obj/item/clothing/mask/gas
/decl/hierarchy/outfit/h_highlander /decl/hierarchy/outfit/costume/highlander
name = "Costume - Highlander" name = OUTFIT_COSTUME("Highlander")
uniform = /obj/item/clothing/under/kilt uniform = /obj/item/clothing/under/kilt
shoes = /obj/item/clothing/shoes/boots/jackboots shoes = /obj/item/clothing/shoes/boots/jackboots
head = /obj/item/clothing/head/beret head = /obj/item/clothing/head/beret
r_hand = /obj/item/weapon/material/sword/foam r_hand = /obj/item/weapon/material/sword/foam
/decl/hierarchy/outfit/h_vampire /decl/hierarchy/outfit/costume/vampire
name = "Costume - Vampire" name = OUTFIT_COSTUME("Vampire")
uniform = /obj/item/clothing/under/suit_jacket/really_black uniform = /obj/item/clothing/under/suit_jacket/really_black
shoes = /obj/item/clothing/shoes/dress shoes = /obj/item/clothing/shoes/dress
gloves = /obj/item/clothing/gloves/white gloves = /obj/item/clothing/gloves/white
r_hand = /obj/item/weapon/bedsheet/red r_hand = /obj/item/weapon/bedsheet/red
/decl/hierarchy/outfit/h_vampire_hunter /decl/hierarchy/outfit/costume/vampire_hunter
name = "Costume - Vampire Hunter" name = OUTFIT_COSTUME("Vampire Hunter")
uniform = /obj/item/clothing/under/pants/tan uniform = /obj/item/clothing/under/pants/tan
suit = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless suit = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
shoes = /obj/item/clothing/shoes/boots/jackboots shoes = /obj/item/clothing/shoes/boots/jackboots
@@ -106,16 +106,16 @@
l_pocket = /obj/item/toy/crossbow l_pocket = /obj/item/toy/crossbow
r_pocket = /obj/item/device/flashlight/color/red r_pocket = /obj/item/device/flashlight/color/red
/decl/hierarchy/outfit/h_pirate /decl/hierarchy/outfit/costume/pirate
name = "Costume - Pirate" name = OUTFIT_COSTUME("Pirate")
uniform = /obj/item/clothing/under/pirate uniform = /obj/item/clothing/under/pirate
shoes = /obj/item/clothing/shoes/brown shoes = /obj/item/clothing/shoes/brown
head = /obj/item/clothing/head/pirate head = /obj/item/clothing/head/pirate
suit = /obj/item/clothing/suit/pirate suit = /obj/item/clothing/suit/pirate
glasses = /obj/item/clothing/glasses/eyepatch glasses = /obj/item/clothing/glasses/eyepatch
/decl/hierarchy/outfit/h_whiteout /decl/hierarchy/outfit/costume/whiteout
name = "Costume - Snow Ghost" name = OUTFIT_COSTUME("Snow Ghost")
uniform = /obj/item/clothing/under/color/white{ starting_accessories=list(/obj/item/clothing/accessory/scarf/white) } uniform = /obj/item/clothing/under/color/white{ starting_accessories=list(/obj/item/clothing/accessory/scarf/white) }
shoes = /obj/item/clothing/shoes/white shoes = /obj/item/clothing/shoes/white
suit = /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout suit = /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout

2
code/datums/outfits/jobs/_defines.dm
View File

@@ -1,2 +0,0 @@
#define OUTFIT_JOB_NAME(job_name) ("Job - " + job_name)
#define OUTFIT_MILITARY(job_name) ("Military Uniform - " + job_name)

2
code/datums/outfits/outfit.dm
View File

@@ -57,6 +57,8 @@ var/list/outfits_decls_by_type_
var/flags // Specific flags var/flags // Specific flags
var/undress = 1 //Does the outfit undress the mob upon equp?
/decl/hierarchy/outfit/New() /decl/hierarchy/outfit/New()
..() ..()

4
code/modules/admin/verbs/debug.dm
View File

@@ -408,10 +408,10 @@
feedback_add_details("admin_verb","SEQ") feedback_add_details("admin_verb","SEQ")
dressup_human(H, outfit, 1) dressup_human(H, outfit, 1)
/proc/dressup_human(var/mob/living/carbon/human/H, var/decl/hierarchy/outfit/outfit, var/undress = 1) /proc/dressup_human(var/mob/living/carbon/human/H, var/decl/hierarchy/outfit/outfit)
if(!H || !outfit) if(!H || !outfit)
return return
if(undress) if(outfit.undress)
H.delete_inventory() H.delete_inventory()
outfit.equip(H) outfit.equip(H)
log_and_message_admins("changed the equipment of [key_name(H)] to [outfit.name].") log_and_message_admins("changed the equipment of [key_name(H)] to [outfit.name].")

2
polaris.dme
View File

@@ -234,8 +234,8 @@
#include "code\datums\outfits\spec_op.dm" #include "code\datums\outfits\spec_op.dm"
#include "code\datums\outfits\tournament.dm" #include "code\datums\outfits\tournament.dm"
#include "code\datums\outfits\wizardry.dm" #include "code\datums\outfits\wizardry.dm"
#include "code\datums\outfits\costumes\costume.dm"
#include "code\datums\outfits\costumes\halloween.dm" #include "code\datums\outfits\costumes\halloween.dm"
#include "code\datums\outfits\jobs\_defines.dm"
#include "code\datums\outfits\jobs\cargo.dm" #include "code\datums\outfits\jobs\cargo.dm"
#include "code\datums\outfits\jobs\civilian.dm" #include "code\datums\outfits\jobs\civilian.dm"
#include "code\datums\outfits\jobs\command.dm" #include "code\datums\outfits\jobs\command.dm"