diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 2129d00e617..716fc6a2a81 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -173,6 +173,7 @@ throw_range = 5 w_class = 2.0 attack_verb = list("warned", "cautioned", "smashed") + /obj/item/weapon/caution/attack_self(mob/user as mob) if(src.icon_state == "caution") src.icon_state = "caution_blinking" @@ -180,6 +181,7 @@ else src.icon_state = "caution" user << "You turn the sign off." + /obj/item/weapon/caution/AltClick() if(src.icon_state == "caution") src.icon_state = "caution_blinking" @@ -192,6 +194,15 @@ desc = "This cone is trying to warn you of something!" name = "warning cone" icon_state = "cone" + item_state = "cone" + contained_sprite = 1 + slot_flags = SLOT_HEAD + +/obj/item/weapon/caution/cone/attack_self(mob/user as mob) + return + +/obj/item/weapon/caution/cone/AltClick() + return /*/obj/item/weapon/syndicate_uplink name = "station bounced radio" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 04f3066f85d..55755e6007e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -251,15 +251,15 @@ New() ..() new /obj/item/clothing/under/det(src) - new /obj/item/clothing/under/det/grey(src) new /obj/item/clothing/under/det/black(src) - new /obj/item/clothing/suit/storage/det_suit(src) - new /obj/item/clothing/suit/storage/det_suit/technicolor(src) + new /obj/item/clothing/under/det/slob(src) + new /obj/item/clothing/suit/storage/det_trench(src) + new /obj/item/clothing/suit/storage/det_trench/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/technicolor(src) + new /obj/item/clothing/head/det(src) + new /obj/item/clothing/head/det/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) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 01f1db51b6c..05b7ea6b7eb 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -105,10 +105,10 @@ sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') siemens_coefficient = 0.7 -/obj/item/clothing/suit/storage/det_suit/black +/obj/item/clothing/suit/storage/det_trench/black icon_state = "detective2" -/obj/item/clothing/suit/storage/det_suit/technicolor +/obj/item/clothing/suit/storage/det_trench/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" @@ -116,7 +116,7 @@ var/suit_color contained_sprite = 1 -/obj/item/clothing/suit/storage/det_suit/technicolor/New() +/obj/item/clothing/suit/storage/det_trench/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) @@ -124,7 +124,7 @@ item_state = "suit_detective_[color]" ..() -/obj/item/clothing/suit/storage/det_suit/technicolor/attackby(obj/item/weapon/O as obj, mob/user as mob) +/obj/item/clothing/suit/storage/det_trench/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 diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 9b8b42db02e..fa04f9775fb 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -73,35 +73,24 @@ /* * Detective */ + /obj/item/clothing/under/det - name = "detective's suit" - desc = "A rumpled white dress shirt paired with well-worn grey slacks, complete with a blue striped tie and a faux-gold tie clip." + name = "hard-worn suit" + desc = "Someone who wears this means business." icon_state = "detective" item_state = "det" worn_state = "detective" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.7 -/obj/item/clothing/under/det/verb/rollup() - set name = "Roll Suit Sleeves" - set category = "Object" - set src in usr - var/unrolled = item_state_slots[slot_w_uniform_str] == initial(worn_state) - item_state_slots[slot_w_uniform_str] = unrolled ? "[worn_state]_r" : initial(worn_state) - var/mob/living/carbon/human/H = loc - H.update_inv_w_uniform(1) - H << "You roll the sleeves of your shirt [unrolled ? "up" : "down"]" - -/obj/item/clothing/under/det/grey +/obj/item/clothing/under/det/black icon_state = "detective2" worn_state = "detective2" - desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie." - -/obj/item/clothing/under/det/black - icon_state = "detective3" - worn_state = "detective3" item_state = "sl_suit" - desc = "An immaculate white dress shirt, paired with a pair of dark grey dress pants, a red tie, and a charcoal vest." + +/obj/item/clothing/under/det/slob + icon_state = "polsuit" + worn_state = "polsuit" /obj/item/clothing/head/det name = "fedora" @@ -120,7 +109,7 @@ icon_state = "detective2" desc = "A grey fedora - either the cornerstone of a detective's style or a poor attempt at looking cool, depending on the person wearing it." -/obj/item/clothing/head/det_hat/technicolor +/obj/item/clothing/head/det/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" @@ -128,7 +117,7 @@ var/hat_color contained_sprite = 1 -/obj/item/clothing/head/det_hat/technicolor/New() +/obj/item/clothing/head/det/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) @@ -136,7 +125,7 @@ item_state = "hat_detective_[color]" ..() -obj/item/clothing/head/det_hat/technicolor/attackby(obj/item/weapon/O as obj, mob/user as mob) +/obj/item/clothing/head/det/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 @@ -145,7 +134,6 @@ obj/item/clothing/head/det_hat/technicolor/attackby(obj/item/weapon/O as obj, mo item_state = "hat_detective_[hat_color]" ..() - /* * Head of Security */ diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index bc80a122925..b76c05fd1bd 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -208,8 +208,9 @@ name = LANGUAGE_AZAZIBA desc = "A language of Moghes consisting of a combination of spoken word and gesticulation. While waning since Moghes entered the glactic stage, it enjoys popular use by Unathi that never fell to the Hegemony's cultural dominance." speech_verb = "hisses" - ask_verb = "gestures" + ask_verb = "hisses" exclaim_verb = "roars" + signlang_verb = list("signs", "gestures aggressively") colour = "soghun_alt" key = "p" flags = WHITELISTED | NONVERBAL diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index aeaeaa10f1b..68ab5eeac9d 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ