diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 55d530bd9ee..959f1cef712 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -276,18 +276,6 @@
name = "warning cone"
icon_state = "cone"
-/obj/item/weapon/directions
- name = "crumpled paper"
- gender = PLURAL
- desc = "This is a crumpled piece of paper."
- icon = 'icons/obj/weapons.dmi'
- icon_state = "crumpled"
- throwforce = 0
- w_class = 1.0
- throw_speed = 3
- throw_range = 15
- //layer = 4
-
/obj/item/weapon/rack_parts
name = "rack parts"
desc = "Parts of a rack."
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 7be8fa834d3..3d955ca9f30 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -775,24 +775,3 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
R.word3=wordtech
R.loc = user.loc
R.check_icon()
-
-
-/obj/item/weapon/paperscrap
- name = "scrap of paper"
- icon_state = "scrap"
- throw_speed = 1
- throw_range = 2
- w_class = 1.0
- flags = FPRINT | TABLEPASS
-
- var/data
-
- attack_self(mob/user as mob)
- view_scrap(user)
-
- examine()
- set src in usr
- view_scrap(usr)
-
- proc/view_scrap(var/viewer)
- viewer << browse(data)
diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm
index dad6aef13bc..69dc3787a11 100644
--- a/code/game/machinery/kitchen/smartfridge.dm
+++ b/code/game/machinery/kitchen/smartfridge.dm
@@ -139,9 +139,14 @@
dat += "[capitalize(O)]:"
dat += " [N] "
dat += "Vend "
- dat += "(x5)"
- dat += "(x10)"
- dat += "(x25)"
+ if(N > 5)
+ dat += "(x5)"
+ if(N > 10)
+ dat += "(x10)"
+ if(N > 25)
+ dat += "(x25)"
+ if(N > 1)
+ dat += "(All)"
dat += "
"
dat += ""
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 2db6274f6c4..20864c641ee 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -120,6 +120,7 @@ obj/machinery/gateway/centerstation/process()
if(!awaygate) return
if(awaygate.calibrated)
M.loc = get_step(awaygate.loc, SOUTH)
+ M.dir = SOUTH
return
else
var/obj/effect/landmark/dest = pick(awaydestinations)
@@ -230,6 +231,6 @@ obj/machinery/gateway/centerstation/process()
user << "\black The gate is already calibrated, there is no work for you to do here."
return
else
- user << "\blue Recalibration successful!: \black This gates systems have been fine tuned, travel to this gate will now be on target."
+ user << "\blue Recalibration successful!: \black This gate's systems have been fine tuned. Travel to this gate will now be on target."
calibrated = 1
return
\ No newline at end of file
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 48153eeeecb..37d8a65ba14 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -1,5 +1,6 @@
/*
* Paper
+ * also scraps of paper
*/
/obj/item/weapon/paper
@@ -338,3 +339,13 @@
/obj/item/weapon/paper/sop
name = "paper- 'Standard Operating Procedure'"
info = "Alert Levels:
\nBlue- Emergency
\n\t1. Caused by fire
\n\t2. Caused by manual interaction
\n\tAction:
\n\t\tClose all fire doors. These can only be opened by reseting the alarm
\nRed- Ejection/Self Destruct
\n\t1. Caused by module operating computer.
\n\tAction:
\n\t\tAfter the specified time the module will eject completely.
\n
\nEngine Maintenance Instructions:
\n\tShut off ignition systems:
\n\tActivate internal power
\n\tActivate orbital balance matrix
\n\tRemove volatile liquids from area
\n\tWear a fire suit
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nToxin Laboratory Procedure:
\n\tWear a gas mask regardless
\n\tGet an oxygen tank.
\n\tActivate internal atmosphere
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nDisaster Procedure:
\n\tFire:
\n\t\tActivate sector fire alarm.
\n\t\tMove to a safe area.
\n\t\tGet a fire suit
\n\t\tAfter:
\n\t\t\tAssess Damage
\n\t\t\tRepair damages
\n\t\t\tIf needed, Evacuate
\n\tMeteor Shower:
\n\t\tActivate fire alarm
\n\t\tMove to the back of ship
\n\t\tAfter
\n\t\t\tRepair damage
\n\t\t\tIf needed, Evacuate
\n\tAccidental Reentry:
\n\t\tActivate fire alrms in front of ship.
\n\t\tMove volatile matter to a fire proof area!
\n\t\tGet a fire suit.
\n\t\tStay secure until an emergency ship arrives.
\n
\n\t\tIf ship does not arrive-
\n\t\t\tEvacuate to a nearby safe area!"
+
+/obj/item/weapon/paper/crumpled
+ name = "paper scrap"
+ icon_state = "scrap"
+
+/obj/item/weapon/paper/crumpled/update_icon()
+ return
+
+/obj/item/weapon/paper/crumpled/bloody
+ icon_state = "scrap_bloodied"
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 52236d5badd..58ae220fd78 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -109,11 +109,11 @@
if (!(usr in range(0)) && usr!=src.loc) return
if(!reagents || reagents.total_volume==0)
usr << "\blue \The [src] is empty!"
- else if (reagents.total_volume