From 0aee00be62f5434be05b8aface4cd5085147c071 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 25 Jan 2012 08:41:11 -0700 Subject: [PATCH] Things should be throwable past tables. Response team should work a bit better, added space suit for medics. --- code/game/objects/tables_racks.dm | 2 +- code/game/response_team.dm | 2 ++ code/modules/clothing/spacesuits/miscellaneous.dm | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/code/game/objects/tables_racks.dm b/code/game/objects/tables_racks.dm index 2df373a1b1a..0af3685cbb6 100644 --- a/code/game/objects/tables_racks.dm +++ b/code/game/objects/tables_racks.dm @@ -98,7 +98,7 @@ TABLE AND RACK OBJECT INTERATIONS /obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(air_group || (height==0)) return 1 - if(istype(mover) && mover.checkpass(PASSTABLE)) + if(istype(mover) && (mover.checkpass(PASSTABLE) || mover.checkpass(TABLEPASS))) //WTF do things hit tables like that? Jeez. return 1 else return 0 diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 87901a232a7..6e6a858b0ba 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -76,6 +76,7 @@ proc/trigger_armed_response_team() /client/proc/create_response_team(obj/spawn_location, leader_selected = 0, commando_name) var/mob/living/carbon/human/M = new(spawn_location.loc) + response_team_members |= M var/new_facial = input("Please select facial hair color.", "Character Generation") as color if(new_facial) @@ -157,6 +158,7 @@ proc/trigger_armed_response_team() M.update_clothing() M.real_name = commando_name + M.name = commando_name M.age = !leader_selected ? rand(23,35) : rand(35,45) M.dna.ready_dna(M)//Creates DNA. diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 36599ceeec2..ee2a43d4d7a 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -48,3 +48,15 @@ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) slowdown = 0 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) + +/obj/item/clothing/head/helmet/space/medic + name = "medical space helmet" + armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 30) + + +/obj/item/clothing/suit/space/medic + name = "medical space suit" + icon_state = "bio_general" + w_class = 3 + slowdown = 0 + armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 30)