diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm
index ad7ae53fdc..198f7fd15a 100644
--- a/code/game/magic/library.dm
+++ b/code/game/magic/library.dm
@@ -512,8 +512,8 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
var/title = query.item[3]
var/category = query.item[4]
dat += "
| [author] | [title] | [category] | \[Order\] |
"
- dat += "
"
- dat += "(Return to main menu)
"
+ dat += ""
+ dat += "
(Return to main menu)
"
dbcon.Disconnect()
if(5)
dat += "Upload a New Title
"
diff --git a/code/game/objects/devices/lightreplacer.dm b/code/game/objects/devices/lightreplacer.dm
index dae06dfa4f..58d2789886 100644
--- a/code/game/objects/devices/lightreplacer.dm
+++ b/code/game/objects/devices/lightreplacer.dm
@@ -15,7 +15,7 @@
//
// HOW TO REFILL THE DEVICE
//
-// It will need to be manually refilled with glass.
+// It will need to be manually refilled with lights.
// If it's part of a robot module, it will charge when the Robot is inside a Recharge Station.
//
// EMAGGED FEATURES
@@ -36,7 +36,7 @@
/obj/item/device/lightreplacer
name = "light replacer"
- desc = "A device to automatically replace lights. Needs glass to operate."
+ desc = "A device to automatically replace lights. Refill with working lightbulbs."
icon = 'janitor.dmi'
icon_state = "lightreplacer0"
@@ -47,7 +47,7 @@
var/emagged = 0
var/failmsg = ""
// How much to increase per each glass?
- var/increment = 2
+ var/increment = 5
// How much to take from the glass?
var/decrement = 1
var/charging = 0
@@ -63,7 +63,7 @@
usr << "It has [uses] lights remaining."
/obj/item/device/lightreplacer/attackby(obj/item/W, mob/user)
- if(istype(W, /obj/item/weapon/card/emag))
+ if(istype(W, /obj/item/weapon/card/emag) && emagged == 0)
Emag()
return
@@ -75,6 +75,20 @@
user << "You insert a piece of glass into the [src.name]. You have [uses] lights remaining."
return
+ if(istype(W, /obj/item/weapon/light))
+ var/obj/item/weapon/light/L = W
+ if(L.status == 0) // LIGHT OKAY
+ if(uses <= max_uses)
+ ModifyUses(1)
+ user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining."
+ user.drop_item()
+ del(L)
+ return
+ else
+ user << "You need a working light."
+ return
+
+
/obj/item/device/lightreplacer/attack_self(mob/user)
/* // This would probably be a bit OP. If you want it though, uncomment the code.
if(isrobot(user))
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index facac75815..5405e1df9e 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -81,6 +81,14 @@
else
user << "\blue The bag is full!"
+/obj/item/weapon/trashbag/attack_self(mob/living/user as mob)
+
+ if(contents.len > 0)
+ for(var/obj/item/I in src.contents)
+ I.loc = user.loc
+ update_icon()
+ user << "\blue You drop all the trash onto the floor."
+
/obj/item/weapon/trashbag/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
if(istype(target, /obj/item))
var/obj/item/W = target
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index 8f94d7c636..8e194c522f 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -37,18 +37,12 @@ datum
if(istype(C, /obj/item/clothing/suit/bio_suit))
// bio suits are just about completely fool-proof - Doohl
// kind of a hacky way of making bio suits more resistant to chemicals but w/e
- if(prob(50))
+ if(prob(75))
block = 1
- else
- if(prob(50))
- block = 1
if(istype(C, /obj/item/clothing/head/bio_hood))
- if(prob(50))
+ if(prob(75))
block = 1
- else
- if(prob(50))
- block = 1
chance = chance * 100
@@ -2593,6 +2587,8 @@ datum
if(!data) data = 1
data++
M.dizziness +=3
+ if(holder.has_reagent("toxin"))
+ holder.remove_reagent("toxin", 2)
if(data >= 45 && data <125)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 76ea08c808..5b2afaca7d 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -674,7 +674,7 @@
icon_state = "ltube"
base_state = "ltube"
item_state = "c_tube"
- g_amt = 200
+ g_amt = 100
brightness = 8
large