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

Ported coats pockets

Browse Source
This commit is contained in:
Chinsky
2013-01-04 05:31:14 +04:00
parent 6e408cc8ca
commit 24a02f90b9
31 changed files with 102 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -594,7 +594,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M.equip_to_slot_or_del(new /obj/item/clothing/under/det(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/det_suit(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(M), slot_head)

4
code/modules/awaymissions/corpse.dm
View File

@@ -124,7 +124,7 @@
name = "Doctor"
corpseradio = /obj/item/device/radio/headset/headset_med
corpseuniform = /obj/item/clothing/under/rank/medical
corpsesuit = /obj/item/clothing/suit/labcoat
corpsesuit = /obj/item/clothing/suit/storage/labcoat
corpseback = /obj/item/weapon/storage/backpack/medic
corpsepocket1 = /obj/item/device/flashlight/pen
corpseshoes = /obj/item/clothing/shoes/black
@@ -166,7 +166,7 @@
name = "Scientist"
corpseradio = /obj/item/device/radio/headset/headset_sci
corpseuniform = /obj/item/clothing/under/rank/scientist
corpsesuit = /obj/item/clothing/suit/labcoat/science
corpsesuit = /obj/item/clothing/suit/storage/labcoat/science
corpseback = /obj/item/weapon/storage/backpack
corpseshoes = /obj/item/clothing/shoes/white
corpseid = 1

2
code/modules/clothing/suits/detective.dm
View File

@@ -16,7 +16,7 @@
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/det_suit/armor
/obj/item/clothing/suit/storage/det_suit/armor
name = "detective's armor"
desc = "An armored vest with a detective's badge on it."
icon_state = "detective-armor"

14
code/modules/clothing/suits/jobs.dm
View File

@@ -59,7 +59,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO
//Detective
/obj/item/clothing/suit/det_suit
/obj/item/clothing/suit/storage/det_suit
name = "coat"
desc = "An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business."
icon_state = "detective"
@@ -70,7 +70,7 @@
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
//Forensics
/obj/item/clothing/suit/forensics
/obj/item/clothing/suit/storage/forensics
name = "jacket"
desc = "A forensics technician jacket."
item_state = "det_suit"
@@ -78,18 +78,18 @@
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/cigpacket,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/forensics/red
/obj/item/clothing/suit/storage/forensics/red
name = "red jacket"
desc = "A red forensics technician jacket."
icon_state = "forensics_red"
/obj/item/clothing/suit/forensics/blue
/obj/item/clothing/suit/storage/forensics/blue
name = "blue jacket"
desc = "A blue forensics technician jacket."
icon_state = "forensics_blue"
//Engineering
/obj/item/clothing/suit/hazardvest
/obj/item/clothing/suit/storage/hazardvest
name = "hazard vest"
desc = "A high-visibility vest used in work zones."
icon_state = "hazard"
@@ -97,7 +97,7 @@
blood_overlay_type = "armor"
//Lawyer
/obj/item/clothing/suit/lawyer/bluejacket
/obj/item/clothing/suit/storage/lawyer/bluejacket
name = "Blue Suit Jacket"
desc = "A snappy dress jacket."
icon_state = "suitjacket_blue_open"
@@ -105,7 +105,7 @@
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/lawyer/purpjacket
/obj/item/clothing/suit/storage/lawyer/purpjacket
name = "Purple Suit Jacket"
desc = "A snappy dress jacket."
icon_state = "suitjacket_purp"

14
code/modules/clothing/suits/labcoat.dm
View File

@@ -1,4 +1,4 @@
/obj/item/clothing/suit/labcoat
/obj/item/clothing/suit/storage/labcoat
name = "labcoat"
desc = "A suit that protects against minor chemical spills."
icon_state = "labcoat_open"
@@ -64,34 +64,34 @@
return
usr.update_inv_wear_suit() //so our overlays update
/obj/item/clothing/suit/labcoat/cmo
/obj/item/clothing/suit/storage/labcoat/cmo
name = "chief medical officer's labcoat"
desc = "Bluer than the standard model."
icon_state = "labcoat_cmo_open"
item_state = "labcoat_cmo"
/obj/item/clothing/suit/labcoat/mad
/obj/item/clothing/suit/storage/labcoat/mad
name = "The Mad's labcoat"
desc = "It makes you look capable of konking someone on the noggin and shooting them into space."
icon_state = "labgreen_open"
item_state = "labgreen"
/obj/item/clothing/suit/labcoat/genetics
/obj/item/clothing/suit/storage/labcoat/genetics
name = "Geneticist Labcoat"
desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder."
icon_state = "labcoat_gen_open"
/obj/item/clothing/suit/labcoat/chemist
/obj/item/clothing/suit/storage/labcoat/chemist
name = "Chemist Labcoat"
desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
icon_state = "labcoat_chem_open"
/obj/item/clothing/suit/labcoat/virologist
/obj/item/clothing/suit/storage/labcoat/virologist
name = "Virologist Labcoat"
desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
icon_state = "labcoat_vir_open"
/obj/item/clothing/suit/labcoat/science
/obj/item/clothing/suit/storage/labcoat/science
name = "Scientist Labcoat"
desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
icon_state = "labcoat_tox_open"

4
code/modules/clothing/uniforms/lawyer.dm
View File

@@ -33,7 +33,7 @@
item_state = "bluesuit"
color = "bluesuit"
/obj/item/clothing/suit/lawyer/bluejacket
/obj/item/clothing/suit/storage/lawyer/bluejacket
name = "blue suit jacket"
desc = "A snappy dress jacket."
icon_state = "suitjacket_blue_open"
@@ -47,7 +47,7 @@
item_state = "lawyer_purp"
color = "lawyer_purp"
/obj/item/clothing/suit/lawyer/purpjacket
/obj/item/clothing/suit/storage/lawyer/purpjacket
name = "purple suit jacket"
desc = "A snappy dress jacket."
icon_state = "suitjacket_purp"

14
code/modules/customitems/item_defines.dm
View File

@@ -455,13 +455,13 @@ hi
//////////// Suits ////////////
/obj/item/clothing/suit/labcoat/fluff/pink //spaceman96: Trenna Seber
/obj/item/clothing/suit/storage/labcoat/fluff/pink //spaceman96: Trenna Seber
name = "pink labcoat"
desc = "A suit that protects against minor chemical spills. Has a pink stripe down from the shoulders."
icon = 'custom_items.dmi'
icon_state = "labcoat_pink_open"
/obj/item/clothing/suit/det_suit/fluff/graycoat //vinceluk: Seth Sealis
/obj/item/clothing/suit/storage/det_suit/fluff/graycoat //vinceluk: Seth Sealis
name = "gray coat"
desc = "Old, worn out coat. It's seen better days."
icon = 'custom_items.dmi'
@@ -469,7 +469,7 @@ hi
item_state = "graycoat"
color = "graycoat"
/obj/item/clothing/suit/det_suit/fluff/leatherjack //atomicdog92: Seth Sealis
/obj/item/clothing/suit/storage/det_suit/fluff/leatherjack //atomicdog92: Seth Sealis
name = "leather jacket"
desc = "A black leather coat, popular amongst punks, greasers, and other galactic scum."
icon = 'custom_items.dmi'
@@ -477,7 +477,7 @@ hi
item_state = "leatherjack"
color = "leatherjack"
/obj/item/clothing/suit/labcoat/fluff/burnt //Jamini: Edwin Atweeke
/obj/item/clothing/suit/storage/labcoat/fluff/burnt //Jamini: Edwin Atweeke
name = "burnt labcoat"
desc = "This lab coat has clearly seen better, less burnt, days."
icon = 'custom_items.dmi'
@@ -643,7 +643,7 @@ hi
//////////// Sets ////////////
/*
/obj/item/clothing/suit/labcoat/fluff/cdc_labcoat
/obj/item/clothing/suit/storage/labcoat/fluff/cdc_labcoat
name = "\improper CDC labcoat"
desc = "A standard-issue CDC labcoat that protects against minor chemical spills. It has the name \"Wiles\" sewn on to the breast pocket."
icon = 'custom_items.dmi'
@@ -658,7 +658,7 @@ hi
icon_state = "medical_short"
color = "medical_short"
/obj/item/clothing/suit/labcoat/fluff/red
/obj/item/clothing/suit/storage/labcoat/fluff/red
name = "red labcoat"
desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves."
icon = 'custom_items.dmi'
@@ -666,7 +666,7 @@ hi
////// Retired Patrol Outfit //desiderium: Rook Maudlin
/obj/item/clothing/suit/det_suit/fluff/retpolcoat
/obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat
name = "retired colony patrolman's coat"
desc = "A clean, black nylon windbreaker with the words \"OUTER LIGHT POLICE\" embroidered in gold-dyed thread on the back. \"RETIRED\" is tastefully embroidered below in a smaller font."
icon = 'custom_items.dmi'

2
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -667,7 +667,7 @@ proc/get_damage_icon_part(damage_state, body_part)
var/t_state
if( istype(wear_suit, /obj/item/clothing/suit/armor/vest || /obj/item/clothing/suit/wcoat) )
t_state = "armor"
else if( istype(wear_suit, /obj/item/clothing/suit/det_suit || /obj/item/clothing/suit/labcoat) )
else if( istype(wear_suit, /obj/item/clothing/suit/storage/det_suit || /obj/item/clothing/suit/storage/labcoat) )
t_state = "coat"
else
t_state = "suit"

2
code/modules/projectiles/guns/projectile/revolver.dm
View File

@@ -10,7 +10,7 @@
special_check(var/mob/living/carbon/human/M)
if(ishuman(M))
if(istype(M.w_uniform, /obj/item/clothing/under/det) && istype(M.head, /obj/item/clothing/head/det_hat) && \
(istype(M.wear_suit, /obj/item/clothing/suit/det_suit) || istype(M.wear_suit, /obj/item/clothing/suit/armor/det_suit)))
(istype(M.wear_suit, /obj/item/clothing/suit/storage/det_suit) || istype(M.wear_suit, /obj/item/clothing/suit/armor/det_suit)))
return 1
M << "\red You just don't feel cool enough to use this gun looking like that."
return 0