diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm
index b8ddd5427dd..2e8d0f57a32 100644
--- a/code/WorkInProgress/Chemistry-Reagents.dm
+++ b/code/WorkInProgress/Chemistry-Reagents.dm
@@ -473,8 +473,7 @@ datum
description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
reagent_state = SOLID
on_mob_life(var/mob/M)
- M.make_jittery(5)
- M:nutrition += 3
+ M:nutrition += 1
..()
return
@@ -929,10 +928,11 @@ datum
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
- if(M:cloneloss) M:cloneloss = max(0, M:cloneloss-5)
- if(M:oxyloss) M:oxyloss = max(0, M:oxyloss-5)
+ M:cloneloss = 0
+ M:oxyloss = 0
+ M:radiation = 0
M:heal_organ_damage(5,5)
- M:drowsyness = max(M:drowsyness-2, 0)
+ M:drowsyness = 0
if(holder.has_reagent("toxin"))
holder.remove_reagent("toxin", 2)
if(holder.has_reagent("stoxin"))
@@ -953,11 +953,11 @@ datum
holder.remove_reagent("carpotoxin", 1)
if(holder.has_reagent("zombiepowder"))
holder.remove_reagent("zombiepowder", 0.5)
- M:brainloss = max(M:brainloss-5 , 0)
+ M:brainloss = 0
M.disabilities = 0
M.sdisabilities = 0
- M:eye_blurry = max(M:eye_blurry-5 , 0)
- M:eye_blind = max(M:eye_blind-5 , 0)
+ M:eye_blurry = 0
+ M:eye_blind = 0
M:disabilities &= ~1
M:sdisabilities &= ~1
if(M:toxloss) M:toxloss = max(0, M:toxloss-5)
@@ -999,7 +999,21 @@ datum
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
- if(M:radiation) M:radiation--
+ M:radiation = max(M:radiation-3,0)
+ ..()
+ return
+
+ arithrazine
+ name = "Arithrazine"
+ id = "arithrazine"
+ description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
+ reagent_state = LIQUID
+ on_mob_life(var/mob/M)
+ if(!M) M = holder.my_atom
+ M:radiation = 0
+ if(M:toxloss) M:toxloss--
+ if(prob(15))
+ M.take_organ_damage(1, 0)
..()
return
@@ -1028,20 +1042,6 @@ datum
..()
return
- arithrazine
- name = "Arithrazine"
- id = "arithrazine"
- description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
- reagent_state = LIQUID
- on_mob_life(var/mob/M)
- if(!M) M = holder.my_atom
- M:radiation = max(M:radiation-3,0)
- if(M:toxloss) M:toxloss--
- if(prob(15))
- M.take_organ_damage(1, 0)
- ..()
- return
-
bicaridine
name = "Bicaridine"
id = "bicaridine"
@@ -1377,7 +1377,7 @@ datum
if (!M:stuttering) M:stuttering = 1
M.make_jittery(10)
M.make_dizzy(10)
- M.druggy = max(M.druggy, 31)
+ M.druggy = max(M.druggy, 35)
if(prob(20)) M:emote(pick("twitch","giggle"))
if (10 to INFINITY)
if (!M:stuttering) M:stuttering = 1
@@ -1617,7 +1617,7 @@ datum
..()
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature+5)
- M:nutrition += 5
+ M:nutrition += 1
return
space_cola
@@ -1629,7 +1629,7 @@ datum
M:drowsyness = max(0,M:drowsyness-5)
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = max(310, M.bodytemperature-5)
- M:nutrition += 2
+ M:nutrition += 1
..()
return
@@ -1644,7 +1644,7 @@ datum
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature-5)
M.make_jittery(5)
- M:nutrition += 2
+ M:nutrition += 1
..()
return
@@ -1659,7 +1659,7 @@ datum
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature-5)
M.make_jittery(5)
- M:nutrition += 2
+ M:nutrition += 1
if(!data) data = 1
data++
M.dizziness +=4
@@ -1680,7 +1680,7 @@ datum
M:drowsyness = max(0,M:drowsyness-6)
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature-5) //310 is the normal bodytemp. 310.055
- M:nutrition += 2
+ M:nutrition += 1
..()
return
@@ -1692,7 +1692,7 @@ datum
on_mob_life(var/mob/M)
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature-8) //310 is the normal bodytemp. 310.055
- M:nutrition += 2
+ M:nutrition += 1
..()
return
diff --git a/code/WorkInProgress/Chemistry-Recipes.dm b/code/WorkInProgress/Chemistry-Recipes.dm
index 32275def76e..8e74717624a 100644
--- a/code/WorkInProgress/Chemistry-Recipes.dm
+++ b/code/WorkInProgress/Chemistry-Recipes.dm
@@ -481,7 +481,7 @@ datum
id = "cleaner"
result = "cleaner"
required_reagents = list("ammonia" = 1, "water" = 1)
- result_amount = 1
+ result_amount = 2
plantbgone
name = "Plant-B-Gone"
diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm
index ae2e73c36ea..0c78d3948e2 100644
--- a/code/game/objects/devices/PDA/cart.dm
+++ b/code/game/objects/devices/PDA/cart.dm
@@ -327,7 +327,7 @@
if (bl.z != cl.z)
continue
- ldat += "Bucket - \[[bl.x],[bl.y]\] - Water level: [B.reagents.total_volume]/70
"
+ ldat += "Bucket - \[[bl.x],[bl.y]\] - Water level: [B.reagents.total_volume]/100
"
if (!ldat)
menu += "None"
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index 6919ab6e383..77c3dcd4525 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -52,8 +52,8 @@ RSF
if (!(istype(A, /obj/table) || istype(A, /turf/simulated/floor)))
return
- if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && mode == 1)
- if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && matter >= 1)
+ if (istype(A, /obj/table) && mode == 1)
+ if (istype(A, /obj/table) && matter >= 1)
user << "Dispensing Dosh..."
playsound(src.loc, 'click.ogg', 10, 1)
new /obj/item/weapon/spacecash/c10( A.loc )
@@ -66,8 +66,22 @@ RSF
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
return
- else if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && mode == 2)
- if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && matter >= 1)
+ else if (istype(A, /turf/simulated/floor) && mode == 1)
+ if (istype(A, /turf/simulated/floor) && matter >= 1)
+ user << "Dispensing Dosh..."
+ playsound(src.loc, 'click.ogg', 10, 1)
+ new /obj/item/weapon/spacecash/c10( A )
+ if (isrobot(user))
+ var/mob/living/silicon/robot/engy = user
+ engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
+ else
+ matter--
+ user << "The RSF now holds [matter]/30 fabrication-units."
+ desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+ return
+
+ else if (istype(A, /obj/table) && mode == 2)
+ if (istype(A, /obj/table) && matter >= 1)
user << "Dispensing Drinking Glass..."
playsound(src.loc, 'click.ogg', 10, 1)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A.loc )
@@ -80,8 +94,22 @@ RSF
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
return
- else if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && mode == 3)
- if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && matter >= 1)
+ else if (istype(A, /turf/simulated/floor) && mode == 2)
+ if (istype(A, /turf/simulated/floor) && matter >= 1)
+ user << "Dispensing Drinking Glass..."
+ playsound(src.loc, 'click.ogg', 10, 1)
+ new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A )
+ if (isrobot(user))
+ var/mob/living/silicon/robot/engy = user
+ engy.cell.charge -= 50
+ else
+ matter--
+ user << "The RSF now holds [matter]/30 fabrication-units."
+ desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+ return
+
+ else if (istype(A, /obj/table) && mode == 3)
+ if (istype(A, /obj/table) && matter >= 1)
user << "Dispensing Paper Sheet..."
playsound(src.loc, 'click.ogg', 10, 1)
new /obj/item/weapon/paper( A.loc )
@@ -94,8 +122,22 @@ RSF
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
return
- else if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && mode == 4)
- if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && matter >= 1)
+ else if (istype(A, /turf/simulated/floor) && mode == 3)
+ if (istype(A, /turf/simulated/floor) && matter >= 1)
+ user << "Dispensing Paper Sheet..."
+ playsound(src.loc, 'click.ogg', 10, 1)
+ new /obj/item/weapon/paper( A )
+ if (isrobot(user))
+ var/mob/living/silicon/robot/engy = user
+ engy.cell.charge -= 10
+ else
+ matter--
+ user << "The RSF now holds [matter]/30 fabrication-units."
+ desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+ return
+
+ else if (istype(A, /obj/table) && mode == 4)
+ if (istype(A, /obj/table) && matter >= 1)
user << "Dispensing Pen..."
playsound(src.loc, 'click.ogg', 10, 1)
new /obj/item/weapon/pen( A.loc )
@@ -108,8 +150,22 @@ RSF
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
return
- else if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && mode == 5)
- if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && matter >= 1)
+ else if (istype(A, /turf/simulated/floor) && mode == 4)
+ if (istype(A, /turf/simulated/floor) && matter >= 1)
+ user << "Dispensing Pen..."
+ playsound(src.loc, 'click.ogg', 10, 1)
+ new /obj/item/weapon/pen( A )
+ if (isrobot(user))
+ var/mob/living/silicon/robot/engy = user
+ engy.cell.charge -= 50
+ else
+ matter--
+ user << "The RSF now holds [matter]/30 fabrication-units."
+ desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+ return
+
+ else if (istype(A, /obj/table) && mode == 5)
+ if (istype(A, /obj/table) && matter >= 1)
user << "Dispensing Dice Pack..."
playsound(src.loc, 'click.ogg', 10, 1)
new /obj/item/weapon/storage/dice( A.loc )
@@ -122,8 +178,22 @@ RSF
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
return
- else if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && mode == 6)
- if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && matter >= 1)
+ else if (istype(A, /turf/simulated/floor) && mode == 5)
+ if (istype(A, /turf/simulated/floor) && matter >= 1)
+ user << "Dispensing Dice Pack..."
+ playsound(src.loc, 'click.ogg', 10, 1)
+ new /obj/item/weapon/storage/dice( A )
+ if (isrobot(user))
+ var/mob/living/silicon/robot/engy = user
+ engy.cell.charge -= 200
+ else
+ matter--
+ user << "The RSF now holds [matter]/30 fabrication-units."
+ desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+ return
+
+ else if (istype(A, /obj/table) && mode == 6)
+ if (istype(A, /obj/table) && matter >= 1)
user << "Dispensing Cigarette..."
playsound(src.loc, 'click.ogg', 10, 1)
new /obj/item/clothing/mask/cigarette( A.loc )
@@ -134,4 +204,18 @@ RSF
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+ return
+
+ else if (istype(A, /turf/simulated/floor) && mode == 6)
+ if (istype(A, /turf/simulated/floor) && matter >= 1)
+ user << "Dispensing Cigarette..."
+ playsound(src.loc, 'click.ogg', 10, 1)
+ new /obj/item/clothing/mask/cigarette( A )
+ if (isrobot(user))
+ var/mob/living/silicon/robot/engy = user
+ engy.cell.charge -= 10
+ else
+ matter--
+ user << "The RSF now holds [matter]/30 fabrication-units."
+ desc = "A RSF. It currently holds [matter]/30 fabrication-units."
return
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm
index 5d4beb4c59c..5ccbca322d3 100644
--- a/code/game/objects/items/weapons/mops_cleaners.dm
+++ b/code/game/objects/items/weapons/mops_cleaners.dm
@@ -5,10 +5,10 @@ MOP
*/
/obj/item/weapon/cleaner/New()
- var/datum/reagents/R = new/datum/reagents(1000)
+ var/datum/reagents/R = new/datum/reagents(250)
reagents = R
R.my_atom = src
- R.add_reagent("cleaner", 1000)
+ R.add_reagent("cleaner", 250)
/obj/item/weapon/cleaner/attack(mob/living/carbon/human/M as mob, mob/user as mob)
return
@@ -24,8 +24,8 @@ MOP
D.name = "chemicals"
D.icon = 'chemical.dmi'
D.icon_state = "chempuff"
- D.create_reagents(10)
- src.reagents.trans_to(D, 10)
+ D.create_reagents(5)
+ src.reagents.trans_to(D, 5)
playsound(src.loc, 'spray2.ogg', 50, 1, -6)
spawn(0)
@@ -90,4 +90,4 @@ MOP
src.reagents.clear_reagents()
mopcount = 0
- return
\ No newline at end of file
+ return