From 5afb55815ea49a44dd4a68dcd342b69de4b2a3d6 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 1 Jan 2015 23:15:34 +1030 Subject: [PATCH 1/3] Fixes #7601 --- code/modules/clothing/spacesuits/rig/rig.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index abbf9c38ee9..ca17213bbb8 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -287,6 +287,15 @@ /obj/item/weapon/rig/process() + // If we've lost any parts, grab them back. + var/mob/living/M + for(var/obj/item/piece in list(gloves,boots,helmet,chest)) + if(piece.loc != src && !(wearer && piece.loc == wearer)) + if(istype(piece.loc, /mob/living)) + M = piece.loc + M.drop_from_inventory(piece) + piece.loc = src + if(!istype(wearer) || loc != wearer || wearer.back != src || canremove || !cell || cell.charge <= 0) if(!cell || cell.charge <= 0) if(electrified >0) From cf6dbcba69a9ef16ce2eb48dce7ac4569df468ee Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 1 Jan 2015 23:36:48 +1030 Subject: [PATCH 2/3] Fixes #7594 --- maps/exodus-1.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index cddb2928f2d..a1d0720c5f8 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -1173,7 +1173,7 @@ "awC" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/camera{c_tag = "Holodeck"},/turf/simulated/floor,/area/crew_quarters/fitness) "awD" = (/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor,/area/crew_quarters/fitness) "awE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only{dir = 2},/turf/simulated/floor/plating,/area/crew_quarters/fitness) -"awF" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "toxin_test_airlock"; name = "exterior access button"; pixel_x = -20; pixel_y = -20; req_access_txt = "13"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/airless{icon_state = "catwalk12"},/area/space) +"awF" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "toxin_test_airlock"; name = "exterior access button"; pixel_x = -20; pixel_y = -20; req_access_txt = "13"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating/airless,/area/space) "awG" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/hallway/secondary/entry/fore) "awH" = (/turf/simulated/floor/plating,/area/hallway/secondary/entry/fore) "awI" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/hallway/secondary/entry/fore) @@ -1182,7 +1182,7 @@ "awL" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/camera{c_tag = "Security Substation"; dir = 1; network = list("SS13","Engineering")},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/maintenance/substation/security) "awM" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/hallway/secondary/entry/fore) "awN" = (/obj/effect/decal/cleanable/blood/oil/streak{amount = 0},/turf/simulated/floor/plating,/area/maintenance/arrivals) -"awO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/airless{icon_state = "catwalk12"},/area/space) +"awO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating/airless,/area/space) "awP" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating/airless,/area/maintenance/evahallway) "awQ" = (/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 10},/area/maintenance/evahallway) "awR" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1379; id_tag = "eva_pump"},/obj/machinery/camera{c_tag = "EVA Airlock"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 6},/area/maintenance/evahallway) From a41364fbd1f2c0669b57beca1cbed2f9bb1cf68a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 2 Jan 2015 00:00:23 +1030 Subject: [PATCH 3/3] Fixes #7595 --- code/modules/client/preferences.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 0531ecab98c..278fefa5e98 100755 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -643,7 +643,7 @@ datum/preferences if(restricted) if(restricted == 1) - dat += "You cannot play as this species.
If you wish to be whitelisted, you can make an application post on the forums.
" + dat += "You cannot play as this species.
If you wish to be whitelisted, you can make an application post on the forums.
" else if(restricted == 2) dat += "You cannot play as this species.
This species is not available for play as a station race..
" if(!restricted || check_rights(R_ADMIN, 0)) @@ -872,6 +872,14 @@ datum/preferences if(!user) return if(!istype(user, /mob/new_player)) return + + if(href_list["preference"] == "open_whitelist_forum") + if(config.forumurl) + user << link(config.forumurl) + else + user << "The forum URL is not set in the server configuration." + return + if(href_list["preference"] == "job") switch(href_list["task"]) if("close")