diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 27373fdf45a..782c5e0f0e1 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -18,6 +18,7 @@
item_state = "bl_suit"
worn_state = "tactifool"
siemens_coefficient = 1
+ has_sensor = 1
armor = null
/obj/item/clothing/under/syndicate/tracksuit
diff --git a/code/modules/custom_ka/cells.dm b/code/modules/custom_ka/cells.dm
index 76fe27851c0..49577c179ea 100644
--- a/code/modules/custom_ka/cells.dm
+++ b/code/modules/custom_ka/cells.dm
@@ -256,5 +256,5 @@
origin_tech = list(TECH_MATERIAL = 4,TECH_ENGINEERING = 5,TECH_MAGNET = 4,TECH_POWER = 4)
- type_to_take = "uranium"
- charge_per_sheet = 50
\ No newline at end of file
+ type_to_take = "mhydrogen"
+ charge_per_sheet = 90
\ No newline at end of file
diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm
index 8cb2731a892..69bc8485cf4 100644
--- a/code/modules/item_worth/worths_list.dm
+++ b/code/modules/item_worth/worths_list.dm
@@ -609,6 +609,7 @@ var/list/worths = list(
/obj/item/device/chameleon = 4000,
/obj/item/device/paicard = 120,
/obj/item/device/powersink = 1800,
+ /obj/item/weapon/hand_tele = 1800,
/obj/item/device/mass_spectrometer/adv = 400,
/obj/item/device/mass_spectrometer = 300,
/obj/item/device/reagent_scanner/adv = 600,
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 6c5d1579379..3ea052a60d0 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -1351,8 +1351,8 @@ var/list/total_extraction_beacons = list()
if(iscarbon(LI))
var/mob/living/carbon/L = A
L.Weaken(3)
- if(ishuman(L))
- shake_camera(L, 20, 1)
+ shake_camera(L, 20, 1)
+ if(!isipc(L))
addtimer(CALLBACK(L, /mob/living/carbon/.proc/vomit), 20)
spawn(2)
diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm
index 00a63f5cd6a..90502262ef0 100644
--- a/code/modules/modular_computers/hardware/battery_module.dm
+++ b/code/modules/modular_computers/hardware/battery_module.dm
@@ -15,8 +15,8 @@
desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices. It's rating is 1100."
icon_state = "battery_advanced"
origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2)
- hardware_size = 3
battery_rating = 1100
+ hardware_size = 2
/obj/item/weapon/computer_hardware/battery_module/super
name = "super battery"
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 8e6bede85ba..1e21dc8f6c2 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -33,7 +33,7 @@
/obj/machinery/chem_master/Initialize()
. = ..()
- create_reagents(120)
+ create_reagents(300)
/obj/machinery/chem_master/ex_act(severity)
switch(severity)
@@ -809,3 +809,17 @@
target.say("*scream")
spawn(10)
user.visible_message("[user] stops the [src] and leaves [target] resting as they are.", "You turn the [src] off and let go of [target].")
+
+/obj/machinery/reagentgrinder/verb/Eject()
+ set src in oview(1)
+ set category = "Object"
+ set name = "Eject contents"
+
+ if(use_check(usr))
+ return
+ usr.visible_message(
+ "[usr] opens [src] and has removed [english_list(holdingitems)]."
+ )
+
+ eject()
+ detach()
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
index 6a6c8dfe44d..56a26051b2f 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
@@ -246,6 +246,17 @@
if(dose == removed)
S.visible_message("[S]'s flesh sizzles where the water touches it!", "Your flesh burns in the water!")
+
+/datum/reagent/water/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+ if(istype(M, /mob/living/carbon/slime))
+ var/mob/living/carbon/slime/S = M
+ S.adjustToxLoss(12 * removed) // A slime having water forced down its throat would cause much more damage then being splashed on it
+ if (!S.client && S.Target)
+
+ S.Target = null
+ ++S.Discipline
+
+
/datum/reagent/fuel
name = "Welding fuel"
id = "fuel"
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index f8413474082..960ae265e9e 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -1642,7 +1642,7 @@
id = "gin"
description = "It's gin. In space. I say, good sir."
color = "#664300"
- strength = 20
+ strength = 30
taste_description = "an alcoholic christmas tree"
glass_icon_state = "ginvodkaglass"
diff --git a/html/changelogs/bugfix.yml b/html/changelogs/bugfix.yml
new file mode 100644
index 00000000000..385fce19af8
--- /dev/null
+++ b/html/changelogs/bugfix.yml
@@ -0,0 +1,44 @@
+################################
+# 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
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+#################################
+
+# Your name.
+author: Drago
+
+# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Fixed Hand Teleporter Price being 5 credits, it is now 1800."
+ - rscdel: "Made the grinder be able to eject its contents and beaker without power."
+ - rscdel: "Slimes that drink water now get major toxin damage, far more then a shower."
+ - rscdel: IPCs No longer vomit with seismic charges
+ - rscdel: Fixed Briefcase missing hand sprites
+ - rscdel: Hydrogen KA now loads properly
+ - rscdel: NTOS cannot be pirated anymore
+ - rscdel: Advanced batteries fit into laptops now
\ No newline at end of file
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index e148910c7e4..27ee8054f81 100644
Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ
diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi
index b043ea843e5..8146d37bdd3 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index b665214a7c5..b50b17e3bba 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -37123,7 +37123,6 @@
icon_state = "rwindow";
dir = 8
},
-/obj/structure/table/standard,
/obj/machinery/door/window{
base_state = "left";
dir = 1;
diff --git a/nano/templates/ntnet_downloader.tmpl b/nano/templates/ntnet_downloader.tmpl
index 3a6c1b6a46b..d5e68b592aa 100644
--- a/nano/templates/ntnet_downloader.tmpl
+++ b/nano/templates/ntnet_downloader.tmpl
@@ -129,4 +129,4 @@
{{/if}}
-
NTOS v2.0.6 Copyright NanoTrasen 2450 - 2458
\ No newline at end of file
+
NTOS v2.0.6 Copyright NanoTrasen 2450 - 2460
\ No newline at end of file