From 15918b2e18a965813a1d980fae36ec24706f79ce Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Fri, 16 Dec 2011 06:06:16 +0000 Subject: [PATCH] Added a config option which forbids the possessing of singularities. This option defaults to allowing the possession of singularities. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2697 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/configuration.dm | 5 +++++ code/game/vials.dm | 6 ++++++ config/config.txt | 3 +++ 3 files changed, 14 insertions(+) diff --git a/code/datums/configuration.dm b/code/datums/configuration.dm index 1def278bf1a..635dda4b8dc 100644 --- a/code/datums/configuration.dm +++ b/code/datums/configuration.dm @@ -50,6 +50,8 @@ var/alert_desc_red_downto = "The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised." var/alert_desc_delta = "The station's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill." + var/forbid_singulo_possession = 0 + //game_options.txt configs var/health_threshold_crit = 0 @@ -246,6 +248,9 @@ if("alert_delta") config.alert_desc_delta = value + if("forbid_singulo_possession") + forbid_singulo_possession = 1 + else diary << "Unknown setting in configuration: '[name]'" diff --git a/code/game/vials.dm b/code/game/vials.dm index 0e27b6b6ee6..5c298e02688 100644 --- a/code/game/vials.dm +++ b/code/game/vials.dm @@ -271,6 +271,12 @@ /proc/possess(obj/O as obj in world) set name = "Possess Obj" set category = "Object" + + if(istype(O,/obj/machinery/singularity)) + if(config.forbid_singulo_possession) + usr << "It is forbidden to possess singularities." + return + usr.loc = O usr.real_name = O.name usr.name = O.name diff --git a/config/config.txt b/config/config.txt index 01b371b01ee..5427b43c336 100644 --- a/config/config.txt +++ b/config/config.txt @@ -108,3 +108,6 @@ HOSTEDBY Yournamehere ##Toggle for having jobs load up from the .txt # LOAD_JOBS_FROM_TXT + +##Remove the # mark infront of this to forbid admins from posssessing the singularity. +#FORBID_SINGULO_POSSESSION \ No newline at end of file