From 50adcbb302bda326baff434b2c5ffcbad51d247c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Jul 2017 16:45:14 -0500 Subject: [PATCH 001/154] DCS Continued --- code/controllers/subsystem/garbage.dm | 8 +- code/datums/components/README.md | 99 +++++++++++++++++++++++++ code/datums/components/component.dm | 44 ++++++----- code/datums/components/component.dm.rej | 35 +++++++++ 4 files changed, 168 insertions(+), 18 deletions(-) create mode 100644 code/datums/components/README.md create mode 100644 code/datums/components/component.dm.rej diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 2cee9a192a..20672ea975 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -247,7 +247,13 @@ SUBSYSTEM_DEF(garbage) if (timer.spent) continue qdel(timer) - QDEL_LIST(datum_components) + var/list/dc = datum_components + for(var/I in dc) + var/datum/component/C = I + C._RemoveNoSignal() + qdel(C) + if(dc) + dc.Cut() return QDEL_HINT_QUEUE /datum/var/gc_destroyed //Time when this object was destroyed. diff --git a/code/datums/components/README.md b/code/datums/components/README.md new file mode 100644 index 0000000000..f92e618a7f --- /dev/null +++ b/code/datums/components/README.md @@ -0,0 +1,99 @@ +# Datum Component System (DCS) + +## Concept + +Loosely adapted from /vg/. This is an entity component system for adding behaviours to datums when inheritance doesn't quite cut it. By using signals and events instead of direct inheritance, you can inject behaviours without hacky overloads. It requires a different method of thinking, but is not hard to use correctly. If a behaviour can have application across more than one thing. Make it generic, make it a component. Atom/mob/obj event? Give it a signal, and forward it's arguments with a `SendSignal()` call. Now every component that want's to can also know about this happening. + +### In the code + +#### Slippery things + +At the time of this writing, every object that is slippery overrides atom/Crossed does some checks, then slips the mob. Instead of all those Crossed overrides they could add a slippery component to all these objects. And have the checks in one proc that is run by the Crossed event + +#### Powercells + +A lot of objects have powercells. The `get_cell()` proc was added to give generic access to the cell var if it had one. This is just a specific use case of `GetComponent()` + +#### Radios + +The radio object as it is should not exist, given that more things use the _concept_ of radios rather than the object itself. The actual function of the radio can exist in a component which all the things that use it (Request consoles, actual radios, the SM shard) can add to themselves. + +#### Standos + +Stands have a lot of procs which mimic mob procs. Rather than inserting hooks for all these procs in overrides, the same can be accomplished with signals + +## API + +### Vars + +1. `/datum/var/list/datum_components` (private) + * Lazy list of all components a datum has (TODO: Make this a typecache with longer paths overwriting shorter ones maybe? It'd be weird) +1. `/datum/component/var/enabled` (protected, boolean) + * If the component is enabled. If not, it will not react to signals + * TRUE by default +1. `/datum/component/var/dupe_mode` (protected, enum) + * How multiple components of the exact same type are handled when added to the datum. + * `COMPONENT_DUPE_HIGHLANDER` (default): Old component will be deleted, new component will first have `/datum/component/proc/InheritComponent(datum/component/old, FALSE)` on it + * `COMPONENT_DUPE_ALLOWED`: The components will be treated as seperate, `GetComponent()` will return the first added + * `COMPONENT_DUPE_UNIQUE`: New component will be deleted, old component will first have `/datum/component/proc/InheritComponent(datum/component/new, TRUE)` on it +1. `/datum/component/var/list/signal_procs` (private) + * Associated lazy list of signals -> callbacks that will be run when the parent datum recieves that signal +1. `/datum/component/var/datum/parent` (protected, read-only) + * The datum this component belongs to + +### Procs + +1. `/datum/proc/GetComponent(component_type(type)) -> datum/component?` (public, final) + * Returns a reference to a component of component_type if it exists in the datum, null otherwise +1. `/datum/proc/GetComponents(component_type(type)) -> list` (public, final) + * Returns a list of references to all components of component_type that exist in the datum +1. `/datum/proc/GetExactComponent(component_type(type)) -> datum/component?` (public, final) + * Returns a reference to a component whose type MATCHES component_type if that component exists in the datum, null otherwise +1. `GET_COMPONENT(varname, component_type)` OR `GET_COMPONENT_FROM(varname, component_type, src)` + * Shorthand for `var/component_type/varname = src.GetComponent(component_type)` +1. `/datum/proc/AddComponent(component_type(type), ...) -> datum/component` (public, final) + * Creates an instance of `component_type` in the datum and passes `...` to it's `New()` call + * Sends the `COMSIG_COMPONENT_ADDED` signal to the datum + * All components a datum owns are deleted with the datum + * Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set +1. `/datum/proc/ComponentActivated(datum/component/C)` (abstract) + * Called on a component's `parent` after a signal recieved causes it to activate. `src` is the parameter + * Will only be called if a component's callback returns `TRUE` +1. `/datum/proc/TakeComponent(datum/component/C)` (public, final) + * Properly transfers ownership of a component from one datum to another + * Singals `COMSIG_COMPONENT_REMOVING` on the parent + * Called on the datum you want to own the component with another datum's component +1. `/datum/proc/SendSignal(signal, ...)` (public, final) + * Call to send a signal to the components of the target datum + * Extra arguments are to be specified in the signal definition +1. `/datum/component/New(datum/parent, ...)` (protected, virtual) + * Forwarded the arguments from `AddComponent()` +1. `/datum/component/Destroy()` (virtual) + * Sends the `COMSIG_COMPONENT_REMOVING` signal to the parent datum if the `parent` isn't being qdeleted + * Properly removes the component from `parent` and cleans up references +1. `/datum/component/proc/InheritComponent(datum/component/C, i_am_original(boolean))` (abstract) + * Called on a component when a component of the same type was added to the same parent + * See `/datum/component/var/dupe_mode` + * `C`'s type will always be the same of the called component +1. `/datum/component/proc/OnTransfer(datum/new_parent)` (abstract) + * Called before the new `parent` is assigned in `TakeComponent()`, after the remove signal, before the added signal + * Allows the component to react to ownership transfers +1. `/datum/component/proc/_RemoveNoSignal()` (private, final) + * Internal, clears the parent var and removes the component from the parents component list +1. `/datum/component/proc/RegisterSignal(signal(string), proc_ref(type), override(boolean))` (protected, final) (Consider removing for performance gainz) + * Makes a component listen for the specified `signal` on it's `parent` datum. + * When that signal is recieved `proc_ref` will be called on the component, along with associated arguments + * Example proc ref: `.proc/OnEvent` + * If a previous registration is overwritten by the call, a runtime occurs. Setting `override` to TRUE prevents this + * These callbacks run asyncronously + * Returning `TRUE` from these callbacks will trigger a `TRUE` return from the `SendSignal()` that initiated it +1. `/datum/component/proc/ReceiveSignal(signal, ...)` (virtual) + * Called when a component recieves any signal and is enabled + * Default implementation looks if the signal is registered and runs the appropriate proc + +### See signals and their arguments in __DEFINES\components.dm + +## Examples + Material Containers: #29268 (Too many GetComponent calls, but not bad) + Slips: #00000 (PR DIS) + Powercells: (TODO) \ No newline at end of file diff --git a/code/datums/components/component.dm b/code/datums/components/component.dm index b9212d2786..1bbd785d22 100644 --- a/code/datums/components/component.dm +++ b/code/datums/components/component.dm @@ -1,8 +1,8 @@ /datum/component - var/enabled = TRUE // Enables or disables the components - var/dupe_mode = COMPONENT_DUPE_HIGHLANDER // How components of the same type are handled in the same parent - var/list/signal_procs // list of signals -> callbacks - var/datum/parent // parent datum + var/enabled = TRUE + var/dupe_mode = COMPONENT_DUPE_HIGHLANDER + var/list/signal_procs + var/datum/parent /datum/component/New(datum/P, ...) var/dm = dupe_mode @@ -11,26 +11,34 @@ if(old) switch(dm) if(COMPONENT_DUPE_HIGHLANDER) - P.RemoveComponent(old) - old = null //in case SendSignal() blocks + InheritComponent(old, FALSE) + qdel(old) if(COMPONENT_DUPE_UNIQUE) + old.InheritComponent(src, TRUE) qdel(src) return - P.SendSignal(COMSIG_COMPONENT_ADDED, list(src), FALSE) + P.SendSignal(COMSIG_COMPONENT_ADDED, src) LAZYADD(P.datum_components, src) parent = P /datum/component/Destroy() - RemoveNoSignal() + enabled = FALSE + var/datum/P = parent + if(P) + _RemoveNoSignal() + P.SendSignal(COMSIG_COMPONENT_REMOVING, src) + LAZYCLEARLIST(signal_procs) return ..() -/datum/component/proc/RemoveNoSignal() +/datum/component/proc/_RemoveNoSignal() var/datum/P = parent if(P) LAZYREMOVE(P.datum_components, src) parent = null /datum/component/proc/RegisterSignal(sig_type, proc_on_self, override = FALSE) + if(QDELETED(src)) + return var/list/procs = signal_procs if(!procs) procs = list() @@ -79,19 +87,21 @@ if(istype(I, c_type)) . += I -/datum/proc/AddComponents(list/new_types) - for(var/new_type in new_types) - AddComponent(new_type) - /datum/proc/AddComponent(new_type, ...) var/nt = new_type args[1] = src var/datum/component/C = new nt(arglist(args)) return QDELING(C) ? GetComponent(new_type) : C -/datum/proc/RemoveComponent(datum/component/C) +/datum/proc/TakeComponent(datum/component/C) if(!C) return - C.RemoveNoSignal() - SendSignal(COMSIG_COMPONENT_REMOVING, list(C), FALSE) - qdel(C) + var/datum/helicopter = C.parent + if(helicopter == src) + //wat + return + C._RemoveNoSignal() + helicopter.SendSignal(COMSIG_COMPONENT_REMOVING, C) + C.OnTransfer(src) + C.parent = src + SendSignal(COMSIG_COMPONENT_ADDED, C) \ No newline at end of file diff --git a/code/datums/components/component.dm.rej b/code/datums/components/component.dm.rej new file mode 100644 index 0000000000..2116ae9d81 --- /dev/null +++ b/code/datums/components/component.dm.rej @@ -0,0 +1,35 @@ +diff a/code/datums/components/component.dm b/code/datums/components/component.dm (rejected hunks) +@@ -47,12 +47,14 @@ + + procs[sig_type] = CALLBACK(src, proc_on_self) + +-/datum/component/proc/ReceiveSignal(sigtype, list/sig_args) ++/datum/component/proc/ReceiveSignal(sigtype, ...) + var/list/sps = signal_procs + var/datum/callback/CB = LAZYACCESS(sps, sigtype) + if(!CB) + return FALSE +- return CB.InvokeAsync(arglist(sig_args)) ++ var/list/arguments = args.Copy() ++ arguments.Cut(1, 2) ++ return CB.InvokeAsync(arglist(arguments)) + + /datum/component/proc/InheritComponent(datum/component/C, i_am_original) + return +@@ -62,14 +64,14 @@ + + /datum/var/list/datum_components //list of /datum/component + +-/datum/proc/SendSignal(sigtype, list/sig_args) ++/datum/proc/SendSignal(sigtype, ...) + var/list/comps = datum_components + . = FALSE + for(var/I in comps) + var/datum/component/C = I + if(!C.enabled) + continue +- if(C.ReceiveSignal(sigtype, sig_args)) ++ if(C.ReceiveSignal(arglist(args))) + ComponentActivated(C) + . = TRUE + From 9b7a0c5d548dce14052068133060c3b6994d8b7a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 26 Jul 2017 15:44:58 -0500 Subject: [PATCH 002/154] Tweaks the ash walker nest so that lava rivers won't wreck them --- .../lavaland_surface_ash_walker1.dmm | 309 ++++++++++-------- .../lavaland_surface_ash_walker1.dmm.rej | 307 +++++++++++++++++ 2 files changed, 475 insertions(+), 141 deletions(-) create mode 100644 _maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm.rej diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index 7537f91f09..0fa2f0795c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -6,13 +6,13 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 4 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "ac" = ( /obj/structure/stone_tile/block{ dir = 1 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "ad" = ( /obj/structure/stone_tile/block{ @@ -21,13 +21,13 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "ae" = ( /obj/structure/stone_tile/block/cracked{ dir = 1 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "af" = ( /obj/structure/stone_tile/block{ @@ -36,26 +36,26 @@ /obj/structure/stone_tile{ dir = 8 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "ag" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "ah" = ( -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "ai" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 4 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "aj" = ( /obj/structure/stone_tile/slab, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "ak" = ( /turf/closed/indestructible/riveted/boss, @@ -64,7 +64,7 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 1 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "am" = ( /obj/structure/stone_tile{ @@ -95,7 +95,10 @@ /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "ar" = ( /obj/structure/stone_tile/block/cracked{ @@ -104,7 +107,7 @@ /obj/structure/stone_tile{ dir = 4 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "as" = ( /turf/closed/wall/mineral/wood, @@ -113,10 +116,10 @@ /obj/structure/stone_tile/block{ dir = 8 }, -/obj/structure/stone_tile{ - dir = 1 +/obj/structure/stone_tile/block{ + dir = 4 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "au" = ( /obj/structure/stone_tile, @@ -181,7 +184,7 @@ /obj/structure/stone_tile/block{ dir = 4 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "aA" = ( /obj/structure/stone_tile/cracked{ @@ -222,10 +225,7 @@ /obj/structure/stone_tile/block{ dir = 8 }, -/obj/structure/stone_tile/cracked{ - dir = 1 - }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "aG" = ( /obj/structure/stone_tile/block/cracked{ @@ -297,7 +297,10 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aO" = ( -/obj/item/weapon/storage/box/rxglasses, +/obj/structure/stone_tile/surrounding/cracked{ + icon_state = "cracked_surrounding1"; + dir = 1 + }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aP" = ( @@ -316,8 +319,10 @@ /obj/structure/stone_tile/block{ dir = 8 }, -/obj/structure/stone_tile, -/turf/closed/mineral/volcanic/lava_land_surface, +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "aS" = ( /obj/structure/stone_tile/block{ @@ -465,13 +470,13 @@ /obj/structure/stone_tile{ dir = 8 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "bi" = ( -/obj/structure/stone_tile/cracked{ - dir = 4 +/obj/structure/stone_tile/block/cracked{ + dir = 8 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "bj" = ( /obj/structure/stone_tile/block/cracked{ @@ -677,7 +682,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 4 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "bD" = ( /obj/structure/stone_tile/block{ @@ -713,11 +718,11 @@ /area/ruin/unpowered/ash_walkers) "bI" = ( /obj/structure/stone_tile/slab/cracked, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "bJ" = ( /obj/structure/stone_tile/surrounding_tile, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "bK" = ( /obj/structure/stone_tile{ @@ -908,10 +913,16 @@ "cj" = ( /obj/effect/mob_spawn/human/corpse/damaged, /obj/effect/decal/cleanable/blood, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "ck" = ( /obj/item/weapon/twohanded/spear, +/obj/structure/stone_tile{ + dir = 4 + }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cl" = ( @@ -931,19 +942,25 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cn" = ( -/obj/structure/bonfire/dense, +/obj/structure/stone_tile/block, +/obj/structure/stone_tile/block/cracked{ + dir = 1 + }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "co" = ( -/obj/structure/stone_tile, -/obj/structure/stone_tile/cracked{ +/obj/structure/stone_tile/block/cracked, +/obj/structure/stone_tile/block{ dir = 1 }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cp" = ( /obj/structure/stone_tile/cracked, -/turf/closed/mineral/volcanic/lava_land_surface, +/obj/structure/stone_tile/block{ + dir = 1 + }, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "cq" = ( /obj/structure/stone_tile/cracked{ @@ -1021,6 +1038,10 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "cA" = ( +/obj/structure/stone_tile/slab/cracked{ + icon_state = "cracked_slab1"; + dir = 4 + }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "cB" = ( @@ -1070,18 +1091,26 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cI" = ( +/obj/structure/stone_tile/cracked{ + dir = 4 + }, /obj/structure/stone_tile/cracked{ dir = 1 }, -/obj/effect/decal/cleanable/blood, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cJ" = ( /obj/item/weapon/shovel, +/obj/structure/stone_tile/cracked{ + dir = 8 + }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cK" = ( -/obj/item/weapon/pickaxe, +/obj/machinery/hydroponics/soil, +/obj/structure/stone_tile/block/cracked{ + dir = 1 + }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cL" = ( @@ -1132,21 +1161,19 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 8 }, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "cP" = ( /obj/structure/stone_tile/block, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "cQ" = ( -/obj/structure/stone_tile{ - dir = 8 - }, -/turf/closed/mineral/volcanic/lava_land_surface, +/obj/structure/stone_tile/block/cracked, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "cR" = ( /obj/structure/stone_tile/surrounding_tile/cracked, -/turf/closed/mineral/volcanic/lava_land_surface, +/turf/closed/mineral/volcanic, /area/lavaland/surface/outdoors) "cS" = ( /obj/effect/decal/cleanable/blood, @@ -1190,15 +1217,15 @@ aa (2,1,1) = {" aa ah +ab +cU +cV ah ah -ah -aL -ah bi -bu -am ah +bi +da ah ah ah @@ -1213,7 +1240,6 @@ aa aa aa ah -am as as as @@ -1221,12 +1247,13 @@ as ak as as +db +ah +ah +bN +bY +dp ah -cp -bX -bL -bM -cC ah ah aa @@ -1235,29 +1262,28 @@ aa aa aa ah -an ak aA aM -aX +cY bj bv ak -bK -bM -bM +db bN -bM -bY -cG +cg +cl +cq +cq +dv +ah ah aa "} (5,1,1) = {" aa aa -ah -ah +ac as aB aN @@ -1265,56 +1291,57 @@ aY bk bw ak -bX -cS -bM -bM -cw -bM +cb +bZ +ch +cm +cr +bY bL +cb ah ah "} (6,1,1) = {" aa aa -ah -ao +cT ak aC +cX aO -aM bl bx bD +bS +de +bV +dg +cs +cy bY -cg -bM -bO -cx -cw -cH +cq ah ah "} (7,1,1) = {" aa aa -ah -ap +ae as -aD +cW aP aZ bm by ak +bV +cb +ci +bA +ct bN -cg -cl -cq -bM -cw +bL cI ah ah @@ -1322,8 +1349,7 @@ ah (8,1,1) = {" aa aa -ah -ah +ae as aE aQ @@ -1331,12 +1357,13 @@ ba bn bz ak +cb +df +bX +dh +bO +dq bZ -ch -cm -cr -bY -bM cJ ah ah @@ -1345,7 +1372,6 @@ ah aa ah ah -ah as ak as @@ -1353,14 +1379,15 @@ as as ak ak -ca -bV +cg +cb +cg cn -cs -cy -cq -bM -ah +bL +dr +dw +dA +dD ah "} (10,1,1) = {" @@ -1368,21 +1395,21 @@ aa ai aq at -aF +cU +aR aR -bb bo bA -bE -bO +cZ +dd +cg cb -ci -bA -ct -bN -bM +di +dn +ds +dx cK -ah +dE ah "} (11,1,1) = {" @@ -1397,14 +1424,14 @@ ak ak bF bE -cc -bX -co -bO -bM -cg -ah -ah +cb +bL +dh +cb +dt +dy +dB +dC aa "} (12,1,1) = {" @@ -1421,11 +1448,11 @@ ak bP bL bX -bM -bY -bM -ah -ah +dh +do +du +dz +dC ah aa "} @@ -1443,7 +1470,7 @@ ak bQ bM cj -bL +dj ah ah ah @@ -1464,14 +1491,14 @@ ak bG bR cd -bM -bM +cg +dk cu ah -ah -aq -ah -cO +bi +bi +bi +da "} (15,1,1) = {" ac @@ -1486,8 +1513,8 @@ bB bH bS ce -bM -bN +dn +dl ak ak as @@ -1508,14 +1535,14 @@ ak bG bT cd -bM -bY +bX +dj as cz cD cL as -cp +ah "} (17,1,1) = {" af @@ -1551,7 +1578,7 @@ ak ak ak bV -bM +bX bN ah as @@ -1559,7 +1586,7 @@ cB cF cN ak -cP +db "} (19,1,1) = {" ag @@ -1599,9 +1626,9 @@ ah ah al ah -an +ah bC -cp +ah ah cR "} diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm.rej b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm.rej new file mode 100644 index 0000000000..4fe35ae3e9 --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm.rej @@ -0,0 +1,307 @@ +diff a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm (rejected hunks) +@@ -1161,6 +1188,293 @@ + }, + /turf/open/floor/plating/asteroid/basalt/lava_land_surface, + /area/lavaland/surface/outdoors) ++"cT" = ( ++/obj/structure/stone_tile, ++/obj/structure/stone_tile/block{ ++ dir = 1 ++ }, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"cU" = ( ++/obj/structure/stone_tile/block{ ++ dir = 8 ++ }, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"cV" = ( ++/obj/structure/stone_tile/cracked, ++/obj/structure/stone_tile/block{ ++ dir = 8 ++ }, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"cW" = ( ++/obj/structure/table/optable, ++/obj/structure/stone_tile{ ++ dir = 1 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/ruin/unpowered/ash_walkers) ++"cX" = ( ++/obj/item/weapon/storage/box/rxglasses, ++/obj/structure/stone_tile{ ++ dir = 1 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/ruin/unpowered/ash_walkers) ++"cY" = ( ++/obj/item/seeds/glowshroom, ++/obj/item/seeds/glowshroom, ++/obj/structure/stone_tile/block{ ++ dir = 4 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/ruin/unpowered/ash_walkers) ++"cZ" = ( ++/obj/structure/stone_tile/surrounding_tile{ ++ dir = 8 ++ }, ++/obj/structure/stone_tile/block{ ++ dir = 4 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"da" = ( ++/obj/structure/stone_tile/surrounding_tile/cracked{ ++ dir = 8 ++ }, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"db" = ( ++/obj/structure/stone_tile/block, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"dc" = ( ++/obj/structure/stone_tile/block, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"dd" = ( ++/obj/structure/stone_tile/surrounding_tile/cracked, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"de" = ( ++/obj/structure/stone_tile/block/cracked{ ++ dir = 4 ++ }, ++/obj/structure/stone_tile/block{ ++ dir = 8 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"df" = ( ++/obj/effect/decal/cleanable/blood, ++/obj/structure/stone_tile/cracked{ ++ dir = 8 ++ }, ++/obj/structure/stone_tile/cracked{ ++ dir = 4 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dg" = ( ++/obj/structure/bonfire/dense, ++/obj/structure/stone_tile/center, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dh" = ( ++/obj/structure/stone_tile/block/cracked, ++/obj/structure/stone_tile/block{ ++ dir = 1 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"di" = ( ++/obj/effect/decal/cleanable/blood, ++/obj/structure/stone_tile/block, ++/obj/structure/stone_tile/cracked{ ++ dir = 4 ++ }, ++/obj/structure/stone_tile/cracked{ ++ dir = 1 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dj" = ( ++/obj/structure/stone_tile/block, ++/obj/structure/stone_tile/block{ ++ dir = 1 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dk" = ( ++/obj/structure/stone_tile/block/cracked{ ++ dir = 1 ++ }, ++/obj/structure/stone_tile/block, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dl" = ( ++/obj/structure/stone_tile/block/cracked{ ++ dir = 1 ++ }, ++/obj/structure/stone_tile/cracked, ++/obj/structure/stone_tile/cracked{ ++ dir = 8 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dm" = ( ++/obj/structure/stone_tile/block, ++/obj/structure/stone_tile/block{ ++ dir = 1 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dn" = ( ++/obj/structure/stone_tile/block{ ++ dir = 4 ++ }, ++/obj/structure/stone_tile/block/cracked{ ++ dir = 8 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"do" = ( ++/obj/structure/stone_tile{ ++ dir = 8 ++ }, ++/obj/structure/reagent_dispensers/watertank, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dp" = ( ++/obj/item/weapon/pickaxe, ++/obj/structure/stone_tile/cracked{ ++ dir = 1 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dq" = ( ++/obj/item/stack/sheet/mineral/wood, ++/obj/structure/stone_tile{ ++ dir = 4 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dr" = ( ++/obj/structure/stone_tile/surrounding_tile/cracked, ++/obj/structure/stone_tile/surrounding_tile/cracked{ ++ dir = 1 ++ }, ++/obj/structure/stone_tile/surrounding_tile{ ++ dir = 8 ++ }, ++/obj/structure/stone_tile/center, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"ds" = ( ++/obj/structure/stone_tile/block, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dt" = ( ++/obj/structure/stone_tile/surrounding_tile/cracked{ ++ dir = 4 ++ }, ++/obj/structure/stone_tile/surrounding_tile/cracked, ++/obj/structure/stone_tile/surrounding_tile{ ++ dir = 8 ++ }, ++/obj/structure/stone_tile/center, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"du" = ( ++/obj/structure/stone_tile/cracked{ ++ dir = 1 ++ }, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"dv" = ( ++/obj/structure/stone_tile/cracked{ ++ dir = 8 ++ }, ++/obj/effect/mob_spawn/human/corpse/damaged, ++/obj/effect/decal/cleanable/blood, ++/obj/structure/stone_tile/cracked{ ++ dir = 1 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dw" = ( ++/obj/item/weapon/reagent_containers/glass/bucket, ++/obj/structure/stone_tile/block/cracked{ ++ dir = 4 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dx" = ( ++/obj/item/device/flashlight/lantern, ++/obj/structure/stone_tile/center, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dy" = ( ++/obj/machinery/hydroponics/soil, ++/obj/structure/stone_tile/block{ ++ dir = 8 ++ }, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dz" = ( ++/obj/structure/stone_tile/cracked{ ++ dir = 1 ++ }, ++/obj/structure/stone_tile/cracked, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"dA" = ( ++/obj/machinery/hydroponics/soil, ++/obj/structure/stone_tile/surrounding_tile/cracked{ ++ dir = 1 ++ }, ++/obj/structure/stone_tile/surrounding_tile, ++/obj/structure/stone_tile/surrounding_tile{ ++ dir = 4 ++ }, ++/obj/structure/stone_tile/center, ++/turf/open/floor/plating/asteroid/basalt/lava_land_surface, ++/area/lavaland/surface/outdoors) ++"dB" = ( ++/obj/structure/stone_tile/surrounding_tile/cracked{ ++ dir = 4 ++ }, ++/obj/structure/stone_tile/surrounding_tile/cracked{ ++ dir = 1 ++ }, ++/obj/structure/stone_tile/surrounding_tile/cracked{ ++ dir = 8 ++ }, ++/obj/structure/stone_tile/center/cracked, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"dC" = ( ++/obj/structure/stone_tile, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"dD" = ( ++/obj/structure/stone_tile/cracked{ ++ dir = 8 ++ }, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"dE" = ( ++/obj/structure/stone_tile, ++/obj/structure/stone_tile/cracked{ ++ dir = 8 ++ }, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) ++"dF" = ( ++/obj/structure/stone_tile, ++/turf/closed/mineral/volcanic, ++/area/lavaland/surface/outdoors) + + (1,1,1) = {" + aa +@@ -1526,9 +1840,9 @@ bt + ak + ak + bU +-bM ++cg + ck +-cb ++bS + cv + cA + cE From 39099f1bc9e09fad355f5746da0b1b3a977ca857 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 29 Jul 2017 19:44:14 -0500 Subject: [PATCH 003/154] Stunbatons now properly appear on security belts when active --- icons/obj/clothing/belt_overlays.dmi | Bin 1278 -> 1279 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi index 07765f7d79c4965a70deb2753a943abe3f8cb608..bbd4df9bb00e86a632ed171988bcad57233e7306 100644 GIT binary patch delta 1200 zcmV;h1W)_^3I7R@7Yd*V0{{R3yb+flks&4$Ut(}WNmoQfM46eH)sX-f9V?MyDt~Tn zZpD5S>zg0R2?oiF1``nxn*adf3k92J0OFnnCL$ss4gf1ACOsSke*ge~RRAk1D;yjg zM@L6(HxF7`T7OX$aBy(3izO~DE>%=iW@ctQ90Y3s0GR*)x&;M190oib1(IeOaBpuo zAP+Yp5<49S9v&Vy7XYE5C-Cq%iGPVeQc_ZYfB;lfRLICDCMG67KR>|0z$;ge#sB~S z0d!JMQvg8b*k%9#0S0kCq_-hYW_vA(;n zt7tWww0L}|D}%N({Iv)SjHz6ldI+Wk*DdNwTMB8fsjCygfKzQehgbjMHS1OLv}$g0 z;L)|f-u)&2CM77g7n~tDudwg)f+CEXQg52WN`s(h32rZm3FbMhBLVk!7Cx3gOE@(=Zr@(-P-UK^@9` zXS(sWj$xghRK=pMPQ>~De~w|CBOj#Cljd309=NZ5yjXIbB!iJNrGEeb008hmfoCrz z2v@v%F_i>rZU3`DNbixlVgPv30*2=nYrAcp*i*Kxwh5F9jd-h8h1k4IK z__ftF>Lq%8{eHazA3SW?pFtm6%mr>ddR*d7;$a0FoAeoMH=k4+s5Z%$=#8h(p0i>9 zCTKDN4xV`zEB)dnAAcqZDC5Nhub2R#7gPJda4Yoc#dN}sS1%^)Fe@bVa=7uO9smFU z004mN2Y2ycbusbUJQQ!t!td;=-JNn>mjQcB;C|JCeI_ufI&cvy zI51~$K==c51`o=0T?Q=T3=W3skPI~5HBfbh{+yl(Ah+0f*MBYU@AXL^?MD`)m;h)0 zmKmG#G2<@+hD;#gmlN1x0tx?)8JqJX#?Luy4W0daW^B$UjK2s_Od#X^!_8lH9{>OV z0B#0j&)(+02Xg!m^bArT#lphz5fdQvQJj`;T4=!dBNI5PdIdlE4wRljHn4Du?Y^Vu zJ1{L=LETk0SAQ%O25PIXiuyi-@)h(RSab$!vVz5L5*@2}8E5b_7kFG?Y7_XSNX1r{ zRN^gW0}Fo-#v{u>at5i7vb1QAM~TfXnwj8)nnCKL>^S>+wX$5nlOu8yr9R5C>{~&g z-9_n`-XgJ2)9*#fst*7F001|TiO}bk^Zb}jf4cZn^M6oqJ~NLEX8!5)mxFJgo{H+TO03g8q8~^|S005{Fe*uWQXRd0aI*|YX O002ovP6b4+LSTY-Ya40+ delta 1198 zcmV;f1X26{3H}L?7Ycv~0{{R3ySuwbI~@nWz`!>b0HJ@OC-Cq%iHSgffB?wICrh*4XaE2J z0d!JMQvg8b*k%9#0QGuQSad{Xb7OL8aCB*JZU6vyoRyP7Zo?oDMc3vODA`6;-9+lD zn<`P2MRNsfY$gU3Lp6+xdi#*nsaGv{$DsGn=Ofng_3(B)$^H9Ld?5wnoqUnIheuIG zqga2ZVf!R1ji%T9GXw_4v|ODn1l@w`SE5peLfWfEbtV{aT5HeY(_g)Mx2c~u^(+S- zT?_2pU-C?Lgi(=6@s_ZSMo^0cH-6wEp(O|*Yjh)XYPKQF$GNlLXswUMcwrFov4wnz z6W3UvK3~Y4F1p^tmgS9vuG58BGoUgZ*iwJIEW$8aHtc==*k7{r?PlSh=GO9X+TT9s z1w}3x=G^a}SO5S5yGcYrRCt{2m}`I1FcgQ=E+RwSCdzbpzkySBDPyI()H$h_Uq$`? z-^S=(C~bDm2_YoY^YmT+P4jS)LODV(48t%CQz!B*fDpwiz7=4+2uex6Hj0e?Jye;KU9f*TvRJqxyB z!8><5^gXCsV%HViym#N=A<VSBw4hUM0Pb-M@MlKlah@AnD@9v4cT_Be& zL77G`xW5cRNoqA~_n=Gys-RYoQo*6xgF_%cP2VwHnSY$2HJC-_LA1gvr;NSH>z?jKF-F3 zS(M;W-HVUxV%KS)w4$FU&v}V{nIR%Gcc|`!}E@63+<_5FP0V?aD8RP?EUyV@`g8O=Db9;ev!{9{$dp)K5zzMM z=y_5U#b=`#O~LweSf1x!7OBH948t%CgHsZ(`#PO|bD3X8p$-b_{?qAqclo7c1x@fb zKOE-_bEWz96uQhACQzuq#NNoVz!l51EW=hTsjoA>2)ld?!!XYH3E2c*RYp+!%m4rY M07*qoM6N<$f}nsLQUCw| From 29f8f8eb451a4bf16dade8f2162ca120c390d286 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 31 Jul 2017 23:36:49 -0500 Subject: [PATCH 004/154] Update component.dm --- code/datums/components/component.dm | 34 +++++++++++++++++++---------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/code/datums/components/component.dm b/code/datums/components/component.dm index 1bbd785d22..6af3039217 100644 --- a/code/datums/components/component.dm +++ b/code/datums/components/component.dm @@ -51,24 +51,36 @@ procs[sig_type] = CALLBACK(src, proc_on_self) +/datum/component/proc/ReceiveSignal(sigtype, ...) + var/list/sps = signal_procs + var/datum/callback/CB = LAZYACCESS(sps, sigtype) + if(!CB) + return FALSE + var/list/arguments = args.Copy() + arguments.Cut(1, 2) + return CB.InvokeAsync(arglist(arguments)) + +/datum/component/proc/InheritComponent(datum/component/C, i_am_original) + return + +/datum/component/proc/OnTransfer(datum/new_parent) + return + /datum/var/list/datum_components //list of /datum/component -// Send a signal to all other components in the container. -/datum/proc/SendSignal(sigtype, list/sig_args, async = FALSE) +/datum/proc/SendSignal(sigtype, ...) var/list/comps = datum_components . = FALSE for(var/I in comps) var/datum/component/C = I if(!C.enabled) continue - var/list/sps = C.signal_procs - var/datum/callback/CB = LAZYACCESS(sps, sigtype) - if(!CB) - continue - if(!async) - . |= CB.Invoke(sig_args) - else - . |= CB.InvokeAsync(sig_args) + if(C.ReceiveSignal(arglist(args))) + ComponentActivated(C) + . = TRUE + +/datum/proc/ComponentActivated(datum/component/C) + return /datum/proc/GetComponent(c_type) for(var/I in datum_components) @@ -104,4 +116,4 @@ helicopter.SendSignal(COMSIG_COMPONENT_REMOVING, C) C.OnTransfer(src) C.parent = src - SendSignal(COMSIG_COMPONENT_ADDED, C) \ No newline at end of file + SendSignal(COMSIG_COMPONENT_ADDED, C) From cccfeb479e23e674d39f61997f05fa93168f63ed Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 31 Jul 2017 23:38:15 -0500 Subject: [PATCH 005/154] Update lavaland_surface_ash_walker1.dmm --- .../lavaland_surface_ash_walker1.dmm | 304 +++++++++++++++++- 1 file changed, 294 insertions(+), 10 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index 0fa2f0795c..aed9b30686 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -1,4 +1,4 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( /turf/template_noop, /area/template_noop) @@ -1069,6 +1069,11 @@ /obj/item/device/flashlight/lantern, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) +"cE" = ( +/obj/structure/stone_tile/surrounding/cracked, +/obj/effect/baseturf_helper, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "cF" = ( /obj/structure/stone_tile/block{ dir = 8 @@ -1183,14 +1188,293 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"cT" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile/block{ + dir = 1 + }, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) "cU" = ( -/obj/effect/baseturf_helper, -/turf/closed/indestructible/riveted/boss, -/area/ruin/unpowered/ash_walkers) -"kB" = ( -/obj/structure/stone_tile/surrounding/cracked, +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"cV" = ( +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"cW" = ( +/obj/structure/table/optable, +/obj/structure/stone_tile{ + dir = 1 + }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) +"cX" = ( +/obj/item/weapon/storage/box/rxglasses, +/obj/structure/stone_tile{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) +"cY" = ( +/obj/item/seeds/glowshroom, +/obj/item/seeds/glowshroom, +/obj/structure/stone_tile/block{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) +"cZ" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/structure/stone_tile/block{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"da" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"db" = ( +/obj/structure/stone_tile/block, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"dc" = ( +/obj/structure/stone_tile/block, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"dd" = ( +/obj/structure/stone_tile/surrounding_tile/cracked, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"de" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"df" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dg" = ( +/obj/structure/bonfire/dense, +/obj/structure/stone_tile/center, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dh" = ( +/obj/structure/stone_tile/block/cracked, +/obj/structure/stone_tile/block{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"di" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/stone_tile/block, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dj" = ( +/obj/structure/stone_tile/block, +/obj/structure/stone_tile/block{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dk" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/block, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dl" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dm" = ( +/obj/structure/stone_tile/block, +/obj/structure/stone_tile/block{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dn" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"do" = ( +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dp" = ( +/obj/item/weapon/pickaxe, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dq" = ( +/obj/item/stack/sheet/mineral/wood, +/obj/structure/stone_tile{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dr" = ( +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/structure/stone_tile/center, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"ds" = ( +/obj/structure/stone_tile/block, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dt" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/structure/stone_tile/center, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"du" = ( +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"dv" = ( +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/obj/effect/mob_spawn/human/corpse/damaged, +/obj/effect/decal/cleanable/blood, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dw" = ( +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dx" = ( +/obj/item/device/flashlight/lantern, +/obj/structure/stone_tile/center, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dy" = ( +/obj/machinery/hydroponics/soil, +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dz" = ( +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/cracked, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"dA" = ( +/obj/machinery/hydroponics/soil, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/obj/structure/stone_tile/center, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) +"dB" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/center/cracked, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"dC" = ( +/obj/structure/stone_tile, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"dD" = ( +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"dE" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) +"dF" = ( +/obj/structure/stone_tile, +/turf/closed/mineral/volcanic, +/area/lavaland/surface/outdoors) (1,1,1) = {" aa @@ -1443,7 +1727,7 @@ ak ak ak ak -cU +ak ak bP bL @@ -1556,12 +1840,12 @@ bt ak ak bU -bM +cg ck -cb +bS cv cA -kB +cE cM as ah From d176fcf24c521e42fd0c73326827a18c2f00d192 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 1 Aug 2017 07:48:16 -0500 Subject: [PATCH 006/154] Refactors pie throwing and fixes throwing not finalizing in some cases --- code/controllers/subsystem/throwing.dm | 13 ++++--- .../food_and_drinks/food/snacks_pie.dm | 39 +++++++++++-------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 4ae31e98d6..d91d91de72 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -103,7 +103,7 @@ SUBSYSTEM_DEF(throwing) finalize() return -/datum/thrownthing/proc/finalize(hit = FALSE) +/datum/thrownthing/proc/finalize(hit = FALSE, target=null) set waitfor = 0 SSthrowing.processing -= thrownthing //done throwing, either because it hit something or it finished moving @@ -120,13 +120,15 @@ SUBSYSTEM_DEF(throwing) thrownthing.newtonian_move(init_dir) else thrownthing.newtonian_move(init_dir) + + if(target) + thrownthing.throw_impact(target, src) + if (callback) callback.Invoke() /datum/thrownthing/proc/hit_atom(atom/A) - thrownthing.throw_impact(A, src) - thrownthing.newtonian_move(init_dir) - finalize(TRUE) + finalize(hit=TRUE, target=A) /datum/thrownthing/proc/hitcheck() for (var/thing in get_turf(thrownthing)) @@ -134,6 +136,5 @@ SUBSYSTEM_DEF(throwing) if (AM == thrownthing) continue if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags & ON_BORDER)) - thrownthing.throwing = null - thrownthing.throw_impact(AM, src) + finalize(hit=TRUE, target=AM) return TRUE diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index 94c8e54f15..13f22851b1 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -26,24 +26,29 @@ tastes = list("pie" = 1) /obj/item/weapon/reagent_containers/food/snacks/pie/cream/throw_impact(atom/hit_atom) - if(!..()) //was it caught by a mob? - var/turf/T = get_turf(hit_atom) - new/obj/effect/decal/cleanable/pie_smudge(T) - reagents.reaction(hit_atom, TOUCH) + . = ..() + if(!.) //if we're not being caught + splat(hit_atom) - if(ishuman(hit_atom)) - var/mob/living/carbon/human/H = hit_atom - var/mutable_appearance/creamoverlay = mutable_appearance('icons/effects/creampie.dmi') - if(H.dna.species.id == "lizard") - creamoverlay.icon_state = "creampie_lizard" - else - creamoverlay.icon_state = "creampie_human" - H.Knockdown(20) //splat! - H.adjust_blurriness(1) - visible_message("[H] was creamed by [src]!!") - H.add_overlay(creamoverlay) - - qdel(src) +/obj/item/weapon/reagent_containers/food/snacks/pie/cream/proc/splat(atom/movable/hit_atom) + if(isliving(loc)) //someone caught us! + return + var/turf/T = get_turf(hit_atom) + new/obj/effect/decal/cleanable/pie_smudge(T) + reagents.reaction(hit_atom, TOUCH) + if(ishuman(hit_atom)) + var/mob/living/carbon/human/H = hit_atom + var/mutable_appearance/creamoverlay = mutable_appearance('icons/effects/creampie.dmi') + if(H.dna.species.limbs_id == "lizard") + creamoverlay.icon_state = "creampie_lizard" + else + creamoverlay.icon_state = "creampie_human" + H.Knockdown(20) //splat! + H.adjust_blurriness(1) + H.visible_message("[H] is creamed by [src]!", "You've been creamed by [src]!") + playsound(H, "desceration", 50, TRUE) + H.add_overlay(creamoverlay) + qdel(src) /obj/item/weapon/reagent_containers/food/snacks/pie/berryclafoutis From 55f1de10a68eafb5adf7116ca6a221f4a1a28aee Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 1 Aug 2017 08:46:20 -0500 Subject: [PATCH 007/154] Spellchecking --- .../lavaland_surface_animal_hospital.dmm | 2 +- _maps/RandomZLevels/Cabin.dmm | 2 +- _maps/RandomZLevels/research.dmm | 32 +-- _maps/RandomZLevels/snowdin.dmm | 8 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 2 +- _maps/map_files/BoxStation/BoxStation.dmm | 2 +- _maps/map_files/Mining/Lavaland.dmm | 2 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 4 +- .../PubbyStation/PubbyStation.dmm.rej | 213 ++++++++++++++++++ _maps/map_files/generic/Centcomm.dmm | 2 +- code/__HELPERS/sorts/__main.dm | 2 +- code/__HELPERS/unsorted.dm | 2 +- code/_globalvars/lists/objects.dm | 2 +- code/_onclick/hud/screen_objects.dm | 2 +- code/controllers/subsystem/garbage.dm | 4 +- code/datums/datumvars.dm | 2 +- code/datums/helper_datums/getrev.dm | 2 +- code/game/area/areas.dm | 2 +- code/game/gamemodes/game_mode.dm | 2 +- .../miniantags/abduction/abduction.dm | 2 +- .../miniantags/abduction/abduction_gear.dm | 2 +- code/game/machinery/camera/camera_assembly.dm | 2 +- code/game/objects/effects/contraband.dm | 2 +- .../objects/items/weapons/tanks/watertank.dm | 4 +- code/game/objects/structures/musician.dm | 2 +- code/modules/admin/admin_ranks.dm | 4 +- code/modules/admin/stickyban.dm | 2 +- .../awaymissions/mission_code/snowdin.dm | 4 +- code/modules/clothing/clothing.dm | 2 +- code/modules/clothing/head/misc.dm | 4 +- code/modules/clothing/shoes/miscellaneous.dm | 2 +- .../modules/clothing/spacesuits/flightsuit.dm | 2 +- .../clothing/spacesuits/flightsuit.dm.rej | 14 ++ .../clothing/spacesuits/miscellaneous.dm | 2 +- code/modules/clothing/suits/armor.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 2 +- code/modules/food_and_drinks/drinks/drinks.dm | 2 +- .../drinks/drinks/drinkingglass.dm | 2 +- .../modules/food_and_drinks/food/condiment.dm | 2 +- code/modules/mining/aux_base_camera.dm | 4 +- .../mining/lavaland/necropolis_chests.dm | 4 +- code/modules/mining/machine_vending.dm | 2 +- code/modules/mining/shelters.dm | 2 +- .../mob/living/carbon/human/human_helpers.dm | 2 +- code/modules/mob/living/living.dm | 4 +- code/modules/mob/living/logout.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../mob/living/simple_animal/corpse.dm | 2 +- code/modules/mob/say_readme.dm | 4 +- code/modules/paperwork/filingcabinet.dm | 2 +- code/modules/power/apc.dm | 4 +- code/modules/power/supermatter/supermatter.dm | 2 +- .../procedural_mapping/mapGeneratorReadme.dm | 4 +- .../projectiles/guns/ballistic/automatic.dm | 2 +- .../projectiles/guns/ballistic/revolver.dm | 2 +- .../guns/energy/kinetic_accelerator.dm | 4 +- code/modules/projectiles/guns/energy/laser.dm | 6 +- .../chemistry/machinery/chem_master.dm | 2 +- code/modules/research/designs.dm | 4 +- code/modules/research/experimentor.dm | 2 +- code/modules/research/research.dm | 6 +- .../research/xenobiology/xenobiology.dm | 2 +- code/modules/spells/spell_types/summonitem.dm | 2 +- code/modules/station_goals/bsa.dm | 2 +- code/modules/station_goals/dna_vault.dm | 2 +- code/modules/stock_market/events.dm | 2 +- .../modules/surgery/organ_manipulation.dm.rej | 10 + code/modules/surgery/organs/augments_arms.dm | 4 +- code/modules/surgery/organs/augments_chest.dm | 2 +- .../modules/surgery/remove_embedded_object.dm | 2 +- code/modules/zombie/organs.dm | 2 +- 71 files changed, 342 insertions(+), 105 deletions(-) create mode 100644 _maps/map_files/PubbyStation/PubbyStation.dmm.rej create mode 100644 code/modules/clothing/spacesuits/flightsuit.dm.rej create mode 100644 code/modules/surgery/organ_manipulation.dm.rej diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index 937890e100..005ce22589 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -474,7 +474,7 @@ "bD" = ( /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/bottle/cyanide{ - desc = "A cocktail of chemotherpy drugs intended to treat bladder cancer."; + desc = "A cocktail of chemotherapy drugs intended to treat bladder cancer."; name = "MVAC regimen" }, /obj/item/weapon/reagent_containers/syringe, diff --git a/_maps/RandomZLevels/Cabin.dmm b/_maps/RandomZLevels/Cabin.dmm index 33f514c051..a03b3b148e 100644 --- a/_maps/RandomZLevels/Cabin.dmm +++ b/_maps/RandomZLevels/Cabin.dmm @@ -250,7 +250,7 @@ /area/awaymission/cabin) "aQ" = ( /obj/machinery/door/airlock/wood{ - name = "maintence" + name = "maintenance" }, /turf/open/floor/plating, /area/awaymission/cabin) diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 127813046e..7d313a0915 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -1060,7 +1060,7 @@ "dd" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -1081,7 +1081,7 @@ read_only = 1 }, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -1143,7 +1143,7 @@ "dp" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -1289,12 +1289,12 @@ "dL" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off with the words 'DO NOT CLONE' hastely written over it."; + desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off with the words 'DO NOT CLONE' hastily written over it."; fields = list("label" = "Buffer1:George Melons", "UI" = "3c300f11b5421ca7014d8", "SE" = "430431205660551642142504334461413202111310233445620533134255", "UE" = "6893e6a0b0076a41897776b10cc2b324", "name" = "George Melons", "blood_type" = "B+"); name = "old genetics data disk" }, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -1306,12 +1306,12 @@ "dM" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -2794,12 +2794,12 @@ "hS" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines. This one has the initials 'C.P' marked on the front. "; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines. This one has the initials 'C.P' marked on the front. "; name = "encrypted genetic data disk"; read_only = 1 }, @@ -2812,12 +2812,12 @@ "hT" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -2949,7 +2949,7 @@ "il" = ( /obj/structure/closet/crate, /obj/item/weapon/disk/data{ - desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, infomation will turn up blank on most DNA machines."; + desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, @@ -3336,7 +3336,7 @@ /area/awaymission/research/interior/dorm) "jp" = ( /obj/structure/barricade/wooden{ - desc = "A wooden table hastely flipped over for cover."; + desc = "A wooden table hastily flipped over for cover."; obj_integrity = 55; icon = 'icons/obj/smooth_structures/wood_table.dmi'; icon_state = "wood_table"; @@ -3402,7 +3402,7 @@ /area/awaymission/research/interior/medbay) "jy" = ( /obj/machinery/door/airlock/medical{ - name = "Medical Surgey" + name = "Medical Surgery" }, /turf/open/floor/plasteel/whiteblue, /area/awaymission/research/interior/medbay) @@ -3446,7 +3446,7 @@ /area/awaymission/research/interior/dorm) "jG" = ( /obj/structure/barricade/wooden{ - desc = "A wooden table hastely flipped over for cover."; + desc = "A wooden table hastily flipped over for cover."; obj_integrity = 55; icon = 'icons/obj/smooth_structures/wood_table.dmi'; icon_state = "wood_table"; @@ -3569,7 +3569,7 @@ /area/awaymission/research/interior/dorm) "kb" = ( /obj/structure/barricade/wooden{ - desc = "A wooden table hastely flipped over for cover."; + desc = "A wooden table hastily flipped over for cover."; obj_integrity = 55; icon = 'icons/obj/smooth_structures/wood_table.dmi'; icon_state = "wood_table"; diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 0cb107f9e1..b390094018 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -635,10 +635,10 @@ /area/awaymission/snowdin/base) "bC" = ( /obj/structure/showcase{ - desc = "A strange machine thats supposedly used to help pick up and decypth wave signals. "; + desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. "; icon = 'icons/obj/machines/telecomms.dmi'; icon_state = "processor"; - name = "subsystem signal decrypher" + name = "subsystem signal decrypter" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -2504,10 +2504,10 @@ "gL" = ( /obj/machinery/light/small, /obj/structure/showcase{ - desc = "A strange machine thats supposedly used to help pick up and decypth wave signals. "; + desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. "; icon = 'icons/obj/machines/telecomms.dmi'; icon_state = "processor"; - name = "subsystem signal decrypher" + name = "subsystem signal decrypter" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index b985470bc1..fb82bb398a 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -9874,7 +9874,7 @@ dir = 8 }, /obj/machinery/button/door{ - desc = "A remote control-switch whichs locks the research division down in the event of a biohazard leak or contamination."; + desc = "A remote control-switch which locks the research division down in the event of a biohazard leak or contamination."; id = "UO45_biohazard"; name = "Biohazard Door Control"; pixel_y = 8; diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 14118443f6..26feb0fa1b 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -34356,7 +34356,7 @@ /area/janitor) "bAV" = ( /obj/machinery/door/window/westleft{ - name = "Janitoral Delivery"; + name = "Janitorial Delivery"; req_access_txt = "26" }, /obj/effect/turf_decal/delivery, diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index f8bf06a40c..432d5ae341 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -2091,7 +2091,7 @@ /area/mine/living_quarters) "ft" = ( /obj/machinery/camera{ - c_tag = "Dormatories"; + c_tag = "Dormitories"; dir = 4; network = list("MINE") }, diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 66b8bd0708..8a7311fb5a 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -35023,7 +35023,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Chaplen Quarters"; + c_tag = "Chaplain's Quarters"; dir = 2; network = list("SS13") }, @@ -36017,7 +36017,7 @@ pixel_y = -32 }, /obj/machinery/camera{ - c_tag = "Xenobilogy Lab"; + c_tag = "Xenobiology Lab"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm.rej b/_maps/map_files/PubbyStation/PubbyStation.dmm.rej new file mode 100644 index 0000000000..80fa973d0a --- /dev/null +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm.rej @@ -0,0 +1,213 @@ +diff a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm (rejected hunks) +@@ -17662,7 +17662,7 @@ + /obj/machinery/conveyor_switch/oneway{ + convdir = 1; + id = "garbagestacked"; +- name = "disposal coveyor" ++ name = "disposal conveyor" + }, + /obj/effect/turf_decal/stripes/line, + /turf/open/floor/plating{ +@@ -19866,7 +19866,7 @@ + /obj/machinery/conveyor_switch/oneway{ + convdir = -1; + id = "garbage"; +- name = "disposal coveyor" ++ name = "disposal conveyor" + }, + /obj/effect/turf_decal/stripes/line{ + dir = 1 +@@ -29076,7 +29076,7 @@ + /area/science/explab) + "blV" = ( + /obj/structure/sign/atmosplaque{ +- desc = "A guide to the drone shell dispenser, detailing the constructive and destructive applications of modern repair drones, as well as the development of the uncorruptable cyborg servants of tomorrow, available today."; ++ desc = "A guide to the drone shell dispenser, detailing the constructive and destructive applications of modern repair drones, as well as the development of the incorruptible cyborg servants of tomorrow, available today."; + icon_state = "kiddieplaque"; + name = "\improper 'Perfect Drone' sign"; + pixel_y = 32 +@@ -31843,7 +31843,7 @@ + /area/science/xenobiology) + "brT" = ( + /obj/machinery/computer/security/telescreen{ +- name = "Test Chamber Moniter"; ++ name = "Test Chamber Monitor"; + network = list("Xeno"); + pixel_y = 2 + }, +@@ -36758,7 +36758,7 @@ + /obj/item/device/radio/intercom{ + dir = 8; + freerange = 1; +- name = "Station Intercom (Telecoms)"; ++ name = "Station Intercom (Telecomms)"; + pixel_x = 28; + pixel_y = 24 + }, +@@ -42005,7 +42005,7 @@ + /obj/item/device/radio/intercom{ + dir = 8; + freerange = 1; +- name = "Station Intercom (Telecoms)"; ++ name = "Station Intercom (Telecomms)"; + pixel_y = 26 + }, + /turf/open/floor/plasteel, +@@ -49228,7 +49228,7 @@ + /area/chapel/main/monastery) + "ccI" = ( + /obj/machinery/door/airlock/centcom{ +- name = "Chape Access"; ++ name = "Chapel Access"; + opacity = 1 + }, + /turf/open/floor/plasteel/black, +@@ -50408,7 +50408,7 @@ + /area/engine/engineering) + "cfs" = ( + /obj/machinery/camera{ +- c_tag = "Engineering Telecoms Access"; ++ c_tag = "Engineering Telecomms Access"; + dir = 8; + network = list("Labor") + }, +@@ -50416,11 +50416,11 @@ + dir = 4 + }, + /obj/machinery/computer/security/telescreen{ +- desc = "Used for watching telecoms."; ++ desc = "Used for watching telecomms."; + dir = 8; + layer = 4; +- name = "Telecoms Telescreen"; +- network = list("Telecoms"); ++ name = "Telecomms Telescreen"; ++ network = list("Telecomms"); + pixel_x = 30 + }, + /turf/open/floor/plasteel, +@@ -52887,9 +52887,9 @@ + /area/space) + "clu" = ( + /obj/machinery/camera{ +- c_tag = "Telecoms External Fore"; ++ c_tag = "Telecomms External Fore"; + dir = 1; +- network = list("SS13, Telecoms"); ++ network = list("SS13, Telecomms"); + start_active = 1 + }, + /turf/open/space, +@@ -53072,9 +53072,9 @@ + /area/tcommsat/computer) + "clX" = ( + /obj/machinery/camera/motion{ +- c_tag = "Telecoms External Access"; ++ c_tag = "Telecomms External Access"; + dir = 1; +- network = list("SS13","Telecoms") ++ network = list("SS13","Telecomms") + }, + /turf/open/floor/plasteel, + /area/tcommsat/computer) +@@ -53136,9 +53136,9 @@ + "cmg" = ( + /obj/machinery/requests_console{ + announcementConsole = 1; +- department = "Telecoms Admin"; ++ department = "Telecomms Admin"; + departmentType = 5; +- name = "Telecoms RC"; ++ name = "Telecomms RC"; + pixel_y = 30 + }, + /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +@@ -53169,9 +53169,9 @@ + pixel_y = 26 + }, + /obj/machinery/camera/motion{ +- c_tag = "Telecoms Monitoring"; ++ c_tag = "Telecomms Monitoring"; + dir = 2; +- network = list("SS13","Telecoms") ++ network = list("SS13","Telecomms") + }, + /turf/open/floor/plasteel/yellow/side{ + dir = 1 +@@ -53197,7 +53197,7 @@ + "cmk" = ( + /obj/machinery/power/apc{ + dir = 1; +- name = "Telecoms Monitoring APC"; ++ name = "Telecomms Monitoring APC"; + pixel_y = 25 + }, + /obj/structure/cable{ +@@ -53282,9 +53282,9 @@ + "cmt" = ( + /obj/structure/lattice, + /obj/machinery/camera/motion{ +- c_tag = "Telecoms External Port"; ++ c_tag = "Telecomms External Port"; + dir = 8; +- network = list("Telecoms") ++ network = list("Telecomms") + }, + /turf/open/space, + /area/space) +@@ -53342,9 +53342,9 @@ + "cmz" = ( + /obj/structure/lattice, + /obj/machinery/camera/motion{ +- c_tag = "Telecoms External Starboard"; ++ c_tag = "Telecomms External Starboard"; + dir = 4; +- network = list("Telecoms") ++ network = list("Telecomms") + }, + /turf/open/space, + /area/space) +@@ -53430,7 +53430,7 @@ + cell_type = 5000; + dir = 1; + layer = 4; +- name = "Telecoms Server APC"; ++ name = "Telecomms Server APC"; + pixel_y = 24 + }, + /obj/structure/cable, +@@ -53719,9 +53719,9 @@ + /area/tcommsat/server) + "cnu" = ( + /obj/machinery/camera/motion{ +- c_tag = "Telecoms Server Room"; ++ c_tag = "Telecomms Server Room"; + dir = 1; +- network = list("SS13","Telecoms") ++ network = list("SS13","Telecomms") + }, + /turf/open/floor/plasteel/black{ + initial_gas_mix = "n2=100;TEMP=80" +@@ -53758,18 +53758,18 @@ + "cny" = ( + /obj/structure/lattice, + /obj/machinery/camera/motion{ +- c_tag = "Telecoms External Port Aft"; ++ c_tag = "Telecomms External Port Aft"; + dir = 2; +- network = list("Telecoms") ++ network = list("Telecomms") + }, + /turf/open/space, + /area/space) + "cnz" = ( + /obj/structure/lattice, + /obj/machinery/camera/motion{ +- c_tag = "Telecoms External Starboard Aft"; ++ c_tag = "Telecomms External Starboard Aft"; + dir = 2; +- network = list("Telecoms") ++ network = list("Telecomms") + }, + /turf/open/space, + /area/space) diff --git a/_maps/map_files/generic/Centcomm.dmm b/_maps/map_files/generic/Centcomm.dmm index 1840fb2d80..8e3d678469 100644 --- a/_maps/map_files/generic/Centcomm.dmm +++ b/_maps/map_files/generic/Centcomm.dmm @@ -10338,7 +10338,7 @@ base_state = "rightsecure"; dir = 2; icon_state = "rightsecure"; - name = "Thunderdoom Booth"; + name = "Thunderdome Booth"; req_access_txt = "109" }, /obj/effect/turf_decal/bot, diff --git a/code/__HELPERS/sorts/__main.dm b/code/__HELPERS/sorts/__main.dm index 7da17da503..c7ccfa97d7 100644 --- a/code/__HELPERS/sorts/__main.dm +++ b/code/__HELPERS/sorts/__main.dm @@ -8,7 +8,7 @@ //When we get into galloping mode, we stay there until both runs win less often than MIN_GALLOP consecutive times. #define MIN_GALLOP 7 - //This is a global instance to allow much of this code to be reused. The interfaces are kept seperately + //This is a global instance to allow much of this code to be reused. The interfaces are kept separately GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new()) /datum/sortInstance //The array being sorted. diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index b743907982..48787430a0 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -48,7 +48,7 @@ Location where the teleport begins, target that will teleport, distance to go, d Random error in tile placement x, error in tile placement y, and block offset. Block offset tells the proc how to place the box. Behind teleport location, relative to starting location, forward, etc. Negative values for offset are accepted, think of it in relation to North, -x is west, -y is south. Error defaults to positive. -Turf and target are seperate in case you want to teleport some distance from a turf the target is not standing on or something. +Turf and target are separate in case you want to teleport some distance from a turf the target is not standing on or something. */ var/dirx = 0//Generic location finding variable. diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 3f0d6cab80..9ad2d6c969 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(tech_list) //list of all /datum/tech datums indexed by id. GLOBAL_LIST_EMPTY(surgeries_list) //list of all surgeries by name, associated with their path. GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes GLOBAL_LIST_EMPTY(rcd_list) //list of Rapid Construction Devices. -GLOBAL_LIST_EMPTY(apcs_list) //list of all Area Power Controller machines, seperate from machines for powernet speeeeeeed. +GLOBAL_LIST_EMPTY(apcs_list) //list of all Area Power Controller machines, separate from machines for powernet speeeeeeed. GLOBAL_LIST_EMPTY(tracked_implants) //list of all current implants that are tracked to work out what sort of trek everyone is on. Sadly not on lavaworld not implemented... GLOBAL_LIST_EMPTY(tracked_chem_implants) //list of implants the prisoner console can track and send inject commands too GLOBAL_LIST_EMPTY(poi_list) //list of points of interest for observe/follow diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 401bde5cdb..14b7323ce3 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -281,7 +281,7 @@ to_chat(H, "You are now running on internals from the [H.r_store] in your right pocket.") H.internal = H.r_store - //Seperate so CO2 jetpacks are a little less cumbersome. + //Separate so CO2 jetpacks are a little less cumbersome. if(!C.internal && istype(C.back, /obj/item/weapon/tank)) to_chat(C, "You are now running on internals from the [C.back] on your back.") C.internal = C.back diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 2cee9a192a..ac2b60c67e 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -18,7 +18,7 @@ SUBSYSTEM_DEF(garbage) // refID's are associated with the time at which they time out and need to be manually del() // we do this so we aren't constantly locating them and preventing them from being gc'd - var/list/tobequeued = list() //We store the references of things to be added to the queue seperately so we can spread out GC overhead over a few ticks + var/list/tobequeued = list() //We store the references of things to be added to the queue separately so we can spread out GC overhead over a few ticks var/list/didntgc = list() // list of all types that have failed to GC associated with the number of times that's happened. // the types are stored as strings @@ -144,7 +144,7 @@ SUBSYSTEM_DEF(garbage) queue[refid] = gctime -//this is purely to seperate things profile wise. +//this is purely to separate things profile wise. /datum/controller/subsystem/garbage/proc/HardDelete(datum/A) var/time = world.timeofday var/tick = world.tick_usage diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index be1ae8bfde..e519cf6af3 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -21,7 +21,7 @@ return debug_variable(var_name, vars[var_name], 0, src) //please call . = ..() first and append to the result, that way parent items are always at the top and child items are further down -//add seperaters by doing . += "---" +//add separaters by doing . += "---" /datum/proc/vv_get_dropdown() . = list() . += "---" diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index d5c0e74839..f6296bc0c9 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -96,7 +96,7 @@ to_chat(src, "[prefix][copytext(pc, 1, min(length(pc), 7))]") else to_chat(src, "Revision unknown") - to_chat(src, "Current Infomational Settings:") + to_chat(src, "Current Informational Settings:") to_chat(src, "Protect Authority Roles From Traitor: [config.protect_roles_from_antagonist]") to_chat(src, "Protect Assistant Role From Traitor: [config.protect_assistant_from_antagonist]") to_chat(src, "Enforce Human Authority: [config.enforce_human_authority]") diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index a0f268344e..2a139da456 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -429,7 +429,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) if(!L.ckey) return - // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch + // Ambience goes down here -- make sure to list each area separately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch if(L.client && !L.client.ambience_playing && L.client.prefs.toggles & SOUND_SHIP_AMBIENCE) L.client.ambience_playing = 1 L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = CHANNEL_BUZZ) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 742ed08cf4..057f9ee34a 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -369,7 +369,7 @@ if(candidates.len < recommended_enemies) for(var/mob/dead/new_player/player in players) if(player.client && player.ready == PLAYER_READY_TO_PLAY) - if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a seperate list of people who don't want to be one + if(!(role in player.client.prefs.be_special)) // We don't have enough people who want to be antagonist, make a separate list of people who don't want to be one if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans drafted += player.mind diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index 8b18c3b1bb..ce0ab22373 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -200,7 +200,7 @@ to_chat(world, text) //Landmarks -// TODO: Split into seperate landmarks for prettier ships +// TODO: Split into separate landmarks for prettier ships /obj/effect/landmark/abductor var/team = 1 diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 3f45f69cdd..d6265a8f75 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -469,7 +469,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(ishuman(L)) var/mob/living/carbon/human/H = L - species = "[H.dna.species.name]" + species = "[H.dna.species.name]" if(L.mind && L.mind.changeling) species = "Changeling lifeform" var/obj/item/organ/heart/gland/temp = locate() in H.internal_organs diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 8639544e0a..8ca1a8632c 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -79,7 +79,7 @@ if(istype(W, /obj/item/weapon/screwdriver)) playsound(src.loc, W.usesound, 50, 1) - var/input = stripped_input(user, "Which networks would you like to connect this camera to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13") + var/input = stripped_input(user, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13") if(!input) to_chat(user, "No input found, please hang up and try your call again!") return diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index fb2b854ffb..663fed74fc 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -115,7 +115,7 @@ forceMove(P) return P -//seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby() +//separated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby() /turf/closed/wall/proc/place_poster(obj/item/weapon/poster/P, mob/user) if(!P.poster_structure) to_chat(user, "[P] has no poster... inside it? Inform a coder!") diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 7b7f1d5423..807756b29e 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -182,7 +182,7 @@ /obj/item/weapon/watertank/atmos name = "backpack firefighter tank" - desc = "A refridgerated and pressurized backpack tank with extinguisher nozzle, intended to fight fires. Swaps between extinguisher, resin launcher and a smaller scale resin foamer." + desc = "A refrigerated and pressurized backpack tank with extinguisher nozzle, intended to fight fires. Swaps between extinguisher, resin launcher and a smaller scale resin foamer." item_state = "waterbackpackatmos" icon_state = "waterbackpackatmos" volume = 200 @@ -215,7 +215,7 @@ precision = 1 cooling_power = 5 w_class = WEIGHT_CLASS_HUGE - flags = NODROP //Necessary to ensure that the nozzle and tank never seperate + flags = NODROP //Necessary to ensure that the nozzle and tank never separate var/obj/item/weapon/watertank/tank var/nozzle_mode = 0 var/metal_synthesis_cooldown = 0 diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 1331a5aeea..2040f86607 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -174,7 +174,7 @@ if(help) dat += "Hide Help
" dat += {" - Lines are a series of chords, separated by commas (,), each with notes seperated by hyphens (-).
+ Lines are a series of chords, separated by commas (,), each with notes separated by hyphens (-).
Every note in a chord will play together, with chord timed by the tempo.

Notes are played by the names of the note, and optionally, the accidental, and/or the octave number.
diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index a9e75c6028..73c2d8067e 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -119,7 +119,7 @@ GLOBAL_PROTECT(admin_ranks) if(config.admin_legacy_system) var/previous_rights = 0 - //load text from file and process each line seperately + //load text from file and process each line separately for(var/line in world.file2list("config/admin_ranks.txt")) if(!line) continue @@ -195,7 +195,7 @@ GLOBAL_PROTECT(admin_ranks) //load text from file var/list/lines = world.file2list("config/admins.txt") - //process each line seperately + //process each line separately for(var/line in lines) if(!length(line)) continue diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index fc64eb2cf8..9ac85e49fa 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -233,7 +233,7 @@ . -= "reverting" //storing these can sometimes cause sticky bans to start matching everybody - // and isn't even needed for sticky ban matching, as the hub tracks these seperately + // and isn't even needed for sticky ban matching, as the hub tracks these separately . -= "IP" . -= "computer_id" diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index b1dadcdf32..2bd1f4c13e 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -201,8 +201,8 @@ death = FALSE faction = "syndicate" outfit = /datum/outfit/snowsyndie - flavour_text = {"You are a syndicate operative recently awoken from cyrostatis in an underground outpost. Monitor Nanotrasen communications and record infomation. All intruders should be - disposed of swirfly to assure no gathered infomation is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself."} + flavour_text = {"You are a syndicate operative recently awoken from cyrostatis in an underground outpost. Monitor Nanotrasen communications and record information. All intruders should be + disposed of swirfly to assure no gathered information is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself."} /datum/outfit/snowsyndie name = "Syndicate Snow Operative" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index af0a4a7518..3c32a49e7d 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -6,7 +6,7 @@ var/damaged_clothes = 0 //similar to machine's BROKEN stat and structure's broken var var/flash_protect = 0 //What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS var/tint = 0 //Sets the item's level of visual impairment tint, normally set to the same as flash_protect - var/up = 0 //but seperated to allow items to protect but not impair vision, like space helmets + var/up = 0 //but separated to allow items to protect but not impair vision, like space helmets var/visor_flags = 0 //flags that are added/removed when an item is adjusted up/down var/visor_flags_inv = 0 //same as visor_flags, but for flags_inv var/visor_flags_cover = 0 //same as above, but for flags_cover diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 1713830c6c..3eabbad438 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -246,7 +246,7 @@ /obj/item/clothing/head/jester name = "jester hat" - desc = "A hat with bells, to add some merryness to the suit." + desc = "A hat with bells, to add some merriness to the suit." icon_state = "jester_hat" /obj/item/clothing/head/rice_hat @@ -296,5 +296,5 @@ /obj/item/clothing/head/jester/alt name = "jester hat" - desc = "A hat with bells, to add some merryness to the suit." + desc = "A hat with bells, to add some merriness to the suit." icon_state = "jester_hat2" \ No newline at end of file diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 3be1bfbbf0..4ae20e1461 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -206,7 +206,7 @@ jumping = TRUE playsound(src.loc, 'sound/effects/stealthoff.ogg', 50, 1, 1) - usr.visible_message("[usr] dashes foward into the air!") + usr.visible_message("[usr] dashes forward into the air!") usr.throw_at(target, jumpdistance, jumpspeed, spin=0, diagonals_first = 1, callback = CALLBACK(src, .proc/hop_end)) /obj/item/clothing/shoes/bhop/proc/hop_end() diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm index dfe85c3092..c1c2733b71 100644 --- a/code/modules/clothing/spacesuits/flightsuit.dm +++ b/code/modules/clothing/spacesuits/flightsuit.dm @@ -1219,7 +1219,7 @@ //FLIGHT HELMET---------------------------------------------------------------------------------------------------------------------------------------------------- /obj/item/clothing/head/helmet/space/hardsuit/flightsuit name = "flight helmet" - desc = "A sealed helmet attached to a flight suit for EVA usage scenerios. Its visor contains an information uplink HUD." + desc = "A sealed helmet attached to a flight suit for EVA usage scenarios. Its visor contains an information uplink HUD." icon_state = "flighthelmet" item_state = "flighthelmet" item_color = "flight" diff --git a/code/modules/clothing/spacesuits/flightsuit.dm.rej b/code/modules/clothing/spacesuits/flightsuit.dm.rej new file mode 100644 index 0000000000..a0b426974d --- /dev/null +++ b/code/modules/clothing/spacesuits/flightsuit.dm.rej @@ -0,0 +1,14 @@ +diff a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm (rejected hunks) +@@ -1157,10 +1157,10 @@ + maint_panel = TRUE + else + maint_panel = FALSE +- usermessage("You [maint_panel? "open" : "close"] the maintainence panel.") ++ usermessage("You [maint_panel? "open" : "close"] the maintenance panel.") + return FALSE + else if(!maint_panel) +- usermessage("The maintainence panel is closed!", "boldwarning") ++ usermessage("The maintenance panel is closed!", "boldwarning") + return FALSE + else if(istype(I, /obj/item/weapon/crowbar)) + var/list/inputlist = list() diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 48f3a16830..fea8665ead 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -242,7 +242,7 @@ Contains: /obj/item/clothing/suit/space/freedom name = "eagle suit" - desc = "An advanced, light suit, fabricated from a mixture of synthetic feathers and space-resistant material. A gun holster appears to be intergrated into the suit and the wings appear to be stuck in 'freedom' mode." + desc = "An advanced, light suit, fabricated from a mixture of synthetic feathers and space-resistant material. A gun holster appears to be integrated into the suit and the wings appear to be stuck in 'freedom' mode." icon_state = "freedom" item_state = "freedom" allowed = list(/obj/item/weapon/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/restraints/handcuffs, /obj/item/weapon/tank/internals) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 46e953f4d0..1172321a89 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -197,7 +197,7 @@ //When the wearer gets hit, this armor will teleport the user a short distance away (to safety or to more danger, no one knows. That's the fun of it!) /obj/item/clothing/suit/armor/reactive/teleport name = "reactive teleport armor" - desc = "Someone seperated our Research Director from his own head!" + desc = "Someone separated our Research Director from his own head!" var/tele_range = 6 var/rad_amount= 15 reactivearmor_cooldown_duration = 100 diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 71075142c6..d6c019c60a 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -210,7 +210,7 @@ /obj/item/clothing/suit/poncho/ponchoshame name = "poncho of shame" - desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseperable. Literally." + desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseparable. Literally." icon_state = "ponchoshame" item_state = "ponchoshame" flags = NODROP diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 30245589d4..012bfe588f 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -398,7 +398,7 @@ /obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko name = "Thirteen Loko" - desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly." + desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly." icon_state = "thirteen_loko" list_reagents = list("thirteenloko" = 30) diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index b8feddfa79..2ca15f7b97 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -34,7 +34,7 @@ // The format for shots is the exact same as iconstates for the drinking glass, except you use a shot glass instead. // // If it's a new drink, remember to add it to Chemistry-Reagents.dm and Chemistry-Recipes.dm as well. // // You can only mix the ported-over drinks in shot glasses for now (they'll mix in a shaker, but the sprite won't change for glasses). // -// This is on a case-by-case basis, and you can even make a seperate sprite for shot glasses if you want. // +// This is on a case-by-case basis, and you can even make a separate sprite for shot glasses if you want. // /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass name = "shot glass" diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index baa804a4de..1b06edc350 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -115,7 +115,7 @@ desc = "Tasty spacey sugar!" list_reagents = list("sugar" = 50) -/obj/item/weapon/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then +/obj/item/weapon/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then name = "salt shaker" // a large one. desc = "Salt. From space oceans, presumably." icon_state = "saltshakersmall" diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index 0f4d5915f4..d629be13ee 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -27,7 +27,7 @@ delay_mod = 0.5 /obj/machinery/computer/camera_advanced/base_construction - name = "base contruction console" + name = "base construction console" desc = "An industrial computer integrated with a camera-assisted rapid construction drone." networks = list("SS13") var/obj/item/weapon/construction/rcd/internal/RCD //Internal RCD. The computer passes user commands to this in order to avoid massive copypaste. @@ -267,7 +267,7 @@ datum/action/innate/aux_base/install_turret/Activate() var/turf/turret_turf = get_turf(remote_eye) if(is_blocked_turf(turret_turf)) - to_chat(owner, "Location is obtructed by something. Please clear the location and try again.") + to_chat(owner, "Location is obstructed by something. Please clear the location and try again.") return var/obj/machinery/porta_turret/aux_base/T = new /obj/machinery/porta_turret/aux_base(turret_turf) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index f9e2ee855a..c1cd1b937e 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -785,7 +785,7 @@ switch(random) if(1) - to_chat(user, "Your appearence morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities.") + to_chat(user, "Your appearance morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities.") H.dna.features = list("mcolor" = "A02720", "tail_lizard" = "Dark Tiger", "tail_human" = "None", "snout" = "Sharp", "horns" = "Curled", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "Long", "body_markings" = "Dark Tiger Body", "legs" = "Digitigrade Legs") H.eye_color = "fee5a3" H.set_species(/datum/species/lizard) @@ -814,7 +814,7 @@ severity = BIOHAZARD visibility_flags = 0 stage1 = list("Your bones ache.") - stage2 = list("Your skin feels scaley.") + stage2 = list("Your skin feels scaly.") stage3 = list("You have an overwhelming urge to terrorize some peasants.", "Your teeth feel sharper.") stage4 = list("Your blood burns.") stage5 = list("You're a fucking dragon. However, any previous allegiances you held still apply. It'd be incredibly rude to eat your still human friends for no reason.") diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 14021cc60c..875380aea8 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -143,7 +143,7 @@ SSblackbox.add_details("mining_equipment_bought", "[src.type]|[prize.equipment_path]") // Add src.type to keep track of free golem purchases - // seperately. + // separately. updateUsrDialog() return diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index d902c34584..a8b4eab8d2 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -47,7 +47,7 @@ /datum/map_template/shelter/beta name = "Shelter Beta" shelter_id = "shelter_beta" - description = "An extremly luxurious shelter, containing all \ + description = "An extremely luxurious shelter, containing all \ the amenities of home, including carpeted floors, hot and cold \ running water, a gourmet three course meal, cooking facilities, \ and a deluxe companion to keep you from getting lonely during \ diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 29e82efe6b..69b581995b 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -35,7 +35,7 @@ return pda.owner return if_no_id -//repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere +//repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a separate proc as it'll be useful elsewhere /mob/living/carbon/human/get_visible_name() var/face_name = get_face_name("") var/id_name = get_id_name("") diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 6510b46bf3..6624e5740f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -135,7 +135,7 @@ //the puller can always swap with its victim if on grab intent if(M.pulledby == src && a_intent == INTENT_GRAB) mob_swap = 1 - //restrained people act if they were on 'help' intent to prevent a person being pulled from being seperated from their puller + //restrained people act if they were on 'help' intent to prevent a person being pulled from being separated from their puller else if((M.restrained() || M.a_intent == INTENT_HELP) && (restrained() || a_intent == INTENT_HELP)) mob_swap = 1 if(mob_swap) @@ -412,7 +412,7 @@ if(client) to_chat(src, "[src]'s Metainfo:
[client.prefs.metadata]") else - to_chat(src, "[src] does not have any stored infomation!") + to_chat(src, "[src] does not have any stored information!") else to_chat(src, "OOC Metadata is not supported by this server!") diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm index bcd7c77f1d..a3479aac89 100644 --- a/code/modules/mob/living/logout.dm +++ b/code/modules/mob/living/logout.dm @@ -2,5 +2,5 @@ if(ranged_ability && client) ranged_ability.remove_mousepointer(client) ..() - if(!key && mind) //key and mind have become seperated. + if(!key && mind) //key and mind have become separated. mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body. \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 7eb7840a59..f083f6c5f5 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1055,7 +1055,7 @@ diag_hud_set_aishell() /mob/living/silicon/robot/proc/deploy_init(var/mob/living/silicon/ai/AI) - real_name = "[AI.real_name] shell [rand(100, 999)] - [designation]" //Randomizing the name so it shows up seperately in the shells list + real_name = "[AI.real_name] shell [rand(100, 999)] - [designation]" //Randomizing the name so it shows up separately in the shells list name = real_name if(camera) camera.c_tag = real_name //update the camera name too diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 45fb411876..2b897bfbcb 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -2,7 +2,7 @@ //If someone can do this in a neater way, be my guest-Kor -//This has to be seperate from the Away Mission corpses, because New() doesn't work for those, and initialize() doesn't work for these. +//This has to be separate from the Away Mission corpses, because New() doesn't work for those, and initialize() doesn't work for these. //To do: Allow corpses to appear mangled, bloody, etc. Allow customizing the bodies appearance (they're all bald and white right now). diff --git a/code/modules/mob/say_readme.dm b/code/modules/mob/say_readme.dm index 87c198875a..0c64da1789 100644 --- a/code/modules/mob/say_readme.dm +++ b/code/modules/mob/say_readme.dm @@ -5,7 +5,7 @@ This is a basic explanation of how say() works. Read this if you don't understand something. The basic "flow" of say() is that a speaker says a message, which is heard by hearers. What appears on screen -is constructed by each hearer seperately, and not by the speaker. +is constructed by each hearer separately, and not by the speaker. This rewrite was needed, but is far from perfect. Report any bugs you come across and feel free to fix things up. Radio code, while very much related to saycode, is not something I wanted to touch, so the code related to that may be messy. @@ -122,7 +122,7 @@ global procs Called right before handle_inherent_channels() can_speak_vocal(message) - Checks if the mob can vocalize their message. This is seperate so, for example, muzzles don't block + Checks if the mob can vocalize their message. This is separate so, for example, muzzles don't block hivemind chat. Called right after handle_inherent_channels() diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 468a044bc0..ca77641a9b 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -27,7 +27,7 @@ desc = "A small cabinet with drawers. This one has wheels!" anchored = FALSE -/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unecessary map issues, but please don't name stuff like this in the future -Pete +/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unnecessary map issues, but please don't name stuff like this in the future -Pete icon_state = "tallcabinet" diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 5db3d9c1c5..e36c639eb9 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -28,7 +28,7 @@ // the Area Power Controller (APC), formerly Power Distribution Unit (PDU) -// one per area, needs wire conection to power network through a terminal +// one per area, needs wire connection to power network through a terminal // controls power to devices in that area // may be opened to change power cell @@ -256,7 +256,7 @@ O += "apco2-[environ]" add_overlay(O) - // And now, seperately for cleanness, the lighting changing + // And now, separately for cleanness, the lighting changing if(update_state & UPSTATE_ALLGOOD) switch(charging) if(0) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index e80b4cd9b6..816cd97874 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -582,7 +582,7 @@ L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\ "The unearthly ringing subsides and you notice you have new radiation burns.", 2) else - L.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2) + L.show_message("You hear an unearthly ringing and notice your skin is covered in fresh radiation burns.", 2) // When you wanna make a supermatter shard for the dramatic effect, but // don't want it exploding suddenly diff --git a/code/modules/procedural_mapping/mapGeneratorReadme.dm b/code/modules/procedural_mapping/mapGeneratorReadme.dm index ae656b5b30..c4ced7674b 100644 --- a/code/modules/procedural_mapping/mapGeneratorReadme.dm +++ b/code/modules/procedural_mapping/mapGeneratorReadme.dm @@ -80,7 +80,7 @@ mapGeneratorModule Simple Workflow: 1. Define a/some mapGeneratorModule(s) to your liking, choosing atoms and turfs to spawn - #Note: I chose to split Turfs and Atoms off into seperate modules, but this is NOT required. + #Note: I chose to split Turfs and Atoms off into separate modules, but this is NOT required. #Note: A mapGeneratorModule may have turfs AND atoms, so long as each is in it's appropriate list 2. Define a mapGenerator type who's modules list contains the typepath(s) of all the module(s) you wish to use @@ -98,7 +98,7 @@ Simple Workflow: Option Suggestions: - * Have seperate modules for Turfs and Atoms, this is not enforced, but it is how I have structured my nature example. + * Have separate modules for Turfs and Atoms, this is not enforced, but it is how I have structured my nature example. * If your map doesn't look quite to your liking, simply jiggle with the variables on your modules and the type probabilities * You can mix and map premade areas with the procedural generation, for example mapping an entire flat land but having code generate just the grass tufts diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index e1c6e6fa6e..cdf5a4b817 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -374,7 +374,7 @@ /obj/item/weapon/gun/ballistic/automatic/sniper_rifle/syndicate name = "syndicate sniper rifle" - desc = "An illegally modified .50 cal sniper rifle with supression compatibility. Quickscoping still doesn't work." + desc = "An illegally modified .50 cal sniper rifle with suppression compatibility. Quickscoping still doesn't work." pin = /obj/item/device/firing_pin/implant/pindicate origin_tech = "combat=7;syndicate=6" diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 6c5e4d935c..226652f6d5 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -247,7 +247,7 @@ if(!SS.transfer_soul("FORCE", user)) //Something went wrong qdel(SS) return - user.visible_message("[user.name]'s soul is captured by \the [src]!", "You've lost the gamble! Your soul is forfiet!") + user.visible_message("[user.name]'s soul is captured by \the [src]!", "You've lost the gamble! Your soul is forfeit!") ///////////////////////////// // DOUBLE BARRELED SHOTGUN // diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 22b51064af..9c84378586 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -427,7 +427,7 @@ /obj/item/borg/upgrade/modkit/bounty name = "death syphon" - desc = "Killing or assisting in killing a creature permenantly increases your damage against that type of creature." + desc = "Killing or assisting in killing a creature permanently increases your damage against that type of creature." denied_type = /obj/item/borg/upgrade/modkit/bounty modifier = 1.25 cost = 30 @@ -534,7 +534,7 @@ /obj/item/borg/upgrade/modkit/tracer/adjustable name = "adjustable tracer bolts" - desc = "Causes kinetic accelerator bolts to have a adjustably-colored tracer trail and explosion. Use in-hand to change color." + desc = "Causes kinetic accelerator bolts to have a adjustable-colored tracer trail and explosion. Use in-hand to change color." /obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user) bolt_color = input(user,"Choose Color") as color diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index a38ba3773e..a0a328afb0 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -46,7 +46,7 @@ name = "scatter shot laser rifle" icon_state = "lasercannon" item_state = "laser" - desc = "An industrial-grade heavy-duty laser rifle with a modified laser lense to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theorically infinite use." + desc = "An industrial-grade heavy-duty laser rifle with a modified laser lens to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theoretically infinite use." origin_tech = "combat=5;materials=4;powerstorage=4" ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser) @@ -107,8 +107,8 @@ transform *= 1 + ((damage/7) * 0.2)//20% larger per tile /obj/item/weapon/gun/energy/xray - name = "xray laser gun" - desc = "A high-power laser gun capable of expelling concentrated xray blasts that pass through multiple soft targets and heavier materials" + name = "x-ray laser gun" + desc = "A high-power laser gun capable of expelling concentrated x-ray blasts that pass through multiple soft targets and heavier materials" icon_state = "xray" item_state = null origin_tech = "combat=6;materials=4;magnets=4;syndicate=1" diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 57d374e3d9..d902ed7b13 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -1,6 +1,6 @@ /obj/machinery/chem_master name = "ChemMaster 3000" - desc = "Used to seperate chemicals and distribute them in a variety of forms." + desc = "Used to separate chemicals and distribute them in a variety of forms." density = TRUE anchored = TRUE icon = 'icons/obj/chemical.dmi' diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index a94b3a80b3..7a078f1891 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -498,7 +498,7 @@ other types of metals and chemistry for reagents). /datum/design/handdrill name = "Hand Drill" - desc = "A small electric hand drill with an interchangable screwdriver and bolt bit" + desc = "A small electric hand drill with an interchangeable screwdriver and bolt bit" id = "handdrill" req_tech = list("materials" = 4, "engineering" = 6) build_type = PROTOLATHE @@ -508,7 +508,7 @@ other types of metals and chemistry for reagents). /datum/design/jawsoflife name = "Jaws of Life" - desc = "A small, compact Jaws of Life with an interchangable pry jaws and cutting jaws" + desc = "A small, compact Jaws of Life with an interchangeable pry jaws and cutting jaws" id = "jawsoflife" req_tech = list("materials" = 4, "engineering" = 6, "magnets" = 6) // added one more requirment since the Jaws of Life are a bit OP build_path = /obj/item/weapon/crowbar/power diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 23b9ad00c8..7e7b4c2b5b 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -653,7 +653,7 @@ warn_admins(user, "Flash") /obj/item/weapon/relic/proc/petSpray(mob/user) - var/message = "[src] begans to shake, and in the distance the sound of rampaging animals arises!" + var/message = "[src] begins to shake, and in the distance the sound of rampaging animals arises!" visible_message(message) to_chat(user, message) var/animals = rand(1,25) diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 827cce162f..49584ecb3c 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -219,13 +219,13 @@ research holder datum. /datum/tech/plasmatech name = "Plasma Research" - desc = "Research into the mysterious substance colloqually known as \"plasma\"." + desc = "Research into the mysterious substance colloquially known as \"plasma\"." id = "plasmatech" rare = 3 /datum/tech/powerstorage name = "Power Manipulation Technology" - desc = "The various technologies behind the storage and generation of electicity." + desc = "The various technologies behind the storage and generation of electricity." id = "powerstorage" /datum/tech/bluespace @@ -256,7 +256,7 @@ research holder datum. /datum/tech/syndicate name = "Illegal Technologies Research" - desc = "The study of technologies that violate Nanotrassen regulations." + desc = "The study of technologies that violate Nanotrasen regulations." id = "syndicate" rare = 4 diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 93ac3324ac..9c826f5f5f 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -425,7 +425,7 @@ /obj/item/clothing/suit/golem name = "adamantine shell" - desc = "a golem's thick outter shell" + desc = "a golem's thick outer shell" icon_state = "golem" item_state = "golem" w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm index 74490fea28..61330265ab 100644 --- a/code/modules/spells/spell_types/summonitem.dm +++ b/code/modules/spells/spell_types/summonitem.dm @@ -80,7 +80,7 @@ var/obj/item/bodypart/part = X if(item_to_retrieve in part.embedded_objects) part.embedded_objects -= item_to_retrieve - to_chat(C, "The [item_to_retrieve] that was embedded in your [L] has myseriously vanished. How fortunate!") + to_chat(C, "The [item_to_retrieve] that was embedded in your [L] has mysteriously vanished. How fortunate!") if(!C.has_embedded_objects()) C.clear_alert("embeddedobject") break diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 074c206c1f..77a30b1884 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -64,7 +64,7 @@ /obj/machinery/bsa/middle name = "Bluespace Artillery Fusor" - desc = "Contents classifed by Nanotrasen Naval Command. Needs to be linked with the other BSA parts using multitool." + desc = "Contents classified by Nanotrasen Naval Command. Needs to be linked with the other BSA parts using multitool." icon_state = "fuel_chamber" var/obj/machinery/bsa/back/back var/obj/machinery/bsa/front/front diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index 55ae1cc2b0..e7a529b2a0 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -85,7 +85,7 @@ if(!H.myseed) return if(!H.harvest)// So it's bit harder. - to_chat(user, "Plant needs to be ready to harvest to perform full data scan.") //Because space dna is actually magic + to_chat(user, "Plant needs to be ready to harvest to perform full data scan.") //Because space dna is actually magic return if(plants[H.myseed.type]) to_chat(user, "Plant data already present in local storage.") diff --git a/code/modules/stock_market/events.dm b/code/modules/stock_market/events.dm index 17a92ea83f..a3d9023f7a 100644 --- a/code/modules/stock_market/events.dm +++ b/code/modules/stock_market/events.dm @@ -4,7 +4,7 @@ var/name = "event" var/next_phase = 0 var/datum/stock/company = null - var/current_title = "A company holding an pangalactic conference in the Seattle Conference Center, Seattle, Earth" + var/current_title = "A company holding a pangalactic conference in the Seattle Conference Center, Seattle, Earth" var/current_desc = "We will continue to monitor their stocks as the situation unfolds." var/phase_id = 0 var/hidden = 0 diff --git a/code/modules/surgery/organ_manipulation.dm.rej b/code/modules/surgery/organ_manipulation.dm.rej new file mode 100644 index 0000000000..8a77b0aade --- /dev/null +++ b/code/modules/surgery/organ_manipulation.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm (rejected hunks) +@@ -78,7 +78,7 @@ + current_type = "extract" + var/list/organs = target.getorganszone(target_zone) + if(!organs.len) +- to_chat(user, "There are no removeable organs in [target]'s [parse_zone(target_zone)]!") ++ to_chat(user, "There are no removable organs in [target]'s [parse_zone(target_zone)]!") + return -1 + else + for(var/obj/item/organ/O in organs) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 5c0e31456e..69cf8aa96b 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -174,7 +174,7 @@ /obj/item/organ/cyberimp/arm/toolset name = "integrated toolset implant" - desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all neccessary tools." + desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all necessary tools." origin_tech = "materials=3;engineering=4;biotech=3;powerstorage=4" contents = newlist(/obj/item/weapon/screwdriver/cyborg, /obj/item/weapon/wrench/cyborg, /obj/item/weapon/weldingtool/largetank/cyborg, /obj/item/weapon/crowbar/cyborg, /obj/item/weapon/wirecutters/cyborg, /obj/item/device/multitool/cyborg) @@ -191,7 +191,7 @@ /obj/item/organ/cyberimp/arm/esword name = "arm-mounted energy blade" - desc = "An illegal, and highly dangerous cybernetic implant that can project a deadly blade of concentrated enregy." + desc = "An illegal, and highly dangerous cybernetic implant that can project a deadly blade of concentrated energy." contents = newlist(/obj/item/weapon/melee/transforming/energy/blade/hardlight) origin_tech = "materials=4;combat=5;biotech=3;powerstorage=2;syndicate=5" diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index 3a2a3611db..a281249a12 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -117,7 +117,7 @@ /obj/item/organ/cyberimp/chest/thrusters name = "implantable thrusters set" desc = "An implantable set of thruster ports. They use the gas from environment or subject's internals for propulsion in zero-gravity areas. \ - Unlike regular jetpack, this device has no stablilzation system." + Unlike regular jetpack, this device has no stabilization system." slot = "thrusters" icon_state = "imp_jetpack" origin_tech = "materials=4;magnets=4;biotech=4;engineering=5" diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm index b791586e22..e116c23303 100644 --- a/code/modules/surgery/remove_embedded_object.dm +++ b/code/modules/surgery/remove_embedded_object.dm @@ -32,7 +32,7 @@ H.clear_alert("embeddedobject") if(objects > 0) - user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L]!", "You successfully remove [objects] objects from [H]'s [L.name].") + user.visible_message("[user] successfully removes [objects] objects from [H]'s [L]!", "You successfully remove [objects] objects from [H]'s [L.name].") else to_chat(user, "You find no objects embedded in [H]'s [L]!") diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index e977ac4600..d3c30ac285 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -1,6 +1,6 @@ /obj/item/organ/zombie_infection name = "festering ooze" - desc = "A black web of pus and vicera." + desc = "A black web of pus and viscera." zone = "head" slot = "zombie_infection" icon_state = "blacktumor" From d6fdd618e8467a1181fb06200f15a7fbe0e2cd94 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 1 Aug 2017 08:46:27 -0500 Subject: [PATCH 008/154] Removes spaces to underline from add_details --- code/controllers/subsystem/blackbox.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index 19e96f3fbf..afa77b0207 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -259,7 +259,6 @@ SUBSYSTEM_DEF(blackbox) /datum/feedback_variable/proc/add_details(text) if (istext(text)) - text = replacetext(text, " ", "_") if (!details) details = text else From e2c14f018bde937161236b8b9c492416754a116e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 1 Aug 2017 17:06:59 -0500 Subject: [PATCH 009/154] Automatic changelog generation for PR #2215 [ci skip] --- html/changelogs/AutoChangeLog-pr-2215.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2215.yml diff --git a/html/changelogs/AutoChangeLog-pr-2215.yml b/html/changelogs/AutoChangeLog-pr-2215.yml new file mode 100644 index 0000000000..f02f2d33cf --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2215.yml @@ -0,0 +1,5 @@ +author: "Xhuis and oranges" +delete-after: True +changes: + - bugfix: "Banana cream pies no longer splat when they're caught by someone." + - soundadd: "Throwing a pie in someone's face now has a splat sound." From 1e82ad9d3e52dd236915e36a595928f063920703 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 1 Aug 2017 17:57:44 -0500 Subject: [PATCH 010/154] Fixes devil pitchforks being uninitialized --- code/game/objects/items/weapons/twohanded.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 113f70825e..067339d6a3 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -578,6 +578,7 @@ force_wielded = 25 /obj/item/weapon/twohanded/pitchfork/demonic/Initialize() + . = ..() set_light(3,6,LIGHT_COLOR_RED) /obj/item/weapon/twohanded/pitchfork/demonic/greater @@ -695,4 +696,4 @@ sharpness = IS_SHARP /obj/item/weapon/twohanded/bonespear/update_icon() - icon_state = "bone_spear[wielded]" \ No newline at end of file + icon_state = "bone_spear[wielded]" From 6cb94445886b88415d9862338e8449a162631ca0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 1 Aug 2017 18:10:59 -0500 Subject: [PATCH 011/154] Fixes silicons not returning an Initialize hint --- code/modules/mob/living/silicon/silicon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 6446debb80..bdc2338828 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -38,7 +38,7 @@ var/law_change_counter = 0 /mob/living/silicon/Initialize() - ..() + . = ..() GLOB.silicon_mobs += src var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC] diag_hud.add_to_hud(src) From f19a9e855ad26374ec695aa9cefa3af994034b88 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 1 Aug 2017 23:55:55 -0500 Subject: [PATCH 012/154] Automatic changelog generation for PR #2143 [ci skip] --- html/changelogs/AutoChangeLog-pr-2143.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2143.yml diff --git a/html/changelogs/AutoChangeLog-pr-2143.yml b/html/changelogs/AutoChangeLog-pr-2143.yml new file mode 100644 index 0000000000..ca4975e073 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2143.yml @@ -0,0 +1,4 @@ +author: "Joan" +delete-after: True +changes: + - tweak: "Lava rivers though the ash walker nest are now significantly less of a hassle for the ashwalkers." From 76f7fcef9a307456fda965d1ed74861655f51b21 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 2 Aug 2017 03:17:32 -0500 Subject: [PATCH 013/154] [MIRROR] Cleaned up paper varedits + tidied up paths (#2156) * Cleaned up paper varedits + tidied up paths * work smarter, not harder * citadel snowflake * Update uplink_item_cit.dm --- .../lavaland_surface_animal_hospital.dmm | 5 +- .../LavaRuins/lavaland_surface_sloth.dmm | 5 +- .../LavaRuins/lavaland_surface_ufo_crash.dmm | 2 +- _maps/RandomRuins/SpaceRuins/DJstation.dmm | 2 +- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 16 +-- _maps/RandomRuins/SpaceRuins/asteroid4.dmm | 4 +- _maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 4 +- .../SpaceRuins/crashedclownship.dmm | 4 +- _maps/RandomRuins/SpaceRuins/crashedship.dmm | 15 +-- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 15 +-- .../SpaceRuins/listeningstation.dmm | 55 ++------- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 18 +-- .../SpaceRuins/originalcontent.dmm | 20 +--- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 30 +---- _maps/RandomZLevels/Academy.dmm | 37 ++---- _maps/RandomZLevels/caves.dmm | 45 ++----- _maps/RandomZLevels/centcomAway.dmm | 8 +- _maps/RandomZLevels/challenge.dmm | 7 +- _maps/RandomZLevels/moonoutpost19.dmm | 88 ++++---------- _maps/RandomZLevels/research.dmm | 8 +- _maps/RandomZLevels/snowdin.dmm | 29 ++--- _maps/RandomZLevels/undergroundoutpost45.dmm | 4 +- _maps/RandomZLevels/wildwest.dmm | 22 +--- _maps/map_files/BoxStation/BoxStation.dmm | 25 ++-- _maps/map_files/Cerestation/cerestation.dmm | 79 +++--------- .../map_files/Deltastation/DeltaStation2.dmm | 12 +- _maps/map_files/MetaStation/MetaStation.dmm | 37 ++---- _maps/map_files/Mining/Lavaland.dmm | 6 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 2 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 27 ++--- .../PubbyStation/PubbyStation.dmm.rej | 2 +- _maps/map_files/generic/Centcomm.dmm | 45 ++++--- .../emergency_imfedupwiththisworld.dmm | 4 +- .../miniantags/abduction/abduction_gear.dm | 6 +- code/game/gamemodes/wizard/spellbook.dm | 2 +- code/game/machinery/cloning.dm | 2 +- code/game/machinery/quantum_pad.dm | 5 + code/game/machinery/recycler.dm | 2 +- code/game/objects/items/theft_tools.dm | 4 +- .../items/weapons/storage/uplink_kits.dm | 4 +- .../crates_lockers/closets/secure/security.dm | 2 +- .../structures/crates_lockers/crates.dm | 2 +- code/game/objects/structures/morgue.dm | 2 +- code/modules/awaymissions/gateway.dm | 5 + .../awaymissions/mission_code/Academy.dm | 30 +++++ .../awaymissions/mission_code/caves.dm | 31 +++++ .../awaymissions/mission_code/centcomAway.dm | 4 +- .../mission_code/moonoutpost19.dm | 83 +++++++++++++ .../awaymissions/mission_code/research.dm | 5 + .../awaymissions/mission_code/snowdin.dm | 38 +++--- .../mission_code/stationCollision.dm | 18 +-- .../awaymissions/mission_code/wildwest.dm | 22 ++++ code/modules/awaymissions/pamphlet.dm | 2 + code/modules/cargo/exports/manifest.dm | 22 ++-- code/modules/cargo/order.dm | 12 +- code/modules/cargo/packs.dm | 4 +- code/modules/holodeck/items.dm | 6 +- .../living/simple_animal/guardian/guardian.dm | 8 +- code/modules/paperwork/paper.dm | 92 -------------- code/modules/paperwork/paper_premade.dm | 113 ++++++++++++++++++ code/modules/power/gravitygenerator.dm | 2 +- code/modules/power/solar.dm | 2 +- code/modules/recycling/conveyor2.dm | 2 +- code/modules/ruins/lavalandruin_code/sloth.dm | 5 + .../ruins/lavalandruin_code/surface.dm | 5 + .../modules/ruins/spaceruin_code/DJstation.dm | 5 + .../ruins/spaceruin_code/TheDerelict.dm | 13 ++ .../modules/ruins/spaceruin_code/asteroid4.dm | 4 + .../ruins/spaceruin_code/crashedclownship.dm | 4 + .../ruins/spaceruin_code/crashedship.dm | 15 +++ .../ruins/spaceruin_code/deepstorage.dm | 14 +++ .../ruins/spaceruin_code/listeningstation.dm | 45 +++++++ .../ruins/spaceruin_code/oldstation.dm | 49 ++++++++ .../ruins/spaceruin_code/originalcontent.dm | 4 + .../ruins/spaceruin_code/spacehotel.dm | 12 ++ code/modules/uplink/uplink_item_cit.dm | 2 +- tgstation.dme | 16 +++ 77 files changed, 756 insertions(+), 651 deletions(-) create mode 100644 code/modules/awaymissions/mission_code/caves.dm create mode 100644 code/modules/awaymissions/mission_code/moonoutpost19.dm create mode 100644 code/modules/awaymissions/mission_code/research.dm create mode 100644 code/modules/paperwork/paper_premade.dm create mode 100644 code/modules/ruins/lavalandruin_code/sloth.dm create mode 100644 code/modules/ruins/lavalandruin_code/surface.dm create mode 100644 code/modules/ruins/spaceruin_code/DJstation.dm create mode 100644 code/modules/ruins/spaceruin_code/TheDerelict.dm create mode 100644 code/modules/ruins/spaceruin_code/asteroid4.dm create mode 100644 code/modules/ruins/spaceruin_code/crashedclownship.dm create mode 100644 code/modules/ruins/spaceruin_code/crashedship.dm create mode 100644 code/modules/ruins/spaceruin_code/deepstorage.dm create mode 100644 code/modules/ruins/spaceruin_code/listeningstation.dm create mode 100644 code/modules/ruins/spaceruin_code/oldstation.dm create mode 100644 code/modules/ruins/spaceruin_code/originalcontent.dm create mode 100644 code/modules/ruins/spaceruin_code/spacehotel.dm diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index 005ce22589..de78fed108 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -145,10 +145,7 @@ dir = 1; pixel_y = -27 }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "Important Notice - Mrs. Henderson" - }, +/obj/item/weapon/paper/fluff/stations/lavaland/surface/henderson_report, /turf/open/floor/plasteel/cmo, /area/ruin/powered/animal_hospital) "aA" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm index a8514a4647..89a8b50c39 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @@ -6,10 +6,7 @@ /turf/open/lava/smooth/lava_land_surface, /area/ruin/unpowered) "c" = ( -/obj/item/weapon/paper{ - desc = "have not gotten around to finishing my cursed item yet sorry - sloth"; - name = "note from sloth" - }, +/obj/item/weapon/paper/fluff/stations/lavaland/sloth/note, /turf/open/floor/sepia{ blocks_air = 0; slowdown = 10 diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm index 6c18feaff8..22d341c7df 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm @@ -132,7 +132,7 @@ /area/ruin/unpowered) "w" = ( /obj/item/weapon/retractor/alien, -/obj/item/weapon/paper/abductor, +/obj/item/weapon/paper/guides/antag/abductor, /turf/open/floor/plating/abductor{ initial_gas_mix = "o2=16;n2=23;TEMP=300" }, diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm index 3a1279237c..515878e931 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm @@ -249,7 +249,7 @@ /area/djstation) "aR" = ( /obj/structure/table, -/obj/item/weapon/paper/djstation, +/obj/item/weapon/paper/fluff/ruins/djstation, /turf/open/floor/plasteel/cafeteria, /area/djstation) "aS" = ( diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 52b8dcab89..768dd08e3f 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -1212,10 +1212,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/paper{ - info = "If the equipment breaks there should be enough spare parts in our engineering storage near the north east solar array."; - name = "Equipment Inventory" - }, +/obj/item/weapon/paper/fluff/ruins/thederelict/equipment, /turf/open/floor/plasteel/airless, /area/derelict/gravity_generator) "dt" = ( @@ -1683,10 +1680,7 @@ /turf/open/floor/plasteel, /area/derelict/bridge) "eN" = ( -/obj/item/weapon/paper{ - info = "Objective #1: Destroy the station with a nuclear device."; - name = "Objectives of a Nuclear Operative" - }, +/obj/item/weapon/paper/fluff/ruins/thederelict/nukie_objectives, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, @@ -4785,11 +4779,7 @@ /turf/open/floor/plating/airless, /area/derelict/se_solar) "oa" = ( -/obj/item/weapon/paper{ - desc = ""; - info = "The Syndicate have cunningly disguised a Syndicate Uplink as your PDA. Simply enter the code \"678 Bravo\" into the ringtone select to unlock its hidden features.

Objective #1. Kill the God damn AI in a fire blast that it rocks the station. Success!
Objective #2. Escape alive. Failed."; - name = "Mission Objectives" - }, +/obj/item/weapon/paper/fluff/ruins/thederelict/syndie_mission, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, diff --git a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm index 03ecac3738..bbbd529e8a 100644 --- a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm +++ b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm @@ -49,9 +49,7 @@ brute_damage = 120; oxy_damage = 75 }, -/obj/item/weapon/paper{ - info = "Extraction was successful! The disguise was perfect, the clowns never knew what hit 'em! Once I get back to base with the bananium samples I'll be rich, I tell you! RICH!" - }, +/obj/item/weapon/paper/fluff/ruins/asteroid4/extraction, /obj/item/stack/sheet/mineral/bananium{ amount = 15 }, diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index 40efc634aa..a9232ea33a 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -259,7 +259,7 @@ name = "critter crate - mr.tiggles"; opened = 1 }, -/obj/item/weapon/paper/crumpled/snowdin{ +/obj/item/weapon/paper/crumpled/ruins/snowdin{ info = "A crumpled piece of manifest paper, out of the barely legible pen writing, you can see something about a warning involving whatever was originally in the crate." }, /obj/structure/alien/weeds{ @@ -455,7 +455,7 @@ name = "Tradeport Officer"; random = 1 }, -/obj/item/weapon/paper/crumpled/snowdin{ +/obj/item/weapon/paper/crumpled/ruins/snowdin{ icon_state = "scrap_bloodied"; info = "If anyone finds this, please, don't let my kids know I died a coward.." }, diff --git a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm index 4f9ce74170..618366df7c 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm @@ -103,9 +103,7 @@ /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "s" = ( -/obj/item/weapon/paper{ - info = "The call has gone out! Our ancestral home has been rediscovered! Not a small patch of land, but a true clown nation, a true Clown Planet! We're on our way home at last!" - }, +/obj/item/weapon/paper/fluff/ruins/crashedclownship/true_nation, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "t" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index 6dcae3923e..ecc3332dde 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -653,10 +653,7 @@ /obj/structure/table, /obj/item/weapon/screwdriver, /obj/item/weapon/screwdriver, -/obj/item/weapon/paper{ - info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"; - name = "scribbled note" - }, +/obj/item/weapon/paper/fluff/ruins/crashedship/scribbled, /obj/item/weapon/screwdriver, /turf/open/floor/plasteel/bar, /area/awaymission/BMPship/Midship) @@ -954,10 +951,7 @@ /area/awaymission/BMPship/Aft) "cY" = ( /obj/structure/table, -/obj/item/weapon/paper{ - info = "I'm no scientist, but judging from the design and components, it seems to be some kind of teleporter. This thing is gonna be worth a lot of cash to the right man. The boys are excited, as they have every right to be, and I've let them crack into that case of beer we got. I normally wouldn't allow such a thing, but this is a time for celebration! It's not like a couple drinks will hurt anything."; - name = "Captain's log entry" - }, +/obj/item/weapon/paper/fluff/ruins/crashedship/captains_log, /turf/open/floor/carpet, /area/awaymission/BMPship/Fore) "cZ" = ( @@ -2167,10 +2161,7 @@ /area/awaymission/BMPship/Aft) "gh" = ( /obj/structure/table, -/obj/item/weapon/paper{ - info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."; - name = "Old Diary" - }, +/obj/item/weapon/paper/fluff/ruins/crashedship/old_diary, /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "gi" = ( diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 803f078057..ce223b03b8 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -1129,18 +1129,9 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ - info = "To whoever keeps it up with the long, hot showers: you're going on the next ice-mining trip. If you feel the need to use up all the damn water during your 'relaxation' time, you sure as hell are gonna work for all that water!"; - name = "water concerns" - }, -/obj/item/weapon/paper{ - info = "Hydroponics is our life and blood here, if it dies then so do we. Keep the damn plants watered!"; - name = "hydroponics notice" - }, -/obj/item/weapon/paper{ - info = "Please make sure to throw all excess waste into the crusher in the back! It's amazing what you can get out of what others consider 'garbage' if you run it through a giant crusher enough times."; - name = "recycling notice" - }, +/obj/item/weapon/paper/fluff/ruins/deepstorage/water_concern, +/obj/item/weapon/paper/fluff/ruins/deepstorage/hydro_notice, +/obj/item/weapon/paper/fluff/ruins/deepstorage/recycling_notice, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 4c351f0593..52b25cdffd 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -69,10 +69,7 @@ /area/awaymission/listeningpost) "o" = ( /obj/structure/table, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "november report" - }, +/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/november, /obj/item/weapon/pen, /turf/open/floor/plasteel, /area/awaymission/listeningpost) @@ -98,10 +95,7 @@ "r" = ( /obj/machinery/door/airlock, /obj/structure/safe/floor, -/obj/item/weapon/paper{ - info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"; - name = "odd report" - }, +/obj/item/weapon/paper/fluff/ruins/listeningstation/odd_report, /obj/item/weapon/gun/ballistic/automatic/pistol, /turf/open/floor/plasteel, /area/awaymission/listeningpost) @@ -156,46 +150,19 @@ /area/awaymission/listeningpost) "B" = ( /obj/structure/filingcabinet, -/obj/item/weapon/paper{ - info = "A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."; - name = "april report" - }, -/obj/item/weapon/paper{ - info = "Nothing of real interest to report this month. I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment."; - name = "may report" - }, -/obj/item/weapon/paper{ - info = "Nanotrasen communications have been noticably less frequent recently. The pirate radio station I found last month has been transmitting pro-Nanotrasen propaganda. I will continue to monitor it."; - name = "june report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "july report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "august report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "september report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "october report" - }, -/obj/item/weapon/paper{ - info = "1 x Stechtkin pistol - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"; - name = "receipt" - }, +/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/april, +/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/may, +/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/june, +/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/july, +/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/august, +/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/september, +/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/october, +/obj/item/weapon/paper/fluff/ruins/listeningstation/receipt, /turf/open/floor/plasteel, /area/awaymission/listeningpost) "C" = ( /obj/structure/table, -/obj/item/weapon/paper{ - info = "Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."; - name = "mission briefing" - }, +/obj/item/weapon/paper/fluff/ruins/listeningstation/briefing, /turf/open/floor/plasteel, /area/awaymission/listeningpost) "D" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 30d9a85e7d..0f6ffcde39 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -135,7 +135,7 @@ desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; name = "Broken Computer" }, -/obj/item/weapon/paper/oldstat/damagereport, +/obj/item/weapon/paper/fluff/ruins/oldstation/damagereport, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/comm) "aw" = ( @@ -144,7 +144,7 @@ desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; name = "Broken Computer" }, -/obj/item/weapon/paper/oldstat/report, +/obj/item/weapon/paper/fluff/ruins/oldstation/report, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/comm) "ax" = ( @@ -3494,7 +3494,7 @@ /obj/machinery/power/solar_control{ name = "Station Solar Control Computer" }, -/obj/item/weapon/paper/solar, +/obj/item/weapon/paper/guides/jobs/engi/solars, /obj/structure/cable, /turf/open/floor/plasteel/yellow/side{ dir = 10 @@ -4534,7 +4534,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper/oldstat/protosuit, +/obj/item/weapon/paper/fluff/ruins/oldstation/protosuit, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "ku" = ( @@ -4579,7 +4579,7 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper/oldstat/protosing, +/obj/item/weapon/paper/fluff/ruins/oldstation/protosing, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "kA" = ( @@ -4716,7 +4716,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/paper/oldstat, +/obj/item/weapon/paper/fluff/ruins/oldstation, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation) "kR" = ( @@ -4724,7 +4724,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper/oldstat/protohealth, +/obj/item/weapon/paper/fluff/ruins/oldstation/protohealth, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "kS" = ( @@ -4742,7 +4742,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/paper/oldstat/protoinv, +/obj/item/weapon/paper/fluff/ruins/oldstation/protoinv, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "kU" = ( @@ -4750,7 +4750,7 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper/oldstat/protogun, +/obj/item/weapon/paper/fluff/ruins/oldstation/protogun, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "kV" = ( diff --git a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm index 5401836144..6388f49c50 100644 --- a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm +++ b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm @@ -106,9 +106,7 @@ /turf/open/indestructible/paper, /area/ruin/powered) "as" = ( -/obj/item/weapon/paper/crumpled{ - desc = "Various scrawled out drawings and sketches reside on the paper, apparently he didn't much care for these drawings." - }, +/obj/item/weapon/paper/crumpled/ruins/originalcontent, /turf/open/indestructible/paper, /area/ruin/powered) "at" = ( @@ -598,15 +596,9 @@ dir = 9 }, /obj/structure/closet/crate/bin, -/obj/item/weapon/paper/crumpled{ - desc = "Various scrawled out drawings and sketches reside on the paper, apparently he didn't much care for these drawings." - }, -/obj/item/weapon/paper/crumpled{ - desc = "Various scrawled out drawings and sketches reside on the paper, apparently he didn't much care for these drawings." - }, -/obj/item/weapon/paper/crumpled{ - desc = "Various scrawled out drawings and sketches reside on the paper, apparently he didn't much care for these drawings." - }, +/obj/item/weapon/paper/crumpled/ruins/originalcontent, +/obj/item/weapon/paper/crumpled/ruins/originalcontent, +/obj/item/weapon/paper/crumpled/ruins/originalcontent, /obj/item/device/gps{ gpstag = "Pulpy Signal" }, @@ -802,9 +794,7 @@ /area/ruin/powered) "ch" = ( /obj/structure/fluff/paper, -/obj/item/weapon/paper/crumpled{ - desc = "Various scrawled out drawings and sketches reside on the paper, apparently he didn't much care for these drawings." - }, +/obj/item/weapon/paper/crumpled/ruins/originalcontent, /turf/open/indestructible/paper, /area/ruin/powered) "ci" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index d87ee0b65d..a99838b8fd 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -2585,10 +2585,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ - info = "!NOTICE!

We are expecting arriving guests soon from a nearby station! Stay sharp and make sure guests enjoy their time spent here. Don't think you can sneak off while they're here, either.
"; - name = "!NOTICE!" - }, +/obj/item/weapon/paper/fluff/ruins/spacehotel/notice, /turf/open/floor/plasteel/black, /area/ruin/hotel/workroom) "gJ" = ( @@ -2705,26 +2702,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paper/pamphlet{ - info = "
The Twin Nexus Hotel

A place of Sanctuary


Welcome to The Twin-Nexus Hotel, \[insert name here]! The loyal staff stride to their best effort to cater for the best possible experience for all space(wo)men! If you have any questions or comments, please ask one of our on-board staff for more infomation.
"; - name = "hotel pamphlet" - }, -/obj/item/weapon/paper/pamphlet{ - info = "
The Twin Nexus Hotel

A place of Sanctuary


Welcome to The Twin-Nexus Hotel, \[insert name here]! The loyal staff stride to their best effort to cater for the best possible experience for all space(wo)men! If you have any questions or comments, please ask one of our on-board staff for more infomation.
"; - name = "hotel pamphlet" - }, -/obj/item/weapon/paper/pamphlet{ - info = "
The Twin Nexus Hotel

A place of Sanctuary


Welcome to The Twin-Nexus Hotel, \[insert name here]! The loyal staff stride to their best effort to cater for the best possible experience for all space(wo)men! If you have any questions or comments, please ask one of our on-board staff for more infomation.
"; - name = "hotel pamphlet" - }, -/obj/item/weapon/paper/pamphlet{ - info = "
The Twin Nexus Hotel

A place of Sanctuary


Welcome to The Twin-Nexus Hotel, \[insert name here]! The loyal staff stride to their best effort to cater for the best possible experience for all space(wo)men! If you have any questions or comments, please ask one of our on-board staff for more infomation.
"; - name = "hotel pamphlet" - }, -/obj/item/weapon/paper/pamphlet{ - info = "
The Twin Nexus Hotel

A place of Sanctuary


Welcome to The Twin-Nexus Hotel, \[insert name here]! The loyal staff stride to their best effort to cater for the best possible experience for all space(wo)men! If you have any questions or comments, please ask one of our on-board staff for more infomation.
"; - name = "hotel pamphlet" - }, +/obj/item/weapon/paper/pamphlet/ruin/spacehotel, +/obj/item/weapon/paper/pamphlet/ruin/spacehotel, +/obj/item/weapon/paper/pamphlet/ruin/spacehotel, +/obj/item/weapon/paper/pamphlet/ruin/spacehotel, +/obj/item/weapon/paper/pamphlet/ruin/spacehotel, /turf/open/floor/plasteel/grimy, /area/ruin/hotel/dock) "hd" = ( diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 41b3223131..0fe71c9faf 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -108,10 +108,7 @@ /area/awaymission/academy/headmaster) "ar" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper{ - info = "We're upgrading to the latest mainframes for our consoles, the shipment should be in before spring break is over!"; - name = "Console Maintenance" - }, +/obj/item/weapon/paper/fluff/awaymissions/academy/console_maint, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "as" = ( @@ -1287,9 +1284,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ - name = "Automotive Repair 101" - }, +/obj/item/weapon/paper/fluff/awaymissions/academy/class/automotive, /turf/open/floor/plasteel/grimy, /area/awaymission/academy/classrooms) "eh" = ( @@ -1302,9 +1297,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ - name = "Pyromancy 250" - }, +/obj/item/weapon/paper/fluff/awaymissions/academy/class/pyromancy, /turf/open/floor/plasteel/grimy, /area/awaymission/academy/classrooms) "ej" = ( @@ -1779,9 +1772,7 @@ /obj/structure/noticeboard{ pixel_y = -32 }, -/obj/item/weapon/paper{ - name = "Biology Lab" - }, +/obj/item/weapon/paper/fluff/awaymissions/academy/class/biology, /turf/open/floor/plasteel/grimy, /area/awaymission/academy/classrooms) "fz" = ( @@ -2205,10 +2196,7 @@ /area/awaymission/academy/academyaft) "gH" = ( /obj/structure/table, -/obj/item/weapon/paper{ - info = "Grade: A+ Educator's Notes: Excellent form."; - name = "Summoning Midterm Exam" - }, +/obj/item/weapon/paper/fluff/awaymissions/academy/grade/aplus, /obj/item/weapon/gun/ballistic/shotgun/automatic/combat, /turf/open/floor/plasteel/vault{ dir = 5 @@ -2217,10 +2205,7 @@ "gI" = ( /obj/structure/table, /obj/item/weapon/gun/ballistic/revolver/russian, -/obj/item/weapon/paper{ - info = "Grade: B- Educator's Notes: Keep applying yourself, you're showing improvement."; - name = "Summoning Midterm Exam" - }, +/obj/item/weapon/paper/fluff/awaymissions/academy/grade/bminus, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -2319,10 +2304,7 @@ "gW" = ( /obj/structure/table, /obj/item/weapon/gun/energy/floragun, -/obj/item/weapon/paper{ - info = "Grade: D- Educator's Notes: SEE ME AFTER CLASS."; - name = "Summoning Midterm Exam" - }, +/obj/item/weapon/paper/fluff/awaymissions/academy/grade/dminus, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -2772,10 +2754,7 @@ /obj/structure/closet, /obj/item/weapon/storage/box/snappops, /obj/item/weapon/storage/backpack, -/obj/item/weapon/paper{ - info = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons. Suggest additional tutilage."; - name = "Pyromancy Evaluation" - }, +/obj/item/weapon/paper/fluff/awaymissions/academy/grade/failure, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) "id" = ( diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index 57740d7fba..c1df4a8090 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -942,9 +942,7 @@ }) "bX" = ( /obj/structure/table, -/obj/item/weapon/paper/crumpled{ - info = "
WARNING


Majority of this area is consitered 'unsafe' past this point. Theres an outpost directly south of here where you can get your bearing and travel further down if needed. Traveling in groups is HIGHLY advised, the shit out there can be extremely deadly if you're alone.
" - }, +/obj/item/weapon/paper/crumpled/awaymissions/caves/unsafe_area, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, @@ -1091,10 +1089,7 @@ dir = 1 }, /obj/structure/filingcabinet, -/obj/item/weapon/paper{ - info = "
Testing Notes


Subject appears unresponsive to most interactions, refusing to move away from the corners or face any scientists. Subject appears to move between the two back corners every observation. A strange humming can be heard from inside the cell, appears to be originating from the subject itself, further testing is necessary to confirm or deny this.
"; - name = "Subject Omega Notes" - }, +/obj/item/weapon/paper/fluff/awaymissions/caves/omega, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt; initial_gas_mix = "n2=23;o2=14" @@ -1487,9 +1482,7 @@ }) "di" = ( /obj/structure/table, -/obj/item/weapon/paper{ - info = "
Mining is hell down here, you can feel the heat of the magma no matter how thick the suit is. Conditions are barely managble as is, restless nights and horrid work conditions. The ore maybe rich down here, but we've already lost a few men to the faults shifting, god knows how much longer till it all just collapses down and consumes everyone with it.
" - }, +/obj/item/weapon/paper/fluff/awaymissions/caves/magma, /obj/item/weapon/pen, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel{ @@ -2020,10 +2013,7 @@ /area/awaymission/BMPship) "eA" = ( /obj/structure/table, -/obj/item/weapon/paper{ - info = "
Survival Info For Miners


The caves are an unforgiving place, the only thing you'll have to traverse is the supplies in your locker and your own wit. Travel in packs when mining and try to shut down the monster dens before they overwhelm you. The job is dangerous but the haul is good, so remember this infomation and hopefully we'll all go home alive.
"; - name = "work notice" - }, +/obj/item/weapon/paper/fluff/awaymissions/caves/work_notice, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2196,7 +2186,7 @@ /area/awaymission/listeningpost) "eX" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet, +/obj/item/weapon/paper/pamphlet/gateway, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2219,14 +2209,8 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ - info = "
We were suppose to get a shipment of these special laser rifles and a couple 'nades to help combat the wildlife down here, but its been weeks since we last heard from the caravan carrying the shit down here. At this point we can only assume they fell victim to one of the monster nests or the dumbasses managed to trip into the lava. So much for that shipment, I guess.
"; - name = "shipment notice" - }, -/obj/item/weapon/paper{ - info = "
Some of the miners have gone to laying some mine traps among the lower levels of the mine to keep the monsters at bay. This probably isn't the smartest idea in a cavern like this but the boys seem to get a chuckle out of every distant blast they hear go off, so I guess it works
"; - name = "safety notice" - }, +/obj/item/weapon/paper/fluff/awaymissions/caves/shipment_notice, +/obj/item/weapon/paper/fluff/awaymissions/caves/saftey_notice, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2241,10 +2225,7 @@ }) "fc" = ( /obj/structure/closet/crate, -/obj/item/weapon/paper{ - info = "
CARAVAN SERVICES

Quality service since 2205


SHIPMENT CONTENTS:


4 scattershot rifles
6 grenades
1 laser rifle
1 blowup doll"; - name = "Shipment Receipt" - }, +/obj/item/weapon/paper/fluff/awaymissions/caves/shipment_receipt, /obj/item/weapon/gun/energy/laser/captain/scattershot, /obj/item/weapon/gun/energy/laser/captain/scattershot, /obj/item/weapon/gun/energy/laser, @@ -2338,10 +2319,7 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/paper{ - info = "
CARAVAN SERVICES

Quality service since 2205


SHIPMENT CONTENTS:


4 scattershot rifles
6 grenades
1 laser rifle
1 blowup doll"; - name = "Shipment Receipt" - }, +/obj/item/weapon/paper/fluff/awaymissions/caves/shipment_receipt, /obj/item/organ/eyes/robotic/thermals, /obj/item/weapon/gun/energy/laser/captain/scattershot, /obj/item/slimepotion/fireproof, @@ -2891,10 +2869,7 @@ "gH" = ( /obj/structure/table, /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill, -/obj/item/weapon/paper{ - info = "
NOTICE!!


Although you may seem indestructible in a mech, remember, THIS SHIT ISN'T LAVA PROOF!! The boys have already had to deal with loosing the last two to salvage because the dumbass thought he could just wade through the lower lakes like it was nothing. The fact he even managed to get back without being fused with what was left of the mech is a miracle in itself. They're built to be resistant against extreme heat, not heat PROOF!


Robotics Team"; - name = "NOTICE!! paper" - }, +/obj/item/weapon/paper/fluff/awaymissions/caves/mech_notice, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/basalt }, diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm index 1149da1290..7b182a91c3 100644 --- a/_maps/RandomZLevels/centcomAway.dmm +++ b/_maps/RandomZLevels/centcomAway.dmm @@ -1988,7 +1988,7 @@ /area/awaymission/centcomAway/general) "gt" = ( /obj/machinery/photocopier, -/obj/item/weapon/paper/ccaMemo, +/obj/item/weapon/paper/fluff/awaymissions/centcom/gateway_memo, /turf/open/floor/plasteel{ icon_state = "floor" }, @@ -2151,7 +2151,7 @@ /area/awaymission/centcomAway/hangar) "gU" = ( /obj/structure/table, -/obj/item/weapon/paper/ccaMemo, +/obj/item/weapon/paper/fluff/awaymissions/centcom/gateway_memo, /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "gV" = ( @@ -3131,7 +3131,7 @@ /area/awaymission/centcomAway/general) "jQ" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/ccaInfo, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, /turf/open/floor/plasteel{ icon_state = "floor" }, @@ -3328,7 +3328,7 @@ /area/awaymission/centcomAway/hangar) "kq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper/pamphlet/ccaInfo, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, /turf/open/floor/plasteel/vault{ dir = 4 }, diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm index faeb6ff724..71edc1e99e 100644 --- a/_maps/RandomZLevels/challenge.dmm +++ b/_maps/RandomZLevels/challenge.dmm @@ -899,10 +899,7 @@ /area/awaymission/challenge/end) "cr" = ( /obj/structure/table/wood, -/obj/item/weapon/paper{ - info = "Congratulations,

Your station has been selected to carry out the Gateway Project.

The equipment will be shipped to you at the start of the next quarter.
You are to prepare a secure location to house the equipment as outlined in the attached documents.

--Nanotrasen Blue Space Research"; - name = "Confidential Correspondence, Pg 1" - }, +/obj/item/weapon/paper/fluff/gateway, /obj/item/weapon/folder/blue, /turf/open/floor/carpet, /area/awaymission/challenge/end) @@ -1193,7 +1190,7 @@ /area/awaymission/challenge/end) "df" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet, +/obj/item/weapon/paper/pamphlet/gateway, /turf/open/floor/plasteel/black, /area/awaymission/challenge/end) "dg" = ( diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index c6805c74e0..f387d2dbc3 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -974,10 +974,7 @@ pixel_y = 9 }, /obj/item/weapon/pen, -/obj/item/weapon/paper{ - info = "Log 1:
We got our promised supply drop today. We were only meant to get it, what, a week ago? This bloody gateway keeps desyncing itself, and that means subsisting off recycled water and carb packs. No clue where the damn thing connects to on its off days, and HQ say we are 'not to touch it if it isn't linking to command.' We dumped off the assload of crates Jim filled, got our boxes of oxygen, food and drink, and closed the portal.

Log 2:
Damn thing is acting up again. Three days no contact this time. I thought I heard clanking noises from it yesterday. Jim is going on about the NT base or some shit. We've been over this before - They don't know we're here, that engineer was too drunk to recognise his suit, especially since I had it painted orange. He's starting to get annoying. We're safe.

Log 3:
Gateway synced itself up automatically today. I opened it for an instant to spy through it, got a glimpse of the inside of a transport container. Either HQ's redecorating or something, or there's more than two of these things."; - name = "Personal Log" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/personal, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -1585,10 +1582,7 @@ dir = 8 }, /obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/paper{ - info = "Alright, listen up. If you're reading this, I'm either taking a shit or I've been recalled back to Command. Either way, you'll need to know how to restore power. We've stolen this stuff from Nanotrasen, so all the equipment is jury-rigged. We have generators that work on both plasma and uranium, about 50 sheets should power the outpost for quite a while. If the generators aren't working, which is very likely, take the power cell on the desk and put it into the APC in the hallway. That should get the place running, at least for a little while."; - name = "Engineering Instructions" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/engineering, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -2463,10 +2457,7 @@ "dq" = ( /obj/structure/table/wood, /obj/item/weapon/pen, -/obj/item/weapon/paper{ - info = "Log 1:
While mining today I noticed the NT station was finished with its renovations. They placed some huge reinforced tumor on the station, looks so ugly. I wouldn't be surprised if those pigs decided to turn that little astronomy outpost into a prison with that thing, it'd be pretty typical of them.

Log 2:
Really dumb of me but I just waved at an engineer in the outpost, and he waved back. I hope to god he was too dumb or drunk to recognize the suit, because if he isn't then we might have to pull out before they come looking for us.

Log 3:
That huge reinforced tumor in their science section has been making a lot of noise lately. I've been hearing some banging and scratching from the other side and I'm kind of glad now that they reinforced this thing so much. I'll be sleeping with my gun under my pillow from now on."; - name = "Personal Log" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/personal_2, /obj/structure/sign/poster/contraband/c20r{ pixel_y = -32 }, @@ -4384,10 +4375,7 @@ }) "fS" = ( /obj/structure/filingcabinet, -/obj/item/weapon/paper{ - info = "Entry One - 27/05/2554:
I just arrived, and already I hate my job. I'm stuck on this shithole of an outpost, trying to avoid these damn eggheads running all over the place preparing for god knows what. There's no crimes to stop, no syndies to kill, and I'm not even allowed to beat the fuckin' assistant senseless! They said I was transferred from Space Station 13 for 'good behavior', but this feels more like a punishment than a reward. All I know is that if I don't get some action soon, I'm going to go insane.

Entry Two - 03/06/2554:
Okay, so get this: we got a fuckin' deathsquad coming in today! I thought the day I saw one of them would be the day my employment was 'terminated', if you get my drift. They're escorting some sort of weird alien creature for the eggheads to study. I heard one of the docs telling the chef that this thing killed a whole security force before it was captured. I sure as hell hope that I don't have to fight it.

Entry Three - 08/06/2554:
My first real bit of 'action' today, if you could call it that. Crazy Ivan got in a fight with Kuester today about his Booze-O-Mat. Apparently one of the crewmembers had stolen a couple bottles of booze from the machine after Ivan disabled the ID lock. Tell you the truth, I don't blame the thief. Everyone is going a little stir-crazy in here, and the bartender is being damn stingy with the alcohol. Either way, once they started to pick a fight, I had to take them down. It's a damn shame that we don't have a brig, though. I had to lock Ivan in a fuckin' freezer, for god's sake. Let's hope that we can keep our sanity together, at least for a while.

Entry Four - 10/06/2554:
Jesus fucking Christ riding on a motorbike. These things the scientists are studying are terrifying! Fucking great huge purple bug things as tall as the ceiling, with blades for arms and drooling at the mouth. I don't think my taser will do jack shit against these damn things, but the eggheads say that they're safely contained. If they do, I have a feeling that it's only a matter of time before we're all screwed. These bastards look like walking death.

Entry Five - 18/06/2554:
Finally caught who stole the booze from Kuester. It was that fuckin' loser assistant Steve! He was in the dorms, chugging his worries away. I took one of the bottles back to the barkeep, but no one has to know about this second one. I think I'm gonna enjoy this while watching tomorrow's Thunderdome match.

Entry Six - 19/06/2554:
Oh, great. The chef is still sleeping, so we get Ivan's gruel for breakfast today. I overheard Sano and Douglas saying something about the aliens being restless, so we might get some action today. As long as it happens after the big game, I'm fine with it. I still got one beer to drink before I'm ready to die."; - name = "Personal Log - Kenneth Cunningham" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/kenneth, /turf/open/floor/plasteel/red/side{ dir = 9; heat_capacity = 1e+006 @@ -4824,10 +4812,7 @@ }) "gx" = ( /obj/structure/table, -/obj/item/weapon/paper{ - info = "Ivan Volodin Stories:

Entry Won - 28/05/2554:
Hello. I am Crazy Ivan. Boss say I must write. I do good job fixing outpost. Is very good job. Much better than mines. Many nice people. I cause no trouble.

Entry Too - 05/06/2554:
I am finding problem with Booze-O-Mat. Is not problem. I solve very easy. Use yellow tool to make purple light go off. I am good engineer! Bartender will be very happy.

Entry Tree - 08/06/2554:
Bartender is not happy. Security man is not happy. Cannot feel legs, is very cold in freezer. Is not good. Table is jammed into door, have no tools. Is very not good. But, on bright side, found meat! Shall chew to keep spirits up.

Entry Fore - 12/06/2554:
Big nasty purple bug looked at me today. Make nervous. Blue wall wire can be broken, then bad thing happens. Very very bad thing. Man in orange spacesuit wave at me today too. He seem nice. Wonder who was?

Entry Fiv - 15/06/2554:
I eat cornflakes today. Is good day. Sun shine for a while. Was nice. I also take ride on disposals chute. Was fun, but tiny. Get clog out of pipes, was vodka bottle. Is empty. This make many sads.

Entry Sex: 19/06/2554:
Purple bugs jumpy today. When waved, get hiss. Maybe very bad. Maybe just ill. Do not know. Is science problem, is not engineer problem. I eat sandwich. Is glorious job. Wish to never end."; - name = "Personal Log - Ivan Volodin" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/ivan, /turf/open/floor/plating{ broken = 1; heat_capacity = 1e+006; @@ -4991,26 +4976,11 @@ icon_state = "bulb-broken"; status = 2 }, -/obj/item/weapon/paper{ - info = "Researcher: Dr. Sakuma Sano
Date: 04/06/2554

Report:
As expected, all that is left of the monkeys we sent in earlier is a group of xenomorph larvae. It is quite clear that the facehuggers are not selective in their hosts, and so far the gestation process has been shown to have a 100% success rate.

The larvae themselves have been behaving very differently from the lone larva we first observed, and despite shying away from humans they are clearly comfortable with others of their kind. Our previous suspicions on larvae have been confirmed with their demonstration of playfulness: they are not nearly as aggressive or violent when young, before molting to adulthood.

The majority of the play we observed involved a sort of hide-and-seek, and occasionally wrestling by tangling themselves and struggling out of it. While normally we would write these off as instinctual play for honing their skills when they molt, their growth period is so incredibly fast and they are still such adept killers that it would serve no practical purpose. The only explanation for this is perhaps to create bonds and friendships with each other, if that is even possible for such an incredibly hostile race. It may be that they are much more reasonable with each other than other life forms.

It had become clear that now was the best time to extract a xenomorph for dissecting, as these were all still larvae and the queen was still attached to its ovipositor and would be immobile. With the approval of the research director, we sent in our medical robot that had been dubbed 'Head Surgeon' into the containment pen, dropping the shields for only a fraction of a second to allow it entry. The larvae were cautious, but the curiosity of one had him within grabbing range of our robot. It was brought out and quickly euthanized through lethal injection, courtesy of our mechanical doctor."; - name = "Larva Xenomorph Social Interactions & Capturing Procedure" - }, -/obj/item/weapon/paper{ - info = "Researcher: Dr. Sakuma Sano
Date: 04/06/2554

Report:
I have studied many interesting and diverse life-forms as a xenobiologist ranging from creatures as large as cows, to specimens too small see with the naked eye. This is by far the largest alien I have ever seen. The alien we were previously studying has molted and has become an absolutely enormous creature. Standing at over 15 feet tall and weighing in at likely two tons or more, the xenomorph queen is an absolutely breathtakingly large and cruel monster. Its behavior has changed drastically from when it was a drone, having become far more comfortable with sitting and staring at us, rather than smashing at the windows.

The queen, physiologically speaking, is fairly similar to the other xenomorphs, with a few key differences. Its enormous size demands large legs, while the back seems to be always hunched forward. The dorsal tubes on the back have changed to several large spikes, and we observed the alien now sports a second pair of smaller arms on its chest. The purpose of these secondary arms is still unknown. Finally, the queen's crown has become incredibly large, with what seems to be a retractable slot to hide its head in. The dome appears to be extremely thick near the front, and will likely be able to resist a lot of trauma. Despite the enormous size it has grown to, it is not that much slower than it used to be.

After two hours of doing relatively nothing but staring, the queen began to produce an unusually large amount of resin and weeds, quickly shaping up a large nest that it then hid behind. It then proceeded to smash out all the lights, leaving us with very little to see with our cameras. When we looked through the back cameras, we had discovered that it had grown a large ovipositor, and was releasing large eggs onto the ground. This had us all in agreement that this stage of the life cycle was the queen.

Over the next few hours, the eggs grew to their full sizes, and we provided the subject with new monkey hosts. When they approached the eggs, they opened to release more facehuggers. It seems that we have observed the full cycle of reproduction for this species. We can expect more larvae in the next few hours."; - name = "Queen Xenomorph Physiology & Behavior Observation" - }, -/obj/item/weapon/paper{ - info = "Researcher: Dr. Sakuma Sano
Date: 03/06/2554

Report:
The other scientists and I can hardly believe our eyes. The snake-like larva has molted into a 7 foot tall insectoid nightmare in just a few hours. It's obvious now as to why such heavy duty containment was needed. It immediately tried to escape however by flinging itself at the window in a flurry of swipes and stabs. It seems its behavior has returned to a state that is very similar to the facehugger, though I doubt with the same intent! Thankfully, our glass and shields have shown to be more than sturdy enough for such a violent creature, and so far, any attempts at the creature escaping have been in vain.

As for its physiology, the creature has an elongated head with what appears to be have an exoskeleton resembling an external rib-cage on the torso. The alien is also fairly skinny with a lean body. The little amount of meat on the alien appears to be entirely muscle. We assume this makes it deceptively strong, while remaining agile at the same time. One of the most interesting things we have seen is its pharyngeal jaw. It has some what of an inner mouth capable of being fired externally at extremely high speeds. It has already caused many dents in the walls and a few small cracks in the window with it. The alien also has a couple of dorsal tubes on its back, their purpose unknown. Finally, this monster sports a long ridged tail, complete with a large and extremely sharp blade at the tip.

Normally I would be absolutely terrified of something like this, but I'm putting my trust in Nanotrasen with the containment. After all, they wouldn't build a cell that could fail to contain its subject, would they?"; - name = "Adult Xenomorph Physiology & Behavior Observation" - }, -/obj/item/weapon/paper{ - info = "Researcher: Dr. Sakuma Sano
Date: 03/06/2554

Report:
When the larva first emerged from the chest of the monkey, it seemed very curious. It would wander around aimlessly for awhile and then sit still. We are unable to determine the gender of the larva, or even determine if it has a gender. After some time had passed, it seemed to lose interest in its surroundings and sat mostly still while occasionally wagging its tail. We decided to throw in a live mouse to see if it would consume it. The larva quickly attacked and ate the mouse and seemed to get larger very suddenly, this suggests that the larvae are capable of metabolizing and directing all the energy towards growth at previously thought impossible speeds. It is a shame that we cannot observe the process more closely, as we do not currently know how dangerous or violent this creature is or will become as it matures fully.

It is tempting to imagine the possibilities of utilizing such a mechanism. The capability of skipping years of growth time for children, repairing bodily damage in a matter of moments, even its usage in existing cloning technology."; - name = "Larva Xenomorph Physiology & Behavior Observation" - }, -/obj/item/weapon/paper{ - info = "Researcher: Dr. Sakuma Sano
Date: 03/06/2554

Report:
The test subject we were provided with truly is alien. It is a small spider-like creature with bony legs leading to a smooth body. It has a long tail connected to it, and it has shown extremely aggressive behavior by flinging its entire body at the glass and shields to no avail. While doing so, we noticed there was a small pink hole in the middle of the body.

When we sent in a monkey through the crude but effective disposal tube, the alien immediately jumped at its face and latched on. The monkey was quickly suffocated by its constricting tail, unable to pry off the fingers. The monkey at first seemed to be dead, but was observed to be breathing. The recently named alien 'facehugger' fell off dead and curled its legs up like a spider moments after it had finished with the monkey's body.

While the monkey appeared to be unharmed, we kept it in the cell for a couple more hours until we were horrified to discover it screaming out in pain as a snake-like creature erupted from the monkey's chest! It appears that the 'facehugger' is only the start of this life cycle. The impregnation cycle involving the creatures growing inside the chests of their hosts seems to only be the beginning."; - name = "'Facehugger' Xenomorph Physiology & Behavior Observation" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/larva_social, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_queen, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_adult, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/larva_psych, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/facehugger, /obj/structure/alien/weeds, /turf/open/floor/plasteel/white, /area/awaycontent/a2{ @@ -5196,19 +5166,19 @@ }) "gW" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/item/weapon/paper{ +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind{ info = "Researcher: Dr. Mark Douglas
Date: 17/06/2554

Report:
Earlier today we have observed a new phenomenon with our subjects. While feeding them our last monkey subject and throwing out the box, the aliens merely looked at us instead of infecting the monkey right away. They looked to be collectively distressed as they would no longer be given hosts, where instead we would move to the next phase of the experiment. When I glanced at the gas tanks and piping leading to their cell, I looked back to see all of them were up against the glass, even the queen! It was as if they all understood what was going to happen, even though we knew only the queen had the cognitive capability to do so.

The only explanation for this is a form of communication between the aliens, but we have seen no such action take place anywhere in the cell until now. We also know that regular drone and hunter xenomorphs have no personality or instinct to survive by themselves. Perhaps the queen has a direct link to them? A form of a commander or overseer that controls their every move? A hivemind?"; name = "The Hivemind Hypothesis" }, -/obj/item/weapon/paper{ +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior{ info = "Researcher: Dr. Sakuma Sano
Date: 08/06/2554

Report:
The xenomorphs we have come to study here are a remarkable species. They are almost universally aggressive across all castes, showing no remorse or guilt or pause before or after acts of violence. They appear to be a species entirely designed to kill. Oddly enough, even their method of reproduction is a brutal two-for-one method of birthing a new xenomorph and killing its host.

The lone xenomorph we studied only five days ago showed little sign of intelligence. Only a simple drone that flung itself at the safety glass and shields repeatedly and thankfully without success. Once the drone molted into a queen, it became much more calm and calculating, merely looking at us and waiting while building its nest. As the hive grew in size and in numbers, so too did the intelligence of the common hunter and drone. We are still researching how they can communicate with one another and the relationship between the different castes and the queen. We will continue to update our research as we learn more about the species."; name = "A Preliminary Study of Alien Behavior" }, -/obj/item/weapon/paper{ +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes{ info = "Researcher: Dr. Mark Douglas
Date: 06/06/2554

Report:
While observing the growing number of aliens in the containment cell, we began to notice subtle differences that were consistently repeating. Like ants, these creatures clearly have different specialized variations that determine their roles in the hive. We have dubbed the three currently observed castes as Hunters, Drones, and Sentinels.

Hunters have been observed to be by far the most aggressive and agile of the three, constantly running on every surface and frequently swiping at the windows. They are also remarkably good at camouflaging themselves in darkness and on their resin structures, appearing almost invisible to the unwary observer. They are always the first to reach the monkeys we send in leading us to believe that this caste is primarily used for finding and retrieving hosts.

Drones on the other hand are much more docile and seem more shy by comparison, though not any less aggressive than the other castes. They have been observed to have a much wider head and lack dorsal tubes. They have shown to be less agile and visibly more fragile than any other caste. The drone however has never been observed to interact with the monkeys directly and instead preferring maintenance of the hive by building walls of resin and moving eggs around the nest. As far as we know, we have only ever observed a drone become a queen, and we have no way of knowing if the other castes have that capability.

Lastly, we have the Sentinels, which appear at first glance to be the guards of the hive. They have so far been only observed to remain near the queen and the eggs, frequently curled up against the walls. We have only observed one instance where they have interacted with a monkey who strayed too closely to the queen, and was pounced and held down immediately until it was applied with a facehugger. Their lack of movement makes it difficult to determine their exact purpose as guards, sentries, or other role."; name = "The Xenomorph 'Castes'" }, -/obj/item/weapon/paper{ +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy{ info = "Researcher: Dr. Mark Douglas
Date: 04/06/2554

Report:
After an extremely dangerous, time consuming and costly dissection, we have managed to record and identify several of the organs inside of the first stage of the xenomorph cycle: the larva. This procedure took an extensive amount of time because these creatures have incredibly, almost-comically acidic blood that can melt through almost anything in a few moments. We had to use over a dozen scalpels and retractors to complete the autopsy.

The larva seems to possess far fewer and quite different organs than that of a human. There is a stomach, with no digestive tract, a heart, which seems to lack any blood-oxygen circulation purpose, and an elongated brain, even though its as dumb as any large cat. It also lacks any liver, kidneys, or other basic organs.

We can't determine the exact nature of how these creatures grow, nor if they gain organs as they become adults. The larger breeds of xenomorph are too dangerous to kill and capture to give us an accurate answer to these questions. All that we can conclude is that being able to function with so little and yet be so deadly means that these creatures are highly evolved and likely to be extremely durable to various hazards that would otherwise be lethal to humans."; name = "Larva Xenomorph Autopsy Report" }, @@ -5527,10 +5497,7 @@ pixel_y = 23; req_access = null }, -/obj/item/weapon/paper{ - info = "Personal Log for Research Director Gerald Rosswell

Entry One - 17/05/2554:
You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.

Entry Two - 25/05/2554:
Well, we all expected it at the outpost, CentComm has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on an xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.

Entry Three - 27/05/2554:
The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.

Entry Four - 06/06/2554:
My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.

Entry Five - 10/06/2554:
Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.

Entry Six - 17/06/2554:
The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information."; - name = "Personal Log - Gerald Rosswell" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/gerald, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -5695,10 +5662,7 @@ icon_state = "bulb-broken"; status = 2 }, -/obj/item/weapon/paper{ - info = "

In The Event of Xenobiology Breach: Evacuate staff, Lock down Xenobiology, Notify on-site superiors and/or Central Command immediatly.



Current Xenobiology Containment Level:Secure RUN

"; - name = "Evacuation Procedure" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/evacuation, /obj/machinery/camera{ c_tag = "Research Division"; dir = 1; @@ -6241,10 +6205,7 @@ }, /obj/effect/decal/cleanable/blood/splatter, /obj/item/weapon/pen, -/obj/item/weapon/paper/crumpled{ - info = "19 06 2554

I fucking knew it. There was a major breach, that idiotic force field failed and the xenomorphs rushed out and took out the scientists. I've managed to make it to my office and closed the blast doors. I can hear them trying to pry open the doors. Probably don't have long. I have no clue what has happened to the rest of the crew, for all I know they've been killed to produce more of the fucks."; - name = "Hastily Written Note" - }, +/obj/item/weapon/paper/crumpled/awaymissions/moonoutpost19/hastey_note, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -7092,10 +7053,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper{ - info = "

I Can't Believe It's Not Pasta: Half off on Wednesdays



Burger night every Friday 6PM-10PM, free drinks with purchase of meal!



Premiering Tonight: The comedy stylings of Shoe Snatching Willy! 11AM-7PM

"; - name = "Specials This Week" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/food_specials, /turf/open/floor/plasteel{ burnt = 1; dir = 8; @@ -9039,10 +8997,7 @@ dir = 8; pixel_x = 32 }, -/obj/item/weapon/paper{ - info = "

Welcome to Moon Outpost 19! Property of Nanotrasen Inc.



Staff Roster:
-Dr. Gerald Rosswell: Research Director & Acting Captain
-Dr. Sakuma Sano: Xenobiologist
-Dr. Mark Douglas: Xenobiologist
-Kenneth Cunningham: Security Officer-Ivan Volodin: Engineer
-Mathias Kuester: Bartender
-Sven Edling: Chef
-Steve: Assistant

Please enjoy your stay, and report any abnormalities to an officer."; - name = "Welcome Notice" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/welcome, /obj/machinery/camera{ c_tag = "Arrivals South"; dir = 8; @@ -9686,10 +9641,7 @@ }) "nI" = ( /obj/structure/dresser, -/obj/item/weapon/paper{ - info = "Bugs break out. I run to here and lock door. I hear door next to me break open and screams. All nice people here dead now. I no want to be eaten, and bottle always said to be coward way out, but person who say that is stupid. Mira, there is no escape for me, tell Alexis and Elena that father will never come home, and that I love you all."; - name = "Note" - }, +/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/goodbye_note, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 7d313a0915..1702e83e3a 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -896,8 +896,8 @@ icon_state = "1-8" }, /obj/structure/table, -/obj/item/weapon/paper/pamphlet, -/obj/item/weapon/paper/pamphlet, +/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/weapon/paper/pamphlet/gateway, /turf/open/floor/plasteel/black, /area/awaymission/research/interior/gateway) "cG" = ( @@ -1691,9 +1691,7 @@ /turf/open/floor/plasteel/black, /area/awaymission/research/interior/secure) "eU" = ( -/obj/item/weapon/paper/crumpled{ - info = "Theres a lot of sensitive info on these disks, try and keep them secure! If these backup copies get into the wrong hands, god knows what they could do with the genetic research on these disk.." - }, +/obj/item/weapon/paper/crumpled/awaymissions/research/sensitive_info, /turf/open/floor/plasteel/black, /area/awaymission/research/interior/secure) "eV" = ( diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index b390094018..2391a827cb 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -95,7 +95,7 @@ "aq" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westright, -/obj/item/weapon/paper/crumpled/snowdin/keys, +/obj/item/weapon/paper/crumpled/ruins/snowdin/keys, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -123,7 +123,7 @@ /area/awaymission/snowdin/base) "at" = ( /obj/structure/filingcabinet, -/obj/item/weapon/paper/snowdin/secnotice, +/obj/item/weapon/paper/fluff/awaymissions/snowdin/secnotice, /turf/open/floor/plasteel/darkred{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -547,7 +547,7 @@ "bt" = ( /obj/structure/table, /obj/item/weapon/shovel, -/obj/item/weapon/paper/crumpled/snowdin/shovel, +/obj/item/weapon/paper/crumpled/ruins/snowdin/shovel, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -982,7 +982,7 @@ /area/awaymission/snowdin/base) "cv" = ( /obj/structure/table/wood, -/obj/item/weapon/paper/crumpled/snowdin/snowdingatewaynotice, +/obj/item/weapon/paper/crumpled/ruins/snowdin/snowdingatewaynotice, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -1067,7 +1067,7 @@ dir = 8 }, /obj/structure/filingcabinet, -/obj/item/weapon/paper/snowdin/snowdinlog, +/obj/item/weapon/paper/fluff/awaymissions/snowdin/log, /turf/open/floor/plasteel/darkbrown{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -1311,7 +1311,7 @@ }, /area/awaymission/snowdin/post) "dt" = ( -/obj/item/weapon/paper/crumpled/snowdin/lootstructures, +/obj/item/weapon/paper/crumpled/ruins/snowdin/lootstructures, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; icon = 'icons/turf/snow.dmi'; @@ -1555,7 +1555,7 @@ /area/awaymission/snowdin/post) "dZ" = ( /obj/structure/table, -/obj/item/weapon/paper/crumpled/snowdin/syndielava, +/obj/item/weapon/paper/crumpled/ruins/snowdin/syndielava, /obj/machinery/light/small{ active_power_usage = 0; dir = 4; @@ -2721,7 +2721,7 @@ /area/awaymission/snowdin/post) "hn" = ( /obj/structure/filingcabinet, -/obj/item/weapon/paper/snowdin/secnotice, +/obj/item/weapon/paper/fluff/awaymissions/snowdin/secnotice, /turf/open/floor/plasteel/darkred{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3670,7 +3670,7 @@ /area/awaymission/snowdin) "jV" = ( /obj/structure/table, -/obj/item/weapon/paper/crumpled/snowdin/misc1, +/obj/item/weapon/paper/crumpled/ruins/snowdin/misc1, /turf/open/floor/mineral/plastitanium/brig{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3893,10 +3893,7 @@ dir = 4 }, /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/item/weapon/paper{ - info = "YOU SEEN IVAN, WHEN YOU HOLD SAAW LIKE PEESTOL, YOU STRONGER THAN RECOIL FOR FEAR OF HITTING FACE!"; - name = "SAW Usage" - }, +/obj/item/weapon/paper/fluff/awaymissions/snowdin/saw_usage, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3950,7 +3947,7 @@ /area/awaymission/snowdin/sekret) "kE" = ( /obj/structure/table/wood, -/obj/item/weapon/paper/snowdin/syndienotice, +/obj/item/weapon/paper/fluff/awaymissions/snowdin/syndienotice, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4970,7 +4967,7 @@ /area/awaymission/snowdin) "nc" = ( /obj/structure/table, -/obj/item/weapon/paper/crumpled/snowdin/shovel, +/obj/item/weapon/paper/crumpled/ruins/snowdin/shovel, /turf/open/floor/plasteel/darkbrown{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -5175,7 +5172,7 @@ dir = 8 }, /obj/structure/filingcabinet, -/obj/item/weapon/paper/snowdin/snowdinlog2, +/obj/item/weapon/paper/fluff/awaymissions/snowdin/log2, /turf/open/floor/plasteel/darkbrown{ baseturf = /turf/open/floor/plating/asteroid/snow }, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index fb82bb398a..02ab07915f 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -2824,7 +2824,7 @@ "eE" = ( /obj/structure/table, /obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/paper/hydroponics, +/obj/item/weapon/paper/guides/jobs/hydroponics, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 1; @@ -5557,7 +5557,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/paper/pamphlet, +/obj/item/weapon/paper/pamphlet/gateway, /turf/open/floor/plasteel/floorgrime{ dir = 8; heat_capacity = 1e+006 diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index 386f79ab87..243f74b6d2 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -171,7 +171,7 @@ /turf/open/floor/engine/cult, /area/awaymission/wwvault) "aL" = ( -/obj/item/weapon/paper{ +/obj/item/weapon/paper/fluff/awaymissions/wildwest/grinder{ info = "meat grinder requires sacri" }, /turf/open/floor/plasteel/cult{ @@ -607,10 +607,7 @@ /area/awaymission/wwgov) "cg" = ( /obj/structure/table/wood, -/obj/item/weapon/paper{ - info = " The miners in the town have become sick and almost all production has stopped. They, in a fit of delusion, tossed all of their mining equipment into the furnaces. They all claimed the same thing. A voice beckoning them to lay down their arms. Stupid miners."; - name = "Planer Saul's Journal: Page 4" - }, +/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page4, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -830,10 +827,7 @@ /turf/open/floor/plating, /area/awaymission/wwrefine) "cU" = ( -/obj/item/weapon/paper{ - info = "We've discovered something floating in space. We can't really tell how old it is, but it is scraped and bent to hell. There object is the size of about a room with double doors that we have yet to break into. It is a lot sturdier than we could have imagined. We have decided to call it 'The Vault' "; - name = "Planer Saul's Journal: Page 1" - }, +/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page1, /turf/open/floor/carpet, /area/awaymission/wwgov) "cV" = ( @@ -1884,10 +1878,7 @@ /turf/open/floor/wood, /area/awaymission/wwmines) "fZ" = ( -/obj/item/weapon/paper{ - info = "The Vault...it just keeps growing and growing. I went on my daily walk through the garden and now its just right outside the mansion... a few days ago it was only barely visible. But whatever is inside...its calling to me."; - name = "Planer Sauls' Journal: Page 7" - }, +/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page7, /turf/open/floor/wood, /area/awaymission/wwmines) "ga" = ( @@ -2192,10 +2183,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "gY" = ( -/obj/item/weapon/paper{ - info = "The syndicate have invaded. Their ships appeared out of nowhere and now they likely intend to kill us all and take everything. On the off-chance that the Vault may grant us sanctuary, many of us have decided to force our way inside and bolt the door, taking as many provisions with us as we can carry. In case you find this, send for help immediately and open the Vault. Find us inside."; - name = "Planer Saul's Journal: Page 8" - }, +/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page8, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 26feb0fa1b..fa2c78e010 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -7240,10 +7240,7 @@ /turf/open/space, /area/space/nearstation) "apR" = ( -/obj/item/weapon/paper{ - info = "01001001 00100000 01101000 01101111 01110000 01100101 00100000 01111001 01101111 01110101 00100000 01110011 01110100 01100001 01111001 00100000 01110011 01100001 01100110 01100101 00101110 00100000 01001100 01101111 01110110 01100101 00101100 00100000 01101101 01101111 01101101 00101110"; - name = "Note from Beepsky's Mom" - }, +/obj/item/weapon/paper/fluff/jobs/security/beepsky_mom, /turf/open/floor/plating, /area/security/processing) "apS" = ( @@ -10002,11 +9999,7 @@ /area/crew_quarters/fitness) "awC" = ( /obj/structure/table, -/obj/item/weapon/paper{ - desc = ""; - info = "Brusies sustained in the holodeck can be healed simply by sleeping."; - name = "Holodeck Disclaimer" - }, +/obj/item/weapon/paper/fluff/holodeck/disclaimer, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "awD" = ( @@ -13672,7 +13665,7 @@ /area/ai_monitored/nuke_storage) "aEQ" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet, +/obj/item/weapon/paper/pamphlet/gateway, /turf/open/floor/plasteel, /area/gateway) "aER" = ( @@ -15921,7 +15914,7 @@ "aJN" = ( /obj/structure/table, /obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/paper/hydroponics, +/obj/item/weapon/paper/guides/jobs/hydroponics, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "aJO" = ( @@ -27793,7 +27786,7 @@ /area/quartermaster/office) "bmR" = ( /obj/structure/table, -/obj/item/weapon/paper/morguereminder{ +/obj/item/weapon/paper/guides/jobs/medical/morgue{ pixel_x = 5; pixel_y = 4 }, @@ -29518,7 +29511,7 @@ pixel_y = 1 }, /obj/structure/table, -/obj/item/weapon/paper/gravity_gen{ +/obj/item/weapon/paper/guides/jobs/engi/gravity_gen{ layer = 3 }, /obj/item/weapon/pen/blue, @@ -44598,7 +44591,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/weapon/paper/range, +/obj/item/weapon/paper/guides/jobs/security/range, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -50694,7 +50687,7 @@ /obj/item/solar_assembly, /obj/item/weapon/circuitboard/computer/solar_control, /obj/item/weapon/electronics/tracker, -/obj/item/weapon/paper/solar, +/obj/item/weapon/paper/guides/jobs/engi/solars, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -50734,7 +50727,7 @@ /obj/item/solar_assembly, /obj/item/weapon/circuitboard/computer/solar_control, /obj/item/weapon/electronics/tracker, -/obj/item/weapon/paper/solar, +/obj/item/weapon/paper/guides/jobs/engi/solars, /turf/open/floor/plasteel, /area/engine/engineering) "ckK" = ( diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm index a679b2a111..e7d08fb1ed 100644 --- a/_maps/map_files/Cerestation/cerestation.dmm +++ b/_maps/map_files/Cerestation/cerestation.dmm @@ -19595,10 +19595,7 @@ dir = 8; pixel_x = 32 }, -/obj/item/weapon/paper{ - info = "
Dummies Guide To Quantum Pads


Do you hate the concept of having to use your legs, let alone walk to places? Well, with the Quantum Pad (tm), never again will the fear of cardio keep you from going places!

How to set up your Quantum Pad(tm)


1.Unscrew the Quantum Pad(tm) you wish to link.
2. Use your multi-tool to cache the buffer of the Quantum Pad(tm) you wish to link.
3. Apply the multi-tool to the secondary Quantum Pad(tm) you wish to link to the first Quantum Pad(tm)

If you followed these instructions carefully, your Quantum Pad(tm) should now be properly linked together for near-instant movement across the station! Bear in mind that this is technically a one-way teleport, so you'll need to do the same process with the secondary pad to the first one if you wish to travel between both.
"; - name = "Quantum Pad For Dummies" - }, +/obj/item/weapon/paper/guides/quantumpad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -23414,10 +23411,7 @@ dir = 8; pixel_x = 27 }, -/obj/item/weapon/paper{ - info = "
Dummies Guide To Quantum Pads


Do you hate the concept of having to use your legs, let alone walk to places? Well, with the Quantum Pad (tm), never again will the fear of cardio keep you from going places!

How to set up your Quantum Pad(tm)


1.Unscrew the Quantum Pad(tm) you wish to link.
2. Use your multi-tool to cache the buffer of the Quantum Pad(tm) you wish to link.
3. Apply the multi-tool to the secondary Quantum Pad(tm) you wish to link to the first Quantum Pad(tm)

If you followed these instructions carefully, your Quantum Pad(tm) should now be properly linked together for near-instant movement across the station! Bear in mind that this is technically a one-way teleport, so you'll need to do the same process with the secondary pad to the first one if you wish to travel between both.
"; - name = "Quantum Pad For Dummies" - }, +/obj/item/weapon/paper/guides/quantumpad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -23554,10 +23548,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/paper{ - info = "You got a big job ahead of you, pal. This is a big station, lots of floors and assholes to dirty said floors without any thought for you. It might not be a bad idea to check on the external waste belts every now and again to make sure some foriegn object hasn't clogged the disposal loop, either."; - name = "Janitor Notice" - }, +/obj/item/weapon/paper/fluff/stations/cere/janitor, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -38752,10 +38743,7 @@ }, /area/awaymission/research/interior/gateway) "bur" = ( -/obj/item/weapon/paper{ - info = "
Nanotrasen Exploration and Colonization Program


Due to recent shutdowns of the Exploration and Colonization department shortly after this gateway was delivered on-site during station construction, this room has been condemmed and an engineering team will be on-site within the next few months to recollect the gate. Thank you for your cooperation."; - name = "NOTICE - GATEWAY STATUS" - }, +/obj/item/weapon/paper/fluff/stations/cere/gateway, /obj/effect/turf_decal/stripes/asteroid/line{ icon_state = "ast_warn"; dir = 8 @@ -40335,7 +40323,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/item/weapon/paper/pamphlet, +/obj/item/weapon/paper/pamphlet/gateway, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -40908,7 +40896,7 @@ /area/awaymission/research/interior/gateway) "byg" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet, +/obj/item/weapon/paper/pamphlet/gateway, /obj/item/weapon/coin/silver, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -44035,7 +44023,7 @@ "bDQ" = ( /obj/structure/table, /obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/paper/hydroponics, +/obj/item/weapon/paper/guides/jobs/hydroponics, /obj/item/stack/packageWrap, /obj/item/device/destTagger, /turf/open/floor/plasteel/hydrofloor{ @@ -54826,11 +54814,7 @@ }) "bYp" = ( /obj/structure/table, -/obj/item/weapon/paper{ - desc = ""; - info = "Bruises sustained in the holodeck can be healed simply by sleeping."; - name = "Holodeck Disclaimer" - }, +/obj/item/weapon/paper/fluff/holodeck/disclaimer, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -57418,7 +57402,7 @@ /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/weapon/electronics/tracker, -/obj/item/weapon/paper/solar, +/obj/item/weapon/paper/guides/jobs/engi/solars, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -58731,10 +58715,7 @@ "cgi" = ( /obj/structure/table, /obj/item/clothing/glasses/meson, -/obj/item/weapon/paper{ - info = "This station needs cleared out within the next few weeks, as construction is almost complete and NT expects most of the equipment off-site before then. Throw most of the shit in here for now and we'll come back later with a pod to haul the heavier stuff. Shouldn't be too big of an issue."; - name = "Disclaimer Notice" - }, +/obj/item/weapon/paper/fluff/stations/cere/abandoned_dock, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -61247,10 +61228,7 @@ dir = 4; pixel_x = -32 }, -/obj/item/weapon/paper{ - info = "
Dummies Guide To Quantum Pads


Do you hate the concept of having to use your legs, let alone walk to places? Well, with the Quantum Pad (tm), never again will the fear of cardio keep you from going places!

How to set up your Quantum Pad(tm)


1.Unscrew the Quantum Pad(tm) you wish to link.
2. Use your multi-tool to cache the buffer of the Quantum Pad(tm) you wish to link.
3. Apply the multi-tool to the secondary Quantum Pad(tm) you wish to link to the first Quantum Pad(tm)

If you followed these instructions carefully, your Quantum Pad(tm) should now be properly linked together for near-instant movement across the station! Bear in mind that this is technically a one-way teleport, so you'll need to do the same process with the secondary pad to the first one if you wish to travel between both.
"; - name = "Quantum Pad For Dummies" - }, +/obj/item/weapon/paper/guides/quantumpad, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -61316,10 +61294,7 @@ dir = 8; pixel_x = 32 }, -/obj/item/weapon/paper{ - info = "
Dummies Guide To Quantum Pads


Do you hate the concept of having to use your legs, let alone walk to places? Well, with the Quantum Pad (tm), never again will the fear of cardio keep you from going places!

How to set up your Quantum Pad(tm)


1.Unscrew the Quantum Pad(tm) you wish to link.
2. Use your multi-tool to cache the buffer of the Quantum Pad(tm) you wish to link.
3. Apply the multi-tool to the secondary Quantum Pad(tm) you wish to link to the first Quantum Pad(tm)

If you followed these instructions carefully, your Quantum Pad(tm) should now be properly linked together for near-instant movement across the station! Bear in mind that this is technically a one-way teleport, so you'll need to do the same process with the secondary pad to the first one if you wish to travel between both.
"; - name = "Quantum Pad For Dummies" - }, +/obj/item/weapon/paper/guides/quantumpad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -79710,15 +79685,9 @@ pixel_x = 32 }, /obj/structure/closet/crate/bin, -/obj/item/weapon/paper/crumpled{ - info = "...SOMETHING IN THE ROCKS, IT WATCHES US ALL..." - }, -/obj/item/weapon/paper/crumpled{ - info = "...THEY SENT US HERE FOR A REASON...TERRIBLE..." - }, -/obj/item/weapon/paper/crumpled{ - info = "...EMPTY HALLS...USELESS SPACE..." - }, +/obj/item/weapon/paper/crumpled/stations/cere/rocks1, +/obj/item/weapon/paper/crumpled/stations/cere/rocks2, +/obj/item/weapon/paper/crumpled/stations/cere/rocks3, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -79732,17 +79701,9 @@ }) "cTH" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/item/weapon/paper/crumpled{ - info = "I can't be here for much longer, this station is too empty for its own good. Something is wrong..." - }, -/obj/item/weapon/paper{ - info = "
2XXX - 2nd Trimestor


I hide in here, away from the masses, not like it matters much considering how fucking huge this place is. "; - name = "Journal Log" - }, -/obj/item/weapon/paper{ - info = "
2XXX - 3rd Trimestor


I hear strange whispers from the halls, longing for blood. Something isn't right here. Why did they transfer us here to work in the first place? "; - name = "Journal Log 2" - }, +/obj/item/weapon/paper/crumpled/stations/cere/empty_station, +/obj/item/weapon/paper/fluff/stations/cere/journal/journal, +/obj/item/weapon/paper/fluff/stations/cere/journal/journal_2, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -79750,9 +79711,7 @@ valid_territory = 0 }) "cTI" = ( -/obj/item/weapon/paper/crumpled/bloody{ - info = "...THE HOPLINE CALLS...IT THIRSTS FOR BLOOD...I MUST GO..." - }, +/obj/item/weapon/paper/crumpled/bloody/hop, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 574dcbb095..96c7f5a8ab 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -65684,9 +65684,9 @@ icon_state = "4-8" }, /obj/item/weapon/clipboard, -/obj/item/weapon/paper/pamphlet, -/obj/item/weapon/paper/pamphlet, -/obj/item/weapon/paper/pamphlet, +/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/weapon/paper/pamphlet/gateway, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -72299,11 +72299,7 @@ /obj/structure/table/reinforced, /obj/item/weapon/clipboard, /obj/item/weapon/folder, -/obj/item/weapon/paper{ - desc = ""; - info = "Brusies sustained in the holodeck can be healed simply by sleeping."; - name = "Holodeck Disclaimer" - }, +/obj/item/weapon/paper/fluff/holodeck/disclaimer, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a7db1e0909..4c863df3c9 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -522,7 +522,7 @@ "abk" = ( /obj/structure/table, /obj/item/weapon/folder, -/obj/item/weapon/paper/hydroponics, +/obj/item/weapon/paper/guides/jobs/hydroponics, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -5130,11 +5130,7 @@ /area/crew_quarters/fitness/recreation) "ajX" = ( /obj/structure/table, -/obj/item/weapon/paper{ - desc = ""; - info = "Brusies sustained in the holodeck can be healed simply by sleeping."; - name = "Holodeck Disclaimer" - }, +/obj/item/weapon/paper/fluff/holodeck/disclaimer, /obj/item/weapon/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 @@ -9493,11 +9489,7 @@ /obj/item/weapon/razor{ pixel_x = -6 }, -/obj/item/weapon/paper{ - desc = ""; - info = "Labor Camp Facility Operation Guide

Hello there, proud operator of an NT-Sec Prisoner Rehabilitation Center. A solution to rising crime rates and falling productivity, these facilities are specifically designed for the safe, productive imprisonment of your most dangerous criminals.

To press a long-term prisoner into the service of the station, replace his equipment with prisoners' garb at one of the prison lockers, as per normal operating procedure. Before assigning a prisoner his ID, insert the ID into a prisoner management console and assign the prisoner a quota, based on the severity of his crime.
A single sheet of most materials produces five points for the prisoner, and points can be expected to be produced at a rate of about 100 per minute, though punishments as severe as forced labor should be reserved for serious crimes of sentences not less than five minutes long.
Once you have prepared the prisoner, place him in the secure northern half of the labor shuttle, and send him to the station. Once he meets his quota by feeding sheets to the stacker, he will be allowed to return to the station, and will be able to open the secure door to the prisoner release area.

In the case of dangerous prisoners, surveilance may be needed. To that end, there is a prisoner monitoring room on the mining station, equipped with a remote flasher and a lockdown button. The mine itself is patrolled by a securibot, so the nearby security records console can also be used to secure hostile prisoners on the mine."; - name = "Labor Camp Operating Guide" - }, +/obj/item/weapon/paper/guides/jobs/security/labor_camp, /obj/item/weapon/pen, /turf/open/floor/plasteel/black, /area/security/brig) @@ -10079,7 +10071,7 @@ icon_state = "1-8" }, /obj/structure/table, -/obj/item/weapon/paper/gravity_gen{ +/obj/item/weapon/paper/guides/jobs/engi/gravity_gen{ layer = 3 }, /obj/item/weapon/pen/blue, @@ -17557,7 +17549,7 @@ /obj/item/solar_assembly, /obj/item/weapon/circuitboard/computer/solar_control, /obj/item/weapon/electronics/tracker, -/obj/item/weapon/paper/solar, +/obj/item/weapon/paper/guides/jobs/engi/solars, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -23052,7 +23044,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/item/weapon/paper/hydroponics, +/obj/item/weapon/paper/guides/jobs/hydroponics, /obj/item/weapon/coin/silver, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -36470,10 +36462,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/paper{ - info = "Congratulations,

Your station has been selected to carry out the Gateway Project.

The equipment will be shipped to you at the start of the next quarter.
You are to prepare a secure location to house the equipment as outlined in the attached documents.

--Nanotrasen Blue Space Research"; - name = "Confidential Correspondence, Pg 1" - }, +/obj/item/weapon/paper/fluff/gateway, /obj/item/weapon/coin/plasma, /obj/item/weapon/melee/chainofcommand, /turf/open/floor/wood, @@ -47189,7 +47178,7 @@ /area/gateway) "bLB" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet, +/obj/item/weapon/paper/pamphlet/gateway, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -53746,7 +53735,7 @@ network = list("SS13") }, /obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/paper/hydroponics, +/obj/item/weapon/paper/guides/jobs/hydroponics, /obj/machinery/requests_console{ department = "Hydroponics"; departmentType = 2; @@ -54884,7 +54873,7 @@ /area/science/research) "cau" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet, +/obj/item/weapon/paper/pamphlet/gateway, /turf/open/floor/plasteel/whitepurple/side{ dir = 1 }, @@ -56007,7 +55996,7 @@ /obj/structure/table, /obj/item/weapon/book/manual/hydroponics_pod_people, /obj/machinery/light, -/obj/item/weapon/paper/hydroponics, +/obj/item/weapon/paper/guides/jobs/hydroponics, /obj/machinery/camera{ c_tag = "Hydroponics - Foyer"; dir = 1; @@ -68090,7 +68079,7 @@ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/paper/range{ +/obj/item/weapon/paper/guides/jobs/security/range{ pixel_x = 2; pixel_y = 2 }, @@ -69620,7 +69609,7 @@ pixel_x = 6; pixel_y = 4 }, -/obj/item/weapon/paper/morguereminder{ +/obj/item/weapon/paper/guides/jobs/medical/morgue{ pixel_x = -4 }, /obj/effect/landmark/revenantspawn, diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 432d5ae341..4c00524717 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -1099,11 +1099,7 @@ pixel_y = 30 }, /obj/structure/table, -/obj/item/weapon/paper{ - anchored = 0; - info = "A hastily written note has been scribbled here...

Please use the ore redemption machine in the cargo office for smelting. PLEASE!

--The Research Staff"; - name = "URGENT!" - }, +/obj/item/weapon/paper/fluff/stations/lavaland/orm_notice, /turf/open/floor/plasteel, /area/mine/production) "de" = ( diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 8a7311fb5a..d0952a4385 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -23651,7 +23651,7 @@ }, /obj/item/weapon/book/manual/hydroponics_pod_people, /obj/item/weapon/storage/box/syringes, -/obj/item/weapon/paper/hydroponics, +/obj/item/weapon/paper/guides/jobs/hydroponics, /obj/item/toy/figure/botanist, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 9d5192484f..be4b4d2c66 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2154,9 +2154,7 @@ /area/security/prison) "aff" = ( /obj/structure/table, -/obj/item/weapon/paper{ - layer = 2.9 - }, +/obj/item/weapon/paper, /obj/item/weapon/pen, /turf/open/floor/plasteel/floorgrime, /area/security/prison) @@ -5673,11 +5671,7 @@ /obj/item/weapon/razor{ pixel_x = -6 }, -/obj/item/weapon/paper{ - desc = ""; - info = "Labor Camp Facility Operation Guide

Hello there, proud operator of an NT-Sec Prisoner Rehabilitation Center. A solution to rising crime rates and falling productivity, these facilities are specifically designed for the safe, productive imprisonment of your most dangerous criminals.

To press a long-term prisoner into the service of the station, replace his equipment with prisoners' garb at one of the prison lockers, as per normal operating procedure. Before assigning a prisoner his ID, insert the ID into a prisoner management console and assign the prisoner a quota, based on the severity of his crime.
A single sheet of most materials produces five points for the prisoner, and points can be expected to be produced at a rate of about 100 per minute, though punishments as severe as forced labor should be reserved for serious crimes of sentences not less than five minutes long.
Once you have prepared the prisoner, place him in the secure northern half of the labor shuttle, and send him to the station. Once he meets his quota by feeding sheets to the stacker, he will be allowed to return to the station, and will be able to open the secure door to the prisoner release area.

In the case of dangerous prisoners, surveilance may be needed. To that end, there is a prisoner monitoring room on the mining station, equipped with a remote flasher and a lockdown button. The mine itself is patrolled by a securibot, so the nearby security records console can also be used to secure hostile prisoners on the mine."; - name = "Labor Camp Operating Guide" - }, +/obj/item/weapon/paper/guides/jobs/security/labor_camp, /obj/item/weapon/pen, /turf/open/floor/plasteel/black, /area/security/brig) @@ -10101,11 +10095,7 @@ /area/crew_quarters/fitness/recreation) "awd" = ( /obj/structure/table, -/obj/item/weapon/paper{ - desc = ""; - info = "Brusies sustained in the holodeck can be healed simply by sleeping."; - name = "Holodeck Disclaimer" - }, +/obj/item/weapon/paper/fluff/holodeck/disclaimer, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "awe" = ( @@ -10305,10 +10295,7 @@ /obj/item/weapon/stock_parts/cell/potato{ name = "\improper Beepsky's emergency battery" }, -/obj/item/weapon/paper{ - info = "01001001 00100000 01101000 01101111 01110000 01100101 00100000 01111001 01101111 01110101 00100000 01110011 01110100 01100001 01111001 00100000 01110011 01100001 01100110 01100101 00101110 00100000 01001100 01101111 01110110 01100101 00101100 00100000 01101101 01101111 01101101 00101110"; - name = "Note from Beepsky's Mom" - }, +/obj/item/weapon/paper/fluff/jobs/security/beepsky_mom, /turf/open/floor/plating, /area/maintenance/department/security/brig) "awy" = ( @@ -18272,7 +18259,7 @@ "aNO" = ( /obj/structure/table, /obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/paper/hydroponics, +/obj/item/weapon/paper/guides/jobs/hydroponics, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/glass/bottle/mutagen, /obj/item/weapon/reagent_containers/dropper, @@ -40231,7 +40218,7 @@ pixel_y = 1 }, /obj/structure/table, -/obj/item/weapon/paper/gravity_gen{ +/obj/item/weapon/paper/guides/jobs/engi/gravity_gen{ layer = 3 }, /obj/item/weapon/pen/blue, @@ -40355,7 +40342,7 @@ /obj/item/solar_assembly, /obj/item/weapon/circuitboard/computer/solar_control, /obj/item/weapon/electronics/tracker, -/obj/item/weapon/paper/solar, +/obj/item/weapon/paper/guides/jobs/engi/solars, /obj/machinery/power/apc{ dir = 2; name = "Tech Storage APC"; diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm.rej b/_maps/map_files/PubbyStation/PubbyStation.dmm.rej index 80fa973d0a..e4945f57e3 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm.rej +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm.rej @@ -210,4 +210,4 @@ diff a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStat + network = list("Telecomms") }, /turf/open/space, - /area/space) + /area/space) \ No newline at end of file diff --git a/_maps/map_files/generic/Centcomm.dmm b/_maps/map_files/generic/Centcomm.dmm index 8e3d678469..fe6fcad6e2 100644 --- a/_maps/map_files/generic/Centcomm.dmm +++ b/_maps/map_files/generic/Centcomm.dmm @@ -1397,7 +1397,7 @@ icon = 'icons/obj/machines/particle_accelerator.dmi'; icon_state = "control_boxp"; name = "Kobayashi Maru control computer"; - prizes = list(/obj/item/weapon/paper/trek_diploma = 1); + prizes = list(/obj/item/weapon/paper/fluff/holodeck/trek_diploma = 1); settlers = list("Kirk","Worf","Gene") }, /turf/open/floor/holofloor/plating, @@ -1423,7 +1423,7 @@ icon = 'icons/obj/machines/particle_accelerator.dmi'; icon_state = "control_boxp"; name = "Kobayashi Maru control computer"; - prizes = list(/obj/item/weapon/paper/trek_diploma = 1); + prizes = list(/obj/item/weapon/paper/fluff/holodeck/trek_diploma = 1); settlers = list("Kirk","Worf","Gene") }, /turf/open/floor/holofloor/plating, @@ -1438,7 +1438,7 @@ icon = 'icons/obj/machines/particle_accelerator.dmi'; icon_state = "control_boxp"; name = "Kobayashi Maru control computer"; - prizes = list(/obj/item/weapon/paper/trek_diploma = 1); + prizes = list(/obj/item/weapon/paper/fluff/holodeck/trek_diploma = 1); settlers = list("Kirk","Worf","Gene") }, /turf/open/floor/holofloor/plating, @@ -1918,7 +1918,7 @@ }, /area/holodeck/rec_center/firingrange) "ft" = ( -/obj/item/weapon/paper/range, +/obj/item/weapon/paper/guides/jobs/security/range, /turf/open/floor/holofloor, /area/holodeck/rec_center/firingrange) "fu" = ( @@ -4669,9 +4669,9 @@ }, /area/centcom/control) "mQ" = ( -/obj/item/weapon/paper/pamphlet/ccaInfo, -/obj/item/weapon/paper/pamphlet/ccaInfo, -/obj/item/weapon/paper/pamphlet/ccaInfo, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ dir = 8 @@ -4946,9 +4946,9 @@ /area/centcom/control) "ny" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/ccaInfo, -/obj/item/weapon/paper/pamphlet/ccaInfo, -/obj/item/weapon/paper/pamphlet/ccaInfo, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/centcom/control) @@ -5809,10 +5809,7 @@ /turf/open/floor/engine/cult, /area/wizard_station) "pz" = ( -/obj/item/weapon/paper{ - info = "GET DAT FUKKEN DISK"; - name = "memo" - }, +/obj/item/weapon/paper/fluff/stations/centcom/disk_memo, /obj/structure/noticeboard{ pixel_x = -32 }, @@ -7600,9 +7597,9 @@ /area/centcom/control) "tD" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/ccaInfo, -/obj/item/weapon/paper/pamphlet/ccaInfo, -/obj/item/weapon/paper/pamphlet/ccaInfo, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, /obj/machinery/light{ dir = 8 }, @@ -9495,9 +9492,9 @@ /area/centcom/control) "yy" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/ccaInfo, -/obj/item/weapon/paper/pamphlet/ccaInfo, -/obj/item/weapon/paper/pamphlet/ccaInfo, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, /obj/machinery/light{ dir = 1 }, @@ -10150,7 +10147,7 @@ "Af" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/paper/pamphlet/ccaInfo, +/obj/item/weapon/paper/pamphlet/centcom/visitor_info, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) @@ -12152,9 +12149,7 @@ /area/shuttle/escape) "Fp" = ( /obj/structure/table/wood, -/obj/item/weapon/paper{ - info = "Due to circumstances beyond our control, your Emergency Evacuation Shuttle is out of service.

We apologise for the inconvinience this may cause you.

Please enjoy the use of this complementary book.

Sincerely,
Centcom Operations Demolitions Examination Retribution Bugfixing Underlining Services" - }, +/obj/item/weapon/paper/fluff/stations/centcom/broken_evac, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "Fq" = ( @@ -12656,7 +12651,7 @@ /area/abductor_ship) "GS" = ( /obj/item/weapon/surgical_drapes, -/obj/item/weapon/paper/abductor, +/obj/item/weapon/paper/guides/antag/abductor, /obj/item/weapon/scalpel/alien, /obj/structure/table/abductor, /obj/item/weapon/cautery/alien, diff --git a/_maps/shuttles/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency_imfedupwiththisworld.dmm index bc3f87c187..3aaa1e5de3 100644 --- a/_maps/shuttles/emergency_imfedupwiththisworld.dmm +++ b/_maps/shuttles/emergency_imfedupwiththisworld.dmm @@ -126,9 +126,7 @@ "x" = ( /obj/structure/bed, /obj/item/weapon/bedsheet/red, -/obj/item/weapon/paper{ - info = "i love daniel
daniel is my best friend

you are tearing me apart elise" - }, +/obj/item/weapon/paper/fluff/shuttles/daniel, /turf/open/floor/carpet, /area/shuttle/escape) "y" = ( diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index d6265a8f75..e84eedf91a 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -298,7 +298,7 @@ origin_tech = "combat=4;magnets=7;powerstorage=3;abductor=3" trigger_guard = TRIGGER_GUARD_ALLOW_ALL -/obj/item/weapon/paper/abductor +/obj/item/weapon/paper/guides/antag/abductor name = "Dissection Guide" icon_state = "alienpaper_words" info = {"Dissection for Dummies
@@ -320,10 +320,10 @@
Congratulations! You are now trained for invasive xenobiology research!"} -/obj/item/weapon/paper/abductor/update_icon() +/obj/item/weapon/paper/guides/antag/abductor/update_icon() return -/obj/item/weapon/paper/abductor/AltClick() +/obj/item/weapon/paper/guides/antag/abductor/AltClick() return #define BATON_STUN 0 diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index d98878b352..69c26cdb43 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -376,7 +376,7 @@ /datum/spellbook_entry/item/guardian/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) . = ..() if(.) - new /obj/item/weapon/paper/guardian/wizard(get_turf(user)) + new /obj/item/weapon/paper/guides/antag/guardian/wizard(get_turf(user)) /datum/spellbook_entry/item/bloodbottle name = "Bottle of Blood" diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 811e90603e..06c4cce2bc 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -483,7 +483,7 @@ * Manual -- A big ol' manual. */ -/obj/item/weapon/paper/Cloning +/obj/item/weapon/paper/guides/jobs/medical/cloning name = "paper - 'H-87 Cloning Apparatus Manual" info = {"

Getting Started

Congratulations, your station has purchased the H-87 industrial cloning device!
diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index 5b1eb0548c..b05ecdea70 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -150,3 +150,8 @@ else if(!isobserver(ROI)) continue do_teleport(ROI, get_turf(linked_pad)) + + +/obj/item/weapon/paper/guides/quantumpad + name = "Quantum Pad For Dummies" + info = "
Dummies Guide To Quantum Pads


Do you hate the concept of having to use your legs, let alone walk to places? Well, with the Quantum Pad (tm), never again will the fear of cardio keep you from going places!

How to set up your Quantum Pad(tm)


1.Unscrew the Quantum Pad(tm) you wish to link.
2. Use your multi-tool to cache the buffer of the Quantum Pad(tm) you wish to link.
3. Apply the multi-tool to the secondary Quantum Pad(tm) you wish to link to the first Quantum Pad(tm)

If you followed these instructions carefully, your Quantum Pad(tm) should now be properly linked together for near-instant movement across the station! Bear in mind that this is technically a one-way teleport, so you'll need to do the same process with the secondary pad to the first one if you wish to travel between both.
" diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 1c3ba36028..f853407df8 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -198,7 +198,7 @@ crush_damage = 120 flags = NODECONSTRUCT -/obj/item/weapon/paper/recycler +/obj/item/weapon/paper/guides/recycler name = "paper - 'garbage duty instructions'" info = "

New Assignment

You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.

There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!" diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index a51dd403a0..9705dadb1c 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -86,7 +86,7 @@ toolspeed = 0.5 random_color = FALSE -/obj/item/weapon/paper/nuke_instructions +/obj/item/weapon/paper/guides/antag/nuke_instructions info = "How to break into a Nanotrasen self-destruct terminal and remove its plutonium core:
\