"
c.name = copy.name
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 597ca6550ca..05a9ad91036 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -127,7 +127,7 @@ obj/item/projectile/kinetic/New()
var/turf/target_turf= get_turf(target)
if(istype(target_turf, /turf/simulated/mineral))
var/turf/simulated/mineral/M = target_turf
- M.gets_drilled()
+ M.gets_drilled(firer)
new /obj/item/effect/kinetic_blast(target_turf)
..()
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index bbe19ffdbc3..6706572d78b 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -66,6 +66,7 @@ obj/item/weapon/reagent_containers/hypospray/combat/nanites
volume = 10
ignore_flags = 1 //so you can medipen through hardsuits
flags = null
+ list_reagents = list("epinephrine" = 10)
/obj/item/weapon/reagent_containers/hypospray/medipen/New()
..()
@@ -105,4 +106,4 @@ obj/item/weapon/reagent_containers/hypospray/combat/nanites
/obj/item/weapon/reagent_containers/hypospray/medipen/morphine
name = "morphine medipen"
desc = "A rapid way to get you out of a tight situation and fast! You'll feel rather drowsy, though."
- list_reagents = list("morphine" = 10)
+ list_reagents = list("morphine" = 10)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 41c7d2f53ee..50aaac4afb1 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -331,14 +331,14 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
////////////Janitor Designs//////////////
/////////////////////////////////////////
-/datum/design/advmop
- name = "Advanced Mop"
- desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals."
- id = "advmop"
- req_tech = list("materials" = 4, "engineering" = 3)
+/datum/design/buffer
+ name = "Floor Buffer Upgrade"
+ desc = "A floor buffer that can be attached to vehicular janicarts."
+ id = "buffer"
+ req_tech = list("materials" = 5, "engineering" = 3)
build_type = PROTOLATHE
- materials = list("$metal" = 2500, "$glass" = 200)
- build_path = /obj/item/weapon/mop/advanced
+ materials = list("$metal" = 3000, "$glass" = 200)
+ build_path = /obj/item/janiupgrade
category = list("Equipement")
/datum/design/holosign
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index e8d38856d04..6f48cc3e3c5 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -14,7 +14,7 @@
#define EFFECT_PROB_HIGH 75
#define EFFECT_PROB_VERYHIGH 95
-#define FAIL 7
+#define FAIL 8
/obj/machinery/r_n_d/experimentor
name = "E.X.P.E.R.I-MENTOR"
icon = 'icons/obj/machines/heavy_lathe.dmi'
@@ -313,7 +313,7 @@
var/list/chems = list("carbon","radium","toxin","condensedcapsaicin","mushroomhallucinogen","space_drugs","ethanol","beepskysmash")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
- R.add_reagent(pick(chems), 50)
+ R.add_reagent(pick(chems) , 50)
var/datum/effect/effect/system/chem_smoke_spread/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
@@ -322,10 +322,10 @@
ejectItem(TRUE)
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src]'s chemical chamber has sprung a leak!.")
- var/list/chems = list("mutationtoxin","amutationtoxin","nanites","xenomicrobes")
+ var/list/chems = list("mutationtoxin","nanomachines","xenomicrobes")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
- R.add_reagent(pick(chems), 50)
+ R.add_reagent(pick(chems) , 50)
var/datum/effect/effect/system/chem_smoke_spread/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
@@ -347,7 +347,7 @@
var/obj/item/weapon/reagent_containers/food/drinks/coffee/C = new /obj/item/weapon/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
var/list/chems = list("plasma","capsaicin","ethanol")
C.reagents.remove_any(25)
- C.reagents.add_reagent(pick(chems),25)
+ C.reagents.add_reagent(pick(chems) , 50)
C.name = "Cup of Suspicious Liquid"
C.desc = "It has a large hazard symbol printed on the side in fading ink."
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
@@ -382,16 +382,16 @@
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("[src]'s emergency coolant system gives off a small ping!")
var/obj/machinery/vending/coffee/C = new /obj/machinery/vending/coffee(get_turf(pick(oview(1,src))))
- var/list/chems = list("uranium","frostoil","hyperzine")
+ var/list/chems = list("uranium","frostoil","ephedrine")
C.reagents.remove_any(25)
- C.reagents.add_reagent(pick(chems),25)
+ C.reagents.add_reagent(pick(chems) , 50)
C.name = "Cup of Suspicious Liquid"
C.desc = "It has a large hazard symbol printed on the side in fading ink."
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
- R.add_reagent("frostoil", 50)
+ R.add_reagent("frostoil" , 50)
var/datum/effect/effect/system/chem_smoke_spread/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
@@ -547,6 +547,7 @@
#undef SCANTYPE_HEAT
#undef SCANTYPE_COLD
#undef SCANTYPE_OBLITERATE
+#undef SCANTYPE_DISCOVER
#undef EFFECT_PROB_VERYLOW
#undef EFFECT_PROB_LOW
@@ -660,4 +661,4 @@
visible_message("The [src] twists and bends, relocating itself!")
throwSmoke(get_turf(user))
do_teleport(user, get_turf(user), 8, asoundin = 'sound/effects/phasein.ogg')
- throwSmoke(get_turf(user))
\ No newline at end of file
+ throwSmoke(get_turf(user))
diff --git a/config/game_options.txt b/config/game_options.txt
index 75b6b241adf..8280e42debf 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -159,8 +159,7 @@ GATEWAY_DELAY 18000
### ACCESS ###
-## If the number of players ready at round starts exceeds this threshold, JOBS_HAVE_MINIMAL_ACCESS will automatically toggle on.
-## If the number of players does not reach this threshold, JOBS_HAVE_MINIMAL_ACCESS will automatically toggle off, and assistants/security will be given maintenance access.
+## If the number of players ready at round starts exceeds this threshold, JOBS_HAVE_MINIMAL_ACCESS will automatically be enabled. Otherwise, it will be disabled.
## This is useful for accomodating both low and high population rounds on the same server.
## Comment out or set to 0 to disable this automatic toggle.
MINIMAL_ACCESS_THRESHOLD 20
@@ -168,7 +167,7 @@ MINIMAL_ACCESS_THRESHOLD 20
## Comment this out if you wish to use the setup where jobs have more access.
## This is intended for servers with low populations - where there are not enough
## players to fill all roles, so players need to do more than just one job.
-## This option is ignored if MINIMAL_ACCESS_THRESHOLD is non-zero.
+## This option is ignored if MINIMAL_ACCESS_THRESHOLD is used.
#JOBS_HAVE_MINIMAL_ACCESS
## Uncomment to give assistants maint access.
diff --git a/html/changelog.html b/html/changelog.html
index 43d0588467c..db07feeae83 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,40 @@
-->
+
+
26 January 2015
+
Dannno updated:
+
+ - Added fannypacks of multiple colors, 3 of which are accessible from the clothing vendor.
+ - Added dufflebags to multiple lockers throughout the station and to the syndicate shuttle, more storage slots at the cost of move speed.
+
+
Deantwo updated:
+
+ - Fixed some bugs in PDA's NTRC Chatroom feature.
+ - You can now use PaperBBCode/PenCode when writing news articles on the newscaster.
+ - PDA's Notekeeper now uses PaperBBCode/PenCode rather than HTML.
+ - Scanning paper with your PDA is now more informative.
+
+
Firecage updated:
+
+ - We, at NanoTrasen, have recently upgraded the Kitchen Spikes to include the skin of both Monkeys and Aliens when you harvest their flesh!
+ - In other news, a station in a nearby Sector has been making monkey and xeno costumes. We are not sure why.
+ - Added the ability to reform mineral floortiles back into sheets/bars
+
+
Ikarrus updated:
+
+ - Added a new config option MINIMAL_ACCESS_THRESHOLD that can be used to automatically give players more access during low-population rounds. See game_options.txt for more information.
+
+
Lo6a4evskiy updated:
+
+ - The kitchen now contains a brand new food cart. It can store foods and liquids, mix them into cocktails and dispense where needed. Food delivery has never been easier!
+
+
fleure updated:
+
+ - Added briefcase filled with cash to uplink.
+
+
21 January 2015
Iamgoofball updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e81e3a38aa1..6e4689f9583 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2349,3 +2349,31 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
and Unstable Mutagen.
- rscadd: Adds 9 new Disabilites and 2 new genetic powers.
- rscadd: You can now heat donk pockets once more. Rejoice.
+2015-01-26:
+ Dannno:
+ - rscadd: Added fannypacks of multiple colors, 3 of which are accessible from the
+ clothing vendor.
+ - rscadd: Added dufflebags to multiple lockers throughout the station and to the
+ syndicate shuttle, more storage slots at the cost of move speed.
+ Deantwo:
+ - bugfix: Fixed some bugs in PDA's NTRC Chatroom feature.
+ - rscadd: You can now use PaperBBCode/PenCode when writing news articles on the
+ newscaster.
+ - rscadd: PDA's Notekeeper now uses PaperBBCode/PenCode rather than HTML.
+ - tweak: Scanning paper with your PDA is now more informative.
+ Firecage:
+ - rscadd: We, at NanoTrasen, have recently upgraded the Kitchen Spikes to include
+ the skin of both Monkeys and Aliens when you harvest their flesh!
+ - rscadd: In other news, a station in a nearby Sector has been making monkey and
+ xeno costumes. We are not sure why.
+ - rscadd: Added the ability to reform mineral floortiles back into sheets/bars
+ Ikarrus:
+ - rscadd: Added a new config option MINIMAL_ACCESS_THRESHOLD that can be used to
+ automatically give players more access during low-population rounds. See game_options.txt
+ for more information.
+ Lo6a4evskiy:
+ - rscadd: The kitchen now contains a brand new food cart. It can store foods and
+ liquids, mix them into cocktails and dispense where needed. Food delivery has
+ never been easier!
+ fleure:
+ - rscadd: Added briefcase filled with cash to uplink.
diff --git a/html/changelogs/Changelog.yml b/html/changelogs/Changelog.yml
deleted file mode 100644
index 6b3f5925849..00000000000
--- a/html/changelogs/Changelog.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscdel (general adding of nice things)
-# rscadd (general deleting of nice things)
-# imageadd
-# imagedel
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-#################################
-
-# Your name.
-author: Ikarrus
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
- - rscadd: "Added a new config option MINIMAL_ACCESS_THRESHOLD that can be used to automatically give players more access during low-population rounds. See game_options.txt for more information."
diff --git a/html/changelogs/FIRECAGE-PR-7141.yml b/html/changelogs/FIRECAGE-PR-7141.yml
deleted file mode 100644
index 494429c0798..00000000000
--- a/html/changelogs/FIRECAGE-PR-7141.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Firecage
-
-delete-after: True
-
-changes:
- - rscadd: "Added the ability to reform mineral floortiles back into sheets/bars"
\ No newline at end of file
diff --git a/html/changelogs/FIRECAGE-PR-7282.yml b/html/changelogs/FIRECAGE-PR-7282.yml
deleted file mode 100644
index 2a922c2fe5f..00000000000
--- a/html/changelogs/FIRECAGE-PR-7282.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Firecage
-
-delete-after: True
-
-changes:
- - rscadd: "We, at NanoTrasen, have recently upgraded the Kitchen Spikes to include the skin of both Monkeys and Aliens when you harvest their flesh!"
- - rscadd: "In other news, a station in a nearby Sector has been making monkey and xeno costumes. We are not sure why."
diff --git a/html/changelogs/Lo6a4evskiy-PR-6892.yml b/html/changelogs/Lo6a4evskiy-PR-6892.yml
deleted file mode 100644
index 9ef7e38802d..00000000000
--- a/html/changelogs/Lo6a4evskiy-PR-6892.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Lo6a4evskiy
-
-delete-after: True
-
-changes:
- - rscadd: "The kitchen now contains a brand new food cart. It can store foods and liquids, mix them into cocktails and dispense where needed. Food delivery has never been easier!"
diff --git a/html/changelogs/dannno-dufflebags-7245.yml b/html/changelogs/dannno-dufflebags-7245.yml
deleted file mode 100644
index fc09f91c8e9..00000000000
--- a/html/changelogs/dannno-dufflebags-7245.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: Dannno
-
-delete-after: True
-
-changes:
- - rscadd: Added fannypacks of multiple colors, 3 of which are accessible from the clothing vendor.
- - rscadd: Added dufflebags to multiple lockers throughout the station and to the syndicate shuttle, more storage slots at the cost of move speed.
\ No newline at end of file
diff --git a/html/changelogs/fleure-PR-6871.yml b/html/changelogs/fleure-PR-6871.yml
deleted file mode 100644
index a2f27f334a8..00000000000
--- a/html/changelogs/fleure-PR-6871.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Your name.
-author: fleure
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
-- rscadd: "Added briefcase filled with cash to uplink."
\ No newline at end of file
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index e7d4d82a950..20b5c68d940 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 0213a6225f5..eac882be2d0 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index 1ba74f830a8..e0b13f390a7 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ
SpaceMessenger V3.9.6