diff --git a/code/defines/obj/clothing/costume.dm b/code/defines/obj/clothing/costume.dm index 069b8cfaee26f..d495a549902b6 100644 --- a/code/defines/obj/clothing/costume.dm +++ b/code/defines/obj/clothing/costume.dm @@ -97,14 +97,14 @@ new /obj/item/clothing/under/soviet(src.loc) new /obj/item/clothing/head/ushanka(src.loc) del(src) - +/* /obj/effect/landmark/costume/nurse/New() new /obj/item/clothing/under/rank/nursesuit(src.loc) new /obj/item/clothing/head/nursehat(src.loc) new /obj/item/clothing/glasses/regular(src.loc) new /obj/item/clothing/gloves/latex(src.loc) new /obj/item/clothing/mask/surgical(src.loc) - del(src) + del(src)*/ /obj/effect/landmark/costume/imperium_monk/New() diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index 28593a0b78511..599f35399d90f 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -250,6 +250,15 @@ flags = FPRINT | TABLEPASS | SUITSPACE | HEADCOVERSEYES armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) +/obj/item/clothing/head/helmet/dermal + name = "Dermal Armour Patch" + desc = "You're not quite sure how you manage to take it on and off, but it implants nicely in your head." + icon_state = "dermal" + item_state = "dermal" + flags = FPRINT | TABLEPASS | SUITSPACE | HEADCOVERSEYES + armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) + + /obj/item/clothing/head/helmet/warden name = "Warden Hat" desc = "Stop right there, criminal scum!" diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm index 82d382f0a627b..2cfcf6a1b8e7d 100644 --- a/code/defines/obj/clothing/jumpsuit.dm +++ b/code/defines/obj/clothing/jumpsuit.dm @@ -385,6 +385,14 @@ color = "scratch" +/obj/item/clothing/under/jensen + desc = "You never asked for anything this stylish." + name = "Head of Security Jumpsuit" + icon_state = "jensen" + item_state = "jensen" + color = "jensen" + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + /obj/item/clothing/under/sl_suit desc = "A very amish looking suit." name = "Amish Suit" diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index ee5ba3a7c7333..640dac0c5c30c 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -257,6 +257,15 @@ flags = FPRINT | TABLEPASS | ONESIZEFITSALL armor = list(melee = 65, bullet = 30, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0) +/obj/item/clothing/suit/armor/jensen + name = "armored trenchoat" + desc = "A trenchoat augmented with a special alloy for some protection and style" + icon_state = "jensencoat" + item_state = "jensencoat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + flags = FPRINT | TABLEPASS | ONESIZEFITSALL + armor = list(melee = 65, bullet = 30, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0) + /obj/item/clothing/suit/armor/captain name = "Captain's armor" desc = "A bulky, heavy-duty piece of exclusive Nanotrasen armor. YOU are in charge!" diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 34e3b238f7661..9961087d89221 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -50,9 +50,9 @@ New() ..() sleep(2) - new /obj/item/clothing/under/rank/head_of_security(src) - new /obj/item/clothing/suit/armor/hos(src) - new /obj/item/clothing/head/helmet(src) + new /obj/item/clothing/under/jensen(src) + new /obj/item/clothing/suit/armor/jensen(src) + new /obj/item/clothing/head/helmet/dermal(src) new /obj/item/device/radio/headset/heads/hos(src) new /obj/item/weapon/shield/riot(src) new /obj/item/weapon/storage/lockbox/loyalty(src) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index 913f292dd5c4d..469a4d62e8f77 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -17,7 +17,7 @@ if (!msg) return - var/rendered = "DEAD: ADMIN([src.stealth ? pick("BADMIN", "hornigranny", "TLF", "scaredforshadows", "KSI", "Silnazi", "HerpEs", "BJ69", "SpoofedEdd", "Uhangay", "Wario90900", "Regarity", "HorPhareon", "LastFish", "unMportant", "Deurpyn" ) : src.key]) says, \"[msg]\"" + var/rendered = "DEAD: ADMIN([src.stealth ? pick("BADMIN", "hornigranny", "TLF", "scaredforshadows", "KSI", "Silnazi", "HerpEs", "BJ69", "SpoofedEdd", "Uhangay", "Wario90900", "Regarity", "MissPhareon", "LastFish", "unMportant", "Deurpyn" ) : src.key]) says, \"[msg]\"" for (var/mob/M in world) if (istype(M, /mob/new_player)) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index deecd2613656a..408fb7e528cb8 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -86,4 +86,10 @@ name = "Optical Thermal Eyepatch" desc = "An eyepatch with built-in thermal optics" icon_state = "eyepatch" - item_state = "eyepatch" \ No newline at end of file + item_state = "eyepatch" + +/obj/item/clothing/glasses/thermal/jensen + name = "Optical Thermal Implants" + desc = "A set of implantable lenses designed to augment your vision" + icon_state = "thermalimplants" + item_state = "syringe_kit" \ No newline at end of file diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index cc7b41a8d9bc1..fd65179acdf3a 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 62b06e9de3fef..4c3ece4c60889 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 0b4de455ea054..17e71b9e4a0c1 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 0b90564f71719..f14bc44ec1fb4 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index c48a6f143ba8c..f8940c5a00b27 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 77ad88fad4027..9c829c3c9cd60 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 7ce7afc5eb047..6ace12c8c6898 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 561d9dc78a67e..e4d1f590b5860 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 2c82dedba2ee9..62a7383a19151 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 45671185d3e1c..315b6802aa140 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index e8e70d65b3ddd..0ee78c8a064c3 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -64,7 +64,7 @@ "abl" = (/obj/machinery/deployable/barrier,/obj/structure/window/reinforced,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/security/warden) "abm" = (/obj/machinery/recharger{pixel_y = 4},/obj/structure/table/woodentable,/turf/simulated/floor{dir = 8; icon_state = "carpetside"},/area/security/hos) "abn" = (/obj/machinery/atmospherics/unary/vent_scrubber,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/security/hos) -"abo" = (/obj/item/clothing/glasses/thermal,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "carpet"},/area/security/hos) +"abo" = (/obj/structure/table/woodentable,/obj/item/clothing/glasses/thermal/jensen,/turf/simulated/floor{icon_state = "carpet"},/area/security/hos) "abp" = (/obj/item/weapon/stamp/hos,/obj/structure/table/woodentable,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/security/hos) "abq" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/woodentable,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/security/hos) "abr" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/item/device/radio/intercom{pixel_x = 28; pixel_y = 0},/turf/simulated/floor{dir = 4; icon_state = "carpetside"},/area/security/hos) @@ -5468,7 +5468,7 @@ "cbh" = (/obj/effect/landmark/start,/turf/unsimulated/floor,/area/start) "cbi" = (/turf/unsimulated/wall{icon = 'icons/misc/fullscreen.dmi'; icon_state = "title"; name = "Space Station 13"},/area/start) "cbj" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/syndicate_mothership) -"cbk" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership) +"cbk" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership) "cbl" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/syndicate_mothership) "cbm" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate_elite/mothership) "cbn" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r (NORTH)"; icon_state = "propulsion_r"; dir = 1},/turf/space,/area/shuttle/syndicate_elite/mothership) @@ -5540,8 +5540,8 @@ "ccB" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "ccC" = (/turf/unsimulated/wall,/area/centcom) "ccD" = (/obj/effect/landmark{name = "Nuclear-Closet"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) -"ccE" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area) -"ccF" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom) +"ccE" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area) +"ccF" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom) "ccG" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom) "ccH" = (/turf/unsimulated/floor{name = "plating"},/area/centcom) "ccI" = (/obj/structure/stool/chair{dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) @@ -5601,7 +5601,7 @@ "cdK" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom/suppy) "cdL" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/suppy) "cdM" = (/turf/unsimulated/floor{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/centcom/suppy) -"cdN" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy) +"cdN" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy) "cdO" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "cdP" = (/obj/effect/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "cdQ" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) @@ -5619,7 +5619,7 @@ "cec" = (/obj/structure/table,/obj/machinery/juicer{pixel_y = 6},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living) "ced" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{name = "plating"},/area/centcom/living) "cee" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/living) -"cef" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living) +"cef" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living) "ceg" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/supply/dock) "ceh" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/supply/dock) "cei" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/supply/dock) @@ -5992,7 +5992,7 @@ "cll" = (/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "clm" = (/obj/structure/stool/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "cln" = (/obj/machinery/computer/security,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) -"clo" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry) +"clo" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry) "clp" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom/ferry) "clq" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry) "clr" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry) @@ -6002,7 +6002,7 @@ "clv" = (/obj/structure/stool/chair{dir = 8},/turf/unsimulated/floor{icon_state = "green"; dir = 4},/area/centcom/control) "clw" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "clx" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) -"cly" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/centcom/ferry) +"cly" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/centcom/ferry) "clz" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/shuttle/transport1/centcom) "clA" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/transport1/centcom) "clB" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/shuttle/transport1/centcom)