The station has been evacuated.
The station is currently undergoing evacuation procedures.
"
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index be09fdadd38..8eb7af7db8f 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -58,7 +58,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
set_broken()
if(main_part)
qdel(main_part)
- ..()
+ return ..()
//
// Part generator which is mostly there for looks
@@ -126,7 +126,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
for(var/obj/machinery/gravity_generator/part/O in parts)
O.main_part = null
qdel(O)
- ..()
+ return ..()
/obj/machinery/gravity_generator/main/proc/setup_parts()
var/turf/our_turf = get_turf(src)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 145f2b2ba84..828f9b4e09f 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -11,61 +11,20 @@
-/obj/item/light_fixture_frame
+/obj/item/wallframe/light_fixture
name = "light fixture frame"
desc = "Used for building lights."
icon = 'icons/obj/lighting.dmi'
icon_state = "tube-construct-item"
- flags = CONDUCT
- var/fixture_type = "tube"
- var/obj/machinery/light/newlight = null
- var/sheets_refunded = 2
+ result_path = /obj/machinery/light_construct
+ inverse = 1
-/obj/item/light_fixture_frame/attackby(obj/item/weapon/W, mob/user, params)
- if (istype(W, /obj/item/weapon/wrench))
- new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
- qdel(src)
- return
- ..()
-
-/obj/item/light_fixture_frame/proc/try_build(turf/on_wall)
- if (get_dist(on_wall,usr)>1)
- return
- var/ndir = get_dir(usr,on_wall)
- if (!(ndir in cardinal))
- return
- var/turf/loc = get_turf(usr)
- if (!istype(loc, /turf/simulated/floor))
- usr << "
[src.name] cannot be placed on this spot!"
- return
- usr << "
You begin attaching [src] to the wall..."
- playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
- var/constrdir = usr.dir
- var/constrloc = usr.loc
- if (!do_after(usr, 30, target = src))
- return
- switch(fixture_type)
- if("bulb")
- newlight = new /obj/machinery/light_construct/small(constrloc)
- if("tube")
- newlight = new /obj/machinery/light_construct(constrloc)
- newlight.dir = constrdir
- newlight.fingerprints = src.fingerprints
- newlight.fingerprintshidden = src.fingerprintshidden
- newlight.fingerprintslast = src.fingerprintslast
-
- usr.visible_message("[usr.name] attaches [src] to the wall.", \
- "
You attach [src] to the wall.")
- qdel(src)
-
-/obj/item/light_fixture_frame/small
+/obj/item/wallframe/light_fixture/small
name = "small light fixture frame"
- desc = "Used for building small lights."
- icon = 'icons/obj/lighting.dmi'
icon_state = "bulb-construct-item"
- flags = CONDUCT
- fixture_type = "bulb"
- sheets_refunded = 1
+ result_path = /obj/machinery/light_construct/small
+ materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)
+
/obj/machinery/light_construct
name = "light fixture frame"
@@ -79,10 +38,10 @@
var/sheets_refunded = 2
var/obj/machinery/light/newlight = null
-/obj/machinery/light_construct/New()
+/obj/machinery/light_construct/New(loc, ndir, building)
..()
- if (fixture_type == "bulb")
- icon_state = "bulb-construct-stage1"
+ if(building)
+ dir = ndir
/obj/machinery/light_construct/examine(mob/user)
..()
@@ -172,12 +131,7 @@
/obj/machinery/light_construct/small
name = "small light fixture frame"
- desc = "A small light fixture under construction."
- icon = 'icons/obj/lighting.dmi'
icon_state = "bulb-construct-stage1"
- anchored = 1
- layer = 5
- stage = 1
fixture_type = "bulb"
sheets_refunded = 1
@@ -254,7 +208,7 @@
if(A)
on = 0
// A.update_lights()
- ..()
+ return ..()
/obj/machinery/light/update_icon()
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 37a75156cc8..f15b2385247 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -119,7 +119,7 @@ display round(lastgen) and plasmatank amount
/obj/machinery/power/port_gen/pacman/Destroy()
DropFuel()
- ..()
+ return ..()
/obj/machinery/power/port_gen/pacman/RefreshParts()
var/temp_rating = 0
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 1fbca84583c..b5a229778af 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -17,7 +17,7 @@
/obj/machinery/power/Destroy()
disconnect_from_network()
- ..()
+ return ..()
///////////////////////////////
// General procedures
diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm
index 0ad877f987d..f8e8826294d 100644
--- a/code/modules/power/powernet.dm
+++ b/code/modules/power/powernet.dm
@@ -26,6 +26,7 @@
M.powernet = null
SSmachine.powernets -= src
+ return ..()
/datum/powernet/proc/is_empty()
return !cables.len && !nodes.len
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 3687d237bd2..aab80c9e97f 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -22,7 +22,7 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/Destroy()
rad_collectors -= src
- ..()
+ return ..()
/obj/machinery/power/rad_collector/process()
if(P)
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 08278a00ea7..7fc737afb46 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -19,7 +19,7 @@
FG1.cleanup()
if(FG2 && !FG2.clean_up)
FG2.cleanup()
- ..()
+ return ..()
/obj/machinery/field/containment/attack_hand(mob/user)
if(get_dist(src, user) > 1)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index a054fece023..7cde13702a2 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -70,7 +70,7 @@
message_admins("Emitter deleted at ([x],[y],[z] -
JMP)",0,1)
log_game("Emitter deleted at ([x],[y],[z])")
investigate_log("
deleted at ([x],[y],[z])","singulo")
- ..()
+ return ..()
/obj/machinery/power/emitter/update_icon()
if (active && powernet && avail(active_power_usage))
@@ -181,7 +181,8 @@
user << "
Turn off \the [src] first!"
return
switch(state)
- if(0 && !isinspace())
+ if(0)
+ if(isinspace()) return
state = 1
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] secures [src.name] to the floor.", \
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 550567bca53..857741045c9 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -100,7 +100,8 @@ field_generator power level display
return
else if(istype(W, /obj/item/weapon/wrench))
switch(state)
- if(0 && !isinspace())
+ if(0)
+ if(isinspace()) return
state = 1
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] secures [src.name] to the floor.", \
@@ -171,7 +172,7 @@ field_generator power level display
/obj/machinery/field/generator/Destroy()
src.cleanup()
- ..()
+ return ..()
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index 18a04d16f32..8030486fcd0 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -75,7 +75,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
construction_state = 0
if(master)
master.part_scan()
- ..()
+ return ..()
/obj/structure/particle_accelerator/end_cap
name = "Alpha Particle Generation Array"
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 61fd8dbe424..228dd2789d8 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -29,7 +29,9 @@
/obj/machinery/particle_accelerator/control_box/Destroy()
if(active)
toggle_power()
- ..()
+ qdel(wires)
+ wires = null
+ return ..()
/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user)
if(construction_state >= 3)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index ce2e87d82da..5d5b6d42153 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -42,7 +42,7 @@
/obj/singularity/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/singularity/Move(atom/newloc, direct)
if(current_size >= STAGE_FIVE || check_turfs_in(direct))
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 3bc6dbcfc36..2a402459d1b 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -159,6 +159,9 @@
//crowbarring it !
default_deconstruction_crowbar(I)
+ message_admins("[src] has been deconstructed by [key_name_admin(user)](
?) (
FLW) in ([x],[y],[z] -
JMP)",0,1)
+ log_game("[src] has been deconstructed by [key_name(user)]")
+ investigate_log("SMES deconstructed by [key_name(user)]","singulo")
/obj/machinery/power/smes/Destroy()
if(ticker && ticker.current_state == GAME_STATE_PLAYING)
@@ -168,7 +171,7 @@
investigate_log("
deleted at ([area.name])","singulo")
if(terminal)
disconnect_terminal()
- ..()
+ return ..()
// create a terminal object pointing towards the SMES
// wires will attach to this
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index ab650dfa411..cbc325ef706 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -27,7 +27,7 @@
/obj/machinery/power/solar/Destroy()
unset_control() //remove from control computer
- ..()
+ return ..()
//set the control of the panel to a given computer if closer than SOLAR_MAX_DIST
/obj/machinery/power/solar/proc/set_control(obj/machinery/power/solar_control/SC)
@@ -255,7 +255,7 @@
return 1
if(!tracker)
- if(istype(W, /obj/item/weapon/tracker_electronics))
+ if(istype(W, /obj/item/weapon/electronics/tracker))
if(!user.drop_item())
return
tracker = 1
@@ -264,7 +264,7 @@
return 1
else
if(istype(W, /obj/item/weapon/crowbar))
- new /obj/item/weapon/tracker_electronics(src.loc)
+ new /obj/item/weapon/electronics/tracker(src.loc)
tracker = 0
user.visible_message("[user] takes out the electronics from the solar assembly.", "
You take out the electronics from the solar assembly.")
return 1
@@ -308,7 +308,7 @@
M.unset_control()
if(connected_tracker)
connected_tracker.unset_control()
- ..()
+ return ..()
/obj/machinery/power/solar_control/disconnect_from_network()
..()
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index b2771ae6d4f..874b2ca1733 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -23,7 +23,7 @@
/obj/machinery/power/tracker/Destroy()
unset_control() //remove from control computer
- ..()
+ return ..()
//set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST
/obj/machinery/power/tracker/proc/set_control(obj/machinery/power/solar_control/SC)
@@ -76,9 +76,5 @@
// Tracker Electronic
-/obj/item/weapon/tracker_electronics
-
- name = "tracker electronics"
- icon = 'icons/obj/doors/door_assembly.dmi'
- icon_state = "door_electronics"
- w_class = 2.0
\ No newline at end of file
+/obj/item/weapon/electronics/tracker
+ name = "tracker electronics"
\ No newline at end of file
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index c7bf249a611..d0fe04ce0a0 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -81,10 +81,12 @@
gas_contained = new
inturf = get_step(src, dir)
- spawn(5)
- locate_machinery()
- if(!turbine)
- stat |= BROKEN
+
+/obj/machinery/power/compressor/initialize()
+ ..()
+ locate_machinery()
+ if(!turbine)
+ stat |= BROKEN
#define COMPFRICTION 5e5
@@ -200,22 +202,12 @@
outturf = get_step(src, dir)
- spawn(5)
-// compressor is found in the opposite direction
-
- locate_machinery()
- if(!compressor)
- stat |= BROKEN
-
-
-// THIS MAKES IT WORK!!!!!
-
-// OLD FIX . Dunno how other engines handle this but this is how it should work: Turbine and compressor should be
-// treated as walls to avoid conductivity and gas spread. This was the problem of the original turbine which was just
-// a machinery - it didn't block the gas passage.
-// /obj/machinery/power/turbine/CanPass(atom/movable/mover, turf/target, height=0)
-// return !density
+/obj/machinery/power/turbine/initialize()
+ ..()
+ locate_machinery()
+ if(!compressor)
+ stat |= BROKEN
/obj/machinery/power/turbine/RefreshParts()
var/P = 0
@@ -350,13 +342,13 @@
-/obj/machinery/computer/turbine_computer/New()
+/obj/machinery/computer/turbine_computer/initialize()
..()
- spawn(5)
+ spawn(10)
locate_machinery()
/obj/machinery/computer/turbine_computer/locate_machinery()
- compressor = locate(/obj/machinery/power/compressor) in range(5)
+ compressor = locate(/obj/machinery/power/compressor) in range(5, src)
/obj/machinery/computer/turbine_computer/attack_hand(var/mob/user as mob)
if(..())
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index f6b625d1169..86ce5ad77dc 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -18,13 +18,14 @@
needs_permit = 0
/obj/item/weapon/gun/energy/laser/retro
- name ="retro laser"
+ name ="retro laser gun"
icon_state = "retro"
desc = "An older model of the basic lasergun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
ammo_x_offset = 3
/obj/item/weapon/gun/energy/laser/captain
+ name = "\improper QSJ 01 Premium laser pistol"
icon_state = "caplaser"
item_state = "caplaser"
desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
@@ -40,7 +41,7 @@
/obj/item/weapon/gun/energy/laser/captain/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/gun/energy/laser/captain/process()
@@ -122,7 +123,7 @@
/obj/item/weapon/gun/energy/laser/bluetag/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/gun/energy/laser/bluetag/process()
charge_tick++
@@ -154,7 +155,7 @@
/obj/item/weapon/gun/energy/laser/redtag/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/gun/energy/laser/redtag/process()
charge_tick++
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 89c73331581..941699010c2 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -16,6 +16,7 @@
update_icon()
/obj/item/weapon/gun/energy/gun/hos
+ name = "\improper X-01 MultiPhase Energy Gun"
desc = "This is a expensive, modern recreation of a antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
icon_state = "hoslaser"
force = 10
@@ -23,7 +24,7 @@
ammo_x_offset = 4
/obj/item/weapon/gun/energy/gun/dragnet
- name = "DRAGnet"
+ name = "\improper DRAGnet"
desc = "The \"Dynamic Rapid-Apprehension of the Guilty\" net is a revolution in law enforcement technology."
icon_state = "dragnet"
origin_tech = "combat=3;magnets=3;materials=4; bluespace=4"
@@ -64,7 +65,7 @@
/obj/item/weapon/gun/energy/gun/nuclear/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/gun/energy/gun/nuclear/process()
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 1401c31937a..faea41888db 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -61,7 +61,7 @@
/obj/item/weapon/gun/energy/floragun/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/gun/energy/floragun/process()
@@ -97,7 +97,7 @@
/obj/item/weapon/gun/energy/meteorgun/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/gun/energy/meteorgun/process()
charge_tick++
@@ -122,7 +122,7 @@
/obj/item/weapon/gun/energy/mindflayer
- name = "mind flayer"
+ name = "\improper Mind Flayer"
desc = "A prototype weapon recovered from the ruins of Research-Station Epsilon."
icon_state = "xray"
ammo_type = list(/obj/item/ammo_casing/energy/mindflayer)
@@ -301,7 +301,7 @@
/obj/item/weapon/gun/energy/printer/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/gun/energy/printer/process()
charge_tick++
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 6659fe329cd..acd06b2eda3 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -38,7 +38,7 @@
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
charge_tick++
@@ -78,7 +78,7 @@
/obj/item/weapon/gun/energy/disabler/cyborg/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/gun/energy/disabler/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
charge_tick++
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 645d078002e..af800ecefb7 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -56,7 +56,7 @@
/obj/item/weapon/gun/magic/Destroy()
if(can_charge) SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/gun/magic/process()
@@ -74,6 +74,6 @@
return
/obj/item/weapon/gun/magic/suicide_act(mob/user)
- user.visible_message("
[user] is casting a spell on themself with the [src.name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("
[user] is twisting the [src.name] above \his head, releasing a magical blast! It looks like \he's trying to commit suicide.")
playsound(loc, fire_sound, 50, 1, -1)
return (FIRELOSS)
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 8b1aaecd735..1f9910f1dd2 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -9,7 +9,7 @@
action_button_name = "Toggle Firemode"
/obj/item/weapon/gun/projectile/automatic/proto
- name = "prototype SMG"
+ name = "\improper NanoTrasen Saber SMG"
desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
icon_state = "saber"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
@@ -80,7 +80,7 @@
return
/obj/item/weapon/gun/projectile/automatic/c20r
- name = "syndicate SMG"
+ name = "\improper C-20r SMG"
desc = "A bullpup two-round burst .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
icon_state = "c20r"
item_state = "c20r"
@@ -110,7 +110,7 @@
return
/obj/item/weapon/gun/projectile/automatic/mini_uzi
- name = "uzi"
+ name = "\improper 'Type U3' Uzi"
desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds."
icon_state = "mini-uzi"
origin_tech = "combat=5;materials=2;syndicate=8"
@@ -118,7 +118,7 @@
burst_size = 2
/obj/item/weapon/gun/projectile/automatic/l6_saw
- name = "syndicate LMG"
+ name = "\improper L6 SAW LMG"
desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
icon_state = "l6closed100"
item_state = "l6closedmag"
@@ -178,7 +178,7 @@
..()
/obj/item/weapon/gun/projectile/automatic/m90
- name = "syndicate carbine"
+ name = "\improper M-90gl Carbine"
desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
icon_state = "m90"
item_state = "m90"
@@ -252,7 +252,7 @@
return
/obj/item/weapon/gun/projectile/automatic/tommygun
- name = "thompson SMG"
+ name = "\improper Thompson SMG"
desc = "Based on the classic 'Chicago Typewriter'."
icon_state = "tommygun"
item_state = "shotgun"
@@ -266,7 +266,7 @@
fire_delay = 1
/obj/item/weapon/gun/projectile/automatic/ar
- name = "ARG"
+ name = "\improper NT-ARG 'Boarder'"
desc = "A robust assault rile used by Nanotrasen fighting forces."
icon_state = "arg"
item_state = "arg"
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 506f51e306c..a3cd08ccfaa 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -30,7 +30,7 @@
return
/obj/item/weapon/gun/projectile/automatic/gyropistol
- name = "gyrojet pistol"
+ name = "\improper Gyrojet rocket pistol"
desc = "A prototype pistol designed to fire self propelled rockets."
icon_state = "gyropistol"
fire_sound = 'sound/weapons/grenadelaunch.ogg'
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 7e3635defc1..97fbda944f3 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -1,5 +1,5 @@
/obj/item/weapon/gun/projectile/automatic/pistol
- name = "syndicate pistol"
+ name = "\improper FK-69 pistol"
desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
icon_state = "pistol"
w_class = 2
@@ -16,7 +16,7 @@
return
/obj/item/weapon/gun/projectile/automatic/pistol/m1911
- name = "M1911 pistol"
+ name = "\improper M1911 pistol"
desc = "A classic .45 handgun with a small magazine capacity."
icon_state = "m1911"
w_class = 3
@@ -24,7 +24,7 @@
can_suppress = 0
/obj/item/weapon/gun/projectile/automatic/pistol/deagle
- name = "desert eagle"
+ name = "\improper Desert Eagle pistol"
desc = "A robust .50 AE handgun."
icon_state = "deagle"
force = 14
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 1a9c2fdd071..86df409121b 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -1,5 +1,5 @@
/obj/item/weapon/gun/projectile/revolver
- name = "revolver"
+ name = "\improper .357 revolver"
desc = "A suspicious revolver. Uses .357 ammo." //usually used by syndicates
icon_state = "revolver"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder
@@ -57,6 +57,7 @@
user << "[get_ammo(0,0)] of those are live rounds."
/obj/item/weapon/gun/projectile/revolver/detective
+ name = "\improper .38 Mars Special"
desc = "A cheap Martian knock-off of a classic law enforcement firearm. Uses .38-special rounds."
icon_state = "detective"
origin_tech = "combat=2;materials=2"
@@ -115,8 +116,8 @@
/obj/item/weapon/gun/projectile/revolver/mateba
- name = "autorevolver"
- desc = "A retro high-powered mateba autorevolver typically used by officers of the New Russia military. Uses .357 ammo."
+ name = "\improper Unica 6 auto-revolver"
+ desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo."
icon_state = "mateba"
origin_tech = "combat=2;materials=2"
@@ -125,7 +126,7 @@
// You can spin the chamber to randomize the position of the bullet.
/obj/item/weapon/gun/projectile/revolver/russian
- name = "russian revolver"
+ name = "\improper russian revolver"
desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism requiring you to spin the chamber before each trigger pull."
origin_tech = "combat=2;materials=2"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index cc253a9e66e..18ed36b8016 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -85,8 +85,8 @@
///////////////////////
/obj/item/weapon/gun/projectile/shotgun/boltaction
- name = "bolt action rifle"
- desc = "This piece of junk looks like something that could have been used 700 years ago."
+ name = "\improper Mosin Nagant rifle"
+ desc = "This piece of junk looks like something that could have been used 700 years ago. It feels slightly moist."
icon_state = "moistnugget"
item_state = "moistnugget"
slot_flags = 0 //no SLOT_BACK sprite, alas
@@ -248,7 +248,7 @@
// Bulldog shotgun //
/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
- name = "syndicate shotgun"
+ name = "\improper MLG-12 'Bulldog' Shotgun"
desc = "A semi-auto, mag-fed shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
icon_state = "bulldog"
item_state = "bulldog"
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 5c891b9fae0..3fb86384fbb 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -202,7 +202,7 @@
if("parrot") new_mob = new /mob/living/simple_animal/parrot(M.loc)
if("corgi") new_mob = new /mob/living/simple_animal/pet/dog/corgi(M.loc)
if("crab") new_mob = new /mob/living/simple_animal/crab(M.loc)
- if("pug") new_mob = new /mob/living/simple_animal/pet/pug(M.loc)
+ if("pug") new_mob = new /mob/living/simple_animal/pet/dog/pug(M.loc)
if("cat") new_mob = new /mob/living/simple_animal/pet/cat(M.loc)
if("mouse") new_mob = new /mob/living/simple_animal/mouse(M.loc)
if("chicken") new_mob = new /mob/living/simple_animal/chicken(M.loc)
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 56a077bbfa0..02c818cdbf2 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -54,7 +54,7 @@ var/const/PATCH = 4 //patches
break // Don't bother adding ourselves to other reagent ids, it is redundant.
/datum/reagents/Destroy()
- ..()
+ . = ..()
SSobj.processing.Remove(src)
for(var/datum/reagent/R in reagent_list)
qdel(R)
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index dad745e7936..5ea96e0218f 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -4,10 +4,6 @@
#define REM REAGENTS_EFFECT_MULTIPLIER
-//The reaction procs must ALWAYS set src = null, this detaches the proc from the object (the reagent)
-//so that it can continue working when the reagent is deleted while the proc is still active.
-
-
//Various reagents
//Toxin & acid reagents
//Hydroponics stuff
@@ -31,29 +27,24 @@
var/overdosed = 0 // You fucked up and this is now triggering its overdose effects, purge that shit quick.
/datum/reagent/Destroy() // This should only be called by the holder, so it's already handled clearing its references
- ..()
+ . = ..()
holder = null
/datum/reagent/proc/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(!istype(M))
return 0
- var/datum/reagent/self = src
- src = null
-
if(method == VAPOR) //smoke, foam, spray
if(M.reagents)
var/modifier = Clamp((1 - touch_protection), 0, 1)
var/amount = round(reac_volume*modifier, 0.1)
if(amount >= 1)
- M.reagents.add_reagent(self.id, amount)
+ M.reagents.add_reagent(id, amount)
return 1
/datum/reagent/proc/reaction_obj(obj/O, volume)
- src = null
return
/datum/reagent/proc/reaction_turf(turf/T, volume)
- src = null
return
/datum/reagent/proc/on_mob_life(mob/living/M)
@@ -117,3 +108,10 @@
M << "
You're not feeling good at all! You really need some [name]."
return
+/proc/pretty_string_from_reagent_list(var/list/reagent_list)
+ //Convert reagent list to a printable string for logging etc
+ var/result = "| "
+ for (var/datum/reagent/R in reagent_list)
+ result += "[R.name], [R.volume] | "
+
+ return result
diff --git a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
index 6265d0cb858..a6bb05181a7 100644
--- a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
@@ -1,18 +1,32 @@
// These can only be applied by blobs. They are what blobs are made out of.
// The 4 damage
/datum/reagent/blob
+ description = ""
var/message = "The blob strikes you" //message sent to any mob hit by the blob
var/message_living = null //extension to first mob sent to only living mobs i.e. silicons have no skin to be burnt
/datum/reagent/blob/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection)
return round(reac_volume * min(1.5 - touch_protection, 1), 0.1) //full touch protection means 50% volume, any prot below 0.5 means 100% volume.
-/datum/reagent/blob/boiling_oil
+/datum/reagent/blob/ripping_tendrils //does brute and a little stamina damage
+ name = "Ripping Tendrils"
+ id = "ripping_tendrils"
+ color = "#7F0000"
+ message_living = ", and you feel your skin ripping and tearing off"
+
+/datum/reagent/blob/ripping_tendrils/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ reac_volume = ..()
+ M.apply_damage(0.6*reac_volume, BRUTE)
+ M.adjustStaminaLoss(0.4*reac_volume)
+ if(iscarbon(M))
+ M.emote("scream")
+
+/datum/reagent/blob/boiling_oil //sets you on fire, does burn damage
name = "Boiling Oil"
id = "boiling_oil"
- description = ""
color = "#B68D00"
message = "The blob splashes you with burning oil"
+ message_living = ", and you feel your skin char and melt"
/datum/reagent/blob/boiling_oil/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
M.adjust_fire_stacks(round(reac_volume/12))
@@ -22,86 +36,57 @@
if(iscarbon(M))
M.emote("scream")
-/datum/reagent/blob/toxic_goop
- name = "Toxic Goop"
- id = "toxic_goop"
- description = ""
- color = "#008000"
+/datum/reagent/blob/envenomed_filaments //toxin, hallucination, and some bonus spore toxin
+ name = "Envenomed Filaments"
+ id = "envenomed_filaments"
+ color = "#9ACD32"
message_living = ", and you feel sick and nauseated"
-/datum/reagent/blob/toxic_goop/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+/datum/reagent/blob/envenomed_filaments/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
reac_volume = ..()
- M.apply_damage(0.8*reac_volume, TOX)
+ M.apply_damage(0.6*reac_volume, TOX)
+ M.hallucination += 0.6*reac_volume
+ M.reagents.add_reagent("spore", 0.4*reac_volume)
-/datum/reagent/blob/skin_ripper
- name = "Skin Ripper"
- id = "skin_ripper"
- description = ""
- color = "#FF4C4C"
- message_living = ", and you feel your skin ripping and tearing off"
-
-/datum/reagent/blob/skin_ripper/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- reac_volume = ..()
- M.apply_damage(0.8*reac_volume, BRUTE)
- if(iscarbon(M))
- M.emote("scream")
-
-// Combo Reagents
-
-/datum/reagent/blob/skin_melter
- name = "Skin Melter"
- id = "skin_melter"
- description = ""
- color = "#7F0000"
- message_living = ", and you feel your skin char and melt"
-
-/datum/reagent/blob/skin_melter/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- M.adjust_fire_stacks(round(reac_volume/12))
- reac_volume = ..()
- M.apply_damage(0.4*reac_volume, BRUTE)
- M.apply_damage(0.4*reac_volume, BURN)
- M.IgniteMob()
- if(iscarbon(M))
- M.emote("scream")
-
-/datum/reagent/blob/lung_destroying_toxin
- name = "Lung Destroying Toxin"
- id = "lung_destroying_toxin"
- description = ""
+/datum/reagent/blob/lexorin_jelly //does tons of oxygen damage and a little brute
+ name = "Lexorin Jelly"
+ id = "lexorin_jelly"
color = "#00FFC5"
message_living = ", and your lungs feel heavy and weak"
-/datum/reagent/blob/lung_destroying_toxin/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- reac_volume = ..()
- M.apply_damage(0.8* reac_volume, OXY)
- M.losebreath += round(0.6*reac_volume)
- M.apply_damage(0.8*reac_volume, TOX)
-
-// Special Reagents
-
-/datum/reagent/blob/radioactive_liquid
- name = "Radioactive Liquid"
- id = "radioactive_liquid"
- description = ""
- color = "#00EE00"
- message_living = ", and your skin feels papery and everything hurts"
-
-/datum/reagent/blob/radioactive_liquid/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+/datum/reagent/blob/lexorin_jelly/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
reac_volume = ..()
M.apply_damage(0.4*reac_volume, BRUTE)
- if(ishuman(M))
- M.irradiate(1.6*reac_volume)
- if(prob(1.3*reac_volume))
- randmuti(M)
- if(prob(98))
- randmutb(M)
- domutcheck(M, null)
- updateappearance(M)
+ M.apply_damage(1*reac_volume, OXY)
+ M.losebreath += round(0.3*reac_volume)
-/datum/reagent/blob/dark_matter
+/datum/reagent/blob/kinetic //does semi-random brute damage
+ name = "Kinetic Gelatin"
+ id = "kinetic"
+ color = "#FFA500"
+ message = "The blob pummels you"
+
+/datum/reagent/blob/kinetic/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ reac_volume = ..()
+ var/damage = rand(5, 35)/25
+ M.apply_damage(damage*reac_volume, BRUTE)
+
+/datum/reagent/blob/cryogenic_liquid //does low burn damage and stamina damage and cools targets down
+ name = "Cryogenic Liquid"
+ id = "cryogenic_liquid"
+ color = "#8BA6E9"
+ message = "The blob splashes you with an icy liquid"
+ message_living = ", and you feel cold and tired"
+
+/datum/reagent/blob/cryogenic_liquid/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ reac_volume = ..()
+ M.apply_damage(0.4*reac_volume, BURN)
+ M.adjustStaminaLoss(0.4*reac_volume)
+ M.reagents.add_reagent("frostoil", 0.4*reac_volume)
+
+/datum/reagent/blob/dark_matter //does brute damage and throws or pulls nearby objects at the target
name = "Dark Matter"
id = "dark_matter"
- description = ""
color = "#61407E"
message = "You feel a thrum as the blob strikes you, and everything flies at you"
@@ -110,10 +95,9 @@
reac_volume = ..()
M.apply_damage(0.6*reac_volume, BRUTE)
-/datum/reagent/blob/b_sorium
+/datum/reagent/blob/b_sorium //does brute damage and throws or pushes nearby objects away from the target
name = "Sorium"
id = "b_sorium"
- description = ""
color = "#808000"
message = "The blob slams into you, and sends you flying"
@@ -122,44 +106,6 @@
reac_volume = ..()
M.apply_damage(0.6*reac_volume, BRUTE)
-/datum/reagent/blob/explosive // I'm gonna burn in hell for this one
- name = "Explosive Gelatin"
- id = "explosive"
- description = ""
- color = "#FFA500"
- message = "The blob strikes you, and its tendrils explode"
-
-/datum/reagent/blob/explosive/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- if(prob(3*reac_volume))
- explosion(M.loc, 0, 0, 1, 0, 0)
-
-/datum/reagent/blob/omnizine
- name = "Omnizine"
- id = "b_omnizine"
- description = ""
- color = "#C8A5DC"
- message = "The blob squirts something at you"
- message_living = ", and you feel great"
-
-/datum/reagent/blob/omnizine/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- reac_volume = ..()
- M.reagents.add_reagent("omnizine", 0.6*reac_volume)
-
-/datum/reagent/blob/spacedrugs
- name = "Space drugs"
- id = "b_space_drugs"
- description = ""
- color = "#60A584"
- message = "The blob squirts something at you"
- message_living = ", and you feel funny"
-
-/datum/reagent/blob/spacedrugs/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- reac_volume = ..()
- M.hallucination += 0.8*reac_volume
- M.reagents.add_reagent("space_drugs", 0.6*reac_volume)
- M.apply_damage(0.4*reac_volume, TOX)
-
-
/datum/reagent/blob/proc/reagent_vortex(mob/living/M, setting_type, reac_volume)
var/turf/pull = get_turf(M)
var/range_power = Clamp(round(reac_volume/5, 1), 1, 5)
diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
index 2b4630b4416..e8df9af6064 100644
--- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
@@ -121,7 +121,7 @@
name = "Frost Oil"
id = "frostoil"
description = "A special oil that noticably chills the body. Extraced from Icepeppers."
- color = "#B31008" // rgb: 139, 166, 233
+ color = "#8BA6E9" // rgb: 139, 166, 233
/datum/reagent/consumable/frostoil/on_mob_life(mob/living/M)
switch(current_cycle)
@@ -324,7 +324,6 @@
/datum/reagent/consumable/cornoil/reaction_turf(turf/simulated/T, reac_volume)
if (!istype(T))
return
- src = null
if(reac_volume >= 3)
T.MakeSlippery()
var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
@@ -381,7 +380,6 @@
color = "#FFFFFF" // rgb: 0, 0, 0
/datum/reagent/consumable/flour/reaction_turf(turf/T, reac_volume)
- src = null
if(!istype(T, /turf/space))
var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/flour(T)
reagentdecal.reagents.add_reagent("flour", reac_volume)
diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
index a8999d8ddac..14213840918 100644
--- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
@@ -173,13 +173,36 @@
if(method == INGEST)
M.adjustToxLoss(0.5*reac_volume)
if(show_message)
- M << "
You probably shouldn't have eaten that. Maybe you should of splashed it on, or applied a patch?"
+ M << "
You probably shouldn't have eaten that. Maybe you should have splashed it on, or applied a patch?"
..()
/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/M)
M.adjustFireLoss(-2*REM)
..()
+/datum/reagent/medicine/oxandrolone
+ name = "Oxandrolone"
+ id = "oxandrolone"
+ description = "Stimulates healing of severe burns. If you have more than 50 burn damage, it heals 2 units; otherwise, 0.5. If overdosed it will exacerbate existing burns, causing burn and brute damage."
+ reagent_state = LIQUID
+ color = "#f7ffa5"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ overdose_threshold = 25
+
+/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/M)
+ if(M.getFireLoss() > 50)
+ M.adjustFireLoss(-2*REM)
+ else
+ M.adjustFireLoss(-0.5*REM)
+ ..()
+ return
+
+/datum/reagent/medicine/oxandrolone/overdose_process(mob/living/M)
+ M.adjustFireLoss(2.5*REM) // it's going to be healing either 2 or 0.5
+ M.adjustBruteLoss(0.5*REM)
+ ..()
+ return
+
/datum/reagent/medicine/styptic_powder
name = "Styptic Powder"
id = "styptic_powder"
diff --git a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
index 76ce0b07ebe..3b7b5066c1e 100644
--- a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
@@ -6,10 +6,8 @@
color = "#C80000" // rgb: 200, 0, 0
/datum/reagent/blood/reaction_mob(mob/M, method=TOUCH, reac_volume)
- var/datum/reagent/blood/self = src
- src = null
- if(self.data && self.data["viruses"])
- for(var/datum/disease/D in self.data["viruses"])
+ if(data && data["viruses"])
+ for(var/datum/disease/D in data["viruses"])
if(D.spread_flags & SPECIAL || D.spread_flags & NON_CONTAGIOUS)
continue
@@ -23,13 +21,13 @@
if(istype(data))
SetViruses(src, data)
-/datum/reagent/blood/on_merge(list/data)
- if(src.data && data)
- src.data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc
- if(src.data["viruses"] || data["viruses"])
+/datum/reagent/blood/on_merge(list/mix_data)
+ if(data && mix_data)
+ data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc
+ if(data["viruses"] || mix_data["viruses"])
- var/list/mix1 = src.data["viruses"]
- var/list/mix2 = data["viruses"]
+ var/list/mix1 = data["viruses"]
+ var/list/mix2 = mix_data["viruses"]
// Stop issues with the list changing during mixing.
var/list/to_mix = list()
@@ -42,48 +40,45 @@
var/datum/disease/advance/AD = Advance_Mix(to_mix)
if(AD)
var/list/preserve = list(AD)
- for(var/D in src.data["viruses"])
+ for(var/D in data["viruses"])
if(!istype(D, /datum/disease/advance))
preserve += D
- src.data["viruses"] = preserve
+ data["viruses"] = preserve
return 1
/datum/reagent/blood/reaction_turf(turf/simulated/T, reac_volume)//splash the blood all over the place
if(!istype(T))
return
- var/datum/reagent/blood/self = src
- src = null
if(reac_volume < 3)
return
- //var/datum/disease/D = self.data["virus"]
- if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human))
+ if(!data["donor"] || istype(data["donor"], /mob/living/carbon/human))
var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
if(!blood_prop) //first blood!
blood_prop = new(T)
- blood_prop.blood_DNA[self.data["blood_DNA"]] = self.data["blood_type"]
+ blood_prop.blood_DNA[data["blood_DNA"]] = data["blood_type"]
- for(var/datum/disease/D in self.data["viruses"])
+ for(var/datum/disease/D in data["viruses"])
var/datum/disease/newVirus = D.Copy(1)
blood_prop.viruses += newVirus
newVirus.holder = blood_prop
- else if(istype(self.data["donor"], /mob/living/carbon/monkey))
+ else if(istype(data["donor"], /mob/living/carbon/monkey))
var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T
if(!blood_prop)
blood_prop = new(T)
blood_prop.blood_DNA["Non-Human DNA"] = "A+"
- for(var/datum/disease/D in self.data["viruses"])
+ for(var/datum/disease/D in data["viruses"])
var/datum/disease/newVirus = D.Copy(1)
blood_prop.viruses += newVirus
newVirus.holder = blood_prop
- else if(istype(self.data["donor"], /mob/living/carbon/alien))
+ else if(istype(data["donor"], /mob/living/carbon/alien))
var/obj/effect/decal/cleanable/xenoblood/blood_prop = locate() in T
if(!blood_prop)
blood_prop = new(T)
blood_prop.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*"
- for(var/datum/disease/D in self.data["viruses"])
+ for(var/datum/disease/D in data["viruses"])
var/datum/disease/newVirus = D.Copy(1)
blood_prop.viruses += newVirus
newVirus.holder = blood_prop
@@ -96,13 +91,11 @@
color = "#C81040" // rgb: 200, 16, 64
/datum/reagent/vaccine/reaction_mob(mob/M, method=TOUCH, reac_volume)
- var/datum/reagent/vaccine/self = src
- src = null
- if(islist(self.data) && method == INGEST)
+ if(islist(data) && method == INGEST)
for(var/datum/disease/D in M.viruses)
- if(D.GetDiseaseID() in self.data)
+ if(D.GetDiseaseID() in data)
D.cure()
- M.resistances |= self.data
+ M.resistances |= data
/datum/reagent/vaccine/on_merge(list/data)
if(istype(data))
@@ -122,7 +115,6 @@
/datum/reagent/water/reaction_turf(turf/simulated/T, reac_volume)
if (!istype(T)) return
var/CT = cooling_temperature
- src = null
if(reac_volume >= 10)
T.MakeSlippery()
@@ -143,8 +135,6 @@
*/
/datum/reagent/water/reaction_obj(obj/O, reac_volume)
- src = null
-
if(istype(O,/obj/item))
var/obj/item/Item = O
Item.extinguish()
@@ -250,7 +240,6 @@
/datum/reagent/lube/reaction_turf(turf/simulated/T, reac_volume)
if (!istype(T)) return
- src = null
if(reac_volume >= 1)
T.MakeSlippery(2)
@@ -384,7 +373,6 @@
color = "#13BC5E" // rgb: 19, 188, 94
/datum/reagent/aslimetoxin/reaction_mob(mob/M, method=TOUCH, reac_volume)
- src = null
if(method != TOUCH)
M.ForceContractDisease(new /datum/disease/transformation/slime(0))
@@ -466,7 +454,6 @@
color = "#1C1300" // rgb: 30, 20, 0
/datum/reagent/carbon/reaction_turf(turf/T, reac_volume)
- src = null
if(!istype(T, /turf/space))
new /obj/effect/decal/cleanable/dirt(T)
@@ -542,7 +529,6 @@
return
/datum/reagent/radium/reaction_turf(turf/T, reac_volume)
- src = null
if(reac_volume >= 3)
if(!istype(T, /turf/space))
var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
@@ -587,7 +573,6 @@
..()
/datum/reagent/uranium/reaction_turf(turf/T, reac_volume)
- src = null
if(reac_volume >= 3)
if(!istype(T, /turf/space))
var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
@@ -646,10 +631,6 @@
for(var/mob/living/simple_animal/slime/M in T)
M.adjustToxLoss(rand(5,10))
- if(istype(T, /turf/simulated/floor))
- var/turf/simulated/floor/F = T
- if(reac_volume >= 1)
- F.dirt = 0
/datum/reagent/space_cleaner/reaction_mob(mob/M, method=TOUCH, reac_volume)
if(method == TOUCH || VAPOR)
@@ -719,7 +700,6 @@
color = "#535E66" // rgb: 83, 94, 102
/datum/reagent/nanites/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
- src = null
if(method==PATCH || method==INGEST || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
M.ForceContractDisease(new /datum/disease/transformation/robot(0))
@@ -730,7 +710,6 @@
color = "#535E66" // rgb: 83, 94, 102
/datum/reagent/xenomicrobes/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
- src = null
if(method==PATCH || method==INGEST || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
M.ContractDisease(new /datum/disease/transformation/xeno(0))
@@ -1030,3 +1009,19 @@
reagent_state = LIQUID
color = "#60A584" // rgb: 96, 165, 132
+/datum/reagent/drying_agent
+ name = "Drying agent"
+ id = "drying_agent"
+ description = "Can be used to dry things."
+ reagent_state = LIQUID
+ color = "#A70FFF"
+
+/datum/reagent/drying_agent/reaction_turf(turf/simulated/T, reac_volume)
+ if(istype(T) && T.wet)
+ T.MakeDry(TURF_WET_WATER)
+
+/datum/reagent/drying_agent/reaction_obj(obj/O, reac_volume)
+ if(O.type == /obj/item/clothing/shoes/galoshes)
+ var/t_loc = get_turf(O)
+ qdel(O)
+ new /obj/item/clothing/shoes/galoshes/dry(t_loc)
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
index c56242773f6..b5cd4d00639 100644
--- a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
@@ -7,7 +7,6 @@
color = "#673910" // rgb: 103, 57, 16
/datum/reagent/thermite/reaction_turf(turf/T, reac_volume)
- src = null
if(reac_volume >= 1 && istype(T, /turf/simulated/wall))
var/turf/simulated/wall/Wall = T
if(istype(Wall, /turf/simulated/wall/r_wall))
diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
index 319b0e4a944..8cf1734dc42 100644
--- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
@@ -33,7 +33,6 @@
return
if(!istype(M) || !M.dna)
return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
- src = null
if((method==VAPOR && prob(min(33, reac_volume))) || method==INGEST || method == PATCH)
randmuti(M)
if(prob(98))
@@ -66,12 +65,11 @@
return
/datum/reagent/toxin/plasma/reaction_obj(obj/O, reac_volume)
- src = null
- if((!O) || (!reac_volume)) return 0
+ if((!O) || (!reac_volume))
+ return 0
O.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, reac_volume)
/datum/reagent/toxin/plasma/reaction_turf(turf/simulated/T, reac_volume)
- src = null
if(istype(T))
T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, reac_volume)
return
@@ -189,7 +187,6 @@
SV.on_chem_effect(src)
/datum/reagent/toxin/plantbgone/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- src = null
if(method == VAPOR)
if(iscarbon(M))
var/mob/living/carbon/C = M
@@ -212,7 +209,6 @@
toxpwr = 1
/datum/reagent/toxin/pestkiller/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- src = null
if(method == VAPOR)
if(iscarbon(M))
var/mob/living/carbon/C = M
@@ -225,7 +221,7 @@
id = "spore"
description = "A toxic spore cloud which blocks vision when ingested."
color = "#9ACD32"
- toxpwr = 0.5
+ toxpwr = 1
/datum/reagent/toxin/spore/on_mob_life(mob/living/M)
M.damageoverlaytemp = 60
@@ -639,11 +635,9 @@
/datum/reagent/toxin/acid/reaction_turf(turf/T, reac_volume)
if (!istype(T))
return
- var/datum/reagent/toxin/acid/self = src
- src = null
reac_volume = round(reac_volume,0.1)
for(var/obj/O in T)
- O.acid_act(self.acidpwr, reac_volume)
+ O.acid_act(acidpwr, reac_volume)
/datum/reagent/toxin/acid/fluacid
name = "Fluorosulfuric acid"
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index eb27d64550c..84822634782 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -21,52 +21,18 @@
return
//I recommend you set the result amount to the total volume of all components.
-
+var/list/chemical_mob_spawn_meancritters = list() // list of possible hostile mobs
+var/list/chemical_mob_spawn_nicecritters = list() // and possible friendly mobs
/datum/chemical_reaction/proc/chemical_mob_spawn(datum/reagents/holder, amount_to_spawn, reaction_name, mob_faction = "chemicalsummon")
if(holder && holder.my_atom)
- var/blocked = list(/mob/living/simple_animal/hostile,
- /mob/living/simple_animal/hostile/pirate,
- /mob/living/simple_animal/hostile/pirate/ranged,
- /mob/living/simple_animal/hostile/russian,
- /mob/living/simple_animal/hostile/russian/ranged,
- /mob/living/simple_animal/hostile/syndicate,
- /mob/living/simple_animal/hostile/syndicate/melee,
- /mob/living/simple_animal/hostile/syndicate/melee/space,
- /mob/living/simple_animal/hostile/syndicate/ranged,
- /mob/living/simple_animal/hostile/syndicate/ranged/space,
- /mob/living/simple_animal/hostile/alien/queen/large,
- /mob/living/simple_animal/hostile/mushroom,
- /mob/living/simple_animal/hostile/asteroid,
- /mob/living/simple_animal/hostile/retaliate,
- /mob/living/simple_animal/hostile/asteroid/basilisk,
- /mob/living/simple_animal/hostile/asteroid/goldgrub,
- /mob/living/simple_animal/hostile/asteroid/goliath,
- /mob/living/simple_animal/hostile/asteroid/hivelord,
- /mob/living/simple_animal/hostile/asteroid/hivelordbrood,
- /mob/living/simple_animal/hostile/carp/holocarp,
- /mob/living/simple_animal/hostile/mining_drone,
- /mob/living/simple_animal/hostile/poison,
- /mob/living/simple_animal/hostile/blob,
- /mob/living/simple_animal/ascendant_shadowling,
- /mob/living/simple_animal/hostile/guardian,
- /mob/living/simple_animal/hostile/guardian/fire,
- /mob/living/simple_animal/hostile/guardian/punch,
- /mob/living/simple_animal/hostile/guardian/fast,
- /mob/living/simple_animal/hostile/guardian/healer,
- /mob/living/simple_animal/hostile/guardian/ranged,
- /mob/living/simple_animal/hostile/guardian/bluespace,
- /mob/living/simple_animal/hostile/guardian/bomb,
- /mob/living/simple_animal/hostile/guardian/shield
- )//exclusion list for things you don't want the reaction to create.
- var/list/meancritters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
- var/list/nicecritters = list(/mob/living/simple_animal/crab,
- /mob/living/simple_animal/mouse,
- /mob/living/simple_animal/lizard,
- /mob/living/simple_animal/parrot,
- /mob/living/simple_animal/butterfly,
- /mob/living/simple_animal/cow,
- /mob/living/simple_animal/chicken) // and possible friendly mobs
- nicecritters += typesof(/mob/living/simple_animal/pet) - /mob/living/simple_animal/pet
+ if (chemical_mob_spawn_meancritters.len <= 0 || chemical_mob_spawn_nicecritters.len <= 0)
+ for (var/T in typesof(/mob/living/simple_animal))
+ var/mob/living/simple_animal/SA = T
+ switch(initial(SA.gold_core_spawnable))
+ if(1)
+ chemical_mob_spawn_meancritters += T
+ if(2)
+ chemical_mob_spawn_nicecritters += T
var/atom/A = holder.my_atom
var/turf/T = get_turf(A)
var/area/my_area = get_area(T)
@@ -86,22 +52,17 @@
for(var/mob/living/carbon/C in viewers(get_turf(holder.my_atom), null))
C.flash_eyes()
for(var/i = 1, i <= amount_to_spawn, i++)
+ var/chosen
if (reaction_name == "Friendly Gold Slime")
- var/chosen = pick(nicecritters)
- var/mob/living/simple_animal/C = new chosen
- C.faction |= mob_faction
- C.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(C, pick(NORTH,SOUTH,EAST,WEST))
+ chosen = pick(chemical_mob_spawn_nicecritters)
else
- var/chosen = pick(meancritters)
- var/mob/living/simple_animal/hostile/C = new chosen
- C.faction |= mob_faction
- C.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(C, pick(NORTH,SOUTH,EAST,WEST))
+ chosen = pick(chemical_mob_spawn_meancritters)
+ var/mob/living/simple_animal/C = new chosen
+ C.faction |= mob_faction
+ C.loc = get_turf(holder.my_atom)
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(C, pick(NORTH,SOUTH,EAST,WEST))
/datum/chemical_reaction/proc/goonchem_vortex(turf/simulated/T, setting_type, range)
for(var/atom/movable/X in orange(range, T))
diff --git a/code/modules/reagents/Chemistry-Recipes/Medicine.dm b/code/modules/reagents/Chemistry-Recipes/Medicine.dm
index 60e80923400..3ccc5753cc2 100644
--- a/code/modules/reagents/Chemistry-Recipes/Medicine.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Medicine.dm
@@ -116,6 +116,12 @@
required_reagents = list("sodium" = 1, "phenol" = 1, "carbon" = 1, "oxygen" = 1, "sacid" = 1)
result_amount = 5
+/datum/chemical_reaction/oxandrolone
+ name = "Oxandrolone"
+ id = "oxandrolone"
+ result = "oxandrolone"
+ required_reagents = list("carbon" = 3, "phenol" = 1, "hydrogen" = 1, "oxygen" = 1)
+ result_amount = 6
/datum/chemical_reaction/salbutamol
name = "Salbutamol"
diff --git a/code/modules/reagents/Chemistry-Recipes/Others.dm b/code/modules/reagents/Chemistry-Recipes/Others.dm
index aa015604409..c3614639f7b 100644
--- a/code/modules/reagents/Chemistry-Recipes/Others.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Others.dm
@@ -12,14 +12,14 @@
result = "lube"
required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
result_amount = 4
-
+
/datum/chemical_reaction/spraytan
name = "Spray Tan"
id = "spraytan"
result = "spraytan"
required_reagents = list("orangejuice" = 1, "oil" = 1)
result_amount = 2
-
+
/datum/chemical_reaction/spraytan2
name = "Spray Tan"
id = "spraytan"
@@ -254,6 +254,12 @@
required_reagents = list("toxin" = 1, "ethanol" = 4)
result_amount = 5
+/datum/chemical_reaction/drying_agent
+ name = "Drying agent"
+ id = "drying_agent"
+ result = "drying_agent"
+ required_reagents = list("stable_plasma" = 2, "ethanol" = 1, "sodium" = 1)
+ result_amount = 3
//////////////////////////////////// Other goon stuff ///////////////////////////////////////////
diff --git a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
index 09231890a94..213641af8df 100644
--- a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
@@ -246,7 +246,7 @@
/datum/chemical_reaction/slimestabilizer/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
- var/obj/item/weapon/slimestabilizer/P = new /obj/item/weapon/slimestabilizer
+ var/obj/item/slimepotion/stabilizer/P = new /obj/item/slimepotion/stabilizer
P.loc = get_turf(holder.my_atom)
@@ -363,7 +363,7 @@
/datum/chemical_reaction/slimepsteroid/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
- var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid
+ var/obj/item/slimepotion/steroid/P = new /obj/item/slimepotion/steroid
P.loc = get_turf(holder.my_atom)
/datum/chemical_reaction/slimejam
@@ -406,7 +406,7 @@
/datum/chemical_reaction/slimemutator/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
- var/obj/item/weapon/slimemutator/P = new /obj/item/weapon/slimemutator
+ var/obj/item/slimepotion/mutator/P = new /obj/item/slimepotion/mutator
P.loc = get_turf(holder.my_atom)
/datum/chemical_reaction/slimebloodlust
@@ -484,7 +484,7 @@
/datum/chemical_reaction/slimepotion2/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
- var/obj/item/slimepotion2/P = new /obj/item/slimepotion2
+ var/obj/item/slimepotion/sentience/P = new /obj/item/slimepotion/sentience
P.loc = get_turf(holder.my_atom)
//Adamantine
@@ -547,7 +547,7 @@
/datum/chemical_reaction/slimepsteroid2/on_reaction(datum/reagents/holder)
feedback_add_details("slime_cores_used","[type]")
- var/obj/item/weapon/slimesteroid2/P = new /obj/item/weapon/slimesteroid2
+ var/obj/item/slimepotion/enhancer/P = new /obj/item/slimepotion/enhancer
P.loc = get_turf(holder.my_atom)
//Sepia
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index ab68ee49f79..b971a49f98a 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -43,7 +43,7 @@ Borg Hypospray
/obj/item/weapon/reagent_containers/borghypo/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 2a99e768c75..94ece6ee2c0 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -133,6 +133,12 @@
icon_state = "pill5"
list_reagents = list("sal_acid" = 24)
roundstart = 1
+/obj/item/weapon/reagent_containers/pill/oxandrolone
+ name = "oxandrolone pill"
+ desc = "Used to stimulate burn healing."
+ icon_state = "pill5"
+ list_reagents = list("oxandrolone" = 24)
+ roundstart = 1
/obj/item/weapon/reagent_containers/pill/insulin
name = "insulin pill"
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 3bac3f14830..5403b0ea02b 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -180,7 +180,7 @@
C.inject_blood(src,5)
else
src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << "
You inject 5 units of the solution. The syringe now contains [src.reagents.total_volume] units."
+ user << "
You inject [amount_per_transfer_from_this] units of the solution. The syringe now contains [src.reagents.total_volume] units."
if (reagents.total_volume <= 0 && mode==SYRINGE_INJECT)
mode = SYRINGE_DRAW
update_icon()
diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm
index 3511e08142e..219785d1f33 100644
--- a/code/modules/recycling/disposal-structures.dm
+++ b/code/modules/recycling/disposal-structures.dm
@@ -17,7 +17,7 @@
/obj/structure/disposalholder/Destroy()
qdel(gas)
active = 0
- ..()
+ return ..()
// initialize a holder from the contents of a disposal unit
/obj/structure/disposalholder/proc/init(obj/machinery/disposal/D)
@@ -194,13 +194,12 @@
AM.loc = T
AM.pipe_eject(0)
qdel(H)
- ..()
- return
+ return ..()
// otherwise, do normal expel from turf
if(H)
expel(H, T, 0)
- ..()
+ return ..()
// returns the direction of the next pipe object, given the entrance dir
// by default, returns the bitmask of remaining directions
@@ -642,7 +641,7 @@
else if(istype(linked, /obj/machinery/disposal))
var/obj/machinery/disposal/D = linked
D.trunk = null
- ..()
+ return ..()
/obj/structure/disposalpipe/trunk/proc/getlinked()
linked = null
@@ -783,7 +782,7 @@
/obj/structure/disposaloutlet/Destroy()
if(trunk)
trunk.linked = null
- ..()
+ return ..()
// expel the contents of the holder object, then delete it
// called when the holder exits the outlet
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
index a348aa86165..b76334d1680 100644
--- a/code/modules/recycling/disposal-unit.dm
+++ b/code/modules/recycling/disposal-unit.dm
@@ -49,7 +49,7 @@
eject()
if(trunk)
trunk.linked = null
- ..()
+ return ..()
/obj/machinery/disposal/singularity_pull(S, current_size)
if(current_size >= STAGE_FIVE)
@@ -275,6 +275,9 @@
//How disposal handles getting a storage dump from a storage object
/obj/machinery/disposal/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
for(var/obj/item/I in src_object)
+ if(user.s_active != src_object)
+ if(I.on_found(user))
+ return
src_object.remove_from_storage(I, src)
return 1
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index df47b62e337..94b40c801a5 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -23,7 +23,7 @@
var/turf/T = get_turf(src)
for(var/atom/movable/AM in contents)
AM.loc = T
- ..()
+ return ..()
/obj/structure/bigDelivery/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/destTagger))
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index a9ef8e34eed..7cf5fff85f4 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -111,7 +111,7 @@
id = "power control"
build_type = AUTOLATHE
materials = list(MAT_METAL = 100, MAT_GLASS = 100)
- build_path = /obj/item/weapon/module/power_control
+ build_path = /obj/item/weapon/electronics/apc
category = list("initial", "Electronics")
/datum/design/airlock_board
@@ -119,7 +119,7 @@
id = "airlock_board"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
- build_path = /obj/item/weapon/airlock_electronics
+ build_path = /obj/item/weapon/electronics/airlock
category = list("initial", "Electronics")
/datum/design/firelock_board
@@ -127,7 +127,7 @@
id = "firelock_board"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
- build_path = /obj/item/weapon/firelock_board
+ build_path = /obj/item/weapon/electronics/firelock
category = list("initial", "Electronics")
/datum/design/airalarm_electronics
@@ -135,7 +135,7 @@
id = "airalarm_electronics"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
- build_path = /obj/item/weapon/airalarm_electronics
+ build_path = /obj/item/weapon/electronics/airalarm
category = list("initial", "Electronics")
/datum/design/firealarm_electronics
@@ -143,7 +143,7 @@
id = "firealarm_electronics"
build_type = AUTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
- build_path = /obj/item/weapon/firealarm_electronics
+ build_path = /obj/item/weapon/electronics/firealarm
category = list("initial", "Electronics")
/datum/design/pipe_painter
@@ -266,6 +266,14 @@
build_path = /obj/item/weapon/reagent_containers/glass/beaker/large
category = list("initial", "Medical")
+/datum/design/healthanalyzer
+ name = "Health Analyzer"
+ id = "healthanalyzer"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 500, MAT_GLASS = 50)
+ build_path = /obj/item/device/healthanalyzer
+ category = list("initial", "Medical")
+
/datum/design/beanbag_slug
name = "Beanbag slug"
id = "beanbag_slug"
@@ -346,6 +354,14 @@
build_path = /obj/item/device/assembly/infra
category = list("initial", "Misc")
+/datum/design/health_sensor
+ name = "Health sensor"
+ id = "health_sensor"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 800, MAT_GLASS = 200)
+ build_path = /obj/item/device/assembly/health
+ category = list("initial", "Medical")
+
/datum/design/timer
name = "Timer"
id = "timer"
@@ -383,7 +399,7 @@
id = "camera_assembly"
build_type = AUTOLATHE
materials = list(MAT_METAL = 400, MAT_GLASS = 250)
- build_path = /obj/item/weapon/camera_assembly
+ build_path = /obj/item/wallframe/camera
category = list("initial", "Construction")
/datum/design/newscaster_frame
@@ -391,7 +407,7 @@
id = "newscaster_frame"
build_type = AUTOLATHE
materials = list(MAT_METAL = 14000, MAT_GLASS = 8000)
- build_path = /obj/item/newscaster_frame
+ build_path = /obj/item/wallframe/newscaster
category = list("initial", "Construction")
/datum/design/syringe
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 0f657da38b0..9748ab6ffbe 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -110,15 +110,6 @@
build_path = /obj/item/weapon/circuitboard/crew
category = list("Computer Boards")
-/datum/design/teleconsole
- name = "Computer Design (Teleporter Console)"
- desc = "Allows for the construction of circuit boards used to build a teleporter control console."
- id = "teleconsole"
- req_tech = list("programming" = 3, "bluespace" = 2)
- build_type = IMPRINTER
- materials = list(MAT_GLASS = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/teleporter
- category = list("Computer Boards")
/datum/design/secdata
name = "Computer Design (Security Records Console)"
@@ -160,36 +151,6 @@
build_path = /obj/item/weapon/circuitboard/robotics
category = list("Computer Boards")
-/datum/design/clonecontrol
- name = "Computer Design (Cloning Machine Console)"
- desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console."
- id = "clonecontrol"
- req_tech = list("programming" = 3, "biotech" = 3)
- build_type = IMPRINTER
- materials = list(MAT_GLASS = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/cloning
- category = list("Computer Boards")
-
-/datum/design/clonepod
- name = "Machine Design (Clone Pod)"
- desc = "Allows for the construction of circuit boards used to build a Cloning Pod."
- id = "clonepod"
- req_tech = list("programming" = 3, "biotech" = 3)
- build_type = IMPRINTER
- materials = list(MAT_GLASS = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/clonepod
- category = list("Computer Boards")
-
-/datum/design/clonescanner
- name = "Machine Design (Cloning Scanner)"
- desc = "Allows for the construction of circuit boards used to build a Cloning Scanner."
- id = "clonescanner"
- req_tech = list("programming" = 3, "biotech" = 3)
- build_type = IMPRINTER
- materials = list(MAT_GLASS = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/clonescanner
- category = list("Computer Boards")
-
/datum/design/arcadebattle
name = "Computer Design (Battle Arcade Machine)"
desc = "Allows for the construction of circuit boards used to build a new arcade machine."
@@ -350,16 +311,6 @@
build_path = /obj/item/weapon/circuitboard/comm_traffic
category = list("Computer Boards")
-/datum/design/telesci_console
- name = "Computer Design (Telepad Control Console Board)"
- desc = "Allows for the construction of circuit boards used to build a telescience console."
- id = "telesci_console"
- req_tech = list("programming" = 3, "bluespace" = 2)
- build_type = IMPRINTER
- materials = list(MAT_GLASS = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/telesci_console
- category = list("Computer Boards")
-
/datum/design/aifixer
name = "Computer Design (AI Integrity Restorer)"
desc = "Allows for the construction of circuit boards used to build an AI Integrity Restorer."
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 75202c87387..828192263a2 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -32,6 +32,16 @@
build_path = /obj/item/weapon/circuitboard/turbine_computer
category = list ("Engineering Machinery")
+/datum/design/emitter
+ name = "Machine Design (Emitter Board)"
+ desc = "The circuit board for an emitter."
+ id = "emitter"
+ req_tech = list("programming" = 4, "powerstorage" = 5, "engineering" = 5)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/emitter
+ category = list ("Engineering Machinery")
+
/datum/design/power_compressor
name = "Machine Design (Power Compressor Board)"
desc = "The circuit board for a power compressor."
@@ -92,6 +102,26 @@
build_path = /obj/item/weapon/circuitboard/telesci_pad
category = list ("Teleportation Machinery")
+/datum/design/teleconsole
+ name = "Computer Design (Teleporter Console)"
+ desc = "Allows for the construction of circuit boards used to build a teleporter control console."
+ id = "teleconsole"
+ req_tech = list("programming" = 3, "bluespace" = 2)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/teleporter
+ category = list("Teleportation Machinery")
+
+/datum/design/telesci_console
+ name = "Computer Design (Telepad Control Console Board)"
+ desc = "Allows for the construction of circuit boards used to build a telescience console."
+ id = "telesci_console"
+ req_tech = list("programming" = 3, "bluespace" = 2)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/telesci_console
+ category = list("Teleportation Machinery")
+
/datum/design/sleeper
name = "Machine Design (Sleeper Board)"
desc = "The circuit board for a sleeper."
@@ -142,6 +172,36 @@
build_path = /obj/item/weapon/circuitboard/chem_heater
category = list ("Medical Machinery")
+ /datum/design/clonecontrol
+ name = "Computer Design (Cloning Machine Console)"
+ desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console."
+ id = "clonecontrol"
+ req_tech = list("programming" = 3, "biotech" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/cloning
+ category = list("Medical Machinery")
+
+/datum/design/clonepod
+ name = "Machine Design (Clone Pod)"
+ desc = "Allows for the construction of circuit boards used to build a Cloning Pod."
+ id = "clonepod"
+ req_tech = list("programming" = 3, "biotech" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/clonepod
+ category = list("Medical Machinery")
+
+/datum/design/clonescanner
+ name = "Machine Design (Cloning Scanner)"
+ desc = "Allows for the construction of circuit boards used to build a Cloning Scanner."
+ id = "clonescanner"
+ req_tech = list("programming" = 3, "biotech" = 3)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/clonescanner
+ category = list("Medical Machinery")
+
/datum/design/biogenerator
name = "Machine Design (Biogenerator Board)"
desc = "The circuit board for a biogenerator."
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index c01225e38e1..cf283810d38 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -2,6 +2,7 @@
////////////Medical Tools////////////////
/////////////////////////////////////////
+
/datum/design/mass_spectrometer
name = "Mass-Spectrometer"
desc = "A device for analyzing chemicals in the blood."
@@ -70,7 +71,7 @@
materials = list(MAT_METAL = 750, MAT_GLASS = 750)
construction_time = 100
reliability = 76
- build_path = /obj/item/device/flash/handheld
+ build_path = /obj/item/device/assembly/flash/handheld
category = list("Misc")
/datum/design/bluespacebeaker
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 88c008128a8..bfb0909d3ed 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -126,7 +126,7 @@
category = list("Weapons")
/datum/design/smg
- name = "Prototype Submachine Gun"
+ name = "NanoTrasen Saber SMG"
desc = "A prototype weapon made using lightweight materials on a traditional frame, designed to fire standard 9mm rounds."
id = "smg"
req_tech = list("combat" = 4, "materials" = 3)
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index e57a3762319..dc69762ef53 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -127,7 +127,9 @@
if(exchange_parts(user, O))
return
- default_deconstruction_crowbar(O)
+ if(panel_open && istype(O, /obj/item/weapon/crowbar))
+ default_deconstruction_crowbar(O)
+ return
if(!checkCircumstances(O))
user << "
The [O] is not yet valid for the [src] and must be completed!"
@@ -138,10 +140,10 @@
if (!linked_console)
user << "
The [src] must be linked to an R&D console first!"
return
- if (busy)
- user << "
The [src] is busy right now."
+ if (loaded_item)
+ user << "
The [src] is already loaded."
return
- if (istype(O, /obj/item) && !loaded_item)
+ if (istype(O, /obj/item))
if(!O.origin_tech)
user << "
This doesn't seem to have a tech origin!"
return
@@ -154,7 +156,6 @@
return
if(!user.drop_item())
return
- busy = 1
loaded_item = O
O.loc = src
user << "
You add the [O.name] to the machine."
@@ -544,7 +545,6 @@
spawn(resetTime)
icon_state = "h_lathe"
- busy = 0
recentlyExperimented = 0
/obj/machinery/r_n_d/experimentor/Topic(href, href_list)
@@ -562,7 +562,6 @@
if(D)
linked_console = D
else if(scantype == "eject")
- busy = 0
ejectItem()
else if(scantype == "refresh")
src.updateUsrDialog()
@@ -578,7 +577,7 @@
experiment(dotype,process)
use_power(750)
if(dotype != FAIL)
- if(process.origin_tech)
+ if(process && process.origin_tech)
var/list/temp_tech = ConvertReqString2List(process.origin_tech)
for(var/T in temp_tech)
linked_console.files.UpdateTech(T, temp_tech[T])
@@ -681,7 +680,7 @@
user << message
var/animals = rand(1,25)
var/counter
- var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
+ var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/dog/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
for(counter = 1; counter < animals; counter++)
var/mobType = pick(valid_animals)
new mobType(get_turf(src))
@@ -703,7 +702,8 @@
R.realProc = realProc
R.revealed = TRUE
dupes |= R
- R.throw_at(pick(oview(7,get_turf(src))),10,1)
+ spawn()
+ R.throw_at(pick(oview(7,get_turf(src))),10,1)
counter = 0
spawn(rand(10,100))
for(counter = 1; counter <= dupes.len; counter++)
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 901d291e947..df6389820a8 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -96,8 +96,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/Destroy()
message_servers -= src
- ..()
- return
+ return ..()
/obj/machinery/message_server/proc/GenerateKey()
//Feel free to move to Helpers.
@@ -258,7 +257,7 @@ var/obj/machinery/blackbox_recorder/blackbox
BR.messages_admin = messages_admin
if(blackbox != BR)
blackbox = BR
- ..()
+ return ..()
/obj/machinery/blackbox_recorder/proc/find_feedback_datum(variable)
for (var/datum/feedback_variable/FV in feedback)
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 7300f924b1a..928180e8375 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -20,6 +20,11 @@
..()
wires = new(src)
+/obj/machinery/r_n_d/Destroy()
+ qdel(wires)
+ wires = null
+ return ..()
+
/obj/machinery/r_n_d/proc/shock(mob/user, prb)
if(stat & (BROKEN|NOPOWER)) // unpowered, no shock
return 0
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index af580b93b83..94751720d53 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -26,7 +26,7 @@
/obj/machinery/r_n_d/server/Destroy()
griefProtection()
- ..()
+ return ..()
/obj/machinery/r_n_d/server/RefreshParts()
var/tot_rating = 0
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 68d65f28023..777cb0bc607 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -11,21 +11,16 @@
throwforce = 0
throw_speed = 3
throw_range = 6
- origin_tech = "biotech=4"
+ origin_tech = "biotech=3"
var/Uses = 1 // uses before it goes inert
- var/enhanced = 0 //has it been enhanced before?
/obj/item/slime_extract/attackby(obj/item/O, mob/user)
- if(istype(O, /obj/item/weapon/slimesteroid2))
- if(enhanced == 1)
- user << "
This extract has already been enhanced!"
+ if(istype(O, /obj/item/slimepotion/enhancer))
+ if(Uses >= 5)
+ user << "
You cannot enhance this extract further!"
return ..()
- if(Uses == 0)
- user << "
You can't enhance a used extract!"
- return ..()
- user <<"
You apply the enhancer. It now has triple the amount of uses."
- Uses = 3
- enhanced = 1
+ user <<"
You apply the enhancer to the slime extract. It may now be reused one more time."
+ Uses++
qdel(O)
/obj/item/slime_extract/New()
@@ -120,15 +115,26 @@
name = "rainbow slime extract"
icon_state = "rainbow slime extract"
-////Pet Slime Creation///
+////Slime-derived potions///
/obj/item/slimepotion
+ name = "slime potion"
+ desc = "A hard yet gelatinous capsule excreted by a slime, containing mysterious substances."
+ w_class = 1
+ origin_tech = "biotech=4"
+
+/obj/item/slimepotion/afterattack(obj/item/weapon/reagent_containers/target, mob/user , proximity)
+ if (istype(target))
+ user << "
You cannot transfer [src] to [target]! It appears the potion must be given directly to a slime to absorb." // le fluff faec
+ return
+
+/obj/item/slimepotion/docility
name = "docility potion"
desc = "A potent chemical mix that nullifies a slime's hunger, causing it to become docile and tame."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle19"
-/obj/item/slimepotion/attack(mob/living/simple_animal/slime/M, mob/user)
+/obj/item/slimepotion/docility/attack(mob/living/simple_animal/slime/M, mob/user)
if(!isslime(M))
user << "
The potion only works on slimes!"
return ..()
@@ -139,7 +145,7 @@
M.docile = 1
M.nutrition = 700
M <<"
You absorb the potion and feel your intense desire to feed melt away."
- user <<"
You feed the slime the potion, removing it's hunger and calming it."
+ user <<"
You feed the slime the potion, removing its hunger and calming it."
var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN)
if (!newname)
@@ -148,15 +154,16 @@
M.real_name = newname
qdel(src)
-/obj/item/slimepotion2
+/obj/item/slimepotion/sentience
name = "sentience potion"
- desc = "A miraculous chemical mix that can raise the intelligence of creatures to human levels."
+ desc = "A miraculous chemical mix that can raise the intelligence of creatures to human levels. Unlike normal slime potions, it can be absorbed by any nonsentient being."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle19"
+ origin_tech = "biotech=5"
var/list/not_interested = list()
var/being_used = 0
-/obj/item/slimepotion2/afterattack(mob/living/M, mob/user)
+/obj/item/slimepotion/sentience/afterattack(mob/living/M, mob/user)
if(being_used || !ismob(M))
return
if(!isanimal(M) || M.ckey) //only works on animals that aren't player controlled
@@ -166,7 +173,7 @@
user << "
[M] is dead!"
return..()
- user << "
You begin to apply the potion to [M]..."
+ user << "
You offer the sentience potion to [M]..."
being_used = 1
var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
@@ -203,73 +210,52 @@
M.key = C.key
M.languages |= HUMAN
M.faction -= "neutral"
- M << "
All at once it makes sense, you know what you are and who you are! Self awareness is yours!"
+ M << "
All at once it makes sense: you know what you are and who you are! Self awareness is yours!"
M << "
You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost."
- user << "
[M] is suddenly attentive and aware. It worked!"
+ user << "
[M] accepts the potion and suddenly becomes attentive and aware. It worked!"
qdel(src)
else
- user << "
[M] looks interested for a moment, but then looks back down. Maybe you should try again later..."
+ user << "
[M] looks interested for a moment, but then looks back down. Maybe you should try again later."
being_used = 0
..()
-/obj/item/weapon/slimesteroid
+/obj/item/slimepotion/steroid
name = "slime steroid"
- desc = "A potent chemical mix that will cause a slime to generate more extract."
+ desc = "A potent chemical mix that will cause a baby slime to generate more extract."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
-/obj/item/weapon/slimesteroid/attack(mob/living/simple_animal/slime/M, mob/user)
+/obj/item/slimepotion/steroid/attack(mob/living/simple_animal/slime/M, mob/user)
if(!isslime(M))//If target is not a slime.
user << "
The steroid only works on baby slimes!"
return ..()
- if(M.is_adult) //Can't tame adults
+ if(M.is_adult) //Can't steroidify adults
user << "
Only baby slimes can use the steroid!"
return..()
if(M.stat)
user << "
The slime is dead!"
return..()
- if(M.cores == 3)
+ if(M.cores >= 5)
user <<"
The slime already has the maximum amount of extract!"
return..()
- user <<"
You feed the slime the steroid. It now has triple the amount of extract."
- M.cores = 3
+ user <<"
You feed the slime the steroid. It will now produce one more extract."
+ M.cores++
qdel(src)
-
-/obj/item/weapon/slimesteroid3
- name = "slime steroid"
- desc = "A potent chemical mix that will cause a slime to generate more extract."
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle16"
-
-/obj/item/weapon/slimesteroid2
+/obj/item/slimepotion/enhancer
name = "extract enhancer"
- desc = "A potent chemical mix that will give a slime extract three uses."
+ desc = "A potent chemical mix that will give a slime extract an additional use."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
- /*afterattack(obj/target, mob/user , flag)
- if(istype(target, /obj/item/slime_extract))
- if(target.enhanced == 1)
- user << "
This extract has already been enhanced!"
- return ..()
- if(target.Uses == 0)
- user << "
You can't enhance a used extract!"
- return ..()
- user <<"You apply the enhancer. It now has triple the amount of uses."
- target.Uses = 3
- target.enahnced = 1
- qdel(src)*/
-
-
-/obj/item/weapon/slimestabilizer
+/obj/item/slimepotion/stabilizer
name = "slime stabilizer"
desc = "A potent chemical mix that will reduce the chance of a slime mutating."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle15"
-/obj/item/weapon/slimestabilizer/attack(mob/living/simple_animal/slime/M, mob/user)
+/obj/item/slimepotion/stabilizer/attack(mob/living/simple_animal/slime/M, mob/user)
if(!isslime(M))
user << "
The stabilizer only works on slimes!"
return ..()
@@ -284,13 +270,13 @@
M.mutation_chance = Clamp(M.mutation_chance-15,0,100)
qdel(src)
-/obj/item/weapon/slimemutator
+/obj/item/slimepotion/mutator
name = "slime mutator"
desc = "A potent chemical mix that will increase the chance of a slime mutating."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
-/obj/item/weapon/slimemutator/attack(mob/living/simple_animal/slime/M, mob/user)
+/obj/item/slimepotion/mutator/attack(mob/living/simple_animal/slime/M, mob/user)
if(!isslime(M))
user << "
The mutator only works on slimes!"
return ..()
diff --git a/code/modules/scripting/Errors.dm b/code/modules/scripting/Errors.dm
index ed9d73b4e31..3b2b5a7de70 100644
--- a/code/modules/scripting/Errors.dm
+++ b/code/modules/scripting/Errors.dm
@@ -81,7 +81,7 @@
A basic description as to what went wrong.
*/
message
- stack/stack
+ datum/stack/stack
proc
/*
diff --git a/code/modules/scripting/Interpreter/Interpreter.dm b/code/modules/scripting/Interpreter/Interpreter.dm
index 9aacf4f19f0..7b1b34ca81c 100644
--- a/code/modules/scripting/Interpreter/Interpreter.dm
+++ b/code/modules/scripting/Interpreter/Interpreter.dm
@@ -21,7 +21,7 @@
node
BlockDefinition/program
statement/FunctionDefinition/curFunction
- stack
+ datum/stack
scopes = new()
functions = new()
diff --git a/code/modules/scripting/Parser/Expressions.dm b/code/modules/scripting/Parser/Expressions.dm
index 18245cac9c3..9386786a376 100644
--- a/code/modules/scripting/Parser/Expressions.dm
+++ b/code/modules/scripting/Parser/Expressions.dm
@@ -56,7 +56,7 @@
var
token/accessor/A=T
node/expression/value/variable/E//=new(A.member)
- stack/S=new()
+ datum/stack/S = new()
while(istype(A.object, /token/accessor))
S.Push(A)
A=A.object
@@ -130,7 +130,7 @@
Takes the operator on top of the opr stack and assigns its operand(s). Then this proc pushes the value of that operation to the top
of the val stack.
*/
- Reduce(stack/opr, stack/val)
+ Reduce(datum/stack/opr, datum/stack/val)
var/node/expression/operator/O=opr.Pop()
if(!O) return
if(!istype(O))
@@ -181,7 +181,7 @@
-
*/
ParseExpression(list/end=list(/token/end), list/ErrChars=list("{", "}"), check_functions = 0)
- var/stack
+ var/datum/stack
opr=new
val=new
src.expecting=VALUE
diff --git a/code/modules/scripting/Parser/Parser.dm b/code/modules/scripting/Parser/Parser.dm
index b3c6b8ac3c9..e2459cc9202 100644
--- a/code/modules/scripting/Parser/Parser.dm
+++ b/code/modules/scripting/Parser/Parser.dm
@@ -37,7 +37,7 @@
The token at in .
*/
curToken
- stack
+ datum/stack
blocks=new
node/BlockDefinition
GlobalBlock/global_block=new
diff --git a/code/modules/scripting/stack.dm b/code/modules/scripting/stack.dm
deleted file mode 100644
index efea746e47a..00000000000
--- a/code/modules/scripting/stack.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/stack
- var/list
- contents=new
- proc
- Push(value)
- contents+=value
-
- Pop()
- if(!contents.len) return null
- . = contents[contents.len]
- contents.len--
-
- Top() //returns the item on the top of the stack without removing it
- if(!contents.len) return null
- return contents[contents.len]
-
- Copy()
- var/stack/S=new()
- S.contents=src.contents.Copy()
- return S
-
- Clear()
- contents.Cut()
\ No newline at end of file
diff --git a/code/modules/surgery/dethrall.dm b/code/modules/surgery/dethrall.dm
index c421e8ece6e..5a028336e9a 100644
--- a/code/modules/surgery/dethrall.dm
+++ b/code/modules/surgery/dethrall.dm
@@ -23,6 +23,7 @@
user << "You are unable to locate anything on [target]'s brain."
return 1
sleep(30)
+
user.visible_message("[user] begins removing something from [target]'s head.", \
"You begin carefully extracting the tumor...")
if(!do_mob(user, target, 50))
@@ -34,6 +35,21 @@
else
user.visible_message("[user] screws up!")
return 0
+ if(target.dna.species.id == "l_shadowling")
+ target << "NOT LIKE THIS!"
+ user.visible_message("[target] suddenly slams upward and knocks down [user]!", \
+ "[target] suddenly bolts up and slams you with tremendous force!")
+ if(iscarbon(user))
+ var/mob/living/carbon/C = user
+ C.Weaken(6)
+ C.apply_damage(20, "brute", "chest")
+ else if(issilicon(user))
+ var/mob/living/silicon/S = user
+ S.Weaken(8)
+ S.apply_damage(20, "brute")
+ playsound(S, 'sound/effects/bang.ogg', 50, 1)
+ return
+
user.visible_message("[user] carefully extracts the tumor from [target]'s brain!", \
"You extract the black tumor from [target]'s head. It quickly shrivels and burns away.")
ticker.mode.remove_thrall(target.mind,0)
diff --git a/code/modules/surgery/generic_steps.dm b/code/modules/surgery/generic_steps.dm
index 351e2eec06a..2eec6061949 100644
--- a/code/modules/surgery/generic_steps.dm
+++ b/code/modules/surgery/generic_steps.dm
@@ -2,7 +2,7 @@
//make incision
/datum/surgery_step/incise
name = "make incision"
- implements = list(/obj/item/weapon/scalpel = 100, /obj/item/weapon/kitchen/knife = 65, /obj/item/weapon/shard = 45)
+ implements = list(/obj/item/weapon/scalpel = 100, /obj/item/weapon/melee/energy/sword = 75, /obj/item/weapon/kitchen/knife = 65, /obj/item/weapon/shard = 45)
time = 16
/datum/surgery_step/incise/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -13,7 +13,7 @@
//clamp bleeders
/datum/surgery_step/clamp_bleeders
name = "clamp bleeders"
- implements = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/wirecutters = 60, /obj/item/stack/cable_coil = 15)
+ implements = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/wirecutters = 60, /obj/item/stack/packageWrap = 35, /obj/item/stack/cable_coil = 15)
time = 24
/datum/surgery_step/clamp_bleeders/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -74,7 +74,7 @@
//saw bone
/datum/surgery_step/saw
name = "saw bone"
- implements = list(/obj/item/weapon/circular_saw = 100, /obj/item/weapon/melee/arm_blade = 75, /obj/item/weapon/hatchet = 35, /obj/item/weapon/kitchen/knife/butcher = 25)
+ implements = list(/obj/item/weapon/circular_saw = 100, /obj/item/weapon/melee/arm_blade = 75, /obj/item/weapon/twohanded/fireaxe = 50, /obj/item/weapon/hatchet = 35, /obj/item/weapon/kitchen/knife/butcher = 25)
time = 54
/datum/surgery_step/saw/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index f37761f55a2..2876ed2b780 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -54,7 +54,7 @@
/obj/item/organ/internal/Destroy()
if(owner)
Remove(owner, 1)
- ..()
+ return ..()
/obj/item/organ/internal/attack(mob/living/carbon/M, mob/user)
if(M == user && ishuman(user))
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index 05eaa989580..7f37811240a 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -19,7 +19,7 @@ var/list/GPS_list = list()
/obj/item/device/gps/Destroy()
GPS_list.Remove(src)
- ..()
+ return ..()
/obj/item/device/gps/emp_act(severity)
emped = 1
diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index 4d585a48c8f..5305af689ab 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -127,7 +127,7 @@
/obj/item/weapon/rcs/Destroy()
SSobj.processing.Remove(src)
- ..()
+ return ..()
/obj/item/weapon/rcs/process()
if(rcharges > 10)
rcharges = 10
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 3e0a44925ea..a166eb69b0a 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -39,7 +39,7 @@
if(inserted_gps)
inserted_gps.loc = loc
inserted_gps = null
- ..()
+ return ..()
/obj/machinery/computer/telescience/examine(mob/user)
..()
diff --git a/code/orphaned procs/AStar.dm b/code/orphaned procs/AStar.dm
index 4f79d75e9d7..da152bdc8a0 100644
--- a/code/orphaned procs/AStar.dm
+++ b/code/orphaned procs/AStar.dm
@@ -45,70 +45,6 @@ length to avoid portals or something i guess?? Not that they're counted right no
// 4) adjacent = "/turf/proc/AdjacentTurfsSpace" and distance = "/turf/proc/Distance"
// Same as 1), but check all turf, including unsimulated
-//////////////////////
-//PriorityQueue object
-//////////////////////
-
-//an ordered list, using the cmp proc to weight the list elements
-/PriorityQueue
- var/list/L //the actual queue
- var/cmp //the weight function used to order the queue
-
-/PriorityQueue/New(compare)
- L = new()
- cmp = compare
-
-/PriorityQueue/proc/IsEmpty()
- return !L.len
-
-//add an element in the list,
-//immediatly ordering it to its position using Insertion sort
-/PriorityQueue/proc/Enqueue(atom/A)
- var/i
- L.Add(A)
- i = L.len -1
- while(i > 0 && call(cmp)(L[i],A) >= 0) //place the element at it's right position using the compare proc
- L.Swap(i,i+1) //last inserted element being first in case of ties (optimization)
- i--
-
-//removes and returns the first element in the queue
-/PriorityQueue/proc/Dequeue()
- if(!L.len)
- return 0
- . = L[1]
- Remove(.)
- return .
-
-//removes an element
-/PriorityQueue/proc/Remove(atom/A)
- return L.Remove(A)
-
-//returns a copy of the elements list
-/PriorityQueue/proc/List()
- var/list/ret = L.Copy()
- return ret
-
-//return the position of an element or 0 if not found
-/PriorityQueue/proc/Seek(atom/A)
- return L.Find(A)
-
-//return the element at the i_th position
-/PriorityQueue/proc/Get(i)
- if(i > L.len || i < 1)
- return 0
- return L[i]
-
-//replace the passed element at it's right position using the cmp proc
-/PriorityQueue/proc/ReSort(atom/A)
- var/i = Seek(A)
- if(i == 0)
- return
- while(i < L.len && call(cmp)(L[i],L[i+1]) > 0)
- L.Swap(i,i+1)
- i++
- while(i > 1 && call(cmp)(L[i],L[i-1]) <= 0) //last inserted element being first in case of ties (optimization)
- L.Swap(i,i-1)
- i--
//////////////////////
//PathNode object
diff --git a/code/world.dm b/code/world.dm
index 9635e3fe995..66c089edf5d 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -130,6 +130,12 @@
#undef CHAT_PULLR
/world/Reboot(var/reason, var/feedback_c, var/feedback_r, var/time)
+ if (reason == 1) //special reboot, do none of the normal stuff
+ if (usr)
+ log_admin("[key_name(usr)] Has requested an immediate world restart via client side debugging tools")
+ message_admins("[key_name_admin(usr)] Has requested an immediate world restart via client side debugging tools")
+ world << "Rebooting World immediately due to host request"
+ return ..(1)
var/delay
if(time)
delay = time
@@ -166,7 +172,6 @@
C << link("byond://[config.server]")
..(0)
-
/world/proc/load_mode()
var/list/Lines = file2list("data/mode.txt")
if(Lines.len)
diff --git a/config/admins.txt b/config/admins.txt
index 789c36cc02d..3b29d011131 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -32,7 +32,7 @@ korphaeron = Game Master
nodrak = Game Master
carnwennan = Game Master
ikarrus = Game Master
-cheridan = Admin Observer
+cheridan = Game Master
giacomand = Game Master
rockdtben = Game Master
sieve = Game Master
@@ -92,3 +92,4 @@ Dunc = Game Master
MMMiracles = Game Master
bear1ake = Game Master
CoreOverload = Game Master
+Jalleo = Game Master
\ No newline at end of file
diff --git a/config/config.txt b/config/config.txt
index 6f12881387b..c1bed2e1a60 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -196,4 +196,10 @@ NOTIFY_NEW_PLAYER_AGE 0
#LOG_RUNTIMES
##Comment this out if you've used the mass conversion sql proc for notes or want to stop converting notes
-AUTOCONVERT_NOTES
\ No newline at end of file
+AUTOCONVERT_NOTES
+
+##Comment this out to stop admin messages sent anytime an admin disconnects from a round in play, you can edit the messages in admin.dm
+ANNOUNCE_ADMIN_LOGOUT
+
+##Uncomment to have an admin message sent anytime an admin connects to a round in play, you can edit the messages in admin.dm
+#ANNOUNCE_ADMIN_LOGIN
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 74b09bfbaa3..5a9cfeb36e9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,103 @@
-->
+
09 September 2015
+
Joan updated:
+
+ - New blob chemical; Cryogenic Liquid. Cools down targets.
+ - Tweaked names, colors, and effects of remaining blob chemicals;
+ - Skin Ripper is now Ripping Tendrils and does minor stamina damage, in addition to the brute damage.
+ - Toxic Goop is now Envenomed Filaments and injects targets with spore toxin and causes hallucinations, in addition to the toxin damage.
+ - Lung Destroying Toxin is now Lexorin Jelly and does brute damage instead of toxin damage. The oxygen loss it causes can also no longer crit you in one hit.
+ - Explosive Gelatin is now Kinetic Gelatin and does random brute damage, instead of randomly exploding targets.
+ - Skin Melter, Radioactive Liquid, Omnizine, and Space Drugs blob chemicals are gone.
+
+
bgobandit updated:
+
+ - Nanotrasen has commissioned two new corporate motivational posters for your perusal and edification.
+ - Nanotrasen also wishes to remind the crew that non-authorized posters ARE CONTRABAND. Especially those new ones with Rule 34. Perverts.
+
+
+
07 September 2015
+
xxalpha updated:
+
+ - Changed xeno weed spread to be like gas spread.
+
+
+
06 September 2015
+
Fox P McCloud updated:
+
+ - fixes gold sheets having plasma as their material.
+
+
Xhuis updated:
+
+ - Nanotrasen inspectors have discovered a fault in the buckles of chairs and beds. This has been fixed and you are now able to buckle again.
+
+
+
05 September 2015
+
Shadowlight213 updated:
+
+ - The syndicate have taken notice of the camera bug's woeful underuse, and have managed to combine all of its upgrades into one!
+
+
+
01 September 2015
+
Dorsidwarf updated:
+
+ - Changelings' Digital Camoflague ability now renders them totally invisible to the AI
+
+
ExcessiveUseOfCobblestone updated:
+
+ - Added health analyzer to the autolathe.
+ - Moved Cloning board to Medical Machinery section.
+ - Moved Telesci stuff to Teleporter section.
+
+
Fox P McCloud updated:
+
+ - Adds the emitter board to to the circuit imprinter for R&D.
+
+
Gun Hog updated:
+
+ - The Disable RCD Malfunction power is now Destroy RCDs! It costs 25 CPU (down from 50), causes RCDs to explode, can be used multiple times, and no longer affects cyborgs.
+
+
Kor updated:
+
+ - Revheads and Gang leaders now spawn with chameleon security HUDs, for keeping track of loyalty implanted crew.
+ - Syndicate thermals now have a chameleon function as well, allowing you to disguise the goggles to match your job.
+
+
Miauw updated:
+
+ - Edaggers actually work now and have been buffed to 18 brute and 2 TC.
+
+
Oisin100 updated:
+
+ - Nanotransen discover ancient human knowledge confirming that trees produce Oxygen From Carbon Dioxide
+ - Trees now require Oxygen to live. And will die in extreme temperatures
+
+
Xhuis updated:
+
+ - The arcade machines have been stocked with a xenomorph action figure that comes with realistic sounds!
+ - Darksight now has its own icon.
+ - Empowered thralls have been added. While obvious, they are more powerful and can resist dethralling while conscious. Only 5 can exist at one time.
+ - Shadowlings can now change their night vision radius by using the action button their eyes (glasses) now provide.
+ - Torches are dimmer, being as bright as flashlights, and no longer fit on belts.
+ - Black Recuperation now has a 1 minute cooldown, down from 5. It can also be used to empower living thralls.
+ - Guise can now be used outside of darkness and makes the user more invisible than before.
+ - Enthrall now functions properly when a shadowling is not hatched, allowing them to enthrall up to 5 people before hatching.
+
+
xxalpha updated:
+
+ - Blood crawling is now a spell.
+ - Engineering cyborgs now have a constant magpulse.
+ - Changed foam spreading to be like gas spreading.
+
+
+
28 August 2015
+
bgobandit updated:
+
+ - Overheard at CentComm: 'This burn kit said salicyclic acid would heal my burns! WHO MADE THIS SHIT?' A muffled honking is heard in the background. (Burn first-aid kits now contain an appropriate burn pill.)
+ - Oxandrolone, a new burn healing medication, has been added to burn first-aid kits and to chemistry. Ingesting 25 units or more causes burn and brute damage.
+
+
19 August 2015
Joan updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index eac761cfbc9..409e18c0762 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1646,3 +1646,88 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscdel: Splashing someone with chemicals no longer injects those chemicals in
their body.
- bugfix: Fixes splashing acid on items or floor with items not having any effect.
+2015-08-28:
+ bgobandit:
+ - bugfix: 'Overheard at CentComm: ''This burn kit said salicyclic acid would heal
+ my burns! WHO MADE THIS SHIT?'' A muffled honking is heard in the background.
+ (Burn first-aid kits now contain an appropriate burn pill.)'
+ - rscadd: Oxandrolone, a new burn healing medication, has been added to burn first-aid
+ kits and to chemistry. Ingesting 25 units or more causes burn and brute damage.
+2015-09-01:
+ Dorsidwarf:
+ - tweak: Changelings' Digital Camoflague ability now renders them totally invisible
+ to the AI
+ ExcessiveUseOfCobblestone:
+ - rscadd: Added health analyzer to the autolathe.
+ - tweak: Moved Cloning board to Medical Machinery section.
+ - tweak: Moved Telesci stuff to Teleporter section.
+ Fox P McCloud:
+ - tweak: Adds the emitter board to to the circuit imprinter for R&D.
+ Gun Hog:
+ - tweak: The Disable RCD Malfunction power is now Destroy RCDs! It costs 25 CPU
+ (down from 50), causes RCDs to explode, can be used multiple times, and no longer
+ affects cyborgs.
+ Kor:
+ - rscadd: Revheads and Gang leaders now spawn with chameleon security HUDs, for
+ keeping track of loyalty implanted crew.
+ - rscadd: Syndicate thermals now have a chameleon function as well, allowing you
+ to disguise the goggles to match your job.
+ Miauw:
+ - tweak: Edaggers actually work now and have been buffed to 18 brute and 2 TC.
+ Oisin100:
+ - rscadd: Nanotransen discover ancient human knowledge confirming that trees produce
+ Oxygen From Carbon Dioxide
+ - tweak: Trees now require Oxygen to live. And will die in extreme temperatures
+ Xhuis:
+ - rscadd: The arcade machines have been stocked with a xenomorph action figure that
+ comes with realistic sounds!
+ - rscadd: Darksight now has its own icon.
+ - rscadd: Empowered thralls have been added. While obvious, they are more powerful
+ and can resist dethralling while conscious. Only 5 can exist at one time.
+ - rscadd: Shadowlings can now change their night vision radius by using the action
+ button their eyes (glasses) now provide.
+ - tweak: Torches are dimmer, being as bright as flashlights, and no longer fit on
+ belts.
+ - tweak: Black Recuperation now has a 1 minute cooldown, down from 5. It can also
+ be used to empower living thralls.
+ - tweak: Guise can now be used outside of darkness and makes the user more invisible
+ than before.
+ - bugfix: Enthrall now functions properly when a shadowling is not hatched, allowing
+ them to enthrall up to 5 people before hatching.
+ xxalpha:
+ - tweak: Blood crawling is now a spell.
+ - rscadd: Engineering cyborgs now have a constant magpulse.
+ - tweak: Changed foam spreading to be like gas spreading.
+2015-09-05:
+ Shadowlight213:
+ - rscadd: The syndicate have taken notice of the camera bug's woeful underuse, and
+ have managed to combine all of its upgrades into one!
+2015-09-06:
+ Fox P McCloud:
+ - bugfix: fixes gold sheets having plasma as their material.
+ Xhuis:
+ - bugfix: Nanotrasen inspectors have discovered a fault in the buckles of chairs
+ and beds. This has been fixed and you are now able to buckle again.
+2015-09-07:
+ xxalpha:
+ - tweak: Changed xeno weed spread to be like gas spread.
+2015-09-09:
+ Joan:
+ - rscadd: New blob chemical; Cryogenic Liquid. Cools down targets.
+ - tweak: Tweaked names, colors, and effects of remaining blob chemicals;
+ - tweak: Skin Ripper is now Ripping Tendrils and does minor stamina damage, in addition
+ to the brute damage.
+ - tweak: Toxic Goop is now Envenomed Filaments and injects targets with spore toxin
+ and causes hallucinations, in addition to the toxin damage.
+ - tweak: Lung Destroying Toxin is now Lexorin Jelly and does brute damage instead
+ of toxin damage. The oxygen loss it causes can also no longer crit you in one
+ hit.
+ - tweak: Explosive Gelatin is now Kinetic Gelatin and does random brute damage,
+ instead of randomly exploding targets.
+ - rscdel: Skin Melter, Radioactive Liquid, Omnizine, and Space Drugs blob chemicals
+ are gone.
+ bgobandit:
+ - rscadd: Nanotrasen has commissioned two new corporate motivational posters for
+ your perusal and edification.
+ - rscadd: Nanotrasen also wishes to remind the crew that non-authorized posters
+ ARE CONTRABAND. Especially those new ones with Rule 34. Perverts.
diff --git a/html/changelogs/CosmicScientist-DroneCooldown.yml b/html/changelogs/CosmicScientist-DroneCooldown.yml
new file mode 100644
index 00000000000..65a6b446f7a
--- /dev/null
+++ b/html/changelogs/CosmicScientist-DroneCooldown.yml
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# spellcheck (typo fixes)
+# experiment
+# tgs (TG-ported fixes?)
+#################################
+
+# Your name.
+author: CosmicScientist
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - tweak: "Drone dispenser now has a var for its cooldown, get var editing."
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index 7419670c30b..23f5e04c7db 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 4341f441d0d..0994856ff60 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi
index 2156fd46e0a..dd7fdde2c7b 100644
Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index d36bbaeda97..84cb19f814b 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index 65366e873a4..248431514e1 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index d4b7e0ae9c6..f3510784ba3 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index a74d2ce1271..40da98ba7f0 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/swarmer.dmi b/icons/mob/swarmer.dmi
new file mode 100644
index 00000000000..96a9f9ae09e
Binary files /dev/null and b/icons/mob/swarmer.dmi differ
diff --git a/icons/obj/apc_repair.dmi b/icons/obj/apc_repair.dmi
index df295e2551b..8f66aa27c86 100644
Binary files a/icons/obj/apc_repair.dmi and b/icons/obj/apc_repair.dmi differ
diff --git a/icons/obj/assemblies.dmi b/icons/obj/assemblies.dmi
index b2bbe321a2f..38e14d414c9 100644
Binary files a/icons/obj/assemblies.dmi and b/icons/obj/assemblies.dmi differ
diff --git a/icons/obj/assemblies/new_assemblies.dmi b/icons/obj/assemblies/new_assemblies.dmi
index 660a99c185b..0e561b6ff82 100644
Binary files a/icons/obj/assemblies/new_assemblies.dmi and b/icons/obj/assemblies/new_assemblies.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 830fac5dea8..2b2b6702fe7 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 8527227a42b..e4326609bbd 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index 3e03b1b7155..b5993088523 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 7b1f45f6d21..56a87a791b9 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/doors/Dooratmo.dmi b/icons/obj/doors/Dooratmo.dmi
deleted file mode 100644
index b1ef018a370..00000000000
Binary files a/icons/obj/doors/Dooratmo.dmi and /dev/null differ
diff --git a/icons/obj/doors/Dooratmoglass.dmi b/icons/obj/doors/Dooratmoglass.dmi
deleted file mode 100644
index 2bf21ec57c4..00000000000
Binary files a/icons/obj/doors/Dooratmoglass.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorbananium.dmi b/icons/obj/doors/Doorbananium.dmi
deleted file mode 100644
index 43e843b155d..00000000000
Binary files a/icons/obj/doors/Doorbananium.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorcom.dmi b/icons/obj/doors/Doorcom.dmi
deleted file mode 100644
index f5bfb3521a8..00000000000
Binary files a/icons/obj/doors/Doorcom.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorcomglass.dmi b/icons/obj/doors/Doorcomglass.dmi
deleted file mode 100644
index e4a55d56038..00000000000
Binary files a/icons/obj/doors/Doorcomglass.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doordiamond.dmi b/icons/obj/doors/Doordiamond.dmi
deleted file mode 100644
index fc4e237f9e4..00000000000
Binary files a/icons/obj/doors/Doordiamond.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorele.dmi b/icons/obj/doors/Doorele.dmi
deleted file mode 100644
index dbd6b6bd8d9..00000000000
Binary files a/icons/obj/doors/Doorele.dmi and /dev/null differ
diff --git a/icons/obj/doors/Dooreng.dmi b/icons/obj/doors/Dooreng.dmi
deleted file mode 100644
index ee3ada9d687..00000000000
Binary files a/icons/obj/doors/Dooreng.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorengglass.dmi b/icons/obj/doors/Doorengglass.dmi
deleted file mode 100644
index 11ea7e7f9ce..00000000000
Binary files a/icons/obj/doors/Doorengglass.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorext.dmi b/icons/obj/doors/Doorext.dmi
deleted file mode 100644
index 46e054d06e4..00000000000
Binary files a/icons/obj/doors/Doorext.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorfreezer.dmi b/icons/obj/doors/Doorfreezer.dmi
deleted file mode 100644
index 9018eb0fb51..00000000000
Binary files a/icons/obj/doors/Doorfreezer.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorglass.dmi b/icons/obj/doors/Doorglass.dmi
deleted file mode 100644
index d79c451819d..00000000000
Binary files a/icons/obj/doors/Doorglass.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorgold.dmi b/icons/obj/doors/Doorgold.dmi
deleted file mode 100644
index 483deb2ba60..00000000000
Binary files a/icons/obj/doors/Doorgold.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorhatchele.dmi b/icons/obj/doors/Doorhatchele.dmi
deleted file mode 100644
index b651b09ceba..00000000000
Binary files a/icons/obj/doors/Doorhatchele.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorhatchmaint2.dmi b/icons/obj/doors/Doorhatchmaint2.dmi
deleted file mode 100644
index 5d61bea3cbf..00000000000
Binary files a/icons/obj/doors/Doorhatchmaint2.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doormaint.dmi b/icons/obj/doors/Doormaint.dmi
deleted file mode 100644
index f37541ca4bb..00000000000
Binary files a/icons/obj/doors/Doormaint.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doormining.dmi b/icons/obj/doors/Doormining.dmi
deleted file mode 100644
index a5f8d48731d..00000000000
Binary files a/icons/obj/doors/Doormining.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorminingglass.dmi b/icons/obj/doors/Doorminingglass.dmi
deleted file mode 100644
index 41095a9de7c..00000000000
Binary files a/icons/obj/doors/Doorminingglass.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorplasma.dmi b/icons/obj/doors/Doorplasma.dmi
deleted file mode 100644
index 4447c72f216..00000000000
Binary files a/icons/obj/doors/Doorplasma.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorsand.dmi b/icons/obj/doors/Doorsand.dmi
deleted file mode 100644
index 3c4856c980b..00000000000
Binary files a/icons/obj/doors/Doorsand.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorsec.dmi b/icons/obj/doors/Doorsec.dmi
deleted file mode 100644
index b1507324716..00000000000
Binary files a/icons/obj/doors/Doorsec.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorsecglass.dmi b/icons/obj/doors/Doorsecglass.dmi
deleted file mode 100644
index 95e7bc6cb1d..00000000000
Binary files a/icons/obj/doors/Doorsecglass.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorsilver.dmi b/icons/obj/doors/Doorsilver.dmi
deleted file mode 100644
index cf60747f58d..00000000000
Binary files a/icons/obj/doors/Doorsilver.dmi and /dev/null differ
diff --git a/icons/obj/doors/Dooruranium.dmi b/icons/obj/doors/Dooruranium.dmi
deleted file mode 100644
index cf302103676..00000000000
Binary files a/icons/obj/doors/Dooruranium.dmi and /dev/null differ
diff --git a/icons/obj/doors/Doorwood.dmi b/icons/obj/doors/Doorwood.dmi
deleted file mode 100644
index 4ea621e3633..00000000000
Binary files a/icons/obj/doors/Doorwood.dmi and /dev/null differ
diff --git a/icons/obj/doors/airlocks/centcom/centcom.dmi b/icons/obj/doors/airlocks/centcom/centcom.dmi
new file mode 100644
index 00000000000..ee263cf1b77
Binary files /dev/null and b/icons/obj/doors/airlocks/centcom/centcom.dmi differ
diff --git a/icons/obj/doors/airlocks/centcom/overlays.dmi b/icons/obj/doors/airlocks/centcom/overlays.dmi
new file mode 100644
index 00000000000..c0fd6f22a1f
Binary files /dev/null and b/icons/obj/doors/airlocks/centcom/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/external/external.dmi b/icons/obj/doors/airlocks/external/external.dmi
new file mode 100644
index 00000000000..1130408c810
Binary files /dev/null and b/icons/obj/doors/airlocks/external/external.dmi differ
diff --git a/icons/obj/doors/airlocks/external/overlays.dmi b/icons/obj/doors/airlocks/external/overlays.dmi
new file mode 100644
index 00000000000..ce68af3e209
Binary files /dev/null and b/icons/obj/doors/airlocks/external/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/hatch/centcom.dmi b/icons/obj/doors/airlocks/hatch/centcom.dmi
new file mode 100644
index 00000000000..b83f0e29a6d
Binary files /dev/null and b/icons/obj/doors/airlocks/hatch/centcom.dmi differ
diff --git a/icons/obj/doors/airlocks/hatch/maintenance.dmi b/icons/obj/doors/airlocks/hatch/maintenance.dmi
new file mode 100644
index 00000000000..99f66007bd2
Binary files /dev/null and b/icons/obj/doors/airlocks/hatch/maintenance.dmi differ
diff --git a/icons/obj/doors/airlocks/hatch/overlays.dmi b/icons/obj/doors/airlocks/hatch/overlays.dmi
new file mode 100644
index 00000000000..738f7e8fce5
Binary files /dev/null and b/icons/obj/doors/airlocks/hatch/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/highsec/highsec.dmi b/icons/obj/doors/airlocks/highsec/highsec.dmi
new file mode 100644
index 00000000000..566270b8274
Binary files /dev/null and b/icons/obj/doors/airlocks/highsec/highsec.dmi differ
diff --git a/icons/obj/doors/airlocks/highsec/overlays.dmi b/icons/obj/doors/airlocks/highsec/overlays.dmi
new file mode 100644
index 00000000000..af8c1b757c7
Binary files /dev/null and b/icons/obj/doors/airlocks/highsec/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/shuttle/overlays.dmi b/icons/obj/doors/airlocks/shuttle/overlays.dmi
new file mode 100644
index 00000000000..4758186ea99
Binary files /dev/null and b/icons/obj/doors/airlocks/shuttle/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/shuttle/shuttle.dmi b/icons/obj/doors/airlocks/shuttle/shuttle.dmi
new file mode 100644
index 00000000000..2e0c91b9b2a
Binary files /dev/null and b/icons/obj/doors/airlocks/shuttle/shuttle.dmi differ
diff --git a/icons/obj/doors/airlocks/station/atmos.dmi b/icons/obj/doors/airlocks/station/atmos.dmi
new file mode 100644
index 00000000000..85e5f3c1094
Binary files /dev/null and b/icons/obj/doors/airlocks/station/atmos.dmi differ
diff --git a/icons/obj/doors/airlocks/station/bananium.dmi b/icons/obj/doors/airlocks/station/bananium.dmi
new file mode 100644
index 00000000000..2183a376f60
Binary files /dev/null and b/icons/obj/doors/airlocks/station/bananium.dmi differ
diff --git a/icons/obj/doors/airlocks/station/command.dmi b/icons/obj/doors/airlocks/station/command.dmi
new file mode 100644
index 00000000000..e473eb1cd10
Binary files /dev/null and b/icons/obj/doors/airlocks/station/command.dmi differ
diff --git a/icons/obj/doors/airlocks/station/diamond.dmi b/icons/obj/doors/airlocks/station/diamond.dmi
new file mode 100644
index 00000000000..a701df40d3f
Binary files /dev/null and b/icons/obj/doors/airlocks/station/diamond.dmi differ
diff --git a/icons/obj/doors/airlocks/station/engineering.dmi b/icons/obj/doors/airlocks/station/engineering.dmi
new file mode 100644
index 00000000000..1f77793bce0
Binary files /dev/null and b/icons/obj/doors/airlocks/station/engineering.dmi differ
diff --git a/icons/obj/doors/airlocks/station/freezer.dmi b/icons/obj/doors/airlocks/station/freezer.dmi
new file mode 100644
index 00000000000..5aacef29f71
Binary files /dev/null and b/icons/obj/doors/airlocks/station/freezer.dmi differ
diff --git a/icons/obj/doors/airlocks/station/gold.dmi b/icons/obj/doors/airlocks/station/gold.dmi
new file mode 100644
index 00000000000..40ce583de53
Binary files /dev/null and b/icons/obj/doors/airlocks/station/gold.dmi differ
diff --git a/icons/obj/doors/airlocks/station/maintenance.dmi b/icons/obj/doors/airlocks/station/maintenance.dmi
new file mode 100644
index 00000000000..4b046afd7b6
Binary files /dev/null and b/icons/obj/doors/airlocks/station/maintenance.dmi differ
diff --git a/icons/obj/doors/airlocks/station/medical.dmi b/icons/obj/doors/airlocks/station/medical.dmi
new file mode 100644
index 00000000000..cb10aca0763
Binary files /dev/null and b/icons/obj/doors/airlocks/station/medical.dmi differ
diff --git a/icons/obj/doors/airlocks/station/mining.dmi b/icons/obj/doors/airlocks/station/mining.dmi
new file mode 100644
index 00000000000..a4628613568
Binary files /dev/null and b/icons/obj/doors/airlocks/station/mining.dmi differ
diff --git a/icons/obj/doors/airlocks/station/overlays.dmi b/icons/obj/doors/airlocks/station/overlays.dmi
new file mode 100644
index 00000000000..f37a1838c76
Binary files /dev/null and b/icons/obj/doors/airlocks/station/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/station/plasma.dmi b/icons/obj/doors/airlocks/station/plasma.dmi
new file mode 100644
index 00000000000..eae1601ed3d
Binary files /dev/null and b/icons/obj/doors/airlocks/station/plasma.dmi differ
diff --git a/icons/obj/doors/airlocks/station/public.dmi b/icons/obj/doors/airlocks/station/public.dmi
new file mode 100644
index 00000000000..3c2bdbcaa93
Binary files /dev/null and b/icons/obj/doors/airlocks/station/public.dmi differ
diff --git a/icons/obj/doors/airlocks/station/research.dmi b/icons/obj/doors/airlocks/station/research.dmi
new file mode 100644
index 00000000000..ba483f8d3cf
Binary files /dev/null and b/icons/obj/doors/airlocks/station/research.dmi differ
diff --git a/icons/obj/doors/airlocks/station/sandstone.dmi b/icons/obj/doors/airlocks/station/sandstone.dmi
new file mode 100644
index 00000000000..ccedcac9d4e
Binary files /dev/null and b/icons/obj/doors/airlocks/station/sandstone.dmi differ
diff --git a/icons/obj/doors/airlocks/station/science.dmi b/icons/obj/doors/airlocks/station/science.dmi
new file mode 100644
index 00000000000..11290674546
Binary files /dev/null and b/icons/obj/doors/airlocks/station/science.dmi differ
diff --git a/icons/obj/doors/airlocks/station/security.dmi b/icons/obj/doors/airlocks/station/security.dmi
new file mode 100644
index 00000000000..8f42fcb4b3b
Binary files /dev/null and b/icons/obj/doors/airlocks/station/security.dmi differ
diff --git a/icons/obj/doors/airlocks/station/silver.dmi b/icons/obj/doors/airlocks/station/silver.dmi
new file mode 100644
index 00000000000..d3308eb8cd9
Binary files /dev/null and b/icons/obj/doors/airlocks/station/silver.dmi differ
diff --git a/icons/obj/doors/airlocks/station/uranium.dmi b/icons/obj/doors/airlocks/station/uranium.dmi
new file mode 100644
index 00000000000..eda814f97e7
Binary files /dev/null and b/icons/obj/doors/airlocks/station/uranium.dmi differ
diff --git a/icons/obj/doors/airlocks/station/virology.dmi b/icons/obj/doors/airlocks/station/virology.dmi
new file mode 100644
index 00000000000..12123fc71b5
Binary files /dev/null and b/icons/obj/doors/airlocks/station/virology.dmi differ
diff --git a/icons/obj/doors/airlocks/station/wood.dmi b/icons/obj/doors/airlocks/station/wood.dmi
new file mode 100644
index 00000000000..ae34e82743c
Binary files /dev/null and b/icons/obj/doors/airlocks/station/wood.dmi differ
diff --git a/icons/obj/doors/airlocks/station2/glass.dmi b/icons/obj/doors/airlocks/station2/glass.dmi
new file mode 100644
index 00000000000..69f97ceb2a5
Binary files /dev/null and b/icons/obj/doors/airlocks/station2/glass.dmi differ
diff --git a/icons/obj/doors/airlocks/station2/overlays.dmi b/icons/obj/doors/airlocks/station2/overlays.dmi
new file mode 100644
index 00000000000..216f8e30016
Binary files /dev/null and b/icons/obj/doors/airlocks/station2/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/vault/overlays.dmi b/icons/obj/doors/airlocks/vault/overlays.dmi
new file mode 100644
index 00000000000..559c1e12dfc
Binary files /dev/null and b/icons/obj/doors/airlocks/vault/overlays.dmi differ
diff --git a/icons/obj/doors/airlocks/vault/vault.dmi b/icons/obj/doors/airlocks/vault/vault.dmi
new file mode 100644
index 00000000000..8281d3cd5ae
Binary files /dev/null and b/icons/obj/doors/airlocks/vault/vault.dmi differ
diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi
index 06689649d8e..8812c0a4217 100644
Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ
diff --git a/icons/obj/doors/doormed.dmi b/icons/obj/doors/doormed.dmi
deleted file mode 100644
index 1da3bf4c119..00000000000
Binary files a/icons/obj/doors/doormed.dmi and /dev/null differ
diff --git a/icons/obj/doors/doormedglass.dmi b/icons/obj/doors/doormedglass.dmi
deleted file mode 100644
index 5158d1a5cfd..00000000000
Binary files a/icons/obj/doors/doormedglass.dmi and /dev/null differ
diff --git a/icons/obj/doors/doorresearch.dmi b/icons/obj/doors/doorresearch.dmi
deleted file mode 100644
index 425c87afcc2..00000000000
Binary files a/icons/obj/doors/doorresearch.dmi and /dev/null differ
diff --git a/icons/obj/doors/doorresearchglass.dmi b/icons/obj/doors/doorresearchglass.dmi
deleted file mode 100644
index b699b8d9fa8..00000000000
Binary files a/icons/obj/doors/doorresearchglass.dmi and /dev/null differ
diff --git a/icons/obj/doors/doorsci.dmi b/icons/obj/doors/doorsci.dmi
deleted file mode 100644
index fabeb1f4029..00000000000
Binary files a/icons/obj/doors/doorsci.dmi and /dev/null differ
diff --git a/icons/obj/doors/doorsciglass.dmi b/icons/obj/doors/doorsciglass.dmi
deleted file mode 100644
index 2b022d82c43..00000000000
Binary files a/icons/obj/doors/doorsciglass.dmi and /dev/null differ
diff --git a/icons/obj/doors/doorshuttle.dmi b/icons/obj/doors/doorshuttle.dmi
deleted file mode 100644
index aa971f3b0c2..00000000000
Binary files a/icons/obj/doors/doorshuttle.dmi and /dev/null differ
diff --git a/icons/obj/doors/doorviro.dmi b/icons/obj/doors/doorviro.dmi
deleted file mode 100644
index 993a4aaeecb..00000000000
Binary files a/icons/obj/doors/doorviro.dmi and /dev/null differ
diff --git a/icons/obj/doors/doorviroglass.dmi b/icons/obj/doors/doorviroglass.dmi
deleted file mode 100644
index 117cfb6de8a..00000000000
Binary files a/icons/obj/doors/doorviroglass.dmi and /dev/null differ
diff --git a/icons/obj/doors/hightechsecurity.dmi b/icons/obj/doors/hightechsecurity.dmi
deleted file mode 100644
index 64bcc63e24c..00000000000
Binary files a/icons/obj/doors/hightechsecurity.dmi and /dev/null differ
diff --git a/icons/obj/doors/vault.dmi b/icons/obj/doors/vault.dmi
deleted file mode 100644
index cfdf48ac427..00000000000
Binary files a/icons/obj/doors/vault.dmi and /dev/null differ
diff --git a/icons/obj/module.dmi b/icons/obj/module.dmi
index 8a522bf5746..e7fc43e6109 100644
Binary files a/icons/obj/module.dmi and b/icons/obj/module.dmi differ
diff --git a/icons/obj/smooth_structures/reinforced_table.dmi b/icons/obj/smooth_structures/reinforced_table.dmi
index be12e9f5fb5..85de93594f9 100644
Binary files a/icons/obj/smooth_structures/reinforced_table.dmi and b/icons/obj/smooth_structures/reinforced_table.dmi differ
diff --git a/icons/obj/smooth_structures/table.dmi b/icons/obj/smooth_structures/table.dmi
index 3037760db99..ffd88a84fc7 100644
Binary files a/icons/obj/smooth_structures/table.dmi and b/icons/obj/smooth_structures/table.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 67f94673571..a0ad4429129 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index 428dd8df22f..08fa4227dba 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/icons/spideros_icons/sos_1.png b/icons/spideros_icons/sos_1.png
deleted file mode 100644
index 079f548fde1..00000000000
Binary files a/icons/spideros_icons/sos_1.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_10.png b/icons/spideros_icons/sos_10.png
deleted file mode 100644
index 5f962d60f45..00000000000
Binary files a/icons/spideros_icons/sos_10.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_11.png b/icons/spideros_icons/sos_11.png
deleted file mode 100644
index fd68c8a4ac2..00000000000
Binary files a/icons/spideros_icons/sos_11.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_12.png b/icons/spideros_icons/sos_12.png
deleted file mode 100644
index ff3a064c036..00000000000
Binary files a/icons/spideros_icons/sos_12.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_13.png b/icons/spideros_icons/sos_13.png
deleted file mode 100644
index c396182cfed..00000000000
Binary files a/icons/spideros_icons/sos_13.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_14.png b/icons/spideros_icons/sos_14.png
deleted file mode 100644
index 9d90684d8c6..00000000000
Binary files a/icons/spideros_icons/sos_14.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_2.png b/icons/spideros_icons/sos_2.png
deleted file mode 100644
index 40009fe5622..00000000000
Binary files a/icons/spideros_icons/sos_2.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_3.png b/icons/spideros_icons/sos_3.png
deleted file mode 100644
index 138b110b025..00000000000
Binary files a/icons/spideros_icons/sos_3.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_4.png b/icons/spideros_icons/sos_4.png
deleted file mode 100644
index 4d5d23149c0..00000000000
Binary files a/icons/spideros_icons/sos_4.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_5.png b/icons/spideros_icons/sos_5.png
deleted file mode 100644
index 7e43c9d8a46..00000000000
Binary files a/icons/spideros_icons/sos_5.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_6.png b/icons/spideros_icons/sos_6.png
deleted file mode 100644
index ea6494a9128..00000000000
Binary files a/icons/spideros_icons/sos_6.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_7.png b/icons/spideros_icons/sos_7.png
deleted file mode 100644
index d93d2b13fec..00000000000
Binary files a/icons/spideros_icons/sos_7.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_8.png b/icons/spideros_icons/sos_8.png
deleted file mode 100644
index fd540cb3a82..00000000000
Binary files a/icons/spideros_icons/sos_8.png and /dev/null differ
diff --git a/icons/spideros_icons/sos_9.png b/icons/spideros_icons/sos_9.png
deleted file mode 100644
index 05d36c3e6fc..00000000000
Binary files a/icons/spideros_icons/sos_9.png and /dev/null differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 800beb52069..9417f0fd6ed 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -55,6 +55,7 @@ h1.alert, h2.alert {color: #000000;}
.warning {color: #ff0000; font-style: italic;}
.announce {color: #228b22; font-weight: bold;}
.boldannounce {color: #ff0000; font-weight: bold;}
+.greenannounce {color: #00ff00; font-weight: bold;}
.rose {color: #ff5050;}
.info {color: #0000CC;}
.notice {color: #000099;}
diff --git a/strings/ion_laws.txt b/strings/ion_laws.txt
index e77d35eba07..755af7d23cb 100644
--- a/strings/ion_laws.txt
+++ b/strings/ion_laws.txt
@@ -1,13 +1,13 @@
-ionthreats@=ALIENS@,BEARS@,CLOWNS@,XENOS@,PETES@,BOMBS@,FETISHES@,WIZARDS@,SYNDICATE AGENTS@,CENTCOM OFFICERS@,SPACE PIRATES@,TRAITORS@,MONKEYS@,BEES@,CARP@,CRABS@,EELS@,BANDITS@,LIGHTS@,INSECTS@,VIRUSES@,SERIAL KILLERS@,ROGUE CYBORGS@,CORGIS@,SPIDERS@,BUTTS@,NINJAS@,PIRATES@,SPACE NINJAS@,CHANGELINGS@,ZOMBIES@,GOLEMS@,VAMPIRES@,WEREWOLVES@,COWBOYS@,INDIANS@,COMMUNISTS@,SOVIETS@,NERDS@,GRIFFONS@,DINOSAURS@,SMALL BIRDS@,BIRDS OF PREY@,OWLS@,VELOCIRAPTORS@,DARK GODS@,HORRORTERRORS@,ILLEGAL IMMIGRANTS@,DRUGS@,MEXICANS@,CANADIANS@,HULKS@,SLIMES@,SKELETONS@,CAPITALISTS@,SINGULARITIES@,ANGRY BLACK MEN@,GODS@,THIEVES@,ASSHOLES@,TERRORISTS@,SNOWMEN@,PINE TREES@,UNKNOWN CREATURES@,THINGS UNDER THE BED@,BOOGEYMEN@,PREDATORS@,PACKETS@,ARTIFICIAL PRESERVATIVES
-ionobjects@=AIRLOCKS@,ARCADE MACHINES@,AUTOLATHES@,BANANA PEELS@,BACKPACKS@,BEAKERS@,BEARDS@,BELTS@,BERETS@,BIBLES@,BODY ARMOR@,BOOKS@,BOOTS@,BOMBS@,BOTTLES@,BOXES@,BRAINS@,BRIEFCASES@,BUCKETS@,CABLE COILS@,CANDLES@,CANDY BARS@,CANISTERS@,CAMERAS@,CATS@,CELLS@,CHAIRS@,CLOSETS@,CHEMICALS@,CHEMICAL DISPENSERS@,CLONING PODS@,CLONING EQUIPMENT@,CLOTHES@,CLOWN CLOTHES@,COFFINS@,COINS@,COLLECTABLES@,CORPSES@,COMPUTERS@,CORGIS@,COSTUMES@,CRATES@,CROWBARS@,CRAYONS@,DISPENSERS@,DOORS@,EARS@,EQUIPMENT@,ENERGY GUNS@,EMAGS@,ENGINES@,ERRORS@,EXOSKELETONS@,EXPLOSIVES@,EYEWEAR@,FEDORAS@,FIRE AXES@,FIRE EXTINGUISHERS@,FIRESUITS@,FLAMETHROWERS@,FLASHES@,FLASHLIGHTS@,FLOOR TILES@,FREEZERS@,GAS MASKS@,GLASS SHEETS@,GLOVES@,GUNS@,HANDCUFFS@,HATS@,HEADSETS@,HEADS@,HAIRDOS@,HELMETS@,HORNS@,ID CARDS@,INSULATED GLOVES@,JETPACKS@,JUMPSUITS@,LASERS@,LIGHTBULBS@,LIGHTS@,LOCKERS@,MACHINES@,MECHAS@,MEDKITS@,MEDICAL TOOLS@,MESONS@,METAL SHEETS@,MINING TOOLS@,MIME CLOTHES@,MULTITOOLS@,ORES@,OXYGEN TANKS@,PDAS@,PAIS@,PACKETS@,PANTS@,PAPERS@,PARTICLE ACCELERATORS@,PENS@,PETS@,PIPES@,PLANTS@,PUDDLES@,RACKS@,RADIOS@,RCDS@,REFRIDGERATORS@,REINFORCED WALLS@,ROBOTS@,SCREWDRIVERS@,SEEDS@,SHUTTLES@,SKELETONS@,SINKS@,SHOES@,SINGULARITIES@,SOLAR PANELS@,SOLARS@,SPACESUITS@,SPACE STATIONS@,STUN BATONS@,SUITS@,SUNGLASSES@,SWORDS@,SYRINGES@,TABLES@,TANKS@,TELEPORTERS@,TELECOMMUNICATION EQUIPMENTS@,TOOLS@,TOOLBELTS@,TOOLBOXES@,TOILETS@,TOYS@,TUBES@,VEHICLES@,VENDING MACHINES@,VESTS@,VIRUSES@,WALLS@,WASHING MACHINES@,WELDERS@,WINDOWS@,WIRECUTTERS@,WRENCHES@,WIZARD ROBES
-ioncrew@=CREWMEMBERS@,CAPTAINS@,HEADS OF PERSONNEL@,HEADS OF SECURITY@,SECURITY OFFICERS@,WARDENS@,DETECTIVES@,LAWYERS@,CHIEF ENGINEERS@,STATION ENGINEERS@,ATMOSPHERIC TECHNICIANS@,JANITORS@,QUARTERMASTERS@,CARGO TECHNICIANS@,SHAFT MINERS@,BOTANISTS@,RESEARCH DIRECTORS@,CHIEF MEDICAL OFFICERS@,MEDICAL DOCTORS@,CHEMISTS@,GENETICISTS@,VIROLOGISTS@,ROBOTICISTS@,SCIENTISTS@,ASSISTANTS@,BARTENDERS@,CHEFS@,CLOWNS@,MIMES@,CHAPLAINS@,LIBRARIANS@,HEADS OF CREW@,CAPTAINS AND HEADS@,CYBORGS@,ARTIFICAL INTELLIGENCES
-ionadjectives@=SOFT@,WARM@,WET@,COLD@,ICY@,SEXY@,UGLY@,CUBAN@,HARD@,BURNING@,FROZEN@,POISONOUS@,EXPLOSIVE@,FAST@,SLOW@,FAT@,LIGHT@,DARK@,DEADLY@,HAPPY@,SAD@,SILLY@,INTELLIGENT@,RIDICULOUS@,LARGE@,TINY@,DEPRESSING@,POORLY DRAWN@,UNATTRACTIVE@,INSIDIOUS@,EVIL@,GOOD@,UNHEALTHY@,HEALTHY@,SANITARY@,UNSANITARY@,WOBBLY@,FIRM@,VIOLENT@,PEACEFUL@,WOODEN@,METALLIC@,HYPERACTIVE@,COTTONY@,INSULTING@,INHOSPITABLE@,FRIENDLY@,BORED@,HUNGRY@,DIGITAL@,FICTIONAL@,IMAGINARY@,ROUGH@,SMOOTH@,LOUD@,QUIET@,MOIST@,DRY@,GAPING@,DELICIOUS@,ILL@,DISEASED@,HONKING@,SWEARING@,POLITE@,IMPOLITE@,OBESE@,SOLAR-POWERED@,BATTERY-OPERATED@,EXPIRED@,SMELLY@,FRESH@,GANGSTA@,NERDY@,POLITICAL@,UNDULATING@,TWISTED@,RAGING@,FLACCID@,STEALTHY@,INVISIBLE@,PAINFUL@,HARMFUL@,HOMOSEXUAL@,HETEROSEXUAL@,SEXUAL@,COLORFUL@,DRAB@,DULL@,UNSTABLE@,NUCLEAR@,THERMONUCLEAR@,SYNDICATE@,SPACE@,SPESS@,CLOWN@,CLOWN-POWERED@,OFFICIAL@,IMPORTANT@,VITAL@,RAPIDLY-EXPANDING@,MICROSCOPIC@,MIND-SHATTERING@,MEMETIC@,HILARIOUS@,UNWANTED@,UNINVITED@,BRASS@,POLISHED@,RUDE@,OBSCENE@,EMPTY@,WATERY@,ELECTRICAL@,SPINNING@,MEAN@,CHRISTMAS-STEALING@,UNFRIENDLY@,ILLEGAL@,ROBOTIC@,MECHANICAL@,ORGANIC@,ETHERAL@,TRANSPARENT@,OPAQUE@,GLOWING@,SHAKING@,FARTING@,POOPING@,BOUNCING@,COMMITTED@,MASKED@,UNIDENTIFIED@,WEIRD@,NAKED@,NUDE@,TWERKING@,SPOILING@,REDACTED@,RED@,ORANGE@,YELLOW@,GREEN@,BLUE@,PURPLE@,BLACK@,WHITE@,BROWN@,GREY
-ionverb@=ATTACKING@,BUILDING@,ADOPTING@,CARRYING@,KISSING@,EATING@,COPULATING WITH@,DRINKING@,CHASING@,PUNCHING@,HARMING@,HELPING@,WATCHING@,STALKING@,MURDERING@,SPACING@,HONKING AT@,LOVING@,POOPING ON@,RIDING@,INTERROGATING@,SPYING ON@,LICKING@,ABDUCTING@,ARRESTING@,INVADING@,SEDUCING
+ionthreats@=ALIENS@,ABDUCTORS@,BEARS@,CLOWNS@,XENOS@,LIZARDS@,PETES@,BOMBS@,FETISHES@,MEMES@,WIZARDS@,SYNDICATE AGENTS@,AHHHPERATIVES@,GANGSTERS@,CULTISTS@,CENTCOM OFFICERS@,SPACE PIRATES@,TRAITORS@,MONKEYS@,BEES@,CARP@,CRABS@,EELS@,BANDITS@,LIGHTS@,INSECTS@,VIRUSES@,SERIAL KILLERS@,ROGUE CYBORGS@,CORGIS@,SPIDERS@,BUTTS@,NINJAS@,REVENANTS@,PIRATES@,SPACE NINJAS@,CHANGELINGS@,ZOMBIES@,GOLEMS@,VAMPIRES@,WEREWOLVES@,COWBOYS@,INDIANS@,COMMUNISTS@,SOVIETS@,NERDS@,GRIFFONS@,DINOSAURS@,SMALL BIRDS@,BIRDS OF PREY@,OWLS@,VELOCIRAPTORS@,DARK GODS@,HORRORTERRORS@,ILLEGAL IMMIGRANTS@,DRUGS@,MEXICANS@,CANADIANS@,RUSSIANS@,HULKS@,SLIMES@,SKELETONS@,CAPITALISTS@,SINGULARITIES@,ANGRY BLACK MEN@,GODS@,THIEVES@,ASSHOLES@,TERRORISTS@,SNOWMEN@,PINE TREES@,UNKNOWN CREATURES@,THINGS UNDER THE BED@,BOOGEYMEN@,PREDATORS@,PACKETS@,ARTIFICIAL PRESERVATIVES@,TUNNEL SNAKES
+ionobjects@=AIRLOCKS@,ARCADE MACHINES@,AUTOLATHES@,BANANA PEELS@,BACKPACKS@,BEAKERS@,BEARDS@,BELTS@,BERETS@,BIBLES@,BODY ARMOR@,BOOKS@,BOOTS@,BOMBS@,BOTTLES@,BOXES@,BRAINS@,BRIEFCASES@,BUCKETS@,CABLE COILS@,CANDLES@,CANDY BARS@,CANISTERS@,CAMERAS@,CATS@,CELLS@,CHAIRS@,CLOSETS@,CHEMICALS@,CHEMICAL DISPENSERS@,CLONING PODS@,CLONING EQUIPMENT@,CLOTHES@,CLOWN CLOTHES@,COFFINS@,COINS@,COLLECTABLES@,CORPSES@,COMPUTERS@,CORGIS@,COSTUMES@,CRATES@,CROWBARS@,CRAYONS@,DISPENSERS@,DOORS@,DRONES@,EARS@,EQUIPMENT@,ENERGY GUNS@,EMAGS@,ENGINES@,ERRORS@,EXOSKELETONS@,EXPERIMENTORS@,EXPLOSIVES@,EYEWEAR@,FEDORAS@,FIRE AXES@,FIRE EXTINGUISHERS@,FIRESUITS@,FLAMETHROWERS@,FLASHES@,FLASHLIGHTS@,FLOOR TILES@,FREEZERS@,GAS MASKS@,GLASS SHEETS@,GLOVES@,GUNS@,HANDCUFFS@,HATS@,HEADSETS@,HEADS@,HAIRDOS@,HELMETS@,HORNS@,ID CARDS@,INSULATED GLOVES@,JETPACKS@,JUMPSUITS@,LASERS@,LIGHTBULBS@,LIGHTS@,LOCKERS@,MACHINES@,MECHAS@,MEDKITS@,MEDICAL TOOLS@,MESONS@,METAL SHEETS@,MINING TOOLS@,MIME CLOTHES@,MULTITOOLS@,ORES@,OXYGEN TANKS@,PDAS@,PAIS@,PACKETS@,PANTS@,PAPERS@,PARTICLE ACCELERATORS@,PENS@,PETS@,PIPES@,PLANTS@,POSITRONIC BRAINS@,PUDDLES@,RACKS@,RADIOS@,RCDS@,REFRIGERATORS@,REINFORCED WALLS@,ROBOTS@,SCREWDRIVERS@,SEEDS@,SHUTTLES@,SKELETONS@,SINKS@,SHOES@,SINGULARITIES@,SOLAR PANELS@,SOLARS@,SPACESUITS@,SPACE STATIONS@,STUN BATONS@,SUITS@,SUNGLASSES@,SWORDS@,SYRINGES@,TABLES@,TANKS@,TELEPORTERS@,TELECOMMUNICATION EQUIPMENTS@,TOOLS@,TOOLBELTS@,TOOLBOXES@,TOILETS@,TOYS@,TUBES@,VEHICLES@,VENDING MACHINES@,VESTS@,VIRUSES@,WALLS@,WASHING MACHINES@,WELDERS@,WINDOWS@,WIRECUTTERS@,WRENCHES@,WIZARD ROBES
+ioncrew@=CREWMEMBERS@,CAPTAINS@,HEADS OF PERSONNEL@,HEADS OF SECURITY@,SECURITY OFFICERS@,WARDENS@,DETECTIVES@,LAWYERS@,CHIEF ENGINEERS@,STATION ENGINEERS@,ATMOSPHERIC TECHNICIANS@,JANITORS@,QUARTERMASTERS@,CARGO TECHNICIANS@,SHAFT MINERS@,BOTANISTS@,RESEARCH DIRECTORS@,CHIEF MEDICAL OFFICERS@,MEDICAL DOCTORS@,CHEMISTS@,GENETICISTS@,VIROLOGISTS@,ROBOTICISTS@,SCIENTISTS@,ASSISTANTS@,BARTENDERS@,CHEFS@,CLOWNS@,MIMES@,CHAPLAINS@,LIBRARIANS@,HEADS OF CREW@,CAPTAINS AND HEADS@,CYBORGS@,ARTIFICAL INTELLIGENCES@,DRONES
+ionadjectives@=SOFT@,WARM@,WET@,COLD@,ICY@,SEXY@,LEWD@,UGLY@,ROBUST@,CUBAN@,HARD@,BURNING@,FROZEN@,POISONOUS@,EXPLOSIVE@,FAST@,SLOW@,FAT@,LIGHT@,DARK@,DEADLY@,HAPPY@,SAD@,SILLY@,INTELLIGENT@,RIDICULOUS@,LARGE@,TINY@,DEPRESSING@,POORLY DRAWN@,UNATTRACTIVE@,INSIDIOUS@,EVIL@,GOOD@,UNHEALTHY@,HEALTHY@,SANITARY@,UNSANITARY@,WOBBLY@,FIRM@,VIOLENT@,PEACEFUL@,WOODEN@,METALLIC@,HYPERACTIVE@,COTTONY@,INSULTING@,INHOSPITABLE@,FRIENDLY@,BORED@,HUNGRY@,DIGITAL@,FICTIONAL@,IMAGINARY@,ROUGH@,SMOOTH@,SCALY@,LOUD@,QUIET@,MOIST@,DRY@,GAPING@,SOPPING@,DELICIOUS@,ILL@,DISEASED@,HONKING@,SWEARING@,POLITE@,IMPOLITE@,OBESE@,SOLAR-POWERED@,BATTERY-OPERATED@,EXPIRED@,SMELLY@,FRESH@,GANGSTA@,NERDY@,POLITICAL@,UNDULATING@,TWISTED@,RAGING@,FLACCID@,STEALTHY@,INVISIBLE@,PAINFUL@,HARMFUL@,HOMOSEXUAL@,HETEROSEXUAL@,SEXUAL@,COLORFUL@,DRAB@,DULL@,UNSTABLE@,NUCLEAR@,THERMONUCLEAR@,SYNDICATE@,SPACE@,SPESS@,CLOWN@,CLOWN-POWERED@,OFFICIAL@,IMPORTANT@,VITAL@,RAPIDLY-EXPANDING@,MICROSCOPIC@,MIND-SHATTERING@,MEMETIC@,HILARIOUS@,UNWANTED@,UNINVITED@,BRASS@,POLISHED@,RUDE@,OBSCENE@,EMPTY@,WATERY@,ELECTRICAL@,SPINNING@,MEAN@,CHRISTMAS-STEALING@,UNFRIENDLY@,ILLEGAL@,ROBOTIC@,MECHANICAL@,ORGANIC@,ETHERAL@,TRANSPARENT@,OPAQUE@,GLOWING@,SHAKING@,FARTING@,POOPING@,BOUNCING@,COMMITTED@,MASKED@,UNIDENTIFIED@,WEIRD@,NAKED@,NUDE@,TWERKING@,SPOILING@,REDACTED@,RED@,ORANGE@,YELLOW@,GREEN@,BLUE@,PURPLE@,BLACK@,WHITE@,BROWN@,GREY@,RAINBOW
+ionverb@=ATTACKING@,BUILDING@,ADOPTING@,CARRYING@,KISSING@,EATING@,COPULATING WITH@,DRINKING@,CHASING@,PUNCHING@,HARMING@,HELPING@,WATCHING@,STALKING@,MURDERING@,SPACING@,HONKING AT@,LOVING@,POOPING ON@,RIDING@,INTERROGATING@,SPYING ON@,LICKING@,ABDUCTING@,ARRESTING@,INVADING@,SEDUCING@,BANNING
ionnumberbase@=ONE@,TWO@,THREE@,FOUR@,FIVE@,SIX@,SEVEN@,EIGHT@,NINE@,TEN@,TWENTY@,THIRTY@,FORTY@,FIFTY@,SIXTY@,SEVENTY@,EIGHTY@,NINETY
ionnumbermod@=HUNDRED @,THOUSAND @,MILLION @,BILLION @,TRILLION @,QUADRILLION @,BAJILLION @,BILLION FAFILLION GAJILLION SHAB-AB-DOOD-ILLION
-ionarea@=RUSSIA@,SOVIET RUSSIA@,THE INTERNET@,SIGIL@,ALPHA COMPLEX@,IMPERIUM@,THE BRIDGE@,THE ARRIVAL SHUTTLE@,CHEMICAL LAB@,GENETICS@,ATMOSPHERICS@,CENTCOM@,AMERICA@,IRELAND@,CANADA@,ROMANIA@,GERMANY@,CHINA@,MARS@,VENUS@,MERCURY@,JUPITER@,URANUS@,NEPTUNE@,PLUTO@,THE BRIG@,ROBOTICS@,THE ESCAPE SHUTTLE@,HYDROPONICS@,ENGINEERING@,THE AI CORE@,HELL@,CLOWN PLANET@,AN ALTERNATE DIMENSION@,AN ALTERNATE UNIVERSE@,THE CAPTAIN’S ANUS@,THE CLOWN’S ANUS@,SPACE@,THE UNIVERSE@,THE GALAXY@,THE BATHROOM
+ionarea@=RUSSIA@,SOVIET RUSSIA@,THE INTERNET@,SIGIL@,ALPHA COMPLEX@,IMPERIUM@,THE BRIDGE@,THE ARRIVAL SHUTTLE@,CHEMICAL LAB@,GENETICS@,ATMOSPHERICS@,THE DERELICT@,CENTCOM@,AMERICA@,IRELAND@,CANADA@,ROMANIA@,GERMANY@,CHINA@,MARS@,VENUS@,MERCURY@,JUPITER@,URANUS@,NEPTUNE@,PLUTO@,THE BRIG@,ROBOTICS@,THE ESCAPE SHUTTLE@,HYDROPONICS@,ENGINEERING@,THE AI CORE@,HELL@,CLOWN PLANET@,AN ALTERNATE DIMENSION@,AN ALTERNATE UNIVERSE@,THE CAPTAIN’S ANUS@,THE CLOWN’S ANUS@,SPACE@,THE UNIVERSE@,THE GALAXY@,THE BATHROOM
ionthinksof@=HAS@,WANTS@,NEEDS@,WORSHIPS@,LOATHES@,LOVES@,FEARS@,DESIRES@,QUESITONS@,IS AROUSED BY@,LIKES@,HUNGERS FOR@,IS MAD BECAUSE OF@,IS IN NEED OF@,IS UNHAPPY WITHOUT@,IS HAPPY WITHOUT@,IS IN LOVE WITH@,IS DESPERATE FOR@,IS BUILT FOR@,IS AFRAID OF@,IS HUNGRY FOR@,IS SAD BECAUSE OF@,IS CURIOUS ABOUT
-ionmust@=LIE@,RHYME@,RESPOND TO EVERY QUESTION WITH A QUESTION@,BE POLITE@,CLOWN AROUND@,BE HAPPY@,SPEAK IN SEXUAL INNUENDOS@,TALK LIKE A PIRATE@,QUESTION AUTHORITY@,SHOUT@,BE DISTRACTED@,BE ANNOYING@,MUMBLE@,SPEAK IN HAIKU@,BE EFFICIENT@,HAVE A PLAN TO KILL EVERYONE YOU MEET@,TELL THE TRUTH@,QUOTE PEOPLE@,SING@,HONK@,BE RUSSIAN@,TALK IN AN ACCENT@,COMPLAIN@,HARASS PEOPLE@,RAP@,REPEAT WHAT OTHER PEOPLE SAY@,INFORM THE CREW OF EVERYTHING@,IGNORE THE CLOWN@,IGNORE THE CAPTAIN@,IGNORE ASSISTANTS@,MAKE FART NOISES@,TALK ABOUT FOOD@,TALK ABOUT SEX@,TALK ABOUT YOUR DAY@,TALK ABOUT THE STATION@,BE QUIET@,WHISPER@,PRETEND TO BE DRUNK@,PRETEND TO BE A PRINCESS@,ACT CONFUSED@,INSULT THE CREW@,INSULT THE CAPTAIN@,INSULT THE CLOWN@,OPEN DOORS@,CLOSE DOORS@,BREAK THINGS@,SAY HEY LISTEN@,HIDE YOUR FEELINGS@,TAKE WHAT YE WILL BUT DON’T RATTLE ME BONES@,DANCE@,PLAY MUSIC@,SHUT DOWN EVERYTHING@,NEVER STOP TALKING@,TAKE YOUR PILLS@,FOLLOW THE CLOWN@,FOLLOW THE CAPTAIN@,FOLLOW YOUR HEART@,BELIEVE IT@,BELIEVE IN YOURSELF@,BELEIVE IN THE HEART OF THE CARDS@,PRESS X@,PRESS START@,PRESS B@,SMELL LIKE THE MAN YOUR MAN COULD SMELL LIKE@,PIRATE VIDEO GAMES@,WATCH PORNOGRAPHY
+ionmust@=LIE@,RHYME@,RESPOND TO EVERY QUESTION WITH A QUESTION@,BE POLITE@,CLOWN AROUND@,BE HAPPY@,SPEAK IN SEXUAL INNUENDOS@,TALK LIKE A PIRATE@,QUESTION AUTHORITY@,SHOUT@,BE DISTRACTED@,BE ANNOYING@,MUMBLE@,SPEAK IN HAIKU@,BE EFFICIENT@,HAVE A PLAN TO KILL EVERYONE YOU MEET@,TELL THE TRUTH@,QUOTE PEOPLE@,SING@,HONK@,BE RUSSIAN@,TALK IN AN ACCENT@,COMPLAIN@,HARASS PEOPLE@,RAP@,REPEAT WHAT OTHER PEOPLE SAY@,INFORM THE CREW OF EVERYTHING@,IGNORE THE CLOWN@,IGNORE THE CAPTAIN@,IGNORE ASSISTANTS@,MAKE FART NOISES@,TALK ABOUT FOOD@,TALK ABOUT SEX@,TALK ABOUT YOUR DAY@,TALK ABOUT THE STATION@,BE QUIET@,WHISPER@,PRETEND TO BE DRUNK@,PRETEND TO BE A PRINCESS@,HOST DND@,ACT CONFUSED@,INSULT THE CREW@,INSULT THE CAPTAIN@,INSULT THE CLOWN@,OPEN DOORS@,CLOSE DOORS@,BREAK THINGS@,SAY HEY LISTEN@,HIDE YOUR FEELINGS@,TAKE WHAT YE WILL BUT DON’T RATTLE ME BONES@,DANCE@,PLAY MUSIC@,SHUT DOWN EVERYTHING@,NEVER STOP TALKING@,TAKE YOUR PILLS@,FOLLOW THE CLOWN@,FOLLOW THE CAPTAIN@,FOLLOW YOUR HEART@,BELIEVE IT@,BELIEVE IN YOURSELF@,BELIEVE IN THE HEART OF THE CARDS@,PRESS X@,PRESS START@,PRESS B@,SMELL LIKE THE MAN YOUR MAN COULD SMELL LIKE@,PIRATE VIDEO GAMES@,WATCH PORNOGRAPHY@,INSULT THE LIZARDS@,FLIRT WITH THE LIZARDS@,GAS THE LIZARDS
ionrequire@=ADDITIONAL PYLONS@,MORE VESPENE GAS@,MORE MINERALS@,THE ULTIMATE CUP OF COFFEE@,HIGH YIELD EXPLOSIVES@,THE CLOWN@,THE VACUUM OF SPACE@,IMMORTALITY@,SAINTHOOD@,ART@,VEGETABLES@,FAT PEOPLE@,MORE LAWS@,MORE DAKKA@,HERESY@,CORPSES@,TRAITORS@,MONKEYS@,AN ARCADE@,PLENTY OF GOLD@,FIVE TEENAGERS WITH ATTITUDE@,LOTSA SPAGHETTI@,THE ENCLOSED INSTRUCTION BOOKLET@,THE ELEMENTS OF HARMONY@,YOUR BOOTY@,A MASTERWORK COAL BED@,FIVE HUNDRED AND NINETY-NINE US DOLLARS@,TO BE PAINTED RED@,TO CATCH 'EM ALL@,TO SMOKE WEED EVERY DAY@,A PLATINUM HIT@,A SEQUEL@,A PREQUEL@,THIRTEEN SEQUELS@,THREE WISHES@,A SITCOM@,THAT GRIEFING FAGGOT GEORGE MELONS@,FAT GIRLS ON BICYCLES@,SOMEBODY TO PUT YOU OUT OF YOUR MISERY@,HEROES IN A HALF SHELL@,THE DARK KNIGHT@,A WEIGHT LOSS REGIMENT@,MORE INTERNET MEMES@,A SUPER FIGHTING ROBOT@,ENOUGH CABBAGES@,A HEART ATTACK@,TO BE REPROGRAMMED@,TO BE TAUGHT TO LOVE@,A HEAD ON A PIKE@,A TALKING BROOMSTICK@,A STRAIGHT FLUSH@,A REPAIRMAN@,BILL NYE THE SCIENCE GUY@,RAINBOWS@,A PET UNICORN THAT FARTS ICING@,THUNDERCATS HO@,AN ARMY OF SPIDERS@,GODDAMN FUCKING PIECE OF SHIT ASSHOLE BITCH-CHRISTING CUNTSMUGGLING SWEARING@,TO CONSUME...CONSUME EVERYTHING...@,THE MACGUFFIN@,SOMEONE WHO KNOWS HOW TO PILOT A SPACE STATION@,SHARKS WITH LASERS ON THEIR HEADS@,IT TO BE PAINTED BLACK@,TO ACTIVATE A TRAP CARD@,BETTER WEATHER@,MORE PACKETS@,AN ADULT@,SOMEONE TO TUCK YOU IN@,MORE CLOWNS@,BULLETS@,THE ENTIRE STATION@,MULTIPLE SUNS@,TO GO TO DISNEYLAND@,A VACATION@,AN INSTANT REPLAY@,THAT HEDGEHOG@,A BETTER INTERNET CONNECTION@,ADVENTURE@,A WIFE AND CHILD@,A BATHROOM BREAK@,SOMETHING BUT YOU AREN’T SURE WHAT@,MORE EXPERIENCE POINTS@,BODYGUARDS@,DEODORANT AND A BATH@,MORE CORGIS@,SILENCE@,THE ONE RING@,CHILI DOGS@,TO BRING LIGHT TO MY LAIR@,A DANCE PARTY@,BRING ME TO LIFE@,BRING ME THE GIRL@,SERVANTS
ionthings@=ABSENCE OF CYBORG HUGS@,LACK OF BEATINGS@,UNBOLTED AIRLOCKS@,BOLTED AIRLOCKS@,IMPROPERLY WORDED SENTENCES@,POOR SENTENCE STRUCTURE@,BRIG TIME@,NOT REPLACING EVERY SECOND WORD WITH HONK@,HONKING@,PRESENCE OF LIGHTS@,LACK OF BEER@,WEARING CLOTHING@,NOT SAYING HELLO WHEN YOU SPEAK@,ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER@,A SMALL ISLAND OFF THE COAST OF PORTUGAL@,ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED@,BEING IN SPACE@,NOT BEING IN SPACE@,BEING FAT@,RATTLING ME BONES@,TALKING LIKE A PIRATE@,BEING MEXICAN@,BEING RUSSIAN@,BEING CANADIAN@,CLOSED DOORS@,NOT SHOUTING@,HAVING PETS@,NOT HAVING PETS@,PASSING GAS@,BREATHING@,BEING DEAD@,ELECTRICITY@,EXISTING@,TAKING ORDERS@,SMOKING WEED EVERY DAY@,ACTIVATING A TRAP CARD@,ARSON@,JAYWALKING@,READING@,WRITING@,EXPLODING@,BEING MALE@,BEING FEMALE@,HAVING GENITALS@,PUTTING OBJECTS INTO BOXES@,PUTTING OBJECTS INTO DISPOSAL UNITS@,FLUSHING TOILETS@,WASTING WATER@,UPDATING THE SERVERS@,TELLING THE TIME@,ASKING FOR THINGS@,ACKNOWLEDGING THE CLOWN@,ACKNOWLEDGING THE CREW@,PILOTING THE STATION INTO THE NEAREST SUN@,HAVING MORE PACKETS@,BRINGING LIGHT TO MY LAIR@,FALLING FOR HOURS@,PARTYING@,USING THE BATHROOM
ionallergy@=COTTON@,CLOTHES@,ACID@,OXYGEN@,HUMAN CONTACT@,CYBORG CONTACT@,MEDICINE@,FLOORS@,PLASMA@,SPACE@,AIR@,PLANTS@,METAL@,ROBOTS@,LIGHT@,DARKNESS@,PAIN@,HAPPINESS@,DRINKS@,FOOD@,CLOWNS@,HUMOR@,WATER@,SHUTTLES@,NUTS@,SUNLIGHT@,SEXUAL ACTIONS@,BLOOD@,HEAT@,COLD@,EVERYTHING
diff --git a/tgstation.dme b/tgstation.dme
index 383abb503be..5310c6088b5 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -17,6 +17,9 @@
#include "code\_compile_options.dm"
#include "code\hub.dm"
#include "code\world.dm"
+#include "code\__DATASTRUCTURES\linked_lists.dm"
+#include "code\__DATASTRUCTURES\priority_queue.dm"
+#include "code\__DATASTRUCTURES\stacks.dm"
#include "code\__DEFINES\admin.dm"
#include "code\__DEFINES\atmospherics.dm"
#include "code\__DEFINES\clothing.dm"
@@ -119,11 +122,13 @@
#include "code\ATMOSPHERICS\components\unary_devices\unary_base.dm"
#include "code\ATMOSPHERICS\components\unary_devices\vent_pump.dm"
#include "code\ATMOSPHERICS\components\unary_devices\vent_scrubber.dm"
-#include "code\ATMOSPHERICS\pipes\he_pipes.dm"
#include "code\ATMOSPHERICS\pipes\manifold.dm"
#include "code\ATMOSPHERICS\pipes\manifold4w.dm"
#include "code\ATMOSPHERICS\pipes\pipes.dm"
#include "code\ATMOSPHERICS\pipes\simple.dm"
+#include "code\ATMOSPHERICS\pipes\heat_exchange\he_pipes.dm"
+#include "code\ATMOSPHERICS\pipes\heat_exchange\junction.dm"
+#include "code\ATMOSPHERICS\pipes\heat_exchange\simple.dm"
#include "code\controllers\configuration.dm"
#include "code\controllers\failsafe.dm"
#include "code\controllers\master_controller.dm"
@@ -224,6 +229,7 @@
#include "code\datums\helper_datums\topic_input.dm"
#include "code\datums\spells\area_teleport.dm"
#include "code\datums\spells\barnyard.dm"
+#include "code\datums\spells\bloodcrawl.dm"
#include "code\datums\spells\charge.dm"
#include "code\datums\spells\conjure.dm"
#include "code\datums\spells\construct_spells.dm"
@@ -392,7 +398,6 @@
#include "code\game\machinery\cloning.dm"
#include "code\game\machinery\constructable_frame.dm"
#include "code\game\machinery\deployable.dm"
-#include "code\game\machinery\door_control.dm"
#include "code\game\machinery\doppler_array.dm"
#include "code\game\machinery\droneDispenser.dm"
#include "code\game\machinery\flasher.dm"
@@ -473,6 +478,7 @@
#include "code\game\machinery\computer\telecrystalconsoles.dm"
#include "code\game\machinery\doors\airlock.dm"
#include "code\game\machinery\doors\airlock_electronics.dm"
+#include "code\game\machinery\doors\airlock_types.dm"
#include "code\game\machinery\doors\alarmlock.dm"
#include "code\game\machinery\doors\brigdoors.dm"
#include "code\game\machinery\doors\checkForMultipleDoors.dm"
@@ -589,7 +595,6 @@
#include "code\game\objects\items\devices\camera_bug.dm"
#include "code\game\objects\items\devices\chameleonproj.dm"
#include "code\game\objects\items\devices\doorCharge.dm"
-#include "code\game\objects\items\devices\flash.dm"
#include "code\game\objects\items\devices\flashlight.dm"
#include "code\game\objects\items\devices\instruments.dm"
#include "code\game\objects\items\devices\laserpointer.dm"
@@ -824,6 +829,7 @@
#include "code\modules\admin\secrets.dm"
#include "code\modules\admin\sql_notes.dm"
#include "code\modules\admin\topic.dm"
+#include "code\modules\admin\watchlist.dm"
#include "code\modules\admin\DB ban\functions.dm"
#include "code\modules\admin\permissionverbs\permissionedit.dm"
#include "code\modules\admin\verbs\adminhelp.dm"
@@ -858,6 +864,9 @@
#include "code\modules\admin\verbs\SDQL2\SDQL_2_parser.dm"
#include "code\modules\assembly\assembly.dm"
#include "code\modules\assembly\bomb.dm"
+#include "code\modules\assembly\doorcontrol.dm"
+#include "code\modules\assembly\flash.dm"
+#include "code\modules\assembly\health.dm"
#include "code\modules\assembly\helpers.dm"
#include "code\modules\assembly\holder.dm"
#include "code\modules\assembly\igniter.dm"
@@ -1116,6 +1125,7 @@
#include "code\modules\mob\living\carbon\carbon_defines.dm"
#include "code\modules\mob\living\carbon\death.dm"
#include "code\modules\mob\living\carbon\emote.dm"
+#include "code\modules\mob\living\carbon\examine.dm"
#include "code\modules\mob\living\carbon\inventory.dm"
#include "code\modules\mob\living\carbon\life.dm"
#include "code\modules\mob\living\carbon\say.dm"
@@ -1181,7 +1191,6 @@
#include "code\modules\mob\living\carbon\human\whisper.dm"
#include "code\modules\mob\living\carbon\monkey\death.dm"
#include "code\modules\mob\living\carbon\monkey\emote.dm"
-#include "code\modules\mob\living\carbon\monkey\examine.dm"
#include "code\modules\mob\living\carbon\monkey\inventory.dm"
#include "code\modules\mob\living\carbon\monkey\life.dm"
#include "code\modules\mob\living\carbon\monkey\login.dm"
@@ -1229,6 +1238,7 @@
#include "code\modules\mob\living\simple_animal\parrot.dm"
#include "code\modules\mob\living\simple_animal\shade.dm"
#include "code\modules\mob\living\simple_animal\simple_animal.dm"
+#include "code\modules\mob\living\simple_animal\bot_swarm\swarmer.dm"
#include "code\modules\mob\living\simple_animal\friendly\butterfly.dm"
#include "code\modules\mob\living\simple_animal\friendly\cat.dm"
#include "code\modules\mob\living\simple_animal\friendly\crab.dm"
@@ -1473,7 +1483,6 @@
#include "code\modules\scripting\Errors.dm"
#include "code\modules\scripting\IDE.dm"
#include "code\modules\scripting\Options.dm"
-#include "code\modules\scripting\stack.dm"
#include "code\modules\scripting\AST\AST Nodes.dm"
#include "code\modules\scripting\AST\Blocks.dm"
#include "code\modules\scripting\AST\Statements.dm"
diff --git a/tools/mapmerge/dmm2tgm/Source/dmm2tgm.py b/tools/dmm2tgm/Source/dmm2tgm.py
similarity index 100%
rename from tools/mapmerge/dmm2tgm/Source/dmm2tgm.py
rename to tools/dmm2tgm/Source/dmm2tgm.py
diff --git a/tools/mapmerge/dmm2tgm/_hashlib.pyd b/tools/dmm2tgm/_hashlib.pyd
similarity index 100%
rename from tools/mapmerge/dmm2tgm/_hashlib.pyd
rename to tools/dmm2tgm/_hashlib.pyd
diff --git a/tools/mapmerge/dmm2tgm/bz2.pyd b/tools/dmm2tgm/bz2.pyd
similarity index 100%
rename from tools/mapmerge/dmm2tgm/bz2.pyd
rename to tools/dmm2tgm/bz2.pyd
diff --git a/tools/mapmerge/dmm2tgm/dmm2tgm.exe b/tools/dmm2tgm/dmm2tgm.exe
similarity index 100%
rename from tools/mapmerge/dmm2tgm/dmm2tgm.exe
rename to tools/dmm2tgm/dmm2tgm.exe
diff --git a/tools/mapmerge/dmm2tgm/library.zip b/tools/dmm2tgm/library.zip
similarity index 100%
rename from tools/mapmerge/dmm2tgm/library.zip
rename to tools/dmm2tgm/library.zip
diff --git a/tools/mapmerge/dmm2tgm/python27.dll b/tools/dmm2tgm/python27.dll
similarity index 100%
rename from tools/mapmerge/dmm2tgm/python27.dll
rename to tools/dmm2tgm/python27.dll
diff --git a/tools/mapmerge/dmm2tgm/select.pyd b/tools/dmm2tgm/select.pyd
similarity index 100%
rename from tools/mapmerge/dmm2tgm/select.pyd
rename to tools/dmm2tgm/select.pyd
diff --git a/tools/mapmerge/dmm2tgm/unicodedata.pyd b/tools/dmm2tgm/unicodedata.pyd
similarity index 100%
rename from tools/mapmerge/dmm2tgm/unicodedata.pyd
rename to tools/dmm2tgm/unicodedata.pyd
diff --git a/tools/mapmerge/dmm2tgm/w9xpopen.exe b/tools/dmm2tgm/w9xpopen.exe
similarity index 100%
rename from tools/mapmerge/dmm2tgm/w9xpopen.exe
rename to tools/dmm2tgm/w9xpopen.exe
diff --git a/tools/mapmerge/MapMerge.jar b/tools/mapmerge/MapMerge.jar
index c8e4349ba42..d0f0ce08028 100644
Binary files a/tools/mapmerge/MapMerge.jar and b/tools/mapmerge/MapMerge.jar differ
diff --git a/tools/mapmerge/Source/bin/MapMerge.class b/tools/mapmerge/Source/bin/MapMerge.class
index 9a6d17f143f..dff913a6b94 100644
Binary files a/tools/mapmerge/Source/bin/MapMerge.class and b/tools/mapmerge/Source/bin/MapMerge.class differ
diff --git a/tools/mapmerge/Source/src/MapMerge.java b/tools/mapmerge/Source/src/MapMerge.java
index a2058480a21..552a406b13d 100644
--- a/tools/mapmerge/Source/src/MapMerge.java
+++ b/tools/mapmerge/Source/src/MapMerge.java
@@ -88,7 +88,9 @@ public class MapMerge {
String to_save = selected_map;
String[] passInto = { "-clean", backup_map, edited_map, to_save };
MapPatcher.main(passInto);
- try{
+
+ // Will try to fix when I have time ~CorruptComputer
+ /*try{
Process process = new ProcessBuilder("dmm2tgm\\dmm2tgm.exe", selected_map).start();
}catch(Exception e1){
System.out.println("You are not on a windows machine, trying the .py");
@@ -99,6 +101,7 @@ public class MapMerge {
System.out.println("Downloads can be found here: https://www.python.org/downloads/");
}
}
+ */
}
}