The station has been evacuated.
The station is currently undergoing evacuation procedures.
"
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 6800d140184..3dba0acb8ca 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -108,3 +108,10 @@
M << "
You're not feeling good at all! You really need some [name]."
return
+/proc/pretty_string_from_reagent_list(var/list/reagent_list)
+ //Convert reagent list to a printable string for logging etc
+ var/result = "| "
+ for (var/datum/reagent/R in reagent_list)
+ result += "[R.name], [R.volume] | "
+
+ return result
diff --git a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
index 6265d0cb858..a6bb05181a7 100644
--- a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
@@ -1,18 +1,32 @@
// These can only be applied by blobs. They are what blobs are made out of.
// The 4 damage
/datum/reagent/blob
+ description = ""
var/message = "The blob strikes you" //message sent to any mob hit by the blob
var/message_living = null //extension to first mob sent to only living mobs i.e. silicons have no skin to be burnt
/datum/reagent/blob/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection)
return round(reac_volume * min(1.5 - touch_protection, 1), 0.1) //full touch protection means 50% volume, any prot below 0.5 means 100% volume.
-/datum/reagent/blob/boiling_oil
+/datum/reagent/blob/ripping_tendrils //does brute and a little stamina damage
+ name = "Ripping Tendrils"
+ id = "ripping_tendrils"
+ color = "#7F0000"
+ message_living = ", and you feel your skin ripping and tearing off"
+
+/datum/reagent/blob/ripping_tendrils/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ reac_volume = ..()
+ M.apply_damage(0.6*reac_volume, BRUTE)
+ M.adjustStaminaLoss(0.4*reac_volume)
+ if(iscarbon(M))
+ M.emote("scream")
+
+/datum/reagent/blob/boiling_oil //sets you on fire, does burn damage
name = "Boiling Oil"
id = "boiling_oil"
- description = ""
color = "#B68D00"
message = "The blob splashes you with burning oil"
+ message_living = ", and you feel your skin char and melt"
/datum/reagent/blob/boiling_oil/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
M.adjust_fire_stacks(round(reac_volume/12))
@@ -22,86 +36,57 @@
if(iscarbon(M))
M.emote("scream")
-/datum/reagent/blob/toxic_goop
- name = "Toxic Goop"
- id = "toxic_goop"
- description = ""
- color = "#008000"
+/datum/reagent/blob/envenomed_filaments //toxin, hallucination, and some bonus spore toxin
+ name = "Envenomed Filaments"
+ id = "envenomed_filaments"
+ color = "#9ACD32"
message_living = ", and you feel sick and nauseated"
-/datum/reagent/blob/toxic_goop/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+/datum/reagent/blob/envenomed_filaments/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
reac_volume = ..()
- M.apply_damage(0.8*reac_volume, TOX)
+ M.apply_damage(0.6*reac_volume, TOX)
+ M.hallucination += 0.6*reac_volume
+ M.reagents.add_reagent("spore", 0.4*reac_volume)
-/datum/reagent/blob/skin_ripper
- name = "Skin Ripper"
- id = "skin_ripper"
- description = ""
- color = "#FF4C4C"
- message_living = ", and you feel your skin ripping and tearing off"
-
-/datum/reagent/blob/skin_ripper/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- reac_volume = ..()
- M.apply_damage(0.8*reac_volume, BRUTE)
- if(iscarbon(M))
- M.emote("scream")
-
-// Combo Reagents
-
-/datum/reagent/blob/skin_melter
- name = "Skin Melter"
- id = "skin_melter"
- description = ""
- color = "#7F0000"
- message_living = ", and you feel your skin char and melt"
-
-/datum/reagent/blob/skin_melter/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- M.adjust_fire_stacks(round(reac_volume/12))
- reac_volume = ..()
- M.apply_damage(0.4*reac_volume, BRUTE)
- M.apply_damage(0.4*reac_volume, BURN)
- M.IgniteMob()
- if(iscarbon(M))
- M.emote("scream")
-
-/datum/reagent/blob/lung_destroying_toxin
- name = "Lung Destroying Toxin"
- id = "lung_destroying_toxin"
- description = ""
+/datum/reagent/blob/lexorin_jelly //does tons of oxygen damage and a little brute
+ name = "Lexorin Jelly"
+ id = "lexorin_jelly"
color = "#00FFC5"
message_living = ", and your lungs feel heavy and weak"
-/datum/reagent/blob/lung_destroying_toxin/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- reac_volume = ..()
- M.apply_damage(0.8* reac_volume, OXY)
- M.losebreath += round(0.6*reac_volume)
- M.apply_damage(0.8*reac_volume, TOX)
-
-// Special Reagents
-
-/datum/reagent/blob/radioactive_liquid
- name = "Radioactive Liquid"
- id = "radioactive_liquid"
- description = ""
- color = "#00EE00"
- message_living = ", and your skin feels papery and everything hurts"
-
-/datum/reagent/blob/radioactive_liquid/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+/datum/reagent/blob/lexorin_jelly/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
reac_volume = ..()
M.apply_damage(0.4*reac_volume, BRUTE)
- if(ishuman(M))
- M.irradiate(1.6*reac_volume)
- if(prob(1.3*reac_volume))
- randmuti(M)
- if(prob(98))
- randmutb(M)
- domutcheck(M, null)
- updateappearance(M)
+ M.apply_damage(1*reac_volume, OXY)
+ M.losebreath += round(0.3*reac_volume)
-/datum/reagent/blob/dark_matter
+/datum/reagent/blob/kinetic //does semi-random brute damage
+ name = "Kinetic Gelatin"
+ id = "kinetic"
+ color = "#FFA500"
+ message = "The blob pummels you"
+
+/datum/reagent/blob/kinetic/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ reac_volume = ..()
+ var/damage = rand(5, 35)/25
+ M.apply_damage(damage*reac_volume, BRUTE)
+
+/datum/reagent/blob/cryogenic_liquid //does low burn damage and stamina damage and cools targets down
+ name = "Cryogenic Liquid"
+ id = "cryogenic_liquid"
+ color = "#8BA6E9"
+ message = "The blob splashes you with an icy liquid"
+ message_living = ", and you feel cold and tired"
+
+/datum/reagent/blob/cryogenic_liquid/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ reac_volume = ..()
+ M.apply_damage(0.4*reac_volume, BURN)
+ M.adjustStaminaLoss(0.4*reac_volume)
+ M.reagents.add_reagent("frostoil", 0.4*reac_volume)
+
+/datum/reagent/blob/dark_matter //does brute damage and throws or pulls nearby objects at the target
name = "Dark Matter"
id = "dark_matter"
- description = ""
color = "#61407E"
message = "You feel a thrum as the blob strikes you, and everything flies at you"
@@ -110,10 +95,9 @@
reac_volume = ..()
M.apply_damage(0.6*reac_volume, BRUTE)
-/datum/reagent/blob/b_sorium
+/datum/reagent/blob/b_sorium //does brute damage and throws or pushes nearby objects away from the target
name = "Sorium"
id = "b_sorium"
- description = ""
color = "#808000"
message = "The blob slams into you, and sends you flying"
@@ -122,44 +106,6 @@
reac_volume = ..()
M.apply_damage(0.6*reac_volume, BRUTE)
-/datum/reagent/blob/explosive // I'm gonna burn in hell for this one
- name = "Explosive Gelatin"
- id = "explosive"
- description = ""
- color = "#FFA500"
- message = "The blob strikes you, and its tendrils explode"
-
-/datum/reagent/blob/explosive/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- if(prob(3*reac_volume))
- explosion(M.loc, 0, 0, 1, 0, 0)
-
-/datum/reagent/blob/omnizine
- name = "Omnizine"
- id = "b_omnizine"
- description = ""
- color = "#C8A5DC"
- message = "The blob squirts something at you"
- message_living = ", and you feel great"
-
-/datum/reagent/blob/omnizine/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- reac_volume = ..()
- M.reagents.add_reagent("omnizine", 0.6*reac_volume)
-
-/datum/reagent/blob/spacedrugs
- name = "Space drugs"
- id = "b_space_drugs"
- description = ""
- color = "#60A584"
- message = "The blob squirts something at you"
- message_living = ", and you feel funny"
-
-/datum/reagent/blob/spacedrugs/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- reac_volume = ..()
- M.hallucination += 0.8*reac_volume
- M.reagents.add_reagent("space_drugs", 0.6*reac_volume)
- M.apply_damage(0.4*reac_volume, TOX)
-
-
/datum/reagent/blob/proc/reagent_vortex(mob/living/M, setting_type, reac_volume)
var/turf/pull = get_turf(M)
var/range_power = Clamp(round(reac_volume/5, 1), 1, 5)
diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
index b951d205880..e8df9af6064 100644
--- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
@@ -121,7 +121,7 @@
name = "Frost Oil"
id = "frostoil"
description = "A special oil that noticably chills the body. Extraced from Icepeppers."
- color = "#B31008" // rgb: 139, 166, 233
+ color = "#8BA6E9" // rgb: 139, 166, 233
/datum/reagent/consumable/frostoil/on_mob_life(mob/living/M)
switch(current_cycle)
diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
index fcdf66fa5b2..8cf1734dc42 100644
--- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
@@ -221,7 +221,7 @@
id = "spore"
description = "A toxic spore cloud which blocks vision when ingested."
color = "#9ACD32"
- toxpwr = 0.5
+ toxpwr = 1
/datum/reagent/toxin/spore/on_mob_life(mob/living/M)
M.damageoverlaytemp = 60
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 58ef59bfd34..777cb0bc607 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -13,19 +13,14 @@
throw_range = 6
origin_tech = "biotech=3"
var/Uses = 1 // uses before it goes inert
- var/enhanced = 0 //has it been enhanced before?
/obj/item/slime_extract/attackby(obj/item/O, mob/user)
- if(istype(O, /obj/item/slimepotion/steroid))
- if(enhanced == 1)
- user << "
This extract has already been enhanced!"
+ if(istype(O, /obj/item/slimepotion/enhancer))
+ if(Uses >= 5)
+ user << "
You cannot enhance this extract further!"
return ..()
- if(Uses == 0)
- user << "
You can't enhance a used extract!"
- return ..()
- user <<"
You apply the enhancer. It now has triple the amount of uses."
- Uses = 3
- enhanced = 1
+ user <<"
You apply the enhancer to the slime extract. It may now be reused one more time."
+ Uses++
qdel(O)
/obj/item/slime_extract/New()
@@ -226,7 +221,7 @@
/obj/item/slimepotion/steroid
name = "slime steroid"
- desc = "A potent chemical mix that will cause a slime to generate more extract."
+ desc = "A potent chemical mix that will cause a baby slime to generate more extract."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
@@ -240,34 +235,20 @@
if(M.stat)
user << "
The slime is dead!"
return..()
- if(M.cores == 3)
+ if(M.cores >= 5)
user <<"
The slime already has the maximum amount of extract!"
return..()
- user <<"
You feed the slime the steroid. It now has triple the amount of extract."
- M.cores = 3
+ user <<"
You feed the slime the steroid. It will now produce one more extract."
+ M.cores++
qdel(src)
/obj/item/slimepotion/enhancer
name = "extract enhancer"
- desc = "A potent chemical mix that will give a slime extract three uses."
+ desc = "A potent chemical mix that will give a slime extract an additional use."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
- /*afterattack(obj/target, mob/user , flag)
- if(istype(target, /obj/item/slime_extract))
- if(target.enhanced == 1)
- user << "
This extract has already been enhanced!"
- return ..()
- if(target.Uses == 0)
- user << "
You can't enhance a used extract!"
- return ..()
- user <<"You apply the enhancer. It now has triple the amount of uses."
- target.Uses = 3
- target.enahnced = 1
- qdel(src)*/
-
-
/obj/item/slimepotion/stabilizer
name = "slime stabilizer"
desc = "A potent chemical mix that will reduce the chance of a slime mutating."
diff --git a/config/admins.txt b/config/admins.txt
index 852f58e02b9..3b29d011131 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -92,3 +92,4 @@ Dunc = Game Master
MMMiracles = Game Master
bear1ake = Game Master
CoreOverload = Game Master
+Jalleo = Game Master
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 8d71d8d1f3d..450653912d3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,12 @@
-->
+
07 September 2015
+
xxalpha updated:
+
+ - Changed xeno weed spread to be like gas spread.
+
+
06 September 2015
Fox P McCloud updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index aa5ac0ba361..0ba050a0c60 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1708,3 +1708,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Xhuis:
- bugfix: Nanotrasen inspectors have discovered a fault in the buckles of chairs
and beds. This has been fixed and you are now able to buckle again.
+2015-09-07:
+ xxalpha:
+ - tweak: Changed xeno weed spread to be like gas spread.
diff --git a/html/changelogs/Joan-blobchemswoowoo.yml b/html/changelogs/Joan-blobchemswoowoo.yml
new file mode 100644
index 00000000000..17fc20d805d
--- /dev/null
+++ b/html/changelogs/Joan-blobchemswoowoo.yml
@@ -0,0 +1,12 @@
+author: Joan
+
+delete-after: True
+
+changes:
+ - rscadd: "New blob chemical; Cryogenic Liquid. Cools down targets."
+ - tweak: "Tweaked names, colors, and effects of remaining blob chemicals;"
+ - tweak: "Skin Ripper is now Ripping Tendrils and does minor stamina damage, in addition to the brute damage."
+ - tweak: "Toxic Goop is now Envenomed Filaments and injects targets with spore toxin and causes hallucinations, in addition to the toxin damage."
+ - tweak: "Lung Destroying Toxin is now Lexorin Jelly and does brute damage instead of toxin damage. The oxygen loss it causes can also no longer crit you in one hit."
+ - tweak: "Explosive Gelatin is now Kinetic Gelatin and does random brute damage, instead of randomly exploding targets."
+ - rscdel: "Skin Melter, Radioactive Liquid, Omnizine, and Space Drugs blob chemicals are gone."
\ No newline at end of file
diff --git a/html/changelogs/bgobandit - legitposters.yml b/html/changelogs/bgobandit - legitposters.yml
new file mode 100644
index 00000000000..dd2b99c8ea6
--- /dev/null
+++ b/html/changelogs/bgobandit - legitposters.yml
@@ -0,0 +1,7 @@
+author: bgobandit
+
+delete-after: True
+
+changes:
+ - rscadd: "Nanotrasen has commissioned two new corporate motivational posters for your perusal and edification."
+ - rscadd: "Nanotrasen also wishes to remind the crew that non-authorized posters ARE CONTRABAND. Especially those new ones with Rule 34. Perverts."
\ No newline at end of file
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index 3e03b1b7155..b5993088523 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/doors/airlocks/hatch/overlays.dmi b/icons/obj/doors/airlocks/hatch/overlays.dmi
index ba39f7291e9..738f7e8fce5 100644
Binary files a/icons/obj/doors/airlocks/hatch/overlays.dmi and b/icons/obj/doors/airlocks/hatch/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/station/command.dmi b/icons/obj/doors/airlocks/station/command.dmi
index 5ca2a46acca..e473eb1cd10 100644
Binary files a/icons/obj/doors/airlocks/station/command.dmi and b/icons/obj/doors/airlocks/station/command.dmi differ