Setup Character
"
if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
- if(!ready) output += "Declare Ready
"
- else output += "You are ready Cancel
"
+ if(ready)
+ output += "\[ Ready | Not Ready \]
"
+ else
+ output += "\[ Ready | Not Ready \]
"
else
+ output += "View the Crew Manifest
"
output += "Join Game!
"
output += "Observe
"
@@ -98,7 +101,10 @@
return 1
if(href_list["ready"])
- ready = text2num(href_list["ready"])
+ if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started
+ ready = !ready
+ else
+ ready = 0
if(href_list["refresh"])
src << browse(null, "window=playersetup") //closes the player setup window
@@ -136,6 +142,9 @@
return
LateChoices()
+ if(href_list["manifest"])
+ ViewManifest()
+
if(href_list["SelectedJob"])
if(!enter_allowed)
@@ -364,6 +373,12 @@
return new_character
+/mob/new_player/proc/ViewManifest()
+ var/dat = ""
+ dat += "Crew Manifest
"
+ dat += data_core.get_manifest(OOC = 1)
+
+ src << browse(dat, "window=manifest;size=370x420;can_close=1")
/mob/new_player/Move()
return 0
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 901fa258ca8..e8bb527e779 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -81,7 +81,7 @@
if(BARTENDER)
clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armoralt"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
else if(backbag == 3)
@@ -95,7 +95,7 @@
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
else if(backbag == 3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(CHEF)
+ if(COOK)
clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY)
@@ -260,12 +260,12 @@
if(backbag == 3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
if(HOS)
- clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "hos_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hoscap"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "hosberetblack"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/eyes.dmi', "sunhud"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hos"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hostrench"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
if(backbag == 3)
@@ -293,9 +293,10 @@
if(backbag == 3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(OFFICER)
- clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "security_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_badge"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 0c60767621b..c47444be1da 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -720,12 +720,12 @@
gender = NEUTER
/datum/sprite_accessory/undershirt/tank_white
- name = "White Tank-Top"
+ name = "White Tank Top"
icon_state = "tank_white"
gender = NEUTER
/datum/sprite_accessory/undershirt/tank_black
- name = "Black Tank-Top"
+ name = "Black Tank Top"
icon_state = "tank_black"
gender = NEUTER
@@ -738,3 +738,208 @@
name = "Midriff Tank Top"
icon_state = "tank_midriff"
gender = FEMALE
+
+/datum/sprite_accessory/undershirt/lover
+ name = "Lover shirt"
+ icon_state = "lover"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/ian
+ name = "Blue Ian Shirt"
+ icon_state = "ian"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/uk
+ name = "UK Shirt"
+ icon_state = "uk"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/ilovent
+ name = "I Love NT Shirt"
+ icon_state = "ilovent"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/peace
+ name = "Peace Shirt"
+ icon_state = "peace"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/mondmondjaja
+ name = "Band Shirt"
+ icon_state = "band"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/pacman
+ name = "Pogoman Shirt"
+ icon_state = "pogoman"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/matroska
+ name = "Matroska Shirt"
+ icon_state = "matroska"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/whiteshortsleeve
+ name = "White Short-sleeved Shirt"
+ icon_state = "whiteshortsleeve"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/purpleshortsleeve
+ name = "Purple Short-sleeved Shirt"
+ icon_state = "purpleshortsleeve"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blueshortsleeve
+ name = "Blue Short-sleeved Shirt"
+ icon_state = "blueshortsleeve"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/greenshortsleeve
+ name = "Green Short-sleeved Shirt"
+ icon_state = "greenshortsleeve"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blackshortsleeve
+ name = "Black Short-sleeved Shirt"
+ icon_state = "blackshortsleeve"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blueshirt
+ name = "Blue T-Shirt"
+ icon_state = "blueshirt"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redshirt
+ name = "Red T-Shirt"
+ icon_state = "redshirt"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/yellowshirt
+ name = "Yellow T-Shirt"
+ icon_state = "yellowshirt"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/greenshirt
+ name = "Green T-Shirt"
+ icon_state = "greenshirt"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/bluepolo
+ name = "Blue Polo Shirt"
+ icon_state = "bluepolo"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redpolo
+ name = "Red Polo Shirt"
+ icon_state = "redpolo"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/whitepolo
+ name = "White Polo Shirt"
+ icon_state = "whitepolo"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/grayyellowpolo
+ name = "Gray-Yellow Polo Shirt"
+ icon_state = "grayyellowpolo"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redtop
+ name = "Red Top"
+ icon_state = "redtop"
+ gender = FEMALE
+
+/datum/sprite_accessory/undershirt/whitetop
+ name = "White Top"
+ icon_state = "whitetop"
+ gender = FEMALE
+
+/datum/sprite_accessory/undershirt/greenshirtsport
+ name = "Green Sports Shirt"
+ icon_state = "greenshirtsport"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redshirtsport
+ name = "Red Sports Shirt"
+ icon_state = "redshirtsport"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blueshirtsport
+ name = "Blue Sports Shirt"
+ icon_state = "blueshirtsport"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/ss13
+ name = "SS13 Shirt"
+ icon_state = "shirt_ss13"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tankfire
+ name = "Fire Tank Top"
+ icon_state = "tank_fire"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/question
+ name = "Question Shirt"
+ icon_state = "shirt_question"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/skull
+ name = "Skull Shirt"
+ icon_state = "shirt_skull"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/commie
+ name = "Commie Shirt"
+ icon_state = "shirt_commie"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/nano
+ name = "Nanotransen Shirt"
+ icon_state = "shirt_nano"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/stripe
+ name = "Striped Shirt"
+ icon_state = "shirt_stripes"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blueshirt
+ name = "Blue Shirt"
+ icon_state = "shirt_blue"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redshirt
+ name = "Red Shirt"
+ icon_state = "shirt_red"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/greenshirt
+ name = "Green Shirt"
+ icon_state = "shirt_green"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/meat
+ name = "Meat Shirt"
+ icon_state = "shirt_meat"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tiedye
+ name = "Tie-dye Shirt"
+ icon_state = "shirt_tiedye"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redjersey
+ name = "Red Jersey"
+ icon_state = "shirt_redjersey"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/bluejersey
+ name = "Blue Jersey"
+ icon_state = "shirt_bluejersey"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tankstripe
+ name = "Striped Tank Top"
+ icon_state = "tank_stripes"
+ gender = FEMALE
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 53831b9f235..a85940d0f81 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -55,7 +55,7 @@
P.loc = user.loc
user.put_in_hands(P)
- user << "You take [P] out of the [src]."
+ user << "You take [P] out of \the [src]."
else
user << "[src] is empty!"
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index dd9af7e4a73..232791722cc 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -679,7 +679,7 @@
if(istype(I, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = I
- user << "You inject the solution into the [src]."
+ user << "You inject the solution into \the [src]."
if(S.reagents.has_reagent("plasma", 5))
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 2d4ede128b5..8e07804317d 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -97,7 +97,7 @@ var/global/list/rad_collectors = list()
user << "The controls are now [src.locked ? "locked." : "unlocked."]"
else
src.locked = 0 //just in case it somehow gets locked
- user << "The controls can only be locked when the [src] is active."
+ user << "The controls can only be locked when \the [src] is active."
else
user << "Access denied!"
return 1
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 377670faa43..14062e210f5 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -74,7 +74,7 @@
return ..()
/obj/machinery/field/CanPass(obj/mover as obj, turf/target, height=0)
- if((istype(mover, /obj/machinery) && !istype(mover, /obj/machinery/singularity)) || \
+ if((istype(mover, /obj/machinery) && !istype(mover, /obj/singularity)) || \
istype(mover, /obj/structure) || \
istype(mover, /obj/mecha))
bump(mover)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 6da19164d8e..8e358e5a43c 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -63,13 +63,13 @@
if(!src.locked)
if(src.active==1)
src.active = 0
- user << "You turn off the [src]."
+ user << "You turn off \the [src]."
message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1)
log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])")
investigate_log("turned off by [user.key]","singulo")
else
src.active = 1
- user << "You turn on the [src]."
+ user << "You turn on \the [src]."
src.shot_number = 0
src.fire_delay = 100
investigate_log("turned on by [user.key]","singulo")
@@ -152,7 +152,7 @@
if(istype(W, /obj/item/weapon/wrench))
if(active)
- user << "Turn off the [src] first."
+ user << "Turn off \the [src] first."
return
switch(state)
if(0 && !isinspace())
@@ -176,7 +176,7 @@
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(active)
- user << "Turn off the [src] first."
+ user << "Turn off \the [src] first."
return
switch(state)
if(0)
@@ -185,23 +185,23 @@
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
- "You start to weld the [src] to the floor.", \
+ "You start to weld \the [src] to the floor.", \
"You hear welding")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 2
- user << "You weld the [src] to the floor."
+ user << "You weld \the [src] to the floor."
connect_to_network()
if(2)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
- "You start to cut the [src] free from the floor.", \
+ "You start to cut \the [src] free from the floor.", \
"You hear welding")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 1
- user << "You cut the [src] free from the floor."
+ user << "You cut \the [src] free from the floor."
disconnect_from_network()
return
@@ -215,7 +215,7 @@
user << "The controls are now [src.locked ? "locked." : "unlocked."]"
else
src.locked = 0 //just in case it somehow gets locked
- user << "The controls can only be locked when the [src] is online."
+ user << "The controls can only be locked when \the [src] is online."
else
user << "Access denied."
return
@@ -227,4 +227,4 @@
if(!emagged)
locked = 0
emagged = 1
- user.visible_message("[user.name] emags the [src.name].","You short out the lock.")
+ user.visible_message("[user.name] emags the [src.name].","You short out the lock.")
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 34f49fa328b..d0fdaf04d41 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -127,7 +127,7 @@ field_generator power level display
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
- "You start to weld the [src] to the floor.", \
+ "You start to weld \the [src] to the floor.", \
"You hear welding")
if (do_after(user,20))
if(!src || !WT.isOn()) return
@@ -139,12 +139,12 @@ field_generator power level display
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
- "You start to cut the [src] free from the floor.", \
+ "You start to cut \the [src] free from the floor.", \
"You hear welding")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 1
- user << "You cut the [src] free from the floor."
+ user << "You cut \the [src] free from the floor."
else
return
else
@@ -344,7 +344,7 @@ field_generator power level display
//I want to avoid using global variables.
spawn(1)
var/temp = 1 //stops spam
- for(var/obj/machinery/singularity/O in world)
+ for(var/obj/singularity/O in world)
if(O.last_warning && temp)
if((world.time - O.last_warning) > 50) //to stop message-spam
temp = 0
diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm
index d618cd54eef..0f27d92cd47 100644
--- a/code/modules/power/singularity/generator.dm
+++ b/code/modules/power/singularity/generator.dm
@@ -12,7 +12,7 @@
/obj/machinery/the_singularitygen/process()
var/turf/T = get_turf(src)
if(src.energy >= 200)
- new /obj/machinery/singularity/(T, 50)
+ new /obj/singularity/(T, 50)
if(src) qdel(src)
/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user)
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 9253dfde465..1ed275131b6 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -1,4 +1,4 @@
-/obj/machinery/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO
+/obj/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO
name = "Nar-sie's Avatar"
desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees."
icon = 'icons/obj/magic_terror.dmi'
@@ -10,9 +10,8 @@
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
- var/uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct)
-/obj/machinery/singularity/narsie/large
+/obj/singularity/narsie/large
name = "Nar-Sie"
icon = 'icons/obj/narsie.dmi'
// Pixel stuff centers Narsie.
@@ -23,7 +22,7 @@
grav_pull = 10
consume_range = 12 //How many tiles out do we eat
-/obj/machinery/singularity/narsie/large/New()
+/obj/singularity/narsie/large/New()
..()
world << "NAR-SIE HAS RISEN"
world << pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg'))
@@ -39,7 +38,7 @@
emergency_shuttle.incall(0.3) // Cannot recall
-/obj/machinery/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
+/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
if(!(src in view()))
user << "Your soul is too far away."
return
@@ -47,7 +46,7 @@
new /obj/effect/effect/sleep_smoke(user.loc)
-/obj/machinery/singularity/narsie/process()
+/obj/singularity/narsie/process()
eat()
if(!target || prob(5))
pickcultist()
@@ -56,15 +55,15 @@
mezzer()
-/obj/machinery/singularity/narsie/Bump(atom/A)//you dare stand before a god?!
+/obj/singularity/narsie/Bump(atom/A)//you dare stand before a god?!
godsmack(A)
return
-/obj/machinery/singularity/narsie/Bumped(atom/A)
+/obj/singularity/narsie/Bumped(atom/A)
godsmack(A)
return
-/obj/machinery/singularity/narsie/proc/godsmack(var/atom/A)
+/obj/singularity/narsie/proc/godsmack(var/atom/A)
if(istype(A,/obj/))
var/obj/O = A
O.ex_act(1.0)
@@ -75,7 +74,7 @@
T.ChangeTurf(/turf/simulated/floor/engine/cult)
-/obj/machinery/singularity/narsie/mezzer()
+/obj/singularity/narsie/mezzer()
for(var/mob/living/carbon/M in oviewers(8, src))
if(M.stat == CONSCIOUS)
if(!iscultist(M))
@@ -83,33 +82,15 @@
M.apply_effect(3, STUN)
-/obj/machinery/singularity/narsie/consume(var/atom/A)
- if(is_type_in_list(A, uneatable))
- return 0
+/obj/singularity/narsie/consume(var/atom/A)
+ A.narsie_act()
- if(istype(A,/mob/living/))
- var/mob/living/C = A
- if(C.client)
- makeNewConstruct(/mob/living/simple_animal/construct/harvester, C, null, 1)
- C.spawn_dust()
- C.gib()
- return
- if(isturf(A))
- var/turf/T = A
- if(istype(T, /turf/simulated/floor) && !istype(T, /turf/simulated/floor/engine/cult))
- if(prob(20)) T.ChangeTurf(/turf/simulated/floor/engine/cult)
-
- else if(istype(T,/turf/simulated/wall) && !istype(T, /turf/simulated/wall/cult))
- if(prob(20)) T.ChangeTurf(/turf/simulated/wall/cult)
+/obj/singularity/narsie/ex_act() //No throwing bombs at it either. --NEO
return
-/obj/machinery/singularity/narsie/ex_act() //No throwing bombs at it either. --NEO
- return
-
-
-/obj/machinery/singularity/narsie/proc/pickcultist() //Narsie rewards his cultists with being devoured first, then picks a ghost to follow. --NEO
+/obj/singularity/narsie/proc/pickcultist() //Narsie rewards his cultists with being devoured first, then picks a ghost to follow. --NEO
var/list/cultists = list()
var/list/noncultists = list()
for(var/mob/living/carbon/food in living_mob_list) //we don't care about constructs or cult-Ians or whatever. cult-monkeys are fair game i guess
@@ -143,7 +124,7 @@
return
-/obj/machinery/singularity/narsie/proc/acquire(var/mob/food)
+/obj/singularity/narsie/proc/acquire(var/mob/food)
target << "NAR-SIE HAS LOST INTEREST IN YOU"
target = food
if(ishuman(target))
@@ -152,10 +133,10 @@
target << "NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL"
//Wizard narsie
-/obj/machinery/singularity/narsie/wizard
+/obj/singularity/narsie/wizard
grav_pull = 0
-/obj/machinery/singularity/narsie/wizard/eat()
+/obj/singularity/narsie/wizard/eat()
set background = BACKGROUND_ENABLED
// if(defer_powernet_rebuild != 2)
// defer_powernet_rebuild = 1
@@ -167,7 +148,7 @@
return
-/obj/machinery/singularity/narsie/proc/narsie_spawn_animation()
+/obj/singularity/narsie/proc/narsie_spawn_animation()
icon = 'icons/obj/narsie_spawn_anim.dmi'
dir = SOUTH
move_self = 0
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 7d41c552c37..ed5d1f760d2 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -38,7 +38,7 @@
if (A)
if(ismob(A))
toxmob(A)
- if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/machinery/singularity/)))
+ if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/singularity/)))
A:energy += energy
return
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 60a9f5f1cd9..8f1443cb6c3 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -1,6 +1,6 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
-/obj/machinery/singularity
+/obj/singularity
name = "gravitational singularity"
desc = "A gravitational singularity."
icon = 'icons/obj/singularity.dmi'
@@ -10,7 +10,6 @@
layer = 6
luminosity = 6
unacidable = 1 //Don't comment this out.
- use_power = 0
var/current_size = 1
var/allowed_size = 1
var/contained = 1 //Are we going to move around?
@@ -27,20 +26,24 @@
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/last_warning
-/obj/machinery/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
+/obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
//CARN: admin-alert for chuckle-fuckery.
admin_investigate_setup()
src.energy = starting_energy
..()
+ processing_objects.Add(src)
for(var/obj/machinery/power/singularity_beacon/singubeacon in world)
if(singubeacon.active)
target = singubeacon
break
return
+/obj/singularity/Destroy()
+ processing_objects.Remove(src)
+ ..()
-/obj/machinery/singularity/Move(atom/newloc, direct)
+/obj/singularity/Move(atom/newloc, direct)
if(current_size >= STAGE_FIVE || check_turfs_in(direct))
last_failed_movement = 0//Reset this because we moved
return ..()
@@ -49,17 +52,17 @@
return 0
-/obj/machinery/singularity/attack_hand(mob/user as mob)
+/obj/singularity/attack_hand(mob/user as mob)
consume(user)
return 1
-/obj/machinery/singularity/Process_Spacemove() //The singularity stops drifting for no man!
+/obj/singularity/Process_Spacemove() //The singularity stops drifting for no man!
return 0
-/obj/machinery/singularity/blob_act(severity)
+/obj/singularity/blob_act(severity)
return
-/obj/machinery/singularity/ex_act(severity, target)
+/obj/singularity/ex_act(severity, target)
switch(severity)
if(1.0)
if(current_size <= STAGE_TWO)
@@ -75,21 +78,21 @@
return
-/obj/machinery/singularity/bullet_act(obj/item/projectile/P)
+/obj/singularity/bullet_act(obj/item/projectile/P)
return 0 //Will there be an impact? Who knows. Will we see it? No.
-/obj/machinery/singularity/Bump(atom/A)
+/obj/singularity/Bump(atom/A)
consume(A)
return
-/obj/machinery/singularity/Bumped(atom/A)
+/obj/singularity/Bumped(atom/A)
consume(A)
return
-/obj/machinery/singularity/process()
+/obj/singularity/process()
if(current_size >= STAGE_TWO)
move()
pulse()
@@ -102,17 +105,17 @@
return
-/obj/machinery/singularity/attack_ai() //to prevent ais from gibbing themselves when they click on one.
+/obj/singularity/attack_ai() //to prevent ais from gibbing themselves when they click on one.
return
-/obj/machinery/singularity/proc/admin_investigate_setup()
+/obj/singularity/proc/admin_investigate_setup()
last_warning = world.time
var/count = locate(/obj/machinery/field/containment) in orange(30, src)
if(!count) message_admins("A singulo has been created without containment fields active ([x],[y],[z])",1)
investigate_log("was created. [count?"":"No containment fields were active"]","singulo")
-/obj/machinery/singularity/proc/dissipate()
+/obj/singularity/proc/dissipate()
if(!dissipate)
return
if(dissipate_track >= dissipate_delay)
@@ -122,7 +125,7 @@
dissipate_track++
-/obj/machinery/singularity/proc/expand(var/force_size = 0)
+/obj/singularity/proc/expand(var/force_size = 0)
var/temp_allowed_size = src.allowed_size
if(force_size)
temp_allowed_size = force_size
@@ -191,7 +194,7 @@
return 0
-/obj/machinery/singularity/proc/check_energy()
+/obj/singularity/proc/check_energy()
if(energy <= 0)
investigate_log("collapsed.","singulo")
qdel(src)
@@ -212,11 +215,11 @@
return 1
-/obj/machinery/singularity/proc/eat()
+/obj/singularity/proc/eat()
set background = BACKGROUND_ENABLED
for(var/atom/X in orange(grav_pull,src))
var/dist = get_dist(X, src)
- var/obj/machinery/singularity/S = src
+ var/obj/singularity/S = src
if(dist > consume_range)
X.singularity_pull(S, current_size)
else if(dist <= consume_range)
@@ -224,13 +227,13 @@
return
-/obj/machinery/singularity/proc/consume(var/atom/A)
+/obj/singularity/proc/consume(var/atom/A)
var/gain = A.singularity_act(current_size)
src.energy += gain
return
-/obj/machinery/singularity/proc/move(var/force_move = 0)
+/obj/singularity/proc/move(var/force_move = 0)
if(!move_self)
return 0
@@ -245,7 +248,7 @@
step(src, movement_dir)
-/obj/machinery/singularity/proc/check_turfs_in(var/direction = 0, var/step = 0)
+/obj/singularity/proc/check_turfs_in(var/direction = 0, var/step = 0)
if(!direction)
return 0
var/steps = 0
@@ -298,7 +301,7 @@
return 1
-/obj/machinery/singularity/proc/can_move(var/turf/T)
+/obj/singularity/proc/can_move(var/turf/T)
if(!T)
return 0
if((locate(/obj/machinery/field/containment) in T)||(locate(/obj/machinery/shieldwall) in T))
@@ -314,7 +317,7 @@
return 1
-/obj/machinery/singularity/proc/event()
+/obj/singularity/proc/event()
var/numb = pick(1,2,3,4,5,6)
switch(numb)
if(1)//EMP
@@ -328,7 +331,7 @@
return 1
-/obj/machinery/singularity/proc/toxmob()
+/obj/singularity/proc/toxmob()
var/toxrange = 10
var/toxdamage = 4
var/radiation = 15
@@ -344,7 +347,7 @@
return
-/obj/machinery/singularity/proc/mezzer()
+/obj/singularity/proc/mezzer()
for(var/mob/living/carbon/M in oviewers(8, src))
if(istype(M, /mob/living/carbon/brain)) //Ignore brains
continue
@@ -361,19 +364,19 @@
return
-/obj/machinery/singularity/proc/emp_area()
+/obj/singularity/proc/emp_area()
empulse(src, 8, 10)
return
-/obj/machinery/singularity/proc/pulse()
+/obj/singularity/proc/pulse()
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
-/obj/machinery/singularity/singularity_act()
+/obj/singularity/singularity_act()
var/gain = (energy/2)
var/dist = max((current_size - 2),1)
explosion(src.loc,(dist),(dist*2),(dist*4))
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 062f28cb028..7c70cb2c484 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -33,9 +33,10 @@ var/list/solars_list = list()
//set the control of the panel to a given computer if closer than SOLAR_MAX_DIST
/obj/machinery/power/solar/proc/set_control(var/obj/machinery/power/solar_control/SC)
- if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST))
+ if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST))
return 0
control = SC
+ SC.connected_panels |= src
return 1
//set the control of the panel to null and removes it from the control list of the previous control computer if needed
@@ -323,12 +324,10 @@ var/list/solars_list = list()
var/obj/machinery/power/solar/S = M
if(!S.control) //i.e unconnected
S.set_control(src)
- connected_panels |= S
else if(istype(M, /obj/machinery/power/tracker))
if(!connected_tracker) //if there's already a tracker connected to the computer don't add another
var/obj/machinery/power/tracker/T = M
if(!T.control) //i.e unconnected
- connected_tracker = T
T.set_control(src)
//called by the sun controller, update the facing angle (either manually or via tracking) and rotates the panels accordingly
@@ -484,10 +483,10 @@ var/list/solars_list = list()
set_panels(targetdir)
if(href_list["search_connected"])
- src.search_for_connected()
+ search_for_connected()
if(connected_tracker && track == 2)
connected_tracker.set_angle(sun.angle)
- src.set_panels(cdir)
+ set_panels(cdir)
src.updateUsrDialog()
return
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
new file mode 100644
index 00000000000..b08ad2edf4d
--- /dev/null
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -0,0 +1,286 @@
+//Ported from /vg/station13, which was in turn forked from baystation12;
+//Please do not bother them with bugs from this port, however, as it has been modified quite a bit.
+//Modifications include removing the world-ending full supermatter variation, and leaving only the shard.
+
+#define NITROGEN_RETARDATION_FACTOR 2 //Higher == N2 slows reaction more
+#define THERMAL_RELEASE_MODIFIER 5 //Higher == less heat released during reaction
+#define PLASMA_RELEASE_MODIFIER 750 //Higher == less plasma released by reaction
+#define OXYGEN_RELEASE_MODIFIER 325 //Higher == less oxygen released at high temperature/power
+#define REACTION_POWER_MODIFIER 0.55 //Higher == more overall power
+
+
+//These would be what you would get at point blank, decreases with distance
+#define DETONATION_RADS 200
+#define DETONATION_HALLUCINATION 600
+
+
+#define WARNING_DELAY 30 //seconds between warnings.
+
+/obj/machinery/power/supermatter_shard
+ name = "supermatter shard"
+ desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. You get headaches just from looking at it."
+ icon = 'icons/obj/supermatter.dmi'
+ icon_state = "darkmatter_shard"
+ density = 1
+ anchored = 0
+ luminosity = 4
+
+
+ var/gasefficency = 0.125
+
+ var/base_icon_state = "darkmatter_shard"
+
+ var/damage = 0
+ var/damage_archived = 0
+ var/safe_alert = "Crystalline hyperstructure returning to safe operating levels."
+ var/warning_point = 50
+ var/warning_alert = "Danger! Crystal hyperstructure instability!"
+ var/emergency_point = 500
+ var/emergency_alert = "CRYSTAL DELAMINATION IMMINENT."
+ var/explosion_point = 900
+
+ var/emergency_issued = 0
+
+ var/explosion_power = 8
+
+ var/lastwarning = 0 // Time in 1/10th of seconds since the last sent warning
+ var/power = 0
+
+ var/oxygen = 0 // Moving this up here for easier debugging.
+
+ //Temporary values so that we can optimize this
+ //How much the bullets damage should be multiplied by when it is added to the internal variables
+ var/config_bullet_energy = 2
+ //How much of the power is left after processing is finished?
+// var/config_power_reduction_per_tick = 0.5
+ //How much hallucination should it produce per unit of power?
+ var/config_hallucination_power = 0.1
+
+ var/obj/item/device/radio/radio
+
+ //for logging
+ var/has_been_powered = 0
+ var/has_reached_emergency = 0
+
+/obj/machinery/power/supermatter_shard/New()
+ . = ..()
+ radio = new(src)
+ radio.listening = 0
+ investigate_log("has been created.", "supermatter")
+
+
+/obj/machinery/power/supermatter_shard/Destroy()
+ investigate_log("has been destroyed.", "supermatter")
+ qdel(radio)
+ . = ..()
+
+/obj/machinery/power/supermatter_shard/proc/explode()
+ investigate_log("has exploded.", "supermatter")
+ explosion(get_turf(src), explosion_power, explosion_power * 2, explosion_power * 3, explosion_power * 4, 1, 1)
+ qdel(src)
+ return
+
+/obj/machinery/power/supermatter_shard/process()
+ var/turf/L = loc
+
+ if(isnull(L)) // We have a null turf...something is wrong, stop processing this entity.
+ return PROCESS_KILL
+
+ if(!istype(L)) //We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now.
+ return //Yeah just stop.
+
+ if(istype(L, /turf/space)) // Stop processing this stuff if we've been ejected.
+ return
+
+ if(damage > warning_point) // while the core is still damaged and it's still worth noting its status
+ if((world.timeofday - lastwarning) / 10 >= WARNING_DELAY)
+ var/stability = num2text(round((damage / explosion_point) * 100))
+
+ if(damage > emergency_point)
+ radio.talk_into(src, "[emergency_alert] Instability: [stability]%")
+ lastwarning = world.timeofday
+ if(!has_reached_emergency)
+ investigate_log("has reached the emergency point for the first time.", "supermatter")
+ message_admins("[src] has reached the emergency point (JMP).")
+ has_reached_emergency = 1
+
+ else if(damage >= damage_archived) // The damage is still going up
+ radio.talk_into(src, "[warning_alert] Instability: [stability]%")
+ lastwarning = world.timeofday - 150
+
+ else // Phew, we're safe
+ radio.talk_into(src, "[safe_alert]")
+ lastwarning = world.timeofday
+
+ if(damage > explosion_point)
+ for(var/mob/living/mob in living_mob_list)
+ if(istype(mob, /mob/living/carbon/human))
+ //Hilariously enough, running into a closet should make you get hit the hardest.
+ var/mob/living/carbon/human/H = mob
+ H.hallucination += max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1)) ) )
+ var/rads = DETONATION_RADS * sqrt( 1 / (get_dist(mob, src) + 1) )
+ mob.apply_effect(rads, IRRADIATE)
+
+ explode()
+
+ //Ok, get the air from the turf
+ var/datum/gas_mixture/env = L.return_air()
+
+ //Remove gas from surrounding area
+ var/datum/gas_mixture/removed = env.remove(gasefficency * env.total_moles())
+
+ if(!removed || !removed.total_moles())
+ damage += max((power-1600)/10, 0)
+ power = min(power, 1600)
+ return 1
+
+ damage_archived = damage
+ damage = max( damage + ( (removed.temperature - 800) / 150 ) , 0 )
+ //Ok, 100% oxygen atmosphere = best reaction
+ //Maxes out at 100% oxygen pressure
+ oxygen = max(min((removed.oxygen - (removed.nitrogen * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 1), 0)
+
+ var/temp_factor = 50
+
+ if(oxygen > 0.8)
+ // with a perfect gas mix, make the power less based on heat
+ icon_state = "[base_icon_state]_glow"
+ else
+ // in normal mode, base the produced energy around the heat
+ temp_factor = 30
+ icon_state = base_icon_state
+
+ power = max( (removed.temperature * temp_factor / T0C) * oxygen + power, 0) //Total laser power plus an overload
+
+ //We've generated power, now let's transfer it to the collectors for storing/usage
+ transfer_energy()
+
+ var/device_energy = power * REACTION_POWER_MODIFIER
+
+ //To figure out how much temperature to add each tick, consider that at one atmosphere's worth
+ //of pure oxygen, with all four lasers firing at standard energy and no N2 present, at room temperature
+ //that the device energy is around 2140. At that stage, we don't want too much heat to be put out
+ //Since the core is effectively "cold"
+
+ //Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock
+ //is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall.
+ removed.temperature += (device_energy / THERMAL_RELEASE_MODIFIER)
+
+ removed.temperature = max(0, min(removed.temperature, 2500))
+
+ //Calculate how much gas to release
+ removed.toxins += max(device_energy / PLASMA_RELEASE_MODIFIER, 0)
+
+ removed.oxygen += max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
+
+ env.merge(removed)
+
+ for(var/mob/living/carbon/human/l in view(src, min(7, round(power ** 0.25)))) // If they can see it without mesons on. Bad on them.
+ if(!istype(l.glasses, /obj/item/clothing/glasses/meson))
+ l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / min(1, get_dist(l, src)) ) ) )
+
+ for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
+ var/rads = (power / 10) * sqrt( 1 / min(get_dist(l, src),1) )
+ l.apply_effect(rads, IRRADIATE)
+
+ power -= (power/500)**3
+
+ return 1
+
+
+/obj/machinery/power/supermatter_shard/bullet_act(var/obj/item/projectile/Proj)
+ var/turf/L = loc
+ if(!istype(L)) // We don't run process() when we are in space
+ return 0 // This stops people from being able to really power up the supermatter
+ // Then bring it inside to explode instantly upon landing on a valid turf.
+
+
+ if(Proj.flag != "bullet")
+ power += Proj.damage * config_bullet_energy
+ if(!has_been_powered)
+ investigate_log("has been powered for the first time.", "supermatter")
+ message_admins("[src] has been powered for the first time (JMP).")
+ has_been_powered = 1
+ else
+ damage += Proj.damage * config_bullet_energy
+ return 0
+
+
+/obj/machinery/power/supermatter_shard/attack_paw(mob/user as mob)
+ return attack_hand(user)
+
+
+/obj/machinery/power/supermatter_shard/attack_robot(mob/user as mob)
+ if(Adjacent(user))
+ return attack_hand(user)
+ else
+ user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
+ return
+
+/obj/machinery/power/supermatter_shard/attack_ai(mob/user as mob)
+ user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
+
+/obj/machinery/power/supermatter_shard/attack_hand(mob/user as mob)
+ user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\
+ "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\
+ "You hear an unearthly noise as a wave of heat washes over you.")
+
+ playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
+
+ Consume(user)
+
+/obj/machinery/power/supermatter_shard/proc/transfer_energy()
+ 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(power/10)
+ return
+
+/obj/machinery/power/supermatter_shard/attackby(obj/item/weapon/W as obj, mob/living/user as mob)
+ if(user.drop_item(W))
+ Consume(W)
+ user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\
+ "You touch \the [src] with \the [W], and everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\
+ "Everything suddenly goes silent.")
+
+ playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
+
+ user.apply_effect(150, IRRADIATE)
+
+
+/obj/machinery/power/supermatter_shard/Bumped(atom/AM as mob|obj)
+ if(istype(AM, /mob/living))
+ AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
+ "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
+ "You hear an unearthly noise as a wave of heat washes over you.")
+ else
+ AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
+ "You hear a loud crack as you are washed with a wave of heat.")
+
+ playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
+
+ Consume(AM)
+
+
+/obj/machinery/power/supermatter_shard/proc/Consume(atom/movable/AM)
+ if(istype(AM, /mob/living))
+ var/mob/living/user = AM
+ user.dust()
+ power += 200
+ message_admins("[src] has consumed [key_name(user)]? (JMP).")
+ else
+ qdel(AM)
+
+ investigate_log("has consumed [AM].", "supermatter")
+
+ power += 200
+
+ //Some poor sod got eaten, go ahead and irradiate people nearby.
+ for(var/mob/living/L in range(10))
+ var/rads = 500 * sqrt( 1 / (get_dist(L, src) + 1) )
+ L.apply_effect(rads, IRRADIATE)
+ investigate_log("has irradiated [L] after consuming [AM].", "supermatter")
+ if(L in view())
+ L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\
+ "The unearthly ringing subsides and you notice you have new radiation burns.", 2)
+ else
+ L.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2)
diff --git a/code/modules/power/supermatter/supermatter_crate.dm b/code/modules/power/supermatter/supermatter_crate.dm
new file mode 100644
index 00000000000..dd65e75cfc5
--- /dev/null
+++ b/code/modules/power/supermatter/supermatter_crate.dm
@@ -0,0 +1,7 @@
+/datum/supply_packs/engineering/engine/supermatter_shard
+ name = "Supermatter Shard Crate"
+ contains = list(/obj/machinery/power/supermatter_shard)
+ cost = 100 //So cargo thinks twice before killing themselves with it
+ containertype = /obj/structure/closet/crate/secure
+ containername = "supermatter shard crate"
+ access = access_ce
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 20e8ab528c4..5cf341f9fbb 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -27,9 +27,10 @@
//set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST
/obj/machinery/power/tracker/proc/set_control(var/obj/machinery/power/solar_control/SC)
- if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST))
+ if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST))
return 0
control = SC
+ SC.connected_tracker = src
return 1
//set the control of the tracker to null and removes it from the previous control computer if needed
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 801d9b6e2e8..0f85597e0ec 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -73,21 +73,34 @@
stored_ammo.Insert(1,b)
return b
-/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/r)
- var/obj/item/ammo_casing/rb = r
- if (rb)
- if (stored_ammo.len < max_ammo && rb.caliber == caliber)
- stored_ammo += rb
- rb.loc = src
- return 1
+/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/R, var/replace_spent = 0)
+ if(!R || (R.caliber != caliber))
+ return 0
+
+ if (stored_ammo.len < max_ammo)
+ stored_ammo += R
+ R.loc = src
+ return 1
+
+ //for accessibles magazines (e.g internal ones) when full, start replacing spent ammo
+ else if(replace_spent)
+ for(var/obj/item/ammo_casing/AC in stored_ammo)
+ if(!AC.BB)//found a spent ammo
+ stored_ammo -= AC
+ AC.loc = get_turf(src.loc)
+
+ stored_ammo += R
+ R.loc = src
+ return 1
+
return 0
-/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, var/silent = 0)
+/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, var/silent = 0, var/replace_spent = 0)
var/num_loaded = 0
if(istype(A, /obj/item/ammo_box))
var/obj/item/ammo_box/AM = A
for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
- var/did_load = give_round(AC)
+ var/did_load = give_round(AC, replace_spent)
if(did_load)
AM.stored_ammo -= AC
num_loaded++
@@ -95,17 +108,18 @@
break
if(istype(A, /obj/item/ammo_casing))
var/obj/item/ammo_casing/AC = A
- if(give_round(AC))
+ if(give_round(AC, replace_spent))
user.drop_item()
AC.loc = src
num_loaded++
+
if(num_loaded)
if(!silent)
user << "You load [num_loaded] shell\s into \the [src]!"
A.update_icon()
update_icon()
- return num_loaded
- return 0
+
+ return num_loaded
/obj/item/ammo_box/attack_self(mob/user as mob)
var/obj/item/ammo_casing/A = get_round()
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index a53b80ca1ed..4cf1351fbf1 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -96,6 +96,12 @@
icon_state = "ishell"
projectile_type = /obj/item/projectile/bullet/incendiary/shell
+/obj/item/ammo_casing/shotgun/frag12
+ name = "FRAG-12 slug"
+ desc = "A high explosive breaching round for a 12 gauge shotgun."
+ icon_state = "heshell"
+ projectile_type = /obj/item/projectile/bullet/frag12
+
/obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
name = "dragonsbreath shell"
desc = "A shotgun shell which fires a spread of incendiary pellets."
@@ -157,4 +163,4 @@
desc = "A cased high explosive grenade that can only be activated once fired out of a grenade launcher."
caliber = "40mm"
icon_state = "40mmHE"
- projectile_type = /obj/item/projectile/bullet/a40mm
\ No newline at end of file
+ projectile_type = /obj/item/projectile/bullet/a40mm
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 5004ad7e4b6..a20e00aae51 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -71,7 +71,7 @@
/obj/item/ammo_casing/energy/ion
projectile_type = /obj/item/projectile/ion
select_name = "ion"
- fire_sound = 'sound/weapons/Laser.ogg'
+ fire_sound = 'sound/weapons/IonRifle.ogg'
/obj/item/ammo_casing/energy/declone
projectile_type = /obj/item/projectile/energy/declone
@@ -114,10 +114,10 @@
projectile_type = /obj/item/projectile/kinetic
select_name = "kinetic"
e_cost = 500
- fire_sound = 'sound/weapons/Gunshot4.ogg'
+ fire_sound = 'sound/weapons/Kenetic_accel.ogg'
/obj/item/ammo_casing/energy/disabler
- projectile_type = /obj/item/projectile/energy/disabler
+ projectile_type = /obj/item/projectile/beam/disabler
select_name = "disable"
e_cost = 50
fire_sound = "sound/weapons/taser.ogg"
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 742541a7011..f9d3c7410a0 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -1,4 +1,9 @@
////////////////INTERNAL MAGAZINES//////////////////////
+
+//internals magazines are accessible, so replace spent ammo if full when trying to put a live one in
+/obj/item/ammo_box/magazine/internal/give_round(var/obj/item/ammo_casing/R)
+ return ..(R,1)
+
/obj/item/ammo_box/magazine/internal/cylinder
name = "revolver cylinder"
desc = "Oh god, this shouldn't be here"
@@ -126,7 +131,7 @@
caliber = ".45"
max_ammo = 20
-/obj/item/ammo_box/magazine/smgm/update_icon()
+/obj/item/ammo_box/magazine/smgm45/update_icon()
..()
icon_state = "[initial(icon_state)]-[round(ammo_count(),2)]"
diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm
index 8abcea10af0..c5f2b3a0e7d 100644
--- a/code/modules/projectiles/firing.dm
+++ b/code/modules/projectiles/firing.dm
@@ -34,7 +34,7 @@
return 0
if(targloc == curloc) //Fire the projectile
user.bullet_act(BB)
- qdel(BB)
+ del(BB)
return 1
BB.loc = get_turf(user)
BB.starting = get_turf(user)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 97e0779a17f..9ede9c8e8e1 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -1,3 +1,7 @@
+ #define SAWN_INTACT 0
+ #define SAWN_OFF 1
+ #define SAWN_SAWING -1
+
/obj/item/weapon/gun
name = "gun"
desc = "It's a gun. It's pretty terrible, though."
@@ -23,6 +27,9 @@
var/obj/item/ammo_casing/chambered = null
var/trigger_guard = 1
var/sawn_desc = null
+ var/sawn_state = SAWN_INTACT
+ var/burst_size = 1
+ var/fire_delay = 0
/obj/item/weapon/gun/proc/process_chamber()
return 0
@@ -30,12 +37,17 @@
/obj/item/weapon/gun/proc/special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver.
return 1
+//check if there's enough ammo/energy/whatever to shoot one time
+//i.e if clicking would make it shoot
+/obj/item/weapon/gun/proc/can_shoot()
+ return 1
+
/obj/item/weapon/gun/proc/shoot_with_empty_chamber(mob/living/user as mob|obj)
user << "*click*"
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
return
-/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, var/pointblank = 0, var/mob/pbtarget = null)
+/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, var/pointblank = 0, var/mob/pbtarget = null, var/message = 1)
if(recoil)
spawn()
shake_camera(user, recoil + 1, recoil)
@@ -44,6 +56,8 @@
playsound(user, fire_sound, 10, 1)
else
playsound(user, fire_sound, 50, 1)
+ if(!message)
+ return
if(pointblank)
user.visible_message("[user] fires [src] point blank at [pbtarget]!", "You fire [src] point blank at [pbtarget]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!")
else
@@ -62,47 +76,65 @@
return
//Exclude lasertag guns from the CLUMSY check.
- if(clumsy_check)
+ if(clumsy_check && can_shoot())
if(istype(user, /mob/living))
var/mob/living/M = user
if ((CLUMSY in M.mutations) && prob(40))
- M << "You shoot yourself in the foot with \the [src]!"
- afterattack(user, user)
+ user << "You shoot yourself in the foot with \the [src]!"
+ process_fire(user,user,0,params)
M.drop_item()
return
+ if(isliving(user))
+ var/mob/living/L = user
+ if(!can_trigger_gun(L))
+ return
+
+ process_fire(target,user,flag,params)
+
+/obj/item/weapon/gun/proc/can_trigger_gun(mob/living/user)
if (!user.IsAdvancedToolUser())
user << "You don't have the dexterity to do this!"
- return
+ return 0
if(trigger_guard)
- if(istype(user, /mob/living))
- var/mob/living/M = user
- if (HULK in M.mutations)
- M << "Your meaty finger is much too large for the trigger guard!"
- return
+ if (HULK in user.mutations)
+ user << "Your meaty finger is much too large for the trigger guard!"
+ return 0
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.dna && NOGUNS in H.dna.species.specflags)
user << "Your fingers don't fit in the trigger guard!"
- return
+ return 0
+ return 1
+
+/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, var/message = 1, params)
add_fingerprint(user)
- if(chambered)
- if(!chambered.fire(target, user, params, , suppressed))
- shoot_with_empty_chamber(user)
- else
- if(!special_check(user))
- return
- if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
- shoot_live_shot(user, 1, target)
+ if(!special_check(user))
+ return
+
+ for(var/i = 1 to burst_size)
+ if(!(src in get_both_hands(user))) //for burst firing
+ break
+ if(chambered)
+ if(!chambered.fire(target, user, params, , suppressed))
+ shoot_with_empty_chamber(user)
+ break
else
- shoot_live_shot(user)
- else
- shoot_with_empty_chamber(user)
- process_chamber()
- update_icon()
+ if(!special_check(user))
+ return
+ if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
+ shoot_live_shot(user, 1, target)
+ else
+ shoot_live_shot(user)
+ else
+ shoot_with_empty_chamber(user)
+ break
+ process_chamber()
+ update_icon()
+ sleep(fire_delay)
if(user.hand)
user.update_inv_l_hand(0)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 08351551243..4c407cd5a20 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -35,7 +35,9 @@
/obj/item/weapon/gun/energy/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
newshot() //prepare a new shot
..()
-
+/obj/item/weapon/gun/energy/can_shoot()
+ var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+ return power_supply.charge >= shot.e_cost
/obj/item/weapon/gun/energy/proc/newshot()
if (!ammo_type || !power_supply)
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index ebace57085b..75d5a076186 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -125,9 +125,11 @@ obj/item/weapon/gun/energy/laser/retro
/obj/item/weapon/gun/energy/laser/bluetag/process()
charge_tick++
- if(charge_tick < 4) return 0
+ if(charge_tick < 4)
+ return 0
charge_tick = 0
- if(!power_supply) return 0
+ if(!power_supply)
+ return 0
power_supply.give(100)
update_icon()
return 1
@@ -162,9 +164,11 @@ obj/item/weapon/gun/energy/laser/retro
/obj/item/weapon/gun/energy/laser/redtag/process()
charge_tick++
- if(charge_tick < 4) return 0
+ if(charge_tick < 4)
+ return 0
charge_tick = 0
- if(!power_supply) return 0
+ if(!power_supply)
+ return 0
power_supply.give(100)
update_icon()
return 1
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 7074c8102b1..6ca4a48924e 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -3,7 +3,7 @@
desc = "A basic hybrid energy gun with two settings: Stun and kill."
icon_state = "energy"
item_state = null //so the human update icon uses the icon_state instead.
- ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+ ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
origin_tech = "combat=3;magnets=2"
modifystate = 2
@@ -12,7 +12,6 @@
select_fire(user)
update_icon()
-
/obj/item/weapon/gun/energy/gun/nuclear
name = "advanced energy gun"
desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
@@ -21,6 +20,7 @@
var/lightfail = 0
var/charge_tick = 0
modifystate = 0
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
/obj/item/weapon/gun/energy/gun/nuclear/New()
..()
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index f2392adfea0..4db3e4a9ffb 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -123,7 +123,7 @@
if(overheat || recent_reload)
return
power_supply.give(500)
- playsound(src.loc, 'sound/weapons/shotgunpump.ogg', 60, 1)
+ playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
recent_reload = 1
update_icon()
return
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 2c79a769a35..432594d9c8a 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -7,25 +7,37 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
cell_type = "/obj/item/weapon/stock_parts/cell/crap"
-/obj/item/weapon/gun/energy/taser/cyborg
- name = "taser gun"
- desc = "An integrated taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
- icon_state = "taser"
- fire_sound = 'sound/weapons/Taser.ogg'
+/obj/item/weapon/gun/energy/stunrevolver
+ name = "stun revolver"
+ desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder."
+ icon_state = "stunrevolver"
+ origin_tech = "combat=3;materials=3;powerstorage=2"
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode/gun)
+ cell_type = "/obj/item/weapon/stock_parts/cell"
+
+/obj/item/weapon/gun/energy/gun/advtaser
+ name = "advanced taser"
+ desc = "A hybrid taser designed to fire both short-range high-power electrodes and long-range disabler beams."
+ icon_state = "advtaser"
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
+
+/obj/item/weapon/gun/energy/gun/advtaser/cyborg
+ name = "advanced taser"
+ desc = "An integrated advanced taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
cell_type = "/obj/item/weapon/stock_parts/cell/secborg"
var/charge_tick = 0
- var/recharge_time = 10 //Time it takes for shots to recharge (in ticks)
+ var/recharge_time = 10
-/obj/item/weapon/gun/energy/taser/cyborg/New()
+/obj/item/weapon/gun/energy/gun/advtaser/cyborg/New()
..()
processing_objects.Add(src)
-/obj/item/weapon/gun/energy/taser/cyborg/Destroy()
+/obj/item/weapon/gun/energy/gun/advtaser/cyborg/Destroy()
processing_objects.Remove(src)
..()
-/obj/item/weapon/gun/energy/taser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
+/obj/item/weapon/gun/energy/gun/advtaser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
charge_tick++
if(charge_tick < recharge_time) return 0
charge_tick = 0
@@ -42,16 +54,6 @@
return 1
-/obj/item/weapon/gun/energy/stunrevolver
- name = "stun revolver"
- desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder."
- icon_state = "stunrevolver"
- origin_tech = "combat=3;materials=3;powerstorage=2"
- ammo_type = list(/obj/item/ammo_casing/energy/electrode/gun)
- cell_type = "/obj/item/weapon/stock_parts/cell"
-
-
-
/obj/item/weapon/gun/energy/crossbow
name = "mini energy crossbow"
desc = "A weapon favored by syndicate stealth specialists."
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index f9a0be82b99..c575632c498 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -29,6 +29,9 @@
no_den_usage = 0
..()
+/obj/item/weapon/gun/magic/can_shoot()
+ return charges
+
/obj/item/weapon/gun/magic/proc/newshot()
if (charges && chambered)
chambered.newshot()
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index d2c6a9a29ba..b1540df35b9 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -40,6 +40,11 @@
chambered.loc = src
return
+/obj/item/weapon/gun/projectile/can_shoot()
+ if(!magazine || !magazine.ammo_count(0))
+ return 0
+ return 1
+
/obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob)
..()
if (istype(A, /obj/item/ammo_box/magazine))
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 6cfa117be6a..b5f2c3033c1 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -1,15 +1,24 @@
-/obj/item/weapon/gun/projectile/automatic //Hopefully someone will find a way to make these fire in bursts or something. --Superxpdude
+/obj/item/weapon/gun/projectile/automatic
name = "prototype SMG"
- desc = "A lightweight, prototype 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
+ desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
icon_state = "saber"
w_class = 3
origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
var/alarmed = 0
can_suppress = 1
+ burst_size = 3
+ fire_delay = 1
+ var/select = 0
+ action_button_name = "Toggle Fire Mode"
/obj/item/weapon/gun/projectile/automatic/update_icon()
..()
+ overlays.Cut()
+ if(!select)
+ overlays += "[initial(icon_state)]semi"
+ if(select == 1)
+ overlays += "[initial(icon_state)]burst"
icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
return
@@ -17,6 +26,31 @@
if(..() && chambered)
alarmed = 0
+/obj/item/weapon/gun/projectile/automatic/ui_action_click()
+ burst_select()
+
+/obj/item/weapon/gun/projectile/automatic/verb/burst_select()
+ set name = "Toggle Fire Mode"
+ set category = "Object"
+ set desc = "Click to switch fire modes."
+ var/mob/living/carbon/human/user = usr
+ if(select)
+ select = 0
+ burst_size = 1
+ fire_delay = 0
+ user << "You switch to semi-automatic."
+ else
+ select = 1
+ burst_size = initial(burst_size)
+ fire_delay = initial(fire_delay)
+ user << "You switch to [burst_size]-rnd burst."
+
+ update_icon()
+ return
+
+/obj/item/weapon/gun/projectile/automatic/can_shoot()
+ return get_ammo()
+
/obj/item/weapon/gun/projectile/automatic/proc/empty_alarm()
if(!chambered && !get_ammo() && !alarmed)
playsound(src.loc, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
@@ -26,12 +60,14 @@
/obj/item/weapon/gun/projectile/automatic/c20r
name = "syndicate SMG"
- desc = "A lightweight, bullpup .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
+ desc = "A bullpup two-round burst .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
icon_state = "c20r"
item_state = "c20r"
origin_tech = "combat=5;materials=2;syndicate=8"
mag_type = /obj/item/ammo_box/magazine/smgm45
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+ fire_delay = 2
+ burst_size = 2
/obj/item/weapon/gun/projectile/automatic/c20r/New()
..()
@@ -62,6 +98,12 @@
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
var/cover_open = 0
can_suppress = 0
+ burst_size = 1
+ fire_delay = 0
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/burst_select()
+ return
+
/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob)
cover_open = !cover_open
@@ -103,43 +145,9 @@
return
..()
-/obj/item/weapon/gun/projectile/automatic/bulldog
- name = "syndicate shotgun"
- desc = "A compact, mag-fed semi-automatic shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
- icon_state = "bulldog"
- item_state = "bulldog"
- w_class = 3.0
- origin_tech = "combat=5;materials=4;syndicate=6"
- mag_type = /obj/item/ammo_box/magazine/m12g
- fire_sound = 'sound/weapons/Gunshot.ogg'
- can_suppress = 0
-
-/obj/item/weapon/gun/projectile/automatic/bulldog/New()
- ..()
- update_icon()
- return
-
-/obj/item/weapon/gun/projectile/automatic/bulldog/proc/update_magazine()
- if(magazine)
- src.overlays = 0
- overlays += "[magazine.icon_state]"
- return
-
-/obj/item/weapon/gun/projectile/automatic/bulldog/update_icon()
- src.overlays = 0
- update_magazine()
- icon_state = "bulldog[chambered ? "" : "-e"]"
- return
-
-/obj/item/weapon/gun/projectile/automatic/bulldog/afterattack()
- ..()
- empty_alarm()
- return
-
-
/obj/item/weapon/gun/projectile/automatic/c90gl
name = "syndicate assault rifle"
- desc = "A bullpup and compact 5.45x39 assault rifle with a unique toploading design, designated 'C-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
+ desc = "A bullpup three-round burst 5.45x39 assault rifle with a unique toploading design, designated 'C-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
icon_state = "c90gl"
item_state = "c90gl"
origin_tech = "combat=5;materials=2;syndicate=8"
@@ -147,8 +155,9 @@
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
action_button_name = "Toggle Grenade Launcher"
can_suppress = 0
- var/select = 1 //1 for boolets, 0 for explosions.
var/obj/item/weapon/gun/projectile/revolver/grenadelauncher/underbarrel
+ burst_size = 3
+ fire_delay = 2
/obj/item/weapon/gun/projectile/automatic/c90gl/New()
..()
@@ -157,54 +166,53 @@
return
/obj/item/weapon/gun/projectile/automatic/c90gl/afterattack(var/atom/target, var/mob/living/user, flag, params)
- if(select)
+ if(select == 2)
+ underbarrel.afterattack(target, user, flag, params)
+ else
..()
empty_alarm()
return
- else
- underbarrel.afterattack(target, user, flag, params)
-
/obj/item/weapon/gun/projectile/automatic/c90gl/attackby(var/obj/item/A, mob/user)
- if(select)
- ..()
- else
+ if(select == 2)
underbarrel.attackby(A, user)
-
-/obj/item/weapon/gun/projectile/automatic/c90gl/attack_self(var/mob/living/user)
- if(select)
- ..()
else
+ ..()
+/obj/item/weapon/gun/projectile/automatic/c90gl/attack_self(var/mob/living/user)
+ if(select == 2)
underbarrel.attack_self(user)
-
-
+ else
+ ..()
/obj/item/weapon/gun/projectile/automatic/c90gl/update_icon()
..()
overlays.Cut()
- if(select)
- overlays += "c90prim"
- else
- overlays += "c90gren"
+ if(!select)
+ overlays += "[initial(icon_state)]semi"
+ if(select == 1)
+ overlays += "[initial(icon_state)]burst"
+ if(select == 2)
+ overlays += "[initial(icon_state)]gren"
icon_state = "c90gl[magazine ? "-[Ceiling(get_ammo(0)/6)*6]" : ""][chambered ? "" : "-e"]"
return
-/obj/item/weapon/gun/projectile/automatic/c90gl/proc/underbarrel_swap()
+/obj/item/weapon/gun/projectile/automatic/c90gl/burst_select()
var/mob/living/carbon/human/user = usr
- if(select)
- select = 0
- user << "You switch to grenades."
- else
+ if(!select)
select = 1
- user << "You switch to bullets."
-
+ burst_size = initial(burst_size)
+ fire_delay = initial(fire_delay)
+ user << "You switch to [burst_size]-rnd burst."
+ if(select == 1)
+ select = 2
+ user << "You switch to grenades."
+ if(select == 2)
+ select = 0
+ burst_size = 1
+ fire_delay = 0
+ user << "You switch to semi-auto."
update_icon()
return
-/obj/item/weapon/gun/projectile/automatic/c90gl/ui_action_click()
- underbarrel_swap()
-
-
-
/obj/item/weapon/gun/projectile/automatic/tommygun
name = "tommy gun"
desc = "A genuine 'Chicago Typewriter'."
@@ -215,3 +223,4 @@
mag_type = /obj/item/ammo_box/magazine/tommygunm45
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
can_suppress = 0
+ burst_size = 4
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 1ef80e2a3f9..31773285919 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -28,6 +28,8 @@
fire_sound = 'sound/effects/Explosion1.ogg'
origin_tech = "combat=3"
mag_type = /obj/item/ammo_box/magazine/m75
+ burst_size = 1
+ fire_delay = 0
/obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(var/eject_casing = 0, var/empty_chamber = 1)
..()
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 7e29cfbf8bc..4ed58eba2c9 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -6,42 +6,38 @@
origin_tech = "combat=2;materials=2;syndicate=2"
mag_type = /obj/item/ammo_box/magazine/m10mm
can_suppress = 1
+ burst_size = 1
+ fire_delay = 0
/obj/item/weapon/gun/projectile/automatic/pistol/update_icon()
..()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
return
-/obj/item/weapon/gun/projectile/automatic/m1911
+/obj/item/weapon/gun/projectile/automatic/pistol/m1911
name = "M1911 pistol"
desc = "A classic .45 handgun with a small magazine capacity."
- icon_state = "pistol"
+ icon_state = "m1911"
w_class = 3
mag_type = /obj/item/ammo_box/magazine/m45
-/obj/item/weapon/gun/projectile/automatic/pistol45/update_icon()
- ..()
- icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
- return
-
-
-/obj/item/weapon/gun/projectile/automatic/deagle
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle
name = "desert eagle"
desc = "A robust .50 AE handgun."
icon_state = "deagle"
force = 14
mag_type = /obj/item/ammo_box/magazine/m50
-/obj/item/weapon/gun/projectile/automatic/deagle/update_icon()
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/update_icon()
..()
icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
-/obj/item/weapon/gun/projectile/automatic/deagle/gold
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/gold
desc = "A gold plated desert eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
icon_state = "deagleg"
item_state = "deagleg"
-/obj/item/weapon/gun/projectile/automatic/deagle/camo
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo
desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE ammo."
icon_state = "deaglecamo"
item_state = "deagleg"
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 7188ce64cbc..c829cff0c4a 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -5,7 +5,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/cylinder
/obj/item/weapon/gun/projectile/revolver/chamber_round()
- if (chambered || !magazine)
+ if ((chambered && chambered.BB)|| !magazine) //if there's a live ammo in the chamber or no magazine
return
else if (magazine.ammo_count())
chambered = magazine.get_round(1)
@@ -37,6 +37,9 @@
else
user << "[src] is empty."
+/obj/item/weapon/gun/projectile/revolver/can_shoot()
+ return get_ammo(0,0)
+
/obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1)
var/boolets = 0 //mature var names for mature people
if (chambered && countchambered)
@@ -172,7 +175,7 @@
return
/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user as mob)
- if(!spun && get_ammo(0,0))
+ if(!spun && can_shoot())
user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
Spin()
else
@@ -190,34 +193,35 @@
user << "[src] is empty."
/obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
- if(!spun && get_ammo(0,0))
- user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
- Spin()
- ..()
- spun = 0
-
-/obj/item/weapon/gun/projectile/revolver/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj)
- if(!spun && get_ammo(0,0))
- user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
- Spin()
+ if(user.a_intent == "harm") // Flogging action
+ return
+ if(isliving(user))
+ if(!can_trigger_gun(user))
+ return
+ if(target != user)
+ user << "A mechanism prevents you from shooting anyone but yourself."
return
-
- if(target == user)
- if(!chambered)
- user.visible_message("*click*", "*click*")
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(!spun)
+ user << "You need to spin the revolver's chamber first."
return
- if(isliving(target) && isliving(user))
- var/obj/item/organ/limb/affecting = user.zone_sel.selecting
- if(affecting == "head")
- var/obj/item/ammo_casing/AC = chambered
- if(AC.fire(user, user))
+ spun = 0
+
+ if(chambered)
+ var/obj/item/ammo_casing/AC = chambered
+ if(AC.fire(user, user))
+ playsound(user, fire_sound, 50, 1)
+ var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting))
+ var/limb_name = affecting.getDisplayName()
+ if(affecting == "head" || affecting == "eyes" || affecting == "mouth")
user.apply_damage(300, BRUTE, affecting)
- playsound(user, fire_sound, 50, 1)
- user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a [istype(AC.BB, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!")
- return
+ user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a gunshot!")
else
- user.visible_message("*click*", "*click*")
- return
- ..()
+ user.visible_message("[user.name] cowardly fires [src] at \his [limb_name]!", "You cowardly fire [src] at your [limb_name]!", "You hear a gunshot!")
+ return
+
+ user.visible_message("*click*")
+ playsound(user, 'sound/weapons/empty.ogg', 100, 1)
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 1858059454a..f07dde7e94f 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -25,6 +25,11 @@
/obj/item/weapon/gun/projectile/shotgun/chamber_round()
return
+/obj/item/weapon/gun/projectile/shotgun/can_shoot()
+ if(!chambered)
+ return 0
+ return (chambered.BB ? 1 : 0)
+
/obj/item/weapon/gun/projectile/shotgun/attack_self(mob/living/user)
if(recentpump) return
pump(user)
@@ -69,8 +74,12 @@
/obj/item/weapon/gun/projectile/shotgun/riot/attackby(var/obj/item/A as obj, mob/user as mob)
..()
- if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
+ if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
sawoff(user)
+ if(istype(A, /obj/item/weapon/melee/energy))
+ var/obj/item/weapon/melee/energy/W = A
+ if(W.active)
+ sawoff(user)
/obj/item/weapon/gun/projectile/revolver/doublebarrel
name = "double-barreled shotgun"
@@ -89,27 +98,13 @@
..()
if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
chamber_round()
- if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
+ if(istype(A, /obj/item/weapon/melee/energy))
+ var/obj/item/weapon/melee/energy/W = A
+ if(W.active)
+ sawoff(user)
+ if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
sawoff(user)
-/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob)
- user << "You begin to shorten \the [src]."
- if(get_ammo())
- afterattack(user, user)
- user.visible_message("The [src] goes off!", "The [src] goes off in your face!")
- return
- if(do_after(user, 30))
- name = "sawn-off [src.name]"
- desc = sawn_desc
- icon_state = initial(icon_state) + "-sawn"
- w_class = 3.0
- item_state = "gun"
- slot_flags &= ~SLOT_BACK //you can't sling it on your back
- slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
- user << "You shorten \the [src]!"
- update_icon()
- return
-
/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user as mob)
var/num_unloaded = 0
while (get_ammo() > 0)
@@ -140,7 +135,7 @@
/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(var/obj/item/A as obj, mob/user as mob)
..()
- if(istype(A, /obj/item/stack/cable_coil))
+ if(istype(A, /obj/item/stack/cable_coil) && !sawn_state)
var/obj/item/stack/cable_coil/C = A
if(C.use(10))
flags = CONDUCT
@@ -150,4 +145,87 @@
update_icon()
else
user << "You need at least ten lengths of cable if you want to make a sling."
- return
\ No newline at end of file
+ return
+
+//Sawing guns related procs
+/obj/item/weapon/gun/projectile/proc/blow_up(mob/user as mob)
+ . = 0
+ for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
+ if(AC.BB)
+ process_fire(user, user)
+ . = 1
+
+/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user as mob)
+ . = 0
+ if(chambered && chambered.BB)
+ process_fire(user, user,0)
+ . = 1
+ for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
+ if(AC.BB)
+ chambered = AC
+ process_fire(user, user,0)
+ . = 1
+
+/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob)
+ if(sawn_state == SAWN_OFF)
+ user << "\The [src] is already shorten."
+ return
+
+ if(sawn_state == SAWN_SAWING)
+ return
+
+ user.visible_message("[user] begin to shorten \the [src].", "You begin to shorten \the [src].")
+
+ //if there's any live ammo inside the gun, makes it go off
+ if(blow_up(user))
+ user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!")
+ return
+
+ sawn_state = SAWN_SAWING
+
+ if(do_after(user, 30))
+ name = "sawn-off [src.name]"
+ desc = sawn_desc
+ icon_state = initial(icon_state) + "-sawn"
+ w_class = 3.0
+ item_state = "gun"
+ slot_flags &= ~SLOT_BACK //you can't sling it on your back
+ slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+ sawn_state = SAWN_OFF
+ user.visible_message("[user] shorten \the [src]!", "You shorten \the [src]!")
+ update_icon()
+ return
+ else
+ sawn_state = SAWN_INTACT
+
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
+ name = "syndicate shotgun"
+ desc = "A compact, mag-fed burst-fire shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
+ icon_state = "bulldog"
+ item_state = "bulldog"
+ w_class = 3.0
+ origin_tech = "combat=5;materials=4;syndicate=6"
+ mag_type = /obj/item/ammo_box/magazine/m12g
+ fire_sound = 'sound/weapons/Gunshot.ogg'
+ can_suppress = 0
+ burst_size = 2
+ fire_delay = 1
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/New()
+ ..()
+ update_icon()
+ return
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/proc/update_magazine()
+ if(magazine)
+ src.overlays = 0
+ overlays += "[magazine.icon_state]"
+ return
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/update_icon()
+ src.overlays = 0
+ update_magazine()
+ icon_state = "bulldog[chambered ? "" : "-e"]"
+ return
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/afterattack()
+ ..()
+ empty_alarm()
+ return
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index d2dc5b61e67..02798ab0189 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -35,8 +35,24 @@
var/stutter = 0
var/eyeblur = 0
var/drowsy = 0
+ var/stamina = 0
var/forcedodge = 0
+ var/range = 0
+ var/proj_hit = 0
+
+/obj/item/projectile/proc/Range()
+ if(range)
+ range--
+ if(range <= 0)
+ on_range()
+ else
+ return
+
+/obj/item/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range
+ proj_hit = 1
+ qdel(src)
+
/obj/item/projectile/proc/on_hit(atom/target, blocked = 0, hit_zone)
if(!isliving(target)) return 0
if(isanimal(target)) return 0
@@ -115,6 +131,3 @@
Bump(original)
Range()
sleep(1)
-
-/obj/item/projectile/proc/Range()
- return
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index d6bfe72329a..d9bba99275d 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -36,6 +36,13 @@
irradiate = 30
forcedodge = 1
+/obj/item/projectile/beam/disabler
+ name = "disabler beam"
+ icon_state = "omnilaser"
+ damage = 33
+ damage_type = STAMINA
+ eyeblur = 0
+
/obj/item/projectile/beam/pulse
name = "pulse"
icon_state = "u_laser"
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index a3634a488f6..8b9d357efe8 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -9,14 +9,12 @@
/obj/item/projectile/bullet/weakbullet
damage = 5
- stun = 5
- weaken = 5
+ stamina = 33
/obj/item/projectile/bullet/weakbullet2
damage = 15
- stun = 5
- weaken = 5
+ stamina = 75 //the detective can't shoot in bursts and will get yelled at if he sinks 50 rounds into perps to stun 'em
/obj/item/projectile/bullet/weakbullet3
damage = 20
@@ -30,8 +28,7 @@
/obj/item/projectile/bullet/midbullet
damage = 20
- stun = 5
- weaken = 5
+ stamina = 50 //two round bursts from the c20r
/obj/item/projectile/bullet/midbullet2
damage = 25
@@ -46,11 +43,7 @@
/obj/item/projectile/bullet/stunshot
name = "stunshot"
damage = 5
- stun = 5
- weaken = 5
- stutter = 5
-
-/obj/item/projectile/bullet/incendiary
+ stamina = 50 //two round bursts from the bulldog
/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)
..()
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index 2f64825d1fd..13c015ab0cd 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -15,13 +15,24 @@
weaken = 5
stutter = 5
hitsound = "sparks"
+ range = 7
- on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/energy/electrode/on_hit(var/atom/target, var/blocked = 0)
+ if(!proj_hit)
if(!ismob(target) || blocked >= 2) //Fully blocked by mob or collided with dense object - burst into sparks!
var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
sparks.set_up(1, 1, src)
sparks.start()
- ..()
+ proj_hit = 1
+ ..()
+
+/obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
+ if(!proj_hit)
+ var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
+ sparks.set_up(1, 1, src)
+ sparks.start()
+ proj_hit = 1
+ ..()
/obj/item/projectile/energy/declone
name = "radiation beam"
@@ -31,39 +42,24 @@
irradiate = 40
-/obj/item/projectile/energy/dart
+/obj/item/projectile/energy/dart //ninja throwing dart
name = "dart"
icon_state = "toxin"
damage = 5
damage_type = TOX
weaken = 5
+ range = 7
-
-/obj/item/projectile/energy/bolt
+/obj/item/projectile/energy/bolt //ebow bolts
name = "bolt"
icon_state = "cbbolt"
- damage = 10
+ damage = 15
damage_type = TOX
nodamage = 0
weaken = 5
stutter = 5
-
+ range = 10
/obj/item/projectile/energy/bolt/large
name = "largebolt"
damage = 20
-
-/obj/item/projectile/energy/disabler
- name = "disabler beam"
- icon_state = "omnilaser"
- damage = 34
- damage_type = STAMINA
- var/range = 7
-
-/obj/item/projectile/energy/disabler/Range()
- range--
- if(range <= 0)
- qdel(src)
-
-
-
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index a359fb02159..65a0c7c1451 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -18,7 +18,6 @@
damage = 50
flag = "bullet"
-
/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
explosion(target, -1, 0, 2)
return 1
@@ -29,6 +28,7 @@
icon_state= "bolter"
damage = 60
flag = "bullet"
+ range = 7
/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0)
explosion(target, -1, 0, 2, 1, 0, flame_range = 3)
@@ -105,7 +105,7 @@
damage = 15
damage_type = BRUTE
flag = "bomb"
- var/range = 3
+ range = 3
obj/item/projectile/kinetic/New()
var/turf/proj_turf = get_turf(src)
@@ -168,3 +168,14 @@ obj/item/projectile/kinetic/New()
if(!gun)
qdel(src)
gun.create_portal(src)
+
+
+/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
+ explosion(target, -1, 0, 2)
+ return 1
+
+
+/obj/item/projectile/bullet/frag12
+ name ="explosive slug"
+ damage = 25
+ weaken = 5
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 9e4da4d8a40..a6d6d2572e2 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -283,7 +283,7 @@ datum/reagents/proc/handle_reactions()
if(ME2.Uses <= 0) // give the notification that the slime core is dead
for(var/mob/M in seen)
M << "\icon[my_atom] The [my_atom]'s power is consumed in the reaction."
- ME2.name = "\improper used slime extract"
+ ME2.name = "used slime extract"
ME2.desc = "This extract has been used up."
playsound(get_turf(my_atom), 'sound/effects/bubbles.ogg', 80, 1)
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
deleted file mode 100644
index 4a278afbdbe..00000000000
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ /dev/null
@@ -1,3477 +0,0 @@
-#define SOLID 1
-#define LIQUID 2
-#define GAS 3
-
-#define REM REAGENTS_EFFECT_MULTIPLIER
-
-//The reaction procs must ALWAYS set src = null, this detaches the proc from the object (the reagent)
-//so that it can continue working when the reagent is deleted while the proc is still active.
-
-
-datum/reagent
- var/name = "Reagent"
- var/id = "reagent"
- var/description = ""
- var/datum/reagents/holder = null
- var/reagent_state = SOLID
- var/list/data
- var/volume = 0
- var/nutriment_factor = 0
- //var/list/viruses = list()
- var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!)
-
-datum/reagent/proc/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) //By default we have a chance to transfer some
- if(!istype(M, /mob/living)) return 0
- var/datum/reagent/self = src
- src = null //of the reagent to the mob on TOUCHING it.
-
- if(!istype(self.holder.my_atom, /obj/effect/effect/chem_smoke))
- // If the chemicals are in a smoke cloud, do not try to let the chemicals "penetrate" into the mob's system (balance station 13) -- Doohl
-
- if(method == TOUCH)
-
- var/chance = 1
- var/block = 0
-
- for(var/obj/item/clothing/C in M.get_equipped_items())
- if(C.permeability_coefficient < chance) chance = C.permeability_coefficient
- 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(75))
- block = 1
-
- if(istype(C, /obj/item/clothing/head/bio_hood))
- if(prob(75))
- block = 1
-
- chance = chance * 100
-
- if(prob(chance) && !block)
- if(M.reagents)
- M.reagents.add_reagent(self.id,self.volume/2)
- return 1
-
-datum/reagent/proc/reaction_obj(var/obj/O, var/volume) //By default we transfer a small part of the reagent to the object
- src = null //if it can hold reagents. nope!
- //if(O.reagents)
- // O.reagents.add_reagent(id,volume/3)
- return
-
-datum/reagent/proc/reaction_turf(var/turf/T, var/volume)
- src = null
- return
-
-datum/reagent/proc/on_mob_life(var/mob/living/M as mob)
- if(!istype(M, /mob/living))
- return //Noticed runtime errors from pacid trying to damage ghosts, this should fix. --NEO
- holder.remove_reagent(src.id, REAGENTS_METABOLISM) //By default it slowly disappears.
- return
-
-datum/reagent/proc/on_move(var/mob/M)
- return
-
-// Called after add_reagents creates a new reagent.
-datum/reagent/proc/on_new(var/data)
- return
-
-// Called when two reagents of the same are mixing.
-datum/reagent/proc/on_merge(var/data)
- return
-
-datum/reagent/proc/on_update(var/atom/A)
- return
-
-datum/reagent/blood
- data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null)
- name = "Blood"
- id = "blood"
- reagent_state = LIQUID
- color = "#C80000" // rgb: 200, 0, 0
-
-datum/reagent/blood/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- var/datum/reagent/blood/self = src
- src = null
- if(self.data && self.data["viruses"])
- for(var/datum/disease/D in self.data["viruses"])
-
- if(D.spread_flags & SPECIAL || D.spread_flags & NON_CONTAGIOUS)
- continue
-
- if(method == TOUCH)
- M.ContractDisease(D)
- else //injected
- M.ForceContractDisease(D)
-
-datum/reagent/blood/on_new(var/list/data)
- if(istype(data))
- SetViruses(src, data)
-
-datum/reagent/blood/on_merge(var/list/data)
- if(src.data && data)
- src.data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc
- if(src.data["viruses"] || data["viruses"])
-
- var/list/mix1 = src.data["viruses"]
- var/list/mix2 = data["viruses"]
-
- // Stop issues with the list changing during mixing.
- var/list/to_mix = list()
-
- for(var/datum/disease/advance/AD in mix1)
- to_mix += AD
- for(var/datum/disease/advance/AD in mix2)
- to_mix += AD
-
- var/datum/disease/advance/AD = Advance_Mix(to_mix)
- if(AD)
- var/list/preserve = list(AD)
- for(var/D in src.data["viruses"])
- if(!istype(D, /datum/disease/advance))
- preserve += D
- src.data["viruses"] = preserve
- return 1
-
-
-datum/reagent/blood/reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place
- if(!istype(T)) return
- var/datum/reagent/blood/self = src
- src = null
- if(!(volume >= 3)) return
- //var/datum/disease/D = self.data["virus"]
- if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human))
- var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
- if(!blood_prop) //first blood!
- blood_prop = new(T)
- blood_prop.blood_DNA[self.data["blood_DNA"]] = self.data["blood_type"]
-
- for(var/datum/disease/D in self.data["viruses"])
- var/datum/disease/newVirus = D.Copy(1)
- blood_prop.viruses += newVirus
- newVirus.holder = blood_prop
-
-
- else if(istype(self.data["donor"], /mob/living/carbon/monkey))
- var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T
- if(!blood_prop)
- blood_prop = new(T)
- blood_prop.blood_DNA["Non-Human DNA"] = "A+"
- for(var/datum/disease/D in self.data["viruses"])
- var/datum/disease/newVirus = D.Copy(1)
- blood_prop.viruses += newVirus
- newVirus.holder = blood_prop
-
- else if(istype(self.data["donor"], /mob/living/carbon/alien))
- var/obj/effect/decal/cleanable/xenoblood/blood_prop = locate() in T
- if(!blood_prop)
- blood_prop = new(T)
- blood_prop.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*"
- for(var/datum/disease/D in self.data["viruses"])
- var/datum/disease/newVirus = D.Copy(1)
- blood_prop.viruses += newVirus
- newVirus.holder = blood_prop
- return
-
-/* Must check the transfering of reagents and their data first. They all can point to one disease datum.
-
- Del()
- if(src.data["virus"])
- var/datum/disease/D = src.data["virus"]
- D.cure(0)
- ..()
-*/
-datum/reagent/vaccine
- //data must contain virus type
- name = "Vaccine"
- id = "vaccine"
- reagent_state = LIQUID
- color = "#C81040" // rgb: 200, 16, 64
-
-datum/reagent/vaccine/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- var/datum/reagent/vaccine/self = src
- src = null
- if(islist(self.data) && method == INGEST)
- for(var/datum/disease/D in M.viruses)
- if(D.GetDiseaseID() in self.data)
- D.cure()
- M.resistances |= self.data
- return
-
-datum/reagent/vaccine/on_merge(var/list/data)
- if(istype(data))
- src.data |= data.Copy()
-
-
-datum/reagent/water
- name = "Water"
- id = "water"
- description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
- reagent_state = LIQUID
- color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha)
- var/cooling_temperature = 2
-
-datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume)
- if (!istype(T)) return
- var/CT = cooling_temperature
- src = null
- if(volume >= 10)
- T.MakeSlippery()
-
- for(var/mob/living/carbon/slime/M in T)
- M.apply_water()
-
- var/hotspot = (locate(/obj/effect/hotspot) in T)
- if(hotspot && !istype(T, /turf/space))
- if(T.air)
- var/datum/gas_mixture/G = T.air
- G.temperature = max(min(G.temperature-(CT*1000),G.temperature/CT),0)
- G.react()
- qdel(hotspot)
- return
-
-datum/reagent/water/reaction_obj(var/obj/O, var/volume)
- src = null
- if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube))
- var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
- if(!cube.wrapped)
- cube.Expand()
- return
-
-datum/reagent/water/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with water can help put them out!
- if(!istype(M, /mob/living))
- return
- if(method == TOUCH)
- M.adjust_fire_stacks(-(volume / 10))
- if(M.fire_stacks <= 0)
- M.ExtinguishMob()
- return
-
-datum/reagent/water/holywater
- name = "Holy Water"
- id = "holywater"
- description = "Water blessed by some deity."
- color = "#E0E8EF" // rgb: 224, 232, 239
-
-datum/reagent/water/holywater/on_mob_life(var/mob/living/M as mob)
- if(!data) data = 1
- data++
- M.jitteriness = max(M.jitteriness-5,0)
- if(data >= 30) // 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec
- if (!M.stuttering) M.stuttering = 1
- M.stuttering += 4
- M.Dizzy(5)
- if(iscultist(M) && prob(5))
- M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","Egkau'haom'nai en Chaous","Ho Diak'nos tou Ap'iron","R'ge Na'sie","Diabo us Vo'iscum","Si gn'um Co'nu"))
- if(data >= 75 && prob(33)) // 30 units, 135 seconds
- if (!M.confused) M.confused = 1
- M.confused += 3
- if(iscultist(M))
- ticker.mode.remove_cultist(M.mind)
- holder.remove_reagent(src.id, src.volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
- M.jitteriness = 0
- M.stuttering = 0
- M.confused = 0
- holder.remove_reagent(src.id, 0.4) //fixed consumption to prevent balancing going out of whack
- return
-
-datum/reagent/water/holywater/reaction_turf(var/turf/simulated/T, var/volume)
- ..()
- if(!istype(T)) return
- if(volume>=10)
- for(var/obj/effect/rune/R in T)
- qdel(R)
- T.Bless()
-
-datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
- name = "Unholy Water"
- id = "unholywater"
- description = "Something that shouldn't exist on this plane of existance."
-
-datum/reagent/fuel/unholywater/on_mob_life(var/mob/living/M as mob)
- M.adjustBrainLoss(3)
- if(iscultist(M))
- M.status_flags |= GOTTAGOFAST
- M.drowsyness = max(M.drowsyness-5, 0)
- M.AdjustParalysis(-2)
- M.AdjustStunned(-2)
- M.AdjustWeakened(-2)
- else
- M.adjustToxLoss(2)
- M.adjustFireLoss(2)
- M.adjustOxyLoss(2)
- M.adjustBruteLoss(2)
- holder.remove_reagent(src.id, 1)
-
-datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god
- name = "Hell Water"
- id = "hell_water"
- description = "YOUR FLESH! IT BURNS!"
-
-datum/reagent/hellwater/on_mob_life(var/mob/living/M as mob)
- M.fire_stacks = min(5,M.fire_stacks + 3)
- M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire
- M.adjustToxLoss(1)
- M.adjustFireLoss(1) //Hence the other damages... ain't I a bastard?
- M.adjustBrainLoss(5)
- holder.remove_reagent(src.id, 1)
-
-datum/reagent/lube
- name = "Space Lube"
- id = "lube"
- description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity."
- reagent_state = LIQUID
- color = "#009CA8" // rgb: 0, 156, 168
-
-datum/reagent/lube/reaction_turf(var/turf/simulated/T, var/volume)
- if (!istype(T)) return
- src = null
- if(volume >= 1)
- T.MakeSlippery(2)
-
-datum/reagent/slimetoxin
- name = "Mutation Toxin"
- id = "mutationtoxin"
- description = "A corruptive toxin produced by slimes."
- reagent_state = LIQUID
- color = "#13BC5E" // rgb: 19, 188, 94
-
-datum/reagent/aslimetoxin
- name = "Advanced Mutation Toxin"
- id = "amutationtoxin"
- description = "An advanced corruptive toxin produced by slimes."
- reagent_state = LIQUID
- color = "#13BC5E" // rgb: 19, 188, 94
-
-datum/reagent/aslimetoxin/reaction_mob(var/mob/M, var/volume)
- src = null
- M.ForceContractDisease(new /datum/disease/transformation/slime(0))
-
-datum/reagent/inaprovaline
- name = "Inaprovaline"
- id = "inaprovaline"
- description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/inaprovaline/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.losebreath >= 10)
- M.losebreath = max(10, M.losebreath-5)
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- return
-
-datum/reagent/space_drugs
- name = "Space drugs"
- id = "space_drugs"
- description = "An illegal chemical compound used as drug."
- reagent_state = LIQUID
- color = "#60A584" // rgb: 96, 165, 132
-
-datum/reagent/space_drugs/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.druggy = max(M.druggy, 15)
- if(isturf(M.loc) && !istype(M.loc, /turf/space))
- if(M.canmove)
- if(prob(10)) step(M, pick(cardinal))
- if(prob(7)) M.emote(pick("twitch","drool","moan","giggle"))
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- return
-
-datum/reagent/serotrotium
- name = "Serotrotium"
- id = "serotrotium"
- description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
- reagent_state = LIQUID
- color = "#202040" // rgb: 20, 20, 40
-
-datum/reagent/serotrotium/on_mob_life(var/mob/living/M as mob)
- if(ishuman(M))
- if(prob(7)) M.emote(pick("twitch","drool","moan","gasp"))
- holder.remove_reagent(src.id, 0.25 * REAGENTS_METABOLISM)
- return
-
-/* silicate
- name = "Silicate"
- id = "silicate"
- description = "A compound that can be used to reinforce glass."
- reagent_state = LIQUID
- color = "#C7FFFF" // rgb: 199, 255, 255
-
- reaction_obj(var/obj/O, var/volume)
- src = null
- if(istype(O,/obj/structure/window))
- if(O:silicate <= 200)
-
- O:silicate += volume
- O:health += volume * 3
-
- if(!O:silicateIcon)
- var/icon/I = icon(O.icon,O.icon_state,O.dir)
-
- var/r = (volume / 100) + 1
- var/g = (volume / 70) + 1
- var/b = (volume / 50) + 1
- I.SetIntensity(r,g,b)
- O.icon = I
- O:silicateIcon = I
- else
- var/icon/I = O:silicateIcon
-
- var/r = (volume / 100) + 1
- var/g = (volume / 70) + 1
- var/b = (volume / 50) + 1
- I.SetIntensity(r,g,b)
- O.icon = I
- O:silicateIcon = I
-
- return*/
-
-datum/reagent/oxygen
- name = "Oxygen"
- id = "oxygen"
- description = "A colorless, odorless gas."
- reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
-
-datum/reagent/copper
- name = "Copper"
- id = "copper"
- description = "A highly ductile metal."
- color = "#6E3B08" // rgb: 110, 59, 8
-
-datum/reagent/nitrogen
- name = "Nitrogen"
- id = "nitrogen"
- description = "A colorless, odorless, tasteless gas."
- reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
-
-datum/reagent/hydrogen
- name = "Hydrogen"
- id = "hydrogen"
- description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
- reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
-
-datum/reagent/potassium
- name = "Potassium"
- id = "potassium"
- description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
- reagent_state = SOLID
- color = "#A0A0A0" // rgb: 160, 160, 160
-
-datum/reagent/mercury
- name = "Mercury"
- id = "mercury"
- description = "A chemical element."
- reagent_state = LIQUID
- color = "#484848" // rgb: 72, 72, 72
-
-datum/reagent/mercury/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.canmove && istype(M.loc, /turf/space))
- step(M, pick(cardinal))
- if(prob(5)) M.emote(pick("twitch","drool","moan"))
- M.adjustBrainLoss(2)
- ..()
- return
-
-datum/reagent/sulfur
- name = "Sulfur"
- id = "sulfur"
- description = "A chemical element."
- reagent_state = SOLID
- color = "#BF8C00" // rgb: 191, 140, 0
-
-datum/reagent/carbon
- name = "Carbon"
- id = "carbon"
- description = "A chemical element."
- reagent_state = SOLID
- color = "#1C1300" // rgb: 30, 20, 0
-
-datum/reagent/carbon/reaction_turf(var/turf/T, var/volume)
- src = null
- if(!istype(T, /turf/space))
- new /obj/effect/decal/cleanable/dirt(T)
-
-datum/reagent/chlorine
- name = "Chlorine"
- id = "chlorine"
- description = "A chemical element."
- reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
-
-datum/reagent/chlorine/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.take_organ_damage(1*REM, 0)
- ..()
- return
-
-datum/reagent/fluorine
- name = "Fluorine"
- id = "fluorine"
- description = "A highly-reactive chemical element."
- reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
-
-datum/reagent/fluorine/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustToxLoss(1*REM)
- ..()
- return
-
-datum/reagent/sodium
- name = "Sodium"
- id = "sodium"
- description = "A chemical element."
- reagent_state = SOLID
- color = "#808080" // rgb: 128, 128, 128
-
-datum/reagent/phosphorus
- name = "Phosphorus"
- id = "phosphorus"
- description = "A chemical element."
- reagent_state = SOLID
- color = "#832828" // rgb: 131, 40, 40
-
-datum/reagent/lithium
- name = "Lithium"
- id = "lithium"
- description = "A chemical element."
- reagent_state = SOLID
- color = "#808080" // rgb: 128, 128, 128
-
-datum/reagent/lithium/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.canmove && istype(M.loc, /turf/space))
- step(M, pick(cardinal))
- if(prob(5)) M.emote(pick("twitch","drool","moan"))
- ..()
- return
-
-datum/reagent/sugar
- name = "Sugar"
- id = "sugar"
- 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
- color = "#FFFFFF" // rgb: 255, 255, 255
-
-datum/reagent/sugar/on_mob_life(var/mob/living/M as mob)
- M.nutrition += 1*REM
- ..()
- return
-
-datum/reagent/glycerol
- name = "Glycerol"
- id = "glycerol"
- description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity."
- reagent_state = LIQUID
- color = "#808080" // rgb: 128, 128, 128
-
-datum/reagent/nitroglycerin
- name = "Nitroglycerin"
- id = "nitroglycerin"
- description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol."
- reagent_state = LIQUID
- color = "#808080" // rgb: 128, 128, 128
-
-datum/reagent/radium
- name = "Radium"
- id = "radium"
- description = "Radium is an alkaline earth metal. It is extremely radioactive."
- reagent_state = SOLID
- color = "#C7C7C7" // rgb: 199,199,199
-
-datum/reagent/radium/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.apply_effect(2*REM,IRRADIATE,0)
- ..()
- return
-
-datum/reagent/radium/reaction_turf(var/turf/T, var/volume)
- src = null
- if(volume >= 3)
- if(!istype(T, /turf/space))
- new /obj/effect/decal/cleanable/greenglow(T)
- return
-
-
-datum/reagent/ryetalyn
- name = "Ryetalyn"
- id = "ryetalyn"
- description = "Ryetalyn can cure all genetic abnomalities."
- reagent_state = SOLID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/ryetalyn/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
-
- var/needs_update = M.mutations.len > 0
-
- M.mutations = list()
- M.disabilities = 0
- M.sdisabilities = 0
- M.jitteriness = 0
-
- // Might need to update appearance for hulk etc.
- if(needs_update && ishuman(M))
- var/mob/living/carbon/human/H = M
- H.update_mutations()
-
- ..()
- return
-
-datum/reagent/thermite
- name = "Thermite"
- id = "thermite"
- description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls."
- reagent_state = SOLID
- color = "#673910" // rgb: 103, 57, 16
-
-datum/reagent/thermite/reaction_turf(var/turf/T, var/volume)
- src = null
- if(volume >= 1 && istype(T, /turf/simulated/wall))
- var/turf/simulated/wall/Wall = T
- if(istype(Wall, /turf/simulated/wall/r_wall))
- Wall.thermite = Wall.thermite+(volume*2.5)
- else
- Wall.thermite = Wall.thermite+(volume*10)
- Wall.overlays = list()
- Wall.overlays += image('icons/effects/effects.dmi',"thermite")
- return
-
-datum/reagent/thermite/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustFireLoss(1)
- ..()
- return
-
-datum/reagent/virus_food
- name = "Virus Food"
- id = "virusfood"
- description = "A mixture of water and milk. Virus cells can use this mixture to reproduce."
- reagent_state = LIQUID
- nutriment_factor = 2 * REAGENTS_METABOLISM
- color = "#899613" // rgb: 137, 150, 19
-
-datum/reagent/virus_food/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition += nutriment_factor*REM
- ..()
- return
-
-datum/reagent/sterilizine
- name = "Sterilizine"
- id = "sterilizine"
- description = "Sterilizes wounds in preparation for surgery."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-/*datum/reagent/sterilizine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- src = null
- if (method==TOUCH)
- if(istype(M, /mob/living/carbon/human))
- if(M.health >= -100 && M.health <= 0)
- M.crit_op_stage = 0.0
- if (method==INGEST)
- usr << "Well, that was stupid."
- M.adjustToxLoss(3)
- return
-
-datum/reagent/sterilizine/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.radiation += 3
- ..()
- return
- */
-datum/reagent/iron
- name = "Iron"
- id = "iron"
- description = "Pure iron is a metal."
- reagent_state = SOLID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/gold
- name = "Gold"
- id = "gold"
- description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
- reagent_state = SOLID
- color = "#F7C430" // rgb: 247, 196, 48
-
-datum/reagent/silver
- name = "Silver"
- id = "silver"
- description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
- reagent_state = SOLID
- color = "#D0D0D0" // rgb: 208, 208, 208
-
-datum/reagent/uranium
- name ="Uranium"
- id = "uranium"
- description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
- reagent_state = SOLID
- color = "#B8B8C0" // rgb: 184, 184, 192
-
-datum/reagent/uranium/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.apply_effect(1,IRRADIATE,0)
- ..()
- return
-
-
-datum/reagent/uranium/reaction_turf(var/turf/T, var/volume)
- src = null
- if(volume >= 3)
- if(!istype(T, /turf/space))
- new /obj/effect/decal/cleanable/greenglow(T)
-
-datum/reagent/aluminium
- name = "Aluminium"
- id = "aluminium"
- description = "A silvery white and ductile member of the boron group of chemical elements."
- reagent_state = SOLID
- color = "#A8A8A8" // rgb: 168, 168, 168
-
-datum/reagent/silicon
- name = "Silicon"
- id = "silicon"
- description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
- reagent_state = SOLID
- color = "#A8A8A8" // rgb: 168, 168, 168
-
-datum/reagent/fuel
- name = "Welding fuel"
- id = "fuel"
- description = "Required for welders. Flamable."
- reagent_state = LIQUID
- color = "#660000" // rgb: 102, 0, 0
-
-datum/reagent/fuel/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with welding fuel to make them easy to ignite!
- if(!istype(M, /mob/living))
- return
- if(method == TOUCH)
- M.adjust_fire_stacks(volume / 10)
- return
-
-//Commenting this out as it's horribly broken. It's a neat effect though, so it might be worth making a new reagent (that is less common) with similar effects. -Pete
-/*
-datum/reagent/fuel/reaction_obj(var/obj/O, var/volume)
- src = null
- var/turf/the_turf = get_turf(O)
- if(!the_turf)
- return //No sense trying to start a fire if you don't have a turf to set on fire. --NEO
- var/datum/gas_mixture/napalm = new
- var/datum/gas/volatile_fuel/fuel = new
- fuel.moles = 15
- napalm.trace_gases += fuel
- the_turf.assume_air(napalm)
-
-datum/reagent/fuel/reaction_turf(var/turf/T, var/volume)
- src = null
- var/datum/gas_mixture/napalm = new
- var/datum/gas/volatile_fuel/fuel = new
- fuel.moles = 15
- napalm.trace_gases += fuel
- T.assume_air(napalm)
- return*/
-
-datum/reagent/fuel/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustToxLoss(1)
- ..()
- return
-
-datum/reagent/space_cleaner
- name = "Space cleaner"
- id = "cleaner"
- description = "A compound used to clean things. Now with 50% more sodium hypochlorite!"
- reagent_state = LIQUID
- color = "#A5F0EE" // rgb: 165, 240, 238
-
-datum/reagent/space_cleaner/reaction_obj(var/obj/O, var/volume)
- if(istype(O,/obj/effect/decal/cleanable))
- qdel(O)
- else
- if(O)
- O.clean_blood()
-
-datum/reagent/space_cleaner/reaction_turf(var/turf/T, var/volume)
- if(volume >= 1)
- T.clean_blood()
- for(var/obj/effect/decal/cleanable/C in T)
- qdel(C)
-
- for(var/mob/living/carbon/slime/M in T)
- M.adjustToxLoss(rand(5,10))
-
-datum/reagent/space_cleaner/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- if(C.r_hand)
- C.r_hand.clean_blood()
- if(C.l_hand)
- C.l_hand.clean_blood()
- if(C.wear_mask)
- if(C.wear_mask.clean_blood())
- C.update_inv_wear_mask(0)
- if(ishuman(M))
- var/mob/living/carbon/human/H = C
- if(H.head)
- if(H.head.clean_blood())
- H.update_inv_head(0)
- if(H.wear_suit)
- if(H.wear_suit.clean_blood())
- H.update_inv_wear_suit(0)
- else if(H.w_uniform)
- if(H.w_uniform.clean_blood())
- H.update_inv_w_uniform(0)
- if(H.shoes)
- if(H.shoes.clean_blood())
- H.update_inv_shoes(0)
- M.clean_blood()
-
-datum/reagent/leporazine
- name = "Leporazine"
- id = "leporazine"
- description = "Leporazine can be use to stabilize an individuals body temperature."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/leporazine/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.bodytemperature > 310)
- M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
- else if(M.bodytemperature < 311)
- M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
- ..()
- return
-
-datum/reagent/cryptobiolin
- name = "Cryptobiolin"
- id = "cryptobiolin"
- description = "Cryptobiolin causes confusion and dizzyness."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/cryptobiolin/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.Dizzy(1)
- if(!M.confused) M.confused = 1
- M.confused = max(M.confused, 20)
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- ..()
- return
-
-datum/reagent/kelotane
- name = "Kelotane"
- id = "kelotane"
- description = "Kelotane is a drug used to treat burns."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/kelotane/on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- M.heal_organ_damage(0,2*REM)
- ..()
- return
-
-datum/reagent/dermaline
- name = "Dermaline"
- id = "dermaline"
- description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/dermaline/on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0) //THE GUY IS **DEAD**! BEREFT OF ALL LIFE HE RESTS IN PEACE etc etc. He does NOT metabolise shit anymore, god DAMN
- return
- if(!M) M = holder.my_atom
- M.heal_organ_damage(0,3*REM)
- ..()
- return
-
-datum/reagent/dexalin
- name = "Dexalin"
- id = "dexalin"
- description = "Dexalin is used in the treatment of oxygen deprivation."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/dexalin/on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0)
- return //See above, down and around. --Agouri
- if(!M) M = holder.my_atom
- M.adjustOxyLoss(-2*REM)
- if(holder.has_reagent("lexorin"))
- holder.remove_reagent("lexorin", 2*REM)
- ..()
- return
-
-datum/reagent/dexalinp
- name = "Dexalin Plus"
- id = "dexalinp"
- description = "Dexalin Plus is used in the treatment of oxygen deprivation. Its highly effective."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/dexalinp/on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- M.adjustOxyLoss(-M.getOxyLoss())
- if(holder.has_reagent("lexorin"))
- holder.remove_reagent("lexorin", 2*REM)
- ..()
- return
-
-datum/reagent/tricordrazine
- name = "Tricordrazine"
- id = "tricordrazine"
- description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/tricordrazine/on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- if(M.getOxyLoss() && prob(80)) M.adjustOxyLoss(-1*REM)
- if(M.getBruteLoss() && prob(80)) M.heal_organ_damage(1*REM,0)
- if(M.getFireLoss() && prob(80)) M.heal_organ_damage(0,1*REM)
- if(M.getToxLoss() && prob(80)) M.adjustToxLoss(-1*REM)
- ..()
- return
-
-datum/reagent/anti_toxin
- name = "Anti-Toxin (Dylovene)"
- id = "anti_toxin"
- description = "Dylovene is a broad-spectrum antitoxin."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/anti_toxin/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.reagents.remove_all_type(/datum/reagent/toxin, 1*REM, 0, 1)
- M.drowsyness = max(M.drowsyness-2*REM, 0)
- M.hallucination = max(0, M.hallucination - 5*REM)
- M.adjustToxLoss(-2*REM)
- ..()
- return
-
-datum/reagent/adminordrazine //An OP chemical for admins
- name = "Adminordrazine"
- id = "adminordrazine"
- description = "It's magic. We don't have to explain it."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/adminordrazine/on_mob_life(var/mob/living/carbon/M as mob)
- if(!M) M = holder.my_atom ///This can even heal dead people.
- M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1)
- M.setCloneLoss(0)
- M.setOxyLoss(0)
- M.radiation = 0
- M.heal_organ_damage(5,5)
- M.adjustToxLoss(-5)
- M.hallucination = 0
- M.setBrainLoss(0)
- M.disabilities = 0
- M.sdisabilities = 0
- M.eye_blurry = 0
- M.eye_blind = 0
- M.SetWeakened(0)
- M.SetStunned(0)
- M.SetParalysis(0)
- M.silent = 0
- M.dizziness = 0
- M.drowsyness = 0
- M.stuttering = 0
- M.confused = 0
- M.sleeping = 0
- M.jitteriness = 0
- for(var/datum/disease/D in M.viruses)
- if(D.severity == NONTHREAT)
- continue
- D.spread_text = "Remissive"
- D.stage--
- if(D.stage < 1)
- D.cure()
- ..()
- return
-
-datum/reagent/synaptizine
- name = "Synaptizine"
- id = "synaptizine"
- description = "Synaptizine is used to treat various diseases."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/synaptizine/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.drowsyness = max(M.drowsyness-5, 0)
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
- if(holder.has_reagent("mindbreaker"))
- holder.remove_reagent("mindbreaker", 5)
- M.hallucination = max(0, M.hallucination - 10)
- if(prob(60)) M.adjustToxLoss(1)
- ..()
- return
-
-datum/reagent/impedrezene
- name = "Impedrezene"
- id = "impedrezene"
- description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/impedrezene/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.jitteriness = max(M.jitteriness-5,0)
- if(prob(80)) M.adjustBrainLoss(1*REM)
- if(prob(50)) M.drowsyness = max(M.drowsyness, 3)
- if(prob(10)) M.emote("drool")
- ..()
- return
-
-datum/reagent/hyronalin
- name = "Hyronalin"
- id = "hyronalin"
- description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/hyronalin/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.radiation = max(M.radiation-3*REM,0)
- ..()
- return
-
-datum/reagent/arithrazine
- name = "Arithrazine"
- id = "arithrazine"
- description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/arithrazine/on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0)
- return //See above, down and around. --Agouri
- if(!M) M = holder.my_atom
- M.radiation = max(M.radiation-7*REM,0)
- M.adjustToxLoss(-1*REM)
- if(prob(15))
- M.take_organ_damage(1, 0)
- ..()
- return
-
-datum/reagent/alkysine
- name = "Alkysine"
- id = "alkysine"
- description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/alkysine/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustBrainLoss(-3*REM)
- ..()
- return
-
-datum/reagent/imidazoline
- name = "Imidazoline"
- id = "imidazoline"
- description = "Heals eye damage."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/imidazoline/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.eye_blurry = max(M.eye_blurry-5 , 0)
- M.eye_blind = max(M.eye_blind-5 , 0)
- M.disabilities &= ~NEARSIGHTED
- M.eye_stat = max(M.eye_stat-5, 0)
-// M.sdisabilities &= ~1 Replaced by eye surgery
- ..()
- return
-
-datum/reagent/inacusiate
- name = "Inacusiate"
- id = "inacusiate"
- description = "Heals ear damage."
- reagent_state = LIQUID
- color = "#6600FF" // rgb: 100, 165, 255
-
-datum/reagent/inacusiate/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.ear_damage = 0
- M.ear_deaf = 0
- ..()
- return
-
-datum/reagent/bicaridine
- name = "Bicaridine"
- id = "bicaridine"
- description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/bicaridine/on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- M.heal_organ_damage(2*REM,0)
- ..()
- return
-
-datum/reagent/hyperzine
- name = "Hyperzine"
- id = "hyperzine"
- description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/hyperzine/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(prob(5)) M.emote(pick("twitch","blink_r","shiver"))
- M.status_flags |= GOTTAGOFAST
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- //..() //this was causing hyperzine to be consumed twice...
- return
-
-datum/reagent/cryoxadone
- name = "Cryoxadone"
- id = "cryoxadone"
- description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/cryoxadone/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.bodytemperature < 170)
- M.adjustCloneLoss(-1)
- M.adjustOxyLoss(-3)
- M.heal_organ_damage(3,3)
- M.adjustToxLoss(-3)
- ..()
- return
-
-datum/reagent/clonexadone
- name = "Clonexadone"
- id = "clonexadone"
- description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' clones that get ejected early when used in conjunction with a cryo tube."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/clonexadone/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.bodytemperature < 170)
- M.adjustCloneLoss(-3)
- M.adjustOxyLoss(-3)
- M.heal_organ_damage(3,3)
- M.adjustToxLoss(-3)
- M.status_flags &= ~DISFIGURED
- ..()
- return
-
-datum/reagent/rezadone
- name = "Rezadone"
- id = "rezadone"
- description = "A powder derived from fish toxin, this substance can effectively treat cellular damage in humanoids, though excessive consumption has side effects."
- reagent_state = SOLID
- color = "#669900" // rgb: 102, 153, 0
-
-datum/reagent/rezadone/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- data++
- switch(data)
- if(1 to 15)
- M.adjustCloneLoss(-1)
- M.heal_organ_damage(1,1)
- if(15 to 35)
- M.adjustCloneLoss(-2)
- M.heal_organ_damage(2,1)
- M.status_flags &= ~DISFIGURED
- if(35 to INFINITY)
- M.adjustToxLoss(1)
- M.Dizzy(5)
- M.Jitter(5)
-
- ..()
- return
-
-datum/reagent/spaceacillin
- name = "Spaceacillin"
- id = "spaceacillin"
- description = "An all-purpose antiviral agent."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
-datum/reagent/spaceacillin/on_mob_life(var/mob/living/M as mob)//no more mr. panacea
- holder.remove_reagent(src.id, 0.2)
- ..()
- return
-
-datum/reagent/nanites
- name = "Nanomachines"
- id = "nanites"
- description = "Microscopic construction robots."
- reagent_state = LIQUID
- color = "#535E66" // rgb: 83, 94, 102
-
-datum/reagent/nanites/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- src = null
- if( (prob(10) && method==TOUCH) || method==INGEST)
- M.ForceContractDisease(new /datum/disease/transformation/robot(0))
-
-datum/reagent/xenomicrobes
- name = "Xenomicrobes"
- id = "xenomicrobes"
- description = "Microbes with an entirely alien cellular structure."
- reagent_state = LIQUID
- color = "#535E66" // rgb: 83, 94, 102
-
-datum/reagent/xenomicrobes/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- src = null
- if( (prob(10) && method==TOUCH) || method==INGEST)
- M.ContractDisease(new /datum/disease/transformation/xeno(0))
-
-datum/reagent/fluorosurfactant//foam precursor
- name = "Fluorosurfactant"
- id = "fluorosurfactant"
- description = "A perfluoronated sulfonic acid that forms a foam when mixed with water."
- reagent_state = LIQUID
- color = "#9E6B38" // rgb: 158, 107, 56
-
-datum/reagent/foaming_agent// Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually.
- name = "Foaming agent"
- id = "foaming_agent"
- description = "A agent that yields metallic foam when mixed with light metal and a strong acid."
- reagent_state = SOLID
- color = "#664B63" // rgb: 102, 75, 99
-
-datum/reagent/ammonia
- name = "Ammonia"
- id = "ammonia"
- description = "A caustic substance commonly used in fertilizer or household cleaners."
- reagent_state = GAS
- color = "#404030" // rgb: 64, 64, 48
-
-datum/reagent/diethylamine
- name = "Diethylamine"
- id = "diethylamine"
- description = "A secondary amine, mildly corrosive."
- reagent_state = LIQUID
- color = "#604030" // rgb: 96, 64, 48
-
-datum/reagent/ethylredoxrazine // FUCK YOU, ALCOHOL
- name = "Ethylredoxrazine"
- id = "ethylredoxrazine"
- description = "A powerful oxidizer that reacts with ethanol."
- reagent_state = SOLID
- color = "#605048" // rgb: 96, 80, 72
-
-datum/reagent/ethylredoxrazine/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.dizziness = 0
- M.drowsyness = 0
- M.stuttering = 0
- M.confused = 0
- M.reagents.remove_all_type(/datum/reagent/ethanol, 1*REM, 0, 1)
- ..()
- return
-
-//////////////////////////Poison stuff///////////////////////
-
-datum/reagent/toxin
- name = "Toxin"
- id = "toxin"
- description = "A toxic chemical."
- reagent_state = LIQUID
- color = "#CF3600" // rgb: 207, 54, 0
- var/toxpwr = 1.5
-
-datum/reagent/toxin/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(toxpwr)
- M.adjustToxLoss(toxpwr*REM)
- ..()
- return
-
-datum/reagent/toxin/amatoxin
- name = "Amatoxin"
- id = "amatoxin"
- description = "A powerful poison derived from certain species of mushroom."
- reagent_state = LIQUID
- color = "#792300" // rgb: 121, 35, 0
- toxpwr = 1
-
-datum/reagent/toxin/mutagen
- name = "Unstable mutagen"
- id = "mutagen"
- description = "Might cause unpredictable mutations. Keep away from children."
- reagent_state = LIQUID
- color = "#13BC5E" // rgb: 19, 188, 94
- toxpwr = 0
-
-datum/reagent/toxin/mutagen/reaction_mob(var/mob/living/carbon/M, var/method=TOUCH, var/volume)
- if(!..()) return
- if(!istype(M) || !M.dna) return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
- src = null
- if((method==TOUCH && prob(33)) || method==INGEST)
- randmuti(M)
- if(prob(98))
- randmutb(M)
- else
- randmutg(M)
- domutcheck(M, null)
- updateappearance(M)
- return
-
-datum/reagent/toxin/mutagen/on_mob_life(var/mob/living/carbon/M)
- if(!istype(M)) return
- if(!M) M = holder.my_atom
- M.apply_effect(5,IRRADIATE,0)
- ..()
- return
-
-datum/reagent/toxin/plasma
- name = "Plasma"
- id = "plasma"
- description = "Plasma in its liquid form."
- reagent_state = LIQUID
- color = "#DB2D08" // rgb: 219, 45, 8
- toxpwr = 3
-
-datum/reagent/toxin/plasma/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(holder.has_reagent("inaprovaline"))
- holder.remove_reagent("inaprovaline", 2*REM)
- ..()
- return
-
-datum/reagent/toxin/plasma/reaction_obj(var/obj/O, var/volume)
- src = null
- /*if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg/slime))
- var/obj/item/weapon/reagent_containers/food/snacks/egg/slime/egg = O
- if (egg.grown)
- egg.Hatch()*/
- if((!O) || (!volume)) return 0
- O.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume)
-
-datum/reagent/toxin/plasma/reaction_turf(var/turf/simulated/T, var/volume)
- src = null
- if(istype(T))
- T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume)
- return
-
-datum/reagent/toxin/plasma/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with plasma is stronger than fuel!
- if(!istype(M, /mob/living))
- return
- if(method == TOUCH)
- M.adjust_fire_stacks(volume / 5)
- return
-
-datum/reagent/toxin/lexorin
- name = "Lexorin"
- id = "lexorin"
- description = "Lexorin temporarily stops respiration. Causes tissue damage."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
- toxpwr = 0
-
-datum/reagent/toxin/lexorin/on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- if(prob(33))
- M.take_organ_damage(1*REM, 0)
- M.adjustOxyLoss(3)
- if(prob(20)) M.emote("gasp")
- ..()
- return
-
-datum/reagent/toxin/slimejelly
- name = "Slime Jelly"
- id = "slimejelly"
- description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
- reagent_state = LIQUID
- color = "#801E28" // rgb: 128, 30, 40
- toxpwr = 0
-
-datum/reagent/toxin/slimejelly/on_mob_life(var/mob/living/M as mob)
- if(prob(10))
- M << "Your insides are burning!"
- M.adjustToxLoss(rand(20,60)*REM)
- else if(prob(40))
- M.heal_organ_damage(5*REM,0)
- ..()
- return
-
-datum/reagent/toxin/cyanide
- name = "Cyanide"
- id = "cyanide"
- description = "A highly toxic chemical."
- reagent_state = LIQUID
- color = "#CF3600" // rgb: 207, 54, 0
- toxpwr = 3
-
-datum/reagent/toxin/cyanide/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustOxyLoss(3*REM)
- M.sleeping += 1
- ..()
- return
-
-datum/reagent/toxin/minttoxin
- name = "Mint Toxin"
- id = "minttoxin"
- description = "Useful for dealing with undesirable customers."
- reagent_state = LIQUID
- color = "#CF3600" // rgb: 207, 54, 0
- toxpwr = 0
-
-datum/reagent/toxin/minttoxin/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if (FAT in M.mutations)
- M.gib()
- ..()
- return
-
-datum/reagent/toxin/carpotoxin
- name = "Carpotoxin"
- id = "carpotoxin"
- description = "A deadly neurotoxin produced by the dreaded spess carp."
- reagent_state = LIQUID
- color = "#003333" // rgb: 0, 51, 51
- toxpwr = 2
-
-datum/reagent/toxin/zombiepowder
- name = "Zombie Powder"
- id = "zombiepowder"
- description = "A strong neurotoxin that puts the subject into a death-like state."
- reagent_state = SOLID
- color = "#669900" // rgb: 102, 153, 0
- toxpwr = 0.5
-
-datum/reagent/toxin/zombiepowder/on_mob_life(var/mob/living/carbon/M as mob)
- if(!M) M = holder.my_atom
- M.status_flags |= FAKEDEATH
- M.adjustOxyLoss(0.5*REM)
- M.Weaken(5)
- M.silent = max(M.silent, 5)
- M.tod = worldtime2text()
- ..()
- return
-
-datum/reagent/toxin/zombiepowder/Del()
- if(holder && ismob(holder.my_atom))
- var/mob/M = holder.my_atom
- M.status_flags &= ~FAKEDEATH
- ..()
-
-datum/reagent/toxin/mindbreaker
- name = "Mindbreaker Toxin"
- id = "mindbreaker"
- description = "A powerful hallucinogen. Not a thing to be messed with."
- reagent_state = LIQUID
- color = "#B31008" // rgb: 139, 166, 233
- toxpwr = 0
-
-datum/reagent/toxin/mindbreaker/on_mob_life(var/mob/living/M)
- if(!M) M = holder.my_atom
- M.hallucination += 10
- ..()
- return
-
-datum/reagent/toxin/plantbgone
- name = "Plant-B-Gone"
- id = "plantbgone"
- description = "A harmful toxic mixture to kill plantlife. Do not ingest!"
- reagent_state = LIQUID
- color = "#49002E" // rgb: 73, 0, 46
- toxpwr = 1
-
-datum/reagent/toxin/plantbgone/reaction_obj(var/obj/O, var/volume)
- if(istype(O,/obj/structure/alien/weeds/))
- var/obj/structure/alien/weeds/alien_weeds = O
- alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
- alien_weeds.healthcheck()
- else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it
- qdel(O)
- else if(istype(O,/obj/effect/spacevine))
- var/obj/effect/spacevine/SV = O
- SV.on_chem_effect(src)
-
-datum/reagent/toxin/plantbgone/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- src = null
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- if(!C.wear_mask) // If not wearing a mask
- C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason
-
-datum/reagent/toxin/plantbgone/weedkiller
- name = "Weed Killer"
- id = "weedkiller"
- description = "A harmful toxic mixture to kill weeds. Do not ingest!"
- reagent_state = LIQUID
- color = "#4B004B" // rgb: 75, 0, 75
-
-
-datum/reagent/toxin/pestkiller
- name = "Pest Killer"
- id = "pestkiller"
- description = "A harmful toxic mixture to kill pests. Do not ingest!"
- color = "#4B004B" // rgb: 75, 0, 75
- toxpwr = 1
-
-datum/reagent/toxin/pestkiller/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- src = null
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- if(!C.wear_mask) // If not wearing a mask
- C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason
-
-datum/reagent/toxin/stoxin
- name = "Sleep Toxin"
- id = "stoxin"
- description = "An effective hypnotic used to treat insomnia."
- reagent_state = LIQUID
- color = "#E895CC" // rgb: 232, 149, 204
- toxpwr = 0
-
-datum/reagent/toxin/stoxin/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- switch(data)
- if(1 to 12)
- if(prob(5)) M.emote("yawn")
- if(12 to 15)
- M.eye_blurry = max(M.eye_blurry, 10)
- if(15 to 25)
- M.drowsyness = max(M.drowsyness, 20)
- if(25 to INFINITY)
- M.Paralyse(20)
- M.drowsyness = max(M.drowsyness, 30)
- data++
- ..()
- return
-
-
-datum/reagent/toxin/spore
- name = "Spore Toxin"
- id = "spore"
- description = "A toxic spore cloud which blocks vision when ingested."
- reagent_state = LIQUID
- color = "#9ACD32"
- toxpwr = 0.5
-
-datum/reagent/toxin/spore/on_mob_life(var/mob/living/M as mob)
- ..()
- M.damageoverlaytemp = 60
- M.eye_blurry = max(M.eye_blurry, 3)
- return
-
-
-datum/reagent/toxin/spore_burning
- name = "Burning Spore Toxin"
- id = "spore_burning"
- description = "A burning spore cloud."
- reagent_state = LIQUID
- color = "#9ACD32"
- toxpwr = 0.5
-
-datum/reagent/toxin/spore_burning/on_mob_life(var/mob/living/M as mob)
- ..()
- M.adjust_fire_stacks(2)
- M.IgniteMob()
-
-datum/reagent/toxin/chloralhydrate
- name = "Chloral Hydrate"
- id = "chloralhydrate"
- description = "A powerful sedative."
- reagent_state = SOLID
- color = "#000067" // rgb: 0, 0, 103
- toxpwr = 0
-
-datum/reagent/toxin/chloralhydrate/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- data++
- switch(data)
- if(1 to 10)
- M.confused += 2
- M.drowsyness += 2
- if(10 to 50)
- M.sleeping += 1
- if(51 to INFINITY)
- M.sleeping += 1
- M.adjustToxLoss((data - 50)*REM)
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- ..()
- return
-
-datum/reagent/toxin/beer2 //disguised as normal beer for use by emagged brobots
- name = "Beer"
- id = "beer2"
- description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
-
-datum/reagent/toxin/beer2/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- switch(data)
- if(1 to 50)
- M.sleeping += 1
- if(51 to INFINITY)
- M.sleeping += 1
- M.adjustToxLoss((data - 50)*REM)
- data++
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- ..()
- return
-
-datum/reagent/toxin/acid
- name = "Sulphuric acid"
- id = "sacid"
- description = "A strong mineral acid with the molecular formula H2SO4."
- reagent_state = LIQUID
- color = "#DB5008" // rgb: 219, 80, 8
- toxpwr = 1
- var/acidpwr = 10 //the amount of protection removed from the armour
-
-datum/reagent/toxin/acid/reaction_mob(var/mob/living/carbon/C, var/method=TOUCH, var/volume)
- if(!istype(C))
- return
- if(method != TOUCH)
- if(!C.unacidable)
- C.take_organ_damage(min(6*toxpwr, volume * toxpwr))
- return
-
- C.acid_act(acidpwr, toxpwr, volume)
-
-datum/reagent/toxin/acid/reaction_obj(var/obj/O, var/volume)
- if(istype(O.loc, /mob)) //handled in human acid_act()
- return
- O.acid_act(acidpwr, toxpwr, volume)
-
-datum/reagent/toxin/acid/polyacid
- name = "Polytrinic acid"
- id = "pacid"
- description = "Polytrinic acid is a an extremely corrosive chemical substance."
- reagent_state = LIQUID
- color = "#8E18A9" // rgb: 142, 24, 169
- toxpwr = 2
- acidpwr = 20
-
-datum/reagent/toxin/coffeepowder
- name = "Coffee Grounds"
- id = "coffeepowder"
- description = "Finely ground coffee beans, used to make coffee."
- reagent_state = SOLID
- color = "#5B2E0D" // rgb: 91, 46, 13
- toxpwr = 0.5
-
-datum/reagent/toxin/teapowder
- name = "Ground Tea Leaves"
- id = "teapowder"
- description = "Finely shredded tea leaves, used for making tea."
- reagent_state = SOLID
- color = "#7F8400" // rgb: 127, 132, 0
- toxpwr = 0.5
-
-datum/reagent/toxin/mutetoxin //the new zombie powder.
- name = "Mute Toxin"
- id = "mutetoxin"
- description = "A toxin that temporarily paralyzes the vocal cords."
- reagent_state = LIQUID
- color = "#F0F8FF" // rgb: 240, 248, 255
- toxpwr = 0
-
-datum/reagent/toxin/mutetoxin/on_mob_life(mob/living/carbon/M)
- M.silent += REM + 1 //If this var is increased by one or less, it will have no effect since silent is decreased right after reagents are handled in Life(). Hence the + 1.
- ..()
-
-datum/reagent/toxin/staminatoxin
- name = "Tirizene"
- id = "tirizene"
- description = "A toxin that affects the stamina of a person when injected into the bloodstream."
- reagent_state = LIQUID
- color = "#6E2828"
- data = 13
- toxpwr = 0
-
-datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/M)
- M.adjustStaminaLoss(REM * data)
- data = max(data - 1, 3)
- ..()
-
-/////////////////////////Coloured Crayon Powder////////////////////////////
-//For colouring in /proc/mix_color_from_reagents
-
-
-datum/reagent/crayonpowder
- name = "Crayon Powder"
- id = "crayon powder"
- var/colorname = "none"
- description = "A powder made by grinding down crayons, good for colouring chemical reagents."
- reagent_state = SOLID
- color = "#FFFFFF" // rgb: 207, 54, 0
-
-datum/reagent/crayonpowder/New()
- description = "\an [colorname] powder made by grinding down crayons, good for colouring chemical reagents."
-
-
-datum/reagent/crayonpowder/red
- name = "Red Crayon Powder"
- id = "redcrayonpowder"
- colorname = "red"
-
-datum/reagent/crayonpowder/orange
- name = "Orange Crayon Powder"
- id = "orangecrayonpowder"
- colorname = "orange"
- color = "#FF9300" // orange
-
-datum/reagent/crayonpowder/yellow
- name = "Yellow Crayon Powder"
- id = "yellowcrayonpowder"
- colorname = "yellow"
- color = "#FFF200" // yellow
-
-datum/reagent/crayonpowder/green
- name = "Green Crayon Powder"
- id = "greencrayonpowder"
- colorname = "green"
- color = "#A8E61D" // green
-
-datum/reagent/crayonpowder/blue
- name = "Blue Crayon Powder"
- id = "bluecrayonpowder"
- colorname = "blue"
- color = "#00B7EF" // blue
-
-datum/reagent/crayonpowder/purple
- name = "Purple Crayon Powder"
- id = "purplecrayonpowder"
- colorname = "purple"
- color = "#DA00FF" // purple
-
-datum/reagent/crayonpowder/invisible
- name = "Invisible Crayon Powder"
- id = "invisiblecrayonpowder"
- colorname = "invisible"
- color = "#FFFFFF00" // white + no alpha
-
-
-/////////////////////////Food Reagents////////////////////////////
-// Part of the food code. Nutriment is used instead of the old "heal_amt" code. Also is where all the food
-// condiments, additives, and such go.
-datum/reagent/nutriment
- name = "Nutriment"
- id = "nutriment"
- description = "All the vitamins, minerals, and carbohydrates the body needs in pure form."
- reagent_state = SOLID
- nutriment_factor = 15 * REAGENTS_METABOLISM
- color = "#664330" // rgb: 102, 67, 48
-
-datum/reagent/nutriment/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(prob(50)) M.heal_organ_damage(1,0)
- M.nutrition += nutriment_factor // For hunger and fatness
-/*
- // If overeaten - vomit and fall down
- // Makes you feel bad but removes reagents and some effect
- // from your body
- if (M.nutrition > 650)
- M.nutrition = rand (250, 400)
- M.weakened += rand(2, 10)
- M.jitteriness += rand(0, 5)
- M.dizziness = max (0, (M.dizziness - rand(0, 15)))
- M.druggy = max (0, (M.druggy - rand(0, 15)))
- M.adjustToxLoss(rand(-15, -5)))
- M.updatehealth()
-*/
- ..()
- return
-
-datum/reagent/lipozine
- name = "Lipozine" // The anti-nutriment.
- id = "lipozine"
- description = "A chemical compound that causes a powerful fat-burning reaction."
- reagent_state = LIQUID
- nutriment_factor = 10 * REAGENTS_METABOLISM
- color = "#BBEDA4" // rgb: 187, 237, 164
-
-datum/reagent/lipozine/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition -= nutriment_factor
- M.overeatduration = 0
- if(M.nutrition < 0)//Prevent from going into negatives.
- M.nutrition = 0
- ..()
- return
-
-datum/reagent/soysauce
- name = "Soysauce"
- id = "soysauce"
- description = "A salty sauce made from the soy plant."
- reagent_state = LIQUID
- nutriment_factor = 2 * REAGENTS_METABOLISM
- color = "#792300" // rgb: 121, 35, 0
-
-datum/reagent/ketchup
- name = "Ketchup"
- id = "ketchup"
- description = "Ketchup, catsup, whatever. It's tomato paste."
- reagent_state = LIQUID
- nutriment_factor = 5 * REAGENTS_METABOLISM
- color = "#731008" // rgb: 115, 16, 8
-
-
-datum/reagent/capsaicin
- name = "Capsaicin Oil"
- id = "capsaicin"
- description = "This is what makes chilis hot."
- reagent_state = LIQUID
- color = "#B31008" // rgb: 179, 16, 8
-
-datum/reagent/capsaicin/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- switch(data)
- if(1 to 15)
- M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(holder.has_reagent("frostoil"))
- holder.remove_reagent("frostoil", 5)
- if(istype(M, /mob/living/carbon/slime))
- M.bodytemperature += rand(5,20)
- if(15 to 25)
- M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(istype(M, /mob/living/carbon/slime))
- M.bodytemperature += rand(10,20)
- if(25 to INFINITY)
- M.bodytemperature += 15 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(istype(M, /mob/living/carbon/slime))
- M.bodytemperature += rand(15,20)
- data++
- ..()
- return
-
-datum/reagent/condensedcapsaicin
- name = "Condensed Capsaicin"
- id = "condensedcapsaicin"
- description = "A chemical agent used for self-defense and in police work."
- reagent_state = LIQUID
- color = "#B31008" // rgb: 179, 16, 8
-
-datum/reagent/condensedcapsaicin/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- if(!istype(M, /mob/living/carbon/human) && !istype(M, /mob/living/carbon/monkey))
- return
-
- var/mob/living/carbon/victim = M
- if(method == TOUCH)
- //check for protection
- var/mouth_covered = 0
- var/eyes_covered = 0
- var/obj/item/safe_thing = null
-
- //monkeys and humans can have masks
- if( victim.wear_mask )
- if ( victim.wear_mask.flags & MASKCOVERSEYES )
- eyes_covered = 1
- safe_thing = victim.wear_mask
- if ( victim.wear_mask.flags & MASKCOVERSMOUTH )
- mouth_covered = 1
- safe_thing = victim.wear_mask
-
- //only humans can have helmets and glasses
- if(istype(victim, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = victim
- if( H.head )
- if ( H.head.flags & MASKCOVERSEYES )
- eyes_covered = 1
- safe_thing = H.head
- if ( H.head.flags & MASKCOVERSMOUTH )
- mouth_covered = 1
- safe_thing = H.head
- if(H.glasses)
- eyes_covered = 1
- if ( !safe_thing )
- safe_thing = H.glasses
-
- //actually handle the pepperspray effects
- if ( eyes_covered && mouth_covered )
- return
- else if ( mouth_covered ) // Reduced effects if partially protected
- if(prob(5))
- victim.emote("scream")
- victim.eye_blurry = max(M.eye_blurry, 3)
- victim.eye_blind = max(M.eye_blind, 1)
- victim.confused = max(M.confused, 3)
- victim.damageoverlaytemp = 60
- victim.Weaken(3)
- victim.drop_item()
- return
- else if ( eyes_covered ) // Eye cover is better than mouth cover
- victim.eye_blurry = max(M.eye_blurry, 3)
- victim.damageoverlaytemp = 30
- return
- else // Oh dear :D
- if(prob(5))
- victim.emote("scream")
- victim.eye_blurry = max(M.eye_blurry, 5)
- victim.eye_blind = max(M.eye_blind, 2)
- victim.confused = max(M.confused, 6)
- victim.damageoverlaytemp = 75
- victim.Weaken(5)
- victim.drop_item()
-
-datum/reagent/condensedcapsaicin/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(prob(5))
- M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]")
- ..()
- return
-
-datum/reagent/frostoil
- name = "Frost Oil"
- id = "frostoil"
- description = "A special oil that noticably chills the body. Extraced from Icepeppers."
- reagent_state = LIQUID
- color = "#B31008" // rgb: 139, 166, 233
-
-datum/reagent/frostoil/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- switch(data)
- if(1 to 15)
- M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(holder.has_reagent("capsaicin"))
- holder.remove_reagent("capsaicin", 5)
- if(istype(M, /mob/living/carbon/slime))
- M.bodytemperature -= rand(5,20)
- if(15 to 25)
- M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(istype(M, /mob/living/carbon/slime))
- M.bodytemperature -= rand(10,20)
- if(25 to INFINITY)
- M.bodytemperature -= 15 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(prob(1)) M.emote("shiver")
- if(istype(M, /mob/living/carbon/slime))
- M.bodytemperature -= rand(15,20)
- data++
- ..()
- return
-
-datum/reagent/frostoil/reaction_turf(var/turf/simulated/T, var/volume)
- if(volume >= 5)
- for(var/mob/living/carbon/slime/M in T)
- M.adjustToxLoss(rand(15,30))
- //if(istype(T))
- // T.atmos_spawn_air(SPAWN_COLD)
-
-datum/reagent/sodiumchloride
- name = "Table Salt"
- id = "sodiumchloride"
- description = "A salt made of sodium chloride. Commonly used to season food."
- reagent_state = SOLID
- color = "#FFFFFF" // rgb: 255,255,255
-
-datum/reagent/blackpepper
- name = "Black Pepper"
- id = "blackpepper"
- description = "A powder ground from peppercorns. *AAAACHOOO*"
- reagent_state = SOLID
- // no color (ie, black)
-
-datum/reagent/coco
- name = "Coco Powder"
- id = "coco"
- description = "A fatty, bitter paste made from coco beans."
- reagent_state = SOLID
- nutriment_factor = 5 * REAGENTS_METABOLISM
- color = "#302000" // rgb: 48, 32, 0
-
-datum/reagent/coco/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
-
-datum/reagent/hot_coco
- name = "Hot Chocolate"
- id = "hot_coco"
- description = "Made with love! And coco beans."
- reagent_state = LIQUID
- nutriment_factor = 2 * REAGENTS_METABOLISM
- color = "#403010" // rgb: 64, 48, 16
-
-datum/reagent/hot_coco/on_mob_life(var/mob/living/M as mob)
- if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
- M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- M.nutrition += nutriment_factor
- ..()
- return
-
-datum/reagent/mushroomhallucinogen
- name = "Mushroom Hallucinogen"
- id = "mushroomhallucinogen"
- description = "A strong hallucinogenic drug derived from certain species of mushroom."
- color = "#E700E7" // rgb: 231, 0, 231
-
-datum/reagent/mushroomhallucinogen/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.druggy = max(M.druggy, 30)
- if(!data) data = 1
- switch(data)
- if(1 to 5)
- if (!M.stuttering) M.stuttering = 1
- M.Dizzy(5)
- if(prob(10)) M.emote(pick("twitch","giggle"))
- if(5 to 10)
- if (!M.stuttering) M.stuttering = 1
- M.Jitter(10)
- M.Dizzy(10)
- M.druggy = max(M.druggy, 35)
- if(prob(20)) M.emote(pick("twitch","giggle"))
- if (10 to INFINITY)
- if (!M.stuttering) M.stuttering = 1
- M.Jitter(20)
- M.Dizzy(20)
- M.druggy = max(M.druggy, 40)
- if(prob(30)) M.emote(pick("twitch","giggle"))
- holder.remove_reagent(src.id, 0.2)
- data++
- ..()
- return
-
-datum/reagent/sprinkles
- name = "Sprinkles"
- id = "sprinkles"
- description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#FF00FF" // rgb: 255, 0, 255
-
-datum/reagent/sprinkles/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden"))
- if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
- M.nutrition += nutriment_factor
- ..()
- return
- ..()
-
-/* //removed because of meta bullshit. this is why we can't have nice things.
-datum/reagent/syndicream
- name = "Cream filling"
- id = "syndicream"
- description = "Delicious cream filling of a mysterious origin. Tastes criminally good."
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#AB7878" // rgb: 171, 120, 120
-
-datum/reagent/syndicream/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if(istype(M, /mob/living/carbon/human) && M.mind)
- if(M.mind.special_role)
- if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
- M.nutrition += nutriment_factor
- ..()
- return
- ..()
-*/
-datum/reagent/cornoil
- name = "Corn Oil"
- id = "cornoil"
- description = "An oil derived from various types of corn."
- reagent_state = LIQUID
- nutriment_factor = 20 * REAGENTS_METABOLISM
- color = "#302000" // rgb: 48, 32, 0
-
-datum/reagent/cornoil/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
-
-datum/reagent/cornoil/reaction_turf(var/turf/simulated/T, var/volume)
- if (!istype(T)) return
- src = null
- if(volume >= 3)
- T.MakeSlippery()
- var/hotspot = (locate(/obj/effect/hotspot) in T)
- if(hotspot)
- var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() )
- lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0)
- lowertemp.react()
- T.assume_air(lowertemp)
- qdel(hotspot)
-
-datum/reagent/enzyme
- name = "Universal Enzyme"
- id = "enzyme"
- description = "A universal enzyme used in the preperation of certain chemicals and foods."
- reagent_state = LIQUID
- color = "#365E30" // rgb: 54, 94, 48
-
-datum/reagent/dry_ramen
- name = "Dry Ramen"
- id = "dry_ramen"
- description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
- reagent_state = SOLID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#302000" // rgb: 48, 32, 0
-
-datum/reagent/dry_ramen/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
-
-datum/reagent/hot_ramen
- name = "Hot Ramen"
- id = "hot_ramen"
- description = "The noodles are boiled, the flavors are artificial, just like being back in school."
- reagent_state = LIQUID
- nutriment_factor = 5 * REAGENTS_METABOLISM
- color = "#302000" // rgb: 48, 32, 0
-
-datum/reagent/hot_ramen/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
- M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT))
- ..()
- return
-
-datum/reagent/hell_ramen
- name = "Hell Ramen"
- id = "hell_ramen"
- description = "The noodles are boiled, the flavors are artificial, just like being back in school."
- reagent_state = LIQUID
- nutriment_factor = 5 * REAGENTS_METABOLISM
- color = "#302000" // rgb: 48, 32, 0
-
-datum/reagent/hell_ramen/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
- ..()
- return
-
-datum/reagent/flour
- name = "flour"
- id = "flour"
- description = "This is what you rub all over yourself to pretend to be a ghost."
- reagent_state = SOLID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#FFFFFF" // rgb: 0, 0, 0
-
-datum/reagent/flour/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
-
-datum/reagent/flour/reaction_turf(var/turf/T, var/volume)
- src = null
- if(!istype(T, /turf/space))
- new /obj/effect/decal/cleanable/flour(T)
-
-datum/reagent/cherryjelly
- name = "Cherry Jelly"
- id = "cherryjelly"
- description = "Totally the best. Only to be spread on foods with excellent lateral symmetry."
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#801E28" // rgb: 128, 30, 40
-
-datum/reagent/cherryjelly/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-datum/reagent/orangejuice
- name = "Orange juice"
- id = "orangejuice"
- description = "Both delicious AND rich in Vitamin C, what more do you need?"
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#E78108" // rgb: 231, 129, 8
-
-datum/reagent/orangejuice/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if(!M) M = holder.my_atom
- if(M.getOxyLoss() && prob(30)) M.adjustOxyLoss(-1)
- M.nutrition++
- ..()
- return
-
-datum/reagent/tomatojuice
- name = "Tomato Juice"
- id = "tomatojuice"
- description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?"
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#731008" // rgb: 115, 16, 8
-
-datum/reagent/tomatojuice/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if(!M) M = holder.my_atom
- if(M.getFireLoss() && prob(20)) M.heal_organ_damage(0,1)
- M.nutrition++
- ..()
- return
-
-datum/reagent/limejuice
- name = "Lime Juice"
- id = "limejuice"
- description = "The sweet-sour juice of limes."
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#365E30" // rgb: 54, 94, 48
-
-datum/reagent/limejuice/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if(!M) M = holder.my_atom
- if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1*REM)
- M.nutrition++
- ..()
- return
-
-datum/reagent/carrotjuice
- name = "Carrot juice"
- id = "carrotjuice"
- description = "It is just like a carrot but without crunching."
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#973800" // rgb: 151, 56, 0
-
-datum/reagent/carrotjuice/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition += nutriment_factor
- M.eye_blurry = max(M.eye_blurry-1 , 0)
- M.eye_blind = max(M.eye_blind-1 , 0)
- if(!data) data = 1
- switch(data)
- if(1 to 20)
- //nothing
- if(21 to INFINITY)
- if (prob(data-10))
- M.disabilities &= ~NEARSIGHTED
- data++
- ..()
- return
-
-datum/reagent/berryjuice
- name = "Berry Juice"
- id = "berryjuice"
- description = "A delicious blend of several different kinds of berries."
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#863333" // rgb: 134, 51, 51
-
-datum/reagent/berryjuice/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition += nutriment_factor
- ..()
- return
-
-datum/reagent/poisonberryjuice
- name = "Poison Berry Juice"
- id = "poisonberryjuice"
- description = "A tasty juice blended from various kinds of very deadly and toxic berries."
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#863353" // rgb: 134, 51, 83
-
-datum/reagent/poisonberryjuice/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition += nutriment_factor
- M.adjustToxLoss(1)
- ..()
- return
-
-datum/reagent/watermelonjuice
- name = "Watermelon Juice"
- id = "watermelonjuice"
- description = "Delicious juice made from watermelon."
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#863333" // rgb: 134, 51, 51
-
-datum/reagent/watermelonjuice/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition += nutriment_factor
- ..()
- return
-
-datum/reagent/lemonjuice
- name = "Lemon Juice"
- id = "lemonjuice"
- description = "This juice is VERY sour."
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#863333" // rgb: 175, 175, 0
-
-datum/reagent/lemonjuice/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition += nutriment_factor
- ..()
- return
-
-datum/reagent/banana
- name = "Banana Juice"
- id = "banana"
- description = "The raw essence of a banana. HONK"
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#863333" // rgb: 175, 175, 0
-
-datum/reagent/banana/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if(istype(M, /mob/living/carbon/human) && M.job in list("Clown"))
- if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
- ..()
- return
- if(istype(M, /mob/living/carbon/monkey))
- if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
- ..()
- return
- ..()
-
-datum/reagent/nothing
- name = "Nothing"
- id = "nothing"
- description = "Absolutely nothing."
- nutriment_factor = 1 * REAGENTS_METABOLISM
-
-datum/reagent/nothing/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
- if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
- ..()
- return
- ..()
-
-datum/reagent/potato_juice
- name = "Potato Juice"
- id = "potato"
- description = "Juice of the potato. Bleh."
- reagent_state = LIQUID
- nutriment_factor = 2 * REAGENTS_METABOLISM
- color = "#302000" // rgb: 48, 32, 0
-
-datum/reagent/potato_juice/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
-
-datum/reagent/milk
- name = "Milk"
- id = "milk"
- description = "An opaque white liquid produced by the mammary glands of mammals."
- reagent_state = LIQUID
- color = "#DFDFDF" // rgb: 223, 223, 223
-
-datum/reagent/milk/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
- if(holder.has_reagent("capsaicin"))
- holder.remove_reagent("capsaicin", 2)
- M.nutrition++
- ..()
- return
-
-datum/reagent/soymilk
- name = "Soy Milk"
- id = "soymilk"
- description = "An opaque white liquid made from soybeans."
- reagent_state = LIQUID
- color = "#DFDFC7" // rgb: 223, 223, 199
-
-datum/reagent/soymilk/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
- M.nutrition++
- ..()
- return
-
-datum/reagent/cream
- name = "Cream"
- id = "cream"
- description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#DFD7AF" // rgb: 223, 215, 175
-
-datum/reagent/cream/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
- ..()
- return
-
-datum/reagent/coffee
- name = "Coffee"
- id = "coffee"
- description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant."
- reagent_state = LIQUID
- color = "#482000" // rgb: 72, 32, 0
-
-datum/reagent/coffee/on_mob_life(var/mob/living/M as mob)
- ..()
- M.dizziness = max(0,M.dizziness-5)
- M.drowsyness = max(0,M.drowsyness-3)
- M.sleeping = max(0,M.sleeping - 2)
- if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
- M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT))
- M.Jitter(5)
- if(holder.has_reagent("frostoil"))
- holder.remove_reagent("frostoil", 5)
- ..()
- return
-
-datum/reagent/tea
- name = "Tea"
- id = "tea"
- description = "Tasty black tea, it has antioxidants, it's good for you!"
- reagent_state = LIQUID
- color = "#101000" // rgb: 16, 16, 0
-
-datum/reagent/tea/on_mob_life(var/mob/living/M as mob)
- ..()
- M.dizziness = max(0,M.dizziness-2)
- M.drowsyness = max(0,M.drowsyness-1)
- M.jitteriness = max(0,M.jitteriness-3)
- M.sleeping = max(0,M.sleeping-1)
- if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1)
- if (M.bodytemperature < 310) //310 is the normal bodytemp. 310.055
- M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT))
- ..()
- return
-
-datum/reagent/icecoffee
- name = "Iced Coffee"
- id = "icecoffee"
- description = "Coffee and ice, refreshing and cool."
- reagent_state = LIQUID
- color = "#102838" // rgb: 16, 40, 56
-
-datum/reagent/icecoffee/on_mob_life(var/mob/living/M as mob)
- ..()
- M.dizziness = max(0,M.dizziness-5)
- M.drowsyness = max(0,M.drowsyness-3)
- M.sleeping = max(0,M.sleeping-2)
- if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
- M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- M.Jitter(5)
- ..()
- return
-
-datum/reagent/icetea
- name = "Iced Tea"
- id = "icetea"
- description = "No relation to a certain rap artist/ actor."
- reagent_state = LIQUID
- color = "#104038" // rgb: 16, 64, 56
-
-datum/reagent/icetea/on_mob_life(var/mob/living/M as mob)
- ..()
- M.dizziness = max(0,M.dizziness-2)
- M.drowsyness = max(0,M.drowsyness-1)
- M.sleeping = max(0,M.sleeping-2)
- if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1)
- if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
- M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- return
-
-datum/reagent/space_cola
- name = "Cola"
- id = "cola"
- description = "A refreshing beverage."
- reagent_state = LIQUID
- color = "#100800" // rgb: 16, 8, 0
-
-datum/reagent/space_cola/on_mob_life(var/mob/living/M as mob)
- 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 * TEMPERATURE_DAMAGE_COEFFICIENT))
- M.nutrition += 1
- ..()
- return
-
-datum/reagent/nuka_cola
- name = "Nuka Cola"
- id = "nuka_cola"
- description = "Cola, cola never changes."
- reagent_state = LIQUID
- color = "#100800" // rgb: 16, 8, 0
-
-datum/reagent/nuka_cola/on_mob_life(var/mob/living/M as mob)
- M.Jitter(20)
- M.druggy = max(M.druggy, 30)
- M.dizziness +=5
- M.drowsyness = 0
- M.sleeping = max(0,M.sleeping-2)
- M.status_flags |= GOTTAGOFAST
- if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
- M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- M.nutrition += 1
- ..()
- return
-
-datum/reagent/spacemountainwind
- name = "Space Mountain Wind"
- id = "spacemountainwind"
- description = "Blows right through you like a space wind."
- reagent_state = LIQUID
- color = "#102000" // rgb: 16, 32, 0
-
-datum/reagent/spacemountainwind/on_mob_life(var/mob/living/M as mob)
- M.drowsyness = max(0,M.drowsyness-7)
- M.sleeping = max(0,M.sleeping-1)
- if (M.bodytemperature > 310)
- M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- M.Jitter(5)
- M.nutrition += 1
- ..()
- return
-
-datum/reagent/dr_gibb
- name = "Dr. Gibb"
- id = "dr_gibb"
- description = "A delicious blend of 42 different flavours"
- reagent_state = LIQUID
- color = "#102000" // rgb: 16, 32, 0
-
-datum/reagent/dr_gibb/on_mob_life(var/mob/living/M as mob)
- M.drowsyness = max(0,M.drowsyness-6)
- if (M.bodytemperature > 310)
- M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- M.nutrition += 1
- ..()
- return
-
-datum/reagent/space_up
- name = "Space-Up"
- id = "space_up"
- description = "Tastes like a hull breach in your mouth."
- reagent_state = LIQUID
- color = "#00FF00" // rgb: 0, 255, 0
-
-datum/reagent/space_up/on_mob_life(var/mob/living/M as mob)
- if (M.bodytemperature > 310)
- M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- M.nutrition += 1
- ..()
- return
-
-datum/reagent/lemon_lime
- name = "Lemon Lime"
- description = "A tangy substance made of 0.5% natural citrus!"
- id = "lemon_lime"
- reagent_state = LIQUID
- color = "#8CFF00" // rgb: 135, 255, 0
-
-datum/reagent/lemon_lime/on_mob_life(var/mob/living/M as mob)
- if (M.bodytemperature > 310)
- M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- M.nutrition += 1
- ..()
- return
-
-datum/reagent/sodawater
- name = "Soda Water"
- id = "sodawater"
- description = "A can of club soda. Why not make a scotch and soda?"
- reagent_state = LIQUID
- color = "#619494" // rgb: 97, 148, 148
-
-datum/reagent/sodawater/on_mob_life(var/mob/living/M as mob)
- M.dizziness = max(0,M.dizziness-5)
- M.drowsyness = max(0,M.drowsyness-3)
- if (M.bodytemperature > 310)
- M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- ..()
- return
-
-datum/reagent/tonic
- name = "Tonic Water"
- id = "tonic"
- description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
- reagent_state = LIQUID
- color = "#0064C8" // rgb: 0, 100, 200
-
-datum/reagent/tonic/on_mob_life(var/mob/living/M as mob)
- M.dizziness = max(0,M.dizziness-5)
- M.drowsyness = max(0,M.drowsyness-3)
- M.sleeping = max(0,M.sleeping-2)
- if (M.bodytemperature > 310)
- M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- ..()
- return
-
-datum/reagent/ice
- name = "Ice"
- id = "ice"
- description = "Frozen water, your dentist wouldn't like you chewing this."
- reagent_state = SOLID
- color = "#619494" // rgb: 97, 148, 148
-
-datum/reagent/ice/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT
- ..()
- return
-
-datum/reagent/soy_latte
- name = "Soy Latte"
- id = "soy_latte"
- description = "A nice and tasty beverage while you are reading your hippie books."
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
-
-datum/reagent/soy_latte/on_mob_life(var/mob/living/M as mob)
- ..()
- M.dizziness = max(0,M.dizziness-5)
- M.drowsyness = max(0,M.drowsyness-3)
- M.sleeping = 0
- if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
- M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- M.Jitter(5)
- if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
- M.nutrition++
- ..()
- return
-
-datum/reagent/cafe_latte
- name = "Cafe Latte"
- id = "cafe_latte"
- description = "A nice, strong and tasty beverage while you are reading."
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
-
-datum/reagent/cafe_latte/on_mob_life(var/mob/living/M as mob)
- ..()
- M.dizziness = max(0,M.dizziness-5)
- M.drowsyness = max(0,M.drowsyness-3)
- M.sleeping = 0
- if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
- M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- M.Jitter(5)
- if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
- M.nutrition++
- ..()
- return
-
-datum/reagent/doctor_delight
- name = "The Doctor's Delight"
- id = "doctorsdelight"
- description = "A gulp a day keeps the MediBot away. That's probably for the best."
- reagent_state = LIQUID
- color = "#FF8CFF" // rgb: 255, 140, 255
-
-datum/reagent/doctor_delight/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.getOxyLoss() && prob(80)) M.adjustOxyLoss(-2)
- if(M.getBruteLoss() && prob(80)) M.heal_organ_damage(2,0)
- if(M.getFireLoss() && prob(80)) M.heal_organ_damage(0,2)
- if(M.getToxLoss() && prob(80)) M.adjustToxLoss(-2)
- if(M.dizziness !=0) M.dizziness = max(0,M.dizziness-15)
- if(M.confused !=0) M.confused = max(0,M.confused - 5)
- ..()
- return
-
-//////////////////////////////////Hydroponics stuff///////////////////////////////
-
-datum/reagent/plantnutriment
- name = "Generic nutriment"
- id = "plantnutriment"
- description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it."
- reagent_state = LIQUID
- color = "#000000" // RBG: 0, 0, 0
- var/tox_prob = 0
-
-datum/reagent/plantnutriment/on_mob_life(var/mob/living/M as mob)
- if(prob(tox_prob)) M.adjustToxLoss(1*REM)
- ..()
- return
-
-datum/reagent/plantnutriment/eznutriment
- name = "E-Z-Nutrient"
- id = "eznutriment"
- description = "Cheap and extremely common type of plant nutriment."
- reagent_state = LIQUID
- color = "#376400" // RBG: 50, 100, 0
- tox_prob = 10
-
-datum/reagent/plantnutriment/left4zednutriment
- name = "Left 4 Zed"
- id = "left4zednutriment"
- description = "Unstable nutriment that makes plants mutate more often than usual."
- reagent_state = LIQUID
- color = "#1A1E4D" // RBG: 26, 30, 77
- tox_prob = 25
-
-datum/reagent/plantnutriment/robustharvestnutriment
- name = "Robust Harvest"
- id = "robustharvestnutriment"
- description = "Very potent nutriment that prevents plants from mutating."
- reagent_state = LIQUID
- color = "#9D9D00" // RBG: 157, 157, 0
- tox_prob = 15
-
-//////////////////////////////////////////////The ten friggen million reagents that get you drunk//////////////////////////////////////////////
-
-datum/reagent/atomicbomb
- name = "Atomic Bomb"
- id = "atomicbomb"
- description = "Nuclear proliferation never tasted so good."
- reagent_state = LIQUID
- color = "#666300" // rgb: 102, 99, 0
-
-datum/reagent/atomicbomb/on_mob_life(var/mob/living/M as mob)
- M.druggy = max(M.druggy, 50)
- M.confused = max(M.confused+2,0)
- M.Dizzy(10)
- if (!M.stuttering) M.stuttering = 1
- M.stuttering += 3
- if(!data) data = 1
- data++
- switch(data)
- if(51 to 200)
- M.sleeping += 1
- if(201 to INFINITY)
- M.sleeping += 1
- M.adjustToxLoss(2)
- ..()
- return
-
-datum/reagent/gargle_blaster
- name = "Pan-Galactic Gargle Blaster"
- id = "gargleblaster"
- description = "Whoah, this stuff looks volatile!"
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
-
-datum/reagent/gargle_blaster/on_mob_life(var/mob/living/M as mob)
- if(!data) data = 1
- data++
- M.dizziness +=6
- if(data >= 15 && data <45)
- if (!M.stuttering) M.stuttering = 1
- M.stuttering += 3
- else if(data >= 45 && prob(50) && data <55)
- M.confused = max(M.confused+3,0)
- else if(data >=55)
- M.druggy = max(M.druggy, 55)
- else if(data >=200)
- M.adjustToxLoss(2)
- ..()
- return
-
-datum/reagent/neurotoxin
- name = "Neurotoxin"
- id = "neurotoxin"
- description = "A strong neurotoxin that puts the subject into a death-like state."
- reagent_state = LIQUID
- color = "#2E2E61" // rgb: 46, 46, 97
-
-datum/reagent/neurotoxin/on_mob_life(var/mob/living/carbon/M as mob)
- if(!M) M = holder.my_atom
- M.weakened = max(M.weakened, 3)
- if(!data) data = 1
- data++
- M.dizziness +=6
- if(data >= 15 && data <45)
- if (!M.stuttering) M.stuttering = 1
- M.stuttering += 3
- else if(data >= 45 && prob(50) && data <55)
- M.confused = max(M.confused+3,0)
- else if(data >=55)
- M.druggy = max(M.druggy, 55)
- else if(data >=200)
- M.adjustToxLoss(2)
- ..()
- return
-
-datum/reagent/hippies_delight
- name = "Hippie's Delight"
- id = "hippiesdelight"
- description = "You just don't get it maaaan."
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
-
-datum/reagent/hippies_delight/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.druggy = max(M.druggy, 50)
- if(!data) data = 1
- data++
- switch(data)
- if(1 to 5)
- if (!M.stuttering) M.stuttering = 1
- M.Dizzy(10)
- if(prob(10)) M.emote(pick("twitch","giggle"))
- if(5 to 10)
- if (!M.stuttering) M.stuttering = 1
- M.Jitter(20)
- M.Dizzy(20)
- M.druggy = max(M.druggy, 45)
- if(prob(20)) M.emote(pick("twitch","giggle"))
- if (10 to 200)
- if (!M.stuttering) M.stuttering = 1
- M.Jitter(40)
- M.Dizzy(40)
- M.druggy = max(M.druggy, 60)
- if(prob(30)) M.emote(pick("twitch","giggle"))
- if(200 to INFINITY)
- if (!M.stuttering) M.stuttering = 1
- M.Jitter(60)
- M.Dizzy(60)
- M.druggy = max(M.druggy, 75)
- if(prob(40)) M.emote(pick("twitch","giggle"))
- if(prob(30)) M.adjustToxLoss(2)
- holder.remove_reagent(src.id, 0.2)
- ..()
- return
-
-/*boozepwr chart
-55 = non-toxic alchohol
-45 = medium-toxic
-35 = the hard stuff
-25 = potent mixes
-<15 = deadly toxic
-*/
-
-datum/reagent/ethanol
- name = "Ethanol"
- id = "ethanol"
- description = "A well-known alcohol with a variety of applications."
- reagent_state = LIQUID
- color = "#404030" // rgb: 64, 64, 48
- var/boozepwr = 10 //lower numbers mean the booze will have an effect faster.
-
-datum/reagent/ethanol/on_mob_life(var/mob/living/M as mob)
- if(!data) data = 1
- data++
- M.jitteriness = max(M.jitteriness-5,0)
- if(data >= boozepwr)
- if (!M.stuttering) M.stuttering = 1
- M.stuttering += 4
- M.Dizzy(5)
- if(data >= boozepwr*2.5 && prob(33))
- if (!M.confused) M.confused = 1
- M.confused += 3
- if(data >= boozepwr*10 && prob(33))
- M.adjustToxLoss(2)
- ..()
- return
-datum/reagent/ethanol/reaction_obj(var/obj/O, var/volume)
- if(istype(O,/obj/item/weapon/paper))
- var/obj/item/weapon/paper/paperaffected = O
- paperaffected.clearpaper()
- usr << "The solution melts away the ink on the paper."
- if(istype(O,/obj/item/weapon/book))
- if(volume >= 5)
- var/obj/item/weapon/book/affectedbook = O
- affectedbook.dat = null
- usr << "The solution melts away the ink on the book."
- else
- usr << "It wasn't enough..."
- return
-
-datum/reagent/ethanol/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with ethanol isn't quite as good as fuel.
- if(!istype(M, /mob/living))
- return
- if(method == TOUCH)
- M.adjust_fire_stacks(volume / 15)
- return
-
-datum/reagent/ethanol/beer
- name = "Beer"
- id = "beer"
- description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 55
-
-datum/reagent/ethanol/beer/on_mob_life(var/mob/living/M as mob)
- M.nutrition += 1
- ..()
- return
-
-datum/reagent/ethanol/beer/greenbeer
- name = "Green Beer"
- id = "greenbeer"
- description = "An alcoholic beverage made from malted grains, hops, yeast, and water. Dyed a festive green."
- color = "#A8E61D"
-
-datum/reagent/ethanol/kahlua
- name = "Kahlua"
- id = "kahlua"
- description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 45
-
-datum/reagent/ethanol/kahlua/on_mob_life(var/mob/living/M as mob)
- M.dizziness = max(0,M.dizziness-5)
- M.drowsyness = max(0,M.drowsyness-3)
- M.sleeping = max(0,M.sleeping-2)
- M.Jitter(5)
- ..()
- return
-
-datum/reagent/ethanol/whiskey
- name = "Whiskey"
- id = "whiskey"
- description = "A superb and well-aged single-malt whiskey. Damn."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/thirteenloko
- name = "Thirteen Loko"
- id = "thirteenloko"
- description = "A potent mixture of caffeine and alcohol."
- color = "#102000" // rgb: 16, 32, 0
- boozepwr = 35
-
-datum/reagent/ethanol/thirteenloko/on_mob_life(var/mob/living/M as mob)
- M.drowsyness = max(0,M.drowsyness-7)
- M.sleeping = max(0,M.sleeping-2)
- if (M.bodytemperature > 310)
- M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- M.Jitter(5)
- M.nutrition += 1
- ..()
- return
-
-datum/reagent/ethanol/vodka
- name = "Vodka"
- id = "vodka"
- description = "Number one drink AND fueling choice for Russians worldwide."
- color = "#0064C8" // rgb: 0, 100, 200
- boozepwr = 35
-
-datum/reagent/ethanol/vodka/on_mob_life(var/mob/living/M as mob)
- M.radiation = max(M.radiation-2,0)
- ..()
- return
-
-datum/reagent/ethanol/bilk
- name = "Bilk"
- id = "bilk"
- description = "This appears to be beer mixed with milk. Disgusting."
- color = "#895C4C" // rgb: 137, 92, 76
- boozepwr = 55
-
-datum/reagent/ethanol/bilk/on_mob_life(var/mob/living/M as mob)
- if(M.getBruteLoss() && prob(10)) M.heal_organ_damage(1,0)
- M.nutrition += 2
- ..()
- return
-
-datum/reagent/ethanol/threemileisland
- name = "Three Mile Island Iced Tea"
- id = "threemileisland"
- description = "Made for a woman, strong enough for a man."
- color = "#666340" // rgb: 102, 99, 64
- boozepwr = 15
-
-datum/reagent/ethanol/threemileisland/on_mob_life(var/mob/living/M as mob)
- M.druggy = max(M.druggy, 50)
- ..()
- return
-
-datum/reagent/ethanol/gin
- name = "Gin"
- id = "gin"
- description = "It's gin. In space. I say, good sir."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 55
-
-datum/reagent/ethanol/rum
- name = "Rum"
- id = "rum"
- description = "Yohoho and all that."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 45
-
-datum/reagent/ethanol/tequilla
- name = "Tequila"
- id = "tequilla"
- description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?"
- color = "#FFFF91" // rgb: 255, 255, 145
- boozepwr = 35
-
-datum/reagent/ethanol/vermouth
- name = "Vermouth"
- id = "vermouth"
- description = "You suddenly feel a craving for a martini..."
- color = "#91FF91" // rgb: 145, 255, 145
- boozepwr = 45
-
-datum/reagent/ethanol/wine
- name = "Wine"
- id = "wine"
- description = "An premium alchoholic beverage made from distilled grape juice."
- color = "#7E4043" // rgb: 126, 64, 67
- boozepwr = 45
-
-datum/reagent/ethanol/cognac
- name = "Cognac"
- id = "cognac"
- description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication."
- color = "#AB3C05" // rgb: 171, 60, 5
- boozepwr = 45
-
-datum/reagent/ethanol/hooch
- name = "Hooch"
- id = "hooch"
- description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?"
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/ale
- name = "Ale"
- id = "ale"
- description = "A dark alchoholic beverage made by malted barley and yeast."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 55
-
-datum/reagent/ethanol/goldschlager
- name = "Goldschlager"
- id = "goldschlager"
- description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
- color = "#FFFF91" // rgb: 255, 255, 145
- boozepwr = 25
-
-datum/reagent/ethanol/patron
- name = "Patron"
- id = "patron"
- description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
- color = "#585840" // rgb: 88, 88, 64
- boozepwr = 45
-
-datum/reagent/ethanol/gintonic
- name = "Gin and Tonic"
- id = "gintonic"
- description = "An all time classic, mild cocktail."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 55
-
-datum/reagent/ethanol/cuba_libre
- name = "Cuba Libre"
- id = "cubalibre"
- description = "Rum, mixed with cola. Viva la revolution."
- color = "#3E1B00" // rgb: 62, 27, 0
- boozepwr = 45
-
-datum/reagent/ethanol/whiskey_cola
- name = "Whiskey Cola"
- id = "whiskeycola"
- description = "Whiskey, mixed with cola. Surprisingly refreshing."
- color = "#3E1B00" // rgb: 62, 27, 0
- boozepwr = 35
-
-datum/reagent/ethanol/martini
- name = "Classic Martini"
- id = "martini"
- description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/vodkamartini
- name = "Vodka Martini"
- id = "vodkamartini"
- description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 25
-
-datum/reagent/ethanol/white_russian
- name = "White Russian"
- id = "whiterussian"
- description = "That's just, like, your opinion, man..."
- color = "#A68340" // rgb: 166, 131, 64
- boozepwr = 35
-
-datum/reagent/ethanol/screwdrivercocktail
- name = "Screwdriver"
- id = "screwdrivercocktail"
- description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
- color = "#A68310" // rgb: 166, 131, 16
- boozepwr = 35
-
-datum/reagent/ethanol/booger
- name = "Booger"
- id = "booger"
- description = "Ewww..."
- color = "#8CFF8C" // rgb: 140, 255, 140
- boozepwr = 45
-
-datum/reagent/ethanol/bloody_mary
- name = "Bloody Mary"
- id = "bloodymary"
- description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/brave_bull
- name = "Brave Bull"
- id = "bravebull"
- description = "It's just as effective as Dutch-Courage!."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/tequilla_sunrise
- name = "Tequila Sunrise"
- id = "tequillasunrise"
- description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
- color = "#FFE48C" // rgb: 255, 228, 140
- boozepwr = 35
-
-datum/reagent/ethanol/toxins_special
- name = "Toxins Special"
- id = "toxinsspecial"
- description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!"
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 15
-
-datum/reagent/ethanol/toxins_special/on_mob_life(var/mob/living/M as mob)
- if (M.bodytemperature < 330)
- M.bodytemperature = min(330, M.bodytemperature + (15 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- ..()
- return
-
-datum/reagent/ethanol/beepsky_smash
- name = "Beepsky Smash"
- id = "beepskysmash"
- description = "Deny drinking this and prepare for THE LAW."
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 25
-
-datum/reagent/ethanol/beepsky_smash/on_mob_life(var/mob/living/M as mob)
- M.Stun(2)
- ..()
- return
-
-datum/reagent/ethanol/irish_cream
- name = "Irish Cream"
- id = "irishcream"
- description = "Whiskey-imbued cream, what else would you expect from the Irish."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/manly_dorf
- name = "The Manly Dorf"
- id = "manlydorf"
- description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 45 //was 10, but really its only beer and ale, both weak alchoholic beverages
-
-datum/reagent/ethanol/longislandicedtea
- name = "Long Island Iced Tea"
- id = "longislandicedtea"
- description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 25
-
-datum/reagent/ethanol/moonshine
- name = "Moonshine"
- id = "moonshine"
- description = "You've really hit rock bottom now... your liver packed its bags and left last night."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 25
-
-datum/reagent/ethanol/b52
- name = "B-52"
- id = "b52"
- description = "Coffee, Irish Cream, and cognac. You will get bombed."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 25
-
-datum/reagent/ethanol/irishcoffee
- name = "Irish Coffee"
- id = "irishcoffee"
- description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/margarita
- name = "Margarita"
- id = "margarita"
- description = "On the rocks with salt on the rim. Arriba~!"
- color = "#8CFF8C" // rgb: 140, 255, 140
- boozepwr = 35
-
-datum/reagent/ethanol/black_russian
- name = "Black Russian"
- id = "blackrussian"
- description = "For the lactose-intolerant. Still as classy as a White Russian."
- color = "#360000" // rgb: 54, 0, 0
- boozepwr = 35
-
-datum/reagent/ethanol/manhattan
- name = "Manhattan"
- id = "manhattan"
- description = "The Detective's undercover drink of choice. He never could stomach gin..."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 45
-
-datum/reagent/ethanol/manhattan_proj
- name = "Manhattan Project"
- id = "manhattan_proj"
- description = "A scientist's drink of choice, for pondering ways to blow up the station."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 15
-
-datum/reagent/ethanol/manhattan_proj/on_mob_life(var/mob/living/M as mob)
- M.druggy = max(M.druggy, 30)
- ..()
- return
-
-datum/reagent/ethanol/whiskeysoda
- name = "Whiskey Soda"
- id = "whiskeysoda"
- description = "For the more refined griffon."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/antifreeze
- name = "Anti-freeze"
- id = "antifreeze"
- description = "Ultimate refreshment."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 25
-
-datum/reagent/ethanol/antifreeze/on_mob_life(var/mob/living/M as mob)
- if (M.bodytemperature < 330)
- M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- ..()
- return
-
-datum/reagent/ethanol/barefoot
- name = "Barefoot"
- id = "barefoot"
- description = "Barefoot and pregnant"
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 45
-
-datum/reagent/ethanol/snowwhite
- name = "Snow White"
- id = "snowwhite"
- description = "A cold refreshment"
- color = "#FFFFFF" // rgb: 255, 255, 255
- boozepwr = 45
-
-datum/reagent/ethanol/demonsblood
- name = "Demons Blood"
- id = "demonsblood"
- description = "AHHHH!!!!"
- color = "#820000" // rgb: 130, 0, 0
- boozepwr = 35
-
-datum/reagent/ethanol/vodkatonic
- name = "Vodka and Tonic"
- id = "vodkatonic"
- description = "For when a gin and tonic isn't russian enough."
- color = "#0064C8" // rgb: 0, 100, 200
- boozepwr = 35
-
-datum/reagent/ethanol/ginfizz
- name = "Gin Fizz"
- id = "ginfizz"
- description = "Refreshingly lemony, deliciously dry."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 45
-
-datum/reagent/ethanol/bahama_mama
- name = "Bahama mama"
- id = "bahama_mama"
- description = "Tropical cocktail."
- color = "#FF7F3B" // rgb: 255, 127, 59
- boozepwr = 35
-
-datum/reagent/ethanol/singulo
- name = "Singulo"
- id = "singulo"
- description = "A blue-space beverage!"
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 15
-
-datum/reagent/ethanol/sbiten
- name = "Sbiten"
- id = "sbiten"
- description = "A spicy Vodka! Might be a little hot for the little guys!"
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/sbiten/on_mob_life(var/mob/living/M as mob)
- if (M.bodytemperature < 360)
- M.bodytemperature = min(360, M.bodytemperature + (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- ..()
- return
-
-datum/reagent/ethanol/devilskiss
- name = "Devils Kiss"
- id = "devilskiss"
- description = "Creepy time!"
- color = "#A68310" // rgb: 166, 131, 16
- boozepwr = 35
-
-datum/reagent/ethanol/red_mead
- name = "Red Mead"
- id = "red_mead"
- description = "The true Viking drink! Even though it has a strange red color."
- color = "#C73C00" // rgb: 199, 60, 0
- boozepwr = 45
-
-datum/reagent/ethanol/mead
- name = "Mead"
- id = "mead"
- description = "A Vikings drink, though a cheap one."
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 45
-
-datum/reagent/ethanol/mead/on_mob_life(var/mob/living/M as mob)
- M.nutrition += 1
- ..()
- return
-
-datum/reagent/ethanol/iced_beer
- name = "Iced Beer"
- id = "iced_beer"
- description = "A beer which is so cold the air around it freezes."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 55
-
-datum/reagent/ethanol/iced_beer/on_mob_life(var/mob/living/M as mob)
- if(M.bodytemperature > 270)
- M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- ..()
- return
-
-datum/reagent/ethanol/grog
- name = "Grog"
- id = "grog"
- description = "Watered down rum, Nanotrasen approves!"
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 90
-
-datum/reagent/ethanol/aloe
- name = "Aloe"
- id = "aloe"
- description = "So very, very, very good."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/andalusia
- name = "Andalusia"
- id = "andalusia"
- description = "A nice, strange named drink."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/alliescocktail
- name = "Allies Cocktail"
- id = "alliescocktail"
- description = "A drink made from your allies, not as sweet as when made from your enemies."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/acid_spit
- name = "Acid Spit"
- id = "acidspit"
- description = "A drink for the daring, can be deadly if incorrectly prepared!"
- reagent_state = LIQUID
- color = "#365000" // rgb: 54, 80, 0
- boozepwr = 45
-
-datum/reagent/ethanol/amasec
- name = "Amasec"
- id = "amasec"
- description = "Official drink of the Nanotrasen Gun-Club!"
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 35
-
-datum/reagent/ethanol/changelingsting
- name = "Changeling Sting"
- id = "changelingsting"
- description = "You take a tiny sip and feel a burning sensation..."
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 15
-
-datum/reagent/ethanol/irishcarbomb
- name = "Irish Car Bomb"
- id = "irishcarbomb"
- description = "Mmm, tastes like chocolate cake..."
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 25
-
-datum/reagent/ethanol/syndicatebomb
- name = "Syndicate Bomb"
- id = "syndicatebomb"
- description = "Tastes like terrorism!"
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 15
-
-datum/reagent/ethanol/erikasurprise
- name = "Erika Surprise"
- id = "erikasurprise"
- description = "The surprise is, it's green!"
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 35
-
-datum/reagent/ethanol/driestmartini
- name = "Driest Martini"
- id = "driestmartini"
- description = "Only for the experienced. You think you see sand floating in the glass."
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 25
-
-datum/reagent/ethanol/bananahonk
- name = "Banana Mama"
- id = "bananahonk"
- description = "A drink from Clown Heaven."
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#FFFF91" // rgb: 255, 255, 140
- boozepwr = 25
-
-datum/reagent/ethanol/bananahonk/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if(istype(M, /mob/living/carbon/human) && M.job in list("Clown") || istype(M, /mob/living/carbon/monkey))
- if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
- ..()
- return
-
-datum/reagent/ethanol/silencer
- name = "Silencer"
- id = "silencer"
- description = "A drink from Mime Heaven."
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 15
-
-datum/reagent/ethanol/silencer/on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
- if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
- ..()
- return
-
-// Undefine the alias for REAGENTS_EFFECT_MULTIPLER
-#undef REM
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
new file mode 100644
index 00000000000..641c0916c0f
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
@@ -0,0 +1,858 @@
+#define SOLID 1
+#define LIQUID 2
+#define GAS 3
+
+#define REM REAGENTS_EFFECT_MULTIPLIER
+
+//The reaction procs must ALWAYS set src = null, this detaches the proc from the object (the reagent)
+//so that it can continue working when the reagent is deleted while the proc is still active.
+
+
+//Various reagents
+//Toxin & acid reagents
+//Hydroponics stuff
+
+datum/reagent
+ var/name = "Reagent"
+ var/id = "reagent"
+ var/description = ""
+ var/datum/reagents/holder = null
+ var/reagent_state = LIQUID
+ var/list/data
+ var/volume = 0
+ //var/list/viruses = list()
+ var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!)
+ var/metabolization_rate = REAGENTS_METABOLISM
+
+datum/reagent/proc/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) //By default we have a chance to transfer some
+ if(!istype(M, /mob/living))
+ return 0
+ var/datum/reagent/self = src
+ src = null //of the reagent to the mob on TOUCHING it.
+
+ if(!istype(self.holder.my_atom, /obj/effect/effect/chem_smoke))
+ // If the chemicals are in a smoke cloud, do not try to let the chemicals "penetrate" into the mob's system (balance station 13) -- Doohl
+
+ if(method == TOUCH)
+
+ var/chance = 1
+ var/block = 0
+
+ for(var/obj/item/clothing/C in M.get_equipped_items())
+ if(C.permeability_coefficient < chance) chance = C.permeability_coefficient
+ 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(75))
+ block = 1
+
+ if(istype(C, /obj/item/clothing/head/bio_hood))
+ if(prob(75))
+ block = 1
+
+ chance = chance * 100
+
+ if(prob(chance) && !block)
+ if(M.reagents)
+ M.reagents.add_reagent(self.id,self.volume/2)
+ return 1
+
+datum/reagent/proc/reaction_obj(var/obj/O, var/volume) //By default we transfer a small part of the reagent to the object
+ src = null //if it can hold reagents. nope!
+ //if(O.reagents)
+ // O.reagents.add_reagent(id,volume/3)
+ return
+
+datum/reagent/proc/reaction_turf(var/turf/T, var/volume)
+ src = null
+ return
+
+datum/reagent/proc/on_mob_life(var/mob/living/M as mob)
+ if(!istype(M, /mob/living))
+ return //Noticed runtime errors from pacid trying to damage ghosts, this should fix. --NEO
+ holder.remove_reagent(src.id, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
+ return
+
+datum/reagent/proc/on_move(var/mob/M)
+ return
+
+// Called after add_reagents creates a new reagent.
+datum/reagent/proc/on_new(var/data)
+ return
+
+// Called when two reagents of the same are mixing.
+datum/reagent/proc/on_merge(var/data)
+ return
+
+datum/reagent/proc/on_update(var/atom/A)
+ return
+
+datum/reagent/blood
+ data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null)
+ name = "Blood"
+ id = "blood"
+ color = "#C80000" // rgb: 200, 0, 0
+
+datum/reagent/blood/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ var/datum/reagent/blood/self = src
+ src = null
+ if(self.data && self.data["viruses"])
+ for(var/datum/disease/D in self.data["viruses"])
+
+ if(D.spread_flags & SPECIAL || D.spread_flags & NON_CONTAGIOUS)
+ continue
+
+ if(method == TOUCH)
+ M.ContractDisease(D)
+ else //injected
+ M.ForceContractDisease(D)
+
+datum/reagent/blood/on_new(var/list/data)
+ if(istype(data))
+ SetViruses(src, data)
+
+datum/reagent/blood/on_merge(var/list/data)
+ if(src.data && data)
+ src.data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc
+ if(src.data["viruses"] || data["viruses"])
+
+ var/list/mix1 = src.data["viruses"]
+ var/list/mix2 = data["viruses"]
+
+ // Stop issues with the list changing during mixing.
+ var/list/to_mix = list()
+
+ for(var/datum/disease/advance/AD in mix1)
+ to_mix += AD
+ for(var/datum/disease/advance/AD in mix2)
+ to_mix += AD
+
+ var/datum/disease/advance/AD = Advance_Mix(to_mix)
+ if(AD)
+ var/list/preserve = list(AD)
+ for(var/D in src.data["viruses"])
+ if(!istype(D, /datum/disease/advance))
+ preserve += D
+ src.data["viruses"] = preserve
+ return 1
+
+
+datum/reagent/blood/reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place
+ if(!istype(T)) return
+ var/datum/reagent/blood/self = src
+ src = null
+ if(!(volume >= 3)) return
+ //var/datum/disease/D = self.data["virus"]
+ if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human))
+ var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
+ if(!blood_prop) //first blood!
+ blood_prop = new(T)
+ blood_prop.blood_DNA[self.data["blood_DNA"]] = self.data["blood_type"]
+
+ for(var/datum/disease/D in self.data["viruses"])
+ var/datum/disease/newVirus = D.Copy(1)
+ blood_prop.viruses += newVirus
+ newVirus.holder = blood_prop
+
+
+ else if(istype(self.data["donor"], /mob/living/carbon/monkey))
+ var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T
+ if(!blood_prop)
+ blood_prop = new(T)
+ blood_prop.blood_DNA["Non-Human DNA"] = "A+"
+ for(var/datum/disease/D in self.data["viruses"])
+ var/datum/disease/newVirus = D.Copy(1)
+ blood_prop.viruses += newVirus
+ newVirus.holder = blood_prop
+
+ else if(istype(self.data["donor"], /mob/living/carbon/alien))
+ var/obj/effect/decal/cleanable/xenoblood/blood_prop = locate() in T
+ if(!blood_prop)
+ blood_prop = new(T)
+ blood_prop.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*"
+ for(var/datum/disease/D in self.data["viruses"])
+ var/datum/disease/newVirus = D.Copy(1)
+ blood_prop.viruses += newVirus
+ newVirus.holder = blood_prop
+ return
+
+/* Must check the transfering of reagents and their data first. They all can point to one disease datum.
+
+ Del()
+ if(src.data["virus"])
+ var/datum/disease/D = src.data["virus"]
+ D.cure(0)
+ ..()
+*/
+datum/reagent/vaccine
+ //data must contain virus type
+ name = "Vaccine"
+ id = "vaccine"
+ color = "#C81040" // rgb: 200, 16, 64
+
+datum/reagent/vaccine/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ var/datum/reagent/vaccine/self = src
+ src = null
+ if(islist(self.data) && method == INGEST)
+ for(var/datum/disease/D in M.viruses)
+ if(D.GetDiseaseID() in self.data)
+ D.cure()
+ M.resistances |= self.data
+ return
+
+datum/reagent/vaccine/on_merge(var/list/data)
+ if(istype(data))
+ src.data |= data.Copy()
+
+
+datum/reagent/water
+ name = "Water"
+ id = "water"
+ description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
+ color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha)
+ var/cooling_temperature = 2
+
+datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume)
+ if (!istype(T)) return
+ var/CT = cooling_temperature
+ src = null
+ if(volume >= 10)
+ T.MakeSlippery()
+
+ for(var/mob/living/carbon/slime/M in T)
+ M.apply_water()
+
+ var/hotspot = (locate(/obj/effect/hotspot) in T)
+ if(hotspot && !istype(T, /turf/space))
+ if(T.air)
+ var/datum/gas_mixture/G = T.air
+ G.temperature = max(min(G.temperature-(CT*1000),G.temperature/CT),0)
+ G.react()
+ qdel(hotspot)
+ return
+
+datum/reagent/water/reaction_obj(var/obj/O, var/volume)
+ src = null
+ if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube))
+ var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
+ if(!cube.wrapped)
+ cube.Expand()
+ return
+
+datum/reagent/water/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with water can help put them out!
+ if(!istype(M, /mob/living))
+ return
+ if(method == TOUCH)
+ M.adjust_fire_stacks(-(volume / 10))
+ if(M.fire_stacks <= 0)
+ M.ExtinguishMob()
+ return
+
+datum/reagent/water/holywater
+ name = "Holy Water"
+ id = "holywater"
+ description = "Water blessed by some deity."
+ color = "#E0E8EF" // rgb: 224, 232, 239
+
+datum/reagent/water/holywater/on_mob_life(var/mob/living/M as mob)
+ if(!data) data = 1
+ data++
+ M.jitteriness = max(M.jitteriness-5,0)
+ if(data >= 30) // 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec
+ if (!M.stuttering) M.stuttering = 1
+ M.stuttering += 4
+ M.Dizzy(5)
+ if(iscultist(M) && prob(5))
+ M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","Egkau'haom'nai en Chaous","Ho Diak'nos tou Ap'iron","R'ge Na'sie","Diabo us Vo'iscum","Si gn'um Co'nu"))
+ if(data >= 75 && prob(33)) // 30 units, 135 seconds
+ if (!M.confused) M.confused = 1
+ M.confused += 3
+ if(iscultist(M))
+ ticker.mode.remove_cultist(M.mind)
+ holder.remove_reagent(src.id, src.volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
+ M.jitteriness = 0
+ M.stuttering = 0
+ M.confused = 0
+ holder.remove_reagent(src.id, 0.4) //fixed consumption to prevent balancing going out of whack
+ return
+
+datum/reagent/water/holywater/reaction_turf(var/turf/simulated/T, var/volume)
+ ..()
+ if(!istype(T)) return
+ if(volume>=10)
+ for(var/obj/effect/rune/R in T)
+ qdel(R)
+ T.Bless()
+
+datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
+ name = "Unholy Water"
+ id = "unholywater"
+ description = "Something that shouldn't exist on this plane of existance."
+
+datum/reagent/fuel/unholywater/on_mob_life(var/mob/living/M as mob)
+ M.adjustBrainLoss(3)
+ if(iscultist(M))
+ M.status_flags |= GOTTAGOFAST
+ M.drowsyness = max(M.drowsyness-5, 0)
+ M.AdjustParalysis(-2)
+ M.AdjustStunned(-2)
+ M.AdjustWeakened(-2)
+ else
+ M.adjustToxLoss(2)
+ M.adjustFireLoss(2)
+ M.adjustOxyLoss(2)
+ M.adjustBruteLoss(2)
+ holder.remove_reagent(src.id, 1)
+
+datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god
+ name = "Hell Water"
+ id = "hell_water"
+ description = "YOUR FLESH! IT BURNS!"
+
+datum/reagent/hellwater/on_mob_life(var/mob/living/M as mob)
+ M.fire_stacks = min(5,M.fire_stacks + 3)
+ M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire
+ M.adjustToxLoss(1)
+ M.adjustFireLoss(1) //Hence the other damages... ain't I a bastard?
+ M.adjustBrainLoss(5)
+ holder.remove_reagent(src.id, 1)
+
+datum/reagent/lube
+ name = "Space Lube"
+ id = "lube"
+ description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity."
+ color = "#009CA8" // rgb: 0, 156, 168
+
+datum/reagent/lube/reaction_turf(var/turf/simulated/T, var/volume)
+ if (!istype(T)) return
+ src = null
+ if(volume >= 1)
+ T.MakeSlippery(2)
+
+datum/reagent/slimetoxin
+ name = "Mutation Toxin"
+ id = "mutationtoxin"
+ description = "A corruptive toxin produced by slimes."
+ color = "#13BC5E" // rgb: 19, 188, 94
+
+datum/reagent/aslimetoxin
+ name = "Advanced Mutation Toxin"
+ id = "amutationtoxin"
+ description = "An advanced corruptive toxin produced by slimes."
+ color = "#13BC5E" // rgb: 19, 188, 94
+
+datum/reagent/aslimetoxin/reaction_mob(var/mob/M, var/volume)
+ src = null
+ M.ForceContractDisease(new /datum/disease/transformation/slime(0))
+
+datum/reagent/space_drugs
+ name = "Space drugs"
+ id = "space_drugs"
+ description = "An illegal chemical compound used as drug."
+ color = "#60A584" // rgb: 96, 165, 132
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/space_drugs/on_mob_life(var/mob/living/M as mob)
+ M.druggy = max(M.druggy, 15)
+ if(isturf(M.loc) && !istype(M.loc, /turf/space))
+ if(M.canmove)
+ if(prob(10)) step(M, pick(cardinal))
+ if(prob(7)) M.emote(pick("twitch","drool","moan","giggle"))
+ ..()
+ return
+
+datum/reagent/serotrotium
+ name = "Serotrotium"
+ id = "serotrotium"
+ description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
+ color = "#202040" // rgb: 20, 20, 40
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+
+datum/reagent/serotrotium/on_mob_life(var/mob/living/M as mob)
+ if(ishuman(M))
+ if(prob(7)) M.emote(pick("twitch","drool","moan","gasp"))
+ ..()
+ return
+
+datum/reagent/oxygen
+ name = "Oxygen"
+ id = "oxygen"
+ description = "A colorless, odorless gas."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/copper
+ name = "Copper"
+ id = "copper"
+ description = "A highly ductile metal."
+ reagent_state = SOLID
+ color = "#6E3B08" // rgb: 110, 59, 8
+
+datum/reagent/nitrogen
+ name = "Nitrogen"
+ id = "nitrogen"
+ description = "A colorless, odorless, tasteless gas."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/hydrogen
+ name = "Hydrogen"
+ id = "hydrogen"
+ description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/potassium
+ name = "Potassium"
+ id = "potassium"
+ description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
+ reagent_state = SOLID
+ color = "#A0A0A0" // rgb: 160, 160, 160
+
+datum/reagent/mercury
+ name = "Mercury"
+ id = "mercury"
+ description = "A chemical element."
+ color = "#484848" // rgb: 72, 72, 72
+
+datum/reagent/mercury/on_mob_life(var/mob/living/M as mob)
+ if(M.canmove && istype(M.loc, /turf/space))
+ step(M, pick(cardinal))
+ if(prob(5))
+ M.emote(pick("twitch","drool","moan"))
+ M.adjustBrainLoss(2)
+ ..()
+ return
+
+datum/reagent/sulfur
+ name = "Sulfur"
+ id = "sulfur"
+ description = "A chemical element."
+ reagent_state = SOLID
+ color = "#BF8C00" // rgb: 191, 140, 0
+
+datum/reagent/carbon
+ name = "Carbon"
+ id = "carbon"
+ description = "A chemical element."
+ reagent_state = SOLID
+ color = "#1C1300" // rgb: 30, 20, 0
+
+datum/reagent/carbon/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(!istype(T, /turf/space))
+ new /obj/effect/decal/cleanable/dirt(T)
+
+datum/reagent/chlorine
+ name = "Chlorine"
+ id = "chlorine"
+ description = "A chemical element."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/chlorine/on_mob_life(var/mob/living/M as mob)
+ M.take_organ_damage(1*REM, 0)
+ ..()
+ return
+
+datum/reagent/fluorine
+ name = "Fluorine"
+ id = "fluorine"
+ description = "A highly-reactive chemical element."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/fluorine/on_mob_life(var/mob/living/M as mob)
+ M.adjustToxLoss(1*REM)
+ ..()
+ return
+
+datum/reagent/sodium
+ name = "Sodium"
+ id = "sodium"
+ description = "A chemical element."
+ reagent_state = SOLID
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/phosphorus
+ name = "Phosphorus"
+ id = "phosphorus"
+ description = "A chemical element."
+ reagent_state = SOLID
+ color = "#832828" // rgb: 131, 40, 40
+
+datum/reagent/lithium
+ name = "Lithium"
+ id = "lithium"
+ description = "A chemical element."
+ reagent_state = SOLID
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/lithium/on_mob_life(var/mob/living/M as mob)
+ if(M.canmove && istype(M.loc, /turf/space))
+ step(M, pick(cardinal))
+ if(prob(5))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+
+datum/reagent/glycerol
+ name = "Glycerol"
+ id = "glycerol"
+ description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity."
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/nitroglycerin
+ name = "Nitroglycerin"
+ id = "nitroglycerin"
+ description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol."
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/radium
+ name = "Radium"
+ id = "radium"
+ description = "Radium is an alkaline earth metal. It is extremely radioactive."
+ reagent_state = SOLID
+ color = "#C7C7C7" // rgb: 199,199,199
+
+datum/reagent/radium/on_mob_life(var/mob/living/M as mob)
+ M.apply_effect(2*REM/M.metabolism_efficiency,IRRADIATE,0)
+ ..()
+ return
+
+datum/reagent/radium/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(volume >= 3)
+ if(!istype(T, /turf/space))
+ new /obj/effect/decal/cleanable/greenglow(T)
+ return
+
+datum/reagent/thermite
+ name = "Thermite"
+ id = "thermite"
+ description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls."
+ reagent_state = SOLID
+ color = "#673910" // rgb: 103, 57, 16
+
+datum/reagent/thermite/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(volume >= 1 && istype(T, /turf/simulated/wall))
+ var/turf/simulated/wall/Wall = T
+ if(istype(Wall, /turf/simulated/wall/r_wall))
+ Wall.thermite = Wall.thermite+(volume*2.5)
+ else
+ Wall.thermite = Wall.thermite+(volume*10)
+ Wall.overlays = list()
+ Wall.overlays += image('icons/effects/effects.dmi',"thermite")
+ return
+
+datum/reagent/thermite/on_mob_life(var/mob/living/M as mob)
+ M.adjustFireLoss(1)
+ ..()
+ return
+
+datum/reagent/sterilizine
+ name = "Sterilizine"
+ id = "sterilizine"
+ description = "Sterilizes wounds in preparation for surgery."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/iron
+ name = "Iron"
+ id = "iron"
+ description = "Pure iron is a metal."
+ reagent_state = SOLID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/gold
+ name = "Gold"
+ id = "gold"
+ description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
+ reagent_state = SOLID
+ color = "#F7C430" // rgb: 247, 196, 48
+
+datum/reagent/silver
+ name = "Silver"
+ id = "silver"
+ description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
+ reagent_state = SOLID
+ color = "#D0D0D0" // rgb: 208, 208, 208
+
+datum/reagent/uranium
+ name ="Uranium"
+ id = "uranium"
+ description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
+ reagent_state = SOLID
+ color = "#B8B8C0" // rgb: 184, 184, 192
+
+datum/reagent/uranium/on_mob_life(var/mob/living/M as mob)
+ M.apply_effect(1/M.metabolism_efficiency,IRRADIATE,0)
+ ..()
+ return
+
+
+datum/reagent/uranium/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(volume >= 3)
+ if(!istype(T, /turf/space))
+ new /obj/effect/decal/cleanable/greenglow(T)
+
+datum/reagent/aluminium
+ name = "Aluminium"
+ id = "aluminium"
+ description = "A silvery white and ductile member of the boron group of chemical elements."
+ reagent_state = SOLID
+ color = "#A8A8A8" // rgb: 168, 168, 168
+
+datum/reagent/silicon
+ name = "Silicon"
+ id = "silicon"
+ description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
+ reagent_state = SOLID
+ color = "#A8A8A8" // rgb: 168, 168, 168
+
+datum/reagent/fuel
+ name = "Welding fuel"
+ id = "fuel"
+ description = "Required for welders. Flamable."
+ color = "#660000" // rgb: 102, 0, 0
+
+datum/reagent/fuel/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with welding fuel to make them easy to ignite!
+ if(!istype(M, /mob/living))
+ return
+ if(method == TOUCH)
+ M.adjust_fire_stacks(volume / 10)
+ return
+
+datum/reagent/fuel/on_mob_life(var/mob/living/M as mob)
+ M.adjustToxLoss(1)
+ ..()
+ return
+
+datum/reagent/space_cleaner
+ name = "Space cleaner"
+ id = "cleaner"
+ description = "A compound used to clean things. Now with 50% more sodium hypochlorite!"
+ color = "#A5F0EE" // rgb: 165, 240, 238
+
+datum/reagent/space_cleaner/reaction_obj(var/obj/O, var/volume)
+ if(istype(O,/obj/effect/decal/cleanable))
+ qdel(O)
+ else
+ if(O)
+ O.clean_blood()
+
+datum/reagent/space_cleaner/reaction_turf(var/turf/T, var/volume)
+ if(volume >= 1)
+ T.clean_blood()
+ for(var/obj/effect/decal/cleanable/C in T)
+ qdel(C)
+
+ for(var/mob/living/carbon/slime/M in T)
+ M.adjustToxLoss(rand(5,10))
+
+datum/reagent/space_cleaner/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ if(C.r_hand)
+ C.r_hand.clean_blood()
+ if(C.l_hand)
+ C.l_hand.clean_blood()
+ if(C.wear_mask)
+ if(C.wear_mask.clean_blood())
+ C.update_inv_wear_mask(0)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = C
+ if(H.head)
+ if(H.head.clean_blood())
+ H.update_inv_head(0)
+ if(H.wear_suit)
+ if(H.wear_suit.clean_blood())
+ H.update_inv_wear_suit(0)
+ else if(H.w_uniform)
+ if(H.w_uniform.clean_blood())
+ H.update_inv_w_uniform(0)
+ if(H.shoes)
+ if(H.shoes.clean_blood())
+ H.update_inv_shoes(0)
+ M.clean_blood()
+
+datum/reagent/cryptobiolin
+ name = "Cryptobiolin"
+ id = "cryptobiolin"
+ description = "Cryptobiolin causes confusion and dizzyness."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/cryptobiolin/on_mob_life(var/mob/living/M as mob)
+ M.Dizzy(1)
+ if(!M.confused)
+ M.confused = 1
+ M.confused = max(M.confused, 20)
+ return
+
+datum/reagent/impedrezene
+ name = "Impedrezene"
+ id = "impedrezene"
+ description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/impedrezene/on_mob_life(var/mob/living/M as mob)
+ M.jitteriness = max(M.jitteriness-5,0)
+ if(prob(80)) M.adjustBrainLoss(1*REM)
+ if(prob(50)) M.drowsyness = max(M.drowsyness, 3)
+ if(prob(10)) M.emote("drool")
+ ..()
+ return
+
+datum/reagent/nanites
+ name = "Nanomachines"
+ id = "nanites"
+ description = "Microscopic construction robots."
+ color = "#535E66" // rgb: 83, 94, 102
+
+datum/reagent/nanites/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ src = null
+ if( (prob(10) && method==TOUCH) || method==INGEST)
+ M.ForceContractDisease(new /datum/disease/transformation/robot(0))
+
+datum/reagent/xenomicrobes
+ name = "Xenomicrobes"
+ id = "xenomicrobes"
+ description = "Microbes with an entirely alien cellular structure."
+ color = "#535E66" // rgb: 83, 94, 102
+
+datum/reagent/xenomicrobes/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ src = null
+ if( (prob(10) && method==TOUCH) || method==INGEST)
+ M.ContractDisease(new /datum/disease/transformation/xeno(0))
+
+datum/reagent/fluorosurfactant//foam precursor
+ name = "Fluorosurfactant"
+ id = "fluorosurfactant"
+ description = "A perfluoronated sulfonic acid that forms a foam when mixed with water."
+ color = "#9E6B38" // rgb: 158, 107, 56
+
+datum/reagent/foaming_agent// Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually.
+ name = "Foaming agent"
+ id = "foaming_agent"
+ description = "A agent that yields metallic foam when mixed with light metal and a strong acid."
+ reagent_state = SOLID
+ color = "#664B63" // rgb: 102, 75, 99
+
+datum/reagent/ammonia
+ name = "Ammonia"
+ id = "ammonia"
+ description = "A caustic substance commonly used in fertilizer or household cleaners."
+ reagent_state = GAS
+ color = "#404030" // rgb: 64, 64, 48
+
+datum/reagent/diethylamine
+ name = "Diethylamine"
+ id = "diethylamine"
+ description = "A secondary amine, mildly corrosive."
+ color = "#604030" // rgb: 96, 64, 48
+
+
+
+/////////////////////////Coloured Crayon Powder////////////////////////////
+//For colouring in /proc/mix_color_from_reagents
+
+
+datum/reagent/crayonpowder
+ name = "Crayon Powder"
+ id = "crayon powder"
+ var/colorname = "none"
+ description = "A powder made by grinding down crayons, good for colouring chemical reagents."
+ reagent_state = SOLID
+ color = "#FFFFFF" // rgb: 207, 54, 0
+
+datum/reagent/crayonpowder/New()
+ description = "\an [colorname] powder made by grinding down crayons, good for colouring chemical reagents."
+
+
+datum/reagent/crayonpowder/red
+ name = "Red Crayon Powder"
+ id = "redcrayonpowder"
+ colorname = "red"
+
+datum/reagent/crayonpowder/orange
+ name = "Orange Crayon Powder"
+ id = "orangecrayonpowder"
+ colorname = "orange"
+ color = "#FF9300" // orange
+
+datum/reagent/crayonpowder/yellow
+ name = "Yellow Crayon Powder"
+ id = "yellowcrayonpowder"
+ colorname = "yellow"
+ color = "#FFF200" // yellow
+
+datum/reagent/crayonpowder/green
+ name = "Green Crayon Powder"
+ id = "greencrayonpowder"
+ colorname = "green"
+ color = "#A8E61D" // green
+
+datum/reagent/crayonpowder/blue
+ name = "Blue Crayon Powder"
+ id = "bluecrayonpowder"
+ colorname = "blue"
+ color = "#00B7EF" // blue
+
+datum/reagent/crayonpowder/purple
+ name = "Purple Crayon Powder"
+ id = "purplecrayonpowder"
+ colorname = "purple"
+ color = "#DA00FF" // purple
+
+datum/reagent/crayonpowder/invisible
+ name = "Invisible Crayon Powder"
+ id = "invisiblecrayonpowder"
+ colorname = "invisible"
+ color = "#FFFFFF00" // white + no alpha
+
+
+
+
+//////////////////////////////////Hydroponics stuff///////////////////////////////
+
+datum/reagent/plantnutriment
+ name = "Generic nutriment"
+ id = "plantnutriment"
+ description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it."
+ color = "#000000" // RBG: 0, 0, 0
+ var/tox_prob = 0
+
+datum/reagent/plantnutriment/on_mob_life(var/mob/living/M as mob)
+ if(prob(tox_prob))
+ M.adjustToxLoss(1*REM)
+ ..()
+ return
+
+datum/reagent/plantnutriment/eznutriment
+ name = "E-Z-Nutrient"
+ id = "eznutriment"
+ description = "Cheap and extremely common type of plant nutriment."
+ color = "#376400" // RBG: 50, 100, 0
+ tox_prob = 10
+
+datum/reagent/plantnutriment/left4zednutriment
+ name = "Left 4 Zed"
+ id = "left4zednutriment"
+ description = "Unstable nutriment that makes plants mutate more often than usual."
+ color = "#1A1E4D" // RBG: 26, 30, 77
+ tox_prob = 25
+
+datum/reagent/plantnutriment/robustharvestnutriment
+ name = "Robust Harvest"
+ id = "robustharvestnutriment"
+ description = "Very potent nutriment that prevents plants from mutating."
+ color = "#9D9D00" // RBG: 157, 157, 0
+ tox_prob = 15
+
+
+
+// Undefine the alias for REAGENTS_EFFECT_MULTIPLER
+#undef REM
+
diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm
new file mode 100644
index 00000000000..2c059efc478
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm
@@ -0,0 +1,620 @@
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////
+ //ALCOHOLS
+/////////////////////////////////////////////////////////////////////////////////////
+
+/*boozepwr chart
+55 = non-toxic alchohol
+45 = medium-toxic
+35 = the hard stuff
+25 = potent mixes
+<15 = deadly toxic
+*/
+
+datum/reagent/consumable/ethanol
+ name = "Ethanol"
+ id = "ethanol"
+ description = "A well-known alcohol with a variety of applications."
+ color = "#404030" // rgb: 64, 64, 48
+ nutriment_factor = 0
+ var/boozepwr = 10 //lower numbers mean the booze will have an effect faster.
+
+datum/reagent/consumable/ethanol/on_mob_life(var/mob/living/M as mob)
+ if(!data)
+ data = 1
+ data++
+ M.jitteriness = max(M.jitteriness-5,0)
+ if(data >= boozepwr)
+ if (!M.stuttering) M.stuttering = 1
+ M.stuttering += 4
+ M.Dizzy(5)
+ if(data >= boozepwr*2.5 && prob(33))
+ if (!M.confused) M.confused = 1
+ M.confused += 3
+ if(data >= boozepwr*10 && prob(33))
+ M.adjustToxLoss(2)
+ ..()
+ return
+datum/reagent/consumable/ethanol/reaction_obj(var/obj/O, var/volume)
+ if(istype(O,/obj/item/weapon/paper))
+ var/obj/item/weapon/paper/paperaffected = O
+ paperaffected.clearpaper()
+ usr << "The solution melts away the ink on the paper."
+ if(istype(O,/obj/item/weapon/book))
+ if(volume >= 5)
+ var/obj/item/weapon/book/affectedbook = O
+ affectedbook.dat = null
+ usr << "The solution melts away the ink on the book."
+ else
+ usr << "It wasn't enough..."
+ return
+
+datum/reagent/consumable/ethanol/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with ethanol isn't quite as good as fuel.
+ if(!istype(M, /mob/living))
+ return
+ if(method == TOUCH)
+ M.adjust_fire_stacks(volume / 15)
+ return
+
+datum/reagent/consumable/ethanol/beer
+ name = "Beer"
+ id = "beer"
+ description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
+ color = "#664300" // rgb: 102, 67, 0
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ boozepwr = 55
+
+datum/reagent/consumable/ethanol/beer/greenbeer
+ name = "Green Beer"
+ id = "greenbeer"
+ description = "An alcoholic beverage made from malted grains, hops, yeast, and water. Dyed a festive green."
+ color = "#A8E61D"
+
+datum/reagent/consumable/ethanol/kahlua
+ name = "Kahlua"
+ id = "kahlua"
+ description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/kahlua/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = max(0,M.dizziness-5)
+ M.drowsyness = max(0,M.drowsyness-3)
+ M.sleeping = max(0,M.sleeping-2)
+ M.Jitter(5)
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/whiskey
+ name = "Whiskey"
+ id = "whiskey"
+ description = "A superb and well-aged single-malt whiskey. Damn."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/thirteenloko
+ name = "Thirteen Loko"
+ id = "thirteenloko"
+ description = "A potent mixture of caffeine and alcohol."
+ color = "#102000" // rgb: 16, 32, 0
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(var/mob/living/M as mob)
+ M.drowsyness = max(0,M.drowsyness-7)
+ M.sleeping = max(0,M.sleeping-2)
+ if (M.bodytemperature > 310)
+ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ M.Jitter(5)
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/vodka
+ name = "Vodka"
+ id = "vodka"
+ description = "Number one drink AND fueling choice for Russians worldwide."
+ color = "#0064C8" // rgb: 0, 100, 200
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/vodka/on_mob_life(var/mob/living/M as mob)
+ M.radiation = max(M.radiation-2,0)
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/bilk
+ name = "Bilk"
+ id = "bilk"
+ description = "This appears to be beer mixed with milk. Disgusting."
+ color = "#895C4C" // rgb: 137, 92, 76
+ nutriment_factor = 2 * REAGENTS_METABOLISM
+ boozepwr = 55
+
+datum/reagent/consumable/ethanol/bilk/on_mob_life(var/mob/living/M as mob)
+ if(M.getBruteLoss() && prob(10))
+ M.heal_organ_damage(1,0)
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/threemileisland
+ name = "Three Mile Island Iced Tea"
+ id = "threemileisland"
+ description = "Made for a woman, strong enough for a man."
+ color = "#666340" // rgb: 102, 99, 64
+ boozepwr = 15
+
+datum/reagent/consumable/ethanol/threemileisland/on_mob_life(var/mob/living/M as mob)
+ M.druggy = max(M.druggy, 50)
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/gin
+ name = "Gin"
+ id = "gin"
+ description = "It's gin. In space. I say, good sir."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 55
+
+datum/reagent/consumable/ethanol/rum
+ name = "Rum"
+ id = "rum"
+ description = "Yohoho and all that."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/tequilla
+ name = "Tequila"
+ id = "tequilla"
+ description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?"
+ color = "#FFFF91" // rgb: 255, 255, 145
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/vermouth
+ name = "Vermouth"
+ id = "vermouth"
+ description = "You suddenly feel a craving for a martini..."
+ color = "#91FF91" // rgb: 145, 255, 145
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/wine
+ name = "Wine"
+ id = "wine"
+ description = "An premium alchoholic beverage made from distilled grape juice."
+ color = "#7E4043" // rgb: 126, 64, 67
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/cognac
+ name = "Cognac"
+ id = "cognac"
+ description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication."
+ color = "#AB3C05" // rgb: 171, 60, 5
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/hooch
+ name = "Hooch"
+ id = "hooch"
+ description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?"
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/ale
+ name = "Ale"
+ id = "ale"
+ description = "A dark alchoholic beverage made by malted barley and yeast."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 55
+
+datum/reagent/consumable/ethanol/goldschlager
+ name = "Goldschlager"
+ id = "goldschlager"
+ description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
+ color = "#FFFF91" // rgb: 255, 255, 145
+ boozepwr = 25
+
+datum/reagent/consumable/ethanol/patron
+ name = "Patron"
+ id = "patron"
+ description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
+ color = "#585840" // rgb: 88, 88, 64
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/gintonic
+ name = "Gin and Tonic"
+ id = "gintonic"
+ description = "An all time classic, mild cocktail."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 55
+
+datum/reagent/consumable/ethanol/cuba_libre
+ name = "Cuba Libre"
+ id = "cubalibre"
+ description = "Rum, mixed with cola. Viva la revolution."
+ color = "#3E1B00" // rgb: 62, 27, 0
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/whiskey_cola
+ name = "Whiskey Cola"
+ id = "whiskeycola"
+ description = "Whiskey, mixed with cola. Surprisingly refreshing."
+ color = "#3E1B00" // rgb: 62, 27, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/martini
+ name = "Classic Martini"
+ id = "martini"
+ description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/vodkamartini
+ name = "Vodka Martini"
+ id = "vodkamartini"
+ description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 25
+
+datum/reagent/consumable/ethanol/white_russian
+ name = "White Russian"
+ id = "whiterussian"
+ description = "That's just, like, your opinion, man..."
+ color = "#A68340" // rgb: 166, 131, 64
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/screwdrivercocktail
+ name = "Screwdriver"
+ id = "screwdrivercocktail"
+ description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
+ color = "#A68310" // rgb: 166, 131, 16
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/booger
+ name = "Booger"
+ id = "booger"
+ description = "Ewww..."
+ color = "#8CFF8C" // rgb: 140, 255, 140
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/bloody_mary
+ name = "Bloody Mary"
+ id = "bloodymary"
+ description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/brave_bull
+ name = "Brave Bull"
+ id = "bravebull"
+ description = "It's just as effective as Dutch-Courage!."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/tequilla_sunrise
+ name = "Tequila Sunrise"
+ id = "tequillasunrise"
+ description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
+ color = "#FFE48C" // rgb: 255, 228, 140
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/toxins_special
+ name = "Toxins Special"
+ id = "toxinsspecial"
+ description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!"
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 15
+
+datum/reagent/consumable/ethanol/toxins_special/on_mob_life(var/mob/living/M as mob)
+ if (M.bodytemperature < 330)
+ M.bodytemperature = min(330, M.bodytemperature + (15 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/beepsky_smash
+ name = "Beepsky Smash"
+ id = "beepskysmash"
+ description = "Deny drinking this and prepare for THE LAW."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 25
+
+datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(var/mob/living/M as mob)
+ M.Stun(2)
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/irish_cream
+ name = "Irish Cream"
+ id = "irishcream"
+ description = "Whiskey-imbued cream, what else would you expect from the Irish."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/manly_dorf
+ name = "The Manly Dorf"
+ id = "manlydorf"
+ description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 45 //was 10, but really its only beer and ale, both weak alchoholic beverages
+
+datum/reagent/consumable/ethanol/longislandicedtea
+ name = "Long Island Iced Tea"
+ id = "longislandicedtea"
+ description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 25
+
+datum/reagent/consumable/ethanol/moonshine
+ name = "Moonshine"
+ id = "moonshine"
+ description = "You've really hit rock bottom now... your liver packed its bags and left last night."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 25
+
+datum/reagent/consumable/ethanol/b52
+ name = "B-52"
+ id = "b52"
+ description = "Coffee, Irish Cream, and cognac. You will get bombed."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 25
+
+datum/reagent/consumable/ethanol/irishcoffee
+ name = "Irish Coffee"
+ id = "irishcoffee"
+ description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/margarita
+ name = "Margarita"
+ id = "margarita"
+ description = "On the rocks with salt on the rim. Arriba~!"
+ color = "#8CFF8C" // rgb: 140, 255, 140
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/black_russian
+ name = "Black Russian"
+ id = "blackrussian"
+ description = "For the lactose-intolerant. Still as classy as a White Russian."
+ color = "#360000" // rgb: 54, 0, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/manhattan
+ name = "Manhattan"
+ id = "manhattan"
+ description = "The Detective's undercover drink of choice. He never could stomach gin..."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/manhattan_proj
+ name = "Manhattan Project"
+ id = "manhattan_proj"
+ description = "A scientist's drink of choice, for pondering ways to blow up the station."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 15
+
+datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(var/mob/living/M as mob)
+ M.druggy = max(M.druggy, 30)
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/whiskeysoda
+ name = "Whiskey Soda"
+ id = "whiskeysoda"
+ description = "For the more refined griffon."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/antifreeze
+ name = "Anti-freeze"
+ id = "antifreeze"
+ description = "Ultimate refreshment."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 25
+
+datum/reagent/consumable/ethanol/antifreeze/on_mob_life(var/mob/living/M as mob)
+ if (M.bodytemperature < 330)
+ M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/barefoot
+ name = "Barefoot"
+ id = "barefoot"
+ description = "Barefoot and pregnant"
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/snowwhite
+ name = "Snow White"
+ id = "snowwhite"
+ description = "A cold refreshment"
+ color = "#FFFFFF" // rgb: 255, 255, 255
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/demonsblood
+ name = "Demons Blood"
+ id = "demonsblood"
+ description = "AHHHH!!!!"
+ color = "#820000" // rgb: 130, 0, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/vodkatonic
+ name = "Vodka and Tonic"
+ id = "vodkatonic"
+ description = "For when a gin and tonic isn't russian enough."
+ color = "#0064C8" // rgb: 0, 100, 200
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/ginfizz
+ name = "Gin Fizz"
+ id = "ginfizz"
+ description = "Refreshingly lemony, deliciously dry."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/bahama_mama
+ name = "Bahama mama"
+ id = "bahama_mama"
+ description = "Tropical cocktail."
+ color = "#FF7F3B" // rgb: 255, 127, 59
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/singulo
+ name = "Singulo"
+ id = "singulo"
+ description = "A blue-space beverage!"
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 15
+
+datum/reagent/consumable/ethanol/sbiten
+ name = "Sbiten"
+ id = "sbiten"
+ description = "A spicy Vodka! Might be a little hot for the little guys!"
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/sbiten/on_mob_life(var/mob/living/M as mob)
+ if (M.bodytemperature < 360)
+ M.bodytemperature = min(360, M.bodytemperature + (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/devilskiss
+ name = "Devils Kiss"
+ id = "devilskiss"
+ description = "Creepy time!"
+ color = "#A68310" // rgb: 166, 131, 16
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/red_mead
+ name = "Red Mead"
+ id = "red_mead"
+ description = "The true Viking drink! Even though it has a strange red color."
+ color = "#C73C00" // rgb: 199, 60, 0
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/mead
+ name = "Mead"
+ id = "mead"
+ description = "A Vikings drink, though a cheap one."
+ color = "#664300" // rgb: 102, 67, 0
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/iced_beer
+ name = "Iced Beer"
+ id = "iced_beer"
+ description = "A beer which is so cold the air around it freezes."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 55
+
+datum/reagent/consumable/ethanol/iced_beer/on_mob_life(var/mob/living/M as mob)
+ if(M.bodytemperature > 270)
+ M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/grog
+ name = "Grog"
+ id = "grog"
+ description = "Watered down rum, Nanotrasen approves!"
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 90
+
+datum/reagent/consumable/ethanol/aloe
+ name = "Aloe"
+ id = "aloe"
+ description = "So very, very, very good."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/andalusia
+ name = "Andalusia"
+ id = "andalusia"
+ description = "A nice, strange named drink."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/alliescocktail
+ name = "Allies Cocktail"
+ id = "alliescocktail"
+ description = "A drink made from your allies, not as sweet as when made from your enemies."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/acid_spit
+ name = "Acid Spit"
+ id = "acidspit"
+ description = "A drink for the daring, can be deadly if incorrectly prepared!"
+ color = "#365000" // rgb: 54, 80, 0
+ boozepwr = 45
+
+datum/reagent/consumable/ethanol/amasec
+ name = "Amasec"
+ id = "amasec"
+ description = "Official drink of the Nanotrasen Gun-Club!"
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/changelingsting
+ name = "Changeling Sting"
+ id = "changelingsting"
+ description = "You take a tiny sip and feel a burning sensation..."
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 15
+
+datum/reagent/consumable/ethanol/irishcarbomb
+ name = "Irish Car Bomb"
+ id = "irishcarbomb"
+ description = "Mmm, tastes like chocolate cake..."
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 25
+
+datum/reagent/consumable/ethanol/syndicatebomb
+ name = "Syndicate Bomb"
+ id = "syndicatebomb"
+ description = "Tastes like terrorism!"
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 15
+
+datum/reagent/consumable/ethanol/erikasurprise
+ name = "Erika Surprise"
+ id = "erikasurprise"
+ description = "The surprise is, it's green!"
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 35
+
+datum/reagent/consumable/ethanol/driestmartini
+ name = "Driest Martini"
+ id = "driestmartini"
+ description = "Only for the experienced. You think you see sand floating in the glass."
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 25
+
+datum/reagent/consumable/ethanol/bananahonk
+ name = "Banana Mama"
+ id = "bananahonk"
+ description = "A drink from Clown Heaven."
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#FFFF91" // rgb: 255, 255, 140
+ boozepwr = 25
+
+datum/reagent/consumable/ethanol/bananahonk/on_mob_life(var/mob/living/M as mob)
+ if( ( istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || istype(M, /mob/living/carbon/monkey) )
+ M.heal_organ_damage(1,1)
+ ..()
+ return
+
+datum/reagent/consumable/ethanol/silencer
+ name = "Silencer"
+ id = "silencer"
+ description = "A drink from Mime Heaven."
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 15
+
+datum/reagent/consumable/ethanol/silencer/on_mob_life(var/mob/living/M as mob)
+ if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
+ M.heal_organ_damage(1,1)
+ ..()
+ return
diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm
new file mode 100644
index 00000000000..656570dce93
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm
@@ -0,0 +1,537 @@
+
+#define REM REAGENTS_EFFECT_MULTIPLIER
+
+
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+datum/reagent/consumable/orangejuice
+ name = "Orange juice"
+ id = "orangejuice"
+ description = "Both delicious AND rich in Vitamin C, what more do you need?"
+ color = "#E78108" // rgb: 231, 129, 8
+
+datum/reagent/consumable/orangejuice/on_mob_life(var/mob/living/M as mob)
+ if(M.getOxyLoss() && prob(30))
+ M.adjustOxyLoss(-1)
+ ..()
+ return
+
+datum/reagent/consumable/tomatojuice
+ name = "Tomato Juice"
+ id = "tomatojuice"
+ description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?"
+ color = "#731008" // rgb: 115, 16, 8
+
+datum/reagent/consumable/tomatojuice/on_mob_life(var/mob/living/M as mob)
+ if(M.getFireLoss() && prob(20))
+ M.heal_organ_damage(0,1)
+ ..()
+ return
+
+datum/reagent/consumable/limejuice
+ name = "Lime Juice"
+ id = "limejuice"
+ description = "The sweet-sour juice of limes."
+ color = "#365E30" // rgb: 54, 94, 48
+
+datum/reagent/consumable/limejuice/on_mob_life(var/mob/living/M as mob)
+ if(M.getToxLoss() && prob(20))
+ M.adjustToxLoss(-1*REM)
+ ..()
+ return
+
+datum/reagent/consumable/carrotjuice
+ name = "Carrot juice"
+ id = "carrotjuice"
+ description = "It is just like a carrot but without crunching."
+ color = "#973800" // rgb: 151, 56, 0
+
+datum/reagent/consumable/carrotjuice/on_mob_life(var/mob/living/M as mob)
+ M.eye_blurry = max(M.eye_blurry-1 , 0)
+ M.eye_blind = max(M.eye_blind-1 , 0)
+ if(!data)
+ data = 1
+ switch(data)
+ if(1 to 20)
+ //nothing
+ if(21 to INFINITY)
+ if (prob(data-10))
+ M.disabilities &= ~NEARSIGHTED
+ data++
+ ..()
+ return
+
+datum/reagent/consumable/berryjuice
+ name = "Berry Juice"
+ id = "berryjuice"
+ description = "A delicious blend of several different kinds of berries."
+ color = "#863333" // rgb: 134, 51, 51
+
+datum/reagent/consumable/poisonberryjuice
+ name = "Poison Berry Juice"
+ id = "poisonberryjuice"
+ description = "A tasty juice blended from various kinds of very deadly and toxic berries."
+ color = "#863353" // rgb: 134, 51, 83
+
+datum/reagent/consumable/poisonberryjuice/on_mob_life(var/mob/living/M as mob)
+ M.adjustToxLoss(1)
+ ..()
+ return
+
+datum/reagent/consumable/watermelonjuice
+ name = "Watermelon Juice"
+ id = "watermelonjuice"
+ description = "Delicious juice made from watermelon."
+ color = "#863333" // rgb: 134, 51, 51
+
+datum/reagent/consumable/lemonjuice
+ name = "Lemon Juice"
+ id = "lemonjuice"
+ description = "This juice is VERY sour."
+ color = "#863333" // rgb: 175, 175, 0
+
+datum/reagent/consumable/banana
+ name = "Banana Juice"
+ id = "banana"
+ description = "The raw essence of a banana. HONK"
+ color = "#863333" // rgb: 175, 175, 0
+
+datum/reagent/consumable/banana/on_mob_life(var/mob/living/M as mob)
+ if( ( istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || istype(M, /mob/living/carbon/monkey) )
+ M.heal_organ_damage(1,1)
+ ..()
+
+datum/reagent/consumable/nothing
+ name = "Nothing"
+ id = "nothing"
+ description = "Absolutely nothing."
+
+datum/reagent/consumable/nothing/on_mob_life(var/mob/living/M as mob)
+ if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
+ M.heal_organ_damage(1,1)
+ ..()
+
+datum/reagent/consumable/potato_juice
+ name = "Potato Juice"
+ id = "potato"
+ description = "Juice of the potato. Bleh."
+ nutriment_factor = 2 * REAGENTS_METABOLISM
+ color = "#302000" // rgb: 48, 32, 0
+
+datum/reagent/consumable/milk
+ name = "Milk"
+ id = "milk"
+ description = "An opaque white liquid produced by the mammary glands of mammals."
+ color = "#DFDFDF" // rgb: 223, 223, 223
+
+datum/reagent/consumable/milk/on_mob_life(var/mob/living/M as mob)
+ if(M.getBruteLoss() && prob(20))
+ M.heal_organ_damage(1,0)
+ if(holder.has_reagent("capsaicin"))
+ holder.remove_reagent("capsaicin", 2)
+ ..()
+ return
+
+datum/reagent/consumable/soymilk
+ name = "Soy Milk"
+ id = "soymilk"
+ description = "An opaque white liquid made from soybeans."
+ color = "#DFDFC7" // rgb: 223, 223, 199
+
+datum/reagent/consumable/soymilk/on_mob_life(var/mob/living/M as mob)
+ if(M.getBruteLoss() && prob(20))
+ M.heal_organ_damage(1,0)
+ ..()
+ return
+
+datum/reagent/consumable/cream
+ name = "Cream"
+ id = "cream"
+ description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
+ color = "#DFD7AF" // rgb: 223, 215, 175
+
+datum/reagent/consumable/cream/on_mob_life(var/mob/living/M as mob)
+ if(M.getBruteLoss() && prob(20))
+ M.heal_organ_damage(1,0)
+ ..()
+ return
+
+datum/reagent/consumable/coffee
+ name = "Coffee"
+ id = "coffee"
+ description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant."
+ color = "#482000" // rgb: 72, 32, 0
+ nutriment_factor = 0
+
+datum/reagent/consumable/coffee/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = max(0,M.dizziness-5)
+ M.drowsyness = max(0,M.drowsyness-3)
+ M.sleeping = max(0,M.sleeping - 2)
+ if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
+ M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ M.Jitter(5)
+ if(holder.has_reagent("frostoil"))
+ holder.remove_reagent("frostoil", 5)
+ ..()
+ return
+
+datum/reagent/consumable/tea
+ name = "Tea"
+ id = "tea"
+ description = "Tasty black tea, it has antioxidants, it's good for you!"
+ color = "#101000" // rgb: 16, 16, 0
+ nutriment_factor = 0
+
+datum/reagent/consumable/tea/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = max(0,M.dizziness-2)
+ M.drowsyness = max(0,M.drowsyness-1)
+ M.jitteriness = max(0,M.jitteriness-3)
+ M.sleeping = max(0,M.sleeping-1)
+ if(M.getToxLoss() && prob(20))
+ M.adjustToxLoss(-1)
+ if (M.bodytemperature < 310) //310 is the normal bodytemp. 310.055
+ M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ ..()
+ return
+
+datum/reagent/consumable/icecoffee
+ name = "Iced Coffee"
+ id = "icecoffee"
+ description = "Coffee and ice, refreshing and cool."
+ color = "#102838" // rgb: 16, 40, 56
+ nutriment_factor = 0
+
+datum/reagent/consumable/icecoffee/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = max(0,M.dizziness-5)
+ M.drowsyness = max(0,M.drowsyness-3)
+ M.sleeping = max(0,M.sleeping-2)
+ if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
+ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ M.Jitter(5)
+ ..()
+ return
+
+datum/reagent/consumable/icetea
+ name = "Iced Tea"
+ id = "icetea"
+ description = "No relation to a certain rap artist/ actor."
+ color = "#104038" // rgb: 16, 64, 56
+ nutriment_factor = 0
+
+datum/reagent/consumable/icetea/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = max(0,M.dizziness-2)
+ M.drowsyness = max(0,M.drowsyness-1)
+ M.sleeping = max(0,M.sleeping-2)
+ if(M.getToxLoss() && prob(20))
+ M.adjustToxLoss(-1)
+ if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
+ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ ..()
+ return
+
+datum/reagent/consumable/space_cola
+ name = "Cola"
+ id = "cola"
+ description = "A refreshing beverage."
+ color = "#100800" // rgb: 16, 8, 0
+
+datum/reagent/consumable/space_cola/on_mob_life(var/mob/living/M as mob)
+ 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 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ ..()
+ return
+
+datum/reagent/consumable/nuka_cola
+ name = "Nuka Cola"
+ id = "nuka_cola"
+ description = "Cola, cola never changes."
+ color = "#100800" // rgb: 16, 8, 0
+
+datum/reagent/consumable/nuka_cola/on_mob_life(var/mob/living/M as mob)
+ M.Jitter(20)
+ M.druggy = max(M.druggy, 30)
+ M.dizziness +=5
+ M.drowsyness = 0
+ M.sleeping = max(0,M.sleeping-2)
+ M.status_flags |= GOTTAGOFAST
+ if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
+ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ ..()
+ return
+
+datum/reagent/consumable/spacemountainwind
+ name = "Space Mountain Wind"
+ id = "spacemountainwind"
+ description = "Blows right through you like a space wind."
+ color = "#102000" // rgb: 16, 32, 0
+
+datum/reagent/consumable/spacemountainwind/on_mob_life(var/mob/living/M as mob)
+ M.drowsyness = max(0,M.drowsyness-7)
+ M.sleeping = max(0,M.sleeping-1)
+ if (M.bodytemperature > 310)
+ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ M.Jitter(5)
+ ..()
+ return
+
+datum/reagent/consumable/dr_gibb
+ name = "Dr. Gibb"
+ id = "dr_gibb"
+ description = "A delicious blend of 42 different flavours"
+ color = "#102000" // rgb: 16, 32, 0
+
+datum/reagent/consumable/dr_gibb/on_mob_life(var/mob/living/M as mob)
+ M.drowsyness = max(0,M.drowsyness-6)
+ if (M.bodytemperature > 310)
+ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
+ ..()
+ return
+
+datum/reagent/consumable/space_up
+ name = "Space-Up"
+ id = "space_up"
+ description = "Tastes like a hull breach in your mouth."
+ color = "#00FF00" // rgb: 0, 255, 0
+
+datum/reagent/consumable/space_up/on_mob_life(var/mob/living/M as mob)
+ if (M.bodytemperature > 310)
+ M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
+ ..()
+ return
+
+datum/reagent/consumable/lemon_lime
+ name = "Lemon Lime"
+ description = "A tangy substance made of 0.5% natural citrus!"
+ id = "lemon_lime"
+ color = "#8CFF00" // rgb: 135, 255, 0
+
+datum/reagent/consumable/lemon_lime/on_mob_life(var/mob/living/M as mob)
+ if (M.bodytemperature > 310)
+ M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
+ ..()
+ return
+
+datum/reagent/consumable/sodawater
+ name = "Soda Water"
+ id = "sodawater"
+ description = "A can of club soda. Why not make a scotch and soda?"
+ color = "#619494" // rgb: 97, 148, 148
+
+datum/reagent/consumable/sodawater/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = max(0,M.dizziness-5)
+ M.drowsyness = max(0,M.drowsyness-3)
+ if (M.bodytemperature > 310)
+ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ ..()
+ return
+
+datum/reagent/consumable/tonic
+ name = "Tonic Water"
+ id = "tonic"
+ description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
+ color = "#0064C8" // rgb: 0, 100, 200
+
+datum/reagent/consumable/tonic/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = max(0,M.dizziness-5)
+ M.drowsyness = max(0,M.drowsyness-3)
+ M.sleeping = max(0,M.sleeping-2)
+ if (M.bodytemperature > 310)
+ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ ..()
+ return
+
+datum/reagent/consumable/ice
+ name = "Ice"
+ id = "ice"
+ description = "Frozen water, your dentist wouldn't like you chewing this."
+ reagent_state = SOLID
+ color = "#619494" // rgb: 97, 148, 148
+
+datum/reagent/consumable/ice/on_mob_life(var/mob/living/M as mob)
+ M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT
+ ..()
+ return
+
+datum/reagent/consumable/soy_latte
+ name = "Soy Latte"
+ id = "soy_latte"
+ description = "A nice and tasty beverage while you are reading your hippie books."
+ color = "#664300" // rgb: 102, 67, 0
+
+datum/reagent/consumable/soy_latte/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = max(0,M.dizziness-5)
+ M.drowsyness = max(0,M.drowsyness-3)
+ M.sleeping = 0
+ if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
+ M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ M.Jitter(5)
+ if(M.getBruteLoss() && prob(20))
+ M.heal_organ_damage(1,0)
+ ..()
+ return
+
+datum/reagent/consumable/cafe_latte
+ name = "Cafe Latte"
+ id = "cafe_latte"
+ description = "A nice, strong and tasty beverage while you are reading."
+ color = "#664300" // rgb: 102, 67, 0
+
+datum/reagent/consumable/cafe_latte/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = max(0,M.dizziness-5)
+ M.drowsyness = max(0,M.drowsyness-3)
+ M.sleeping = 0
+ if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
+ M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ M.Jitter(5)
+ if(M.getBruteLoss() && prob(20))
+ M.heal_organ_damage(1,0)
+ ..()
+ return
+
+datum/reagent/consumable/doctor_delight
+ name = "The Doctor's Delight"
+ id = "doctorsdelight"
+ description = "A gulp a day keeps the MediBot away. That's probably for the best."
+ color = "#FF8CFF" // rgb: 255, 140, 255
+
+datum/reagent/consumable/doctor_delight/on_mob_life(var/mob/living/M as mob)
+ if(M.getOxyLoss() && prob(80))
+ M.adjustOxyLoss(-2)
+ if(M.getBruteLoss() && prob(80))
+ M.heal_organ_damage(2,0)
+ if(M.getFireLoss() && prob(80))
+ M.heal_organ_damage(0,2)
+ if(M.getToxLoss() && prob(80))
+ M.adjustToxLoss(-2)
+ if(M.dizziness !=0)
+ M.dizziness = max(0,M.dizziness-15)
+ if(M.confused !=0)
+ M.confused = max(0,M.confused - 5)
+ holder.remove_reagent(id, metabolization_rate/M.metabolism_efficiency)
+ return
+
+
+//////////////////////////////////////////////The ten friggen million reagents that get you drunk//////////////////////////////////////////////
+
+datum/reagent/consumable/atomicbomb
+ name = "Atomic Bomb"
+ id = "atomicbomb"
+ description = "Nuclear proliferation never tasted so good."
+ color = "#666300" // rgb: 102, 99, 0
+
+datum/reagent/consumable/atomicbomb/on_mob_life(var/mob/living/M as mob)
+ M.druggy = max(M.druggy, 50)
+ M.confused = max(M.confused+2,0)
+ M.Dizzy(10)
+ if (!M.stuttering)
+ M.stuttering = 1
+ M.stuttering += 3
+ if(!data)
+ data = 1
+ data++
+ switch(data)
+ if(51 to 200)
+ M.sleeping += 1
+ if(201 to INFINITY)
+ M.sleeping += 1
+ M.adjustToxLoss(2)
+ ..()
+ return
+
+datum/reagent/consumable/gargle_blaster
+ name = "Pan-Galactic Gargle Blaster"
+ id = "gargleblaster"
+ description = "Whoah, this stuff looks volatile!"
+ color = "#664300" // rgb: 102, 67, 0
+
+datum/reagent/consumable/gargle_blaster/on_mob_life(var/mob/living/M as mob)
+ if(!data)
+ data = 1
+ data++
+ M.dizziness +=6
+ if(data >= 15 && data <45)
+ if (!M.stuttering)
+ M.stuttering = 1
+ M.stuttering += 3
+ else if(data >= 45 && prob(50) && data <55)
+ M.confused = max(M.confused+3,0)
+ else if(data >=55)
+ M.druggy = max(M.druggy, 55)
+ else if(data >=200)
+ M.adjustToxLoss(2)
+ ..()
+ return
+
+datum/reagent/consumable/neurotoxin
+ name = "Neurotoxin"
+ id = "neurotoxin"
+ description = "A strong neurotoxin that puts the subject into a death-like state."
+ color = "#2E2E61" // rgb: 46, 46, 97
+
+datum/reagent/consumable/neurotoxin/on_mob_life(var/mob/living/carbon/M as mob)
+ M.weakened = max(M.weakened, 3)
+ if(!data)
+ data = 1
+ data++
+ M.dizziness +=6
+ if(data >= 15 && data <45)
+ if (!M.stuttering)
+ M.stuttering = 1
+ M.stuttering += 3
+ else if(data >= 45 && prob(50) && data <55)
+ M.confused = max(M.confused+3,0)
+ else if(data >=55)
+ M.druggy = max(M.druggy, 55)
+ else if(data >=200)
+ M.adjustToxLoss(2)
+ ..()
+ return
+
+datum/reagent/consumable/hippies_delight
+ name = "Hippie's Delight"
+ id = "hippiesdelight"
+ description = "You just don't get it maaaan."
+ color = "#664300" // rgb: 102, 67, 0
+ nutriment_factor = 0
+ metabolization_rate = 0.2 * REAGENTS_METABOLISM
+
+datum/reagent/consumable/hippies_delight/on_mob_life(var/mob/living/M as mob)
+ M.druggy = max(M.druggy, 50)
+ if(!data)
+ data = 1
+ data++
+ switch(data)
+ if(1 to 5)
+ if (!M.stuttering) M.stuttering = 1
+ M.Dizzy(10)
+ if(prob(10)) M.emote(pick("twitch","giggle"))
+ if(5 to 10)
+ if (!M.stuttering) M.stuttering = 1
+ M.Jitter(20)
+ M.Dizzy(20)
+ M.druggy = max(M.druggy, 45)
+ if(prob(20)) M.emote(pick("twitch","giggle"))
+ if (10 to 200)
+ if (!M.stuttering) M.stuttering = 1
+ M.Jitter(40)
+ M.Dizzy(40)
+ M.druggy = max(M.druggy, 60)
+ if(prob(30)) M.emote(pick("twitch","giggle"))
+ if(200 to INFINITY)
+ if (!M.stuttering) M.stuttering = 1
+ M.Jitter(60)
+ M.Dizzy(60)
+ M.druggy = max(M.druggy, 75)
+ if(prob(40)) M.emote(pick("twitch","giggle"))
+ if(prob(30)) M.adjustToxLoss(2)
+ ..()
+ return
+
+
+// Undefine the alias for REAGENTS_EFFECT_MULTIPLER
+#undef REM
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
new file mode 100644
index 00000000000..c5132e52363
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
@@ -0,0 +1,388 @@
+
+
+///////////////////////////////////////////////////////////////////
+ //Food Reagents
+//////////////////////////////////////////////////////////////////
+
+
+// Part of the food code. Also is where all the food
+// condiments, additives, and such go.
+
+
+datum/reagent/consumable
+ name = "Consumable"
+ id = "consumable"
+ var/nutriment_factor = 1 * REAGENTS_METABOLISM
+
+datum/reagent/consumable/on_mob_life(var/mob/living/M as mob)
+ M.nutrition += nutriment_factor
+ holder.remove_reagent(src.id, metabolization_rate)
+
+datum/reagent/consumable/nutriment
+ name = "Nutriment"
+ id = "nutriment"
+ description = "All the vitamins, minerals, and carbohydrates the body needs in pure form."
+ reagent_state = SOLID
+ nutriment_factor = 15 * REAGENTS_METABOLISM
+ color = "#664330" // rgb: 102, 67, 48
+
+datum/reagent/consumable/nutriment/on_mob_life(var/mob/living/M as mob)
+ if(prob(50))
+ M.heal_organ_damage(1,0)
+ ..()
+ return
+
+datum/reagent/consumable/vitamin
+ name = "Vitamin"
+ id = "vitamin"
+ description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form."
+ reagent_state = SOLID
+ color = "#664330" // rgb: 102, 67, 48
+
+datum/reagent/consumable/vitamin/on_mob_life(var/mob/living/M as mob)
+ if(prob(50))
+ M.heal_organ_damage(1,1)
+ if(M.satiety < 600)
+ M.satiety += 20
+ ..()
+ return
+
+datum/reagent/consumable/sugar
+ name = "Sugar"
+ id = "sugar"
+ 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
+ color = "#FFFFFF" // rgb: 255, 255, 255
+ nutriment_factor = 10 * REAGENTS_METABOLISM
+ metabolization_rate = 2 * REAGENTS_METABOLISM
+
+datum/reagent/consumable/sugar/on_mob_life(var/mob/living/M as mob)
+ if(M.satiety > -200)
+ M.satiety -= 20 //eating sugar makes you more hungry over time by making your hunger drop faster.
+ M.nutrition += max(((NUTRITION_LEVEL_FED + 50) - M.nutrition )/100, 0) * nutriment_factor // sugar doesn't help your hunger if your stomach is nearly full
+ holder.remove_reagent(src.id, metabolization_rate)
+
+datum/reagent/consumable/virus_food
+ name = "Virus Food"
+ id = "virusfood"
+ description = "A mixture of water and milk. Virus cells can use this mixture to reproduce."
+ nutriment_factor = 2 * REAGENTS_METABOLISM
+ color = "#899613" // rgb: 137, 150, 19
+
+datum/reagent/consumable/soysauce
+ name = "Soysauce"
+ id = "soysauce"
+ description = "A salty sauce made from the soy plant."
+ nutriment_factor = 2 * REAGENTS_METABOLISM
+ color = "#792300" // rgb: 121, 35, 0
+
+datum/reagent/consumable/ketchup
+ name = "Ketchup"
+ id = "ketchup"
+ description = "Ketchup, catsup, whatever. It's tomato paste."
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ color = "#731008" // rgb: 115, 16, 8
+
+
+datum/reagent/consumable/capsaicin
+ name = "Capsaicin Oil"
+ id = "capsaicin"
+ description = "This is what makes chilis hot."
+ color = "#B31008" // rgb: 179, 16, 8
+
+datum/reagent/consumable/capsaicin/on_mob_life(var/mob/living/M as mob)
+ if(!data)
+ data = 1
+ switch(data)
+ if(1 to 15)
+ M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT
+ if(holder.has_reagent("frostoil"))
+ holder.remove_reagent("frostoil", 5)
+ if(istype(M, /mob/living/carbon/slime))
+ M.bodytemperature += rand(5,20)
+ if(15 to 25)
+ M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
+ if(istype(M, /mob/living/carbon/slime))
+ M.bodytemperature += rand(10,20)
+ if(25 to INFINITY)
+ M.bodytemperature += 15 * TEMPERATURE_DAMAGE_COEFFICIENT
+ if(istype(M, /mob/living/carbon/slime))
+ M.bodytemperature += rand(15,20)
+ data++
+ ..()
+ return
+
+datum/reagent/consumable/condensedcapsaicin
+ name = "Condensed Capsaicin"
+ id = "condensedcapsaicin"
+ description = "A chemical agent used for self-defense and in police work."
+ color = "#B31008" // rgb: 179, 16, 8
+
+datum/reagent/consumable/condensedcapsaicin/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+ if(!istype(M, /mob/living/carbon/human) && !istype(M, /mob/living/carbon/monkey))
+ return
+
+ var/mob/living/carbon/victim = M
+ if(method == TOUCH)
+ //check for protection
+ var/mouth_covered = 0
+ var/eyes_covered = 0
+ var/obj/item/safe_thing = null
+
+ //monkeys and humans can have masks
+ if( victim.wear_mask )
+ if ( victim.wear_mask.flags & MASKCOVERSEYES )
+ eyes_covered = 1
+ safe_thing = victim.wear_mask
+ if ( victim.wear_mask.flags & MASKCOVERSMOUTH )
+ mouth_covered = 1
+ safe_thing = victim.wear_mask
+
+ //only humans can have helmets and glasses
+ if(istype(victim, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = victim
+ if( H.head )
+ if ( H.head.flags & MASKCOVERSEYES )
+ eyes_covered = 1
+ safe_thing = H.head
+ if ( H.head.flags & MASKCOVERSMOUTH )
+ mouth_covered = 1
+ safe_thing = H.head
+ if(H.glasses)
+ eyes_covered = 1
+ if ( !safe_thing )
+ safe_thing = H.glasses
+
+ //actually handle the pepperspray effects
+ if ( eyes_covered && mouth_covered )
+ return
+ else if ( mouth_covered ) // Reduced effects if partially protected
+ if(prob(5))
+ victim.emote("scream")
+ victim.eye_blurry = max(M.eye_blurry, 3)
+ victim.eye_blind = max(M.eye_blind, 1)
+ victim.confused = max(M.confused, 3)
+ victim.damageoverlaytemp = 60
+ victim.Weaken(3)
+ victim.drop_item()
+ return
+ else if ( eyes_covered ) // Eye cover is better than mouth cover
+ victim.eye_blurry = max(M.eye_blurry, 3)
+ victim.damageoverlaytemp = 30
+ return
+ else // Oh dear :D
+ if(prob(5))
+ victim.emote("scream")
+ victim.eye_blurry = max(M.eye_blurry, 5)
+ victim.eye_blind = max(M.eye_blind, 2)
+ victim.confused = max(M.confused, 6)
+ victim.damageoverlaytemp = 75
+ victim.Weaken(5)
+ victim.drop_item()
+
+datum/reagent/consumable/condensedcapsaicin/on_mob_life(var/mob/living/M as mob)
+ if(prob(5))
+ M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]")
+ ..()
+ return
+
+datum/reagent/consumable/frostoil
+ name = "Frost Oil"
+ id = "frostoil"
+ description = "A special oil that noticably chills the body. Extraced from Icepeppers."
+ color = "#B31008" // rgb: 139, 166, 233
+
+datum/reagent/consumable/frostoil/on_mob_life(var/mob/living/M as mob)
+ if(!data) data = 1
+ switch(data)
+ if(1 to 15)
+ M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT
+ if(holder.has_reagent("capsaicin"))
+ holder.remove_reagent("capsaicin", 5)
+ if(istype(M, /mob/living/carbon/slime))
+ M.bodytemperature -= rand(5,20)
+ if(15 to 25)
+ M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT
+ if(istype(M, /mob/living/carbon/slime))
+ M.bodytemperature -= rand(10,20)
+ if(25 to INFINITY)
+ M.bodytemperature -= 15 * TEMPERATURE_DAMAGE_COEFFICIENT
+ if(prob(1))
+ M.emote("shiver")
+ if(istype(M, /mob/living/carbon/slime))
+ M.bodytemperature -= rand(15,20)
+ data++
+ ..()
+ return
+
+datum/reagent/consumable/frostoil/reaction_turf(var/turf/simulated/T, var/volume)
+ if(volume >= 5)
+ for(var/mob/living/carbon/slime/M in T)
+ M.adjustToxLoss(rand(15,30))
+ //if(istype(T))
+ // T.atmos_spawn_air(SPAWN_COLD)
+
+datum/reagent/consumable/sodiumchloride
+ name = "Table Salt"
+ id = "sodiumchloride"
+ description = "A salt made of sodium chloride. Commonly used to season food."
+ reagent_state = SOLID
+ color = "#FFFFFF" // rgb: 255,255,255
+
+datum/reagent/consumable/blackpepper
+ name = "Black Pepper"
+ id = "blackpepper"
+ description = "A powder ground from peppercorns. *AAAACHOOO*"
+ reagent_state = SOLID
+ // no color (ie, black)
+
+datum/reagent/consumable/coco
+ name = "Coco Powder"
+ id = "coco"
+ description = "A fatty, bitter paste made from coco beans."
+ reagent_state = SOLID
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ color = "#302000" // rgb: 48, 32, 0
+
+datum/reagent/consumable/hot_coco
+ name = "Hot Chocolate"
+ id = "hot_coco"
+ description = "Made with love! And coco beans."
+ nutriment_factor = 3 * REAGENTS_METABOLISM
+ color = "#403010" // rgb: 64, 48, 16
+
+datum/reagent/consumable/hot_coco/on_mob_life(var/mob/living/M as mob)
+ if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
+ M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ ..()
+ return
+
+datum/reagent/mushroomhallucinogen
+ name = "Mushroom Hallucinogen"
+ id = "mushroomhallucinogen"
+ description = "A strong hallucinogenic drug derived from certain species of mushroom."
+ color = "#E700E7" // rgb: 231, 0, 231
+ metabolization_rate = 0.2 * REAGENTS_METABOLISM
+
+datum/reagent/mushroomhallucinogen/on_mob_life(var/mob/living/M as mob)
+ M.druggy = max(M.druggy, 30)
+ if(!data)
+ data = 1
+ switch(data)
+ if(1 to 5)
+ if (!M.stuttering)
+ M.stuttering = 1
+ M.Dizzy(5)
+ if(prob(10))
+ M.emote(pick("twitch","giggle"))
+ if(5 to 10)
+ if (!M.stuttering)
+ M.stuttering = 1
+ M.Jitter(10)
+ M.Dizzy(10)
+ M.druggy = max(M.druggy, 35)
+ if(prob(20))
+ M.emote(pick("twitch","giggle"))
+ if (10 to INFINITY)
+ if (!M.stuttering)
+ M.stuttering = 1
+ M.Jitter(20)
+ M.Dizzy(20)
+ M.druggy = max(M.druggy, 40)
+ if(prob(30))
+ M.emote(pick("twitch","giggle"))
+ data++
+ ..()
+ return
+
+datum/reagent/consumable/sprinkles
+ name = "Sprinkles"
+ id = "sprinkles"
+ description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
+ color = "#FF00FF" // rgb: 255, 0, 255
+
+datum/reagent/consumable/sprinkles/on_mob_life(var/mob/living/M as mob)
+ if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden"))
+ M.heal_organ_damage(1,1)
+ ..()
+ return
+ ..()
+
+datum/reagent/consumable/cornoil
+ name = "Corn Oil"
+ id = "cornoil"
+ description = "An oil derived from various types of corn."
+ nutriment_factor = 20 * REAGENTS_METABOLISM
+ color = "#302000" // rgb: 48, 32, 0
+
+datum/reagent/consumable/cornoil/reaction_turf(var/turf/simulated/T, var/volume)
+ if (!istype(T))
+ return
+ src = null
+ if(volume >= 3)
+ T.MakeSlippery()
+ var/hotspot = (locate(/obj/effect/hotspot) in T)
+ if(hotspot)
+ var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() )
+ lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0)
+ lowertemp.react()
+ T.assume_air(lowertemp)
+ qdel(hotspot)
+
+datum/reagent/consumable/enzyme
+ name = "Universal Enzyme"
+ id = "enzyme"
+ description = "A universal enzyme used in the preperation of certain chemicals and foods."
+ color = "#365E30" // rgb: 54, 94, 48
+
+datum/reagent/consumable/dry_ramen
+ name = "Dry Ramen"
+ id = "dry_ramen"
+ description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
+ reagent_state = SOLID
+ color = "#302000" // rgb: 48, 32, 0
+
+datum/reagent/consumable/hot_ramen
+ name = "Hot Ramen"
+ id = "hot_ramen"
+ description = "The noodles are boiled, the flavors are artificial, just like being back in school."
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ color = "#302000" // rgb: 48, 32, 0
+
+datum/reagent/consumable/hot_ramen/on_mob_life(var/mob/living/M as mob)
+ if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
+ M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ ..()
+ return
+
+datum/reagent/consumable/hell_ramen
+ name = "Hell Ramen"
+ id = "hell_ramen"
+ description = "The noodles are boiled, the flavors are artificial, just like being back in school."
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ color = "#302000" // rgb: 48, 32, 0
+
+datum/reagent/consumable/hell_ramen/on_mob_life(var/mob/living/M as mob)
+ M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
+ ..()
+ return
+
+datum/reagent/consumable/flour
+ name = "flour"
+ id = "flour"
+ description = "This is what you rub all over yourself to pretend to be a ghost."
+ reagent_state = SOLID
+ color = "#FFFFFF" // rgb: 0, 0, 0
+
+datum/reagent/consumable/flour/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(!istype(T, /turf/space))
+ new /obj/effect/decal/cleanable/flour(T)
+
+datum/reagent/consumable/cherryjelly
+ name = "Cherry Jelly"
+ id = "cherryjelly"
+ description = "Totally the best. Only to be spread on foods with excellent lateral symmetry."
+ color = "#801E28" // rgb: 128, 30, 40
+
+
diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
new file mode 100644
index 00000000000..20b105f9040
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
@@ -0,0 +1,399 @@
+
+#define REM REAGENTS_EFFECT_MULTIPLIER
+
+//////////////////////////////////////////////////////////////////////////////////////////
+ // MEDICINE REAGENTS
+//////////////////////////////////////////////////////////////////////////////////////
+
+// where all the reagents related to medicine go.
+
+datum/reagent/medicine
+ name = "Medicine"
+ id = "medicine"
+
+datum/reagent/medicine/on_mob_life(var/mob/living/M as mob)
+ holder.remove_reagent(src.id, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
+
+datum/reagent/medicine/ethylredoxrazine // FUCK YOU, ALCOHOL
+ name = "Ethylredoxrazine"
+ id = "ethylredoxrazine"
+ description = "A powerful oxidizer that reacts with ethanol."
+ reagent_state = SOLID
+ color = "#605048" // rgb: 96, 80, 72
+
+datum/reagent/medicine/ethylredoxrazine/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = 0
+ M.drowsyness = 0
+ M.stuttering = 0
+ M.confused = 0
+ M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 1*REM, 0, 1)
+ ..()
+ return
+
+datum/reagent/medicine/lipozine
+ name = "Lipozine" // The anti-nutriment.
+ id = "lipozine"
+ description = "A chemical compound that causes a powerful fat-burning reaction."
+ color = "#BBEDA4" // rgb: 187, 237, 164
+
+datum/reagent/medicine/lipozine/on_mob_life(var/mob/living/M as mob)
+ M.nutrition -= 10 * REAGENTS_METABOLISM
+ M.overeatduration = 0
+ if(M.nutrition < 0)//Prevent from going into negatives.
+ M.nutrition = 0
+ ..()
+ return
+
+datum/reagent/medicine/hyperzine
+ name = "Hyperzine"
+ id = "hyperzine"
+ description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/hyperzine/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD)
+ if(prob(5))
+ M.emote(pick("twitch","blink_r","shiver"))
+ M.status_flags |= GOTTAGOFAST
+ ..()
+ return
+
+datum/reagent/medicine/leporazine
+ name = "Leporazine"
+ id = "leporazine"
+ description = "Leporazine can be use to stabilize an individuals body temperature."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/leporazine/on_mob_life(var/mob/living/M as mob)
+ if(M.bodytemperature > 310)
+ M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ else if(M.bodytemperature < 311)
+ M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ ..()
+
+datum/reagent/medicine/inaprovaline
+ name = "Inaprovaline"
+ id = "inaprovaline"
+ description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/inaprovaline/on_mob_life(var/mob/living/M as mob)
+ if(M.losebreath >= 10)
+ M.losebreath = max(10, M.losebreath-5)
+ ..()
+ return
+
+datum/reagent/medicine/ryetalyn
+ name = "Ryetalyn"
+ id = "ryetalyn"
+ description = "Ryetalyn can cure all genetic abnomalities."
+ reagent_state = SOLID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/ryetalyn/on_mob_life(var/mob/living/M as mob)
+
+ var/needs_update = M.mutations.len > 0
+ M.mutations = list()
+ M.disabilities = 0
+ M.sdisabilities = 0
+ M.jitteriness = 0
+
+ // Might need to update appearance for hulk etc.
+ if(needs_update && ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.update_mutations()
+ ..()
+ return
+
+datum/reagent/medicine/kelotane
+ name = "Kelotane"
+ id = "kelotane"
+ description = "Kelotane is a drug used to treat burns."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/kelotane/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD)
+ M.heal_organ_damage(0,2*REM)
+ ..()
+ return
+
+datum/reagent/medicine/dermaline
+ name = "Dermaline"
+ id = "dermaline"
+ description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/dermaline/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD) //THE GUY IS **DEAD**! BEREFT OF ALL LIFE HE RESTS IN PEACE etc etc. He does NOT metabolise shit anymore, god DAMN
+ M.heal_organ_damage(0,3*REM)
+ ..()
+ return
+
+datum/reagent/medicine/dexalin
+ name = "Dexalin"
+ id = "dexalin"
+ description = "Dexalin is used in the treatment of oxygen deprivation."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/dexalin/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD)
+ M.adjustOxyLoss(-2*REM)
+ if(holder.has_reagent("lexorin"))
+ holder.remove_reagent("lexorin", 2*REM)
+ ..()
+ return
+
+datum/reagent/medicine/dexalinp
+ name = "Dexalin Plus"
+ id = "dexalinp"
+ description = "Dexalin Plus is used in the treatment of oxygen deprivation. Its highly effective."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/dexalinp/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD)
+ M.adjustOxyLoss(-M.getOxyLoss())
+ if(holder.has_reagent("lexorin"))
+ holder.remove_reagent("lexorin", 2*REM)
+ ..()
+ return
+
+datum/reagent/medicine/tricordrazine
+ name = "Tricordrazine"
+ id = "tricordrazine"
+ description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/tricordrazine/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD)
+ if(M.getOxyLoss() && prob(80))
+ M.adjustOxyLoss(-1*REM)
+ if(M.getBruteLoss() && prob(80))
+ M.heal_organ_damage(1*REM,0)
+ if(M.getFireLoss() && prob(80))
+ M.heal_organ_damage(0,1*REM)
+ if(M.getToxLoss() && prob(80))
+ M.adjustToxLoss(-1*REM)
+ ..()
+ return
+
+datum/reagent/medicine/anti_toxin
+ name = "Anti-Toxin (Dylovene)"
+ id = "anti_toxin"
+ description = "Dylovene is a broad-spectrum antitoxin."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/anti_toxin/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD)
+ M.reagents.remove_all_type(/datum/reagent/toxin, 1*REM, 0, 1)
+ M.drowsyness = max(M.drowsyness-2*REM, 0)
+ M.hallucination = max(0, M.hallucination - 5*REM)
+ M.adjustToxLoss(-2*REM)
+ ..()
+ return
+
+datum/reagent/medicine/adminordrazine //An OP chemical for admins
+ name = "Adminordrazine"
+ id = "adminordrazine"
+ description = "It's magic. We don't have to explain it."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/adminordrazine/on_mob_life(var/mob/living/carbon/M as mob)
+ if(!M) M = holder.my_atom ///This can even heal dead people.
+ M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1)
+ M.setCloneLoss(0)
+ M.setOxyLoss(0)
+ M.radiation = 0
+ M.heal_organ_damage(5,5)
+ M.adjustToxLoss(-5)
+ M.hallucination = 0
+ M.setBrainLoss(0)
+ M.disabilities = 0
+ M.sdisabilities = 0
+ M.eye_blurry = 0
+ M.eye_blind = 0
+ M.SetWeakened(0)
+ M.SetStunned(0)
+ M.SetParalysis(0)
+ M.silent = 0
+ M.dizziness = 0
+ M.drowsyness = 0
+ M.stuttering = 0
+ M.confused = 0
+ M.sleeping = 0
+ M.jitteriness = 0
+ for(var/datum/disease/D in M.viruses)
+ if(D.severity == NONTHREAT)
+ continue
+ D.spread_text = "Remissive"
+ D.stage--
+ if(D.stage < 1)
+ D.cure()
+ ..()
+ return
+
+datum/reagent/medicine/synaptizine
+ name = "Synaptizine"
+ id = "synaptizine"
+ description = "Synaptizine is used to treat various diseases."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/synaptizine/on_mob_life(var/mob/living/M as mob)
+ M.drowsyness = max(M.drowsyness-5, 0)
+ M.AdjustParalysis(-1)
+ M.AdjustStunned(-1)
+ M.AdjustWeakened(-1)
+ if(holder.has_reagent("mindbreaker"))
+ holder.remove_reagent("mindbreaker", 5)
+ M.hallucination = max(0, M.hallucination - 10)
+ if(prob(60))
+ M.adjustToxLoss(1)
+ ..()
+ return
+
+datum/reagent/medicine/hyronalin
+ name = "Hyronalin"
+ id = "hyronalin"
+ description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/hyronalin/on_mob_life(var/mob/living/M as mob)
+ M.radiation = max(M.radiation-3*REM,0)
+ ..()
+ return
+
+datum/reagent/medicine/arithrazine
+ name = "Arithrazine"
+ id = "arithrazine"
+ description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/arithrazine/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD)
+ M.radiation = max(M.radiation-7*REM,0)
+ M.adjustToxLoss(-1*REM)
+ if(prob(15))
+ M.take_organ_damage(1, 0)
+ ..()
+ return
+
+datum/reagent/medicine/alkysine
+ name = "Alkysine"
+ id = "alkysine"
+ description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/alkysine/on_mob_life(var/mob/living/M as mob)
+ if(M != DEAD)
+ M.adjustBrainLoss(-3*REM)
+ ..()
+ return
+
+datum/reagent/medicine/imidazoline
+ name = "Imidazoline"
+ id = "imidazoline"
+ description = "Heals eye damage."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/imidazoline/on_mob_life(var/mob/living/M as mob)
+ M.eye_blurry = max(M.eye_blurry-5 , 0)
+ M.eye_blind = max(M.eye_blind-5 , 0)
+ M.disabilities &= ~NEARSIGHTED
+ M.eye_stat = max(M.eye_stat-5, 0)
+// M.sdisabilities &= ~1 Replaced by eye surgery
+ ..()
+ return
+
+datum/reagent/medicine/inacusiate
+ name = "Inacusiate"
+ id = "inacusiate"
+ description = "Heals ear damage."
+ color = "#6600FF" // rgb: 100, 165, 255
+
+datum/reagent/medicine/inacusiate/on_mob_life(var/mob/living/M as mob)
+ M.ear_damage = 0
+ M.ear_deaf = 0
+ ..()
+ return
+
+datum/reagent/medicine/bicaridine
+ name = "Bicaridine"
+ id = "bicaridine"
+ description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/bicaridine/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD)
+ M.heal_organ_damage(2*REM,0)
+ ..()
+ return
+
+datum/reagent/medicine/cryoxadone
+ name = "Cryoxadone"
+ id = "cryoxadone"
+ description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/cryoxadone/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD && M.bodytemperature < 170)
+ M.adjustCloneLoss(-1)
+ M.adjustOxyLoss(-3)
+ M.heal_organ_damage(3,3)
+ M.adjustToxLoss(-3)
+ ..()
+ return
+
+datum/reagent/medicine/clonexadone
+ name = "Clonexadone"
+ id = "clonexadone"
+ description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' clones that get ejected early when used in conjunction with a cryo tube."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/medicine/clonexadone/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD && M.bodytemperature < 170)
+ M.adjustCloneLoss(-3)
+ M.adjustOxyLoss(-3)
+ M.heal_organ_damage(3,3)
+ M.adjustToxLoss(-3)
+ M.status_flags &= ~DISFIGURED
+ ..()
+ return
+
+datum/reagent/medicine/rezadone
+ name = "Rezadone"
+ id = "rezadone"
+ description = "A powder derived from fish toxin, this substance can effectively treat cellular damage in humanoids, though excessive consumption has side effects."
+ reagent_state = SOLID
+ color = "#669900" // rgb: 102, 153, 0
+
+datum/reagent/medicine/rezadone/on_mob_life(var/mob/living/M as mob)
+ if(!data)
+ data = 1
+ data++
+ switch(data)
+ if(1 to 15)
+ M.adjustCloneLoss(-1)
+ M.heal_organ_damage(1,1)
+ if(15 to 35)
+ M.adjustCloneLoss(-2)
+ M.heal_organ_damage(2,1)
+ M.status_flags &= ~DISFIGURED
+ if(35 to INFINITY)
+ M.adjustToxLoss(1)
+ M.Dizzy(5)
+ M.Jitter(5)
+
+ ..()
+ return
+
+datum/reagent/medicine/spaceacillin
+ name = "Spaceacillin"
+ id = "spaceacillin"
+ description = "An all-purpose antiviral agent."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+
+// Undefine the alias for REAGENTS_EFFECT_MULTIPLER
+#undef REM
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
new file mode 100644
index 00000000000..d58815700bf
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
@@ -0,0 +1,411 @@
+
+#define REM REAGENTS_EFFECT_MULTIPLIER
+
+
+//////////////////////////Poison stuff (Toxins & Acids)///////////////////////
+
+datum/reagent/toxin
+ name = "Toxin"
+ id = "toxin"
+ description = "A toxic chemical."
+ color = "#CF3600" // rgb: 207, 54, 0
+ var/toxpwr = 1.5
+
+datum/reagent/toxin/on_mob_life(var/mob/living/M as mob)
+ if(toxpwr)
+ M.adjustToxLoss(toxpwr*REM)
+ ..()
+ return
+
+datum/reagent/toxin/amatoxin
+ name = "Amatoxin"
+ id = "amatoxin"
+ description = "A powerful poison derived from certain species of mushroom."
+ color = "#792300" // rgb: 121, 35, 0
+ toxpwr = 1
+
+datum/reagent/toxin/mutagen
+ name = "Unstable mutagen"
+ id = "mutagen"
+ description = "Might cause unpredictable mutations. Keep away from children."
+ color = "#13BC5E" // rgb: 19, 188, 94
+ toxpwr = 0
+
+datum/reagent/toxin/mutagen/reaction_mob(var/mob/living/carbon/M, var/method=TOUCH, var/volume)
+ if(!..())
+ return
+ if(!istype(M) || !M.dna)
+ return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
+ src = null
+ if((method==TOUCH && prob(33)) || method==INGEST)
+ randmuti(M)
+ if(prob(98))
+ randmutb(M)
+ else
+ randmutg(M)
+ domutcheck(M, null)
+ updateappearance(M)
+ return
+
+datum/reagent/toxin/mutagen/on_mob_life(var/mob/living/carbon/M)
+ if(istype(M))
+ M.apply_effect(5,IRRADIATE,0)
+ ..()
+ return
+
+datum/reagent/toxin/plasma
+ name = "Plasma"
+ id = "plasma"
+ description = "Plasma in its liquid form."
+ color = "#DB2D08" // rgb: 219, 45, 8
+ toxpwr = 3
+
+datum/reagent/toxin/plasma/on_mob_life(var/mob/living/M as mob)
+ if(holder.has_reagent("inaprovaline"))
+ holder.remove_reagent("inaprovaline", 2*REM)
+ ..()
+ return
+
+datum/reagent/toxin/plasma/reaction_obj(var/obj/O, var/volume)
+ src = null
+ /*if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg/slime))
+ var/obj/item/weapon/reagent_containers/food/snacks/egg/slime/egg = O
+ if (egg.grown)
+ egg.Hatch()*/
+ if((!O) || (!volume)) return 0
+ O.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume)
+
+datum/reagent/toxin/plasma/reaction_turf(var/turf/simulated/T, var/volume)
+ src = null
+ if(istype(T))
+ T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume)
+ return
+
+datum/reagent/toxin/plasma/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with plasma is stronger than fuel!
+ if(!istype(M, /mob/living))
+ return
+ if(method == TOUCH)
+ M.adjust_fire_stacks(volume / 5)
+ return
+
+datum/reagent/toxin/lexorin
+ name = "Lexorin"
+ id = "lexorin"
+ description = "Lexorin temporarily stops respiration. Causes tissue damage."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+ toxpwr = 0
+
+datum/reagent/toxin/lexorin/on_mob_life(var/mob/living/M as mob)
+ if(M.stat != DEAD)
+ if(prob(33))
+ M.take_organ_damage(1*REM, 0)
+ M.adjustOxyLoss(3)
+ if(prob(20))
+ M.emote("gasp")
+ ..()
+ return
+
+datum/reagent/toxin/slimejelly
+ name = "Slime Jelly"
+ id = "slimejelly"
+ description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
+ color = "#801E28" // rgb: 128, 30, 40
+ toxpwr = 0
+
+datum/reagent/toxin/slimejelly/on_mob_life(var/mob/living/M as mob)
+ if(prob(10))
+ M << "Your insides are burning!"
+ M.adjustToxLoss(rand(20,60)*REM)
+ else if(prob(40))
+ M.heal_organ_damage(5*REM,0)
+ ..()
+ return
+
+datum/reagent/toxin/cyanide
+ name = "Cyanide"
+ id = "cyanide"
+ description = "A highly toxic chemical."
+ color = "#CF3600" // rgb: 207, 54, 0
+ toxpwr = 3
+
+datum/reagent/toxin/cyanide/on_mob_life(var/mob/living/M as mob)
+ M.adjustOxyLoss(3*REM)
+ M.sleeping += 1
+ ..()
+ return
+
+datum/reagent/toxin/minttoxin
+ name = "Mint Toxin"
+ id = "minttoxin"
+ description = "Useful for dealing with undesirable customers."
+ color = "#CF3600" // rgb: 207, 54, 0
+ toxpwr = 0
+
+datum/reagent/toxin/minttoxin/on_mob_life(var/mob/living/M as mob)
+ if (FAT in M.mutations)
+ M.gib()
+ ..()
+ return
+
+datum/reagent/toxin/carpotoxin
+ name = "Carpotoxin"
+ id = "carpotoxin"
+ description = "A deadly neurotoxin produced by the dreaded spess carp."
+ color = "#003333" // rgb: 0, 51, 51
+ toxpwr = 2
+
+datum/reagent/toxin/zombiepowder
+ name = "Zombie Powder"
+ id = "zombiepowder"
+ description = "A strong neurotoxin that puts the subject into a death-like state."
+ reagent_state = SOLID
+ color = "#669900" // rgb: 102, 153, 0
+ toxpwr = 0.5
+
+datum/reagent/toxin/zombiepowder/on_mob_life(var/mob/living/carbon/M as mob)
+ M.status_flags |= FAKEDEATH
+ M.adjustOxyLoss(0.5*REM)
+ M.Weaken(5)
+ M.silent = max(M.silent, 5)
+ M.tod = worldtime2text()
+ ..()
+ return
+
+datum/reagent/toxin/zombiepowder/Del()
+ if(holder && ismob(holder.my_atom))
+ var/mob/M = holder.my_atom
+ M.status_flags &= ~FAKEDEATH
+ ..()
+
+datum/reagent/toxin/mindbreaker
+ name = "Mindbreaker Toxin"
+ id = "mindbreaker"
+ description = "A powerful hallucinogen. Not a thing to be messed with."
+ color = "#B31008" // rgb: 139, 166, 233
+ toxpwr = 0
+
+datum/reagent/toxin/mindbreaker/on_mob_life(var/mob/living/M)
+ M.hallucination += 10
+ ..()
+ return
+
+datum/reagent/toxin/plantbgone
+ name = "Plant-B-Gone"
+ id = "plantbgone"
+ description = "A harmful toxic mixture to kill plantlife. Do not ingest!"
+ color = "#49002E" // rgb: 73, 0, 46
+ toxpwr = 1
+
+datum/reagent/toxin/plantbgone/reaction_obj(var/obj/O, var/volume)
+ if(istype(O,/obj/structure/alien/weeds/))
+ var/obj/structure/alien/weeds/alien_weeds = O
+ alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
+ alien_weeds.healthcheck()
+ else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it
+ qdel(O)
+ else if(istype(O,/obj/effect/spacevine))
+ var/obj/effect/spacevine/SV = O
+ SV.on_chem_effect(src)
+
+datum/reagent/toxin/plantbgone/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+ src = null
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ if(!C.wear_mask) // If not wearing a mask
+ C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason
+
+datum/reagent/toxin/plantbgone/weedkiller
+ name = "Weed Killer"
+ id = "weedkiller"
+ description = "A harmful toxic mixture to kill weeds. Do not ingest!"
+ color = "#4B004B" // rgb: 75, 0, 75
+
+
+datum/reagent/toxin/pestkiller
+ name = "Pest Killer"
+ id = "pestkiller"
+ description = "A harmful toxic mixture to kill pests. Do not ingest!"
+ color = "#4B004B" // rgb: 75, 0, 75
+ toxpwr = 1
+
+datum/reagent/toxin/pestkiller/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+ src = null
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ if(!C.wear_mask) // If not wearing a mask
+ C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason
+
+datum/reagent/toxin/stoxin
+ name = "Sleep Toxin"
+ id = "stoxin"
+ description = "An effective hypnotic used to treat insomnia."
+ color = "#E895CC" // rgb: 232, 149, 204
+ toxpwr = 0
+
+datum/reagent/toxin/stoxin/on_mob_life(var/mob/living/M as mob)
+ if(!data) data = 1
+ switch(data)
+ if(1 to 12)
+ if(prob(5)) M.emote("yawn")
+ if(12 to 15)
+ M.eye_blurry = max(M.eye_blurry, 10)
+ if(15 to 25)
+ M.drowsyness = max(M.drowsyness, 20)
+ if(25 to INFINITY)
+ M.Paralyse(20)
+ M.drowsyness = max(M.drowsyness, 30)
+ data++
+ ..()
+ return
+
+
+datum/reagent/toxin/spore
+ name = "Spore Toxin"
+ id = "spore"
+ description = "A toxic spore cloud which blocks vision when ingested."
+ color = "#9ACD32"
+ toxpwr = 0.5
+
+datum/reagent/toxin/spore/on_mob_life(var/mob/living/M as mob)
+ M.damageoverlaytemp = 60
+ M.eye_blurry = max(M.eye_blurry, 3)
+ ..()
+ return
+
+
+datum/reagent/toxin/spore_burning
+ name = "Burning Spore Toxin"
+ id = "spore_burning"
+ description = "A burning spore cloud."
+ color = "#9ACD32"
+ toxpwr = 0.5
+
+datum/reagent/toxin/spore_burning/on_mob_life(var/mob/living/M as mob)
+ ..()
+ M.adjust_fire_stacks(2)
+ M.IgniteMob()
+
+datum/reagent/toxin/chloralhydrate
+ name = "Chloral Hydrate"
+ id = "chloralhydrate"
+ description = "A powerful sedative."
+ reagent_state = SOLID
+ color = "#000067" // rgb: 0, 0, 103
+ toxpwr = 0
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/toxin/chloralhydrate/on_mob_life(var/mob/living/M as mob)
+ if(!data)
+ data = 1
+ data++
+ switch(data)
+ if(1 to 10)
+ M.confused += 2
+ M.drowsyness += 2
+ if(10 to 50)
+ M.sleeping += 1
+ if(51 to INFINITY)
+ M.sleeping += 1
+ M.adjustToxLoss((data - 50)*REM)
+ ..()
+ return
+
+datum/reagent/toxin/beer2 //disguised as normal beer for use by emagged brobots
+ name = "Beer"
+ id = "beer2"
+ description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
+ color = "#664300" // rgb: 102, 67, 0
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/toxin/beer2/on_mob_life(var/mob/living/M as mob)
+ if(!data)
+ data = 1
+ switch(data)
+ if(1 to 50)
+ M.sleeping += 1
+ if(51 to INFINITY)
+ M.sleeping += 1
+ M.adjustToxLoss((data - 50)*REM)
+ data++
+ ..()
+ return
+
+
+
+//ACID
+
+
+datum/reagent/toxin/acid
+ name = "Sulphuric acid"
+ id = "sacid"
+ description = "A strong mineral acid with the molecular formula H2SO4."
+ color = "#DB5008" // rgb: 219, 80, 8
+ toxpwr = 1
+ var/acidpwr = 10 //the amount of protection removed from the armour
+
+datum/reagent/toxin/acid/reaction_mob(var/mob/living/carbon/C, var/method=TOUCH, var/volume)
+ if(!istype(C))
+ return
+ if(method != TOUCH)
+ if(!C.unacidable)
+ C.take_organ_damage(min(6*toxpwr, volume * toxpwr))
+ return
+
+ C.acid_act(acidpwr, toxpwr, volume)
+
+datum/reagent/toxin/acid/reaction_obj(var/obj/O, var/volume)
+ if(istype(O.loc, /mob)) //handled in human acid_act()
+ return
+ O.acid_act(acidpwr, toxpwr, volume)
+
+datum/reagent/toxin/acid/polyacid
+ name = "Polytrinic acid"
+ id = "pacid"
+ description = "Polytrinic acid is a an extremely corrosive chemical substance."
+ color = "#8E18A9" // rgb: 142, 24, 169
+ toxpwr = 2
+ acidpwr = 20
+
+datum/reagent/toxin/coffeepowder
+ name = "Coffee Grounds"
+ id = "coffeepowder"
+ description = "Finely ground coffee beans, used to make coffee."
+ reagent_state = SOLID
+ color = "#5B2E0D" // rgb: 91, 46, 13
+ toxpwr = 0.5
+
+datum/reagent/toxin/teapowder
+ name = "Ground Tea Leaves"
+ id = "teapowder"
+ description = "Finely shredded tea leaves, used for making tea."
+ reagent_state = SOLID
+ color = "#7F8400" // rgb: 127, 132, 0
+ toxpwr = 0.5
+
+datum/reagent/toxin/mutetoxin //the new zombie powder.
+ name = "Mute Toxin"
+ id = "mutetoxin"
+ description = "A toxin that temporarily paralyzes the vocal cords."
+ color = "#F0F8FF" // rgb: 240, 248, 255
+ toxpwr = 0
+
+datum/reagent/toxin/mutetoxin/on_mob_life(mob/living/carbon/M)
+ M.silent += REM + 1 //If this var is increased by one or less, it will have no effect since silent is decreased right after reagents are handled in Life(). Hence the + 1.
+ ..()
+
+datum/reagent/toxin/staminatoxin
+ name = "Tirizene"
+ id = "tirizene"
+ description = "A toxin that affects the stamina of a person when injected into the bloodstream."
+ color = "#6E2828"
+ data = 13
+ toxpwr = 0
+
+datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/M)
+ M.adjustStaminaLoss(REM * data)
+ data = max(data - 1, 3)
+ ..()
+
+
+// Undefine the alias for REAGENTS_EFFECT_MULTIPLER
+#undef REM
\ No newline at end of file
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index a19eaff4eb4..958ed65f986 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -17,6 +17,19 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
var/efficiency_coeff
reagents = new()
+ var/list/categories = list(
+ "AI Modules",
+ "Computer Boards",
+ "Teleportation Machinery",
+ "Medical Machinery",
+ "Engineering Machinery",
+ "Exosuit Modules",
+ "Hydroponics Machinery",
+ "Subspace Telecomms",
+ "Research Machinery",
+ "Misc. Machinery"
+ )
+
/obj/machinery/r_n_d/circuit_imprinter/New()
..()
component_parts = list()
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 875504431b4..9be7c88ea13 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -149,7 +149,7 @@ datum/design/drill_diamond
build_type = PROTOLATHE
materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
reliability = 79
- build_path = /obj/item/weapon/pickaxe/diamonddrill
+ build_path = /obj/item/weapon/pickaxe/drill/diamonddrill
/////////////////////////////////////////
//////////////Blue Space/////////////////
diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm
index d91e8efb90a..9915b0eb92c 100644
--- a/code/modules/research/designs/AI_module_designs.dm
+++ b/code/modules/research/designs/AI_module_designs.dm
@@ -2,79 +2,89 @@
//////////AI Module Disks//////////
///////////////////////////////////
-datum/design/safeguard_module
- name = "AI Module(Safeguard)"
+
+/datum/design/safeguard_module
+ name = "Module Design (Safeguard)"
desc = "Allows for the construction of a Safeguard AI Module."
id = "safeguard_module"
req_tech = list("programming" = 3, "materials" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/supplied/safeguard
+ category = list("AI Modules")
-datum/design/onehuman_module
- name = "AI Module (OneHuman)"
+/datum/design/onehuman_module
+ name = "Module Design (OneHuman)"
desc = "Allows for the construction of a OneHuman AI Module."
id = "onehuman_module"
req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/zeroth/oneHuman
+ category = list("AI Modules")
-datum/design/protectstation_module
- name = "AI Module (ProtectStation)"
+/datum/design/protectstation_module
+ name = "Module Design (ProtectStation)"
desc = "Allows for the construction of a ProtectStation AI Module."
id = "protectstation_module"
req_tech = list("programming" = 3, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/supplied/protectStation
+ category = list("AI Modules")
-datum/design/quarantine_module
- name = "AI Module (Quarantine)"
+/datum/design/quarantine_module
+ name = "Module Design (Quarantine)"
desc = "Allows for the construction of a Quarantine AI Module."
id = "quarantine_module"
req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/supplied/quarantine
+ category = list("AI Modules")
-datum/design/oxygen_module
- name = "AI Module (OxygenIsToxicToHumans)"
+
+/datum/design/oxygen_module
+ name = "Module Design (OxygenIsToxicToHumans)"
desc = "Allows for the construction of a Safeguard AI Module."
id = "oxygen_module"
req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/supplied/oxygen
+ category = list("AI Modules")
-datum/design/freeform_module
- name = "AI Module (Freeform)"
+/datum/design/freeform_module
+ name = "Module Design (Freeform)"
desc = "Allows for the construction of a Freeform AI Module."
id = "freeform_module"
req_tech = list("programming" = 4, "materials" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/supplied/freeform
+ category = list("AI Modules")
-datum/design/reset_module
- name = "AI Module (Reset)"
+/datum/design/reset_module
+ name = "Module Design (Reset)"
desc = "Allows for the construction of a Reset AI Module."
id = "reset_module"
req_tech = list("programming" = 3, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/reset
+ category = list("AI Modules")
-datum/design/purge_module
- name = "AI Module (Purge)"
+/datum/design/purge_module
+ name = "Module Design (Purge)"
desc = "Allows for the construction of a Purge AI Module."
id = "purge_module"
req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/reset/purge
+ category = list("AI Modules")
-datum/design/freeformcore_module
+/datum/design/freeformcore_module
name = "AI Core Module (Freeform)"
desc = "Allows for the construction of a Freeform AI Core Module."
id = "freeformcore_module"
@@ -82,48 +92,54 @@ datum/design/freeformcore_module
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/core/freeformcore
+ category = list("AI Modules")
-datum/design/asimov
- name = "AI Core Module (Asimov)"
+/datum/design/asimov
+ name = "Core Module Design (Asimov)"
desc = "Allows for the construction of a Asimov AI Core Module."
id = "asimov_module"
req_tech = list("programming" = 3, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/core/full/asimov
+ category = list("AI Modules")
-datum/design/paladin_module
- name = "AI Core Module (P.A.L.A.D.I.N.)"
+/datum/design/paladin_module
+ name = "Core Module Design (P.A.L.A.D.I.N.)"
desc = "Allows for the construction of a P.A.L.A.D.I.N. AI Core Module."
id = "paladin_module"
req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/core/full/paladin
+ category = list("AI Modules")
-datum/design/tyrant_module
- name = "AI Core Module (T.Y.R.A.N.T.)"
+/datum/design/tyrant_module
+ name = "Core Module Design (T.Y.R.A.N.T.)"
desc = "Allows for the construction of a T.Y.R.A.N.T. AI Module."
id = "tyrant_module"
req_tech = list("programming" = 4, "syndicate" = 2, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/core/full/tyrant
+ category = list("AI Modules")
-datum/design/corporate_module
- name = "AI Core Module (Corporate)"
+/datum/design/corporate_module
+ name = "Core Module Design (Corporate)"
desc = "Allows for the construction of a Corporate AI Core Module."
id = "corporate_module"
req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/core/full/corp
+ category = list("AI Modules")
-datum/design/custom_module
- name = "AI Core Module (Custom)"
+/datum/design/custom_module
+ name = "Core Module Design (Custom)"
desc = "Allows for the construction of a Custom AI Core Module."
id = "custom_module"
req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
- build_path = /obj/item/weapon/aiModule/core/full/custom
\ No newline at end of file
+ build_path = /obj/item/weapon/aiModule/core/full/custom
+ category = list("AI Modules")
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
new file mode 100644
index 00000000000..8eca25e1066
--- /dev/null
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -0,0 +1,492 @@
+///////////////////////////////////
+//////////Autolathe Designs ///////
+///////////////////////////////////
+
+/datum/design/bucket
+ name = "Bucket"
+ id = "bucket"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 200)
+ build_path = /obj/item/weapon/reagent_containers/glass/bucket
+ category = list("initial","Tools")
+
+/datum/design/crowbar
+ name = "Pocket crowbar"
+ id = "crowbar"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50)
+ build_path = /obj/item/weapon/crowbar
+ category = list("initial","Tools")
+
+/datum/design/flashlight
+ name = "Flashlight"
+ id = "flashlight"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 20)
+ build_path = /obj/item/device/flashlight
+ category = list("initial","Tools")
+
+/datum/design/extinguisher
+ name = "Fire extinguisher"
+ id = "extinguisher"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 90)
+ build_path = /obj/item/weapon/extinguisher
+ category = list("initial","Tools")
+
+/datum/design/multitool
+ name = "Multitool"
+ id = "multitool"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 20)
+ build_path = /obj/item/device/multitool
+ category = list("initial","Tools")
+
+/datum/design/analyzer
+ name = "Analyzer"
+ id = "analyzer"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30, "$glass" = 20)
+ build_path = /obj/item/device/analyzer
+ category = list("initial","Tools")
+
+/datum/design/tscanner
+ name = "T-ray scanner"
+ id = "tscanner"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 150)
+ build_path = /obj/item/device/t_scanner
+ category = list("initial","Tools")
+
+/datum/design/weldingtool
+ name = "Welding tool"
+ id = "welding_tool"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 70, "$glass" = 20)
+ build_path = /obj/item/weapon/weldingtool
+ category = list("initial","Tools")
+
+/datum/design/screwdriver
+ name = "Screwdriver"
+ id = "screwdriver"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 75)
+ build_path = /obj/item/weapon/screwdriver
+ category = list("initial","Tools")
+
+/datum/design/wirecutters
+ name = "Wirecutters"
+ id = "wirecutters"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 80)
+ build_path = /obj/item/weapon/wirecutters
+ category = list("initial","Tools")
+
+/datum/design/wrench
+ name = "Wrench"
+ id = "wrench"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 150)
+ build_path = /obj/item/weapon/wrench
+ category = list("initial","Tools")
+
+/datum/design/welding_helmet
+ name = "Welding helmet"
+ id = "welding_helmet"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 1750, "$glass" = 400)
+ build_path = /obj/item/clothing/head/welding
+ category = list("initial","Tools")
+
+/datum/design/console_screen
+ name = "Console screen"
+ id = "console_screen"
+ build_type = AUTOLATHE
+ materials = list("$glass" = 200)
+ build_path = /obj/item/weapon/stock_parts/console_screen
+ category = list("initial", "Electronics")
+
+/datum/design/airlock_board
+ name = "Airlock electronics"
+ id = "airlock_board"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/weapon/airlock_electronics
+ category = list("initial", "Electronics")
+
+/datum/design/airalarm_electronics
+ name = "Air alarm electronics"
+ id = "airalarm_electronics"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/weapon/airalarm_electronics
+ category = list("initial", "Electronics")
+
+/datum/design/firealarm_electronics
+ name = "Fire alarm electronics"
+ id = "firealarm_electronics"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/weapon/firealarm_electronics
+ category = list("initial", "Electronics")
+
+/datum/design/pipe_painter
+ name = "Pipe painter"
+ id = "pipe_painter"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 5000, "$glass" = 2000)
+ build_path = /obj/item/device/pipe_painter
+ category = list("initial", "Misc")
+
+/datum/design/metal
+ name = "Metal"
+ id = "metal"
+ build_type = AUTOLATHE
+ materials = list("$metal" = MINERAL_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/metal
+ category = list("initial","Construction")
+
+/datum/design/glass
+ name = "Glass"
+ id = "glass"
+ build_type = AUTOLATHE
+ materials = list("$glass" = MINERAL_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/glass
+ category = list("initial","Construction")
+
+/datum/design/rglass
+ name = "Reinforced glass"
+ id = "rglass"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 1000, "$glass" = MINERAL_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/rglass
+ category = list("initial","Construction")
+
+/datum/design/rods
+ name = "Metal rod"
+ id = "rods"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 1000)
+ build_path = /obj/item/stack/rods
+ category = list("initial","Construction")
+
+/datum/design/rcd_ammo
+ name = "Compressed matter cardridge"
+ id = "rcd_ammo"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 16000, "$glass"=8000)
+ build_path = /obj/item/weapon/rcd_ammo
+ category = list("initial","Construction")
+
+/datum/design/kitchen_knife
+ name = "Kitchen knife"
+ id = "kitchen_knife"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 12000)
+ build_path = /obj/item/weapon/kitchenknife
+ category = list("initial","Misc")
+
+/datum/design/scalpel
+ name = "Scalpel"
+ id = "scalpel"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 4000, "$glass" = 1000)
+ build_path = /obj/item/weapon/scalpel
+ category = list("initial", "Medical")
+
+/datum/design/circular_saw
+ name = "Circular saw"
+ id = "circular_saw"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 10000, "$glass" = 6000)
+ build_path = /obj/item/weapon/circular_saw
+ category = list("initial", "Medical")
+
+/datum/design/surgicaldrill
+ name = "Surgical drill"
+ id = "surgicaldrill"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 10000, "$glass" = 6000)
+ build_path = /obj/item/weapon/surgicaldrill
+ category = list("initial", "Medical")
+
+/datum/design/retractor
+ name = "Retractor"
+ id = "retractor"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 6000, "$glass" = 3000)
+ build_path = /obj/item/weapon/
+ category = list("initial", "Medical")
+
+/datum/design/cautery
+ name = "Cautery"
+ id = "cautery"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 2500, "$glass" = 750)
+ build_path = /obj/item/weapon/cautery
+ category = list("initial", "Medical")
+
+/datum/design/hemostat
+ name = "Hemostat"
+ id = "hemostat"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 5000, "$glass" = 2500)
+ build_path = /obj/item/weapon/hemostat
+ category = list("initial", "Medical")
+
+/datum/design/beaker
+ name = "Beaker"
+ id = "beaker"
+ build_type = AUTOLATHE
+ materials = list("$glass" = 500)
+ build_path = /obj/item/weapon/reagent_containers/glass/beaker
+ category = list("initial", "Medical")
+
+/datum/design/large_beaker
+ name = "Large beaker"
+ id = "large_beaker"
+ build_type = AUTOLATHE
+ materials = list("$glass" = 2500)
+ build_path = /obj/item/weapon/reagent_containers/glass/beaker/large
+ category = list("initial", "Medical")
+
+/datum/design/beanbag_slug
+ name = "Beanbag slug"
+ id = "beanbag_slug"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 250)
+ build_path = /obj/item/ammo_casing/shotgun/beanbag
+ category = list("initial", "Security")
+
+/datum/design/c38
+ name = "Speed loader (.38)"
+ id = "c38"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/ammo_box/c38
+ category = list("initial", "Security")
+
+/datum/design/recorder
+ name = "Universal recorder"
+ id = "recorder"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 60, "$glass" = 30)
+ build_path = /obj/item/device/taperecorder/empty
+ category = list("initial", "Misc")
+
+/datum/design/tape
+ name = "Tape"
+ id = "tape"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 20, "$glass" = 5)
+ build_path = /obj/item/device/tape
+ category = list("initial", "Misc")
+
+/datum/design/igniter
+ name = "Igniter"
+ id = "igniter"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 500, "$glass" = 50)
+ build_path = /obj/item/device/assembly/igniter
+ category = list("initial", "Misc")
+
+/datum/design/signaler
+ name = "Remote signaling device"
+ id = "signaler"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 400, "$glass" = 120)
+ build_path = /obj/item/device/assembly/signaler
+ category = list("initial", "T-Comm")
+
+/datum/design/radio_headset
+ name = "Radio headset"
+ id = "radio_headset"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 75)
+ build_path = /obj/item/device/radio/headset
+ category = list("initial", "T-Comm")
+
+/datum/design/bounced_radio
+ name = "Station bounced radio"
+ id = "bounced_radio"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 75, "$glass" = 25)
+ build_path = /obj/item/device/radio/off
+ category = list("initial", "T-Comm")
+
+/datum/design/infrared_emitter
+ name = "Infrared emitter"
+ id = "infrared_emitter"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 1000, "$glass" = 500)
+ build_path = /obj/item/device/assembly/infra
+ category = list("initial", "Misc")
+
+/datum/design/timer
+ name = "Timer"
+ id = "timer"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 500, "$glass" = 50)
+ build_path = /obj/item/device/assembly/timer
+ category = list("initial", "Misc")
+
+/datum/design/voice_analyser
+ name = "Voice analyser"
+ id = "voice_analyser"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 500, "$glass" = 50)
+ build_path = /obj/item/device/assembly/voice
+ category = list("initial", "Misc")
+
+/datum/design/light_tube
+ name = "Light tube"
+ id = "light_tube"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 60, "$glass" = 100)
+ build_path = /obj/item/weapon/light/tube
+ category = list("initial", "Construction")
+
+/datum/design/light_bulb
+ name = "Light bulb"
+ id = "light_bulb"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 60, "$glass" = 100)
+ build_path = /obj/item/weapon/light/bulb
+ category = list("initial", "Construction")
+
+/datum/design/camera_assembly
+ name = "Camera assembly"
+ id = "camera_assembly"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 400, "$glass" = 250)
+ build_path = /obj/item/weapon/camera_assembly
+ category = list("initial", "Construction")
+
+/datum/design/newscaster_frame
+ name = "Newscaster frame"
+ id = "newscaster_frame"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 14000, "$glass" = 8000)
+ build_path = /obj/item/newscaster_frame
+ category = list("initial", "Construction")
+
+/datum/design/syringe
+ name = "Syringe"
+ id = "syringe"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 10, "$glass" = 20)
+ build_path = /obj/item/weapon/reagent_containers/syringe
+ category = list("initial", "Medical")
+
+/datum/design/prox_sensor
+ name = "Proximity sensor"
+ id = "prox_sensor"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 800, "$glass" = 200)
+ build_path = /obj/item/device/assembly/prox_sensor
+ category = list("initial", "Misc")
+
+//hacked autolathe recipes
+/datum/design/flamethrower
+ name = "Flamethrower"
+ id = "flamethrower"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 500)
+ build_path = /obj/item/weapon/flamethrower/full
+ category = list("hacked", "Weapons and ammo")
+
+/datum/design/rcd
+ name = "Rapid construction device (RCD)"
+ id = "rcd"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/weapon/rcd
+ category = list("hacked", "Construction")
+
+/datum/design/electropack
+ name = "Electropack"
+ id = "electropack"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 10000, "$glass" = 2500)
+ build_path = /obj/item/device/electropack
+ category = list("hacked", "Tools")
+
+/datum/design/large_welding_tool
+ name = "Industrial welding tool"
+ id = "large_welding_tool"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 70, "$glass" = 60)
+ build_path = /obj/item/weapon/weldingtool/largetank
+ category = list("hacked", "Tools")
+
+/datum/design/handcuffs
+ name = "Handcuffs"
+ id = "handcuffs"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 500)
+ build_path = /obj/item/weapon/restraints/handcuffs
+ category = list("hacked", "Security")
+
+/datum/design/shotgun_slug
+ name = "Shotgun slug"
+ id = "shotgun_slug"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 4000)
+ build_path = /obj/item/ammo_casing/shotgun
+ category = list("hacked", "Security")
+
+/datum/design/buckshot_shell
+ name = "Buckshot shell"
+ id = "buckshot_shell"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 4000)
+ build_path = /obj/item/ammo_casing/shotgun/buckshot
+ category = list("hacked", "Security")
+
+/datum/design/shotgun_dart
+ name = "Shotgun dart"
+ id = "shotgun_dart"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 4000)
+ build_path = /obj/item/ammo_casing/shotgun/dart
+ category = list("hacked", "Security")
+
+/datum/design/incendiary_slug
+ name = "Incendiary slug"
+ id = "incendiary_slug"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 4000)
+ build_path = /obj/item/ammo_casing/shotgun/incendiary
+ category = list("hacked", "Security")
+
+/datum/design/a357
+ name = "Ammo box (.357)"
+ id = "a357"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/ammo_box/a357
+ category = list("hacked", "Security")
+
+/datum/design/c10mm
+ name = "Ammo box (10mm)"
+ id = "c10mm"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/ammo_box/c10mm
+ category = list("hacked", "Security")
+
+/datum/design/c45
+ name = "Ammo box (.45)"
+ id = "c45"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/ammo_box/c45
+ category = list("hacked", "Security")
+
+/datum/design/c9mm
+ name = "Ammo box (9mm)"
+ id = "c9mm"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/ammo_box/c9mm
+ category = list("hacked", "Security")
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 599e9700966..297a1eaa353 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -1,6 +1,6 @@
///////////////////Computer Boards///////////////////////////////////
-datum/design/seccamera
+/datum/design/seccamera
name = "Computer Design (Security)"
desc = "Allows for the construction of circuit boards used to build security camera computers."
id = "seccamera"
@@ -8,8 +8,9 @@ datum/design/seccamera
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/security
+ category = list("Computer Boards")
-datum/design/aicore
+/datum/design/aicore
name = "AI Design (AI Core)"
desc = "Allows for the construction of circuit boards used to build new AI cores."
id = "aicore"
@@ -17,8 +18,9 @@ datum/design/aicore
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/aicore
+ category = list("Computer Boards")
-datum/design/aiupload
+/datum/design/aiupload
name = "Computer Design (AI Upload)"
desc = "Allows for the construction of circuit boards used to build an AI Upload Console."
id = "aiupload"
@@ -26,8 +28,9 @@ datum/design/aiupload
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/aiupload
+ category = list("Computer Boards")
-datum/design/borgupload
+/datum/design/borgupload
name = "Computer Design (Cyborg Upload)"
desc = "Allows for the construction of circuit boards used to build a Cyborg Upload Console."
id = "borgupload"
@@ -35,8 +38,9 @@ datum/design/borgupload
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/borgupload
+ category = list("Computer Boards")
-datum/design/med_data
+/datum/design/med_data
name = "Computer Design (Medical Records)"
desc = "Allows for the construction of circuit boards used to build a medical records console."
id = "med_data"
@@ -44,8 +48,9 @@ datum/design/med_data
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/med_data
+ category = list("Computer Boards")
-datum/design/operating
+/datum/design/operating
name = "Computer Design (Operating Computer)"
desc = "Allows for the construction of circuit boards used to build an operating computer console."
id = "operating"
@@ -53,8 +58,9 @@ datum/design/operating
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/operating
+ category = list("Computer Boards")
-datum/design/pandemic
+/datum/design/pandemic
name = "Computer Design (PanD.E.M.I.C. 2200)"
desc = "Allows for the construction of circuit boards used to build a PanD.E.M.I.C. 2200 console."
id = "pandemic"
@@ -62,8 +68,9 @@ datum/design/pandemic
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/pandemic
+ category = list("Computer Boards")
-datum/design/scan_console
+/datum/design/scan_console
name = "Computer Design (DNA Machine)"
desc = "Allows for the construction of circuit boards used to build a new DNA scanning console."
id = "scan_console"
@@ -71,8 +78,9 @@ datum/design/scan_console
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/scan_consolenew
+ category = list("Computer Boards")
-datum/design/comconsole
+/datum/design/comconsole
name = "Computer Design (Communications)"
desc = "Allows for the construction of circuit boards used to build a communications console."
id = "comconsole"
@@ -80,8 +88,9 @@ datum/design/comconsole
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/communications
+ category = list("Computer Boards")
-datum/design/idcardconsole
+/datum/design/idcardconsole
name = "Computer Design (ID Console)"
desc = "Allows for the construction of circuit boards used to build an ID computer."
id = "idcardconsole"
@@ -89,8 +98,9 @@ datum/design/idcardconsole
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/card
+ category = list("Computer Boards")
-datum/design/crewconsole
+/datum/design/crewconsole
name = "Computer Design (Crew monitoring computer)"
desc = "Allows for the construction of circuit boards used to build a Crew monitoring computer."
id = "crewconsole"
@@ -98,8 +108,9 @@ datum/design/crewconsole
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/crew
+ category = list("Computer Boards")
-datum/design/teleconsole
+/datum/design/teleconsole
name = "Computer Design (Teleporter Console)"
desc = "Allows for the construction of circuit boards used to build a teleporter control console."
id = "teleconsole"
@@ -107,8 +118,9 @@ datum/design/teleconsole
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/teleporter
+ category = list("Computer Boards")
-datum/design/secdata
+/datum/design/secdata
name = "Computer Design (Security Records Console)"
desc = "Allows for the construction of circuit boards used to build a security records console."
id = "secdata"
@@ -116,8 +128,9 @@ datum/design/secdata
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/secure_data
+ category = list("Computer Boards")
-datum/design/atmosalerts
+/datum/design/atmosalerts
name = "Computer Design (Atmosphere Alert)"
desc = "Allows for the construction of circuit boards used to build an atmosphere alert console."
id = "atmosalerts"
@@ -125,8 +138,9 @@ datum/design/atmosalerts
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/atmos_alert
+ category = list("Computer Boards")
-datum/design/air_management
+/datum/design/air_management
name = "Computer Design (Atmospheric Monitor)"
desc = "Allows for the construction of circuit boards used to build an Atmospheric Monitor."
id = "air_management"
@@ -134,8 +148,9 @@ datum/design/air_management
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/air_management
+ category = list("Computer Boards")
-datum/design/robocontrol
+/datum/design/robocontrol
name = "Computer Design (Robotics Control Console)"
desc = "Allows for the construction of circuit boards used to build a Robotics Control console."
id = "robocontrol"
@@ -143,8 +158,9 @@ datum/design/robocontrol
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/robotics
+ category = list("Computer Boards")
-datum/design/clonecontrol
+/datum/design/clonecontrol
name = "Computer Design (Cloning Machine Console)"
desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console."
id = "clonecontrol"
@@ -152,8 +168,9 @@ datum/design/clonecontrol
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/cloning
+ category = list("Computer Boards")
-datum/design/clonepod
+/datum/design/clonepod
name = "Machine Design (Clone Pod)"
desc = "Allows for the construction of circuit boards used to build a Cloning Pod."
id = "clonepod"
@@ -161,8 +178,9 @@ datum/design/clonepod
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/clonepod
+ category = list("Computer Boards")
-datum/design/clonescanner
+/datum/design/clonescanner
name = "Machine Design (Cloning Scanner)"
desc = "Allows for the construction of circuit boards used to build a Cloning Scanner."
id = "clonescanner"
@@ -170,8 +188,9 @@ datum/design/clonescanner
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/clonescanner
+ category = list("Computer Boards")
-datum/design/arcadebattle
+/datum/design/arcadebattle
name = "Computer Design (Battle Arcade Machine)"
desc = "Allows for the construction of circuit boards used to build a new arcade machine."
id = "arcademachine"
@@ -179,8 +198,9 @@ datum/design/arcadebattle
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/arcade/battle
+ category = list("Computer Boards")
-datum/design/orion_trail
+/datum/design/orion_trail
name = "Computer Design (Orion Trail Arcade Machine)"
desc = "Allows for the construction of circuit boards used to build a new Orion Trail machine."
id = "arcademachine"
@@ -188,8 +208,9 @@ datum/design/orion_trail
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/arcade/orion_trail
+ category = list("Computer Boards")
-datum/design/orion_trail
+/datum/design/orion_trail
name = "Computer Design (Slot Machine)"
desc = "Allows for the construction of circuit boards used to build a new slot machine."
id = "slotmachine"
@@ -197,8 +218,9 @@ datum/design/orion_trail
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/slot_machine
+ category = list("Computer Boards")
-datum/design/powermonitor
+/datum/design/powermonitor
name = "Computer Design (Power Monitor)"
desc = "Allows for the construction of circuit boards used to build a new power monitor."
id = "powermonitor"
@@ -206,8 +228,9 @@ datum/design/powermonitor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/powermonitor
+ category = list("Computer Boards")
-datum/design/solarcontrol
+/datum/design/solarcontrol
name = "Computer Design (Solar Control)"
desc = "Allows for the construction of circuit boards used to build a solar control console."
id = "solarcontrol"
@@ -215,8 +238,9 @@ datum/design/solarcontrol
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/solar_control
+ category = list("Computer Boards")
-datum/design/prisonmanage
+/datum/design/prisonmanage
name = "Computer Design (Prisoner Management Console)"
desc = "Allows for the construction of circuit boards used to build a prisoner management console."
id = "prisonmanage"
@@ -224,8 +248,9 @@ datum/design/prisonmanage
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/prisoner
+ category = list("Computer Boards")
-datum/design/mechacontrol
+/datum/design/mechacontrol
name = "Computer Design (Exosuit Control Console)"
desc = "Allows for the construction of circuit boards used to build an exosuit control console."
id = "mechacontrol"
@@ -233,8 +258,9 @@ datum/design/mechacontrol
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha_control
+ category = list("Computer Boards")
-datum/design/mechapower
+/datum/design/mechapower
name = "Computer Design (Mech Bay Power Control Console)"
desc = "Allows for the construction of circuit boards used to build a mech bay power control console."
id = "mechapower"
@@ -242,8 +268,9 @@ datum/design/mechapower
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mech_bay_power_console
+ category = list("Computer Boards")
-datum/design/rdconsole
+/datum/design/rdconsole
name = "Computer Design (R&D Console)"
desc = "Allows for the construction of circuit boards used to build a new R&D console."
id = "rdconsole"
@@ -251,8 +278,9 @@ datum/design/rdconsole
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/rdconsole
+ category = list("Computer Boards")
-datum/design/ordercomp
+/datum/design/ordercomp
name = "Computer Design (Supply ordering console)"
desc = "Allows for the construction of circuit boards used to build a Supply ordering console."
id = "ordercomp"
@@ -260,8 +288,9 @@ datum/design/ordercomp
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/ordercomp
+ category = list("Computer Boards")
-datum/design/supplycomp
+/datum/design/supplycomp
name = "Computer Design (Supply shuttle console)"
desc = "Allows for the construction of circuit boards used to build a Supply shuttle console."
id = "supplycomp"
@@ -269,8 +298,9 @@ datum/design/supplycomp
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/supplycomp
+ category = list("Computer Boards")
-datum/design/mining
+/datum/design/mining
name = "Computer Design (Outpost Status Display)"
desc = "Allows for the construction of circuit boards used to build an outpost status display console."
id = "mining"
@@ -278,8 +308,9 @@ datum/design/mining
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mining
+ category = list("Computer Boards")
-datum/design/comm_monitor
+/datum/design/comm_monitor
name = "Computer Design (Telecommunications Monitoring Console)"
desc = "Allows for the construction of circuit boards used to build a telecommunications monitor."
id = "comm_monitor"
@@ -287,8 +318,9 @@ datum/design/comm_monitor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/comm_monitor
+ category = list("Computer Boards")
-datum/design/comm_server
+/datum/design/comm_server
name = "Computer Design (Telecommunications Server Monitoring Console)"
desc = "Allows for the construction of circuit boards used to build a telecommunication server browser and monitor."
id = "comm_server"
@@ -296,8 +328,9 @@ datum/design/comm_server
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/comm_server
+ category = list("Computer Boards")
-datum/design/message_monitor
+/datum/design/message_monitor
name = "Computer Design (Messaging Monitor Console)"
desc = "Allows for the construction of circuit boards used to build a messaging monitor console."
id = "message_monitor"
@@ -305,8 +338,9 @@ datum/design/message_monitor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/message_monitor
+ category = list("Computer Boards")
-datum/design/comm_traffic
+/datum/design/comm_traffic
name = "Computer Design (Telecommunications Traffic Control Console)"
desc = "Allows for the construction of circuit boards used to build a telecommunications traffic control console."
id = "comm_traffic"
@@ -314,8 +348,9 @@ datum/design/comm_traffic
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/comm_traffic
+ category = list("Computer Boards")
-datum/design/telesci_console
+/datum/design/telesci_console
name = "Computer Design (Telepad Control Console Board)"
desc = "Allows for the construction of circuit boards used to build a telescience console."
id = "telesci_console"
@@ -323,12 +358,14 @@ datum/design/telesci_console
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telesci_console
+ category = list("Computer Boards")
-datum/design/aifixer
+/datum/design/aifixer
name = "Computer Design (AI Integrity Restorer)"
desc = "Allows for the construction of circuit boards used to build an AI Integrity Restorer."
id = "aifixer"
req_tech = list("programming" = 3, "biotech" = 2)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/aifixer
\ No newline at end of file
+ build_path = /obj/item/weapon/circuitboard/aifixer
+ category = list("Computer Boards")
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index bc0d01dd8fb..bcd39b203e3 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -2,7 +2,7 @@
//////////////MISC Boards///////////////
////////////////////////////////////////
-datum/design/smes
+/datum/design/smes
name = "Machine Design (SMES Board)"
desc = "The circuit board for a SMES."
id = "smes"
@@ -10,8 +10,9 @@ datum/design/smes
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/smes
+ category = list ("Engineering Machinery")
-datum/design/turbine_computer
+/datum/design/turbine_computer
name = "Computer Design (Power Turbine Console Board)"
desc = "The circuit board for a power turbine console."
id = "power_turbine_console"
@@ -19,8 +20,9 @@ datum/design/turbine_computer
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/turbine_computer
+ category = list ("Engineering Machinery")
-datum/design/power_compressor
+/datum/design/power_compressor
name = "Machine Design (Power Compressor Board)"
desc = "The circuit board for a power compressor."
id = "power_compressor"
@@ -28,8 +30,9 @@ datum/design/power_compressor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/power_compressor
+ category = list ("Engineering Machinery")
-datum/design/power_turbine
+/datum/design/power_turbine
name = "Machine Design (Power Turbine Board)"
desc = "The circuit board for a power turbine."
id = "power_turbine"
@@ -37,53 +40,9 @@ datum/design/power_turbine
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/power_turbine
+ category = list ("Engineering Machinery")
-datum/design/teleport_station
- name = "Machine Design (Teleportation Station Board)"
- desc = "The circuit board for a teleportation station."
- id = "tele_station"
- req_tech = list("programming" = 4, "bluespace" = 4, "engineering" = 4)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/teleporter_station
-
-datum/design/teleport_hub
- name = "Machine Design (Teleportation Hub Board)"
- desc = "The circuit board for a teleportation hub."
- id = "tele_hub"
- req_tech = list("programming" = 3, "bluespace" = 5, "materials" = 4, "engineering" = 5)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/teleporter_hub
-
-datum/design/telepad
- name = "Machine Design (Telepad Board)"
- desc = "The circuit board for a telescience telepad."
- id = "telepad"
- req_tech = list("programming" = 4, "bluespace" = 4, "materials" = 3, "engineering" = 3)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/telesci_pad
-
-datum/design/sleeper
- name = "Machine Design (Sleeper Board)"
- desc = "The circuit board for a sleeper."
- id = "sleeper"
- req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3, "engineering" = 3)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/sleeper
-
-datum/design/cryotube
- name = "Machine Design (Cryotube Board)"
- desc = "The circuit board for a cryotube."
- id = "cryotube"
- req_tech = list("programming" = 4, "biotech" = 3, "engineering" = 4)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/cryo_tube
-
-datum/design/thermomachine
+/datum/design/thermomachine
name = "Machine Design (Freezer/Heater Board)"
desc = "The circuit board for a freezer/heater."
id = "thermomachine"
@@ -91,35 +50,59 @@ datum/design/thermomachine
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/thermomachine
+ category = list ("Engineering Machinery")
-datum/design/biogenerator
- name = "Machine Design (Biogenerator Board)"
- desc = "The circuit board for a biogenerator."
- id = "biogenerator"
- req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3)
+/datum/design/teleport_station
+ name = "Machine Design (Teleportation Station Board)"
+ desc = "The circuit board for a teleportation station."
+ id = "tele_station"
+ req_tech = list("programming" = 4, "bluespace" = 4, "engineering" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/biogenerator
+ build_path = /obj/item/weapon/circuitboard/teleporter_station
+ category = list ("Teleportation Machinery")
-datum/design/hydroponics
- name = "Machine Design (Hydroponics Tray Board)"
- desc = "The circuit board for a hydroponics tray."
- id = "hydro_tray"
- req_tech = list("programming" = 1, "biotech" = 1)
+/datum/design/teleport_hub
+ name = "Machine Design (Teleportation Hub Board)"
+ desc = "The circuit board for a teleportation hub."
+ id = "tele_hub"
+ req_tech = list("programming" = 3, "bluespace" = 5, "materials" = 4, "engineering" = 5)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/hydroponics
+ build_path = /obj/item/weapon/circuitboard/teleporter_hub
+ category = list ("Teleportation Machinery")
-datum/design/microwave
- name = "Machine Design (Microwave Board)"
- desc = "The circuit board for a microwave."
- id = "microwave"
- req_tech = list("programming" = 1)
+/datum/design/telepad
+ name = "Machine Design (Telepad Board)"
+ desc = "The circuit board for a telescience telepad."
+ id = "telepad"
+ req_tech = list("programming" = 4, "bluespace" = 4, "materials" = 3, "engineering" = 3)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/microwave
+ build_path = /obj/item/weapon/circuitboard/telesci_pad
+ category = list ("Teleportation Machinery")
-datum/design/chem_dispenser
+/datum/design/sleeper
+ name = "Machine Design (Sleeper Board)"
+ desc = "The circuit board for a sleeper."
+ id = "sleeper"
+ req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3, "engineering" = 3)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/sleeper
+ category = list ("Medical Machinery")
+
+/datum/design/cryotube
+ name = "Machine Design (Cryotube Board)"
+ desc = "The circuit board for a cryotube."
+ id = "cryotube"
+ req_tech = list("programming" = 4, "biotech" = 3, "engineering" = 4)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/cryo_tube
+ category = list ("Medical Machinery")
+
+/datum/design/chem_dispenser
name = "Machine Design (Portable Chem Dispenser Board)"
desc = "The circuit board for a portable chem dispenser."
id = "chem_dispenser"
@@ -127,8 +110,29 @@ datum/design/chem_dispenser
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/chem_dispenser
+ category = list ("Medical Machinery")
-datum/design/destructive_analyzer
+/datum/design/biogenerator
+ name = "Machine Design (Biogenerator Board)"
+ desc = "The circuit board for a biogenerator."
+ id = "biogenerator"
+ req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/biogenerator
+ category = list ("Hydroponics Machinery")
+
+/datum/design/hydroponics
+ name = "Machine Design (Hydroponics Tray Board)"
+ desc = "The circuit board for a hydroponics tray."
+ id = "hydro_tray"
+ req_tech = list("programming" = 1, "biotech" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/hydroponics
+ category = list ("Hydroponics Machinery")
+
+/datum/design/destructive_analyzer
name = "Machine Design (Destructive Analyzer Board)"
desc = "The circuit board for a destructive analyzer."
id = "destructive_analyzer"
@@ -136,8 +140,9 @@ datum/design/destructive_analyzer
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/destructive_analyzer
+ category = list("Research Machinery")
-datum/design/protolathe
+/datum/design/protolathe
name = "Machine Design (Protolathe Board)"
desc = "The circuit board for a protolathe."
id = "protolathe"
@@ -145,8 +150,9 @@ datum/design/protolathe
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/protolathe
+ category = list("Research Machinery")
-datum/design/circuit_imprinter
+/datum/design/circuit_imprinter
name = "Machine Design (Circuit Imprinter Board)"
desc = "The circuit board for a circuit imprinter."
id = "circuit_imprinter"
@@ -154,17 +160,9 @@ datum/design/circuit_imprinter
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/circuit_imprinter
+ category = list("Research Machinery")
-datum/design/autolathe
- name = "Machine Design (Autolathe Board)"
- desc = "The circuit board for an autolathe."
- id = "autolathe"
- req_tech = list("programming" = 2, "engineering" = 2)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/autolathe
-
-datum/design/rdservercontrol
+/datum/design/rdservercontrol
name = "Computer Design (R&D Server Control Console Board)"
desc = "The circuit board for an R&D Server Control Console."
id = "rdservercontrol"
@@ -172,8 +170,9 @@ datum/design/rdservercontrol
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/rdservercontrol
+ category = list("Research Machinery")
-datum/design/rdserver
+/datum/design/rdserver
name = "Machine Design (R&D Server Board)"
desc = "The circuit board for an R&D Server."
id = "rdserver"
@@ -181,8 +180,9 @@ datum/design/rdserver
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/rdserver
+ category = list("Research Machinery")
-datum/design/mechfab
+/datum/design/mechfab
name = "Machine Design (Exosuit Fabricator Board)"
desc = "The circuit board for an Exosuit Fabricator."
id = "mechfab"
@@ -190,8 +190,9 @@ datum/design/mechfab
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mechfab
+ category = list("Research Machinery")
-datum/design/cyborgrecharger
+/datum/design/cyborgrecharger
name = "Machine Design (Cyborg Recharger Board)"
desc = "The circuit board for a Cyborg Recharger."
id = "cyborgrecharger"
@@ -199,8 +200,9 @@ datum/design/cyborgrecharger
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/cyborgrecharger
+ category = list("Research Machinery")
-datum/design/mech_recharger
+/datum/design/mech_recharger
name = "Machine Design (Mechbay Recharger Board)"
desc = "The circuit board for a Mechbay Recharger."
id = "mech_recharger"
@@ -208,8 +210,29 @@ datum/design/mech_recharger
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mech_recharger
+ category = list("Research Machinery")
-datum/design/vendor
+/datum/design/microwave
+ name = "Machine Design (Microwave Board)"
+ desc = "The circuit board for a microwave."
+ id = "microwave"
+ req_tech = list("programming" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/microwave
+ category = list ("Misc. Machinery")
+
+/datum/design/autolathe
+ name = "Machine Design (Autolathe Board)"
+ desc = "The circuit board for an autolathe."
+ id = "autolathe"
+ req_tech = list("programming" = 2, "engineering" = 2)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/autolathe
+ category = list ("Misc. Machinery")
+
+/datum/design/vendor
name = "Machine Design (Vendor Board)"
desc = "The circuit board for a Vendor."
id = "vendor"
@@ -217,8 +240,9 @@ datum/design/vendor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/vendor
+ category = list ("Misc. Machinery")
-datum/design/ore_redemption
+/datum/design/ore_redemption
name = "Machine Design (Ore Redemption Board)"
desc = "The circuit board for an Ore Redemption machine."
id = "ore_redemption"
@@ -226,13 +250,15 @@ datum/design/ore_redemption
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/ore_redemption
+ category = list ("Misc. Machinery")
-datum/design/mining_equipment_vendor
+/datum/design/mining_equipment_vendor
name = "Machine Design (Mining Rewards Vender Board)"
desc = "The circuit board for a Mining Rewards Vender."
id = "mining_equipment_vendor"
req_tech = list("programming" = 1, "engineering" = 2)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/mining_equipment_vendor
\ No newline at end of file
+ build_path = /obj/item/weapon/circuitboard/mining_equipment_vendor
+ category = list ("Misc. Machinery")
\ No newline at end of file
diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm
index 08d65a3a975..479c91de938 100644
--- a/code/modules/research/designs/mecha_designs.dm
+++ b/code/modules/research/designs/mecha_designs.dm
@@ -10,6 +10,7 @@ datum/design/ripley_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/ripley/main
+ category = list("Exosuit Modules")
datum/design/ripley_peri
name = "Exosuit Module (APLU \"Ripley\" Peripherals Control module)"
@@ -19,6 +20,7 @@ datum/design/ripley_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/ripley/peripherals
+ category = list("Exosuit Modules")
datum/design/odysseus_main
name = "Exosuit Module (\"Odysseus\" Central Control module)"
@@ -28,6 +30,7 @@ datum/design/odysseus_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/odysseus/main
+ category = list("Exosuit Modules")
datum/design/odysseus_peri
name = "Exosuit Module (\"Odysseus\" Peripherals Control module)"
@@ -37,6 +40,7 @@ datum/design/odysseus_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/odysseus/peripherals
+ category = list("Exosuit Modules")
datum/design/gygax_main
name = "Exosuit Module (\"Gygax\" Central Control module)"
@@ -46,6 +50,7 @@ datum/design/gygax_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/gygax/main
+ category = list("Exosuit Modules")
datum/design/gygax_peri
name = "Exosuit Module (\"Gygax\" Peripherals Control module)"
@@ -55,6 +60,7 @@ datum/design/gygax_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/gygax/peripherals
+ category = list("Exosuit Modules")
datum/design/gygax_targ
name = "Exosuit Module (\"Gygax\" Weapons & Targeting Control module)"
@@ -64,6 +70,7 @@ datum/design/gygax_targ
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/gygax/targeting
+ category = list("Exosuit Modules")
datum/design/durand_main
name = "Exosuit Module (\"Durand\" Central Control module)"
@@ -73,6 +80,7 @@ datum/design/durand_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/main
+ category = list("Exosuit Modules")
datum/design/durand_peri
name = "Exosuit Module (\"Durand\" Peripherals Control module)"
@@ -82,6 +90,7 @@ datum/design/durand_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals
+ category = list("Exosuit Modules")
datum/design/durand_targ
name = "Exosuit Module (\"Durand\" Weapons & Targeting Control module)"
@@ -91,6 +100,7 @@ datum/design/durand_targ
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting
+ category = list("Exosuit Modules")
datum/design/honker_main
name = "Exosuit Module (\"H.O.N.K\" Central Control module)"
@@ -100,6 +110,7 @@ datum/design/honker_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/main
+ category = list("Exosuit Modules")
datum/design/honker_peri
name = "Exosuit Module (\"H.O.N.K\" Peripherals Control module)"
@@ -109,6 +120,7 @@ datum/design/honker_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/peripherals
+ category = list("Exosuit Modules")
datum/design/honker_targ
name = "Exosuit Module (\"H.O.N.K\" Weapons & Targeting Control module)"
@@ -118,6 +130,7 @@ datum/design/honker_targ
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting
+ category = list("Exosuit Modules")
datum/design/phazon_main
name = "Exosuit Module (\"Phazon\" Central Control module)"
@@ -127,6 +140,7 @@ datum/design/phazon_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/phazon/main
+ category = list("Exosuit Modules")
datum/design/phazon_peri
name = "Exosuit Module (\"Phazon\" Peripherals Control module)"
@@ -136,6 +150,7 @@ datum/design/phazon_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/phazon/peripherals
+ category = list("Exosuit Modules")
datum/design/phazon_targ
name = "Exosuit Module (\"Phazon\" Weapons & Targeting Control module)"
@@ -145,6 +160,7 @@ datum/design/phazon_targ
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/phazon/targeting
+ category = list("Exosuit Modules")
////////////////////////////////////////
/////////// Mecha Equpment /////////////
@@ -346,4 +362,4 @@ datum/design/mech_generator_nuclear
build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear
materials = list("$metal"=10000,"$glass"=1000,"$silver"=500)
construction_time = 100
- category = list("Exosuit Equipment")
\ No newline at end of file
+ category = list("Exosuit Equipment")
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 6e5143a5e07..013841c43c9 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -11,6 +11,7 @@ datum/design/mass_spectrometer
materials = list("$metal" = 30, "$glass" = 20)
reliability = 76
build_path = /obj/item/device/mass_spectrometer
+ category = list("Medical Designs")
datum/design/adv_mass_spectrometer
name = "Advanced Mass-Spectrometer"
@@ -21,6 +22,7 @@ datum/design/adv_mass_spectrometer
materials = list("$metal" = 30, "$glass" = 20)
reliability = 74
build_path = /obj/item/device/mass_spectrometer/adv
+ category = list("Medical Designs")
datum/design/mmi
name = "Man-Machine Interface"
@@ -32,7 +34,7 @@ datum/design/mmi
construction_time = 75
reliability = 76
build_path = /obj/item/device/mmi
- category = list("Misc")
+ category = list("Misc","Medical Designs")
datum/design/mmi_radio
name = "Radio-enabled Man-Machine Interface"
@@ -44,7 +46,7 @@ datum/design/mmi_radio
construction_time = 75
reliability = 74
build_path = /obj/item/device/mmi/radio_enabled
- category = list("Misc")
+ category = list("Misc","Medical Designs")
datum/design/synthetic_flash
name = "Flash"
@@ -67,7 +69,7 @@ datum/design/bluespacebeaker
materials = list("$metal" = 3000, "$plasma" = 3000, "$diamond" = 500)
reliability = 76
build_path = /obj/item/weapon/reagent_containers/glass/beaker/bluespace
- category = list("Misc")
+ category = list("Misc","Medical Designs")
datum/design/noreactbeaker
name = "Cryostasis Beaker"
@@ -78,7 +80,7 @@ datum/design/noreactbeaker
materials = list("$metal" = 3000)
reliability = 76
build_path = /obj/item/weapon/reagent_containers/glass/beaker/noreact
- category = list("Misc")
+ category = list("Medical Designs")
datum/design/bluespacebodybag
name = "Bluespace body bag"
@@ -89,7 +91,7 @@ datum/design/bluespacebodybag
materials = list("$metal" = 3000, "$plasma" = 2000, "$diamond" = 500)
reliability = 76
build_path = /obj/item/bodybag/bluespace
- category = list("Misc")
+ category = list("Medical Designs")
datum/design/defib
name = "Defibrillator"
@@ -100,4 +102,4 @@ datum/design/defib
materials = list("$metal" = 5000, "$glass" = 2000, "$silver" = 1000)
reliability = 76
build_path = /obj/item/weapon/defibrillator
- category = list("Misc")
\ No newline at end of file
+ category = list("Medical Designs")
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index 7e83426acfc..73cb40dc456 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -9,9 +9,9 @@ datum/design/basic_cell
req_tech = list("powerstorage" = 1)
build_type = PROTOLATHE | AUTOLATHE |MECHFAB
materials = list("$metal" = 700, "$glass" = 50)
- build_path = /obj/item/weapon/stock_parts/cell
construction_time=100
- category = list("Misc")
+ build_path = /obj/item/weapon/stock_parts/cell
+ category = list("Misc","Power Designs")
datum/design/high_cell
name = "High-Capacity Power Cell"
@@ -22,7 +22,7 @@ datum/design/high_cell
materials = list("$metal" = 700, "$glass" = 60)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell/high
- category = list("Misc")
+ category = list("Misc","Power Designs")
datum/design/super_cell
name = "Super-Capacity Power Cell"
@@ -34,7 +34,7 @@ datum/design/super_cell
materials = list("$metal" = 700, "$glass" = 70)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell/super
- category = list("Misc")
+ category = list("Misc","Power Designs")
datum/design/hyper_cell
name = "Hyper-Capacity Power Cell"
@@ -46,7 +46,7 @@ datum/design/hyper_cell
materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 80)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell/hyper
- category = list("Misc")
+ category = list("Misc","Power Designs")
datum/design/light_replacer
name = "Light Replacer"
@@ -56,6 +56,7 @@ datum/design/light_replacer
build_type = PROTOLATHE
materials = list("$metal" = 1500, "$silver" = 150, "$glass" = 3000)
build_path = /obj/item/device/lightreplacer
+ category = list("Power Designs")
datum/design/pacman
name = "Machine Design (PACMAN-type Generator Board)"
@@ -85,4 +86,4 @@ datum/design/mrspacman
build_type = IMPRINTER
reliability = 74
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/pacman/mrs
\ No newline at end of file
+ build_path = /obj/item/weapon/circuitboard/pacman/mrs
diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm
index 1268e86079a..638ef2d97ab 100644
--- a/code/modules/research/designs/stock_parts_designs.dm
+++ b/code/modules/research/designs/stock_parts_designs.dm
@@ -2,7 +2,7 @@
/////////////Stock Parts////////////////
////////////////////////////////////////
-datum/design/RPED
+/datum/design/RPED
name = "Rapid Part Exchange Device"
desc = "Special mechanical module made to store, sort, and apply standard machine parts."
id = "rped"
@@ -11,8 +11,10 @@ datum/design/RPED
build_type = PROTOLATHE
materials = list("$metal" = 15000, "$glass" = 5000) //hardcore
build_path = /obj/item/weapon/storage/part_replacer
+ category = list("Stock Parts")
-datum/design/basic_capacitor
+//Capacitors
+/datum/design/basic_capacitor
name = "Basic Capacitor"
desc = "A stock part used in the construction of various devices."
id = "basic_capacitor"
@@ -20,44 +22,9 @@ datum/design/basic_capacitor
build_type = PROTOLATHE | AUTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = /obj/item/weapon/stock_parts/capacitor
+ category = list("Stock Parts")
-datum/design/basic_scanning
- name = "Basic Scanning Module"
- desc = "A stock part used in the construction of various devices."
- id = "basic_scanning"
- req_tech = list("magnets" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 50, "$glass" = 20)
- build_path = /obj/item/weapon/stock_parts/scanning_module
-
-datum/design/micro_mani
- name = "Micro Manipulator"
- desc = "A stock part used in the construction of various devices."
- id = "micro_mani"
- req_tech = list("materials" = 1, "programming" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 30)
- build_path = /obj/item/weapon/stock_parts/manipulator
-
-datum/design/basic_micro_laser
- name = "Basic Micro-Laser"
- desc = "A stock part used in the construction of various devices."
- id = "basic_micro_laser"
- req_tech = list("magnets" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 10, "$glass" = 20)
- build_path = /obj/item/weapon/stock_parts/micro_laser
-
-datum/design/basic_matter_bin
- name = "Basic Matter Bin"
- desc = "A stock part used in the construction of various devices."
- id = "basic_matter_bin"
- req_tech = list("materials" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 80)
- build_path = /obj/item/weapon/stock_parts/matter_bin
-
-datum/design/adv_capacitor
+/datum/design/adv_capacitor
name = "Advanced Capacitor"
desc = "A stock part used in the construction of various devices."
id = "adv_capacitor"
@@ -65,8 +32,31 @@ datum/design/adv_capacitor
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = /obj/item/weapon/stock_parts/capacitor/adv
+ category = list("Stock Parts")
-datum/design/adv_scanning
+/datum/design/super_capacitor
+ name = "Super Capacitor"
+ desc = "A stock part used in the construction of various devices."
+ id = "super_capacitor"
+ req_tech = list("powerstorage" = 5, "materials" = 4)
+ build_type = PROTOLATHE
+ reliability = 71
+ materials = list("$metal" = 50, "$glass" = 50, "$gold" = 20)
+ build_path = /obj/item/weapon/stock_parts/capacitor/super
+ category = list("Stock Parts")
+
+//Scanning modules
+/datum/design/basic_scanning
+ name = "Basic Scanning Module"
+ desc = "A stock part used in the construction of various devices."
+ id = "basic_scanning"
+ req_tech = list("magnets" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 20)
+ build_path = /obj/item/weapon/stock_parts/scanning_module
+ category = list("Stock Parts")
+
+/datum/design/adv_scanning
name = "Advanced Scanning Module"
desc = "A stock part used in the construction of various devices."
id = "adv_scanning"
@@ -74,8 +64,31 @@ datum/design/adv_scanning
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 20)
build_path = /obj/item/weapon/stock_parts/scanning_module/adv
+ category = list("Stock Parts")
-datum/design/nano_mani
+/datum/design/phasic_scanning
+ name = "Phasic Scanning Module"
+ desc = "A stock part used in the construction of various devices."
+ id = "phasic_scanning"
+ req_tech = list("magnets" = 5, "materials" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 50, "$glass" = 20, "$silver" = 10)
+ reliability = 72
+ build_path = /obj/item/weapon/stock_parts/scanning_module/phasic
+ category = list("Stock Parts")
+
+//Maipulators
+/datum/design/micro_mani
+ name = "Micro Manipulator"
+ desc = "A stock part used in the construction of various devices."
+ id = "micro_mani"
+ req_tech = list("materials" = 1, "programming" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 30)
+ build_path = /obj/item/weapon/stock_parts/manipulator
+ category = list("Stock Parts")
+
+/datum/design/nano_mani
name = "Nano Manipulator"
desc = "A stock part used in the construction of various devices."
id = "nano_mani"
@@ -83,6 +96,29 @@ datum/design/nano_mani
build_type = PROTOLATHE
materials = list("$metal" = 30)
build_path = /obj/item/weapon/stock_parts/manipulator/nano
+ category = list("Stock Parts")
+
+/datum/design/pico_mani
+ name = "Pico Manipulator"
+ desc = "A stock part used in the construction of various devices."
+ id = "pico_mani"
+ req_tech = list("materials" = 5, "programming" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 30)
+ reliability = 73
+ build_path = /obj/item/weapon/stock_parts/manipulator/pico
+ category = list("Stock Parts")
+
+//Micro-lasers
+/datum/design/basic_micro_laser
+ name = "Basic Micro-Laser"
+ desc = "A stock part used in the construction of various devices."
+ id = "basic_micro_laser"
+ req_tech = list("magnets" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 10, "$glass" = 20)
+ build_path = /obj/item/weapon/stock_parts/micro_laser
+ category = list("Stock Parts")
datum/design/high_micro_laser
name = "High-Power Micro-Laser"
@@ -92,45 +128,7 @@ datum/design/high_micro_laser
build_type = PROTOLATHE
materials = list("$metal" = 10, "$glass" = 20)
build_path = /obj/item/weapon/stock_parts/micro_laser/high
-
-datum/design/adv_matter_bin
- name = "Advanced Matter Bin"
- desc = "A stock part used in the construction of various devices."
- id = "adv_matter_bin"
- req_tech = list("materials" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 80)
- build_path = /obj/item/weapon/stock_parts/matter_bin/adv
-
-datum/design/super_capacitor
- name = "Super Capacitor"
- desc = "A stock part used in the construction of various devices."
- id = "super_capacitor"
- req_tech = list("powerstorage" = 5, "materials" = 4)
- build_type = PROTOLATHE
- reliability = 71
- materials = list("$metal" = 50, "$glass" = 50, "$gold" = 20)
- build_path = /obj/item/weapon/stock_parts/capacitor/super
-
-datum/design/phasic_scanning
- name = "Phasic Scanning Module"
- desc = "A stock part used in the construction of various devices."
- id = "phasic_scanning"
- req_tech = list("magnets" = 5, "materials" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 20, "$silver" = 10)
- reliability = 72
- build_path = /obj/item/weapon/stock_parts/scanning_module/phasic
-
-datum/design/pico_mani
- name = "Pico Manipulator"
- desc = "A stock part used in the construction of various devices."
- id = "pico_mani"
- req_tech = list("materials" = 5, "programming" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 30)
- reliability = 73
- build_path = /obj/item/weapon/stock_parts/manipulator/pico
+ category = list("Stock Parts")
datum/design/ultra_micro_laser
name = "Ultra-High-Power Micro-Laser"
@@ -141,6 +139,27 @@ datum/design/ultra_micro_laser
materials = list("$metal" = 10, "$glass" = 20, "$uranium" = 10)
reliability = 70
build_path = /obj/item/weapon/stock_parts/micro_laser/ultra
+ category = list("Stock Parts")
+
+datum/design/basic_matter_bin
+ name = "Basic Matter Bin"
+ desc = "A stock part used in the construction of various devices."
+ id = "basic_matter_bin"
+ req_tech = list("materials" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 80)
+ build_path = /obj/item/weapon/stock_parts/matter_bin
+ category = list("Stock Parts")
+
+datum/design/adv_matter_bin
+ name = "Advanced Matter Bin"
+ desc = "A stock part used in the construction of various devices."
+ id = "adv_matter_bin"
+ req_tech = list("materials" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 80)
+ build_path = /obj/item/weapon/stock_parts/matter_bin/adv
+ category = list("Stock Parts")
datum/design/super_matter_bin
name = "Super Matter Bin"
@@ -151,7 +170,9 @@ datum/design/super_matter_bin
materials = list("$metal" = 80)
reliability = 75
build_path = /obj/item/weapon/stock_parts/matter_bin/super
+ category = list("Stock Parts")
+//T-Comms devices
datum/design/subspace_ansible
name = "Subspace Ansible"
desc = "A compact module capable of sensing extradimensional activity."
@@ -160,6 +181,7 @@ datum/design/subspace_ansible
build_type = PROTOLATHE
materials = list("$metal" = 80, "$silver" = 20)
build_path = /obj/item/weapon/stock_parts/subspace/ansible
+ category = list("Stock Parts")
datum/design/hyperwave_filter
name = "Hyperwave Filter"
@@ -169,6 +191,7 @@ datum/design/hyperwave_filter
build_type = PROTOLATHE
materials = list("$metal" = 40, "$silver" = 10)
build_path = /obj/item/weapon/stock_parts/subspace/filter
+ category = list("Stock Parts")
datum/design/subspace_amplifier
name = "Subspace Amplifier"
@@ -178,6 +201,7 @@ datum/design/subspace_amplifier
build_type = PROTOLATHE
materials = list("$metal" = 10, "$gold" = 30, "$uranium" = 15)
build_path = /obj/item/weapon/stock_parts/subspace/amplifier
+ category = list("Stock Parts")
datum/design/subspace_treatment
name = "Subspace Treatment Disk"
@@ -187,6 +211,7 @@ datum/design/subspace_treatment
build_type = PROTOLATHE
materials = list("$metal" = 10, "$silver" = 20)
build_path = /obj/item/weapon/stock_parts/subspace/treatment
+ category = list("Stock Parts")
datum/design/subspace_analyzer
name = "Subspace Analyzer"
@@ -196,6 +221,7 @@ datum/design/subspace_analyzer
build_type = PROTOLATHE
materials = list("$metal" = 10, "$gold" = 15)
build_path = /obj/item/weapon/stock_parts/subspace/analyzer
+ category = list("Stock Parts")
datum/design/subspace_crystal
name = "Ansible Crystal"
@@ -205,6 +231,7 @@ datum/design/subspace_crystal
build_type = PROTOLATHE
materials = list("$glass" = 1000, "$silver" = 20, "$gold" = 20)
build_path = /obj/item/weapon/stock_parts/subspace/crystal
+ category = list("Stock Parts")
datum/design/subspace_transmitter
name = "Subspace Transmitter"
@@ -213,4 +240,5 @@ datum/design/subspace_transmitter
req_tech = list("magnets" = 3, "materials" = 3, "bluespace" = 2)
build_type = PROTOLATHE
materials = list("$glass" = 100, "$silver" = 10, "$uranium" = 15)
- build_path = /obj/item/weapon/stock_parts/subspace/transmitter
\ No newline at end of file
+ build_path = /obj/item/weapon/stock_parts/subspace/transmitter
+ category = list("Stock Parts")
\ No newline at end of file
diff --git a/code/modules/research/designs/telecomms_designs.dm b/code/modules/research/designs/telecomms_designs.dm
index e4de22f4fdd..d43f9c6cdde 100644
--- a/code/modules/research/designs/telecomms_designs.dm
+++ b/code/modules/research/designs/telecomms_designs.dm
@@ -2,7 +2,7 @@
/////Subspace Telecomms////////////
///////////////////////////////////
-datum/design/subspace_receiver
+/datum/design/subspace_receiver
name = "Machine Design (Subspace Receiver)"
desc = "Allows for the construction of Subspace Receiver equipment."
id = "s-receiver"
@@ -10,8 +10,9 @@ datum/design/subspace_receiver
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/receiver
+ category = list("Subspace Telecomms")
-datum/design/telecomms_bus
+/datum/design/telecomms_bus
name = "Machine Design (Bus Mainframe)"
desc = "Allows for the construction of Telecommunications Bus Mainframes."
id = "s-bus"
@@ -19,8 +20,9 @@ datum/design/telecomms_bus
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/bus
+ category = list("Subspace Telecomms")
-datum/design/telecomms_hub
+/datum/design/telecomms_hub
name = "Machine Design (Hub Mainframe)"
desc = "Allows for the construction of Telecommunications Hub Mainframes."
id = "s-hub"
@@ -28,8 +30,9 @@ datum/design/telecomms_hub
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/hub
+ category = list("Subspace Telecomms")
-datum/design/telecomms_relay
+/datum/design/telecomms_relay
name = "Machine Design (Relay Mainframe)"
desc = "Allows for the construction of Telecommunications Relay Mainframes."
id = "s-relay"
@@ -37,8 +40,9 @@ datum/design/telecomms_relay
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/relay
+ category = list("Subspace Telecomms")
-datum/design/telecomms_processor
+/datum/design/telecomms_processor
name = "Machine Design (Processor Unit)"
desc = "Allows for the construction of Telecommunications Processor equipment."
id = "s-processor"
@@ -46,8 +50,9 @@ datum/design/telecomms_processor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/processor
+ category = list("Subspace Telecomms")
-datum/design/telecomms_server
+/datum/design/telecomms_server
name = "Machine Design (Server Mainframe)"
desc = "Allows for the construction of Telecommunications Servers."
id = "s-server"
@@ -55,12 +60,14 @@ datum/design/telecomms_server
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/server
+ category = list("Subspace Telecomms")
-datum/design/subspace_broadcaster
+/datum/design/subspace_broadcaster
name = "Machine Design (Subspace Broadcaster)"
desc = "Allows for the construction of Subspace Broadcasting equipment."
id = "s-broadcaster"
req_tech = list("programming" = 2, "engineering" = 2, "bluespace" = 1)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/telecomms/broadcaster
\ No newline at end of file
+ build_path = /obj/item/weapon/circuitboard/telecomms/broadcaster
+ category = list("Subspace Telecomms")
\ No newline at end of file
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 71830875577..fa35c34bacf 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -2,7 +2,7 @@
/////////////////Weapons/////////////////
/////////////////////////////////////////
-datum/design/nuclear_gun
+/datum/design/nuclear_gun
name = "Advanced Energy Gun"
desc = "An energy gun with an experimental miniaturized reactor."
id = "nuclear_gun"
@@ -12,8 +12,9 @@ datum/design/nuclear_gun
reliability = 76
build_path = /obj/item/weapon/gun/energy/gun/nuclear
locked = 1
+ category = list("Weapons")
-datum/design/stunrevolver
+/datum/design/stunrevolver
name = "Stun Revolver"
desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder. The stun cartridges can be recharged using a conventional energy weapon recharger."
id = "stunrevolver"
@@ -22,8 +23,9 @@ datum/design/stunrevolver
materials = list("$metal" = 4000)
build_path = /obj/item/weapon/gun/energy/stunrevolver
locked = 1
+ category = list("Weapons")
-datum/design/tele_shield
+/datum/design/tele_shield
name = "Telescopic Riot Shield"
desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
id = "tele_shield"
@@ -32,8 +34,9 @@ datum/design/tele_shield
materials = list("$metal" = 4000, "$glass" = 5000, "$silver" = 300)
build_path = /obj/item/weapon/shield/riot/tele
locked = 1
+ category = list("Weapons")
-datum/design/lasercannon
+/datum/design/lasercannon
name = "Laser Cannon"
desc = "A heavy duty laser cannon."
id = "lasercannon"
@@ -42,8 +45,9 @@ datum/design/lasercannon
materials = list("$metal" = 10000, "$glass" = 2000, "$diamond" = 2000)
build_path = /obj/item/weapon/gun/energy/lasercannon
locked = 1
+ category = list("Weapons")
-datum/design/decloner
+/datum/design/decloner
name = "Decloner"
desc = "Your opponent will bubble into a messy pile of goop."
id = "decloner"
@@ -52,18 +56,9 @@ datum/design/decloner
materials = list("$gold" = 5000,"$uranium" = 10000, "mutagen" = 40)
build_path = /obj/item/weapon/gun/energy/decloner
locked = 1
-/*
-datum/design/chemsprayer
- name = "Chem Sprayer"
- desc = "An advanced chem spraying device."
- id = "chemsprayer"
- req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 5000, "$glass" = 1000)
- reliability = 100
- build_path = /obj/item/weapon/chemsprayer"
-*/
-datum/design/rapidsyringe
+ category = list("Weapons")
+
+/datum/design/rapidsyringe
name = "Rapid Syringe Gun"
desc = "A gun that fires many syringes."
id = "rapidsyringe"
@@ -71,8 +66,9 @@ datum/design/rapidsyringe
build_type = PROTOLATHE
materials = list("$metal" = 5000, "$glass" = 1000)
build_path = /obj/item/weapon/gun/syringe/rapidsyringe
+ category = list("Weapons")
-datum/design/largecrossbow
+/datum/design/largecrossbow
name = "Energy Crossbow"
desc = "A reverse-engineered energy crossbow favored by syndicate infiltration teams and carp hunters."
id = "largecrossbow"
@@ -81,8 +77,9 @@ datum/design/largecrossbow
materials = list("$metal" = 5000, "$glass" = 1500, "$uranium" = 1500, "$silver" = 1500)
build_path = /obj/item/weapon/gun/energy/crossbow/largecrossbow
locked = 1
+ category = list("Weapons")
-datum/design/temp_gun
+/datum/design/temp_gun
name = "Temperature Gun"
desc = "A gun that shoots temperature bullet energythings to change temperature."//Change it if you want
id = "temp_gun"
@@ -91,8 +88,9 @@ datum/design/temp_gun
materials = list("$metal" = 5000, "$glass" = 500, "$silver" = 3000)
build_path = /obj/item/weapon/gun/energy/temperature
locked = 1
+ category = list("Weapons")
-datum/design/flora_gun
+/datum/design/flora_gun
name = "Floral Somatoray"
desc = "A tool that discharges controlled radiation which induces mutation in plant cells. Harmless to other organic life."
id = "flora_gun"
@@ -100,8 +98,9 @@ datum/design/flora_gun
build_type = PROTOLATHE
materials = list("$metal" = 2000, "$glass" = 500, "radium" = 20)
build_path = /obj/item/weapon/gun/energy/floragun
+ category = list("Weapons")
-datum/design/large_grenade
+/datum/design/large_grenade
name = "Large Grenade"
desc = "A grenade that affects a larger area and use larger containers."
id = "large_Grenade"
@@ -110,8 +109,9 @@ datum/design/large_grenade
materials = list("$metal" = 3000)
reliability = 79
build_path = /obj/item/weapon/grenade/chem_grenade/large
+ category = list("Weapons")
-datum/design/smg
+/datum/design/smg
name = "Prototype Submachine Gun"
desc = "A prototype weapon made using lightweight materials on a traditional frame, designed to fire standard 9mm rounds."
id = "smg"
@@ -120,17 +120,9 @@ datum/design/smg
materials = list("$metal" = 8000, "$silver" = 2000, "$diamond" = 1000)
build_path = /obj/item/weapon/gun/projectile/automatic
locked = 1
+ category = list("Weapons")
-datum/design/mag_smg
- name = "Submachine Gun Magazine (9mm)"
- desc = "A 20-round magazine for the prototype submachine gun."
- id = "mag_smg"
- req_tech = list("combat" = 4, "materials" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 2000)
- build_path = /obj/item/ammo_box/magazine/smgm9mm
-
-datum/design/xray
+/datum/design/xray
name = "Xray Laser Gun"
desc = "Not quite as menacing as it sounds"
id = "xray"
@@ -139,8 +131,9 @@ datum/design/xray
materials = list("$gold" = 5000,"$uranium" = 10000, "$metal" = 4000)
build_path = /obj/item/weapon/gun/energy/xray
locked = 1
+ category = list("Weapons")
-datum/design/ionrifle
+/datum/design/ionrifle
name = "Ion Rifle"
desc = "How to dismantle a cyborg : The gun."
id = "ionrifle"
@@ -149,8 +142,9 @@ datum/design/ionrifle
materials = list("$silver" = 4000, "$metal" = 6000, "$uranium" = 1000)
build_path = /obj/item/weapon/gun/energy/ionrifle
locked = 1
+ category = list("Weapons")
-datum/design/wormhole_projector
+/datum/design/wormhole_projector
name = "Bluespace Wormhole Projector"
desc = "A projector that emits high density quantum-coupled bluespace beams."
id = "wormholeprojector"
@@ -159,8 +153,9 @@ datum/design/wormhole_projector
materials = list("$silver" = 1000, "$metal" = 5000, "$diamond" = 3000)
build_path = /obj/item/weapon/gun/energy/wormhole_projector
locked = 1
+ category = list("Weapons")
-datum/design/reciever
+/datum/design/reciever
name = "Modular Reciever"
desc = "A prototype modular reciever and trigger assembly for a variety of firearms."
id = "reciever"
@@ -168,8 +163,19 @@ datum/design/reciever
build_type = PROTOLATHE
materials = list("$metal" = 6500, "$silver" = 500)
build_path = /obj/item/weaponcrafting/reciever
+ category = list("Weapons")
-datum/design/stunshell
+/datum/design/mag_smg
+ name = "Submachine Gun Magazine (9mm)"
+ desc = "A 20-round magazine for the prototype submachine gun."
+ id = "mag_smg"
+ req_tech = list("combat" = 4, "materials" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 2000)
+ build_path = /obj/item/ammo_box/magazine/smgm9mm
+ category = list("Ammo")
+
+/datum/design/stunshell
name = "Stun Shell"
desc = "A stunning shell for a shotgun."
id = "stunshell"
@@ -177,8 +183,9 @@ datum/design/stunshell
build_type = PROTOLATHE
materials = list("$metal" = 200)
build_path = /obj/item/ammo_casing/shotgun/stunslug
+ category = list("Ammo")
-datum/design/techshell
+/datum/design/techshell
name = "Unloaded Technological Shotshell"
desc = "A high-tech shotgun shell which can be loaded with materials to produce unique effects."
id = "techshotshell"
@@ -186,12 +193,14 @@ datum/design/techshell
build_type = PROTOLATHE
materials = list("$metal" = 1000, "$glass" = 200, "$silver" = 300)
build_path = /obj/item/ammo_casing/shotgun/techshell
+ category = list("Ammo")
-datum/design/suppressor
+/datum/design/suppressor
name = "Universal Suppressor"
desc = "A reverse-engineered universal suppressor that fits on most small arms with threaded barrels."
id = "suppressor"
req_tech = list("combat" = 6, "engineering" = 5, "syndicate" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 2000, "$silver" = 500)
- build_path = /obj/item/weapon/suppressor
\ No newline at end of file
+ build_path = /obj/item/weapon/suppressor
+ category = list("Weapons")
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index d4affb8af14..771d53cd16e 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -25,6 +25,14 @@ Note: Must be placed west/left of and R&D console to function.
var/adamantine_amount = 0.0
var/efficiency_coeff
+ var/list/categories = list(
+ "Power Designs",
+ "Stock Parts",
+ "Medical Designs",
+ "Weapons",
+ "Ammo",
+ )
+
reagents = new()
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 124bbf8599c..7c695ffe718 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -49,6 +49,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
req_access = list(access_tox) //Data and setting manipulation requires scientist access.
+ var/selected_category
+
/obj/machinery/computer/rdconsole/proc/CallTechName(var/ID) //A simple helper proc to find the name of a tech with a given ID.
var/datum/tech/check_tech
@@ -179,6 +181,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/temp_screen = text2num(href_list["menu"])
screen = temp_screen
+ if(href_list["category"])
+ selected_category = href_list["category"]
+
else if(href_list["updt_tech"]) //Update the research holder with information from the technology disk.
screen = 0.0
spawn(50)
@@ -413,7 +418,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else
new_item.loc = linked_lathe.loc
linked_lathe.busy = 0
- screen = 3.1
+ screen = 3.15
updateUsrDialog()
else if(href_list["imprint"]) //Causes the Circuit Imprinter to build something.
@@ -778,31 +783,42 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Protolathe Menu:
"
dat += "Material Amount: [linked_lathe.TotalMaterials()] / [linked_lathe.max_material_storage]
"
dat += "Chemical Volume: [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]
"
+
+ dat += list_categories(linked_lathe.categories, 3.15)
+
+ //Grouping designs by categories, to improve readability
+ if(3.15)
+ dat += "Main Menu"
+ dat += "Protolathe Menu"
+ dat += "Browsing [selected_category]:
"
+ dat += "
Material Amount: [linked_lathe.TotalMaterials()] / [linked_lathe.max_material_storage]
"
+ dat += "
Chemical Volume: [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]
"
+
var/coeff = linked_lathe.efficiency_coeff
for(var/datum/design/D in files.known_designs)
- if(!(D.build_type & PROTOLATHE))
+ if(!(selected_category in D.category)|| !(D.build_type & PROTOLATHE))
continue
- var/temp_dat = "[D.name]"
var/temp_material
var/c = 50
var/t
for(var/M in D.materials)
t = linked_lathe.check_mat(D, M)
+ temp_material += " | "
if (!t)
- temp_material += "
[D.materials[M]/coeff] [CallMaterialName(M)]"
+ temp_material += "
[D.materials[M]/coeff] [CallMaterialName(M)]"
else
temp_material += " [D.materials[M]/coeff] [CallMaterialName(M)]"
c = min(c,t)
if (c)
- dat += "*
[temp_dat]"
+ dat += "
[D.name]"
if(c >= 5.0)
dat += "
x5"
if(c >= 10.0)
dat += "
x10"
dat += "[temp_material]"
else
- dat += "*
[temp_dat][temp_material]"
+ dat += "
[D.name][temp_material]"
dat += "
"
dat += "
Circuit Imprinter Menu:
"
dat += "Material Amount: [linked_imprinter.TotalMaterials()]
"
dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
"
+
+ dat += list_categories(linked_imprinter.categories, 4.15)
+
+ if(4.15)
+ dat += "Main Menu"
+ dat += "Circuit Imprinter Menu"
+ dat += "Browsing [selected_category]:
"
+ dat += "Material Amount: [linked_imprinter.TotalMaterials()]
"
+ dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
"
+
var/coeff = linked_imprinter.efficiency_coeff
for(var/datum/design/D in files.known_designs)
- if(!(D.build_type & IMPRINTER))
+ if(!(selected_category in D.category) || !(D.build_type & IMPRINTER))
continue
- var/temp_dat = "[D.name]"
var/temp_materials
var/check_materials = 1
for(var/M in D.materials)
+ temp_materials += " | "
if (!linked_imprinter.check_mat(D, M))
check_materials = 0
- temp_materials += "
[D.materials[M]/coeff] [CallMaterialName(M)]"
+ temp_materials += "
[D.materials[M]/coeff] [CallMaterialName(M)]"
else
temp_materials += " [D.materials[M]/coeff] [CallMaterialName(M)]"
if (check_materials)
- dat += "*
[temp_dat][temp_materials]
"
+ dat += "
[D.name][temp_materials]
"
else
- dat += "*
[temp_dat][temp_materials]
"
+ dat += "
[D.name][temp_materials]
"
dat += "
"
+
+ for(var/C in categories)
+ if(line_length > 2)
+ dat += "
"
+ line_length = 1
+
+ dat += "| [C] | "
+ line_length++
+
+ dat += "
"
+ return dat
+
/obj/machinery/computer/rdconsole/robotics
name = "Robotics R&D Console"
desc = "A console used to interface with R&D tools."
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index ef765b17f9e..6fa8bb0536a 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -159,6 +159,26 @@ research holder datum.
if(I.crit_fail)
D.reliability = min(100, D.reliability + rand(3, 5))
+/datum/research/proc/FindDesignByID(var/id)
+ for(var/datum/design/D in known_designs)
+ if(D.id == id)
+ return D
+
+
+//Autolathe files
+/datum/research/autolathe/New()
+ for(var/T in (typesof(/datum/tech) - /datum/tech))
+ possible_tech += new T(src)
+ for(var/path in typesof(/datum/design) - /datum/design)
+ var/datum/design/D = new path(src)
+ possible_designs += D
+ if((D.build_type & AUTOLATHE) && ("initial" in D.category)) //autolathe starts without hacked designs
+ AddDesign2Known(D)
+
+/datum/research/autolathe/AddDesign2Known(var/datum/design/D)
+ if(!(D.build_type & AUTOLATHE))
+ return
+ ..()
/***************************************************************
** Technology Datums **
diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm
index 9ccb93d6dd5..8652fc2978e 100644
--- a/code/modules/surgery/lipoplasty.dm
+++ b/code/modules/surgery/lipoplasty.dm
@@ -31,7 +31,7 @@
user.visible_message("[user] extracts [target]'s fat!")
target.overeatduration = 0 //patient is unfatted
var/removednutriment = target.nutrition
- target.nutrition = 450
+ target.nutrition = NUTRITION_LEVEL_WELL_FED
removednutriment -= 450 //whatever was removed goes into the meat
var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new
newmeat.name = "fatty meat"
diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index ea7bb4ce13a..e0eccaff92b 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -60,10 +60,10 @@
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
if(anchored)
anchored = 0
- user << " The [src] can now be moved."
+ user << " \The [src] can now be moved."
else if(!anchored)
anchored = 1
- user << " The [src] is now secured."
+ user << " \The [src] is now secured."
if(istype(W, /obj/item/weapon/screwdriver))
if(stage == 0)
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
diff --git a/code/world.dm b/code/world.dm
index 82f3817b3c2..c31d225da1d 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -89,7 +89,7 @@
master_controller = new /datum/controller/game_controller()
spawn(-1)
master_controller.setup()
- lighting_controller.Initialize()
+ lighting_controller.initializeLighting()
src.update_status()
diff --git a/config/admins.txt b/config/admins.txt
index e888262a285..cec937826ec 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -69,3 +69,7 @@ steelpoint = Game Master
phil235 = Game Master
xxnoob = Game Master
tkdrg = Game Master
+Cuboos = Game Master
+thunder12345 = Game Master
+wjohnston = Game Master
+mandurrh = Game Master
diff --git a/html/changelog.html b/html/changelog.html
index f1a6231e621..c0dafcb126f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,32 @@
-->
+
+
16 December 2014
+
Paprika updated:
+
+ - Reverted security armor and helmets to the old (Grey) style of armor/helmets.
+ - Updated security jumpsuits to be more consistent across officer/warden/HoS ranks.
+ - Added tactical armor and helmets to replace the largely unused bulletproof vest in the armory. This armor has higher bullet and explosive resistance than normal armor, and uses the previous, more military armor/helmet sprites.
+ - Added a new injury doll to go along with the overall health meter. This will show you locational overall limb-based burn/brute damage, so you can tell the difference between being hurt with burn/brute or toxins/stamina damage which does not affect limbs.
+ - Reverted some UI icons back to their older status and changed some around for readability. Thank you for your feedback.
+
+
Thunder12345 updated:
+
+ - Added a new FRAG-12 explosive shotgun shell, built from the unloaded technological shell, using tablecrafting. Constructed using an unloaded technological tech shell, 5 units sulphuric acid, 5 units polytrinic acid, 5 units glycerol, and requires a screwdriver.
+
+
phil235 updated:
+
+ - Change to the hunger system. Eating food with sugar temporarily worsens your nutrition drop rate. Eating too much sugar too quickly can make you temporarily unable to eat any sugary food. The nutritional effect of sugar depends on how hungry you are thus it cannot easily raise your nutrition level past well fed and is best used when hungry. Lots of sugar can make you a bit jittery at times. Eating food with vitamin (new reagent) counteracts the sugar effects and can give you temporary buffs when well fed: it lowers your chance to catch or spread viruses,it makes your body's metabolism more efficient that is it keeps healing reagents longer and evacuate toxins faster and reduces damage from radioactive reagents. Your metabolism gets less efficient if starving.
+ - New hunger hud icons: starving, hungry, fed, well fed, full, fat.
+ - Snack vending machine get a chef compartment that can be loaded with non-sugary food by hand or with a tray by anyone with kitchen access (unless you hack the machine with multitool or emag). The food can be unloaded by anyone, like regular snacks
+ - Cargo can get a nutritious pizza crate order for 60 points.
+ - Grown and cooked food gets some vitamin while junk food gets less nutriment and more sugar (only hot donkpocket and ramen don't have sugar)
+ - The number of junk food in snack vending machine is lowered from 6 to 5 of each type.
+ - Fixing not being able to load an omelette du fromage on a tray.
+
+
10 December 2014
GunHog updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d8ff4543cd3..11d9482ac4a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2164,3 +2164,44 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
of mutation, and plasma will increase it.
- rscadd: We've also found that feeding slimes solid plasma bars makes them more
friendly to humans.
+2014-12-16:
+ Paprika:
+ - tweak: Reverted security armor and helmets to the old (Grey) style of armor/helmets.
+ - tweak: Updated security jumpsuits to be more consistent across officer/warden/HoS
+ ranks.
+ - rscadd: Added tactical armor and helmets to replace the largely unused bulletproof
+ vest in the armory. This armor has higher bullet and explosive resistance than
+ normal armor, and uses the previous, more military armor/helmet sprites.
+ - rscadd: Added a new injury doll to go along with the overall health meter. This
+ will show you locational overall limb-based burn/brute damage, so you can tell
+ the difference between being hurt with burn/brute or toxins/stamina damage which
+ does not affect limbs.
+ - tweak: Reverted some UI icons back to their older status and changed some around
+ for readability. Thank you for your feedback.
+ Thunder12345:
+ - rscadd: Added a new FRAG-12 explosive shotgun shell, built from the unloaded technological
+ shell, using tablecrafting. Constructed using an unloaded technological tech
+ shell, 5 units sulphuric acid, 5 units polytrinic acid, 5 units glycerol, and
+ requires a screwdriver.
+ phil235:
+ - rscadd: 'Change to the hunger system. Eating food with sugar temporarily worsens
+ your nutrition drop rate. Eating too much sugar too quickly can make you temporarily
+ unable to eat any sugary food. The nutritional effect of sugar depends on how
+ hungry you are thus it cannot easily raise your nutrition level past well fed
+ and is best used when hungry. Lots of sugar can make you a bit jittery at times.
+ Eating food with vitamin (new reagent) counteracts the sugar effects and can
+ give you temporary buffs when well fed: it lowers your chance to catch or spread
+ viruses,it makes your body''s metabolism more efficient that is it keeps healing
+ reagents longer and evacuate toxins faster and reduces damage from radioactive
+ reagents. Your metabolism gets less efficient if starving.'
+ - rscadd: 'New hunger hud icons: starving, hungry, fed, well fed, full, fat.'
+ - rscadd: Snack vending machine get a chef compartment that can be loaded with non-sugary
+ food by hand or with a tray by anyone with kitchen access (unless you hack the
+ machine with multitool or emag). The food can be unloaded by anyone, like regular
+ snacks
+ - rscadd: Cargo can get a nutritious pizza crate order for 60 points.
+ - tweak: Grown and cooked food gets some vitamin while junk food gets less nutriment
+ and more sugar (only hot donkpocket and ramen don't have sugar)
+ - tweak: The number of junk food in snack vending machine is lowered from 6 to 5
+ of each type.
+ - bugfix: Fixing not being able to load an omelette du fromage on a tray.
diff --git a/html/changelogs/Paprika - secsprites.yml b/html/changelogs/Paprika - secsprites.yml
deleted file mode 100644
index 8cd3297fdc4..00000000000
--- a/html/changelogs/Paprika - secsprites.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: Paprika
-delete-after: True
-
-
-changes:
-
- - tweak: "Reverted security armor and helmets to the old (Grey) style of armor/helmets."
-
- - tweak: "Updated security jumpsuits to be more consistent across officer/warden/HoS ranks."
-
- - rscadd: "Added tactical armor and helmets to replace the largely unused bulletproof vest in the armory. This armor has higher bullet and explosive resistance than normal armor, and uses the previous, more military armor/helmet sprites."
\ No newline at end of file
diff --git a/html/changelogs/Paprika - stuntweaks.yml b/html/changelogs/Paprika - stuntweaks.yml
new file mode 100644
index 00000000000..a37a27e1fc8
--- /dev/null
+++ b/html/changelogs/Paprika - stuntweaks.yml
@@ -0,0 +1,13 @@
+author: Paprika
+delete-after: True
+
+
+changes:
+
+ - experiment: "Taser electrodes now have a limited range of 7 tiles."
+ - experiment: "The energy gun's stun mode has been replaced with a disable mode."
+ - experiment: "Security officers will now spawn with tasers."
+ - tweak: "Disabler beams now go through windows and grilles."
+ - tweak: "Disabler beams now do 33 stamina damage instead of 34. This means they will only stun in 3 hits on someone that is NOT 100% healthy."
+ - tweak: "Most ballistic projectiles now do stamina damage in addition to their regular damage instead of stunning. This includes nuke op c-20r .45, detective's revolver, etc. They are effectively better than disablers at stunning people, as well as do significant damage, but they do not stun instantly like a taser. Expect engagements to be a little longer and plan ahead for this."
+ - rscadd: "Added an advanced taser for RnD, the child of a disabler and a taser."
\ No newline at end of file
diff --git a/html/changelogs/Paprka-injurydoll.yml b/html/changelogs/Paprka-injurydoll.yml
deleted file mode 100644
index 835f656c2a6..00000000000
--- a/html/changelogs/Paprka-injurydoll.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Paprika
-delete-after: True
-changes:
- - rscadd: "Added a new injury doll to go along with the overall health meter. This will show you locational overall limb-based burn/brute damage, so you can tell the difference between being hurt with burn/brute or toxins/stamina damage which does not affect limbs."
- - tweak: "Reverted some UI icons back to their older status and changed some around for readability. Thank you for your feedback."
\ No newline at end of file
diff --git a/html/changelogs/Tkdrg-FUCKING_SUPERMATTER.yml b/html/changelogs/Tkdrg-FUCKING_SUPERMATTER.yml
new file mode 100644
index 00000000000..8a39d30d075
--- /dev/null
+++ b/html/changelogs/Tkdrg-FUCKING_SUPERMATTER.yml
@@ -0,0 +1,5 @@
+author: Tkdrg
+delete-after: True
+
+changes:
+ - rscadd: "Envoys from the distant Viji sector have brought an exotic contraption to Centcomm. Known as the 'supermatter shard', it is a fragment of an ancient alien artifact, believed to have a dangerous and mysterious power. This precious item has been made available to the Space Station 13 cargo team for the cost of a hundred supply points, as a reward for all your hard work. Good luck, and stay safe."
diff --git a/icons/mecha/mech_construction.dmi b/icons/mecha/mech_construction.dmi
index cb4da25728d..38b3b04c5df 100644
Binary files a/icons/mecha/mech_construction.dmi and b/icons/mecha/mech_construction.dmi differ
diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi
index 8c8690ea853..0b2c7f8e136 100644
Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 9c0449f011e..d613dedcefe 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index e711157e2e5..0a170f70789 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/corgi_back.dmi b/icons/mob/corgi_back.dmi
index 6c7c1444909..7ea3cee1a4a 100644
Binary files a/icons/mob/corgi_back.dmi and b/icons/mob/corgi_back.dmi differ
diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi
index 4faf6d77ddb..e03c9eb25c0 100644
Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ
diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi
index 8ff02f67652..fe9e2b691e7 100644
Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index fb2f66315e6..b10bcfce92b 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 14588c5ff62..dfe577df1d4 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 57009026e86..bb4f4121a2a 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 33af023bd79..32316ec15f2 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/mob/monkey.dmi b/icons/mob/monkey.dmi
index 99beec24bf8..d1872d6aaff 100644
Binary files a/icons/mob/monkey.dmi and b/icons/mob/monkey.dmi differ
diff --git a/icons/mob/screen_alien.dmi b/icons/mob/screen_alien.dmi
index 3674b2bf163..e0257307ac1 100644
Binary files a/icons/mob/screen_alien.dmi and b/icons/mob/screen_alien.dmi differ
diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi
index 1126ea7226d..4e5a9f42d54 100644
Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 8a75178920d..b6923194bb1 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi
index c2befc32eaa..bab5533b140 100644
Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ
diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi
index 6a16f7002c2..7e161846df6 100644
Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 7dbde85779a..30334b16415 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 200bed93b1b..367ef6ee234 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 589ae4689f3..a47cfcdb2e9 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index b5dd02a219d..6ac0661e122 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 195682b8789..24f9048fc45 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 39d8d0c3d86..30fd1979df8 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi
index 80722813075..7be081f9579 100644
Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 637ce06644f..9cee4e8a3bb 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 31601e0c21d..e73f17598ab 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index 3e27a28f2ec..6f8513e7862 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 201a73b0905..e0bbc6ea25a 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index cf23e987632..848647eae2d 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index cedaea84001..edb1b1fe792 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/supermatter.dmi b/icons/obj/supermatter.dmi
new file mode 100644
index 00000000000..64e26758738
Binary files /dev/null and b/icons/obj/supermatter.dmi differ
diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi
index 91d42d5ec4e..01e5983da03 100644
Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 7ae9dadfd3b..2d23a9a9b4d 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi
index ec37cad94c5..aa9f2873f02 100644
Binary files a/icons/obj/vending_restock.dmi and b/icons/obj/vending_restock.dmi differ
diff --git a/sound/effects/break_stone.ogg b/sound/effects/break_stone.ogg
new file mode 100644
index 00000000000..711fd50d482
Binary files /dev/null and b/sound/effects/break_stone.ogg differ
diff --git a/sound/effects/picaxe1.ogg b/sound/effects/picaxe1.ogg
new file mode 100644
index 00000000000..337422d39e4
Binary files /dev/null and b/sound/effects/picaxe1.ogg differ
diff --git a/sound/effects/picaxe2.ogg b/sound/effects/picaxe2.ogg
new file mode 100644
index 00000000000..c1a2fd631bd
Binary files /dev/null and b/sound/effects/picaxe2.ogg differ
diff --git a/sound/effects/picaxe3.ogg b/sound/effects/picaxe3.ogg
new file mode 100644
index 00000000000..f4656613284
Binary files /dev/null and b/sound/effects/picaxe3.ogg differ
diff --git a/sound/effects/shovel_dig.ogg b/sound/effects/shovel_dig.ogg
new file mode 100644
index 00000000000..c0b459066a0
Binary files /dev/null and b/sound/effects/shovel_dig.ogg differ
diff --git a/sound/effects/supermatter.ogg b/sound/effects/supermatter.ogg
new file mode 100644
index 00000000000..83081a5e9bf
Binary files /dev/null and b/sound/effects/supermatter.ogg differ
diff --git a/sound/machines/defib_SaftyOn.ogg b/sound/machines/defib_SaftyOn.ogg
new file mode 100644
index 00000000000..cf261536466
Binary files /dev/null and b/sound/machines/defib_SaftyOn.ogg differ
diff --git a/sound/machines/defib_charge.ogg b/sound/machines/defib_charge.ogg
new file mode 100644
index 00000000000..3e2be160fd1
Binary files /dev/null and b/sound/machines/defib_charge.ogg differ
diff --git a/sound/machines/defib_failed.ogg b/sound/machines/defib_failed.ogg
new file mode 100644
index 00000000000..341f70ce84e
Binary files /dev/null and b/sound/machines/defib_failed.ogg differ
diff --git a/sound/machines/defib_ready.ogg b/sound/machines/defib_ready.ogg
new file mode 100644
index 00000000000..718128602ed
Binary files /dev/null and b/sound/machines/defib_ready.ogg differ
diff --git a/sound/machines/defib_saftyOff.ogg b/sound/machines/defib_saftyOff.ogg
new file mode 100644
index 00000000000..6ab57097de3
Binary files /dev/null and b/sound/machines/defib_saftyOff.ogg differ
diff --git a/sound/machines/defib_success.ogg b/sound/machines/defib_success.ogg
new file mode 100644
index 00000000000..3f71438c168
Binary files /dev/null and b/sound/machines/defib_success.ogg differ
diff --git a/sound/machines/defib_zap.ogg b/sound/machines/defib_zap.ogg
new file mode 100644
index 00000000000..5612db39a43
Binary files /dev/null and b/sound/machines/defib_zap.ogg differ
diff --git a/sound/misc/announce.ogg b/sound/misc/announce.ogg
index 2342d2eb505..0ee0f36d56f 100644
Binary files a/sound/misc/announce.ogg and b/sound/misc/announce.ogg differ
diff --git a/sound/misc/announce_dig.ogg b/sound/misc/announce_dig.ogg
new file mode 100644
index 00000000000..2342d2eb505
Binary files /dev/null and b/sound/misc/announce_dig.ogg differ
diff --git a/sound/weapons/Taser.ogg b/sound/weapons/Taser.ogg
index f2191222b79..8992b71f50f 100644
Binary files a/sound/weapons/Taser.ogg and b/sound/weapons/Taser.ogg differ
diff --git a/sound/weapons/drill.ogg b/sound/weapons/drill.ogg
new file mode 100644
index 00000000000..fd7495f74fa
Binary files /dev/null and b/sound/weapons/drill.ogg differ
diff --git a/sound/weapons/plasma_cutter.ogg b/sound/weapons/plasma_cutter.ogg
new file mode 100644
index 00000000000..ba95317cc1e
Binary files /dev/null and b/sound/weapons/plasma_cutter.ogg differ
diff --git a/sound/weapons/resonator_blast.ogg b/sound/weapons/resonator_blast.ogg
new file mode 100644
index 00000000000..7110a716b1c
Binary files /dev/null and b/sound/weapons/resonator_blast.ogg differ
diff --git a/sound/weapons/resonator_fire.ogg b/sound/weapons/resonator_fire.ogg
new file mode 100644
index 00000000000..20665e5dd08
Binary files /dev/null and b/sound/weapons/resonator_fire.ogg differ
diff --git a/sound/weapons/sonic_jackhammer.ogg b/sound/weapons/sonic_jackhammer.ogg
new file mode 100644
index 00000000000..dae5762b2c4
Binary files /dev/null and b/sound/weapons/sonic_jackhammer.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 672a4f281ef..1ee1c28cfe7 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -209,6 +209,7 @@
#include "code\datums\spells\mime.dm"
#include "code\datums\spells\mind_transfer.dm"
#include "code\datums\spells\projectile.dm"
+#include "code\datums\spells\santa.dm"
#include "code\datums\spells\trigger.dm"
#include "code\datums\spells\turf_teleport.dm"
#include "code\datums\spells\wizard.dm"
@@ -836,6 +837,7 @@
#include "code\modules\clothing\under\chameleon.dm"
#include "code\modules\clothing\under\color.dm"
#include "code\modules\clothing\under\miscellaneous.dm"
+#include "code\modules\clothing\under\pants.dm"
#include "code\modules\clothing\under\shorts.dm"
#include "code\modules\clothing\under\syndicate.dm"
#include "code\modules\clothing\under\ties.dm"
@@ -1212,6 +1214,8 @@
#include "code\modules\power\singularity\particle_accelerator\particle_control.dm"
#include "code\modules\power\singularity\particle_accelerator\particle_emitter.dm"
#include "code\modules\power\singularity\particle_accelerator\particle_power.dm"
+#include "code\modules\power\supermatter\supermatter.dm"
+#include "code\modules\power\supermatter\supermatter_crate.dm"
#include "code\modules\projectiles\ammunition.dm"
#include "code\modules\projectiles\firing.dm"
#include "code\modules\projectiles\gun.dm"
@@ -1246,12 +1250,17 @@
#include "code\modules\reagents\Chemistry-Holder.dm"
#include "code\modules\reagents\Chemistry-Machinery.dm"
#include "code\modules\reagents\Chemistry-Readme.dm"
-#include "code\modules\reagents\Chemistry-Reagents.dm"
#include "code\modules\reagents\Chemistry-Recipes.dm"
#include "code\modules\reagents\grenade_launcher.dm"
#include "code\modules\reagents\reagent_containers.dm"
#include "code\modules\reagents\reagent_dispenser.dm"
#include "code\modules\reagents\syringe_gun.dm"
+#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents.dm"
+#include "code\modules\reagents\Chemistry-Reagents\Medicine-Reagents.dm"
+#include "code\modules\reagents\Chemistry-Reagents\Toxin-Reagents.dm"
+#include "code\modules\reagents\Chemistry-Reagents\Consumable-Reagents\Food-Reagents.dm"
+#include "code\modules\reagents\Chemistry-Reagents\Consumable-Reagents\Drink-Reagents\Alcohols.dm"
+#include "code\modules\reagents\Chemistry-Reagents\Consumable-Reagents\Drink-Reagents\Drinks.dm"
#include "code\modules\reagents\reagent_containers\borghydro.dm"
#include "code\modules\reagents\reagent_containers\dropper.dm"
#include "code\modules\reagents\reagent_containers\glass.dm"
@@ -1276,6 +1285,7 @@
#include "code\modules\research\research.dm"
#include "code\modules\research\server.dm"
#include "code\modules\research\designs\AI_module_designs.dm"
+#include "code\modules\research\designs\autolathe_designs.dm"
#include "code\modules\research\designs\comp_board_designs.dm"
#include "code\modules\research\designs\machine_designs.dm"
#include "code\modules\research\designs\mecha_designs.dm"
diff --git a/tools/mapmerge/Location.java b/tools/mapmerge/Source/Location.java
similarity index 100%
rename from tools/mapmerge/Location.java
rename to tools/mapmerge/Source/Location.java
diff --git a/tools/mapmerge/META-INF/MANIFEST.MF b/tools/mapmerge/Source/META-INF/MANIFEST.MF
similarity index 95%
rename from tools/mapmerge/META-INF/MANIFEST.MF
rename to tools/mapmerge/Source/META-INF/MANIFEST.MF
index d66a7b3b698..5aa53c2fa28 100644
--- a/tools/mapmerge/META-INF/MANIFEST.MF
+++ b/tools/mapmerge/Source/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0
-Created-By: 1.6.0_31 (Sun Microsystems Inc.)
-Main-Class: MapPatcher
-
+Manifest-Version: 1.0
+Created-By: 1.6.0_31 (Sun Microsystems Inc.)
+Main-Class: MapPatcher
+
diff --git a/tools/mapmerge/Map.java b/tools/mapmerge/Source/Map.java
similarity index 100%
rename from tools/mapmerge/Map.java
rename to tools/mapmerge/Source/Map.java
diff --git a/tools/mapmerge/MapPatcher.java b/tools/mapmerge/Source/MapPatcher.java
similarity index 100%
rename from tools/mapmerge/MapPatcher.java
rename to tools/mapmerge/Source/MapPatcher.java
diff --git a/tools/mapmerge/SavingThread.java b/tools/mapmerge/Source/SavingThread.java
similarity index 100%
rename from tools/mapmerge/SavingThread.java
rename to tools/mapmerge/Source/SavingThread.java
diff --git a/tools/mapmerge/clean_map.bat b/tools/mapmerge/clean_map.bat
index ab0cd4ea2ec..01cf441ee32 100644
--- a/tools/mapmerge/clean_map.bat
+++ b/tools/mapmerge/clean_map.bat
@@ -1,5 +1,5 @@
-set MAPFILE=TgStation/tgstation.2.1.3.dmm
+set MAPFILE=tgstation.2.1.3.dmm
-java -jar MapPatcher.jar -clean ../../_maps/map_files/%MAPFILE%.backup ../../_maps/map_files/%MAPFILE% ../../_maps/map_files/%MAPFILE%
+java -jar MapPatcher.jar -clean ../../_maps/map_files/TgStation/%MAPFILE%.backup ../../_maps/map_files/TgStation/%MAPFILE% ../../_maps/map_files/TgStation/%MAPFILE%
pause
diff --git a/tools/mapmerge/prepare_map.bat b/tools/mapmerge/prepare_map.bat
index d0d67489e82..4132fbbc2a7 100644
--- a/tools/mapmerge/prepare_map.bat
+++ b/tools/mapmerge/prepare_map.bat
@@ -1,6 +1,6 @@
-set MAPFILE=TgStation/tgstation.2.1.3.dmm
+set MAPFILE=tgstation.2.1.3.dmm
-cd ../../_maps/map_files
+cd ../../_maps/map_files/TgStation/
copy %MAPFILE% %MAPFILE%.backup
pause
AI Control:
Activate Abilities: