From a8738ddc4b679f329e5f04f775853601c8cac75d Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Thu, 28 Nov 2013 21:35:04 -0600 Subject: [PATCH 1/2] Players will now no longer be able to jump in exosuits while handcuffed. --- code/game/mecha/mecha.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 65284a054d1..519a4dd90cd 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -973,6 +973,11 @@ if (usr.stat || !ishuman(usr)) return src.log_message("[usr] tries to move in.") + if(iscarbon(usr)) + var/mob/living/carbon/C = usr + if(C.handcuffed) + usr << "\red Kinda hard to climb in while handcuffed don't you think?" + return if (src.occupant) usr << "\blue The [src.name] is already occupied!" src.log_append_to_last("Permission denied.") From 3be474bab881c7ae4f2064838f4d7ce6cc54e18e Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Thu, 28 Nov 2013 22:35:12 -0600 Subject: [PATCH 2/2] Admin request: Added ability to jobban players from becoming Dionaea nymph --- code/game/machinery/podmen.dm | 2 ++ code/modules/admin/topic.dm | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/podmen.dm b/code/game/machinery/podmen.dm index 7654bda9641..6dd173f4478 100644 --- a/code/game/machinery/podmen.dm +++ b/code/game/machinery/podmen.dm @@ -92,6 +92,8 @@ Growing it to term with nothing injected will grab a ghost from the observers. * /obj/item/seeds/replicapod/proc/request_player() for(var/mob/dead/observer/O in player_list) + if(jobban_isbanned(O, "Dionaea")) + continue if(O.client) if(O.client.prefs.be_special & BE_PLANT) question(O.client) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 6f25d8b05a1..e3104a25f0d 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -614,11 +614,24 @@ else jobs += "[replacetext("Infested Monkey", " ", " ")]" */ + jobs += "" + //Other races (BLUE, because I have no idea what other color to make this) + jobs += "" + jobs += "" + + if(jobban_isbanned(M, "Dionaea")) + jobs += "" + else + jobs += "" + + jobs += "
Other Races
DionaeaDionaea
" + + body = "[jobs]" dat = "[header][body]" - usr << browse(dat, "window=jobban2;size=800x450") + usr << browse(dat, "window=jobban2;size=800x490") return //JOBBAN'S INNARDS