From d7eb6e4ae60194b7f5cfb3652f97653e8ecb576c Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 12:35:10 -0700 Subject: [PATCH 01/12] Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker --- baystation12.dme | 62 --------------------- code/game/objects/items.dm | 8 +-- code/game/objects/items/weapons/uplinks.dm | 17 ++++-- code/modules/chemical/Chemistry-Reagents.dm | 4 +- 4 files changed, 16 insertions(+), 75 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 3535be05090..3ca192c2781 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -101,12 +101,8 @@ #define FILE_DIR "code/modules/mob/living/carbon" #define FILE_DIR "code/modules/mob/living/carbon/alien" #define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste" #define FILE_DIR "code/modules/mob/living/carbon/alien/larva" -#define FILE_DIR "code/modules/mob/living/carbon/alien/special" -#define FILE_DIR "code/modules/mob/living/carbon/brain" #define FILE_DIR "code/modules/mob/living/carbon/human" -#define FILE_DIR "code/modules/mob/living/carbon/metroid" #define FILE_DIR "code/modules/mob/living/carbon/monkey" #define FILE_DIR "code/modules/mob/living/silicon" #define FILE_DIR "code/modules/mob/living/silicon/ai" @@ -179,7 +175,6 @@ // END_PREFERENCES // BEGIN_INCLUDE #include "code\names.dm" -#include "code\setup.dm" #include "code\stylesheet.dm" #include "code\ATMOSPHERICS\atmospherics.dm" #include "code\ATMOSPHERICS\datum_pipe_network.dm" @@ -790,71 +785,14 @@ #include "code\modules\mob\living\say.dm" #include "code\modules\mob\living\blob\blob.dm" #include "code\modules\mob\living\carbon\carbon.dm" -#include "code\modules\mob\living\carbon\alien\say.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\death.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\emote.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\hud.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm" #include "code\modules\mob\living\carbon\alien\humanoid\life.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\login.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\queen.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\caste\drone.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\caste\sentinel.dm" -#include "code\modules\mob\living\carbon\alien\larva\death.dm" -#include "code\modules\mob\living\carbon\alien\larva\emote.dm" -#include "code\modules\mob\living\carbon\alien\larva\hud.dm" #include "code\modules\mob\living\carbon\alien\larva\larva.dm" #include "code\modules\mob\living\carbon\alien\larva\life.dm" -#include "code\modules\mob\living\carbon\alien\larva\login.dm" -#include "code\modules\mob\living\carbon\alien\larva\powers.dm" -#include "code\modules\mob\living\carbon\alien\special\_main.dm" -#include "code\modules\mob\living\carbon\alien\special\chryssalid.dm" -#include "code\modules\mob\living\carbon\alien\special\ethereal.dm" -#include "code\modules\mob\living\carbon\alien\special\floater.dm" -#include "code\modules\mob\living\carbon\alien\special\muton.dm" -#include "code\modules\mob\living\carbon\alien\special\sectoid.dm" -#include "code\modules\mob\living\carbon\alien\special\snakeman.dm" -#include "code\modules\mob\living\carbon\brain\brain.dm" -#include "code\modules\mob\living\carbon\brain\death.dm" -#include "code\modules\mob\living\carbon\brain\hud.dm" -#include "code\modules\mob\living\carbon\brain\life.dm" -#include "code\modules\mob\living\carbon\brain\MMI.dm" -#include "code\modules\mob\living\carbon\brain\say.dm" #include "code\modules\mob\living\carbon\human\death.dm" #include "code\modules\mob\living\carbon\human\emote.dm" -#include "code\modules\mob\living\carbon\human\examine.dm" -#include "code\modules\mob\living\carbon\human\hud.dm" #include "code\modules\mob\living\carbon\human\human.dm" -#include "code\modules\mob\living\carbon\human\human_attackalien.dm" -#include "code\modules\mob\living\carbon\human\human_attackhand.dm" -#include "code\modules\mob\living\carbon\human\human_attackpaw.dm" -#include "code\modules\mob\living\carbon\human\human_damage.dm" -#include "code\modules\mob\living\carbon\human\human_defense.dm" -#include "code\modules\mob\living\carbon\human\human_movement.dm" #include "code\modules\mob\living\carbon\human\life.dm" -#include "code\modules\mob\living\carbon\human\login.dm" -#include "code\modules\mob\living\carbon\human\say.dm" -#include "code\modules\mob\living\carbon\human\whisper.dm" -#include "code\modules\mob\living\carbon\metroid\death.dm" -#include "code\modules\mob\living\carbon\metroid\emote.dm" -#include "code\modules\mob\living\carbon\metroid\examine.dm" -#include "code\modules\mob\living\carbon\metroid\hud.dm" -#include "code\modules\mob\living\carbon\metroid\life.dm" -#include "code\modules\mob\living\carbon\metroid\login.dm" -#include "code\modules\mob\living\carbon\metroid\metroid.dm" -#include "code\modules\mob\living\carbon\metroid\powers.dm" -#include "code\modules\mob\living\carbon\metroid\say.dm" -#include "code\modules\mob\living\carbon\monkey\death.dm" -#include "code\modules\mob\living\carbon\monkey\emote.dm" -#include "code\modules\mob\living\carbon\monkey\examine.dm" -#include "code\modules\mob\living\carbon\monkey\hud.dm" -#include "code\modules\mob\living\carbon\monkey\life.dm" -#include "code\modules\mob\living\carbon\monkey\login.dm" #include "code\modules\mob\living\carbon\monkey\monkey.dm" -#include "code\modules\mob\living\carbon\monkey\powers.dm" -#include "code\modules\mob\living\carbon\monkey\say.dm" #include "code\modules\mob\living\silicon\say.dm" #include "code\modules\mob\living\silicon\silicon.dm" #include "code\modules\mob\living\silicon\ai\ai.dm" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b8aacbd87e8..c314daf72e2 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -166,7 +166,7 @@ if(!ismob(M)) return user << "\red You stab [M] with the pen." - M << "\red You feel a tiny prick!" +// M << "\red You feel a tiny prick!" //Removed to make tritor pens stealthier M.attack_log += text("\[[time_stamp()]\] Has been stabbed with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to stab [M.name] ([M.ckey])") return @@ -179,12 +179,10 @@ return /obj/item/weapon/pen/sleepypen/New() - var/datum/reagents/R = new/datum/reagents(30) //Used to be 300 + var/datum/reagents/R = new/datum/reagents(150) //Used to be 300 reagents = R R.my_atom = src - R.add_reagent("chloralhydrate", 22) //Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N -// R.add_reagent("impedrezene", 100) -// R.add_reagent("cryptobiolin", 100) + R.add_reagent("stoxin", 150) //Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N ..() return diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm index 5c934f2066c..39d0d1a9fe6 100644 --- a/code/game/objects/items/weapons/uplinks.dm +++ b/code/game/objects/items/weapons/uplinks.dm @@ -43,10 +43,11 @@ SYNDICATE UPLINK dat += "Syndicate Shoes (2)
" dat += "Syndicate Card (3)
" dat += "Voice-Changer (4)
" + dat += "Thermal Glasses (4)
" dat += "
" dat += "Freedom Implant (with injector) (3)
" dat += "Paralysis Pen (3)
" //Note that this goes to the updated sleepypen now. -// dat += "Sleepy Pen (5)
" //Terrible -Pete. + dat += "Sleepy Pen (4)
" //Terrible -Pete. //Reinstated -Skymarshal dat += "
" dat += "Detomatix Cartridge (3)
" dat += "Plastic Explosives (2)
" @@ -54,7 +55,7 @@ SYNDICATE UPLINK dat += "Syndicate-made Space Suit (inludes a helmet) (3)
" dat += "
" dat += "Chameleon-projector (4)
" - dat += "Cloaking Device (4)
" +// dat += "Cloaking Device (4)
" dat += "Electromagnet Card (3)
" dat += "5 EMP Grenades (4)
" dat += "
" @@ -131,8 +132,8 @@ SYNDICATE UPLINK var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(get_turf(src)) O.imp = new /obj/item/weapon/implant/freedom(O) if("sleepypen") - if (src.uses >= 5) - src.uses -= 5 + if (src.uses >= 4) + src.uses -= 4 new /obj/item/weapon/pen/sleepypen(get_turf(src)) if("paralysispen") if (src.uses >= 3) @@ -146,18 +147,22 @@ SYNDICATE UPLINK if (src.uses >= 7) src.uses -= 7 new /obj/item/weapon/aiModule/syndicate(get_turf(src)) - if("cloak") +/* if("cloak") if (src.uses >= 4) if (ticker.mode.config_tag!="nuclear" || \ (input(currentUser,"Spawning a cloak in nuke is generally regarded as entirely dumb, are you sure?") in list("Confirm", "Abort")) == "Confirm" \ ) if (src.uses >= 4) src.uses -= 4 - new /obj/item/weapon/cloaking_device(get_turf(src)) + new /obj/item/weapon/cloaking_device(get_turf(src)) */ if("sword") if (src.uses >= 4) src.uses -= 4 new /obj/item/weapon/melee/energy/sword(get_turf(src)) + if("thermal") + if (src.uses >= 4) + src.uses -= 4 + new /obj/item/clothing/glasses/thermal(get_turf(src)) if("bomb") if (src.uses >= 2) src.uses -= 2 diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 49b3873af62..bb1facaaee5 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -341,7 +341,7 @@ datum ..() return - cyanide +/* cyanide name = "Cyanide" id = "cyanide" description = "A highly toxic chemical." @@ -354,7 +354,7 @@ datum M:adjustOxyLoss(3) M:sleeping += 1 ..() - return + return */ stoxin name = "Sleep Toxin" From 2784d59c09fad375dcc6c81f50e46f8beb3200c8 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 12:42:03 -0700 Subject: [PATCH 02/12] Fixed derp --- baystation12.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/baystation12.dme b/baystation12.dme index 3ca192c2781..caf54c8d802 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -923,4 +923,3 @@ #include "interface\skin.dmf" #include "maps\tgstation.2.0.8.dmm" // END_INCLUDE - From 7779a4c0346811299375b10e82dccddb33e6c6ef Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 12:44:36 -0700 Subject: [PATCH 03/12] Fixed double derp. --- baystation12.dme | 64 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/baystation12.dme b/baystation12.dme index caf54c8d802..b30b50898ac 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -101,8 +101,12 @@ #define FILE_DIR "code/modules/mob/living/carbon" #define FILE_DIR "code/modules/mob/living/carbon/alien" #define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid" +#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste" #define FILE_DIR "code/modules/mob/living/carbon/alien/larva" +#define FILE_DIR "code/modules/mob/living/carbon/alien/special" +#define FILE_DIR "code/modules/mob/living/carbon/brain" #define FILE_DIR "code/modules/mob/living/carbon/human" +#define FILE_DIR "code/modules/mob/living/carbon/metroid" #define FILE_DIR "code/modules/mob/living/carbon/monkey" #define FILE_DIR "code/modules/mob/living/silicon" #define FILE_DIR "code/modules/mob/living/silicon/ai" @@ -175,6 +179,7 @@ // END_PREFERENCES // BEGIN_INCLUDE #include "code\names.dm" +#include "code\setup.dm" #include "code\stylesheet.dm" #include "code\ATMOSPHERICS\atmospherics.dm" #include "code\ATMOSPHERICS\datum_pipe_network.dm" @@ -785,14 +790,71 @@ #include "code\modules\mob\living\say.dm" #include "code\modules\mob\living\blob\blob.dm" #include "code\modules\mob\living\carbon\carbon.dm" +#include "code\modules\mob\living\carbon\alien\say.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\death.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\emote.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\hud.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm" #include "code\modules\mob\living\carbon\alien\humanoid\life.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\login.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\queen.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\caste\drone.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\caste\sentinel.dm" +#include "code\modules\mob\living\carbon\alien\larva\death.dm" +#include "code\modules\mob\living\carbon\alien\larva\emote.dm" +#include "code\modules\mob\living\carbon\alien\larva\hud.dm" #include "code\modules\mob\living\carbon\alien\larva\larva.dm" #include "code\modules\mob\living\carbon\alien\larva\life.dm" +#include "code\modules\mob\living\carbon\alien\larva\login.dm" +#include "code\modules\mob\living\carbon\alien\larva\powers.dm" +#include "code\modules\mob\living\carbon\alien\special\_main.dm" +#include "code\modules\mob\living\carbon\alien\special\chryssalid.dm" +#include "code\modules\mob\living\carbon\alien\special\ethereal.dm" +#include "code\modules\mob\living\carbon\alien\special\floater.dm" +#include "code\modules\mob\living\carbon\alien\special\muton.dm" +#include "code\modules\mob\living\carbon\alien\special\sectoid.dm" +#include "code\modules\mob\living\carbon\alien\special\snakeman.dm" +#include "code\modules\mob\living\carbon\brain\brain.dm" +#include "code\modules\mob\living\carbon\brain\death.dm" +#include "code\modules\mob\living\carbon\brain\hud.dm" +#include "code\modules\mob\living\carbon\brain\life.dm" +#include "code\modules\mob\living\carbon\brain\MMI.dm" +#include "code\modules\mob\living\carbon\brain\say.dm" #include "code\modules\mob\living\carbon\human\death.dm" #include "code\modules\mob\living\carbon\human\emote.dm" +#include "code\modules\mob\living\carbon\human\examine.dm" +#include "code\modules\mob\living\carbon\human\hud.dm" #include "code\modules\mob\living\carbon\human\human.dm" +#include "code\modules\mob\living\carbon\human\human_attackalien.dm" +#include "code\modules\mob\living\carbon\human\human_attackhand.dm" +#include "code\modules\mob\living\carbon\human\human_attackpaw.dm" +#include "code\modules\mob\living\carbon\human\human_damage.dm" +#include "code\modules\mob\living\carbon\human\human_defense.dm" +#include "code\modules\mob\living\carbon\human\human_movement.dm" #include "code\modules\mob\living\carbon\human\life.dm" +#include "code\modules\mob\living\carbon\human\login.dm" +#include "code\modules\mob\living\carbon\human\say.dm" +#include "code\modules\mob\living\carbon\human\whisper.dm" +#include "code\modules\mob\living\carbon\metroid\death.dm" +#include "code\modules\mob\living\carbon\metroid\emote.dm" +#include "code\modules\mob\living\carbon\metroid\examine.dm" +#include "code\modules\mob\living\carbon\metroid\hud.dm" +#include "code\modules\mob\living\carbon\metroid\life.dm" +#include "code\modules\mob\living\carbon\metroid\login.dm" +#include "code\modules\mob\living\carbon\metroid\metroid.dm" +#include "code\modules\mob\living\carbon\metroid\powers.dm" +#include "code\modules\mob\living\carbon\metroid\say.dm" +#include "code\modules\mob\living\carbon\monkey\death.dm" +#include "code\modules\mob\living\carbon\monkey\emote.dm" +#include "code\modules\mob\living\carbon\monkey\examine.dm" +#include "code\modules\mob\living\carbon\monkey\hud.dm" +#include "code\modules\mob\living\carbon\monkey\life.dm" +#include "code\modules\mob\living\carbon\monkey\login.dm" #include "code\modules\mob\living\carbon\monkey\monkey.dm" +#include "code\modules\mob\living\carbon\monkey\powers.dm" +#include "code\modules\mob\living\carbon\monkey\say.dm" #include "code\modules\mob\living\silicon\say.dm" #include "code\modules\mob\living\silicon\silicon.dm" #include "code\modules\mob\living\silicon\ai\ai.dm" @@ -922,4 +984,4 @@ #include "code\WorkInProgress\virus2\Disease2\monkeydispensor.dm" #include "interface\skin.dmf" #include "maps\tgstation.2.0.8.dmm" -// END_INCLUDE +// END_INCLUDE \ No newline at end of file From 9ec39e939004611aeeb800b62c7151752beccdb6 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 13:21:29 -0700 Subject: [PATCH 04/12] Replaced baystation.dme --- baystation12.dme | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index b30b50898ac..f865a695dc0 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1,6 +1,8 @@ -// DM Environment file for InSpace.dme. + + +
// DM Environment file for InSpace.dme.
 // All manual changes should be made outside the BEGIN_ and END_ blocks.
-// New source code should be placed in .dm files: choose File/New --> Code File.
+// New source code should be placed in .dm files: choose File/New --> Code File.
 // BEGIN_INTERNALS
 // END_INTERNALS
 // BEGIN_FILE_DIR
@@ -984,4 +986,6 @@
 #include "code\WorkInProgress\virus2\Disease2\monkeydispensor.dm"
 #include "interface\skin.dmf"
 #include "maps\tgstation.2.0.8.dmm"
-// END_INCLUDE
\ No newline at end of file
+// END_INCLUDE
+
+
\ No newline at end of file From 1f2a2ef68e31771f4ee69515b6111cda651f7633 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 13:36:09 -0700 Subject: [PATCH 05/12] Hopefully final fix --- baystation12.dme | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index f865a695dc0..3535be05090 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1,8 +1,6 @@ - - -
// DM Environment file for InSpace.dme.
+// DM Environment file for InSpace.dme.
 // All manual changes should be made outside the BEGIN_ and END_ blocks.
-// New source code should be placed in .dm files: choose File/New --> Code File.
+// New source code should be placed in .dm files: choose File/New --> Code File.
 // BEGIN_INTERNALS
 // END_INTERNALS
 // BEGIN_FILE_DIR
@@ -988,4 +986,3 @@
 #include "maps\tgstation.2.0.8.dmm"
 // END_INCLUDE
 
-
\ No newline at end of file From 0da1bea7c07de8967fb5eee6997cd94becd76a6a Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 13:51:10 -0700 Subject: [PATCH 06/12] Add BS12 Space Law, remove Gravitational Anomaly event --- code/game/gamemodes/events.dm | 4 +- code/game/objects/items/weapons/manuals.dm | 212 ++++++++++++++++++++- 2 files changed, 210 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 0bc3c4f6a12..e05f3fd88fd 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -29,13 +29,13 @@ meteor_wave() spawn_meteors() - if(2) +/* if(2) command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert") world << sound('granomalies.ogg') var/turf/T = pick(blobstart) var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 ) spawn(rand(50, 300)) - del(bh) + del(bh) */ /* if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert") diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index e0bf51c5ccb..ee66a58a5d8 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -575,16 +575,220 @@ author = "Nanotrasen Inc." dat = {" - - +

If you can't find the crime listed in here you need to set up a proper trial Go here: Legal Standard Operating Procedure

+

The time you took for bringing the suspect in and the time you spend questioning are NOT to be calculated into this. This is the pure time someone spends in a cell starring at the wall.
+ On laggy games first take a look at how quickly the cell timer tick... we don't want people to spend an eternity in jail for staling a pair of gloves. I am sure you have a system clock on your PC that you can keep an eye on.

+

The maximum time someone can be put in jail for is 10 minutes (exceptions are listed below)
+ Always remember that when you add crimes together!

+


+ Note: Compare the ingame version of this found in Security with the version on the wiki regularly. If the ingame version differs, follow the rules on the wiki, since they are easier to update. + Link to the wiki page: http://wiki.baystation12.co.cc/index.php/Security_Sentences + Compare changes here: http://wiki.baystation12.co.cc/index.php?title=Security_Sentences&action=history

+ +

Minor Crimes

+ + + + + + + + + + + + + + + + +
Crime + Description + Punishment + Notes +
Resisting Arrest + Not cooperating with the officer who demands you turn yourself in peacefully. Shouting "No!" or otherwise making the officer have the need to tase you to put handcuffs on. + +30 seconds to original time + See manhunt if the suspect runs away. Or attack on an officer if he fights back. This is for shouting/swearing and moving around a bit (just so you cant cuff him) only. +
Petty Theft + Stealing non-crucial items from the ship. Items can include anything from toolboxes to metal to insulated gloves. To steal something the person must take it from a place which he doesn't have access to. + 60 seconds (Half the time of Theft) + Remember to take the items away from them and return them to where they stole them. +
Theft + Stealing of important, dangerous or otherwise crucial items like IDs, weapons or something similar. To steal something the person must take it from a place which he doesn't have access to. + 2 minutes (2x the time of Petty Theft) + Remember to take the items away from them and return them to where they stole them. Compare Robbery. +
Robbery + Robbery is stealing items from another person's possession. This can be the stealing of ID's, backpack contents or anything else. + 1m 30s (3m) + Remember to take the stolen items from the person and return them, if you can find the person they've been stolen from. Otherwise put them in a locker in security. Taking the items for yourself is considered stealing!! Remember to double the time if the robbed item was an ID or something else crucial or dangerous. Compare Theft and Petty Theft. +
Assault + To assault means to attack someone without causing them to die and without the intent to kill them. + 3m + Example: Knocking someone out to take their ID yields: Assault + Robbery +
Trespassing + Trespassing means to be in an area which you don't have access to. + Remove from area, if the crime is repeated imprison for 60s + +
Indecent Exposure or being a nuisance + Running around the ship naked, yelling at people for no reason (don't arrest someone because they are arguing), throwing around stuff where it could hit someone, etc. + 30s + Drunks can be keep to sober up, but only if they are badly harassing other crew members. Regular drunks don't get arrested and if they are only a nuisance you keep them for the regular time. +
+

Medium Crimes

+ + + + + + + + + + + + + + + + + + + + +
Crime + Description + Punishment + Notes +
Assault with a deadly or dangerous weapon + Getting assaulted with a knife or tased without the intention of your attacker killing you. + 5m + Usual weapons: Stun baton, taser or other gun, wirecutters, knife or scalpel, crowbar or fire extinguisher/oxygen tank. +
Assault on an officer + Assault with whichever weapon or object on an officer. An officer is defined as either a member of the security force (forensic technician included) or one of the heads of staff. + 5m + Don't abuse him. I know you want to, but don't. At least try not to. You'll get fired. Most likely. +
Unlawful conduct or negligence resulting in ship damage or harm to crewmen. + It's impossible to list everything that can lead up to this. Starting a fire in toxins is one thing, smashing windows and major vandalism is another, as is putting someone else in harms way. If you can't put it somewhere else, bets are good that it is this. If it is still not this, you need a trial. + 3m 30s + If someone dies directly related to it, add manslaughter. +
Manslaughter + Manslaughter is the unintentional killing of a fellow human being. If you cause a fire in toxins and someone else get's trapped and dies, that's manslaughter. + 5m + If there is the intention to kill, it's murder. +
Theft of a high value item + Stealing something which we know traitors often want. + 3m + Theft of a rapid construction device (RCD), Captain's jumpsuit, Hand teleporter, captain's antique laser or other items which the traitors want. Note that they have to be kept in areas which this person doesn't have access to. +
Threatening Ship Integrity + To threaten the ships integrity means to cause mediocre damage to the ships atmosphere, this means to create an air or gas leak that affects a vital part of the ship, or destroying an interior wall. + 5m + If it wasn't on purpose or if the damage is easily fixed see Unlawful conduct. +
Threatening Power Supply + Cutting power lines, shutting down power storage units, engine's power generators, etc. + 4m + remove insulated gloves and wirecutters and anything else that might be related, like engineering access. + This does not include blowing up the Engine. See Compromising Ship Integrity further down. +
Sparking a man-hunt or chase + This means the officer needs to chase after you to catch you. It means you actually flee from the scene. + +3m to original time + This will happen to you often... +
Escape attempt + Attempting to escape from the brig. + +2m to current time, this can exceed the maximum jail time. + It's the job of the officer to prevent such events. +
+

Major Crimes

+ + + + + + + + + + + + +
Crime + Description + Punishment + Notes +
Identity Theft + Stealing someones ID and/or other objects of identification with the purpose to appear to others as them or to enter into areas where the suspect would normally not have access. + 10 minutes + The case of impersonation regarding ship equipment(doors, computer terminals, AI, etc) or personnel has to be proven, otherwise see Petty Theft/Robbery. Remember to double the time if the object was an ID or something similar crucial (Compare Petty Theft). +
Syndicate collaboration + Being either a traitor, a syndicate operative or a head revolutionary + Until the end of the round
(disregard maximum sentence time)
or DEATH
(if approved by the Captain) + 		You have two choices: Killing them or permabrigging them. If you choose to kill them, first ask for permission from the Captain. If permission is given, it is wise to first Adminhelp your intentions. Adminhelp something like: "I have grounds to believe X is a rev head. I have him locked in the brig and intend to kill him. If you have any objections to this action, please contact me." then wait for about a minute. If no PM comes, proceed to kill him. The other option is to permabrig them. This simply means you put them in the brig and don't ever let them out until your are going to evac. Then cuff them and secure them on one of the pods. (Note that Head Revolutionaries MUST be executed for you to win the round.) +
Murder + Killing someone with the intent to kill. + Death Sentence if authorised by the Captain. Otherwise brigging for the rest of the round. + Not to be confused with Manslaughter. Hint: Cyborgification is a valid execution method, since he will be bound by laws. +
Attempted Murder + Attempting to kill someone. The victim survives. + See Murder + Regardless if you succeed or not, if you try to commit murder, the punishment is the same! You have to be sure there was intent to kill though! +
Compromising Ship Integrity + Compromising a large part of the Ships atmosphere or integrity. + 10m (You are going to evac anyway. Cuff him and secure him on a pod.) + Blowing up the Engine is included here. +
+

Parole Circumstances

+

Okay, we've covered all the punishments. Now for the parole circumstances. These circumstances will shorten your prisoner's time in jail. +

Note that all of these add up to a maximum of 33%!! +

+ + + + + + + + + + + + + + +
Crime + Description + Benefit + Notes +
Good behavior + Behaving well, not attempting any problems or causing riots or screaming and yelling. + -20% of original time + It sounds like a good deal... but few will actually take it. +
Reeducation + Getting de-converted from revolutionary, renouncing traitoring (must be arranged with admins), etc. (most of these must be arranged with admins) + -15% of original time + +
Cooperation with prosecution or security + Being helpful to the members of security, revealing things during questioning or providing names of head revolutionaries. + -10% + In the case of revealing a head revolutionary: Immediate release +
Surrender + Coming to the brig, confessing what you've done and taking the punishment. + -25% + Getting arrested without putting a fuss is not surrender. For this, you have to actually come to the brig yourself. +
Immediate threat to the prisoner + Call for evac, atmospheric problems in the Brig or SecHQ area, threat of being overrun by revolutionaries, etc + Immediately move the prisoner.
If that is not possible: Immediate Release! + 		Keep in mind the time until they get released. Exception is if the person is a CONFIRMED traitor, syndicate operative or head of revolutionary. In those cases you can leave them to die. +
Medical reasons + The person needs immediate medical attention + Immediate escort to medbay + The sentence timer continues to tick while he's at medbay, it's not paused. +
+ - - "} /obj/item/weapon/book/manual/engineering_guide From 6f88b4f981d04b47aae9f49a187b5823b193c39a Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 13:57:26 -0700 Subject: [PATCH 07/12] Forgot to remove the entry from the table the random event switch looks at. --- code/game/gamemodes/events.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index e05f3fd88fd..1201758185c 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -13,7 +13,7 @@ /proc/event() event = 1 - var/eventNumbersToPickFrom = list(1,2,4,5,6,7,8,9,10,11,12,13) //so ninjas don't cause "empty" events. + var/eventNumbersToPickFrom = list(1,4,5,6,7,8,9,10,11,12,13) //so ninjas don't cause "empty" events. if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. eventNumbersToPickFrom += 3 From ff8ca07714801a9350eb8b53c7d6f05754a7d70e Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 14:05:14 -0700 Subject: [PATCH 08/12] Removed accelerated shuttle launch. --- code/game/machinery/computer/shuttle.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index b278ab2f7be..4f057e8eab7 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -6,7 +6,7 @@ var/list/authorized = list( ) - attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob) +/* attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob) if(stat & (BROKEN|NOPOWER)) return if ((!( istype(W, /obj/item/weapon/card) ) || !( ticker ) || emergency_shuttle.location != 1 || !( user ))) return if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) @@ -61,4 +61,4 @@ emergency_shuttle.settimeleft( 10 ) if("Cancel") return - return + return */ From 009d0915bf66d91b388db41576e7cb61e5b2a33c Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 14:22:45 -0700 Subject: [PATCH 09/12] Removed most other cyanide references. Remade cyanide pills into suicide pills (100 units of Toxin) --- code/game/gamemodes/events/ninja_equipment.dm | 2 +- code/modules/chemical/Chemistry-Reagents.dm | 8 ++++---- code/modules/chemical/Chemistry-Recipes.dm | 2 +- code/modules/chemical/Chemistry-Tools.dm | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 6c489d87a22..6ae765c6f9f 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -380,7 +380,7 @@ ________________________________________________________________________________ Equipment: cannot be tracked by AI (passive), faster speed (passive), stealth (active), vision switch (passive if toggled), voice masking (passive), SpiderOS (passive if toggled), energy drain (passive if toggled).
  • Voice masking generates a random name the ninja can use over the radio and in-person. Although, the former use is recommended.
    • -
  • Toggling vision cycles to one of the following: thermal, meson, or darkness vision. The starting mode allows one to scout the identity of those in view, revealing their role. Traitors, revolutionaries, wizards, and other such people will be made known to you.
    • +
  • Toggling vision cycles to one of the following: , meson, or darkness vision. The starting mode allows one to scout the identity of those in view, revealing their role. Traitors, revolutionaries, wizards, and other such people will be made known to you.
  • Stealth, when activated, drains more battery charge and works similarly to a syndicate cloak. The cloak will deactivate when most Abilities are utilized.
  • On-board AI: The suit is able to download an AI much like an intelicard. Check with SpiderOS for details once downloaded.
  • SpiderOS is a specialized, PDA-like screen that allows for a small variety of functions, such as injecting healing chemicals directly from the suit. You are using it now, if that was not already obvious. You may also download AI modules directly to the OS.
    • diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index bb1facaaee5..5bbd90e4101 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -314,8 +314,8 @@ datum holder.remove_reagent("plasma", 1) if(holder.has_reagent("acid")) holder.remove_reagent("acid", 1) - if(holder.has_reagent("cyanide")) - holder.remove_reagent("cyanide", 1) +/* if(holder.has_reagent("cyanide")) + holder.remove_reagent("cyanide", 1) */ if(holder.has_reagent("amatoxin")) holder.remove_reagent("amatoxin", 2) if(holder.has_reagent("chloralhydrate")) @@ -1235,8 +1235,8 @@ datum holder.remove_reagent("acid", 5) if(holder.has_reagent("pacid")) holder.remove_reagent("pacid", 5) - if(holder.has_reagent("cyanide")) - holder.remove_reagent("cyanide", 5) +/* if(holder.has_reagent("cyanide")) + holder.remove_reagent("cyanide", 5) */ if(holder.has_reagent("lexorin")) holder.remove_reagent("lexorin", 5) if(holder.has_reagent("amatoxin")) diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm index 36183d6f889..6c568571302 100644 --- a/code/modules/chemical/Chemistry-Recipes.dm +++ b/code/modules/chemical/Chemistry-Recipes.dm @@ -600,7 +600,7 @@ datum var/list/data = list("viruses"= list(F)) holder.add_reagent("blood", 20, data) - holder.add_reagent("cyanide", rand(1,10)) + holder.add_reagent("toxin", rand(1,10)) return diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 16f0fe07c7a..cd2709ec38c 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -1768,7 +1768,7 @@ ..() reagents.add_reagent("toxin", 30) -/obj/item/weapon/reagent_containers/glass/bottle/cyanide +/*/obj/item/weapon/reagent_containers/glass/bottle/cyanide name = "cyanide bottle" desc = "A small bottle of cyanide. Bitter almonds?" icon = 'chemical.dmi' @@ -1776,7 +1776,7 @@ New() ..() - reagents.add_reagent("cyanide", 30) + reagents.add_reagent("cyanide", 30) */ /obj/item/weapon/reagent_containers/glass/bottle/stoxin name = "sleep-toxin bottle" @@ -2557,12 +2557,12 @@ reagents.add_reagent("toxin", 50) /obj/item/weapon/reagent_containers/pill/cyanide - name = "Cyanide pill" + name = "Suicide pill" desc = "Don't swallow this." icon_state = "pill5" New() ..() - reagents.add_reagent("cyanide", 50) + reagents.add_reagent("toxin", 100) /obj/item/weapon/reagent_containers/pill/adminordrazine name = "Adminordrazine pill" From dafbfe6edd4136b6a1262bab7f95a71414f7e3d1 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 14:25:24 -0700 Subject: [PATCH 10/12] Replaced an accidentially blanked part of flavor text --- code/game/gamemodes/events/ninja_equipment.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 6ae765c6f9f..6c489d87a22 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -380,7 +380,7 @@ ________________________________________________________________________________ Equipment: cannot be tracked by AI (passive), faster speed (passive), stealth (active), vision switch (passive if toggled), voice masking (passive), SpiderOS (passive if toggled), energy drain (passive if toggled).
    • Voice masking generates a random name the ninja can use over the radio and in-person. Although, the former use is recommended.
      • -
    • Toggling vision cycles to one of the following: , meson, or darkness vision. The starting mode allows one to scout the identity of those in view, revealing their role. Traitors, revolutionaries, wizards, and other such people will be made known to you.
      • +
    • Toggling vision cycles to one of the following: thermal, meson, or darkness vision. The starting mode allows one to scout the identity of those in view, revealing their role. Traitors, revolutionaries, wizards, and other such people will be made known to you.
    • Stealth, when activated, drains more battery charge and works similarly to a syndicate cloak. The cloak will deactivate when most Abilities are utilized.
    • On-board AI: The suit is able to download an AI much like an intelicard. Check with SpiderOS for details once downloaded.
    • SpiderOS is a specialized, PDA-like screen that allows for a small variety of functions, such as injecting healing chemicals directly from the suit. You are using it now, if that was not already obvious. You may also download AI modules directly to the OS.
      • From b5018a8aa323a1026c286691a2683c046f624842 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 14:29:21 -0700 Subject: [PATCH 11/12] Removed thermals from traitor objectives. --- code/game/gamemodes/objective.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 419061b9fb5..afe9ac0b69b 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -258,7 +258,6 @@ datum/objective/steal "a functional AI" = /obj/item/device/aicard, "a pair of magboots" = /obj/item/clothing/shoes/magboots, "the station blueprints" = /obj/item/blueprints, - "thermal optics" = /obj/item/clothing/glasses/thermal, "a nasa voidsuit" = /obj/item/clothing/suit/space/nasavoid, "28 moles of plasma (full tank)" = /obj/item/weapon/tank, ) From 3319b22adf33c757fc42aa515bc05db894fd0e90 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 8 Dec 2011 15:08:03 -0700 Subject: [PATCH 12/12] Remove killbot ref. when you make an ED-209, reversed list order for QM requests and orders. --- code/game/machinery/bots/ed209bot.dm | 2 +- code/game/supplyshuttle.dm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 0e4f95eabb5..2d923b416d2 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -828,7 +828,7 @@ Auto Patrol: []"}, else if(istype(W, /obj/item/weapon/cable_coil) && (src.build_step == 6) ) var/obj/item/weapon/cable_coil/coil = W var/turf/T = get_turf(user) - user.visible_message("[user] wires killbot.", "You start to wire the killbot.") + user.visible_message("[user] wires the ED-209 assembly.", "You start to wire the ED-209 assembly.") sleep(40) if(get_turf(user) == T) coil.use(1) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 269a4ff4a69..96284d1071b 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -312,14 +312,14 @@ var/ordernum=0 src.temp = "Current approved orders:

      " for(var/S in supply_shuttle_shoppinglist) var/datum/supply_order/SO = S - src.temp += "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]
      " + src.temp = "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]
      " + src.temp src.temp += "
      OK" else if (href_list["viewrequests"]) src.temp = "Current requests:

      " for(var/S in supply_shuttle_requestlist) var/datum/supply_order/SO = S - src.temp += "[SO.object.name] requested by [SO.orderedby]
      " + src.temp = "[SO.object.name] requested by [SO.orderedby]
      " + src.temp src.temp += "
      OK" else if (href_list["mainmenu"]) @@ -483,7 +483,7 @@ var/ordernum=0 src.temp = "Current approved orders:

      " for(var/S in supply_shuttle_shoppinglist) var/datum/supply_order/SO = S - src.temp += "[SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""]
      "// (Cancel)
      " + src.temp = "[SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""]
      " + src.temp// (Cancel)
      " src.temp += "
      OK" /* else if (href_list["cancelorder"]) @@ -501,7 +501,7 @@ var/ordernum=0 src.temp = "Current requests:

      " for(var/S in supply_shuttle_requestlist) var/datum/supply_order/SO = S - src.temp += "[SO.object.name] requested by [SO.orderedby] [supply_shuttle_moving ? "":supply_shuttle_at_station ? "":"Approve Remove"]
      " + src.temp = "[SO.object.name] requested by [SO.orderedby] [supply_shuttle_moving ? "":supply_shuttle_at_station ? "":"Approve Remove"]
      " + src.temp src.temp += "
      Clear list" src.temp += "
      OK"