diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index 2e2147009b8..b1d9283326c 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -332,7 +332,7 @@ icon_state = "riot" item_state = "helmet" flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES - armor = list(melee = 85, bullet = 10, laser = 5, taser = 5, bomb = 5, bio = 2, rad = 0) + armor = list(melee = 82, bullet = 10, laser = 5, taser = 5, bomb = 5, bio = 2, rad = 0) diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm index 008e89c0402..e217b36839c 100644 --- a/code/defines/obj/clothing/jumpsuit.dm +++ b/code/defines/obj/clothing/jumpsuit.dm @@ -306,7 +306,7 @@ name = "Genetics Jumpsuit" icon_state = "genetics_new" item_state = "w_suit" - color = "geneticsblue" + color = "genetics_new" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0) @@ -315,7 +315,7 @@ name = "Chemist Jumpsuit" icon_state = "chemist_new" item_state = "w_suit" - color = "chemistorange" + color = "chemist_new" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0) @@ -324,7 +324,7 @@ name = "Scientist Jumpsuit" icon_state = "scientist_new" item_state = "w_suit" - color = "sciencepurple" + color = "scientist_new" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 10, bio = 10, rad = 0) @@ -333,7 +333,7 @@ name = "Virologist Jumpsuit" icon_state = "virologist_new" item_state = "w_suit" - color = "medical" + color = "virologist_new" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 15, rad = 0) diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index 9c2199ae26d..531227250c9 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -312,11 +312,11 @@ /obj/item/clothing/suit/armor/riot name = "Riot Suit" desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement." - icon_state = "swat" - item_state = "swat" + icon_state = "riot" + item_state = "swat_suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS slowdown = 2.5 - armor = list(melee = 85, bullet = 5, laser = 2, taser = 2, bomb = 5, bio = 0, rad = 0) + armor = list(melee = 82, bullet = 5, laser = 2, taser = 2, bomb = 5, bio = 0, rad = 0) // FIRE SUITS diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm index 77b6b16edb2..ae35f28e6c6 100644 --- a/code/defines/obj/computer.dm +++ b/code/defines/obj/computer.dm @@ -41,13 +41,13 @@ /obj/machinery/computer/aiupload name = "AI Upload" - icon_state = "aiupload" + icon_state = "command" var/mob/living/silicon/ai/current = null var/opened = 0 /obj/machinery/computer/borgupload name = "Cyborg Upload" - icon_state = "aiupload" + icon_state = "command" var/mob/living/silicon/robot/current = null /obj/machinery/computer/atmosphere @@ -164,6 +164,10 @@ var/temp = null var/printing = null +/obj/machinery/computer/med_data/laptop + name = "Medical Laptop" + icon_state = "medlaptop" + /obj/machinery/computer/pod name = "Pod Launch Control" icon_state = "computer_generic" diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index d7876d73f09..38077acad05 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -264,8 +264,10 @@ "/obj/item/weapon/storage/flashbang_kit", "/obj/item/weapon/storage/flashbang_kit", "/obj/item/weapon/handcuffs", - "/obj/item/weapon/handcuffs") - cost = 20 + "/obj/item/weapon/handcuffs", + "/obj/item/clothing/head/helmet/riot", + "/obj/item/clothing/suit/armor/riot",) + cost = 25 containertype = "/obj/crate/secure/gear" containername = "Riot crate" access = access_security @@ -296,8 +298,10 @@ "/obj/item/weapon/shield/riot", "/obj/item/weapon/shield/riot", "/obj/item/clothing/suit/armor/vest", - "/obj/item/clothing/suit/armor/vest",) - cost = 20 + "/obj/item/clothing/suit/armor/vest", + "/obj/item/clothing/head/helmet/riot", + "/obj/item/clothing/suit/armor/riot",) + cost = 25 containertype = "/obj/crate/secure/gear" containername = "Armor crate" access = access_security diff --git a/code/game/asteroid/device.dm b/code/game/asteroid/device.dm index 7141b6c521f..8f6843d286c 100644 --- a/code/game/asteroid/device.dm +++ b/code/game/asteroid/device.dm @@ -81,6 +81,6 @@ new /obj/item/weapon/reagent_containers/food/snacks/chips(src) new /obj/item/weapon/cigpacket(src) var/obj/item/weapon/reagent_containers/pill/P = new/obj/item/weapon/reagent_containers/pill(src) - P.reagents.add_reagent("cyanide", 30) + P.reagents.add_reagent("nutriment", 500) P.name = "Cyanide pill" return \ No newline at end of file diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index e2283979655..f174124c2d0 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -37,6 +37,10 @@ name = "Circuit board (AI Upload)" build_path = "/obj/machinery/computer/aiupload" origin_tech = "programming=4" +/obj/item/weapon/circuitboard/borgupload + name = "Circuit board (Cyborg Upload)" + build_path = "/obj/machinery/computer/borgupload" + origin_tech = "programming=4" /obj/item/weapon/circuitboard/med_data name = "Circuit board (Medical Records)" build_path = "/obj/machinery/computer/med_data" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index ca496338b78..f903b83316e 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 0abe4856d65..e9c5b87158a 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 05cf17930a0..fab15f20665 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index 7752f787076..0a22816d9c0 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm index 523e9841a97..d34fbb65965 100644 --- a/maps/tgstation.2.0.7.dmm +++ b/maps/tgstation.2.0.7.dmm @@ -510,7 +510,7 @@ "ajP" = (/turf/simulated/floor/plating,/area/maintenance/fsmaint) "ajQ" = (/obj/grille,/obj/window/reinforced{dir = 8},/obj/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "ajR" = (/obj/machinery/deployable/barrier,/obj/window/reinforced{dir = 4},/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor{tag = "icon-delivery (SOUTHWEST)"; icon_state = "delivery"; dir = 10},/area/security/warden) -"ajS" = (/obj/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/security/warden) +"ajS" = (/obj/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/rack,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/riot,/turf/simulated/floor,/area/security/warden) "ajT" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/rack,/obj/item/weapon/storage/trackimp_kit{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/chemimp_kit,/obj/item/weapon/storage/handcuff_kit{pixel_x = -2; pixel_y = -2},/turf/simulated/floor,/area/security/warden) "ajU" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/obj/window/reinforced,/obj/machinery/atmospherics/pipe/simple,/obj/window/reinforced{dir = 8},/obj/cable,/turf/simulated/floor/plating,/area/security/warden) "ajV" = (/obj/machinery/door/airlock/security{name = "Warden's Office"; req_access = null; req_access_txt = "3"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/security/warden) @@ -3911,7 +3911,7 @@ "bxk" = (/obj/secure_closet/CMO,/turf/simulated/floor{icon_state = "warning"},/area/medical/cmo) "bxl" = (/obj/window/reinforced{dir = 4},/obj/closet/emcloset,/turf/simulated/floor{icon_state = "warning"},/area/medical/cmo) "bxm" = (/obj/stool/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 6; icon_state = "intact-r-f"; initialize_directions = 6; level = 1; name = "pipe"},/turf/simulated/floor{icon_state = "white"},/area/medical/cmo) -"bxn" = (/obj/item/weapon/stamp/cmo,/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/table,/turf/simulated/floor{icon_state = "white"},/area/medical/cmo) +"bxn" = (/obj/item/weapon/stamp/cmo,/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/table,/obj/item/weapon/paper{info = "Due to financial reasons your department's funding will be reduced. Consequentially you will start receiving slightly less equipment in regular shipments. Try to use the equipment you have more responsibly so it will remain in working order for longer. Replacements might become hard to come by.

CentCom Financial Office"; name = "Budget Cuts"},/turf/simulated/floor{icon_state = "white"},/area/medical/cmo) "bxo" = (/obj/machinery/computer/crew,/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 9; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/machinery/camera{c_tag = "CMO's Office"; dir = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/cmo) "bxp" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/door/airlock/maintenance{name = "Medical Maintenance"; req_access_txt = "12;5"},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bxq" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"},/obj/machinery/door/airlock/maintenance{name = "Medical Maintenance"; req_access_txt = "12;5"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "dark"},/area/medical/surgery) @@ -3966,7 +3966,7 @@ "byn" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/medical/cmo) "byo" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/medical/cmo) "byp" = (/obj/stool/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor{icon_state = "white"},/area/medical/cmo) -"byq" = (/obj/item/weapon/paper{info = "Due to financial reasons your department's funding will be reduced. Consequentially you will start receiving slightly less equipment in regular shipments. Try to use the equipment you have more responsibly so it will remain in working order for longer. Replacements might become hard to come by.

CentCom Financial Office"; name = "Budget Cuts"},/obj/table,/turf/simulated/floor{icon_state = "white"},/area/medical/cmo) +"byq" = (/obj/table,/obj/machinery/computer/med_data/laptop,/turf/simulated/floor{icon_state = "white"},/area/medical/cmo) "byr" = (/obj/stool/chair{dir = 8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/landmark/start{name = "Chief Medical Officer"},/turf/simulated/floor{icon_state = "white"},/area/medical/cmo) "bys" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/medical/cmo) "byt" = (/turf/simulated/floor/plating,/area/maintenance/asmaint2)