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

Makes it so that holsters can be hidden by suit-slot items.

Browse Source 
I have yet to actually make any suit-slot items hide holsters.
This commit is contained in:
MagmaRam
2016-11-09 23:23:19 -06:00
parent b0193fad78
commit b418d57dd6
10 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__defines/items_clothing.dm
View File

@@ -52,6 +52,8 @@
#define HIDEJUMPSUIT 0x4
#define HIDESHOES 0x8
#define HIDETAIL 0x10
#define HIDETIE 0x20
#define HIDEHOLSTER 0x40 //Some clothing hides holsters, but not all accessories
// WARNING: The following flags apply only to the helmets and masks!
#define HIDEMASK 0x1

6
code/datums/supplypacks/security.dm
View File

@@ -147,8 +147,8 @@
contains = list(
/obj/item/clothing/accessory/holster,
/obj/item/clothing/accessory/holster/armpit,
/obj/item/clothing/accessory/holster/waist,
/obj/item/clothing/accessory/holster/hip
/obj/item/clothing/accessory/holster/visible/waist,
/obj/item/clothing/accessory/holster/visible/hip
)
cost = 15
containertype = "/obj/structure/closet/crate/secure"
@@ -288,7 +288,7 @@
/obj/item/device/flash,
/obj/item/device/hailer,
/obj/item/clothing/accessory/badge/holo/hos,
/obj/item/clothing/accessory/holster/waist,
/obj/item/clothing/accessory/holster/visible/waist,
/obj/item/weapon/melee/telebaton,
/obj/item/weapon/shield/riot/tele,
/obj/item/clothing/head/beret/sec/corporate/hos,

4
code/game/antagonist/outsider/raider.dm
View File

@@ -100,8 +100,8 @@ var/datum/antagonist/raider/raiders
var/list/raider_holster = list(
/obj/item/clothing/accessory/holster/armpit,
/obj/item/clothing/accessory/holster/waist,
/obj/item/clothing/accessory/holster/hip
/obj/item/clothing/accessory/holster/visible/waist,
/obj/item/clothing/accessory/holster/visible/hip
)
/datum/antagonist/raider/New()

2
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -122,7 +122,7 @@
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/cell/device/weapon(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/clothing/accessory/holster/visible/waist(src)
new /obj/item/weapon/melee/telebaton(src)
new /obj/item/clothing/head/beret/sec/corporate/hos(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)

6
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -50,9 +50,9 @@
new /obj/item/clothing/accessory/armband(src)
new /obj/item/clothing/accessory/armband(src)
new /obj/item/clothing/accessory/armband(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/clothing/accessory/holster/waist(src)
new /obj/item/clothing/accessory/holster/visible/waist(src)
new /obj/item/clothing/accessory/holster/visible/waist(src)
new /obj/item/clothing/accessory/holster/visible/waist(src)
return

6
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -112,15 +112,15 @@
/datum/gear/accessory/holster/hip
display_name = "holster, hip"
path = /obj/item/clothing/accessory/holster/hip
path = /obj/item/clothing/accessory/holster/visible/hip
/datum/gear/accessory/holster/leg
display_name = "holster, leg"
path = /obj/item/clothing/accessory/holster/leg
path = /obj/item/clothing/accessory/holster/visible/leg
/datum/gear/accessory/holster/waist
display_name = "holster, waist"
path = /obj/item/clothing/accessory/holster/waist
path = /obj/item/clothing/accessory/holster/visible/waist
/datum/gear/accessory/tie
display_name = "tie, black"

1
code/modules/clothing/under/accessories/accessory.dm
View File

@@ -11,6 +11,7 @@
var/image/inv_overlay = null //overlay used when attached to clothing.
var/image/mob_overlay = null
var/overlay_state = null
var/concealed_holster = 0
sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/ties.dmi') //Teshari can into webbing, too!

10
code/modules/clothing/under/accessories/holster.dm
View File

@@ -3,6 +3,7 @@
desc = "A handgun holster."
icon_state = "holster"
slot = "utility"
concealed_holster = 1
var/obj/item/holstered = null
/obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user)
@@ -115,18 +116,21 @@
desc = "A worn-out handgun holster. Perfect for concealed carry"
icon_state = "holster"
/obj/item/clothing/accessory/holster/waist
/obj/item/clothing/accessory/holster/visible
concealed_holster = 0
/obj/item/clothing/accessory/holster/visible/waist
name = "waist holster"
desc = "A handgun holster. Made of expensive leather."
icon_state = "holster"
overlay_state = "holster_low"
/obj/item/clothing/accessory/holster/hip
/obj/item/clothing/accessory/holster/visible/hip
name = "hip holster"
desc = "A handgun holster slung low on the hip, draw pardner!"
icon_state = "holster_hip"
/obj/item/clothing/accessory/holster/leg
/obj/item/clothing/accessory/holster/visible/leg
name = "leg holster"
desc = "A tacticool handgun holster. Worn on the upper leg."
icon_state = "holster_hip"

19
code/modules/mob/living/carbon/human/examine.dm
View File

@@ -4,6 +4,8 @@
var/skipjumpsuit = 0
var/skipshoes = 0
var/skipmask = 0
var/skiptie = 0
var/skipholster = 0
var/skipears = 0
var/skipeyes = 0
@@ -25,6 +27,13 @@
skiplegs |= 1
skipchest |= 1
skipgroin |= 1
skiptie |= 1
skipholster |= 1
else if(wear_suit.flags_inv & HIDETIE)
skiptie |= 1
skipholster |= 1
else if(wear_suit.flags_inv & HIDEHOLSTER)
skipholster |= 1
if(wear_suit.flags_inv & HIDESHOES)
skipshoes |= 1
skipfeet |= 1
@@ -105,10 +114,16 @@
if(w_uniform && !skipjumpsuit)
//Ties
var/tie_msg
if(istype(w_uniform,/obj/item/clothing/under))
if(istype(w_uniform,/obj/item/clothing/under) && !skiptie)
var/obj/item/clothing/under/U = w_uniform
if(U.accessories.len)
tie_msg += ". Attached to it is [lowertext(english_list(U.accessories))]"
if(skipholster)
var/list/accessories_visible
for(var/obj/item/clothing/accessory/A in U.accessories)
if((A.concealed_holster == 0))
accessories_visible.Add(A)
tie_msg += ". Attached to it is [lowertext(english_list(accessories_visible))]"
else tie_msg += ". Attached to it is [lowertext(english_list(U.accessories))]"
if(w_uniform.blood_DNA)
msg += "<span class='warning'>[T.He] [T.is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained [w_uniform.name][tie_msg]!</span>\n"