cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dick Tracy and the Technicolor Dreamcoat (#1035)

Browse Source 
User Changelog

rscadd: "Gave detective a colourable trench-coat, solving the Dick Tracy Dilemma."
tweak: "Wooden closets now have a slightly larger capacity, indicative of their greater size."
This commit is contained in:
LordFowl
2016-10-23 17:23:07 -04:00
committed by skull132
parent 57f03923dc
commit ea0f8c48d9
7 changed files with 93 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/structures/crates_lockers/closets/gimmick.dm
View File

@@ -4,6 +4,7 @@
icon_state = "cabinet_closed"
icon_closed = "cabinet_closed"
icon_opened = "cabinet_open"
storage_capacity = 45 //such a big closet deserves a little more capacity
/obj/structure/closet/cabinet/update_icon()
if(!opened)

1
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
View File

@@ -7,6 +7,7 @@
icon_opened = "cabinetdetective_open"
icon_broken = "cabinetdetective_broken"
icon_off = "cabinetdetective_broken"
storage_capacity = 45 //such a big closet deserves a little more capacity
New()

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

@@ -245,6 +245,7 @@
icon_opened = "cabinetdetective_open"
icon_broken = "cabinetdetective_broken"
icon_off = "cabinetdetective_broken"
storage_capacity = 45 //such a big closet deserves a little more capacity
New()
..()
@@ -252,12 +253,12 @@
new /obj/item/clothing/under/det/black(src)
new /obj/item/clothing/under/det/slob(src)
new /obj/item/clothing/suit/storage/det_suit(src)
new /obj/item/clothing/suit/storage/det_suit/black(src)
new /obj/item/clothing/suit/storage/det_suit/technicolor(src)
new /obj/item/clothing/suit/storage/forensics/blue(src)
new /obj/item/clothing/suit/storage/forensics/red(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/head/det_hat(src)
new /obj/item/clothing/head/det_hat/black(src)
new /obj/item/clothing/head/det_hat/technicolor(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/weapon/storage/box/evidence(src)
new /obj/item/device/radio/headset/headset_sec(src)

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

@@ -106,10 +106,35 @@
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
siemens_coefficient = 0.7
/obj/item/clothing/suit/storage/det_suit/black
icon_state = "detective2"
/obj/item/clothing/suit/storage/det_suit/technicolor
desc = "A 23rd-century multi-purpose trenchcoat. It's fibres are hyper-absorbent."
icon = 'icons/obj/clothing/coloured_detective_coats.dmi'
icon_state = "suit_detective_black"
item_state = "suit_detective_black"
var/suit_color
contained_sprite = 1
/obj/item/clothing/suit/storage/det_suit/technicolor/New()
if(prob(5))
var/list/colors = list("yellow"=2,"red"=1,"white"=1,"orange"=1,"purple"=1,"green"=1,"blue"=1 )
var/color = pickweight(colors)
icon_state = "suit_detective_[color]"
item_state = "suit_detective_[color]"
..()
/obj/item/clothing/suit/storage/det_suit/technicolor/attackby(obj/item/weapon/O as obj, mob/user as mob)
if(istype(O, /obj/item/weapon/reagent_containers/glass/paint))
var/obj/item/weapon/reagent_containers/glass/paint/P = O
suit_color = P.paint_type
user.visible_message("<span class='warning'>[user] soaks \the [src] into [P]!</span>")
icon_state = "suit_detective_[suit_color]"
item_state = "suit_detective_[suit_color]"
..()
//Forensics
/obj/item/clothing/suit/storage/forensics
name = "jacket"

25
code/modules/clothing/under/jobs/security.dm
View File

@@ -106,6 +106,31 @@
/obj/item/clothing/head/det_hat/black
icon_state = "detective2"
/obj/item/clothing/head/det_hat/technicolor
desc = "A 23rd-century fedora. It's fibres are hyper-absorbent."
icon = 'icons/obj/clothing/coloured_detective_coats.dmi'
icon_state = "hat_detective_black"
item_state = "hat_detective_black"
var/hat_color
contained_sprite = 1
/obj/item/clothing/head/det_hat/technicolor/New()
if(prob(5))
var/list/colors = list("yellow"=2,"red"=1,"white"=1,"orange"=1,"purple"=1,"green"=1,"blue"=1 )
var/color = pickweight(colors)
icon_state = "hat_detective_[color]"
item_state = "hat_detective_[color]"
..()
obj/item/clothing/head/det_hat/technicolor/attackby(obj/item/weapon/O as obj, mob/user as mob)
if(istype(O, /obj/item/weapon/reagent_containers/glass/paint))
var/obj/item/weapon/reagent_containers/glass/paint/P = O
hat_color = P.paint_type
user.visible_message("<span class='warning'>[user] soaks \the [src] into [P]!</span>")
icon_state = "hat_detective_[hat_color]"
item_state = "hat_detective_[hat_color]"
..()
/*
* Head of Security