diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 6dbcc5d4268..3b65c0fdadf 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -200,10 +200,6 @@ user << "Sticking a dead [W] into the frame would sort of defeat the purpose." return - if(jobban_isbanned(M.brainmob, "Cyborg")) - user << "\The [W] does not seem to fit." - return - if(!src.head.law_manager) if(!is_alien_whitelisted(M.brainmob, "Machine") && config.usealienwhitelist) @@ -225,6 +221,11 @@ return else + + if(jobban_isbanned(M.brainmob, "Cyborg")) + user << "\The [W] does not seem to fit." + return + var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), TRUE) if(!O) return diff --git a/code/modules/martial_arts/skrell.dm b/code/modules/martial_arts/skrell.dm index a280b8822dc..e05d6218037 100644 --- a/code/modules/martial_arts/skrell.dm +++ b/code/modules/martial_arts/skrell.dm @@ -102,6 +102,6 @@ datum/martial_art/karak_virul/grab_act(var/mob/living/carbon/human/A, var/mob/li to_chat(usr, "You warble deeply and recall the teachings...") to_chat(usr, "Painful Palm: Disarm Harm Harm. Strikes your target with a painful hit, causing some pain.") - to_chat(usr, "Leg Sweep: Disarm Disarm Harm. Trips the victim, rendering them prone and unable to move for a short time.") + to_chat(usr, "Leg Sweep: Disarm Harm Disarm.. Trips the victim, rendering them prone and unable to move for a short time.") to_chat(usr, "Dislocating Strike: Harm Disarm Disarm Disarm. Delivers a strong punch that can dislocate your target's limb.") diff --git a/code/modules/martial_arts/sol_combat.dm b/code/modules/martial_arts/sol_combat.dm index e1100a43273..32f679e6406 100644 --- a/code/modules/martial_arts/sol_combat.dm +++ b/code/modules/martial_arts/sol_combat.dm @@ -123,5 +123,5 @@ datum/martial_art/sol_combat/grab_act(var/mob/living/carbon/human/A, var/mob/liv to_chat(usr, "You clench your fists and have a flashback of knowledge...") to_chat(usr, "Neck Chop: Harm Harm Disarm. Injures the neck, stopping the victim from speaking for a while.") - to_chat(usr, "Leg Sweep: Disarm Disarm Harm. Trips the victim, rendering them prone and unable to move for a short time.") + to_chat(usr, "Leg Sweep: Disarm Harm Disarm. Trips the victim, rendering them prone and unable to move for a short time.") to_chat(usr, "Lung Punch: Harm Disarm Harm. Delivers a strong punch just above the victim's abdomen, constraining the lungs. The victim will be unable to breathe for a short time.") \ No newline at end of file diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index ac6079b1869..0d5c298f3ca 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 33779d9b46a..50d96030088 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -25380,23 +25380,8 @@ dir = 8; layer = 2.9 }, -/obj/item/clothing/head/helmet/space/void/skrell/black, /obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/skrell/black, -/obj/item/clothing/head/helmet/space/void/skrell/white, /obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/skrell/white, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 6 - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, /obj/machinery/light/small{ dir = 4 }, @@ -63664,10 +63649,10 @@ }, /obj/machinery/firealarm/west, /obj/machinery/camera/network/medbay{ - c_tag = "Medical - Isolation Room"; + c_tag = "Medical - Chemistry"; dir = 4; icon_state = "camera"; - network = list("Medical","Isolation Room") + network = list("Medical") }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index bb278840b5c..4cfb398972f 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -1,5 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -//Model dictionary trimmed on: 08-04-2018 16:07 (UTC) "aa" = ( /turf/unsimulated/chasm_mask, /area/mine/unexplored) @@ -2445,7 +2444,7 @@ dir = 8 }, /obj/structure/punching_bag, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "ex" = ( /obj/effect/floor_decal/corner/red{ @@ -2453,7 +2452,7 @@ dir = 5 }, /obj/structure/weightlifter, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "ey" = ( /obj/effect/floor_decal/corner/red{ @@ -2463,7 +2462,7 @@ /obj/structure/table/standard, /obj/item/clothing/gloves/boxing/green, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "ez" = ( /obj/structure/table/standard, @@ -2556,7 +2555,7 @@ c_tag = "Security - Gymnasium"; dir = 4 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "eJ" = ( /obj/effect/floor_decal/corner/blue{ @@ -2567,7 +2566,7 @@ icon_state = "intact-supply"; dir = 6 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "eK" = ( /obj/effect/floor_decal/corner/blue/full{ @@ -2581,7 +2580,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "eL" = ( /obj/effect/floor_decal/corner/green{ @@ -2594,7 +2593,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "eM" = ( /obj/effect/floor_decal/corner/blue{ @@ -2688,11 +2687,11 @@ icon_state = "tube1"; pixel_y = 0 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "eV" = ( /obj/effect/floor_decal/corner/blue/full, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "eW" = ( /obj/effect/floor_decal/corner/blue{ @@ -2700,21 +2699,21 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "eX" = ( /obj/effect/floor_decal/corner/blue/full{ icon_state = "corner_white_full"; dir = 4 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "eY" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 6 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "eZ" = ( /obj/machinery/door/firedoor, @@ -2781,7 +2780,7 @@ pixel_x = 0; pixel_y = -32 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "fh" = ( /obj/effect/floor_decal/corner/green{ @@ -2792,21 +2791,21 @@ dir = 9; pixel_y = 0 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "fi" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 10 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "fj" = ( /obj/effect/floor_decal/corner/green/full{ icon_state = "corner_white_full"; dir = 4 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/security/training) "fk" = ( /obj/structure/flora/pottedplant/random, @@ -5345,14 +5344,14 @@ dir = 5 }, /obj/structure/weightlifter, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/mine/unexplored) "jB" = ( /obj/effect/floor_decal/corner/blue/full{ icon_state = "corner_white_full"; dir = 8 }, -/turf/simulated/floor/holofloor/tiled, +/turf/simulated/floor/tiled, /area/mine/unexplored) "jC" = ( /obj/machinery/door/firedoor, @@ -6074,6 +6073,7 @@ pixel_y = 7 }, /obj/machinery/requests_console{ + department = "Psychiatry"; pixel_x = 0; pixel_y = 32 }, @@ -6673,6 +6673,7 @@ dir = 5 }, /obj/machinery/requests_console{ + department = "Psychiatry"; pixel_x = 32; pixel_y = 0 }, @@ -39267,7 +39268,7 @@ db ew eI eU -ff +dM dc fA fW