mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
Fix some people spawing without prybars
Fixes centcom officers, clowns, and mimes spawning without emergency supply boxes by making them use the outfit system. Adds prybars to promethean emergency lunchboxes. Fixes #6154
This commit is contained in:
@@ -13,8 +13,13 @@
|
|||||||
|
|
||||||
flags = OUTFIT_HAS_BACKPACK
|
flags = OUTFIT_HAS_BACKPACK
|
||||||
|
|
||||||
/decl/hierarchy/outfit/job/equip_id(mob/living/carbon/human/H)
|
//VOREStation Edit START
|
||||||
|
/decl/hierarchy/outfit/job/equip_id(mob/living/carbon/human/H, rank, assignment)
|
||||||
var/obj/item/weapon/card/id/C = ..()
|
var/obj/item/weapon/card/id/C = ..()
|
||||||
|
var/datum/job/J = job_master.GetJob(rank)
|
||||||
|
if(J)
|
||||||
|
C.access = J.get_access()
|
||||||
|
//VOREStation Edit END - fixes outfit system not giving centcom officers access on their id
|
||||||
if(H.mind)
|
if(H.mind)
|
||||||
var/datum/mind/M = H.mind
|
var/datum/mind/M = H.mind
|
||||||
if(M.initial_account)
|
if(M.initial_account)
|
||||||
|
|||||||
34
code/datums/outfits/jobs/special_vr.dm
Normal file
34
code/datums/outfits/jobs/special_vr.dm
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
/decl/hierarchy/outfit/job/centcom_officer
|
||||||
|
name = OUTFIT_JOB_NAME("CentCom Officer")
|
||||||
|
uniform = /obj/item/clothing/under/rank/centcom
|
||||||
|
gloves = /obj/item/clothing/gloves/white
|
||||||
|
shoes = /obj/item/clothing/shoes/laceup
|
||||||
|
head = /obj/item/clothing/head/beret/centcom/officer
|
||||||
|
l_ear = /obj/item/device/radio/headset/centcom
|
||||||
|
glasses = /obj/item/clothing/glasses/omnihud/all
|
||||||
|
id_type = /obj/item/weapon/card/id/centcom
|
||||||
|
pda_type = /obj/item/device/pda/centcom
|
||||||
|
|
||||||
|
/decl/hierarchy/outfit/job/clown
|
||||||
|
name = OUTFIT_JOB_NAME("Clown")
|
||||||
|
uniform = /obj/item/clothing/under/rank/clown
|
||||||
|
back = /obj/item/weapon/storage/backpack/clown
|
||||||
|
shoes = /obj/item/clothing/shoes/clown_shoes
|
||||||
|
mask = /obj/item/clothing/mask/gas/clown_hat
|
||||||
|
backpack_contents = list(/obj/item/weapon/stamp/clown = 1, /obj/item/weapon/bikehorn = 1)
|
||||||
|
pda_type = /obj/item/device/pda/clown
|
||||||
|
flags = 0
|
||||||
|
|
||||||
|
/decl/hierarchy/outfit/job/mime
|
||||||
|
name = OUTFIT_JOB_NAME("Mime")
|
||||||
|
uniform = /obj/item/clothing/under/mime
|
||||||
|
shoes = /obj/item/clothing/shoes/mime
|
||||||
|
head = /obj/item/clothing/head/soft/mime
|
||||||
|
mask = /obj/item/clothing/mask/gas/mime
|
||||||
|
backpack_contents = list(/obj/item/weapon/pen/crayon/mime = 1)
|
||||||
|
pda_type = /obj/item/device/pda/mime
|
||||||
|
|
||||||
|
post_equip(var/mob/living/carbon/human/H)
|
||||||
|
..()
|
||||||
|
if(H.backbag == 1)
|
||||||
|
H.equip_to_slot_or_del(new /obj/item/weapon/pen/crayon/mime(H), slot_l_hand)
|
||||||
@@ -14,28 +14,11 @@
|
|||||||
economic_modifier = 20
|
economic_modifier = 20
|
||||||
whitelist_only = 1
|
whitelist_only = 1
|
||||||
latejoin_only = 1
|
latejoin_only = 1
|
||||||
|
outfit_type = /decl/hierarchy/outfit/job/centcom_officer
|
||||||
|
|
||||||
minimum_character_age = 25
|
minimum_character_age = 25
|
||||||
ideal_character_age = 40
|
ideal_character_age = 40
|
||||||
|
|
||||||
equip(var/mob/living/carbon/human/H)
|
|
||||||
if(!H) return 0
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(H), slot_l_ear)
|
|
||||||
switch(H.backbag)
|
|
||||||
if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
|
|
||||||
if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
|
|
||||||
if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom, slot_w_uniform)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/device/pda/centcom(H), slot_belt)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), slot_gloves)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom/officer(H), slot_head)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/glasses/omnihud/all(H), slot_l_store)
|
|
||||||
|
|
||||||
H.implant_loyalty()
|
|
||||||
|
|
||||||
return 1
|
|
||||||
|
|
||||||
get_access()
|
get_access()
|
||||||
return get_all_accesses().Copy()
|
return get_all_accesses().Copy()
|
||||||
|
|
||||||
@@ -97,23 +80,7 @@
|
|||||||
alt_titles = list("Comedian","Jester")
|
alt_titles = list("Comedian","Jester")
|
||||||
whitelist_only = 1
|
whitelist_only = 1
|
||||||
latejoin_only = 1
|
latejoin_only = 1
|
||||||
|
outfit_type = /decl/hierarchy/outfit/job/clown
|
||||||
equip(var/mob/living/carbon/human/H)
|
|
||||||
if(!H) return 0
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/clown(H), slot_back)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/device/pda/clown(H), slot_belt)
|
|
||||||
|
|
||||||
if(H.backbag > 0)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/weapon/stamp/clown(H.back), slot_in_backpack)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(H.back), slot_in_backpack) //VOREStation Edit
|
|
||||||
else
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/weapon/stamp/clown(H), slot_l_hand)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(H.back), slot_l_hand) //VOREStation Edit
|
|
||||||
|
|
||||||
return 1
|
|
||||||
|
|
||||||
/datum/job/clown/get_access()
|
/datum/job/clown/get_access()
|
||||||
if(config.assistant_maint)
|
if(config.assistant_maint)
|
||||||
@@ -137,22 +104,7 @@
|
|||||||
alt_titles = list("Performer","Interpretive Dancer")
|
alt_titles = list("Performer","Interpretive Dancer")
|
||||||
whitelist_only = 1
|
whitelist_only = 1
|
||||||
latejoin_only = 1
|
latejoin_only = 1
|
||||||
|
outfit_type = /decl/hierarchy/outfit/job/mime
|
||||||
equip(var/mob/living/carbon/human/H)
|
|
||||||
if(!H) return 0
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/under/mime(H), slot_w_uniform)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/mime(H), slot_shoes)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/head/soft/mime(H), slot_head)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/mime(H), slot_wear_mask)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/device/pda/mime(H), slot_belt)
|
|
||||||
|
|
||||||
if(H.backbag > 0)
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/weapon/pen/crayon/mime(H.back), slot_in_backpack)
|
|
||||||
else
|
|
||||||
H.equip_to_slot_or_del(new /obj/item/weapon/pen/crayon/mime(H), slot_l_hand)
|
|
||||||
|
|
||||||
return 1
|
|
||||||
|
|
||||||
/datum/job/mime/get_access()
|
/datum/job/mime/get_access()
|
||||||
if(config.assistant_maint)
|
if(config.assistant_maint)
|
||||||
|
|||||||
@@ -132,6 +132,7 @@ var/datum/species/shapeshifter/promethean/prometheans
|
|||||||
/obj/item/weapon/storage/toolbox/lunchbox/syndicate)) //Only pick the empty types
|
/obj/item/weapon/storage/toolbox/lunchbox/syndicate)) //Only pick the empty types
|
||||||
var/obj/item/weapon/storage/toolbox/lunchbox/L = new boxtype(get_turf(H))
|
var/obj/item/weapon/storage/toolbox/lunchbox/L = new boxtype(get_turf(H))
|
||||||
new /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar(L)
|
new /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar(L)
|
||||||
|
new /obj/item/weapon/tool/prybar/red(L) //VOREStation Add,
|
||||||
if(H.backbag == 1)
|
if(H.backbag == 1)
|
||||||
H.equip_to_slot_or_del(L, slot_r_hand)
|
H.equip_to_slot_or_del(L, slot_r_hand)
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -347,6 +347,7 @@
|
|||||||
#include "code\datums\outfits\jobs\misc.dm"
|
#include "code\datums\outfits\jobs\misc.dm"
|
||||||
#include "code\datums\outfits\jobs\science.dm"
|
#include "code\datums\outfits\jobs\science.dm"
|
||||||
#include "code\datums\outfits\jobs\security.dm"
|
#include "code\datums\outfits\jobs\security.dm"
|
||||||
|
#include "code\datums\outfits\jobs\special_vr.dm"
|
||||||
#include "code\datums\outfits\military\fleet.dm"
|
#include "code\datums\outfits\military\fleet.dm"
|
||||||
#include "code\datums\outfits\military\marines.dm"
|
#include "code\datums\outfits\military\marines.dm"
|
||||||
#include "code\datums\outfits\military\military.dm"
|
#include "code\datums\outfits\military\military.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user