diff --git a/code/WorkInProgress/Yinadele/Supermatter.dm b/code/WorkInProgress/Yinadele/Supermatter.dm
index 5b3f2e6e5b9..05f6bdf042e 100644
--- a/code/WorkInProgress/Yinadele/Supermatter.dm
+++ b/code/WorkInProgress/Yinadele/Supermatter.dm
@@ -1,14 +1,14 @@
#define NITROGEN_RETARDATION_FACTOR 4 //Higher == N2 slows reaction more
-#define THERMAL_RELEASE_MODIFIER 25 //Higher == less heat released during reaction
+#define THERMAL_RELEASE_MODIFIER 20 //Higher == less heat released during reaction
#define PLASMA_RELEASE_MODIFIER 1500 //Higher == less plasma released by reaction
#define OXYGEN_RELEASE_MODIFIER 750 //Higher == less oxygen released at high temperature/power
#define REACTION_POWER_MODIFIER 1.1 //Higher == more overall power
//These would be what you would get at point blank, decreases with distance
-#define DETONATION_RADS 300000
-#define DETONATION_HALLUCINATION 60000
+#define DETONATION_RADS 350000
+#define DETONATION_HALLUCINATION 600000
#define WARNING_DELAY 60 //45 seconds between warnings.
@@ -122,6 +122,8 @@
if(damage > explosion_point)
for(var/mob/living/mob in living_mob_list)
+ if ((mob.z != src.z) && (mob.z != 0))
+ continue
if(istype(mob, /mob/living/carbon/human))
//Hilariously enough, running into a closet should make you get hit the hardest.
mob:hallucination += max(50, min(300, DETONATION_HALLUCINATION/((get_dist(mob, src)+1)**2) ) )
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index f092665ef1f..6e3600d894a 100644
--- a/code/game/area/Space Station 13 areas.dm
+++ b/code/game/area/Space Station 13 areas.dm
@@ -1949,7 +1949,6 @@ var/list/the_station_areas = list (
/area/bridge,
/area/crew_quarters,
/area/holodeck,
- /area/mint,
/area/library,
/area/chapel,
/area/lawoffice,
diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm
index 4a79d656b3f..d075f80d2fe 100644
--- a/code/game/gamemodes/blob/blobs/factory.dm
+++ b/code/game/gamemodes/blob/blobs/factory.dm
@@ -21,7 +21,7 @@
return 0
if(spore_delay > world.time)
return 0
- spore_delay = world.time + 300 // 30 seconds
+ spore_delay = world.time + 150 // 15 seconds
new/mob/living/simple_animal/hostile/blobspore(src.loc, src)
return 1
diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm
index d8d4623b3a2..f6847e63986 100644
--- a/code/modules/events/event_dynamic.dm
+++ b/code/modules/events/event_dynamic.dm
@@ -63,7 +63,7 @@ var/global/list/possibleEvents = list()
possibleEvents[/datum/event/money_hacker] = max(min(25, player_list.len) * 4, 200)
possibleEvents[/datum/event/carp_migration] = 50 + 50 * active_with_role["Engineer"]
- possibleEvents[/datum/event/spider_infestation] = 50 + 50 * active_with_role["Security"]
+ possibleEvents[/datum/event/spider_infestation] = 50 + 25 * active_with_role["Security"]
possibleEvents[/datum/event/dust] = 50 + 50 * active_with_role["Engineer"]
possibleEvents[/datum/event/dust/meaty] = 50 + 50 * active_with_role["Engineer"]
possibleEvents[/datum/event/brand_intelligence] = 50 + 25 * active_with_role["Engineer"]
diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm
index 472e64c0d58..11c9a320432 100644
--- a/code/modules/events/event_manager.dm
+++ b/code/modules/events/event_manager.dm
@@ -83,7 +83,10 @@ var/scheduledEvent = null
/area/shuttle/escape_pod5/station,
/area/shuttle/mining/station,
/area/shuttle/transport1/station,
- /area/shuttle/specops/station)
+ /area/shuttle/specops/station,
+ /area/shuttle/prison/station,
+ /area/shuttle/administration/station
+ )
//These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up.
var/list/danger_areas = list(
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 1b89f93ce26..7952ac06e4c 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -1037,7 +1037,7 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- M.apply_effect(2*REM,IRRADIATE,0)
+ M.apply_effect(8*REM,IRRADIATE,0)
// radium may increase your chances to cure a disease
if(istype(M,/mob/living/carbon)) // make sure to only use it on carbon mobs
var/mob/living/carbon/C = M
@@ -1129,7 +1129,7 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M.dna) return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
if(!M) M = holder.my_atom
- M.apply_effect(10,IRRADIATE,0)
+ M.apply_effect(4*REM,IRRADIATE,0)
..()
return
diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm
index 923b2cf7d0e..af02775e47e 100644
--- a/code/modules/virus2/effect.dm
+++ b/code/modules/virus2/effect.dm
@@ -51,6 +51,7 @@
/datum/disease2/effect/alien
name = "Unidentified Foreign Body"
stage = 4
+ badness = 3
activate(var/mob/living/carbon/mob,var/multiplier)
mob << "\red You feel something tearing its way out of your stomach..."
mob.adjustToxLoss(10)
@@ -106,13 +107,14 @@
stage = 4
badness = 2
activate(var/mob/living/carbon/mob,var/multiplier)
- mob.suiciding = 1
- //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while
- viewers(mob) << "\red [mob.name] is holding \his breath. It looks like \he's trying to commit suicide."
- mob.adjustOxyLoss(175 - mob.getToxLoss() - mob.getFireLoss() - mob.getBruteLoss() - mob.getOxyLoss())
- mob.updatehealth()
- spawn(200) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds
- mob.suiciding = 0
+ if (mob.suiciding == 0)
+ mob.suiciding = 1
+ //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while
+ viewers(mob) << "\red [mob.name] is holding \his breath. It looks like \he's trying to commit suicide."
+ mob.adjustOxyLoss(175 - mob.getToxLoss() - mob.getFireLoss() - mob.getBruteLoss() - mob.getOxyLoss())
+ mob.updatehealth()
+ spawn(200) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds
+ mob.suiciding = 0
/datum/disease2/effect/killertoxins
name = "Toxification Syndrome"