Merge pull request #131 from SamCroswell/master

More C4 suicide phrases. For no Raisin.
This commit is contained in:
ZomgPonies
2014-01-28 20:15:26 -08:00
10 changed files with 11384 additions and 11451 deletions
-4
View File
@@ -117,7 +117,3 @@
drain("RESEARCH",A,suit)
return 1
if(istype(A,/mob/living/carbon/human))
drain("HUMAN",A,suit)
return 1
@@ -53,7 +53,6 @@
//Ability function variables.
var/s_bombs = 10.0//Number of starting ninja smoke bombs.
var/a_boost = 3.0//Number of adrenaline boosters.
var/h_stings = 5.0// Experementing with a wrist-mounted hypospray for delivering various drugs. Right now I'm thinking hallucigenics.
//Onboard AI related variables.
var/mob/living/silicon/ai/AI//If there is an AI inside the suit.
+1 -1
View File
@@ -99,7 +99,7 @@ var/global/list/possibleEvents = list()
if(aliens_allowed && !sent_aliens_to_station)
possibleEvents[/datum/event/alien_infestation] = max(active_with_role["Security"], 5) + 2.5
if(!sent_ninja_to_station && toggle_space_ninja)
possibleEvents[/datum/event/space_ninja] = max(active_with_role["Security"], 5)
possibleEvents[/datum/event/space_ninja] = active_with_role["Security"] * 20
possibleEvents[/datum/event/undead] = active_with_role["Security"] * 10
possibleEvents[/datum/event/ghosts] = active_with_role["Security"] * 25
possibleEvents[/datum/event/tear] = active_with_role["Security"] * 25