diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 1d1a19eb97a..b9d3ac0364d 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -300,7 +300,7 @@ "afN" = (/obj/machinery/door/firedoor,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/sign/securearea{pixel_x = -32; pixel_y = 0},/obj/machinery/door/poddoor/preopen{id = "Prison Gate"; name = "prison blast door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/security/brig) "afO" = (/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/preopen{id = "Prison Gate"; name = "prison blast door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/security/brig) "afP" = (/turf/simulated/wall/r_wall,/area/security/warden) -"afQ" = (/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_x = -30; pixel_y = 0},/obj/machinery/camera{c_tag = "Brig Control Room"; dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/rack,/obj/item/clothing/mask/gas/sechailer{pixel_x = -3; pixel_y = -3},/obj/item/clothing/mask/gas/sechailer,/obj/item/clothing/mask/gas/sechailer{pixel_x = -3; pixel_y = -3},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) +"afQ" = (/obj/machinery/requests_console{department = "Security"; departmentType = 5; pixel_x = -30; pixel_y = 0},/obj/machinery/camera{c_tag = "Brig Control Room"; dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/rack,/obj/item/clothing/mask/gas/security{pixel_x = -3; pixel_y = -3},/obj/item/clothing/mask/gas/security,/obj/item/clothing/mask/gas/security{pixel_x = -3; pixel_y = -3},/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "afR" = (/obj/machinery/computer/prisoner,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "afS" = (/obj/machinery/computer/security,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) "afT" = (/obj/machinery/computer/secure_data,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "showroomfloor"},/area/security/warden) @@ -6471,7 +6471,7 @@ "cuw" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/engine/engineering) "cux" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1; layer = 2.9},/turf/simulated/floor/plating/airless,/area/shuttle/laborcamp/station) "cuy" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/simulated/shuttle/plating,/area/shuttle/mining/station) - + (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 230235b347b..ba4b8e2c39b 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -57,7 +57,7 @@ /obj/machinery/suit_storage_unit/security SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/security HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/security - MASK_TYPE = /obj/item/clothing/mask/gas/sechailer + MASK_TYPE = /obj/item/clothing/mask/gas/security /obj/machinery/suit_storage_unit/atmos SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/atmos diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 492989be550..6aff22e4854 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -587,3 +587,47 @@ new /obj/item/clothing/tie/armband/deputy(src) new /obj/item/clothing/tie/armband/deputy(src) new /obj/item/clothing/tie/armband/deputy(src) + +/obj/item/weapon/storage/box/scienceband + name = "box of science armbands" + desc = "For the research director to assign personnel as temporarily apart of science." + +/obj/item/weapon/storage/box/scienceband/New() + ..() + new /obj/item/clothing/tie/armband/science(src) + new /obj/item/clothing/tie/armband/science(src) + new /obj/item/clothing/tie/armband/science(src) + new /obj/item/clothing/tie/armband/science(src) + +/obj/item/weapon/storage/box/cargoband + name = "box of cargo armbands" + desc = "For the quartermaster to assign personnel as temporarily apart of supply." + +/obj/item/weapon/storage/box/cargoband/New() + ..() + new /obj/item/clothing/tie/armband/cargo(src) + new /obj/item/clothing/tie/armband/cargo(src) + new /obj/item/clothing/tie/armband/cargo(src) + new /obj/item/clothing/tie/armband/cargo(src) + +/obj/item/weapon/storage/box/medband + name = "box of medical armbands" + desc = "For the chief medical officer to assign personnel as temporarily apart of medical." + +/obj/item/weapon/storage/box/medband/New() + ..() + new /obj/item/clothing/tie/armband/medblue(src) + new /obj/item/clothing/tie/armband/medblue(src) + new /obj/item/clothing/tie/armband/medblue(src) + new /obj/item/clothing/tie/armband/medblue(src) + +/obj/item/weapon/storage/box/engieband + name = "box of engineering armbands" + desc = "For the chief engineer to assign personnel as temporarily apart of engineering." + +/obj/item/weapon/storage/box/engieband/New() + ..() + new /obj/item/clothing/tie/armband/engine(src) + new /obj/item/clothing/tie/armband/engine(src) + new /obj/item/clothing/tie/armband/engine(src) + new /obj/item/clothing/tie/armband/engine(src) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 9db64cf3f2f..c8884ea1e23 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -63,8 +63,8 @@ new /obj/item/clothing/gloves/combat(src) new /obj/item/clothing/head/helmet/swat(src) new /obj/item/clothing/head/helmet/swat(src) - new /obj/item/clothing/mask/gas/sechailer/swat(src) - new /obj/item/clothing/mask/gas/sechailer/swat(src) + new /obj/item/clothing/mask/gas/swat(src) + new /obj/item/clothing/mask/gas/swat(src) new /obj/item/clothing/shoes/combat/swat(src) new /obj/item/clothing/shoes/combat/swat(src) new /obj/item/clothing/suit/space/deathsquad(src) 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 7ea96c0dc20..970c08e4c38 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -15,7 +15,7 @@ else new /obj/item/weapon/storage/backpack/satchel_cap(src) new /obj/item/clothing/suit/captunic(src) - new /obj/item/clothing/under/captainformal(src) + new /obj/item/clothing/under/captainparade(src) new /obj/item/clothing/head/caphat/parade(src) new /obj/item/clothing/under/rank/captain(src) new /obj/item/clothing/suit/armor/vest/capcarapace(src) @@ -70,19 +70,18 @@ /obj/structure/closet/secure_closet/hos/New() ..() - new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/clothing/under/hosformalfem(src) - new /obj/item/clothing/under/hosformalmale(src) - new /obj/item/clothing/suit/armor/hos/trenchcoat(src) - new /obj/item/clothing/head/HoS/beret(src) new /obj/item/weapon/cartridge/hos(src) new /obj/item/device/radio/headset/heads/hos(src) + new /obj/item/clothing/under/hosparadefem(src) + new /obj/item/clothing/under/hosparademale(src) + new /obj/item/clothing/suit/armor/hos/trenchcoat(src) + new /obj/item/clothing/under/rank/head_of_security/formal(src) + new /obj/item/clothing/head/HoS/beret(src) new /obj/item/clothing/glasses/hud/security/eyepatch(src) new /obj/item/weapon/storage/lockbox/loyalty(src) - new /obj/item/weapon/shield/riot/tele(src) - new /obj/item/clothing/mask/gas/sechailer/swat(src) new /obj/item/weapon/storage/box/flashbangs(src) - new /obj/item/device/flash/handheld(src) + new /obj/item/clothing/mask/gas/swat(src) + new /obj/item/weapon/shield/riot/tele(src) new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/gun/energy/gun(src) new /obj/item/weapon/storage/belt/security(src) @@ -103,14 +102,14 @@ /obj/structure/closet/secure_closet/warden/New() ..() - new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/clothing/under/rank/warden(src) + new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/clothing/suit/armor/vest/warden(src) new /obj/item/clothing/head/warden(src) + new /obj/item/clothing/suit/armor/vest(src) + new /obj/item/clothing/under/rank/warden/formal(src) new /obj/item/clothing/head/warden/drill(src) - new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) - new /obj/item/clothing/mask/gas/sechailer(src) + new /obj/item/clothing/mask/gas/security(src) new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/box/zipties(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) @@ -137,9 +136,9 @@ new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/head/helmet(src) new /obj/item/device/radio/headset/headset_sec/alt(src) - new /obj/item/clothing/mask/gas/sechailer(src) - new /obj/item/device/flash/handheld(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) + new /obj/item/clothing/mask/gas/security(src) + new /obj/item/device/flash/handheld(src) new /obj/item/weapon/grenade/flashbang(src) new /obj/item/weapon/gun/energy/taser(src) new /obj/item/weapon/storage/belt/security(src) @@ -204,7 +203,7 @@ new /obj/item/clothing/suit/det_suit(src) new /obj/item/clothing/head/det_hat(src) new /obj/item/clothing/gloves/black(src) - new /obj/item/clothing/under/det/grey(src) + new /obj/item/clothing/under/rank/det/grey(src) new /obj/item/clothing/suit/det_suit/grey(src) new /obj/item/clothing/head/fedora(src) new /obj/item/clothing/shoes/laceup(src) @@ -298,4 +297,3 @@ icon_state = icon_closed else icon_state = icon_opened - diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 59024f59a11..f60909c72d6 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -1067,7 +1067,7 @@ var/global/list/g_fancy_list_of_types = null M.equip_to_slot_or_del(new /obj/item/clothing/under/color/green(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(M), slot_wear_mask) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(M), slot_back) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 304b0d0e72b..f2fc692419b 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -40,35 +40,38 @@ // **** Security gas mask **** -/obj/item/clothing/mask/gas/sechailer +/obj/item/clothing/mask/gas/security name = "security gas mask" - desc = "A standard issue Security gas mask with integrated 'Compli-o-nator 3000' device. Plays over a dozen pre-recorded compliance phrases designed to get scumbags to stand still whilst you taze them. Do not tamper with the device." - action_button_name = "HALT!" + desc = "A standard security rebreather that can filter most harmful gasses while being easily adjustable to hang loosely around your neck." + action_button_name = "Adjust Mask" icon_state = "sechailer" - var/cooldown = 0 - var/aggressiveness = 2 ignore_maskadjust = 0 flags = MASKCOVERSMOUTH | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS flags_inv = HIDEFACE visor_flags = MASKCOVERSMOUTH | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS visor_flags_inv = HIDEFACE -/obj/item/clothing/mask/gas/sechailer/swat +/obj/item/clothing/mask/gas/security/verb/adjust() + set category = "Object" + set name = "Adjust Mask" + adjustmask(usr) + +/obj/item/clothing/mask/gas/security/attack_self() + adjust() + + +/obj/item/clothing/mask/gas/swat name = "\improper SWAT mask" desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000." action_button_name = "HALT!" icon_state = "swat" - aggressiveness = 3 + var/cooldown = 0 + var/aggressiveness = 3 ignore_maskadjust = 1 + flags = MASKCOVERSMOUTH | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS + flags_inv = HIDEFACE -/obj/item/clothing/mask/gas/sechailer/cyborg - name = "security hailer" - desc = "A set of recognizable pre-recorded messages for cyborgs to use when apprehending criminals." - icon = 'icons/obj/device.dmi' - icon_state = "taperecorder_idle" - aggressiveness = 1 //Borgs are nicecurity! - -/obj/item/clothing/mask/gas/sechailer/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/clothing/mask/gas/swat/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/screwdriver)) switch(aggressiveness) if(1) @@ -89,15 +92,7 @@ else ..() -/obj/item/clothing/mask/gas/sechailer/verb/adjust() - set category = "Object" - set name = "Adjust Mask" - adjustmask(usr) - -/obj/item/clothing/mask/gas/sechailer/attack_self() - halt() - -/obj/item/clothing/mask/gas/sechailer/verb/halt() +/obj/item/clothing/mask/gas/swat/verb/halt() set category = "Object" set name = "HALT" set src in usr @@ -182,6 +177,16 @@ playsound(src.loc, "sound/voice/complionator/[phrase_sound].ogg", 100, 0, 4) cooldown = world.time +/obj/item/clothing/mask/gas/swat/attack_self() + halt() + +/obj/item/clothing/mask/gas/swat/cyborg + name = "security hailer" + desc = "A set of recognizable pre-recorded messages for cyborgs to use when apprehending criminals." + icon = 'icons/obj/device.dmi' + icon_state = "taperecorder_idle" + aggressiveness = 1 //Borgs are nicecurity! + // ******************************************************************** @@ -235,12 +240,12 @@ temp_message[H] = ninjaspeak(temp_message[H]) pick_list -= H message = list2text(temp_message, " ") - message = replacetext(message, "o", "¤") - message = replacetext(message, "p", "þ") - message = replacetext(message, "l", "£") - message = replacetext(message, "s", "§") - message = replacetext(message, "u", "µ") - message = replacetext(message, "b", "ß") + message = replacetext(message, "o", "?") + message = replacetext(message, "p", "?") + message = replacetext(message, "l", "?") + message = replacetext(message, "s", "?") + message = replacetext(message, "u", "?") + message = replacetext(message, "b", "?") return message diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 9c14fab6cce..35f409c39b5 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -76,11 +76,10 @@ /obj/item/clothing/under/rank/janitor - desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." + desc = "It's the official uniform of the station's janitor." name = "janitor's jumpsuit" icon_state = "janitor" item_color = "janitor" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) /obj/item/clothing/under/lawyer diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index 27708bcf775..59801076ee6 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -1,29 +1,27 @@ //Contains: Engineering department jumpsuits /obj/item/clothing/under/rank/chief_engineer - desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief Engineer\". It has minor radiation shielding." + desc = "A high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief Engineer\"." name = "chief engineer's jumpsuit" icon_state = "chiefengineer" item_state = "g_suit" item_color = "chief" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) /obj/item/clothing/under/rank/atmospheric_technician - desc = "It's a jumpsuit worn by atmospheric technicians." + desc = "A jumpsuit worn by atmospheric technicians." name = "atmospheric technician's jumpsuit" icon_state = "atmos" item_state = "atmos_suit" item_color = "atmos" /obj/item/clothing/under/rank/engineer - desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding." + desc = "An orange high visibility jumpsuit worn by engineers." name = "engineer's jumpsuit" icon_state = "engine" item_state = "engi_suit" item_color = "engine" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) /obj/item/clothing/under/rank/roboticist - desc = "It's a slimming black with reinforced seams; great for industrial work." + desc = "A slimming black with reinforced seams; great for industrial work." name = "roboticist's jumpsuit" icon_state = "robotics" item_state = "robotics" diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 5947065bf55..8c0dd2c1f1a 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -2,21 +2,19 @@ * Science */ /obj/item/clothing/under/rank/research_director - desc = "It's a suit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants." + desc = "It's a suit worn by those with the know-how to achieve the position of \"Research Director\"." name = "research director's vest suit" icon_state = "director" item_state = "g_suit" item_color = "director" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 10, rad = 0) can_adjust = 0 /obj/item/clothing/under/rank/research_director/alt - desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants." + desc = "Maybe you'll engineer your own half-man, half-pig creature some day." name = "research director's tan suit" icon_state = "rdwhimsy" item_state = "rdwhimsy" item_color = "rdwhimsy" - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0) can_adjust = 1 /obj/item/clothing/under/rank/research_director/turtleneck @@ -25,57 +23,51 @@ icon_state = "rdturtle" item_state = "p_suit" item_color = "rdturtle" - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0) can_adjust = 1 /obj/item/clothing/under/rank/scientist - desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist." + desc = "A white and purple jumpsuit for scientists." name = "scientist's jumpsuit" icon_state = "toxins" item_state = "w_suit" item_color = "toxinswhite" permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) /obj/item/clothing/under/rank/chemist - desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it." + desc = "A white and orange jumpsuit for chemists." name = "chemist's jumpsuit" icon_state = "chemistry" item_state = "w_suit" item_color = "chemistrywhite" permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) /* * Medical */ /obj/item/clothing/under/rank/chief_medical_officer - desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." + desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\"." name = "chief medical officer's jumpsuit" icon_state = "cmo" item_state = "w_suit" item_color = "cmo" permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) /obj/item/clothing/under/rank/geneticist - desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." + desc = "A white and blue jumpsuit for geneticists." name = "geneticist's jumpsuit" icon_state = "genetics" item_state = "w_suit" item_color = "geneticswhite" permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) /obj/item/clothing/under/rank/virologist - desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." + desc = "A white and green jumpsuit for virologists." name = "virologist's jumpsuit" icon_state = "virology" item_state = "w_suit" item_color = "virologywhite" permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) /obj/item/clothing/under/rank/nursesuit desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." @@ -84,36 +76,34 @@ item_state = "w_suit" item_color = "nursesuit" permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) fitted = 0 can_adjust = 0 /obj/item/clothing/under/rank/medical - desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." + desc = "A white jumpsuit with the token blue cross of medical doctors." name = "medical doctor's jumpsuit" icon_state = "medical" item_state = "w_suit" item_color = "medical" permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) /obj/item/clothing/under/rank/medical/blue name = "medical scrubs" - desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue." + desc = "A short sleeve blue jumpsuit for medical doctors and first responders alike." icon_state = "scrubsblue" item_color = "scrubsblue" can_adjust = 0 /obj/item/clothing/under/rank/medical/green name = "medical scrubs" - desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green." + desc = "A short sleeve green jumpsuit for medical doctors and first responders alike." icon_state = "scrubsgreen" item_color = "scrubsgreen" can_adjust = 0 /obj/item/clothing/under/rank/medical/purple name = "medical scrubs" - desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple." + desc = "A short sleeve purple jumpsuit for medical doctors and first responders alike." icon_state = "scrubspurple" item_color = "scrubspurple" can_adjust = 0 @@ -161,4 +151,4 @@ item_color = "virologist_new" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - can_adjust = 0 + can_adjust = 0 \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 658c78b3698..646e0ea2565 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -8,24 +8,29 @@ /* * Security */ -/obj/item/clothing/under/rank/warden - desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders." - name = "warden's jumpsuit" - icon_state = "warden" - item_state = "r_suit" - item_color = "warden" - armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - strip_delay = 50 /obj/item/clothing/under/rank/security - name = "security officer's jumpsuit" - desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection." + name = "security jumpsuit" + desc = "A security jumpsuit for officers complete with nanotrasen waistbuckle." icon_state = "security" item_state = "r_suit" - item_color = "secred" - armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + item_color = "security" strip_delay = 50 +/obj/item/clothing/under/rank/warden + name = "warden's jumpsuit" + desc = "A security jumpsuit suit with decorative silver pips and 'warden' written on the shoulders." + icon_state = "wardenformal" + item_state = "r_suit" + item_color = "warden" + strip_delay = 50 + +/obj/item/clothing/under/rank/warden/formal + name = "warden's formal suit" + desc = "A security formal suit with silver shoulder pips, a striped red tie, and tan slacks - the universal sign of bureaucracy.=" + icon_state = "wardenformal" + item_color = "wardenformal" + /* * Detective */ @@ -35,29 +40,31 @@ icon_state = "detective" item_state = "det" item_color = "detective" - armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) strip_delay = 50 -/obj/item/clothing/under/det/grey +/obj/item/clothing/under/rank/det/grey name = "noir suit" desc = "A hard-boiled private investigator's grey suit, complete with tie clip." icon_state = "greydet" item_state = "greydet" item_color = "greydet" - armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) /* * Head of Security */ /obj/item/clothing/under/rank/head_of_security - desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer." - name = "head of security's jumpsuit" + name = "head of security's suit" + desc = "The jumpsuit worn by those few with the dedication to achieve the position of Head of Security." icon_state = "hos" item_state = "r_suit" - item_color = "hosred" - armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + item_color = "hos" strip_delay = 60 +/obj/item/clothing/under/rank/head_of_security/formal + name = "head of security's formal suit" + desc = "The formal suit for a Head of Security with a superior sense of style." + icon_state = "hosformal" + item_color = "hosformal" /* * Navy uniforms @@ -82,4 +89,4 @@ name = "warden's uniform" icon_state = "wardenblueclothes" item_state = "wardenblueclothes" - item_color = "wardenblueclothes" + item_color = "wardenblueclothes" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 29c9356fd69..5c90623466a 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -334,28 +334,28 @@ fitted = 0 can_adjust = 0 -/obj/item/clothing/under/captainformal - name = "captain's formal uniform" - desc = "A captain's formal-wear, for special occasions." - icon_state = "captain_formal" +/obj/item/clothing/under/captainparade + name = "captain's parade uniform" + desc = "A captain's luxury-wear, for special occasions." + icon_state = "captain_parade" item_state = "by_suit" - item_color = "captain_formal" + item_color = "captain_parade" can_adjust = 0 -/obj/item/clothing/under/hosformalmale - name = "head of security's formal uniform" - desc = "A male head of security's formal-wear, for special occasions." - icon_state = "hos_formal_male" +/obj/item/clothing/under/hosparademale + name = "head of security's parade uniform" + desc = "A male head of security's luxury-wear, for special occasions." + icon_state = "hos_parade_male" item_state = "r_suit" - item_color = "hos_formal_male" + item_color = "hos_parade_male" can_adjust = 0 -/obj/item/clothing/under/hosformalfem - name = "head of security's formal uniform" - desc = "A female head of security's formal-wear, for special occasions." - icon_state = "hos_formal_fem" +/obj/item/clothing/under/hosparadefem + name = "head of security's parade uniform" + desc = "A female head of security's luxury-wear, for special occasions." + icon_state = "hos_parade_fem" item_state = "r_suit" - item_color = "hos_formal_fem" + item_color = "hos_parade_fem" fitted = 0 can_adjust = 0 @@ -374,4 +374,4 @@ item_state = "wcoat" item_color = "black_tango" fitted = 0 - can_adjust = 0 + can_adjust = 0 \ No newline at end of file diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 2f364403081..92485237ea0 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -5,7 +5,6 @@ item_state = "bl_suit" item_color = "syndicate" has_sensor = 0 - armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/under/syndicate/tacticool name = "tacticool turtleneck" diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 92c6e97985a..c3772bcdeed 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -154,45 +154,45 @@ /obj/item/clothing/tie/armband name = "red armband" desc = "An fancy red armband!" - icon_state = "red" - item_color = "red" + icon_state = "redband" + item_color = "redband" /obj/item/clothing/tie/armband/deputy name = "security deputy armband" desc = "An armband, worn by personnel authorized to act as a deputy of station security." /obj/item/clothing/tie/armband/cargo - name = "cargo bay guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is brown." - icon_state = "cargo" - item_color = "cargo" + name = "cargo bay armband" + desc = "A department armband, worn to designate someone as temporarily assisting a department. Typically worn by security officers assigned to departments. This one is brown." + icon_state = "cargoband" + item_color = "cargoband" /obj/item/clothing/tie/armband/engine - name = "engineering guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is orange with a reflective strip!" - icon_state = "engie" - item_color = "engie" + name = "engineering armband" + desc = "A department armband, worn to designate someone as temporarily assisting a department. Typically worn by security officers assigned to departments. This one is orange with a reflective strip!" + icon_state = "engieband" + item_color = "engieband" /obj/item/clothing/tie/armband/science - name = "science guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is purple." - icon_state = "rnd" - item_color = "rnd" + name = "science armband" + desc = "A department armband, worn to designate someone as temporarily assisting a department. Typically worn by security officers assigned to departments. This one is purple." + icon_state = "rndband" + item_color = "rndband" /obj/item/clothing/tie/armband/hydro - name = "hydroponics guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is green and blue." - icon_state = "hydro" - item_color = "hydro" + name = "hydroponics armband" + desc = "A department armband, worn to designate someone as temporarily assisting a department. Typically worn by security officers assigned to departments. This one is green and blue." + icon_state = "hydroband" + item_color = "hydroband" /obj/item/clothing/tie/armband/med - name = "medical guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white." - icon_state = "med" - item_color = "med" + name = "medical armband" + desc = "A department armband, worn to designate someone as temporarily assisting a department. Typically worn by security officers assigned to departments. This one is white." + icon_state = "medband" + item_color = "medband" /obj/item/clothing/tie/armband/medblue - name = "medical guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white and blue." - icon_state = "medblue" - item_color = "medblue" \ No newline at end of file + name = "medical armband" + desc = "A department armband, worn to designate someone as temporarily assisting a department. Typically worn by security officers assigned to departments. This one is white and blue." + icon_state = "medblueband" + item_color = "medblueband" \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index f698a6ae801..c03e4380d2f 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -162,7 +162,7 @@ modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) modules += new /obj/item/weapon/melee/baton/loaded(src) modules += new /obj/item/weapon/gun/energy/taser/cyborg(src) - modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src) + modules += new /obj/item/clothing/mask/gas/swat/cyborg(src) emag = new /obj/item/weapon/gun/energy/laser/cyborg(src) fix_modules() diff --git a/icons/mob/corgi_back.dmi b/icons/mob/corgi_back.dmi index ced75e39a42..6c7c1444909 100644 Binary files a/icons/mob/corgi_back.dmi and b/icons/mob/corgi_back.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index e9fdbd53072..4faf6d77ddb 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 27c769a0207..415855c9b1f 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 16d9e3e706b..32ac5328006 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index c2f21ea8cc7..c2befc32eaa 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 4bb63e8eeb1..c0634a924e9 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e537d98f50a..5825f2dfdd6 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 985b13fcf62..97e0d2f258a 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ