diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 791b3db061..fff192f5a3 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -227,7 +227,7 @@ usr << "\red Subject may not have abiotic items on." return if(!src.node) - usr << "\red The cell is not corrrectly connected to its pipe network!" + usr << "\red The cell is not correctly connected to its pipe network!" return if (M.client) M.client.perspective = EYE_PERSPECTIVE @@ -247,9 +247,18 @@ set name = "Eject occupant" set category = "Object" set src in oview(1) - if (usr.stat != 0) - return - src.go_out() + if(usr == src.occupant)//If the user is inside the tube... + if (usr.stat == 2)//and he's not dead.... + return + usr << "\blue Release sequence activated. This will take two minutes." + sleep(1200) + if(!src || !usr || !src.occupant || (src.occupant != usr)) //Check if someone's released/replaced/bombed him already + return + src.go_out()//and release him from the eternal prison. + else + if (usr.stat != 0) + return + src.go_out() add_fingerprint(usr) return diff --git a/code/game/objects/closets/syndicate.dm b/code/game/objects/closets/syndicate.dm index 9b8b6629d3..dd17e11fd9 100644 --- a/code/game/objects/closets/syndicate.dm +++ b/code/game/objects/closets/syndicate.dm @@ -2,13 +2,13 @@ ..() sleep(2) new /obj/item/weapon/tank/jetpack/oxygen(src) - new /obj/item/clothing/mask/breath(src) + new /obj/item/clothing/mask/gas/syndicate(src) new /obj/item/clothing/under/syndicate(src) - new /obj/item/clothing/head/helmet/space/syndicate(src) - new /obj/item/clothing/suit/space/syndicate(src) - new /obj/item/weapon/crowbar(src) + new /obj/item/clothing/head/helmet/space/rig/syndi(src) + new /obj/item/clothing/suit/space/rig/syndi(src) + new /obj/item/weapon/crowbar/red(src) new /obj/item/weapon/cell/high(src) new /obj/item/weapon/card/id/syndicate(src) new /obj/item/device/multitool(src) - new /obj/item/weapon/shield/riot(src) + new /obj/item/weapon/shield/energy(src) diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index 739e586329..5d7c87f186 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -48,12 +48,21 @@ item_state = "rig0-white" color = "white" +/obj/item/clothing/head/helmet/space/rig/syndi + name = "blood-red hardsuit helmet" + icon_state = "rig0-syndi" + item_state = "rig0-syndi" + color = "syndi" + armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) + +////////////////////Suits + /obj/item/clothing/suit/space/rig name = "engineering hardsuit" desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding." icon_state = "rig-engineering" item_state = "rig_suit" - protective_temperature = 5000 //For not dieing near a fire, but still not being great in a full inferno + protective_temperature = 5000 //For not dying near a fire, but still not being great in a full inferno slowdown = 2 armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd) @@ -66,3 +75,11 @@ icon_state = "rig-white" name = "advanced hardsuit" protective_temperature = 10000 + +/obj/item/clothing/suit/space/rig/syndi + icon_state = "rig-syndi" + name = "blood-red hardsuit" + slowdown = 1 + w_class = 3 + armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 18ac73ed24..4c88c1f770 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 6176dabc77..d23e55fa5a 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index a65cb4590d..3ddd0040aa 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 35f5845fc1..77717d2921 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ