"
if(istype(inserted_id))
dat += "You have [inserted_id.mining_points] mining points collected.
"
else
dat += "No ID inserted.
"
+ dat += ""
+ dat += "
Equipment point cost list:
"
for(var/datum/data/mining_equipment/prize in prize_list)
dat += "| [prize.equipment_name] | [prize.cost] | Purchase |
"
dat += "
"
- user << browse("[dat]", "window=mining_equipment_vendor")
+ var/datum/browser/popup = new(user, "miningvendor", "Mining Equipment Vendor", 400, 350)
+ popup.set_content(dat)
+ popup.open()
return
/obj/machinery/mineral/equipment_vendor/Topic(href, href_list)
@@ -453,8 +456,7 @@
shake_camera(L, 20, 1)
spawn(20)
if(L)
- L.visible_message("[L.name] vomits from travelling through the [src.name]!", \
- "You throw up from travelling through the [src.name]!")
+ L.visible_message("[L.name] vomits from travelling through the [src.name]!", "You throw up from travelling through the [src.name]!")
L.nutrition -= 20
L.adjustToxLoss(-3)
var/turf/T = get_turf(L)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index a20ec5c3a00..84d3f094d59 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -705,4 +705,15 @@
facial_hair_style = "Shaved"
hair_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
underwear = "Nude"
- regenerate_icons()
\ No newline at end of file
+ regenerate_icons()
+
+/mob/living/carbon/human/singularity_act()
+ var/gain = 20
+ if(mind)
+ if((mind.assigned_role == "Station Engineer") || (mind.assigned_role == "Chief Engineer") )
+ gain = 100
+ if(mind.assigned_role == "Clown")
+ gain = rand(-300, 300)
+ investigate_log(" has consumed [key_name(src)].","singulo") //Oh that's where the clown ended up!
+ gib()
+ return(gain)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index d52e595df3d..17e08ce7d3a 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -630,3 +630,9 @@
src.unEquip(what)
who.equip_to_slot_if_possible(what, where, 0, 1)
add_logs(src, who, "equipped", object=what)
+
+/mob/living/singularity_act()
+ var/gain = 20
+ investigate_log(" has consumed [key_name(src)].","singulo") //Oh that's where the clown ended up!
+ gib()
+ return(gain)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 290132a23d5..8b4076e265b 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1081,7 +1081,7 @@
new /obj/item/robot_parts/head(T)
var/b
for(b=0, b!=2, b++)
- var/obj/item/device/flash/F = new /obj/item/device/flash(T)
+ var/obj/item/device/flash/handheld/F = new /obj/item/device/flash/handheld(T)
F.burn_out()
if (cell) //Sanity check.
cell.loc = T
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 68fe80c0780..c5539036b56 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -10,7 +10,7 @@
move_self = 1 //Do we move on our own?
grav_pull = 5 //How many tiles out do we pull?
consume_range = 6 //How many tiles out do we eat
- uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct)
+ var/uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct)
/obj/machinery/singularity/narsie/large
name = "Nar-Sie"
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index c92564ada45..9108b61c8ea 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -25,9 +25,7 @@
var/event_chance = 15 //Prob for event each tick
var/target = null //its target. moves towards the target if it has one
var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing
- var/teleport_del = 0
var/last_warning
- var/list/uneatable = list(/turf/space, /obj/effect/overlay)
/obj/machinery/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
//CARN: admin-alert for chuckle-fuckery.
@@ -212,7 +210,6 @@
var/dist = get_dist(X, src)
// Movable atoms only
if(dist > consume_range && istype(X, /atom/movable))
- if(is_type_in_list(X, uneatable)) continue
if(((X) &&(!X:anchored) && (!istype(X,/mob/living/carbon/human)))|| (src.current_size >= 9))
step_towards(X,src)
@@ -244,60 +241,7 @@
/obj/machinery/singularity/proc/consume(var/atom/A)
- var/gain = 0
- if(is_type_in_list(A, uneatable))
- return 0
- if (istype(A,/mob/living))//Mobs get gibbed
- var/mob/living/M = A
- gain = 20
- if(istype(M,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- if(H.mind)
-
- if((H.mind.assigned_role == "Station Engineer") || (H.mind.assigned_role == "Chief Engineer") )
- gain = 100
-
- if(H.mind.assigned_role == "Clown")
- gain = rand(-300, 300) // HONK
-
- investigate_log(" has consumed [key_name(M)].","singulo") //Oh that's where the clown ended up!
- M.gib()
- sleep(1)
- else if(istype(A,/obj/))
-
- if (istype(A,/obj/item/weapon/storage/backpack/holding))
- var/dist = max((current_size - 2),1)
- explosion(src.loc,(dist),(dist*2),(dist*4))
- return
-
- if(istype(A, /obj/machinery/singularity))//Welp now you did it
- var/obj/machinery/singularity/S = A
- src.energy += (S.energy/2)//Absorb most of it
- qdel(S)
- var/dist = max((current_size - 2),1)
- explosion(src.loc,(dist),(dist*2),(dist*4))
- return//Quits here, the obj should be gone, hell we might be
-
- if((teleport_del) && (!istype(A, /obj/machinery)))//Going to see if it does not lag less to tele items over to Z 2
- var/obj/O = A
- O.x = 2
- O.y = 2
- O.z = 2
- else
- A.ex_act(1.0)
- if(A && isnull(A.gc_destroyed))
- qdel(A)
- gain = 2
- else if(isturf(A))
- var/turf/T = A
- if(T.intact)
- for(var/obj/O in T.contents)
- if(O.level != 1)
- continue
- if(O.invisibility == 101)
- src.consume(O)
- T.ChangeTurf(/turf/space)
- gain = 2
+ var/gain = A.singularity_act(current_size)
src.energy += gain
return
@@ -453,4 +397,11 @@
for(var/obj/machinery/power/rad_collector/R in rad_collectors)
if(get_dist(R, src) <= 15) // Better than using orange() every process
R.receive_pulse(energy)
- return
\ No newline at end of file
+ return
+
+/obj/machinery/singularity/singularity_act()
+ var/gain = (energy/2)
+ var/dist = max((current_size - 2),1)
+ explosion(src.loc,(dist),(dist*2),(dist*4))
+ qdel(src)
+ return(gain)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index f1ee2f12a74..08351551243 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -68,6 +68,8 @@
var/ratio = power_supply.charge / power_supply.maxcharge
ratio = Ceiling(ratio*4) * 25
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+ if(power_supply.charge < shot.e_cost)
+ ratio = 0 //so the icon changes to empty if the charge isn't zero but not enough for a shot.
switch(modifystate)
if (0)
icon_state = "[initial(icon_state)][ratio]"
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 2973bfcc363..f2fbbce3172 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -708,7 +708,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
if(!R.total_volume||!R.reagent_list.len)
dat += "The beaker is empty
"
else if(!Blood)
- dat += "No blood sample found in beaker"
+ dat += "No blood sample found in beaker."
else if(!Blood.data)
dat += "No blood data found in beaker."
else
@@ -749,6 +749,10 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
english_symptoms += S.name
dat += english_list(english_symptoms)
+ else
+ dat += "No detectable virus in the sample."
+ else
+ dat += "No detectable virus in the sample."
dat += "
Contains antibodies to: "
if(Blood.data["resistances"])
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index b5fcb1ae5c2..60fb6d1f946 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -68,6 +68,7 @@
amount_per_transfer_from_this = 10
volume = 10
ignore_flags = 1 //so you can medipen through hardsuits
+ flags = null
/obj/item/weapon/reagent_containers/hypospray/medipen/New()
..()
@@ -75,10 +76,9 @@
update_icon()
return
+
/obj/item/weapon/reagent_containers/hypospray/medipen/attack(mob/M as mob, mob/user as mob)
..()
- if(reagents.total_volume <= 0) //Prevents medipens from being refilled.
- flags &= ~OPENCONTAINER
update_icon()
return
diff --git a/code/unused/hivebot/hive_modules.dm b/code/unused/hivebot/hive_modules.dm
index c0ae3196ca9..56951dee480 100644
--- a/code/unused/hivebot/hive_modules.dm
+++ b/code/unused/hivebot/hive_modules.dm
@@ -14,7 +14,7 @@
name = "HiveBot engineering robot module"
/obj/item/weapon/hive_module/New()//Shit all the mods have
- src.modules += new /obj/item/device/flash(src)
+ src.modules += new /obj/item/device/flash/handheld(src)
/obj/item/weapon/hive_module/standard/New()
diff --git a/html/changelog.html b/html/changelog.html
index 7df9840a60f..b3528ac9971 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,53 @@
-->
+
+
19 October 2014
+
Donkie updated:
+
+ - Major atmos update. Featuring pretty colors.
+ - 4-Way pipes added.
+ - Flip-able trinary devices (mixer & filter).
+ - Pipe-painter added.
+ - Most pipe icons have been tweaked with shading and such, making it look more uniform.
+
+
JJRcop updated:
+
+ - We have managed to re-discover drones! We improved the formula, and have discovered some cool stuff.
+ - After some fiddling with audio recognition, drones can now understand human speech!
+ - One of our engineers found some screws that were loose on some of our tests, screwing them in made the drone work as if it had just come out of robotics.
+ - We had to sacrifice some of our NT brand EMP protection for the speech recognition, so drones can get damaged if subjected to heavy EMP radiation.
+ - We figured out why drones couldn't remove objects from people, that has been fixed.
+ - The standby light wasn't wired correctly.
+ - Unfortunately one of our assistants tasked with transporting the only copy of the data dropped the flash drive in hot water because he wanted to see what "drone tea" tasted like. You'll have to discover them again.
+
+
Lo6a4evskiy updated:
+
+ - Station's crayons have been upgraded to the version 2.0 of ColourOS. Don't worry, they are still edible!
+ - Many items now have different stripping delays. Heavier and more armored pieces of clothing are generally more difficult to take off someone else, while smaller items can be very easy to snatch. Pockets always take 4 seconds to search.
+
+
MrPerson updated:
+
+ - Implants are activated via action buttons on the top-left corner of your screen instead of emotes.
+
+
Paprika updated:
+
+ - Added zipties for security and nuke operatives. These have a slightly shorter 'breakout time' as normal cuffs but they are destroyed upon removal. Beepsky and sec borgs now use these by default.
+ - Changed the medical HUD in the tactical medkit to a night vision HUD so syndicate medics don't stumble around in the dark. Can be purchased through nuke op uplinks.
+ - Added a second roboticist roundstart job slot.
+ - Added a third cargo tech job slot.
+
+
Paprka updated:
+
+ - Added undershirts as a companion piece to jumpsuit adjusting. Beat the heat with a comfortable tank top, or warm up with an extra layer tshirt!
+ - Added a holographic sign projector to replace the old wet floor signs to encourage janitors to warn crewmembers about wet floors.
+
+
optimumtact updated:
+
+ - Medical supplies crate now comes with a boxy full of bodybags
+
+
09 October 2014
Paprika updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 1b538c51b16..bce08847b4b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1944,3 +1944,51 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
capacity of the jetpack has been reduced as well, however.
- experiment: Removed resonator from the mining voucher redemption. Replaced it
with a mining drill.
+2014-10-19:
+ Donkie:
+ - rscadd: Major atmos update. Featuring pretty colors.
+ - rscadd: 4-Way pipes added.
+ - rscadd: Flip-able trinary devices (mixer & filter).
+ - rscadd: Pipe-painter added.
+ - tweak: Most pipe icons have been tweaked with shading and such, making it look
+ more uniform.
+ JJRcop:
+ - rscadd: We have managed to re-discover drones! We improved the formula, and have
+ discovered some cool stuff.
+ - rscadd: After some fiddling with audio recognition, drones can now understand
+ human speech!
+ - rscadd: One of our engineers found some screws that were loose on some of our
+ tests, screwing them in made the drone work as if it had just come out of robotics.
+ - tweak: We had to sacrifice some of our NT brand EMP protection for the speech
+ recognition, so drones can get damaged if subjected to heavy EMP radiation.
+ - bugfix: We figured out why drones couldn't remove objects from people, that has
+ been fixed.
+ - bugfix: The standby light wasn't wired correctly.
+ - rscdel: Unfortunately one of our assistants tasked with transporting the only
+ copy of the data dropped the flash drive in hot water because he wanted to see
+ what "drone tea" tasted like. You'll have to discover them again.
+ Lo6a4evskiy:
+ - rscadd: Station's crayons have been upgraded to the version 2.0 of ColourOS. Don't
+ worry, they are still edible!
+ - tweak: Many items now have different stripping delays. Heavier and more armored
+ pieces of clothing are generally more difficult to take off someone else, while
+ smaller items can be very easy to snatch. Pockets always take 4 seconds to search.
+ MrPerson:
+ - rscadd: Implants are activated via action buttons on the top-left corner of your
+ screen instead of emotes.
+ Paprika:
+ - rscadd: Added zipties for security and nuke operatives. These have a slightly
+ shorter 'breakout time' as normal cuffs but they are destroyed upon removal.
+ Beepsky and sec borgs now use these by default.
+ - bugfix: Changed the medical HUD in the tactical medkit to a night vision HUD so
+ syndicate medics don't stumble around in the dark. Can be purchased through
+ nuke op uplinks.
+ - rscadd: Added a second roboticist roundstart job slot.
+ - rscadd: Added a third cargo tech job slot.
+ Paprka:
+ - rscadd: Added undershirts as a companion piece to jumpsuit adjusting. Beat the
+ heat with a comfortable tank top, or warm up with an extra layer tshirt!
+ - rscadd: Added a holographic sign projector to replace the old wet floor signs
+ to encourage janitors to warn crewmembers about wet floors.
+ optimumtact:
+ - rscadd: Medical supplies crate now comes with a boxy full of bodybags
diff --git a/html/changelogs/Donkie-PR-4759.yml b/html/changelogs/Donkie-PR-4759.yml
deleted file mode 100644
index 97156691aec..00000000000
--- a/html/changelogs/Donkie-PR-4759.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscdel (general adding of nice things)
-# rscadd (general deleting of nice things)
-# imageadd
-# imagedel
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-
-# Your name.
-author: Donkie
-
-# 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.
-changes:
- - rscadd: Major atmos update. Featuring pretty colors.
- - rscadd: 4-Way pipes added.
- - rscadd: Flip-able trinary devices (mixer & filter).
- - rscadd: Pipe-painter added.
- - tweak: Most pipe icons have been tweaked with shading and such, making it look more uniform.
-
diff --git a/html/changelogs/JJRcop-PR-5185.yml b/html/changelogs/JJRcop-PR-5185.yml
deleted file mode 100644
index 6c72197236b..00000000000
--- a/html/changelogs/JJRcop-PR-5185.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: JJRcop
-delete-after: True
-changes:
- - rscadd: "We have managed to re-discover drones! We improved the formula, and have discovered some cool stuff."
- - rscadd: "After some fiddling with audio recognition, drones can now understand human speech!"
- - rscadd: "One of our engineers found some screws that were loose on some of our tests, screwing them in made the drone work as if it had just come out of robotics."
- - tweak: "We had to sacrifice some of our NT brand EMP protection for the speech recognition, so drones can get damaged if subjected to heavy EMP radiation."
- - bugfix: "We figured out why drones couldn't remove objects from people, that has been fixed."
- - bugfix: "The standby light wasn't wired correctly."
-# ^ These aren't actually code bugs, but I'm writing this all In Character from Nanotrasen, and the icons fit well
- - rscdel: "Unfortunately one of our assistants tasked with transporting the only copy of the data dropped the flash drive in hot water because he wanted to see what \"drone tea\" tasted like. You'll have to discover them again."
\ No newline at end of file
diff --git a/html/changelogs/Lo6a4evskiy-PR-4861.yml b/html/changelogs/Lo6a4evskiy-PR-4861.yml
deleted file mode 100644
index 99c6b5694bf..00000000000
--- a/html/changelogs/Lo6a4evskiy-PR-4861.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Lo6a4evskiy
-
-delete-after: True
-
-changes:
- - rscadd: Station's crayons have been upgraded to the version 2.0 of ColourOS. Don't worry, they are still edible!
\ No newline at end of file
diff --git a/html/changelogs/Lo6a4evskiy-PR-5100.yml b/html/changelogs/Lo6a4evskiy-PR-5100.yml
deleted file mode 100644
index 932d1d032f5..00000000000
--- a/html/changelogs/Lo6a4evskiy-PR-5100.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Lo6a4evskiy
-
-delete-after: True
-
-changes:
- - tweak: Many items now have different stripping delays. Heavier and more armored pieces of clothing are generally more difficult to take off someone else, while smaller items can be very easy to snatch. Pockets always take 4 seconds to search.
\ No newline at end of file
diff --git a/html/changelogs/MrPerson.yml b/html/changelogs/MrPerson.yml
index a97817867cd..6378584f30e 100644
--- a/html/changelogs/MrPerson.yml
+++ b/html/changelogs/MrPerson.yml
@@ -1,3 +1,2 @@
author: MrPerson
-changes:
- - rscadd: Implants are activated via action buttons on the top-left corner of your screen instead of emotes.
\ No newline at end of file
+changes: []
diff --git a/html/changelogs/Paprka-PR-5123.yml b/html/changelogs/Paprka-PR-5123.yml
deleted file mode 100644
index f0323cd6a7a..00000000000
--- a/html/changelogs/Paprka-PR-5123.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Paprika
-delete-after: True
-changes:
- - rscadd: "Added zipties for security and nuke operatives. These have a slightly shorter 'breakout time' as normal cuffs but they are destroyed upon removal. Beepsky and sec borgs now use these by default."
\ No newline at end of file
diff --git a/html/changelogs/Paprka-PR-5132.yml b/html/changelogs/Paprka-PR-5132.yml
deleted file mode 100644
index 07b8090aa77..00000000000
--- a/html/changelogs/Paprka-PR-5132.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Paprika
-delete-after: True
-changes:
- - bugfix: Changed the medical HUD in the tactical medkit to a night vision HUD so syndicate medics don't stumble around in the dark. Can be purchased through nuke op uplinks.
\ No newline at end of file
diff --git a/html/changelogs/Paprka-PR-5135.yml b/html/changelogs/Paprka-PR-5135.yml
deleted file mode 100644
index d31426110ae..00000000000
--- a/html/changelogs/Paprka-PR-5135.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Paprka
-
-delete-after: True
-
-changes:
- - rscadd: "Added undershirts as a companion piece to jumpsuit adjusting. Beat the heat with a comfortable tank top, or warm up with an extra layer tshirt!"
\ No newline at end of file
diff --git a/html/changelogs/Paprka-PR-5137.yml b/html/changelogs/Paprka-PR-5137.yml
deleted file mode 100644
index 9a277d228ec..00000000000
--- a/html/changelogs/Paprka-PR-5137.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Paprka
-delete-after: True
-changes:
- - rscadd: "Added a holographic sign projector to replace the old wet floor signs to encourage janitors to warn crewmembers about wet floors."
\ No newline at end of file
diff --git a/html/changelogs/Paprka-PR-5179.yml b/html/changelogs/Paprka-PR-5179.yml
new file mode 100644
index 00000000000..09edf6384ea
--- /dev/null
+++ b/html/changelogs/Paprka-PR-5179.yml
@@ -0,0 +1,4 @@
+author: Paprika
+delete-after: True
+changes:
+ - experiment: "Allowed constructs to assist in activating most runes. This includes conversion runes, but does NOT include sacrifice runes."
\ No newline at end of file
diff --git a/html/changelogs/Paprka-PR-5202.yml b/html/changelogs/Paprka-PR-5202.yml
deleted file mode 100644
index fa15d19cf93..00000000000
--- a/html/changelogs/Paprka-PR-5202.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Paprika
-delete-after: True
-changes:
- - rscadd: "Added a second roboticist roundstart job slot."
- - rscadd: "Added a third cargo tech job slot."
diff --git a/html/changelogs/optimumtact-PR-5141.yml b/html/changelogs/optimumtact-PR-5141.yml
deleted file mode 100644
index 226ba3a2542..00000000000
--- a/html/changelogs/optimumtact-PR-5141.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscdel (general adding of nice things)
-# rscadd (general deleting of nice things)
-# imageadd
-# imagedel
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-
-# Your name.
-author: optimumtact
-
-delete-after: True
-
-changes:
- - rscadd: "Medical supplies crate now comes with a boxy full of bodybags"
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index ff3137d0e70..e711157e2e5 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index c8d4790d75f..64d5b519ad0 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 22ef17c1007..2572ffae3a7 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 4623677765c..3ed28b85624 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index c6b21068494..11520ec0f35 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index ad81a1a1650..1dcfa6357a1 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index eeb1db6b29c..0f7700a18ea 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 594e9f0bde5..fbfeef2b539 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -748,6 +748,7 @@
#include "code\modules\admin\verbs\possess.dm"
#include "code\modules\admin\verbs\pray.dm"
#include "code\modules\admin\verbs\randomverbs.dm"
+#include "code\modules\admin\verbs\reestablish_db_connection.dm"
#include "code\modules\admin\verbs\ticklag.dm"
#include "code\modules\admin\verbs\tripAI.dm"
#include "code\modules\admin\verbs\SDQL2\SDQL_2.dm"