Eject"
else
dat += "Nothing loaded."
@@ -215,11 +221,11 @@
if(loaded_item)
if(cloneMode && cloneCount > 0)
visible_message("A duplicate [loaded_item] pops out!")
- new loaded_item(pick(oview(1,src)))
+ new loaded_item(get_turf(pick(oview(1,src))))
--cloneCount
if(cloneCount == 0)
cloneMode = FALSE
- loaded_item.loc = pick(oview(1,src))
+ loaded_item.loc = get_turf(pick(oview(1,src)))
if(delete)
qdel(loaded_item)
loaded_item = null
@@ -242,13 +248,6 @@
else
counter = 1
-/*
-#define EFFECT_PROB_VERYLOW 10
-#define EFFECT_PROB_LOW 20
-#define EFFECT_PROB_MEDIUM 45
-#define EFFECT_PROB_HIGH 65
-#define EFFECT_PROB_VERYHIGH 85
-*/
/obj/machinery/r_n_d/experimentor/proc/experiment(var/exp,var/obj/item/exp_on)
recentlyExperimented = 1
icon_state = "h_lathe_wloop"
@@ -264,10 +263,10 @@
for(var/mob/living/m in oview(1))
m.apply_damage(15,"brute",pick("head","chest","groin"))
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions!.")
exp = SCANTYPE_OBLITERATE
- else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, throwing the [exp_on]!.")
var/mob/living/target = locate(/mob/living) in oview(7,src)
if(target)
@@ -287,13 +286,13 @@
for(var/mob/living/m in oview(1))
m.apply_effect(25,IRRADIATE)
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, spewing toxic waste!.")
for(var/turf/T in oview(1))
if(!T.density)
if(prob(EFFECT_PROB_VERYHIGH))
new /obj/effect/decal/cleanable/greenglow(T)
- else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
var/savedName = "[exp_on]"
ejectItem(TRUE)
var/newPath = pickWeighted(valid_items)
@@ -308,7 +307,7 @@
visible_message("[src] fills it's chamber with gas, [exp_on] included.")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("[exp_on] achieves the perfect mix!")
- new /obj/item/stack/sheet/mineral/plasma(pick(oview(1,src)))
+ new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src))))
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] destroys [exp_on], leaking dangerous gas!.")
var/list/chems = list("carbon","radium","toxin","condensedcapsaicin","mushroomhallucinogen","space_drugs","ethanol","beepskysmash")
@@ -321,10 +320,22 @@
smoke.start()
R.delete()
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ 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/datum/reagents/R = new/datum/reagents(50)
+ R.my_atom = src
+ 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)
+ smoke.start()
+ R.delete()
+ ejectItem(TRUE)
+ if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, spewing harmless gas!.")
throwSmoke(src.loc)
- else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] melts [exp_on], ionizing the air around it!.")
empulse(src.loc, 8, 10)
ejectItem(TRUE)
@@ -332,18 +343,21 @@
if(exp == SCANTYPE_HEAT)
visible_message("[src] raises [exp_on]'s temperature.")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
- visible_message("[src]'s emergency coolant system gives off a small beep!")
- var/obj/item/weapon/reagent_containers/food/drinks/coffee/C = new /obj/item/weapon/reagent_containers/food/drinks/coffee(pick(oview(1,src)))
+ visible_message("[src]'s emergency coolant system gives off a small beep!")
+ 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.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] activates it's heat-seeking system!")
+ new/datum/round_event/meteor_wave()
+ if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!.")
explosion(src.loc, -1, 0, 0, 0, 0, flame_range = 2)
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and leaking hot air!.")
var/datum/gas_mixture/env = src.loc.return_air()
var/transfer_moles = 0.25 * env.total_moles()
@@ -356,7 +370,7 @@
env.merge(removed)
air_update_turf()
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, activating it's emergency coolant systems!.")
throwSmoke(src.loc)
for(var/mob/living/m in oview(1))
@@ -367,7 +381,7 @@
visible_message("[src] lowers [exp_on]'s temperature.")
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(pick(oview(1,src)))
+ var/obj/machinery/vending/coffee/C = new /obj/machinery/vending/coffee(get_turf(pick(oview(1,src))))
var/list/chems = list("uranium","frostoil","hyperzine")
C.reagents.remove_any(25)
C.reagents.add_reagent(pick(chems),25)
@@ -384,7 +398,7 @@
smoke.start()
R.delete()
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, shattering [exp_on] and leaking cold air!.")
var/datum/gas_mixture/env = src.loc.return_air()
var/transfer_moles = 0.25 * env.total_moles()
@@ -397,7 +411,7 @@
env.merge(removed)
air_update_turf()
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
+ if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!.")
var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
smoke.set_up(1,0, src.loc, 0)
@@ -408,7 +422,7 @@
visible_message("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!")
- new /obj/item/stack/sheet/plasteel(pick(oview(1,src)))
+ new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src))))
if(linked_console.linked_lathe)
linked_console.linked_lathe.m_amount += min((linked_console.linked_lathe.max_material_storage - linked_console.linked_lathe.TotalMaterials()), (exp_on.m_amt))
linked_console.linked_lathe.g_amount += min((linked_console.linked_lathe.max_material_storage - linked_console.linked_lathe.TotalMaterials()), (exp_on.g_amt))
@@ -423,7 +437,7 @@
for(counter = 1, counter < throwAt.len, ++counter)
var/cast = throwAt[counter]
cast:throw_at(src,10,1)
- else if(prob(EFFECT_PROB_LOW-badThingCoeff))
+ if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src]'s crusher goes one level too high, crushing right into space-time!.")
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3)
var/list/oViewStuff = oview(7,src)
@@ -442,6 +456,12 @@
var/b = pick("crushes","spins","viscerates","smashes","insults")
visible_message("[exp_on] [a], and [b], the experiment was a failiure!")
+ if(exp == SCANTYPE_DISCOVER)
+ visible_message("[src] scans the [exp_on], revealing it's true nature!.")
+ playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 3, -1)
+ var/obj/item/weapon/relic/R = loaded_item
+ R.reveal()
+ ejectItem()
//Global reactions
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
@@ -535,3 +555,109 @@
#undef EFFECT_PROB_VERYHIGH
#undef FAIL
+
+
+//////////////////////////////////SPECIAL ITEMS////////////////////////////////////////
+
+/obj/item/weapon/relic
+ name = "strange object"
+ desc = "What mysteries could this hold?"
+ icon = 'icons/obj/assemblies.dmi'
+ origin_tech = "combat=1;plasmatech=1;powerstorage=1;materials=1"
+ var/realName = "defined object"
+ var/revealed = FALSE
+ var/realProc
+ var/cooldownMax = 60
+ var/cooldown
+
+/obj/item/weapon/relic/New()
+ icon_state = pick("shock_kit","armor-igniter-analyzer","infra-igniter0","infra-igniter1","radio-multitool","prox-radio1","radio-radio","timer-multitool0","radio-igniter-tank")
+ realName = "[pick("broken","twisted","spun","improved","silly","regular","badly made")] [pick("device","object","toy","illegal tech","weapon")]"
+
+
+/obj/item/weapon/relic/proc/reveal()
+ revealed = TRUE
+ name = realName
+ cooldownMax = rand(60,300)
+ realProc = pick("teleport","explode","rapidDupe","petSpray","flash","clean","corgicannon")
+
+/obj/item/weapon/relic/attack_self(mob/user as mob)
+ if(revealed)
+ if(cooldown)
+ user << "[src] does not react."
+ return
+ else if(src.loc == user)
+ call(src,realProc)(user)
+ cooldown = TRUE
+ spawn(cooldownMax)
+ cooldown = FALSE
+ else
+ user << "You aren't quite sure what to do with this, yet."
+
+//////////////// RELIC PROCS /////////////////////////////
+
+/obj/item/weapon/relic/proc/throwSmoke(var/turf/where)
+ var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
+ smoke.set_up(1,0, where, 0)
+ smoke.start()
+
+/obj/item/weapon/relic/proc/corgicannon(var/mob/user)
+ playsound(src.loc, "sparks", rand(25,50), 1)
+ var/mob/living/simple_animal/corgi/C = new/mob/living/simple_animal/corgi(get_turf(user))
+ C.throw_at(pick(oview(10,user)),10,rand(3,8))
+ throwSmoke(get_turf(C))
+
+/obj/item/weapon/relic/proc/clean(var/mob/user)
+ playsound(src.loc, "sparks", rand(25,50), 1)
+ var/obj/item/weapon/grenade/chem_grenade/cleaner/CL = new/obj/item/weapon/grenade/chem_grenade/cleaner(get_turf(user))
+ CL.prime()
+
+/obj/item/weapon/relic/proc/flash(var/mob/user)
+ playsound(src.loc, "sparks", rand(25,50), 1)
+ var/obj/item/weapon/grenade/flashbang/CB = new/obj/item/weapon/grenade/flashbang(get_turf(user))
+ CB.prime()
+
+/obj/item/weapon/relic/proc/petSpray(var/mob/user)
+ visible_message("[src] begans to shake, and in the distance the sound of rampaging animals arises!")
+ var/animals = rand(1,25)
+ var/counter
+ var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/cat,/mob/living/simple_animal/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
+ for(counter = 1; counter < animals; counter++)
+ var/mobType = pick(valid_animals)
+ new mobType(get_turf(src))
+
+/obj/item/weapon/relic/proc/rapidDupe(var/mob/user)
+ visible_message("[src] emits a loud pop!")
+ var/list/dupes = list()
+ var/counter
+ var/max = rand(5,45)
+ for(counter = 1; counter < max; counter++)
+ var/obj/item/weapon/relic/R = new src.type(get_turf(src))
+ R.name = name
+ R.desc = desc
+ R.realName = realName
+ R.realProc = realProc
+ R.revealed = TRUE
+ dupes |= R
+ R.throw_at(pick(oview(7,src)),10,1)
+ counter = 0
+ spawn(rand(10,100))
+ for(counter = 1; counter < dupes.len; counter++)
+ var/obj/item/weapon/relic/R = dupes[counter]
+ qdel(R)
+
+/obj/item/weapon/relic/proc/explode(var/mob/user)
+ visible_message("[src] begins to heat up!")
+ spawn(rand(35,100))
+ if(src.loc == user)
+ visible_message("The [src]'s top opens, releasing a powerful blast!")
+ explosion(user.loc, -1, rand(1,5), rand(1,5), rand(1,5), rand(1,5), flame_range = 2)
+
+/obj/item/weapon/relic/proc/teleport(var/mob/user)
+ visible_message("The [src] begins to vibrate!")
+ spawn(rand(10,30))
+ if(src.loc == user)
+ 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
diff --git a/config/game_options.txt b/config/game_options.txt
index 62bfc11ff59..8280e42debf 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -158,10 +158,16 @@ GATEWAY_DELAY 18000
### 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
+
## 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.
-## Also for servers where they don't want people to hide in their own departments.
+## 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/icons/emoji.dmi b/icons/emoji.dmi
index 8da34d9a468..04406998764 100644
Binary files a/icons/emoji.dmi and b/icons/emoji.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index e8d4b61b58b..00aae60bf8d 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index e2e3408c577..be45636ff70 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/corgi_back.dmi b/icons/mob/corgi_back.dmi
index 7ea3cee1a4a..7ed1e9f92d6 100644
Binary files a/icons/mob/corgi_back.dmi and b/icons/mob/corgi_back.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 4474ee9dee8..5db57cf7454 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 3376015c276..73f9cc78c0c 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 7bb7c2e69db..e38ed34c7aa 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index f70ce1eafaf..5e5577fb7dd 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index acb1e00589c..3d80a2669ea 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/aicards.dmi b/icons/obj/aicards.dmi
index a28931ed90c..c1068e6fb2a 100644
Binary files a/icons/obj/aicards.dmi and b/icons/obj/aicards.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 1675219fcc3..6fe896b2bb1 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 774e2c7f9c1..c9169705640 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 65a0027ff4d..be66f5eac2a 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index fdc8ccdd1a8..8e5b28e1b1d 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 7cb334987a1..5e15820d45e 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 51b57125584..825dee8bb49 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 7ff300e0c88..143db8d719f 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.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
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 5d6065bace7..5885a408c76 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index e1d91f0d173..562ba702797 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -68,10 +68,7 @@ h1.alert, h2.alert {color: #000000;}
.interface {color: #330033;}
.sans {font-family: "Comic Sans MS", cursive, sans-serif;}
-.papyrus {font-family: "Papyrus", cursive, sans-serif;}
-.vineta {font-family: "Vineta BT", cursive, sans-serif;}
-.jokerman {font-family: "Jokerman", cursive, sans-serif;}
-.robot {font-family: "OCR A Extended", cursive, sans-serif;}
+.robot {font-family: "Courier New", cursive, sans-serif;}
BIG IMG.icon {width: 32px; height: 32px;}
diff --git a/tgstation.dme b/tgstation.dme
index 1598c65ddee..04feb07a19d 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -934,7 +934,6 @@
#include "code\modules\food&drinks\drinks\drinks.dm"
#include "code\modules\food&drinks\drinks\drinks\bottle.dm"
#include "code\modules\food&drinks\drinks\drinks\drinkingglass.dm"
-#include "code\modules\food&drinks\drinks\drinks\bottle\robot.dm"
#include "code\modules\food&drinks\food\condiment.dm"
#include "code\modules\food&drinks\food\snacks.dm"
#include "code\modules\food&drinks\food\snacks_bread.dm"
@@ -953,6 +952,7 @@
#include "code\modules\food&drinks\food\snacks_vend.dm"
#include "code\modules\food&drinks\food\snacks\food_mixtures.dm"
#include "code\modules\food&drinks\food\snacks\meat.dm"
+#include "code\modules\food&drinks\kitchen machinery\food_cart.dm"
#include "code\modules\food&drinks\kitchen machinery\gibber.dm"
#include "code\modules\food&drinks\kitchen machinery\icecream_vat.dm"
#include "code\modules\food&drinks\kitchen machinery\juicer.dm"
@@ -1300,6 +1300,7 @@
#include "code\modules\reagents\Chemistry-Reagents\Consumable-Reagents\Drink-Reagents\Drinks.dm"
#include "code\modules\reagents\reagent_containers\blood_pack.dm"
#include "code\modules\reagents\reagent_containers\borghydro.dm"
+#include "code\modules\reagents\reagent_containers\bottle.dm"
#include "code\modules\reagents\reagent_containers\dropper.dm"
#include "code\modules\reagents\reagent_containers\glass.dm"
#include "code\modules\reagents\reagent_containers\hypospray.dm"
@@ -1307,7 +1308,6 @@
#include "code\modules\reagents\reagent_containers\pill.dm"
#include "code\modules\reagents\reagent_containers\spray.dm"
#include "code\modules\reagents\reagent_containers\syringes.dm"
-#include "code\modules\reagents\reagent_containers\glass\bottle.dm"
#include "code\modules\recycling\conveyor2.dm"
#include "code\modules\recycling\disposal-construction.dm"
#include "code\modules\recycling\disposal.dm"
Notekeeper V2.1
SpaceMessenger V3.9.5
Ringer: [silent == 1 ? "Off" : "On"] | "
dat += "
Clear Messages"
dat += "
SS13 Nanotrasen Relay Chat Network