The station has been evacuated.
The station is currently undergoing evacuation procedures.
"
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 6e095836457..d0fe04ce0a0 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -84,10 +84,9 @@
/obj/machinery/power/compressor/initialize()
..()
- spawn(10)
- locate_machinery()
- if(!turbine)
- stat |= BROKEN
+ locate_machinery()
+ if(!turbine)
+ stat |= BROKEN
#define COMPFRICTION 5e5
@@ -206,10 +205,9 @@
/obj/machinery/power/turbine/initialize()
..()
- spawn(10)
- locate_machinery()
- if(!compressor)
- stat |= BROKEN
+ locate_machinery()
+ if(!compressor)
+ stat |= BROKEN
/obj/machinery/power/turbine/RefreshParts()
var/P = 0
@@ -350,7 +348,7 @@
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/magic.dm b/code/modules/projectiles/guns/magic.dm
index b0ba982348e..af800ecefb7 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -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/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-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 6800d140184..3dba0acb8ca 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -108,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/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-unit.dm b/code/modules/recycling/disposal-unit.dm
index 0e0153bb26a..b76334d1680 100644
--- a/code/modules/recycling/disposal-unit.dm
+++ b/code/modules/recycling/disposal-unit.dm
@@ -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/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index a80441f1e2d..7cf5fff85f4 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -354,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"
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 329066dfa42..cf283810d38 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -71,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/experimentor.dm b/code/modules/research/experimentor.dm
index 6282be27194..dc69762ef53 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -680,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))
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/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 852f58e02b9..3b29d011131 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -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 9d3505103bd..450653912d3 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,11 +55,39 @@
-->
+
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.
@@ -77,9 +105,27 @@
- 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
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 92c5a4b53f4..0ba050a0c60 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1657,6 +1657,10 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
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:
@@ -1670,6 +1674,40 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
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.
diff --git a/html/changelogs/ExcessiveUseOfCobblestone-PR-11270.yml b/html/changelogs/ExcessiveUseOfCobblestone-PR-11270.yml
deleted file mode 100644
index 7ac9ac15acf..00000000000
--- a/html/changelogs/ExcessiveUseOfCobblestone-PR-11270.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# 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: ExcessiveUseOfCobblestone
-
-# 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:
- - rscadd: "Added health analyzer to the autolathe."
- - tweak: "Moved Cloning board to Medical Machinery section."
- - tweak: "Moved Telesci stuff to Teleporter section."
diff --git a/html/changelogs/Oisin100-Trees.yml b/html/changelogs/Oisin100-Trees.yml
deleted file mode 100644
index 3ce8b121560..00000000000
--- a/html/changelogs/Oisin100-Trees.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-author: Oisin100
-
-delete-after: True
-
-changes:
- - 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"
diff --git a/html/changelogs/Xhuis-SU4.yml b/html/changelogs/Xhuis-SU4.yml
deleted file mode 100644
index c45a1d02253..00000000000
--- a/html/changelogs/Xhuis-SU4.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: Xhuis
-delete-after: True
-
-changes:
- - 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."
\ No newline at end of file
diff --git a/html/changelogs/xxalpha-magborg.yml b/html/changelogs/xxalpha-magborg.yml
deleted file mode 100644
index 40a10134e57..00000000000
--- a/html/changelogs/xxalpha-magborg.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: xxalpha
-
-delete-after: True
-
-changes:
- - rscadd: "Engineering cyborgs now have a constant magpulse."
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index 485d89155bc..23f5e04c7db 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.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/obj/assemblies/new_assemblies.dmi b/icons/obj/assemblies/new_assemblies.dmi
index 6255dc886d3..3cc1d93114e 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/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/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/tgstation.dme b/tgstation.dme
index 20650c89e23..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"
@@ -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"
@@ -860,6 +865,8 @@
#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"
@@ -1476,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"