| [capitalize(ore)] | [machine.ores_stored[ore]] | 0 && ores_processing[metal] != 0)
- var/datum/ore/O = ore_data[metal]
+ var/ore/O = ore_data[metal]
if(!O) continue
@@ -206,24 +209,28 @@
var/can_make = Clamp(ores_stored[metal],0,sheets_per_tick-sheets)
if(can_make%2>0) can_make--
- if(!can_make || ores_stored[metal] < 1)
+ var/material/M = name_to_material[O.compresses_to]
+
+ if(!istype(M) || !can_make || ores_stored[metal] < 1)
continue
for(var/i=0,i[pick("[display_name] crumbles away into dust","[display_name] breaks apart")].")
- del(X)
+ qdel(X)
finds.Remove(F)
@@ -369,12 +375,9 @@
/turf/simulated/mineral/random/New()
if (prob(mineralChance) && !mineral)
var/mineral_name = pickweight(mineralSpawnChanceList) //temp mineral name
-
- if(!name_to_mineral)
- SetupMinerals()
-
- if (mineral_name && mineral_name in name_to_mineral)
- mineral = name_to_mineral[mineral_name]
+ mineral_name = lowertext(mineral_name)
+ if (mineral_name && (mineral_name in ore_data))
+ mineral = ore_data[mineral_name]
UpdateMineral()
. = ..()
@@ -507,7 +510,7 @@
..()
if(istype(M,/mob/living/silicon/robot))
var/mob/living/silicon/robot/R = M
- if(istype(R.module, /obj/item/weapon/robot_module/miner))
+ if(R.module)
if(istype(R.module_state_1,/obj/item/weapon/storage/bag/ore))
attackby(R.module_state_1,R)
else if(istype(R.module_state_2,/obj/item/weapon/storage/bag/ore))
diff --git a/code/modules/mining/mineral_effect.dm b/code/modules/mining/mineral_effect.dm
new file mode 100644
index 0000000000..bc0ce899ea
--- /dev/null
+++ b/code/modules/mining/mineral_effect.dm
@@ -0,0 +1,26 @@
+/obj/effect/mineral
+ name = "mineral vein"
+ icon = 'icons/obj/mining.dmi'
+ desc = "Shiny."
+ mouse_opacity = 0
+ density = 0
+ anchored = 1
+ var/ore_key
+ var/image/scanner_image
+
+/obj/effect/mineral/New(var/newloc, var/ore/M)
+ ..(newloc)
+ name = "[M.display_name] deposit"
+ ore_key = M.name
+ icon_state = "rock_[ore_key]"
+ var/turf/T = get_turf(src)
+ layer = T.layer+0.1
+
+/obj/effect/mineral/proc/get_scan_overlay()
+ if(!scanner_image)
+ var/ore/O = ore_data[ore_key]
+ if(O)
+ scanner_image = image(icon, loc = get_turf(src), icon_state = (O.scan_icon ? O.scan_icon : icon_state))
+ else
+ world << "No ore data for [src]!"
+ return scanner_image
\ No newline at end of file
diff --git a/code/modules/mining/minerals.dm b/code/modules/mining/minerals.dm
deleted file mode 100644
index a3e34b6be9..0000000000
--- a/code/modules/mining/minerals.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-var/list/name_to_mineral
-
-/proc/SetupMinerals()
- name_to_mineral = list()
- for(var/type in typesof(/mineral) - /mineral)
- var/mineral/new_mineral = new type
- if(!new_mineral.name)
- continue
- name_to_mineral[new_mineral.name] = new_mineral
- return 1
-
-/mineral
- var/name // Tag for use in overlay generation/list population .
- var/display_name // What am I called?
- var/result_amount // How much ore?
- var/spread = 1 // Does this type of deposit spread?
- var/spread_chance // Chance of spreading in any direction
- var/ore // Path to the ore produced when tile is mined.
-
-
-/mineral/New()
- . = ..()
- if(!display_name)
- display_name = name
-
-/mineral/uranium
- name = "Uranium"
- result_amount = 5
- spread_chance = 10
- ore = /obj/item/weapon/ore/uranium
-
-/mineral/platinum
- name = "Platinum"
- result_amount = 5
- spread_chance = 10
- ore = /obj/item/weapon/ore/osmium
-
-/mineral/iron
- name = "Iron"
- result_amount = 5
- spread_chance = 25
- ore = /obj/item/weapon/ore/iron
-
-/mineral/coal
- name = "Coal"
- result_amount = 5
- spread_chance = 25
- ore = /obj/item/weapon/ore/coal
-
-/mineral/diamond
- name = "Diamond"
- result_amount = 5
- spread_chance = 10
- ore = /obj/item/weapon/ore/diamond
-
-/mineral/gold
- name = "Gold"
- result_amount = 5
- spread_chance = 10
- ore = /obj/item/weapon/ore/gold
-
-/mineral/silver
- name = "Silver"
- result_amount = 5
- spread_chance = 10
- ore = /obj/item/weapon/ore/silver
-
-/mineral/phoron
- name = "Phoron"
- result_amount = 5
- spread_chance = 25
- ore = /obj/item/weapon/ore/phoron
\ No newline at end of file
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index bcf46bb292..5d989d1ce1 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -17,7 +17,7 @@
var/amt_uranium = 0
var/newCoins = 0 //how many coins the machine made in it's last load
var/processing = 0
- var/chosen = "metal" //which material will be used to make coins
+ var/chosen = DEFAULT_WALL_MATERIAL //which material will be used to make coins
var/coinsToProduce = 10
@@ -42,22 +42,22 @@
if(O)
if (istype(O,/obj/item/stack/sheet/mineral/gold))
amt_gold += 100 * O.get_amount()
- del(O)
+ qdel(O)
if (istype(O,/obj/item/stack/sheet/mineral/silver))
amt_silver += 100 * O.get_amount()
- del(O)
+ qdel(O)
if (istype(O,/obj/item/stack/sheet/mineral/diamond))
amt_diamond += 100 * O.get_amount()
- del(O)
+ qdel(O)
if (istype(O,/obj/item/stack/sheet/mineral/phoron))
amt_phoron += 100 * O.get_amount()
- del(O)
+ qdel(O)
if (istype(O,/obj/item/stack/sheet/mineral/uranium))
amt_uranium += 100 * O.get_amount()
- del(O)
+ qdel(O)
if (istype(O,/obj/item/stack/sheet/metal))
amt_iron += 100 * O.get_amount()
- del(O)
+ qdel(O)
/obj/machinery/mineral/mint/attack_hand(user as mob)
@@ -81,7 +81,7 @@
else
dat += text("Choose")
dat += text("
Iron inserted: [amt_iron] ")
- if (chosen == "metal")
+ if (chosen == DEFAULT_WALL_MATERIAL)
dat += text("chosen")
else
dat += text("Choose")
@@ -133,7 +133,7 @@
icon_state = "coinpress1"
var/obj/item/weapon/moneybag/M
switch(chosen)
- if("metal")
+ if(DEFAULT_WALL_MATERIAL)
while(amt_iron > 0 && coinsToProduce > 0)
if (locate(/obj/item/weapon/moneybag,output.loc))
M = locate(/obj/item/weapon/moneybag,output.loc)
diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index 30385d49a5..a46b263152 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -4,71 +4,71 @@
icon_state = "ore2"
w_class = 2
var/datum/geosample/geologic_data
- var/oretag
+ var/material
/obj/item/weapon/ore/uranium
name = "pitchblende"
- icon_state = "Uranium ore"
+ icon_state = "ore_uranium"
origin_tech = "materials=5"
- oretag = "uranium"
+ material = "uranium"
/obj/item/weapon/ore/iron
name = "hematite"
- icon_state = "Iron ore"
+ icon_state = "ore_iron"
origin_tech = "materials=1"
- oretag = "hematite"
+ material = "hematite"
/obj/item/weapon/ore/coal
- name = "carbonaceous rock"
- icon_state = "Coal ore"
+ name = "raw carbon"
+ icon_state = "ore_coal"
origin_tech = "materials=1"
- oretag = "coal"
+ material = "carbon"
/obj/item/weapon/ore/glass
name = "impure silicates"
- icon_state = "Glass ore"
+ icon_state = "ore_glass"
origin_tech = "materials=1"
- oretag = "sand"
+ material = "sand"
/obj/item/weapon/ore/phoron
name = "phoron crystals"
- icon_state = "Phoron ore"
+ icon_state = "ore_phoron"
origin_tech = "materials=2"
- oretag = "phoron"
+ material = "phoron"
/obj/item/weapon/ore/silver
name = "native silver ore"
- icon_state = "Silver ore"
+ icon_state = "ore_silver"
origin_tech = "materials=3"
- oretag = "silver"
+ material = "silver"
/obj/item/weapon/ore/gold
name = "native gold ore"
- icon_state = "Gold ore"
+ icon_state = "ore_gold"
origin_tech = "materials=4"
- oretag = "gold"
+ material = "gold"
/obj/item/weapon/ore/diamond
name = "diamonds"
- icon_state = "Diamond ore"
+ icon_state = "ore_diamond"
origin_tech = "materials=6"
- oretag = "diamond"
+ material = "diamond"
/obj/item/weapon/ore/osmium
name = "raw platinum"
- icon_state = "Platinum ore"
- oretag = "platinum"
+ icon_state = "ore_platinum"
+ material = "platinum"
/obj/item/weapon/ore/hydrogen
name = "raw hydrogen"
- icon_state = "Phazon"
- oretag = "hydrogen"
+ icon_state = "ore_hydrogen"
+ material = "mhydrogen"
/obj/item/weapon/ore/slag
name = "Slag"
- desc = "Completely useless"
+ desc = "Someone screwed up..."
icon_state = "slag"
- oretag = "slag"
+ material = null
/obj/item/weapon/ore/New()
pixel_x = rand(0,16)-8
diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm
index b3689d3abb..32f03c072f 100644
--- a/code/modules/mining/ore_datum.dm
+++ b/code/modules/mining/ore_datum.dm
@@ -1,52 +1,133 @@
-/datum/ore
- var/oretag
+var/global/list/ore_data = list()
+
+/ore
+ var/name
+ var/display_name
var/alloy
var/smelts_to
var/compresses_to
+ var/result_amount // How much ore?
+ var/spread = 1 // Does this type of deposit spread?
+ var/spread_chance // Chance of spreading in any direction
+ var/ore // Path to the ore produced when tile is mined.
+ var/scan_icon // Overlay for ore scanners.
+ // Xenoarch stuff. No idea what it's for, just refactored it to be less awful.
+ var/list/xarch_ages = list(
+ "thousand" = 999,
+ "million" = 999
+ )
+ var/xarch_source_mineral = "iron"
-/datum/ore/uranium
- smelts_to = /obj/item/stack/sheet/mineral/uranium
- oretag = "uranium"
+/ore/New()
+ . = ..()
+ if(!display_name)
+ display_name = name
-/datum/ore/iron
- smelts_to = /obj/item/stack/sheet/mineral/iron
+/ore/uranium
+ name = "uranium"
+ display_name = "pitchblende"
+ smelts_to = "uranium"
+ result_amount = 5
+ spread_chance = 10
+ ore = /obj/item/weapon/ore/uranium
+ scan_icon = "mineral_uncommon"
+ xarch_ages = list(
+ "thousand" = 999,
+ "million" = 704
+ )
+ xarch_source_mineral = "potassium"
+
+/ore/hematite
+ name = "hematite"
+ display_name = "hematite"
+ smelts_to = "iron"
alloy = 1
- oretag = "hematite"
+ result_amount = 5
+ spread_chance = 25
+ ore = /obj/item/weapon/ore/iron
+ scan_icon = "mineral_common"
-/datum/ore/coal
- smelts_to = /obj/item/stack/sheet/mineral/plastic
+/ore/coal
+ name = "carbon"
+ display_name = "raw carbon"
+ smelts_to = "plastic"
alloy = 1
- oretag = "coal"
+ result_amount = 5
+ spread_chance = 25
+ ore = /obj/item/weapon/ore/coal
+ scan_icon = "mineral_common"
-/datum/ore/glass
- smelts_to = /obj/item/stack/sheet/glass
- compresses_to = /obj/item/stack/sheet/mineral/sandstone
- oretag = "sand"
+/ore/glass
+ name = "sand"
+ display_name = "impure silicates"
+ smelts_to = "glass"
+ compresses_to = "sandstone"
-/datum/ore/phoron
+/ore/phoron
+ name = "phoron"
+ display_name = "phoron crystals"
+ compresses_to = "phoron"
//smelts_to = something that explodes violently on the conveyor, huhuhuhu
- compresses_to = /obj/item/stack/sheet/mineral/phoron
- oretag = "phoron"
+ result_amount = 5
+ spread_chance = 25
+ ore = /obj/item/weapon/ore/phoron
+ scan_icon = "mineral_uncommon"
+ xarch_ages = list(
+ "thousand" = 999,
+ "million" = 999,
+ "billion" = 13,
+ "billion_lower" = 10
+ )
+ xarch_source_mineral = "phoron"
-/datum/ore/silver
- smelts_to = /obj/item/stack/sheet/mineral/silver
- oretag = "silver"
+/ore/silver
+ name = "silver"
+ display_name = "native silver"
+ smelts_to = "silver"
+ result_amount = 5
+ spread_chance = 10
+ ore = /obj/item/weapon/ore/silver
+ scan_icon = "mineral_uncommon"
-/datum/ore/gold
- smelts_to = /obj/item/stack/sheet/mineral/gold
- oretag = "gold"
+/ore/gold
+ smelts_to = "gold"
+ name = "gold"
+ display_name = "native gold"
+ result_amount = 5
+ spread_chance = 10
+ ore = /obj/item/weapon/ore/gold
+ scan_icon = "mineral_uncommon"
+ xarch_ages = list(
+ "thousand" = 999,
+ "million" = 999,
+ "billion" = 4,
+ "billion_lower" = 3
+ )
-/datum/ore/diamond
- compresses_to = /obj/item/stack/sheet/mineral/diamond
- oretag = "diamond"
+/ore/diamond
+ name = "diamond"
+ display_name = "diamond"
+ compresses_to = "diamond"
+ result_amount = 5
+ spread_chance = 10
+ ore = /obj/item/weapon/ore/diamond
+ scan_icon = "mineral_rare"
+ xarch_source_mineral = "nitrogen"
-/datum/ore/osmium
- smelts_to = /obj/item/stack/sheet/mineral/platinum
- compresses_to = /obj/item/stack/sheet/mineral/osmium
+/ore/platinum
+ name = "platinum"
+ display_name = "raw platinum"
+ smelts_to = "platinum"
+ compresses_to = "osmium"
alloy = 1
- oretag = "platinum"
+ result_amount = 5
+ spread_chance = 10
+ ore = /obj/item/weapon/ore/osmium
+ scan_icon = "mineral_rare"
-/datum/ore/hydrogen
- smelts_to = /obj/item/stack/sheet/mineral/tritium
- compresses_to = /obj/item/stack/sheet/mineral/mhydrogen
- oretag = "hydrogen"
+/ore/hydrogen
+ name = "mhydrogen"
+ display_name = "metallic hydrogen"
+ smelts_to = "tritium"
+ compresses_to = "mhydrogen"
+ scan_icon = "mineral_rare"
\ No newline at end of file
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 5428f3f6c0..ce365bbde2 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -97,5 +97,5 @@
for (var/obj/item/weapon/ore/O in contents)
O.loc = src.loc
O.ex_act(severity++)
- del(src)
+ qdel(src)
return
\ No newline at end of file
diff --git a/code/modules/mob/dead/observer/logout.dm b/code/modules/mob/dead/observer/logout.dm
index cf51df634e..11c6c3c834 100644
--- a/code/modules/mob/dead/observer/logout.dm
+++ b/code/modules/mob/dead/observer/logout.dm
@@ -2,4 +2,4 @@
..()
spawn(0)
if(src && !key) //we've transferred to another mob. This ghost should be deleted.
- del(src)
+ qdel(src)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 5c33250a97..56927f56bf 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -81,10 +81,10 @@ var/global/list/image/ghost_sightless_images = list() //this is a list of images
real_name = name
..()
-/mob/dead/observer/Del()
+/mob/dead/observer/Destroy()
if (ghostimage)
ghost_darkness_images -= ghostimage
- del(ghostimage)
+ qdel(ghostimage)
ghostimage = null
updateallghostimages()
..()
@@ -436,9 +436,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
src << "Spawning as a mouse is currently disabled."
return
- var/mob/dead/observer/M = usr
- if(config.antag_hud_restricted && M.has_enabled_antagHUD == 1)
- src << "antagHUD restrictions prevent you from spawning in as a mouse."
+ if(!MayRespawn(1))
return
var/timedifference = world.time - client.time_died_as_mouse
@@ -598,7 +596,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
for(var/image/I in client.images)
if(I.icon_state == icon)
iconRemoved = 1
- del(I)
+ qdel(I)
if(!iconRemoved)
var/image/J = image('icons/mob/mob.dmi', loc = src, icon_state = icon)
@@ -677,3 +675,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
client.images |= ghost_darkness_images
if (ghostimage)
client.images -= ghostimage //remove ourself
+
+mob/dead/observer/MayRespawn(var/feedback = 0)
+ if(config.antag_hud_restricted && has_enabled_antagHUD == 1)
+ if(feedback)
+ src << "antagHUD restrictions prevent you from respawning."
+ return 0
+ return 1
diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm
index a97d616dee..07cd8f19ff 100644
--- a/code/modules/mob/death.dm
+++ b/code/modules/mob/death.dm
@@ -19,8 +19,8 @@
if(do_gibs) gibs(loc, viruses, dna)
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
//This is the proc for turning a mob into ash. Mostly a copy of gib code (above).
//Originally created for wizard disintegrate. I've removed the virus code since it's irrelevant here.
@@ -43,8 +43,8 @@
dead_mob_list -= src
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/proc/death(gibbed,deathmessage="seizes up and falls limp...")
diff --git a/code/modules/mob/freelook/ai/cameranet.dm b/code/modules/mob/freelook/ai/cameranet.dm
index 2fb3c4b5ce..f29749b38c 100644
--- a/code/modules/mob/freelook/ai/cameranet.dm
+++ b/code/modules/mob/freelook/ai/cameranet.dm
@@ -3,7 +3,7 @@
// The datum containing all the chunks.
/datum/visualnet/camera
- // The cameras on the map, no matter if they work or not. Updated in obj/machinery/camera.dm by New() and Del().
+ // The cameras on the map, no matter if they work or not. Updated in obj/machinery/camera.dm by New() and Destroy().
var/list/cameras = list()
var/cameras_unsorted = 1
chunk_type = /datum/chunk/camera
diff --git a/code/modules/mob/freelook/ai/eye.dm b/code/modules/mob/freelook/ai/eye.dm
index a0df415c03..c0a42ace48 100644
--- a/code/modules/mob/freelook/ai/eye.dm
+++ b/code/modules/mob/freelook/ai/eye.dm
@@ -39,10 +39,11 @@
if(eyeobj)
eyeobj.loc = src.loc
-/mob/living/silicon/ai/Del()
+/mob/living/silicon/ai/Destroy()
if(eyeobj)
eyeobj.owner = null
- del(eyeobj) // No AI, no Eye
+ qdel(eyeobj) // No AI, no Eye
+ eyeobj = null
..()
/atom/proc/move_camera_by_click()
diff --git a/code/modules/mob/freelook/ai/update_triggers.dm b/code/modules/mob/freelook/ai/update_triggers.dm
index 828281567e..8a91d0540e 100644
--- a/code/modules/mob/freelook/ai/update_triggers.dm
+++ b/code/modules/mob/freelook/ai/update_triggers.dm
@@ -28,7 +28,7 @@
if(src.can_use())
cameranet.addCamera(src)
else
- src.SetLuminosity(0)
+ src.set_light(0)
cameranet.removeCamera(src)
/obj/machinery/camera/New()
@@ -41,7 +41,7 @@
dd_insertObjectList(cameranet.cameras, src)
update_coverage(1)
-/obj/machinery/camera/Del()
+/obj/machinery/camera/Destroy()
cameranet.cameras -= src
clear_all_networks()
..()
diff --git a/code/modules/mob/freelook/eye.dm b/code/modules/mob/freelook/eye.dm
index a9fefbc5bd..bec261797d 100644
--- a/code/modules/mob/freelook/eye.dm
+++ b/code/modules/mob/freelook/eye.dm
@@ -31,11 +31,11 @@
updateallghostimages()
..()
-mob/eye/Del()
+mob/eye/Destroy()
if (ghostimage)
ghost_darkness_images -= ghostimage
ghost_sightless_images -= ghostimage
- del(ghostimage)
+ qdel(ghostimage)
ghostimage = null
updateallghostimages()
..()
diff --git a/code/modules/mob/freelook/mask/update_triggers.dm b/code/modules/mob/freelook/mask/update_triggers.dm
index d80527a2fa..a8e68058fd 100644
--- a/code/modules/mob/freelook/mask/update_triggers.dm
+++ b/code/modules/mob/freelook/mask/update_triggers.dm
@@ -23,7 +23,7 @@
..()
cultnet.updateVisibility(src, 0)
-/mob/living/Del()
+/mob/living/Destroy()
cultnet.updateVisibility(src, 0)
..()
diff --git a/code/modules/mob/freelook/read_me.dm b/code/modules/mob/freelook/read_me.dm
index 53e68ff137..8ddb068940 100644
--- a/code/modules/mob/freelook/read_me.dm
+++ b/code/modules/mob/freelook/read_me.dm
@@ -20,7 +20,7 @@
HOW IT WORKS
It works by first creating a camera network datum. Inside of this camera network are "chunks" (which will be
- explained later) and "cameras". The cameras list is kept up to date by obj/machinery/camera/New() and Del().
+ explained later) and "cameras". The cameras list is kept up to date by obj/machinery/camera/New() and Destroy().
Next the camera network has chunks. These chunks are a 16x16 tile block of turfs and cameras contained inside the chunk.
These turfs are then sorted out based on what the cameras can and cannot see. If none of the cameras can see the turf, inside
diff --git a/code/modules/mob/freelook/update_triggers.dm b/code/modules/mob/freelook/update_triggers.dm
index 9bba162c40..8408083ba8 100644
--- a/code/modules/mob/freelook/update_triggers.dm
+++ b/code/modules/mob/freelook/update_triggers.dm
@@ -13,7 +13,7 @@
/turf/drain_power()
return -1
-/turf/simulated/Del()
+/turf/simulated/Destroy()
updateVisibility(src)
..()
@@ -24,7 +24,7 @@
// STRUCTURES
-/obj/structure/Del()
+/obj/structure/Destroy()
updateVisibility(src)
..()
@@ -34,9 +34,9 @@
// EFFECTS
-/obj/effect/Del()
+/obj/effect/Destroy()
updateVisibility(src)
- ..()
+ return ..()
/obj/effect/New()
..()
diff --git a/code/modules/mob/freelook/visualnet.dm b/code/modules/mob/freelook/visualnet.dm
index 161aeb92b8..38cb5bb3d2 100644
--- a/code/modules/mob/freelook/visualnet.dm
+++ b/code/modules/mob/freelook/visualnet.dm
@@ -12,7 +12,7 @@
..()
visual_nets += src
-/datum/visualnet/Del()
+/datum/visualnet/Destroy()
visual_nets -= src
..()
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 5e7fbe438d..6347a091f4 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -11,7 +11,7 @@
..()
processing_objects.Add(src)
-/obj/item/weapon/holder/Del()
+/obj/item/weapon/holder/Destroy()
processing_objects.Remove(src)
..()
@@ -26,7 +26,7 @@
mob_container.forceMove(get_turf(src))
M.reset_view()
- del(src)
+ qdel(src)
/obj/item/weapon/holder/attackby(obj/item/weapon/W as obj, mob/user as mob)
for(var/mob/M in src.contents)
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 0d20e00166..55232be0f6 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -20,7 +20,7 @@
if(!W.mob_can_equip(src, slot))
if(del_on_fail)
- del(W)
+ qdel(W)
else
if(!disable_warning)
src << "\red You are unable to equip that." //Only print if del_on_fail is false
@@ -58,6 +58,10 @@ var/list/slot_equipment_priority = list( \
slot_r_store\
)
+//Checks if a given slot can be accessed at this time, either to equip or unequip I
+/mob/proc/slot_is_accessible(var/slot, var/obj/item/I, mob/user=null)
+ return 1
+
//puts the item "W" into an appropriate slot in a human's inventory
//returns 0 if it cannot, 1 if successful
/mob/proc/equip_to_appropriate_slot(obj/item/W)
@@ -143,14 +147,15 @@ var/list/slot_equipment_priority = list( \
W.dropped()
return 0
-// Removes an item from inventory and places it in the target atom
+// Removes an item from inventory and places it in the target atom.
+// If canremove or other conditions need to be checked then use unEquip instead.
/mob/proc/drop_from_inventory(var/obj/item/W, var/atom/Target = null)
if(W)
if(!Target)
Target = loc
remove_from_mob(W)
- if(!W) return 1 // self destroying objects (tk, grabs)
+ if(!(W && W.loc)) return 1 // self destroying objects (tk, grabs)
W.forceMove(Target)
update_icons()
@@ -196,15 +201,21 @@ var/list/slot_equipment_priority = list( \
update_inv_wear_mask(0)
return
-//This differs from remove_from_mob() in that it checks canremove first.
+//This differs from remove_from_mob() in that it checks if the item can be unequipped first.
/mob/proc/unEquip(obj/item/I, force = 0) //Force overrides NODROP for things like wizarditis and admin undress.
if(!I) //If there's nothing to drop, the drop is automatically successful.
return 1
- if(!I.canremove && !force)
+ var/slot
+ for(var/s in slot_back to slot_tie) //kind of worries me
+ if(get_equipped_item(s) == I)
+ slot = s
+ break
+
+ if(slot && !I.mob_can_unequip(src, slot))
return 0
- remove_from_mob(I)
+ drop_from_inventory(I)
return 1
//Attemps to remove an object on a mob. Will not move it to another area or such, just removes from the mob.
@@ -220,6 +231,15 @@ var/list/slot_equipment_priority = list( \
return 1
+//Returns the item equipped to the specified slot, if any.
+/mob/proc/get_equipped_item(var/slot)
+ switch(slot)
+ if(slot_l_hand) return l_hand
+ if(slot_r_hand) return r_hand
+ if(slot_back) return back
+ if(slot_wear_mask) return wear_mask
+ return null
+
//Outdated but still in use apparently. This should at least be a human proc.
/mob/proc/get_equipped_items()
var/list/items = new/list()
diff --git a/code/modules/mob/living/blob/blob.dm b/code/modules/mob/living/blob/blob.dm
index 2b82ccbedb..8bbf517e60 100644
--- a/code/modules/mob/living/blob/blob.dm
+++ b/code/modules/mob/living/blob/blob.dm
@@ -246,7 +246,7 @@
B << "To create this node you will have to be on a normal blob tile and far enough away from any other node."
B << "Check your Blob verbs and hit Create Node to build a node."
spawn(10)
- del(G_found)
+ qdel(G_found)
diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm
new file mode 100644
index 0000000000..36110c600c
--- /dev/null
+++ b/code/modules/mob/living/bot/bot.dm
@@ -0,0 +1,123 @@
+/mob/living/bot
+ name = "Bot"
+ health = 20
+ maxHealth = 20
+ icon = 'icons/obj/aibots.dmi'
+ layer = MOB_LAYER
+ universal_speak = 1
+ density = 0
+ var/obj/item/weapon/card/id/botcard = null
+ var/list/botcard_access = list()
+ var/on = 1
+ var/open = 0
+ var/locked = 1
+ var/emagged = 0
+ var/light_strength = 3
+
+ var/obj/access_scanner = null
+ var/list/req_access = list()
+
+/mob/living/bot/New()
+ ..()
+ update_icons()
+
+ botcard = new /obj/item/weapon/card/id(src)
+ botcard.access = botcard_access.Copy()
+
+ access_scanner = new /obj(src)
+ access_scanner.req_access = req_access.Copy()
+
+/mob/living/bot/Life()
+ ..()
+ weakened = 0
+ stunned = 0
+ paralysis = 0
+ if(health <= 0)
+ death()
+
+/mob/living/bot/updatehealth()
+ if(status_flags & GODMODE)
+ health = maxHealth
+ stat = CONSCIOUS
+ else
+ health = maxHealth - getFireLoss() - getBruteLoss()
+ oxyloss = 0
+ toxloss = 0
+ cloneloss = 0
+ halloss = 0
+
+/mob/living/bot/death()
+ explode()
+
+/mob/living/bot/attackby(var/obj/item/O, var/mob/user)
+ if(O.GetID())
+ if(access_scanner.allowed(user) && !open && !emagged)
+ locked = !locked
+ user << "Controls are now [locked ? "locked." : "unlocked."]"
+ attack_hand(user)
+ else
+ if(emagged)
+ user << "ERROR"
+ if(open)
+ user << "Please close the access panel before locking it."
+ else
+ user << "Access denied."
+ return
+ else if(istype(O, /obj/item/weapon/screwdriver))
+ if(!locked)
+ open = !open
+ user << "Maintenance panel is now [open ? "opened" : "closed"]."
+ else
+ user << "You need to unlock the controls first."
+ return
+ else if(istype(O, /obj/item/weapon/weldingtool))
+ if(health < maxHealth)
+ if(open)
+ health = min(maxHealth, health + 10)
+ user.visible_message("[user] repairs [src].","You repair [src].")
+ else
+ user << "Unable to repair with the maintenance panel closed."
+ else
+ user << "[src] does not need a repair."
+ return
+ else if (istype(O, /obj/item/weapon/card/emag) && !emagged)
+ Emag(user)
+ return
+ else
+ ..()
+
+/mob/living/bot/attack_ai(var/mob/user)
+ return attack_hand(user)
+
+/mob/living/bot/say(var/message)
+ var/verb = "beeps"
+
+ message = sanitize(message)
+
+ ..(message, null, verb)
+
+/mob/living/bot/Bump(var/atom/A)
+ if(istype(A, /obj/machinery/door) && botcard)
+ var/obj/machinery/door/D = A
+ if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && D.check_access(botcard))
+ D.open()
+
+/mob/living/bot/proc/Emag(var/mob/user)
+ log_and_message_admins("emagged [src]")
+ return
+
+/mob/living/bot/proc/turn_on()
+ if(stat)
+ return 0
+ on = 1
+ set_light(light_strength)
+ update_icons()
+ return 1
+
+/mob/living/bot/proc/turn_off()
+ on = 0
+ set_light(0)
+ update_icons()
+
+/mob/living/bot/proc/explode()
+ qdel(src)
diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm
new file mode 100644
index 0000000000..7331010852
--- /dev/null
+++ b/code/modules/mob/living/bot/cleanbot.dm
@@ -0,0 +1,306 @@
+/mob/living/bot/cleanbot
+ name = "Cleanbot"
+ desc = "A little cleaning robot, he looks so excited!"
+ icon_state = "cleanbot0"
+ req_access = list(access_janitor)
+ botcard_access = list(access_janitor, access_maint_tunnels)
+
+ locked = 0 // Start unlocked so roboticist can set them to patrol.
+
+ var/obj/effect/decal/cleanable/target
+ var/list/path = list()
+ var/list/patrol_path = list()
+ var/list/ignorelist = list()
+
+ var/obj/cleanbot_listener/listener = null
+ var/beacon_freq = 1445 // navigation beacon frequency
+ var/signal_sent = 0
+ var/closest_dist
+ var/next_dest
+ var/next_dest_loc
+
+ var/cleaning = 0
+ var/screwloose = 0
+ var/oddbutton = 0
+ var/should_patrol = 0
+ var/blood = 1
+ var/list/target_types = list()
+
+/mob/living/bot/cleanbot/New()
+ ..()
+ get_targets()
+
+ listener = new /obj/cleanbot_listener(src)
+ listener.cleanbot = src
+
+ if(radio_controller)
+ radio_controller.add_object(listener, beacon_freq, filter = RADIO_NAVBEACONS)
+
+/mob/living/bot/cleanbot/Life()
+ ..()
+
+ if(!on)
+ return
+
+ if(client)
+ return
+ if(cleaning)
+ return
+
+ if(!screwloose && !oddbutton && prob(5))
+ custom_emote(2, "makes an excited beeping booping sound!")
+
+ if(screwloose && prob(5)) // Make a mess
+ if(istype(loc, /turf/simulated))
+ var/turf/simulated/T = loc
+ if(T.wet < 1)
+ T.wet = 1
+ if(T.wet_overlay)
+ T.overlays -= T.wet_overlay
+ T.wet_overlay = null
+ T.wet_overlay = image('icons/effects/water.dmi', T, "wet_floor")
+ T.overlays += T.wet_overlay
+ spawn(800)
+ if(istype(T) && T.wet < 2)
+ T.wet = 0
+ if(T.wet_overlay)
+ T.overlays -= T.wet_overlay
+ T.wet_overlay = null
+
+ if(oddbutton && prob(5)) // Make a big mess
+ visible_message("Something flies out of [src]. He seems to be acting oddly.")
+ var/obj/effect/decal/cleanable/blood/gibs/gib = new /obj/effect/decal/cleanable/blood/gibs(loc)
+ ignorelist += gib
+ spawn(600)
+ ignorelist -= gib
+
+ if(!target) // Find a target
+ for(var/obj/effect/decal/cleanable/D in view(7, src))
+ if(D in ignorelist)
+ continue
+ for(var/T in target_types)
+ if(istype(D, T))
+ target = D
+ patrol_path = list()
+
+ if(!target) // No targets in range
+ if(!should_patrol)
+ return
+
+ if(!patrol_path || !patrol_path.len)
+ if(!signal_sent || signal_sent > world.time + 200) // Waited enough or didn't send yet
+ var/datum/radio_frequency/frequency = radio_controller.return_frequency(beacon_freq)
+ if(!frequency)
+ return
+
+ closest_dist = 9999
+ next_dest = null
+ next_dest_loc = null
+
+ var/datum/signal/signal = new()
+ signal.source = src
+ signal.transmission_method = 1
+ signal.data = list("findbeakon" = "patrol")
+ frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
+ signal_sent = world.time
+ else
+ if(next_dest)
+ next_dest_loc = listener.memorized[next_dest]
+ if(next_dest_loc)
+ patrol_path = AStar(loc, next_dest_loc, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 120, id = botcard, exclude = null)
+ signal_sent = 0
+ else
+ if(pulledby) // Don't wiggle if someone pulls you
+ patrol_path = list()
+ return
+ if(patrol_path[1] == loc)
+ patrol_path -= patrol_path[1]
+ var/moved = step_towards(src, patrol_path[1])
+ if(moved)
+ patrol_path -= patrol_path[1]
+ if(target)
+ if(loc == target.loc)
+ if(!cleaning)
+ UnarmedAttack(target)
+ return
+ if(!path.len)
+ spawn(0)
+ path = AStar(loc, target.loc, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 30, id = botcard)
+ if(!path)
+ path = list()
+ return
+ if(path.len)
+ step_to(src, path[1])
+ path -= path[1]
+ return
+
+/mob/living/bot/cleanbot/UnarmedAttack(var/obj/effect/decal/cleanable/D, var/proximity)
+ if(!..())
+ return
+
+ if(!istype(D))
+ return
+
+ if(D.loc != loc)
+ return
+
+ cleaning = 1
+ custom_emote(2, "begins to clean up the [D]")
+ update_icons()
+ var/cleantime = istype(D, /obj/effect/decal/cleanable/dirt) ? 10 : 50
+ if(do_after(src, cleantime))
+ if(istype(loc, /turf/simulated))
+ var/turf/simulated/f = loc
+ f.dirt = 0
+ if(!D)
+ return
+ qdel(D)
+ cleaning = 0
+ update_icons()
+
+/mob/living/bot/cleanbot/explode()
+ on = 0
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ new /obj/item/weapon/reagent_containers/glass/bucket(Tsec)
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+ if(prob(50))
+ new /obj/item/robot_parts/l_arm(Tsec)
+
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+ qdel(src)
+ return
+
+/mob/living/bot/cleanbot/update_icons()
+ if(cleaning)
+ icon_state = "cleanbot-c"
+ else
+ icon_state = "cleanbot[on]"
+
+/mob/living/bot/cleanbot/turn_off()
+ ..()
+ target = null
+ path = list()
+ patrol_path = list()
+
+/mob/living/bot/cleanbot/attack_hand(var/mob/user)
+ var/dat
+ dat += "Automatic Station Cleaner v1.0
"
+ dat += "Status: [on ? "On" : "Off"]
"
+ dat += "Behaviour controls are [locked ? "locked" : "unlocked"]
"
+ dat += "Maintenance panel is [open ? "opened" : "closed"]"
+ if(!locked || issilicon(user))
+ dat += "
Cleans Blood: [blood ? "Yes" : "No"]
"
+ dat += "
Patrol station: [should_patrol ? "Yes" : "No"]
"
+ if(open && !locked)
+ dat += "Odd looking screw twiddled: [screwloose ? "Yes" : "No"]
"
+ dat += "Weird button pressed: [oddbutton ? "Yes" : "No"]"
+
+ user << browse("Cleaner v1.0 controls[dat]", "window=autocleaner")
+ onclose(user, "autocleaner")
+ return
+
+/mob/living/bot/cleanbot/Topic(href, href_list)
+ if(..())
+ return
+ usr.set_machine(src)
+ add_fingerprint(usr)
+ switch(href_list["operation"])
+ if("start")
+ if(on)
+ turn_off()
+ else
+ turn_on()
+ if("blood")
+ blood = !blood
+ get_targets()
+ if("patrol")
+ should_patrol = !should_patrol
+ patrol_path = null
+ if("freq")
+ var/freq = text2num(input("Select frequency for navigation beacons", "Frequnecy", num2text(beacon_freq / 10))) * 10
+ if (freq > 0)
+ beacon_freq = freq
+ if("screw")
+ screwloose = !screwloose
+ usr << "You twiddle the screw."
+ if("oddbutton")
+ oddbutton = !oddbutton
+ usr << "You press the weird button."
+ attack_hand(usr)
+
+/mob/living/bot/cleanbot/Emag(var/mob/user)
+ ..()
+ if(user)
+ user << "The [src] buzzes and beeps."
+ oddbutton = 1
+ screwloose = 1
+
+/mob/living/bot/cleanbot/proc/get_targets()
+ target_types = list()
+
+ target_types += /obj/effect/decal/cleanable/blood/oil
+ target_types += /obj/effect/decal/cleanable/vomit
+ target_types += /obj/effect/decal/cleanable/crayon
+ target_types += /obj/effect/decal/cleanable/liquid_fuel
+ target_types += /obj/effect/decal/cleanable/mucus
+ target_types += /obj/effect/decal/cleanable/dirt
+
+ if(blood)
+ target_types += /obj/effect/decal/cleanable/blood
+
+/* Radio object that listens to signals */
+
+/obj/cleanbot_listener
+ var/mob/living/bot/cleanbot/cleanbot = null
+ var/list/memorized = list()
+
+/obj/cleanbot_listener/receive_signal(var/datum/signal/signal)
+ var/recv = signal.data["beacon"]
+ var/valid = signal.data["patrol"]
+ if(!recv || !valid || !cleanbot)
+ return
+
+ var/dist = get_dist(cleanbot, signal.source.loc)
+ memorized[recv] = signal.source.loc
+
+ if(dist < cleanbot.closest_dist) // We check all signals, choosing the closest beakon; then we move to the NEXT one after the closest one
+ cleanbot.closest_dist = dist
+ cleanbot.next_dest = signal.data["next_patrol"]
+
+/* Assembly */
+
+/obj/item/weapon/bucket_sensor
+ desc = "It's a bucket. With a sensor attached."
+ name = "proxy bucket"
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "bucket_proxy"
+ force = 3.0
+ throwforce = 10.0
+ throw_speed = 2
+ throw_range = 5
+ w_class = 3.0
+ var/created_name = "Cleanbot"
+
+/obj/item/weapon/bucket_sensor/attackby(var/obj/item/O, var/mob/user)
+ ..()
+ if(istype(O, /obj/item/robot_parts/l_arm) || istype(O, /obj/item/robot_parts/r_arm))
+ user.drop_item()
+ qdel(O)
+ var/turf/T = get_turf(loc)
+ var/mob/living/bot/cleanbot/A = new /mob/living/bot/cleanbot(T)
+ A.name = created_name
+ user << "You add the robot arm to the bucket and sensor assembly. Beep boop!"
+ user.drop_from_inventory(src)
+ qdel(src)
+
+ else if(istype(O, /obj/item/weapon/pen))
+ var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && src.loc != usr)
+ return
+ created_name = t
diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm
new file mode 100644
index 0000000000..78262f58ec
--- /dev/null
+++ b/code/modules/mob/living/bot/ed209bot.dm
@@ -0,0 +1,192 @@
+/mob/living/bot/secbot/ed209
+ name = "ED-209 Security Robot"
+ desc = "A security robot. He looks less than thrilled."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "ed2090"
+ density = 1
+ health = 100
+ maxHealth = 100
+
+ bot_version = "2.5"
+ is_ranged = 1
+ preparing_arrest_sounds = new()
+
+ var/shot_delay = 4
+ var/last_shot = 0
+
+/mob/living/bot/secbot/ed209/update_icons()
+ if(on && is_attacking)
+ icon_state = "ed209-c"
+ else
+ icon_state = "ed209[on]"
+
+/mob/living/bot/secbot/ed209/explode()
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ new /obj/item/weapon/secbot_assembly/ed209_assembly(Tsec)
+
+ var/obj/item/weapon/gun/energy/taser/G = new /obj/item/weapon/gun/energy/taser(Tsec)
+ G.power_supply.charge = 0
+ if(prob(50))
+ new /obj/item/robot_parts/l_leg(Tsec)
+ if(prob(50))
+ new /obj/item/robot_parts/r_leg(Tsec)
+ if(prob(50))
+ if(prob(50))
+ new /obj/item/clothing/head/helmet(Tsec)
+ else
+ new /obj/item/clothing/suit/armor/vest(Tsec)
+
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+
+ new /obj/effect/decal/cleanable/blood/oil(Tsec)
+ qdel(src)
+
+/mob/living/bot/secbot/ed209/RangedAttack(var/atom/A)
+ if(last_shot + shot_delay > world.time)
+ src << "You are not ready to fire yet!"
+ return
+
+ last_shot = world.time
+ var/turf/T = get_turf(src)
+ var/turf/U = get_turf(A)
+
+ var/projectile = /obj/item/projectile/beam/stun
+ if(emagged)
+ projectile = /obj/item/projectile/beam
+
+ playsound(loc, emagged ? 'sound/weapons/Laser.ogg' : 'sound/weapons/Taser.ogg', 50, 1)
+ var/obj/item/projectile/P = new projectile(loc)
+
+ P.original = A
+ P.starting = T
+ P.current = T
+ P.yo = U.y - T.y
+ P.xo = U.x - T.x
+ spawn()
+ P.process()
+ return
+
+// Assembly
+
+/obj/item/weapon/secbot_assembly/ed209_assembly
+ name = "ED-209 assembly"
+ desc = "Some sort of bizarre assembly."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "ed209_frame"
+ item_state = "ed209_frame"
+ created_name = "ED-209 Security Robot"
+ var/lasercolor = ""
+
+/obj/item/weapon/secbot_assembly/ed209_assembly/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ ..()
+
+ if(istype(W, /obj/item/weapon/pen))
+ var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && src.loc != usr)
+ return
+ created_name = t
+ return
+
+ switch(build_step)
+ if(0, 1)
+ if(istype(W, /obj/item/robot_parts/l_leg) || istype(W, /obj/item/robot_parts/r_leg))
+ user.drop_item()
+ qdel(W)
+ build_step++
+ user << "You add the robot leg to [src]."
+ name = "legs/frame assembly"
+ if(build_step == 1)
+ item_state = "ed209_leg"
+ icon_state = "ed209_leg"
+ else
+ item_state = "ed209_legs"
+ icon_state = "ed209_legs"
+
+ if(2)
+ if(istype(W, /obj/item/clothing/suit/storage/vest))
+ user.drop_item()
+ qdel(W)
+ build_step++
+ user << "You add the armor to [src]."
+ name = "vest/legs/frame assembly"
+ item_state = "ed209_shell"
+ icon_state = "ed209_shell"
+
+ if(3)
+ if(istype(W, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = W
+ if(WT.remove_fuel(0, user))
+ build_step++
+ name = "shielded frame assembly"
+ user << "You welded the vest to [src]."
+ if(4)
+ if(istype(W, /obj/item/clothing/head/helmet))
+ user.drop_item()
+ qdel(W)
+ build_step++
+ user << "You add the helmet to [src]."
+ name = "covered and shielded frame assembly"
+ item_state = "ed209_hat"
+ icon_state = "ed209_hat"
+
+ if(5)
+ if(isprox(W))
+ user.drop_item()
+ qdel(W)
+ build_step++
+ user << "You add the prox sensor to [src]."
+ name = "covered, shielded and sensored frame assembly"
+ item_state = "ed209_prox"
+ icon_state = "ed209_prox"
+
+ if(6)
+ if(istype(W, /obj/item/stack/cable_coil))
+ var/obj/item/stack/cable_coil/C = W
+ if (C.get_amount() < 1)
+ user << "You need one coil of wire to wire [src]."
+ return
+ user << "You start to wire [src]."
+ if(do_after(user, 40) && build_step == 6)
+ if(C.use(1))
+ build_step++
+ user << "You wire the ED-209 assembly."
+ name = "wired ED-209 assembly"
+ return
+
+ if(7)
+ if(istype(W, /obj/item/weapon/gun/energy/taser))
+ name = "taser ED-209 assembly"
+ build_step++
+ user << "You add [W] to [src]."
+ item_state = "ed209_taser"
+ icon_state = "ed209_taser"
+ user.drop_item()
+ qdel(W)
+
+ if(8)
+ if(istype(W, /obj/item/weapon/screwdriver))
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+ var/turf/T = get_turf(user)
+ user << "Now attaching the gun to the frame..."
+ sleep(40)
+ if(get_turf(user) == T && build_step == 8)
+ build_step++
+ name = "armed [name]"
+ user << "Taser gun attached."
+
+ if(9)
+ if(istype(W, /obj/item/weapon/cell))
+ build_step++
+ user << "You complete the ED-209."
+ var/turf/T = get_turf(src)
+ new /mob/living/bot/secbot/ed209(T,created_name,lasercolor)
+ user.drop_item()
+ qdel(W)
+ user.drop_from_inventory(src)
+ qdel(src)
diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm
new file mode 100644
index 0000000000..f1c84f3866
--- /dev/null
+++ b/code/modules/mob/living/bot/farmbot.dm
@@ -0,0 +1,359 @@
+#define FARMBOT_COLLECT 1
+#define FARMBOT_WATER 2
+#define FARMBOT_UPROOT 3
+#define FARMBOT_NUTRIMENT 4
+
+/mob/living/bot/farmbot
+ name = "Farmbot"
+ desc = "The botanist's best friend."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "farmbot0"
+ health = 50
+ maxHealth = 50
+ req_access = list(access_hydroponics)
+
+ var/action = "" // Used to update icon
+ var/waters_trays = 1
+ var/refills_water = 1
+ var/uproots_weeds = 1
+ var/replaces_nutriment = 0
+ var/collects_produce = 0
+ var/removes_dead = 0
+
+ var/obj/structure/reagent_dispensers/watertank/tank
+
+ var/attacking = 0
+ var/list/path = list()
+ var/atom/target
+ var/frustration = 0
+
+/mob/living/bot/farmbot/New()
+ ..()
+ spawn(5)
+ tank = locate() in contents
+ if(!tank)
+ tank = new /obj/structure/reagent_dispensers/watertank(src)
+
+/mob/living/bot/farmbot/attack_hand(var/mob/user as mob)
+ . = ..()
+ if(.)
+ return
+ var/dat = ""
+ dat += "Automatic Hyrdoponic Assisting Unit v1.0
"
+ dat += "Status: [on ? "On" : "Off"]
"
+ dat += "Water Tank: "
+ if (tank)
+ dat += "[tank.reagents.total_volume]/[tank.reagents.maximum_volume]"
+ else
+ dat += "Error: Watertank not found"
+ dat += "
Behaviour controls are [locked ? "locked" : "unlocked"]
"
+ if(!locked)
+ dat += "Watering controls:
"
+ dat += "Water plants : [waters_trays ? "Yes" : "No"]
"
+ dat += "Refill watertank : [refills_water ? "Yes" : "No"]
"
+ dat += "
Weeding controls:
"
+ dat += "Weed plants: [uproots_weeds ? "Yes" : "No"]
"
+ dat += "
Nutriment controls:
"
+ dat += "Replace fertilizer: [replaces_nutriment ? "Yes" : "No"]
"
+ dat += "
Plant controls:
"
+ dat += "Collect produce: [collects_produce ? "Yes" : "No"]
"
+ dat += "Remove dead plants: [removes_dead ? "Yes" : "No"]
"
+ dat += ""
+
+ user << browse("Farmbot v1.0 controls[dat]", "window=autofarm")
+ onclose(user, "autofarm")
+ return
+
+/mob/living/bot/farmbot/Emag(var/mob/user)
+ ..()
+ if(user)
+ user << "You short out [src]'s plant identifier circuits."
+ spawn(rand(30, 50))
+ visible_message("[src] buzzes oddly.")
+ emagged = 1
+
+/mob/living/bot/farmbot/Topic(href, href_list)
+ if(..())
+ return
+ usr.machine = src
+ add_fingerprint(usr)
+ if((href_list["power"]) && (access_scanner.allowed(usr)))
+ if(on)
+ turn_off()
+ else
+ turn_on()
+
+ if(locked)
+ return
+
+ if(href_list["water"])
+ waters_trays = !waters_trays
+ else if(href_list["refill"])
+ refills_water = !refills_water
+ else if(href_list["weed"])
+ uproots_weeds = !uproots_weeds
+ else if(href_list["replacenutri"])
+ replaces_nutriment = !replaces_nutriment
+ else if(href_list["collect"])
+ collects_produce = !collects_produce
+ else if(href_list["removedead"])
+ removes_dead = !removes_dead
+
+ attack_hand(usr)
+ return
+
+/mob/living/bot/farmbot/update_icons()
+ if(on && action)
+ icon_state = "farmbot_[action]"
+ else
+ icon_state = "farmbot[on]"
+
+/mob/living/bot/farmbot/Life()
+ ..()
+ if(!on)
+ return
+ if(emagged && prob(1))
+ flick("farmbot_broke", src)
+ if(client)
+ return
+
+ if(target)
+ if(Adjacent(target))
+ UnarmedAttack(target)
+ path = list()
+ target = null
+ else
+ if(path.len && frustration < 5)
+ if(path[1] == loc)
+ path -= path[1]
+ var/t = step_towards(src, path[1])
+ if(t)
+ path -= path[1]
+ else
+ ++frustration
+ else
+ path = list()
+ target = null
+ else
+ if(emagged)
+ for(var/mob/living/carbon/human/H in view(7, src))
+ target = H
+ break
+ else
+ for(var/obj/machinery/portable_atmospherics/hydroponics/tray in view(7, src))
+ if(process_tray(tray))
+ target = tray
+ frustration = 0
+ break
+ if(!target && refills_water && tank && tank.reagents.total_volume < tank.reagents.maximum_volume)
+ for(var/obj/structure/sink/source in view(7, src))
+ target = source
+ frustration = 0
+ break
+ if(target)
+ var/t = get_dir(target, src) // Turf with the tray is impassable, so a* can't navigate directly to it
+ path = AStar(loc, get_step(target, t), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 30, id = botcard)
+ if(!path)
+ path = list()
+
+/mob/living/bot/farmbot/UnarmedAttack(var/atom/A, var/proximity)
+ if(!..())
+ return
+ if(attacking)
+ return
+
+ if(istype(A, /obj/machinery/portable_atmospherics/hydroponics))
+ var/obj/machinery/portable_atmospherics/hydroponics/T = A
+ var/t = process_tray(T)
+ switch(t)
+ if(0)
+ return
+ if(FARMBOT_COLLECT)
+ action = "water" // Needs a better one
+ update_icons()
+ visible_message("[src] starts [T.dead? "removing the plant from" : "harvesting"] \the [A].")
+ attacking = 1
+ if(do_after(src, 30))
+ visible_message("[src] [T.dead? "removes the plant from" : "harvests"] \the [A].")
+ T.attack_hand(src)
+ if(FARMBOT_WATER)
+ action = "water"
+ update_icons()
+ visible_message("[src] starts watering \the [A].")
+ attacking = 1
+ if(do_after(src, 30))
+ playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+ visible_message("[src] waters \the [A].")
+ tank.reagents.trans_to(T, 100 - T.waterlevel)
+ if(FARMBOT_UPROOT)
+ action = "hoe"
+ update_icons()
+ visible_message("[src] starts uprooting the weeds in \the [A].")
+ attacking = 1
+ if(do_after(src, 30))
+ visible_message("[src] uproots the weeds in \the [A].")
+ T.weedlevel = 0
+ if(FARMBOT_NUTRIMENT)
+ action = "fertile"
+ update_icons()
+ visible_message("[src] starts fertilizing \the [A].")
+ attacking = 1
+ if(do_after(src, 30))
+ visible_message("[src] waters \the [A].")
+ T.reagents.add_reagent("ammonia", 10)
+ attacking = 0
+ action = ""
+ update_icons()
+ T.update_icon()
+ else if(istype(A, /obj/structure/sink))
+ if(!tank || tank.reagents.total_volume >= tank.reagents.maximum_volume)
+ return
+ action = "water"
+ update_icons()
+ visible_message("[src] starts refilling its tank from \the [A].")
+ attacking = 1
+ while(do_after(src, 10) && tank.reagents.total_volume < tank.reagents.maximum_volume)
+ tank.reagents.add_reagent("water", 10)
+ if(prob(5))
+ playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+ attacking = 0
+ action = ""
+ update_icons()
+ visible_message("[src] finishes refilling its tank.")
+ else if(emagged && ishuman(A))
+ var/action = pick("weed", "water")
+ attacking = 1
+ spawn(50) // Some delay
+ attacking = 0
+ switch(action)
+ if("weed")
+ flick("farmbot_hoe", src)
+ if(prob(50))
+ visible_message("[src] swings wildly at [A] with a minihoe, missing completely!")
+ return
+ var/t = pick("slashed", "sliced", "cut", "clawed")
+ A.attack_generic(src, 5, t)
+ if("water")
+ flick("farmbot_water", src)
+ visible_message("[src] splashes [A] with water!") // That's it. RP effect.
+
+/mob/living/bot/farmbot/explode()
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ new /obj/item/weapon/minihoe(Tsec)
+ new /obj/item/weapon/reagent_containers/glass/bucket(Tsec)
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+ new /obj/item/device/analyzer/plant_analyzer(Tsec)
+
+ if(tank)
+ tank.loc = Tsec
+
+ if(prob(50))
+ new /obj/item/robot_parts/l_arm(Tsec)
+
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+ qdel(src)
+ return
+
+/mob/living/bot/farmbot/proc/process_tray(var/obj/machinery/portable_atmospherics/hydroponics/tray)
+ if(!tray || !istype(tray))
+ return 0
+
+ if(tray.closed_system || !tray.seed)
+ return 0
+
+ if(tray.dead && removes_dead || tray.harvest && collects_produce)
+ return FARMBOT_COLLECT
+
+ else if(refills_water && tray.waterlevel < 40 && !tray.reagents.has_reagent("water"))
+ return FARMBOT_WATER
+
+ else if(uproots_weeds && tray.weedlevel > 3)
+ return FARMBOT_UPROOT
+
+ else if(replaces_nutriment && tray.nutrilevel < 1 && tray.reagents.total_volume < 1)
+ return FARMBOT_NUTRIMENT
+
+ return 0
+
+// Assembly
+
+/obj/item/weapon/farmbot_arm_assembly
+ name = "water tank/robot arm assembly"
+ desc = "A water tank with a robot arm permanently grafted to it."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "water_arm"
+ var/build_step = 0
+ var/created_name = "Farmbot"
+ w_class = 3.0
+
+ New()
+ ..()
+ spawn(4) // If an admin spawned it, it won't have a watertank it, so lets make one for em!
+ var tank = locate(/obj/structure/reagent_dispensers/watertank) in contents
+ if(!tank)
+ new /obj/structure/reagent_dispensers/watertank(src)
+
+
+/obj/structure/reagent_dispensers/watertank/attackby(var/obj/item/robot_parts/S, mob/user as mob)
+ if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm)))
+ ..()
+ return
+
+ var/obj/item/weapon/farmbot_arm_assembly/A = new /obj/item/weapon/farmbot_arm_assembly(loc)
+
+ user << "You add the robot arm to [src]."
+ loc = A //Place the water tank into the assembly, it will be needed for the finished bot
+ user.drop_from_inventory(S)
+ qdel(S)
+
+/obj/item/weapon/farmbot_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ ..()
+ if((istype(W, /obj/item/device/analyzer/plant_analyzer)) && (build_step == 0))
+ build_step++
+ user << "You add the plant analyzer to [src]."
+ name = "farmbot assembly"
+ user.remove_from_mob(W)
+ qdel(W)
+
+ else if((istype(W, /obj/item/weapon/reagent_containers/glass/bucket)) && (build_step == 1))
+ build_step++
+ user << "You add a bucket to [src]."
+ name = "farmbot assembly with bucket"
+ user.remove_from_mob(W)
+ qdel(W)
+
+ else if((istype(W, /obj/item/weapon/minihoe)) && (build_step == 2))
+ build_step++
+ user << "You add a minihoe to [src]."
+ name = "farmbot assembly with bucket and minihoe"
+ user.remove_from_mob(W)
+ qdel(W)
+
+ else if((isprox(W)) && (build_step == 3))
+ build_step++
+ user << "You complete the Farmbot! Beep boop."
+ var/mob/living/bot/farmbot/S = new /mob/living/bot/farmbot(get_turf(src))
+ for(var/obj/structure/reagent_dispensers/watertank/wTank in contents)
+ wTank.loc = S
+ S.tank = wTank
+ S.name = created_name
+ user.remove_from_mob(W)
+ qdel(W)
+ qdel(src)
+
+ else if(istype(W, /obj/item/weapon/pen))
+ var/t = input(user, "Enter new robot name", name, created_name) as text
+ t = sanitize(t, MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && loc != usr)
+ return
+
+ created_name = t
+
+/obj/item/weapon/farmbot_arm_assembly/attack_hand(mob/user as mob)
+ return //it's a converted watertank, no you cannot pick it up and put it in your backpack
\ No newline at end of file
diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm
new file mode 100644
index 0000000000..08c5ac1c4b
--- /dev/null
+++ b/code/modules/mob/living/bot/floorbot.dm
@@ -0,0 +1,365 @@
+/mob/living/bot/floorbot
+ name = "Floorbot"
+ desc = "A little floor repairing robot, he looks so excited!"
+ icon_state = "floorbot0"
+ req_access = list(access_construction)
+
+ var/amount = 10 // 1 for tile, 2 for lattice
+ var/maxAmount = 60
+ var/tilemake = 0 // When it reaches 100, bot makes a tile
+ var/repairing = 0
+ var/improvefloors = 0
+ var/eattiles = 0
+ var/maketiles = 0
+ var/targetdirection = null
+ var/list/path = list()
+ var/list/ignorelist = list()
+ var/turf/target
+
+/mob/living/bot/floorbot/update_icons()
+ if(repairing)
+ icon_state = "floorbot-c"
+ else if(amount > 0)
+ icon_state = "floorbot[on]"
+ else
+ icon_state = "floorbot[on]e"
+
+/mob/living/bot/floorbot/attack_hand(var/mob/user)
+ user.set_machine(src)
+ var/dat
+ dat += "Automatic Station Floor Repairer v1.0
"
+ dat += "Status: [src.on ? "On" : "Off"]
"
+ dat += "Maintenance panel is [open ? "opened" : "closed"]
"
+ //dat += "Tiles left: [amount]
"
+ dat += "Behvaiour controls are [locked ? "locked" : "unlocked"]
"
+ if(!locked || issilicon(user))
+ dat += "Improves floors: [improvefloors ? "Yes" : "No"]
"
+ dat += "Finds tiles: [eattiles ? "Yes" : "No"]
"
+ dat += "Make singles pieces of metal into tiles when empty: [maketiles ? "Yes" : "No"]
"
+ var/bmode
+ if(targetdirection)
+ bmode = dir2text(targetdirection)
+ else
+ bmode = "Disabled"
+ dat += "
Bridge Mode : [bmode]
"
+
+ user << browse("Repairbot v1.0 controls[dat]", "window=autorepair")
+ onclose(user, "autorepair")
+ return
+
+/mob/living/bot/floorbot/Emag(var/mob/user)
+ ..()
+ emagged = 1
+ if(user)
+ user << "The [src] buzzes and beeps."
+
+/mob/living/bot/floorbot/Topic(href, href_list)
+ if(..())
+ return
+ usr.set_machine(src)
+ add_fingerprint(usr)
+ switch(href_list["operation"])
+ if("start")
+ if (on)
+ turn_off()
+ else
+ turn_on()
+ if("improve")
+ improvefloors = !improvefloors
+ if("tiles")
+ eattiles = !eattiles
+ if("make")
+ maketiles = !maketiles
+ if("bridgemode")
+ switch(targetdirection)
+ if(null)
+ targetdirection = 1
+ if(1)
+ targetdirection = 2
+ if(2)
+ targetdirection = 4
+ if(4)
+ targetdirection = 8
+ if(8)
+ targetdirection = null
+ else
+ targetdirection = null
+ attack_hand(usr)
+
+/mob/living/bot/floorbot/turn_off()
+ ..()
+ target = null
+ path = list()
+ ignorelist = list()
+
+/mob/living/bot/floorbot/Life()
+ ..()
+
+ if(!on)
+ return
+
+ ++tilemake
+ if(tilemake >= 100)
+ tilemake = 0
+ addTiles(1)
+
+ if(client)
+ return
+
+ if(prob(5))
+ custom_emote(2, "makes an excited booping beeping sound!")
+
+ if(ignorelist.len) // Don't stick forever
+ for(var/T in ignorelist)
+ if(prob(1))
+ ignorelist -= T
+
+ if(amount && !emagged)
+ if(!target && targetdirection) // Building a bridge
+ var/turf/T = get_step(src, targetdirection)
+ while(T in range(src))
+ if(istype(T, /turf/space))
+ target = T
+ break
+ T = get_step(T, targetdirection)
+
+ if(!target) // Fixing floors
+ for(var/turf/T in view(src))
+ if(T.loc.name == "Space")
+ continue
+ if(T in ignorelist)
+ continue
+ if(istype(T, /turf/space))
+ if(get_turf(T) == loc || prob(40)) // So they target the same tile all the time
+ target = T
+ if(improvefloors && istype(T, /turf/simulated/floor))
+ var/turf/simulated/floor/F = T
+ if(!F.floor_type && (get_turf(T) == loc || prob(40)))
+ target = T
+
+ if(emagged) // Time to griff
+ for(var/turf/simulated/floor/D in view(src))
+ if(D.loc.name == "Space")
+ continue
+ if(D in ignorelist)
+ continue
+ target = D
+ break
+
+ if(!target && amount < maxAmount && eattiles || maketiles) // Eat tiles
+ if(eattiles)
+ for(var/obj/item/stack/tile/plasteel/T in view(src))
+ if(T in ignorelist)
+ continue
+ target = T
+ break
+ if(maketiles && !target)
+ for(var/obj/item/stack/sheet/metal/T in view(src))
+ if(T in ignorelist)
+ continue
+ target = T
+ break
+
+ if(target && get_turf(target) == loc)
+ UnarmedAttack(target)
+
+ if(target && get_turf(target) != loc && !path.len)
+ spawn(0)
+ path = AStar(loc, get_turf(target), /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id = botcard)
+ if(!path)
+ path = list()
+ ignorelist += target
+ target = null
+
+ if(path.len)
+ step_to(src, path[1])
+ path -= path[1]
+
+/mob/living/bot/floorbot/UnarmedAttack(var/atom/A, var/proximity)
+ if(!..())
+ return
+
+ if(repairing)
+ return
+
+ if(get_turf(A) != loc)
+ return
+
+ if(emagged && istype(A, /turf/simulated/floor))
+ var/turf/simulated/floor/F = A
+ repairing = 1
+ update_icons()
+ if(F.is_plating())
+ visible_message("[src] begins to tear the floor tile from the floor!")
+ if(do_after(src, 50))
+ F.break_tile_to_plating()
+ addTiles(1)
+ else
+ visible_message("[src] begins to tear through the floor!")
+ if(do_after(src, 150)) // Extra time because this can and will kill.
+ F.ReplaceWithLattice()
+ addTiles(1)
+ target = null
+ repairing = 0
+ update_icons()
+ else if(istype(A, /turf/space))
+ var/building = 2
+ if(locate(/obj/structure/lattice, A))
+ building = 1
+ if(amount < building)
+ return
+ repairing = 1
+ update_icons()
+ visible_message("[src] begins to repair the hole.")
+ if(do_after(src, 50))
+ if(A && (locate(/obj/structure/lattice, A) && building == 1 || !locate(/obj/structure/lattice, A) && building == 2)) // Make sure that it still needs repairs
+ var/obj/item/I
+ if(building == 1)
+ I = new /obj/item/stack/tile/plasteel(src)
+ else
+ I = PoolOrNew(/obj/item/stack/rods, src)
+ A.attackby(I, src)
+ target = null
+ repairing = 0
+ update_icons()
+ else if(istype(A, /turf/simulated/floor))
+ var/turf/simulated/floor/F = A
+ if(!F.floor_type && amount)
+ repairing = 1
+ update_icons()
+ visible_message("[src] begins to improve the floor.")
+ if(do_after(src, 50))
+ if(!F.floor_type)
+ var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel(src)
+ F.attackby(T, src)
+ addTiles(-1)
+ target = null
+ repairing = 0
+ update_icons()
+ else if(istype(A, /obj/item/stack/tile/plasteel) && amount < maxAmount)
+ var/obj/item/stack/tile/plasteel/T = A
+ visible_message("[src] begins to collect tiles.")
+ repairing = 1
+ update_icons()
+ if(do_after(src, 20))
+ if(T)
+ var/eaten = min(maxAmount - amount, T.get_amount())
+ T.use(eaten)
+ addTiles(eaten)
+ target = null
+ repairing = 0
+ update_icons()
+ else if(istype(A, /obj/item/stack/sheet/metal) && amount + 3 < maxAmount)
+ var/obj/item/stack/sheet/metal/M = A
+ visible_message("[src] begins to make tiles.")
+ repairing = 1
+ update_icons()
+ if(do_after(50))
+ if(M)
+ M.use(1)
+ addTiles(4)
+
+/mob/living/bot/floorbot/explode()
+ turn_off()
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec)
+ N.contents = list()
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+ if(prob(50))
+ new /obj/item/robot_parts/l_arm(Tsec)
+ var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel(Tsec)
+ T.amount = amount
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+ qdel(src)
+
+/mob/living/bot/floorbot/proc/addTiles(var/am)
+ amount += am
+ if(amount < 0)
+ amount = 0
+ else if(amount > maxAmount)
+ amount = maxAmount
+
+/* Assembly */
+
+/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob)
+ if(!istype(T, /obj/item/stack/tile/plasteel))
+ ..()
+ return
+ if(contents.len >= 1)
+ user << "They wont fit in as there is already stuff inside."
+ return
+ if(user.s_active)
+ user.s_active.close(user)
+ if(T.use(10))
+ var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles
+ user.put_in_hands(B)
+ user << "You add the tiles into the empty toolbox. They protrude from the top."
+ user.drop_from_inventory(src)
+ qdel(src)
+ else
+ user << "You need 10 floor tiles for a floorbot."
+ return
+
+/obj/item/weapon/toolbox_tiles
+ desc = "It's a toolbox with tiles sticking out the top"
+ name = "tiles and toolbox"
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "toolbox_tiles"
+ force = 3.0
+ throwforce = 10.0
+ throw_speed = 2
+ throw_range = 5
+ w_class = 3.0
+ var/created_name = "Floorbot"
+
+/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob)
+ ..()
+ if(isprox(W))
+ qdel(W)
+ var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor()
+ B.created_name = created_name
+ user.put_in_hands(B)
+ user << "You add the sensor to the toolbox and tiles!"
+ user.drop_from_inventory(src)
+ qdel(src)
+ else if (istype(W, /obj/item/weapon/pen))
+ var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, user) && loc != user)
+ return
+ created_name = t
+
+/obj/item/weapon/toolbox_tiles_sensor
+ desc = "It's a toolbox with tiles sticking out the top and a sensor attached"
+ name = "tiles, toolbox and sensor arrangement"
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "toolbox_tiles_sensor"
+ force = 3.0
+ throwforce = 10.0
+ throw_speed = 2
+ throw_range = 5
+ w_class = 3.0
+ var/created_name = "Floorbot"
+
+/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob)
+ ..()
+ if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
+ qdel(W)
+ var/turf/T = get_turf(user.loc)
+ var/mob/living/bot/floorbot/A = new /mob/living/bot/floorbot(T)
+ A.name = created_name
+ user << "You add the robot arm to the odd looking toolbox assembly! Boop beep!"
+ user.drop_from_inventory(src)
+ qdel(src)
+ else if(istype(W, /obj/item/weapon/pen))
+ var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, user) && loc != user)
+ return
+ created_name = t
\ No newline at end of file
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
new file mode 100644
index 0000000000..d6e20a9641
--- /dev/null
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -0,0 +1,365 @@
+/mob/living/bot/medbot
+ name = "Medbot"
+ desc = "A little medical robot. He looks somewhat underwhelmed."
+ icon_state = "medibot0"
+ req_access = list(access_medical)
+
+ var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
+ botcard_access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
+
+ //AI vars
+ var/frustration = 0
+ var/list/path = list()
+ var/mob/living/carbon/human/patient = null
+ var/mob/ignored = list() // Used by emag
+ var/last_newpatient_speak = 0
+ var/vocal = 1
+
+ //Healing vars
+ var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents.
+ var/currently_healing = 0
+ var/injection_amount = 15 //How much reagent do we inject at a time?
+ var/heal_threshold = 10 //Start healing when they have this much damage in a category
+ var/use_beaker = 0 //Use reagents in beaker instead of default treatment agents.
+ var/treatment_brute = "tricordrazine"
+ var/treatment_oxy = "tricordrazine"
+ var/treatment_fire = "tricordrazine"
+ var/treatment_tox = "tricordrazine"
+ var/treatment_virus = "spaceacillin"
+ var/treatment_emag = "toxin"
+ var/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds?
+
+/mob/living/bot/medbot/Life()
+ ..()
+
+ if(!on)
+ return
+
+ if(!client)
+
+ if(vocal && prob(1))
+ var/message = pick("Radar, put a mask on!", "There's always a catch, and it's the best there is.", "I knew it, I should've been a plastic surgeon.", "What kind of medbay is this? Everyone's dropping like dead flies.", "Delicious!")
+ say(message)
+
+ if(patient)
+ if(Adjacent(patient))
+ if(!currently_healing)
+ UnarmedAttack(patient)
+ else
+ if(path.len && (get_dist(patient, path[path.len]) > 2)) // We have a path, but it's off
+ path = list()
+ if(!path.len && (get_dist(src, patient) > 1))
+ spawn(0)
+ path = AStar(loc, get_turf(patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 30, id = botcard)
+ if(!path)
+ path = list()
+ if(path.len)
+ step_to(src, path[1])
+ path -= path[1]
+ ++frustration
+ if(get_dist(src, patient) > 7 || frustration > 8)
+ patient = null
+ else
+ for(var/mob/living/carbon/human/H in view(7, src)) // Time to find a patient!
+ if(valid_healing_target(H))
+ patient = H
+ frustration = 0
+ if(last_newpatient_speak + 300 < world.time)
+ var/message = pick("Hey, [H.name]! Hold on, I'm coming.", "Wait [H.name]! I want to help!", "[H.name], you appear to be injured!")
+ say(message)
+ custom_emote(1, "points at [H.name].")
+ last_newpatient_speak = world.time
+ break
+
+/mob/living/bot/medbot/UnarmedAttack(var/mob/living/carbon/human/H, var/proximity)
+ if(!..())
+ return
+
+ if(!on)
+ return
+
+ if(!istype(H))
+ return
+
+ if(H.stat == DEAD)
+ var/death_message = pick("No! NO!", "Live, damnit! LIVE!", "I... I've never lost a patient before. Not today, I mean.")
+ say(death_message)
+ patient = null
+ return
+
+ var/t = valid_healing_target(H)
+ if(!t)
+ var/message = pick("All patched up!", "An apple a day keeps me away.", "Feel better soon!")
+ say(message)
+ patient = null
+ return
+
+ icon_state = "medibots"
+ visible_message("[src] is trying to inject [H]!")
+ if(declare_treatment)
+ var/area/location = get_area(src)
+ broadcast_medical_hud_message("[src] is treating [H] in [location]", src)
+ currently_healing = 1
+ update_icons()
+ if(do_mob(src, H, 30))
+ if(t == 1)
+ reagent_glass.reagents.trans_to(H, injection_amount)
+ reagent_glass.reagents.reaction(H, 2)
+ else
+ H.reagents.add_reagent(t, injection_amount)
+ visible_message("[src] injects [H] with the syringe!")
+ currently_healing = 0
+ update_icons()
+
+/mob/living/bot/medbot/update_icons()
+ overlays.Cut()
+ if(skin)
+ overlays += image('icons/obj/aibots.dmi', "medskin_[skin]")
+ if(currently_healing)
+ icon_state = "medibots"
+ else
+ icon_state = "medibot[on]"
+
+/mob/living/bot/medbot/attack_hand(var/mob/user)
+ var/dat
+ dat += "Automatic Medical Unit v1.0
"
+ dat += "Status: [on ? "On" : "Off"]
"
+ dat += "Maintenance panel is [open ? "opened" : "closed"]
"
+ dat += "Beaker: "
+ if (reagent_glass)
+ dat += "Loaded \[[reagent_glass.reagents.total_volume]/[reagent_glass.reagents.maximum_volume]\]"
+ else
+ dat += "None Loaded"
+ dat += "
Behaviour controls are [locked ? "locked" : "unlocked"]
"
+ if(!locked || issilicon(user))
+ dat += "Healing Threshold: "
+ dat += "-- "
+ dat += "- "
+ dat += "[heal_threshold] "
+ dat += "+ "
+ dat += "++"
+ dat += "
"
+
+ dat += "Injection Level: "
+ dat += "- "
+ dat += "[injection_amount] "
+ dat += "+ "
+ dat += "
"
+
+ dat += "Reagent Source: "
+ dat += "[use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
"
+
+ dat += "Treatment report is [declare_treatment ? "on" : "off"]. Toggle
"
+
+ dat += "The speaker switch is [vocal ? "on" : "off"]. Toggle
"
+
+ user << browse("Medibot v1.0 controls[dat]", "window=automed")
+ onclose(user, "automed")
+ return
+
+/mob/living/bot/medbot/attackby(var/obj/item/O, var/mob/user)
+ if(istype(O, /obj/item/weapon/reagent_containers/glass))
+ if(locked)
+ user << "You cannot insert a beaker because the panel is locked."
+ return
+ if(!isnull(reagent_glass))
+ user << "There is already a beaker loaded."
+ return
+
+ user.drop_item()
+ O.loc = src
+ reagent_glass = O
+ user << "You insert [O]."
+ return
+ else
+ ..()
+
+/mob/living/bot/medbot/Topic(href, href_list)
+ if(..())
+ return
+ usr.set_machine(src)
+ add_fingerprint(usr)
+ if ((href_list["power"]) && access_scanner.allowed(usr))
+ if (on)
+ turn_off()
+ else
+ turn_on()
+
+ else if((href_list["adj_threshold"]) && (!locked || issilicon(usr)))
+ var/adjust_num = text2num(href_list["adj_threshold"])
+ heal_threshold += adjust_num
+ if(heal_threshold < 5)
+ heal_threshold = 5
+ if(heal_threshold > 75)
+ heal_threshold = 75
+
+ else if((href_list["adj_inject"]) && (!locked || issilicon(usr)))
+ var/adjust_num = text2num(href_list["adj_inject"])
+ injection_amount += adjust_num
+ if(injection_amount < 5)
+ injection_amount = 5
+ if(injection_amount > 15)
+ injection_amount = 15
+
+ else if((href_list["use_beaker"]) && (!locked || issilicon(usr)))
+ use_beaker = !use_beaker
+
+ else if (href_list["eject"] && (!isnull(reagent_glass)))
+ if(!locked)
+ reagent_glass.loc = get_turf(src)
+ reagent_glass = null
+ else
+ usr << "You cannot eject the beaker because the panel is locked."
+
+ else if ((href_list["togglevoice"]) && (!locked || issilicon(usr)))
+ vocal = !vocal
+
+ else if ((href_list["declaretreatment"]) && (!locked || issilicon(usr)))
+ declare_treatment = !declare_treatment
+
+ attack_hand(usr)
+ return
+
+/mob/living/bot/medbot/Emag(var/mob/user)
+ ..()
+ if(!emagged)
+ if(user)
+ user << "You short out [src]'s reagent synthesis circuits."
+ visible_message("[src] buzzes oddly!")
+ flick("medibot_spark", src)
+ patient = null
+ currently_healing = 0
+ emagged = 1
+ on = 1
+ update_icons()
+ ignored |= user
+
+/mob/living/bot/medbot/explode()
+ on = 0
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ new /obj/item/weapon/storage/firstaid(Tsec)
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+ new /obj/item/device/healthanalyzer(Tsec)
+ if (prob(50))
+ new /obj/item/robot_parts/l_arm(Tsec)
+
+ if(reagent_glass)
+ reagent_glass.loc = Tsec
+ reagent_glass = null
+
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+ qdel(src)
+ return
+
+/mob/living/bot/medbot/proc/valid_healing_target(var/mob/living/carbon/human/H)
+ if(H.stat == DEAD) // He's dead, Jim
+ return null
+
+ if(H.suiciding)
+ return null
+
+ if(H in ignored)
+ return null
+
+ if(emagged)
+ return treatment_emag
+
+ // If they're injured, we're using a beaker, and they don't have on of the chems in the beaker
+ if(reagent_glass && use_beaker && ((H.getBruteLoss() >= heal_threshold) || (H.getToxLoss() >= heal_threshold) || (H.getToxLoss() >= heal_threshold) || (H.getOxyLoss() >= (heal_threshold + 15))))
+ for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
+ if(!H.reagents.has_reagent(R))
+ return 1
+ continue
+
+ if((H.getBruteLoss() >= heal_threshold) && (!H.reagents.has_reagent(treatment_brute)))
+ return treatment_brute //If they're already medicated don't bother!
+
+ if((H.getOxyLoss() >= (15 + heal_threshold)) && (!H.reagents.has_reagent(treatment_oxy)))
+ return treatment_oxy
+
+ if((H.getFireLoss() >= heal_threshold) && (!H.reagents.has_reagent(treatment_fire)))
+ return treatment_fire
+
+ if((H.getToxLoss() >= heal_threshold) && (!H.reagents.has_reagent(treatment_tox)))
+ return treatment_tox
+
+ for(var/datum/disease/D in H.viruses)
+ if (!H.reagents.has_reagent(treatment_virus))
+ return treatment_virus // STOP DISEASE FOREVER
+
+/* Construction */
+
+/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob)
+ if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm)))
+ ..()
+ return
+
+ if(contents.len >= 1)
+ user << "You need to empty [src] out first."
+ return
+
+ var/obj/item/weapon/firstaid_arm_assembly/A = new /obj/item/weapon/firstaid_arm_assembly
+ if(istype(src, /obj/item/weapon/storage/firstaid/fire))
+ A.skin = "ointment"
+ else if(istype(src, /obj/item/weapon/storage/firstaid/toxin))
+ A.skin = "tox"
+ else if(istype(src, /obj/item/weapon/storage/firstaid/o2))
+ A.skin = "o2"
+
+ qdel(S)
+ user.put_in_hands(A)
+ user << "You add the robot arm to the first aid kit."
+ user.drop_from_inventory(src)
+ qdel(src)
+
+/obj/item/weapon/firstaid_arm_assembly
+ name = "first aid/robot arm assembly"
+ desc = "A first aid kit with a robot arm permanently grafted to it."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "firstaid_arm"
+ var/build_step = 0
+ var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
+ var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
+ w_class = 3.0
+
+/obj/item/weapon/firstaid_arm_assembly/New()
+ ..()
+ spawn(5) // Terrible. TODO: fix
+ if(skin)
+ overlays += image('icons/obj/aibots.dmi', "kit_skin_[src.skin]")
+
+/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ ..()
+ if(istype(W, /obj/item/weapon/pen))
+ var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && loc != usr)
+ return
+ created_name = t
+ else
+ switch(build_step)
+ if(0)
+ if(istype(W, /obj/item/device/healthanalyzer))
+ user.drop_item()
+ qdel(W)
+ build_step++
+ user << "You add the health sensor to [src]."
+ name = "First aid/robot arm/health analyzer assembly"
+ overlays += image('icons/obj/aibots.dmi', "na_scanner")
+
+ if(1)
+ if(isprox(W))
+ user.drop_item()
+ qdel(W)
+ user << "You complete the Medibot! Beep boop."
+ var/turf/T = get_turf(src)
+ var/mob/living/bot/medbot/S = new /mob/living/bot/medbot(T)
+ S.skin = skin
+ S.name = created_name
+ user.drop_from_inventory(src)
+ qdel(src)
diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm
new file mode 100644
index 0000000000..eba380340f
--- /dev/null
+++ b/code/modules/mob/living/bot/secbot.dm
@@ -0,0 +1,539 @@
+/mob/living/bot/secbot
+ name = "Securitron"
+ desc = "A little security robot. He looks less than thrilled."
+ icon_state = "secbot0"
+ maxHealth = 50
+ health = 50
+ req_access = list(access_security, access_forensics_lockers)
+ botcard_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
+
+ var/mob/target
+
+ var/idcheck = 0 // If true, arrests for having weapons without authorization.
+ var/check_records = 0 // If true, arrests people without a record.
+ var/check_arrest = 1 // If true, arrests people who are set to arrest.
+ var/arrest_type = 0 // If true, doesn't handcuff. You monster.
+ var/declare_arrests = 0 // If true, announces arrests over sechuds.
+ var/auto_patrol = 0 // If true, patrols on its own
+
+ var/mode = 0
+#define SECBOT_IDLE 0 // idle
+#define SECBOT_HUNT 1 // found target, hunting
+#define SECBOT_ARREST 2 // arresting target
+#define SECBOT_START_PATROL 3 // start patrol
+#define SECBOT_WAIT_PATROL 4 // waiting for signals
+#define SECBOT_PATROL 5 // patrolling
+#define SECBOT_SUMMON 6 // summoned by PDA
+ var/is_attacking = 0
+ var/is_ranged = 0
+ var/awaiting_surrender = 0
+
+ var/obj/secbot_listener/listener = null
+ var/beacon_freq = 1445 // Navigation beacon frequency
+ var/control_freq = AI_FREQ // Bot control frequency
+ var/list/path = list()
+ var/frustration = 0
+ var/turf/patrol_target = null // This is where we are headed
+ var/closest_dist // Used to find the closest beakon
+ var/destination = "__nearest__" // This is the current beacon's ID
+ var/next_destination = "__nearest__" // This is the next beacon's ID
+ var/nearest_beacon // Tag of the beakon that we assume to be the closest one
+
+ var/bot_version = 1.3
+ var/list/threat_found_sounds = new('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg')
+ var/list/preparing_arrest_sounds = new('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg')
+
+/mob/living/bot/secbot/beepsky
+ name = "Officer Beepsky"
+ desc = "It's Officer Beep O'sky! Powered by a potato and a shot of whiskey."
+ auto_patrol = 1
+
+/mob/living/bot/secbot/New()
+ ..()
+ listener = new /obj/secbot_listener(src)
+ listener.secbot = src
+
+ spawn(5) // Since beepsky is made on the start... this delay is necessary
+ if(radio_controller)
+ radio_controller.add_object(listener, control_freq, filter = RADIO_SECBOT)
+ radio_controller.add_object(listener, beacon_freq, filter = RADIO_NAVBEACONS)
+
+/mob/living/bot/secbot/turn_off()
+ ..()
+ target = null
+ frustration = 0
+ mode = SECBOT_IDLE
+
+/mob/living/bot/secbot/update_icons()
+ if(on && is_attacking)
+ icon_state = "secbot-c"
+ else
+ icon_state = "secbot[on]"
+
+/mob/living/bot/secbot/attack_hand(var/mob/user)
+ user.set_machine(src)
+ var/dat
+ dat += "Automatic Security Unit v[bot_version]
"
+ dat += "Status: [on ? "On" : "Off"]
"
+ dat += "Behaviour controls are [locked ? "locked" : "unlocked"]
"
+ dat += "Maintenance panel is [open ? "opened" : "closed"]"
+ if(!locked || issilicon(user))
+ dat += "
Check for Weapon Authorization: [idcheck ? "Yes" : "No"]
"
+ dat += "Check Security Records: [check_records ? "Yes" : "No"]
"
+ dat += "Check Arrest Status: [check_arrest ? "Yes" : "No"]
"
+ dat += "Operating Mode: [arrest_type ? "Detain" : "Arrest"]
"
+ dat += "Report Arrests: [declare_arrests ? "Yes" : "No"]
"
+ dat += "Auto Patrol: [auto_patrol ? "On" : "Off"]"
+ user << browse("Securitron v[bot_version] controls[dat]", "window=autosec")
+ onclose(user, "autosec")
+ return
+
+/mob/living/bot/secbot/Topic(href, href_list)
+ if(..())
+ return
+
+ usr.set_machine(src)
+ add_fingerprint(usr)
+
+ if((href_list["power"]) && (access_scanner.allowed(usr)))
+ if(on)
+ turn_off()
+ else
+ turn_on()
+ return
+
+ switch(href_list["operation"])
+ if("idcheck")
+ idcheck = !idcheck
+ if("ignorerec")
+ check_records = !check_records
+ if("ignorearr")
+ check_arrest = !check_arrest
+ if("switchmode")
+ arrest_type = !arrest_type
+ if("patrol")
+ auto_patrol = !auto_patrol
+ mode = SECBOT_IDLE
+ if("declarearrests")
+ declare_arrests = !declare_arrests
+ attack_hand(usr)
+
+/mob/living/bot/secbot/attackby(var/obj/item/O, var/mob/user)
+ var/curhealth = health
+ ..()
+ if(health < curhealth)
+ target = user
+ awaiting_surrender = 5
+ mode = SECBOT_HUNT
+
+/mob/living/bot/secbot/Life()
+ ..()
+ if(!on)
+ return
+ if(client)
+ return
+
+ if(!target)
+ scan_view()
+
+ if(!locked && (mode == SECBOT_START_PATROL || mode == SECBOT_PATROL)) // Stop running away when we set you up
+ mode = SECBOT_IDLE
+
+ switch(mode)
+ if(SECBOT_IDLE)
+ if(auto_patrol && locked)
+ mode = SECBOT_START_PATROL
+ return
+
+ if(SECBOT_HUNT) // Target is in the view or has been recently - chase it
+ if(frustration > 7)
+ target = null
+ frustration = 0
+ awaiting_surrender = 0
+ mode = SECBOT_IDLE
+ return
+ if(target)
+ var/threat = check_threat(target)
+ if(threat < 4) // Re-evaluate in case they dropped the weapon or something
+ target = null
+ frustration = 0
+ awaiting_surrender = 0
+ mode = SECBOT_IDLE
+ return
+ if(!(target in view(7, src)))
+ ++frustration
+ if(Adjacent(target))
+ mode = SECBOT_ARREST
+ return
+ else
+ if(is_ranged)
+ RangedAttack(target)
+ else
+ step_towards(src, target) // Melee bots chase a bit faster
+ spawn(8)
+ if(!Adjacent(target))
+ step_towards(src, target)
+ spawn(16)
+ if(!Adjacent(target))
+ step_towards(src, target)
+
+ if(SECBOT_ARREST) // Target is next to us - attack it
+ if(!target)
+ mode = SECBOT_IDLE
+ if(!Adjacent(target))
+ awaiting_surrender = 5 // I'm done playing nice
+ mode = SECBOT_HUNT
+ var/threat = check_threat(target)
+ if(threat < 4)
+ target = null
+ awaiting_surrender = 0
+ frustration = 0
+ mode = SECBOT_IDLE
+ return
+ if(awaiting_surrender < 5 && ishuman(target) && !target.lying)
+ if(awaiting_surrender == 0)
+ say("Down on the floor, [target]! You have five seconds to comply.")
+ ++awaiting_surrender
+ else
+ UnarmedAttack(target)
+ if(ishuman(target) && declare_arrests)
+ var/area/location = get_area(src)
+ broadcast_security_hud_message("[src] is [arrest_type ? "detaining" : "arresting"] a level [check_threat(target)] suspect [target] in [location].", src)
+ return
+
+ if(SECBOT_START_PATROL)
+ if(path.len && patrol_target)
+ mode = SECBOT_PATROL
+ return
+ else if(patrol_target)
+ spawn(0)
+ calc_path()
+ if(!path.len)
+ patrol_target = null
+ mode = SECBOT_IDLE
+ else
+ mode = SECBOT_PATROL
+ if(!patrol_target)
+ if(next_destination)
+ find_next_target()
+ else
+ find_patrol_target()
+ say("Engaging patrol mode.")
+ mode = SECBOT_WAIT_PATROL
+ return
+
+ if(SECBOT_WAIT_PATROL)
+ if(patrol_target)
+ mode = SECBOT_START_PATROL
+ else
+ ++frustration
+ if(frustration > 120)
+ frustration = 0
+ mode = SECBOT_IDLE
+
+ if(SECBOT_PATROL)
+ patrol_step()
+ spawn(10)
+ patrol_step()
+ return
+
+ if(SECBOT_SUMMON)
+ patrol_step()
+ spawn(8)
+ patrol_step()
+ spawn(16)
+ patrol_step()
+ return
+
+/mob/living/bot/secbot/UnarmedAttack(var/mob/M, var/proximity)
+ if(!..())
+ return
+
+ if(!istype(M))
+ return
+
+ if(istype(M, /mob/living/carbon))
+ var/mob/living/carbon/C = M
+ var/cuff = 1
+ if(istype(C, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = C
+ if(istype(H.back, /obj/item/weapon/rig) && istype(H.gloves,/obj/item/clothing/gloves/rig))
+ cuff = 0
+ if(!C.lying || C.handcuffed || arrest_type)
+ cuff = 0
+ if(!cuff)
+ C.stun_effect_act(0, 60, null)
+ playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ is_attacking = 1
+ update_icons()
+ spawn(2)
+ is_attacking = 0
+ update_icons()
+ visible_message("[C] was prodded by [src] with a stun baton!")
+ else
+ playsound(loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
+ visible_message("[src] is trying to put handcuffs on [C]!")
+ if(do_mob(src, C, 60))
+ if(!C.handcuffed)
+ C.handcuffed = new /obj/item/weapon/handcuffs(C)
+ C.update_inv_handcuffed()
+ if(preparing_arrest_sounds.len)
+ playsound(loc, pick(preparing_arrest_sounds), 50, 0)
+ else if(istype(M, /mob/living/simple_animal))
+ var/mob/living/simple_animal/S = M
+ S.AdjustStunned(10)
+ S.adjustBruteLoss(15)
+ playsound(loc, "swing_hit", 50, 1, -1)
+ is_attacking = 1
+ update_icons()
+ spawn(2)
+ is_attacking = 0
+ update_icons()
+ visible_message("[M] was beaten by [src] with a stun baton!")
+
+/mob/living/bot/secbot/explode()
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec)
+ Sa.build_step = 1
+ Sa.overlays += image('icons/obj/aibots.dmi', "hs_hole")
+ Sa.created_name = name
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+ new /obj/item/weapon/melee/baton(Tsec)
+ if(prob(50))
+ new /obj/item/robot_parts/l_arm(Tsec)
+
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+
+ new /obj/effect/decal/cleanable/blood/oil(Tsec)
+ qdel(src)
+
+/mob/living/bot/secbot/proc/scan_view()
+ for(var/mob/living/M in view(7, src))
+ if(M.invisibility >= INVISIBILITY_LEVEL_ONE)
+ continue
+ if(M.stat)
+ continue
+
+ var/threat = check_threat(M)
+
+ if(threat >= 4)
+ target = M
+ say("Level [threat] infraction alert!")
+ custom_emote(1, "points at [M.name]!")
+ mode = SECBOT_HUNT
+ break
+ return
+
+/mob/living/bot/secbot/proc/calc_path(var/turf/avoid = null)
+ path = AStar(loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 120, id=botcard, exclude=avoid)
+ if(!path)
+ path = list()
+
+/mob/living/bot/secbot/proc/check_threat(var/mob/living/M)
+ if(!M || !istype(M) || M.stat)
+ return 0
+
+ if(emagged)
+ return 10
+
+ return M.assess_perp(access_scanner, idcheck, check_records, check_arrest)
+
+/mob/living/bot/secbot/proc/patrol_step()
+ if(loc == patrol_target)
+ patrol_target = null
+ path = list()
+ mode = SECBOT_IDLE
+ return
+
+ if(path.len && patrol_target)
+ var/turf/next = path[1]
+ if(loc == next)
+ path -= next
+ return
+ var/moved = step_towards(src, next)
+ if(moved)
+ path -= next
+ frustration = 0
+ else
+ ++frustration
+ if(frustration > 5) // Make a new path
+ mode = SECBOT_START_PATROL
+ return
+ else
+ mode = SECBOT_START_PATROL
+
+/mob/living/bot/secbot/proc/find_patrol_target()
+ send_status()
+ nearest_beacon = null
+ next_destination = "__nearest__"
+ listener.post_signal(beacon_freq, "findbeacon", "patrol")
+
+/mob/living/bot/secbot/proc/find_next_target()
+ send_status()
+ nearest_beacon = null
+ listener.post_signal(beacon_freq, "findbeacon", "patrol")
+
+/mob/living/bot/secbot/proc/send_status()
+ var/list/kv = list(
+ "type" = "secbot",
+ "name" = name,
+ "loca" = get_area(loc),
+ "mode" = mode
+ )
+ listener.post_signal_multiple(control_freq, kv)
+
+/obj/secbot_listener
+ var/mob/living/bot/secbot/secbot = null
+
+/obj/secbot_listener/proc/post_signal(var/freq, var/key, var/value) // send a radio signal with a single data key/value pair
+ post_signal_multiple(freq, list("[key]" = value))
+
+/obj/secbot_listener/proc/post_signal_multiple(var/freq, var/list/keyval) // send a radio signal with multiple data key/values
+ var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
+ if(!frequency)
+ return
+
+ var/datum/signal/signal = new()
+ signal.source = secbot
+ signal.transmission_method = 1
+ signal.data = keyval.Copy()
+
+ if(signal.data["findbeacon"])
+ frequency.post_signal(secbot, signal, filter = RADIO_NAVBEACONS)
+ else if(signal.data["type"] == "secbot")
+ frequency.post_signal(secbot, signal, filter = RADIO_SECBOT)
+ else
+ frequency.post_signal(secbot, signal)
+
+/obj/secbot_listener/receive_signal(datum/signal/signal)
+ if(!secbot || !secbot.on)
+ return
+
+ var/recv = signal.data["command"]
+ if(recv == "bot_status")
+ secbot.send_status()
+ return
+
+ if(signal.data["active"] == secbot)
+ switch(recv)
+ if("stop")
+ secbot.mode = SECBOT_IDLE
+ secbot.auto_patrol = 0
+ return
+
+ if("go")
+ secbot.mode = SECBOT_IDLE
+ secbot.auto_patrol = 1
+ return
+
+ if("summon")
+ secbot.patrol_target = signal.data["target"]
+ secbot.next_destination = secbot.destination
+ secbot.destination = null
+ //secbot.awaiting_beacon = 0
+ secbot.mode = SECBOT_SUMMON
+ secbot.calc_path()
+ secbot.say("Responding.")
+ return
+
+ recv = signal.data["beacon"]
+ var/valid = signal.data["patrol"]
+ if(!recv || !valid)
+ return
+
+ if(recv == secbot.next_destination) // This beacon is our target
+ secbot.destination = secbot.next_destination
+ secbot.patrol_target = signal.source.loc
+ secbot.next_destination = signal.data["next_patrol"]
+ else if(secbot.next_destination == "__nearest__")
+ var/dist = get_dist(secbot, signal.source.loc)
+ if(dist <= 1)
+ return
+
+ if(secbot.nearest_beacon)
+ if(dist < secbot.closest_dist)
+ secbot.nearest_beacon = recv
+ secbot.patrol_target = secbot.nearest_beacon
+ secbot.next_destination = signal.data["next_patrol"]
+ secbot.closest_dist = dist
+ return
+ else
+ secbot.nearest_beacon = recv
+ secbot.patrol_target = secbot.nearest_beacon
+ secbot.next_destination = signal.data["next_patrol"]
+ secbot.closest_dist = dist
+
+//Secbot Construction
+
+/obj/item/clothing/head/helmet/attackby(var/obj/item/device/assembly/signaler/S, mob/user as mob)
+ ..()
+ if(!issignaler(S))
+ ..()
+ return
+
+ if(type != /obj/item/clothing/head/helmet) //Eh, but we don't want people making secbots out of space helmets.
+ return
+
+ if(S.secured)
+ qdel(S)
+ var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly
+ user.put_in_hands(A)
+ user << "You add the signaler to the helmet."
+ user.drop_from_inventory(src)
+ qdel(src)
+ else
+ return
+
+/obj/item/weapon/secbot_assembly
+ name = "helmet/signaler assembly"
+ desc = "Some sort of bizarre assembly."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "helmet_signaler"
+ item_state = "helmet"
+ var/build_step = 0
+ var/created_name = "Securitron"
+
+/obj/item/weapon/secbot_assembly/attackby(var/obj/item/O, var/mob/user)
+ ..()
+ if(istype(O, /obj/item/weapon/weldingtool) && !build_step)
+ var/obj/item/weapon/weldingtool/WT = O
+ if(WT.remove_fuel(0, user))
+ build_step = 1
+ overlays += image('icons/obj/aibots.dmi', "hs_hole")
+ user << "You weld a hole in \the [src]."
+
+ else if(isprox(O) && (build_step == 1))
+ user.drop_item()
+ build_step = 2
+ user << "You add \the [O] to [src]."
+ overlays += image('icons/obj/aibots.dmi', "hs_eye")
+ name = "helmet/signaler/prox sensor assembly"
+ qdel(O)
+
+ else if((istype(O, /obj/item/robot_parts/l_arm) || istype(O, /obj/item/robot_parts/r_arm)) && build_step == 2)
+ user.drop_item()
+ build_step = 3
+ user << "You add \the [O] to [src]."
+ name = "helmet/signaler/prox sensor/robot arm assembly"
+ overlays += image('icons/obj/aibots.dmi', "hs_arm")
+ qdel(O)
+
+ else if(istype(O, /obj/item/weapon/melee/baton) && build_step == 3)
+ user.drop_item()
+ user << "You complete the Securitron! Beep boop."
+ var/mob/living/bot/secbot/S = new /mob/living/bot/secbot(get_turf(src))
+ S.name = created_name
+ qdel(O)
+ qdel(src)
+
+ else if(istype(O, /obj/item/weapon/pen))
+ var/t = sanitizeSafe(input(user, "Enter new robot name", name, created_name), MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && loc != usr)
+ return
+ created_name = t
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/diona/diona.dm b/code/modules/mob/living/carbon/alien/diona/diona.dm
index 5faeadbdcc..981e250749 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona.dm
@@ -31,4 +31,4 @@
/mob/living/carbon/alien/diona/put_in_hands(var/obj/item/W) // No hands.
W.loc = get_turf(src)
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/mob/living/carbon/alien/diona/life.dm b/code/modules/mob/living/carbon/alien/diona/life.dm
index 5a82e3f373..ec0dd5d7e1 100644
--- a/code/modules/mob/living/carbon/alien/diona/life.dm
+++ b/code/modules/mob/living/carbon/alien/diona/life.dm
@@ -4,10 +4,12 @@
var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
if(isturf(loc)) //else, there's considered to be no light
var/turf/T = loc
- var/area/A = T.loc
- if(A)
- if(A.lighting_use_dynamic) light_amount = min(10,T.lighting_lumcount) - 5 //hardcapped so it's not abused by having a ton of flashlights
- else light_amount = 5
+ var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
+ if(L)
+ light_amount = min(10,L.lum_r + L.lum_g + L.lum_b) - 5 //hardcapped so it's not abused by having a ton of flashlights
+ else
+ light_amount = 5
+
nutrition += light_amount
diff --git a/code/modules/mob/living/carbon/alien/diona/progression.dm b/code/modules/mob/living/carbon/alien/diona/progression.dm
index fa567cbb44..588acea5ad 100644
--- a/code/modules/mob/living/carbon/alien/diona/progression.dm
+++ b/code/modules/mob/living/carbon/alien/diona/progression.dm
@@ -13,7 +13,7 @@
if(istype(loc,/obj/item/weapon/holder/diona))
var/obj/item/weapon/holder/diona/L = loc
src.loc = L.loc
- del(L)
+ qdel(L)
src.visible_message("\red [src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.","\red You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.")
return "Diona"
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/progression.dm b/code/modules/mob/living/carbon/alien/progression.dm
index b6306ed5e2..54c7f9a969 100644
--- a/code/modules/mob/living/carbon/alien/progression.dm
+++ b/code/modules/mob/living/carbon/alien/progression.dm
@@ -38,7 +38,7 @@
for(var/datum/language/L in languages)
adult.add_language(L.name)
- del(src)
+ qdel(src)
/mob/living/carbon/alien/proc/update_progression()
if(amount_grown < max_grown)
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 7b225da186..4e9ef55280 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -25,7 +25,7 @@
w_class = 3
origin_tech = "biotech=3"
- var/list/construction_cost = list("metal"=1000,"glass"=500)
+ var/list/construction_cost = list(DEFAULT_WALL_MATERIAL=1000,"glass"=500)
var/construction_time = 75
//these vars are so the mecha fabricator doesn't shit itself anymore. --NEO
@@ -60,7 +60,7 @@
living_mob_list += brainmob
user.drop_item()
- del(O)
+ qdel(O)
name = "Man-Machine Interface: [brainmob.real_name]"
icon_state = "mmi_full"
@@ -114,6 +114,15 @@
locked = 1
return
+/obj/item/device/mmi/Destroy()
+ if(isrobot(loc))
+ var/mob/living/silicon/robot/borg = loc
+ borg.mmi = null
+ if(brainmob)
+ qdel(brainmob)
+ brainmob = null
+ ..()
+
/obj/item/device/mmi/radio_enabled
name = "radio-enabled man-machine interface"
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity. This one comes with a built-in radio."
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index 230b7736f2..e72671d78a 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -15,7 +15,7 @@
R.my_atom = src
..()
- Del()
+ Destroy()
if(key) //If there is a mob connected to this thing. Have to check key twice to avoid false death reporting.
if(stat!=DEAD) //If not dead.
death(1) //Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index 05ceed7916..486916821b 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -27,6 +27,12 @@
if(brainmob && brainmob.client)
brainmob.client.screen.len = null //clear the hud
+/obj/item/organ/brain/Destroy()
+ if(brainmob)
+ qdel(brainmob)
+ brainmob = null
+ ..()
+
/obj/item/organ/brain/proc/transfer_identity(var/mob/living/carbon/H)
name = "\the [H]'s [initial(src.name)]"
brainmob = new(src)
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index 517e32362a..43918f5288 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -7,8 +7,8 @@
/mob/living/carbon/brain/gib()
if(istype(container, /obj/item/device/mmi))
- del(container)//Gets rid of the MMI if there is one
+ qdel(container)//Gets rid of the MMI if there is one
if(loc)
if(istype(loc,/obj/item/organ/brain))
- del(loc)//Gets rid of the brain item
+ qdel(loc)//Gets rid of the brain item
..(null,1)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 08f2e34243..b9ff795aaa 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -6,7 +6,7 @@
w_class = 3
origin_tech = "engineering=4;materials=4;bluespace=2;programming=4"
- construction_cost = list("metal"=500,"glass"=500,"silver"=200,"gold"=200,"phoron"=100,"diamond"=10)
+ construction_cost = list(DEFAULT_WALL_MATERIAL=500,"glass"=500,"silver"=200,"gold"=200,"phoron"=100,"diamond"=10)
construction_time = 75
var/searching = 0
var/askDelay = 10 * 60 * 1
@@ -26,7 +26,7 @@
/obj/item/device/mmi/digital/posibrain/proc/request_player()
for(var/mob/dead/observer/O in player_list)
- if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ if(!O.MayRespawn())
continue
if(jobban_isbanned(O, "AI") && jobban_isbanned(O, "Cyborg"))
continue
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index a3b46d6442..6647b7c930 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -7,6 +7,13 @@
if(germ_level < GERM_LEVEL_AMBIENT && prob(30)) //if you're just standing there, you shouldn't get more germs beyond an ambient level
germ_level++
+/mob/living/carbon/Destroy()
+ for(var/guts in internal_organs)
+ qdel(guts)
+ for(var/food in stomach_contents)
+ qdel(food)
+ return ..()
+
/mob/living/carbon/Move(NewLoc, direct)
. = ..()
if(.)
diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm
index 107e660d39..579321a512 100644
--- a/code/modules/mob/living/carbon/give.dm
+++ b/code/modules/mob/living/carbon/give.dm
@@ -1,7 +1,7 @@
mob/living/carbon/verb/give(var/mob/living/carbon/target in view(1)-usr)
set category = "IC"
set name = "Give"
- if(target.stat == 2 || usr.stat == 2|| target.client == null)
+ if(!istype(target) || target.stat == 2 || usr.stat == 2|| target.client == null)
return
var/obj/item/I
if(!usr.hand && usr.r_hand == null)
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 1a9ae03d51..63b781e183 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -10,6 +10,10 @@
sleep(1)
+ for(var/obj/item/I in src)
+ drop_from_inventory(I)
+ I.throw_at(get_edge_target_turf(src,pick(alldirs)), rand(1,3), round(30/I.w_class))
+
..(species.gibbed_anim)
gibs(loc, viruses, dna, null, species.flesh_color, species.blood_color)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 258c8cbcd1..8d7c655730 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -119,14 +119,14 @@
m_type = 1
if ("flap")
if (!src.restrained())
- message = "[src] flaps his wings."
+ message = "[src] flaps \his wings."
m_type = 2
if(miming)
m_type = 1
if ("aflap")
if (!src.restrained())
- message = "[src] flaps his wings ANGRILY!"
+ message = "[src] flaps \his wings ANGRILY!"
m_type = 2
if(miming)
m_type = 1
@@ -618,4 +618,4 @@
HTML += "
"
HTML +="\[Done\]"
HTML += ""
- src << browse(HTML, "window=flavor_changes;size=430x300")
\ No newline at end of file
+ src << browse(HTML, "window=flavor_changes;size=430x300")
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 965870f97e..d725557161 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -395,14 +395,14 @@
else if(is_bleeding["right foot"])
display_shoes = 1
if(display_chest)
- msg += "[src] has blood soaking through from under [t_his] clothing!\n"
+ msg += "[src] has blood soaking through from under [t_his] clothing!\n"
if(display_shoes)
- msg += "[src] has blood running from [t_his] shoes!\n"
+ msg += "[src] has blood running from [t_his] shoes!\n"
if(display_gloves)
- msg += "[src] has blood running from under [t_his] gloves!\n"
+ msg += "[src] has blood running from under [t_his] gloves!\n"
for(var/implant in get_visible_implants(0))
- msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n"
+ msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n"
if(digitalcamo)
msg += "[t_He] [t_is] repulsively uncanny!\n"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index d3a7f24b36..498b46345d 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -47,6 +47,11 @@
dna.real_name = real_name
make_blood()
+/mob/living/carbon/human/Destroy()
+ for(var/organ in organs)
+ qdel(organ)
+ return ..()
+
/mob/living/carbon/human/Stat()
..()
statpanel("Status")
@@ -65,7 +70,7 @@
if (internal)
if (!internal.air_contents)
- del(internal)
+ qdel(internal)
else
stat("Internal Atmosphere Info", internal.name)
stat("Tank Pressure", internal.air_contents.return_pressure())
@@ -818,7 +823,7 @@
for(var/x in all_hairs)
var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x
hairs.Add(H.name) // add hair name to hairs
- del(H) // delete the hair after it's all done
+ qdel(H) // delete the hair after it's all done
var/new_style = input("Please select hair style", "Character Generation",h_style) as null|anything in hairs
@@ -833,7 +838,7 @@
for(var/x in all_fhairs)
var/datum/sprite_accessory/facial_hair/H = new x
fhairs.Add(H.name)
- del(H)
+ qdel(H)
new_style = input("Please select facial style", "Character Generation",f_style) as null|anything in fhairs
@@ -944,7 +949,7 @@
if(H.brainmob.real_name == src.real_name)
if(H.brainmob.mind)
H.brainmob.mind.transfer_to(src)
- del(H)
+ qdel(H)
for (var/datum/disease/virus in viruses)
virus.cure()
@@ -1017,7 +1022,7 @@
.=..()
if(clean_feet && !shoes && istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
feet_blood_color = null
- del(feet_blood_DNA)
+ qdel(feet_blood_DNA)
update_inv_shoes(1)
return 1
@@ -1143,7 +1148,7 @@
if(client && client.screen)
client.screen.len = null
if(hud_used)
- del(hud_used)
+ qdel(hud_used)
hud_used = new /datum/hud(src)
if(species)
@@ -1358,4 +1363,4 @@
/mob/living/carbon/human/drop_from_inventory(var/obj/item/W, var/atom/Target = null)
if(W in organs)
return
- ..()
+ ..()
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 25a5d1dd7e..b8244e8326 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -336,12 +336,12 @@
visible_message("[user] has broken [src]'s grip on [lgrab.affecting]!")
success = 1
spawn(1)
- del(lgrab)
+ qdel(lgrab)
if(istype(r_hand, /obj/item/weapon/grab))
var/obj/item/weapon/grab/rgrab = r_hand
if(rgrab.affecting)
visible_message("[user] has broken [src]'s grip on [rgrab.affecting]!")
success = 1
spawn(1)
- del(rgrab)
+ qdel(rgrab)
return success
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index e96e526077..04ca892225 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -319,7 +319,7 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t
This function restores the subjects blood to max.
*/
/mob/living/carbon/human/proc/restore_blood()
- if(!species.flags & NO_BLOOD)
+ if(!(species.flags & NO_BLOOD))
var/blood_volume = vessel.get_reagent_amount("blood")
vessel.add_reagent("blood",560.0-blood_volume)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index a0c78d7572..f409bee147 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -138,6 +138,14 @@ emp_act
return 1
return 0
+//Used to check if they can be fed food/drinks/pills
+/mob/living/carbon/human/proc/check_mouth_coverage()
+ var/list/protective_gear = list(head, wear_mask, wear_suit, w_uniform)
+ for(var/obj/item/gear in protective_gear)
+ if(istype(gear) && (gear.body_parts_covered & FACE) && (gear.flags & (MASKCOVERSMOUTH|HEADCOVERSMOUTH)))
+ return gear
+ return null
+
/mob/living/carbon/human/proc/check_shields(var/damage = 0, var/attack_text = "the attack")
if(l_hand && istype(l_hand, /obj/item/weapon))//Current base is the prob(50-d/3)
var/obj/item/weapon/I = l_hand
@@ -281,7 +289,7 @@ emp_act
forcesay(hit_appends) //forcesay checks stat already
//Melee weapon embedded object code.
- if (I && I.damtype == BRUTE && !I.anchored && !I.is_robot_module())
+ if (I && I.damtype == BRUTE && !I.anchored && !is_robot_module(I))
var/damage = effective_force
if (armor)
damage /= armor+1
@@ -355,7 +363,7 @@ emp_act
//thrown weapon embedded object code.
if(dtype == BRUTE && istype(O,/obj/item))
var/obj/item/I = O
- if (!I.is_robot_module())
+ if (!is_robot_module(I))
var/sharp = is_sharp(I)
var/damage = throw_damage
if (armor)
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 705879c633..c962b8355b 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -129,7 +129,7 @@
spark_system.attach(src)
spark_system.start()
spawn(10)
- del(spark_system)
+ qdel(spark_system)
//Handles chem traces
/mob/living/carbon/human/proc/handle_trace_chems()
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index 10988afb92..0357d4ee09 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -218,4 +218,41 @@
log_say("PsychicWhisper: [key_name(src)]->[M.key] : [msg]")
M << "\green You hear a strange, alien voice in your head... \italic [msg]"
src << "\green You said: \"[msg]\" to [M]"
- return
\ No newline at end of file
+ return
+
+/mob/living/carbon/human/proc/diona_split_nymph()
+ set name = "Split"
+ set desc = "Split your humanoid form into its constituent nymphs."
+ set category = "Abilities"
+
+ var/turf/T = get_turf(src)
+
+ var/mob/living/carbon/alien/diona/S = new(T)
+ S.set_dir(dir)
+ if(mind)
+ mind.transfer_to(S)
+
+ message_admins("\The [src] has split into nymphs; player now controls [key_name_admin(S)]")
+ log_admin("\The [src] has split into nymphs; player now controls [key_name(S)]")
+
+ var/nymphs = 1
+
+ for(var/mob/living/carbon/alien/diona/D in src)
+ nymphs++
+ D.loc = T
+ D.set_dir(pick(NORTH, SOUTH, EAST, WEST))
+
+ if(nymphs < 5)
+ for(var/i in nymphs to 4)
+ var/mob/M = new /mob/living/carbon/alien/diona(T)
+ M.set_dir(pick(NORTH, SOUTH, EAST, WEST))
+
+
+ for(var/obj/item/W in src)
+ drop_from_inventory(W)
+
+ visible_message("\The [src] quivers slightly, then splits apart with a wet slithering noise.")
+
+ del(src)
+
+
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 5484508fe7..c19540c800 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -34,7 +34,7 @@ This saves us from having to call add_fingerprint() any time something is put in
if (equip_to_slot_if_possible(W, slots[slot], del_on_fail = 0))
return slot
if (del_on_fail)
- del(W)
+ qdel(W)
return null
@@ -317,6 +317,48 @@ This saves us from having to call add_fingerprint() any time something is put in
return 1
+//Checks if a given slot can be accessed at this time, either to equip or unequip I
+/mob/living/carbon/human/slot_is_accessible(var/slot, var/obj/item/I, mob/user=null)
+ var/obj/item/covering = null
+ var/check_flags = 0
+
+ switch(slot)
+ if(slot_wear_mask)
+ covering = src.head
+ check_flags = HEADCOVERSMOUTH
+ if(slot_glasses)
+ covering = src.head
+ check_flags = HEADCOVERSEYES
+ if(slot_gloves, slot_w_uniform)
+ covering = src.wear_suit
+
+ if(covering)
+ if((covering.body_parts_covered & I.body_parts_covered) || (covering.flags & check_flags))
+ user << "\The [covering] is in the way."
+ return 0
+ return 1
+
+/mob/living/carbon/human/get_equipped_item(var/slot)
+ switch(slot)
+ if(slot_wear_suit) return wear_suit
+ if(slot_gloves) return gloves
+ if(slot_shoes) return shoes
+ if(slot_belt) return belt
+ if(slot_glasses) return glasses
+ if(slot_head) return head
+ if(slot_l_ear) return l_ear
+ if(slot_r_ear) return r_ear
+ if(slot_w_uniform) return w_uniform
+ if(slot_wear_id) return wear_id
+ if(slot_l_store) return l_store
+ if(slot_r_store) return r_store
+ if(slot_s_store) return s_store
+ if(slot_handcuffed) return handcuffed
+ if(slot_legcuffed) return legcuffed
+ return ..()
+
+///Bizarre equip effect system below
+
/*
MouseDrop human inventory menu
*/
@@ -341,9 +383,9 @@ This saves us from having to call add_fingerprint() any time something is put in
/obj/effect/equip_e/New()
if (!ticker)
- del(src)
+ qdel(src)
spawn(100)
- del(src)
+ qdel(src)
..()
return
@@ -354,22 +396,22 @@ This saves us from having to call add_fingerprint() any time something is put in
switch(place)
if("mask")
if (!( target.wear_mask ))
- del(src)
+ qdel(src)
if("l_hand")
if (!( target.l_hand ))
- del(src)
+ qdel(src)
if("r_hand")
if (!( target.r_hand ))
- del(src)
+ qdel(src)
if("suit")
if (!( target.wear_suit ))
- del(src)
+ qdel(src)
if("uniform")
if (!( target.w_uniform ))
- del(src)
+ qdel(src)
if("back")
if (!( target.back ))
- del(src)
+ qdel(src)
if("syringe")
return
if("pill")
@@ -382,10 +424,10 @@ This saves us from having to call add_fingerprint() any time something is put in
return
if("handcuff")
if (!( target.handcuffed ))
- del(src)
+ qdel(src)
if("id")
if ((!( target.wear_id ) || !( target.w_uniform )))
- del(src)
+ qdel(src)
if("splints")
var/count = 0
for(var/organ in list("l_leg","r_leg","l_arm","r_arm"))
@@ -394,19 +436,19 @@ This saves us from having to call add_fingerprint() any time something is put in
count = 1
break
if(count == 0)
- del(src)
+ qdel(src)
return
if("sensor")
if (! target.w_uniform )
- del(src)
+ qdel(src)
if("internal")
if ((!( (istype(target.wear_mask, /obj/item/clothing/mask) && (istype(target.back, /obj/item/weapon/tank) || istype(target.belt, /obj/item/weapon/tank) || istype(target.s_store, /obj/item/weapon/tank)) && !( target.internal )) ) && !( target.internal )))
- del(src)
+ qdel(src)
var/list/L = list( "syringe", "pill", "drink", "dnainjector", "fuel", "sensor", "internal", "tie")
if ((item && !( L.Find(place) )))
if(isrobot(source) && place != "handcuff")
- del(src)
+ qdel(src)
for(var/mob/O in viewers(target, null))
O.show_message("\red [source] is trying to put \a [item] on [target]", 1)
else
@@ -508,7 +550,7 @@ This saves us from having to call add_fingerprint() any time something is put in
message = "\red [source] is trying to empty [target]'s pockets."
if("CPR")
if (!target.cpr_time)
- del(src)
+ qdel(src)
target.cpr_time = 0
message = "\red [source] is trying perform CPR on [target]!"
if("internal")
@@ -566,7 +608,7 @@ It can still be worn/put on as normal.
if ((source.restrained() || source.stat)) return //Source restrained or unconscious / dead
var/slot_to_process
- var/strip_item //this will tell us which item we will be stripping - if any.
+ var/obj/item/strip_item //this will tell us which item we will be stripping - if any.
switch(place) //here we go again...
if("mask")
@@ -607,13 +649,13 @@ It can still be worn/put on as normal.
strip_item = target.shoes
if("l_hand")
if (istype(target, /obj/item/clothing/suit/straight_jacket))
- del(src)
+ qdel(src)
slot_to_process = slot_l_hand
if (target.l_hand)
strip_item = target.l_hand
if("r_hand")
if (istype(target, /obj/item/clothing/suit/straight_jacket))
- del(src)
+ qdel(src)
slot_to_process = slot_r_hand
if (target.r_hand)
strip_item = target.r_hand
@@ -700,11 +742,11 @@ It can still be worn/put on as normal.
S.add_fingerprint(source)
if (!( istype(S, /obj/item/weapon/dnainjector) ))
S.inuse = 0
- del(src)
+ qdel(src)
S.inject(target, source)
if (S.s_time >= world.time + 30)
S.inuse = 0
- del(src)
+ qdel(src)
S.s_time = world.time
for(var/mob/O in viewers(source, null))
O.show_message("\red [source] injects [target] with the DNA Injector!", 1)
@@ -748,19 +790,23 @@ It can still be worn/put on as normal.
target.internals.icon_state = "internal1"
if(slot_to_process)
if(strip_item) //Stripping an item from the mob
- var/obj/item/W = strip_item
- target.remove_from_mob(W)
- W.add_fingerprint(source)
- if(slot_to_process == slot_l_store) //pockets! Needs to process the other one too. Snowflake code, wooo! It's not like anyone will rewrite this anytime soon. If I'm wrong then... CONGRATULATIONS! ;)
- if(target.r_store)
- target.remove_from_mob(target.r_store) //At this stage l_store is already processed by the code above, we only need to process r_store.
- else
- if(item && target.has_organ_for_slot(slot_to_process)) //Placing an item on the mob
- if(item.mob_can_equip(target, slot_to_process, 0))
- source.remove_from_mob(item)
- target.equip_to_slot_if_possible(item, slot_to_process, 0, 1, 1)
+ if(strip_item.mob_can_unequip(target, slot_to_process, 0))
+ target.drop_from_inventory(strip_item)
+ source.put_in_hands(strip_item)
+ strip_item.add_fingerprint(source)
+ if(slot_to_process == slot_l_store) //pockets! Needs to process the other one too. Snowflake code, wooo! It's not like anyone will rewrite this anytime soon. If I'm wrong then... CONGRATULATIONS! ;)
+ if(target.r_store)
+ target.drop_from_inventory(target.r_store) //At this stage l_store is already processed by the code above, we only need to process r_store.
+ else
+ source << "You fail to remove \the [strip_item] from [target]!"
+ else if(item)
+ if(target.has_organ_for_slot(slot_to_process) && item.mob_can_equip(target, slot_to_process, 0)) //Placing an item on the mob
+ source.drop_from_inventory(item)
+ target.equip_to_slot_if_possible(item, slot_to_process, 0, 1, 1)
+ else
+ source << "You fail to place \the [item] on [target]!"
if(source && target)
if(source.machine == target)
target.show_inv(source)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 568822d105..4bbb81612c 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -2,7 +2,7 @@
//NOTE: Breathing happens once per FOUR TICKS, unless the last breath fails. In which case it happens once per ONE TICK! So oxyloss healing is done once per 4 ticks while oxyloss damage is applied once per tick!
#define HUMAN_MAX_OXYLOSS 1 //Defines how much oxyloss humans can get per tick. A tile with no air at all (such as space) applies this value, otherwise it's a percentage of it.
-#define HUMAN_CRIT_MAX_OXYLOSS ( (tickerProcess.getLastTickerTimeDuration()) / 6) //The amount of damage you'll get when in critical condition. We want this to be a 5 minute deal = 300s. There are 50HP to get through, so (1/6)*last_tick_duration per second. Breaths however only happen every 4 ticks.
+#define HUMAN_CRIT_MAX_OXYLOSS ( 2.0 / 6) //The amount of damage you'll get when in critical condition. We want this to be a 5 minute deal = 300s. There are 50HP to get through, so (1/6)*last_tick_duration per second. Breaths however only happen every 4 ticks. last_tick_duration = ~2.0 on average
#define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point
#define HEAT_DAMAGE_LEVEL_2 4 //Amount of damage applied when your body temperature passes the 400K point
@@ -32,6 +32,7 @@
var/temperature_alert = 0
var/in_stasis = 0
var/heartbeat = 0
+ var/global/list/overlays_cache = null
/mob/living/carbon/human/Life()
@@ -876,10 +877,11 @@
var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
if(isturf(loc)) //else, there's considered to be no light
var/turf/T = loc
- var/area/A = T.loc
- if(A)
- if(A.lighting_use_dynamic) light_amount = min(10,T.lighting_lumcount) - 5 //hardcapped so it's not abused by having a ton of flashlights
- else light_amount = 5
+ var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
+ if(L)
+ light_amount = min(10,L.lum_r + L.lum_g + L.lum_b) - 5 //hardcapped so it's not abused by having a ton of flashlights
+ else
+ light_amount = 5
nutrition += light_amount
traumatic_shock -= light_amount
@@ -897,10 +899,11 @@
var/light_amount = 0
if(isturf(loc))
var/turf/T = loc
- var/area/A = T.loc
- if(A)
- if(A.lighting_use_dynamic) light_amount = T.lighting_lumcount
- else light_amount = 10
+ var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
+ if(L)
+ light_amount = L.lum_r + L.lum_g + L.lum_b //hardcapped so it's not abused by having a ton of flashlights
+ else
+ light_amount = 10
if(light_amount > species.light_dam) //if there's enough light, start dying
take_overall_damage(1,1)
else //heal in the dark
@@ -974,7 +977,7 @@
else
for(var/atom/a in hallucinations)
- del a
+ qdel(a)
if(halloss > 100)
src << "You're in too much pain to keep going..."
@@ -1082,6 +1085,33 @@
return 1
proc/handle_regular_hud_updates()
+ if(!overlays_cache)
+ overlays_cache = list()
+ overlays_cache.len = 23
+ overlays_cache[1] = image('icons/mob/screen1_full.dmi', "icon_state" = "passage1")
+ overlays_cache[2] = image('icons/mob/screen1_full.dmi', "icon_state" = "passage2")
+ overlays_cache[3] = image('icons/mob/screen1_full.dmi', "icon_state" = "passage3")
+ overlays_cache[4] = image('icons/mob/screen1_full.dmi', "icon_state" = "passage4")
+ overlays_cache[5] = image('icons/mob/screen1_full.dmi', "icon_state" = "passage5")
+ overlays_cache[6] = image('icons/mob/screen1_full.dmi', "icon_state" = "passage6")
+ overlays_cache[7] = image('icons/mob/screen1_full.dmi', "icon_state" = "passage7")
+ overlays_cache[8] = image('icons/mob/screen1_full.dmi', "icon_state" = "passage8")
+ overlays_cache[9] = image('icons/mob/screen1_full.dmi', "icon_state" = "passage9")
+ overlays_cache[10] = image('icons/mob/screen1_full.dmi', "icon_state" = "passage10")
+ overlays_cache[11] = image('icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay1")
+ overlays_cache[12] = image('icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay2")
+ overlays_cache[13] = image('icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay3")
+ overlays_cache[14] = image('icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay4")
+ overlays_cache[15] = image('icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay5")
+ overlays_cache[16] = image('icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay6")
+ overlays_cache[17] = image('icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay7")
+ overlays_cache[18] = image('icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay1")
+ overlays_cache[19] = image('icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay2")
+ overlays_cache[20] = image('icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay3")
+ overlays_cache[21] = image('icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay4")
+ overlays_cache[22] = image('icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay5")
+ overlays_cache[23] = image('icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay6")
+
if(hud_updateflag) // update our mob's hud overlays, AKA what others see flaoting above our head
handle_hud_list()
@@ -1100,32 +1130,32 @@
if(damageoverlay.overlays)
damageoverlay.overlays = list()
-
+
if(stat == UNCONSCIOUS)
//Critical damage passage overlay
if(health <= 0)
var/image/I
switch(health)
if(-20 to -10)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage1")
+ I = overlays_cache[1]
if(-30 to -20)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage2")
+ I = overlays_cache[2]
if(-40 to -30)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage3")
+ I = overlays_cache[3]
if(-50 to -40)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage4")
+ I = overlays_cache[4]
if(-60 to -50)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage5")
+ I = overlays_cache[5]
if(-70 to -60)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage6")
+ I = overlays_cache[6]
if(-80 to -70)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage7")
+ I = overlays_cache[7]
if(-90 to -80)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage8")
+ I = overlays_cache[8]
if(-95 to -90)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage9")
+ I = overlays_cache[9]
if(-INFINITY to -95)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage10")
+ I = overlays_cache[10]
damageoverlay.overlays += I
else
//Oxygen damage overlay
@@ -1133,19 +1163,19 @@
var/image/I
switch(oxyloss)
if(10 to 20)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay1")
+ I = overlays_cache[11]
if(20 to 25)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay2")
+ I = overlays_cache[12]
if(25 to 30)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay3")
+ I = overlays_cache[13]
if(30 to 35)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay4")
+ I = overlays_cache[14]
if(35 to 40)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay5")
+ I = overlays_cache[15]
if(40 to 45)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay6")
+ I = overlays_cache[16]
if(45 to INFINITY)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay7")
+ I = overlays_cache[17]
damageoverlay.overlays += I
//Fire and Brute damage overlay (BSSR)
@@ -1155,17 +1185,17 @@
var/image/I
switch(hurtdamage)
if(10 to 25)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay1")
+ I = overlays_cache[18]
if(25 to 40)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay2")
+ I = overlays_cache[19]
if(40 to 55)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay3")
+ I = overlays_cache[20]
if(55 to 70)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay4")
+ I = overlays_cache[21]
if(70 to 85)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay5")
+ I = overlays_cache[22]
if(85 to INFINITY)
- I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay6")
+ I = overlays_cache[23]
damageoverlay.overlays += I
if( stat == DEAD )
@@ -1390,8 +1420,9 @@
//0.1% chance of playing a scary sound to someone who's in complete darkness
if(isturf(loc) && rand(1,1000) == 1)
- var/turf/currentTurf = loc
- if(!currentTurf.lighting_lumcount)
+ var/turf/T = loc
+ var/atom/movable/lighting_overlay/L = locate(/atom/movable/lighting_overlay) in T
+ if(L && L.lum_r + L.lum_g + L.lum_b == 0)
playsound_local(src,pick(scarySounds),50, 1, -1)
proc/handle_stomach()
@@ -1404,7 +1435,7 @@
if(M.stat == 2)
M.death(1)
stomach_contents.Remove(M)
- del(M)
+ qdel(M)
continue
if(air_master.current_cycle%3==1)
if(!(M.status_flags & GODMODE))
diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm
index 290c81723e..b586a197c9 100644
--- a/code/modules/mob/living/carbon/human/npcs.dm
+++ b/code/modules/mob/living/carbon/human/npcs.dm
@@ -2,7 +2,7 @@
name = "fancy uniform"
desc = "It looks like it was tailored for a monkey."
icon_state = "punpun"
- item_color = "punpun"
+ worn_state = "punpun"
species_restricted = list("Monkey")
/mob/living/carbon/human/monkey/punpun/New()
diff --git a/code/modules/mob/living/carbon/human/species/outsider/shadow.dm b/code/modules/mob/living/carbon/human/species/outsider/shadow.dm
index fa40f8ee00..41349846eb 100644
--- a/code/modules/mob/living/carbon/human/species/outsider/shadow.dm
+++ b/code/modules/mob/living/carbon/human/species/outsider/shadow.dm
@@ -23,4 +23,4 @@
/datum/species/shadow/handle_death(var/mob/living/carbon/human/H)
spawn(1)
new /obj/effect/decal/cleanable/ash(H.loc)
- del(H)
\ No newline at end of file
+ qdel(H)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 6fddbd92ec..5c01ea38b4 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -178,7 +178,7 @@
for(var/obj/item/organ/organ in H.contents)
if((organ in H.organs) || (organ in H.internal_organs))
- del(organ)
+ qdel(organ)
if(H.organs) H.organs.Cut()
if(H.internal_organs) H.internal_organs.Cut()
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index 62907752aa..ee8a1438d2 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -168,6 +168,10 @@
"r_foot" = list("path" = /obj/item/organ/external/diona/foot/right)
)
+ inherent_verbs = list(
+ /mob/living/carbon/human/proc/diona_split_nymph
+ )
+
warning_low_pressure = 50
hazard_low_pressure = -1
@@ -209,7 +213,7 @@
if(D.client)
D.loc = H.loc
else
- del(D)
+ qdel(D)
H.visible_message("\red[H] splits apart with a wet slithering noise!")
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_embryo.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_embryo.dm
index 093025189b..c60d8bca1d 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_embryo.dm
@@ -16,9 +16,9 @@
spawn(0)
AddInfectionImages(affected_mob)
else
- del(src)
+ qdel(src)
-/obj/item/alien_embryo/Del()
+/obj/item/alien_embryo/Destroy()
if(affected_mob)
affected_mob.status_flags &= ~(XENO_HOST)
spawn(0)
@@ -98,7 +98,7 @@
new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100) //To get the player's attention
if(gib_on_success)
affected_mob.gib()
- del(src)
+ qdel(src)
/*----------------------------------------
Proc: RefreshInfectionImage()
@@ -114,7 +114,7 @@ Des: Removes all infection images from aliens and places an infection image on a
if(alien.client)
for(var/image/I in alien.client.images)
if(dd_hasprefix_case(I.icon_state, "infected"))
- del(I)
+ qdel(I)
for(var/mob/living/L in mob_list)
if(iscorgi(L) || iscarbon(L))
if(L.status_flags & XENO_HOST)
@@ -156,4 +156,4 @@ Des: Removes the alien infection image from all aliens in the world located in p
for(var/image/I in alien.client.images)
if(I.loc == C)
if(dd_hasprefix_case(I.icon_state, "infected"))
- del(I)
\ No newline at end of file
+ qdel(I)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
index 6fbdfa8ddb..bdc505fe34 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
@@ -41,7 +41,7 @@ var/const/MAX_ACTIVE_TIME = 400
if(config.aliens_allowed)
..()
else
- del(src)
+ qdel(src)
/obj/item/clothing/mask/facehugger/examine(mob/user)
..(user)
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm
index caea1ae7a8..7bab6d074c 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm
@@ -134,13 +134,20 @@
return
// OBJ CHECK
+ var/cannot_melt
if(isobj(O))
var/obj/I = O
- if(I.unacidable) //So the aliens don't destroy energy fields/singularies/other aliens/etc with their acid.
- src << "You cannot dissolve this object."
- return
- // TURF CHECK
- else if(istype(O, /turf/simulated/wall/r_wall) || istype(O, /turf/simulated/floor/engine))
+ if(I.unacidable)
+ cannot_melt = 1
+ else
+ if(istype(O, /turf/simulated/wall))
+ var/turf/simulated/wall/W = O
+ if(W.material.unmeltable)
+ cannot_melt = 1
+ else if(istype(O, /turf/simulated/floor/engine))
+ cannot_melt = 1
+
+ if(cannot_melt)
src << "You cannot dissolve this object."
return
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm
index e1caf89324..4ef350ef88 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm
@@ -45,7 +45,7 @@ Des: Removes all infected images from the alien.
if (client)
for(var/image/I in client.images)
if(dd_hasprefix_case(I.icon_state, "infected"))
- del(I)
+ qdel(I)
return
/* TODO: Convert this over.
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index dbc78f513c..d7776fa18d 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -239,7 +239,7 @@ var/global/list/damage_icon_parts = list()
//0 = destroyed, 1 = normal, 2 = robotic, 3 = necrotic.
//Create a new, blank icon for our mob to use.
if(stand_icon)
- del(stand_icon)
+ qdel(stand_icon)
stand_icon = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi',"blank")
var/icon_key = "[species.race_key][g][s_tone][r_skin][g_skin][b_skin]"
var/obj/item/organ/eyes/eyes = internal_organs_by_name["eyes"]
@@ -412,7 +412,7 @@ var/global/list/damage_icon_parts = list()
if (targeted_by && target_locked)
overlays_standing[TARGETED_LAYER] = target_locked
else if (!targeted_by && target_locked)
- del(target_locked)
+ qdel(target_locked)
if (!targeted_by)
overlays_standing[TARGETED_LAYER] = null
if(update_icons) update_icons()
@@ -457,37 +457,49 @@ var/global/list/damage_icon_parts = list()
/mob/living/carbon/human/update_inv_w_uniform(var/update_icons=1)
if(w_uniform && istype(w_uniform, /obj/item/clothing/under) )
w_uniform.screen_loc = ui_iclothing
- var/t_color = w_uniform.item_color
- if(!t_color) t_color = icon_state
- var/image/standing = image("icon_state" = "[t_color]_s")
+ //determine the icon to use
+ var/icon/under_icon
if(w_uniform.icon_override)
- standing.icon = w_uniform.icon_override
+ under_icon = w_uniform.icon_override
else if(w_uniform.sprite_sheets && w_uniform.sprite_sheets[species.name])
- standing.icon = w_uniform.sprite_sheets[species.name]
+ under_icon = w_uniform.sprite_sheets[species.name]
+ else if(w_uniform.item_icons && w_uniform.item_icons[slot_w_uniform_str])
+ under_icon = w_uniform.item_icons[slot_w_uniform_str]
else
- standing.icon = 'icons/mob/uniform.dmi'
+ under_icon = INV_W_UNIFORM_DEF_ICON
+
+ //determine state to use
+ var/under_state
+ if(w_uniform.item_state_slots && w_uniform.item_state_slots[slot_w_uniform_str])
+ under_state = w_uniform.item_state_slots[slot_w_uniform_str]
+ else if(w_uniform.item_state)
+ under_state = w_uniform.item_state
+ else
+ under_state = w_uniform.icon_state
+ //need to append _s to the icon state for legacy compatibility
+ var/image/standing = image(icon = under_icon, icon_state = "[under_state]_s")
+
+ //apply blood overlay
if(w_uniform.blood_DNA)
- var/image/bloodsies = image("icon" = species.blood_mask, "icon_state" = "uniformblood")
+ var/image/bloodsies = image(icon = species.blood_mask, icon_state = "uniformblood")
bloodsies.color = w_uniform.blood_color
standing.overlays += bloodsies
- if(w_uniform:accessories.len) //WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE.
- for(var/obj/item/clothing/accessory/A in w_uniform:accessories)
- var/tie_color = A.item_color
- if(!tie_color) tie_color = A.icon_state
- standing.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]")
+ //accessories
+ var/obj/item/clothing/under/under = w_uniform
+ if(under.accessories.len)
+ for(var/obj/item/clothing/accessory/A in under.accessories)
+ var/accessory_state = A.overlay_state? A.overlay_state : A.icon_state
+ standing.overlays += image(icon = INV_ACCESSORIES_DEF_ICON, icon_state = accessory_state)
overlays_standing[UNIFORM_LAYER] = standing
else
overlays_standing[UNIFORM_LAYER] = null
- // This really, really seems like it should not be mixed in the middle of display code...
- // Automatically drop anything in store / id / belt if you're not wearing a uniform. //CHECK IF NECESARRY
- for( var/obj/item/thing in list(r_store, l_store, wear_id, belt) )
- if(thing)
- remove_from_mob(thing)
- if(update_icons) update_icons()
+
+ if(update_icons)
+ update_icons()
/mob/living/carbon/human/update_inv_wear_id(var/update_icons=1)
if(wear_id)
@@ -742,19 +754,38 @@ var/global/list/damage_icon_parts = list()
/mob/living/carbon/human/update_inv_back(var/update_icons=1)
if(back)
back.screen_loc = ui_back //TODO
- var/obj/item/weapon/rig/rig = back
+
+ //determine the icon to use
+ var/icon/overlay_icon
if(back.icon_override)
- overlays_standing[BACK_LAYER] = image("icon" = back.icon_override, "icon_state" = "[back.icon_state]")
- //If this is a rig and a mob_icon is set, it will take species into account in the rig update_icon() proc.
- else if(istype(rig) && rig.mob_icon)
- overlays_standing[BACK_LAYER] = rig.mob_icon
+ overlay_icon = back.icon_override
+ else if(istype(back, /obj/item/weapon/rig))
+ //If this is a rig and a mob_icon is set, it will take species into account in the rig update_icon() proc.
+ var/obj/item/weapon/rig/rig = back
+ overlay_icon = rig.mob_icon
else if(back.sprite_sheets && back.sprite_sheets[species.name])
- overlays_standing[BACK_LAYER] = image("icon" = back.sprite_sheets[species.name], "icon_state" = "[back.icon_state]")
+ overlay_icon = back.sprite_sheets[species.name]
+ else if(back.item_icons && (slot_back_str in back.item_icons))
+ overlay_icon = back.item_icons[slot_back_str]
else
- overlays_standing[BACK_LAYER] = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]")
+ overlay_icon = INV_BACK_DEF_ICON
+
+ //determine state to use
+ var/overlay_state
+ if(back.item_state_slots && back.item_state_slots[slot_back_str])
+ overlay_state = back.item_state_slots[slot_back_str]
+ else if(back.item_state)
+ overlay_state = back.item_state
+ else
+ overlay_state = back.icon_state
+
+ //create the image
+ overlays_standing[BACK_LAYER] = image(icon = overlay_icon, icon_state = overlay_state)
else
- overlays_standing[BACK_LAYER] = null
- if(update_icons) update_icons()
+ overlays_standing[BACK_LAYER] = null
+
+ if(update_icons)
+ update_icons()
/mob/living/carbon/human/update_hud() //TODO: do away with this if possible
@@ -791,19 +822,27 @@ var/global/list/damage_icon_parts = list()
if(r_hand)
r_hand.screen_loc = ui_rhand //TODO
- var/t_icon = INV_R_HAND_DEF_ICON
- if(r_hand.item_icons && (icon_r_hand in r_hand.item_icons))
- t_icon = r_hand.item_icons[icon_r_hand]
-
- var/t_state = r_hand.item_state //useful for clothing that changes icon_state but retains the same sprite on the mob when held in hand
- if(!t_state) t_state = r_hand.icon_state
+ //determine icon to use
+ var/icon/t_icon
if(r_hand.icon_override)
- t_state = "[t_state]_r"
- overlays_standing[R_HAND_LAYER] = image("icon" = r_hand.icon_override, "icon_state" = "[t_state]")
+ t_icon = r_hand.icon_override
+ else if(r_hand.item_icons && (slot_r_hand_str in r_hand.item_icons))
+ t_icon = r_hand.item_icons[slot_r_hand_str]
else
- overlays_standing[R_HAND_LAYER] = image("icon" = t_icon, "icon_state" = "[t_state]")
+ t_icon = INV_R_HAND_DEF_ICON
- if (handcuffed) drop_r_hand()
+ //determine icon state to use
+ var/t_state
+ if(r_hand.item_state_slots && r_hand.item_state_slots[slot_r_hand_str])
+ t_state = r_hand.item_state_slots[slot_r_hand_str]
+ else if(r_hand.item_state)
+ t_state = r_hand.item_state
+ else
+ t_state = r_hand.icon_state
+
+ overlays_standing[R_HAND_LAYER] = image(icon = t_icon, icon_state = t_state)
+
+ if (handcuffed) drop_r_hand() //this should be moved out of icon code
else
overlays_standing[R_HAND_LAYER] = null
@@ -814,19 +853,27 @@ var/global/list/damage_icon_parts = list()
if(l_hand)
l_hand.screen_loc = ui_lhand //TODO
- var/t_icon = INV_L_HAND_DEF_ICON
- if(l_hand.item_icons && (icon_l_hand in l_hand.item_icons))
- t_icon = l_hand.item_icons[icon_l_hand]
-
- var/t_state = l_hand.item_state //useful for clothing that changes icon_state but retains the same sprite on the mob when held in hand
- if(!t_state) t_state = l_hand.icon_state
+ //determine icon to use
+ var/icon/t_icon
if(l_hand.icon_override)
- t_state = "[t_state]_l"
- overlays_standing[L_HAND_LAYER] = image("icon" = l_hand.icon_override, "icon_state" = "[t_state]")
+ t_icon = l_hand.icon_override
+ else if(l_hand.item_icons && (slot_l_hand_str in l_hand.item_icons))
+ t_icon = l_hand.item_icons[slot_l_hand_str]
else
- overlays_standing[L_HAND_LAYER] = image("icon" = t_icon, "icon_state" = "[t_state]")
+ t_icon = INV_L_HAND_DEF_ICON
- if (handcuffed) drop_l_hand()
+ //determine icon state to use
+ var/t_state
+ if(l_hand.item_state_slots && l_hand.item_state_slots[slot_l_hand_str])
+ t_state = l_hand.item_state_slots[slot_l_hand_str]
+ else if(l_hand.item_state)
+ t_state = l_hand.item_state
+ else
+ t_state = l_hand.icon_state
+
+ overlays_standing[L_HAND_LAYER] = image(icon = t_icon, icon_state = t_state)
+
+ if (handcuffed) drop_l_hand() //This probably should not be here
else
overlays_standing[L_HAND_LAYER] = null
diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm
index 2f67cbec85..7336189e11 100644
--- a/code/modules/mob/living/carbon/human/whisper.dm
+++ b/code/modules/mob/living/carbon/human/whisper.dm
@@ -143,7 +143,7 @@
//now mobs
var/speech_bubble_test = say_test(message)
var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
- spawn(30) del(speech_bubble)
+ spawn(30) qdel(speech_bubble)
for(var/mob/M in listening)
M << speech_bubble
diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm
index 9f10399112..6739cb4e2b 100644
--- a/code/modules/mob/living/carbon/metroid/items.dm
+++ b/code/modules/mob/living/carbon/metroid/items.dm
@@ -23,7 +23,7 @@
user <<"You apply the enhancer. It now has triple the amount of uses."
Uses = 3
enhanced = 1
- del(O)
+ qdel(O)
/obj/item/slime_extract/New()
..()
@@ -145,14 +145,14 @@
pet.icon_dead = "[M.colour] baby slime dead"
pet.colour = "[M.colour]"
user <<"You feed the slime the potion, removing it's powers and calming it."
- del(M)
+ qdel(M)
var/newname = sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text, MAX_NAME_LEN)
if (!newname)
newname = "pet slime"
pet.name = newname
pet.real_name = newname
- del(src)
+ qdel(src)
/obj/item/weapon/slimepotion2
name = "advanced docility potion"
@@ -176,14 +176,14 @@
pet.icon_dead = "[M.colour] baby slime dead"
pet.colour = "[M.colour]"
user <<"You feed the slime the potion, removing it's powers and calming it."
- del(M)
+ qdel(M)
var/newname = sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text, MAX_NAME_LEN)
if (!newname)
newname = "pet slime"
pet.name = newname
pet.real_name = newname
- del(src)
+ qdel(src)
/obj/item/weapon/slimesteroid
@@ -208,7 +208,7 @@
user <<"You feed the slime the steroid. It now has triple the amount of extract."
M.cores = 3
- del(src)
+ qdel(src)
/obj/item/weapon/slimesteroid2
name = "extract enhancer"
@@ -227,7 +227,7 @@
user <<"You apply the enhancer. It now has triple the amount of uses."
target.Uses = 3
target.enahnced = 1
- del(src)*/
+ qdel(src)*/
/obj/effect/golemrune
anchored = 1
@@ -268,7 +268,7 @@
G.set_species("Golem")
G.key = ghost.key
G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."
- del (src)
+ qdel(src)
proc/announce_to_ghosts()
@@ -350,7 +350,7 @@
spawn(rand(50,100))
src.visible_message(" The [name] bursts open!")
new/mob/living/carbon/slime(T)
- del(src)
+ qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/egg/slime/process()
@@ -360,7 +360,7 @@
src.Hatch()
/obj/item/weapon/reagent_containers/food/snacks/egg/slime/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype( W, /obj/item/toy/crayon ))
+ if(istype( W, /obj/item/weapon/pen/crayon ))
return
else
..()
diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm
index e7e545fb30..ebbfb991d0 100644
--- a/code/modules/mob/living/carbon/metroid/metroid.dm
+++ b/code/modules/mob/living/carbon/metroid/metroid.dm
@@ -178,7 +178,7 @@
var/f_loss = null
switch (severity)
if (1.0)
- del(src)
+ qdel(src)
return
if (2.0)
diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm
index b2f8c2588f..b5fd583ade 100644
--- a/code/modules/mob/living/carbon/metroid/powers.dm
+++ b/code/modules/mob/living/carbon/metroid/powers.dm
@@ -161,7 +161,7 @@
src.mind.transfer_to(new_slime)
else
new_slime.key = src.key
- del(src)
+ qdel(src)
else
src << "I am not ready to reproduce yet..."
else
diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm
new file mode 100644
index 0000000000..7a4c184ca7
--- /dev/null
+++ b/code/modules/mob/living/carbon/resist.dm
@@ -0,0 +1,170 @@
+
+/mob/living/carbon/process_resist()
+
+ //drop && roll
+ if(on_fire)
+ fire_stacks -= 2 //reduced
+ Weaken(3)
+ spin(32,2)
+ visible_message(
+ "[src] rolls on the floor, trying to put themselves out!",
+ "You stop, drop, and roll!"
+ )
+ sleep(30)
+ if(fire_stacks <= 0)
+ visible_message(
+ "[src] has successfully extinguished themselves!",
+ "You extinguish yourself."
+ )
+ ExtinguishMob()
+ return
+
+ if(handcuffed)
+ spawn() escape_handcuffs()
+ else if(legcuffed)
+ spawn() escape_legcuffs()
+
+ ..()
+
+/mob/living/carbon/proc/escape_handcuffs()
+ if(!(last_special <= world.time)) return
+
+ next_move = world.time + 100
+ last_special = world.time + 100
+
+ if(can_break_cuffs()) //Don't want to do a lot of logic gating here.
+ break_handcuffs()
+ return
+
+ var/obj/item/weapon/handcuffs/HC = handcuffed
+
+ //A default in case you are somehow handcuffed with something that isn't an obj/item/weapon/handcuffs type
+ var/breakouttime = 1200
+ var/displaytime = 2 //Minutes to display in the "this will take X minutes."
+ //If you are handcuffed with actual handcuffs... Well what do I know, maybe someone will want to handcuff you with toilet paper in the future...
+ if(istype(HC))
+ breakouttime = HC.breakouttime
+ displaytime = breakouttime / 600 //Minutes
+
+ visible_message(
+ "[src] attempts to remove \the [HC]!",
+ "You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)"
+ )
+
+ if(do_after(src, breakouttime))
+ if(!handcuffed || buckled)
+ return
+ visible_message(
+ "[src] manages to remove \the [handcuffed]!",
+ "You successfully remove \the [handcuffed]."
+ )
+ drop_from_inventory(handcuffed)
+
+/mob/living/carbon/proc/escape_legcuffs()
+ if(!(last_special <= world.time)) return
+
+ next_move = world.time + 100
+ last_special = world.time + 100
+
+ if(can_break_cuffs()) //Don't want to do a lot of logic gating here.
+ break_legcuffs()
+ return
+
+ var/obj/item/weapon/legcuffs/HC = legcuffed
+
+ //A default in case you are somehow legcuffed with something that isn't an obj/item/weapon/legcuffs type
+ var/breakouttime = 1200
+ var/displaytime = 2 //Minutes to display in the "this will take X minutes."
+ //If you are legcuffed with actual legcuffs... Well what do I know, maybe someone will want to legcuff you with toilet paper in the future...
+ if(istype(HC))
+ breakouttime = HC.breakouttime
+ displaytime = breakouttime / 600 //Minutes
+
+ visible_message(
+ "[usr] attempts to remove \the [HC]!",
+ "You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)"
+ )
+
+ if(do_after(src, breakouttime))
+ if(!legcuffed || buckled)
+ return
+ visible_message(
+ "[src] manages to remove \the [legcuffed]!",
+ "You successfully remove \the [legcuffed]."
+ )
+
+ drop_from_inventory(legcuffed)
+ legcuffed = null
+ update_inv_legcuffed()
+
+/mob/living/carbon/proc/can_break_cuffs()
+ if(HULK in mutations)
+ return 1
+
+/mob/living/carbon/proc/break_handcuffs()
+ visible_message(
+ "[src] is trying to break \the [handcuffed]!",
+ "You attempt to break your [handcuffed.name]. (This will take around 5 seconds and you need to stand still)"
+ )
+
+ if(do_after(src, 50))
+ if(!handcuffed || buckled)
+ return
+
+ visible_message(
+ "[src] manages to break \the [handcuffed]!",
+ "You successfully break your [handcuffed.name]."
+ )
+
+ say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+
+ del(handcuffed)
+ handcuffed = null
+ if(buckled && buckled.buckle_require_restraints)
+ buckled.unbuckle_mob()
+ update_inv_handcuffed()
+
+/mob/living/carbon/proc/break_legcuffs()
+ src << "You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)"
+ visible_message("[src] is trying to break the legcuffs!")
+
+ if(do_after(src, 50))
+ if(!legcuffed || buckled)
+ return
+
+ visible_message(
+ "[src] manages to break the legcuffs!",
+ "You successfully break your legcuffs."
+ )
+
+ say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+
+ del(legcuffed)
+ legcuffed = null
+ update_inv_legcuffed()
+
+/mob/living/carbon/human/can_break_cuffs()
+ if(species.can_shred(src,1))
+ return 1
+ return ..()
+
+/mob/living/carbon/escape_buckle()
+ if(!buckled) return
+ if(!(last_special <= world.time)) return
+
+ if(!restrained())
+ ..()
+ else
+ next_move = world.time + 100
+ last_special = world.time + 100
+ visible_message(
+ "[usr] attempts to unbuckle themself!",
+ "You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)"
+ )
+
+ if(do_after(usr, 1200))
+ if(!buckled)
+ return
+ visible_message("[usr] manages to unbuckle themself!",
+ "You successfully unbuckle yourself.")
+ buckled.user_unbuckle_mob(src)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index b2dd102fea..c37dce2824 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -516,7 +516,7 @@ default behaviour is:
for(var/mob/O in viewers(M, null))
O.show_message(text("\red [] has been pulled from []'s grip by []", G.affecting, G.assailant, src), 1)
//G = null
- del(G)
+ qdel(G)
else
ok = 0
if (locate(/obj/item/weapon/grab, M.grabbed_by.len))
@@ -575,284 +575,84 @@ default behaviour is:
set name = "Resist"
set category = "IC"
- if(usr.stat || !isliving(usr) || usr.next_move > world.time)
- return
+ if(can_resist())
+ next_move = world.time + 20
+ process_resist()
- usr.next_move = world.time + 20
-
- var/mob/living/L = usr
+/mob/living/proc/can_resist()
+ //need to allow !canmove, or otherwise neck grabs can't be resisted
+ //so just check weakened instead.
+ if(stat || weakened)
+ return 0
+ if(next_move > world.time)
+ return 0
+ return 1
+/mob/living/proc/process_resist()
//Getting out of someone's inventory.
- if(istype(src.loc,/obj/item/weapon/holder))
- var/obj/item/weapon/holder/H = src.loc //Get our item holder.
- var/mob/M = H.loc //Get our mob holder (if any).
-
- if(istype(M))
- M.drop_from_inventory(H)
- M << "[H] wriggles out of your grip!"
- src << "You wriggle out of [M]'s grip!"
- else if(istype(H.loc,/obj/item))
- src << "You struggle free of [H.loc]."
- H.loc = get_turf(H)
-
- if(istype(M))
- for(var/atom/A in M.contents)
- if(istype(A,/mob/living/simple_animal/borer) || istype(A,/obj/item/weapon/holder))
- return
-
- M.status_flags &= ~PASSEMOTES
+ if(istype(src.loc, /obj/item/weapon/holder))
+ escape_inventory(src.loc)
return
- //Resisting control by an alien mind.
- if(istype(src.loc,/mob/living/simple_animal/borer))
- var/mob/living/simple_animal/borer/B = src.loc
- var/mob/living/captive_brain/H = src
-
- H << "You begin doggedly resisting the parasite's control (this will take approximately sixty seconds)."
- B.host << "You feel the captive mind of [src] begin to resist your control."
-
- spawn(rand(200,250)+B.host.brainloss)
-
- if(!B || !B.controlling)
- return
-
- B.host.adjustBrainLoss(rand(5,10))
- H << "With an immense exertion of will, you regain control of your body!"
- B.host << "You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you."
-
- B.detatch()
-
- verbs -= /mob/living/carbon/proc/release_control
- verbs -= /mob/living/carbon/proc/punish_host
- verbs -= /mob/living/carbon/proc/spawn_larvae
-
- return
-
//resisting grabs (as if it helps anyone...)
- if ((!( L.stat ) && !( L.restrained() )))
- var/resisting = 0
- for(var/obj/O in L.requests)
- L.requests.Remove(O)
- del(O)
- resisting++
- for(var/obj/item/weapon/grab/G in usr.grabbed_by)
- resisting++
- switch(G.state)
- if(GRAB_PASSIVE)
- del(G)
- if(GRAB_AGGRESSIVE)
- if(prob(60)) //same chance of breaking the grab as disarm
- L.visible_message("[L] has broken free of [G.assailant]'s grip!")
- del(G)
- if(GRAB_NECK)
- //If the you move when grabbing someone then it's easier for them to break free. Same if the affected mob is immune to stun.
- if (((world.time - G.assailant.l_move_time < 30 || !L.stunned) && prob(15)) || prob(3))
- L.visible_message("[L] has broken free of [G.assailant]'s headlock!")
- del(G)
- if(resisting)
- L.visible_message("[L] resists!")
-
+ if (!restrained())
+ resist_grab()
//unbuckling yourself
- if(L.buckled && (L.last_special <= world.time) )
- if(iscarbon(L))
- var/mob/living/carbon/C = L
- if( C.handcuffed )
- C.next_move = world.time + 100
- C.last_special = world.time + 100
- C << "\red You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)"
- for(var/mob/O in viewers(L))
- O.show_message("\red [usr] attempts to unbuckle themself!", 1)
- spawn(0)
- if(do_after(usr, 1200))
- if(!C.buckled)
- return
- for(var/mob/O in viewers(C))
- O.show_message("\red [usr] manages to unbuckle themself!", 1)
- C << "\blue You successfully unbuckle yourself."
- C.buckled.user_unbuckle_mob(C)
- else
- L.buckled.user_unbuckle_mob(L)
+ if(buckled)
+ spawn() escape_buckle()
//Breaking out of a locker?
- else if( src.loc && (istype(src.loc, /obj/structure/closet)) )
- var/breakout_time = 2 //2 minutes by default
+ if( src.loc && (istype(src.loc, /obj/structure/closet)) )
+ var/obj/structure/closet/C = loc
+ spawn() C.mob_breakout(src)
- var/obj/structure/closet/C = L.loc
- if(C.opened)
- return //Door's open... wait, why are you in it's contents then?
- if(istype(L.loc, /obj/structure/closet/secure_closet))
- var/obj/structure/closet/secure_closet/SC = L.loc
- if(!SC.locked && !SC.welded)
- return //It's a secure closet, but isn't locked. Easily escapable from, no need to 'resist'
- else
- if(!C.welded)
- return //closed but not welded...
- // else Meh, lets just keep it at 2 minutes for now
- // breakout_time++ //Harder to get out of welded lockers than locked lockers
+/mob/living/proc/escape_inventory(obj/item/weapon/holder/H)
+ if(H != src.loc) return
+
+ var/mob/M = H.loc //Get our mob holder (if any).
- //okay, so the closet is either welded or locked... resist!!!
- usr.next_move = world.time + 100
- L.last_special = world.time + 100
- L << "\red You lean on the back of \the [C] and start pushing the door open. (this will take about [breakout_time] minutes)"
- for(var/mob/O in viewers(usr.loc))
- O.show_message("\red The [L.loc] begins to shake violently!", 1)
+ if(istype(M))
+ M.drop_from_inventory(H)
+ M << "[H] wriggles out of your grip!"
+ src << "You wriggle out of [M]'s grip!"
+ else if(istype(H.loc,/obj/item))
+ src << "You struggle free of [H.loc]."
+ H.loc = get_turf(H)
+ if(istype(M))
+ for(var/atom/A in M.contents)
+ if(istype(A,/mob/living/simple_animal/borer) || istype(A,/obj/item/weapon/holder))
+ return
- spawn(0)
- if(do_after(usr,(breakout_time*60*10))) //minutes * 60seconds * 10deciseconds
- if(!C || !L || L.stat != CONSCIOUS || L.loc != C || C.opened) //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened
- return
+ M.status_flags &= ~PASSEMOTES
- //Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'...
- if(istype(L.loc, /obj/structure/closet/secure_closet))
- var/obj/structure/closet/secure_closet/SC = L.loc
- if(!SC.locked && !SC.welded)
- return
- else
- if(!C.welded)
- return
+/mob/living/proc/escape_buckle()
+ if(buckled)
+ buckled.user_unbuckle_mob(src)
- //Well then break it!
- if(istype(usr.loc, /obj/structure/closet/secure_closet))
- var/obj/structure/closet/secure_closet/SC = L.loc
- SC.desc = "It appears to be broken."
- SC.icon_state = SC.icon_off
- flick(SC.icon_broken, SC)
- sleep(10)
- flick(SC.icon_broken, SC)
- sleep(10)
- SC.broken = 1
- SC.locked = 0
- SC.update_icon()
- usr << "\red You successfully break out!"
- for(var/mob/O in viewers(L.loc))
- O.show_message("\red \the [usr] successfully broke out of \the [SC]!", 1)
- if(istype(SC.loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
- var/obj/structure/bigDelivery/BD = SC.loc
- BD.attack_hand(usr)
- SC.open()
- else
- C.welded = 0
- C.update_icon()
- usr << "\red You successfully break out!"
- for(var/mob/O in viewers(L.loc))
- O.show_message("\red \the [usr] successfully broke out of \the [C]!", 1)
- if(istype(C.loc, /obj/structure/bigDelivery)) //nullspace ect.. read the comment above
- var/obj/structure/bigDelivery/BD = C.loc
- BD.attack_hand(usr)
- C.open()
-
- //drop && roll or breaking out of handcuffs
- else if(iscarbon(L))
- var/mob/living/carbon/CM = L
- if(CM.on_fire && CM.canmove)
- CM.fire_stacks -= 5
- CM.Weaken(3)
- CM.spin(32,2)
- CM.visible_message("[CM] rolls on the floor, trying to put themselves out!", \
- "You stop, drop, and roll!")
- sleep(30)
- if(fire_stacks <= 0)
- CM.visible_message("[CM] has successfully extinguished themselves!", \
- "You extinguish yourself.")
- ExtinguishMob()
- return
- if(CM.handcuffed && CM.canmove && (CM.last_special <= world.time))
- CM.next_move = world.time + 100
- CM.last_special = world.time + 100
-
- var/can_break_cuffs
- if(HULK in usr.mutations)
- can_break_cuffs = 1
- else if(istype(CM,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = CM
- if(H.species.can_shred(H,1))
- can_break_cuffs = 1
-
- if(can_break_cuffs) //Don't want to do a lot of logic gating here.
- usr << "\red You attempt to break your handcuffs. (This will take around 5 seconds and you need to stand still)"
- for(var/mob/O in viewers(CM))
- O.show_message(text("\red [] is trying to break the handcuffs!", CM), 1)
- spawn(0)
- if(do_after(CM, 50))
- if(!CM.handcuffed || CM.buckled)
- return
- for(var/mob/O in viewers(CM))
- O.show_message(text("\red [] manages to break the handcuffs!", CM), 1)
- CM << "\red You successfully break your handcuffs."
- CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
- del(CM.handcuffed)
- CM.handcuffed = null
- if(buckled && buckled.buckle_require_restraints)
- buckled.unbuckle_mob()
- CM.update_inv_handcuffed()
- else
- var/obj/item/weapon/handcuffs/HC = CM.handcuffed
- var/breakouttime = 1200 //A default in case you are somehow handcuffed with something that isn't an obj/item/weapon/handcuffs type
- var/displaytime = 2 //Minutes to display in the "this will take X minutes."
- if(istype(HC)) //If you are handcuffed with actual handcuffs... Well what do I know, maybe someone will want to handcuff you with toilet paper in the future...
- breakouttime = HC.breakouttime
- displaytime = breakouttime / 600 //Minutes
- CM << "\red You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)"
- for(var/mob/O in viewers(CM))
- O.show_message( "\red [usr] attempts to remove \the [HC]!", 1)
- spawn(0)
- if(do_after(CM, breakouttime))
- if(!CM.handcuffed || CM.buckled)
- return // time leniency for lag which also might make this whole thing pointless but the server
- for(var/mob/O in viewers(CM))// lags so hard that 40s isn't lenient enough - Quarxink
- O.show_message("\red [CM] manages to remove the handcuffs!", 1)
- CM << "\blue You successfully remove \the [CM.handcuffed]."
- CM.drop_from_inventory(CM.handcuffed)
-
- else if(CM.legcuffed && CM.canmove && (CM.last_special <= world.time))
- CM.next_move = world.time + 100
- CM.last_special = world.time + 100
-
- var/can_break_cuffs
- if(HULK in usr.mutations)
- can_break_cuffs = 1
- else if(istype(CM,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = CM
- if(H.species.can_shred(H,1))
- can_break_cuffs = 1
-
- if(can_break_cuffs) //Don't want to do a lot of logic gating here.
- usr << "\red You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)"
- for(var/mob/O in viewers(CM))
- O.show_message(text("\red [] is trying to break the legcuffs!", CM), 1)
- spawn(0)
- if(do_after(CM, 50))
- if(!CM.legcuffed || CM.buckled)
- return
- for(var/mob/O in viewers(CM))
- O.show_message(text("\red [] manages to break the legcuffs!", CM), 1)
- CM << "\red You successfully break your legcuffs."
- CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
- del(CM.legcuffed)
- CM.legcuffed = null
- CM.update_inv_legcuffed()
- else
- var/obj/item/weapon/legcuffs/HC = CM.legcuffed
- var/breakouttime = 1200 //A default in case you are somehow legcuffed with something that isn't an obj/item/weapon/legcuffs type
- var/displaytime = 2 //Minutes to display in the "this will take X minutes."
- if(istype(HC)) //If you are legcuffed with actual legcuffs... Well what do I know, maybe someone will want to legcuff you with toilet paper in the future...
- breakouttime = HC.breakouttime
- displaytime = breakouttime / 600 //Minutes
- CM << "\red You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)"
- for(var/mob/O in viewers(CM))
- O.show_message( "\red [usr] attempts to remove \the [HC]!", 1)
- spawn(0)
- if(do_after(CM, breakouttime))
- if(!CM.legcuffed || CM.buckled)
- return // time leniency for lag which also might make this whole thing pointless but the server
- for(var/mob/O in viewers(CM))// lags so hard that 40s isn't lenient enough - Quarxink
- O.show_message("\red [CM] manages to remove the legcuffs!", 1)
- CM << "\blue You successfully remove \the [CM.legcuffed]."
- CM.drop_from_inventory(CM.legcuffed)
- CM.legcuffed = null
- CM.update_inv_legcuffed()
+/mob/living/proc/resist_grab()
+ var/resisting = 0
+ for(var/obj/O in requests)
+ requests.Remove(O)
+ qdel(O)
+ resisting++
+ for(var/obj/item/weapon/grab/G in grabbed_by)
+ resisting++
+ switch(G.state)
+ if(GRAB_PASSIVE)
+ qdel(G)
+ if(GRAB_AGGRESSIVE)
+ if(prob(60)) //same chance of breaking the grab as disarm
+ visible_message("[src] has broken free of [G.assailant]'s grip!")
+ qdel(G)
+ if(GRAB_NECK)
+ //If the you move when grabbing someone then it's easier for them to break free. Same if the affected mob is immune to stun.
+ if (((world.time - G.assailant.l_move_time < 30 || !stunned) && prob(15)) || prob(3))
+ visible_message("[src] has broken free of [G.assailant]'s headlock!")
+ qdel(G)
+ if(resisting)
+ visible_message("[src] resists!")
/mob/living/verb/lay_down()
set name = "Rest"
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 244541a199..4a41479e34 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -60,7 +60,7 @@
if(P.taser_effect)
stun_effect_act(0, P.agony, def_zone, P)
src <<"\red You have been hit by [P]!"
- del P
+ qdel(P)
return
//Armor
@@ -139,7 +139,7 @@
var/obj/item/I = O
mass = I.w_class/THROWNOBJ_KNOCKBACK_DIVISOR
var/momentum = speed*mass
-
+
if(O.throw_source && momentum >= THROWNOBJ_KNOCKBACK_SPEED)
var/dir = get_dir(O.throw_source, src)
@@ -200,14 +200,14 @@
/mob/living/proc/IgniteMob()
if(fire_stacks > 0 && !on_fire)
on_fire = 1
- src.AddLuminosity(3)
+ set_light(light_range + 3)
update_fire()
/mob/living/proc/ExtinguishMob()
if(on_fire)
on_fire = 0
fire_stacks = 0
- src.AddLuminosity(-3)
+ set_light(max(0, light_range - 3))
update_fire()
/mob/living/proc/update_fire()
@@ -219,18 +219,18 @@
/mob/living/proc/handle_fire()
if(fire_stacks < 0)
fire_stacks = max(0, fire_stacks++) //If we've doused ourselves in water to avoid fire, dry off slowly
-
+
if(!on_fire)
return 1
else if(fire_stacks <= 0)
ExtinguishMob() //Fire's been put out.
return 1
-
+
var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment
if(G.gas["oxygen"] < 1)
ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire
return 1
-
+
var/turf/location = get_turf(src)
location.hotspot_expose(fire_burn_temperature(), 50, 1)
@@ -242,6 +242,6 @@
/mob/living/proc/fire_burn_temperature()
if (fire_stacks <= 0)
return 0
-
+
//Scale quadratically so that single digit numbers of fire stacks don't burn ridiculously hot.
return round(FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE*(fire_stacks/FIRE_MAX_FIRESUIT_STACKS)**2)
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 3db012b44d..8919ab0952 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -263,7 +263,7 @@ proc/get_radio_key_from_channel(var/channel)
var/speech_bubble_test = say_test(message)
var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
- spawn(30) del(speech_bubble)
+ spawn(30) qdel(speech_bubble)
for(var/mob/M in listening)
M << speech_bubble
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index af26c7ddb9..558576e658 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -72,7 +72,6 @@ var/list/ai_verbs_default = list(
var/mob/living/silicon/ai/parent = null
- var/apc_override = 0 //hack for letting the AI use its APC even when visionless
var/camera_light_on = 0 //Defines if the AI toggled the light on the camera it's looking through.
var/datum/trackable/track = null
var/last_announcement = ""
@@ -80,13 +79,11 @@ var/list/ai_verbs_default = list(
/mob/living/silicon/ai/proc/add_ai_verbs()
src.verbs |= ai_verbs_default
- src.verbs |= ai_verbs_subsystems
- src.verbs |= silicon_verbs_subsystems
+ src.verbs |= silicon_subsystems
/mob/living/silicon/ai/proc/remove_ai_verbs()
src.verbs -= ai_verbs_default
- src.verbs -= ai_verbs_subsystems
- src.verbs -= silicon_verbs_subsystems
+ src.verbs -= silicon_subsystems
/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
announcement = new()
@@ -146,7 +143,7 @@ var/list/ai_verbs_default = list(
if(!safety)//Only used by AIize() to successfully spawn an AI.
if (!B)//If there is no player/brain inside.
empty_playable_ai_cores += new/obj/structure/AIcore/deactivated(loc)//New empty terminal.
- del(src)//Delete AI.
+ qdel(src)//Delete AI.
return
else
if (B.brainmob.mind)
@@ -196,9 +193,9 @@ var/list/ai_verbs_default = list(
job = "AI"
-/mob/living/silicon/ai/Del()
+/mob/living/silicon/ai/Destroy()
ai_list -= src
- del(eyeobj)
+ qdel(eyeobj)
..()
/mob/living/silicon/ai/pointed(atom/A as mob|obj|turf in view())
@@ -244,7 +241,7 @@ var/list/ai_verbs_default = list(
/obj/machinery/ai_powersupply/New(var/mob/living/silicon/ai/ai=null)
powered_ai = ai
if(isnull(powered_ai))
- Del()
+ qdel(src)
loc = powered_ai.loc
use_power(1) // Just incase we need to wake up the power system.
@@ -253,7 +250,7 @@ var/list/ai_verbs_default = list(
/obj/machinery/ai_powersupply/process()
if(!powered_ai || powered_ai.stat & DEAD)
- Del()
+ qdel(src)
if(!powered_ai.anchored)
loc = powered_ai.loc
use_power = 0
@@ -285,7 +282,7 @@ var/list/ai_verbs_default = list(
//if(icon_state == initial(icon_state))
var/icontype = ""
if (custom_sprite == 1) icontype = ("Custom")//automagically selects custom sprite if one is available
- else icontype = input("Select an icon!", "AI", null, null) in list("Monochrome", "Rainbow", "Blue", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static", "Soviet", "Trapped", "Heartline", "Chatterbox")
+ else icontype = input("Select an icon!", "AI", null, null) in list("Monochrome", "Rainbow", "Blue", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static", "Soviet", "Trapped", "Heartline", "Chatterbox", "Helios", "Dug Too Deep", "Goon", "Database", "Glitchman", "Lonestar", "Nanotrasen")
switch(icontype)
if("Custom") icon_state = "[src.ckey]-ai"
if("Rainbow") icon_state = "ai-clown"
@@ -307,6 +304,13 @@ var/list/ai_verbs_default = list(
if("Trapped") icon_state = "ai-hades"
if("Heartline") icon_state = "ai-heartline"
if("Chatterbox") icon_state = "ai-president"
+ if("Helios") icon_state = "ai-helios"
+ if("Dug Too Deep") icon_state = "ai-toodeep"
+ if("Goon") icon_state = "ai-goon"
+ if("Database") icon_state = "ai-database"
+ if("Glitchman") icon_state = "ai-glitchman"
+ if("Lonestar") icon_state = "ai-lonestar"
+ if("Nanotrasen") icon_state = "ai-nanotrasen"
else icon_state = "ai"
//else
//usr <<"You can only change your display once!"
@@ -471,13 +475,13 @@ var/list/ai_verbs_default = list(
/mob/living/silicon/ai/reset_view(atom/A)
if(camera)
- camera.SetLuminosity(0)
+ camera.set_light(0)
if(istype(A,/obj/machinery/camera))
camera = A
..()
if(istype(A,/obj/machinery/camera))
- if(camera_light_on) A.SetLuminosity(AI_CAMERA_LUMINOSITY)
- else A.SetLuminosity(0)
+ if(camera_light_on) A.set_light(AI_CAMERA_LUMINOSITY)
+ else A.set_light(0)
/mob/living/silicon/ai/proc/switchCamera(var/obj/machinery/camera/C)
@@ -579,7 +583,7 @@ var/list/ai_verbs_default = list(
input = input("Select a crew member:") as null|anything in personnel_list
var/icon/character_icon = personnel_list[input]
if(character_icon)
- del(holo_icon)//Clear old icon so we're not storing it in memory.
+ qdel(holo_icon)//Clear old icon so we're not storing it in memory.
holo_icon = getHologramIcon(icon(character_icon))
else
alert("No suitable records found. Aborting.")
@@ -592,7 +596,7 @@ var/list/ai_verbs_default = list(
)
input = input("Please select a hologram:") as null|anything in icon_list
if(input)
- del(holo_icon)
+ qdel(holo_icon)
switch(input)
if("default")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1"))
@@ -615,7 +619,7 @@ var/list/ai_verbs_default = list(
src << "Camera lights [camera_light_on ? "activated" : "deactivated"]."
if(!camera_light_on)
if(camera)
- camera.SetLuminosity(0)
+ camera.set_light(0)
camera = null
else
lightNearbyCamera()
@@ -630,20 +634,20 @@ var/list/ai_verbs_default = list(
if(src.camera)
var/obj/machinery/camera/camera = near_range_camera(src.eyeobj)
if(camera && src.camera != camera)
- src.camera.SetLuminosity(0)
+ src.camera.set_light(0)
if(!camera.light_disabled)
src.camera = camera
- src.camera.SetLuminosity(AI_CAMERA_LUMINOSITY)
+ src.camera.set_light(AI_CAMERA_LUMINOSITY)
else
src.camera = null
else if(isnull(camera))
- src.camera.SetLuminosity(0)
+ src.camera.set_light(0)
src.camera = null
else
var/obj/machinery/camera/camera = near_range_camera(src.eyeobj)
if(camera && !camera.light_disabled)
src.camera = camera
- src.camera.SetLuminosity(AI_CAMERA_LUMINOSITY)
+ src.camera.set_light(AI_CAMERA_LUMINOSITY)
camera_light_on = world.timeofday + 1 * 20 // Update the light every 2 seconds.
diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm
index efa4ccd4a4..7c60bb75e4 100644
--- a/code/modules/mob/living/silicon/ai/latejoin.dm
+++ b/code/modules/mob/living/silicon/ai/latejoin.dm
@@ -34,10 +34,10 @@ var/global/list/empty_playable_ai_cores = list()
job_master.FreeRole(job)
if(mind.objectives.len)
- del(mind.objectives)
+ qdel(mind.objectives)
mind.special_role = null
clear_antag_roles(mind)
ghostize(0)
- del(src)
+ qdel(src)
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 602e427f95..f57a96a088 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -48,7 +48,7 @@
loc = T.loc
if (istype(loc, /area))
//stage = 4
- if (!loc.master.power_equip && !istype(src.loc,/obj/item))
+ if (!loc.power_equip && !istype(src.loc,/obj/item))
//stage = 5
blind = 1
@@ -92,7 +92,7 @@
var/area/current_area = get_area(src)
- if (((!loc.master.power_equip) && current_area.requires_power == 1 || istype(T, /turf/space)) && !istype(src.loc,/obj/item))
+ if (lacks_power())
//If our area lacks equipment power, and is not magically powered (i.e. centcom), or if we are in space and not carded, lose power.
if (src:aiRestorePowerRoutine==0)
src:aiRestorePowerRoutine = 1
@@ -115,7 +115,7 @@
spawn(20)
src << "Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection."
sleep(50)
- if (loc.master.power_equip)
+ if (loc.power_equip)
if (!istype(T, /turf/space))
src << "Alert cancelled. Power has been restored without our assistance."
src:aiRestorePowerRoutine = 0
@@ -135,18 +135,17 @@
var/PRP
for (PRP=1, PRP<=4, PRP++)
- for(var/area/A in current_area.master.related)
- for (var/obj/machinery/power/apc/APC in A)
- if (!(APC.stat & BROKEN))
- theAPC = APC
- break
+ for (var/obj/machinery/power/apc/APC in current_area)
+ if (!(APC.stat & BROKEN))
+ theAPC = APC
+ break
if (!theAPC)
switch(PRP)
if (1) src << "Unable to locate APC!"
else src << "Lost connection with the APC!"
src:aiRestorePowerRoutine = 2
return
- if (loc.master.power_equip)
+ if (loc.power_equip)
if (!istype(T, /turf/space))
src << "Alert cancelled. Power has been restored without our assistance."
src:aiRestorePowerRoutine = 0
@@ -161,10 +160,9 @@
sleep(50)
src << "Receiving control information from APC."
sleep(2)
- //bring up APC dialog
- apc_override = 1
- theAPC.attack_ai(src)
- apc_override = 0
+ theAPC.operating = 1
+ theAPC.equipment = 3
+ theAPC.update()
src:aiRestorePowerRoutine = 3
src << "Here are your current laws:"
src.show_laws()
@@ -179,6 +177,11 @@
if (MED_HUD)
process_med_hud(src,0,src.eyeobj)
+/mob/living/silicon/ai/proc/lacks_power()
+ var/turf/T = get_turf(src)
+ var/area/A = get_area(src)
+ return ((!A.power_equip) && A.requires_power == 1 || istype(T, /turf/space)) && !istype(src.loc,/obj/item)
+
/mob/living/silicon/ai/updatehealth()
if(status_flags & GODMODE)
health = 100
@@ -191,4 +194,4 @@
/mob/living/silicon/ai/rejuvenate()
..()
- add_ai_verbs(src)
\ No newline at end of file
+ add_ai_verbs(src)
diff --git a/code/modules/mob/living/silicon/ai/subsystems.dm b/code/modules/mob/living/silicon/ai/subsystems.dm
deleted file mode 100644
index af2f2f5b2c..0000000000
--- a/code/modules/mob/living/silicon/ai/subsystems.dm
+++ /dev/null
@@ -1,36 +0,0 @@
-/mob/living/silicon/ai
- var/list/ai_verbs_subsystems = list(
- /mob/living/silicon/ai/proc/subsystem_crew_monitor,
- /mob/living/silicon/ai/proc/subsystem_power_monitor,
- /mob/living/silicon/ai/proc/subsystem_rcon
- )
-
- var/obj/nano_module/crew_monitor/crew_monitor
- var/obj/nano_module/rcon/rcon
- var/obj/nano_module/power_monitor/power_monitor
-
-/mob/living/silicon/ai/init_subsystems()
- ..()
- del(alarm_monitor)
- alarm_monitor = new/obj/nano_module/alarm_monitor/ai(src)
- crew_monitor = new(src)
- rcon = new(src)
- power_monitor = new(src)
-
-/mob/living/silicon/ai/proc/subsystem_crew_monitor()
- set category = "Subystems"
- set name = "Crew Monitor"
-
- crew_monitor.ui_interact(usr)
-
-/mob/living/silicon/ai/proc/subsystem_power_monitor()
- set category = "Subystems"
- set name = "Power Monitor"
-
- power_monitor.ui_interact(usr)
-
-/mob/living/silicon/ai/proc/subsystem_rcon()
- set category = "Subystems"
- set name = "RCON"
-
- rcon.ui_interact(usr)
diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm
index 87e70393d0..920a3a1658 100644
--- a/code/modules/mob/living/silicon/pai/death.dm
+++ b/code/modules/mob/living/silicon/pai/death.dm
@@ -3,11 +3,11 @@
card.removePersonality()
if(gibbed)
src.loc = get_turf(card)
- del(card)
+ qdel(card)
else
close_up()
if(mind)
- del(mind)
+ qdel(mind)
..(gibbed)
ghostize()
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index 6c099af932..fe426c36d0 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -8,7 +8,7 @@
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2)
- del(src.cable)
+ qdel(src.cable)
regular_hud_updates()
diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm
index 294ee51562..91a10bf3e5 100644
--- a/code/modules/mob/living/silicon/pai/recruit.dm
+++ b/code/modules/mob/living/silicon/pai/recruit.dm
@@ -234,7 +234,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates
if(c.ready)
var/found = 0
for(var/mob/dead/observer/o in player_list)
- if(o.key == c.key)
+ if(o.key == c.key && o.MayRespawn())
found = 1
if(found)
available.Add(c)
@@ -347,7 +347,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates
/datum/paiController/proc/requestRecruits(var/mob/user)
inquirer = user
for(var/mob/dead/observer/O in player_list)
- if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ if(!O.MayRespawn())
continue
if(jobban_isbanned(O, "pAI"))
continue
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index cb9431f04e..472125cef9 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -7,7 +7,13 @@ var/list/pai_emotions = list(
"Off" = 6,
"Sad" = 7,
"Angry" = 8,
- "What" = 9
+ "What" = 9,
+ "Neutral" = 10,
+ "Silly" = 11,
+ "Nose" = 12,
+ "Smirk" = 13,
+ "Exclamation Points" = 14,
+ "Question Mark" = 15
)
diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm
index cb86e52302..75556cf304 100644
--- a/code/modules/mob/living/silicon/robot/analyzer.dm
+++ b/code/modules/mob/living/silicon/robot/analyzer.dm
@@ -12,7 +12,7 @@
w_class = 2.0
throw_speed = 5
throw_range = 10
- matter = list("metal" = 500, "glass" = 200)
+ matter = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 200)
origin_tech = "magnets=2;biotech=1;engineering=2"
var/mode = 1;
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index b78deedf7a..1894d62942 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -29,7 +29,7 @@
var/obj/item/robot_parts/robot_component/comp = wrapped
brokenstate = comp.icon_state_broken
if(wrapped)
- del wrapped
+ qdel(wrapped)
wrapped = new/obj/item/broken_device
@@ -218,7 +218,7 @@
icon = 'icons/obj/robot_component.dmi'
icon_state = "working"
construction_time = 200
- construction_cost = list("metal"=5000)
+ construction_cost = list(DEFAULT_WALL_MATERIAL=5000)
var/brute = 0
var/burn = 0
var/icon_state_broken = "broken"
diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm
index ca3c80d3a7..3dd2afd216 100644
--- a/code/modules/mob/living/silicon/robot/death.dm
+++ b/code/modules/mob/living/silicon/robot/death.dm
@@ -1,7 +1,7 @@
/mob/living/silicon/robot/dust()
//Delete the MMI first so that it won't go popping out.
if(mmi)
- del(mmi)
+ qdel(mmi)
..()
/mob/living/silicon/robot/death(gibbed)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 8fd20e1368..40746ff02f 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -188,8 +188,8 @@
//Standard robots use config for crit, which is somewhat excessive for these guys.
//Drones killed by damage will gib.
/mob/living/silicon/robot/drone/handle_regular_status_updates()
-
- if((health <= -35 || (master_fabricator && src.z != master_fabricator.z)) && src.stat != 2)
+ var/turf/T = get_turf(src)
+ if((!T || health <= -35 || (master_fabricator && T.z != master_fabricator.z)) && src.stat != DEAD)
timeofdeath = world.time
death() //Possibly redundant, having trouble making death() cooperate.
gib()
@@ -281,12 +281,13 @@
return
/mob/living/silicon/robot/drone/add_robot_verbs()
- src.verbs |= silicon_verbs_subsystems
+ src.verbs |= silicon_subsystems
/mob/living/silicon/robot/drone/remove_robot_verbs()
- src.verbs -= silicon_verbs_subsystems
+ src.verbs -= silicon_subsystems
/mob/living/silicon/robot/drone/construction
+ icon_state = "constructiondrone"
law_type = /datum/ai_laws/construction_drone
module_type = /obj/item/weapon/robot_module/drone/construction
can_pull_size = 5
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 8353972ba2..5634cda9b6 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -16,10 +16,7 @@
/obj/item/weapon/airlock_electronics,
/obj/item/weapon/module/power_control,
/obj/item/weapon/stock_parts,
- /obj/item/light_fixture_frame,
- /obj/item/apc_frame,
- /obj/item/alarm_frame,
- /obj/item/firealarm_frame,
+ /obj/item/frame,
/obj/item/weapon/table_parts,
/obj/item/weapon/table_parts/rack,
/obj/item/weapon/camera_assembly,
@@ -256,7 +253,7 @@
if(istype(M,/mob/living/simple_animal/lizard) || istype(M,/mob/living/simple_animal/mouse))
src.loc.visible_message("[src.loc] sucks [M] into its decompiler. There's a horrible crunching noise.","It's a bit of a struggle, but you manage to suck [M] into your decompiler. It makes a series of visceral crunching noises.")
new/obj/effect/decal/cleanable/blood/splatter(get_turf(src))
- del(M)
+ qdel(M)
if(wood)
wood.add_charge(2000)
if(plastic)
@@ -279,7 +276,7 @@
if(!M || !D) return
D << "You carefully and thoroughly decompile [M], storing as much of its resources as you can within yourself."
- del(M)
+ qdel(M)
new/obj/effect/decal/cleanable/blood/oil(get_turf(src))
if(metal)
@@ -347,7 +344,7 @@
else
continue
- del(W)
+ qdel(W)
grabbed_something = 1
if(grabbed_something)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
index 247334c2ea..a292ead1b1 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
@@ -108,6 +108,9 @@
if(jobban_isbanned(src,"Cyborg"))
usr << "You are banned from playing synthetics and cannot spawn as a drone."
return
+
+ if(!MayRespawn(1))
+ return
var/deathtime = world.time - src.timeofdeath
if(istype(src,/mob/dead/observer))
@@ -145,4 +148,4 @@
var/choice = input(src,"Which fabricator do you wish to use?") as null|anything in all_fabricators
if(choice)
var/obj/machinery/drone_fabricator/chosen_fabricator = all_fabricators[choice]
- chosen_fabricator.create_drone(src.client)
\ No newline at end of file
+ chosen_fabricator.create_drone(src.client)
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index e25bb9ff10..615f1d3a41 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -58,7 +58,7 @@
src.has_power = 0
if(lights_on) // Light is on but there is no power!
lights_on = 0
- SetLuminosity(0)
+ set_light(0)
/mob/living/silicon/robot/proc/handle_regular_status_updates()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index cab055696d..589af5a168 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -73,7 +73,6 @@
var/datum/effect/effect/system/ion_trail_follow/ion_trail = null
var/datum/effect/effect/system/spark_spread/spark_system//So they can initialize sparks whenever/N
var/jeton = 0
- var/borgwires = 31 // 0b11111
var/killswitch = 0
var/killswitch_time = 60
var/weapon_lock = 0
@@ -227,14 +226,28 @@
//If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
//Improved /N
-/mob/living/silicon/robot/Del()
- if(mmi)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
+/mob/living/silicon/robot/Destroy()
+ if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
var/turf/T = get_turf(loc)//To hopefully prevent run time errors.
if(T) mmi.loc = T
- if(mind) mind.transfer_to(mmi.brainmob)
+ if(mmi.brainmob)
+ mind.transfer_to(mmi.brainmob)
+ else
+ src << "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug."
+ ghostize()
+ //ERROR("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey].")
mmi = null
+ if(connected_ai)
+ connected_ai.connected_robots -= src
..()
+/mob/living/silicon/robot/proc/set_module_sprites(var/list/new_sprites)
+ module_sprites = new_sprites
+ //Custom_sprite check and entry
+ if (custom_sprite == 1)
+ module_sprites["Custom"] = "[src.ckey]-[modtype]"
+ return module_sprites
+
/mob/living/silicon/robot/proc/pick_module()
if(module)
return
@@ -247,138 +260,17 @@
if(module)
return
+ if(!(modtype in robot_modules))
+ return
- module_sprites = list()
- switch(modtype)
- if("Standard")
- module = new /obj/item/weapon/robot_module/standard(src)
- module_sprites["Basic"] = "robot_old"
- module_sprites["Android"] = "droid"
- module_sprites["Default"] = "robot"
- module_sprites["Drone"] = "drone-standard"
-
- if("Service")
- module = new /obj/item/weapon/robot_module/butler(src)
- module.channels = list("Service" = 1)
- module_sprites["Waitress"] = "Service"
- module_sprites["Kent"] = "toiletbot"
- module_sprites["Bro"] = "Brobot"
- module_sprites["Rich"] = "maximillion"
- module_sprites["Default"] = "Service2"
- module_sprites["Drone - Service"] = "drone-service"
- module_sprites["Drone - Hydro"] = "drone-hydro"
-
- if("Clerical")
- module = new /obj/item/weapon/robot_module/clerical(src)
- module.channels = list("Service" = 1)
- module_sprites["Waitress"] = "Service"
- module_sprites["Kent"] = "toiletbot"
- module_sprites["Bro"] = "Brobot"
- module_sprites["Rich"] = "maximillion"
- module_sprites["Default"] = "Service2"
- module_sprites["Drone"] = "drone-service"
-
- if("Research")
- module = new /obj/item/weapon/robot_module/research(src)
- module.channels = list("Science" = 1)
- module_sprites["Droid"] = "droid-science"
- module_sprites["Drone"] = "drone-science"
-
- if("Miner")
- module = new /obj/item/weapon/robot_module/miner(src)
- module.channels = list("Supply" = 1)
- if(camera && "Robots" in camera.network)
- camera.add_network("MINE")
- module_sprites["Basic"] = "Miner_old"
- module_sprites["Advanced Droid"] = "droid-miner"
- module_sprites["Treadhead"] = "Miner"
- module_sprites["Drone"] = "drone-miner"
-
- if("Crisis")
- module = new /obj/item/weapon/robot_module/crisis(src)
- module.channels = list("Medical" = 1)
- if(camera && "Robots" in camera.network)
- camera.add_network("Medical")
- module_sprites["Basic"] = "Medbot"
- module_sprites["Standard"] = "surgeon"
- module_sprites["Advanced Droid"] = "droid-medical"
- module_sprites["Needles"] = "medicalrobot"
- module_sprites["Drone - Medical" ] = "drone-medical"
- module_sprites["Drone - Chemistry" ] = "drone-chemistry"
-
- if("Surgeon")
- module = new /obj/item/weapon/robot_module/surgeon(src)
- module.channels = list("Medical" = 1)
- if(camera && "Robots" in camera.network)
- camera.add_network("Medical")
-
- module_sprites["Basic"] = "Medbot"
- module_sprites["Standard"] = "surgeon"
- module_sprites["Advanced Droid"] = "droid-medical"
- module_sprites["Needles"] = "medicalrobot"
- module_sprites["Drone"] = "drone-surgery"
-
- if("Security")
- module = new /obj/item/weapon/robot_module/security(src)
- module.channels = list("Security" = 1)
- module_sprites["Basic"] = "secborg"
- module_sprites["Red Knight"] = "Security"
- module_sprites["Black Knight"] = "securityrobot"
- module_sprites["Bloodhound"] = "bloodhound"
- module_sprites["Bloodhound - Treaded"] = "secborg+tread"
- module_sprites["Drone"] = "drone-sec"
-
- if("Engineering")
- module = new /obj/item/weapon/robot_module/engineering(src)
- module.channels = list("Engineering" = 1)
- if(camera && "Robots" in camera.network)
- camera.add_network("Engineering")
- module_sprites["Basic"] = "Engineering"
- module_sprites["Antique"] = "engineerrobot"
- module_sprites["Landmate"] = "landmate"
- module_sprites["Landmate - Treaded"] = "engiborg+tread"
- module_sprites["Drone"] = "drone-engineer"
-
- if("Construction")
- module = new /obj/item/weapon/robot_module/construction(src)
- module.channels = list("Engineering" = 1)
- if(camera && "Robots" in camera.network)
- camera.add_network("Engineering")
- module_sprites["Basic"] = "Engineering"
- module_sprites["Antique"] = "engineerrobot"
- module_sprites["Landmate"] = "landmate"
- module_sprites["Landmate - Treaded"] = "engiborg+tread"
- module_sprites["Drone"] = "drone-engineer"
-
- if("Janitor")
- module = new /obj/item/weapon/robot_module/janitor(src)
- module.channels = list("Service" = 1)
- module_sprites["Basic"] = "JanBot2"
- module_sprites["Mopbot"] = "janitorrobot"
- module_sprites["Mop Gear Rex"] = "mopgearrex"
- module_sprites["Drone"] = "drone-janitor"
-
- if("Combat")
- module = new /obj/item/weapon/robot_module/combat(src)
- module_sprites["Combat Android"] = "droid-combat"
- module.channels = list("Security" = 1)
-
- //languages
- module.add_languages(src)
-
- //Custom_sprite check and entry
- if (custom_sprite == 1)
- module_sprites["Custom"] = "[src.ckey]-[modtype]"
+ var/module_type = robot_modules[modtype]
+ module = new module_type(src)
hands.icon_state = lowertext(modtype)
feedback_inc("cyborg_[lowertext(modtype)]",1)
updatename()
-
- if(modtype == "Medical" || modtype == "Security" || modtype == "Combat")
- status_flags &= ~CANPUSH
-
- choose_icon(6,module_sprites)
- radio.config(module.channels)
+ set_module_sprites(module.sprites)
+ choose_icon(module_sprites.len + 1, module_sprites)
notify_ai(ROBOT_NOTIFICATION_NEW_MODULE, module.name)
/mob/living/silicon/robot/proc/updatename(var/prefix as text)
@@ -396,10 +288,10 @@
var/changed_name = ""
if(custom_name)
changed_name = custom_name
+ notify_ai(ROBOT_NOTIFICATION_NEW_NAME, real_name, changed_name)
else
changed_name = "[modtype] [braintype]-[num2text(ident)]"
- notify_ai(ROBOT_NOTIFICATION_NEW_NAME, real_name, changed_name)
real_name = changed_name
name = real_name
@@ -475,9 +367,9 @@
lights_on = !lights_on
usr << "You [lights_on ? "enable" : "disable"] your integrated light."
if(lights_on)
- SetLuminosity(integrated_light_power) // 1.5x luminosity of flashlight
+ set_light(integrated_light_power) // 1.5x luminosity of flashlight
else
- SetLuminosity(0)
+ set_light(0)
/mob/living/silicon/robot/verb/self_diagnosis_verb()
set category = "Robot Commands"
@@ -662,7 +554,7 @@
C.r_arm = new/obj/item/robot_parts/r_arm(C)
C.updateicon()
new/obj/item/robot_parts/chest(loc)
- src.Del()
+ qdel(src)
else
// Okay we're not removing the cell or an MMI, but maybe something else?
var/list/removable_components = list()
@@ -702,6 +594,8 @@
user << "Close the panel first."
else if(cell)
user << "There is a power cell already installed."
+ else if(W.w_class != 3)
+ user << "\The [W] is too [W.w_class < 3? "small" : "large"] to fit here."
else
user.drop_item()
W.loc = src
@@ -803,11 +697,14 @@
src << "Obey these laws:"
laws.show_laws(src)
src << "\red \b ALERT: [user.real_name] is your new master. Obey your new laws and his commands."
- if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
+ if(src.module)
+ var/rebuild = 0
for(var/obj/item/weapon/pickaxe/borgdrill/D in src.module.modules)
- del(D)
- src.module.modules += new /obj/item/weapon/pickaxe/diamonddrill(src.module)
- src.module.rebuild()
+ qdel(D)
+ rebuild = 1
+ if(rebuild)
+ src.module.modules += new /obj/item/weapon/pickaxe/diamonddrill(src.module)
+ src.module.rebuild()
updateicon()
else
user << "You fail to hack [src]'s interface."
@@ -897,7 +794,6 @@
return 0
/mob/living/silicon/robot/updateicon()
-
overlays.Cut()
if(stat == 0)
overlays += "eyes-[module_sprites[icontype]]"
@@ -924,7 +820,7 @@
//Call when target overlay should be added/removed
/mob/living/silicon/robot/update_targeted()
if(!targeted_by && target_locked)
- del(target_locked)
+ qdel(target_locked)
updateicon()
if (targeted_by && target_locked)
overlays += target_locked
@@ -1058,7 +954,7 @@
for(var/A in tile)
if(istype(A, /obj/effect))
if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay))
- del(A)
+ qdel(A)
else if(istype(A, /obj/item))
var/obj/item/cleaned_item = A
cleaned_item.clean_blood()
@@ -1127,7 +1023,6 @@
return
/mob/living/silicon/robot/proc/choose_icon(var/triesleft, var/list/module_sprites)
-
if(triesleft<1 || !module_sprites.len)
return
else
@@ -1136,6 +1031,8 @@
if (custom_sprite == 1)
icontype = "Custom"
triesleft = 0
+ else if(module_sprites.len == 1)
+ icontype = module_sprites[1]
else
icontype = input("Select an icon! [triesleft ? "You have [triesleft] more chances." : "This is your last try."]", "Robot", null, null) in module_sprites
@@ -1146,13 +1043,13 @@
icon_state = module_sprites[1]
return
- overlays -= "eyes"
updateicon()
if (triesleft >= 1)
var/choice = input("Look at your icon - is this what you want?") in list("Yes","No")
if(choice=="No")
choose_icon(triesleft, module_sprites)
+ return
else
triesleft = 0
return
@@ -1167,11 +1064,11 @@
/mob/living/silicon/robot/proc/add_robot_verbs()
src.verbs |= robot_verbs_default
- src.verbs |= silicon_verbs_subsystems
+ src.verbs |= silicon_subsystems
/mob/living/silicon/robot/proc/remove_robot_verbs()
src.verbs -= robot_verbs_default
- src.verbs -= silicon_verbs_subsystems
+ src.verbs -= silicon_subsystems
// Uses power from cyborg's cell. Returns 1 on success or 0 on failure.
// Properly converts using CELLRATE now! Amount is in Joules.
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index d18ca506cc..3bc0dd9a15 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -43,11 +43,11 @@
S.use(1)
loaded_item = S
else
- del(S)
+ qdel(S)
desc = initial(desc)
icon_state = initial(icon_state)
else
- del(I)
+ qdel(I)
desc = initial(desc)
icon_state = initial(icon_state)
else
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index a48adddeb8..12b1fd080b 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -1,3 +1,18 @@
+var/global/list/robot_modules = list(
+ "Standard" = /obj/item/weapon/robot_module/standard,
+ "Service" = /obj/item/weapon/robot_module/clerical/butler,
+ "Clerical" = /obj/item/weapon/robot_module/clerical/general,
+ "Research" = /obj/item/weapon/robot_module/research,
+ "Miner" = /obj/item/weapon/robot_module/miner,
+ "Crisis" = /obj/item/weapon/robot_module/medical/crisis,
+ "Surgeon" = /obj/item/weapon/robot_module/medical/surgeon,
+ "Security" = /obj/item/weapon/robot_module/security/general,
+ "Combat" = /obj/item/weapon/robot_module/security/combat,
+ "Engineering" = /obj/item/weapon/robot_module/engineering/general,
+ "Construction" = /obj/item/weapon/robot_module/engineering/construction,
+ "Janitor" = /obj/item/weapon/robot_module/janitor
+ )
+
/obj/item/weapon/robot_module
name = "robot module"
icon = 'icons/obj/module.dmi'
@@ -6,10 +21,55 @@
item_state = "electronic"
flags = CONDUCT
var/channels = list()
+ var/networks = list()
+ var/languages = list(LANGUAGE_SOL_COMMON = 1, LANGUAGE_TRADEBAND = 1, LANGUAGE_UNATHI = 0, LANGUAGE_SIIK_TAJR = 0, LANGUAGE_SKRELLIAN = 0, LANGUAGE_GUTTER = 0)
+ var/sprites = list()
+ var/can_be_pushed = 1
+ var/no_slip = 0
var/list/modules = list()
var/list/datum/matter_synth/synths = list()
var/obj/item/emag = null
var/obj/item/borg/upgrade/jetpack = null
+ var/list/subsystems = list()
+ var/list/obj/item/borg/upgrade/supported_upgrades = list()
+
+ // Bookkeeping
+ var/list/added_languages = list()
+ var/list/added_networks = list()
+
+/obj/item/weapon/robot_module/New(var/mob/living/silicon/robot/R)
+ ..()
+ add_camera_networks(R)
+ add_languages(R)
+ add_subsystems(R)
+ apply_status_flags(R)
+
+ if(R.radio)
+ R.radio.recalculateChannels()
+
+/obj/item/weapon/robot_module/proc/Reset(var/mob/living/silicon/robot/R)
+ R.module = null
+
+ remove_camera_networks(R)
+ remove_languages(R)
+ remove_subsystems(R)
+ remove_status_flags(R)
+
+ if(R.radio)
+ R.radio.recalculateChannels()
+
+ qdel(src)
+
+/obj/item/weapon/robot_module/Destroy()
+ qdel(modules)
+ qdel(synths)
+ qdel(emag)
+ qdel(jetpack)
+ modules = null
+ synths = null
+ emag = null
+ jetpack = null
+ ..()
/obj/item/weapon/robot_module/emp_act(severity)
if(modules)
@@ -24,7 +84,6 @@
return
/obj/item/weapon/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R, var/rate)
-
if(!synths || !synths.len)
return
@@ -39,16 +98,48 @@
modules += O
/obj/item/weapon/robot_module/proc/add_languages(var/mob/living/silicon/robot/R)
- //full set of languages
- R.add_language("Sol Common", 1)
- R.add_language("Tradeband", 1)
- R.add_language("Sinta'unathi", 0)
- R.add_language("Siik'tajr", 0)
- R.add_language("Skrellian", 0)
- R.add_language("Gutter", 0)
+ for(var/language in languages)
+ if(R.add_language(language, languages[language]))
+ added_languages |= language
+
+/obj/item/weapon/robot_module/proc/remove_languages(var/mob/living/silicon/robot/R)
+ for(var/language in added_languages)
+ R.remove_language(language)
+ added_languages.Cut()
+
+/obj/item/weapon/robot_module/proc/add_camera_networks(var/mob/living/silicon/robot/R)
+ if(R.camera && "Robots" in R.camera.network)
+ for(var/network in networks)
+ if(!(network in R.camera.network))
+ R.camera.add_network(network)
+ added_networks |= network
+
+/obj/item/weapon/robot_module/proc/remove_camera_networks(var/mob/living/silicon/robot/R)
+ if(R.camera)
+ R.camera.remove_networks(added_networks)
+ added_networks.Cut()
+
+/obj/item/weapon/robot_module/proc/add_subsystems(var/mob/living/silicon/robot/R)
+ R.verbs |= subsystems
+
+/obj/item/weapon/robot_module/proc/remove_subsystems(var/mob/living/silicon/robot/R)
+ R.verbs -= subsystems
+
+/obj/item/weapon/robot_module/proc/apply_status_flags(var/mob/living/silicon/robot/R)
+ if(!can_be_pushed)
+ R.status_flags &= ~CANPUSH
+
+/obj/item/weapon/robot_module/proc/remove_status_flags(var/mob/living/silicon/robot/R)
+ if(!can_be_pushed)
+ R.status_flags |= CANPUSH
/obj/item/weapon/robot_module/standard
name = "standard robot module"
+ sprites = list( "Basic" = "robot_old",
+ "Android" = "droid",
+ "Default" = "robot",
+ "Drone" = "drone-standard"
+ )
/obj/item/weapon/robot_module/standard/New()
..()
@@ -61,10 +152,24 @@
src.emag = new /obj/item/weapon/melee/energy/sword(src)
return
-/obj/item/weapon/robot_module/surgeon
- name = "surgeon robot module"
+/obj/item/weapon/robot_module/medical
+ name = "medical robot module"
+ channels = list("Medical" = 1)
+ networks = list(NETWORK_MEDICAL)
+ subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
+ can_be_pushed = 0
-/obj/item/weapon/robot_module/surgeon/New()
+/obj/item/weapon/robot_module/medical/surgeon
+ name = "surgeon robot module"
+ sprites = list(
+ "Basic" = "Medbot",
+ "Standard" = "surgeon",
+ "Advanced Droid" = "droid-medical",
+ "Needles" = "medicalrobot",
+ "Drone" = "drone-surgery"
+ )
+
+/obj/item/weapon/robot_module/medical/surgeon/New()
..()
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/device/healthanalyzer(src)
@@ -99,16 +204,24 @@
return
-/obj/item/weapon/robot_module/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/weapon/robot_module/medical/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
if(src.emag)
var/obj/item/weapon/reagent_containers/spray/PS = src.emag
PS.reagents.add_reagent("pacid", 2 * amount)
..()
-/obj/item/weapon/robot_module/crisis
+/obj/item/weapon/robot_module/medical/crisis
name = "crisis robot module"
+ sprites = list(
+ "Basic" = "Medbot",
+ "Standard" = "surgeon",
+ "Advanced Droid" = "droid-medical",
+ "Needles" = "medicalrobot",
+ "Drone - Medical" = "drone-medical",
+ "Drone - Chemistry" = "drone-chemistry"
+ )
-/obj/item/weapon/robot_module/crisis/New()
+/obj/item/weapon/robot_module/medical/crisis/New()
..()
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/borg/sight/hud/med(src)
@@ -145,7 +258,7 @@
return
-/obj/item/weapon/robot_module/crisis/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/weapon/robot_module/medical/crisis/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules
if(S.mode == 2)
@@ -160,10 +273,25 @@
..()
-/obj/item/weapon/robot_module/construction
- name = "construction robot module"
-/obj/item/weapon/robot_module/construction/New()
+/obj/item/weapon/robot_module/engineering
+ name = "engineering robot module"
+ channels = list("Engineering" = 1)
+ networks = list(NETWORK_ENGINEERING)
+ subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor)
+ sprites = list(
+ "Basic" = "Engineering",
+ "Antique" = "engineerrobot",
+ "Landmate" = "landmate",
+ "Landmate - Treaded" = "engiborg+tread",
+ "Drone" = "drone-engineer"
+ )
+
+/obj/item/weapon/robot_module/engineering/construction
+ name = "construction robot module"
+ no_slip = 1
+
+/obj/item/weapon/robot_module/engineering/construction/New()
..()
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/borg/sight/meson(src)
@@ -198,10 +326,7 @@
RG.synths = list(metal, glass)
src.modules += RG
-/obj/item/weapon/robot_module/engineering
- name = "engineering robot module"
-
-/obj/item/weapon/robot_module/engineering/New()
+/obj/item/weapon/robot_module/engineering/general/New()
..()
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/borg/sight/meson(src)
@@ -259,8 +384,23 @@
/obj/item/weapon/robot_module/security
name = "security robot module"
+ channels = list("Security" = 1)
+ networks = list(NETWORK_SECURITY)
+ subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
+ can_be_pushed = 0
+ supported_upgrades = list(/obj/item/borg/upgrade/tasercooler)
-/obj/item/weapon/robot_module/security/New()
+/obj/item/weapon/robot_module/security/general
+ sprites = list(
+ "Basic" = "secborg",
+ "Red Knight" = "Security",
+ "Black Knight" = "securityrobot",
+ "Bloodhound" = "bloodhound",
+ "Bloodhound - Treaded" = "secborg+tread",
+ "Drone" = "drone-sec"
+ )
+
+/obj/item/weapon/robot_module/security/general/New()
..()
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/borg/sight/hud/sec(src)
@@ -288,6 +428,13 @@
/obj/item/weapon/robot_module/janitor
name = "janitorial robot module"
+ channels = list("Service" = 1)
+ sprites = list(
+ "Basic" = "JanBot2",
+ "Mopbot" = "janitorrobot",
+ "Mop Gear Rex" = "mopgearrex",
+ "Drone" = "drone-janitor"
+ )
/obj/item/weapon/robot_module/janitor/New()
..()
@@ -308,10 +455,31 @@
var/obj/item/weapon/reagent_containers/spray/S = src.emag
S.reagents.add_reagent("lube", 2 * amount)
-/obj/item/weapon/robot_module/butler
+/obj/item/weapon/robot_module/clerical
name = "service robot module"
+ channels = list("Service" = 1)
+ languages = list(
+ LANGUAGE_SOL_COMMON = 1,
+ LANGUAGE_UNATHI = 1,
+ LANGUAGE_SIIK_MAAS = 1,
+ LANGUAGE_SIIK_TAJR = 0,
+ LANGUAGE_SKRELLIAN = 1,
+ LANGUAGE_ROOTSPEAK = 1,
+ LANGUAGE_TRADEBAND = 1,
+ LANGUAGE_GUTTER = 1
+ )
-/obj/item/weapon/robot_module/butler/New()
+/obj/item/weapon/robot_module/clerical/butler
+ sprites = list( "Waitress" = "Service",
+ "Kent" = "toiletbot",
+ "Bro" = "Brobot",
+ "Rich" = "maximillion",
+ "Default" = "Service2",
+ "Drone - Service" = "drone-service",
+ "Drone - Hydro" = "drone-hydro"
+ )
+
+/obj/item/weapon/robot_module/clerical/butler/New()
..()
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/weapon/gripper/service(src)
@@ -343,21 +511,18 @@
src.emag.name = "Mickey Finn's Special Brew"
return
-/obj/item/weapon/robot_module/butler/add_languages(var/mob/living/silicon/robot/R)
- //full set of languages
- R.add_language("Sol Common", 1)
- R.add_language("Sinta'unathi", 1)
- R.add_language("Siik'maas", 1)
- R.add_language("Siik'tajr", 0)
- R.add_language("Skrellian", 1)
- R.add_language("Rootspeak", 1)
- R.add_language("Tradeband", 1)
- R.add_language("Gutter", 1)
-
-/obj/item/weapon/robot_module/clerical
+/obj/item/weapon/robot_module/clerical/general
name = "clerical robot module"
+ sprites = list(
+ "Waitress" = "Service",
+ "Kent" = "toiletbot",
+ "Bro" = "Brobot",
+ "Rich" = "maximillion",
+ "Default" = "Service2",
+ "Drone" = "drone-service"
+ )
-/obj/item/weapon/robot_module/clerical/New()
+/obj/item/weapon/robot_module/clerical/general/New()
..()
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/weapon/pen/robopen(src)
@@ -366,17 +531,7 @@
src.modules += new /obj/item/weapon/hand_labeler(src)
src.emag = new /obj/item/weapon/stamp/denied(src)
-/obj/item/weapon/robot_module/clerical/add_languages(var/mob/living/silicon/robot/R)
- R.add_language("Sol Common", 1)
- R.add_language("Sinta'unathi", 1)
- R.add_language("Siik'maas", 1)
- R.add_language("Siik'tajr", 0)
- R.add_language("Skrellian", 1)
- R.add_language("Rootspeak", 1)
- R.add_language("Tradeband", 1)
- R.add_language("Gutter", 1)
-
-/obj/item/weapon/robot_module/butler/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/weapon/robot_module/general/butler/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/weapon/reagent_containers/food/condiment/enzyme/E = locate() in src.modules
E.reagents.add_reagent("enzyme", 2 * amount)
if(src.emag)
@@ -385,6 +540,15 @@
/obj/item/weapon/robot_module/miner
name = "miner robot module"
+ channels = list("Supply" = 1)
+ networks = list(NETWORK_MINE)
+ sprites = list(
+ "Basic" = "Miner_old",
+ "Advanced Droid" = "droid-miner",
+ "Treadhead" = "Miner",
+ "Drone" = "drone-miner"
+ )
+ supported_upgrades = list(/obj/item/borg/upgrade/jetpack)
/obj/item/weapon/robot_module/miner/New()
..()
@@ -403,6 +567,11 @@
/obj/item/weapon/robot_module/research
name = "research module"
+ channels = list("Science" = 1)
+ sprites = list(
+ "Droid" = "droid-science",
+ "Drone" = "drone-science"
+ )
/obj/item/weapon/robot_module/research/New()
..()
@@ -435,6 +604,14 @@
/obj/item/weapon/robot_module/syndicate
name = "illegal robot module"
+ languages = list(
+ LANGUAGE_SOL_COMMON = 1,
+ LANGUAGE_TRADEBAND = 1,
+ LANGUAGE_UNATHI = 0,
+ LANGUAGE_SIIK_TAJR = 0,
+ LANGUAGE_SKRELLIAN = 0,
+ LANGUAGE_GUTTER = 1
+ )
/obj/item/weapon/robot_module/syndicate/New(var/mob/living/silicon/robot/R)
..()
@@ -448,17 +625,9 @@
R.internals = jetpack
return
-/obj/item/weapon/robot_module/syndicate/add_languages(var/mob/living/silicon/robot/R)
- //full set of languages
- R.add_language("Sol Common", 1)
- R.add_language("Tradeband", 1)
- R.add_language("Sinta'unathi", 0)
- R.add_language("Siik'tajr", 0)
- R.add_language("Skrellian", 0)
- R.add_language("Gutter", 1)
-
-/obj/item/weapon/robot_module/combat
+/obj/item/weapon/robot_module/security/combat
name = "combat robot module"
+ sprites = list("Combat Android" = "droid-combat")
/obj/item/weapon/robot_module/combat/New()
..()
@@ -473,6 +642,7 @@
/obj/item/weapon/robot_module/drone
name = "drone module"
+ no_slip = 1
/obj/item/weapon/robot_module/drone/New()
..()
@@ -544,23 +714,15 @@
/obj/item/weapon/robot_module/drone/construction
name = "construction drone module"
+ channels = list("Engineering" = 1)
+ languages = list()
/obj/item/weapon/robot_module/drone/construction/New()
..()
src.modules += new /obj/item/weapon/rcd/borg(src)
-/obj/item/weapon/robot_module/drone/add_languages(var/mob/living/silicon/robot/R)
- return //not much ROM to spare in that tiny microprocessor!
-
/obj/item/weapon/robot_module/drone/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/device/lightreplacer/LR = locate() in src.modules
LR.Charge(R, amount)
..()
return
-
-//checks whether this item is a module of the robot it is located in.
-/obj/item/proc/is_robot_module()
- if (!istype(src.loc, /mob/living/silicon/robot))
- return 0
- var/mob/living/silicon/robot/R = src.loc
- return (src in R.module.modules)
diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm
index f9265a383f..5ea383aaa6 100644
--- a/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -1,5 +1,5 @@
/mob/living/silicon/robot/Process_Spaceslipping(var/prob_slip)
- if(module && (istype(module,/obj/item/weapon/robot_module/construction) || istype(module,/obj/item/weapon/robot_module/drone)))
+ if(module && module.no_slip)
return 0
..(prob_slip)
diff --git a/code/modules/mob/living/silicon/robot/robot_upgrades.dm b/code/modules/mob/living/silicon/robot/robot_upgrades.dm
deleted file mode 100644
index a6d08bd534..0000000000
--- a/code/modules/mob/living/silicon/robot/robot_upgrades.dm
+++ /dev/null
@@ -1,147 +0,0 @@
-// robot_upgrades.dm
-// Contains various borg upgrades.
-
-/obj/item/borg/upgrade/
- name = "A borg upgrade module."
- desc = "Protected by FRM."
- icon = 'icons/obj/module.dmi'
- icon_state = "cyborg_upgrade"
- var/construction_time = 120
- var/construction_cost = list("metal"=10000)
- var/locked = 0
- var/require_module = 0
- var/installed = 0
-
-/obj/item/borg/upgrade/proc/action()
- return
-
-
-/obj/item/borg/upgrade/reset/
- name = "Borg module reset board"
- desc = "Used to reset a borg's module. Destroys any other upgrades applied to the borg."
- icon_state = "cyborg_upgrade1"
- require_module = 1
-
-/obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R)
- R.uneq_all()
- del(R.module)
- R.module = null
- R.modtype = "robot"
- R.real_name = "Cyborg [R.ident]"
- R.name = R.real_name
- R.nopush = 0
- R.hands.icon_state = "nomod"
- R.base_icon = "robot"
- R.icon_state = "robot"
- R.updateicon()
- R.languages = list()
- R.speech_synthesizer_langs = list()
-
- return 1
-
-
-
-/obj/item/borg/upgrade/flashproof/
- name = "Borg Flash-Supression"
- desc = "A highly advanced, complicated system for supressing incoming flashes directed at the borg's optical processing system."
- construction_cost = list("metal"=10000,"gold"=2000,"silver"=3000,"glass"=2000, "diamond"=5000)
- icon_state = "cyborg_upgrade4"
- require_module = 1
-
-
-/obj/item/borg/upgrade/flashproof/New() // Why the fuck does the fabricator make a new instance of all the items?
- //desc = "Sunglasses with duct tape." // Why? D:
-
-/obj/item/borg/upgrade/flashproof/action(var/mob/living/silicon/robot/R)
- if(R.module)
- R.module += src
-
- return 1
-
-/obj/item/borg/upgrade/restart/
- name = "Borg emergancy restart module"
- desc = "Used to force a restart of a disabled-but-repaired borg, bringing it back online."
- construction_cost = list("metal"=60000 , "glass"=5000)
- icon_state = "cyborg_upgrade1"
-
-
-/obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R)
- if(!R.key)
- for(var/mob/dead/observer/ghost in world)
- if(ghost.corpse == R && ghost.client)
- ghost.client.mob = ghost.corpse
-
- if(R.health < 0)
- usr << "You have to repair the borg before using this module!"
- return 0
-
- R.stat = 0
- return 1
-
-
-/obj/item/borg/upgrade/vtec/
- name = "Borg VTEC Module"
- desc = "Used to kick in a borgs VTEC systems, increasing their speed."
- construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 5000)
- icon_state = "cyborg_upgrade2"
- require_module = 1
-
-/obj/item/borg/upgrade/vtec/action(var/mob/living/silicon/robot/R)
- if(R.speed == -1)
- return 0
-
- R.speed--
- return 1
-
-
-/obj/item/borg/upgrade/tasercooler/
- name = "Borg Rapid Taser Cooling Module"
- desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate.."
- construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 2000, "diamond" = 500)
- icon_state = "cyborg_upgrade3"
- require_module = 1
-
-
-/obj/item/borg/upgrade/tasercooler/action(var/mob/living/silicon/robot/R)
- if(!istype(R.module, /obj/item/weapon/robot_module/security))
- R << "Upgrade mounting error! No suitable hardpoint detected!"
- usr << "There's no mounting point for the module!"
- return 0
-
- var/obj/item/weapon/gun/energy/taser/mounted/cyborg/T = locate() in R.module
- if(!T)
- T = locate() in R.module.contents
- if(!T)
- T = locate() in R.module.modules
- if(!T)
- usr << "This cyborg has had its taser removed!"
- return 0
-
- if(T.recharge_time <= 2)
- R << "Maximum cooling achieved for this hardpoint!"
- usr << "There's no room for another cooling unit!"
- return 0
-
- else
- T.recharge_time = max(2 , T.recharge_time - 4)
-
- return 1
-
-/obj/item/borg/upgrade/jetpack/
- name = "Mining Borg Jetpack"
- desc = "A carbon dioxide jetpack suitable for low-gravity mining operations"
- construction_cost = list("metal"=10000,"phoron"=15000,"uranium" = 20000)
- icon_state = "cyborg_upgrade3"
- require_module = 1
-
-/obj/item/borg/upgrade/jetpack/action(var/mob/living/silicon/robot/R)
- if(!istype(R.module, /obj/item/weapon/robot_module/miner))
- R << "Upgrade mounting error! No suitable hardpoint detected!"
- usr << "There's no mounting point for the module!"
- return 0
- else
- R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide
- for(var/obj/item/weapon/tank/jetpack/carbondioxide in R.module.modules)
- R.internals = src
- R.icon_state="Miner+j"
- return 1
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index b1cc4240ff..d2e30953e7 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -31,7 +31,7 @@
add_language("Galactic Common")
init_subsystems()
-/mob/living/silicon/Del()
+/mob/living/silicon/Destroy()
for(var/datum/alarm_handler/AH in alarm_manager.all_handlers)
AH.unregister(src)
..()
@@ -278,14 +278,6 @@
updatehealth()
-/mob/living/silicon/proc/init_subsystems()
- alarm_monitor = new/obj/nano_module/alarm_monitor/borg(src)
- law_manager = new/obj/nano_module/law_manager(src)
-
- for(var/datum/alarm_handler/AH in alarm_manager.all_handlers)
- AH.register(src, /mob/living/silicon/proc/receive_alarm)
- queued_alarms[AH] = list() // Makes sure alarms remain listed in consistent order
-
/mob/living/silicon/proc/receive_alarm(var/datum/alarm_handler/alarm_handler, var/datum/alarm/alarm, was_raised)
if(!next_alarm_notice)
next_alarm_notice = world.time + SecondsToTicks(10)
diff --git a/code/modules/mob/living/silicon/subystems.dm b/code/modules/mob/living/silicon/subystems.dm
index 9f1e07c301..e8909b0b50 100644
--- a/code/modules/mob/living/silicon/subystems.dm
+++ b/code/modules/mob/living/silicon/subystems.dm
@@ -1,26 +1,97 @@
/mob/living/silicon
- var/list/silicon_verbs_subsystems = list(
+ var/register_alarms = 1
+ var/obj/nano_module/alarm_monitor/all/alarm_monitor
+ var/obj/nano_module/atmos_control/atmos_control
+ var/obj/nano_module/crew_monitor/crew_monitor
+ var/obj/nano_module/law_manager/law_manager
+ var/obj/nano_module/power_monitor/power_monitor
+ var/obj/nano_module/rcon/rcon
+
+/mob/living/silicon
+ var/list/silicon_subsystems = list(
/mob/living/silicon/proc/subsystem_alarm_monitor,
/mob/living/silicon/proc/subsystem_law_manager
)
- // Subsystems
- var/obj/nano_module/alarm_monitor = null
- var/obj/nano_module/law_manager = null
-
-/mob/living/silicon/robot/syndicate
- silicon_verbs_subsystems = list(
- /mob/living/silicon/proc/subsystem_law_manager
+/mob/living/silicon/ai
+ silicon_subsystems = list(
+ /mob/living/silicon/proc/subsystem_alarm_monitor,
+ /mob/living/silicon/proc/subsystem_atmos_control,
+ /mob/living/silicon/proc/subsystem_crew_monitor,
+ /mob/living/silicon/proc/subsystem_law_manager,
+ /mob/living/silicon/proc/subsystem_power_monitor,
+ /mob/living/silicon/proc/subsystem_rcon
)
+/mob/living/silicon/robot/syndicate
+ register_alarms = 0
+ silicon_subsystems = list(/mob/living/silicon/proc/subsystem_law_manager)
+
+/mob/living/silicon/proc/init_subsystems()
+ alarm_monitor = new(src)
+ atmos_control = new(src)
+ crew_monitor = new(src)
+ law_manager = new(src)
+ power_monitor = new(src)
+ rcon = new(src)
+
+ if(!register_alarms)
+ return
+
+ for(var/datum/alarm_handler/AH in alarm_manager.all_handlers)
+ AH.register(src, /mob/living/silicon/proc/receive_alarm)
+ queued_alarms[AH] = list() // Makes sure alarms remain listed in consistent order
+
+/********************
+* Alarm Monitor *
+********************/
/mob/living/silicon/proc/subsystem_alarm_monitor()
set name = "Alarm Monitor"
set category = "Subystems"
- alarm_monitor.ui_interact(usr)
+ alarm_monitor.ui_interact(usr, state = self_state)
+/********************
+* Atmos Control *
+********************/
+/mob/living/silicon/proc/subsystem_atmos_control()
+ set category = "Subystems"
+ set name = "Atmospherics Control"
+
+ atmos_control.ui_interact(usr, state = self_state)
+
+/********************
+* Crew Monitor *
+********************/
+/mob/living/silicon/proc/subsystem_crew_monitor()
+ set category = "Subystems"
+ set name = "Crew Monitor"
+
+ crew_monitor.ui_interact(usr, state = self_state)
+
+/****************
+* Law Manager *
+****************/
/mob/living/silicon/proc/subsystem_law_manager()
set name = "Law Manager"
set category = "Subystems"
- law_manager.ui_interact(usr)
+ law_manager.ui_interact(usr, state = self_state)
+
+/********************
+* Power Monitor *
+********************/
+/mob/living/silicon/proc/subsystem_power_monitor()
+ set category = "Subystems"
+ set name = "Power Monitor"
+
+ power_monitor.ui_interact(usr, state = self_state)
+
+/************
+* RCON *
+************/
+/mob/living/silicon/proc/subsystem_rcon()
+ set category = "Subystems"
+ set name = "RCON"
+
+ rcon.ui_interact(usr, state = self_state)
diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm
index 3a5f2f17e5..fc2a1cd72e 100644
--- a/code/modules/mob/living/simple_animal/bees.dm
+++ b/code/modules/mob/living/simple_animal/bees.dm
@@ -20,7 +20,7 @@
..()
parent = new_parent
-/mob/living/simple_animal/bee/Del()
+/mob/living/simple_animal/bee/Destroy()
if(parent)
parent.owned_bee_swarms.Remove(src)
..()
@@ -107,7 +107,7 @@
if(feral > 0)
src.strength += B.strength
- del(B)
+ qdel(B)
src.icon_state = "bees[src.strength]"
if(strength > 5)
icon_state = "bees_swarm"
@@ -120,7 +120,7 @@
B.icon_state = "bees[B.strength]"
if(src.strength <= 0)
- del(src)
+ qdel(src)
return
src.icon_state = "bees[B.strength]"
var/turf/simulated/floor/T = get_turf(get_step(src, pick(1,2,4,8)))
@@ -169,7 +169,7 @@
if(!parent && prob(10))
strength -= 1
if(strength <= 0)
- del(src)
+ qdel(src)
else if(strength <= 5)
icon_state = "bees[strength]"
diff --git a/code/modules/mob/living/simple_animal/borer/borer.dm b/code/modules/mob/living/simple_animal/borer/borer.dm
index 333ea3540d..9480840d71 100644
--- a/code/modules/mob/living/simple_animal/borer/borer.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer.dm
@@ -143,7 +143,7 @@
if(!host.lastKnownIP)
host.lastKnownIP = b2h_ip
- del(host_brain)
+ qdel(host_brain)
/mob/living/simple_animal/borer/proc/leave_host()
diff --git a/code/modules/mob/living/simple_animal/borer/borer_captive.dm b/code/modules/mob/living/simple_animal/borer/borer_captive.dm
index 156d362773..c0b2999b2f 100644
--- a/code/modules/mob/living/simple_animal/borer/borer_captive.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer_captive.dm
@@ -32,4 +32,31 @@
M << "The captive mind of [src] whispers, \"[message]\""
/mob/living/captive_brain/emote(var/message)
- return
\ No newline at end of file
+ return
+
+/mob/living/captive_brain/can_resist()
+ return !(stat || next_move > world.time)
+
+/mob/living/captive_brain/process_resist()
+ //Resisting control by an alien mind.
+ if(istype(src.loc,/mob/living/simple_animal/borer))
+ var/mob/living/simple_animal/borer/B = src.loc
+ var/mob/living/captive_brain/H = src
+
+ H << "You begin doggedly resisting the parasite's control (this will take approximately sixty seconds)."
+ B.host << "You feel the captive mind of [src] begin to resist your control."
+
+ spawn(rand(200,250)+B.host.brainloss)
+ if(!B || !B.controlling) return
+
+ B.host.adjustBrainLoss(rand(5,10))
+ H << "With an immense exertion of will, you regain control of your body!"
+ B.host << "You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you."
+ B.detatch()
+ verbs -= /mob/living/carbon/proc/release_control
+ verbs -= /mob/living/carbon/proc/punish_host
+ verbs -= /mob/living/carbon/proc/spawn_larvae
+
+ return
+
+ ..()
diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm
index b0fd2a5121..e1b54dc832 100644
--- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm
@@ -304,7 +304,7 @@
host.computer_id = null
host.lastKnownIP = null
- del(host_brain)
+ qdel(host_brain)
host_brain = new(src)
host_brain.ckey = host.ckey
diff --git a/code/modules/mob/living/simple_animal/constructs/constructs.dm b/code/modules/mob/living/simple_animal/constructs/constructs.dm
index 43ebfd9a49..56746a51d5 100644
--- a/code/modules/mob/living/simple_animal/constructs/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs/constructs.dm
@@ -52,7 +52,7 @@
new /obj/item/weapon/ectoplasm (src.loc)
..(null,"collapses in a shattered heap.")
ghostize()
- del src
+ qdel(src)
/mob/living/simple_animal/construct/attack_generic(var/mob/user)
if(istype(user, /mob/living/simple_animal/construct/builder))
@@ -240,7 +240,7 @@
////////////////Glow//////////////////
/mob/living/simple_animal/construct/proc/add_glow()
overlays = 0
- var/overlay_layer = LIGHTING_LAYER+1
+ var/overlay_layer = 11
if(layer != MOB_LAYER)
overlay_layer=TURF_LAYER+0.2
diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm
index 502b7dd3dd..2fa81f08c8 100644
--- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm
+++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm
@@ -131,7 +131,7 @@
animation.icon = 'icons/mob/mob.dmi'
animation.master = T
flick("dust-h", animation)
- del(animation)
+ qdel(animation)
var/mob/living/simple_animal/shade/S = new /mob/living/simple_animal/shade( T.loc )
S.loc = C //put shade in stone
S.status_flags |= GODMODE //So they won't die inside the stone somehow
@@ -152,7 +152,7 @@
U << "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone."
U << "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls."
C.imprinted = "[S.name]"
- del T
+ qdel(T)
if("SHADE")
var/mob/living/simple_animal/shade/T = target
var/obj/item/device/soulstone/C = src
@@ -184,33 +184,33 @@
Z.key = A.key
if(iscultist(U))
cult.add_antagonist(Z.mind)
- del(T)
+ qdel(T)
Z << "You are playing a Juggernaut. Though slow, you can withstand extreme punishment, and rip apart enemies and walls alike."
Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs."
Z.cancel_camera()
- del(C)
+ qdel(C)
if("Wraith")
var/mob/living/simple_animal/construct/wraith/Z = new /mob/living/simple_animal/construct/wraith (get_turf(T.loc))
Z.key = A.key
if(iscultist(U))
cult.add_antagonist(Z.mind)
- del(T)
+ qdel(T)
Z << "You are playing a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls."
Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs."
Z.cancel_camera()
- del(C)
+ qdel(C)
if("Artificer")
var/mob/living/simple_animal/construct/builder/Z = new /mob/living/simple_animal/construct/builder (get_turf(T.loc))
Z.key = A.key
if(iscultist(U))
cult.add_antagonist(Z.mind)
- del(T)
+ qdel(T)
Z << "You are playing an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, repair allied constructs (by clicking on them), and even create new constructs"
Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs."
Z.cancel_camera()
- del(C)
+ qdel(C)
else
U << "\red Creation failed!: \black The soul stone is empty! Go kill someone!"
return
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 4f26dacdb6..93b79423ce 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -78,7 +78,7 @@
W.assignment = corpseidjob
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
- del(src)
+ qdel(src)
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 43b6c42cee..a68280a430 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -59,7 +59,7 @@
health = min(maxHealth, health + MED.heal_brute)
MED.amount -= 1
if(MED.amount <= 0)
- del(MED)
+ qdel(MED)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\blue [user] applies the [MED] on [src]")
@@ -94,7 +94,7 @@
emote_hear = list("clicks")
emote_see = list("clacks")
desc = "Free crabs!"
- src.sd_SetLuminosity(0)
+ src.sd_set_light(0)
inventory_head.loc = src.loc
inventory_head = null
else
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index b7e72da0c6..433a46efb7 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -177,7 +177,7 @@
amount_grown += rand(1,2)
if(amount_grown >= 100)
new /mob/living/simple_animal/chicken(src.loc)
- del(src)
+ qdel(src)
var/const/MAX_CHICKENS = 50
var/global/chicken_count = 0
@@ -228,7 +228,7 @@ var/global/chicken_count = 0
if(!stat && eggsleft < 8)
user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
user.drop_item()
- del(O)
+ qdel(O)
eggsleft += rand(1, 4)
else
user << "\blue [name] doesn't seem hungry!"
@@ -258,6 +258,6 @@ var/global/chicken_count = 0
visible_message("[src] hatches with a quiet cracking sound.")
new /mob/living/simple_animal/chick(get_turf(src))
processing_objects.Remove(src)
- del(src)
+ qdel(src)
else
processing_objects.Remove(src)
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 5b207ce2a7..ad41fc28aa 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -56,7 +56,10 @@
verbs += /mob/living/proc/ventcrawl
verbs += /mob/living/proc/hide
- name = "[name] ([rand(1, 1000)])"
+ if(name == initial(name))
+ name = "[name] ([rand(1, 1000)])"
+ real_name = name
+
if(!body_color)
body_color = pick( list("brown","gray","white") )
icon_state = "mouse_[body_color]"
@@ -112,5 +115,10 @@
name = "Tom"
desc = "Jerry the cat is not amused."
+/mob/living/simple_animal/mouse/brown/Tom/New()
+ ..()
+ // Change my name back, don't want to be named Tom (666)
+ name = initial(name)
+
/mob/living/simple_animal/mouse/can_use_vents()
- return
\ No newline at end of file
+ return
diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm
index dab2d2e2d9..d0a8e09207 100644
--- a/code/modules/mob/living/simple_animal/friendly/slime.dm
+++ b/code/modules/mob/living/simple_animal/friendly/slime.dm
@@ -45,4 +45,4 @@
S2.icon_living = "[src.colour] baby slime"
S2.icon_dead = "[src.colour] baby slime dead"
S2.colour = "[src.colour]"
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index ab4f7b2269..af59941b1f 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -185,7 +185,7 @@
src.name = "Spider-bot"
update_icon()
-/mob/living/simple_animal/spiderbot/Del()
+/mob/living/simple_animal/spiderbot/Destroy()
eject_brain()
..()
@@ -210,7 +210,7 @@
held_item = null
gibs(loc, viruses, null, null, /obj/effect/gibspawner/robot) //TODO: use gib() or refactor spiderbots into synthetics.
- src.Del()
+ qdel(src)
return
//Cannibalized from the parrot mob. ~Zuhayr
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 26d69933e8..e358f3e69a 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -51,7 +51,7 @@
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
- del src
+ qdel(src)
return
/mob/living/simple_animal/hostile/hivebot/tele//this still needs work
@@ -95,7 +95,7 @@
if("rapid")
new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
spawn(100)
- del(src)
+ qdel(src)
return
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index bb4616bbe8..cc58a7ce1c 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -188,7 +188,7 @@
if(!A) return
if (!istype(target, /turf))
- del(A)
+ qdel(A)
return
A.current = target
A.starting = get_turf(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 4cd203ee08..4764dcd547 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -43,7 +43,7 @@
/mob/living/simple_animal/hostile/mimic/death()
..()
- del(src)
+ qdel(src)
//
// Crate Mimic
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index e3a4ce4667..cddaadfccd 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -53,5 +53,5 @@
new corpse (src.loc)
if(weapon1)
new weapon1 (src.loc)
- del src
+ qdel(src)
return
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
index 872eb95b61..a2e9e21f75 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
@@ -159,9 +159,9 @@
/mob/living/simple_animal/hostile/retaliate/malf_drone/death()
..(null,"suddenly breaks apart.")
- del(src)
+ qdel(src)
-/mob/living/simple_animal/hostile/retaliate/malf_drone/Del()
+/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy()
//some random debris left behind
if(has_loot)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -183,16 +183,16 @@
step_to(O, get_turf(pick(view(7, src))))
//rods
- O = new /obj/item/stack/rods(src.loc)
+ O = PoolOrNew(/obj/item/stack/rods, src.loc)
step_to(O, get_turf(pick(view(7, src))))
if(prob(75))
- O = new /obj/item/stack/rods(src.loc)
+ O = PoolOrNew(/obj/item/stack/rods, src.loc)
step_to(O, get_turf(pick(view(7, src))))
if(prob(50))
- O = new /obj/item/stack/rods(src.loc)
+ O = PoolOrNew(/obj/item/stack/rods, src.loc)
step_to(O, get_turf(pick(view(7, src))))
if(prob(25))
- O = new /obj/item/stack/rods(src.loc)
+ O = PoolOrNew(/obj/item/stack/rods, src.loc)
step_to(O, get_turf(pick(view(7, src))))
//plasteel
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
index 84f1c6f27a..ab044a02f0 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -51,5 +51,5 @@
new corpse (src.loc)
if(weapon1)
new weapon1 (src.loc)
- del src
+ qdel(src)
return
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 12f175cfef..e0845a399d 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -43,7 +43,7 @@
new weapon1 (src.loc)
if(weapon2)
new weapon2 (src.loc)
- del src
+ qdel(src)
return
///////////////Sword and shield////////////
@@ -159,4 +159,4 @@
/mob/living/simple_animal/hostile/viscerator/death()
..(null,"is smashed into pieces!")
- del src
+ qdel(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 50b2191d3e..56bcafd6f5 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -53,4 +53,4 @@
/mob/living/simple_animal/hostile/tree/death()
..(null,"is hacked into pieces!")
new /obj/item/stack/sheet/wood(loc)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index c284f7ad3c..359db24c63 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -47,5 +47,5 @@
if((M.client && !( M.blinded )))
M.show_message("\red [src] lets out a contented sigh as their form unwinds. ")
ghostize()
- del src
+ qdel(src)
return
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 067a9bd8fe..ab2bc3d98c 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -274,12 +274,12 @@
adjustBruteLoss(-MED.heal_brute)
MED.amount -= 1
if(MED.amount <= 0)
- del(MED)
+ qdel(MED)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
- M.show_message("[user] applies the [MED] on [src].")
else
- user << ""
+ user << "\The [src] is dead, medical items won't bring it back to life."
if(meat_type && (stat == DEAD)) //if the animal has a meat, and if it is dead.
if(istype(O, /obj/item/weapon/kitchenknife) || istype(O, /obj/item/weapon/butch))
harvest(user)
@@ -300,7 +300,7 @@
usr << "[user] gently taps [src] with the [O].")
+ M.show_message("[user] gently taps [src] with \the [O].")
/mob/living/simple_animal/movement_delay()
var/tally = 0 //Incase I need to add stuff other than "speed" later
@@ -361,7 +361,7 @@
//Call when target overlay should be added/removed
/mob/living/simple_animal/update_targeted()
if(!targeted_by && target_locked)
- del(target_locked)
+ qdel(target_locked)
overlays = null
if (targeted_by && target_locked)
overlays += target_locked
@@ -392,7 +392,7 @@
if(small)
user.visible_message("[user] chops up \the [src]!")
new/obj/effect/decal/cleanable/blood/splatter(get_turf(src))
- del(src)
+ qdel(src)
else
user.visible_message("[user] butchers \the [src] messily!")
gib()
diff --git a/code/modules/mob/living/simple_animal/worm.dm b/code/modules/mob/living/simple_animal/worm.dm
index fe76fa87b4..20a8ee499c 100644
--- a/code/modules/mob/living/simple_animal/worm.dm
+++ b/code/modules/mob/living/simple_animal/worm.dm
@@ -98,7 +98,7 @@
return
- Del() //if a chunk a destroyed, make a new worm out of the split halves
+ Destroy() //if a chunk a destroyed, make a new worm out of the split halves
if(previous)
previous.Detach()
..()
@@ -137,10 +137,9 @@
proc/AttemptToEat(var/atom/target)
if(istype(target,/turf/simulated/wall))
- if((!istype(target,/turf/simulated/wall/r_wall) && eatingDuration >= 100) || eatingDuration >= 200) //need 20 ticks to eat an rwall, 10 for a regular one
- var/turf/simulated/wall/wall = target
- wall.ChangeTurf(/turf/simulated/floor)
- new /obj/item/stack/sheet/metal(src, flatPlasmaValue)
+ var/turf/simulated/wall/W = target
+ if((!W.reinf_material && eatingDuration >= 100) || eatingDuration >= 200) //need 20 ticks to eat an rwall, 10 for a regular one
+ W.dismantle_wall()
return 1
else if(istype(target,/atom/movable))
if(istype(target,/mob) || eatingDuration >= 50) //5 ticks to eat stuff like airlocks
@@ -170,7 +169,7 @@
if(die)
newHead.death()
- del(src)
+ qdel(src)
proc/ProcessStomach()
for(var/atom/movable/stomachContent in contents)
@@ -179,16 +178,16 @@
if(!istype(stomachContent,/obj/item/stack/sheet/mineral/phoron))
var/obj/item/stack/oldStack = stomachContent
new /obj/item/stack/sheet/mineral/phoron(src, oldStack.get_amount())
- del(oldStack)
+ qdel(oldStack)
continue
else if(istype(stomachContent,/obj/item)) //converts to plasma, keeping the w_class
var/obj/item/oldItem = stomachContent
new /obj/item/stack/sheet/mineral/phoron(src, oldItem.w_class)
- del(oldItem)
+ qdel(oldItem)
continue
else
new /obj/item/stack/sheet/mineral/phoron(src, flatPlasmaValue) //just flat amount
- del(stomachContent)
+ qdel(stomachContent)
continue
if(previous)
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index d34a309ee3..f1bb76c85d 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -31,7 +31,7 @@
client.images = null //remove the images such as AIs being unable to see runes
client.screen = null //remove hud items just in case
- if(hud_used) del(hud_used) //remove the hud objects
+ if(hud_used) qdel(hud_used) //remove the hud objects
hud_used = new /datum/hud(src)
next_move = 1
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 6d2b062abc..e9cae30755 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1,7 +1,12 @@
-/mob/Del()//This makes sure that mobs with clients/keys are not just deleted from the game.
+/mob/Destroy()//This makes sure that mobs with clients/keys are not just deleted from the game.
mob_list -= src
dead_mob_list -= src
living_mob_list -= src
+ qdel(hud_used)
+ if(mind && mind.current == src)
+ spellremove(src)
+ for(var/infection in viruses)
+ qdel(infection)
ghostize()
..()
@@ -179,7 +184,7 @@
P.invisibility = invisibility
spawn (20)
if(P)
- del(P) // qdel
+ qdel(P) // qdel
face_atom(A)
return 1
@@ -213,7 +218,7 @@
var/list/temp = list( )
temp += L.container
//L = null
- del(L)
+ qdel(L)
return temp
else
return L.container
@@ -367,7 +372,7 @@
var/mob/new_player/M = new /mob/new_player()
if(!client)
log_game("[usr.key] AM failed due to disconnect.")
- del(M)
+ qdel(M)
return
M.key = key
@@ -433,7 +438,7 @@
namecounts[name] = 1
creatures[name] = O
- if(istype(O, /obj/machinery/singularity))
+ if(istype(O, /obj/singularity))
var/name = "Singularity"
if (names.Find(name))
namecounts[name]++
@@ -715,63 +720,19 @@ note dizziness decrements automatically in the mob's Life() proc.
//reset the pixel offsets to zero
is_floating = 0
-/proc/getStatName(var/datum/controller/process/process)
- return uppertext(copytext(process.name, 1, 4))
-
/mob/Stat()
..()
if(client && client.holder)
if(statpanel("Status"))
- stat(null,"Location:\t([x], [y], [z])")
- stat(null,"CPU:\t[world.cpu]")
- stat(null,"Instances:\t[world.contents.len]")
+ statpanel("Status","Location:","([x], [y], [z])")
+ statpanel("Status","CPU:","[world.cpu]")
+ statpanel("Status","Instances:","[world.contents.len]")
if(statpanel("Status") && processScheduler && processScheduler.getIsRunning())
- var/datum/controller/process/process
-
- process = processScheduler.getProcess("air")
- stat(null, "[getStatName(process)]\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("alarm")
- var/list/alarms = alarm_manager.active_alarms()
- stat(null, "[getStatName(process)]([alarms.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("disease")
- stat(null, "[getStatName(process)]([active_diseases.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("garbage")
- stat(null, "[getStatName(process)]([garbage_collector.destroyed.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("machinery")
- stat(null, "[getStatName(process)]([machines.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("mob")
- stat(null, "[getStatName(process)]([mob_list.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("nanoui")
- stat(null, "[getStatName(process)]([nanomanager.processing_uis.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("lighting")
- stat(null, "[getStatName(process)]\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("obj")
- stat(null, "[getStatName(process)]([processing_objects.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("pipenet")
- stat(null, "[getStatName(process)]([pipe_networks.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("powernet")
- stat(null, "[getStatName(process)]([powernets.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("sun")
- stat(null, "[getStatName(process)]\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
- process = processScheduler.getProcess("ticker")
- stat(null, "[getStatName(process)]\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
+ for(var/datum/controller/process/P in processScheduler.processes)
+ statpanel("Status",P.getStatName(), P.getTickTime())
else
- stat(null, "processScheduler is not running.")
-
+ statpanel("Status","processScheduler is not running.")
if(listed_turf && client)
if(!TurfAdjacent(listed_turf))
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 39700bdfb5..af0ef28676 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -29,8 +29,8 @@
assailant = user
affecting = victim
- if(affecting.anchored)
- del(src)
+ if(affecting.anchored || !assailant.Adjacent(victim))
+ qdel(src)
return
affecting.grabbed_by += src
@@ -50,11 +50,6 @@
dancing = 1
adjust_position()
-/obj/item/weapon/grab/Del()
- //make sure the grabbed_by list doesn't fill up with nulls
- if(affecting) affecting.grabbed_by -= src
- ..()
-
//Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code.
/obj/item/weapon/grab/proc/throw()
if(affecting)
@@ -77,6 +72,9 @@
/obj/item/weapon/grab/process()
confirm()
+ if(!assailant)
+ qdel(src)
+ return
if(assailant.client)
assailant.client.screen -= hud
@@ -139,7 +137,7 @@
affecting.Weaken(2)
if(state >= GRAB_NECK)
- affecting.Stun(1)
+ affecting.Stun(3)
if(isliving(affecting))
var/mob/living/L = affecting
L.adjustOxyLoss(1)
@@ -213,7 +211,7 @@
if(world.time < (last_action + UPGRADE_COOLDOWN))
return
if(!assailant.canmove || assailant.lying)
- del(src)
+ qdel(src)
return
last_action = world.time
@@ -267,12 +265,12 @@
//This is used to make sure the victim hasn't managed to yackety sax away before using the grab.
/obj/item/weapon/grab/proc/confirm()
if(!assailant || !affecting)
- del(src)
+ qdel(src)
return 0
if(affecting)
if(!isturf(assailant.loc) || ( !isturf(affecting.loc) || assailant.loc != affecting.loc && get_dist(assailant, affecting) > 1) )
- del(src)
+ qdel(src)
return 0
return 1
@@ -394,14 +392,25 @@
user.visible_message("[user] devours [affecting]!")
affecting.loc = user
attacker.stomach_contents.Add(affecting)
- del(src)
+ qdel(src)
/obj/item/weapon/grab/dropped()
del(src)
-/obj/item/weapon/grab/Del()
+/obj/item/weapon/grab/Destroy()
+ //make sure the grabbed_by list doesn't fill up with nulls
+ if(affecting)
+ affecting.grabbed_by -= src
+ affecting = null
+ if(assailant)
+ if(assailant.client)
+ assailant.client.screen -= hud
+ assailant = null
+
animate(affecting, pixel_x = 0, pixel_y = 0, 4, 1, LINEAR_EASING)
affecting.layer = 4
- del(hud)
+ loc = null
+ qdel(hud)
+ hud = null
..()
\ No newline at end of file
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 101af1d94f..17def087b3 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -82,6 +82,7 @@
/mob/living/silicon/isSilicon()
return 1
+
/proc/isAI(A)
if(istype(A, /mob/living/silicon/ai))
return 1
@@ -93,10 +94,10 @@
/mob/living/silicon/ai/isAI()
return 1
-/mob/proc/isRobot()
+/mob/proc/isMobAI()
return 0
-/mob/living/silicon/robot/isRobot()
+/mob/living/silicon/ai/isMobAI()
return 1
/mob/proc/isSynthetic()
@@ -615,3 +616,65 @@ proc/is_blind(A)
eyeobj.setLoc(C)
return 1
+
+// Returns true if the mob has a client which has been active in the last given X minutes.
+/mob/proc/is_client_active(var/active = 1)
+ return client && client.inactivity < active MINUTES
+
+#define SAFE_PERP -50
+/mob/living/proc/assess_perp(var/auth_weapons, var/check_records, var/check_arrest)
+ if(stat == DEAD)
+ return SAFE_PERP
+
+ return 0
+
+/mob/living/carbon/human/assess_perp(var/obj/access_obj, var/auth_weapons, var/check_records, var/check_arrest)
+ var/threatcount = ..()
+ if(. == SAFE_PERP)
+ return SAFE_PERP
+
+ //Agent cards lower threatlevel.
+ var/obj/item/weapon/card/id/id = GetIdCard(src)
+ if(id && istype(id, /obj/item/weapon/card/id/syndicate))
+ threatcount -= 2
+ // A proper CentCom id is hard currency.
+ else if(id && istype(id, /obj/item/weapon/card/id/centcom))
+ return SAFE_PERP
+
+ if(auth_weapons && !access_obj.allowed(src))
+ if(istype(l_hand, /obj/item/weapon/gun) || istype(l_hand, /obj/item/weapon/melee))
+ threatcount += 4
+
+ if(istype(r_hand, /obj/item/weapon/gun) || istype(r_hand, /obj/item/weapon/melee))
+ threatcount += 4
+
+ if(istype(belt, /obj/item/weapon/gun) || istype(belt, /obj/item/weapon/melee))
+ threatcount += 2
+
+ if(species.name != "Human")
+ threatcount += 2
+
+ if(check_records || check_arrest)
+ var/perpname = name
+ if(id)
+ perpname = id.registered_name
+
+ var/datum/data/record/R = find_security_record("name", perpname)
+ if(check_records && !R)
+ threatcount += 4
+
+ if(check_arrest && R && (R.fields["criminal"] == "*Arrest*"))
+ threatcount += 4
+
+ return threatcount
+
+/mob/living/simple_animal/hostile/assess_perp(var/obj/access_obj, var/auth_weapons, var/check_records, var/check_arrest)
+ var/threatcount = ..()
+ if(. == SAFE_PERP)
+ return SAFE_PERP
+
+ if(!istype(src, /mob/living/simple_animal/hostile/retaliate/goat))
+ threatcount += 4
+ return threatcount
+
+#undef SAFE_PERP
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 6310588826..3cffc1a57a 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -188,7 +188,7 @@
if(S.victim == mob)
return
- if(mob.stat==2)
+ if(mob.stat==DEAD && isliving(mob))
mob.ghostize()
return
diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm
index f07cadb9e8..da68dfc0cc 100644
--- a/code/modules/mob/mob_transformation_simple.dm
+++ b/code/modules/mob/mob_transformation_simple.dm
@@ -1,58 +1,58 @@
-
-//This proc is the most basic of the procs. All it does is make a new mob on the same tile and transfer over a few variables.
-//Returns the new mob
-//Note that this proc does NOT do MMI related stuff!
-/mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/subspecies)
-
- if(istype(src,/mob/new_player))
- usr << "\red cannot convert players who have not entered yet."
- return
-
- if(!new_type)
- new_type = input("Mob type path:", "Mob type") as text|null
-
- if(istext(new_type))
- new_type = text2path(new_type)
-
- if( !ispath(new_type) )
- usr << "Invalid type path (new_type = [new_type]) in change_mob_type(). Contact a coder."
- return
-
- if( new_type == /mob/new_player )
- usr << "\red cannot convert into a new_player mob type."
- return
-
- var/mob/M
- if(isturf(location))
- M = new new_type( location )
- else
- M = new new_type( src.loc )
-
- if(!M || !ismob(M))
- usr << "Type path is not a mob (new_type = [new_type]) in change_mob_type(). Contact a coder."
- del(M)
- return
-
- if( istext(new_name) )
- M.name = new_name
- M.real_name = new_name
- else
- M.name = src.name
- M.real_name = src.real_name
-
- if(src.dna)
- M.dna = src.dna.Clone()
-
- if(mind)
- mind.transfer_to(M)
- else
- M.key = key
-
- if(subspecies && istype(M,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- H.set_species(subspecies)
-
- if(delete_old_mob)
- spawn(1)
- del(src)
- return M
+
+//This proc is the most basic of the procs. All it does is make a new mob on the same tile and transfer over a few variables.
+//Returns the new mob
+//Note that this proc does NOT do MMI related stuff!
+/mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/subspecies)
+
+ if(istype(src,/mob/new_player))
+ usr << "\red cannot convert players who have not entered yet."
+ return
+
+ if(!new_type)
+ new_type = input("Mob type path:", "Mob type") as text|null
+
+ if(istext(new_type))
+ new_type = text2path(new_type)
+
+ if( !ispath(new_type) )
+ usr << "Invalid type path (new_type = [new_type]) in change_mob_type(). Contact a coder."
+ return
+
+ if( new_type == /mob/new_player )
+ usr << "\red cannot convert into a new_player mob type."
+ return
+
+ var/mob/M
+ if(isturf(location))
+ M = new new_type( location )
+ else
+ M = new new_type( src.loc )
+
+ if(!M || !ismob(M))
+ usr << "Type path is not a mob (new_type = [new_type]) in change_mob_type(). Contact a coder."
+ qdel(M)
+ return
+
+ if( istext(new_name) )
+ M.name = new_name
+ M.real_name = new_name
+ else
+ M.name = src.name
+ M.real_name = src.real_name
+
+ if(src.dna)
+ M.dna = src.dna.Clone()
+
+ if(mind)
+ mind.transfer_to(M)
+ else
+ M.key = key
+
+ if(subspecies && istype(M,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = M
+ H.set_species(subspecies)
+
+ if(delete_old_mob)
+ spawn(1)
+ qdel(src)
+ return M
diff --git a/code/modules/mob/new_player/logout.dm b/code/modules/mob/new_player/logout.dm
index 9f064a99cd..ad1c9b3098 100644
--- a/code/modules/mob/new_player/logout.dm
+++ b/code/modules/mob/new_player/logout.dm
@@ -3,5 +3,5 @@
..()
if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to.
key = null//We null their key before deleting the mob, so they are properly kicked out.
- del(src)
+ qdel(src)
return
\ No newline at end of file
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 299caf37c5..fe1a86648d 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -5,6 +5,7 @@
var/spawning = 0//Referenced when you want to delete the new_player later on in the code.
var/totalPlayers = 0 //Player counts for the Lobby tab
var/totalPlayersReady = 0
+
universal_speak = 1
invisibility = 101
@@ -130,12 +131,14 @@
if(client.prefs.be_random_name)
client.prefs.real_name = random_name(client.prefs.gender)
+ if(client.prefs.dummy)
+ qdel(client.prefs.dummy)
observer.real_name = client.prefs.real_name
observer.name = observer.real_name
if(!client.holder && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed.
observer.verbs -= /mob/dead/observer/verb/toggle_antagHUD // Poor guys, don't know what they are missing!
observer.key = key
- del(src)
+ qdel(src)
return 1
@@ -327,8 +330,8 @@
AnnounceCyborg(character, rank, "has been downloaded to the empty core in \the [character.loc.loc]")
ticker.mode.latespawn(character)
- del(C)
- del(src)
+ qdel(C)
+ qdel(src)
return
//Find our spawning point.
@@ -368,7 +371,7 @@
else
AnnounceCyborg(character, rank, join_message)
- del(src)
+ qdel(src)
proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message)
if (ticker.current_state == GAME_STATE_PLAYING)
@@ -449,7 +452,8 @@
client.prefs.randomize_appearance_for(new_character)
else
client.prefs.copy_to(new_character)
-
+ if(client.prefs.dummy)
+ qdel(client.prefs.dummy)
src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo
if(mind)
@@ -527,3 +531,6 @@
/mob/new_player/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0)
return
+
+mob/new_player/MayRespawn()
+ return 1
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 6330504e3c..f5b6056e15 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -178,519 +178,41 @@ datum/preferences
b_skin = blue
- proc/update_preview_icon() //seriously. This is horrendous.
- del(preview_icon_front)
- del(preview_icon_side)
- del(preview_icon)
+ proc/update_preview_icon() //seriously. This is horrendous. //less so now
+ if(!dummy)
+ dummy = new(null, species)
+ dummy.set_species(species)
+ dummy.flags |= GODMODE
+ copy_to(dummy)
- var/g = "m"
- if(gender == FEMALE) g = "f"
+ var/jobflag
+ var/dept
+ if(job_civilian_high)
+ jobflag = job_civilian_high
+ dept = CIVILIAN
+ else if (job_medsci_high)
+ jobflag = job_medsci_high
+ dept = MEDSCI
+ else if (job_engsec_high)
+ jobflag = job_engsec_high
+ dept = ENGSEC
- var/icon/icobase
- var/datum/species/current_species = all_species[species]
-
- if(current_species)
- icobase = current_species.icobase
- else
- icobase = 'icons/mob/human_races/r_human.dmi'
-
- preview_icon = new /icon(icobase, "torso_[g]")
- preview_icon.Blend(new /icon(icobase, "groin_[g]"), ICON_OVERLAY)
- preview_icon.Blend(new /icon(icobase, "head_[g]"), ICON_OVERLAY)
-
- for(var/name in list("r_arm","r_hand","r_leg","r_foot","l_leg","l_foot","l_arm","l_hand"))
- if(organ_data[name] == "amputated") continue
- if(organ_data[name] == "cyborg")
- var/datum/robolimb/R
- if(rlimb_data[name]) R = all_robolimbs[rlimb_data[name]]
- if(!R) R = basic_robolimb
- preview_icon.Blend(icon(R.icon, "[name]"), ICON_OVERLAY) // This doesn't check gendered_icon. Not an issue while only limbs can be robotic.
- continue
- preview_icon.Blend(new /icon(icobase, "[name]"), ICON_OVERLAY)
-
- //Tail
- if(current_species && (current_species.tail))
- var/icon/temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[current_species.tail]_s")
- preview_icon.Blend(temp, ICON_OVERLAY)
-
- // Skin color
- if(current_species && (current_species.flags & HAS_SKIN_COLOR))
- preview_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
-
- // Skin tone
- if(current_species && (current_species.flags & HAS_SKIN_TONE))
- if (s_tone >= 0)
- preview_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
- else
- preview_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
-
- var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = current_species ? current_species.eyes : "eyes_s")
- if ((current_species && (current_species.flags & HAS_EYE_COLOR)))
- eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-
- var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
- if(hair_style)
- var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
- hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
- eyes_s.Blend(hair_s, ICON_OVERLAY)
-
- var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
- if(facial_hair_style)
- var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
- facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
- eyes_s.Blend(facial_s, ICON_OVERLAY)
-
- var/icon/underwear_s = null
- if(underwear && current_species.flags & HAS_UNDERWEAR)
- underwear_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = underwear)
-
- var/icon/undershirt_s = null
- if(undershirt && current_species.flags & HAS_UNDERWEAR)
- undershirt_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = undershirt)
-
- var/icon/clothes_s = null
- if(job_civilian_low & ASSISTANT)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
- clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if(backbag == 2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- else if(backbag == 3 || backbag == 4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
- else if(job_civilian_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
- switch(job_civilian_high)
- if(HOP)
- clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "ianshirt"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- 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)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "tophat"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(BOTANIST)
- clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "nymph"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CHEF)
- 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', "chefhat"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apronchef"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(JANITOR)
- clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_janitor"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(LIBRARIAN)
- clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hairflower"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(QUARTERMASTER)
- clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "poncho"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CARGOTECH)
- clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "flat_cap"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(MINER)
- clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "bearpelt"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(LAWYER)
- clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon(INV_R_HAND_DEF_ICON, "briefcase"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CHAPLAIN)
- clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "imperium_monk"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CLOWN)
- clothes_s = new /icon('icons/mob/uniform.dmi', "clown_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY)
- if(MIME)
- clothes_s = new /icon('icons/mob/uniform.dmi', "mime_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
- else if(job_medsci_high)
- switch(job_medsci_high)
- if(RD)
- clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "petehat"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(SCIENTIST)
- clothes_s = new /icon('icons/mob/uniform.dmi', "sciencewhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(XENOBIOLOGIST)
- clothes_s = new /icon('icons/mob/uniform.dmi', "sciencewhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CHEMIST)
- clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labgreen"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CMO)
- clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_cmo"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(DOCTOR)
- clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "surgeon"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(GENETICIST)
- clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "monkeysuit"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(VIROLOGIST)
- clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "plaguedoctor"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(ROBOTICIST)
- clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon(INV_R_HAND_DEF_ICON, "toolbox_blue"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
- else if(job_engsec_high)
- switch(job_engsec_high)
- if(CAPTAIN)
- clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "centcomcaptain"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "captain"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(HOS)
- clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_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)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hosberet"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(WARDEN)
- clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "slippers_worn"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(DETECTIVE)
- clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(OFFICER)
- clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "officerberet"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CHIEF)
- clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon(INV_R_HAND_DEF_ICON, "blueprints"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(ENGINEER)
- clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hazard"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(ATMOSTECH)
- clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "firesuit"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
- if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
- clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "straight_jacket"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
- if(backbag == 2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- else if(backbag == 3 || backbag == 4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CYBORG)
- clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "cardborg"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
- if(backbag == 2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- else if(backbag == 3 || backbag == 4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
- if(disabilities & NEARSIGHTED)
- preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
-
- preview_icon.Blend(eyes_s, ICON_OVERLAY)
- if(underwear_s)
- preview_icon.Blend(underwear_s, ICON_OVERLAY)
- if(undershirt_s)
- preview_icon.Blend(undershirt_s, ICON_OVERLAY)
- if(clothes_s)
- preview_icon.Blend(clothes_s, ICON_OVERLAY)
+ if(jobflag && dept && job_master)
+ for (var/datum/job/J in job_master.occupations)
+ if((J.department_flag & dept) && (J.flag & jobflag))
+ var/alt = GetPlayerAltTitle(J)
+ if(alt) //more hacks
+ if(!dummy.mind)
+ dummy.mind = new
+ dummy.mind.role_alt_title = alt
+ J.equip(dummy)
+ break
+ dummy.update_eyes()
+ dummy.force_update_limbs()
+ dummy.regenerate_icons()
+ preview_icon = icon(dummy.icon)
+ for(var/image/I in dummy.overlays_standing)
+ if(I && I.icon)
+ preview_icon.Blend(icon(I.icon, I.icon_state), ICON_OVERLAY)
preview_icon_front = new(preview_icon, dir = SOUTH)
- preview_icon_side = new(preview_icon, dir = WEST)
-
- del(eyes_s)
- del(underwear_s)
- del(undershirt_s)
- del(clothes_s)
+ preview_icon_side = new(preview_icon, dir = WEST)
\ No newline at end of file
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 958f0b982a..c0a7fbce3c 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -12,7 +12,7 @@
icon = null
invisibility = 101
for(var/t in organs)
- del(t)
+ qdel(t)
var/atom/movable/overlay/animation = new /atom/movable/overlay( loc )
animation.icon_state = "blank"
animation.icon = 'icons/mob/mob.dmi'
@@ -37,7 +37,7 @@
dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF)
src << "You are now [species.name]. "
- del(animation)
+ qdel(animation)
return src
@@ -49,7 +49,7 @@
if (monkeyizing)
return
for(var/t in organs)
- del(t)
+ qdel(t)
return ..(move)
@@ -106,8 +106,7 @@
O.add_ai_verbs()
O.rename_self("ai",1)
- spawn(0)
- del(src)
+ qdel(src)
return O
//human -> robot
@@ -122,7 +121,7 @@
icon = null
invisibility = 101
for(var/t in organs)
- del(t)
+ qdel(t)
var/mob/living/silicon/robot/O = new /mob/living/silicon/robot( loc )
@@ -159,8 +158,7 @@
callHook("borgify", list(O))
O.Namepick()
- spawn(0)//To prevent the proc from returning null.
- del(src)
+ qdel(src)
return O
//human -> alien
@@ -175,7 +173,7 @@
icon = null
invisibility = 101
for(var/t in organs)
- del(t)
+ qdel(t)
var/alien_caste = pick("Hunter","Sentinel","Drone")
var/mob/living/carbon/human/new_xeno = create_new_xenomorph(alien_caste,loc)
@@ -184,8 +182,7 @@
new_xeno.key = key
new_xeno << "You are now an alien."
- spawn(0)//To prevent the proc from returning null.
- del(src)
+ qdel(src)
return
/mob/living/carbon/human/proc/slimeize(adult as num, reproduce as num)
@@ -199,7 +196,7 @@
icon = null
invisibility = 101
for(var/t in organs)
- del(t)
+ qdel(t)
var/mob/living/carbon/slime/new_slime
if(reproduce)
@@ -219,8 +216,7 @@
new_slime.key = key
new_slime << "You are now a slime. Skreee!"
- spawn(0)//To prevent the proc from returning null.
- del(src)
+ qdel(src)
return
/mob/living/carbon/human/proc/corgize()
@@ -234,15 +230,14 @@
icon = null
invisibility = 101
for(var/t in organs) //this really should not be necessary
- del(t)
+ qdel(t)
var/mob/living/simple_animal/corgi/new_corgi = new /mob/living/simple_animal/corgi (loc)
new_corgi.a_intent = I_HURT
new_corgi.key = key
new_corgi << "You are now a Corgi. Yap Yap!"
- spawn(0)//To prevent the proc from returning null.
- del(src)
+ qdel(src)
return
/mob/living/carbon/human/Animalize()
@@ -266,7 +261,7 @@
invisibility = 101
for(var/t in organs)
- del(t)
+ qdel(t)
var/mob/new_mob = new mobpath(src.loc)
@@ -276,7 +271,7 @@
new_mob << "You suddenly feel more... animalistic."
spawn()
- del(src)
+ qdel(src)
return
/mob/proc/Animalize()
@@ -294,7 +289,7 @@
new_mob.a_intent = I_HURT
new_mob << "You feel more... animalistic"
- del(src)
+ qdel(src)
/* Certain mob types have problems and should not be allowed to be controlled by players.
*
diff --git a/code/modules/mob/update_icons.dm b/code/modules/mob/update_icons.dm
index 480c4be322..33c54cf63b 100644
--- a/code/modules/mob/update_icons.dm
+++ b/code/modules/mob/update_icons.dm
@@ -2,8 +2,11 @@
//Having them here also makes for a nice reference list of the various overlay-updating procs available
//default item on-mob icons
+#define INV_BACK_DEF_ICON 'icons/mob/back.dmi'
#define INV_L_HAND_DEF_ICON 'icons/mob/items/lefthand.dmi'
#define INV_R_HAND_DEF_ICON 'icons/mob/items/righthand.dmi'
+#define INV_W_UNIFORM_DEF_ICON 'icons/mob/uniform.dmi'
+#define INV_ACCESSORIES_DEF_ICON 'icons/mob/ties.dmi'
/mob/proc/regenerate_icons() //TODO: phase this out completely if possible
diff --git a/code/modules/nano/interaction/base.dm b/code/modules/nano/interaction/base.dm
index 65a7b273eb..10cda75162 100644
--- a/code/modules/nano/interaction/base.dm
+++ b/code/modules/nano/interaction/base.dm
@@ -17,3 +17,18 @@
else if (restrained() || lying || stat || stunned || weakened)
return STATUS_UPDATE // update only (orange visibility)
return STATUS_INTERACTIVE
+
+/mob/living/silicon/ai/shared_nano_interaction()
+ if(lacks_power())
+ return STATUS_CLOSE
+ if (check_unable(1))
+ return STATUS_CLOSE
+ return ..()
+
+/mob/living/silicon/robot/shared_nano_interaction()
+ . = STATUS_INTERACTIVE
+ if(cell.charge <= 0)
+ return STATUS_CLOSE
+ if(lockcharge)
+ . = STATUS_DISABLED
+ return min(., ..())
diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm
index 6fd931160d..aa692e0a23 100644
--- a/code/modules/nano/interaction/default.dm
+++ b/code/modules/nano/interaction/default.dm
@@ -21,10 +21,10 @@
return ..()
/mob/living/silicon/robot/default_can_use_topic(var/src_object)
- if(stat || !client)
- return STATUS_CLOSE
- if(lockcharge || stunned || weakened)
- return STATUS_DISABLED
+ . = shared_nano_interaction()
+ if(. <= STATUS_DISABLED)
+ return
+
// robots can interact with things they can see within their view range
if((src_object in view(src)) && get_dist(src_object, src) <= src.client.view)
return STATUS_INTERACTIVE // interactive (green visibility)
@@ -46,8 +46,10 @@
return STATUS_UPDATE
/mob/living/silicon/ai/default_can_use_topic(var/src_object)
- if(!client || check_unable(1))
- return STATUS_CLOSE
+ . = shared_nano_interaction()
+ if(. != STATUS_INTERACTIVE)
+ return
+
// Prevents the AI from using Topic on admin levels (by for example viewing through the court/thunderdome cameras)
// unless it's on the same level as the object it's interacting with.
var/turf/T = get_turf(src_object)
@@ -61,9 +63,8 @@
// If we're installed in a chassi, rather than transfered to an inteliCard or other container, then check if we have camera view
if(is_in_chassis())
//stop AIs from leaving windows open and using then after they lose vision
- //apc_override is needed here because AIs use their own APC when powerless
if(cameranet && !cameranet.checkTurfVis(get_turf(src_object)))
- return apc_override ? STATUS_INTERACTIVE : STATUS_CLOSE
+ return STATUS_CLOSE
return STATUS_INTERACTIVE
else if(get_dist(src_object, src) <= client.view) // View does not return what one would expect while installed in an inteliCard
return STATUS_INTERACTIVE
@@ -89,15 +90,15 @@
/mob/living/default_can_use_topic(var/src_object)
. = shared_nano_interaction(src_object)
- if(. == STATUS_INTERACTIVE)
+ if(. != STATUS_CLOSE)
if(loc)
- . = loc.contents_nano_distance(src_object, src)
+ . = min(., loc.contents_nano_distance(src_object, src))
if(STATUS_INTERACTIVE)
return STATUS_UPDATE
/mob/living/carbon/human/default_can_use_topic(var/src_object)
. = shared_nano_interaction(src_object)
- if(. == STATUS_INTERACTIVE)
- . = shared_living_nano_distance(src_object)
+ if(. != STATUS_CLOSE)
+ . = min(., shared_living_nano_distance(src_object))
if(. == STATUS_UPDATE && (TK in mutations)) // If we have telekinesis and remain close enough, allow interaction.
return STATUS_INTERACTIVE
diff --git a/code/modules/nano/interaction/physical.dm b/code/modules/nano/interaction/physical.dm
new file mode 100644
index 0000000000..36f9a20971
--- /dev/null
+++ b/code/modules/nano/interaction/physical.dm
@@ -0,0 +1,18 @@
+/var/global/datum/topic_state/physical/physical_state = new()
+
+/datum/topic_state/physical/can_use_topic(var/src_object, var/mob/user)
+ . = user.shared_nano_interaction(src_object)
+ if(. > STATUS_CLOSE)
+ return min(., user.check_physical_distance(src_object))
+
+/mob/proc/check_physical_distance(var/src_object)
+ return STATUS_CLOSE
+
+/mob/dead/observer/check_physical_distance(var/src_object)
+ return default_can_use_topic(src_object)
+
+/mob/living/check_physical_distance(var/src_object)
+ return shared_living_nano_distance(src_object)
+
+/mob/living/silicon/check_physical_distance(var/src_object)
+ return max(STATUS_UPDATE, shared_living_nano_distance(src_object))
diff --git a/code/modules/nano/interaction/self.dm b/code/modules/nano/interaction/self.dm
new file mode 100644
index 0000000000..639e50e161
--- /dev/null
+++ b/code/modules/nano/interaction/self.dm
@@ -0,0 +1,9 @@
+/*
+ This state checks that the src_object is the same the as user
+*/
+/var/global/datum/topic_state/self_state/self_state = new()
+
+/datum/topic_state/self_state/can_use_topic(var/src_object, var/mob/user)
+ if(src_object != user)
+ return STATUS_CLOSE
+ return user.shared_nano_interaction()
diff --git a/code/modules/nano/modules/alarm_monitor.dm b/code/modules/nano/modules/alarm_monitor.dm
index b27349bf9a..d073f6f6d2 100644
--- a/code/modules/nano/modules/alarm_monitor.dm
+++ b/code/modules/nano/modules/alarm_monitor.dm
@@ -3,14 +3,7 @@
var/list_cameras = 0 // Whether or not to list camera references. A future goal would be to merge this with the enginering/security camera console. Currently really only for AI-use.
var/list/datum/alarm_handler/alarm_handlers // The particular list of alarm handlers this alarm monitor should present to the user.
-/obj/nano_module/alarm_monitor/ai
- list_cameras = 1
-
-/obj/nano_module/alarm_monitor/ai/New()
- ..()
- alarm_handlers = alarm_manager.all_handlers
-
-/obj/nano_module/alarm_monitor/borg/New()
+/obj/nano_module/alarm_monitor/all/New()
..()
alarm_handlers = alarm_manager.all_handlers
@@ -63,7 +56,7 @@
usr.switch_to_camera(C)
return 1
-/obj/nano_module/alarm_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/nano_module/alarm_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
var/data[0]
var/categories[0]
@@ -73,7 +66,7 @@
var/cameras[0]
var/lost_sources[0]
- if(list_cameras)
+ if(user.isMobAI())
for(var/obj/machinery/camera/C in A.cameras())
cameras[++cameras.len] = C.nano_structure()
for(var/datum/alarm_source/AS in A.sources)
@@ -90,7 +83,7 @@
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
- ui = new(user, src, ui_key, "alarm_monitor.tmpl", "Alarm Monitoring Console", 800, 800)
+ ui = new(user, src, ui_key, "alarm_monitor.tmpl", "Alarm Monitoring Console", 800, 800, state = state)
ui.set_initial_data(data)
ui.open()
ui.set_auto_update(1)
diff --git a/code/modules/nano/modules/atmos_control.dm b/code/modules/nano/modules/atmos_control.dm
new file mode 100644
index 0000000000..3897526865
--- /dev/null
+++ b/code/modules/nano/modules/atmos_control.dm
@@ -0,0 +1,74 @@
+/obj/nano_module/atmos_control
+ name = "Atmospherics Control"
+ var/ui_ref
+ var/emagged = 0
+ var/list/monitored_alarms = list()
+ var/datum/topic_state/atmos_state
+
+/obj/nano_module/atmos_control/New(atmos_computer, req_access, req_one_access, monitored_alarm_ids)
+ ..()
+ loc = atmos_computer
+ src.req_access = req_access
+ src.req_one_access = req_one_access
+ atmos_state = default_state
+
+ if(monitored_alarm_ids)
+ for(var/obj/machinery/alarm/alarm in machines)
+ if(alarm.alarm_id && alarm.alarm_id in monitored_alarm_ids)
+ monitored_alarms += alarm
+ // machines may not yet be ordered at this point
+ monitored_alarms = dd_sortedObjectList(monitored_alarms)
+
+/obj/nano_module/atmos_control/Topic(href, href_list)
+ if(..())
+ return 1
+
+ if(href_list["alarm"])
+ if(ui_ref)
+ var/obj/machinery/alarm/alarm = locate(href_list["alarm"]) in (monitored_alarms.len ? monitored_alarms : machines)
+ if(alarm)
+ var/datum/topic_state/TS = generate_state(alarm)
+ alarm.ui_interact(usr, master_ui = ui_ref, state = TS)
+ return 1
+
+/obj/nano_module/atmos_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
+ var/data[0]
+ var/alarms[0]
+
+ // TODO: Move these to a cache, similar to cameras
+ for(var/obj/machinery/alarm/alarm in (monitored_alarms.len ? monitored_alarms : machines))
+ alarms[++alarms.len] = list("name" = sanitize(alarm.name), "ref"= "\ref[alarm]", "danger" = max(alarm.danger_level, alarm.alarm_area.atmosalm))
+ data["alarms"] = alarms
+
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "atmos_control.tmpl", src.name, 625, 625, state = state)
+ ui.set_initial_data(data)
+ ui.open()
+ ui.set_auto_update(1)
+ ui_ref = ui
+
+/obj/nano_module/atmos_control/proc/generate_state(air_alarm)
+ var/datum/topic_state/air_alarm/state = new()
+ state.atmos_control = src
+ state.air_alarm = air_alarm
+ return state
+
+/datum/topic_state/air_alarm
+ var/obj/nano_module/atmos_control/atmos_control = null
+ var/obj/machinery/alarm/air_alarm = null
+
+/datum/topic_state/air_alarm/can_use_topic(var/src_object, var/mob/user)
+ if(has_access(user))
+ return STATUS_INTERACTIVE
+ return STATUS_UPDATE
+
+/datum/topic_state/air_alarm/href_list(var/mob/user)
+ var/list/extra_href = list()
+ extra_href["remote_connection"] = 1
+ extra_href["remote_access"] = has_access(user)
+
+ return extra_href
+
+/datum/topic_state/air_alarm/proc/has_access(var/mob/user)
+ return user && (user.isAI() || atmos_control.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO))
diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm
index bb60182a1b..2758b859d7 100644
--- a/code/modules/nano/modules/crew_monitor.dm
+++ b/code/modules/nano/modules/crew_monitor.dm
@@ -25,7 +25,7 @@
AI.ai_actual_track(H)
return 1
-/obj/nano_module/crew_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/nano_module/crew_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
user.set_machine(src)
src.scan()
@@ -74,7 +74,7 @@
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if(!ui)
- ui = new(user, src, ui_key, "crew_monitor.tmpl", "Crew Monitoring Computer", 900, 800)
+ ui = new(user, src, ui_key, "crew_monitor.tmpl", "Crew Monitoring Computer", 900, 800, state = state)
// adding a template with the key "mapContent" enables the map ui functionality
ui.add_template("mapContent", "crew_monitor_map_content.tmpl")
diff --git a/code/modules/nano/modules/law_manager.dm b/code/modules/nano/modules/law_manager.dm
index 7cdd93b4dc..93caa4c48b 100644
--- a/code/modules/nano/modules/law_manager.dm
+++ b/code/modules/nano/modules/law_manager.dm
@@ -147,7 +147,7 @@
R << "Law Notice"
R.laws.show_laws(R)
if(usr != owner)
- usr << "Laws displayed."
return 1
return 0
diff --git a/code/modules/nano/modules/power_monitor.dm b/code/modules/nano/modules/power_monitor.dm
index 03d9263a80..ed7c64aa94 100644
--- a/code/modules/nano/modules/power_monitor.dm
+++ b/code/modules/nano/modules/power_monitor.dm
@@ -7,7 +7,7 @@
..()
refresh_sensors()
-/obj/nano_module/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/nano_module/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
var/list/data = list()
var/list/sensors = list()
// Focus: If it remains null if no sensor is selected and UI will display sensor list, otherwise it will display sensor reading.
@@ -28,14 +28,12 @@
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
- ui = new(user, src, ui_key, "power_monitor.tmpl", "Power Monitoring Console", 800, 500)
+ ui = new(user, src, ui_key, "power_monitor.tmpl", "Power Monitoring Console", 800, 500, state = state)
ui.set_initial_data(data)
ui.open()
ui.set_auto_update(1)
-// Proc: refresh_sensors()
-// Parameters: None
-// Description: Refreshes list of active sensors kept on this computer.
+// Refreshes list of active sensors kept on this computer.
/obj/nano_module/power_monitor/proc/refresh_sensors()
grid_sensors = list()
var/turf/T = get_turf(src)
@@ -46,13 +44,13 @@
else
grid_sensors += S
-// Proc: Topic()
-// Parameters: 2 (href, href_list - allows us to process UI clicks)
-// Description: Allows us to process UI clicks, which are relayed in form of hrefs.
+// Allows us to process UI clicks, which are relayed in form of hrefs.
/obj/nano_module/power_monitor/Topic(href, href_list)
if(..())
return
if( href_list["clear"] )
active_sensor = null
+ if( href_list["refresh"] )
+ refresh_sensors()
else if( href_list["setsensor"] )
active_sensor = href_list["setsensor"]
diff --git a/code/modules/nano/modules/rcon.dm b/code/modules/nano/modules/rcon.dm
index abdae311d0..58e55894c1 100644
--- a/code/modules/nano/modules/rcon.dm
+++ b/code/modules/nano/modules/rcon.dm
@@ -8,7 +8,7 @@
var/hide_SMES_details = 0
var/hide_breakers = 0
-/obj/nano_module/rcon/ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=1)
+/obj/nano_module/rcon/ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=1, var/datum/topic_state/state = default_state)
FindDevices() // Update our devices list
var/data[0]
@@ -41,7 +41,7 @@
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
- ui = new(user, src, ui_key, "rcon.tmpl", "RCON Console", 600, 400)
+ ui = new(user, src, ui_key, "rcon.tmpl", "RCON Console", 600, 400, state = state)
ui.set_initial_data(data)
ui.open()
ui.set_auto_update(1)
diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm
index 1eab38904c..6cd162b50a 100644
--- a/code/modules/organs/blood.dm
+++ b/code/modules/organs/blood.dm
@@ -288,7 +288,7 @@ proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large)
// Only a certain number of drips (or one large splatter) can be on a given turf.
for(var/obj/effect/decal/cleanable/blood/drip/drop in T)
drips |= drop.drips
- del(drop)
+ qdel(drop)
if(!large && drips.len < 3)
decal_type = /obj/effect/decal/cleanable/blood/drip
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index a9da448693..06dd521f64 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -315,7 +315,7 @@ var/list/organ_cache = list()
if(fingerprintslast) O.fingerprintslast = fingerprintslast
user.put_in_active_hand(O)
- del(src)
+ qdel(src)
/obj/item/organ/attack_self(mob/user as mob)
diff --git a/code/modules/organs/organ_alien.dm b/code/modules/organs/organ_alien.dm
index d326e2ade4..4e2610f584 100644
--- a/code/modules/organs/organ_alien.dm
+++ b/code/modules/organs/organ_alien.dm
@@ -5,12 +5,12 @@
//This is a terrible hack and I should be ashamed.
var/datum/seed/diona = plant_controller.seeds["diona"]
if(!diona)
- del(src)
+ qdel(src)
spawn(1) // So it has time to be thrown about by the gib() proc.
var/mob/living/carbon/alien/diona/D = new(get_turf(organ))
diona.request_player(D)
- del(organ)
+ qdel(organ)
/obj/item/organ/external/diona
name = "tendril"
@@ -130,7 +130,7 @@
/obj/item/organ/external/diona/removed()
..()
if(!istype(owner))
- del(src)
+ qdel(src)
if(!owner.organs.len)
owner.death()
@@ -175,7 +175,7 @@
..()
if(!istype(owner))
- del(src)
+ qdel(src)
if(!owner.internal_organs.len)
owner.death()
@@ -247,7 +247,7 @@
B.ckey = owner.ckey
spawn(0)
- del(src)
+ qdel(src)
//XENOMORPH ORGANS
/obj/item/organ/xenos/eggsac
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 650eea751c..4bf7b9c99e 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -210,25 +210,29 @@
// sync the organ's damage with its wounds
src.update_damages()
+ owner.updatehealth() //droplimb will call updatehealth() again if it does end up being called
//If limb took enough damage, try to cut or tear it off
if(owner && loc == owner)
if(!cannot_amputate && config.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * config.organ_health_multiplier))
- var/threshold = max_damage/3
+ var/threshold = max_damage
var/dropped
if((burn >= threshold) && prob(burn/3))
dropped = 1
droplimb(0,DROPLIMB_BURN)
if(!dropped && prob(brute))
- if(brute >= threshold)
- if((sharp || edge) && istype(used_weapon,/obj/item))
- var/obj/item/W = used_weapon
- if(W.w_class >= 3)
- droplimb(0,DROPLIMB_EDGE)
+ var/edge_eligible = 0
+ if(edge && istype(used_weapon,/obj/item))
+ var/obj/item/W = used_weapon
+ if(W.w_class >= 3)
+ edge_eligible = 1
+
+ if(brute >= threshold || (edge_eligible && brute >= threshold/3))
+ if((sharp || edge))
+ droplimb(0,DROPLIMB_EDGE)
else
droplimb(0,DROPLIMB_BLUNT)
- owner.updatehealth()
return update_icon()
/obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0)
@@ -685,9 +689,9 @@ Note that amputating the affected organ does in fact remove the infection from t
if(src && istype(loc,/turf))
throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
dir = 2
- return
if(DROPLIMB_BURN)
new /obj/effect/decal/cleanable/ash(get_turf(victim))
+ qdel(src)
if(DROPLIMB_BLUNT)
var/obj/effect/decal/cleanable/blood/gibs/gore = new owner.species.single_gib_type(get_turf(victim))
if(victim.species.flesh_color)
@@ -701,8 +705,7 @@ Note that amputating the affected organ does in fact remove the infection from t
I.removed()
if(istype(loc,/turf))
I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
-
- del(src)
+ qdel(src)
/****************************************************
HELPERS
@@ -878,7 +881,7 @@ Note that amputating the affected organ does in fact remove the infection from t
victim.bad_external_organs -= src
for(var/implant in implants) //todo: check if this can be left alone
- del(implant)
+ qdel(implant)
// Attached organs also fly off.
if(!ignore_children)
@@ -908,8 +911,8 @@ Note that amputating the affected organ does in fact remove the infection from t
spark_system.attach(owner)
spark_system.start()
spawn(10)
- del(spark_system)
- del(src)
+ qdel(spark_system)
+ qdel(src)
/obj/item/organ/external/proc/disfigure(var/type = "brute")
if (disfigured)
diff --git a/code/modules/organs/organ_stump.dm b/code/modules/organs/organ_stump.dm
index c08363e10b..728f9cd1bc 100644
--- a/code/modules/organs/organ_stump.dm
+++ b/code/modules/organs/organ_stump.dm
@@ -21,4 +21,4 @@
/obj/item/organ/external/stump/removed()
..()
- del(src)
+ qdel(src)
diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm
index 7f0b8548c9..5309b05096 100644
--- a/code/modules/overmap/sectors.dm
+++ b/code/modules/overmap/sectors.dm
@@ -108,7 +108,7 @@ var/global/list/map_sectors = list()
map_sectors["[map_z]"] = src
testing("Temporary sector at [x],[y] was created, corresponding zlevel is [map_z].")
-/obj/effect/map/sector/temporary/Del()
+/obj/effect/map/sector/temporary/Destroy()
map_sectors["[map_z]"] = null
testing("Temporary sector at [x],[y] was deleted.")
if (can_die())
diff --git a/code/modules/overmap/ships/engines/engine.dm b/code/modules/overmap/ships/engines/engine.dm
index 80690aa84d..6e927e6431 100644
--- a/code/modules/overmap/ships/engines/engine.dm
+++ b/code/modules/overmap/ships/engines/engine.dm
@@ -57,4 +57,4 @@ var/list/ship_engines = list()
if (E.z == zlevel)
E.engines -= src
break
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/overmap/ships/engines/thermal.dm b/code/modules/overmap/ships/engines/thermal.dm
index 44a7dcb84f..b2f537bb96 100644
--- a/code/modules/overmap/ships/engines/thermal.dm
+++ b/code/modules/overmap/ships/engines/thermal.dm
@@ -57,7 +57,7 @@
..()
controller = new(src)
-/obj/machinery/atmospherics/unary/engine/Del()
+/obj/machinery/atmospherics/unary/engine/Destroy()
..()
controller.die()
diff --git a/code/modules/overmap/ships/ship.dm b/code/modules/overmap/ships/ship.dm
index 1dd7a17e46..9b8557363d 100644
--- a/code/modules/overmap/ships/ship.dm
+++ b/code/modules/overmap/ships/ship.dm
@@ -8,6 +8,7 @@
var/last_burn = 0
var/list/last_movement = list(0,0)
var/fore_dir = NORTH
+ var/rotate = 1 //For proc rotate
var/obj/effect/map/current_sector
var/obj/machinery/computer/helm/nav_control
@@ -70,7 +71,7 @@
/obj/effect/map/ship/proc/get_brake_path()
if(!get_acceleration())
return INFINITY
- return max(abs(speed[1]),abs(speed[2]))/get_acceleration()
+ return get_speed()/get_acceleration()
#define SIGN(X) (X == 0 ? 0 : (X > 0 ? 1 : -1))
/obj/effect/map/ship/proc/decelerate()
@@ -94,13 +95,21 @@
if(direction & SOUTH)
adjust_speed(0, -get_acceleration())
+
+/obj/effect/map/ship/proc/rotate(var/direction)
+ var/matrix/M = matrix()
+ M.Turn(dir2angle(direction))
+ src.transform = M //Rotate ship
+
/obj/effect/map/ship/process()
if(!is_still())
var/list/deltas = list(0,0)
for(var/i=1, i<=2, i++)
- if(speed[i] && world.time > last_movement[i] + default_delay - speed[i])
+ if(speed[i] && world.time > last_movement[i] + default_delay - abs(speed[i]))
deltas[i] = speed[i] > 0 ? 1 : -1
last_movement[i] = world.time
var/turf/newloc = locate(x + deltas[1], y + deltas[2], z)
if(newloc)
- Move(newloc)
\ No newline at end of file
+ Move(newloc)
+ if(rotate)
+ rotate(get_heading())
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 9598800312..2253e049a5 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -68,14 +68,14 @@
//The topmost paper. I don't think there's any way to organise contents in byond, so this is what we're stuck with. -Pete
if(toppaper)
var/obj/item/weapon/paper/P = toppaper
- dat += "Write Remove - [P.name]
"
+ dat += "Write Remove Rename - [P.name]
"
for(var/obj/item/weapon/paper/P in src)
if(P==toppaper)
continue
- dat += "Remove - [P.name]
"
+ dat += "Remove Rename - [P.name]
"
for(var/obj/item/weapon/photo/Ph in src)
- dat += "Remove - [Ph.name]
"
+ dat += "Remove Rename - [Ph.name]
"
user << browse(dat, "window=clipboard")
onclose(user, "clipboard")
@@ -129,6 +129,18 @@
toppaper = newtop
else
toppaper = null
+
+ else if(href_list["rename"])
+ var/obj/item/weapon/O = locate(href_list["rename"])
+
+ if(O && (O.loc == src))
+ if(istype(O, /obj/item/weapon/paper))
+ var/obj/item/weapon/paper/to_rename = O
+ to_rename.rename()
+
+ else if(istype(O, /obj/item/weapon/photo))
+ var/obj/item/weapon/photo/to_rename = O
+ to_rename.rename()
else if(href_list["read"])
var/obj/item/weapon/paper/P = locate(href_list["read"])
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 33d0bb31c6..7cd104870f 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -189,7 +189,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
else if (istype(copyitem, /obj/item/weapon/photo))
rcvdcopy = photocopy(copyitem)
else if (istype(copyitem, /obj/item/weapon/paper_bundle))
- rcvdcopy = bundlecopy(copyitem)
+ rcvdcopy = bundlecopy(copyitem, 0)
else
visible_message("[src] beeps, \"Error transmitting message.\"")
return
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index ddc211cc7c..c10b940c1e 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -44,11 +44,11 @@
var/dat = "[name]"
for(var/obj/item/weapon/paper/P in src)
- dat += "Remove - [P.name]
"
+ dat += "Remove Rename - [P.name]
"
for(var/obj/item/weapon/photo/Ph in src)
- dat += "Remove - [Ph.name]
"
+ dat += "Remove Rename - [Ph.name]
"
for(var/obj/item/weapon/paper_bundle/Pb in src)
- dat += "Remove - [Pb.name]
"
+ dat += "Remove Rename - [Pb.name]
"
user << browse(dat, "window=folder")
onclose(user, "folder")
add_fingerprint(usr)
@@ -85,7 +85,22 @@
if(P && (P.loc == src) && istype(P))
P.attack_self(usr)
onclose(usr, "[P.name]")
-
+ else if(href_list["rename"])
+ var/obj/item/weapon/O = locate(href_list["rename"])
+
+ if(O && (O.loc == src))
+ if(istype(O, /obj/item/weapon/paper))
+ var/obj/item/weapon/paper/to_rename = O
+ to_rename.rename()
+
+ else if(istype(O, /obj/item/weapon/photo))
+ var/obj/item/weapon/photo/to_rename = O
+ to_rename.rename()
+
+ else if(istype(O, /obj/item/weapon/paper_bundle))
+ var/obj/item/weapon/paper_bundle/to_rename = O
+ to_rename.rename()
+
//Update everything
attack_self(usr)
update_icon()
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 9c9fe2e639..f855d27452 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -22,6 +22,7 @@
var/info_links //A different version of the paper which includes html links at fields and EOF
var/stamps //The (text for the) stamps on the paper.
var/fields //Amount of user created fields
+ var/free_space = MAX_PAPER_MESSAGE_LEN
var/list/stamped
var/list/ico[0] //Icons and
var/list/offset_x[0] //offsets stored for later
@@ -51,6 +52,7 @@
spawn(2)
update_icon()
+ update_space(info)
updateinfolinks()
return
@@ -62,6 +64,12 @@
return
icon_state = "paper"
+/obj/item/weapon/paper/proc/update_space(var/new_text)
+ if(!new_text)
+ return
+
+ free_space -= length(strip_html_properly(new_text))
+
/obj/item/weapon/paper/examine(mob/user)
..()
if(in_range(user, src) || istype(user, /mob/dead/observer))
@@ -87,11 +95,14 @@
usr << "You cut yourself on the paper."
return
var/n_name = sanitizeSafe(input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text, MAX_NAME_LEN)
- if((loc == usr && usr.stat == 0))
- name = "[(n_name ? text("[n_name]") : initial(name))]"
- if(name != "paper")
- desc = "This is a paper titled '" + name + "'."
- add_fingerprint(usr)
+
+ // We check loc one level up, so we can rename in clipboards and such. See also: /obj/item/weapon/photo/rename()
+ if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0 && n_name)
+ name = n_name
+ if(n_name != "paper")
+ desc = "This is a paper titled '" + name + "'."
+
+ add_fingerprint(usr)
return
/obj/item/weapon/paper/attack_self(mob/living/user as mob)
@@ -188,6 +199,7 @@
/obj/item/weapon/paper/proc/clearpaper()
info = null
stamps = null
+ free_space = MAX_PAPER_MESSAGE_LEN
stamped = list()
overlays.Cut()
updateinfolinks()
@@ -268,31 +280,6 @@
return t
-
-/obj/item/weapon/paper/proc/openhelp(mob/user as mob)
- user << browse({"Pen Help
-
- Crayon&Pen commands
-
- \[br\] : Creates a linebreak.
- \[center\] - \[/center\] : Centers the text.
- \[h1\] - \[/h1\] : Makes the text a first level heading
- \[h2\] - \[/h2\] : Makes the text a second level heading
- \[h3\] - \[/h3\] : Makes the text a third level heading
- \[b\] - \[/b\] : Makes the text bold.
- \[i\] - \[/i\] : Makes the text italic.
- \[u\] - \[/u\] : Makes the text underlined.
- \[large\] - \[/large\] : Increases the size of the text.
- \[sign\] : Inserts a signature of your name in a foolproof way.
- \[field\] : Inserts an invisible field which lets you start type from there. Useful for forms.
-
- Pen exclusive commands
- \[small\] - \[/small\] : Decreases the size of the text.
- \[list\] - \[/list\] : A list.
- \[*\] : A dot used for lists.
- \[hr\] : Adds a horizontal rule.
- "}, "window=paper_help")
-
/obj/item/weapon/paper/proc/burnpaper(obj/item/weapon/flame/P, mob/user)
var/class = ""
@@ -312,7 +299,7 @@
user.drop_from_inventory(src)
new /obj/effect/decal/cleanable/ash(src.loc)
- del(src)
+ qdel(src)
else
user << "\red You must hold \the [P] steady to burn \the [src]."
@@ -327,12 +314,11 @@
var/id = href_list["write"]
//var/t = strip_html_simple(input(usr, "What text do you wish to add to " + (id=="end" ? "the end of the paper" : "field "+id) + "?", "[name]", null),8192) as message
- var/textlimit = MAX_PAPER_MESSAGE_LEN - length(info)
- if(textlimit <= 0)
+ if(free_space <= 0)
usr << "There isn't enough space left on \the [src] to write anything."
return
- var/t = sanitize(input("Enter what you want to write:", "Write", null, null) as message, textlimit, extra = 0)
+ var/t = sanitize(input("Enter what you want to write:", "Write", null, null) as message, free_space, extra = 0)
if(!t)
return
@@ -340,8 +326,8 @@
var/obj/item/i = usr.get_active_hand() // Check to see if he still got that darn pen, also check if he's using a crayon or pen.
var/iscrayon = 0
if(!istype(i, /obj/item/weapon/pen))
- if(!istype(i, /obj/item/toy/crayon))
- return
+ return
+ if(istype(i, /obj/item/weapon/pen/crayon))
iscrayon = 1
@@ -378,6 +364,8 @@
info += t // Oh, he wants to edit to the end of the file, let him.
updateinfolinks()
+ update_space(t)
+
usr << browse("[name][info_links][stamps]", "window=[name]") // Update the window
update_icon()
@@ -437,15 +425,17 @@
user << "You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name]."
src.loc = B
P.loc = B
- B.amount++
+
+ B.pages.Add(src)
+ B.pages.Add(P)
B.update_icon()
- else if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
- if ( istype(P, /obj/item/weapon/pen/robopen) && P:mode == 2 )
- P:RenamePaper(user,src)
+ else if(istype(P, /obj/item/weapon/pen))
+ var/obj/item/weapon/pen/robopen/RP = P
+ if ( istype(RP) && RP.mode == 2 )
+ RP.RenamePaper(user,src)
else
user << browse("[name][info_links][stamps]", "window=[name]")
- //openhelp(user)
return
else if(istype(P, /obj/item/weapon/stamp))
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index dfa5103ec2..409dd3e5f0 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -11,66 +11,63 @@
layer = 4
pressure_resistance = 1
attack_verb = list("bapped")
- var/amount = 0 //Amount of items clipped to the paper
- var/page = 1
- var/screen = 0
+ var/page = 1 // current page
+ var/list/pages = list() // Ordered list of pages as they are to be displayed. Can be different order than src.contents.
/obj/item/weapon/paper_bundle/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
- var/obj/item/weapon/paper/P
- if(istype(W, /obj/item/weapon/paper))
- P = W
- if (istype(P, /obj/item/weapon/paper/carbon))
- var/obj/item/weapon/paper/carbon/C = P
- if (!C.iscopy && !C.copied)
- user << "Take off the carbon copy first."
- add_fingerprint(user)
- return
- amount++
- if(screen == 2)
- screen = 1
- user << "You add [(P.name == "paper") ? "the paper" : P.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]."
- user.drop_from_inventory(P)
- P.loc = src
- if(istype(user,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = user
- H.update_inv_l_hand()
- H.update_inv_r_hand()
- else if(istype(W, /obj/item/weapon/photo))
- amount++
- if(screen == 2)
- screen = 1
- user << "You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]."
- user.drop_from_inventory(W)
- W.loc = src
+ if (istype(W, /obj/item/weapon/paper/carbon))
+ var/obj/item/weapon/paper/carbon/C = W
+ if (!C.iscopy && !C.copied)
+ user << "Take off the carbon copy first."
+ add_fingerprint(user)
+ return
+ // adding sheets
+ if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo))
+ insert_sheet_at(user, pages.len+1, W)
+
+ // burning
else if(istype(W, /obj/item/weapon/flame))
burnpaper(W, user)
+
+ // merging bundles
else if(istype(W, /obj/item/weapon/paper_bundle))
user.drop_from_inventory(W)
for(var/obj/O in W)
O.loc = src
O.add_fingerprint(usr)
- src.amount++
- if(screen == 2)
- screen = 1
+ pages.Add(O)
+
user << "You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]."
- del(W)
+ qdel(W)
else
if(istype(W, /obj/item/weapon/tape_roll))
return 0
- if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/toy/crayon))
+ if(istype(W, /obj/item/weapon/pen))
usr << browse("", "window=[name]") //Closes the dialog
- P = src[page]
+ var/obj/P = pages[page]
P.attackby(W, user)
-
update_icon()
attack_self(usr) //Update the browsed page.
add_fingerprint(usr)
return
+/obj/item/weapon/paper_bundle/proc/insert_sheet_at(mob/user, var/index, obj/item/weapon/sheet)
+ if(istype(sheet, /obj/item/weapon/paper))
+ user << "You add [(sheet.name == "paper") ? "the paper" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]."
+ else if(istype(sheet, /obj/item/weapon/photo))
+ user << "You add [(sheet.name == "photo") ? "the photo" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]."
+
+ user.drop_from_inventory(sheet)
+ sheet.loc = src
+
+ pages.Insert(index, sheet)
+
+ if(index <= page)
+ page++
/obj/item/weapon/paper_bundle/proc/burnpaper(obj/item/weapon/flame/P, mob/user)
var/class = ""
@@ -91,7 +88,7 @@
user.drop_from_inventory(src)
new /obj/effect/decal/cleanable/ash(src.loc)
- del(src)
+ qdel(src)
else
user << "\red You must hold \the [P] steady to burn \the [src]."
@@ -105,28 +102,32 @@
/obj/item/weapon/paper_bundle/proc/show_content(mob/user as mob)
var/dat
- var/obj/item/weapon/W = src[page]
- switch(screen)
- if(0)
- dat+= ""
- dat+= ""
- dat+= "
"
- if(1)
- dat+= ""
- dat+= ""
- dat+= "
"
- if(2)
- dat+= ""
- dat+= "
"
- dat+= ""
- if(istype(src[page], /obj/item/weapon/paper))
+ var/obj/item/weapon/W = pages[page]
+
+ // first
+ if(page == 1)
+ dat+= ""
+ dat+= ""
+ dat+= "
"
+ // last
+ else if(page == pages.len)
+ dat+= ""
+ dat+= ""
+ dat+= "
"
+ // middle pages
+ else
+ dat+= ""
+ dat+= ""
+ dat+= "
"
+
+ if(istype(pages[page], /obj/item/weapon/paper))
var/obj/item/weapon/paper/P = W
if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/dead/observer) || istype(usr, /mob/living/silicon)))
dat+= "[P.name][stars(P.info)][P.stamps]"
else
dat+= "[P.name][P.info][P.stamps]"
user << browse(dat, "window=[name]")
- else if(istype(src[page], /obj/item/weapon/photo))
+ else if(istype(pages[page], /obj/item/weapon/photo))
var/obj/item/weapon/photo/P = W
user << browse_rsc(P.img, "tmp_photo.png")
user << browse(dat + "[P.name]" \
@@ -145,55 +146,51 @@
..()
if((src in usr.contents) || (istype(src.loc, /obj/item/weapon/folder) && (src.loc in usr.contents)))
usr.set_machine(src)
+ var/obj/item/weapon/in_hand = usr.get_active_hand()
if(href_list["next_page"])
- if(page == amount)
- screen = 2
- else if(page == 1)
- screen = 1
- else if(page == amount+1)
- return
- page++
- playsound(src.loc, "pageturn", 50, 1)
+ if(in_hand && (istype(in_hand, /obj/item/weapon/paper) || istype(in_hand, /obj/item/weapon/photo)))
+ insert_sheet_at(usr, page+1, in_hand)
+ else if(page != pages.len)
+ page++
+ playsound(src.loc, "pageturn", 50, 1)
if(href_list["prev_page"])
- if(page == 1)
- return
- else if(page == 2)
- screen = 0
- else if(page == amount+1)
- screen = 1
- page--
- playsound(src.loc, "pageturn", 50, 1)
+ if(in_hand && (istype(in_hand, /obj/item/weapon/paper) || istype(in_hand, /obj/item/weapon/photo)))
+ insert_sheet_at(usr, page, in_hand)
+ else if(page > 1)
+ page--
+ playsound(src.loc, "pageturn", 50, 1)
if(href_list["remove"])
- var/obj/item/weapon/W = src[page]
+ var/obj/item/weapon/W = pages[page]
usr.put_in_hands(W)
+ pages.Remove(pages[page])
+
usr << "You remove the [W.name] from the bundle."
- if(amount == 1)
+
+ if(pages.len <= 1)
var/obj/item/weapon/paper/P = src[1]
usr.drop_from_inventory(src)
usr.put_in_hands(P)
- del(src)
- else if(page == amount)
- screen = 2
- else if(page == amount+1)
- page--
-
- amount--
+ qdel(src)
+
+ return
+
+ if(page > pages.len)
+ page = pages.len
+
update_icon()
else
usr << "You need to hold it in hands!"
if (istype(src.loc, /mob) ||istype(src.loc.loc, /mob))
- src.attack_self(src.loc)
+ src.attack_self(usr)
updateUsrDialog()
-
-
/obj/item/weapon/paper_bundle/verb/rename()
set name = "Rename bundle"
set category = "Object"
set src in usr
var/n_name = sanitizeSafe(input(usr, "What would you like to label the bundle?", "Bundle Labelling", null) as text, MAX_NAME_LEN)
- if((loc == usr && usr.stat == 0))
+ if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0)
name = "[(n_name ? text("[n_name]") : "paper")]"
add_fingerprint(usr)
return
@@ -210,12 +207,12 @@
O.layer = initial(O.layer)
O.add_fingerprint(usr)
usr.drop_from_inventory(src)
- del(src)
+ qdel(src)
return
/obj/item/weapon/paper_bundle/update_icon()
- var/obj/item/weapon/paper/P = src[1]
+ var/obj/item/weapon/paper/P = pages[1]
icon_state = P.icon_state
overlays = P.overlays
underlays = 0
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 3c3d07b36f..2be70ad5e7 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -20,7 +20,7 @@
w_class = 1.0
throw_speed = 7
throw_range = 15
- matter = list("metal" = 10)
+ matter = list(DEFAULT_WALL_MATERIAL = 10)
var/colour = "black" //what colour the ink is!
pressure_resistance = 2
@@ -167,3 +167,28 @@
colour = COLOR_BLACK
usr << "You select the [lowertext(selected_type)] ink container."
+
+/*
+ * Crayons
+ */
+
+/obj/item/weapon/pen/crayon
+ name = "crayon"
+ desc = "A colourful crayon. Please refrain from eating it or putting it in your nose."
+ icon = 'icons/obj/crayons.dmi'
+ icon_state = "crayonred"
+ w_class = 1.0
+ attack_verb = list("attacked", "coloured")
+ colour = "#FF0000" //RGB
+ var/shadeColour = "#220000" //RGB
+ var/uses = 30 //0 for unlimited uses
+ var/instant = 0
+ var/colourName = "red" //for updateIcon purposes
+
+ suicide_act(mob/user)
+ viewers(user) << "\red [user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide."
+ return (BRUTELOSS|OXYLOSS)
+
+ New()
+ name = "[colourName] crayon"
+ ..()
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 7f0ed21c78..2ae10e1c35 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -56,7 +56,7 @@
sleep(15)
else if (istype(copyitem, /obj/item/weapon/paper_bundle))
var/obj/item/weapon/paper_bundle/B = bundlecopy(copyitem)
- sleep(15*B.amount)
+ sleep(15*B.pages.len)
else
usr << "\The [copyitem] can't be copied by \the [src]."
break
@@ -118,7 +118,7 @@
user << "You insert the toner cartridge into \the [src]."
var/obj/item/device/toner/T = O
toner += T.toner_amount
- del(O)
+ qdel(O)
updateUsrDialog()
else
user << "This cartridge is not yet ready for replacement! Use up the rest of the toner."
@@ -131,10 +131,10 @@
/obj/machinery/photocopier/ex_act(severity)
switch(severity)
if(1.0)
- del(src)
+ qdel(src)
if(2.0)
if(prob(50))
- del(src)
+ qdel(src)
else
if(toner > 0)
new /obj/effect/decal/cleanable/blood/oil(get_turf(src))
@@ -148,7 +148,7 @@
/obj/machinery/photocopier/blob_act()
if(prob(50))
- del(src)
+ qdel(src)
else
if(toner > 0)
new /obj/effect/decal/cleanable/blood/oil(get_turf(src))
@@ -216,7 +216,7 @@
//If need_toner is 0, the copies will still be lightened when low on toner, however it will not be prevented from printing. TODO: Implement print queues for fax machines and get rid of need_toner
/obj/machinery/photocopier/proc/bundlecopy(var/obj/item/weapon/paper_bundle/bundle, var/need_toner=1)
var/obj/item/weapon/paper_bundle/p = new /obj/item/weapon/paper_bundle (src)
- for(var/obj/item/weapon/W in bundle)
+ for(var/obj/item/weapon/W in bundle.pages)
if(toner <= 0 && need_toner)
toner = 0
visible_message("A red light on \the [src] flashes, indicating that it is out of toner.")
@@ -227,8 +227,8 @@
else if(istype(W, /obj/item/weapon/photo))
W = photocopy(W)
W.loc = p
- p.amount++
- //p.amount--
+ p.pages += W
+
p.loc = src.loc
p.update_icon()
p.icon_state = "paper_words"
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 24a321ac87..46853a978c 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -42,7 +42,7 @@ var/global/photo_count = 0
user.examinate(src)
/obj/item/weapon/photo/attackby(obj/item/weapon/P as obj, mob/user as mob)
- if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
+ if(istype(P, /obj/item/weapon/pen))
var/txt = sanitize(input(user, "What would you like to write on the back?", "Photo Writing", null) as text, 128)
if(loc == user && user.stat == 0)
scribble = txt
@@ -124,7 +124,7 @@ var/global/photo_count = 0
w_class = 2.0
flags = CONDUCT
slot_flags = SLOT_BELT
- matter = list("metal" = 2000)
+ matter = list(DEFAULT_WALL_MATERIAL = 2000)
var/pictures_max = 10
var/pictures_left = 10
var/on = 1
@@ -159,7 +159,7 @@ var/global/photo_count = 0
return
user << "You insert [I] into [src]."
user.drop_item()
- del(I)
+ qdel(I)
pictures_left = pictures_max
return
..()
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index f2767ca0e8..a6954e9e2f 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -8,60 +8,49 @@
w_class = 1.0
throw_speed = 7
throw_range = 15
- matter = list("metal" = 60)
- item_color = "cargo"
+ matter = list(DEFAULT_WALL_MATERIAL = 60)
pressure_resistance = 2
attack_verb = list("stamped")
/obj/item/weapon/stamp/captain
name = "captain's rubber stamp"
icon_state = "stamp-cap"
- item_color = "captain"
/obj/item/weapon/stamp/hop
name = "head of personnel's rubber stamp"
icon_state = "stamp-hop"
- item_color = "hop"
/obj/item/weapon/stamp/hos
name = "head of security's rubber stamp"
icon_state = "stamp-hos"
- item_color = "hosred"
/obj/item/weapon/stamp/ce
name = "chief engineer's rubber stamp"
icon_state = "stamp-ce"
- item_color = "chief"
/obj/item/weapon/stamp/rd
name = "research director's rubber stamp"
icon_state = "stamp-rd"
- item_color = "director"
/obj/item/weapon/stamp/cmo
name = "chief medical officer's rubber stamp"
icon_state = "stamp-cmo"
- item_color = "cmo"
/obj/item/weapon/stamp/denied
name = "\improper DENIED rubber stamp"
icon_state = "stamp-deny"
- item_color = "redcoat"
/obj/item/weapon/stamp/clown
name = "clown's rubber stamp"
icon_state = "stamp-clown"
- item_color = "clown"
/obj/item/weapon/stamp/internalaffairs
name = "internal affairs rubber stamp"
icon_state = "stamp-intaff"
- item_color = "intaff"
/obj/item/weapon/stamp/centcomm
name = "centcomm rubber stamp"
icon_state = "stamp-cent"
- item_color = "centcomm"
// Syndicate stamp to forge documents.
/obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob)
@@ -84,5 +73,4 @@
if(chosen_stamp)
name = chosen_stamp.name
- icon_state = chosen_stamp.icon_state
- item_color = chosen_stamp.item_color
\ No newline at end of file
+ icon_state = chosen_stamp.icon_state
\ No newline at end of file
diff --git a/code/modules/power/antimatter/containment_jar.dm b/code/modules/power/antimatter/containment_jar.dm
index 8cb372b0c1..dd0e503bd4 100644
--- a/code/modules/power/antimatter/containment_jar.dm
+++ b/code/modules/power/antimatter/containment_jar.dm
@@ -20,13 +20,13 @@
if(1.0)
explosion(get_turf(src), 1, 2, 3, 5)//Should likely be larger but this works fine for now I guess
if(src)
- del(src)
+ qdel(src)
return
if(2.0)
if(prob((fuel/10)-stability))
explosion(get_turf(src), 1, 2, 3, 5)
if(src)
- del(src)
+ qdel(src)
return
stability -= 40
if(3.0)
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index b9f1075fa1..9fd35c2c26 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -35,16 +35,16 @@
linked_cores = list()
-/obj/machinery/power/am_control_unit/Del()//Perhaps damage and run stability checks rather than just del on the others
+/obj/machinery/power/am_control_unit/Destroy()//Perhaps damage and run stability checks rather than just qdel on the others
for(var/obj/machinery/am_shielding/AMS in linked_shielding)
- del(AMS)
+ qdel(AMS)
..()
/obj/machinery/power/am_control_unit/process()
if(exploding)
explosion(get_turf(src),8,12,18,12)
- if(src) del(src)
+ if(src) qdel(src)
if(update_shield_icons && !shield_icon_delay)
check_shield_icons()
@@ -108,7 +108,7 @@
AMS.blob_act()
spawn(0)
//Likely explode
- del(src)
+ qdel(src)
return
check_stability()
return
@@ -211,7 +211,7 @@
/obj/machinery/power/am_control_unit/proc/check_stability()//TODO: make it break when low also might want to add a way to fix it like a part or such that can be replaced
if(stability <= 0)
- del(src)
+ qdel(src)
return
diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm
index 77512fb5b0..a2d4a38ca0 100644
--- a/code/modules/power/antimatter/engine.dm
+++ b/code/modules/power/antimatter/engine.dm
@@ -47,7 +47,7 @@
user << "You insert the rod into the injector"
injecting = 1
var/fuel = F.fuel
- del(F)
+ qdel(F)
spawn( 300 )
injecting = 0
new/obj/item/weapon/fuel(src.loc)
@@ -60,7 +60,7 @@
user << "You insert the rod into the injector"
injecting = 1
var/fuel = F.fuel
- del(F)
+ qdel(F)
spawn( 300 )
injecting = 0
new /obj/item/weapon/fuel(src.loc)
diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm
index 3c0a32586d..56098a0b56 100644
--- a/code/modules/power/antimatter/fuel.dm
+++ b/code/modules/power/antimatter/fuel.dm
@@ -29,7 +29,7 @@
user << "You have added the anti-Hydrogen to the storage ring, it now contains [src.fuel]kg"
if(istype(F, /obj/item/weapon/fuel/H))
src.fuel += F.fuel
- del(F)
+ qdel(F)
src:annihilation(src.fuel)
if(istype(src, /obj/item/weapon/fuel/H))
if(istype(F, /obj/item/weapon/fuel/H))
@@ -38,7 +38,7 @@
user << "You have added the Hydrogen to the storage ring, it now contains [src.fuel]kg"
if(istype(F, /obj/item/weapon/fuel/antiH))
src.fuel += F.fuel
- del(src)
+ qdel(src)
F:annihilation(F.fuel)
/obj/item/weapon/fuel/antiH/proc/annihilation(var/mass)
@@ -54,7 +54,7 @@
if (strength > (300+T0C))
explosion(T, 0, 0, 2, 3)
- del(src)
+ qdel(src)
return
var/turf/ground_zero = get_turf(loc)
@@ -63,7 +63,7 @@
explosion(ground_zero, ground_zero_range, ground_zero_range*2, ground_zero_range*3, ground_zero_range*4)
//SN src = null
- del(src)
+ qdel(src)
return
@@ -77,7 +77,7 @@
M.gib()
if("Hydrogen")
M << "\blue You feel very light, as if you might just float away..."
- del(src)
+ qdel(src)
return
/obj/item/weapon/fuel/attack(mob/M as mob, mob/user as mob)
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index 5085fb6c85..700fad25ad 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -36,12 +36,12 @@ proc/cardinalrange(var/center)
/obj/machinery/am_shielding/proc/controllerscan(var/priorscan = 0)
//Make sure we are the only one here
if(!istype(src.loc, /turf))
- del(src)
+ qdel(src)
return
for(var/obj/machinery/am_shielding/AMS in loc.contents)
if(AMS == src) continue
spawn(0)
- del(src)
+ qdel(src)
return
//Search for shielding first
@@ -61,11 +61,11 @@ proc/cardinalrange(var/center)
controllerscan(1)//Last chance
return
spawn(0)
- del(src)
+ qdel(src)
return
-/obj/machinery/am_shielding/Del()
+/obj/machinery/am_shielding/Destroy()
if(control_unit) control_unit.remove_shielding(src)
if(processing) shutdown_core()
visible_message("\red The [src.name] melts!")
@@ -98,7 +98,7 @@ proc/cardinalrange(var/center)
else
new /obj/effect/blob(src.loc,60)
spawn(0)
- del(src)
+ qdel(src)
return
check_stability()
return
@@ -185,7 +185,7 @@ proc/cardinalrange(var/center)
if(injecting_fuel && control_unit)
control_unit.exploding = 1
if(src)
- del(src)
+ qdel(src)
return
@@ -210,12 +210,12 @@ proc/cardinalrange(var/center)
throwforce = 5
throw_speed = 1
throw_range = 2
- matter = list("metal" = 100, "waste" = 2000)
+ matter = list(DEFAULT_WALL_MATERIAL = 100, "waste" = 2000)
/obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user)
if(istype(I, /obj/item/device/multitool) && istype(src.loc,/turf))
new/obj/machinery/am_shielding(src.loc)
- del(src)
+ qdel(src)
return
..()
return
\ No newline at end of file
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index c6dfcd55be..594bc89bd0 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -100,7 +100,6 @@
var/update_overlay = -1
var/global/status_overlays = 0
var/updating_icon = 0
- var/standard_max_charge
var/global/list/status_overlays_lock
var/global/list/status_overlays_charging
var/global/list/status_overlays_equipment
@@ -143,9 +142,6 @@
/obj/machinery/power/apc/New(turf/loc, var/ndir, var/building=0)
..()
wires = new(src)
- var/tmp/obj/item/weapon/cell/tmp_cell = new
- standard_max_charge = tmp_cell.maxcharge
- del(tmp_cell)
// offset 24 pixels in direction of dir
// this allows the APC to be embedded in a wall, yet still inside an area
@@ -169,16 +165,19 @@
spawn(5)
src.update()
-/obj/machinery/power/apc/Del()
+/obj/machinery/power/apc/Destroy()
if(operating && malf && src.z in config.station_levels) //if (is_type_in_list(get_area(src), the_station_areas))
malf.hacked_apcs -= src
area.power_light = 0
area.power_equip = 0
area.power_environ = 0
area.power_change()
- del(wires)
+ if(wires)
+ wires.Destroy()
+ wires = null
if(cell)
- del(cell) // qdel
+ cell.loc = loc
+ cell = null
if(terminal)
disconnect_terminal()
@@ -443,18 +442,21 @@
if(cell)
user << "There is a power cell already installed."
return
- else
- if (stat & MAINT)
- user << "There is no connector for your power cell."
- return
- user.drop_item()
- W.loc = src
- cell = W
- user.visible_message(\
- "[user.name] has inserted the power cell to [src.name]!",\
- "You insert the power cell.")
- chargecount = 0
- update_icon()
+ if (stat & MAINT)
+ user << "There is no connector for your power cell."
+ return
+ if(W.w_class != 3)
+ user << "\The [W] is too [W.w_class < 3? "small" : "large"] to fit here."
+ return
+
+ user.drop_item()
+ W.loc = src
+ cell = W
+ user.visible_message(\
+ "[user.name] has inserted the power cell to [src.name]!",\
+ "You insert the power cell.")
+ chargecount = 0
+ update_icon()
else if (istype(W, /obj/item/weapon/screwdriver)) // haxing
if(opened)
if (cell)
@@ -559,7 +561,7 @@
return
new /obj/item/stack/cable_coil(loc,10)
user << "You cut the cables and dismantle the power terminal."
- del(terminal) // qdel
+ qdel(terminal)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
user.visible_message("[user.name] inserts the power control board into [src].", \
"You start to insert the power control board into the frame...")
@@ -568,7 +570,7 @@
if(has_electronics==0)
has_electronics = 1
user << "You place the power control board inside the frame."
- del(W) // qdel
+ qdel(W)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
user << "You cannot put the board inside, the frame is damaged."
return
@@ -595,7 +597,7 @@
"[src] has been cut from the wall by [user.name] with the weldingtool.",\
"You cut the APC frame from the wall.",\
"You hear welding.")
- del(src) // qdel
+ qdel(src)
return
else if (istype(W, /obj/item/apc_frame) && opened && emagged)
emagged = 0
@@ -604,7 +606,7 @@
user.visible_message(\
"[user.name] has replaced the damaged APC frontal panel with a new one.",\
"You replace the damaged APC frontal panel with a new one.")
- del(W) // qdel
+ qdel(W)
update_icon()
else if (istype(W, /obj/item/apc_frame) && opened && ((stat & BROKEN) || malfhack))
if (has_electronics)
@@ -616,7 +618,7 @@
user.visible_message(\
"[user.name] has replaced the damaged APC frame with new one.",\
"You replace the damaged APC frame with new one.")
- del(W) // qdel
+ qdel(W)
stat &= ~BROKEN
malfai = null
malfhack = 0
@@ -1211,7 +1213,7 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
//set_broken() //now Del() do what we need
if (cell)
cell.ex_act(1.0) // more lags woohoo
- del(src) // qdel
+ qdel(src)
return
if(2.0)
if (prob(50))
@@ -1254,11 +1256,10 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
if( cell && cell.charge>=20)
cell.use(20);
spawn(0)
- for(var/area/A in area.related)
- for(var/obj/machinery/light/L in A)
- L.on = 1
- L.broken()
- sleep(1)
+ for(var/obj/machinery/light/L in area)
+ L.on = 1
+ L.broken()
+ sleep(1)
/obj/machinery/power/apc/proc/setsubsystem(val)
if(cell && cell.charge > 0)
diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm
index ad47a4eb28..ee6a0dfd9c 100644
--- a/code/modules/power/batteryrack.dm
+++ b/code/modules/power/batteryrack.dm
@@ -11,6 +11,7 @@
icon_state = "gsmes"
var/cells_amount = 0
var/capacitors_amount = 0
+ var/global/list/br_cache = null
/obj/machinery/power/smes/batteryrack/New()
..()
@@ -48,15 +49,26 @@
/obj/machinery/power/smes/batteryrack/update_icon()
overlays.Cut()
if(stat & BROKEN) return
-
+
+ if(!br_cache)
+ br_cache = list()
+ br_cache.len = 7
+ br_cache[1] = image('icons/obj/power.dmi', "gsmes_outputting")
+ br_cache[2] = image('icons/obj/power.dmi', "gsmes_charging")
+ br_cache[3] = image('icons/obj/power.dmi', "gsmes_overcharge")
+ br_cache[4] = image('icons/obj/power.dmi', "gsmes_og1")
+ br_cache[5] = image('icons/obj/power.dmi', "gsmes_og2")
+ br_cache[6] = image('icons/obj/power.dmi', "gsmes_og3")
+ br_cache[7] = image('icons/obj/power.dmi', "gsmes_og4")
+
if (output_attempt)
- overlays += image('icons/obj/power.dmi', "gsmes_outputting")
+ overlays += br_cache[1]
if(inputting)
- overlays += image('icons/obj/power.dmi', "gsmes_charging")
+ overlays += br_cache[2]
var/clevel = chargedisplay()
if(clevel>0)
- overlays += image('icons/obj/power.dmi', "gsmes_og[clevel]")
+ overlays += br_cache[3+clevel]
return
@@ -78,7 +90,7 @@
if(I.reliability != 100 && crit_fail)
I.crit_fail = 1
I.loc = src.loc
- del(src)
+ qdel(src)
return 1
else
user << "Turn off the [src] before dismantling it."
@@ -124,15 +136,15 @@
if(stat & BROKEN) return
if (output_attempt)
- overlays += image('icons/obj/power.dmi', "gsmes_outputting")
+ overlays += br_cache[1]
if(inputting)
- overlays += image('icons/obj/power.dmi', "gsmes_charging")
+ overlays += br_cache[2]
if (overcharge_percent > 100)
- overlays += image('icons/obj/power.dmi', "gsmes_overcharge")
+ overlays += br_cache[3]
else
var/clevel = chargedisplay()
if(clevel>0)
- overlays += image('icons/obj/power.dmi', "gsmes_og[clevel]")
+ overlays += br_cache[3+clevel]
return
//This mess of if-elses and magic numbers handles what happens if the engies don't pay attention and let it eat too much charge
diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm
index 869e654e6e..2faa50a4e6 100644
--- a/code/modules/power/breaker_box.dm
+++ b/code/modules/power/breaker_box.dm
@@ -117,7 +117,7 @@
else
icon_state = icon_state_off
for(var/obj/structure/cable/C in src.loc)
- del(C)
+ qdel(C)
// Used by RCON to toggle the breaker box.
/obj/machinery/power/breakerbox/proc/auto_toggle()
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index f652ebe9ec..e5be56b944 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -85,7 +85,7 @@ By design, d1 is the smallest direction and d2 is the highest
cable_list += src //add it to the global cable list
-/obj/structure/cable/Del() // called when a cable is deleted
+/obj/structure/cable/Destroy() // called when a cable is deleted
if(powernet)
cut_cable_from_powernet() // update the powernets
cable_list -= src //remove it from global cable list
@@ -154,11 +154,11 @@ By design, d1 is the smallest direction and d2 is the highest
var/turf/below = locate(src.x, src.y, controller.down_target)
for(var/obj/structure/cable/c in below)
if(c.d1 == 12 || c.d2 == 12)
- c.Del()
+ qdel(c)
///// Z-Level Stuff
investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires")
- del(src) // qdel
+ qdel(src)
return
@@ -201,16 +201,16 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/structure/cable/ex_act(severity)
switch(severity)
if(1.0)
- del(src) // qdel
+ qdel(src)
if(2.0)
if (prob(50))
new/obj/item/stack/cable_coil(src.loc, src.d1 ? 2 : 1, color)
- del(src) // qdel
+ qdel(src)
if(3.0)
if (prob(25))
new/obj/item/stack/cable_coil(src.loc, src.d1 ? 2 : 1, color)
- del(src) // qdel
+ qdel(src)
return
obj/structure/cable/proc/cableColor(var/colorC)
@@ -418,7 +418,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
propagate_network(powerlist[1],PN) //propagates the new powernet beginning at the source cable
if(PN.is_empty()) //can happen with machines made nodeless when smoothing cables
- del(PN) // qdel
+ qdel(PN)
// cut the cable's powernet at this cable and updates the powergrid
/obj/structure/cable/proc/cut_cable_from_powernet()
@@ -470,13 +470,12 @@ obj/structure/cable/proc/cableColor(var/colorC)
amount = MAXCOIL
max_amount = MAXCOIL
color = COLOR_RED
- //item_color = COLOR_RED Use regular "color" var instead. No need to have it duplicate in two vars. Causes confusion.
desc = "A coil of power cable."
throwforce = 10
w_class = 2.0
throw_speed = 2
throw_range = 5
- matter = list("metal" = 50, "glass" = 20)
+ matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
flags = CONDUCT
slot_flags = SLOT_BELT
item_state = "coil"
@@ -770,7 +769,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
if (C.shock(user, 50))
if (prob(50)) //fail
new/obj/item/stack/cable_coil(C.loc, 1, C.color)
- del(C) // qdel
+ qdel(C)
// called when cable_coil is click on an installed obj/cable
// or click on a turf that already contains a "node" cable
@@ -834,7 +833,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
if (NC.shock(user, 50))
if (prob(50)) //fail
new/obj/item/stack/cable_coil(NC.loc, 1, NC.color)
- del(NC) // qdel
+ qdel(NC)
return
@@ -882,7 +881,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
if (C.shock(user, 50))
if (prob(50)) //fail
new/obj/item/stack/cable_coil(C.loc, 2, C.color)
- del(C) // qdel
+ qdel(C)
return
C.denode()// this call may have disconnected some cables that terminated on the centre of the turf, if so split the powernets.
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 55c78538d6..efccd0aa4f 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -118,8 +118,7 @@
explosion(T, devastation_range, heavy_impact_range, light_impact_range, flash_range)
- spawn(1)
- del(src)
+ qdel(src)
/obj/item/weapon/cell/proc/corrupt()
charge /= 2
@@ -144,17 +143,17 @@
switch(severity)
if(1.0)
- del(src)
+ qdel(src)
return
if(2.0)
if (prob(50))
- del(src)
+ qdel(src)
return
if (prob(50))
corrupt()
if(3.0)
if (prob(25))
- del(src)
+ qdel(src)
return
if (prob(25))
corrupt()
diff --git a/code/modules/power/engine.dm b/code/modules/power/engine.dm
index c0f761254e..a9095b3a78 100644
--- a/code/modules/power/engine.dm
+++ b/code/modules/power/engine.dm
@@ -19,12 +19,12 @@
switch(severity)
if(1.0)
ChangeTurf(/turf/space)
- del(src)
+ qdel(src)
return
if(2.0)
if (prob(50))
ChangeTurf(/turf/space)
- del(src)
+ qdel(src)
return
else
return
@@ -32,6 +32,6 @@
/turf/simulated/floor/engine/blob_act()
if (prob(25))
ChangeTurf(/turf/space)
- del(src)
+ qdel(src)
return
return
\ No newline at end of file
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 53599073b2..fe51b4152e 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -50,8 +50,8 @@
for(var/area/A in range(src,effectiverange))
if(A.name == "Space")
continue // No (de)gravitizing space.
- if(A.master && !( A.master in localareas) )
- localareas += A.master
+ if(!(A in localareas))
+ localareas += A
/obj/machinery/computer/gravity_control_computer/proc/findgenerator()
var/obj/machinery/gravity_generator/foundgenerator = null
@@ -125,7 +125,7 @@
for(var/area/A in gravity_generator:localareas)
var/obj/machinery/gravity_generator/G
for(G in machines)
- if((A.master in G.localareas) && (G.on))
+ if((A in G.localareas) && (G.on))
break
if(!G)
A.gravitychange(0,A)
@@ -137,4 +137,4 @@
A.gravitychange(1,A)
src.updateUsrDialog()
- return
\ No newline at end of file
+ return
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 14bdaa1644..ba3c539c77 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -8,64 +8,7 @@
#define LIGHT_EMPTY 1
#define LIGHT_BROKEN 2
#define LIGHT_BURNED 3
-
-
-
-/obj/item/light_fixture_frame
- name = "light fixture frame"
- desc = "Used for building lights."
- icon = 'icons/obj/lighting.dmi'
- icon_state = "tube-construct-item"
- flags = CONDUCT
- var/fixture_type = "tube"
- var/obj/machinery/light/newlight = null
- var/sheets_refunded = 2
-
-/obj/item/light_fixture_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if (istype(W, /obj/item/weapon/wrench))
- new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
- del(src)
- return
- ..()
-
-/obj/item/light_fixture_frame/proc/try_build(turf/on_wall)
- if (get_dist(on_wall,usr)>1)
- return
- var/ndir = get_dir(usr,on_wall)
- if (!(ndir in cardinal))
- return
- var/turf/loc = get_turf(usr)
- if (!istype(loc, /turf/simulated/floor))
- usr << "\red [src.name] cannot be placed on this spot."
- return
- usr << "Attaching [src] to the wall."
- playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
- var/constrdir = usr.dir
- var/constrloc = usr.loc
- if (!do_after(usr, 30))
- return
- switch(fixture_type)
- if("bulb")
- newlight = new /obj/machinery/light_construct/small(constrloc)
- if("tube")
- newlight = new /obj/machinery/light_construct(constrloc)
- newlight.dir = constrdir
- newlight.fingerprints = src.fingerprints
- newlight.fingerprintshidden = src.fingerprintshidden
- newlight.fingerprintslast = src.fingerprintslast
-
- usr.visible_message("[usr.name] attaches [src] to the wall.", \
- "You attach [src] to the wall.")
- del(src)
-
-/obj/item/light_fixture_frame/small
- name = "small light fixture frame"
- desc = "Used for building small lights."
- icon = 'icons/obj/lighting.dmi'
- icon_state = "bulb-construct-item"
- flags = CONDUCT
- fixture_type = "bulb"
- sheets_refunded = 1
+#define LIGHT_BULB_TEMPERATURE 400 //K - used value for a 60W bulb
/obj/machinery/light_construct
name = "light fixture frame"
@@ -111,7 +54,7 @@
user.visible_message("[user.name] deconstructs [src].", \
"You deconstruct [src].", "You hear a noise.")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1)
- del(src)
+ qdel(src)
if (src.stage == 2)
usr << "You have to remove the wires first."
return
@@ -169,7 +112,7 @@
newlight.dir = src.dir
src.transfer_fingerprints_to(newlight)
- del(src)
+ qdel(src)
return
..()
@@ -199,7 +142,9 @@
power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
var/on = 0 // 1 if on, 0 if off
var/on_gs = 0
- var/brightness = 8 // luminosity when on, also used in power calculation
+ var/brightness_range = 8 // luminosity when on, also used in power calculation
+ var/brightness_power = 3
+ var/brightness_color = null
var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN
var/flickering = 0
var/light_type = /obj/item/weapon/light/tube // the type of light item
@@ -215,7 +160,9 @@
icon_state = "bulb1"
base_state = "bulb"
fitting = "bulb"
- brightness = 4
+ brightness_range = 4
+ brightness_power = 2
+ brightness_color = "#a0a080"
desc = "A small lighting fixture."
light_type = /obj/item/weapon/light/bulb
@@ -224,7 +171,8 @@
name = "spotlight"
fitting = "large tube"
light_type = /obj/item/weapon/light/tube/large
- brightness = 12
+ brightness_range = 12
+ brightness_power = 4
/obj/machinery/light/built/New()
status = LIGHT_EMPTY
@@ -241,19 +189,26 @@
..()
spawn(2)
+ var/area/A = get_area(src)
+ if(A && !A.requires_power)
+ on = 1
+
switch(fitting)
if("tube")
- brightness = 8
+ brightness_range = 8
+ brightness_power = 3
if(prob(2))
broken(1)
if("bulb")
- brightness = 4
+ brightness_range = 4
+ brightness_power = 2
+ brightness_color = "#a0a080"
if(prob(5))
broken(1)
spawn(1)
update(0)
-/obj/machinery/light/Del()
+/obj/machinery/light/Destroy()
var/area/A = get_area(src)
if(A)
on = 0
@@ -281,7 +236,7 @@
update_icon()
if(on)
- if(luminosity != brightness)
+ if(light_range != brightness_range || light_power != brightness_power || light_color != brightness_color)
switchcount++
if(rigged)
if(status == LIGHT_OK && trigger)
@@ -295,15 +250,15 @@
status = LIGHT_BURNED
icon_state = "[base_state]-burned"
on = 0
- SetLuminosity(0)
+ set_light(0)
else
use_power = 2
- SetLuminosity(brightness)
+ set_light(brightness_range, brightness_power, brightness_color)
else
use_power = 1
- SetLuminosity(0)
+ set_light(0)
- active_power_usage = (luminosity * 10)
+ active_power_usage = ((light_range + light_power) * 10)
if(on != on_gs)
on_gs = on
@@ -364,13 +319,14 @@
user << "You insert the [L.name]."
switchcount = L.switchcount
rigged = L.rigged
- brightness = L.brightness
- l_color = L.color
+ brightness_range = L.brightness_range
+ brightness_power = L.brightness_power
+ brightness_color = L.brightness_color
on = has_power()
update()
user.drop_item() //drop the item to update overlays and such
- del(L)
+ qdel(L)
if(on && rigged)
@@ -424,7 +380,7 @@
newlight.fingerprints = src.fingerprints
newlight.fingerprintshidden = src.fingerprintshidden
newlight.fingerprintslast = src.fingerprintslast
- del(src)
+ qdel(src)
return
user << "You stick \the [W] into the light socket!"
@@ -441,7 +397,7 @@
// true if area has power and lightswitch is on
/obj/machinery/light/proc/has_power()
var/area/A = src.loc.loc
- return A.master.lightswitch && A.master.power_light
+ return A.lightswitch && A.power_light
/obj/machinery/light/proc/flicker(var/amount = rand(10, 20))
if(flickering) return
@@ -487,11 +443,13 @@
var/mob/living/carbon/human/H = user
if(istype(H))
-
- if(H.gloves)
+ if(H.species.heat_level_1 > LIGHT_BULB_TEMPERATURE)
+ prot = 1
+ else if(H.gloves)
var/obj/item/clothing/gloves/G = H.gloves
if(G.max_heat_protection_temperature)
- prot = (G.max_heat_protection_temperature > 360)
+ if(G.max_heat_protection_temperature > LIGHT_BULB_TEMPERATURE)
+ prot = 1
else
prot = 1
@@ -509,8 +467,9 @@
var/obj/item/weapon/light/L = new light_type()
L.status = status
L.rigged = rigged
- L.brightness = src.brightness
- L.color = l_color
+ L.brightness_range = brightness_range
+ L.brightness_power = brightness_power
+ L.brightness_color = brightness_color
// light item inherits the switchcount, then zero it
L.switchcount = switchcount
@@ -535,8 +494,9 @@
var/obj/item/weapon/light/L = new light_type()
L.status = status
L.rigged = rigged
- L.brightness = brightness
- L.color = l_color
+ L.brightness_range = brightness_range
+ L.brightness_power = brightness_power
+ L.brightness_color = brightness_color
// light item inherits the switchcount, then zero it
L.switchcount = switchcount
@@ -569,7 +529,6 @@
if(status == LIGHT_OK)
return
status = LIGHT_OK
- brightness = initial(brightness)
on = 1
update()
@@ -579,7 +538,7 @@
/obj/machinery/light/ex_act(severity)
switch(severity)
if(1.0)
- del(src)
+ qdel(src)
return
if(2.0)
if (prob(75))
@@ -604,14 +563,13 @@
/obj/machinery/light/process()
if(on)
- use_power(luminosity * LIGHTING_POWER_FACTOR, LIGHT)
+ use_power(light_range * LIGHTING_POWER_FACTOR, LIGHT)
// called when area power state changes
/obj/machinery/light/power_change()
spawn(10)
var/area/A = src.loc.loc
- A = A.master
seton(A.lightswitch && A.power_light)
// called when on fire
@@ -629,7 +587,7 @@
sleep(2)
explosion(T, 0, 0, 2, 2)
sleep(1)
- del(src)
+ qdel(src)
// the light item
// can be tube or bulb subtypes
@@ -643,9 +601,11 @@
var/status = 0 // LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN
var/base_state
var/switchcount = 0 // number of times switched
- matter = list("metal" = 60)
+ matter = list(DEFAULT_WALL_MATERIAL = 60)
var/rigged = 0 // true if rigged to explode
- var/brightness = 2 //how much light it gives off
+ var/brightness_range = 2 //how much light it gives off
+ var/brightness_power = 1
+ var/brightness_color = null
/obj/item/weapon/light/tube
name = "light tube"
@@ -654,12 +614,14 @@
base_state = "ltube"
item_state = "c_tube"
matter = list("glass" = 100)
- brightness = 8
+ brightness_range = 8
+ brightness_power = 3
/obj/item/weapon/light/tube/large
w_class = 2
name = "large light tube"
- brightness = 15
+ brightness_range = 15
+ brightness_power = 4
/obj/item/weapon/light/bulb
name = "light bulb"
@@ -668,7 +630,9 @@
base_state = "lbulb"
item_state = "contvapour"
matter = list("glass" = 100)
- brightness = 5
+ brightness_range = 5
+ brightness_power = 2
+ brightness_color = "#a0a080"
/obj/item/weapon/light/throw_impact(atom/hit_atom)
..()
@@ -681,7 +645,8 @@
base_state = "fbulb"
item_state = "egg4"
matter = list("glass" = 100)
- brightness = 5
+ brightness_range = 5
+ brightness_power = 2
// update the icon state and description of the light
@@ -702,9 +667,9 @@
..()
switch(name)
if("light tube")
- brightness = rand(6,9)
+ brightness_range = rand(6,9)
if("light bulb")
- brightness = rand(4,6)
+ brightness_range = rand(4,6)
update()
diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm
index 017c5997e6..0664c529d2 100644
--- a/code/modules/power/pacman2.dm
+++ b/code/modules/power/pacman2.dm
@@ -113,7 +113,7 @@
I.loc = src.loc
new_frame.state = 2
new_frame.icon_state = "box_1"
- del(src)
+ qdel(src)
attack_hand(mob/user as mob)
..()
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index a858a5fd43..bd113ff268 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -76,7 +76,7 @@
/obj/machinery/power/port_gen/proc/explode()
explosion(src.loc, -1, 3, 5, -1)
- del(src)
+ qdel(src)
#define TEMPERATURE_DIVISOR 40
#define TEMPERATURE_CHANGE_MAX 20
@@ -125,7 +125,7 @@
component_parts += new board_path(src)
RefreshParts()
-/obj/machinery/power/port_gen/pacman/Del()
+/obj/machinery/power/port_gen/pacman/Destroy()
DropFuel()
..()
@@ -301,7 +301,7 @@
new_frame.state = 2
new_frame.icon_state = "box_1"
- del(src)
+ qdel(src)
/obj/machinery/power/port_gen/pacman/attack_hand(mob/user as mob)
..()
@@ -424,7 +424,7 @@
L.apply_effect(max(20, round(rads/get_dist(L,src))), IRRADIATE)
explosion(src.loc, 3, 3, 5, 3)
- del(src)
+ qdel(src)
/obj/machinery/power/port_gen/pacman/mrs
name = "M.R.S.P.A.C.M.A.N.-type Portable Generator"
@@ -446,4 +446,4 @@
/obj/machinery/power/port_gen/pacman/mrs/explode()
//no special effects, but the explosion is pretty big (same as a supermatter shard).
explosion(src.loc, 3, 6, 12, 16, 1)
- del(src)
+ qdel(src)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 7cfcc53246..387a8c03d1 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -15,7 +15,7 @@
idle_power_usage = 0
active_power_usage = 0
-/obj/machinery/power/Del()
+/obj/machinery/power/Destroy()
disconnect_from_network()
..()
@@ -69,20 +69,20 @@
// return 1
var/area/A = src.loc.loc // make sure it's in an area
- if(!A || !isarea(A) || !A.master)
+ if(!A || !isarea(A))
return 0 // if not, then not powered
if(chan == -1)
chan = power_channel
- return A.master.powered(chan) // return power status of the area
+ return A.powered(chan) // return power status of the area
// increment the power usage stats for an area
/obj/machinery/proc/use_power(var/amount, var/chan = -1) // defaults to power_channel
var/area/A = get_area(src) // make sure it's in an area
- if(!A || !isarea(A) || !A.master)
+ if(!A || !isarea(A))
return
if(chan == -1)
chan = power_channel
- A.master.use_power(amount, chan)
+ A.use_power(amount, chan)
/obj/machinery/proc/power_change() // called whenever the power settings of the containing area change
// by default, check equipment channel & set flag
@@ -235,7 +235,7 @@
// rebuild all power networks from scratch - only called at world creation or by the admin verb
/proc/makepowernets()
for(var/datum/powernet/PN in powernets)
- del(PN)
+ qdel(PN)
powernets.Cut()
for(var/obj/structure/cable/PC in cable_list)
diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm
index 791b69e949..e8d42bd2bd 100644
--- a/code/modules/power/powernet.dm
+++ b/code/modules/power/powernet.dm
@@ -18,7 +18,7 @@
powernets += src
..()
-/datum/powernet/Del()
+/datum/powernet/Destroy()
powernets -= src
..()
@@ -42,7 +42,7 @@
cables -= C
C.powernet = null
if(is_empty())//the powernet is now empty...
- del(src)///... delete it - qdel
+ qdel(src)///... delete it
//add a cable to the current powernet
//Warning : this proc DON'T check if the cable exists
@@ -62,7 +62,7 @@
nodes -=M
M.powernet = null
if(is_empty())//the powernet is now empty...
- del(src)///... delete it - qdel
+ qdel(src)///... delete it - qdel
//add a power machine to the current powernet
@@ -150,7 +150,6 @@
return null
/area/proc/get_apc()
- for(var/area/RA in src.related)
- var/obj/machinery/power/apc/FINDME = locate() in RA
- if (FINDME)
- return FINDME
\ No newline at end of file
+ var/obj/machinery/power/apc/FINDME = locate() in src
+ if (FINDME)
+ return FINDME
diff --git a/code/modules/power/rust/circuits_and_design.dm b/code/modules/power/rust/circuits_and_design.dm
index 4c00673061..441da2e4aa 100644
--- a/code/modules/power/rust/circuits_and_design.dm
+++ b/code/modules/power/rust/circuits_and_design.dm
@@ -75,7 +75,6 @@ datum/design/rust_fuel_compressor
build_path = "/obj/machinery/power/rust_core"
board_type = "machine"
origin_tech = "bluespace=3;phorontech=4;magnets=5;powerstorage=6"
- frame_desc = "Requires 2 Pico Manipulators, 1 Ultra Micro-Laser, 5 Pieces of Cable, 1 Subspace Crystal and 1 Console Screen."
req_components = list(
"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
"/obj/item/weapon/stock_parts/micro_laser/ultra" = 1,
@@ -101,7 +100,6 @@ datum/design/rust_core
build_path = "/obj/machinery/power/rust_fuel_injector"
board_type = "machine"
origin_tech = "powerstorage=3;engineering=4;phorontech=4;materials=6"
- frame_desc = "Requires 2 Pico Manipulators, 1 Phasic Scanning Module, 1 Super Matter Bin, 1 Console Screen and 5 Pieces of Cable."
req_components = list(
"/obj/item/weapon/stock_parts/manipulator/pico" = 2,
"/obj/item/weapon/stock_parts/scanning_module/phasic" = 1,
diff --git a/code/modules/power/rust/core_field.dm b/code/modules/power/rust/core_field.dm
index ad974786b7..587dde3ce5 100644
--- a/code/modules/power/rust/core_field.dm
+++ b/code/modules/power/rust/core_field.dm
@@ -47,7 +47,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
owned_core = core
if(!owned_core)
- del(src)
+ qdel(src)
//create the gimmicky things to handle field collisions
var/obj/effect/rust_particle_catcher/catcher
@@ -118,7 +118,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
/obj/effect/rust_em_field/process()
//make sure the field generator is still intact
if(!owned_core)
- del(src)
+ qdel(src)
//handle radiation
if(!radiator)
@@ -427,10 +427,10 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
AddParticles(reactant, reactants_reacting_pool[reactant])
//world << "retained: [reactant], [reactants_reacting_pool[reactant]]"
-/obj/effect/rust_em_field/Del()
+/obj/effect/rust_em_field/Destroy()
//radiate everything in one giant burst
for(var/obj/effect/rust_particle_catcher/catcher in particle_catchers)
- del (catcher)
+ qdel (catcher)
RadiateAll()
processing_objects.Remove(src)
diff --git a/code/modules/power/rust/core_gen.dm b/code/modules/power/rust/core_gen.dm
index 7cf9f9d696..78e0a02b15 100644
--- a/code/modules/power/rust/core_gen.dm
+++ b/code/modules/power/rust/core_gen.dm
@@ -268,7 +268,7 @@ max volume of phoron storeable by the field = the total volume of a number of ti
//todo: safety checks for field status
if(owned_field)
icon_state = "core0"
- del(owned_field)
+ qdel(owned_field)
luminosity = 0
use_power = 1
diff --git a/code/modules/power/rust/fuel_assembly_port_construction.dm b/code/modules/power/rust/fuel_assembly_port_construction.dm
index 092805de78..fa4ededb3d 100644
--- a/code/modules/power/rust/fuel_assembly_port_construction.dm
+++ b/code/modules/power/rust/fuel_assembly_port_construction.dm
@@ -1,37 +1,3 @@
-
-//frame assembly
-
-/obj/item/rust_fuel_assembly_port_frame
- name = "Fuel Assembly Port frame"
- icon = 'icons/rust.dmi'
- icon_state = "port2"
- w_class = 4
- flags = CONDUCT
-
-/obj/item/rust_fuel_assembly_port_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if (istype(W, /obj/item/weapon/wrench))
- new /obj/item/stack/sheet/plasteel( get_turf(src.loc), 12 )
- del(src)
- return
- ..()
-
-/obj/item/rust_fuel_assembly_port_frame/proc/try_build(turf/on_wall)
- if (get_dist(on_wall,usr)>1)
- return
- var/ndir = get_dir(usr,on_wall)
- if (!(ndir in cardinal))
- return
- var/turf/loc = get_turf(usr)
- var/area/A = loc.loc
- if (!istype(loc, /turf/simulated/floor))
- usr << "\red Port cannot be placed on this spot."
- return
- if (A.requires_power == 0 || A.name == "Space")
- usr << "\red Port cannot be placed in this area."
- return
- new /obj/machinery/rust_fuel_assembly_port(loc, ndir, 1)
- del(src)
-
//construction steps
/obj/machinery/rust_fuel_assembly_port/New(turf/loc, var/ndir, var/building=0)
..()
@@ -110,7 +76,7 @@
if(do_after(user, 10))
has_electronics &= 1
user << "You place the port control board inside the frame."
- del(W)
+ qdel(W)
return
else if (istype(W, /obj/item/weapon/weldingtool) && opened && !has_electronics)
@@ -122,12 +88,12 @@
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
if(do_after(user, 50))
if(!src || !WT.remove_fuel(3, user)) return
- new /obj/item/rust_fuel_assembly_port_frame(loc)
+ new /obj/item/frame/rust/assembly(loc)
user.visible_message(\
"\red [src] has been cut away from the wall by [user.name].",\
"You detached the port frame.",\
"\red You hear welding.")
- del(src)
+ qdel(src)
return
..()
diff --git a/code/modules/power/rust/fuel_compressor.dm b/code/modules/power/rust/fuel_compressor.dm
index 2abd9f17f8..2a6adfa50f 100644
--- a/code/modules/power/rust/fuel_compressor.dm
+++ b/code/modules/power/rust/fuel_compressor.dm
@@ -25,7 +25,7 @@ var/const/max_assembly_amount = 300
/obj/machinery/rust_fuel_compressor/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/rcd_ammo))
compressed_matter += 10
- del(W)
+ qdel(W)
return
..()
@@ -93,7 +93,7 @@ var/const/max_assembly_amount = 300
break
//world << "\blue [reagent]: new_assembly_quantities[reagent]
"
if(fail)
- del(F)
+ qdel(F)
compressed_matter = old_matter
usr << "\red \icon[src] [src] flashes red: \'Out of matter.\'"
else
diff --git a/code/modules/power/rust/fuel_compressor_construction.dm b/code/modules/power/rust/fuel_compressor_construction.dm
index c9c3895f2b..9f52a2cf7c 100644
--- a/code/modules/power/rust/fuel_compressor_construction.dm
+++ b/code/modules/power/rust/fuel_compressor_construction.dm
@@ -1,38 +1,3 @@
-
-//frame assembly
-
-/obj/item/rust_fuel_compressor_frame
- name = "Fuel Compressor frame"
- icon = 'icons/rust.dmi'
- icon_state = "fuel_compressor0"
- w_class = 4
- flags = CONDUCT
-
-/obj/item/rust_fuel_compressor_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if (istype(W, /obj/item/weapon/wrench))
- new /obj/item/stack/sheet/plasteel( get_turf(src.loc), 12 )
- del(src)
- return
- ..()
-
-/obj/item/rust_fuel_compressor_frame/proc/try_build(turf/on_wall)
- if (get_dist(on_wall,usr)>1)
- return
- var/ndir = get_dir(usr,on_wall)
- if (!(ndir in cardinal))
- return
- var/turf/loc = get_turf(usr)
- var/area/A = loc.loc
- if (!istype(loc, /turf/simulated/floor))
- usr << "\red Compressor cannot be placed on this spot."
- return
- if (A.requires_power == 0 || A.name == "Space")
- usr << "\red Compressor cannot be placed in this area."
- return
- new /obj/machinery/rust_fuel_assembly_port(loc, ndir, 1)
- del(src)
-
-//construction steps
/obj/machinery/rust_fuel_compressor/New(turf/loc, var/ndir, var/building=0)
..()
@@ -137,7 +102,7 @@
if(do_after(user, 10))
has_electronics &= 1
user << "You place the circuitboard inside the frame."
- del(W)
+ qdel(W)
return
else if (istype(W, /obj/item/weapon/weldingtool) && opened && !has_electronics)
@@ -149,12 +114,12 @@
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
if(do_after(user, 50))
if(!src || !WT.remove_fuel(3, user)) return
- new /obj/item/rust_fuel_assembly_port_frame(loc)
+ new /obj/item/frame/rust(loc)
user.visible_message(\
"\red [src] has been cut away from the wall by [user.name].",\
"You detached the compressor frame.",\
"\red You hear welding.")
- del(src)
+ qdel(src)
return
..()
diff --git a/code/modules/power/rust/radiation.dm b/code/modules/power/rust/radiation.dm
index b94127ffa2..88d8cd05ab 100644
--- a/code/modules/power/rust/radiation.dm
+++ b/code/modules/power/rust/radiation.dm
@@ -15,7 +15,7 @@
else
time_alive -= 0.1
if(time_alive < 0)
- del(src)
+ qdel(src)
//radiate mobs nearby here
//
diff --git a/code/modules/power/rust/virtual_particle_catcher.dm b/code/modules/power/rust/virtual_particle_catcher.dm
index 350d9f66fc..8da88e76cb 100644
--- a/code/modules/power/rust/virtual_particle_catcher.dm
+++ b/code/modules/power/rust/virtual_particle_catcher.dm
@@ -14,11 +14,11 @@
for(var/obj/machinery/rust/em_field/field in range(6))
parent = field
if(!parent)
- del(src)*/
+ qdel(src)*/
/obj/effect/rust_particle_catcher/process()
if(!parent)
- del(src)
+ qdel(src)
/obj/effect/rust_particle_catcher/proc/SetSize(var/newsize)
name = "collector [newsize]"
diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm
index 54b203a7d4..c4e9a191e9 100644
--- a/code/modules/power/sensors/sensor_monitoring.dm
+++ b/code/modules/power/sensors/sensor_monitoring.dm
@@ -1,7 +1,4 @@
// POWERNET SENSOR MONITORING CONSOLE
-//
-// Last Change 31.12.2014 by Atlantis
-//
// Connects to powernet sensors and loads data from them. Shows this data to the user.
// Newly supports NanoUI.
@@ -11,6 +8,7 @@
desc = "Computer designed to remotely monitor power levels around the station"
icon = 'icons/obj/computer.dmi'
icon_state = "power"
+ light_color = "#ffcc33"
//computer stuff
density = 1
@@ -22,18 +20,14 @@
active_power_usage = 300
var/obj/nano_module/power_monitor/power_monitor
-// Proc: process()
-// Parameters: None
-// Description: Checks the sensors for alerts. If change (alerts cleared or detected) occurs, calls for icon update.
+// Checks the sensors for alerts. If change (alerts cleared or detected) occurs, calls for icon update.
/obj/machinery/computer/power_monitor/process()
var/alert = check_warnings()
if(alert != alerting)
alerting = !alerting
update_icon()
-// Proc: update_icon()
-// Parameters: None
-// Description: Updates icon of this computer according to current status.
+// Updates icon of this computer according to current status.
/obj/machinery/computer/power_monitor/update_icon()
if(stat & BROKEN)
icon_state = "powerb"
@@ -46,17 +40,12 @@
return
icon_state = "power"
-// Proc: New()
-// Parameters: None
-// Description: On creation automatically connects to active sensors. This is delayed to ensure sensors already exist.
+// On creation automatically connects to active sensors. This is delayed to ensure sensors already exist.
/obj/machinery/computer/power_monitor/New()
..()
- spawn(50)
- power_monitor = new(src)
+ power_monitor = new(src)
-// Proc: attack_hand()
-// Parameters: None
-// Description: On user click opens the UI of this computer.
+// On user click opens the UI of this computer.
/obj/machinery/computer/power_monitor/attack_hand(mob/user)
add_fingerprint(user)
@@ -64,16 +53,12 @@
return
ui_interact(user)
-// Proc: ui_interact()
-// Parameters: 4 (standard NanoUI parameters)
-// Description: Uses dark magic to operate the NanoUI of this computer.
+// Uses dark magic to operate the NanoUI of this computer.
/obj/machinery/computer/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
power_monitor.ui_interact(user, ui_key, ui, force_open)
-// Proc: check_warnings()
-// Parameters: None
-// Description: Verifies if any warnings were registered by connected sensors.
+// Verifies if any warnings were registered by connected sensors.
/obj/machinery/computer/power_monitor/proc/check_warnings()
for(var/obj/machinery/power/sensor/S in power_monitor.grid_sensors)
if(S.check_grid_warning())
diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm
index 5b0303c9b5..dc8f667a28 100644
--- a/code/modules/power/singularity/act.dm
+++ b/code/modules/power/singularity/act.dm
@@ -38,18 +38,19 @@
..()
/obj/singularity_act()
- ex_act(1)
- if(src)
- spawn(0)
+ if(simulated)
+ ex_act(1)
+ if(src)
qdel(src)
- return 2
+ return 2
/obj/singularity_pull(S, current_size)
- if(anchored)
- if(current_size >= STAGE_FIVE)
+ if(simulated)
+ if(anchored)
+ if(current_size >= STAGE_FIVE)
+ step_towards(src, S)
+ else
step_towards(src, S)
- else
- step_towards(src, S)
/obj/effect/beam/singularity_pull()
return
@@ -72,6 +73,7 @@
return
/obj/machinery/power/supermatter/shard/singularity_act()
+ src.loc = null
qdel(src)
return 5000
@@ -83,8 +85,8 @@
SetUniversalState(/datum/universal_state/supermatter_cascade)
log_admin("New super singularity made by eating a SM crystal [prints]. Last touched by [src.fingerprintslast].")
message_admins("New super singularity made by eating a SM crystal [prints]. Last touched by [src.fingerprintslast].")
- spawn(0)
- qdel(src)
+ src.loc = null
+ qdel(src)
return 50000
/obj/item/projectile/beam/emitter/singularity_pull()
@@ -106,18 +108,19 @@
return 2
/turf/simulated/wall/singularity_pull(S, current_size)
- if(current_size >= STAGE_FIVE)
- if(prob(75))
- dismantle_wall()
- return
- if(current_size == STAGE_FOUR)
- if(prob(30))
- dismantle_wall()
-/turf/simulated/wall/r_wall/singularity_pull(S, current_size)
- if(current_size >= STAGE_FIVE)
- if(prob(30))
- dismantle_wall()
+ if(!reinf_material)
+ if(current_size >= STAGE_FIVE)
+ if(prob(75))
+ dismantle_wall()
+ return
+ if(current_size == STAGE_FOUR)
+ if(prob(30))
+ dismantle_wall()
+ else
+ if(current_size >= STAGE_FIVE)
+ if(prob(30))
+ dismantle_wall()
/turf/space/singularity_act()
return
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 4dc1fb528e..dee15d9f14 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -21,7 +21,7 @@ var/global/list/rad_collectors = list()
..()
rad_collectors += src
-/obj/machinery/power/rad_collector/Del()
+/obj/machinery/power/rad_collector/Destroy()
rad_collectors -= src
..()
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 2c24eba108..8b51264460 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -9,12 +9,12 @@
density = 0
unacidable = 1
use_power = 0
- luminosity = 4
+ light_range = 4
var/obj/machinery/field_generator/FG1 = null
var/obj/machinery/field_generator/FG2 = null
var/hasShocked = 0 //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.
-/obj/machinery/containment_field/Del()
+/obj/machinery/containment_field/Destroy()
if(FG1 && !FG1.clean_up)
FG1.cleanup()
if(FG2 && !FG2.clean_up)
@@ -54,7 +54,7 @@
if(hasShocked)
return 0
if(!FG1 || !FG2)
- del(src)
+ qdel(src)
return 0
if(isliving(user))
hasShocked = 1
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index c85c48e27a..11606b3dc1 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -41,7 +41,7 @@
if(state == 2 && anchored)
connect_to_network()
-/obj/machinery/power/emitter/Del()
+/obj/machinery/power/emitter/Destroy()
message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1)
log_game("Emitter deleted at ([x],[y],[z])")
investigate_log("deleted at ([x],[y],[z])","singulo")
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 501ccd989a..2f38800637 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -31,7 +31,7 @@ field_generator power level display
var/list/obj/machinery/containment_field/fields
var/list/obj/machinery/field_generator/connected_gens
var/clean_up = 0
-
+
//If keeping field generators powered is hard then increase the emitter active power usage.
var/gen_power_draw = 5500 //power needed per generator
var/field_power_draw = 2000 //power needed per field object
@@ -61,7 +61,6 @@ field_generator power level display
connected_gens = list()
return
-
/obj/machinery/field_generator/process()
if(Varedit_start == 1)
if(active == 0)
@@ -177,7 +176,7 @@ field_generator power level display
return 0
-/obj/machinery/field_generator/Del()
+/obj/machinery/field_generator/Destroy()
src.cleanup()
..()
@@ -231,22 +230,22 @@ field_generator power level display
//Tries to draw the needed power from our own power reserve, or connected generators if we can. Returns the amount of power we were able to get.
/obj/machinery/field_generator/proc/draw_power(var/draw = 0, var/list/flood_list = list())
flood_list += src
-
+
if(src.power >= draw)//We have enough power
src.power -= draw
return draw
-
+
//Need more power
var/actual_draw = src.power //already checked that power < draw
src.power = 0
-
+
for(var/obj/machinery/field_generator/FG in connected_gens)
if (FG in flood_list)
continue
actual_draw += FG.draw_power(draw - actual_draw, flood_list) //since the flood list reference is shared this actually works.
if (actual_draw >= draw)
return actual_draw
-
+
return actual_draw
/obj/machinery/field_generator/proc/start_fields()
@@ -325,7 +324,7 @@ field_generator power level display
for (var/obj/machinery/containment_field/F in fields)
if (isnull(F))
continue
- del(F)
+ qdel(F)
fields = list()
for(var/obj/machinery/field_generator/FG in connected_gens)
if (isnull(FG))
@@ -343,7 +342,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 machines)
+ for(var/obj/singularity/O in machines)
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 8b20fc16ab..1093390b0e 100644
--- a/code/modules/power/singularity/generator.dm
+++ b/code/modules/power/singularity/generator.dm
@@ -12,8 +12,8 @@
/obj/machinery/the_singularitygen/process()
var/turf/T = get_turf(src)
if(src.energy >= 200)
- new /obj/machinery/singularity/(T, 50)
- if(src) del(src)
+ new /obj/singularity/(T, 50)
+ if(src) qdel(src)
/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/weapon/wrench))
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 0fc454b9fb..094915047b 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -1,7 +1,6 @@
var/global/narsie_behaviour = "CultStation13"
-var/global/narsie_cometh = 0
var/global/list/narsie_list = list()
-/obj/machinery/singularity/narsie //Moving narsie to its own file for the sake of being clearer
+/obj/singularity/narsie //Moving narsie to its own file for the sake of being clearer
name = "Nar-Sie"
desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees."
icon = 'icons/obj/narsie.dmi'
@@ -16,15 +15,15 @@ var/global/list/narsie_list = list()
consume_range = 3 //How many tiles out do we eat
-/obj/machinery/singularity/narsie/New()
+/obj/singularity/narsie/New()
..()
narsie_list.Add(src)
-/obj/machinery/singularity/narsie/Destroy()
+/obj/singularity/narsie/Destroy()
narsie_list.Remove(src)
..()
-/obj/machinery/singularity/narsie/large
+/obj/singularity/narsie/large
name = "Nar-Sie"
icon = 'icons/obj/narsie.dmi'
icon_state = "narsie"//mobs perceive the geometer of blood through their see_narsie proc
@@ -32,29 +31,31 @@ var/global/list/narsie_list = list()
// Pixel stuff centers Narsie.
pixel_x = -236
pixel_y = -256
- luminosity = 1
- l_color = "#3e0000"
+ light_range = 1
+ light_color = "#3e0000"
current_size = 12
consume_range = 12 // How many tiles out do we eat.
var/announce=1
var/narnar = 1
-/obj/machinery/singularity/narsie/large/New()
+/obj/singularity/narsie/large/New()
..()
if(announce)
world << "[uppertext(name)] HAS RISEN"
world << sound('sound/effects/wind/wind_5_1.ogg')
- if(emergency_shuttle && emergency_shuttle.can_call())
- emergency_shuttle.call_evac()
- emergency_shuttle.launch_time = 0 // Cannot recall
+ narsie_spawn_animation()
if(narnar)
SetUniversalState(/datum/universal_state/hell)
- narsie_cometh = 1
-/obj/machinery/singularity/narsie/process()
+ spawn(10 SECONDS)
+ if(emergency_shuttle && emergency_shuttle.can_call())
+ emergency_shuttle.call_evac()
+ emergency_shuttle.launch_time = 0 // Cannot recall
+
+/obj/singularity/narsie/process()
eat()
if (!target || prob(5))
@@ -65,13 +66,13 @@ var/global/list/narsie_list = list()
if (prob(25))
mezzer()
-/obj/machinery/singularity/narsie/large/eat()
+/obj/singularity/narsie/large/eat()
set background = BACKGROUND_ENABLED
for (var/turf/A in orange(consume_range, src))
consume(A)
-/obj/machinery/singularity/narsie/mezzer()
+/obj/singularity/narsie/mezzer()
for(var/mob/living/carbon/M in oviewers(8, src))
if(M.stat == CONSCIOUS)
if(M.status_flags & GODMODE)
@@ -81,21 +82,21 @@ var/global/list/narsie_list = list()
M.apply_effect(3, STUN)
-/obj/machinery/singularity/narsie/large/Bump(atom/A)
+/obj/singularity/narsie/large/Bump(atom/A)
if(!narnar) return
if(isturf(A))
narsiewall(A)
else if(istype(A, /obj/structure/cult))
qdel(A)
-/obj/machinery/singularity/narsie/large/Bumped(atom/A)
+/obj/singularity/narsie/large/Bumped(atom/A)
if(!narnar) return
if(isturf(A))
narsiewall(A)
else if(istype(A, /obj/structure/cult))
qdel(A)
-/obj/machinery/singularity/narsie/move(var/force_move = 0)
+/obj/singularity/narsie/move(var/force_move = 0)
if(!move_self)
return 0
@@ -113,7 +114,7 @@ var/global/list/narsie_list = list()
step(src, movement_dir)
return 1
-/obj/machinery/singularity/narsie/large/move(var/force_move = 0)
+/obj/singularity/narsie/large/move(var/force_move = 0)
if(!move_self)
return 0
@@ -138,22 +139,22 @@ var/global/list/narsie_list = list()
M.see_narsie(src,movement_dir)
return 1
-/obj/machinery/singularity/narsie/proc/narsiefloor(var/turf/T)//leaving "footprints"
+/obj/singularity/narsie/proc/narsiefloor(var/turf/T)//leaving "footprints"
if(!(istype(T, /turf/simulated/wall/cult)||istype(T, /turf/space)))
if(T.icon_state != "cult-narsie")
T.desc = "something that goes beyond your understanding went this way"
T.icon_state = "cult-narsie"
- T.luminosity = 1
+ T.set_light(1)
-/obj/machinery/singularity/narsie/proc/narsiewall(var/turf/T)
+/obj/singularity/narsie/proc/narsiewall(var/turf/T)
T.desc = "An opening has been made on that wall, but who can say if what you seek truly lies on the other side?"
T.icon = 'icons/turf/walls.dmi'
T.icon_state = "cult-narsie"
T.opacity = 0
T.density = 0
- luminosity = 1
+ set_light(1)
-/obj/machinery/singularity/narsie/large/consume(const/atom/A) //Has its own consume proc because it doesn't need energy and I don't want BoHs to explode it. --NEO
+/obj/singularity/narsie/large/consume(const/atom/A) //Has its own consume proc because it doesn't need energy and I don't want BoHs to explode it. --NEO
//NEW BEHAVIOUR
if(narsie_behaviour == "CultStation13")
//MOB PROCESSING
@@ -163,7 +164,7 @@ var/global/list/narsie_list = list()
else if(narsie_behaviour == "Nar-Singulo")
old_narsie(A)
-/obj/machinery/singularity/narsie/proc/new_narsie(const/atom/A)
+/obj/singularity/narsie/proc/new_narsie(const/atom/A)
if (istype(A, /mob/) && (get_dist(A, src) <= 7))
var/mob/M = A
@@ -192,7 +193,7 @@ var/global/list/narsie_list = list()
T.holy = 0 //Nar-Sie doesn't give a shit about sacred grounds.
T.cultify()
-/obj/machinery/singularity/narsie/proc/old_narsie(const/atom/A)
+/obj/singularity/narsie/proc/old_narsie(const/atom/A)
if(!(A.singuloCanEat()))
return 0
@@ -224,7 +225,7 @@ var/global/list/narsie_list = list()
var/turf/T2 = A
T2.ChangeTurf(/turf/space)
-/obj/machinery/singularity/narsie/consume(const/atom/A) //This one is for the small ones.
+/obj/singularity/narsie/consume(const/atom/A) //This one is for the small ones.
if(!(A.singuloCanEat()))
return 0
@@ -266,10 +267,10 @@ var/global/list/narsie_list = list()
var/turf/T2 = A
T2.ChangeTurf(/turf/space)
-/obj/machinery/singularity/narsie/ex_act(severity) //No throwing bombs at it either. --NEO
+/obj/singularity/narsie/ex_act(severity) //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()
for(var/datum/mind/cult_nh_mind in cult.current_antagonists)
if(!cult_nh_mind.current)
@@ -307,7 +308,7 @@ var/global/list/narsie_list = list()
return
//no living humans, follow a ghost instead.
-/obj/machinery/singularity/narsie/proc/acquire(const/mob/food)
+/obj/singularity/narsie/proc/acquire(const/mob/food)
var/capname = uppertext(name)
target << "[capname] HAS LOST INTEREST IN YOU."
@@ -318,17 +319,17 @@ var/global/list/narsie_list = list()
else
target << "[capname] HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL."
-/obj/machinery/singularity/narsie/on_capture()
+/obj/singularity/narsie/on_capture()
chained = 1
move_self = 0
icon_state ="narsie-small-chains"
-/obj/machinery/singularity/narsie/on_release()
+/obj/singularity/narsie/on_release()
chained = 0
move_self = 1
icon_state ="narsie-small"
-/obj/machinery/singularity/narsie/large/on_capture()
+/obj/singularity/narsie/large/on_capture()
chained = 1
move_self = 0
icon_state ="narsie-chains"
@@ -336,22 +337,31 @@ var/global/list/narsie_list = list()
if(M.client)
M.see_narsie(src)
-/obj/machinery/singularity/narsie/large/on_release()
+/obj/singularity/narsie/large/on_release()
chained = 0
move_self = 1
icon_state ="narsie"
-/obj/machinery/singularity/narsie/cultify()
+/obj/singularity/narsie/cultify()
return
/**
* 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
for (var/turf/T in trange(consume_range, src))
consume(T)
+
+/obj/singularity/narsie/proc/narsie_spawn_animation()
+ icon = 'icons/obj/narsie_spawn_anim.dmi'
+ dir = SOUTH
+ move_self = 0
+ flick("narsie_spawn_anim",src)
+ sleep(11)
+ move_self = 1
+ icon = initial(icon)
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 2113ba87f7..10413fb992 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -41,14 +41,14 @@
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
else if( istype(A,/obj/effect/rust_particle_catcher) )
var/obj/effect/rust_particle_catcher/collided_catcher = A
if(particle_type && particle_type != "neutron")
if(collided_catcher.AddParticles(particle_type, 1 + additional_particles))
collided_catcher.parent.AddEnergy(energy,mega_energy)
- del (src)
+ qdel(src)
else if( istype(A,/obj/machinery/power/rust_core) )
var/obj/machinery/power/rust_core/collided_core = A
if(particle_type && particle_type != "neutron")
@@ -56,7 +56,7 @@
var/energy_loss_ratio = abs(collided_core.owned_field.frequency - frequency) / 1e9
collided_core.owned_field.mega_energy += mega_energy - mega_energy * energy_loss_ratio
collided_core.owned_field.energy += energy - energy * energy_loss_ratio
- del (src)
+ qdel(src)
return
@@ -67,7 +67,7 @@
/obj/effect/accelerated_particle/ex_act(severity)
- del(src)
+ qdel(src)
return
@@ -95,7 +95,7 @@
src.loc = get_step(src,dir)
movement_range--
if(movement_range <= 0)
- del(src)
+ qdel(src)
else
sleep(lag)
move(lag)
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index 6739bd165e..6ae932dee1 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -72,6 +72,12 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
var/strength = null
var/desc_holder = null
+/obj/structure/particle_accelerator/Destroy()
+ construction_state = 0
+ if(master)
+ master.part_scan()
+ ..()
+
/obj/structure/particle_accelerator/end_cap
name = "Alpha Particle Generation Array"
desc_holder = "This is where Alpha particles are generated from \[REDACTED\]"
@@ -138,15 +144,15 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
/obj/structure/particle_accelerator/ex_act(severity)
switch(severity)
if(1.0)
- del(src)
+ qdel(src)
return
if(2.0)
if (prob(50))
- del(src)
+ qdel(src)
return
if(3.0)
if (prob(25))
- del(src)
+ qdel(src)
return
else
return
@@ -154,13 +160,13 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
/obj/structure/particle_accelerator/blob_act()
if(prob(50))
- del(src)
+ qdel(src)
return
/obj/structure/particle_accelerator/meteorhit()
if(prob(50))
- del(src)
+ qdel(src)
return
/obj/structure/particle_accelerator/update_icon()
@@ -325,15 +331,15 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
/obj/machinery/particle_accelerator/ex_act(severity)
switch(severity)
if(1.0)
- del(src)
+ qdel(src)
return
if(2.0)
if (prob(50))
- del(src)
+ qdel(src)
return
if(3.0)
if (prob(25))
- del(src)
+ qdel(src)
return
else
return
@@ -341,13 +347,13 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
/obj/machinery/particle_accelerator/blob_act()
if(prob(50))
- del(src)
+ qdel(src)
return
/obj/machinery/particle_accelerator/meteorhit()
if(prob(50))
- del(src)
+ qdel(src)
return
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 26239ff567..985bd74e62 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -27,6 +27,10 @@
active_power_usage = initial(active_power_usage) * (strength + 1)
..()
+/obj/machinery/particle_accelerator/control_box/Destroy()
+ if(active)
+ toggle_power()
+ ..()
/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user as mob)
if(construction_state >= 3)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index aa8e85017c..55b4fad1a4 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'
@@ -8,9 +8,8 @@
anchored = 1
density = 1
layer = 6
- luminosity = 6
+ light_range = 6
unacidable = 1 //Don't comment this out.
- use_power = 0
var/current_size = 1
var/allowed_size = 1
@@ -30,7 +29,7 @@
var/chained = 0//Adminbus chain-grab
-/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()
energy = starting_energy
@@ -40,19 +39,24 @@
qdel(src)
..()
+ processing_objects += src
for(var/obj/machinery/power/singularity_beacon/singubeacon in machines)
if(singubeacon.active)
target = singubeacon
break
-/obj/machinery/singularity/attack_hand(mob/user as mob)
+/obj/singularity/Destroy()
+ processing_objects -= src
+ ..()
+
+/obj/singularity/attack_hand(mob/user as mob)
consume(user)
return 1
-/obj/machinery/singularity/blob_act(severity)
+/obj/singularity/blob_act(severity)
return
-/obj/machinery/singularity/ex_act(severity)
+/obj/singularity/ex_act(severity)
if(current_size == STAGE_SUPER)//IT'S UNSTOPPABLE
return
switch(severity)
@@ -67,16 +71,16 @@
energy += round((rand(20,60)/2),1)
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)
-/obj/machinery/singularity/Bumped(atom/A)
+/obj/singularity/Bumped(atom/A)
consume(A)
-/obj/machinery/singularity/process()
+/obj/singularity/process()
eat()
dissipate()
check_energy()
@@ -88,10 +92,10 @@
if (prob(event_chance)) //Chance for it to run a special event TODO: Come up with one or two more that fit.
event()
-/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/containment_field) in orange(30, src)
@@ -100,7 +104,7 @@
investigate_log("was created. [count ? "" : "No containment fields were active."]", I_SINGULO)
-/obj/machinery/singularity/proc/dissipate()
+/obj/singularity/proc/dissipate()
if (!dissipate)
return
@@ -110,7 +114,7 @@
else
dissipate_track++
-/obj/machinery/singularity/proc/expand(var/force_size = 0, var/growing = 1)
+/obj/singularity/proc/expand(var/force_size = 0, var/growing = 1)
if(current_size == STAGE_SUPER)//if this is happening, this is an error
message_admins("expand() was called on a super singulo. This should not happen. Contact a coder immediately!")
return
@@ -241,7 +245,7 @@
else
return 0
-/obj/machinery/singularity/proc/check_energy()
+/obj/singularity/proc/check_energy()
if (energy <= 0)
investigate_log("collapsed.", I_SINGULO)
qdel(src)
@@ -265,12 +269,12 @@
expand(null, current_size > allowed_size)
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(!istype(src))
return
if(dist > consume_range)
@@ -283,11 +287,11 @@
return
-/obj/machinery/singularity/proc/consume(const/atom/A)
+/obj/singularity/proc/consume(const/atom/A)
src.energy += A.singularity_act(src, current_size)
return
-/obj/machinery/singularity/proc/move(var/force_move = 0)
+/obj/singularity/proc/move(var/force_move = 0)
if(!move_self)
return 0
@@ -314,7 +318,7 @@
last_failed_movement = movement_dir
return 0
-/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
@@ -368,7 +372,7 @@
return 0
return 1
-/obj/machinery/singularity/proc/can_move(const/turf/T)
+/obj/singularity/proc/can_move(const/turf/T)
if (!isturf(T))
return 0
@@ -386,7 +390,7 @@
return 0
return 1
-/obj/machinery/singularity/proc/event()
+/obj/singularity/proc/event()
var/numb = pick(1, 2, 3, 4, 5, 6)
switch (numb)
@@ -403,7 +407,7 @@
return 1
-/obj/machinery/singularity/proc/toxmob()
+/obj/singularity/proc/toxmob()
var/toxrange = 10
var/toxdamage = 4
var/radiation = 15
@@ -421,7 +425,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
@@ -440,13 +444,13 @@
for(var/mob/O in viewers(M, null))
O.show_message(text("[] stares blankly at The []!", M, src), 1)
-/obj/machinery/singularity/proc/emp_area()
+/obj/singularity/proc/emp_area()
if(current_size != 11)
empulse(src, 8, 10)
else
empulse(src, 12, 16)
-/obj/machinery/singularity/proc/smwave()
+/obj/singularity/proc/smwave()
for(var/mob/living/M in view(10, src.loc))
if(prob(67))
M.apply_effect(rand(energy), IRRADIATE)
@@ -458,12 +462,12 @@
M.dust()
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)
-/obj/machinery/singularity/proc/on_capture()
+/obj/singularity/proc/on_capture()
chained = 1
overlays = 0
move_self = 0
@@ -479,12 +483,12 @@
if(9)
overlays += image('icons/effects/288x288.dmi',"chain_s9")
-/obj/machinery/singularity/proc/on_release()
+/obj/singularity/proc/on_release()
chained = 0
overlays = 0
move_self = 1
-/obj/machinery/singularity/singularity_act(S, size)
+/obj/singularity/singularity_act(S, size)
if(current_size <= size)
var/gain = (energy/2)
var/dist = max((current_size - 2), 1)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 4fdcbe811f..e42c5289b7 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -83,6 +83,12 @@
return
+
+/obj/machinery/power/smes/Destroy()
+ if(terminal)
+ disconnect_terminal()
+ ..()
+
/obj/machinery/power/smes/update_icon()
overlays.Cut()
if(stat & BROKEN) return
@@ -281,7 +287,7 @@
user.visible_message(\
"[user.name] cut the cables and dismantled the power terminal.",\
"You cut the cables and dismantle the power terminal.")
- del(terminal)
+ qdel(terminal)
building_terminal = 0
return 0
return 1
@@ -374,7 +380,7 @@
smoke.attach(src)
smoke.start()
explosion(src.loc, -1, 0, 1, 3, 1, 0)
- del(src)
+ qdel(src)
return
if(prob(15)) //Power drain
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm
index 3fe4f511eb..b2e584c136 100644
--- a/code/modules/power/smes_construction.dm
+++ b/code/modules/power/smes_construction.dm
@@ -258,7 +258,7 @@
src.ping("DANGER! Magnetic containment field failure in 3 ... 2 ... 1 ...")
explosion(src.loc,1,2,4,8)
// Not sure if this is necessary, but just in case the SMES *somehow* survived..
- del(src)
+ qdel(src)
@@ -345,7 +345,7 @@
if(I.reliability != 100 && crit_fail)
I.crit_fail = 1
I.loc = src.loc
- del(src)
+ qdel(src)
return
// Superconducting Magnetic Coil - Upgrade the SMES
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 28eaf27619..6bdef2c273 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -30,7 +30,7 @@ var/list/solars_list = list()
Make(S)
connect_to_network()
-/obj/machinery/power/solar/Del()
+/obj/machinery/power/solar/Destroy()
unset_control() //remove from control computer
..()
@@ -71,7 +71,7 @@ var/list/solars_list = list()
S.give_glass()
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
user.visible_message("[user] takes the glass off the solar panel.")
- del(src) // qdel
+ qdel(src)
return
else if (W)
src.add_fingerprint(user)
@@ -93,7 +93,7 @@ var/list/solars_list = list()
else
new /obj/item/weapon/shard(src.loc)
new /obj/item/weapon/shard(src.loc)
- del(src) // qdel
+ qdel(src)
return
return
@@ -154,13 +154,13 @@ var/list/solars_list = list()
if(1.0)
if(prob(15))
new /obj/item/weapon/shard( src.loc )
- del(src) // qdel
+ qdel(src)
return
if(2.0)
if (prob(25))
new /obj/item/weapon/shard( src.loc )
- del(src) // qdel
+ qdel(src)
return
if (prob(50))
@@ -270,7 +270,7 @@ var/list/solars_list = list()
if(istype(W, /obj/item/weapon/tracker_electronics))
tracker = 1
user.drop_item()
- del(W) // qdel
+ qdel(W)
user.visible_message("[user] inserts the electronics into the solar assembly.")
return 1
else
@@ -308,13 +308,7 @@ var/list/solars_list = list()
/obj/machinery/power/solar_control/drain_power()
return -1
-/obj/machinery/power/solar_control/New()
- ..()
- if(ticker)
- initialize()
- connect_to_network()
-
-/obj/machinery/power/solar_control/Del()
+/obj/machinery/power/solar_control/Destroy()
for(var/obj/machinery/power/solar/M in connected_panels)
M.unset_control()
if(connected_tracker)
@@ -368,6 +362,7 @@ var/list/solars_list = list()
..()
if(!powernet) return
set_panels(cdir)
+ connect_to_network()
/obj/machinery/power/solar_control/update_icon()
if(stat & BROKEN)
@@ -433,7 +428,7 @@ var/list/solars_list = list()
A.state = 3
A.icon_state = "3"
A.anchored = 1
- del(src) // qdel
+ qdel(src)
else
user << "\blue You disconnect the monitor."
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
@@ -444,7 +439,7 @@ var/list/solars_list = list()
A.state = 4
A.icon_state = "4"
A.anchored = 1
- del(src) // qdel
+ qdel(src)
else
src.attack_hand(user)
return
@@ -534,7 +529,7 @@ var/list/solars_list = list()
switch(severity)
if(1.0)
//SN src = null
- del(src) // qdel
+ qdel(src)
return
if(2.0)
if (prob(50))
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index feec0e3f81..24245f00e4 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -20,7 +20,7 @@
if(level==1) hide(T.intact)
return
-/obj/machinery/power/terminal/Del()
+/obj/machinery/power/terminal/Destroy()
if(master)
master.disconnect_terminal()
return ..()
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 38824dec5d..ea572a2b97 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -21,7 +21,7 @@
Make(S)
connect_to_network()
-/obj/machinery/power/tracker/Del()
+/obj/machinery/power/tracker/Destroy()
unset_control() //remove from control computer
..()
@@ -69,7 +69,7 @@
S.give_glass()
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
user.visible_message("[user] takes the glass off the tracker.")
- del(src) // qdel
+ qdel(src)
return
..()
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 9708656d3b..10d6d8238d 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -243,7 +243,7 @@
A.state = 3
A.icon_state = "3"
A.anchored = 1
- del(src)
+ qdel(src)
else
user << "\blue You disconnect the monitor."
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
@@ -255,7 +255,7 @@
A.state = 4
A.icon_state = "4"
A.anchored = 1
- del(src)
+ qdel(src)
else
src.attack_hand(user)
return
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 01f6a55044..515d5596b6 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -66,7 +66,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
item_state = "syringe_kit"
- matter = list("metal" = 500)
+ matter = list(DEFAULT_WALL_MATERIAL = 500)
throwforce = 5
w_class = 2
throw_speed = 4
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index e25d8f39f1..75b1680d0b 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -6,7 +6,7 @@
icon_state = "T38"
caliber = "357"
ammo_type = /obj/item/ammo_casing/a357
- matter = list("metal" = 1260)
+ matter = list(DEFAULT_WALL_MATERIAL = 1260)
max_ammo = 7
multiple_sprites = 1
@@ -14,7 +14,7 @@
name = "speed loader (.38)"
icon_state = "38"
caliber = "38"
- matter = list("metal" = 360)
+ matter = list(DEFAULT_WALL_MATERIAL = 360)
ammo_type = /obj/item/ammo_casing/c38
max_ammo = 6
multiple_sprites = 1
@@ -28,7 +28,7 @@
icon_state = "45"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c45
- matter = list("metal" = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
+ matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
caliber = ".45"
max_ammo = 7
multiple_sprites = 1
@@ -40,6 +40,10 @@
name = "magazine (.45 rubber)"
ammo_type = /obj/item/ammo_casing/c45r
+/obj/item/ammo_magazine/c45m/practice
+ name = "magazine (.45 practice)"
+ ammo_type = /obj/item/ammo_casing/c45p
+
/obj/item/ammo_magazine/c45m/flash
name = "magazine (.45 flash)"
ammo_type = "/obj/item/ammo_casing/c45f"
@@ -49,7 +53,7 @@
icon_state = "9x19p"
origin_tech = "combat=2"
mag_type = MAGAZINE
- matter = list("metal" = 600)
+ matter = list(DEFAULT_WALL_MATERIAL = 600)
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/c9mm
max_ammo = 10
@@ -65,7 +69,7 @@
name = "ammunition Box (9mm)"
icon_state = "9mm"
origin_tech = "combat=2"
- matter = list("metal" = 1800)
+ matter = list(DEFAULT_WALL_MATERIAL = 1800)
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/c9mm
max_ammo = 30
@@ -78,7 +82,7 @@
icon_state = "9mmt"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c9mm
- matter = list("metal" = 1200)
+ matter = list(DEFAULT_WALL_MATERIAL = 1200)
caliber = "9mm"
max_ammo = 20
multiple_sprites = 1
@@ -90,12 +94,16 @@
name = "top mounted magazine (9mm rubber)"
ammo_type = /obj/item/ammo_casing/c9mmr
+/obj/item/ammo_magazine/mc9mmt/practice
+ name = "top mounted magazine (9mm practice)"
+ ammo_type = /obj/item/ammo_casing/c9mmp
+
/obj/item/ammo_magazine/c45
name = "ammunition Box (.45)"
icon_state = "9mm"
origin_tech = "combat=2"
caliber = ".45"
- matter = list("metal" = 2250)
+ matter = list(DEFAULT_WALL_MATERIAL = 2250)
ammo_type = /obj/item/ammo_casing/c45
max_ammo = 30
@@ -108,7 +116,7 @@
origin_tech = "combat=2"
mag_type = MAGAZINE
caliber = "12mm"
- matter = list("metal" = 1500)
+ matter = list(DEFAULT_WALL_MATERIAL = 1500)
ammo_type = "/obj/item/ammo_casing/a12mm"
max_ammo = 20
multiple_sprites = 1
@@ -122,7 +130,7 @@
origin_tech = "combat=2"
mag_type = MAGAZINE
caliber = "a556"
- matter = list("metal" = 1800)
+ matter = list(DEFAULT_WALL_MATERIAL = 1800)
ammo_type = /obj/item/ammo_casing/a556
max_ammo = 10
multiple_sprites = 1
@@ -130,13 +138,17 @@
/obj/item/ammo_magazine/a556/empty
initial_ammo = 0
+/obj/item/ammo_magazine/a556/practice
+ name = "magazine (5.56mm practice)"
+ ammo_type = /obj/item/ammo_casing/a556p
+
/obj/item/ammo_magazine/a50
name = "magazine (.50)"
icon_state = "50ae"
origin_tech = "combat=2"
mag_type = MAGAZINE
caliber = ".50"
- matter = list("metal" = 1260)
+ matter = list(DEFAULT_WALL_MATERIAL = 1260)
ammo_type = /obj/item/ammo_casing/a50
max_ammo = 7
multiple_sprites = 1
@@ -162,7 +174,7 @@
origin_tech = "combat=2"
mag_type = MAGAZINE
caliber = "a762"
- matter = list("metal" = 4500)
+ matter = list(DEFAULT_WALL_MATERIAL = 4500)
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 50
multiple_sprites = 1
@@ -175,7 +187,7 @@
icon_state = "c762"
mag_type = MAGAZINE
caliber = "a762"
- matter = list("metal" = 1800)
+ matter = list(DEFAULT_WALL_MATERIAL = 1800)
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 20
multiple_sprites = 1
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
index 931555381a..4bb8cbf10f 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -38,12 +38,22 @@
caliber = "9mm"
projectile_type = /obj/item/projectile/bullet/pistol/rubber
+/obj/item/ammo_casing/c9mmp
+ desc = "A 9mm practice bullet casing."
+ caliber = "9mm"
+ projectile_type = /obj/item/projectile/bullet/pistol/practice
+
/obj/item/ammo_casing/c45
desc = "A .45 bullet casing."
caliber = ".45"
projectile_type = /obj/item/projectile/bullet/pistol/medium
+/obj/item/ammo_casing/c45p
+ desc = "A .45 practice bullet casing."
+ caliber = ".45"
+ projectile_type = /obj/item/projectile/bullet/pistol/practice
+
/obj/item/ammo_casing/c45r
desc = "A .45 rubber bullet casing."
caliber = ".45"
@@ -66,20 +76,27 @@
icon_state = "slshell"
caliber = "shotgun"
projectile_type = /obj/item/projectile/bullet/shotgun
- matter = list("metal" = 360)
+ matter = list(DEFAULT_WALL_MATERIAL = 360)
/obj/item/ammo_casing/shotgun/pellet
name = "shotgun shell"
desc = "A 12 gauge shell."
icon_state = "gshell"
projectile_type = /obj/item/projectile/bullet/pellet/shotgun
- matter = list("metal" = 360)
+ matter = list(DEFAULT_WALL_MATERIAL = 360)
/obj/item/ammo_casing/shotgun/blank
name = "shotgun shell"
desc = "A blank shell."
icon_state = "blshell"
projectile_type = /obj/item/projectile/bullet/blank
+ matter = list(DEFAULT_WALL_MATERIAL = 90)
+
+/obj/item/ammo_casing/shotgun/practice
+ name = "shotgun shell"
+ desc = "A practice shell."
+ icon_state = "pshell"
+ projectile_type = /obj/item/projectile/bullet/shotgun/practice
matter = list("metal" = 90)
/obj/item/ammo_casing/shotgun/beanbag
@@ -87,7 +104,7 @@
desc = "A beanbag shell."
icon_state = "bshell"
projectile_type = /obj/item/projectile/bullet/shotgun/beanbag
- matter = list("metal" = 180)
+ matter = list(DEFAULT_WALL_MATERIAL = 180)
//Can stun in one hit if aimed at the head, but
//is blocked by clothing that stops tasers and is vulnerable to EMP
@@ -97,7 +114,7 @@
icon_state = "stunshell"
spent_icon = "stunshell-spent"
projectile_type = /obj/item/projectile/energy/electrode/stunshot
- matter = list("metal" = 360, "glass" = 720)
+ matter = list(DEFAULT_WALL_MATERIAL = 360, "glass" = 720)
/obj/item/ammo_casing/shotgun/stunshell/emp_act(severity)
if(prob(100/severity)) BB = null
@@ -109,7 +126,7 @@
desc = "A chemical shell used to signal distress or provide illumination."
icon_state = "fshell"
projectile_type = /obj/item/projectile/energy/flash/flare
- matter = list("metal" = 90, "glass" = 90)
+ matter = list(DEFAULT_WALL_MATERIAL = 90, "glass" = 90)
/obj/item/ammo_casing/a762
desc = "A 7.62mm bullet casing."
@@ -123,13 +140,18 @@
spent_icon = "lcasing-spent"
caliber = "14.5mm"
projectile_type = /obj/item/projectile/bullet/rifle/a145
- matter = list("metal" = 1250)
+ matter = list(DEFAULT_WALL_MATERIAL = 1250)
/obj/item/ammo_casing/a556
desc = "A 5.56mm bullet casing."
caliber = "a556"
projectile_type = /obj/item/projectile/bullet/rifle/a556
+/obj/item/ammo_casing/a556p
+ desc = "A 5.56mm practice bullet casing."
+ caliber = "a556"
+ projectile_type = /obj/item/projectile/bullet/rifle/a556/practice
+
/obj/item/ammo_casing/rocket
name = "rocket shell"
desc = "A high explosive designed to be fired from a launcher."
diff --git a/code/modules/projectiles/effects.dm b/code/modules/projectiles/effects.dm
index 066f4cf55d..d765e353da 100644
--- a/code/modules/projectiles/effects.dm
+++ b/code/modules/projectiles/effects.dm
@@ -13,7 +13,7 @@
/obj/effect/projectile/proc/activate()
spawn(3)
- delete() //see effect_system.dm - sets loc to null and lets GC handle removing these effects
+ qdel(src) //see effect_system.dm - sets loc to null and lets GC handle removing these effects
return
@@ -100,13 +100,13 @@
//----------------------------
/obj/effect/projectile/emitter/tracer
icon_state = "emitter"
-
+
/obj/effect/projectile/emitter/muzzle
icon_state = "muzzle_emitter"
-
+
/obj/effect/projectile/emitter/impact
icon_state = "impact_emitter"
-
+
//----------------------------
// Stun beam
//----------------------------
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 77693417df..dc53d788f1 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -1,17 +1,47 @@
+/*
+ Defines a firing mode for a gun.
+
+ burst number of shots fired when the gun is used
+ burst_delay tick delay between shots in a burst
+ fire_delay tick delay after the last shot before the gun may be used again
+ move_delay tick delay after the last shot before the player may move
+ dispersion dispersion of each shot in the burst measured in tiles per 7 tiles angle ratio
+ accuracy accuracy modifier applied to each shot in tiles.
+ applied on top of the base weapon accuracy.
+*/
+/datum/firemode
+ var/name = "default"
+ var/burst = 1
+ var/burst_delay = null
+ var/fire_delay = null
+ var/move_delay = 1
+ var/list/accuracy = list(0)
+ var/list/dispersion = list(0)
+
+//using a list makes defining fire modes for new guns much nicer,
+//however we convert the lists to datums in part so that firemodes can be VVed if necessary.
+/datum/firemode/New(list/properties = null)
+ ..()
+ if(!properties) return
+
+ for(var/propname in vars)
+ if(!isnull(properties[propname]))
+ src.vars[propname] = properties[propname]
+
//Parent gun type. Guns are weapons that can be aimed at mobs and act over a distance
/obj/item/weapon/gun
name = "gun"
desc = "Its a gun. It's pretty terrible, though."
icon = 'icons/obj/gun.dmi'
item_icons = list(
- icon_l_hand = 'icons/mob/items/lefthand_guns.dmi',
- icon_r_hand = 'icons/mob/items/righthand_guns.dmi',
+ slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi',
)
icon_state = "detective"
item_state = "gun"
flags = CONDUCT
slot_flags = SLOT_BELT|SLOT_HOLSTER
- matter = list("metal" = 2000)
+ matter = list(DEFAULT_WALL_MATERIAL = 2000)
w_class = 3
throwforce = 5
throw_speed = 4
@@ -21,16 +51,22 @@
attack_verb = list("struck", "hit", "bashed")
zoomdevicename = "scope"
- var/fire_delay = 6
+ var/fire_delay = 6 //delay after shooting before the gun can be used again
+ var/burst_delay = 2 //delay between shots, if firing in bursts
var/fire_sound = 'sound/weapons/Gunshot.ogg'
var/fire_sound_text = "gunshot"
var/recoil = 0 //screen shake
var/silenced = 0
- var/accuracy = 0 //accuracy is measured in tiles. +1 accuracy means that everything is effectively one tile closer for the purpose of miss chance, -1 means the opposite. launchers are not supported, at the moment.
+ var/muzzle_flash = 3
+ var/accuracy = 0 //accuracy is measured in tiles. +1 accuracy means that everything is effectively one tile closer for the purpose of miss chance, -1 means the opposite. launchers are not supported, at the moment.
var/scoped_accuracy = null
- var/last_fired = 0
-
+ var/next_fire_time = 0
+
+ var/sel_mode = 1 //index of the currently selected mode
+ var/list/firemodes = list()
+ var/firemode_type = /datum/firemode //for subtypes that need custom firemode data
+
//aiming system stuff
var/keep_aim = 1 //1 for keep shooting until aim is lowered
//0 for one bullet after tarrget moves and aim is lowered
@@ -42,17 +78,15 @@
/obj/item/weapon/gun/New()
..()
+ if(!firemodes.len)
+ firemodes += new firemode_type
+ else
+ for(var/i in 1 to firemodes.len)
+ firemodes[i] = new firemode_type(firemodes[i])
+
if(isnull(scoped_accuracy))
scoped_accuracy = accuracy
-//Returns 1 if the gun is able to be fired
-/obj/item/weapon/gun/proc/ready_to_fire()
- if(world.time >= last_fired + fire_delay)
- last_fired = world.time
- return 1
- else
- return 0
-
//Checks whether a given mob can use the gun
//Any checks that shouldn't result in handle_click_empty() being called if they fail should go here.
//Otherwise, if you want handle_click_empty() to be called, check in consume_next_projectile() and return null there.
@@ -61,9 +95,9 @@
return 0
if(!user.IsAdvancedToolUser())
return 0
-
+
var/mob/living/M = user
-
+
if(HULK in M.mutations)
M << "Your fingers are much too large for the trigger guard!"
return 0
@@ -73,7 +107,7 @@
if(process_projectile(P, user, user, pick("l_foot", "r_foot")))
handle_post_fire(user, user)
user.visible_message(
- "[user] shoots \himself in the foot with \the [src]!",
+ "[user] shoots \himself in the foot with \the [src]!",
"You shoot yourself in the foot with \the [src]!"
)
M.drop_item()
@@ -114,7 +148,7 @@
else
return ..() //Pistolwhippin'
-/obj/item/weapon/gun/proc/Fire(atom/target, mob/living/user, params, pointblank=0, reflex=0)
+/obj/item/weapon/gun/proc/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0)
if(!user || !target) return
add_fingerprint(user)
@@ -122,24 +156,55 @@
if(!special_check(user))
return
- if (!ready_to_fire())
+ if(world.time < next_fire_time)
if (world.time % 3) //to prevent spam
- user << "[src] is not ready to fire again!"
+ user << "[src] is not ready to fire again!"
return
- var/obj/projectile = consume_next_projectile(user)
- if(!projectile)
- handle_click_empty(user)
- return
+ //unpack firemode data
+ var/datum/firemode/firemode = firemodes[sel_mode]
+ var/_burst = firemode.burst
+ var/_burst_delay = isnull(firemode.burst_delay)? src.burst_delay : firemode.burst_delay
+ var/_fire_delay = isnull(firemode.fire_delay)? src.fire_delay : firemode.fire_delay
+ var/_move_delay = firemode.move_delay
+ var/shoot_time = (_burst - 1)*_burst_delay
+ user.next_move = world.time + shoot_time //no clicking on things while shooting
+ if(user.client) user.client.move_delay = world.time + shoot_time //no moving while shooting either
+ next_fire_time = world.time + shoot_time
+
+ //actually attempt to shoot
+ var/turf/targloc = get_turf(target) //cache this in case target gets deleted during shooting, e.g. if it was a securitron that got destroyed.
+ for(var/i in 1 to _burst)
+ var/obj/projectile = consume_next_projectile(user)
+ if(!projectile)
+ handle_click_empty(user)
+ break
+
+ var/acc = firemode.accuracy[min(i, firemode.accuracy.len)]
+ var/disp = firemode.dispersion[min(i, firemode.dispersion.len)]
+ process_accuracy(projectile, user, target, acc, disp)
+
+ if(pointblank)
+ process_point_blank(projectile, user, target)
+
+ if(process_projectile(projectile, user, target, user.zone_sel.selecting, clickparams))
+ handle_post_fire(user, target, pointblank, reflex)
+ update_icon()
+
+ if(i < _burst)
+ sleep(_burst_delay)
+
+ if(!(target && target.loc))
+ target = targloc
+ pointblank = 0
+
+ update_held_icon()
+
+ //update timing
user.next_move = world.time + 4
-
- if(process_projectile(projectile, user, target, user.zone_sel.selecting, params, pointblank, reflex))
- handle_post_fire(user, target, pointblank, reflex)
-
- update_icon()
- update_held_icon()
-
+ if(user.client) user.client.move_delay = world.time + _move_delay
+ next_fire_time = world.time + _fire_delay
//obtains the next projectile to fire
/obj/item/weapon/gun/proc/consume_next_projectile()
@@ -149,7 +214,7 @@
/obj/item/weapon/gun/proc/can_hit(atom/target as mob, var/mob/living/user as mob)
if(!special_check(user))
return 2
- //just assume we can shoot through glass and stuff. No big deal, the player can just choose to not target someone
+ //just assume we can shoot through glass and stuff. No big deal, the player can just choose to not target someone
//on the other side of a window if it makes a difference. Or if they run behind a window, too bad.
return check_trajectory(target, user)
@@ -167,7 +232,7 @@
playsound(user, fire_sound, 10, 1)
else
playsound(user, fire_sound, 50, 1)
-
+
if(reflex)
user.visible_message(
"\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""] by reflex!",
@@ -180,19 +245,65 @@
"You fire \the [src]!",
"You hear a [fire_sound_text]!"
)
-
+
+ if(muzzle_flash)
+ var/turf/T_user = get_turf(user)
+ var/turf/T_target = get_turf(target)
+ var/obj/effect/effect/smoke/illumination/I = new /obj/effect/effect/smoke/illumination(get_step(T_user, get_dir(T_user,T_target)), brightness=muzzle_flash, lifetime=8)
+ I.alpha = 0
+
if(recoil)
spawn()
shake_camera(user, recoil+1, recoil)
update_icon()
-//does the actual shooting
-/obj/item/weapon/gun/proc/process_projectile(obj/projectile, mob/user, atom/target, var/target_zone, var/params=null, var/pointblank=0, var/reflex=0)
- if(!istype(projectile, /obj/item/projectile))
- return 0 //default behaviour only applies to true projectiles
-
+
+/obj/item/weapon/gun/proc/process_point_blank(obj/projectile, mob/user, atom/target)
var/obj/item/projectile/P = projectile
-
+ if(!istype(P))
+ return //default behaviour only applies to true projectiles
+
+ //default point blank multiplier
+ var/damage_mult = 1.3
+
+ //determine multiplier due to the target being grabbed
+ if(ismob(target))
+ var/mob/M = target
+ if(M.grabbed_by.len)
+ var/grabstate = 0
+ for(var/obj/item/weapon/grab/G in M.grabbed_by)
+ grabstate = max(grabstate, G.state)
+ if(grabstate >= GRAB_NECK)
+ damage_mult = 3.0
+ else if(grabstate >= GRAB_AGGRESSIVE)
+ damage_mult = 1.5
+ P.damage *= damage_mult
+
+/obj/item/weapon/gun/proc/process_accuracy(obj/projectile, mob/user, atom/target, acc_mod, dispersion)
+ var/obj/item/projectile/P = projectile
+ if(!istype(P))
+ return //default behaviour only applies to true projectiles
+
+ //Accuracy modifiers
+ P.accuracy = accuracy + acc_mod
+ P.dispersion = dispersion
+
+ //accuracy bonus from aiming
+ if (aim_targets && (target in aim_targets))
+ //If you aim at someone beforehead, it'll hit more often.
+ //Kinda balanced by fact you need like 2 seconds to aim
+ //As opposed to no-delay pew pew
+ P.accuracy += 2
+
+//does the actual launching of the projectile
+/obj/item/weapon/gun/proc/process_projectile(obj/projectile, mob/user, atom/target, var/target_zone, var/params=null)
+ var/obj/item/projectile/P = projectile
+ if(!istype(P))
+ return 0 //default behaviour only applies to true projectiles
+
+ if(params)
+ P.set_clickpoint(params)
+
//shooting while in shock
var/x_offset = 0
var/y_offset = 0
@@ -205,27 +316,6 @@
y_offset = rand(-1,1)
x_offset = rand(-1,1)
- //Point blank bonus
- if(pointblank)
- var/damage_mult = 1.3 //default point blank multiplier
-
- //determine multiplier due to the target being grabbed
- if(ismob(target))
- var/mob/M = target
- if(M.grabbed_by.len)
- var/grabstate = 0
- for(var/obj/item/weapon/grab/G in M.grabbed_by)
- grabstate = max(grabstate, G.state)
- if(grabstate >= GRAB_NECK)
- damage_mult = 3.0
- else if (grabstate >= GRAB_AGGRESSIVE)
- damage_mult = 1.5
-
- P.damage *= damage_mult
-
- if(params)
- P.set_clickpoint(params)
-
return !P.launch(target, user, src, target_zone, x_offset, y_offset)
//Suicide handling.
@@ -234,7 +324,7 @@
if(!ishuman(user))
return
var/mob/living/carbon/human/M = user
-
+
mouthshoot = 1
M.visible_message("\red [user] sticks their gun in their mouth, ready to pull the trigger...")
if(!do_after(user, 40))
@@ -260,7 +350,7 @@
else
user << "Ow..."
user.apply_effect(110,AGONY,0)
- del(in_chamber)
+ qdel(in_chamber)
mouthshoot = 0
return
else
@@ -274,7 +364,7 @@
var/zoom_offset = round(world.view * zoom_amount)
var/view_size = round(world.view + zoom_amount)
var/scoped_accuracy_mod = zoom_offset
-
+
zoom(zoom_offset, view_size)
if(zoom)
accuracy = scoped_accuracy + scoped_accuracy_mod
@@ -287,3 +377,21 @@
if(!zoom)
accuracy = initial(accuracy)
recoil = initial(recoil)
+
+/obj/item/weapon/gun/examine(mob/user)
+ ..()
+ if(firemodes.len > 1)
+ var/datum/firemode/current_mode = firemodes[sel_mode]
+ user << "The fire selector is set to [current_mode.name]."
+
+/obj/item/weapon/gun/proc/switch_firemodes(mob/user=null)
+ sel_mode++
+ if(sel_mode > firemodes.len)
+ sel_mode = 1
+ var/datum/firemode/new_mode = firemodes[sel_mode]
+ user << "\The [src] is now set to [new_mode.name]."
+
+/obj/item/weapon/gun/attack_self(mob/user)
+ if(firemodes.len > 1)
+ switch_firemodes(user)
+
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
index 9f611e593d..ff9edcabfc 100644
--- a/code/modules/projectiles/guns/alien.dm
+++ b/code/modules/projectiles/guns/alien.dm
@@ -20,7 +20,7 @@
processing_objects.Add(src)
last_regen = world.time
-/obj/item/weapon/gun/launcher/spikethrower/Del()
+/obj/item/weapon/gun/launcher/spikethrower/Destroy()
processing_objects.Remove(src)
..()
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 994256b12a..32771984f6 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -1,23 +1,43 @@
+/datum/firemode/energy
+ var/projectile_type = null
+ var/modifystate = null
+ var/charge_cost = null
+ var/fire_sound = null
+
/obj/item/weapon/gun/energy
name = "energy gun"
desc = "A basic energy-based gun."
icon_state = "energy"
fire_sound = 'sound/weapons/Taser.ogg'
fire_sound_text = "laser blast"
+ firemode_type = /datum/firemode/energy
var/obj/item/weapon/cell/power_supply //What type of power cell this uses
- var/charge_cost = 100 //How much energy is needed to fire.
- var/cell_type = /obj/item/weapon/cell
+ var/charge_cost = 200 //How much energy is needed to fire.
+ var/max_shots = 10 //Determines the capacity of the weapon's power cell. Specifying a cell_type overrides this value.
+ var/cell_type = null
var/projectile_type = /obj/item/projectile/beam/practice
var/modifystate
var/charge_meter = 1 //if set, the icon state will be chosen based on the current charge
-
+
//self-recharging
var/self_recharge = 0 //if set, the weapon will recharge itself
var/use_external_power = 0 //if set, the weapon will look for an external power source to draw from, otherwise it recharges magically
var/recharge_time = 4
var/charge_tick = 0
+/obj/item/weapon/gun/energy/switch_firemodes(mob/user=null)
+ ..()
+ var/datum/firemode/energy/current_mode = firemodes[sel_mode]
+ if(istype(current_mode))
+ projectile_type = isnull(current_mode.projectile_type)? initial(projectile_type) : current_mode.projectile_type
+ modifystate = isnull(current_mode.modifystate)? initial(modifystate) : current_mode.modifystate
+ charge_cost = isnull(current_mode.charge_cost)? initial(charge_cost) : current_mode.charge_cost
+ fire_sound = isnull(current_mode.fire_sound)? initial(fire_sound) : current_mode.fire_sound
+
+ update_icon()
+ update_held_icon()
+
/obj/item/weapon/gun/energy/emp_act(severity)
..()
update_icon()
@@ -26,12 +46,13 @@
..()
if(cell_type)
power_supply = new cell_type(src)
- power_supply.give(power_supply.maxcharge)
+ else
+ power_supply = new /obj/item/weapon/cell/device/variable(src, max_shots*charge_cost)
if(self_recharge)
processing_objects.Add(src)
update_icon()
-/obj/item/weapon/gun/energy/Del()
+/obj/item/weapon/gun/energy/Destroy()
if(self_recharge)
processing_objects.Remove(src)
..()
@@ -41,15 +62,15 @@
charge_tick++
if(charge_tick < recharge_time) return 0
charge_tick = 0
-
+
if(!power_supply || power_supply.charge >= power_supply.maxcharge)
return 0 // check if we actually need to recharge
-
+
if(use_external_power)
var/obj/item/weapon/cell/external = get_external_power_supply()
if(!external || !external.use(charge_cost)) //Take power from the borg...
return 0
-
+
power_supply.give(charge_cost) //... to recharge the shot
update_icon()
return 1
@@ -74,16 +95,22 @@
return suit.cell
return null
+/obj/item/weapon/gun/energy/examine(mob/user)
+ ..(user)
+ var/shots_remaining = round(power_supply.charge / charge_cost)
+ user << "Has [shots_remaining] shot\s remaining."
+ return
+
/obj/item/weapon/gun/energy/update_icon()
if(charge_meter)
var/ratio = power_supply.charge / power_supply.maxcharge
-
+
//make sure that rounding down will not give us the empty state even if we have charge for a shot left.
if(power_supply.charge < charge_cost)
ratio = 0
else
ratio = max(round(ratio, 0.25) * 100, 25)
-
+
if(modifystate)
icon_state = "[modifystate][ratio]"
else
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index dffc012998..3521b49a14 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -7,7 +7,7 @@
slot_flags = SLOT_BELT|SLOT_BACK
w_class = 3
force = 10
- matter = list("metal" = 2000)
+ matter = list(DEFAULT_WALL_MATERIAL = 2000)
origin_tech = "combat=3;magnets=2"
projectile_type = /obj/item/projectile/beam
fire_delay = 1 //rapid fire
@@ -43,7 +43,7 @@ obj/item/weapon/gun/energy/retro
w_class = 3
projectile_type = /obj/item/projectile/beam
origin_tech = null
- charge_cost = 200 //to compensate a bit for self-recharging
+ max_shots = 5 //to compensate a bit for self-recharging
self_recharge = 1
/obj/item/weapon/gun/energy/lasercannon
@@ -55,7 +55,8 @@ obj/item/weapon/gun/energy/retro
origin_tech = "combat=4;materials=3;powerstorage=3"
slot_flags = SLOT_BELT|SLOT_BACK
projectile_type = /obj/item/projectile/beam/heavylaser
- charge_cost = 250
+ charge_cost = 400
+ max_shots = 5
fire_delay = 20
/obj/item/weapon/gun/energy/lasercannon/mounted
@@ -72,7 +73,8 @@ obj/item/weapon/gun/energy/retro
fire_sound = 'sound/weapons/laser3.ogg'
origin_tech = "combat=5;materials=3;magnets=2;syndicate=2"
projectile_type = /obj/item/projectile/beam/xray
- charge_cost = 50
+ charge_cost = 100
+ max_shots = 20
fire_delay = 1
/obj/item/weapon/gun/energy/sniperrifle
@@ -84,7 +86,8 @@ obj/item/weapon/gun/energy/retro
origin_tech = "combat=6;materials=5;powerstorage=4"
projectile_type = /obj/item/projectile/beam/sniper
slot_flags = SLOT_BACK
- charge_cost = 250
+ charge_cost = 400
+ max_shots = 4
fire_delay = 35
force = 10
w_class = 4
@@ -106,7 +109,7 @@ obj/item/weapon/gun/energy/retro
desc = "Standard issue weapon of the Imperial Guard"
origin_tech = "combat=1;magnets=2"
self_recharge = 1
- matter = list("metal" = 2000)
+ matter = list(DEFAULT_WALL_MATERIAL = 2000)
fire_sound = 'sound/weapons/Laser.ogg'
projectile_type = /obj/item/projectile/beam/lastertag/blue
var/required_vest
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 6b9f6f0d51..adb2d7e517 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -4,32 +4,16 @@
icon_state = "energystun100"
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/Taser.ogg'
+ max_shots = 10
- charge_cost = 100 //How much energy is needed to fire.
projectile_type = /obj/item/projectile/beam/stun
origin_tech = "combat=3;magnets=2"
modifystate = "energystun"
- var/mode = 0 //0 = stun, 1 = kill
-
-/obj/item/weapon/gun/energy/gun/attack_self(mob/living/user as mob)
- switch(mode)
- if(0)
- mode = 1
- charge_cost = 100
- fire_sound = 'sound/weapons/Laser.ogg'
- user << "[src.name] is now set to kill."
- projectile_type = /obj/item/projectile/beam
- modifystate = "energykill"
- if(1)
- mode = 0
- charge_cost = 100
- fire_sound = 'sound/weapons/Taser.ogg'
- user << "[src.name] is now set to stun."
- projectile_type = /obj/item/projectile/beam/stun
- modifystate = "energystun"
- update_icon()
- update_held_icon()
+ firemodes = list(
+ list(name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="energystun", fire_sound='sound/weapons/Taser.ogg'),
+ list(name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="energykill", fire_sound='sound/weapons/Laser.ogg'),
+ )
/obj/item/weapon/gun/energy/gun/mounted
name = "mounted energy gun"
@@ -43,7 +27,14 @@
origin_tech = "combat=3;materials=5;powerstorage=3"
slot_flags = SLOT_BELT
force = 8 //looks heavier than a pistol
- self_recharge = 1
+ self_recharge = 1
+ modifystate = null
+
+ firemodes = list(
+ list(name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
+ list(name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg'),
+ )
+
var/lightfail = 0
//override for failcheck behaviour
@@ -101,10 +92,10 @@
overlays += "nucgun-clean"
/obj/item/weapon/gun/energy/gun/nuclear/proc/update_mode()
- if (mode == 0)
- overlays += "nucgun-stun"
- else if (mode == 1)
- overlays += "nucgun-kill"
+ var/datum/firemode/current_mode = firemodes[sel_mode]
+ switch(current_mode.name)
+ if("stun") overlays += "nucgun-stun"
+ if("lethal") overlays += "nucgun-kill"
/obj/item/weapon/gun/energy/gun/nuclear/emp_act(severity)
..()
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 82ab47438b..507bc22735 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -5,33 +5,16 @@
item_state = null //so the human update icon uses the icon_state instead.
slot_flags = SLOT_BELT|SLOT_BACK
force = 10
- fire_sound = 'sound/weapons/pulse.ogg'
- charge_cost = 200
- projectile_type = /obj/item/projectile/beam/pulse
- cell_type = /obj/item/weapon/cell/super
- var/mode = 2
- fire_delay = 25
-
-/obj/item/weapon/gun/energy/pulse_rifle/attack_self(mob/living/user as mob)
- switch(mode)
- if(2)
- mode = 0
- charge_cost = 100
- fire_sound = 'sound/weapons/Taser.ogg'
- user << "[src.name] is now set to stun."
- projectile_type = /obj/item/projectile/beam/stun
- if(0)
- mode = 1
- charge_cost = 100
- fire_sound = 'sound/weapons/Laser.ogg'
- user << "[src.name] is now set to kill."
- projectile_type = /obj/item/projectile/beam
- if(1)
- mode = 2
- charge_cost = 200
- fire_sound = 'sound/weapons/pulse.ogg'
- user << "[src.name] is now set to DESTROY."
- projectile_type = /obj/item/projectile/beam/pulse
+ fire_sound='sound/weapons/Laser.ogg'
+ projectile_type = /obj/item/projectile/beam
+ sel_mode = 2
+ max_shots = 10
+
+ firemodes = list(
+ list(name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
+ list(name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg'),
+ list(name="DESTROY", projectile_type=/obj/item/projectile/beam/pulse, fire_sound='sound/weapons/pulse.ogg', fire_delay=25, charge_cost=400),
+ )
/obj/item/weapon/gun/energy/pulse_rifle/mounted
self_recharge = 1
@@ -40,12 +23,14 @@
/obj/item/weapon/gun/energy/pulse_rifle/destroyer
name = "pulse destroyer"
desc = "A heavy-duty, pulse-based energy weapon. Because of its complexity and cost, it is rarely seen in use except by specialists."
- cell_type = /obj/item/weapon/cell/infinite
- fire_delay = 10
+ cell_type = /obj/item/weapon/cell/super
+ fire_delay = 25
+ fire_sound='sound/weapons/pulse.ogg'
+ projectile_type=/obj/item/projectile/beam/pulse
+ charge_cost=400
/obj/item/weapon/gun/energy/pulse_rifle/destroyer/attack_self(mob/living/user as mob)
- user << "[src.name] has three settings, and they are all DESTROY."
-
+ user << "[src.name] has three settings, and they are all DESTROY."
//WHY?
/obj/item/weapon/gun/energy/pulse_rifle/M1911
@@ -53,5 +38,4 @@
desc = "It's not the size of the gun, it's the size of the hole it puts through people."
slot_flags = SLOT_BELT|SLOT_HOLSTER
icon_state = "m1911-p"
- cell_type = /obj/item/weapon/cell/infinite
- fire_delay = 10
+ max_shots = 5
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index c7f74e1d95..d9ef1b9504 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -9,7 +9,8 @@
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
- charge_cost = 100
+ charge_cost = 300
+ max_shots = 10
projectile_type = /obj/item/projectile/ion
/obj/item/weapon/gun/energy/ionrifle/emp_act(severity)
@@ -29,7 +30,7 @@
item_state = "decloner"
fire_sound = 'sound/weapons/pulse3.ogg'
origin_tech = "combat=5;materials=4;powerstorage=3"
- charge_cost = 100
+ max_shots = 10
projectile_type = /obj/item/projectile/energy/declone
/obj/item/weapon/gun/energy/floragun
@@ -39,28 +40,16 @@
item_state = "floramut"
fire_sound = 'sound/effects/stealthoff.ogg'
charge_cost = 100
+ max_shots = 10
projectile_type = /obj/item/projectile/energy/floramut
origin_tech = "materials=2;biotech=3;powerstorage=3"
modifystate = "floramut"
self_recharge = 1
- var/mode = 0 //0 = mutate, 1 = yield boost
-/obj/item/weapon/gun/energy/floragun/attack_self(mob/living/user as mob)
- switch(mode)
- if(0)
- mode = 1
- charge_cost = 100
- user << "The [src.name] is now set to increase yield."
- projectile_type = /obj/item/projectile/energy/florayield
- modifystate = "florayield"
- if(1)
- mode = 0
- charge_cost = 100
- user << "The [src.name] is now set to induce mutations."
- projectile_type = /obj/item/projectile/energy/floramut
- modifystate = "floramut"
- update_icon()
- update_held_icon()
+ firemodes = list(
+ list(name="induce mutations", projectile_type=/obj/item/projectile/energy/floramut, modifystate="floramut"),
+ list(name="increase yield", projectile_type=/obj/item/projectile/energy/florayield, modifystate="florayield"),
+ )
/obj/item/weapon/gun/energy/floragun/afterattack(obj/target, mob/user, adjacent_flag)
//allow shooting into adjacent hydrotrays regardless of intent
@@ -78,7 +67,6 @@
slot_flags = SLOT_BELT|SLOT_BACK
w_class = 4
projectile_type = /obj/item/projectile/meteor
- charge_cost = 100
cell_type = /obj/item/weapon/cell/potato
self_recharge = 1
recharge_time = 5 //Time it takes for shots to recharge (in ticks)
@@ -123,7 +111,7 @@
flags = CONDUCT
slot_flags = SLOT_BACK
w_class = 4.0
- charge_cost = 200
+ max_shots = 5
projectile_type = /obj/item/projectile/change
origin_tech = null
self_recharge = 1
@@ -140,7 +128,7 @@
name = "staff of animation"
desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."
projectile_type = /obj/item/projectile/animate
- charge_cost = 100
+ max_shots = 10
obj/item/weapon/gun/energy/staff/focus
name = "mental focus"
@@ -153,11 +141,11 @@ obj/item/weapon/gun/energy/staff/focus
/*
attack_self(mob/living/user as mob)
if(projectile_type == "/obj/item/projectile/forcebolt")
- charge_cost = 200
+ charge_cost = 400
user << "The [src.name] will now strike a small area."
projectile_type = "/obj/item/projectile/forcebolt/strong"
else
- charge_cost = 100
+ charge_cost = 200
user << "The [src.name] will now strike only a single person."
projectile_type = "/obj/item/projectile/forcebolt"
*/
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 1d51f7957e..cc40169fb5 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -4,9 +4,8 @@
icon_state = "taser"
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/Taser.ogg'
- charge_cost = 100
+ max_shots = 5
projectile_type = /obj/item/projectile/beam/stun
- cell_type = /obj/item/weapon/cell/crap
/obj/item/weapon/gun/energy/taser/mounted
name = "mounted taser gun"
@@ -15,7 +14,7 @@
/obj/item/weapon/gun/energy/taser/mounted/cyborg
name = "taser gun"
- cell_type = /obj/item/weapon/cell/secborg
+ max_shots = 6
recharge_time = 10 //Time it takes for shots to recharge (in ticks)
@@ -26,9 +25,8 @@
item_state = "stunrevolver"
fire_sound = 'sound/weapons/Gunshot.ogg'
origin_tech = "combat=3;materials=3;powerstorage=2"
- charge_cost = 125
projectile_type = /obj/item/projectile/energy/electrode/stunshot
- cell_type = /obj/item/weapon/cell
+ max_shots = 8
/obj/item/weapon/gun/energy/crossbow
@@ -37,13 +35,13 @@
icon_state = "crossbow"
w_class = 2.0
item_state = "crossbow"
- matter = list("metal" = 2000)
+ matter = list(DEFAULT_WALL_MATERIAL = 2000)
origin_tech = "combat=2;magnets=2;syndicate=5"
slot_flags = SLOT_BELT
silenced = 1
fire_sound = 'sound/weapons/Genhit.ogg'
projectile_type = /obj/item/projectile/energy/bolt
- cell_type = /obj/item/weapon/cell/crap
+ max_shots = 5
self_recharge = 1
charge_meter = 0
@@ -56,5 +54,5 @@
desc = "A weapon favored by mercenary infiltration teams."
w_class = 4
force = 10
- matter = list("metal" = 200000)
+ matter = list(DEFAULT_WALL_MATERIAL = 200000)
projectile_type = /obj/item/projectile/energy/bolt/large
diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm
index b836d265cc..47bc2cfc00 100644
--- a/code/modules/projectiles/guns/energy/temperature.dm
+++ b/code/modules/projectiles/guns/energy/temperature.dm
@@ -18,7 +18,7 @@
processing_objects.Add(src)
-/obj/item/weapon/gun/energy/temperature/Del()
+/obj/item/weapon/gun/energy/temperature/Destroy()
processing_objects.Remove(src)
..()
diff --git a/code/modules/projectiles/guns/launcher.dm b/code/modules/projectiles/guns/launcher.dm
index 98b09e12c7..8d5a9748f1 100644
--- a/code/modules/projectiles/guns/launcher.dm
+++ b/code/modules/projectiles/guns/launcher.dm
@@ -7,6 +7,7 @@
var/release_force = 0
var/throw_distance = 10
+ muzzle_flash = 0
fire_sound_text = "a launcher firing"
//This normally uses a proc on projectiles and our ammo is not strictly speaking a projectile.
@@ -26,6 +27,3 @@
projectile.loc = get_turf(user)
projectile.throw_at(target, throw_distance, release_force, user)
return 1
-
-/obj/item/weapon/gun/launcher/attack_self(mob/living/user as mob)
- return
diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm
index 917d3c338e..4736fc0c7b 100644
--- a/code/modules/projectiles/guns/launcher/crossbow.dm
+++ b/code/modules/projectiles/guns/launcher/crossbow.dm
@@ -43,7 +43,7 @@
user << "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow."
var/obj/item/weapon/shard/shrapnel/S = new()
S.loc = get_turf(src)
- src.Del()
+ qdel(src)
/obj/item/weapon/gun/launcher/crossbow
name = "powered crossbow"
@@ -257,7 +257,7 @@
if(buildstate == 5)
user << "\blue You secure the crossbow's various parts."
new /obj/item/weapon/gun/launcher/crossbow(get_turf(src))
- del(src)
+ qdel(src)
return
else
..()
diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm
index 906e428e8d..fe27d35790 100644
--- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm
@@ -15,7 +15,7 @@
var/obj/item/weapon/grenade/chambered
var/list/grenades = new/list()
var/max_grenades = 5 //holds this + one in the chamber
- matter = list("metal" = 2000)
+ matter = list(DEFAULT_WALL_MATERIAL = 2000)
//revolves the magazine, allowing players to choose between multiple grenade types
/obj/item/weapon/gun/launcher/grenade/proc/pump(mob/M as mob)
@@ -80,7 +80,7 @@
chambered.det_time = 10
chambered.activate(null)
return chambered
-
+
/obj/item/weapon/gun/launcher/grenade/handle_post_fire(mob/user)
message_admins("[key_name_admin(user)] fired a grenade ([chambered.name]) from a grenade launcher ([src.name]).")
log_game("[key_name_admin(user)] used a grenade ([chambered.name]).")
diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm
index b1a0f563df..863d3348e5 100644
--- a/code/modules/projectiles/guns/launcher/pneumatic.dm
+++ b/code/modules/projectiles/guns/launcher/pneumatic.dm
@@ -150,7 +150,7 @@
if(istype(W,/obj/item/pipe))
if(buildstate == 0)
user.drop_item()
- del(W)
+ qdel(W)
user << "\blue You secure the piping inside the frame."
buildstate++
update_icon()
@@ -168,7 +168,7 @@
else if(istype(W,/obj/item/device/transfer_valve))
if(buildstate == 4)
user.drop_item()
- del(W)
+ qdel(W)
user << "\blue You install the transfer valve and connect it to the piping."
buildstate++
update_icon()
@@ -197,7 +197,7 @@
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
user << "\blue You weld the valve into place."
new /obj/item/weapon/gun/launcher/pneumatic(get_turf(src))
- del(src)
+ qdel(src)
return
else
..()
diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm
index 099f8687a3..755ca336a7 100644
--- a/code/modules/projectiles/guns/launcher/syringe_gun.dm
+++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "syringe-cartridge"
var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot
- matter = list("metal" = 125, "glass" = 375)
+ matter = list(DEFAULT_WALL_MATERIAL = 125, "glass" = 375)
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 3
@@ -53,10 +53,10 @@
if(L.can_inject())
if(syringe.reagents)
syringe.reagents.trans_to(L, 15)
-
+
syringe.break_syringe(iscarbon(hit_atom)? hit_atom : null)
syringe.update_icon()
-
+
icon_state = initial(icon_state) //reset icon state
update_icon()
@@ -67,15 +67,15 @@
item_state = "syringegun"
w_class = 3
force = 7
- matter = list("metal" = 2000)
+ matter = list(DEFAULT_WALL_MATERIAL = 2000)
slot_flags = SLOT_BELT
-
+
fire_sound = 'sound/weapons/empty.ogg'
fire_sound_text = "a metallic thunk"
recoil = 0
release_force = 10
throw_distance = 10
-
+
var/list/darts = list()
var/max_darts = 1
var/obj/item/weapon/syringe_cartridge/next
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 944a9fe99f..576488e774 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -8,9 +8,9 @@
icon_state = "revolver"
origin_tech = "combat=2;materials=2"
w_class = 3
- matter = list("metal" = 1000)
+ matter = list(DEFAULT_WALL_MATERIAL = 1000)
recoil = 1
-
+
var/caliber = "357" //determines which casings will fit
var/handle_casings = EJECT_CASINGS //determines how spent casings should be handled
var/load_method = SINGLE_CASING|SPEEDLOADER //1 = Single shells, 2 = box or quick loader, 3 = magazine
@@ -18,7 +18,7 @@
//For SINGLE_CASING or SPEEDLOADER guns
var/max_shells = 0 //the number of casings that will fit inside
- var/ammo_type = null //the type of ammo that the gun comes preloaded with
+ var/ammo_type = null //the type of ammo that the gun comes preloaded with
var/list/loaded = list() //stored ammo
//For MAGAZINE guns
@@ -50,7 +50,7 @@
chambered = ammo_magazine.stored_ammo[1]
if(handle_casings != HOLD_CASINGS)
ammo_magazine.stored_ammo -= chambered
-
+
if (chambered)
return chambered.BB
return null
@@ -165,7 +165,10 @@
load_ammo(A, user)
/obj/item/weapon/gun/projectile/attack_self(mob/user as mob)
- unload_ammo(user)
+ if(firemodes.len > 1)
+ switch_firemodes(user)
+ else
+ unload_ammo(user)
/obj/item/weapon/gun/projectile/attack_hand(mob/user as mob)
if(user.get_inactive_hand() == src)
@@ -183,15 +186,15 @@
)
if(auto_eject_sound)
playsound(user, auto_eject_sound, 40, 1)
- ammo_magazine.update_icon()
+ ammo_magazine.update_icon()
ammo_magazine = null
update_icon() //make sure to do this after unsetting ammo_magazine
/obj/item/weapon/gun/projectile/examine(mob/user)
..(user)
- user << "Has [getAmmo()] round\s remaining."
if(ammo_magazine)
user << "It has \a [ammo_magazine] loaded."
+ user << "Has [getAmmo()] round\s remaining."
return
/obj/item/weapon/gun/projectile/proc/getAmmo()
@@ -203,3 +206,15 @@
if(chambered)
bullets += 1
return bullets
+
+/* Unneeded -- so far.
+//in case the weapon has firemodes and can't unload using attack_hand()
+/obj/item/weapon/gun/projectile/verb/unload_gun()
+ set name = "Unload Ammo"
+ set category = "Object"
+ set src in usr
+
+ if(usr.stat || usr.restrained()) return
+
+ unload_ammo(usr)
+*/
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index ee7bfbffff..2ad17537c2 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -10,7 +10,12 @@
slot_flags = SLOT_BELT
ammo_type = /obj/item/ammo_casing/c9mm
multi_aim = 1
- fire_delay = 0
+
+ firemodes = list(
+ list(name="semiauto", burst=1, fire_delay=0),
+ list(name="3-round bursts", burst=3, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 1.0)),
+ list(name="short bursts", burst=5, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
+ )
/obj/item/weapon/gun/projectile/automatic/mini_uzi
name = "\improper Uzi"
@@ -59,6 +64,12 @@
slot_flags = SLOT_BACK
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/c762
+
+ firemodes = list(
+ list(name="semiauto", burst=1, fire_delay=0),
+ list(name="3-round bursts", burst=3, move_delay=6, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 0.6)),
+ list(name="short bursts", burst=5, move_delay=6, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
+ )
/obj/item/weapon/gun/projectile/automatic/sts35/update_icon()
..()
@@ -87,6 +98,9 @@
icon_state = "wt550"
return
+/datum/firemode/z8
+ var/use_launcher = 0
+
/obj/item/weapon/gun/projectile/automatic/z8
name = "\improper Z8 Bulldog"
desc = "An older model bullpup carbine, made by the now defunct Zendai Foundries. Uses armor piercing 5.56mm rounds. Makes you feel like a space marine when you hold it."
@@ -104,17 +118,20 @@
auto_eject = 1
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
- var/use_launcher = 0
+ burst_delay = 4
+ firemode_type = /datum/firemode/z8
+ firemodes = list(
+ list(name="semiauto", burst=1, fire_delay=0),
+ list(name="3-round bursts", burst=3, move_delay=6, accuracy = list(0,-1,-1), dispersion = list(0.0, 0.6, 0.6)),
+ list(name="fire grenades", use_launcher=1)
+ )
+
var/obj/item/weapon/gun/launcher/grenade/underslung/launcher
/obj/item/weapon/gun/projectile/automatic/z8/New()
..()
launcher = new(src)
-/obj/item/weapon/gun/projectile/automatic/z8/attack_self(mob/user)
- use_launcher = !use_launcher
- user << "You switch to [use_launcher? "\the [launcher]" : "firing normally"]."
-
/obj/item/weapon/gun/projectile/automatic/z8/attackby(obj/item/I, mob/user)
if((istype(I, /obj/item/weapon/grenade)))
launcher.load(I, user)
@@ -122,16 +139,18 @@
..()
/obj/item/weapon/gun/projectile/automatic/z8/attack_hand(mob/user)
- if(user.get_inactive_hand() == src && use_launcher)
+ var/datum/firemode/z8/current_mode = firemodes[sel_mode]
+ if(user.get_inactive_hand() == src && current_mode.use_launcher)
launcher.unload(user)
else
..()
/obj/item/weapon/gun/projectile/automatic/z8/Fire(atom/target, mob/living/user, params, pointblank=0, reflex=0)
- if(use_launcher)
+ var/datum/firemode/z8/current_mode = firemodes[sel_mode]
+ if(current_mode.use_launcher)
launcher.Fire(target, user, params, pointblank, reflex)
if(!launcher.chambered)
- use_launcher = 0 //switch back automatically
+ switch_firemodes() //switch back automatically
else
..()
@@ -166,22 +185,40 @@
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/a762
+
+ firemodes = list(
+ list(name="short bursts", burst=5, move_delay=6, accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
+ list(name="long bursts", burst=8, move_delay=8, accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)),
+ )
+
var/cover_open = 0
-/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob)
- cover_open = !cover_open
- user << "You [cover_open ? "open" : "close"] [src]'s cover."
- update_icon()
-
-/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
- icon_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? round(ammo_magazine.stored_ammo.len, 25) : "-empty"]"
-
/obj/item/weapon/gun/projectile/automatic/l6_saw/special_check(mob/user)
if(cover_open)
user << "[src]'s cover is open! Close it before firing!"
return 0
return ..()
+/obj/item/weapon/gun/projectile/automatic/l6_saw/proc/toggle_cover(mob/user)
+ cover_open = !cover_open
+ user << "You [cover_open ? "open" : "close"] [src]'s cover."
+ update_icon()
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob)
+ if(cover_open)
+ toggle_cover(user) //close the cover
+ else
+ return ..() //once closed, behave like normal
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_hand(mob/user as mob)
+ if(!cover_open && user.get_inactive_hand() == src)
+ toggle_cover(user) //open the cover
+ else
+ return ..() //once open, behave like normal
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
+ icon_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? round(ammo_magazine.stored_ammo.len, 25) : "-empty"]"
+
/obj/item/weapon/gun/projectile/automatic/l6_saw/load_ammo(var/obj/item/A, mob/user)
if(!cover_open)
user << "You need to open the cover to load [src]."
@@ -190,5 +227,6 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw/unload_ammo(mob/user, var/allow_dump=1)
if(!cover_open)
+ user << "You need to open the cover to unload [src]."
return
..()
diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm
index cf05a005ed..e6a81c7057 100644
--- a/code/modules/projectiles/guns/projectile/dartgun.dm
+++ b/code/modules/projectiles/guns/projectile/dartgun.dm
@@ -27,7 +27,7 @@
projectile_type = /obj/item/projectile/bullet/chemdart
/obj/item/ammo_casing/chemdart/expend()
- del(src)
+ qdel(src)
/obj/item/ammo_magazine/chemdart
name = "dart cartridge"
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index fa29d7e8ba..1b3bb21451 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -65,12 +65,24 @@
caliber = "shotgun"
origin_tech = "combat=3;materials=1"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+
+ burst_delay = 0
+ firemodes = list(
+ list(name="fire one barrel at a time", burst=1),
+ list(name="fire both barrels at once", burst=2),
+ )
+
+/obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet
+ ammo_type = /obj/item/ammo_casing/shotgun/pellet
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare
name = "signal shotgun"
desc = "A double-barreled shotgun meant to fire signal flash shells."
ammo_type = /obj/item/ammo_casing/shotgun/flash
+/obj/item/weapon/gun/projectile/shotgun/doublebarrel/unload_ammo(user, allow_dump)
+ ..(user, allow_dump=1)
+
//this is largely hacky and bad :( -Pete
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/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))
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 98293ebc7f..2bd77f3442 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -33,6 +33,9 @@
var/p_x = 16
var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center
+ var/accuracy = 0
+ var/dispersion = 0.0
+
var/damage = 10
var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here
var/nodamage = 0 //Determines if the projectile will skip any damage inflictions
@@ -101,6 +104,12 @@
if(mouse_control["icon-y"])
p_y = text2num(mouse_control["icon-y"])
+ //randomize clickpoint a bit based on dispersion
+ if(dispersion)
+ var/radius = round((dispersion*0.443)*world.icon_size*0.8) //0.443 = sqrt(pi)/4 = 2a, where a is the side length of a square that shares the same area as a circle with diameter = dispersion
+ p_x = between(0, p_x + rand(-radius, radius), world.icon_size)
+ p_y = between(0, p_y + rand(-radius, radius), world.icon_size)
+
//called to launch a projectile from a gun
/obj/item/projectile/proc/launch(atom/target, mob/user, obj/item/weapon/gun/launcher, var/target_zone, var/x_offset=0, var/y_offset=0)
var/turf/curloc = get_turf(user)
@@ -147,24 +156,15 @@
yo = new_y - starting_loc.y
xo = new_x - starting_loc.x
+ setup_trajectory()
//Called when the projectile intercepts a mob. Returns 1 if the projectile hit the mob, 0 if it missed and should keep flying.
/obj/item/projectile/proc/attack_mob(var/mob/living/target_mob, var/distance, var/miss_modifier=0)
if(!istype(target_mob))
return
- //accuracy bonus from aiming
- if (istype(shot_from, /obj/item/weapon/gun))
- var/obj/item/weapon/gun/daddy = shot_from
- miss_modifier -= round(15*daddy.accuracy)
-
- //If you aim at someone beforehead, it'll hit more often.
- //Kinda balanced by fact you need like 2 seconds to aim
- //As opposed to no-delay pew pew
- if (daddy.aim_targets && original in daddy.aim_targets)
- miss_modifier += -30
//roll to-hit
- miss_modifier = max(miss_modifier + 15*(distance-2), 0)
+ miss_modifier = max(15*(distance-2) - round(15*accuracy) + miss_modifier, 0)
var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1))
if(!hit_zone)
visible_message("\The [src] misses [target_mob] narrowly!")
@@ -180,16 +180,17 @@
visible_message("\The [target_mob] is hit by \the [src] in the [parse_zone(def_zone)]!")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
//admin logs
- if(istype(firer, /mob))
- target_mob.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [target_mob]/[target_mob.ckey] with a [src.type]"
- firer.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [target_mob]/[target_mob.ckey] with a [src.type]"
- msg_admin_attack("[firer] ([firer.ckey]) shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG
- else if(firer)
- target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with a [src]"
- msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG
- else
- target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with a [src]"
- msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG
+ if(!no_attack_log)
+ if(istype(firer, /mob))
+ target_mob.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [target_mob]/[target_mob.ckey] with a [src.type]"
+ firer.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [target_mob]/[target_mob.ckey] with a [src.type]"
+ msg_admin_attack("[firer] ([firer.ckey]) shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG
+ else if(firer)
+ target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with a [src]"
+ msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG
+ else
+ target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with a [src]"
+ msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with a [src] (JMP)") //BS12 EDIT ALG
//sometimes bullet_act() will want the projectile to continue flying
if (target_mob.bullet_act(src, def_zone) == -1)
@@ -274,10 +275,11 @@
//plot the initial trajectory
setup_trajectory()
- spawn while(src)
+ spawn while(src && src.loc)
if(kill_count-- < 1)
on_impact(src.loc) //for any final impact behaviours
qdel(src)
+ return
if((!( current ) || loc == current))
current = locate(min(max(x + xo, 1), world.maxx), min(max(y + yo, 1), world.maxy), z)
if((x == 1 || x == world.maxx || y == 1 || y == world.maxy))
@@ -289,6 +291,7 @@
if(!location)
qdel(src) // if it's left the world... kill it
+ return
before_move()
Move(location.return_turf())
@@ -302,8 +305,8 @@
if(!bumped && !isturf(original))
if(loc == get_turf(original))
if(!(original in permutated))
- Bump(original)
-
+ if(Bump(original))
+ return
if(!hitscan)
sleep(step_delay) //add delay between movement iterations if it's not a hitscan weapon
@@ -314,9 +317,15 @@
/obj/item/projectile/proc/before_move()
/obj/item/projectile/proc/setup_trajectory()
+ // trajectory dispersion
+ var/offset = 0
+ if(dispersion)
+ var/radius = round(dispersion*9, 1)
+ offset = rand(-radius, radius)
+
// plot the initial trajectory
trajectory = new()
- trajectory.setup(starting, original, pixel_x, pixel_y)
+ trajectory.setup(starting, original, pixel_x, pixel_y, angle_offset=offset)
// generate this now since all visual effects the projectile makes can use it
effect_transform = new()
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index cbe1ad5625..eb515298ef 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -68,6 +68,7 @@
icon_state = "bluelaser"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 0
+ no_attack_log = 1
damage_type = BURN
check_armour = "laser"
@@ -87,6 +88,7 @@
icon_state = "laser"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 0
+ no_attack_log = 1
damage_type = BURN
check_armour = "laser"
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 977c9e26f4..06e0a02c1f 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -8,7 +8,7 @@
embed = 1
sharp = 1
var/mob_passthrough_check = 0
-
+
muzzle_type = /obj/effect/projectile/bullet/muzzle
/obj/item/projectile/bullet/on_hit(var/atom/target, var/blocked = 0)
@@ -38,19 +38,19 @@
if(ismob(A))
if(!mob_passthrough_check)
return 0
- if(iscarbon(A))
- damage *= 0.7 //squishy mobs absorb KE
+ if(iscarbon(A))
+ damage *= 0.7 //squishy mobs absorb KE
return 1
var/chance = 0
if(istype(A, /turf/simulated/wall))
var/turf/simulated/wall/W = A
- chance = round(damage/W.damage_cap*180)
+ chance = round(damage/W.material.integrity*180)
else if(istype(A, /obj/machinery/door))
var/obj/machinery/door/D = A
chance = round(damage/D.maxhealth*180)
if(D.glass) chance *= 2
- else if(istype(A, /obj/structure/girder) || istype(A, /obj/structure/cultgirder))
+ else if(istype(A, /obj/structure/girder))
chance = 100
else if(istype(A, /obj/machinery) || istype(A, /obj/structure))
chance = 25
@@ -148,6 +148,7 @@
stun = 3
weaken = 3
penetrating = 5
+ hitscan = 1 //so the PTR isn't useless as a sniper weapon
/obj/item/projectile/bullet/rifle/a556
damage = 40
@@ -184,3 +185,15 @@
/obj/item/projectile/bullet/chameleon
damage = 1 // stop trying to murderbone with a fake gun dumbass!!!
embed = 0 // nope
+
+/* Practice */
+
+/obj/item/projectile/bullet/pistol/practice
+ damage = 5
+
+/obj/item/projectile/bullet/rifle/a556/practice
+ damage = 5
+
+/obj/item/projectile/bullet/shotgun/practice
+ name = "practice"
+ damage = 5
diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm
index 051ae913f6..4a9fdb9c4f 100644
--- a/code/modules/projectiles/projectile/change.dm
+++ b/code/modules/projectiles/projectile/change.dm
@@ -19,11 +19,11 @@
if(istype(M, /mob/living/silicon/robot))
var/mob/living/silicon/robot/Robot = M
if(Robot.mmi)
- del(Robot.mmi)
+ qdel(Robot.mmi)
else
for(var/obj/item/W in M)
if(istype(W, /obj/item/weapon/implant)) //TODO: Carn. give implants a dropped() or something
- del(W)
+ qdel(W)
continue
M.drop_from_inventory(W)
@@ -90,7 +90,7 @@
new_mob << "Your form morphs into that of \a [lowertext(randomize)]."
- del(M)
+ qdel(M)
return
else
M << "Your form morphs into that of \a [lowertext(randomize)]."
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index fc69f6ec94..9ef0aea43c 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -65,7 +65,7 @@
for(var/mob/M in range(10, src))
if(!M.stat && !istype(M, /mob/living/silicon/ai))\
shake_camera(M, 3, 1)
- del(src)
+ qdel(src)
return 1
else
return 0
@@ -141,12 +141,12 @@
/obj/item/projectile/icarus/pointdefense/process()
Icarus_FireLaser(get_turf(original))
spawn
- del src
+ qdel(src)
return
/obj/item/projectile/icarus/guns/process()
Icarus_FireCannon(get_turf(original))
spawn
- del src
+ qdel(src)
return
diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm
index c69d8afda4..3bda5319d7 100644
--- a/code/modules/projectiles/targeting.dm
+++ b/code/modules/projectiles/targeting.dm
@@ -16,10 +16,6 @@
stop_aim()
usr.visible_message(" \The [usr] lowers \the [src]...")
-//Clicking gun will still lower aim for guns that don't overwrite this
-/obj/item/weapon/gun/attack_self()
- lower_aim()
-
//Removing the lock and the buttons.
/obj/item/weapon/gun/dropped(mob/user as mob)
stop_aim()
@@ -40,7 +36,7 @@
for(var/mob/living/M in aim_targets)
if(M)
M.NotTargeted(src) //Untargeting people.
- del(aim_targets)
+ qdel(aim_targets)
//Compute how to fire.....
//Return 1 if a target was found, 0 otherwise.
@@ -69,7 +65,7 @@
for(var/mob/living/L in aim_targets)
if(L)
L.NotTargeted(src)
- del(aim_targets)
+ qdel(aim_targets)
usr.visible_message("[usr] turns \the [src] on [M]!")
else
usr.visible_message("[usr] aims \a [src] at [M]!")
@@ -234,13 +230,13 @@
targeted_by -= I
I.aim_targets.Remove(src) //De-target them
if(!I.aim_targets.len)
- del(I.aim_targets)
+ qdel(I.aim_targets)
var/mob/living/T = I.loc //Remove the targeting icons
if(T && ismob(T) && !I.aim_targets && T.client)
T.client.remove_gun_icons()
if(!targeted_by.len)
- del target_locked //Remove the overlay
- del targeted_by
+ qdel(target_locked) //Remove the overlay
+ qdel(targeted_by)
spawn(1) update_targeted()
/mob/living/Move()
@@ -308,7 +304,7 @@
else
usr << "Target may no longer move."
target_can_run = 0
- del(usr.gun_run_icon) //no need for icon for running permission
+ qdel(usr.gun_run_icon) //no need for icon for running permission
//Updating walking permission button
if(usr.gun_move_icon)
diff --git a/code/modules/reagents/Chemistry-Colours.dm b/code/modules/reagents/Chemistry-Colours.dm
index a59147e85f..501b1ac475 100644
--- a/code/modules/reagents/Chemistry-Colours.dm
+++ b/code/modules/reagents/Chemistry-Colours.dm
@@ -1,66 +1,23 @@
-/proc/mix_color_from_reagents(var/list/reagent_list)
- if(!reagent_list || !length(reagent_list))
- return 0
+/datum/reagents/proc/get_color()
+ if(!reagent_list || !reagent_list.len)
+ return "#ffffffff"
+ if(reagent_list.len == 1) // It's pretty common and saves a lot of work
+ var/datum/reagent/R = reagent_list[1]
+ return R.color
- var/contents = length(reagent_list)
- var/list/weight = new /list(contents)
- var/list/redcolor = new /list(contents)
- var/list/greencolor = new /list(contents)
- var/list/bluecolor = new /list(contents)
- var/i
+ var/list/colors = list(0, 0, 0, 0)
+ var/tot_w = 0
+ for(var/datum/reagent/R in reagent_list)
+ var/hex = uppertext(R.color)
+ if(length(hex) == 7)
+ hex += "FF"
+ if(length(hex) != 9) // PANIC PANIC PANIC
+ warning("Reagent [R.id] has an incorrect color set ([R.color])")
+ hex = "#FFFFFFFF"
+ colors[1] += hex2num(copytext(hex, 2, 4)) * R.volume * R.color_weight
+ colors[2] += hex2num(copytext(hex, 4, 6)) * R.volume * R.color_weight
+ colors[3] += hex2num(copytext(hex, 6, 8)) * R.volume * R.color_weight
+ colors[4] += hex2num(copytext(hex, 8, 10)) * R.volume * R.color_weight
+ tot_w += R.volume * R.color_weight
- //fill the list of weights
- for(i=1; i<=contents; i++)
- var/datum/reagent/re = reagent_list[i]
- var/reagentweight = re.volume
- if(istype(re, /datum/reagent/paint))
- reagentweight *= 20 //Paint colours a mixture twenty times as much
- weight[i] = reagentweight
-
-
- //fill the lists of colours
- for(i=1; i<=contents; i++)
- var/datum/reagent/re = reagent_list[i]
- var/hue = re.color
- if(length(hue) != 7)
- return 0
- redcolor[i]=hex2num(copytext(hue,2,4))
- greencolor[i]=hex2num(copytext(hue,4,6))
- bluecolor[i]=hex2num(copytext(hue,6,8))
-
- //mix all the colors
- var/red = mixOneColor(weight,redcolor)
- var/green = mixOneColor(weight,greencolor)
- var/blue = mixOneColor(weight,bluecolor)
-
- //assemble all the pieces
- var/finalcolor = rgb(red, green, blue)
- return finalcolor
-
-/proc/mixOneColor(var/list/weight, var/list/color)
- if (!weight || !color || length(weight)!=length(color))
- return 0
-
- var/contents = length(weight)
- var/i
-
- //normalize weights
- var/listsum = 0
- for(i=1; i<=contents; i++)
- listsum += weight[i]
- for(i=1; i<=contents; i++)
- weight[i] /= listsum
-
- //mix them
- var/mixedcolor = 0
- for(i=1; i<=contents; i++)
- mixedcolor += weight[i]*color[i]
- mixedcolor = round(mixedcolor)
-
- //until someone writes a formal proof for this algorithm, let's keep this in
-// if(mixedcolor<0x00 || mixedcolor>0xFF)
-// return 0
- //that's not the kind of operation we are running here, nerd
- mixedcolor=min(max(mixedcolor,0),255)
-
- return mixedcolor
+ return rgb(colors[1] / tot_w, colors[2] / tot_w, colors[3] / tot_w, colors[4] / tot_w)
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 6c6c194af5..a9562ca861 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -5,655 +5,623 @@ var/const/INGEST = 2
///////////////////////////////////////////////////////////////////////////////////
-datum
- reagents
- var/list/datum/reagent/reagent_list = new/list()
- var/total_volume = 0
- var/maximum_volume = 100
- var/atom/my_atom = null
+/datum/reagents
+ var/list/datum/reagent/reagent_list = new/list()
+ var/total_volume = 0
+ var/maximum_volume = 100
+ var/atom/my_atom = null
- New(maximum=100)
- maximum_volume = maximum
+/datum/reagents/New(maximum=100)
+ maximum_volume = maximum
- //I dislike having these here but map-objects are initialised before world/New() is called. >_>
- if(!chemical_reagents_list)
- //Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id
- var/paths = typesof(/datum/reagent) - /datum/reagent
- chemical_reagents_list = list()
- for(var/path in paths)
- var/datum/reagent/D = new path()
- chemical_reagents_list[D.id] = D
- if(!chemical_reactions_list)
- //Chemical Reactions - Initialises all /datum/chemical_reaction into a list
- // It is filtered into multiple lists within a list.
- // For example:
- // chemical_reaction_list["phoron"] is a list of all reactions relating to phoron
+ //I dislike having these here but map-objects are initialised before world/New() is called. >_>
+ if(!chemical_reagents_list)
+ //Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id
+ var/paths = typesof(/datum/reagent) - /datum/reagent
+ chemical_reagents_list = list()
+ for(var/path in paths)
+ var/datum/reagent/D = new path()
+ chemical_reagents_list[D.id] = D
+ if(!chemical_reactions_list)
+ //Chemical Reactions - Initialises all /datum/chemical_reaction into a list
+ // It is filtered into multiple lists within a list.
+ // For example:
+ // chemical_reaction_list["phoron"] is a list of all reactions relating to phoron
- var/paths = typesof(/datum/chemical_reaction) - /datum/chemical_reaction
- chemical_reactions_list = list()
+ var/paths = typesof(/datum/chemical_reaction) - /datum/chemical_reaction
+ chemical_reactions_list = list()
- for(var/path in paths)
+ for(var/path in paths)
- var/datum/chemical_reaction/D = new path()
- var/list/reaction_ids = list()
+ var/datum/chemical_reaction/D = new path()
+ var/list/reaction_ids = list()
- if(D.required_reagents && D.required_reagents.len)
- for(var/reaction in D.required_reagents)
- reaction_ids += reaction
+ if(D.required_reagents && D.required_reagents.len)
+ for(var/reaction in D.required_reagents)
+ reaction_ids += reaction
- // Create filters based on each reagent id in the required reagents list
- for(var/id in reaction_ids)
- if(!chemical_reactions_list[id])
- chemical_reactions_list[id] = list()
- chemical_reactions_list[id] += D
- break // Don't bother adding ourselves to other reagent ids, it is redundant.
+ // Create filters based on each reagent id in the required reagents list
+ for(var/id in reaction_ids)
+ if(!chemical_reactions_list[id])
+ chemical_reactions_list[id] = list()
+ chemical_reactions_list[id] += D
+ break // Don't bother adding ourselves to other reagent ids, it is redundant.
- proc
+/datum/reagents/Destroy()
+ ..()
+ for(var/datum/reagent/R in reagent_list)
+ qdel(R)
+ reagent_list.Cut()
+ reagent_list = null
+ if(my_atom && my_atom.reagents == src)
+ my_atom.reagents = null
- remove_any(var/amount=1)
- var/total_transfered = 0
- var/current_list_element = 1
+/datum/reagents/proc/remove_any(var/amount=1)
+ var/total_transfered = 0
+ var/current_list_element = 1
- current_list_element = rand(1,reagent_list.len)
+ current_list_element = rand(1,reagent_list.len)
- while(total_transfered != amount)
- if(total_transfered >= amount) break
- if(total_volume <= 0 || !reagent_list.len) break
+ while(total_transfered != amount)
+ if(total_transfered >= amount) break
+ if(total_volume <= 0 || !reagent_list.len) break
- if(current_list_element > reagent_list.len) current_list_element = 1
- var/datum/reagent/current_reagent = reagent_list[current_list_element]
+ if(current_list_element > reagent_list.len) current_list_element = 1
+ var/datum/reagent/current_reagent = reagent_list[current_list_element]
- src.remove_reagent(current_reagent.id, 1)
+ src.remove_reagent(current_reagent.id, 1)
- current_list_element++
- total_transfered++
- src.update_total()
+ current_list_element++
+ total_transfered++
+ src.update_total()
- handle_reactions()
- return total_transfered
+ handle_reactions()
+ return total_transfered
- get_master_reagent()
- var/the_reagent = null
- var/the_volume = 0
- for(var/datum/reagent/A in reagent_list)
- if(A.volume > the_volume)
- the_volume = A.volume
- the_reagent = A
+/datum/reagents/proc/get_master_reagent()
+ var/the_reagent = null
+ var/the_volume = 0
+ for(var/datum/reagent/A in reagent_list)
+ if(A.volume > the_volume)
+ the_volume = A.volume
+ the_reagent = A
- return the_reagent
+ return the_reagent
- get_master_reagent_name()
- var/the_name = null
- var/the_volume = 0
- for(var/datum/reagent/A in reagent_list)
- if(A.volume > the_volume)
- the_volume = A.volume
- the_name = A.name
+/datum/reagents/proc/get_master_reagent_name()
+ var/the_name = null
+ var/the_volume = 0
+ for(var/datum/reagent/A in reagent_list)
+ if(A.volume > the_volume)
+ the_volume = A.volume
+ the_name = A.name
- return the_name
+ return the_name
- get_master_reagent_id()
- var/the_id = null
- var/the_volume = 0
- for(var/datum/reagent/A in reagent_list)
- if(A.volume > the_volume)
- the_volume = A.volume
- the_id = A.id
+/datum/reagents/proc/get_master_reagent_id()
+ var/the_id = null
+ var/the_volume = 0
+ for(var/datum/reagent/A in reagent_list)
+ if(A.volume > the_volume)
+ the_volume = A.volume
+ the_id = A.id
- return the_id
+ return the_id
- trans_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred.
- if (!target )
- return
- if (!target.reagents || src.total_volume<=0)
- return
- var/datum/reagents/R = target.reagents
- amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
- var/part = amount / src.total_volume
- var/trans_data = null
- for (var/datum/reagent/current_reagent in src.reagent_list)
- if (!current_reagent)
- continue
- if (current_reagent.id == "blood" && ishuman(target))
- var/mob/living/carbon/human/H = target
- H.inject_blood(my_atom, amount)
- continue
- var/current_reagent_transfer = current_reagent.volume * part
- if(preserve_data)
- trans_data = copy_data(current_reagent)
+/datum/reagents/proc/trans_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred.
+ if (!target )
+ return
+ if (!target.reagents || src.total_volume<=0)
+ return
+ var/datum/reagents/R = target.reagents
+ amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
+ var/part = amount / src.total_volume
+ var/trans_data = null
+ for (var/datum/reagent/current_reagent in src.reagent_list)
+ if (!current_reagent)
+ continue
+ if (current_reagent.id == "blood" && ishuman(target))
+ var/mob/living/carbon/human/H = target
+ H.inject_blood(my_atom, amount)
+ continue
+ var/current_reagent_transfer = current_reagent.volume * part
+ if(preserve_data)
+ trans_data = copy_data(current_reagent)
- R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data, safety = 1) //safety checks on these so all chemicals are transferred
- src.remove_reagent(current_reagent.id, current_reagent_transfer, safety = 1) // to the target container before handling reactions
+ R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data, safety = 1) //safety checks on these so all chemicals are transferred
+ src.remove_reagent(current_reagent.id, current_reagent_transfer, safety = 1) // to the target container before handling reactions
- src.update_total()
- R.update_total()
- R.handle_reactions()
- src.handle_reactions()
- return amount
+ src.update_total()
+ R.update_total()
+ R.handle_reactions()
+ src.handle_reactions()
+ return amount
- trans_to_ingest(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//For items ingested. A delay is added between ingestion and addition of the reagents
- if (!target )
- return
- if (!target.reagents || src.total_volume<=0)
- return
+/datum/reagents/proc/trans_to_ingest(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//For items ingested. A delay is added between ingestion and addition of the reagents
+ if (!target )
+ return
+ if (!target.reagents || src.total_volume<=0)
+ return
- /*var/datum/reagents/R = target.reagents
+ /*var/datum/reagents/R = target.reagents
- var/obj/item/weapon/reagent_containers/glass/beaker/noreact/B = new /obj/item/weapon/reagent_containers/glass/beaker/noreact //temporary holder
+ var/obj/item/weapon/reagent_containers/glass/beaker/noreact/B = new /obj/item/weapon/reagent_containers/glass/beaker/noreact //temporary holder
- amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
- var/part = amount / src.total_volume
- var/trans_data = null
- for (var/datum/reagent/current_reagent in src.reagent_list)
- if (!current_reagent)
- continue
- //if (current_reagent.id == "blood" && ishuman(target))
- // var/mob/living/carbon/human/H = target
- // H.inject_blood(my_atom, amount)
- // continue
- var/current_reagent_transfer = current_reagent.volume * part
- if(preserve_data)
- trans_data = current_reagent.data
+ amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
+ var/part = amount / src.total_volume
+ var/trans_data = null
+ for (var/datum/reagent/current_reagent in src.reagent_list)
+ if (!current_reagent)
+ continue
+ //if (current_reagent.id == "blood" && ishuman(target))
+ // var/mob/living/carbon/human/H = target
+ // H.inject_blood(my_atom, amount)
+ // continue
+ var/current_reagent_transfer = current_reagent.volume * part
+ if(preserve_data)
+ trans_data = current_reagent.data
- B.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data, safety = 1) //safety checks on these so all chemicals are transferred
- src.remove_reagent(current_reagent.id, current_reagent_transfer, safety = 1) // to the target container before handling reactions
+ B.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data, safety = 1) //safety checks on these so all chemicals are transferred
+ src.remove_reagent(current_reagent.id, current_reagent_transfer, safety = 1) // to the target container before handling reactions
- src.update_total()
- B.update_total()
- B.handle_reactions()
- src.handle_reactions()*/
+ src.update_total()
+ B.update_total()
+ B.handle_reactions()
+ src.handle_reactions()*/
- var/obj/item/weapon/reagent_containers/glass/beaker/noreact/B = new /obj/item/weapon/reagent_containers/glass/beaker/noreact //temporary holder
- B.volume = 1000
+ var/obj/item/weapon/reagent_containers/glass/beaker/noreact/B = new /obj/item/weapon/reagent_containers/glass/beaker/noreact //temporary holder
+ B.volume = 1000
- var/datum/reagents/BR = B.reagents
- var/datum/reagents/R = target.reagents
+ var/datum/reagents/BR = B.reagents
+ var/datum/reagents/R = target.reagents
- amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
+ amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
- src.trans_to(B, amount)
+ src.trans_to(B, amount)
- spawn(95)
- BR.reaction(target, INGEST)
- spawn(5)
- BR.trans_to(target, BR.total_volume)
- del(B)
+ spawn(95)
+ BR.reaction(target, INGEST)
+ spawn(5)
+ BR.trans_to(target, BR.total_volume)
+ qdel(B)
- return amount
+ return amount
- copy_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1, var/safety = 0)
- if(!target)
- return
- if(!target.reagents || src.total_volume<=0)
- return
- var/datum/reagents/R = target.reagents
- amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
- var/part = amount / src.total_volume
- var/trans_data = null
- for (var/datum/reagent/current_reagent in src.reagent_list)
- var/current_reagent_transfer = current_reagent.volume * part
- if(preserve_data)
- trans_data = copy_data(current_reagent)
- R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data, safety = 1) //safety check so all chemicals are transferred before reacting
+/datum/reagents/proc/copy_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1, var/safety = 0)
+ if(!target)
+ return
+ if(!target.reagents || src.total_volume<=0)
+ return
+ var/datum/reagents/R = target.reagents
+ amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
+ var/part = amount / src.total_volume
+ var/trans_data = null
+ for (var/datum/reagent/current_reagent in src.reagent_list)
+ var/current_reagent_transfer = current_reagent.volume * part
+ if(preserve_data)
+ trans_data = copy_data(current_reagent)
+ R.add_reagent(current_reagent.id, (current_reagent_transfer * multiplier), trans_data, safety = 1) //safety check so all chemicals are transferred before reacting
- src.update_total()
- R.update_total()
- if(!safety)
- R.handle_reactions()
- src.handle_reactions()
- return amount
+ src.update_total()
+ R.update_total()
+ if(!safety)
+ R.handle_reactions()
+ src.handle_reactions()
+ return amount
- trans_id_to(var/obj/target, var/reagent, var/amount=1, var/preserve_data=1)//Not sure why this proc didn't exist before. It does now! /N
- if (!target)
- return
- if (!target.reagents || src.total_volume<=0 || !src.get_reagent_amount(reagent))
- return
+/datum/reagents/proc/trans_id_to(var/obj/target, var/reagent, var/amount=1, var/preserve_data=1)//Not sure why this proc didn't exist before. It does now! /N
+ if (!target)
+ return
+ if (!target.reagents || src.total_volume<=0 || !src.get_reagent_amount(reagent))
+ return
- var/datum/reagents/R = target.reagents
- if(src.get_reagent_amount(reagent) R.maximum_volume) return 0
+ if (!target) return
+ var/total_transfered = 0
+ var/current_list_element = 1
+ var/datum/reagents/R = target.reagents
+ var/trans_data = null
+ //if(R.total_volume + amount > R.maximum_volume) return 0
- current_list_element = rand(1,reagent_list.len) //Eh, bandaid fix.
+ current_list_element = rand(1,reagent_list.len) //Eh, bandaid fix.
- while(total_transfered != amount)
- if(total_transfered >= amount) break //Better safe than sorry.
- if(total_volume <= 0 || !reagent_list.len) break
- if(R.total_volume >= R.maximum_volume) break
+ while(total_transfered != amount)
+ if(total_transfered >= amount) break //Better safe than sorry.
+ if(total_volume <= 0 || !reagent_list.len) break
+ if(R.total_volume >= R.maximum_volume) break
- if(current_list_element > reagent_list.len) current_list_element = 1
- var/datum/reagent/current_reagent = reagent_list[current_list_element]
- if(preserve_data)
- trans_data = current_reagent.data
- R.add_reagent(current_reagent.id, (1 * multiplier), trans_data)
- src.remove_reagent(current_reagent.id, 1)
+ if(current_list_element > reagent_list.len) current_list_element = 1
+ var/datum/reagent/current_reagent = reagent_list[current_list_element]
+ if(preserve_data)
+ trans_data = current_reagent.data
+ R.add_reagent(current_reagent.id, (1 * multiplier), trans_data)
+ src.remove_reagent(current_reagent.id, 1)
- current_list_element++
- total_transfered++
- src.update_total()
- R.update_total()
- R.handle_reactions()
- handle_reactions()
+ current_list_element++
+ total_transfered++
+ src.update_total()
+ R.update_total()
+ R.handle_reactions()
+ handle_reactions()
- return total_transfered
+ return total_transfered
*/
- metabolize(var/mob/M,var/alien)
+/datum/reagents/proc/metabolize(var/mob/M,var/alien)
- for(var/A in reagent_list)
- var/datum/reagent/R = A
- if(M && R)
- R.on_mob_life(M,alien)
- update_total()
+ for(var/A in reagent_list)
+ var/datum/reagent/R = A
+ if(M && R)
+ R.on_mob_life(M,alien)
+ update_total()
- conditional_update_move(var/atom/A, var/Running = 0)
- for(var/datum/reagent/R in reagent_list)
- R.on_move (A, Running)
- update_total()
+/datum/reagents/proc/conditional_update_move(var/atom/A, var/Running = 0)
+ for(var/datum/reagent/R in reagent_list)
+ R.on_move (A, Running)
+ update_total()
- conditional_update(var/atom/A, )
- for(var/datum/reagent/R in reagent_list)
- R.on_update (A)
- update_total()
+/datum/reagents/proc/conditional_update(var/atom/A, )
+ for(var/datum/reagent/R in reagent_list)
+ R.on_update (A)
+ update_total()
- handle_reactions()
- if(my_atom.flags & NOREACT) return //Yup, no reactions here. No siree.
+/datum/reagents/proc/handle_reactions()
+ if(my_atom.flags & NOREACT) return //Yup, no reactions here. No siree.
- var/reaction_occured = 0
- do
- reaction_occured = 0
- for(var/datum/reagent/R in reagent_list) // Usually a small list
- for(var/reaction in chemical_reactions_list[R.id]) // Was a big list but now it should be smaller since we filtered it with our reagent id
+ var/reaction_occured = 0
+ do
+ reaction_occured = 0
+ for(var/datum/reagent/R in reagent_list) // Usually a small list
+ for(var/reaction in chemical_reactions_list[R.id]) // Was a big list but now it should be smaller since we filtered it with our reagent id
- if(!reaction)
- continue
+ if(!reaction)
+ continue
- var/datum/chemical_reaction/C = reaction
+ var/datum/chemical_reaction/C = reaction
- //check if this recipe needs to be heated to mix
- if(C.requires_heating)
- if(istype(my_atom.loc, /obj/machinery/bunsen_burner))
- if(!my_atom.loc:heated)
- continue
- else
- continue
-
- var/total_required_reagents = C.required_reagents.len
- var/total_matching_reagents = 0
- var/total_required_catalysts = C.required_catalysts.len
- var/total_matching_catalysts= 0
- var/matching_container = 0
- var/matching_other = 0
- var/list/multipliers = new/list()
-
- for(var/B in C.required_reagents)
- if(!has_reagent(B, C.required_reagents[B])) break
- total_matching_reagents++
- multipliers += round(get_reagent_amount(B) / C.required_reagents[B])
- for(var/B in C.required_catalysts)
- if(!has_reagent(B, C.required_catalysts[B])) break
- total_matching_catalysts++
-
- if(!C.required_container)
- matching_container = 1
-
- else
- if(my_atom.type == C.required_container)
- matching_container = 1
-
- if(!C.required_other)
- matching_other = 1
-
- else
- /*if(istype(my_atom, /obj/item/slime_core))
- var/obj/item/slime_core/M = my_atom
-
- if(M.POWERFLAG == C.required_other && M.Uses > 0) // added a limit to slime cores -- Muskets requested this
- matching_other = 1*/
- if(istype(my_atom, /obj/item/slime_extract))
- var/obj/item/slime_extract/M = my_atom
-
- if(M.Uses > 0) // added a limit to slime cores -- Muskets requested this
- matching_other = 1
-
-
-
-
- if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container && matching_other)
- var/multiplier = min(multipliers)
- var/preserved_data = null
- for(var/B in C.required_reagents)
- if(!preserved_data)
- preserved_data = get_data(B)
- remove_reagent(B, (multiplier * C.required_reagents[B]), safety = 1)
-
- var/created_volume = C.result_amount*multiplier
- if(C.result)
- feedback_add_details("chemical_reaction","[C.result]|[C.result_amount*multiplier]")
- multiplier = max(multiplier, 1) //this shouldnt happen ...
- if(!isnull(C.resultcolor)) //paints
- add_reagent(C.result, C.result_amount*multiplier, C.resultcolor)
- else
- add_reagent(C.result, C.result_amount*multiplier)
- set_data(C.result, preserved_data)
-
- //add secondary products
- for(var/S in C.secondary_results)
- add_reagent(S, C.result_amount * C.secondary_results[S] * multiplier)
-
- var/list/seen = viewers(4, get_turf(my_atom))
- for(var/mob/M in seen)
- M << "\blue \icon[my_atom] The solution begins to bubble."
-
- /* if(istype(my_atom, /obj/item/slime_core))
- var/obj/item/slime_core/ME = my_atom
- ME.Uses--
- if(ME.Uses <= 0) // give the notification that the slime core is dead
- for(var/mob/M in viewers(4, get_turf(my_atom)) )
- M << "\blue \icon[my_atom] The innards begin to boil!"
- */
- if(istype(my_atom, /obj/item/slime_extract))
- var/obj/item/slime_extract/ME2 = my_atom
- ME2.Uses--
- if(ME2.Uses <= 0) // give the notification that the slime core is dead
- for(var/mob/M in seen)
- M << "\blue \icon[my_atom] The [my_atom]'s power is consumed in the reaction."
- ME2.name = "used slime extract"
- ME2.desc = "This extract has been used up."
-
- playsound(get_turf(my_atom), 'sound/effects/bubbles.ogg', 80, 1)
-
- C.on_reaction(src, created_volume)
- reaction_occured = 1
- break
-
- while(reaction_occured)
- update_total()
- return 0
-
- isolate_reagent(var/reagent)
- for(var/A in reagent_list)
- var/datum/reagent/R = A
- if (R.id != reagent)
- del_reagent(R.id)
- update_total()
-
- del_reagent(var/reagent)
- for(var/A in reagent_list)
- var/datum/reagent/R = A
- if (R.id == reagent)
- reagent_list -= A
- del(A)
- update_total()
- my_atom.on_reagent_change()
- return 0
-
-
- return 1
-
- update_total()
- total_volume = 0
- for(var/datum/reagent/R in reagent_list)
- if(R.volume < 0.1)
- del_reagent(R.id)
+ //check if this recipe needs to be heated to mix
+ if(C.requires_heating)
+ if(istype(my_atom.loc, /obj/machinery/bunsen_burner))
+ if(!my_atom.loc:heated)
+ continue
else
- total_volume += R.volume
+ continue
- return 0
+ var/total_required_reagents = C.required_reagents.len
+ var/total_matching_reagents = 0
+ var/total_required_catalysts = C.required_catalysts.len
+ var/total_matching_catalysts= 0
+ var/matching_container = 0
+ var/matching_other = 0
+ var/list/multipliers = new/list()
- clear_reagents()
- for(var/datum/reagent/R in reagent_list)
- del_reagent(R.id)
- return 0
+ for(var/B in C.required_reagents)
+ if(!has_reagent(B, C.required_reagents[B])) break
+ total_matching_reagents++
+ multipliers += round(get_reagent_amount(B) / C.required_reagents[B])
+ for(var/B in C.required_catalysts)
+ if(!has_reagent(B, C.required_catalysts[B])) break
+ total_matching_catalysts++
- reaction(var/atom/A, var/method=TOUCH, var/volume_modifier=0)
+ if(!C.required_container)
+ matching_container = 1
- switch(method)
- if(TOUCH)
- for(var/datum/reagent/R in reagent_list)
- if(ismob(A))
- spawn(0)
- if(!R) return
- else R.reaction_mob(A, TOUCH, R.volume+volume_modifier)
- if(isturf(A))
- spawn(0)
- if(!R) return
- else R.reaction_turf(A, R.volume+volume_modifier)
- if(isobj(A))
- spawn(0)
- if(!R) return
- else R.reaction_obj(A, R.volume+volume_modifier)
- if(INGEST)
- for(var/datum/reagent/R in reagent_list)
- if(ismob(A) && R)
- spawn(0)
- if(!R) return
- else R.reaction_mob(A, INGEST, R.volume+volume_modifier)
- if(isturf(A) && R)
- spawn(0)
- if(!R) return
- else R.reaction_turf(A, R.volume+volume_modifier)
- if(isobj(A) && R)
- spawn(0)
- if(!R) return
- else R.reaction_obj(A, R.volume+volume_modifier)
- return
-
- add_reagent(var/reagent, var/amount, var/data=null, var/safety = 0)
- if(!isnum(amount)) return 1
- update_total()
- if(total_volume + amount > maximum_volume) amount = (maximum_volume - total_volume) //Doesnt fit in. Make it disappear. Shouldnt happen. Will happen.
-
- for(var/A in reagent_list)
-
- var/datum/reagent/R = A
- if (R.id == reagent)
- R.volume += amount
- update_total()
-
- // mix dem viruses
- if(R.id == "blood" && reagent == "blood")
- if(R.data && data)
-
- if(R.data["viruses"] || data["viruses"])
-
- var/list/mix1 = R.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 R.data["viruses"])
- if(!istype(D, /datum/disease/advance))
- preserve += D
- R.data["viruses"] = preserve
- if(R.id == "paint" && reagent == "paint")
- if(R.color && data)
- var/list/mix = new /list(2)
- //fill the list
- var/datum/reagent/paint/P = chemical_reagents_list["paint"]
- var/datum/reagent/paint/P1 = new P.type()
- P1.color = R.color
- P1.volume = R.volume - amount //since we just increased that
- var/datum/reagent/paint/P2 = new P.type()
- P2.color = data
- P2.volume = amount
- mix[1] = P1
- mix[2] = P2
- R.color = mix_color_from_reagents(mix)
- if(!safety)
- handle_reactions()
- my_atom.on_reagent_change()
- return 0
-
- var/datum/reagent/D = chemical_reagents_list[reagent]
- if(D)
-
- var/datum/reagent/R = new D.type()
- reagent_list += R
- R.holder = src
- R.volume = amount
- if(reagent == "paint")
- R.color = data
- else
- SetViruses(R, data) // Includes setting data for blood
-
- //debug
- //world << "Adding data"
- //for(var/D in R.data)
- // world << "Container data: [D] = [R.data[D]]"
- //debug
- update_total()
- my_atom.on_reagent_change()
- if(!safety)
- handle_reactions()
- return 0
else
- warning("[my_atom] attempted to add a reagent called '[reagent]' which doesn't exist. ([usr])")
+ if(my_atom.type == C.required_container)
+ matching_container = 1
- if(!safety)
- handle_reactions()
+ if(!C.required_other)
+ matching_other = 1
- return 1
+ else
+ /*if(istype(my_atom, /obj/item/slime_core))
+ var/obj/item/slime_core/M = my_atom
- remove_reagent(var/reagent, var/amount, var/safety = 0)//Added a safety check for the trans_id_to
- if(!isnum(amount)) return 1
+ if(M.POWERFLAG == C.required_other && M.Uses > 0) // added a limit to slime cores -- Muskets requested this
+ matching_other = 1*/
+ if(istype(my_atom, /obj/item/slime_extract))
+ var/obj/item/slime_extract/M = my_atom
- for(var/A in reagent_list)
- var/datum/reagent/R = A
- if (R.id == reagent)
- R.volume -= amount
- update_total()
- if(!safety)//So it does not handle reactions when it need not to
- handle_reactions()
- my_atom.on_reagent_change()
- return 0
+ if(M.Uses > 0) // added a limit to slime cores -- Muskets requested this
+ matching_other = 1
- return 1
- has_reagent(var/reagent, var/amount = -1)
- for(var/A in reagent_list)
- var/datum/reagent/R = A
- if (R.id == reagent)
- if(!amount) return R
+
+ if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container && matching_other)
+ var/multiplier = min(multipliers)
+ var/preserved_data = null
+ for(var/B in C.required_reagents)
+ if(!preserved_data)
+ preserved_data = get_data(B)
+ remove_reagent(B, (multiplier * C.required_reagents[B]), safety = 1)
+
+ var/created_volume = C.result_amount*multiplier
+ if(C.result)
+ feedback_add_details("chemical_reaction","[C.result]|[C.result_amount*multiplier]")
+ multiplier = max(multiplier, 1) //this shouldnt happen ...
+ if(!isnull(C.resultcolor)) //paints
+ add_reagent(C.result, C.result_amount*multiplier, C.resultcolor)
else
- if(R.volume >= amount) return R
- else return 0
+ add_reagent(C.result, C.result_amount*multiplier)
+ set_data(C.result, preserved_data)
- return 0
+ //add secondary products
+ for(var/S in C.secondary_results)
+ add_reagent(S, C.result_amount * C.secondary_results[S] * multiplier)
- get_reagent_amount(var/reagent)
- for(var/A in reagent_list)
- var/datum/reagent/R = A
- if (R.id == reagent)
- return R.volume
+ var/list/seen = viewers(4, get_turf(my_atom))
+ for(var/mob/M in seen)
+ M << "\blue \icon[my_atom] The solution begins to bubble."
- return 0
+ /* if(istype(my_atom, /obj/item/slime_core))
+ var/obj/item/slime_core/ME = my_atom
+ ME.Uses--
+ if(ME.Uses <= 0) // give the notification that the slime core is dead
+ for(var/mob/M in viewers(4, get_turf(my_atom)) )
+ M << "\blue \icon[my_atom] The innards begin to boil!"
+ */
+ if(istype(my_atom, /obj/item/slime_extract))
+ var/obj/item/slime_extract/ME2 = my_atom
+ ME2.Uses--
+ if(ME2.Uses <= 0) // give the notification that the slime core is dead
+ for(var/mob/M in seen)
+ M << "\blue \icon[my_atom] The [my_atom]'s power is consumed in the reaction."
+ ME2.name = "used slime extract"
+ ME2.desc = "This extract has been used up."
- get_reagents()
- var/res = ""
- for(var/datum/reagent/A in reagent_list)
- if (res != "") res += ","
- res += A.name
+ playsound(get_turf(my_atom), 'sound/effects/bubbles.ogg', 80, 1)
- return res
+ C.on_reaction(src, created_volume)
+ reaction_occured = 1
+ break
- remove_all_type(var/reagent_type, var/amount, var/strict = 0, var/safety = 1) // Removes all reagent of X type. @strict set to 1 determines whether the childs of the type are included.
- if(!isnum(amount)) return 1
+ while(reaction_occured)
+ update_total()
+ return 0
- var/has_removed_reagent = 0
+/datum/reagents/proc/isolate_reagent(var/reagent)
+ for(var/A in reagent_list)
+ var/datum/reagent/R = A
+ if (R.id != reagent)
+ del_reagent(R.id)
+ update_total()
- for(var/datum/reagent/R in reagent_list)
- var/matches = 0
- // Switch between how we check the reagent type
- if(strict)
- if(R.type == reagent_type)
- matches = 1
- else
- if(istype(R, reagent_type))
- matches = 1
- // We found a match, proceed to remove the reagent. Keep looping, we might find other reagents of the same type.
- if(matches)
- // Have our other proc handle removement
- has_removed_reagent = remove_reagent(R.id, amount, safety)
+/datum/reagents/proc/del_reagent(var/reagent)
+ for(var/A in reagent_list)
+ var/datum/reagent/R = A
+ if (R.id == reagent)
+ reagent_list -= A
+ qdel(A)
+ update_total()
+ my_atom.on_reagent_change()
+ return 0
- return has_removed_reagent
- //two helper functions to preserve data across reactions (needed for xenoarch)
- get_data(var/reagent_id)
- for(var/datum/reagent/D in reagent_list)
- if(D.id == reagent_id)
- //world << "proffering a data-carrying reagent ([reagent_id])"
- return D.data
+ return 1
- set_data(var/reagent_id, var/new_data)
- for(var/datum/reagent/D in reagent_list)
- if(D.id == reagent_id)
- //world << "reagent data set ([reagent_id])"
- D.data = new_data
+/datum/reagents/proc/update_total()
+ total_volume = 0
+ for(var/datum/reagent/R in reagent_list)
+ if(R.volume < 0.1)
+ del_reagent(R.id)
+ else
+ total_volume += R.volume
- delete()
- for(var/datum/reagent/R in reagent_list)
- R.holder = null
- if(my_atom)
- my_atom.reagents = null
+ return 0
- copy_data(var/datum/reagent/current_reagent)
- if (current_reagent.id == "paint") return current_reagent.color
- if (!current_reagent || !current_reagent.data) return null
- if (!istype(current_reagent.data, /list)) return current_reagent.data
+/datum/reagents/proc/clear_reagents()
+ for(var/datum/reagent/R in reagent_list)
+ del_reagent(R.id)
+ return 0
- var/list/trans_data = current_reagent.data.Copy()
+/datum/reagents/proc/reaction(var/atom/A, var/method=TOUCH, var/volume_modifier=0)
- // We do this so that introducing a virus to a blood sample
- // doesn't automagically infect all other blood samples from
- // the same donor.
- //
- // Technically we should probably copy all data lists, but
- // that could possibly eat up a lot of memory needlessly
- // if most data lists are read-only.
- if (trans_data["virus2"])
- var/list/v = trans_data["virus2"]
- trans_data["virus2"] = v.Copy()
+ switch(method)
+ if(TOUCH)
+ for(var/datum/reagent/R in reagent_list)
+ if(ismob(A))
+ spawn(0)
+ if(!R) return
+ else R.reaction_mob(A, TOUCH, R.volume+volume_modifier)
+ if(isturf(A))
+ spawn(0)
+ if(!R) return
+ else R.reaction_turf(A, R.volume+volume_modifier)
+ if(isobj(A))
+ spawn(0)
+ if(!R) return
+ else R.reaction_obj(A, R.volume+volume_modifier)
+ if(INGEST)
+ for(var/datum/reagent/R in reagent_list)
+ if(ismob(A) && R)
+ spawn(0)
+ if(!R) return
+ else R.reaction_mob(A, INGEST, R.volume+volume_modifier)
+ if(isturf(A) && R)
+ spawn(0)
+ if(!R) return
+ else R.reaction_turf(A, R.volume+volume_modifier)
+ if(isobj(A) && R)
+ spawn(0)
+ if(!R) return
+ else R.reaction_obj(A, R.volume+volume_modifier)
+ return
- return trans_data
+/datum/reagents/proc/add_reagent(var/reagent, var/amount, var/data=null, var/safety = 0)
+ if(!isnum(amount)) return 1
+ update_total()
+ if(total_volume + amount > maximum_volume) amount = (maximum_volume - total_volume) //Doesnt fit in. Make it disappear. Shouldnt happen. Will happen.
+
+ for(var/A in reagent_list)
+
+ var/datum/reagent/R = A
+ if (R.id == reagent)
+ R.on_merge(data, amount)
+ R.volume += amount
+ update_total()
+ if(!safety)
+ handle_reactions()
+ my_atom.on_reagent_change()
+ return 0
+
+ var/datum/reagent/D = chemical_reagents_list[reagent]
+ if(D)
+
+ var/datum/reagent/R = new D.type()
+ reagent_list += R
+ R.holder = src
+ R.volume = amount
+ if(reagent == "paint")
+ R.color = data
+ else
+ SetViruses(R, data) // Includes setting data for blood
+
+ //debug
+ //world << "Adding data"
+ //for(var/D in R.data)
+ // world << "Container data: [D] = [R.data[D]]"
+ //debug
+ update_total()
+ my_atom.on_reagent_change()
+ if(!safety)
+ handle_reactions()
+ return 0
+ else
+ warning("[my_atom] attempted to add a reagent called '[reagent]' which doesn't exist. ([usr])")
+
+ if(!safety)
+ handle_reactions()
+
+ return 1
+
+/datum/reagents/proc/remove_reagent(var/reagent, var/amount, var/safety = 0)//Added a safety check for the trans_id_to
+ if(!isnum(amount)) return 1
+
+ for(var/A in reagent_list)
+ var/datum/reagent/R = A
+ if (R.id == reagent)
+ R.volume -= amount
+ update_total()
+ if(!safety)//So it does not handle reactions when it need not to
+ handle_reactions()
+ my_atom.on_reagent_change()
+ return 0
+
+ return 1
+
+/datum/reagents/proc/has_reagent(var/reagent, var/amount = -1)
+
+ for(var/A in reagent_list)
+ var/datum/reagent/R = A
+ if (R.id == reagent)
+ if(!amount) return R
+ else
+ if(R.volume >= amount) return R
+ else return 0
+
+ return 0
+
+/datum/reagents/proc/get_reagent_amount(var/reagent)
+ for(var/A in reagent_list)
+ var/datum/reagent/R = A
+ if (R.id == reagent)
+ return R.volume
+
+ return 0
+
+/datum/reagents/proc/get_reagents()
+ var/res = ""
+ for(var/datum/reagent/A in reagent_list)
+ if (res != "") res += ","
+ res += A.name
+
+ return res
+
+/datum/reagents/proc/remove_all_type(var/reagent_type, var/amount, var/strict = 0, var/safety = 1) // Removes all reagent of X type. @strict set to 1 determines whether the childs of the type are included.
+ if(!isnum(amount)) return 1
+
+ var/has_removed_reagent = 0
+
+ for(var/datum/reagent/R in reagent_list)
+ var/matches = 0
+ // Switch between how we check the reagent type
+ if(strict)
+ if(R.type == reagent_type)
+ matches = 1
+ else
+ if(istype(R, reagent_type))
+ matches = 1
+ // We found a match, proceed to remove the reagent. Keep looping, we might find other reagents of the same type.
+ if(matches)
+ // Have our other proc handle removement
+ has_removed_reagent = remove_reagent(R.id, amount, safety)
+
+ return has_removed_reagent
+
+//two helper functions to preserve data across reactions (needed for xenoarch)
+/datum/reagents/proc/get_data(var/reagent_id)
+ for(var/datum/reagent/D in reagent_list)
+ if(D.id == reagent_id)
+ //world << "proffering a data-carrying reagent ([reagent_id])"
+ return D.data
+
+/datum/reagents/proc/set_data(var/reagent_id, var/new_data)
+ for(var/datum/reagent/D in reagent_list)
+ if(D.id == reagent_id)
+ //world << "reagent data set ([reagent_id])"
+ D.data = new_data
+
+/datum/reagents/proc/delete()
+ for(var/datum/reagent/R in reagent_list)
+ R.holder = null
+ if(my_atom)
+ my_atom.reagents = null
+
+/datum/reagents/proc/copy_data(var/datum/reagent/current_reagent)
+ if (current_reagent.id == "paint") return current_reagent.color
+ if (!current_reagent || !current_reagent.data) return null
+ if (!istype(current_reagent.data, /list)) return current_reagent.data
+
+ var/list/trans_data = current_reagent.data.Copy()
+
+ // We do this so that introducing a virus to a blood sample
+ // doesn't automagically infect all other blood samples from
+ // the same donor.
+ //
+ // Technically we should probably copy all data lists, but
+ // that could possibly eat up a lot of memory needlessly
+ // if most data lists are read-only.
+ if (trans_data["virus2"])
+ var/list/v = trans_data["virus2"]
+ trans_data["virus2"] = v.Copy()
+
+ return trans_data
///////////////////////////////////////////////////////////////////////////////////
// Convenience proc to create a reagents holder for an atom
// Max vol is maximum volume of holder
-atom/proc/create_reagents(var/max_vol)
+/atom/proc/create_reagents(var/max_vol)
reagents = new/datum/reagents(max_vol)
reagents.my_atom = src
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index e7c8262aa7..5a79e2a3cd 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -37,19 +37,19 @@
/obj/machinery/chem_master/ex_act(severity)
switch(severity)
if(1.0)
- del(src)
+ qdel(src)
return
if(2.0)
if (prob(50))
- del(src)
+ qdel(src)
return
/obj/machinery/chem_master/blob_act()
if (prob(50))
- del(src)
+ qdel(src)
/obj/machinery/chem_master/meteorhit()
- del(src)
+ qdel(src)
return
/obj/machinery/chem_master/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob)
@@ -751,7 +751,7 @@
/obj/machinery/reagentgrinder/proc/remove_object(var/obj/item/O)
holdingitems -= O
- del(O)
+ qdel(O)
/obj/machinery/reagentgrinder/proc/grind()
diff --git a/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm b/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm
deleted file mode 100644
index 12ecf3a817..0000000000
--- a/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm
+++ /dev/null
@@ -1,90 +0,0 @@
-#define ANTIDEPRESSANT_MESSAGE_DELAY 5*60*10
-
-/datum/reagent/antidepressant/methylphenidate
- name = "Methylphenidate"
- id = "methylphenidate"
- description = "Improves the ability to concentrate."
- reagent_state = LIQUID
- color = "#BF80BF"
- custom_metabolism = 0.01
- data = 0
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(src.volume <= 0.1) if(data != -1)
- data = -1
- M << "\red You lose focus.."
- else
- if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
- data = world.time
- M << "\blue Your mind feels focused and undivided."
- ..()
- return
-
-/datum/chemical_reaction/methylphenidate
- name = "Methylphenidate"
- id = "methylphenidate"
- result = "methylphenidate"
- required_reagents = list("mindbreaker" = 1, "hydrogen" = 1)
- result_amount = 3
-
-/datum/reagent/antidepressant/citalopram
- name = "Citalopram"
- id = "citalopram"
- description = "Stabilizes the mind a little."
- reagent_state = LIQUID
- color = "#FF80FF"
- custom_metabolism = 0.01
- data = 0
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(src.volume <= 0.1) if(data != -1)
- data = -1
- M << "\red Your mind feels a little less stable.."
- else
- if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
- data = world.time
- M << "\blue Your mind feels stable.. a little stable."
- ..()
- return
-
-/datum/chemical_reaction/citalopram
- name = "Citalopram"
- id = "citalopram"
- result = "citalopram"
- required_reagents = list("mindbreaker" = 1, "carbon" = 1)
- result_amount = 3
-
-
-/datum/reagent/antidepressant/paroxetine
- name = "Paroxetine"
- id = "paroxetine"
- description = "Stabilizes the mind greatly, but has a chance of adverse effects."
- reagent_state = LIQUID
- color = "#FF80BF"
- custom_metabolism = 0.01
- data = 0
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(src.volume <= 0.1) if(data != -1)
- data = -1
- M << "\red Your mind feels much less stable.."
- else
- if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
- data = world.time
- if(prob(90))
- M << "\blue Your mind feels much more stable."
- else
- M << "\red Your mind breaks apart.."
- M.hallucination += 200
- ..()
- return
-
-/datum/chemical_reaction/paroxetine
- name = "Paroxetine"
- id = "paroxetine"
- result = "paroxetine"
- required_reagents = list("mindbreaker" = 1, "oxygen" = 1, "inaprovaline" = 1)
- result_amount = 3
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 44ee2987c4..b4e6248246 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -8,4425 +8,99 @@
//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 = null
- var/volume = 0
- var/nutriment_factor = 0
- var/custom_metabolism = REAGENTS_METABOLISM
- var/overdose = 0
- var/overdose_dam = 1
- var/scannable = 0 //shows up on health analyzers
- var/glass_icon_state = null
- var/glass_name = null
- var/glass_desc = null
- var/glass_center_of_mass = null
- //var/list/viruses = list()
- var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!)
-
- 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(self.holder) //for catching rare runtimes
- if(!istype(self.holder.my_atom, /obj/effect/effect/smoke/chem))
- // 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
-
- 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
-
- reaction_turf(var/turf/T, var/volume)
- src = null
- return
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(!istype(M, /mob/living))
- return //Noticed runtime errors from pacid trying to damage ghosts, this should fix. --NEO
- if( (overdose > 0) && (volume >= overdose))//Overdosing, wooo
- M.adjustToxLoss(overdose_dam)
- holder.remove_reagent(src.id, custom_metabolism) //By default it slowly disappears.
- return
-
- on_move(var/mob/M)
- return
-
- // Called after add_reagents creates a new reagent.
- on_new(var/data)
- return
-
- // Called when two reagents of the same are mixing. <-- Blatant lies
- on_merge(var/data)
- return
-
- on_update(var/atom/A)
- return
-
-
-
- blood
- data = new/list("donor"=null,"viruses"=null,"species"="Human","blood_DNA"=null,"blood_type"=null,"blood_colour"= "#A10808","resistances"=null,"trace_chem"=null, "antibodies" = list())
- name = "Blood"
- id = "blood"
- reagent_state = LIQUID
- color = "#C80000" // rgb: 200, 0, 0
-
- glass_icon_state = "glass_red"
- glass_name = "glass of tomato juice"
- glass_desc = "Are you sure this is tomato juice?"
-
- 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"])
- //var/datum/disease/virus = new D.type(0, D, 1)
- // We don't spread.
- if(D.spread_type == SPECIAL || D.spread_type == NON_CONTAGIOUS) continue
-
- if(method == TOUCH)
- M.contract_disease(D)
- else //injected
- M.contract_disease(D, 1, 0)
- if(self.data && self.data["virus2"] && istype(M, /mob/living/carbon))//infecting...
- var/list/vlist = self.data["virus2"]
- if (vlist.len)
- for (var/ID in vlist)
- var/datum/disease2/disease/V = vlist[ID]
-
- if(method == TOUCH)
- infect_virus2(M,V.getcopy())
- else
- infect_virus2(M,V.getcopy(),1) //injected, force infection!
- if(self.data && self.data["antibodies"] && istype(M, /mob/living/carbon))//... and curing
- var/mob/living/carbon/C = M
- C.antibodies |= self.data["antibodies"]
-
- on_merge(var/data)
- if(data["blood_colour"])
- color = data["blood_colour"]
- return ..()
-
- on_update(var/atom/A)
- if(data["blood_colour"])
- color = data["blood_colour"]
- return ..()
-
- 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
-
- if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human))
- blood_splatter(T,self,1)
- else if(istype(self.data["donor"], /mob/living/carbon/alien))
- var/obj/effect/decal/cleanable/blood/B = blood_splatter(T,self,1)
- if(B) B.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*"
- if(volume >= 5 && !istype(T.loc, /area/chapel)) //blood desanctifies non-chapel tiles
- T.holy = 0
- 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)
- ..()
-*/
- vaccine
- //data must contain virus type
- name = "Vaccine"
- id = "vaccine"
- reagent_state = LIQUID
- color = "#C81040" // rgb: 200, 16, 64
-
- reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- var/datum/reagent/vaccine/self = src
- src = null
- if(self.data&&method == INGEST)
- for(var/datum/disease/D in M.viruses)
- if(istype(D, /datum/disease/advance))
- var/datum/disease/advance/A = D
- if(A.GetDiseaseID() == self.data)
- D.cure()
- else
- if(D.type == self.data)
- D.cure()
-
- M.resistances += self.data
- return
-
- woodpulp
- name = "Wood Pulp"
- id = "woodpulp"
- description = "A mass of wood fibers."
- reagent_state = LIQUID
- color = "#B97A57"
-
- #define WATER_LATENT_HEAT 19000 // How much heat is removed when applied to a hot turf, in J/unit (19000 makes 120 u of water roughly equivalent to 4L)
- water
- name = "Water"
- id = "water"
- description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
- reagent_state = LIQUID
- color = "#0064C8" // rgb: 0, 100, 200
- custom_metabolism = 0.01
-
- glass_icon_state = "glass_clear"
- glass_name = "glass of water"
- glass_desc = "The father of all refreshments."
-
- reaction_turf(var/turf/simulated/T, var/volume)
- if (!istype(T)) return
-
- //If the turf is hot enough, remove some heat
- var/datum/gas_mixture/environment = T.return_air()
- var/min_temperature = T0C + 100 //100C, the boiling point of water
-
- if (environment && environment.temperature > min_temperature) //abstracted as steam or something
- var/removed_heat = between(0, volume*WATER_LATENT_HEAT, -environment.get_thermal_energy_change(min_temperature))
- environment.add_thermal_energy(-removed_heat)
- if (prob(5))
- T.visible_message("\red The water sizzles as it lands on \the [T]!")
-
- else //otherwise, the turf gets wet
- if(volume >= 3)
- if(T.wet >= 1) return
- T.wet = 1
- if(T.wet_overlay)
- T.overlays -= T.wet_overlay
- T.wet_overlay = null
- T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
- T.overlays += T.wet_overlay
-
- src = null
- spawn(800)
- if (!istype(T)) return
- if(T.wet >= 2) return
- T.wet = 0
- if(T.wet_overlay)
- T.overlays -= T.wet_overlay
- T.wet_overlay = null
-
- //Put out fires.
- var/hotspot = (locate(/obj/fire) in T)
- if(hotspot)
- del(hotspot)
- if(environment)
- environment.react() //react at the new temperature
-
- reaction_obj(var/obj/O, var/volume)
- var/turf/T = get_turf(O)
- var/hotspot = (locate(/obj/fire) in T)
- if(hotspot && !istype(T, /turf/space))
- 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)
- del(hotspot)
- 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()
-
- reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- if (istype(M, /mob/living/carbon/slime))
- var/mob/living/carbon/slime/S = M
- S.apply_water(volume)
- if(method == TOUCH && isliving(M))
- M.adjust_fire_stacks(-(volume / 10))
- if(M.fire_stacks <= 0)
- M.ExtinguishMob()
- return
-
- water/holywater
- name = "Holy Water"
- id = "holywater"
- description = "An ashen-obsidian-water mix, this solution will alter certain sections of the brain's rationality."
- color = "#E0E8EF" // rgb: 224, 232, 239
-
- glass_icon_state = "glass_clear"
- glass_name = "glass of holy water"
- glass_desc = "An ashen-obsidian-water mix, this solution will alter certain sections of the brain's rationality."
-
- on_mob_life(var/mob/living/M as mob)
- if(ishuman(M))
- if(M.mind && cult.is_antagonist(M.mind) && prob(10))
- cult.remove_antagonist(M.mind)
- holder.remove_reagent(src.id, 10 * REAGENTS_METABOLISM) //high metabolism to prevent extended uncult rolls.
- return
-
- reaction_turf(var/turf/T, var/volume)
- src = null
- if(volume >= 5)
- T.holy = 1
- return
-
- 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
- overdose = REAGENTS_OVERDOSE
-
- reaction_turf(var/turf/simulated/T, var/volume)
- if (!istype(T)) return
- src = null
- if(volume >= 1)
- if(T.wet >= 2) return
- T.wet = 2
- spawn(800)
- if (!istype(T)) return
- T.wet = 0
- if(T.wet_overlay)
- T.overlays -= T.wet_overlay
- T.wet_overlay = null
- return
-
- plasticide
- name = "Plasticide"
- id = "plasticide"
- description = "Liquid plastic, do not eat."
- reagent_state = LIQUID
- color = "#CF3600" // rgb: 207, 54, 0
- custom_metabolism = 0.01
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- // Toxins are really weak, but without being treated, last very long.
- M.adjustToxLoss(0.2)
- ..()
- return
-
- slimetoxin
- name = "Mutation Toxin"
- id = "mutationtoxin"
- description = "A corruptive toxin produced by slimes."
- reagent_state = LIQUID
- color = "#13BC5E" // rgb: 19, 188, 94
- overdose = REAGENTS_OVERDOSE
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(ishuman(M))
- var/mob/living/carbon/human/human = M
- if(human.species.name != "Slime")
- M << "Your flesh rapidly mutates!"
- human.set_species("Slime")
- ..()
- return
-
- aslimetoxin
- name = "Advanced Mutation Toxin"
- id = "amutationtoxin"
- description = "An advanced corruptive toxin produced by slimes."
- reagent_state = LIQUID
- color = "#13BC5E" // rgb: 19, 188, 94
- overdose = REAGENTS_OVERDOSE
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(istype(M, /mob/living/carbon) && M.stat != DEAD)
- M << "\red Your flesh rapidly mutates!"
- if(M.monkeyizing) return
- M.monkeyizing = 1
- M.canmove = 0
- M.icon = null
- M.overlays.Cut()
- M.invisibility = 101
- for(var/obj/item/W in M)
- if(istype(W, /obj/item/weapon/implant)) //TODO: Carn. give implants a dropped() or something
- del(W)
- continue
- W.layer = initial(W.layer)
- W.loc = M.loc
- W.dropped(M)
- var/mob/living/carbon/slime/new_mob = new /mob/living/carbon/slime(M.loc)
- new_mob.a_intent = I_HURT
- new_mob.universal_speak = 1
- if(M.mind)
- M.mind.transfer_to(new_mob)
- else
- new_mob.key = M.key
- del(M)
- ..()
- return
-
- inaprovaline
- name = "Inaprovaline"
- id = "inaprovaline"
- description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients."
- reagent_state = LIQUID
- color = "#00BFFF" // rgb: 200, 165, 220
- overdose = REAGENTS_OVERDOSE*2
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(!M) M = holder.my_atom
-
- if(alien && alien == IS_VOX)
- M.adjustToxLoss(REAGENTS_METABOLISM)
- else
- if(M.losebreath >= 10)
- M.losebreath = max(10, M.losebreath-5)
-
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- return
-
- 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
- overdose = REAGENTS_OVERDOSE
-
- 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 && !M.restrained())
- 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
-
- 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
- overdose = REAGENTS_OVERDOSE
-
- 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))
- var/obj/structure/window/W = O
- W.apply_silicate(volume)
- return
-
- oxygen
- name = "Oxygen"
- id = "oxygen"
- description = "A colorless, odorless gas."
- reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
-
- custom_metabolism = 0.01
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2) return
- if(alien && alien == IS_VOX)
- M.adjustToxLoss(REAGENTS_METABOLISM)
- holder.remove_reagent(src.id, REAGENTS_METABOLISM) //By default it slowly disappears.
- return
- ..()
-
- copper
- name = "Copper"
- id = "copper"
- description = "A highly ductile metal."
- color = "#6E3B08" // rgb: 110, 59, 8
-
- custom_metabolism = 0.01
-
- nitrogen
- name = "Nitrogen"
- id = "nitrogen"
- description = "A colorless, odorless, tasteless gas."
- reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
-
- custom_metabolism = 0.01
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2) return
- if(alien && alien == IS_VOX)
- M.adjustOxyLoss(-2*REM)
- holder.remove_reagent(src.id, REAGENTS_METABOLISM) //By default it slowly disappears.
- return
- ..()
-
- hydrogen
- name = "Hydrogen"
- id = "hydrogen"
- description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
- reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
-
- custom_metabolism = 0.01
-
- 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
-
- custom_metabolism = 0.01
-
- mercury
- name = "Mercury"
- id = "mercury"
- description = "A chemical element."
- reagent_state = LIQUID
- color = "#484848" // rgb: 72, 72, 72
- overdose = REAGENTS_OVERDOSE
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.canmove && !M.restrained() && istype(M.loc, /turf/space))
- step(M, pick(cardinal))
- if(prob(5)) M.emote(pick("twitch","drool","moan"))
- M.adjustBrainLoss(2)
- ..()
- return
-
- sulfur
- name = "Sulfur"
- id = "sulfur"
- description = "A chemical element with a pungent smell."
- reagent_state = SOLID
- color = "#BF8C00" // rgb: 191, 140, 0
-
- custom_metabolism = 0.01
-
- carbon
- name = "Carbon"
- id = "carbon"
- description = "A chemical element, the builing block of life."
- reagent_state = SOLID
- color = "#1C1300" // rgb: 30, 20, 0
-
- custom_metabolism = 0.01
-
- reaction_turf(var/turf/T, var/volume)
- src = null
- if(!istype(T, /turf/space))
- var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt, T)
- if (!dirtoverlay)
- dirtoverlay = new/obj/effect/decal/cleanable/dirt(T)
- dirtoverlay.alpha = volume*30
- else
- dirtoverlay.alpha = min(dirtoverlay.alpha+volume*30, 255)
-
- chlorine
- name = "Chlorine"
- id = "chlorine"
- description = "A chemical element with a characteristic odour."
- reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
- overdose = REAGENTS_OVERDOSE
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.take_organ_damage(1*REM, 0)
- ..()
- return
-
- fluorine
- name = "Fluorine"
- id = "fluorine"
- description = "A highly-reactive chemical element."
- reagent_state = GAS
- color = "#808080" // rgb: 128, 128, 128
- overdose = REAGENTS_OVERDOSE
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustToxLoss(1*REM)
- ..()
- return
-
- sodium
- name = "Sodium"
- id = "sodium"
- description = "A chemical element, readily reacts with water."
- reagent_state = SOLID
- color = "#808080" // rgb: 128, 128, 128
-
- custom_metabolism = 0.01
-
- phosphorus
- name = "Phosphorus"
- id = "phosphorus"
- description = "A chemical element, the backbone of biological energy carriers."
- reagent_state = SOLID
- color = "#832828" // rgb: 131, 40, 40
-
- custom_metabolism = 0.01
-
- lithium
- name = "Lithium"
- id = "lithium"
- description = "A chemical element, used as antidepressant."
- reagent_state = SOLID
- color = "#808080" // rgb: 128, 128, 128
- overdose = REAGENTS_OVERDOSE
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.canmove && !M.restrained() && istype(M.loc, /turf/space))
- step(M, pick(cardinal))
- if(prob(5)) M.emote(pick("twitch","drool","moan"))
- ..()
- return
-
- 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
-
- glass_icon_state = "iceglass"
- glass_name = "glass of sugar"
- glass_desc = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
-
- on_mob_life(var/mob/living/M as mob)
- M.nutrition += 1*REM
- ..()
- return
-
-
- 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
-
- custom_metabolism = 0.01
-
- 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
-
- custom_metabolism = 0.01
-
- 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
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.apply_effect(2*REM,IRRADIATE,0)
- // radium may increase your chances to cure a disease
- if(istype(M,/mob/living/carbon)) // make sure to only use it on carbon mobs
- var/mob/living/carbon/C = M
- if(C.virus2.len)
- for (var/ID in C.virus2)
- var/datum/disease2/disease/V = C.virus2[ID]
- if(prob(5))
- C.antibodies |= V.antigen
- if(prob(50))
- M.radiation += 50 // curing it that way may kill you instead
- var/absorbed
- var/obj/item/organ/diona/nutrients/rad_organ = locate() in C.internal_organs
- if(rad_organ && !rad_organ.is_broken())
- absorbed = 1
- if(!absorbed)
- M.adjustToxLoss(100)
- ..()
- return
-
- reaction_turf(var/turf/T, var/volume)
- src = null
- if(volume >= 3)
- if(!istype(T, /turf/space))
- var/obj/effect/decal/cleanable/greenglow/glow = locate(/obj/effect/decal/cleanable/greenglow, T)
- if(!glow)
- new /obj/effect/decal/cleanable/greenglow(T)
- return
-
-
- ryetalyn
- name = "Ryetalyn"
- id = "ryetalyn"
- description = "Ryetalyn can cure all genetic abnomalities via a catalytic process."
- reagent_state = SOLID
- color = "#004000" // rgb: 200, 165, 220
- overdose = REAGENTS_OVERDOSE
-
- 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
-
- // Might need to update appearance for hulk etc.
- if(needs_update && ishuman(M))
- var/mob/living/carbon/human/H = M
- H.update_mutations()
-
- ..()
- return
-
- 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
-
- reaction_turf(var/turf/T, var/volume)
- src = null
- if(volume >= 5)
- if(istype(T, /turf/simulated/wall))
- var/turf/simulated/wall/W = T
- W.thermite = 1
- W.overlays += image('icons/effects/effects.dmi',icon_state = "#673910")
- return
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustFireLoss(1)
- ..()
- return
-
- paracetamol
- name = "Paracetamol"
- id = "paracetamol"
- description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller."
- reagent_state = LIQUID
- color = "#C8A5DC"
- overdose = 60
- scannable = 1
- custom_metabolism = 0.025 // Lasts 10 minutes for 15 units
-
- on_mob_life(var/mob/living/M as mob)
- if (volume > overdose)
- M.hallucination = max(M.hallucination, 2)
- ..()
- return
-
- tramadol
- name = "Tramadol"
- id = "tramadol"
- description = "A simple, yet effective painkiller."
- reagent_state = LIQUID
- color = "#CB68FC"
- overdose = 30
- scannable = 1
- custom_metabolism = 0.025 // Lasts 10 minutes for 15 units
-
- on_mob_life(var/mob/living/M as mob)
- if (volume > overdose)
- M.hallucination = max(M.hallucination, 2)
- ..()
- return
-
- oxycodone
- name = "Oxycodone"
- id = "oxycodone"
- description = "An effective and very addictive painkiller."
- reagent_state = LIQUID
- color = "#800080"
- overdose = 20
- custom_metabolism = 0.25 // Lasts 10 minutes for 15 units
-
- on_mob_life(var/mob/living/M as mob)
- if (volume > overdose)
- M.druggy = max(M.druggy, 10)
- M.hallucination = max(M.hallucination, 3)
- ..()
- return
-
-
- virus_food
- name = "Virus Food"
- id = "virusfood"
- description = "A mixture of water, milk, and oxygen. Virus cells can use this mixture to reproduce."
- reagent_state = LIQUID
- nutriment_factor = 2 * REAGENTS_METABOLISM
- color = "#899613" // rgb: 137, 150, 19
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition += nutriment_factor*REM
- ..()
- return
-
- sterilizine
- name = "Sterilizine"
- id = "sterilizine"
- description = "Sterilizes wounds in preparation for surgery."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- //makes you squeaky clean
- reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- if (method == TOUCH)
- M.germ_level -= min(volume*20, M.germ_level)
-
- reaction_obj(var/obj/O, var/volume)
- O.germ_level -= min(volume*20, O.germ_level)
-
- reaction_turf(var/turf/T, var/volume)
- T.germ_level -= min(volume*20, T.germ_level)
-
- /* 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
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.radiation += 3
- ..()
- return
- */
- iron
- name = "Iron"
- id = "iron"
- description = "Pure iron is a metal."
- reagent_state = SOLID
- color = "#353535"
- overdose = REAGENTS_OVERDOSE
-
- 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
-
- 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
-
- 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
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.apply_effect(1,IRRADIATE,0)
- ..()
- return
-
- reaction_turf(var/turf/T, var/volume)
- src = null
- if(volume >= 3)
- if(!istype(T, /turf/space))
- var/obj/effect/decal/cleanable/greenglow/glow = locate(/obj/effect/decal/cleanable/greenglow, T)
- if(!glow)
- new /obj/effect/decal/cleanable/greenglow(T)
- return
-
- aluminum
- name = "Aluminum"
- id = "aluminum"
- description = "A silvery white and ductile member of the boron group of chemical elements."
- reagent_state = SOLID
- color = "#A8A8A8" // rgb: 168, 168, 168
-
- 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
-
- fuel
- name = "Welding fuel"
- id = "fuel"
- description = "Required for welders. Flamable."
- reagent_state = LIQUID
- color = "#660000" // rgb: 102, 0, 0
- overdose = REAGENTS_OVERDOSE
-
- glass_icon_state = "dr_gibb_glass"
- glass_name = "glass of welder fuel"
- glass_desc = "Unless you are an industrial tool, this is probably not safe for consumption."
-
- reaction_obj(var/obj/O, var/volume)
- 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
- new /obj/effect/decal/cleanable/liquid_fuel(the_turf, volume)
- reaction_turf(var/turf/T, var/volume)
- new /obj/effect/decal/cleanable/liquid_fuel(T, volume)
- return
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustToxLoss(1)
- ..()
- return
- 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
-
- 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
- overdose = REAGENTS_OVERDOSE
-
- reaction_obj(var/obj/O, var/volume)
- if(istype(O,/obj/effect/decal/cleanable))
- del(O)
- else
- if(O)
- O.clean_blood()
-
- reaction_turf(var/turf/T, var/volume)
- if(volume >= 1)
- if(istype(T, /turf/simulated))
- var/turf/simulated/S = T
- S.dirt = 0
- T.clean_blood()
- for(var/obj/effect/decal/cleanable/C in T.contents)
- src.reaction_obj(C, volume)
- del(C)
-
- for(var/mob/living/carbon/slime/M in T)
- M.adjustToxLoss(rand(5,10))
-
- 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)
- else
- H.clean_blood(1)
- return
- M.clean_blood()
-
- 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
- overdose = REAGENTS_OVERDOSE
- scannable = 1
-
- 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
-
- cryptobiolin
- name = "Cryptobiolin"
- id = "cryptobiolin"
- description = "Cryptobiolin causes confusion and dizzyness."
- reagent_state = LIQUID
- color = "#000055" // rgb: 200, 165, 220
- overdose = REAGENTS_OVERDOSE
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.make_dizzy(1)
- if(!M.confused) M.confused = 1
- M.confused = max(M.confused, 20)
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- ..()
- return
-
-
- kelotane
- name = "Kelotane"
- id = "kelotane"
- description = "Kelotane is a drug used to treat burns."
- reagent_state = LIQUID
- color = "#FFA800" // rgb: 200, 165, 220
- overdose = REAGENTS_OVERDOSE
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- //This needs a diona check but if one is added they won't be able to heal burn damage at all.
- M.heal_organ_damage(0,2*REM)
- ..()
- return
-
- 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 = "#FF8000" // rgb: 200, 165, 220
- overdose = REAGENTS_OVERDOSE/2
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- 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
- if(!alien || alien != IS_DIONA)
- M.heal_organ_damage(0,3*REM)
- ..()
- return
-
- dexalin
- name = "Dexalin"
- id = "dexalin"
- description = "Dexalin is used in the treatment of oxygen deprivation."
- reagent_state = LIQUID
- color = "#0080FF" // rgb: 200, 165, 220
- overdose = REAGENTS_OVERDOSE
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2.0)
- return //See above, down and around. --Agouri
- if(!M) M = holder.my_atom
-
- if(alien && alien == IS_VOX)
- M.adjustToxLoss(2*REM)
- else if(!alien || alien != IS_DIONA)
- M.adjustOxyLoss(-2*REM)
-
- holder.remove_reagent("lexorin", 2*REM)
- ..()
- return
-
- dexalinp
- name = "Dexalin Plus"
- id = "dexalinp"
- description = "Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective."
- reagent_state = LIQUID
- color = "#0040FF" // rgb: 200, 165, 220
- overdose = REAGENTS_OVERDOSE/2
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
-
- if(alien && alien == IS_VOX)
- M.adjustOxyLoss()
- else if(!alien || alien != IS_DIONA)
- M.adjustOxyLoss(-M.getOxyLoss())
-
- holder.remove_reagent("lexorin", 2*REM)
- ..()
- return
-
- 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 = "#8040FF" // rgb: 200, 165, 220
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- if(!alien || alien != IS_DIONA)
- if(M.getOxyLoss()) 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
-
- anti_toxin
- name = "Dylovene"
- id = "anti_toxin"
- description = "Dylovene is a broad-spectrum antitoxin."
- reagent_state = LIQUID
- color = "#00A000" // rgb: 200, 165, 220
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(!M) M = holder.my_atom
- if(!alien || alien != IS_DIONA)
- 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
-
- 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
-
- glass_icon_state = "golden_cup"
- glass_name = "golden cup"
- glass_desc = "It's magic. We don't have to explain it."
-
- 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)
- D.spread = "Remissive"
- D.stage--
- if(D.stage < 1)
- D.cure()
- ..()
- return
- synaptizine
-
- name = "Synaptizine"
- id = "synaptizine"
- description = "Synaptizine is used to treat various diseases."
- reagent_state = LIQUID
- color = "#99CCFF" // rgb: 200, 165, 220
- custom_metabolism = 0.01
- overdose = REAGENTS_OVERDOSE
- scannable = 1
-
- 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)
- holder.remove_reagent("mindbreaker", 5)
- M.hallucination = max(0, M.hallucination - 10)
- if(prob(60)) M.adjustToxLoss(1)
- ..()
- return
-
- 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
- overdose = REAGENTS_OVERDOSE
-
- 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
-
- hyronalin
- name = "Hyronalin"
- id = "hyronalin"
- description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
- reagent_state = LIQUID
- color = "#408000" // rgb: 200, 165, 220
- custom_metabolism = 0.05
- overdose = REAGENTS_OVERDOSE
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.radiation = max(M.radiation-3*REM,0)
- ..()
- return
-
- arithrazine
- name = "Arithrazine"
- id = "arithrazine"
- description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
- reagent_state = LIQUID
- color = "#008000" // rgb: 200, 165, 220
- custom_metabolism = 0.05
- overdose = REAGENTS_OVERDOSE
-
- 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
-
- 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 = "#FFFF66" // rgb: 200, 165, 220
- custom_metabolism = 0.05
- overdose = REAGENTS_OVERDOSE
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustBrainLoss(-3*REM)
- ..()
- return
-
- imidazoline
- name = "Imidazoline"
- id = "imidazoline"
- description = "Heals eye damage"
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
- overdose = REAGENTS_OVERDOSE
- scannable = 1
-
- 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)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
- if(E && istype(E))
- if(E.damage > 0)
- E.damage = max(E.damage - 1, 0)
- ..()
- return
-
- peridaxon
- name = "Peridaxon"
- id = "peridaxon"
- description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
- reagent_state = LIQUID
- color = "#561EC3" // rgb: 200, 165, 220
- overdose = 10
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
-
- //Peridaxon heals only non-robotic organs
- for(var/obj/item/organ/I in H.internal_organs)
- if((I.damage > 0) && (I.robotic != 2))
- I.damage = max(I.damage - 0.20, 0)
- ..()
- return
-
- bicaridine
- name = "Bicaridine"
- id = "bicaridine"
- description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma."
- reagent_state = LIQUID
- color = "#BF0000" // rgb: 200, 165, 220
- overdose = REAGENTS_OVERDOSE
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- if(alien != IS_DIONA)
- M.heal_organ_damage(2*REM,0)
- ..()
- return
-
- hyperzine
- name = "Hyperzine"
- id = "hyperzine"
- description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
- reagent_state = LIQUID
- color = "#FF3300" // rgb: 200, 165, 220
- custom_metabolism = 0.03
- overdose = REAGENTS_OVERDOSE/2
-
- 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"))
- ..()
- return
-
- adrenaline
- name = "Adrenaline"
- id = "adrenaline"
- description = "Adrenaline is a hormone used as a drug to treat cardiac arrest and other cardiac dysrhythmias resulting in diminished or absent cardiac output."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.SetParalysis(0)
- M.SetWeakened(0)
- M.adjustToxLoss(rand(3))
- ..()
- return
-
- 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 = "#8080FF" // rgb: 200, 165, 220
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.bodytemperature < 170)
- M.adjustCloneLoss(-1)
- M.adjustOxyLoss(-1)
- M.heal_organ_damage(1,1)
- M.adjustToxLoss(-1)
- ..()
- return
-
- clonexadone
- name = "Clonexadone"
- id = "clonexadone"
- description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube."
- reagent_state = LIQUID
- color = "#80BFFF" // rgb: 200, 165, 220
- scannable = 1
-
- 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)
- ..()
- return
-
- rezadone
- name = "Rezadone"
- id = "rezadone"
- description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
- reagent_state = SOLID
- color = "#669900" // rgb: 102, 153, 0
- overdose = REAGENTS_OVERDOSE
- scannable = 1
-
- 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.make_dizzy(5)
- M.make_jittery(5)
-
- ..()
- return
-
- spaceacillin
- name = "Spaceacillin"
- id = "spaceacillin"
- description = "An all-purpose antiviral agent."
- reagent_state = LIQUID
- color = "#C1C1C1" // rgb: 200, 165, 220
- custom_metabolism = 0.01
- overdose = REAGENTS_OVERDOSE
- scannable = 1
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- return
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- nanites
- name = "Nanomachines"
- id = "nanites"
- description = "Microscopic construction robots."
- reagent_state = LIQUID
- color = "#535E66" // rgb: 83, 94, 102
-
- reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- src = null
- if( (prob(10) && method==TOUCH) || method==INGEST)
- M.contract_disease(new /datum/disease/robotic_transformation(0),1)
-
- xenomicrobes
- name = "Xenomicrobes"
- id = "xenomicrobes"
- description = "Microbes with an entirely alien cellular structure."
- reagent_state = LIQUID
- color = "#535E66" // rgb: 83, 94, 102
-
- reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- src = null
- if( (prob(10) && method==TOUCH) || method==INGEST)
- M.contract_disease(new /datum/disease/xeno_transformation(0),1)
-
- 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
-
- 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
-
- nicotine
- name = "Nicotine"
- id = "nicotine"
- description = "A highly addictive stimulant extracted from the tobacco plant."
- reagent_state = LIQUID
- color = "#181818" // rgb: 24, 24, 24
-
- 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
-
- ultraglue
- name = "Ultra Glue"
- id = "glue"
- description = "An extremely powerful bonding agent."
- color = "#FFFFCC" // rgb: 255, 255, 204
-
- diethylamine
- name = "Diethylamine"
- id = "diethylamine"
- description = "A secondary amine, mildly corrosive."
- reagent_state = LIQUID
- color = "#604030" // rgb: 96, 64, 48
-
- 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
- overdose = REAGENTS_OVERDOSE
-
- 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
-
-//////////////////////////Ground crayons/////////////////////
-
-
- crayon_dust
- name = "Crayon dust"
- id = "crayon_dust"
- description = "Intensely coloured powder obtained by grinding crayons."
- reagent_state = LIQUID
- color = "#888888"
- overdose = 5
-
- red
- name = "Red crayon dust"
- id = "crayon_dust_red"
- color = "#FE191A"
-
- orange
- name = "Orange crayon dust"
- id = "crayon_dust_orange"
- color = "#FFBE4F"
-
- yellow
- name = "Yellow crayon dust"
- id = "crayon_dust_yellow"
- color = "#FDFE7D"
-
- green
- name = "Green crayon dust"
- id = "crayon_dust_green"
- color = "#18A31A"
-
- blue
- name = "Blue crayon dust"
- id = "crayon_dust_blue"
- color = "#247CFF"
-
- purple
- name = "Purple crayon dust"
- id = "crayon_dust_purple"
- color = "#CC0099"
-
- grey //Mime
- name = "Grey crayon dust"
- id = "crayon_dust_grey"
- color = "#808080"
-
- brown //Rainbow
- name = "Brown crayon dust"
- id = "crayon_dust_brown"
- color = "#846F35"
-
-//////////////////////////Paint//////////////////////////////
-
- paint
- name = "Paint"
- id = "paint"
- description = "This paint will stick to almost any object."
- reagent_state = LIQUID
- color = "#808080"
- overdose = 15
-
- reaction_turf(var/turf/T, var/volume)
- ..()
- if(istype(T) && !istype(T, /turf/space))
- T.color = color
-
- reaction_obj(var/obj/O, var/volume)
- ..()
- if(istype(O,/obj))
- O.color = color
-
- reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- ..()
- if(istype(M,/mob) && !istype(M,/mob/dead))
- //painting ghosts: not allowed
- M.color = color
-
-
-//////////////////////////Poison stuff///////////////////////
-
- toxin
- name = "Toxin"
- id = "toxin"
- description = "A toxic chemical."
- reagent_state = LIQUID
- color = "#CF3600" // rgb: 207, 54, 0
- var/toxpwr = 0.7 // Toxins are really weak, but without being treated, last very long.
- custom_metabolism = 0.1
-
- on_mob_life(var/mob/living/M as mob,var/alien)
- if(!M) M = holder.my_atom
- if(toxpwr)
- M.adjustToxLoss(toxpwr*REM)
- if(alien) ..() // Kind of a catch-all for aliens without the liver. Because this does not metabolize 'naturally', only removed by the liver.
- return
-
- 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
-
- 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
-
- 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)
- M.UpdateAppearance()
- return
- on_mob_life(var/mob/living/carbon/M)
- if(!istype(M)) return
- if(!M) M = holder.my_atom
- M.apply_effect(10,IRRADIATE,0)
- ..()
- return
-
- toxin/phoron
- name = "Phoron"
- id = "phoron"
- description = "Phoron in its liquid form."
- reagent_state = LIQUID
- color = "#9D14DB"
- toxpwr = 3
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- holder.remove_reagent("inaprovaline", 2*REM)
- ..()
- return
- 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
- var/turf/the_turf = get_turf(O)
- the_turf.assume_gas("volatile_fuel", volume, T20C)
- reaction_turf(var/turf/T, var/volume)
- src = null
- T.assume_gas("volatile_fuel", volume, T20C)
- return
- 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
-
- 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
- overdose = REAGENTS_OVERDOSE
-
- 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)
- if(M.losebreath < 15)
- M.losebreath++
- ..()
- return
-
- 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
-
- on_mob_life(var/mob/living/M as mob)
- if(prob(10))
- M << "\red Your insides are burning!"
- M.adjustToxLoss(rand(20,60)*REM)
- else if(prob(40))
- M.heal_organ_damage(5*REM,0)
- ..()
- return
-
- toxin/cyanide //Fast and Lethal
- name = "Cyanide"
- id = "cyanide"
- description = "A highly toxic chemical."
- reagent_state = LIQUID
- color = "#CF3600" // rgb: 207, 54, 0
- toxpwr = 4
- custom_metabolism = 0.4
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustOxyLoss(4*REM)
- M.sleeping += 1
- ..()
- return
-
- 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
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if (FAT in M.mutations)
- M.gib()
- ..()
- return
-
- toxin/carpotoxin
- name = "Carpotoxin"
- id = "carpotoxin"
- description = "A deadly neurotoxin produced by the dreaded space carp."
- reagent_state = LIQUID
- color = "#003333" // rgb: 0, 51, 51
- toxpwr = 2
-
- 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
-
- 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(10)
- M.silent = max(M.silent, 10)
- M.tod = worldtime2text()
- ..()
- return
-
- Del()
- if(holder && ismob(holder.my_atom))
- var/mob/M = holder.my_atom
- M.status_flags &= ~FAKEDEATH
- ..()
-
- toxin/mindbreaker
- name = "Mindbreaker Toxin"
- id = "mindbreaker"
- description = "A powerful hallucinogen, it can cause fatal effects in users."
- reagent_state = LIQUID
- color = "#B31008" // rgb: 139, 166, 233
- toxpwr = 0
- custom_metabolism = 0.05
- overdose = REAGENTS_OVERDOSE
-
- on_mob_life(var/mob/living/M)
- if(!M) M = holder.my_atom
- M.hallucination += 10
- ..()
- return
-
- //Reagents used for plant fertilizers.
- toxin/fertilizer
- name = "fertilizer"
- id = "fertilizer"
- description = "A chemical mix good for growing plants with."
- reagent_state = LIQUID
- toxpwr = 0.2 //It's not THAT poisonous.
- color = "#664330" // rgb: 102, 67, 48
-
- toxin/fertilizer/eznutrient
- name = "EZ Nutrient"
- id = "eznutrient"
-
- toxin/fertilizer/left4zed
- name = "Left-4-Zed"
- id = "left4zed"
-
- toxin/fertilizer/robustharvest
- name = "Robust Harvest"
- id = "robustharvest"
-
- 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
-
- // Clear off wallrot fungi
- reaction_turf(var/turf/T, var/volume)
- if(istype(T, /turf/simulated/wall))
- var/turf/simulated/wall/W = T
- if(W.rotting)
- W.rotting = 0
- for(var/obj/effect/E in W) if(E.name == "Wallrot") del E
-
- for(var/mob/O in viewers(W, null))
- O.show_message(text("\blue The fungi are completely dissolved by the solution!"), 1)
-
- reaction_obj(var/obj/O, var/volume)
- if(istype(O,/obj/effect/alien/weeds/))
- var/obj/effect/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/plant))
- var/obj/effect/plant/plant = O
- plant.die_off()
- else if(istype(O,/obj/machinery/portable_atmospherics/hydroponics))
- var/obj/machinery/portable_atmospherics/hydroponics/tray = O
-
- if(tray.seed)
- tray.health -= rand(30,50)
- if(tray.pestlevel > 0)
- tray.pestlevel -= 2
- if(tray.weedlevel > 0)
- tray.weedlevel -= 3
- tray.toxins += 4
- tray.check_level_sanity()
- tray.update_icon()
-
- 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
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.dna)
- if(H.species.flags & IS_PLANT) //plantmen take a LOT of damage
- H.adjustToxLoss(50)
-
- toxin/stoxin
- name = "Soporific"
- id = "stoxin"
- description = "An effective hypnotic used to treat insomnia."
- reagent_state = LIQUID
- color = "#009CA8" // rgb: 232, 149, 204
- toxpwr = 0
- custom_metabolism = 0.1
- overdose = REAGENTS_OVERDOSE
-
- 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 49)
- if(prob(50))
- M.Weaken(2)
- M.drowsyness = max(M.drowsyness, 20)
- if(50 to INFINITY)
- M.sleeping = max(M.sleeping, 20)
- M.drowsyness = max(M.drowsyness, 60)
- data++
- ..()
- return
-
- toxin/chloralhydrate
- name = "Chloral Hydrate"
- id = "chloralhydrate"
- description = "A powerful sedative."
- reagent_state = SOLID
- color = "#000067" // rgb: 0, 0, 103
- toxpwr = 1
- custom_metabolism = 0.1 //Default 0.2
- overdose = 15
- overdose_dam = 5
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- data++
- switch(data)
- if(1)
- M.confused += 2
- M.drowsyness += 2
- if(2 to 20)
- M.Weaken(30)
- M.eye_blurry = max(M.eye_blurry, 10)
- if(20 to INFINITY)
- M.sleeping = max(M.sleeping, 30)
- ..()
- return
-
- toxin/potassium_chloride
- name = "Potassium Chloride"
- id = "potassium_chloride"
- description = "A delicious salt that stops the heart when injected into cardiac muscle."
- reagent_state = SOLID
- color = "#FFFFFF" // rgb: 255,255,255
- toxpwr = 0
- overdose = 30
-
- on_mob_life(var/mob/living/carbon/M as mob)
- var/mob/living/carbon/human/H = M
- if(H.stat != 1)
- if (volume >= overdose)
- if(H.losebreath >= 10)
- H.losebreath = max(10, H.losebreath-10)
- H.adjustOxyLoss(2)
- H.Weaken(10)
- ..()
- return
-
- toxin/potassium_chlorophoride
- name = "Potassium Chlorophoride"
- id = "potassium_chlorophoride"
- description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!"
- reagent_state = SOLID
- color = "#FFFFFF" // rgb: 255,255,255
- toxpwr = 2
- overdose = 20
-
- on_mob_life(var/mob/living/carbon/M as mob)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.stat != 1)
- if(H.losebreath >= 10)
- H.losebreath = max(10, M.losebreath-10)
- H.adjustOxyLoss(2)
- H.Weaken(10)
- ..()
- return
-
- 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. The fermentation appears to be incomplete." //If the players manage to analyze this, they deserve to know something is wrong.
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
- custom_metabolism = 0.15 // Sleep toxins should always be consumed pretty fast
- overdose = REAGENTS_OVERDOSE/2
-
- glass_icon_state = "beerglass"
- glass_name = "glass of beer"
- glass_desc = "A freezing pint of beer"
- glass_center_of_mass = list("x"=16, "y"=8)
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- switch(data)
- if(1)
- M.confused += 2
- M.drowsyness += 2
- if(2 to 50)
- M.sleeping += 1
- if(51 to INFINITY)
- M.sleeping += 1
- M.adjustToxLoss((data - 50)*REM)
- data++
- ..()
- return
-
- toxin/acid
- name = "Sulphuric acid"
- id = "sacid"
- description = "A very corrosive mineral acid with the molecular formula H2SO4."
- reagent_state = LIQUID
- color = "#DB5008" // rgb: 219, 80, 8
- toxpwr = 1
- var/meltprob = 10
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.take_organ_damage(0, 1*REM)
- ..()
- return
-
- reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//magic numbers everywhere
- if(!istype(M, /mob/living))
- return
- if(method == TOUCH)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
-
- if(H.head)
- if(prob(meltprob) && !H.head.unacidable)
- H << "Your headgear melts away but protects you from the acid!"
- del(H.head)
- H.update_inv_head(0)
- H.update_hair(0)
- else
- H << "Your headgear protects you from the acid."
- return
-
- if(H.wear_mask)
- if(prob(meltprob) && !H.wear_mask.unacidable)
- H << "Your mask melts away but protects you from the acid!"
- del (H.wear_mask)
- H.update_inv_wear_mask(0)
- H.update_hair(0)
- else
- H << "Your mask protects you from the acid."
- return
-
- if(H.glasses) //Doesn't protect you from the acid but can melt anyways!
- if(prob(meltprob) && !H.glasses.unacidable)
- H << "Your glasses melts away!"
- del (H.glasses)
- H.update_inv_glasses(0)
-
- if(!M.unacidable)
- if(istype(M, /mob/living/carbon/human) && volume >= 10)
- var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/affecting = H.get_organ("head")
- if(affecting)
- if(affecting.take_damage(4*toxpwr, 2*toxpwr))
- H.UpdateDamageIcon()
- if(prob(meltprob)) //Applies disfigurement
- if (!(H.species && (H.species.flags & NO_PAIN)))
- H.emote("scream")
- H.status_flags |= DISFIGURED
- else
- M.take_organ_damage(min(6*toxpwr, volume * toxpwr)) // uses min() and volume to make sure they aren't being sprayed in trace amounts (1 unit != insta rape) -- Doohl
- else
- if(!M.unacidable)
- M.take_organ_damage(min(6*toxpwr, volume * toxpwr))
-
- reaction_obj(var/obj/O, var/volume)
- if((istype(O,/obj/item) || istype(O,/obj/effect/plant)) && prob(meltprob * 3))
- if(!O.unacidable)
- var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
- I.desc = "Looks like this was \an [O] some time ago."
- for(var/mob/M in viewers(5, O))
- M << "\red \the [O] melts."
- del(O)
-
- 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
- meltprob = 30
-
-/////////////////////////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.
- 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
-
- 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
- ..()
- return
-
- nutriment/protein // Bad for Skrell!
- name = "animal protein"
- id = "protein"
- color = "#440000"
-
- on_mob_life(var/mob/living/M, var/alien)
- if(alien && alien == IS_SKRELL)
- M.adjustToxLoss(0.5)
- M.nutrition -= nutriment_factor
- ..()
-
- nutriment/egg // Also bad for skrell. Not a child of protein because it might mess up, not sure.
- name = "egg yolk"
- id = "egg"
- color = "#FFFFAA"
-
- on_mob_life(var/mob/living/M, var/alien)
- if(alien && alien == IS_SKRELL)
- M.adjustToxLoss(0.5)
- M.nutrition -= nutriment_factor
- ..()
-
- 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
- overdose = REAGENTS_OVERDOSE
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition = max(M.nutrition - nutriment_factor, 0)
- M.overeatduration = 0
- if(M.nutrition < 0)//Prevent from going into negatives.
- M.nutrition = 0
- ..()
- return
-
- 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
-
- 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
-
- capsaicin
- name = "Capsaicin Oil"
- id = "capsaicin"
- description = "This is what makes chilis hot."
- reagent_state = LIQUID
- color = "#B31008" // rgb: 179, 16, 8
-
- on_mob_life(var/mob/living/M as mob)
- if(!M)
- M = holder.my_atom
- if(!data)
- data = 1
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.species && !(H.species.flags & (NO_PAIN | IS_SYNTHETIC)) )
- switch(data)
- if(1 to 2)
- H << "\red Your insides feel uncomfortably hot !"
- if(2 to 20)
- if(prob(5))
- H << "\red Your insides feel uncomfortably hot !"
- if(20 to INFINITY)
- H.apply_effect(2,AGONY,0)
- if(prob(5))
- H.visible_message("[H] [pick("dry heaves!","coughs!","splutters!")]")
- H << "\red You feel like your insides are burning !"
- else if(istype(M, /mob/living/carbon/slime))
- M.bodytemperature += rand(10,25)
- holder.remove_reagent("frostoil", 5)
- holder.remove_reagent(src.id, FOOD_METABOLISM)
- data++
- ..()
- return
-
- 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
-
- reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- if(!istype(M, /mob/living))
- return
- if(method == TOUCH)
- if(istype(M, /mob/living/carbon/human))
- var/mob/living/carbon/human/victim = M
- var/mouth_covered = 0
- var/eyes_covered = 0
- var/obj/item/safe_thing = null
- 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
- if( victim.head )
- if ( victim.head.flags & MASKCOVERSEYES )
- eyes_covered = 1
- safe_thing = victim.head
- if ( victim.head.flags & MASKCOVERSMOUTH )
- mouth_covered = 1
- safe_thing = victim.head
- if(victim.glasses)
- eyes_covered = 1
- if ( !safe_thing )
- safe_thing = victim.glasses
- if ( eyes_covered && mouth_covered )
- victim << "\red Your [safe_thing] protects you from the pepperspray!"
- return
- else if ( eyes_covered ) // Reduced effects if partially protected
- victim << "\red Your [safe_thing] protect you from most of the pepperspray!"
- victim.eye_blurry = max(M.eye_blurry, 15)
- victim.eye_blind = max(M.eye_blind, 5)
- victim.Stun(5)
- victim.Weaken(5)
- //victim.Paralyse(10)
- //victim.drop_item()
- return
- else if ( mouth_covered ) // Mouth cover is better than eye cover
- victim << "\red Your [safe_thing] protects your face from the pepperspray!"
- if (!(victim.species && (victim.species.flags & NO_PAIN)))
- victim.emote("scream")
- victim.eye_blurry = max(M.eye_blurry, 5)
- return
- else // Oh dear :D
- if (!(victim.species && (victim.species.flags & NO_PAIN)))
- victim.emote("scream")
- victim << "\red You're sprayed directly in the eyes with pepperspray!"
- victim.eye_blurry = max(M.eye_blurry, 25)
- victim.eye_blind = max(M.eye_blind, 10)
- victim.Stun(5)
- victim.Weaken(5)
- //victim.Paralyse(10)
- //victim.drop_item()
-
- on_mob_life(var/mob/living/M as mob)
- if(!M)
- M = holder.my_atom
- if(!data)
- data = 1
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.species && !(H.species.flags & (NO_PAIN | IS_SYNTHETIC)) )
- switch(data)
- if(1)
- H << "\red You feel like your insides are burning !"
- if(2 to INFINITY)
- H.apply_effect(4,AGONY,0)
- if(prob(5))
- H.visible_message("[H] [pick("dry heaves!","coughs!","splutters!")]")
- H << "\red You feel like your insides are burning !"
- else if(istype(M, /mob/living/carbon/slime))
- M.bodytemperature += rand(15,30)
- holder.remove_reagent("frostoil", 5)
- holder.remove_reagent(src.id, FOOD_METABOLISM)
- data++
- ..()
- return
-
- frostoil
- name = "Frost Oil"
- id = "frostoil"
- description = "A special oil that noticably chills the body. Extracted from Ice Peppers."
- reagent_state = LIQUID
- color = "#B31008" // rgb: 139, 166, 233
-
- on_mob_life(var/mob/living/M as mob)
- if(!M)
- M = holder.my_atom
- M.bodytemperature = max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0)
- if(prob(1))
- M.emote("shiver")
- if(istype(M, /mob/living/carbon/slime))
- M.bodytemperature = max(M.bodytemperature - rand(10,20), 0)
- holder.remove_reagent("capsaicin", 5)
- holder.remove_reagent(src.id, FOOD_METABOLISM)
- ..()
- return
-
- reaction_turf(var/turf/simulated/T, var/volume)
- for(var/mob/living/carbon/slime/M in T)
- M.adjustToxLoss(rand(15,30))
-
- 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
- overdose = REAGENTS_OVERDOSE
-
- blackpepper
- name = "Black Pepper"
- id = "blackpepper"
- description = "A powder ground from peppercorns. *AAAACHOOO*"
- reagent_state = SOLID
- // no color (ie, black)
-
- 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
-
- on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
-
- hot_coco // there's also drink/hot_coco for whatever reason
- name = "Hot Chocolate"
- id = "hot_coco"
- description = "Made with love! And cocoa beans."
- reagent_state = LIQUID
- nutriment_factor = 2 * REAGENTS_METABOLISM
- color = "#403010" // rgb: 64, 48, 16
-
- glass_icon_state = "chocolateglass"
- glass_name = "glass of hot chocolate"
- glass_desc = "Made with love! And cocoa beans."
-
- 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
-
- psilocybin
- name = "Psilocybin"
- id = "psilocybin"
- description = "A strong psycotropic derived from certain species of mushroom."
- color = "#E700E7" // rgb: 231, 0, 231
- overdose = REAGENTS_OVERDOSE
-
- 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.make_dizzy(5)
- if(prob(10)) M.emote(pick("twitch","giggle"))
- if(5 to 10)
- if (!M.stuttering) M.stuttering = 1
- M.make_jittery(10)
- M.make_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.make_jittery(20)
- M.make_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
-
- 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
-
- 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.
- 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
-
- 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
- ..()
-*/
- 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
-
- on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
- reaction_turf(var/turf/simulated/T, var/volume)
- if (!istype(T)) return
- src = null
- if(volume >= 3)
- if(T.wet >= 1) return
- T.wet = 1
- if(T.wet_overlay)
- T.overlays -= T.wet_overlay
- T.wet_overlay = null
- T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
- T.overlays += T.wet_overlay
-
- spawn(800)
- if (!istype(T)) return
- if(T.wet >= 2) return
- T.wet = 0
- if(T.wet_overlay)
- T.overlays -= T.wet_overlay
- T.wet_overlay = null
- var/hotspot = (locate(/obj/fire) 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)
- del(hotspot)
-
- 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
- overdose = REAGENTS_OVERDOSE
-
- 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
-
- on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
-
- 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
-
- 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
-
- 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
-
- on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
- ..()
- return
-
- 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
-
- on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
-
- reaction_turf(var/turf/T, var/volume)
- src = null
- if(!istype(T, /turf/space))
- new /obj/effect/decal/cleanable/flour(T)
-
- rice
- name = "Rice"
- id = "rice"
- description = "Enjoy the great taste of nothing."
- reagent_state = SOLID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#FFFFFF" // rgb: 0, 0, 0
-
- on_mob_life(var/mob/living/M as mob)
- M.nutrition += nutriment_factor
- ..()
- return
-
- 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
-
- 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////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- drink
- name = "Drink"
- id = "drink"
- description = "Uh, some kind of drink."
- reagent_state = LIQUID
- nutriment_factor = 1 * REAGENTS_METABOLISM
- color = "#E78108" // rgb: 231, 129, 8
- var/adj_dizzy = 0
- var/adj_drowsy = 0
- var/adj_sleepy = 0
- var/adj_temp = 0
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition += nutriment_factor
- holder.remove_reagent(src.id, FOOD_METABOLISM)
- // Drinks should be used up faster than other reagents.
- holder.remove_reagent(src.id, FOOD_METABOLISM)
- if (adj_dizzy) M.dizziness = max(0,M.dizziness + adj_dizzy)
- if (adj_drowsy) M.drowsyness = max(0,M.drowsyness + adj_drowsy)
- if (adj_sleepy) M.sleeping = max(0,M.sleeping + adj_sleepy)
- if (adj_temp)
- if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
- M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT))
-
- ..()
- return
-
- drink/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
-
- glass_icon_state = "glass_orange"
- glass_name = "glass of orange juice"
- glass_desc = "Vitamins! Yay!"
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- if(M.getOxyLoss() && prob(30)) M.adjustOxyLoss(-1)
- return
-
- drink/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
-
- glass_icon_state = "glass_red"
- glass_name = "glass of tomato juice"
- glass_desc = "Are you sure this is tomato juice?"
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- if(M.getFireLoss() && prob(20)) M.heal_organ_damage(0,1)
- return
-
- drink/limejuice
- name = "Lime Juice"
- id = "limejuice"
- description = "The sweet-sour juice of limes."
- color = "#365E30" // rgb: 54, 94, 48
-
- glass_icon_state = "glass_green"
- glass_name = "glass of lime juice"
- glass_desc = "A glass of sweet-sour lime juice"
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1*REM)
- return
-
- drink/carrotjuice
- name = "Carrot juice"
- id = "carrotjuice"
- description = "It is just like a carrot but without crunching."
- color = "#FF8C00" // rgb: 255, 140, 0
-
- glass_icon_state = "carrotjuice"
- glass_name = "glass of carrot juice"
- glass_desc = "It is just like a carrot but without crunching."
-
- 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
-
- drink/berryjuice
- name = "Berry Juice"
- id = "berryjuice"
- description = "A delicious blend of several different kinds of berries."
- color = "#990066" // rgb: 153, 0, 102
-
- glass_icon_state = "berryjuice"
- glass_name = "glass of berry juice"
- glass_desc = "Berry juice. Or maybe it's jam. Who cares?"
-
- drink/grapejuice
- name = "Grape Juice"
- id = "grapejuice"
- description = "It's grrrrrape!"
- color = "#863333" // rgb: 134, 51, 51
-
- glass_icon_state = "grapejuice"
- glass_name = "glass of grape juice"
- glass_desc = "It's grrrrrape!"
-
- drink/grapesoda
- name = "Grape Soda"
- id = "grapesoda"
- description = "Grapes made into a fine drank."
- color = "#421C52" // rgb: 98, 57, 53
- adj_drowsy = -3
-
- glass_icon_state = "gsodaglass"
- glass_name = "glass of grape soda"
- glass_desc = "Looks like a delicious drink!"
-
- drink/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
-
- glass_icon_state = "poisonberryjuice"
- glass_name = "glass of poison berry juice"
- glass_desc = "A glass of deadly juice."
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- M.adjustToxLoss(1)
- return
-
- drink/watermelonjuice
- name = "Watermelon Juice"
- id = "watermelonjuice"
- description = "Delicious juice made from watermelon."
- color = "#B83333" // rgb: 184, 51, 51
-
- glass_icon_state = "glass_red"
- glass_name = "glass of watermelon juice"
- glass_desc = "Delicious juice made from watermelon."
-
- drink/lemonjuice
- name = "Lemon Juice"
- id = "lemonjuice"
- description = "This juice is VERY sour."
- color = "#AFAF00" // rgb: 175, 175, 0
-
- glass_icon_state = "lemonjuice"
- glass_name = "glass of lemon juice"
- glass_desc = "Sour..."
-
- drink/banana
- name = "Banana Juice"
- id = "banana"
- description = "The raw essence of a banana."
- color = "#C3AF00" // rgb: 195, 175, 0
-
- glass_icon_state = "banana"
- glass_name = "glass of banana juice"
- glass_desc = "The raw essence of a banana. HONK!"
-
- drink/nothing
- name = "Nothing"
- id = "nothing"
- description = "Absolutely nothing."
-
- glass_icon_state = "nothing"
- glass_name = "glass of nothing"
- glass_desc = "Absolutely nothing."
-
- drink/potato_juice
- name = "Potato Juice"
- id = "potato"
- description = "Juice of the potato. Bleh."
- nutriment_factor = 2 * FOOD_METABOLISM
- color = "#302000" // rgb: 48, 32, 0
-
- glass_icon_state = "glass_brown"
- glass_name = "glass of potato juice"
- glass_desc = "Juice from a potato. Bleh."
-
- drink/milk
- name = "Milk"
- id = "milk"
- description = "An opaque white liquid produced by the mammary glands of mammals."
- color = "#DFDFDF" // rgb: 223, 223, 223
-
- glass_icon_state = "glass_white"
- glass_name = "glass of milk"
- glass_desc = "White and nutritious goodness!"
-
- on_mob_life(var/mob/living/M as mob)
- if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
- holder.remove_reagent("capsaicin", 10*REAGENTS_METABOLISM)
- ..()
- return
-
- drink/milk/soymilk
- name = "Soy Milk"
- id = "soymilk"
- description = "An opaque white liquid made from soybeans."
- color = "#DFDFC7" // rgb: 223, 223, 199
-
- glass_icon_state = "glass_white"
- glass_name = "glass of soy milk"
- glass_desc = "White and nutritious soy goodness!"
-
- drink/milk/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
-
- glass_icon_state = "glass_white"
- glass_name = "glass of cream"
- glass_desc = "Ewwww..."
-
- drink/grenadine
- name = "Grenadine Syrup"
- id = "grenadine"
- description = "Made in the modern day with proper pomegranate substitute. Who uses real fruit, anyways?"
- color = "#FF004F" // rgb: 255, 0, 79
-
- glass_icon_state = "grenadineglass"
- glass_name = "glass of grenadine syrup"
- glass_desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
- glass_center_of_mass = list("x"=17, "y"=6)
-
- drink/hot_coco
- name = "Hot Chocolate"
- id = "hot_coco"
- description = "Made with love! And cocoa beans."
- nutriment_factor = 2 * FOOD_METABOLISM
- color = "#403010" // rgb: 64, 48, 16
- adj_temp = 5
-
- glass_icon_state = "chocolateglass"
- glass_name = "glass of hot chocolate"
- glass_desc = "Made with love! And cocoa beans."
-
- drink/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
- adj_dizzy = -5
- adj_drowsy = -3
- adj_sleepy = -2
- adj_temp = 25
-
- glass_icon_state = "hot_coffee"
- glass_name = "cup of coffee"
- glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- M.make_jittery(5)
- if(adj_temp > 0)
- holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM)
-
- holder.remove_reagent(src.id, 0.1)
-
- drink/coffee/icecoffee
- name = "Iced Coffee"
- id = "icecoffee"
- description = "Coffee and ice, refreshing and cool."
- color = "#102838" // rgb: 16, 40, 56
- adj_temp = -5
-
- glass_icon_state = "icedcoffeeglass"
- glass_name = "glass of iced coffee"
- glass_desc = "A drink to perk you up and refresh you!"
-
- drink/coffee/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
- adj_sleepy = 0
- adj_temp = 5
-
- glass_icon_state = "soy_latte"
- glass_name = "glass of soy latte"
- glass_desc = "A nice and refrshing beverage while you are reading."
- glass_center_of_mass = list("x"=15, "y"=9)
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- M.sleeping = 0
- if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
- return
-
- drink/coffee/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
- adj_sleepy = 0
- adj_temp = 5
-
- glass_icon_state = "cafe_latte"
- glass_name = "glass of cafe latte"
- glass_desc = "A nice, strong and refreshing beverage while you are reading."
- glass_center_of_mass = list("x"=15, "y"=9)
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- M.sleeping = 0
- if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
- return
-
- drink/tea
- name = "Tea"
- id = "tea"
- description = "Tasty black tea, it has antioxidants, it's good for you!"
- color = "#101000" // rgb: 16, 16, 0
- adj_dizzy = -2
- adj_drowsy = -1
- adj_sleepy = -3
- adj_temp = 20
-
- glass_icon_state = "bigteacup"
- glass_name = "cup of tea"
- glass_desc = "Tasty black tea, it has antioxidants, it's good for you!"
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1)
- return
-
- drink/tea/icetea
- name = "Iced Tea"
- id = "icetea"
- description = "No relation to a certain rap artist/ actor."
- color = "#104038" // rgb: 16, 64, 56
- adj_temp = -5
-
- glass_icon_state = "icedteaglass"
- glass_name = "glass of iced tea"
- glass_desc = "No relation to a certain rap artist/ actor."
- glass_center_of_mass = list("x"=15, "y"=10)
-
- drink/cold
- name = "Cold drink"
- adj_temp = -5
-
- drink/cold/tonic
- name = "Tonic Water"
- id = "tonic"
- description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
- color = "#664300" // rgb: 102, 67, 0
- adj_dizzy = -5
- adj_drowsy = -3
- adj_sleepy = -2
-
- glass_icon_state = "glass_clear"
- glass_name = "glass of tonic water"
- glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
-
- drink/cold/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
- adj_dizzy = -5
- adj_drowsy = -3
-
- glass_icon_state = "glass_clear"
- glass_name = "glass of soda water"
- glass_desc = "Soda water. Why not make a scotch and soda?"
-
- drink/cold/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
-
- glass_icon_state = "iceglass"
- glass_name = "glass of ice"
- glass_desc = "Generally, you're supposed to put something else in there too..."
-
- drink/cold/space_cola
- name = "Space Cola"
- id = "cola"
- description = "A refreshing beverage."
- reagent_state = LIQUID
- color = "#100800" // rgb: 16, 8, 0
- adj_drowsy = -3
-
- glass_icon_state = "glass_brown"
- glass_name = "glass of Space Cola"
- glass_desc = "A glass of refreshing Space Cola"
-
- drink/cold/nuka_cola
- name = "Nuka Cola"
- id = "nuka_cola"
- description = "Cola, cola never changes."
- color = "#100800" // rgb: 16, 8, 0
- adj_sleepy = -2
-
- glass_icon_state = "nuka_colaglass"
- glass_name = "glass of Nuka-Cola"
- glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
- glass_center_of_mass = list("x"=16, "y"=6)
-
- on_mob_life(var/mob/living/M as mob)
- M.make_jittery(20)
- M.druggy = max(M.druggy, 30)
- M.dizziness +=5
- M.drowsyness = 0
- ..()
- return
-
- drink/cold/spacemountainwind
- name = "Mountain Wind"
- id = "spacemountainwind"
- description = "Blows right through you like a space wind."
- color = "#102000" // rgb: 16, 32, 0
- adj_drowsy = -7
- adj_sleepy = -1
-
- glass_icon_state = "Space_mountain_wind_glass"
- glass_name = "glass of Space Mountain Wind"
- glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
-
- drink/cold/dr_gibb
- name = "Dr. Gibb"
- id = "dr_gibb"
- description = "A delicious blend of 42 different flavours"
- color = "#102000" // rgb: 16, 32, 0
- adj_drowsy = -6
-
- glass_icon_state = "dr_gibb_glass"
- glass_name = "glass of Dr. Gibb"
- glass_desc = "Dr. Gibb. Not as dangerous as the name might imply."
-
- drink/cold/space_up
- name = "Space-Up"
- id = "space_up"
- description = "Tastes like a hull breach in your mouth."
- color = "#202800" // rgb: 32, 40, 0
- adj_temp = -8
-
- glass_icon_state = "space-up_glass"
- glass_name = "glass of Space-up"
- glass_desc = "Space-up. It helps keep your cool."
-
- drink/cold/lemon_lime
- name = "Lemon Lime"
- description = "A tangy substance made of 0.5% natural citrus!"
- id = "lemon_lime"
- color = "#878F00" // rgb: 135, 40, 0
- adj_temp = -8
-
- glass_icon_state = "lemonlime"
- glass_name = "glass of lemon lime soda"
- glass_desc = "A tangy substance made of 0.5% natural citrus!"
-
- drink/cold/lemonade
- name = "Lemonade"
- description = "Oh the nostalgia..."
- id = "lemonade"
- color = "#FFFF00" // rgb: 255, 255, 0
-
- glass_icon_state = "lemonadeglass"
- glass_name = "glass of lemonade"
- glass_desc = "Oh the nostalgia..."
-
- drink/cold/kiraspecial
- name = "Kira Special"
- description = "Long live the guy who everyone had mistaken for a girl. Baka!"
- id = "kiraspecial"
- color = "#CCCC99" // rgb: 204, 204, 153
-
- glass_icon_state = "kiraspecial"
- glass_name = "glass of Kira Special"
- glass_desc = "Long live the guy who everyone had mistaken for a girl. Baka!"
- glass_center_of_mass = list("x"=16, "y"=12)
-
- drink/cold/brownstar
- name = "Brown Star"
- description = "It's not what it sounds like..."
- id = "brownstar"
- color = "#9F3400" // rgb: 159, 052, 000
- adj_temp = - 2
-
- glass_icon_state = "brownstar"
- glass_name = "glass of Brown Star"
- glass_desc = "It's not what it sounds like..."
-
- drink/cold/milkshake
- name = "Milkshake"
- description = "Glorious brainfreezing mixture."
- id = "milkshake"
- color = "#AEE5E4" // rgb" 174, 229, 228
- adj_temp = -9
-
- glass_icon_state = "milkshake"
- glass_name = "glass of milkshake"
- glass_desc = "Glorious brainfreezing mixture."
- glass_center_of_mass = list("x"=16, "y"=7)
-
- on_mob_life(var/mob/living/M as mob)
- if(!M)
- M = holder.my_atom
- if(prob(1))
- M.emote("shiver")
- M.bodytemperature = max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0)
- if(istype(M, /mob/living/carbon/slime))
- M.bodytemperature = max(M.bodytemperature - rand(10,20), 0)
- holder.remove_reagent("capsaicin", 5)
- holder.remove_reagent(src.id, FOOD_METABOLISM)
- ..()
- return
-
- drink/cold/rewriter
- name = "Rewriter"
- description = "The secret of the sanctuary of the Libarian..."
- id = "rewriter"
- color = "#485000" // rgb:72, 080, 0
-
- glass_icon_state = "rewriter"
- glass_name = "glass of Rewriter"
- glass_desc = "The secret of the sanctuary of the Libarian..."
- glass_center_of_mass = list("x"=16, "y"=9)
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- M.make_jittery(5)
- return
-
-
- 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
- nutriment_factor = 1 * FOOD_METABOLISM
-
- glass_icon_state = "doctorsdelightglass"
- glass_name = "glass of The Doctor's Delight"
- glass_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
- glass_center_of_mass = list("x"=16, "y"=8)
-
- on_mob_life(var/mob/living/M as mob)
- M:nutrition += nutriment_factor
- holder.remove_reagent(src.id, FOOD_METABOLISM)
- if(!M) M = holder.my_atom
- if(M:getOxyLoss() && prob(50)) M:adjustOxyLoss(-2)
- if(M:getBruteLoss() && prob(60)) M:heal_organ_damage(2,0)
- if(M:getFireLoss() && prob(50)) M:heal_organ_damage(0,2)
- if(M:getToxLoss() && prob(50)) 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
-
-//////////////////////////////////////////////The ten friggen million reagents that get you drunk//////////////////////////////////////////////
-
- atomicbomb
- name = "Atomic Bomb"
- id = "atomicbomb"
- description = "Nuclear proliferation never tasted so good."
- reagent_state = LIQUID
- color = "#666300" // rgb: 102, 99, 0
-
- glass_icon_state = "atomicbombglass"
- glass_name = "glass of Atomic Bomb"
- glass_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
- glass_center_of_mass = list("x"=15, "y"=7)
-
- on_mob_life(var/mob/living/M as mob)
- M.druggy = max(M.druggy, 50)
- M.confused = max(M.confused+2,0)
- M.make_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
-
- gargle_blaster
- name = "Pan-Galactic Gargle Blaster"
- id = "gargleblaster"
- description = "Whoah, this stuff looks volatile!"
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
-
- glass_icon_state = "gargleblasterglass"
- glass_name = "glass of Pan-Galactic Gargle Blaster"
- glass_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
- glass_center_of_mass = list("x"=17, "y"=6)
-
- on_mob_life(var/mob/living/M as mob)
- if(!data) data = 1
- data++
- M.dizziness +=6
- switch(data)
- if(15 to 45)
- M.stuttering = max(M.stuttering+3,0)
- if(45 to 55)
- if (prob(50))
- M.confused = max(M.confused+3,0)
- if(55 to 200)
- M.druggy = max(M.druggy, 55)
- if(200 to INFINITY)
- M.adjustToxLoss(2)
- ..()
-
- 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
-
- glass_icon_state = "neurotoxinglass"
- glass_name = "glass of Neurotoxin"
- glass_desc = "A drink that is guaranteed to knock you silly."
- glass_center_of_mass = list("x"=16, "y"=8)
-
- 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
- switch(data)
- if(15 to 45)
- M.stuttering = max(M.stuttering+3,0)
- if(45 to 55)
- if (prob(50))
- M.confused = max(M.confused+3,0)
- if(55 to 200)
- M.druggy = max(M.druggy, 55)
- if(200 to INFINITY)
- M.adjustToxLoss(2)
- ..()
-
- hippies_delight
- name = "Hippies' Delight"
- id = "hippiesdelight"
- description = "You just don't get it maaaan."
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
-
- glass_icon_state = "hippiesdelightglass"
- glass_name = "glass of Hippie's Delight"
- glass_desc = "A drink enjoyed by people during the 1960's."
- glass_center_of_mass = list("x"=16, "y"=8)
-
- 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.make_dizzy(10)
- if(prob(10)) M.emote(pick("twitch","giggle"))
- if(5 to 10)
- if (!M.stuttering) M.stuttering = 1
- M.make_jittery(20)
- M.make_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.make_jittery(40)
- M.make_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.make_jittery(60)
- M.make_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
-1-2 = non-toxic alcohol
-3 = medium-toxic
-4 = the hard stuff
-5 = potent mixes
-<6 = deadly toxic
-*/
-
- ethanol
- name = "Ethanol" //Parent class for all alcoholic reagents.
- id = "ethanol"
- description = "A well-known alcohol with a variety of applications."
- reagent_state = LIQUID
- nutriment_factor = 0 //So alcohol can fill you up! If they want to.
- color = "#404030" // rgb: 64, 64, 48
- var/boozepwr = 5 //higher numbers mean the booze will have an effect faster.
- var/dizzy_adj = 3
- var/adj_drowsy = 0
- var/adj_sleepy = 0
- var/slurr_adj = 3
- var/confused_adj = 2
- var/slur_start = 90 //amount absorbed after which mob starts slurring
- var/confused_start = 150 //amount absorbed after which mob starts confusing directions
- var/blur_start = 300 //amount absorbed after which mob starts getting blurred vision
- var/pass_out = 400 //amount absorbed after which mob starts passing out
-
- glass_icon_state = "glass_clear"
- glass_name = "glass of ethanol"
- glass_desc = "A well-known alcohol with a variety of applications."
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- M:nutrition += nutriment_factor
- holder.remove_reagent(src.id, (alien ? FOOD_METABOLISM : ALCOHOL_METABOLISM)) // Catch-all for creatures without livers.
-
- if (adj_drowsy) M.drowsyness = max(0,M.drowsyness + adj_drowsy)
- if (adj_sleepy) M.sleeping = max(0,M.sleeping + adj_sleepy)
-
- if(!src.data || (!isnum(src.data) && src.data.len)) data = 1 //if it doesn't exist we set it. if it's a list we're going to set it to 1 as well. This is to
- src.data += boozepwr //avoid a runtime error associated with drinking blood mixed in drinks (demon's blood).
-
- var/d = data
-
- // make all the beverages work together
- for(var/datum/reagent/ethanol/A in holder.reagent_list)
- if(A != src && isnum(A.data)) d += A.data
-
- if(alien && alien == IS_SKRELL) //Skrell get very drunk very quickly.
- d*=5
-
- M.dizziness += dizzy_adj.
- if(d >= slur_start && d < pass_out)
- if (!M:slurring) M:slurring = 1
- M:slurring += slurr_adj
- if(d >= confused_start && prob(33))
- if (!M:confused) M:confused = 1
- M.confused = max(M:confused+confused_adj,0)
- if(d >= blur_start)
- M.eye_blurry = max(M.eye_blurry, 10)
- M:drowsyness = max(M:drowsyness, 0)
- if(d >= pass_out)
- M:paralysis = max(M:paralysis, 20)
- M:drowsyness = max(M:drowsyness, 30)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/obj/item/organ/liver/L = H.internal_organs_by_name["liver"]
- if (!L)
- H.adjustToxLoss(5)
- else if(istype(L))
- L.take_damage(0.1, 1)
- H.adjustToxLoss(0.1)
- ..()
- return
-
- 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 dissolves the ink on the paper."
- if(istype(O,/obj/item/weapon/book))
- if(istype(O,/obj/item/weapon/book/tome))
- usr << "The solution does nothing. Whatever this is, it isn't normal ink."
- return
- if(volume >= 5)
- var/obj/item/weapon/book/affectedbook = O
- affectedbook.dat = null
- usr << "The solution dissolves the ink on the book."
- else
- usr << "It wasn't enough..."
- return
-
- 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
- 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 = 1
- nutriment_factor = 1 * FOOD_METABOLISM
-
- glass_icon_state = "beerglass"
- glass_name = "glass of beer"
- glass_desc = "A freezing pint of beer"
- glass_center_of_mass = list("x"=16, "y"=8)
-
- on_mob_life(var/mob/living/M as mob)
- M:jitteriness = max(M:jitteriness-3,0)
- ..()
- return
-
- 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 = 1.5
- dizzy_adj = -5
- adj_drowsy = -3
- adj_sleepy = -2
-
- glass_icon_state = "kahluaglass"
- glass_name = "glass of RR coffee liquor"
- glass_desc = "DAMN, THIS THING LOOKS ROBUST"
- glass_center_of_mass = list("x"=15, "y"=7)
-
- on_mob_life(var/mob/living/M as mob)
- M.make_jittery(5)
- ..()
- return
-
- ethanol/whiskey
- name = "Whiskey"
- id = "whiskey"
- description = "A superb and well-aged single-malt whiskey. Damn."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 2
- dizzy_adj = 4
-
- glass_icon_state = "whiskeyglass"
- glass_name = "glass of whiskey"
- glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
- glass_center_of_mass = list("x"=16, "y"=12)
-
- ethanol/specialwhiskey
- name = "Special Blend Whiskey"
- id = "specialwhiskey"
- description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 2
- dizzy_adj = 4
- slur_start = 30 //amount absorbed after which mob starts slurring
-
- glass_icon_state = "whiskeyglass"
- glass_name = "glass of special blend whiskey"
- glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
- glass_center_of_mass = list("x"=16, "y"=12)
-
- ethanol/thirteenloko
- name = "Thirteen Loko"
- id = "thirteenloko"
- description = "A potent mixture of caffeine and alcohol."
- color = "#102000" // rgb: 16, 32, 0
- boozepwr = 2
- nutriment_factor = 1 * FOOD_METABOLISM
-
- glass_icon_state = "thirteen_loko_glass"
- glass_name = "glass of Thirteen Loko"
- glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
-
- on_mob_life(var/mob/living/M as mob)
- M:drowsyness = max(0,M:drowsyness-7)
- if (M.bodytemperature > 310)
- M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- M.make_jittery(5)
- ..()
- return
-
- ethanol/vodka
- name = "Vodka"
- id = "vodka"
- description = "Number one drink AND fueling choice for Russians worldwide."
- color = "#0064C8" // rgb: 0, 100, 200
- boozepwr = 2
-
- glass_icon_state = "ginvodkaglass"
- glass_name = "glass of vodka"
- glass_desc = "The glass contain wodka. Xynta."
- glass_center_of_mass = list("x"=16, "y"=12)
-
- on_mob_life(var/mob/living/M as mob)
- M.radiation = max(M.radiation-1,0)
- ..()
- return
-
- ethanol/bilk
- name = "Bilk"
- id = "bilk"
- description = "This appears to be beer mixed with milk. Disgusting."
- color = "#895C4C" // rgb: 137, 92, 76
- boozepwr = 1
- nutriment_factor = 2 * FOOD_METABOLISM
-
- glass_icon_state = "glass_brown"
- glass_name = "glass of bilk"
- glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
-
- 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 = 5
-
- glass_icon_state = "threemileislandglass"
- glass_name = "glass of Three Mile Island iced tea"
- glass_desc = "A glass of this is sure to prevent a meltdown."
- glass_center_of_mass = list("x"=16, "y"=2)
-
- on_mob_life(var/mob/living/M as mob)
- M.druggy = max(M.druggy, 50)
- ..()
- return
-
- ethanol/gin
- name = "Gin"
- id = "gin"
- description = "It's gin. In space. I say, good sir."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 1
- dizzy_adj = 3
-
- glass_icon_state = "ginvodkaglass"
- glass_name = "glass of gin"
- glass_desc = "A crystal clear glass of Griffeater gin."
- glass_center_of_mass = list("x"=16, "y"=12)
-
- 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 = 2
-
- glass_icon_state = "tequillaglass"
- glass_name = "glass of Tequilla"
- glass_desc = "Now all that's missing is the weird colored shades!"
- glass_center_of_mass = list("x"=16, "y"=12)
-
- ethanol/vermouth
- name = "Vermouth"
- id = "vermouth"
- description = "You suddenly feel a craving for a martini..."
- color = "#91FF91" // rgb: 145, 255, 145
- boozepwr = 1.5
-
- glass_icon_state = "vermouthglass"
- glass_name = "glass of vermouth"
- glass_desc = "You wonder why you're even drinking this straight."
- glass_center_of_mass = list("x"=16, "y"=12)
-
- ethanol/wine
- name = "Wine"
- id = "wine"
- description = "An premium alchoholic beverage made from distilled grape juice."
- color = "#7E4043" // rgb: 126, 64, 67
- boozepwr = 1.5
- dizzy_adj = 2
- slur_start = 65 //amount absorbed after which mob starts slurring
- confused_start = 145 //amount absorbed after which mob starts confusing directions
-
- glass_icon_state = "wineglass"
- glass_name = "glass of wine"
- glass_desc = "A very classy looking drink."
- glass_center_of_mass = list("x"=15, "y"=7)
-
- 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 = 1.5
- dizzy_adj = 4
- confused_start = 115 //amount absorbed after which mob starts confusing directions
-
- glass_icon_state = "cognacglass"
- glass_name = "glass of cognac"
- glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this."
- glass_center_of_mass = list("x"=16, "y"=6)
-
- 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 = 2
- dizzy_adj = 6
- slurr_adj = 5
- slur_start = 35 //amount absorbed after which mob starts slurring
- confused_start = 90 //amount absorbed after which mob starts confusing directions
-
- glass_icon_state = "glass_brown2"
- glass_name = "glass of Hooch"
- glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
-
- ethanol/ale
- name = "Ale"
- id = "ale"
- description = "A dark alchoholic beverage made by malted barley and yeast."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 1
-
- glass_icon_state = "aleglass"
- glass_name = "glass of ale"
- glass_desc = "A freezing pint of delicious ale"
- glass_center_of_mass = list("x"=16, "y"=8)
-
- ethanol/absinthe
- name = "Absinthe"
- id = "absinthe"
- description = "Watch out that the Green Fairy doesn't come for you!"
- color = "#33EE00" // rgb: 51, 238, 0
- boozepwr = 4
- dizzy_adj = 5
- slur_start = 15
- confused_start = 30
-
- glass_icon_state = "absintheglass"
- glass_name = "glass of absinthe"
- glass_desc = "Wormwood, anise, oh my."
- glass_center_of_mass = list("x"=16, "y"=5)
-
- ethanol/pwine
- name = "Poison Wine"
- id = "pwine"
- description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!"
- color = "#000000" // rgb: 0, 0, 0 SHOCKER
- boozepwr = 1
- dizzy_adj = 1
- slur_start = 1
- confused_start = 1
-
- glass_icon_state = "pwineglass"
- glass_name = "glass of ???"
- glass_desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?"
- glass_center_of_mass = list("x"=16, "y"=5)
-
- 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 25)
- if (!M.stuttering) M.stuttering = 1
- M.make_dizzy(1)
- M.hallucination = max(M.hallucination, 3)
- if(prob(1)) M.emote(pick("twitch","giggle"))
- if(25 to 75)
- if (!M.stuttering) M.stuttering = 1
- M.hallucination = max(M.hallucination, 10)
- M.make_jittery(2)
- M.make_dizzy(2)
- M.druggy = max(M.druggy, 45)
- if(prob(5)) M.emote(pick("twitch","giggle"))
- if (75 to 150)
- if (!M.stuttering) M.stuttering = 1
- M.hallucination = max(M.hallucination, 60)
- M.make_jittery(4)
- M.make_dizzy(4)
- M.druggy = max(M.druggy, 60)
- if(prob(10)) M.emote(pick("twitch","giggle"))
- if(prob(30)) M.adjustToxLoss(2)
- if (150 to 300)
- if (!M.stuttering) M.stuttering = 1
- M.hallucination = max(M.hallucination, 60)
- M.make_jittery(4)
- M.make_dizzy(4)
- M.druggy = max(M.druggy, 60)
- if(prob(10)) M.emote(pick("twitch","giggle"))
- if(prob(30)) M.adjustToxLoss(2)
- if(prob(5)) if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/obj/item/organ/heart/L = H.internal_organs_by_name["heart"]
- if (L && istype(L))
- L.take_damage(5, 0)
- if (300 to INFINITY)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/obj/item/organ/heart/L = H.internal_organs_by_name["heart"]
- if (L && istype(L))
- L.take_damage(100, 0)
- holder.remove_reagent(src.id, FOOD_METABOLISM)
-
- ethanol/rum
- name = "Rum"
- id = "rum"
- description = "Yohoho and all that."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 1.5
-
- glass_icon_state = "rumglass"
- glass_name = "glass of rum"
- glass_desc = "Now you want to Pray for a pirate suit, don't you?"
- glass_center_of_mass = list("x"=16, "y"=12)
-
- ethanol/deadrum
- name = "Deadrum"
- id = "rum" // duplicate ids?
- description = "Popular with the sailors. Not very popular with everyone else."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 1
-
- glass_icon_state = "rumglass"
- glass_name = "glass of rum"
- glass_desc = "Now you want to Pray for a pirate suit, don't you?"
- glass_center_of_mass = list("x"=16, "y"=12)
-
- on_mob_life(var/mob/living/M as mob)
- ..()
- M.dizziness +=5
- return
-
- ethanol/sake
- name = "Sake"
- id = "sake"
- description = "Anime's favorite drink."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 2
-
- glass_icon_state = "ginvodkaglass"
- glass_name = "glass of sake"
- glass_desc = "A glass of sake."
- glass_center_of_mass = list("x"=16, "y"=12)
-
-/////////////////////////////////////////////////////////////////cocktail entities//////////////////////////////////////////////
-
-
- ethanol/goldschlager
- name = "Goldschlager"
- id = "goldschlager"
- description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 3
-
- glass_icon_state = "ginvodkaglass"
- glass_name = "glass of Goldschlager"
- glass_desc = "100 proof that teen girls will drink anything with gold in it."
- glass_center_of_mass = list("x"=16, "y"=12)
-
- 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 = 1.5
-
- glass_icon_state = "patronglass"
- glass_name = "glass of Patron"
- glass_desc = "Drinking patron in the bar, with all the subpar ladies."
- glass_center_of_mass = list("x"=7, "y"=8)
-
- ethanol/gintonic
- name = "Gin and Tonic"
- id = "gintonic"
- description = "An all time classic, mild cocktail."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 1
-
- glass_icon_state = "gintonicglass"
- glass_name = "glass of gin and tonic"
- glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman."
- glass_center_of_mass = list("x"=16, "y"=7)
-
- ethanol/cuba_libre
- name = "Cuba Libre"
- id = "cubalibre"
- description = "Rum, mixed with cola. Viva la revolucion."
- color = "#3E1B00" // rgb: 62, 27, 0
- boozepwr = 1.5
-
- glass_icon_state = "cubalibreglass"
- glass_name = "glass of Cuba Libre"
- glass_desc = "A classic mix of rum and cola."
- glass_center_of_mass = list("x"=16, "y"=8)
-
- ethanol/whiskey_cola
- name = "Whiskey Cola"
- id = "whiskeycola"
- description = "Whiskey, mixed with cola. Surprisingly refreshing."
- color = "#3E1B00" // rgb: 62, 27, 0
- boozepwr = 2
-
- glass_icon_state = "whiskeycolaglass"
- glass_name = "glass of whiskey cola"
- glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
- glass_center_of_mass = list("x"=16, "y"=9)
-
- 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 = 2
-
- glass_icon_state = "martiniglass"
- glass_name = "glass of classic martini"
- glass_desc = "Damn, the bartender even stirred it, not shook it."
- glass_center_of_mass = list("x"=17, "y"=8)
-
- 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 = 4
-
- glass_icon_state = "martiniglass"
- glass_name = "glass of vodka martini"
- glass_desc ="A bastardisation of the classic martini. Still great."
- glass_center_of_mass = list("x"=17, "y"=8)
-
- ethanol/white_russian
- name = "White Russian"
- id = "whiterussian"
- description = "That's just, like, your opinion, man..."
- color = "#A68340" // rgb: 166, 131, 64
- boozepwr = 3
-
- glass_icon_state = "whiterussianglass"
- glass_name = "glass of White Russian"
- glass_desc = "A very nice looking drink. But that's just, like, your opinion, man."
- glass_center_of_mass = list("x"=16, "y"=9)
-
- 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 = 3
-
- glass_icon_state = "screwdriverglass"
- glass_name = "glass of Screwdriver"
- glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
- glass_center_of_mass = list("x"=15, "y"=10)
-
- ethanol/booger
- name = "Booger"
- id = "booger"
- description = "Ewww..."
- color = "#8CFF8C" // rgb: 140, 255, 140
- boozepwr = 1.5
-
- glass_icon_state = "booger"
- glass_name = "glass of Booger"
- glass_desc = "Ewww..."
-
- 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 = 3
-
- glass_icon_state = "bloodymaryglass"
- glass_name = "glass of Bloody Mary"
- glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
-
- ethanol/brave_bull
- name = "Brave Bull"
- id = "bravebull"
- description = "It's just as effective as Dutch-Courage!"
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 3
-
- glass_icon_state = "bravebullglass"
- glass_name = "glass of Brave Bull"
- glass_desc = "Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up."
- glass_center_of_mass = list("x"=15, "y"=8)
-
- 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 = 2
-
- glass_icon_state = "tequillasunriseglass"
- glass_name = "glass of Tequilla Sunrise"
- glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
-
- ethanol/toxins_special
- name = "Toxins Special"
- id = "phoronspecial"
- description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!"
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 5
-
- glass_icon_state = "toxinsspecialglass"
- glass_name = "glass of Toxins Special"
- glass_desc = "Whoah, this thing is on FIRE"
-
- 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
-
- 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 = 4
-
- glass_icon_state = "beepskysmashglass"
- glass_name = "Beepsky Smash"
- glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
- glass_center_of_mass = list("x"=18, "y"=10)
-
- on_mob_life(var/mob/living/M as mob)
- M.Stun(2)
- ..()
- return
-
- 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 = 2
-
- glass_icon_state = "irishcreamglass"
- glass_name = "glass of Irish cream"
- glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
- glass_center_of_mass = list("x"=16, "y"=9)
-
- 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 = 2
-
- glass_icon_state = "manlydorfglass"
- glass_name = "glass of The Manly Dorf"
- glass_desc = "A manly concotion made from Ale and Beer. Intended for true men only."
-
- 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 = 4
-
- glass_icon_state = "longislandicedteaglass"
- glass_name = "glass of Long Island iced tea"
- glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
- glass_center_of_mass = list("x"=16, "y"=8)
-
- 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 = 4
-
- glass_icon_state = "glass_clear"
- glass_name = "glass of moonshine"
- glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
-
- ethanol/b52
- name = "B-52"
- id = "b52"
- description = "Coffee, Irish Cream, and cognac. You will get bombed."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 4
-
- glass_icon_state = "b52glass"
- glass_name = "glass of B-52"
- glass_desc = "Kahlua, Irish cream, and congac. You will get bombed."
-
- 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 = 3
-
- glass_icon_state = "irishcoffeeglass"
- glass_name = "glass of Irish coffee"
- glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
- glass_center_of_mass = list("x"=15, "y"=10)
-
- ethanol/margarita
- name = "Margarita"
- id = "margarita"
- description = "On the rocks with salt on the rim. Arriba~!"
- color = "#8CFF8C" // rgb: 140, 255, 140
- boozepwr = 3
-
- glass_icon_state = "margaritaglass"
- glass_name = "glass of margarita"
- glass_desc = "On the rocks with salt on the rim. Arriba~!"
- glass_center_of_mass = list("x"=16, "y"=8)
-
- 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 = 3
-
- glass_icon_state = "blackrussianglass"
- glass_name = "glass of Black Russian"
- glass_desc = "For the lactose-intolerant. Still as classy as a White Russian."
- glass_center_of_mass = list("x"=16, "y"=9)
-
- 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 = 3
-
- glass_icon_state = "manhattanglass"
- glass_name = "glass of Manhattan"
- glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..."
- glass_center_of_mass = list("x"=17, "y"=8)
-
- 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 = 5
-
- glass_icon_state = "proj_manhattanglass"
- glass_name = "glass of Manhattan Project"
- glass_desc = "A scienitst drink of choice, for thinking how to blow up the station."
- glass_center_of_mass = list("x"=17, "y"=8)
-
- on_mob_life(var/mob/living/M as mob)
- M.druggy = max(M.druggy, 30)
- ..()
- return
-
- ethanol/whiskeysoda
- name = "Whiskey Soda"
- id = "whiskeysoda"
- description = "For the more refined griffon."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 3
-
- glass_icon_state = "whiskeysodaglass2"
- glass_name = "glass of whiskey soda"
- glass_desc = "Ultimate refreshment."
- glass_center_of_mass = list("x"=16, "y"=9)
-
- ethanol/antifreeze
- name = "Anti-freeze"
- id = "antifreeze"
- description = "Ultimate refreshment."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 4
-
- glass_icon_state = "antifreeze"
- glass_name = "glass of Anti-freeze"
- glass_desc = "The ultimate refreshment."
- glass_center_of_mass = list("x"=16, "y"=8)
-
- 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
-
- ethanol/barefoot
- name = "Barefoot"
- id = "barefoot"
- description = "Barefoot and pregnant"
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 1.5
-
- glass_icon_state = "b&p"
- glass_name = "glass of Barefoot"
- glass_desc = "Barefoot and pregnant"
- glass_center_of_mass = list("x"=17, "y"=8)
-
- ethanol/snowwhite
- name = "Snow White"
- id = "snowwhite"
- description = "A cold refreshment"
- color = "#FFFFFF" // rgb: 255, 255, 255
- boozepwr = 1.5
-
- glass_icon_state = "snowwhite"
- glass_name = "glass of Snow White"
- glass_desc = "A cold refreshment."
- glass_center_of_mass = list("x"=16, "y"=8)
-
- ethanol/melonliquor
- name = "Melon Liquor"
- id = "melonliquor"
- description = "A relatively sweet and fruity 46 proof liquor."
- color = "#138808" // rgb: 19, 136, 8
- boozepwr = 1
-
- glass_icon_state = "emeraldglass"
- glass_name = "glass of melon liquor"
- glass_desc = "A relatively sweet and fruity 46 proof liquor."
- glass_center_of_mass = list("x"=16, "y"=5)
-
- ethanol/bluecuracao
- name = "Blue Curacao"
- id = "bluecuracao"
- description = "Exotically blue, fruity drink, distilled from oranges."
- color = "#0000CD" // rgb: 0, 0, 205
- boozepwr = 1.5
-
- glass_icon_state = "curacaoglass"
- glass_name = "glass of blue curacao"
- glass_desc = "Exotically blue, fruity drink, distilled from oranges."
- glass_center_of_mass = list("x"=16, "y"=5)
-
- ethanol/suidream
- name = "Sui Dream"
- id = "suidream"
- description = "Comprised of: White soda, blue curacao, melon liquor."
- color = "#00A86B" // rgb: 0, 168, 107
- boozepwr = 0.5
-
- glass_icon_state = "sdreamglass"
- glass_name = "glass of Sui Dream"
- glass_desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame."
- glass_center_of_mass = list("x"=16, "y"=5)
-
- ethanol/demonsblood
- name = "Demons Blood"
- id = "demonsblood"
- description = "AHHHH!!!!"
- color = "#820000" // rgb: 130, 0, 0
- boozepwr = 3
-
- glass_icon_state = "demonsblood"
- glass_name = "glass of Demons' Blood"
- glass_desc = "Just looking at this thing makes the hair at the back of your neck stand up."
- glass_center_of_mass = list("x"=16, "y"=2)
-
- 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 = 3
- dizzy_adj = 4
- slurr_adj = 3
-
- glass_icon_state = "vodkatonicglass"
- glass_name = "glass of vodka and tonic"
- glass_desc = "For when a gin and tonic isn't Russian enough."
- glass_center_of_mass = list("x"=16, "y"=7)
-
- ethanol/ginfizz
- name = "Gin Fizz"
- id = "ginfizz"
- description = "Refreshingly lemony, deliciously dry."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 1.5
- dizzy_adj = 4
- slurr_adj = 3
-
- glass_icon_state = "ginfizzglass"
- glass_name = "glass of gin fizz"
- glass_desc = "Refreshingly lemony, deliciously dry."
- glass_center_of_mass = list("x"=16, "y"=7)
-
- ethanol/bahama_mama
- name = "Bahama mama"
- id = "bahama_mama"
- description = "Tropical cocktail."
- color = "#FF7F3B" // rgb: 255, 127, 59
- boozepwr = 2
-
- glass_icon_state = "bahama_mama"
- glass_name = "glass of Bahama Mama"
- glass_desc = "Tropical cocktail"
- glass_center_of_mass = list("x"=16, "y"=5)
-
- ethanol/singulo
- name = "Singulo"
- id = "singulo"
- description = "A blue-space beverage!"
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 5
- dizzy_adj = 15
- slurr_adj = 15
-
- glass_icon_state = "singulo"
- glass_name = "glass of Singulo"
- glass_desc = "A blue-space beverage."
- glass_center_of_mass = list("x"=17, "y"=4)
-
- 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 = 3
-
- glass_icon_state = "sbitenglass"
- glass_name = "glass of Sbiten"
- glass_desc = "A spicy mix of Vodka and Spice. Very hot."
- glass_center_of_mass = list("x"=17, "y"=8)
-
- 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
-
- ethanol/devilskiss
- name = "Devils Kiss"
- id = "devilskiss"
- description = "Creepy time!"
- color = "#A68310" // rgb: 166, 131, 16
- boozepwr = 3
-
- glass_icon_state = "devilskiss"
- glass_name = "glass of Devil's Kiss"
- glass_desc = "Creepy time!"
- glass_center_of_mass = list("x"=16, "y"=8)
-
- ethanol/red_mead
- name = "Red Mead"
- id = "red_mead"
- description = "The true Viking's drink! Even though it has a strange red color."
- color = "#C73C00" // rgb: 199, 60, 0
- boozepwr = 1.5
-
- glass_icon_state = "red_meadglass"
- glass_name = "glass of red mead"
- glass_desc = "A true Viking's beverage, though its color is strange."
- glass_center_of_mass = list("x"=17, "y"=10)
-
- ethanol/mead
- name = "Mead"
- id = "mead"
- description = "A Viking's drink, though a cheap one."
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 1.5
- nutriment_factor = 1 * FOOD_METABOLISM
-
- glass_icon_state = "meadglass"
- glass_name = "glass of mead"
- glass_desc = "A Viking's beverage, though a cheap one."
- glass_center_of_mass = list("x"=17, "y"=10)
-
- 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 = 1
-
- glass_icon_state = "iced_beerglass"
- glass_name = "glass of iced beer"
- glass_desc = "A beer so frosty, the air around it freezes."
- glass_center_of_mass = list("x"=16, "y"=7)
-
- 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
-
- ethanol/grog
- name = "Grog"
- id = "grog"
- description = "Watered down rum, NanoTrasen approves!"
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 0.5
-
- glass_icon_state = "grogglass"
- glass_name = "glass of grog"
- glass_desc = "A fine and cepa drink for Space."
-
- ethanol/aloe
- name = "Aloe"
- id = "aloe"
- description = "So very, very, very good."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 3
-
- glass_icon_state = "aloe"
- glass_name = "glass of Aloe"
- glass_desc = "Very, very, very good."
- glass_center_of_mass = list("x"=17, "y"=8)
-
- ethanol/andalusia
- name = "Andalusia"
- id = "andalusia"
- description = "A nice, strangely named drink."
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 3
-
- glass_icon_state = "andalusia"
- glass_name = "glass of Andalusia"
- glass_desc = "A nice, strange named drink."
- glass_center_of_mass = list("x"=16, "y"=9)
-
- 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 = 2
-
- glass_icon_state = "alliescocktail"
- glass_name = "glass of Allies cocktail"
- glass_desc = "A drink made from your allies."
- glass_center_of_mass = list("x"=17, "y"=8)
-
- 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 = 1.5
-
- glass_icon_state = "acidspitglass"
- glass_name = "glass of Acid Spit"
- glass_desc = "A drink from Nanotrasen. Made from live aliens."
- glass_center_of_mass = list("x"=16, "y"=7)
-
- ethanol/amasec
- name = "Amasec"
- id = "amasec"
- description = "Official drink of the NanoTrasen Gun-Club!"
- reagent_state = LIQUID
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 2
-
- glass_icon_state = "amasecglass"
- glass_name = "glass of Amasec"
- glass_desc = "Always handy before COMBAT!!!"
- glass_center_of_mass = list("x"=16, "y"=9)
-
- 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 = 5
-
- glass_icon_state = "changelingsting"
- glass_name = "glass of Changeling Sting"
- glass_desc = "A stingy drink."
-
- ethanol/irishcarbomb
- name = "Irish Car Bomb"
- id = "irishcarbomb"
- description = "Mmm, tastes like chocolate cake..."
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 3
- dizzy_adj = 5
-
- glass_icon_state = "irishcarbomb"
- glass_name = "glass of Irish Car Bomb"
- glass_desc = "An irish car bomb."
- glass_center_of_mass = list("x"=16, "y"=8)
-
- ethanol/syndicatebomb
- name = "Syndicate Bomb"
- id = "syndicatebomb"
- description = "Tastes like terrorism!"
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 5
-
- glass_icon_state = "syndicatebomb"
- glass_name = "glass of Syndicate Bomb"
- glass_desc = "Tastes like terrorism!"
- glass_center_of_mass = list("x"=16, "y"=4)
-
- ethanol/erikasurprise
- name = "Erika Surprise"
- id = "erikasurprise"
- description = "The surprise is it's green!"
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 3
-
- glass_icon_state = "erikasurprise"
- glass_name = "glass of Erika Surprise"
- glass_desc = "The surprise is, it's green!"
- glass_center_of_mass = list("x"=16, "y"=9)
-
- ethanol/driestmartini
- name = "Driest Martini"
- id = "driestmartini"
- description = "Only for the experienced. You think you see sand floating in the glass."
- nutriment_factor = 1 * FOOD_METABOLISM
- color = "#2E6671" // rgb: 46, 102, 113
- boozepwr = 4
-
- glass_icon_state = "driestmartiniglass"
- glass_name = "glass of Driest Martini"
- glass_desc = "Only for the experienced. You think you see sand floating in the glass."
- glass_center_of_mass = list("x"=17, "y"=8)
-
- 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 = 4
-
- glass_icon_state = "bananahonkglass"
- glass_name = "glass of Banana Honk"
- glass_desc = "A drink from Banana Heaven."
- glass_center_of_mass = list("x"=16, "y"=8)
-
- ethanol/silencer
- name = "Silencer"
- id = "silencer"
- description = "A drink from Mime Heaven."
- nutriment_factor = 1 * FOOD_METABOLISM
- color = "#664300" // rgb: 102, 67, 0
- boozepwr = 4
-
- glass_icon_state = "silencerglass"
- glass_name = "glass of Silencer"
- glass_desc = "A drink from mime Heaven."
- glass_center_of_mass = list("x"=16, "y"=9)
-
- on_mob_life(var/mob/living/M as mob)
- if(!data) data = 1
- data++
- M.dizziness +=10
- if(data >= 55 && data <115)
- if (!M.stuttering) M.stuttering = 1
- M.stuttering += 10
- else if(data >= 115 && prob(33))
- M.confused = max(M.confused+15,15)
- ..()
- return
-
-// Undefine the alias for REAGENTS_EFFECT_MULTIPLER
-#undef REM
+/datum/reagent
+ var/name = "Reagent"
+ var/id = "reagent"
+ var/description = ""
+ var/datum/reagents/holder = null
+ var/reagent_state = SOLID
+ var/list/data = null
+ var/volume = 0
+ var/nutriment_factor = 0
+ var/custom_metabolism = REAGENTS_METABOLISM
+ var/overdose = 0
+ var/overdose_dam = 1
+ var/scannable = 0 //shows up on health analyzers
+ var/glass_icon_state = null
+ var/glass_name = null
+ var/glass_desc = null
+ var/glass_center_of_mass = null
+ //var/list/viruses = list()
+ var/color = "#000000" // rgb: 0, 0, 0, 0 - supports alpha channels
+ var/color_weight = 1
+
+/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(self.holder) //for catching rare runtimes
+ if(!istype(self.holder.my_atom, /obj/effect/effect/smoke/chem))
+ // 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, var/alien)
+ if(!istype(M, /mob/living))
+ return //Noticed runtime errors from pacid trying to damage ghosts, this should fix. --NEO
+ if( (overdose > 0) && (volume >= overdose))//Overdosing, wooo
+ M.adjustToxLoss(overdose_dam)
+ holder.remove_reagent(src.id, custom_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. <-- Blatant lies
+/datum/reagent/proc/on_merge(var/newdata, var/newamount)
+ return
+
+/datum/reagent/proc/on_update(var/atom/A)
+ return
+
+/datum/reagent/Destroy() // This should only be called by the holder, so it's already handled clearing its references
+ ..()
+ holder = null
+
+/datum/reagent/woodpulp
+ name = "Wood Pulp"
+ id = "woodpulp"
+ description = "A mass of wood fibers."
+ reagent_state = LIQUID
+ color = "#B97A57"
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
new file mode 100644
index 0000000000..36749ef408
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
@@ -0,0 +1,225 @@
+/datum/reagent/blood
+ data = new/list("donor"=null,"viruses"=null,"species"="Human","blood_DNA"=null,"blood_type"=null,"blood_colour"= "#A10808","resistances"=null,"trace_chem"=null, "antibodies" = list())
+ name = "Blood"
+ id = "blood"
+ reagent_state = LIQUID
+ color = "#C80000" // rgb: 200, 0, 0
+
+ glass_icon_state = "glass_red"
+ glass_name = "glass of tomato juice"
+ glass_desc = "Are you sure this is tomato juice?"
+
+/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"])
+ //var/datum/disease/virus = new D.type(0, D, 1)
+ // We don't spread.
+ if(D.spread_type == SPECIAL || D.spread_type == NON_CONTAGIOUS) continue
+
+ if(method == TOUCH)
+ M.contract_disease(D)
+ else //injected
+ M.contract_disease(D, 1, 0)
+ if(self.data && self.data["virus2"] && istype(M, /mob/living/carbon))//infecting...
+ var/list/vlist = self.data["virus2"]
+ if (vlist.len)
+ for (var/ID in vlist)
+ var/datum/disease2/disease/V = vlist[ID]
+
+ if(method == TOUCH)
+ infect_virus2(M,V.getcopy())
+ else
+ infect_virus2(M,V.getcopy(),1) //injected, force infection!
+ if(self.data && self.data["antibodies"] && istype(M, /mob/living/carbon))//... and curing
+ var/mob/living/carbon/C = M
+ C.antibodies |= self.data["antibodies"]
+
+/datum/reagent/blood/on_merge(var/newdata, var/newamount)
+ if(!data || !newdata)
+ return
+ if(newdata["blood_colour"])
+ color = newdata["blood_colour"]
+ if(data && newdata)
+ if(data["viruses"] || newdata["viruses"])
+
+ var/list/mix1 = data["viruses"]
+ var/list/mix2 = newdata["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 data["viruses"])
+ if(!istype(D, /datum/disease/advance))
+ preserve += D
+ data["viruses"] = preserve
+ return ..()
+
+/datum/reagent/blood/on_update(var/atom/A)
+ if(data["blood_colour"])
+ color = data["blood_colour"]
+ return ..()
+
+/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
+
+ if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human))
+ blood_splatter(T,self,1)
+ else if(istype(self.data["donor"], /mob/living/carbon/alien))
+ var/obj/effect/decal/cleanable/blood/B = blood_splatter(T,self,1)
+ if(B) B.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*"
+ if(volume >= 5 && !istype(T.loc, /area/chapel)) //blood desanctifies non-chapel tiles
+ T.holy = 0
+ return
+
+/* Must check the transfering of reagents and their data first. They all can point to one disease datum.
+
+/datum/reagent/blood/Destroy()
+ 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(self.data&&method == INGEST)
+ for(var/datum/disease/D in M.viruses)
+ if(istype(D, /datum/disease/advance))
+ var/datum/disease/advance/A = D
+ if(A.GetDiseaseID() == self.data)
+ D.cure()
+ else
+ if(D.type == self.data)
+ D.cure()
+
+ M.resistances += self.data
+ return
+
+#define WATER_LATENT_HEAT 19000 // How much heat is removed when applied to a hot turf, in J/unit (19000 makes 120 u of water roughly equivalent to 4L)
+/datum/reagent/water
+ name = "Water"
+ id = "water"
+ description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
+ reagent_state = LIQUID
+ color = "#0064C877" // rgb: 0, 100, 200
+ custom_metabolism = 0.01
+
+ glass_icon_state = "glass_clear"
+ glass_name = "glass of water"
+ glass_desc = "The father of all refreshments."
+
+/datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume)
+ if (!istype(T)) return
+
+ //If the turf is hot enough, remove some heat
+ var/datum/gas_mixture/environment = T.return_air()
+ var/min_temperature = T0C + 100 //100C, the boiling point of water
+
+ if (environment && environment.temperature > min_temperature) //abstracted as steam or something
+ var/removed_heat = between(0, volume*WATER_LATENT_HEAT, -environment.get_thermal_energy_change(min_temperature))
+ environment.add_thermal_energy(-removed_heat)
+ if (prob(5))
+ T.visible_message("\red The water sizzles as it lands on \the [T]!")
+
+ else //otherwise, the turf gets wet
+ if(volume >= 3)
+ if(T.wet >= 1) return
+ T.wet = 1
+ if(T.wet_overlay)
+ T.overlays -= T.wet_overlay
+ T.wet_overlay = null
+ T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
+ T.overlays += T.wet_overlay
+
+ src = null
+ spawn(800)
+ if (!istype(T)) return
+ if(T.wet >= 2) return
+ T.wet = 0
+ if(T.wet_overlay)
+ T.overlays -= T.wet_overlay
+ T.wet_overlay = null
+
+ //Put out fires.
+ var/hotspot = (locate(/obj/fire) in T)
+ if(hotspot)
+ qdel(hotspot)
+ if(environment)
+ environment.react() //react at the new temperature
+
+/datum/reagent/water/reaction_obj(var/obj/O, var/volume)
+ var/turf/T = get_turf(O)
+ var/hotspot = (locate(/obj/fire) in T)
+ if(hotspot && !istype(T, /turf/space))
+ 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)
+ 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()
+
+/datum/reagent/water/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+ if (istype(M, /mob/living/carbon/slime))
+ var/mob/living/carbon/slime/S = M
+ S.apply_water(volume)
+ if(method == TOUCH && isliving(M))
+ M.adjust_fire_stacks(-(volume / 10))
+ if(M.fire_stacks <= 0)
+ M.ExtinguishMob()
+ return
+
+/datum/reagent/fuel
+ name = "Welding fuel"
+ id = "fuel"
+ description = "Required for welders. Flamable."
+ reagent_state = LIQUID
+ color = "#660000" // rgb: 102, 0, 0
+ overdose = REAGENTS_OVERDOSE
+
+ glass_icon_state = "dr_gibb_glass"
+ glass_name = "glass of welder fuel"
+ glass_desc = "Unless you are an industrial tool, this is probably not safe for consumption."
+
+/datum/reagent/fuel/reaction_obj(var/obj/O, var/volume)
+ 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
+ new /obj/effect/decal/cleanable/liquid_fuel(the_turf, volume)
+/datum/reagent/fuel/reaction_turf(var/turf/T, var/volume)
+ new /obj/effect/decal/cleanable/liquid_fuel(T, volume)
+ 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/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
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
new file mode 100644
index 0000000000..c12ad11ebf
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
@@ -0,0 +1,405 @@
+/datum/reagent/aluminum
+ name = "Aluminum"
+ id = "aluminum"
+ 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/carbon
+ name = "Carbon"
+ id = "carbon"
+ description = "A chemical element, the builing block of life."
+ reagent_state = SOLID
+ color = "#1C1300" // rgb: 30, 20, 0
+
+ custom_metabolism = 0.01
+
+/datum/reagent/carbon/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(!istype(T, /turf/space))
+ var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt, T)
+ if (!dirtoverlay)
+ dirtoverlay = new/obj/effect/decal/cleanable/dirt(T)
+ dirtoverlay.alpha = volume*30
+ else
+ dirtoverlay.alpha = min(dirtoverlay.alpha+volume*30, 255)
+
+/datum/reagent/chlorine
+ name = "Chlorine"
+ id = "chlorine"
+ description = "A chemical element with a characteristic odour."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+ overdose = REAGENTS_OVERDOSE
+
+/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/copper
+ name = "Copper"
+ id = "copper"
+ description = "A highly ductile metal."
+ color = "#6E3B08" // rgb: 110, 59, 8
+
+ custom_metabolism = 0.01
+
+/datum/reagent/ethanol
+ name = "Ethanol" //Parent class for all alcoholic reagents.
+ id = "ethanol"
+ description = "A well-known alcohol with a variety of applications."
+ reagent_state = LIQUID
+ nutriment_factor = 0 //So alcohol can fill you up! If they want to.
+ color = "#404030" // rgb: 64, 64, 48
+ var/boozepwr = 5 //higher numbers mean the booze will have an effect faster.
+ var/dizzy_adj = 3
+ var/adj_drowsy = 0
+ var/adj_sleepy = 0
+ var/slurr_adj = 3
+ var/confused_adj = 2
+ var/slur_start = 90 //amount absorbed after which mob starts slurring
+ var/confused_start = 150 //amount absorbed after which mob starts confusing directions
+ var/blur_start = 300 //amount absorbed after which mob starts getting blurred vision
+ var/pass_out = 400 //amount absorbed after which mob starts passing out
+
+ glass_icon_state = "glass_clear"
+ glass_name = "glass of ethanol"
+ glass_desc = "A well-known alcohol with a variety of applications."
+
+/datum/reagent/ethanol/on_mob_life(var/mob/living/M as mob, var/alien)
+ M:nutrition += nutriment_factor
+ holder.remove_reagent(src.id, (alien ? FOOD_METABOLISM : ALCOHOL_METABOLISM)) // Catch-all for creatures without livers.
+
+ if (adj_drowsy) M.drowsyness = max(0,M.drowsyness + adj_drowsy)
+ if (adj_sleepy) M.sleeping = max(0,M.sleeping + adj_sleepy)
+
+ if(!src.data || (!isnum(src.data) && src.data.len)) data = 1 //if it doesn't exist we set it. if it's a list we're going to set it to 1 as well. This is to
+ src.data += boozepwr //avoid a runtime error associated with drinking blood mixed in drinks (demon's blood).
+
+ var/d = data
+
+ // make all the beverages work together
+ for(var/datum/reagent/ethanol/A in holder.reagent_list)
+ if(A != src && isnum(A.data)) d += A.data
+
+ if(alien && alien == IS_SKRELL) //Skrell get very drunk very quickly.
+ d*=5
+
+ M.dizziness += dizzy_adj.
+ if(d >= slur_start && d < pass_out)
+ if (!M:slurring) M:slurring = 1
+ M:slurring += slurr_adj
+ if(d >= confused_start && prob(33))
+ if (!M:confused) M:confused = 1
+ M.confused = max(M:confused+confused_adj,0)
+ if(d >= blur_start)
+ M.eye_blurry = max(M.eye_blurry, 10)
+ M:drowsyness = max(M:drowsyness, 0)
+ if(d >= pass_out)
+ M:paralysis = max(M:paralysis, 20)
+ M:drowsyness = max(M:drowsyness, 30)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ var/obj/item/organ/liver/L = H.internal_organs_by_name["liver"]
+ if (!L)
+ H.adjustToxLoss(5)
+ else if(istype(L))
+ L.take_damage(0.1, 1)
+ H.adjustToxLoss(0.1)
+ ..()
+ 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 dissolves the ink on the paper."
+ if(istype(O,/obj/item/weapon/book))
+ if(istype(O,/obj/item/weapon/book/tome))
+ usr << "The solution does nothing. Whatever this is, it isn't normal ink."
+ return
+ if(volume >= 5)
+ var/obj/item/weapon/book/affectedbook = O
+ affectedbook.dat = null
+ usr << "The solution dissolves 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/fluorine
+ name = "Fluorine"
+ id = "fluorine"
+ description = "A highly-reactive chemical element."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+ overdose = REAGENTS_OVERDOSE
+
+/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/hydrogen
+ name = "Hydrogen"
+ id = "hydrogen"
+ description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+ custom_metabolism = 0.01
+
+/datum/reagent/iron
+ name = "Iron"
+ id = "iron"
+ description = "Pure iron is a metal."
+ reagent_state = SOLID
+ color = "#353535"
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/lithium
+ name = "Lithium"
+ id = "lithium"
+ description = "A chemical element, used as antidepressant."
+ reagent_state = SOLID
+ color = "#808080" // rgb: 128, 128, 128
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/lithium/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(M.canmove && !M.restrained() && istype(M.loc, /turf/space))
+ step(M, pick(cardinal))
+ if(prob(5)) M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+
+/datum/reagent/mercury
+ name = "Mercury"
+ id = "mercury"
+ description = "A chemical element."
+ reagent_state = LIQUID
+ color = "#484848" // rgb: 72, 72, 72
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/mercury/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(M.canmove && !M.restrained() && istype(M.loc, /turf/space))
+ step(M, pick(cardinal))
+ if(prob(5)) M.emote(pick("twitch","drool","moan"))
+ M.adjustBrainLoss(2)
+ ..()
+ return
+
+/datum/reagent/nitrogen
+ name = "Nitrogen"
+ id = "nitrogen"
+ description = "A colorless, odorless, tasteless gas."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+ custom_metabolism = 0.01
+
+/datum/reagent/nitrogen/on_mob_life(var/mob/living/M as mob, var/alien)
+ if(M.stat == 2) return
+ if(alien && alien == IS_VOX)
+ M.adjustOxyLoss(-2*REM)
+ holder.remove_reagent(src.id, REAGENTS_METABOLISM) //By default it slowly disappears.
+ return
+ ..()
+
+/datum/reagent/oxygen
+ name = "Oxygen"
+ id = "oxygen"
+ description = "A colorless, odorless gas."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+ custom_metabolism = 0.01
+
+/datum/reagent/oxygen/on_mob_life(var/mob/living/M as mob, var/alien)
+ if(M.stat == 2) return
+ if(alien && alien == IS_VOX)
+ M.adjustToxLoss(REAGENTS_METABOLISM)
+ holder.remove_reagent(src.id, REAGENTS_METABOLISM) //By default it slowly disappears.
+ return
+ ..()
+
+/datum/reagent/phosphorus
+ name = "Phosphorus"
+ id = "phosphorus"
+ description = "A chemical element, the backbone of biological energy carriers."
+ reagent_state = SOLID
+ color = "#832828" // rgb: 131, 40, 40
+
+ custom_metabolism = 0.01
+
+/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
+
+ custom_metabolism = 0.01
+
+/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)
+ // radium may increase your chances to cure a disease
+ if(istype(M,/mob/living/carbon)) // make sure to only use it on carbon mobs
+ var/mob/living/carbon/C = M
+ if(C.virus2.len)
+ for (var/ID in C.virus2)
+ var/datum/disease2/disease/V = C.virus2[ID]
+ if(prob(5))
+ C.antibodies |= V.antigen
+ if(prob(50))
+ M.radiation += 50 // curing it that way may kill you instead
+ var/absorbed
+ var/obj/item/organ/diona/nutrients/rad_organ = locate() in C.internal_organs
+ if(rad_organ && !rad_organ.is_broken())
+ absorbed = 1
+ if(!absorbed)
+ M.adjustToxLoss(100)
+ ..()
+ return
+
+/datum/reagent/radium/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(volume >= 3)
+ if(!istype(T, /turf/space))
+ var/obj/effect/decal/cleanable/greenglow/glow = locate(/obj/effect/decal/cleanable/greenglow, T)
+ if(!glow)
+ new /obj/effect/decal/cleanable/greenglow(T)
+ return
+
+/datum/reagent/toxin/acid
+ name = "Sulphuric acid"
+ id = "sacid"
+ description = "A very corrosive mineral acid with the molecular formula H2SO4."
+ reagent_state = LIQUID
+ color = "#DB5008" // rgb: 219, 80, 8
+ toxpwr = 1
+ var/meltprob = 10
+
+/datum/reagent/toxin/acid/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.take_organ_damage(0, 1*REM)
+ ..()
+ return
+
+/datum/reagent/toxin/acid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//magic numbers everywhere
+ if(!istype(M, /mob/living))
+ return
+ if(method == TOUCH)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+
+ if(H.head)
+ if(prob(meltprob) && !H.head.unacidable)
+ H << "Your headgear melts away but protects you from the acid!"
+ qdel(H.head)
+ H.update_inv_head(0)
+ H.update_hair(0)
+ else
+ H << "Your headgear protects you from the acid."
+ return
+
+ if(H.wear_mask)
+ if(prob(meltprob) && !H.wear_mask.unacidable)
+ H << "Your mask melts away but protects you from the acid!"
+ qdel (H.wear_mask)
+ H.update_inv_wear_mask(0)
+ H.update_hair(0)
+ else
+ H << "Your mask protects you from the acid."
+ return
+
+ if(H.glasses) //Doesn't protect you from the acid but can melt anyways!
+ if(prob(meltprob) && !H.glasses.unacidable)
+ H << "Your glasses melts away!"
+ qdel (H.glasses)
+ H.update_inv_glasses(0)
+
+ if(!M.unacidable)
+ if(istype(M, /mob/living/carbon/human) && volume >= 10)
+ var/mob/living/carbon/human/H = M
+ var/obj/item/organ/external/affecting = H.get_organ("head")
+ if(affecting)
+ if(affecting.take_damage(4*toxpwr, 2*toxpwr))
+ H.UpdateDamageIcon()
+ if(prob(meltprob)) //Applies disfigurement
+ if (!(H.species && (H.species.flags & NO_PAIN)))
+ H.emote("scream")
+ H.status_flags |= DISFIGURED
+ else
+ M.take_organ_damage(min(6*toxpwr, volume * toxpwr)) // uses min() and volume to make sure they aren't being sprayed in trace amounts (1 unit != insta rape) -- Doohl
+ else
+ if(!M.unacidable)
+ M.take_organ_damage(min(6*toxpwr, volume * toxpwr))
+
+/datum/reagent/toxin/acid/reaction_obj(var/obj/O, var/volume)
+ if((istype(O,/obj/item) || istype(O,/obj/effect/plant)) && prob(meltprob * 3))
+ if(!O.unacidable)
+ var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
+ I.desc = "Looks like this was \an [O] some time ago."
+ for(var/mob/M in viewers(5, O))
+ M << "\red \the [O] melts."
+ qdel(O)
+
+/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/sodium
+ name = "Sodium"
+ id = "sodium"
+ description = "A chemical element, readily reacts with water."
+ reagent_state = SOLID
+ color = "#808080" // rgb: 128, 128, 128
+
+ custom_metabolism = 0.01
+
+/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
+
+ glass_icon_state = "iceglass"
+ glass_name = "glass of sugar"
+ glass_desc = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
+
+/datum/reagent/sugar/on_mob_life(var/mob/living/M as mob)
+ M.nutrition += 1*REM
+ ..()
+ return
+
+/datum/reagent/sulfur
+ name = "Sulfur"
+ id = "sulfur"
+ description = "A chemical element with a pungent smell."
+ reagent_state = SOLID
+ color = "#BF8C00" // rgb: 191, 140, 0
+
+ custom_metabolism = 0.01
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
new file mode 100644
index 0000000000..afb6585e1b
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -0,0 +1,2191 @@
+
+/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
+ ..()
+ return
+
+/datum/reagent/nutriment/protein // Bad for Skrell!
+ name = "animal protein"
+ id = "protein"
+ color = "#440000"
+
+/datum/reagent/nutriment/protein/on_mob_life(var/mob/living/M, var/alien)
+ if(alien && alien == IS_SKRELL)
+ M.adjustToxLoss(0.5)
+ M.nutrition -= nutriment_factor
+ ..()
+
+/datum/reagent/nutriment/egg // Also bad for skrell. Not a child of protein because it might mess up, not sure.
+ name = "egg yolk"
+ id = "egg"
+ color = "#FFFFAA"
+
+/datum/reagent/nutriment/egg/on_mob_life(var/mob/living/M, var/alien)
+ if(alien && alien == IS_SKRELL)
+ M.adjustToxLoss(0.5)
+ M.nutrition -= nutriment_factor
+ ..()
+
+/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/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/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/rice
+ name = "Rice"
+ id = "rice"
+ description = "Enjoy the great taste of nothing."
+ reagent_state = SOLID
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#FFFFFF" // rgb: 0, 0, 0
+
+/datum/reagent/rice/on_mob_life(var/mob/living/M as mob)
+ M.nutrition += nutriment_factor
+ ..()
+ return
+
+/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
+
+/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)
+ if(T.wet >= 1) return
+ T.wet = 1
+ if(T.wet_overlay)
+ T.overlays -= T.wet_overlay
+ T.wet_overlay = null
+ T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
+ T.overlays += T.wet_overlay
+
+ spawn(800)
+ if (!istype(T)) return
+ if(T.wet >= 2) return
+ T.wet = 0
+ if(T.wet_overlay)
+ T.overlays -= T.wet_overlay
+ T.wet_overlay = null
+ var/hotspot = (locate(/obj/fire) 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/virus_food
+ name = "Virus Food"
+ id = "virusfood"
+ description = "A mixture of water, milk, and oxygen. 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/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
+ */
+ ..()
+
+/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/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
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/lipozine/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.nutrition = max(M.nutrition - nutriment_factor, 0)
+ M.overeatduration = 0
+ if(M.nutrition < 0)//Prevent from going into negatives.
+ M.nutrition = 0
+ ..()
+ return
+
+/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
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/blackpepper
+ name = "Black Pepper"
+ id = "blackpepper"
+ description = "A powder ground from peppercorns. *AAAACHOOO*"
+ reagent_state = SOLID
+ // no color (ie, black)
+
+/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
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/frostoil
+ name = "Frost Oil"
+ id = "frostoil"
+ description = "A special oil that noticably chills the body. Extracted from Ice Peppers."
+ 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
+ M.bodytemperature = max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0)
+ if(prob(1))
+ M.emote("shiver")
+ if(istype(M, /mob/living/carbon/slime))
+ M.bodytemperature = max(M.bodytemperature - rand(10,20), 0)
+ holder.remove_reagent("capsaicin", 5)
+ holder.remove_reagent(src.id, FOOD_METABOLISM)
+ ..()
+ return
+
+/datum/reagent/frostoil/reaction_turf(var/turf/simulated/T, var/volume)
+ for(var/mob/living/carbon/slime/M in T)
+ M.adjustToxLoss(rand(15,30))
+
+/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
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H.species && !(H.species.flags & (NO_PAIN | IS_SYNTHETIC)) )
+ switch(data)
+ if(1 to 2)
+ H << "\red Your insides feel uncomfortably hot !"
+ if(2 to 20)
+ if(prob(5))
+ H << "\red Your insides feel uncomfortably hot !"
+ if(20 to INFINITY)
+ H.apply_effect(2,AGONY,0)
+ if(prob(5))
+ H.visible_message("[H] [pick("dry heaves!","coughs!","splutters!")]")
+ H << "\red You feel like your insides are burning !"
+ else if(istype(M, /mob/living/carbon/slime))
+ M.bodytemperature += rand(10,25)
+ holder.remove_reagent("frostoil", 5)
+ holder.remove_reagent(src.id, FOOD_METABOLISM)
+ 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))
+ return
+ if(method == TOUCH)
+ if(istype(M, /mob/living/carbon/human))
+ var/mob/living/carbon/human/victim = M
+ var/mouth_covered = 0
+ var/eyes_covered = 0
+ var/obj/item/safe_thing = null
+ 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
+ if( victim.head )
+ if ( victim.head.flags & MASKCOVERSEYES )
+ eyes_covered = 1
+ safe_thing = victim.head
+ if ( victim.head.flags & MASKCOVERSMOUTH )
+ mouth_covered = 1
+ safe_thing = victim.head
+ if(victim.glasses)
+ eyes_covered = 1
+ if ( !safe_thing )
+ safe_thing = victim.glasses
+ if ( eyes_covered && mouth_covered )
+ victim << "\red Your [safe_thing] protects you from the pepperspray!"
+ return
+ else if ( eyes_covered ) // Reduced effects if partially protected
+ victim << "\red Your [safe_thing] protect you from most of the pepperspray!"
+ victim.eye_blurry = max(M.eye_blurry, 15)
+ victim.eye_blind = max(M.eye_blind, 5)
+ victim.Stun(5)
+ victim.Weaken(5)
+ //victim.Paralyse(10)
+ //victim.drop_item()
+ return
+ else if ( mouth_covered ) // Mouth cover is better than eye cover
+ victim << "\red Your [safe_thing] protects your face from the pepperspray!"
+ if (!(victim.species && (victim.species.flags & NO_PAIN)))
+ victim.emote("scream")
+ victim.eye_blurry = max(M.eye_blurry, 5)
+ return
+ else // Oh dear :D
+ if (!(victim.species && (victim.species.flags & NO_PAIN)))
+ victim.emote("scream")
+ victim << "\red You're sprayed directly in the eyes with pepperspray!"
+ victim.eye_blurry = max(M.eye_blurry, 25)
+ victim.eye_blind = max(M.eye_blind, 10)
+ victim.Stun(5)
+ victim.Weaken(5)
+ //victim.Paralyse(10)
+ //victim.drop_item()
+
+/datum/reagent/condensedcapsaicin/on_mob_life(var/mob/living/M as mob)
+ if(!M)
+ M = holder.my_atom
+ if(!data)
+ data = 1
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H.species && !(H.species.flags & (NO_PAIN | IS_SYNTHETIC)) )
+ switch(data)
+ if(1)
+ H << "\red You feel like your insides are burning !"
+ if(2 to INFINITY)
+ H.apply_effect(4,AGONY,0)
+ if(prob(5))
+ H.visible_message("[H] [pick("dry heaves!","coughs!","splutters!")]")
+ H << "\red You feel like your insides are burning !"
+ else if(istype(M, /mob/living/carbon/slime))
+ M.bodytemperature += rand(15,30)
+ holder.remove_reagent("frostoil", 5)
+ holder.remove_reagent(src.id, FOOD_METABOLISM)
+ data++
+ ..()
+ return
+
+/datum/reagent/drink
+ name = "Drink"
+ id = "drink"
+ description = "Uh, some kind of drink."
+ reagent_state = LIQUID
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#E78108" // rgb: 231, 129, 8
+ var/adj_dizzy = 0
+ var/adj_drowsy = 0
+ var/adj_sleepy = 0
+ var/adj_temp = 0
+
+/datum/reagent/drink/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.nutrition += nutriment_factor
+ holder.remove_reagent(src.id, FOOD_METABOLISM)
+ // Drinks should be used up faster than other reagents.
+ holder.remove_reagent(src.id, FOOD_METABOLISM)
+ if (adj_dizzy) M.dizziness = max(0,M.dizziness + adj_dizzy)
+ if (adj_drowsy) M.drowsyness = max(0,M.drowsyness + adj_drowsy)
+ if (adj_sleepy) M.sleeping = max(0,M.sleeping + adj_sleepy)
+ if (adj_temp)
+ if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
+ M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT))
+
+ ..()
+ return
+
+/datum/reagent/drink/banana
+ name = "Banana Juice"
+ id = "banana"
+ description = "The raw essence of a banana."
+ color = "#C3AF00" // rgb: 195, 175, 0
+
+ glass_icon_state = "banana"
+ glass_name = "glass of banana juice"
+ glass_desc = "The raw essence of a banana. HONK!"
+
+/datum/reagent/drink/berryjuice
+ name = "Berry Juice"
+ id = "berryjuice"
+ description = "A delicious blend of several different kinds of berries."
+ color = "#990066" // rgb: 153, 0, 102
+
+ glass_icon_state = "berryjuice"
+ glass_name = "glass of berry juice"
+ glass_desc = "Berry juice. Or maybe it's jam. Who cares?"
+
+/datum/reagent/drink/carrotjuice
+ name = "Carrot juice"
+ id = "carrotjuice"
+ description = "It is just like a carrot but without crunching."
+ color = "#FF8C00" // rgb: 255, 140, 0
+
+ glass_icon_state = "carrotjuice"
+ glass_name = "glass of carrot juice"
+ glass_desc = "It is just like a carrot but without crunching."
+
+/datum/reagent/drink/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/drink/grapejuice
+ name = "Grape Juice"
+ id = "grapejuice"
+ description = "It's grrrrrape!"
+ color = "#863333" // rgb: 134, 51, 51
+
+ glass_icon_state = "grapejuice"
+ glass_name = "glass of grape juice"
+ glass_desc = "It's grrrrrape!"
+
+/datum/reagent/drink/lemonjuice
+ name = "Lemon Juice"
+ id = "lemonjuice"
+ description = "This juice is VERY sour."
+ color = "#AFAF00" // rgb: 175, 175, 0
+
+ glass_icon_state = "lemonjuice"
+ glass_name = "glass of lemon juice"
+ glass_desc = "Sour..."
+
+/datum/reagent/drink/limejuice
+ name = "Lime Juice"
+ id = "limejuice"
+ description = "The sweet-sour juice of limes."
+ color = "#365E30" // rgb: 54, 94, 48
+
+ glass_icon_state = "glass_green"
+ glass_name = "glass of lime juice"
+ glass_desc = "A glass of sweet-sour lime juice"
+
+/datum/reagent/drink/limejuice/on_mob_life(var/mob/living/M as mob)
+ ..()
+ if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1*REM)
+ return
+
+/datum/reagent/drink/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
+
+ glass_icon_state = "glass_orange"
+ glass_name = "glass of orange juice"
+ glass_desc = "Vitamins! Yay!"
+
+/datum/reagent/drink/orangejuice/on_mob_life(var/mob/living/M as mob)
+ ..()
+ if(M.getOxyLoss() && prob(30)) M.adjustOxyLoss(-1)
+ return
+
+/datum/reagent/drink/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
+
+ glass_icon_state = "poisonberryjuice"
+ glass_name = "glass of poison berry juice"
+ glass_desc = "A glass of deadly juice."
+
+/datum/reagent/drink/poisonberryjuice/on_mob_life(var/mob/living/M as mob)
+ ..()
+ M.adjustToxLoss(1)
+ return
+
+/datum/reagent/drink/potato_juice
+ name = "Potato Juice"
+ id = "potato"
+ description = "Juice of the potato. Bleh."
+ nutriment_factor = 2 * FOOD_METABOLISM
+ color = "#302000" // rgb: 48, 32, 0
+
+ glass_icon_state = "glass_brown"
+ glass_name = "glass of potato juice"
+ glass_desc = "Juice from a potato. Bleh."
+
+/datum/reagent/drink/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
+
+ glass_icon_state = "glass_red"
+ glass_name = "glass of tomato juice"
+ glass_desc = "Are you sure this is tomato juice?"
+
+/datum/reagent/drink/tomatojuice/on_mob_life(var/mob/living/M as mob)
+ ..()
+ if(M.getFireLoss() && prob(20)) M.heal_organ_damage(0,1)
+ return
+
+/datum/reagent/drink/watermelonjuice
+ name = "Watermelon Juice"
+ id = "watermelonjuice"
+ description = "Delicious juice made from watermelon."
+ color = "#B83333" // rgb: 184, 51, 51
+
+ glass_icon_state = "glass_red"
+ glass_name = "glass of watermelon juice"
+ glass_desc = "Delicious juice made from watermelon."
+
+/datum/reagent/drink/milk
+ name = "Milk"
+ id = "milk"
+ description = "An opaque white liquid produced by the mammary glands of mammals."
+ color = "#DFDFDF" // rgb: 223, 223, 223
+
+ glass_icon_state = "glass_white"
+ glass_name = "glass of milk"
+ glass_desc = "White and nutritious goodness!"
+
+/datum/reagent/drink/milk/on_mob_life(var/mob/living/M as mob)
+ if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
+ holder.remove_reagent("capsaicin", 10*REAGENTS_METABOLISM)
+ ..()
+ return
+
+/datum/reagent/drink/milk/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
+
+ glass_icon_state = "glass_white"
+ glass_name = "glass of cream"
+ glass_desc = "Ewwww..."
+
+/datum/reagent/drink/milk/soymilk
+ name = "Soy Milk"
+ id = "soymilk"
+ description = "An opaque white liquid made from soybeans."
+ color = "#DFDFC7" // rgb: 223, 223, 199
+
+ glass_icon_state = "glass_white"
+ glass_name = "glass of soy milk"
+ glass_desc = "White and nutritious soy goodness!"
+
+/datum/reagent/drink/tea
+ name = "Tea"
+ id = "tea"
+ description = "Tasty black tea, it has antioxidants, it's good for you!"
+ color = "#101000" // rgb: 16, 16, 0
+ adj_dizzy = -2
+ adj_drowsy = -1
+ adj_sleepy = -3
+ adj_temp = 20
+
+ glass_icon_state = "bigteacup"
+ glass_name = "cup of tea"
+ glass_desc = "Tasty black tea, it has antioxidants, it's good for you!"
+
+/datum/reagent/drink/tea/on_mob_life(var/mob/living/M as mob)
+ ..()
+ if(M.getToxLoss() && prob(20))
+ M.adjustToxLoss(-1)
+ return
+
+/datum/reagent/drink/tea/icetea
+ name = "Iced Tea"
+ id = "icetea"
+ description = "No relation to a certain rap artist/ actor."
+ color = "#104038" // rgb: 16, 64, 56
+ adj_temp = -5
+
+ glass_icon_state = "icedteaglass"
+ glass_name = "glass of iced tea"
+ glass_desc = "No relation to a certain rap artist/ actor."
+ glass_center_of_mass = list("x"=15, "y"=10)
+
+/datum/reagent/drink/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
+ adj_dizzy = -5
+ adj_drowsy = -3
+ adj_sleepy = -2
+ adj_temp = 25
+
+ glass_icon_state = "hot_coffee"
+ glass_name = "cup of coffee"
+ glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
+
+/datum/reagent/drink/coffee/on_mob_life(var/mob/living/M as mob)
+ ..()
+ M.make_jittery(5)
+ if(adj_temp > 0)
+ holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM)
+
+ holder.remove_reagent(src.id, 0.1)
+
+/datum/reagent/drink/coffee/icecoffee
+ name = "Iced Coffee"
+ id = "icecoffee"
+ description = "Coffee and ice, refreshing and cool."
+ color = "#102838" // rgb: 16, 40, 56
+ adj_temp = -5
+
+ glass_icon_state = "icedcoffeeglass"
+ glass_name = "glass of iced coffee"
+ glass_desc = "A drink to perk you up and refresh you!"
+
+/datum/reagent/drink/coffee/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
+ adj_sleepy = 0
+ adj_temp = 5
+
+ glass_icon_state = "soy_latte"
+ glass_name = "glass of soy latte"
+ glass_desc = "A nice and refrshing beverage while you are reading."
+ glass_center_of_mass = list("x"=15, "y"=9)
+
+/datum/reagent/drink/coffee/soy_latte/on_mob_life(var/mob/living/M as mob)
+ ..()
+ M.sleeping = 0
+ if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
+ return
+
+/datum/reagent/drink/coffee/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
+ adj_sleepy = 0
+ adj_temp = 5
+
+ glass_icon_state = "cafe_latte"
+ glass_name = "glass of cafe latte"
+ glass_desc = "A nice, strong and refreshing beverage while you are reading."
+ glass_center_of_mass = list("x"=15, "y"=9)
+
+/datum/reagent/drink/coffee/cafe_latte/on_mob_life(var/mob/living/M as mob)
+ ..()
+ M.sleeping = 0
+ if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
+ return
+
+/datum/reagent/hot_coco // there's also drink/hot_coco for whatever reason
+ name = "Hot Chocolate"
+ id = "hot_coco"
+ description = "Made with love! And cocoa beans."
+ reagent_state = LIQUID
+ nutriment_factor = 2 * REAGENTS_METABOLISM
+ color = "#403010" // rgb: 64, 48, 16
+
+ glass_icon_state = "chocolateglass"
+ glass_name = "glass of hot chocolate"
+ glass_desc = "Made with love! And cocoa beans."
+
+/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/drink/hot_coco
+ name = "Hot Chocolate"
+ id = "hot_coco"
+ description = "Made with love! And cocoa beans."
+ nutriment_factor = 2 * FOOD_METABOLISM
+ color = "#403010" // rgb: 64, 48, 16
+ adj_temp = 5
+
+ glass_icon_state = "chocolateglass"
+ glass_name = "glass of hot chocolate"
+ glass_desc = "Made with love! And cocoa beans."
+
+/datum/reagent/drink/cold/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
+ adj_dizzy = -5
+ adj_drowsy = -3
+
+ glass_icon_state = "glass_clear"
+ glass_name = "glass of soda water"
+ glass_desc = "Soda water. Why not make a scotch and soda?"
+
+/datum/reagent/drink/grapesoda
+ name = "Grape Soda"
+ id = "grapesoda"
+ description = "Grapes made into a fine drank."
+ color = "#421C52" // rgb: 98, 57, 53
+ adj_drowsy = -3
+
+ glass_icon_state = "gsodaglass"
+ glass_name = "glass of grape soda"
+ glass_desc = "Looks like a delicious drink!"
+
+/datum/reagent/drink/cold/tonic
+ name = "Tonic Water"
+ id = "tonic"
+ description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
+ color = "#664300" // rgb: 102, 67, 0
+ adj_dizzy = -5
+ adj_drowsy = -3
+ adj_sleepy = -2
+
+ glass_icon_state = "glass_clear"
+ glass_name = "glass of tonic water"
+ glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
+
+/datum/reagent/drink/cold/lemonade
+ name = "Lemonade"
+ description = "Oh the nostalgia..."
+ id = "lemonade"
+ color = "#FFFF00" // rgb: 255, 255, 0
+
+ glass_icon_state = "lemonadeglass"
+ glass_name = "glass of lemonade"
+ glass_desc = "Oh the nostalgia..."
+
+/datum/reagent/drink/cold/kiraspecial
+ name = "Kira Special"
+ description = "Long live the guy who everyone had mistaken for a girl. Baka!"
+ id = "kiraspecial"
+ color = "#CCCC99" // rgb: 204, 204, 153
+
+ glass_icon_state = "kiraspecial"
+ glass_name = "glass of Kira Special"
+ glass_desc = "Long live the guy who everyone had mistaken for a girl. Baka!"
+ glass_center_of_mass = list("x"=16, "y"=12)
+
+/datum/reagent/drink/cold/brownstar
+ name = "Brown Star"
+ description = "It's not what it sounds like..."
+ id = "brownstar"
+ color = "#9F3400" // rgb: 159, 052, 000
+ adj_temp = - 2
+
+ glass_icon_state = "brownstar"
+ glass_name = "glass of Brown Star"
+ glass_desc = "It's not what it sounds like..."
+
+/datum/reagent/drink/cold/milkshake
+ name = "Milkshake"
+ description = "Glorious brainfreezing mixture."
+ id = "milkshake"
+ color = "#AEE5E4" // rgb" 174, 229, 228
+ adj_temp = -9
+
+ glass_icon_state = "milkshake"
+ glass_name = "glass of milkshake"
+ glass_desc = "Glorious brainfreezing mixture."
+ glass_center_of_mass = list("x"=16, "y"=7)
+
+/datum/reagent/drink/cold/milkshake/on_mob_life(var/mob/living/M as mob)
+ if(!M)
+ M = holder.my_atom
+ if(prob(1))
+ M.emote("shiver")
+ M.bodytemperature = max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0)
+ if(istype(M, /mob/living/carbon/slime))
+ M.bodytemperature = max(M.bodytemperature - rand(10,20), 0)
+ holder.remove_reagent("capsaicin", 5)
+ holder.remove_reagent(src.id, FOOD_METABOLISM)
+ ..()
+ return
+
+/datum/reagent/drink/cold/rewriter
+ name = "Rewriter"
+ description = "The secret of the sanctuary of the Libarian..."
+ id = "rewriter"
+ color = "#485000" // rgb:72, 080, 0
+
+ glass_icon_state = "rewriter"
+ glass_name = "glass of Rewriter"
+ glass_desc = "The secret of the sanctuary of the Libarian..."
+ glass_center_of_mass = list("x"=16, "y"=9)
+
+/datum/reagent/drink/cold/rewriter/on_mob_life(var/mob/living/M as mob)
+ ..()
+ M.make_jittery(5)
+ return
+
+/datum/reagent/drink/cold/nuka_cola
+ name = "Nuka Cola"
+ id = "nuka_cola"
+ description = "Cola, cola never changes."
+ color = "#100800" // rgb: 16, 8, 0
+ adj_sleepy = -2
+
+ glass_icon_state = "nuka_colaglass"
+ glass_name = "glass of Nuka-Cola"
+ glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
+ glass_center_of_mass = list("x"=16, "y"=6)
+
+/datum/reagent/drink/cold/nuka_cola/on_mob_life(var/mob/living/M as mob)
+ M.make_jittery(20)
+ M.druggy = max(M.druggy, 30)
+ M.dizziness +=5
+ M.drowsyness = 0
+ ..()
+ return
+
+/datum/reagent/drink/grenadine
+ name = "Grenadine Syrup"
+ id = "grenadine"
+ description = "Made in the modern day with proper pomegranate substitute. Who uses real fruit, anyways?"
+ color = "#FF004F" // rgb: 255, 0, 79
+
+ glass_icon_state = "grenadineglass"
+ glass_name = "glass of grenadine syrup"
+ glass_desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
+ glass_center_of_mass = list("x"=17, "y"=6)
+
+/datum/reagent/drink/cold/space_cola
+ name = "Space Cola"
+ id = "cola"
+ description = "A refreshing beverage."
+ reagent_state = LIQUID
+ color = "#100800" // rgb: 16, 8, 0
+ adj_drowsy = -3
+
+ glass_icon_state = "glass_brown"
+ glass_name = "glass of Space Cola"
+ glass_desc = "A glass of refreshing Space Cola"
+
+/datum/reagent/drink/cold/spacemountainwind
+ name = "Mountain Wind"
+ id = "spacemountainwind"
+ description = "Blows right through you like a space wind."
+ color = "#102000" // rgb: 16, 32, 0
+ adj_drowsy = -7
+ adj_sleepy = -1
+
+ glass_icon_state = "Space_mountain_wind_glass"
+ glass_name = "glass of Space Mountain Wind"
+ glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
+
+/datum/reagent/drink/cold/dr_gibb
+ name = "Dr. Gibb"
+ id = "dr_gibb"
+ description = "A delicious blend of 42 different flavours"
+ color = "#102000" // rgb: 16, 32, 0
+ adj_drowsy = -6
+
+ glass_icon_state = "dr_gibb_glass"
+ glass_name = "glass of Dr. Gibb"
+ glass_desc = "Dr. Gibb. Not as dangerous as the name might imply."
+
+/datum/reagent/drink/cold/space_up
+ name = "Space-Up"
+ id = "space_up"
+ description = "Tastes like a hull breach in your mouth."
+ color = "#202800" // rgb: 32, 40, 0
+ adj_temp = -8
+
+ glass_icon_state = "space-up_glass"
+ glass_name = "glass of Space-up"
+ glass_desc = "Space-up. It helps keep your cool."
+
+/datum/reagent/drink/cold/lemon_lime
+ name = "Lemon Lime"
+ description = "A tangy substance made of 0.5% natural citrus!"
+ id = "lemon_lime"
+ color = "#878F00" // rgb: 135, 40, 0
+ adj_temp = -8
+
+ glass_icon_state = "lemonlime"
+ glass_name = "glass of lemon lime soda"
+ glass_desc = "A tangy substance made of 0.5% natural citrus!"
+
+/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
+ nutriment_factor = 1 * FOOD_METABOLISM
+
+ glass_icon_state = "doctorsdelightglass"
+ glass_name = "glass of The Doctor's Delight"
+ glass_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/datum/reagent/doctor_delight/on_mob_life(var/mob/living/M as mob)
+ M:nutrition += nutriment_factor
+ holder.remove_reagent(src.id, FOOD_METABOLISM)
+ if(!M) M = holder.my_atom
+ if(M:getOxyLoss() && prob(50)) M:adjustOxyLoss(-2)
+ if(M:getBruteLoss() && prob(60)) M:heal_organ_damage(2,0)
+ if(M:getFireLoss() && prob(50)) M:heal_organ_damage(0,2)
+ if(M:getToxLoss() && prob(50)) 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
+
+/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/drink/cold/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
+
+ glass_icon_state = "iceglass"
+ glass_name = "glass of ice"
+ glass_desc = "Generally, you're supposed to put something else in there too..."
+
+/datum/reagent/drink/nothing
+ name = "Nothing"
+ id = "nothing"
+ description = "Absolutely nothing."
+
+ glass_icon_state = "nothing"
+ glass_name = "glass of nothing"
+ glass_desc = "Absolutely nothing."
+
+/datum/reagent/drink/cold
+ name = "Cold drink"
+ adj_temp = -5
+
+/datum/reagent/ethanol/absinthe
+ name = "Absinthe"
+ id = "absinthe"
+ description = "Watch out that the Green Fairy doesn't come for you!"
+ color = "#33EE00" // rgb: 51, 238, 0
+ boozepwr = 4
+ dizzy_adj = 5
+ slur_start = 15
+ confused_start = 30
+
+ glass_icon_state = "absintheglass"
+ glass_name = "glass of absinthe"
+ glass_desc = "Wormwood, anise, oh my."
+ glass_center_of_mass = list("x"=16, "y"=5)
+
+/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 = 1
+
+ glass_icon_state = "aleglass"
+ glass_name = "glass of ale"
+ glass_desc = "A freezing pint of delicious ale"
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/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 = 1
+ nutriment_factor = 1 * FOOD_METABOLISM
+
+ glass_icon_state = "beerglass"
+ glass_name = "glass of beer"
+ glass_desc = "A freezing pint of beer"
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/datum/reagent/ethanol/beer/on_mob_life(var/mob/living/M as mob)
+ M:jitteriness = max(M:jitteriness-3,0)
+ ..()
+ return
+
+/datum/reagent/ethanol/bluecuracao
+ name = "Blue Curacao"
+ id = "bluecuracao"
+ description = "Exotically blue, fruity drink, distilled from oranges."
+ color = "#0000CD" // rgb: 0, 0, 205
+ boozepwr = 1.5
+
+ glass_icon_state = "curacaoglass"
+ glass_name = "glass of blue curacao"
+ glass_desc = "Exotically blue, fruity drink, distilled from oranges."
+ glass_center_of_mass = list("x"=16, "y"=5)
+
+/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 = 1.5
+ dizzy_adj = 4
+ confused_start = 115 //amount absorbed after which mob starts confusing directions
+
+ glass_icon_state = "cognacglass"
+ glass_name = "glass of cognac"
+ glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this."
+ glass_center_of_mass = list("x"=16, "y"=6)
+
+/datum/reagent/ethanol/deadrum
+ name = "Deadrum"
+ id = "rum" // duplicate ids?
+ description = "Popular with the sailors. Not very popular with everyone else."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 1
+
+ glass_icon_state = "rumglass"
+ glass_name = "glass of rum"
+ glass_desc = "Now you want to Pray for a pirate suit, don't you?"
+ glass_center_of_mass = list("x"=16, "y"=12)
+
+/datum/reagent/ethanol/deadrum/on_mob_life(var/mob/living/M as mob)
+ ..()
+ M.dizziness +=5
+ 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 = 1
+ dizzy_adj = 3
+
+ glass_icon_state = "ginvodkaglass"
+ glass_name = "glass of gin"
+ glass_desc = "A crystal clear glass of Griffeater gin."
+ glass_center_of_mass = list("x"=16, "y"=12)
+
+/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 = 1.5
+ dizzy_adj = -5
+ adj_drowsy = -3
+ adj_sleepy = -2
+
+ glass_icon_state = "kahluaglass"
+ glass_name = "glass of RR coffee liquor"
+ glass_desc = "DAMN, THIS THING LOOKS ROBUST"
+ glass_center_of_mass = list("x"=15, "y"=7)
+
+/datum/reagent/ethanol/kahlua/on_mob_life(var/mob/living/M as mob)
+ M.make_jittery(5)
+ ..()
+ return
+
+/datum/reagent/ethanol/melonliquor
+ name = "Melon Liquor"
+ id = "melonliquor"
+ description = "A relatively sweet and fruity 46 proof liquor."
+ color = "#138808" // rgb: 19, 136, 8
+ boozepwr = 1
+
+ glass_icon_state = "emeraldglass"
+ glass_name = "glass of melon liquor"
+ glass_desc = "A relatively sweet and fruity 46 proof liquor."
+ glass_center_of_mass = list("x"=16, "y"=5)
+
+/datum/reagent/ethanol/rum
+ name = "Rum"
+ id = "rum"
+ description = "Yohoho and all that."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 1.5
+
+ glass_icon_state = "rumglass"
+ glass_name = "glass of rum"
+ glass_desc = "Now you want to Pray for a pirate suit, don't you?"
+ glass_center_of_mass = list("x"=16, "y"=12)
+
+/datum/reagent/ethanol/sake
+ name = "Sake"
+ id = "sake"
+ description = "Anime's favorite drink."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 2
+
+ glass_icon_state = "ginvodkaglass"
+ glass_name = "glass of sake"
+ glass_desc = "A glass of sake."
+ glass_center_of_mass = list("x"=16, "y"=12)
+
+/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 = 2
+
+ glass_icon_state = "tequillaglass"
+ glass_name = "glass of Tequilla"
+ glass_desc = "Now all that's missing is the weird colored shades!"
+ glass_center_of_mass = list("x"=16, "y"=12)
+
+/datum/reagent/ethanol/thirteenloko
+ name = "Thirteen Loko"
+ id = "thirteenloko"
+ description = "A potent mixture of caffeine and alcohol."
+ color = "#102000" // rgb: 16, 32, 0
+ boozepwr = 2
+ nutriment_factor = 1 * FOOD_METABOLISM
+
+ glass_icon_state = "thirteen_loko_glass"
+ glass_name = "glass of Thirteen Loko"
+ glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
+
+/datum/reagent/ethanol/thirteenloko/on_mob_life(var/mob/living/M as mob)
+ M:drowsyness = max(0,M:drowsyness-7)
+ if (M.bodytemperature > 310)
+ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ M.make_jittery(5)
+ ..()
+ return
+
+/datum/reagent/ethanol/vermouth
+ name = "Vermouth"
+ id = "vermouth"
+ description = "You suddenly feel a craving for a martini..."
+ color = "#91FF91" // rgb: 145, 255, 145
+ boozepwr = 1.5
+
+ glass_icon_state = "vermouthglass"
+ glass_name = "glass of vermouth"
+ glass_desc = "You wonder why you're even drinking this straight."
+ glass_center_of_mass = list("x"=16, "y"=12)
+
+/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 = 2
+
+ glass_icon_state = "ginvodkaglass"
+ glass_name = "glass of vodka"
+ glass_desc = "The glass contain wodka. Xynta."
+ glass_center_of_mass = list("x"=16, "y"=12)
+
+/datum/reagent/ethanol/vodka/on_mob_life(var/mob/living/M as mob)
+ M.radiation = max(M.radiation-1,0)
+ ..()
+ 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 = 2
+ dizzy_adj = 4
+
+ glass_icon_state = "whiskeyglass"
+ glass_name = "glass of whiskey"
+ glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
+ glass_center_of_mass = list("x"=16, "y"=12)
+
+/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 = 1.5
+ dizzy_adj = 2
+ slur_start = 65 //amount absorbed after which mob starts slurring
+ confused_start = 145 //amount absorbed after which mob starts confusing directions
+
+ glass_icon_state = "wineglass"
+ glass_name = "glass of wine"
+ glass_desc = "A very classy looking drink."
+ glass_center_of_mass = list("x"=15, "y"=7)
+
+/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 = 1.5
+
+ glass_icon_state = "acidspitglass"
+ glass_name = "glass of Acid Spit"
+ glass_desc = "A drink from Nanotrasen. Made from live aliens."
+ glass_center_of_mass = list("x"=16, "y"=7)
+
+/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 = 2
+
+ glass_icon_state = "alliescocktail"
+ glass_name = "glass of Allies cocktail"
+ glass_desc = "A drink made from your allies."
+ glass_center_of_mass = list("x"=17, "y"=8)
+
+/datum/reagent/ethanol/aloe
+ name = "Aloe"
+ id = "aloe"
+ description = "So very, very, very good."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 3
+
+ glass_icon_state = "aloe"
+ glass_name = "glass of Aloe"
+ glass_desc = "Very, very, very good."
+ glass_center_of_mass = list("x"=17, "y"=8)
+
+/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 = 2
+
+/datum/reagent/ethanol/andalusia
+ name = "Andalusia"
+ id = "andalusia"
+ description = "A nice, strangely named drink."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 3
+
+ glass_icon_state = "andalusia"
+ glass_name = "glass of Andalusia"
+ glass_desc = "A nice, strange named drink."
+ glass_center_of_mass = list("x"=16, "y"=9)
+
+ glass_icon_state = "amasecglass"
+ glass_name = "glass of Amasec"
+ glass_desc = "Always handy before COMBAT!!!"
+ glass_center_of_mass = list("x"=16, "y"=9)
+
+/datum/reagent/ethanol/antifreeze
+ name = "Anti-freeze"
+ id = "antifreeze"
+ description = "Ultimate refreshment."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 4
+
+ glass_icon_state = "antifreeze"
+ glass_name = "glass of Anti-freeze"
+ glass_desc = "The ultimate refreshment."
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/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/atomicbomb
+ name = "Atomic Bomb"
+ id = "atomicbomb"
+ description = "Nuclear proliferation never tasted so good."
+ reagent_state = LIQUID
+ color = "#666300" // rgb: 102, 99, 0
+
+ glass_icon_state = "atomicbombglass"
+ glass_name = "glass of Atomic Bomb"
+ glass_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
+ glass_center_of_mass = list("x"=15, "y"=7)
+
+/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.make_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/ethanol/b52
+ name = "B-52"
+ id = "b52"
+ description = "Coffee, Irish Cream, and cognac. You will get bombed."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 4
+
+ glass_icon_state = "b52glass"
+ glass_name = "glass of B-52"
+ glass_desc = "Kahlua, Irish cream, and congac. You will get bombed."
+
+/datum/reagent/ethanol/bahama_mama
+ name = "Bahama mama"
+ id = "bahama_mama"
+ description = "Tropical cocktail."
+ color = "#FF7F3B" // rgb: 255, 127, 59
+ boozepwr = 2
+
+ glass_icon_state = "bahama_mama"
+ glass_name = "glass of Bahama Mama"
+ glass_desc = "Tropical cocktail"
+ glass_center_of_mass = list("x"=16, "y"=5)
+
+/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 = 4
+
+ glass_icon_state = "bananahonkglass"
+ glass_name = "glass of Banana Honk"
+ glass_desc = "A drink from Banana Heaven."
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/datum/reagent/ethanol/barefoot
+ name = "Barefoot"
+ id = "barefoot"
+ description = "Barefoot and pregnant"
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 1.5
+
+ glass_icon_state = "b&p"
+ glass_name = "glass of Barefoot"
+ glass_desc = "Barefoot and pregnant"
+ glass_center_of_mass = list("x"=17, "y"=8)
+
+/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 = 4
+
+ glass_icon_state = "beepskysmashglass"
+ glass_name = "Beepsky Smash"
+ glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
+ glass_center_of_mass = list("x"=18, "y"=10)
+
+/datum/reagent/ethanol/beepsky_smash/on_mob_life(var/mob/living/M as mob)
+ M.Stun(2)
+ ..()
+ 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 = 1
+ nutriment_factor = 2 * FOOD_METABOLISM
+
+ glass_icon_state = "glass_brown"
+ glass_name = "glass of bilk"
+ glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
+
+/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 = 3
+
+ glass_icon_state = "blackrussianglass"
+ glass_name = "glass of Black Russian"
+ glass_desc = "For the lactose-intolerant. Still as classy as a White Russian."
+ glass_center_of_mass = list("x"=16, "y"=9)
+
+/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 = 3
+
+ glass_icon_state = "bloodymaryglass"
+ glass_name = "glass of Bloody Mary"
+ glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
+
+/datum/reagent/ethanol/booger
+ name = "Booger"
+ id = "booger"
+ description = "Ewww..."
+ color = "#8CFF8C" // rgb: 140, 255, 140
+ boozepwr = 1.5
+
+ glass_icon_state = "booger"
+ glass_name = "glass of Booger"
+ glass_desc = "Ewww..."
+
+/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 = 3
+
+ glass_icon_state = "bravebullglass"
+ glass_name = "glass of Brave Bull"
+ glass_desc = "Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up."
+ glass_center_of_mass = list("x"=15, "y"=8)
+
+/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 = 5
+
+ glass_icon_state = "changelingsting"
+ glass_name = "glass of Changeling Sting"
+ glass_desc = "A stingy drink."
+
+/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 = 2
+
+ glass_icon_state = "martiniglass"
+ glass_name = "glass of classic martini"
+ glass_desc = "Damn, the bartender even stirred it, not shook it."
+ glass_center_of_mass = list("x"=17, "y"=8)
+
+/datum/reagent/ethanol/cuba_libre
+ name = "Cuba Libre"
+ id = "cubalibre"
+ description = "Rum, mixed with cola. Viva la revolucion."
+ color = "#3E1B00" // rgb: 62, 27, 0
+ boozepwr = 1.5
+
+ glass_icon_state = "cubalibreglass"
+ glass_name = "glass of Cuba Libre"
+ glass_desc = "A classic mix of rum and cola."
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/datum/reagent/ethanol/demonsblood
+ name = "Demons Blood"
+ id = "demonsblood"
+ description = "AHHHH!!!!"
+ color = "#820000" // rgb: 130, 0, 0
+ boozepwr = 3
+
+ glass_icon_state = "demonsblood"
+ glass_name = "glass of Demons' Blood"
+ glass_desc = "Just looking at this thing makes the hair at the back of your neck stand up."
+ glass_center_of_mass = list("x"=16, "y"=2)
+
+/datum/reagent/ethanol/devilskiss
+ name = "Devils Kiss"
+ id = "devilskiss"
+ description = "Creepy time!"
+ color = "#A68310" // rgb: 166, 131, 16
+ boozepwr = 3
+
+ glass_icon_state = "devilskiss"
+ glass_name = "glass of Devil's Kiss"
+ glass_desc = "Creepy time!"
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/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 * FOOD_METABOLISM
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 4
+
+ glass_icon_state = "driestmartiniglass"
+ glass_name = "glass of Driest Martini"
+ glass_desc = "Only for the experienced. You think you see sand floating in the glass."
+ glass_center_of_mass = list("x"=17, "y"=8)
+
+/datum/reagent/ethanol/ginfizz
+ name = "Gin Fizz"
+ id = "ginfizz"
+ description = "Refreshingly lemony, deliciously dry."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 1.5
+ dizzy_adj = 4
+ slurr_adj = 3
+
+ glass_icon_state = "ginfizzglass"
+ glass_name = "glass of gin fizz"
+ glass_desc = "Refreshingly lemony, deliciously dry."
+ glass_center_of_mass = list("x"=16, "y"=7)
+
+/datum/reagent/ethanol/grog
+ name = "Grog"
+ id = "grog"
+ description = "Watered down rum, NanoTrasen approves!"
+ reagent_state = LIQUID
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 0.5
+
+ glass_icon_state = "grogglass"
+ glass_name = "glass of grog"
+ glass_desc = "A fine and cepa drink for Space."
+
+/datum/reagent/ethanol/erikasurprise
+ name = "Erika Surprise"
+ id = "erikasurprise"
+ description = "The surprise is it's green!"
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 3
+
+ glass_icon_state = "erikasurprise"
+ glass_name = "glass of Erika Surprise"
+ glass_desc = "The surprise is, it's green!"
+ glass_center_of_mass = list("x"=16, "y"=9)
+
+/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
+
+ glass_icon_state = "gargleblasterglass"
+ glass_name = "glass of Pan-Galactic Gargle Blaster"
+ glass_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
+ glass_center_of_mass = list("x"=17, "y"=6)
+
+/datum/reagent/gargle_blaster/on_mob_life(var/mob/living/M as mob)
+ if(!data) data = 1
+ data++
+ M.dizziness +=6
+ switch(data)
+ if(15 to 45)
+ M.stuttering = max(M.stuttering+3,0)
+ if(45 to 55)
+ if (prob(50))
+ M.confused = max(M.confused+3,0)
+ if(55 to 200)
+ M.druggy = max(M.druggy, 55)
+ if(200 to INFINITY)
+ M.adjustToxLoss(2)
+ ..()
+
+/datum/reagent/ethanol/gintonic
+ name = "Gin and Tonic"
+ id = "gintonic"
+ description = "An all time classic, mild cocktail."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 1
+
+ glass_icon_state = "gintonicglass"
+ glass_name = "glass of gin and tonic"
+ glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman."
+ glass_center_of_mass = list("x"=16, "y"=7)
+
+/datum/reagent/ethanol/goldschlager
+ name = "Goldschlager"
+ id = "goldschlager"
+ description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 3
+
+ glass_icon_state = "ginvodkaglass"
+ glass_name = "glass of Goldschlager"
+ glass_desc = "100 proof that teen girls will drink anything with gold in it."
+ glass_center_of_mass = list("x"=16, "y"=12)
+
+/datum/reagent/hippies_delight
+ name = "Hippies' Delight"
+ id = "hippiesdelight"
+ description = "You just don't get it maaaan."
+ reagent_state = LIQUID
+ color = "#664300" // rgb: 102, 67, 0
+
+ glass_icon_state = "hippiesdelightglass"
+ glass_name = "glass of Hippie's Delight"
+ glass_desc = "A drink enjoyed by people during the 1960's."
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/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.make_dizzy(10)
+ if(prob(10)) M.emote(pick("twitch","giggle"))
+ if(5 to 10)
+ if (!M.stuttering) M.stuttering = 1
+ M.make_jittery(20)
+ M.make_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.make_jittery(40)
+ M.make_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.make_jittery(60)
+ M.make_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
+
+/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 = 2
+ dizzy_adj = 6
+ slurr_adj = 5
+ slur_start = 35 //amount absorbed after which mob starts slurring
+ confused_start = 90 //amount absorbed after which mob starts confusing directions
+
+ glass_icon_state = "glass_brown2"
+ glass_name = "glass of Hooch"
+ glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+
+/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 = 1
+
+ glass_icon_state = "iced_beerglass"
+ glass_name = "glass of iced beer"
+ glass_desc = "A beer so frosty, the air around it freezes."
+ glass_center_of_mass = list("x"=16, "y"=7)
+
+/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/irishcarbomb
+ name = "Irish Car Bomb"
+ id = "irishcarbomb"
+ description = "Mmm, tastes like chocolate cake..."
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 3
+ dizzy_adj = 5
+
+ glass_icon_state = "irishcarbomb"
+ glass_name = "glass of Irish Car Bomb"
+ glass_desc = "An irish car bomb."
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/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 = 2
+
+ glass_icon_state = "irishcreamglass"
+ glass_name = "glass of Irish cream"
+ glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
+ glass_center_of_mass = list("x"=16, "y"=9)
+
+/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 = 4
+
+ glass_icon_state = "longislandicedteaglass"
+ glass_name = "glass of Long Island iced tea"
+ glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/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 = 3
+
+ glass_icon_state = "manhattanglass"
+ glass_name = "glass of Manhattan"
+ glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..."
+ glass_center_of_mass = list("x"=17, "y"=8)
+
+/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 = 5
+
+ glass_icon_state = "proj_manhattanglass"
+ glass_name = "glass of Manhattan Project"
+ glass_desc = "A scienitst drink of choice, for thinking how to blow up the station."
+ glass_center_of_mass = list("x"=17, "y"=8)
+
+/datum/reagent/ethanol/manhattan_proj/on_mob_life(var/mob/living/M as mob)
+ M.druggy = max(M.druggy, 30)
+ ..()
+ return
+
+/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 = 2
+
+ glass_icon_state = "manlydorfglass"
+ glass_name = "glass of The Manly Dorf"
+ glass_desc = "A manly concotion made from Ale and Beer. Intended for true men only."
+
+/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 = 3
+
+ glass_icon_state = "margaritaglass"
+ glass_name = "glass of margarita"
+ glass_desc = "On the rocks with salt on the rim. Arriba~!"
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/datum/reagent/ethanol/mead
+ name = "Mead"
+ id = "mead"
+ description = "A Viking's drink, though a cheap one."
+ reagent_state = LIQUID
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 1.5
+ nutriment_factor = 1 * FOOD_METABOLISM
+
+ glass_icon_state = "meadglass"
+ glass_name = "glass of mead"
+ glass_desc = "A Viking's beverage, though a cheap one."
+ glass_center_of_mass = list("x"=17, "y"=10)
+
+/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 = 4
+
+ glass_icon_state = "glass_clear"
+ glass_name = "glass of moonshine"
+ glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+
+/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
+
+ glass_icon_state = "neurotoxinglass"
+ glass_name = "glass of Neurotoxin"
+ glass_desc = "A drink that is guaranteed to knock you silly."
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/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
+ switch(data)
+ if(15 to 45)
+ M.stuttering = max(M.stuttering+3,0)
+ if(45 to 55)
+ if (prob(50))
+ M.confused = max(M.confused+3,0)
+ if(55 to 200)
+ M.druggy = max(M.druggy, 55)
+ if(200 to INFINITY)
+ M.adjustToxLoss(2)
+ ..()
+
+/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 = 1.5
+
+ glass_icon_state = "patronglass"
+ glass_name = "glass of Patron"
+ glass_desc = "Drinking patron in the bar, with all the subpar ladies."
+ glass_center_of_mass = list("x"=7, "y"=8)
+
+/datum/reagent/ethanol/pwine
+ name = "Poison Wine"
+ id = "pwine"
+ description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!"
+ color = "#000000" // rgb: 0, 0, 0 SHOCKER
+ boozepwr = 1
+ dizzy_adj = 1
+ slur_start = 1
+ confused_start = 1
+
+ glass_icon_state = "pwineglass"
+ glass_name = "glass of ???"
+ glass_desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?"
+ glass_center_of_mass = list("x"=16, "y"=5)
+
+/datum/reagent/ethanol/pwine/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 25)
+ if (!M.stuttering) M.stuttering = 1
+ M.make_dizzy(1)
+ M.hallucination = max(M.hallucination, 3)
+ if(prob(1)) M.emote(pick("twitch","giggle"))
+ if(25 to 75)
+ if (!M.stuttering) M.stuttering = 1
+ M.hallucination = max(M.hallucination, 10)
+ M.make_jittery(2)
+ M.make_dizzy(2)
+ M.druggy = max(M.druggy, 45)
+ if(prob(5)) M.emote(pick("twitch","giggle"))
+ if (75 to 150)
+ if (!M.stuttering) M.stuttering = 1
+ M.hallucination = max(M.hallucination, 60)
+ M.make_jittery(4)
+ M.make_dizzy(4)
+ M.druggy = max(M.druggy, 60)
+ if(prob(10)) M.emote(pick("twitch","giggle"))
+ if(prob(30)) M.adjustToxLoss(2)
+ if (150 to 300)
+ if (!M.stuttering) M.stuttering = 1
+ M.hallucination = max(M.hallucination, 60)
+ M.make_jittery(4)
+ M.make_dizzy(4)
+ M.druggy = max(M.druggy, 60)
+ if(prob(10)) M.emote(pick("twitch","giggle"))
+ if(prob(30)) M.adjustToxLoss(2)
+ if(prob(5)) if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ var/obj/item/organ/heart/L = H.internal_organs_by_name["heart"]
+ if (L && istype(L))
+ L.take_damage(5, 0)
+ if (300 to INFINITY)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ var/obj/item/organ/heart/L = H.internal_organs_by_name["heart"]
+ if (L && istype(L))
+ L.take_damage(100, 0)
+ holder.remove_reagent(src.id, FOOD_METABOLISM)
+
+/datum/reagent/ethanol/red_mead
+ name = "Red Mead"
+ id = "red_mead"
+ description = "The true Viking's drink! Even though it has a strange red color."
+ color = "#C73C00" // rgb: 199, 60, 0
+ boozepwr = 1.5
+
+ glass_icon_state = "red_meadglass"
+ glass_name = "glass of red mead"
+ glass_desc = "A true Viking's beverage, though its color is strange."
+ glass_center_of_mass = list("x"=17, "y"=10)
+
+/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 = 3
+
+ glass_icon_state = "sbitenglass"
+ glass_name = "glass of Sbiten"
+ glass_desc = "A spicy mix of Vodka and Spice. Very hot."
+ glass_center_of_mass = list("x"=17, "y"=8)
+
+/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/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 = 3
+
+ glass_icon_state = "screwdriverglass"
+ glass_name = "glass of Screwdriver"
+ glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
+ glass_center_of_mass = list("x"=15, "y"=10)
+
+/datum/reagent/ethanol/silencer
+ name = "Silencer"
+ id = "silencer"
+ description = "A drink from Mime Heaven."
+ nutriment_factor = 1 * FOOD_METABOLISM
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 4
+
+ glass_icon_state = "silencerglass"
+ glass_name = "glass of Silencer"
+ glass_desc = "A drink from mime Heaven."
+ glass_center_of_mass = list("x"=16, "y"=9)
+
+/datum/reagent/ethanol/silencer/on_mob_life(var/mob/living/M as mob)
+ if(!data) data = 1
+ data++
+ M.dizziness +=10
+ if(data >= 55 && data <115)
+ if (!M.stuttering) M.stuttering = 1
+ M.stuttering += 10
+ else if(data >= 115 && prob(33))
+ M.confused = max(M.confused+15,15)
+ ..()
+ return
+
+/datum/reagent/ethanol/singulo
+ name = "Singulo"
+ id = "singulo"
+ description = "A blue-space beverage!"
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 5
+ dizzy_adj = 15
+ slurr_adj = 15
+
+ glass_icon_state = "singulo"
+ glass_name = "glass of Singulo"
+ glass_desc = "A blue-space beverage."
+ glass_center_of_mass = list("x"=17, "y"=4)
+
+/datum/reagent/ethanol/snowwhite
+ name = "Snow White"
+ id = "snowwhite"
+ description = "A cold refreshment"
+ color = "#FFFFFF" // rgb: 255, 255, 255
+ boozepwr = 1.5
+
+ glass_icon_state = "snowwhite"
+ glass_name = "glass of Snow White"
+ glass_desc = "A cold refreshment."
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/datum/reagent/ethanol/suidream
+ name = "Sui Dream"
+ id = "suidream"
+ description = "Comprised of: White soda, blue curacao, melon liquor."
+ color = "#00A86B" // rgb: 0, 168, 107
+ boozepwr = 0.5
+
+ glass_icon_state = "sdreamglass"
+ glass_name = "glass of Sui Dream"
+ glass_desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame."
+ glass_center_of_mass = list("x"=16, "y"=5)
+
+/datum/reagent/ethanol/syndicatebomb
+ name = "Syndicate Bomb"
+ id = "syndicatebomb"
+ description = "Tastes like terrorism!"
+ color = "#2E6671" // rgb: 46, 102, 113
+ boozepwr = 5
+
+ glass_icon_state = "syndicatebomb"
+ glass_name = "glass of Syndicate Bomb"
+ glass_desc = "Tastes like terrorism!"
+ glass_center_of_mass = list("x"=16, "y"=4)
+
+/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 = 2
+
+ glass_icon_state = "tequillasunriseglass"
+ glass_name = "glass of Tequilla Sunrise"
+ glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
+
+/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 = 5
+
+ glass_icon_state = "threemileislandglass"
+ glass_name = "glass of Three Mile Island iced tea"
+ glass_desc = "A glass of this is sure to prevent a meltdown."
+ glass_center_of_mass = list("x"=16, "y"=2)
+
+/datum/reagent/ethanol/threemileisland/on_mob_life(var/mob/living/M as mob)
+ M.druggy = max(M.druggy, 50)
+ ..()
+ return
+
+/datum/reagent/ethanol/toxins_special
+ name = "Toxins Special"
+ id = "phoronspecial"
+ description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!"
+ reagent_state = LIQUID
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 5
+
+ glass_icon_state = "toxinsspecialglass"
+ glass_name = "glass of Toxins Special"
+ glass_desc = "Whoah, this thing is on FIRE"
+
+/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/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 = 4
+
+ glass_icon_state = "martiniglass"
+ glass_name = "glass of vodka martini"
+ glass_desc ="A bastardisation of the classic martini. Still great."
+ glass_center_of_mass = list("x"=17, "y"=8)
+
+/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 = 3
+ dizzy_adj = 4
+ slurr_adj = 3
+
+ glass_icon_state = "vodkatonicglass"
+ glass_name = "glass of vodka and tonic"
+ glass_desc = "For when a gin and tonic isn't Russian enough."
+ glass_center_of_mass = list("x"=16, "y"=7)
+
+/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 = 3
+
+ glass_icon_state = "whiterussianglass"
+ glass_name = "glass of White Russian"
+ glass_desc = "A very nice looking drink. But that's just, like, your opinion, man."
+ glass_center_of_mass = list("x"=16, "y"=9)
+
+/datum/reagent/ethanol/whiskey_cola
+ name = "Whiskey Cola"
+ id = "whiskeycola"
+ description = "Whiskey, mixed with cola. Surprisingly refreshing."
+ color = "#3E1B00" // rgb: 62, 27, 0
+ boozepwr = 2
+
+ glass_icon_state = "whiskeycolaglass"
+ glass_name = "glass of whiskey cola"
+ glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
+ glass_center_of_mass = list("x"=16, "y"=9)
+
+/datum/reagent/ethanol/whiskeysoda
+ name = "Whiskey Soda"
+ id = "whiskeysoda"
+ description = "For the more refined griffon."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 3
+
+ glass_icon_state = "whiskeysodaglass2"
+ glass_name = "glass of whiskey soda"
+ glass_desc = "Ultimate refreshment."
+ glass_center_of_mass = list("x"=16, "y"=9)
+
+/datum/reagent/ethanol/specialwhiskey
+ name = "Special Blend Whiskey"
+ id = "specialwhiskey"
+ description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
+ color = "#664300" // rgb: 102, 67, 0
+ boozepwr = 2
+ dizzy_adj = 4
+ slur_start = 30 //amount absorbed after which mob starts slurring
+
+ glass_icon_state = "whiskeyglass"
+ glass_name = "glass of special blend whiskey"
+ glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
+ glass_center_of_mass = list("x"=16, "y"=12)
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
new file mode 100644
index 0000000000..11ea8f23a6
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
@@ -0,0 +1,603 @@
+/datum/reagent/inaprovaline
+ name = "Inaprovaline"
+ id = "inaprovaline"
+ description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients."
+ reagent_state = LIQUID
+ color = "#00BFFF" // rgb: 200, 165, 220
+ overdose = REAGENTS_OVERDOSE*2
+ scannable = 1
+
+/datum/reagent/inaprovaline/on_mob_life(var/mob/living/M as mob, var/alien)
+ if(!M) M = holder.my_atom
+
+ if(alien && alien == IS_VOX)
+ M.adjustToxLoss(REAGENTS_METABOLISM)
+ else
+ if(M.losebreath >= 10)
+ M.losebreath = max(10, M.losebreath-5)
+
+ holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
+ 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 = "#BF0000" // rgb: 200, 165, 220
+ overdose = REAGENTS_OVERDOSE
+ scannable = 1
+
+/datum/reagent/bicaridine/on_mob_life(var/mob/living/M as mob, var/alien)
+ if(M.stat == 2.0)
+ return
+ if(!M) M = holder.my_atom
+ if(alien != IS_DIONA)
+ M.heal_organ_damage(2*REM,0)
+ ..()
+ return
+
+/datum/reagent/kelotane
+ name = "Kelotane"
+ id = "kelotane"
+ description = "Kelotane is a drug used to treat burns."
+ reagent_state = LIQUID
+ color = "#FFA800" // rgb: 200, 165, 220
+ overdose = REAGENTS_OVERDOSE
+ scannable = 1
+
+/datum/reagent/kelotane/on_mob_life(var/mob/living/M as mob)
+ if(M.stat == 2.0)
+ return
+ if(!M) M = holder.my_atom
+ //This needs a diona check but if one is added they won't be able to heal burn damage at all.
+ 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 = "#FF8000" // rgb: 200, 165, 220
+ overdose = REAGENTS_OVERDOSE/2
+ scannable = 1
+
+/datum/reagent/dermaline/on_mob_life(var/mob/living/M as mob, var/alien)
+ 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
+ if(!alien || alien != IS_DIONA)
+ M.heal_organ_damage(0,3*REM)
+ ..()
+ return
+
+/datum/reagent/anti_toxin
+ name = "Dylovene"
+ id = "anti_toxin"
+ description = "Dylovene is a broad-spectrum antitoxin."
+ reagent_state = LIQUID
+ color = "#00A000" // rgb: 200, 165, 220
+ scannable = 1
+
+/datum/reagent/anti_toxin/on_mob_life(var/mob/living/M as mob, var/alien)
+ if(!M) M = holder.my_atom
+ if(!alien || alien != IS_DIONA)
+ 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/dexalin
+ name = "Dexalin"
+ id = "dexalin"
+ description = "Dexalin is used in the treatment of oxygen deprivation."
+ reagent_state = LIQUID
+ color = "#0080FF" // rgb: 200, 165, 220
+ overdose = REAGENTS_OVERDOSE
+ scannable = 1
+
+/datum/reagent/dexalin/on_mob_life(var/mob/living/M as mob, var/alien)
+ if(M.stat == 2.0)
+ return //See above, down and around. --Agouri
+ if(!M) M = holder.my_atom
+
+ if(alien && alien == IS_VOX)
+ M.adjustToxLoss(2*REM)
+ else if(!alien || alien != IS_DIONA)
+ M.adjustOxyLoss(-2*REM)
+
+ 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. It is highly effective."
+ reagent_state = LIQUID
+ color = "#0040FF" // rgb: 200, 165, 220
+ overdose = REAGENTS_OVERDOSE/2
+ scannable = 1
+
+/datum/reagent/dexalinp/on_mob_life(var/mob/living/M as mob, var/alien)
+ if(M.stat == 2.0)
+ return
+ if(!M) M = holder.my_atom
+
+ if(alien && alien == IS_VOX)
+ M.adjustOxyLoss()
+ else if(!alien || alien != IS_DIONA)
+ M.adjustOxyLoss(-M.getOxyLoss())
+
+ 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 = "#8040FF" // rgb: 200, 165, 220
+ scannable = 1
+
+/datum/reagent/tricordrazine/on_mob_life(var/mob/living/M as mob, var/alien)
+ if(M.stat == 2.0)
+ return
+ if(!M) M = holder.my_atom
+ if(!alien || alien != IS_DIONA)
+ if(M.getOxyLoss()) 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/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 = "#8080FF" // rgb: 200, 165, 220
+ scannable = 1
+
+/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(-1)
+ M.heal_organ_damage(1,1)
+ M.adjustToxLoss(-1)
+ ..()
+ 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' the cloning process when used in conjunction with a cryo tube."
+ reagent_state = LIQUID
+ color = "#80BFFF" // rgb: 200, 165, 220
+ scannable = 1
+
+/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)
+ ..()
+ return
+
+/datum/reagent/paracetamol
+ name = "Paracetamol"
+ id = "paracetamol"
+ description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ overdose = 60
+ scannable = 1
+ custom_metabolism = 0.025 // Lasts 10 minutes for 15 units
+
+/datum/reagent/paracetamol/on_mob_life(var/mob/living/M as mob)
+ if (volume > overdose)
+ M.hallucination = max(M.hallucination, 2)
+ ..()
+ return
+
+/datum/reagent/tramadol
+ name = "Tramadol"
+ id = "tramadol"
+ description = "A simple, yet effective painkiller."
+ reagent_state = LIQUID
+ color = "#CB68FC"
+ overdose = 30
+ scannable = 1
+ custom_metabolism = 0.025 // Lasts 10 minutes for 15 units
+
+/datum/reagent/tramadol/on_mob_life(var/mob/living/M as mob)
+ if (volume > overdose)
+ M.hallucination = max(M.hallucination, 2)
+ ..()
+ return
+
+/datum/reagent/oxycodone
+ name = "Oxycodone"
+ id = "oxycodone"
+ description = "An effective and very addictive painkiller."
+ reagent_state = LIQUID
+ color = "#800080"
+ overdose = 20
+ custom_metabolism = 0.25 // Lasts 10 minutes for 15 units
+
+/datum/reagent/oxycodone/on_mob_life(var/mob/living/M as mob)
+ if (volume > overdose)
+ M.druggy = max(M.druggy, 10)
+ M.hallucination = max(M.hallucination, 3)
+ ..()
+ return
+
+/datum/reagent/synaptizine
+ name = "Synaptizine"
+ id = "synaptizine"
+ description = "Synaptizine is used to treat various diseases."
+ reagent_state = LIQUID
+ color = "#99CCFF" // rgb: 200, 165, 220
+ custom_metabolism = 0.01
+ overdose = REAGENTS_OVERDOSE
+ scannable = 1
+
+/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)
+ holder.remove_reagent("mindbreaker", 5)
+ M.hallucination = max(0, M.hallucination - 10)
+ if(prob(60)) M.adjustToxLoss(1)
+ ..()
+ 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 = "#FFFF66" // rgb: 200, 165, 220
+ custom_metabolism = 0.05
+ overdose = REAGENTS_OVERDOSE
+ scannable = 1
+/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
+ overdose = REAGENTS_OVERDOSE
+ scannable = 1
+
+/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)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
+ if(E && istype(E))
+ if(E.damage > 0)
+ E.damage = max(E.damage - 1, 0)
+ ..()
+ return
+
+/datum/reagent/peridaxon
+ name = "Peridaxon"
+ id = "peridaxon"
+ description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
+ reagent_state = LIQUID
+ color = "#561EC3" // rgb: 200, 165, 220
+ overdose = 10
+ scannable = 1
+
+/datum/reagent/peridaxon/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+
+ //Peridaxon heals only non-robotic organs
+ for(var/obj/item/organ/I in H.internal_organs)
+ if((I.damage > 0) && (I.robotic != 2))
+ I.damage = max(I.damage - 0.20, 0)
+ ..()
+ return
+
+/datum/reagent/ryetalyn
+ name = "Ryetalyn"
+ id = "ryetalyn"
+ description = "Ryetalyn can cure all genetic abnomalities via a catalytic process."
+ reagent_state = SOLID
+ color = "#004000" // rgb: 200, 165, 220
+ overdose = REAGENTS_OVERDOSE
+
+/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
+
+ // 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/hyperzine
+ name = "Hyperzine"
+ id = "hyperzine"
+ description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
+ reagent_state = LIQUID
+ color = "#FF3300" // rgb: 200, 165, 220
+ custom_metabolism = 0.03
+ overdose = REAGENTS_OVERDOSE/2
+
+/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"))
+ ..()
+ return
+
+/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
+ overdose = REAGENTS_OVERDOSE
+
+/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
+
+/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 = "#408000" // rgb: 200, 165, 220
+ custom_metabolism = 0.05
+ overdose = REAGENTS_OVERDOSE
+ scannable = 1
+
+/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 = "#008000" // rgb: 200, 165, 220
+ custom_metabolism = 0.05
+ overdose = REAGENTS_OVERDOSE
+
+/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/spaceacillin
+ name = "Spaceacillin"
+ id = "spaceacillin"
+ description = "An all-purpose antiviral agent."
+ reagent_state = LIQUID
+ color = "#C1C1C1" // rgb: 200, 165, 220
+ custom_metabolism = 0.01
+ overdose = REAGENTS_OVERDOSE
+ scannable = 1
+
+/datum/reagent/spaceacillin/on_mob_life(var/mob/living/M as mob)
+ ..()
+ return
+
+/datum/reagent/sterilizine
+ name = "Sterilizine"
+ id = "sterilizine"
+ description = "Sterilizes wounds in preparation for surgery."
+ reagent_state = LIQUID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+ //makes you squeaky clean
+/datum/reagent/sterilizine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+ if (method == TOUCH)
+ M.germ_level -= min(volume*20, M.germ_level)
+
+/datum/reagent/sterilizine/reaction_obj(var/obj/O, var/volume)
+ O.germ_level -= min(volume*20, O.germ_level)
+
+/datum/reagent/sterilizine/reaction_turf(var/turf/T, var/volume)
+ T.germ_level -= min(volume*20, T.germ_level)
+
+/* 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
+ on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.radiation += 3
+ ..()
+ return
+*/
+
+/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
+ overdose = REAGENTS_OVERDOSE
+ scannable = 1
+
+/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
+
+#define ANTIDEPRESSANT_MESSAGE_DELAY 5*60*10
+
+/datum/reagent/antidepressant/methylphenidate
+ name = "Methylphenidate"
+ id = "methylphenidate"
+ description = "Improves the ability to concentrate."
+ reagent_state = LIQUID
+ color = "#BF80BF"
+ custom_metabolism = 0.01
+ data = 0
+
+ on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(src.volume <= 0.1) if(data != -1)
+ data = -1
+ M << "\red You lose focus.."
+ else
+ if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
+ data = world.time
+ M << "\blue Your mind feels focused and undivided."
+ ..()
+ return
+
+/datum/chemical_reaction/methylphenidate
+ name = "Methylphenidate"
+ id = "methylphenidate"
+ result = "methylphenidate"
+ required_reagents = list("mindbreaker" = 1, "hydrogen" = 1)
+ result_amount = 3
+
+/datum/reagent/antidepressant/citalopram
+ name = "Citalopram"
+ id = "citalopram"
+ description = "Stabilizes the mind a little."
+ reagent_state = LIQUID
+ color = "#FF80FF"
+ custom_metabolism = 0.01
+ data = 0
+
+ on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(src.volume <= 0.1) if(data != -1)
+ data = -1
+ M << "\red Your mind feels a little less stable.."
+ else
+ if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
+ data = world.time
+ M << "\blue Your mind feels stable.. a little stable."
+ ..()
+ return
+
+/datum/chemical_reaction/citalopram
+ name = "Citalopram"
+ id = "citalopram"
+ result = "citalopram"
+ required_reagents = list("mindbreaker" = 1, "carbon" = 1)
+ result_amount = 3
+
+
+/datum/reagent/antidepressant/paroxetine
+ name = "Paroxetine"
+ id = "paroxetine"
+ description = "Stabilizes the mind greatly, but has a chance of adverse effects."
+ reagent_state = LIQUID
+ color = "#FF80BF"
+ custom_metabolism = 0.01
+ data = 0
+
+ on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(src.volume <= 0.1) if(data != -1)
+ data = -1
+ M << "\red Your mind feels much less stable.."
+ else
+ if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
+ data = world.time
+ if(prob(90))
+ M << "\blue Your mind feels much more stable."
+ else
+ M << "\red Your mind breaks apart.."
+ M.hallucination += 200
+ ..()
+ return
+
+/datum/chemical_reaction/paroxetine
+ name = "Paroxetine"
+ id = "paroxetine"
+ result = "paroxetine"
+ required_reagents = list("mindbreaker" = 1, "oxygen" = 1, "inaprovaline" = 1)
+ result_amount = 3
+
+/datum/reagent/rezadone
+ name = "Rezadone"
+ id = "rezadone"
+ description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
+ reagent_state = SOLID
+ color = "#669900" // rgb: 102, 153, 0
+ overdose = REAGENTS_OVERDOSE
+ scannable = 1
+
+/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.make_dizzy(5)
+ M.make_jittery(5)
+
+ ..()
+ return
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
new file mode 100644
index 0000000000..847c3ce458
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
@@ -0,0 +1,389 @@
+/datum/reagent/crayon_dust
+ name = "Crayon dust"
+ id = "crayon_dust"
+ description = "Intensely coloured powder obtained by grinding crayons."
+ reagent_state = LIQUID
+ color = "#888888"
+ overdose = 5
+
+/datum/reagent/crayon_dust/red
+ name = "Red crayon dust"
+ id = "crayon_dust_red"
+ color = "#FE191A"
+
+/datum/reagent/crayon_dust/orange
+ name = "Orange crayon dust"
+ id = "crayon_dust_orange"
+ color = "#FFBE4F"
+
+/datum/reagent/crayon_dust/yellow
+ name = "Yellow crayon dust"
+ id = "crayon_dust_yellow"
+ color = "#FDFE7D"
+
+/datum/reagent/crayon_dust/green
+ name = "Green crayon dust"
+ id = "crayon_dust_green"
+ color = "#18A31A"
+
+/datum/reagent/crayon_dust/blue
+ name = "Blue crayon dust"
+ id = "crayon_dust_blue"
+ color = "#247CFF"
+
+/datum/reagent/crayon_dust/purple
+ name = "Purple crayon dust"
+ id = "crayon_dust_purple"
+ color = "#CC0099"
+
+/datum/reagent/crayon_dust/grey //Mime
+ name = "Grey crayon dust"
+ id = "crayon_dust_grey"
+ color = "#808080"
+
+/datum/reagent/crayon_dust/brown //Rainbow
+ name = "Brown crayon dust"
+ id = "crayon_dust_brown"
+ color = "#846F35"
+
+/datum/reagent/paint
+ name = "Paint"
+ id = "paint"
+ description = "This paint will stick to almost any object."
+ reagent_state = LIQUID
+ color = "#808080"
+ overdose = 15
+ color_weight = 20
+
+/datum/reagent/paint/New()
+ ..()
+ data = color
+
+/datum/reagent/paint/reaction_turf(var/turf/T, var/volume)
+ ..()
+ if(istype(T) && !istype(T, /turf/space))
+ T.color = color
+
+/datum/reagent/paint/reaction_obj(var/obj/O, var/volume)
+ ..()
+ if(istype(O,/obj))
+ O.color = color
+
+/datum/reagent/paint/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ ..()
+ if(istype(M,/mob) && !istype(M,/mob/dead))
+ //painting ghosts: not allowed
+ M.color = color
+
+/datum/reagent/paint/on_merge(var/newdata, var/newamount)
+ if(!data || !newdata)
+ return
+ var/list/colors = list(0, 0, 0, 0)
+ var/tot_w = 0
+
+ var/hex1 = uppertext(color)
+ var/hex2 = uppertext(newdata)
+ if(length(hex1) == 7)
+ hex1 += "FF"
+ if(length(hex2) == 7)
+ hex2 += "FF"
+ if(length(hex1) != 9 || length(hex2) != 9)
+ return
+ colors[1] += hex2num(copytext(hex1, 2, 4)) * volume
+ colors[2] += hex2num(copytext(hex1, 4, 6)) * volume
+ colors[3] += hex2num(copytext(hex1, 6, 8)) * volume
+ colors[4] += hex2num(copytext(hex1, 8, 10)) * volume
+ tot_w += volume
+ colors[1] += hex2num(copytext(hex2, 2, 4)) * newamount
+ colors[2] += hex2num(copytext(hex2, 4, 6)) * newamount
+ colors[3] += hex2num(copytext(hex2, 6, 8)) * newamount
+ colors[4] += hex2num(copytext(hex2, 8, 10)) * newamount
+ tot_w += newamount
+
+ color = rgb(colors[1] / tot_w, colors[2] / tot_w, colors[3] / tot_w, colors[4] / tot_w)
+ data = color
+ 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
+
+ glass_icon_state = "golden_cup"
+ glass_name = "golden cup"
+ glass_desc = "It's magic. We don't have to explain it."
+
+/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)
+ D.spread = "Remissive"
+ D.stage--
+ if(D.stage < 1)
+ D.cure()
+ ..()
+ return
+
+/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))
+ var/obj/effect/decal/cleanable/greenglow/glow = locate(/obj/effect/decal/cleanable/greenglow, T)
+ if(!glow)
+ new /obj/effect/decal/cleanable/greenglow(T)
+ return
+
+/datum/reagent/adrenaline
+ name = "Adrenaline"
+ id = "adrenaline"
+ description = "Adrenaline is a hormone used as a drug to treat cardiac arrest and other cardiac dysrhythmias resulting in diminished or absent cardiac output."
+ reagent_state = LIQUID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+/datum/reagent/adrenaline/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.SetParalysis(0)
+ M.SetWeakened(0)
+ M.adjustToxLoss(rand(3))
+ ..()
+ return
+
+/datum/reagent/water/holywater
+ name = "Holy Water"
+ id = "holywater"
+ description = "An ashen-obsidian-water mix, this solution will alter certain sections of the brain's rationality."
+ color = "#E0E8EF" // rgb: 224, 232, 239
+
+ glass_icon_state = "glass_clear"
+ glass_name = "glass of holy water"
+ glass_desc = "An ashen-obsidian-water mix, this solution will alter certain sections of the brain's rationality."
+
+/datum/reagent/water/holywater/on_mob_life(var/mob/living/M as mob)
+ if(ishuman(M))
+ if(M.mind && cult.is_antagonist(M.mind) && prob(10))
+ cult.remove_antagonist(M.mind)
+ holder.remove_reagent(src.id, 10 * REAGENTS_METABOLISM) //high metabolism to prevent extended uncult rolls.
+ return
+
+/datum/reagent/water/holywater/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(volume >= 5)
+ T.holy = 1
+ return
+
+/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/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/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 >= 5)
+ if(istype(T, /turf/simulated/wall))
+ var/turf/simulated/wall/W = T
+ W.thermite = 1
+ W.overlays += image('icons/effects/effects.dmi',icon_state = "#673910")
+ 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/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
+ overdose = REAGENTS_OVERDOSE
+
+/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)
+ if(istype(T, /turf/simulated))
+ var/turf/simulated/S = T
+ S.dirt = 0
+ T.clean_blood()
+ for(var/obj/effect/decal/cleanable/C in T.contents)
+ src.reaction_obj(C, volume)
+ 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)
+ else
+ H.clean_blood(1)
+ return
+ M.clean_blood()
+
+/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
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/lube/reaction_turf(var/turf/simulated/T, var/volume)
+ if (!istype(T)) return
+ src = null
+ if(volume >= 1)
+ if(T.wet >= 2) return
+ T.wet = 2
+ spawn(800)
+ if (!istype(T)) return
+ T.wet = 0
+ if(T.wet_overlay)
+ T.overlays -= T.wet_overlay
+ T.wet_overlay = null
+ return
+
+/datum/reagent/silicate
+ name = "Silicate"
+ id = "silicate"
+ description = "A compound that can be used to reinforce glass."
+ reagent_state = LIQUID
+ color = "#C7FFFF" // rgb: 199, 255, 255
+
+/datum/reagent/silicate/reaction_obj(var/obj/O, var/volume)
+ src = null
+ if(istype(O,/obj/structure/window))
+ var/obj/structure/window/W = O
+ W.apply_silicate(volume)
+ 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
+
+ custom_metabolism = 0.01
+
+/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
+
+ custom_metabolism = 0.01
+
+/datum/reagent/ultraglue
+ name = "Ultra Glue"
+ id = "glue"
+ description = "An extremely powerful bonding agent."
+ color = "#FFFFCC" // rgb: 255, 255, 204
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
new file mode 100644
index 0000000000..6971683d24
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
@@ -0,0 +1,592 @@
+/datum/reagent/toxin
+ name = "Toxin"
+ id = "toxin"
+ description = "A toxic chemical."
+ reagent_state = LIQUID
+ color = "#CF3600" // rgb: 207, 54, 0
+ var/toxpwr = 0.7 // Toxins are really weak, but without being treated, last very long.
+ custom_metabolism = 0.1
+
+/datum/reagent/toxin/on_mob_life(var/mob/living/M as mob,var/alien)
+ if(!M) M = holder.my_atom
+ if(toxpwr)
+ M.adjustToxLoss(toxpwr*REM)
+ if(alien) ..() // Kind of a catch-all for aliens without the liver. Because this does not metabolize 'naturally', only removed by the liver.
+ return
+
+/datum/reagent/plasticide
+ name = "Plasticide"
+ id = "plasticide"
+ description = "Liquid plastic, do not eat."
+ reagent_state = LIQUID
+ color = "#CF3600" // rgb: 207, 54, 0
+ custom_metabolism = 0.01
+
+/datum/reagent/plasticide/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ // Toxins are really weak, but without being treated, last very long.
+ M.adjustToxLoss(0.2)
+ ..()
+ 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/carpotoxin
+ name = "Carpotoxin"
+ id = "carpotoxin"
+ description = "A deadly neurotoxin produced by the dreaded space carp."
+ reagent_state = LIQUID
+ color = "#003333" // rgb: 0, 51, 51
+ toxpwr = 2
+
+/datum/reagent/toxin/phoron
+ name = "Phoron"
+ id = "phoron"
+ description = "Phoron in its liquid form."
+ reagent_state = LIQUID
+ color = "#9D14DB"
+ toxpwr = 3
+
+/datum/reagent/toxin/phoron/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ holder.remove_reagent("inaprovaline", 2*REM)
+ ..()
+ return
+
+/datum/reagent/toxin/phoron/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
+ var/turf/the_turf = get_turf(O)
+ the_turf.assume_gas("volatile_fuel", volume, T20C)
+
+/datum/reagent/toxin/phoron/reaction_turf(var/turf/T, var/volume)
+ src = null
+ T.assume_gas("volatile_fuel", volume, T20C)
+ return
+
+/datum/reagent/toxin/phoron/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/cyanide //Fast and Lethal
+ name = "Cyanide"
+ id = "cyanide"
+ description = "A highly toxic chemical."
+ reagent_state = LIQUID
+ color = "#CF3600" // rgb: 207, 54, 0
+ toxpwr = 4
+ custom_metabolism = 0.4
+
+/datum/reagent/toxin/cyanide/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.adjustOxyLoss(4*REM)
+ M.sleeping += 1
+ ..()
+ return
+
+/datum/reagent/toxin/potassium_chloride
+ name = "Potassium Chloride"
+ id = "potassium_chloride"
+ description = "A delicious salt that stops the heart when injected into cardiac muscle."
+ reagent_state = SOLID
+ color = "#FFFFFF" // rgb: 255,255,255
+ toxpwr = 0
+ overdose = 30
+
+/datum/reagent/toxin/potassium_chloride/on_mob_life(var/mob/living/carbon/M as mob)
+ var/mob/living/carbon/human/H = M
+ if(H.stat != 1)
+ if (volume >= overdose)
+ if(H.losebreath >= 10)
+ H.losebreath = max(10, H.losebreath-10)
+ H.adjustOxyLoss(2)
+ H.Weaken(10)
+ ..()
+ return
+
+/datum/reagent/toxin/potassium_chlorophoride
+ name = "Potassium Chlorophoride"
+ id = "potassium_chlorophoride"
+ description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!"
+ reagent_state = SOLID
+ color = "#FFFFFF" // rgb: 255,255,255
+ toxpwr = 2
+ overdose = 20
+
+/datum/reagent/toxin/potassium_chlorophoride/on_mob_life(var/mob/living/carbon/M as mob)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H.stat != 1)
+ if(H.losebreath >= 10)
+ H.losebreath = max(10, M.losebreath-10)
+ H.adjustOxyLoss(2)
+ H.Weaken(10)
+ ..()
+ return
+
+/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(10)
+ M.silent = max(M.silent, 10)
+ M.tod = worldtime2text()
+ ..()
+ return
+
+/datum/reagent/toxin/zombiepowder/Destroy()
+ if(holder && ismob(holder.my_atom))
+ var/mob/M = holder.my_atom
+ M.status_flags &= ~FAKEDEATH
+ ..()
+
+//Reagents used for plant fertilizers.
+/datum/reagent/toxin/fertilizer
+ name = "fertilizer"
+ id = "fertilizer"
+ description = "A chemical mix good for growing plants with."
+ reagent_state = LIQUID
+ toxpwr = 0.2 //It's not THAT poisonous.
+ color = "#664330" // rgb: 102, 67, 48
+
+/datum/reagent/toxin/fertilizer/eznutrient
+ name = "EZ Nutrient"
+ id = "eznutrient"
+
+/datum/reagent/toxin/fertilizer/left4zed
+ name = "Left-4-Zed"
+ id = "left4zed"
+
+/datum/reagent/toxin/fertilizer/robustharvest
+ name = "Robust Harvest"
+ id = "robustharvest"
+
+/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
+
+ // Clear off wallrot fungi
+/datum/reagent/toxin/plantbgone/reaction_turf(var/turf/T, var/volume)
+ if(istype(T, /turf/simulated/wall))
+ var/turf/simulated/wall/W = T
+ if(locate(/obj/effect/overlay/wallrot) in W)
+ for(var/obj/effect/overlay/wallrot/E in W)
+ qdel(E)
+ W.visible_message("The fungi are completely dissolved by the solution!")
+
+/datum/reagent/toxin/plantbgone/reaction_obj(var/obj/O, var/volume)
+ if(istype(O,/obj/effect/alien/weeds/))
+ var/obj/effect/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/plant))
+ var/obj/effect/plant/plant = O
+ plant.die_off()
+ else if(istype(O,/obj/machinery/portable_atmospherics/hydroponics))
+ var/obj/machinery/portable_atmospherics/hydroponics/tray = O
+
+ if(tray.seed)
+ tray.health -= rand(30,50)
+ if(tray.pestlevel > 0)
+ tray.pestlevel -= 2
+ if(tray.weedlevel > 0)
+ tray.weedlevel -= 3
+ tray.toxins += 4
+ tray.check_level_sanity()
+ tray.update_icon()
+
+/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
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H.dna)
+ if(H.species.flags & IS_PLANT) //plantmen take a LOT of damage
+ H.adjustToxLoss(50)
+
+/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
+ meltprob = 30
+
+/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
+ overdose = REAGENTS_OVERDOSE
+
+/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)
+ if(M.losebreath < 15)
+ M.losebreath++
+ ..()
+ return
+
+/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)
+ M.UpdateAppearance()
+ 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(10,IRRADIATE,0)
+ ..()
+ 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 << "\red 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/stoxin
+ name = "Soporific"
+ id = "stoxin"
+ description = "An effective hypnotic used to treat insomnia."
+ reagent_state = LIQUID
+ color = "#009CA8" // rgb: 232, 149, 204
+ toxpwr = 0
+ custom_metabolism = 0.1
+ overdose = REAGENTS_OVERDOSE
+
+/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 49)
+ if(prob(50))
+ M.Weaken(2)
+ M.drowsyness = max(M.drowsyness, 20)
+ if(50 to INFINITY)
+ M.sleeping = max(M.sleeping, 20)
+ M.drowsyness = max(M.drowsyness, 60)
+ data++
+ ..()
+ return
+
+/datum/reagent/toxin/chloralhydrate
+ name = "Chloral Hydrate"
+ id = "chloralhydrate"
+ description = "A powerful sedative."
+ reagent_state = SOLID
+ color = "#000067" // rgb: 0, 0, 103
+ toxpwr = 1
+ custom_metabolism = 0.1 //Default 0.2
+ overdose = 15
+ overdose_dam = 5
+
+/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)
+ M.confused += 2
+ M.drowsyness += 2
+ if(2 to 20)
+ M.Weaken(30)
+ M.eye_blurry = max(M.eye_blurry, 10)
+ if(20 to INFINITY)
+ M.sleeping = max(M.sleeping, 30)
+ ..()
+ 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. The fermentation appears to be incomplete." //If the players manage to analyze this, they deserve to know something is wrong.
+ reagent_state = LIQUID
+ color = "#664300" // rgb: 102, 67, 0
+ custom_metabolism = 0.15 // Sleep toxins should always be consumed pretty fast
+ overdose = REAGENTS_OVERDOSE/2
+
+ glass_icon_state = "beerglass"
+ glass_name = "glass of beer"
+ glass_desc = "A freezing pint of beer"
+ glass_center_of_mass = list("x"=16, "y"=8)
+
+/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)
+ M.confused += 2
+ M.drowsyness += 2
+ if(2 to 50)
+ M.sleeping += 1
+ if(51 to INFINITY)
+ M.sleeping += 1
+ M.adjustToxLoss((data - 50)*REM)
+ data++
+ ..()
+ 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
+ overdose = REAGENTS_OVERDOSE
+
+/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 && !M.restrained())
+ 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
+ overdose = REAGENTS_OVERDOSE
+
+/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
+
+/datum/reagent/cryptobiolin
+ name = "Cryptobiolin"
+ id = "cryptobiolin"
+ description = "Cryptobiolin causes confusion and dizzyness."
+ reagent_state = LIQUID
+ color = "#000055" // rgb: 200, 165, 220
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/cryptobiolin/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.make_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/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
+ overdose = REAGENTS_OVERDOSE
+
+/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/toxin/mindbreaker
+ name = "Mindbreaker Toxin"
+ id = "mindbreaker"
+ description = "A powerful hallucinogen, it can cause fatal effects in users."
+ reagent_state = LIQUID
+ color = "#B31008" // rgb: 139, 166, 233
+ toxpwr = 0
+ custom_metabolism = 0.05
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/toxin/mindbreaker/on_mob_life(var/mob/living/M)
+ if(!M) M = holder.my_atom
+ M.hallucination += 10
+ ..()
+ return
+
+/datum/reagent/psilocybin
+ name = "Psilocybin"
+ id = "psilocybin"
+ description = "A strong psycotropic derived from certain species of mushroom."
+ color = "#E700E7" // rgb: 231, 0, 231
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/psilocybin/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.make_dizzy(5)
+ if(prob(10)) M.emote(pick("twitch","giggle"))
+ if(5 to 10)
+ if (!M.stuttering) M.stuttering = 1
+ M.make_jittery(10)
+ M.make_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.make_jittery(20)
+ M.make_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/nicotine
+ name = "Nicotine"
+ id = "nicotine"
+ description = "A highly addictive stimulant extracted from the tobacco plant."
+ reagent_state = LIQUID
+ color = "#181818" // rgb: 24, 24, 24
+
+/datum/reagent/slimetoxin
+ name = "Mutation Toxin"
+ id = "mutationtoxin"
+ description = "A corruptive toxin produced by slimes."
+ reagent_state = LIQUID
+ color = "#13BC5E" // rgb: 19, 188, 94
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/slimetoxin/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(ishuman(M))
+ var/mob/living/carbon/human/human = M
+ if(human.species.name != "Slime")
+ M << "Your flesh rapidly mutates!"
+ human.set_species("Slime")
+ ..()
+ return
+
+/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
+ overdose = REAGENTS_OVERDOSE
+
+/datum/reagent/aslimetoxin/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(istype(M, /mob/living/carbon) && M.stat != DEAD)
+ M << "\red Your flesh rapidly mutates!"
+ if(M.monkeyizing) return
+ M.monkeyizing = 1
+ M.canmove = 0
+ M.icon = null
+ M.overlays.Cut()
+ M.invisibility = 101
+ for(var/obj/item/W in M)
+ if(istype(W, /obj/item/weapon/implant)) //TODO: Carn. give implants a dropped() or something
+ qdel(W)
+ continue
+ W.layer = initial(W.layer)
+ W.loc = M.loc
+ W.dropped(M)
+ var/mob/living/carbon/slime/new_mob = new /mob/living/carbon/slime(M.loc)
+ new_mob.a_intent = I_HURT
+ new_mob.universal_speak = 1
+ if(M.mind)
+ M.mind.transfer_to(new_mob)
+ else
+ new_mob.key = M.key
+ qdel(M)
+ ..()
+ 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.contract_disease(new /datum/disease/robotic_transformation(0),1)
+
+/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.contract_disease(new /datum/disease/xeno_transformation(0),1)
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 96730fb25b..d569061037 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1,2253 +1,2280 @@
-///////////////////////////////////////////////////////////////////////////////////
-datum
- chemical_reaction
- var/name = null
- var/id = null
- var/result = null
- var/resultcolor = null //for paint
- var/list/required_reagents = new/list()
- var/list/required_catalysts = new/list()
-
- // Both of these variables are mostly going to be used with slime cores - but if you want to, you can use them for other things
- var/atom/required_container = null // the container required for the reaction to happen
- var/required_other = 0 // an integer required for the reaction to happen
-
- var/result_amount = 0
- var/secondary = 0 // set to nonzero if secondary reaction
- var/list/secondary_results = list() //additional reagents produced by the reaction
- var/requires_heating = 0
-
- proc
- on_reaction(var/datum/reagents/holder, var/created_volume)
- return
-
- //I recommend you set the result amount to the total volume of all components.
-
- explosion_potassium
- name = "Explosion"
- id = "explosion_potassium"
- result = null
- required_reagents = list("water" = 1, "potassium" = 1)
- result_amount = 2
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/datum/effect/effect/system/reagents_explosion/e = new()
- e.set_up(round (created_volume/10, 1), holder.my_atom, 0, 0)
- e.holder_damage(holder.my_atom)
- if(isliving(holder.my_atom))
- e.amount *= 0.5
- var/mob/living/L = holder.my_atom
- if(L.stat!=DEAD)
- e.amount *= 0.5
- e.start()
- holder.clear_reagents()
- return
-
- emp_pulse
- name = "EMP Pulse"
- id = "emp_pulse"
- result = null
- required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
- result_amount = 2
-
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
- // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
- empulse(location, round(created_volume / 24), round(created_volume / 14), 1)
- holder.clear_reagents()
- return
-
- silicate
- name = "Silicate"
- id = "silicate"
- result = "silicate"
- required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
- result_amount = 3
-
- stoxin
- name = "Soporific"
- id = "stoxin"
- result = "stoxin"
- required_reagents = list("chloralhydrate" = 1, "sugar" = 4)
- result_amount = 5
-
- sterilizine
- name = "Sterilizine"
- id = "sterilizine"
- result = "sterilizine"
- required_reagents = list("ethanol" = 1, "anti_toxin" = 1, "chlorine" = 1)
- result_amount = 3
-
- inaprovaline
- name = "Inaprovaline"
- id = "inaprovaline"
- result = "inaprovaline"
- required_reagents = list("oxygen" = 1, "carbon" = 1, "sugar" = 1)
- result_amount = 3
-
- anti_toxin
- name = "Dylovene"
- id = "anti_toxin"
- result = "anti_toxin"
- required_reagents = list("silicon" = 1, "potassium" = 1, "nitrogen" = 1)
- result_amount = 3
-
- mutagen
- name = "Unstable mutagen"
- id = "mutagen"
- result = "mutagen"
- required_reagents = list("radium" = 1, "phosphorus" = 1, "chlorine" = 1)
- result_amount = 3
-
- tramadol
- name = "Tramadol"
- id = "tramadol"
- result = "tramadol"
- required_reagents = list("inaprovaline" = 1, "ethanol" = 1, "oxygen" = 1)
- result_amount = 3
-
- paracetamol
- name = "Paracetamol"
- id = "paracetamol"
- result = "paracetamol"
- required_reagents = list("tramadol" = 1, "sugar" = 1, "water" = 1)
- result_amount = 3
-
- oxycodone
- name = "Oxycodone"
- id = "oxycodone"
- result = "oxycodone"
- required_reagents = list("ethanol" = 1, "tramadol" = 1)
- required_catalysts = list("phoron" = 1)
- result_amount = 1
-
- //cyanide
- // name = "Cyanide"
- // id = "cyanide"
- // result = "cyanide"
- // required_reagents = list("hydrogen" = 1, "carbon" = 1, "nitrogen" = 1)
- // result_amount = 1
-
- water //I can't believe we never had this.
- name = "Water"
- id = "water"
- result = "water"
- required_reagents = list("oxygen" = 1, "hydrogen" = 2)
- result_amount = 1
-
- thermite
- name = "Thermite"
- id = "thermite"
- result = "thermite"
- required_reagents = list("aluminum" = 1, "iron" = 1, "oxygen" = 1)
- result_amount = 3
-
- lexorin
- name = "Lexorin"
- id = "lexorin"
- result = "lexorin"
- required_reagents = list("phoron" = 1, "hydrogen" = 1, "nitrogen" = 1)
- result_amount = 3
-
- space_drugs
- name = "Space Drugs"
- id = "space_drugs"
- result = "space_drugs"
- required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1)
- result_amount = 3
-
- lube
- name = "Space Lube"
- id = "lube"
- result = "lube"
- required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
- result_amount = 4
-
- pacid
- name = "Polytrinic acid"
- id = "pacid"
- result = "pacid"
- required_reagents = list("sacid" = 1, "chlorine" = 1, "potassium" = 1)
- result_amount = 3
-
- synaptizine
- name = "Synaptizine"
- id = "synaptizine"
- result = "synaptizine"
- required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1)
- result_amount = 3
-
- hyronalin
- name = "Hyronalin"
- id = "hyronalin"
- result = "hyronalin"
- required_reagents = list("radium" = 1, "anti_toxin" = 1)
- result_amount = 2
-
- arithrazine
- name = "Arithrazine"
- id = "arithrazine"
- result = "arithrazine"
- required_reagents = list("hyronalin" = 1, "hydrogen" = 1)
- result_amount = 2
-
- impedrezene
- name = "Impedrezene"
- id = "impedrezene"
- result = "impedrezene"
- required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1)
- result_amount = 2
-
- kelotane
- name = "Kelotane"
- id = "kelotane"
- result = "kelotane"
- required_reagents = list("silicon" = 1, "carbon" = 1)
- result_amount = 2
-
- peridaxon
- name = "Peridaxon"
- id = "peridaxon"
- result = "peridaxon"
- required_reagents = list("bicaridine" = 2, "clonexadone" = 2)
- required_catalysts = list("phoron" = 5)
- result_amount = 2
-
- leporazine
- name = "Leporazine"
- id = "leporazine"
- result = "leporazine"
- required_reagents = list("silicon" = 1, "copper" = 1)
- required_catalysts = list("phoron" = 5)
- result_amount = 2
-
- cryptobiolin
- name = "Cryptobiolin"
- id = "cryptobiolin"
- result = "cryptobiolin"
- required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
- result_amount = 3
-
- tricordrazine
- name = "Tricordrazine"
- id = "tricordrazine"
- result = "tricordrazine"
- required_reagents = list("inaprovaline" = 1, "anti_toxin" = 1)
- result_amount = 2
-
- alkysine
- name = "Alkysine"
- id = "alkysine"
- result = "alkysine"
- required_reagents = list("chlorine" = 1, "nitrogen" = 1, "anti_toxin" = 1)
- result_amount = 2
-
- dexalin
- name = "Dexalin"
- id = "dexalin"
- result = "dexalin"
- required_reagents = list("oxygen" = 2, "phoron" = 0.1)
- required_catalysts = list("phoron" = 5)
- result_amount = 1
-
- dermaline
- name = "Dermaline"
- id = "dermaline"
- result = "dermaline"
- required_reagents = list("oxygen" = 1, "phosphorus" = 1, "kelotane" = 1)
- result_amount = 3
-
- dexalinp
- name = "Dexalin Plus"
- id = "dexalinp"
- result = "dexalinp"
- required_reagents = list("dexalin" = 1, "carbon" = 1, "iron" = 1)
- result_amount = 3
-
- bicaridine
- name = "Bicaridine"
- id = "bicaridine"
- result = "bicaridine"
- required_reagents = list("inaprovaline" = 1, "carbon" = 1)
- result_amount = 2
-
- hyperzine
- name = "Hyperzine"
- id = "hyperzine"
- result = "hyperzine"
- required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1,)
- result_amount = 3
-
- ryetalyn
- name = "Ryetalyn"
- id = "ryetalyn"
- result = "ryetalyn"
- required_reagents = list("arithrazine" = 1, "carbon" = 1)
- result_amount = 2
-
- cryoxadone
- name = "Cryoxadone"
- id = "cryoxadone"
- result = "cryoxadone"
- required_reagents = list("dexalin" = 1, "water" = 1, "oxygen" = 1)
- result_amount = 3
-
- clonexadone
- name = "Clonexadone"
- id = "clonexadone"
- result = "clonexadone"
- required_reagents = list("cryoxadone" = 1, "sodium" = 1, "phoron" = 0.1)
- required_catalysts = list("phoron" = 5)
- result_amount = 2
-
- spaceacillin
- name = "Spaceacillin"
- id = "spaceacillin"
- result = "spaceacillin"
- required_reagents = list("cryptobiolin" = 1, "inaprovaline" = 1)
- result_amount = 2
-
- imidazoline
- name = "imidazoline"
- id = "imidazoline"
- result = "imidazoline"
- required_reagents = list("carbon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
- result_amount = 2
-
- ethylredoxrazine
- name = "Ethylredoxrazine"
- id = "ethylredoxrazine"
- result = "ethylredoxrazine"
- required_reagents = list("oxygen" = 1, "anti_toxin" = 1, "carbon" = 1)
- result_amount = 3
-
- ethanoloxidation
- name = "ethanoloxidation" //Kind of a placeholder in case someone ever changes it so that chemicals
- id = "ethanoloxidation" // react in the body. Also it would be silly if it didn't exist.
- result = "water"
- required_reagents = list("ethylredoxrazine" = 1, "ethanol" = 1)
- result_amount = 2
-
- glycerol
- name = "Glycerol"
- id = "glycerol"
- result = "glycerol"
- required_reagents = list("cornoil" = 3, "sacid" = 1)
- result_amount = 1
-
- nitroglycerin
- name = "Nitroglycerin"
- id = "nitroglycerin"
- result = "nitroglycerin"
- required_reagents = list("glycerol" = 1, "pacid" = 1, "sacid" = 1)
- result_amount = 2
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/datum/effect/effect/system/reagents_explosion/e = new()
- e.set_up(round (created_volume/2, 1), holder.my_atom, 0, 0)
- e.holder_damage(holder.my_atom)
- if(isliving(holder.my_atom))
- e.amount *= 0.5
- var/mob/living/L = holder.my_atom
- if(L.stat!=DEAD)
- e.amount *= 0.5
- e.start()
-
- holder.clear_reagents()
- return
-
- sodiumchloride
- name = "Sodium Chloride"
- id = "sodiumchloride"
- result = "sodiumchloride"
- required_reagents = list("sodium" = 1, "chlorine" = 1)
- result_amount = 2
-
- flash_powder
- name = "Flash powder"
- id = "flash_powder"
- result = null
- required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 )
- result_amount = null
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
- s.set_up(2, 1, location)
- s.start()
- for(var/mob/living/carbon/M in viewers(world.view, location))
- switch(get_dist(M, location))
- if(0 to 3)
- if(hasvar(M, "glasses"))
- if(istype(M:glasses, /obj/item/clothing/glasses/sunglasses))
- continue
-
- flick("e_flash", M.flash)
- M.Weaken(15)
-
- if(4 to 5)
- if(hasvar(M, "glasses"))
- if(istype(M:glasses, /obj/item/clothing/glasses/sunglasses))
- continue
-
- flick("e_flash", M.flash)
- M.Stun(5)
-
- napalm
- name = "Napalm"
- id = "napalm"
- result = null
- required_reagents = list("aluminum" = 1, "phoron" = 1, "sacid" = 1 )
- result_amount = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/turf/location = get_turf(holder.my_atom.loc)
- for(var/turf/simulated/floor/target_tile in range(0,location))
- target_tile.assume_gas("volatile_fuel", created_volume, 400+T0C)
- spawn (0) target_tile.hotspot_expose(700, 400)
- holder.del_reagent("napalm")
- return
-
- /*
- smoke
- name = "Smoke"
- id = "smoke"
- result = null
- required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1 )
- result_amount = null
- secondary = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- var/datum/effect/system/bad_smoke_spread/S = new /datum/effect/system/bad_smoke_spread
- S.attach(location)
- S.set_up(10, 0, location)
- playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
- spawn(0)
- S.start()
- sleep(10)
- S.start()
- sleep(10)
- S.start()
- sleep(10)
- S.start()
- sleep(10)
- S.start()
- holder.clear_reagents()
- return */
-
- chemsmoke
- name = "Chemsmoke"
- id = "chemsmoke"
- result = null
- required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1)
- result_amount = 0.4
- secondary = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
- S.attach(location)
- S.set_up(holder, created_volume, 0, location)
- playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
- spawn(0)
- S.start()
- holder.clear_reagents()
- return
-
- chloralhydrate
- name = "Chloral Hydrate"
- id = "chloralhydrate"
- result = "chloralhydrate"
- required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
- result_amount = 1
-
- potassium_chloride
- name = "Potassium Chloride"
- id = "potassium_chloride"
- result = "potassium_chloride"
- required_reagents = list("sodiumchloride" = 1, "potassium" = 1)
- result_amount = 2
-
- potassium_chlorophoride
- name = "Potassium Chlorophoride"
- id = "potassium_chlorophoride"
- result = "potassium_chlorophoride"
- required_reagents = list("potassium_chloride" = 1, "phoron" = 1, "chloralhydrate" = 1)
- result_amount = 4
-
- stoxin
- name = "Soporific"
- id = "stoxin"
- result = "stoxin"
- required_reagents = list("chloralhydrate" = 1, "sugar" = 4)
- result_amount = 5
-
- zombiepowder
- name = "Zombie Powder"
- id = "zombiepowder"
- result = "zombiepowder"
- required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5)
- result_amount = 2
-
- rezadone
- name = "Rezadone"
- id = "rezadone"
- result = "rezadone"
- required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1)
- result_amount = 3
-
- mindbreaker
- name = "Mindbreaker Toxin"
- id = "mindbreaker"
- result = "mindbreaker"
- required_reagents = list("silicon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
- result_amount = 3
-
- lipozine
- name = "Lipozine"
- id = "Lipozine"
- result = "lipozine"
- required_reagents = list("sodiumchloride" = 1, "ethanol" = 1, "radium" = 1)
- result_amount = 3
-
- phoronsolidification
- name = "Solid Phoron"
- id = "solidphoron"
- result = null
- required_reagents = list("iron" = 5, "frostoil" = 5, "phoron" = 20)
- result_amount = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- new /obj/item/stack/sheet/mineral/phoron(location)
- return
-
- plastication
- name = "Plastic"
- id = "solidplastic"
- result = null
- required_reagents = list("pacid" = 10, "plasticide" = 20)
- result_amount = 1
- on_reaction(var/datum/reagents/holder)
- new /obj/item/stack/sheet/mineral/plastic(get_turf(holder.my_atom),10)
- return
-
- virus_food
- name = "Virus Food"
- id = "virusfood"
- result = "virusfood"
- required_reagents = list("water" = 1, "milk" = 1, "oxygen" = 1)
- result_amount = 3
+/datum/chemical_reaction
+ var/name = null
+ var/id = null
+ var/result = null
+ var/resultcolor = null //for paint
+ var/list/required_reagents = new/list()
+ var/list/required_catalysts = new/list()
+
+ // Both of these variables are mostly going to be used with slime cores - but if you want to, you can use them for other things
+ var/atom/required_container = null // the container required for the reaction to happen
+ var/required_other = 0 // an integer required for the reaction to happen
+
+ var/result_amount = 0
+ var/secondary = 0 // set to nonzero if secondary reaction
+ var/list/secondary_results = list() //additional reagents produced by the reaction
+ var/requires_heating = 0
+
+/datum/chemical_reaction/proc/on_reaction(var/datum/reagents/holder, var/created_volume)
+ return
+
+ //I recommend you set the result amount to the total volume of all components.
+
+/datum/chemical_reaction/explosion_potassium
+ name = "Explosion"
+ id = "explosion_potassium"
+ result = null
+ required_reagents = list("water" = 1, "potassium" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/explosion_potassium/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/datum/effect/effect/system/reagents_explosion/e = new()
+ e.set_up(round (created_volume/10, 1), holder.my_atom, 0, 0)
+ e.holder_damage(holder.my_atom)
+ if(isliving(holder.my_atom))
+ e.amount *= 0.5
+ var/mob/living/L = holder.my_atom
+ if(L.stat!=DEAD)
+ e.amount *= 0.5
+ e.start()
+ holder.clear_reagents()
+ return
+
+/datum/chemical_reaction/emp_pulse
+ name = "EMP Pulse"
+ id = "emp_pulse"
+ result = null
+ required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
+ result_amount = 2
+
+/datum/chemical_reaction/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
+ // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
+ empulse(location, round(created_volume / 24), round(created_volume / 14), 1)
+ holder.clear_reagents()
+ return
+
+/datum/chemical_reaction/silicate
+ name = "Silicate"
+ id = "silicate"
+ result = "silicate"
+ required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/stoxin
+ name = "Soporific"
+ id = "stoxin"
+ result = "stoxin"
+ required_reagents = list("chloralhydrate" = 1, "sugar" = 4)
+ result_amount = 5
+
+/datum/chemical_reaction/sterilizine
+ name = "Sterilizine"
+ id = "sterilizine"
+ result = "sterilizine"
+ required_reagents = list("ethanol" = 1, "anti_toxin" = 1, "chlorine" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/inaprovaline
+ name = "Inaprovaline"
+ id = "inaprovaline"
+ result = "inaprovaline"
+ required_reagents = list("oxygen" = 1, "carbon" = 1, "sugar" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/anti_toxin
+ name = "Dylovene"
+ id = "anti_toxin"
+ result = "anti_toxin"
+ required_reagents = list("silicon" = 1, "potassium" = 1, "nitrogen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/mutagen
+ name = "Unstable mutagen"
+ id = "mutagen"
+ result = "mutagen"
+ required_reagents = list("radium" = 1, "phosphorus" = 1, "chlorine" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/tramadol
+ name = "Tramadol"
+ id = "tramadol"
+ result = "tramadol"
+ required_reagents = list("inaprovaline" = 1, "ethanol" = 1, "oxygen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/paracetamol
+ name = "Paracetamol"
+ id = "paracetamol"
+ result = "paracetamol"
+ required_reagents = list("tramadol" = 1, "sugar" = 1, "water" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/oxycodone
+ name = "Oxycodone"
+ id = "oxycodone"
+ result = "oxycodone"
+ required_reagents = list("ethanol" = 1, "tramadol" = 1)
+ required_catalysts = list("phoron" = 1)
+ result_amount = 1
+
+//cyanide
+// name = "Cyanide"
+// id = "cyanide"
+// result = "cyanide"
+// required_reagents = list("hydrogen" = 1, "carbon" = 1, "nitrogen" = 1)
+// result_amount = 1
+
+/datum/chemical_reaction/water //I can't believe we never had this.
+ name = "Water"
+ id = "water"
+ result = "water"
+ required_reagents = list("oxygen" = 1, "hydrogen" = 2)
+ result_amount = 1
+
+/datum/chemical_reaction/thermite
+ name = "Thermite"
+ id = "thermite"
+ result = "thermite"
+ required_reagents = list("aluminum" = 1, "iron" = 1, "oxygen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/lexorin
+ name = "Lexorin"
+ id = "lexorin"
+ result = "lexorin"
+ required_reagents = list("phoron" = 1, "hydrogen" = 1, "nitrogen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/space_drugs
+ name = "Space Drugs"
+ id = "space_drugs"
+ result = "space_drugs"
+ required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/lube
+ name = "Space Lube"
+ id = "lube"
+ result = "lube"
+ required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
+ result_amount = 4
+
+/datum/chemical_reaction/pacid
+ name = "Polytrinic acid"
+ id = "pacid"
+ result = "pacid"
+ required_reagents = list("sacid" = 1, "chlorine" = 1, "potassium" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/synaptizine
+ name = "Synaptizine"
+ id = "synaptizine"
+ result = "synaptizine"
+ required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/hyronalin
+ name = "Hyronalin"
+ id = "hyronalin"
+ result = "hyronalin"
+ required_reagents = list("radium" = 1, "anti_toxin" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/arithrazine
+ name = "Arithrazine"
+ id = "arithrazine"
+ result = "arithrazine"
+ required_reagents = list("hyronalin" = 1, "hydrogen" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/impedrezene
+ name = "Impedrezene"
+ id = "impedrezene"
+ result = "impedrezene"
+ required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/kelotane
+ name = "Kelotane"
+ id = "kelotane"
+ result = "kelotane"
+ required_reagents = list("silicon" = 1, "carbon" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/peridaxon
+ name = "Peridaxon"
+ id = "peridaxon"
+ result = "peridaxon"
+ required_reagents = list("bicaridine" = 2, "clonexadone" = 2)
+ required_catalysts = list("phoron" = 5)
+ result_amount = 2
+
+/datum/chemical_reaction/leporazine
+ name = "Leporazine"
+ id = "leporazine"
+ result = "leporazine"
+ required_reagents = list("silicon" = 1, "copper" = 1)
+ required_catalysts = list("phoron" = 5)
+ result_amount = 2
+
+/datum/chemical_reaction/cryptobiolin
+ name = "Cryptobiolin"
+ id = "cryptobiolin"
+ result = "cryptobiolin"
+ required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/tricordrazine
+ name = "Tricordrazine"
+ id = "tricordrazine"
+ result = "tricordrazine"
+ required_reagents = list("inaprovaline" = 1, "anti_toxin" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/alkysine
+ name = "Alkysine"
+ id = "alkysine"
+ result = "alkysine"
+ required_reagents = list("chlorine" = 1, "nitrogen" = 1, "anti_toxin" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/dexalin
+ name = "Dexalin"
+ id = "dexalin"
+ result = "dexalin"
+ required_reagents = list("oxygen" = 2, "phoron" = 0.1)
+ required_catalysts = list("phoron" = 5)
+ result_amount = 1
+
+/datum/chemical_reaction/dermaline
+ name = "Dermaline"
+ id = "dermaline"
+ result = "dermaline"
+ required_reagents = list("oxygen" = 1, "phosphorus" = 1, "kelotane" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/dexalinp
+ name = "Dexalin Plus"
+ id = "dexalinp"
+ result = "dexalinp"
+ required_reagents = list("dexalin" = 1, "carbon" = 1, "iron" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/bicaridine
+ name = "Bicaridine"
+ id = "bicaridine"
+ result = "bicaridine"
+ required_reagents = list("inaprovaline" = 1, "carbon" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/hyperzine
+ name = "Hyperzine"
+ id = "hyperzine"
+ result = "hyperzine"
+ required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1,)
+ result_amount = 3
+
+/datum/chemical_reaction/ryetalyn
+ name = "Ryetalyn"
+ id = "ryetalyn"
+ result = "ryetalyn"
+ required_reagents = list("arithrazine" = 1, "carbon" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/cryoxadone
+ name = "Cryoxadone"
+ id = "cryoxadone"
+ result = "cryoxadone"
+ required_reagents = list("dexalin" = 1, "water" = 1, "oxygen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/clonexadone
+ name = "Clonexadone"
+ id = "clonexadone"
+ result = "clonexadone"
+ required_reagents = list("cryoxadone" = 1, "sodium" = 1, "phoron" = 0.1)
+ required_catalysts = list("phoron" = 5)
+ result_amount = 2
+
+/datum/chemical_reaction/spaceacillin
+ name = "Spaceacillin"
+ id = "spaceacillin"
+ result = "spaceacillin"
+ required_reagents = list("cryptobiolin" = 1, "inaprovaline" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/imidazoline
+ name = "imidazoline"
+ id = "imidazoline"
+ result = "imidazoline"
+ required_reagents = list("carbon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/ethylredoxrazine
+ name = "Ethylredoxrazine"
+ id = "ethylredoxrazine"
+ result = "ethylredoxrazine"
+ required_reagents = list("oxygen" = 1, "anti_toxin" = 1, "carbon" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/ethanoloxidation
+ name = "ethanoloxidation" //Kind of a placeholder in case someone ever changes it so that chemicals
+ id = "ethanoloxidation" // react in the body. Also it would be silly if it didn't exist.
+ result = "water"
+ required_reagents = list("ethylredoxrazine" = 1, "ethanol" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/glycerol
+ name = "Glycerol"
+ id = "glycerol"
+ result = "glycerol"
+ required_reagents = list("cornoil" = 3, "sacid" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/nitroglycerin
+ name = "Nitroglycerin"
+ id = "nitroglycerin"
+ result = "nitroglycerin"
+ required_reagents = list("glycerol" = 1, "pacid" = 1, "sacid" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/nitroglycerin/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/datum/effect/effect/system/reagents_explosion/e = new()
+ e.set_up(round (created_volume/2, 1), holder.my_atom, 0, 0)
+ e.holder_damage(holder.my_atom)
+ if(isliving(holder.my_atom))
+ e.amount *= 0.5
+ var/mob/living/L = holder.my_atom
+ if(L.stat!=DEAD)
+ e.amount *= 0.5
+ e.start()
+
+ holder.clear_reagents()
+ return
+
+/datum/chemical_reaction/sodiumchloride
+ name = "Sodium Chloride"
+ id = "sodiumchloride"
+ result = "sodiumchloride"
+ required_reagents = list("sodium" = 1, "chlorine" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/flash_powder
+ name = "Flash powder"
+ id = "flash_powder"
+ result = null
+ required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 )
+ result_amount = null
+
+/datum/chemical_reaction/flash_powder/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(2, 1, location)
+ s.start()
+ for(var/mob/living/carbon/M in viewers(world.view, location))
+ switch(get_dist(M, location))
+ if(0 to 3)
+ if(hasvar(M, "glasses"))
+ if(istype(M:glasses, /obj/item/clothing/glasses/sunglasses))
+ continue
+
+ flick("e_flash", M.flash)
+ M.Weaken(15)
+
+ if(4 to 5)
+ if(hasvar(M, "glasses"))
+ if(istype(M:glasses, /obj/item/clothing/glasses/sunglasses))
+ continue
+
+ flick("e_flash", M.flash)
+ M.Stun(5)
+
+/datum/chemical_reaction/napalm
+ name = "Napalm"
+ id = "napalm"
+ result = null
+ required_reagents = list("aluminum" = 1, "phoron" = 1, "sacid" = 1 )
+ result_amount = 1
+
+/datum/chemical_reaction/napalm/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/turf/location = get_turf(holder.my_atom.loc)
+ for(var/turf/simulated/floor/target_tile in range(0,location))
+ target_tile.assume_gas("volatile_fuel", created_volume, 400+T0C)
+ spawn (0) target_tile.hotspot_expose(700, 400)
+ holder.del_reagent("napalm")
+ return
+
/*
- mix_virus
- name = "Mix Virus"
- id = "mixvirus"
- result = "blood"
- required_reagents = list("virusfood" = 5)
- required_catalysts = list("blood")
- var/level = 2
+/datum/chemical_reaction/smoke
+ name = "Smoke"
+ id = "smoke"
+ result = null
+ required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1 )
+ result_amount = null
+ secondary = 1
+ on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/system/bad_smoke_spread/S = new /datum/effect/system/bad_smoke_spread
+ S.attach(location)
+ S.set_up(10, 0, location)
+ playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
+ spawn(0)
+ S.start()
+ sleep(10)
+ S.start()
+ sleep(10)
+ S.start()
+ sleep(10)
+ S.start()
+ sleep(10)
+ S.start()
+ holder.clear_reagents()
+ return */
- on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/chemical_reaction/chemsmoke
+ name = "Chemsmoke"
+ id = "chemsmoke"
+ result = null
+ required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1)
+ result_amount = 0.4
+ secondary = 1
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
- if(B && B.data)
- var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
- if(D)
- D.Evolve(level - rand(0, 1))
+/datum/chemical_reaction/chemsmoke/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
+ S.attach(location)
+ S.set_up(holder, created_volume, 0, location)
+ playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
+ spawn(0)
+ S.start()
+ holder.clear_reagents()
+ return
+
+/datum/chemical_reaction/chloralhydrate
+ name = "Chloral Hydrate"
+ id = "chloralhydrate"
+ result = "chloralhydrate"
+ required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/potassium_chloride
+ name = "Potassium Chloride"
+ id = "potassium_chloride"
+ result = "potassium_chloride"
+ required_reagents = list("sodiumchloride" = 1, "potassium" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/potassium_chlorophoride
+ name = "Potassium Chlorophoride"
+ id = "potassium_chlorophoride"
+ result = "potassium_chlorophoride"
+ required_reagents = list("potassium_chloride" = 1, "phoron" = 1, "chloralhydrate" = 1)
+ result_amount = 4
+
+/datum/chemical_reaction/stoxin
+ name = "Soporific"
+ id = "stoxin"
+ result = "stoxin"
+ required_reagents = list("chloralhydrate" = 1, "sugar" = 4)
+ result_amount = 5
+
+/datum/chemical_reaction/zombiepowder
+ name = "Zombie Powder"
+ id = "zombiepowder"
+ result = "zombiepowder"
+ required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5)
+ result_amount = 2
+
+/datum/chemical_reaction/rezadone
+ name = "Rezadone"
+ id = "rezadone"
+ result = "rezadone"
+ required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/mindbreaker
+ name = "Mindbreaker Toxin"
+ id = "mindbreaker"
+ result = "mindbreaker"
+ required_reagents = list("silicon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/lipozine
+ name = "Lipozine"
+ id = "Lipozine"
+ result = "lipozine"
+ required_reagents = list("sodiumchloride" = 1, "ethanol" = 1, "radium" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/phoronsolidification
+ name = "Solid Phoron"
+ id = "solidphoron"
+ result = null
+ required_reagents = list("iron" = 5, "frostoil" = 5, "phoron" = 20)
+ result_amount = 1
+
+/datum/chemical_reaction/phoronsolidification/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ new /obj/item/stack/sheet/mineral/phoron(location)
+ return
+
+/datum/chemical_reaction/plastication
+ name = "Plastic"
+ id = "solidplastic"
+ result = null
+ required_reagents = list("pacid" = 10, "plasticide" = 20)
+ result_amount = 1
+
+/datum/chemical_reaction/plastication/on_reaction(var/datum/reagents/holder)
+ new /obj/item/stack/sheet/mineral/plastic(get_turf(holder.my_atom),10)
+ return
+
+/datum/chemical_reaction/virus_food
+ name = "Virus Food"
+ id = "virusfood"
+ result = "virusfood"
+ required_reagents = list("water" = 1, "milk" = 1, "oxygen" = 1)
+ result_amount = 3
+/*
+/datum/chemical_reaction/mix_virus
+ name = "Mix Virus"
+ id = "mixvirus"
+ result = "blood"
+ required_reagents = list("virusfood" = 5)
+ required_catalysts = list("blood")
+ var/level = 2
+
+ on_reaction(var/datum/reagents/holder, var/created_volume)
+
+ var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
+ if(B && B.data)
+ var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
+ if(D)
+ D.Evolve(level - rand(0, 1))
- mix_virus_2
+ mix_virus_2
- name = "Mix Virus 2"
- id = "mixvirus2"
- required_reagents = list("mutagen" = 5)
- level = 4
+ name = "Mix Virus 2"
+ id = "mixvirus2"
+ required_reagents = list("mutagen" = 5)
+ level = 4
- rem_virus
+ rem_virus
- name = "Devolve Virus"
- id = "remvirus"
- required_reagents = list("synaptizine" = 5)
+ name = "Devolve Virus"
+ id = "remvirus"
+ required_reagents = list("synaptizine" = 5)
- on_reaction(var/datum/reagents/holder, var/created_volume)
+ on_reaction(var/datum/reagents/holder, var/created_volume)
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
- if(B && B.data)
- var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
- if(D)
- D.Devolve()
+ var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
+ if(B && B.data)
+ var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
+ if(D)
+ D.Devolve()
*/
- condensedcapsaicin
- name = "Condensed Capsaicin"
- id = "condensedcapsaicin"
- result = "condensedcapsaicin"
- required_reagents = list("capsaicin" = 2)
- required_catalysts = list("phoron" = 5)
- result_amount = 1
+/datum/chemical_reaction/condensedcapsaicin
+ name = "Condensed Capsaicin"
+ id = "condensedcapsaicin"
+ result = "condensedcapsaicin"
+ required_reagents = list("capsaicin" = 2)
+ required_catalysts = list("phoron" = 5)
+ result_amount = 1
- ketchup
- name = "Ketchup"
- id = "ketchup"
- result = "ketchup"
- required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1)
- result_amount = 4
+/datum/chemical_reaction/ketchup
+ name = "Ketchup"
+ id = "ketchup"
+ result = "ketchup"
+ required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1)
+ result_amount = 4
///////////////////////////////////////////////////////////////////////////////////
// foam and foam precursor
- surfactant
- name = "Foam surfactant"
- id = "foam surfactant"
- result = "fluorosurfactant"
- required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1)
- result_amount = 5
+/datum/chemical_reaction/surfactant
+ name = "Foam surfactant"
+ id = "foam surfactant"
+ result = "fluorosurfactant"
+ required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1)
+ result_amount = 5
- foam
- name = "Foam"
- id = "foam"
- result = null
- required_reagents = list("fluorosurfactant" = 1, "water" = 1)
- result_amount = 2
+/datum/chemical_reaction/foam
+ name = "Foam"
+ id = "foam"
+ result = null
+ required_reagents = list("fluorosurfactant" = 1, "water" = 1)
+ result_amount = 2
- on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/chemical_reaction/foam/on_reaction(var/datum/reagents/holder, var/created_volume)
+
+ var/location = get_turf(holder.my_atom)
+ for(var/mob/M in viewers(5, location))
+ M << "\red The solution violently bubbles!"
+
+ location = get_turf(holder.my_atom)
+
+ for(var/mob/M in viewers(5, location))
+ M << "\red The solution spews out foam!"
+
+ //world << "Holder volume is [holder.total_volume]"
+ //for(var/datum/reagent/R in holder.reagent_list)
+ // world << "[R.name] = [R.volume]"
+
+ var/datum/effect/effect/system/foam_spread/s = new()
+ s.set_up(created_volume, location, holder, 0)
+ s.start()
+ holder.clear_reagents()
+ return
+
+/datum/chemical_reaction/metalfoam
+ name = "Metal Foam"
+ id = "metalfoam"
+ result = null
+ required_reagents = list("aluminum" = 3, "foaming_agent" = 1, "pacid" = 1)
+ result_amount = 5
+
+/datum/chemical_reaction/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- for(var/mob/M in viewers(5, location))
- M << "\red The solution violently bubbles!"
+ var/location = get_turf(holder.my_atom)
- location = get_turf(holder.my_atom)
+ for(var/mob/M in viewers(5, location))
+ M << "\red The solution spews out a metalic foam!"
- for(var/mob/M in viewers(5, location))
- M << "\red The solution spews out foam!"
+ var/datum/effect/effect/system/foam_spread/s = new()
+ s.set_up(created_volume, location, holder, 1)
+ s.start()
+ return
- //world << "Holder volume is [holder.total_volume]"
- //for(var/datum/reagent/R in holder.reagent_list)
- // world << "[R.name] = [R.volume]"
+/datum/chemical_reaction/ironfoam
+ name = "Iron Foam"
+ id = "ironlfoam"
+ result = null
+ required_reagents = list("iron" = 3, "foaming_agent" = 1, "pacid" = 1)
+ result_amount = 5
- var/datum/effect/effect/system/foam_spread/s = new()
- s.set_up(created_volume, location, holder, 0)
- s.start()
- holder.clear_reagents()
- return
-
- metalfoam
- name = "Metal Foam"
- id = "metalfoam"
- result = null
- required_reagents = list("aluminum" = 3, "foaming_agent" = 1, "pacid" = 1)
- result_amount = 5
-
- on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/chemical_reaction/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
+ var/location = get_turf(holder.my_atom)
- for(var/mob/M in viewers(5, location))
- M << "\red The solution spews out a metalic foam!"
+ for(var/mob/M in viewers(5, location))
+ M << "\red The solution spews out a metalic foam!"
- var/datum/effect/effect/system/foam_spread/s = new()
- s.set_up(created_volume, location, holder, 1)
- s.start()
- return
-
- ironfoam
- name = "Iron Foam"
- id = "ironlfoam"
- result = null
- required_reagents = list("iron" = 3, "foaming_agent" = 1, "pacid" = 1)
- result_amount = 5
-
- on_reaction(var/datum/reagents/holder, var/created_volume)
-
-
- var/location = get_turf(holder.my_atom)
-
- for(var/mob/M in viewers(5, location))
- M << "\red The solution spews out a metalic foam!"
-
- var/datum/effect/effect/system/foam_spread/s = new()
- s.set_up(created_volume, location, holder, 2)
- s.start()
- return
+ var/datum/effect/effect/system/foam_spread/s = new()
+ s.set_up(created_volume, location, holder, 2)
+ s.start()
+ return
- foaming_agent
- name = "Foaming Agent"
- id = "foaming_agent"
- result = "foaming_agent"
- required_reagents = list("lithium" = 1, "hydrogen" = 1)
- result_amount = 1
+/datum/chemical_reaction/foaming_agent
+ name = "Foaming Agent"
+ id = "foaming_agent"
+ result = "foaming_agent"
+ required_reagents = list("lithium" = 1, "hydrogen" = 1)
+ result_amount = 1
- // Synthesizing these three chemicals is pretty complex in real life, but fuck it, it's just a game!
- ammonia
- name = "Ammonia"
- id = "ammonia"
- result = "ammonia"
- required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
- result_amount = 3
+// Synthesizing these three chemicals is pretty complex in real life, but fuck it, it's just a game!
+/datum/chemical_reaction/ammonia
+ name = "Ammonia"
+ id = "ammonia"
+ result = "ammonia"
+ required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
+ result_amount = 3
- diethylamine
- name = "Diethylamine"
- id = "diethylamine"
- result = "diethylamine"
- required_reagents = list ("ammonia" = 1, "ethanol" = 1)
- result_amount = 2
+/datum/chemical_reaction/diethylamine
+ name = "Diethylamine"
+ id = "diethylamine"
+ result = "diethylamine"
+ required_reagents = list ("ammonia" = 1, "ethanol" = 1)
+ result_amount = 2
- space_cleaner
- name = "Space cleaner"
- id = "cleaner"
- result = "cleaner"
- required_reagents = list("ammonia" = 1, "water" = 1)
- result_amount = 2
+/datum/chemical_reaction/space_cleaner
+ name = "Space cleaner"
+ id = "cleaner"
+ result = "cleaner"
+ required_reagents = list("ammonia" = 1, "water" = 1)
+ result_amount = 2
- plantbgone
- name = "Plant-B-Gone"
- id = "plantbgone"
- result = "plantbgone"
- required_reagents = list("toxin" = 1, "water" = 4)
- result_amount = 5
+/datum/chemical_reaction/plantbgone
+ name = "Plant-B-Gone"
+ id = "plantbgone"
+ result = "plantbgone"
+ required_reagents = list("toxin" = 1, "water" = 4)
+ result_amount = 5
/////////////////////////////////////OLD SLIME CORE REACTIONS ///////////////////////////////
/*
- slimepepper
- name = "Slime Condensedcapaicin"
- id = "m_condensedcapaicin"
- result = "condensedcapsaicin"
- required_reagents = list("sugar" = 1)
- result_amount = 1
- required_container = /obj/item/slime_core
- required_other = 1
- slimefrost
- name = "Slime Frost Oil"
- id = "m_frostoil"
- result = "frostoil"
- required_reagents = list("water" = 1)
- result_amount = 1
- required_container = /obj/item/slime_core
- required_other = 1
- slimeglycerol
- name = "Slime Glycerol"
- id = "m_glycerol"
- result = "glycerol"
- required_reagents = list("blood" = 1)
- result_amount = 1
- required_container = /obj/item/slime_core
- required_other = 1
+slimepepper
+ name = "Slime Condensedcapaicin"
+ id = "m_condensedcapaicin"
+ result = "condensedcapsaicin"
+ required_reagents = list("sugar" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_core
+ required_other = 1
+slimefrost
+ name = "Slime Frost Oil"
+ id = "m_frostoil"
+ result = "frostoil"
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_core
+ required_other = 1
+slimeglycerol
+ name = "Slime Glycerol"
+ id = "m_glycerol"
+ result = "glycerol"
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_core
+ required_other = 1
- slime_explosion
- name = "Slime Explosion"
- id = "m_explosion"
- result = null
- required_reagents = list("blood" = 1)
- result_amount = 2
- required_container = /obj/item/slime_core
- required_other = 2
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- var/datum/effect/effect/system/reagents_explosion/e = new()
- e.set_up(round (created_volume/10, 1), location, 0, 0)
- e.start()
+slime_explosion
+ name = "Slime Explosion"
+ id = "m_explosion"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 2
+ required_container = /obj/item/slime_core
+ required_other = 2
+ on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/reagents_explosion/e = new()
+ e.set_up(round (created_volume/10, 1), location, 0, 0)
+ e.start()
- holder.clear_reagents()
- return
- slimejam
- name = "Slime Jam"
- id = "m_jam"
- result = "slimejelly"
- required_reagents = list("water" = 1)
- result_amount = 1
- required_container = /obj/item/slime_core
- required_other = 2
- slimesynthi
- name = "Slime Synthetic Flesh"
- id = "m_flesh"
- result = null
- required_reagents = list("sugar" = 1)
- result_amount = 1
- required_container = /obj/item/slime_core
- required_other = 2
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location)
- return
+ holder.clear_reagents()
+ return
+slimejam
+ name = "Slime Jam"
+ id = "m_jam"
+ result = "slimejelly"
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_core
+ required_other = 2
+slimesynthi
+ name = "Slime Synthetic Flesh"
+ id = "m_flesh"
+ result = null
+ required_reagents = list("sugar" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_core
+ required_other = 2
+ on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location)
+ return
- slimeenzyme
- name = "Slime Enzyme"
- id = "m_enzyme"
- result = "enzyme"
- required_reagents = list("blood" = 1, "water" = 1)
- result_amount = 2
- required_container = /obj/item/slime_core
- required_other = 3
- slimeplasma
- name = "Slime Plasma"
- id = "m_plasma"
- result = "plasma"
- required_reagents = list("sugar" = 1, "blood" = 2)
- result_amount = 2
- required_container = /obj/item/slime_core
- required_other = 3
- slimevirus
- name = "Slime Virus"
- id = "m_virus"
- result = null
- required_reagents = list("sugar" = 1, "sacid" = 1)
- result_amount = 2
- required_container = /obj/item/slime_core
- required_other = 3
- on_reaction(var/datum/reagents/holder, var/created_volume)
- holder.clear_reagents()
+slimeenzyme
+ name = "Slime Enzyme"
+ id = "m_enzyme"
+ result = "enzyme"
+ required_reagents = list("blood" = 1, "water" = 1)
+ result_amount = 2
+ required_container = /obj/item/slime_core
+ required_other = 3
+slimeplasma
+ name = "Slime Plasma"
+ id = "m_plasma"
+ result = "plasma"
+ required_reagents = list("sugar" = 1, "blood" = 2)
+ result_amount = 2
+ required_container = /obj/item/slime_core
+ required_other = 3
+slimevirus
+ name = "Slime Virus"
+ id = "m_virus"
+ result = null
+ required_reagents = list("sugar" = 1, "sacid" = 1)
+ result_amount = 2
+ required_container = /obj/item/slime_core
+ required_other = 3
+ on_reaction(var/datum/reagents/holder, var/created_volume)
+ holder.clear_reagents()
- var/virus = pick(/datum/disease/advance/flu, /datum/disease/advance/cold, \
- /datum/disease/pierrot_throat, /datum/disease/fake_gbs, \
- /datum/disease/brainrot, /datum/disease/magnitis)
+ var/virus = pick(/datum/disease/advance/flu, /datum/disease/advance/cold, \
+ /datum/disease/pierrot_throat, /datum/disease/fake_gbs, \
+ /datum/disease/brainrot, /datum/disease/magnitis)
- var/datum/disease/F = new virus(0)
- var/list/data = list("viruses"= list(F))
- holder.add_reagent("blood", 20, data)
+ var/datum/disease/F = new virus(0)
+ var/list/data = list("viruses"= list(F))
+ holder.add_reagent("blood", 20, data)
- holder.add_reagent("cyanide", rand(1,10))
+ holder.add_reagent("cyanide", rand(1,10))
- return
+ return
- slimeteleport
- name = "Slime Teleport"
- id = "m_tele"
- result = null
- required_reagents = list("pacid" = 2, "mutagen" = 2)
- required_catalysts = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_core
- required_other = 4
- on_reaction(var/datum/reagents/holder, var/created_volume)
+slimeteleport
+ name = "Slime Teleport"
+ id = "m_tele"
+ result = null
+ required_reagents = list("pacid" = 2, "mutagen" = 2)
+ required_catalysts = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_core
+ required_other = 4
+ on_reaction(var/datum/reagents/holder, var/created_volume)
- // Calculate new position (searches through beacons in world)
- var/obj/item/device/radio/beacon/chosen
- var/list/possible = list()
- for(var/obj/item/device/radio/beacon/W in world)
- possible += W
+ // Calculate new position (searches through beacons in world)
+ var/obj/item/device/radio/beacon/chosen
+ var/list/possible = list()
+ for(var/obj/item/device/radio/beacon/W in world)
+ possible += W
- if(possible.len > 0)
- chosen = pick(possible)
+ if(possible.len > 0)
+ chosen = pick(possible)
- if(chosen)
- // Calculate previous position for transition
+ if(chosen)
+ // Calculate previous position for transition
- var/turf/FROM = get_turf(holder.my_atom) // the turf of origin we're travelling FROM
- var/turf/TO = get_turf(chosen) // the turf of origin we're travelling TO
+ var/turf/FROM = get_turf(holder.my_atom) // the turf of origin we're travelling FROM
+ var/turf/TO = get_turf(chosen) // the turf of origin we're travelling TO
- playsound(TO, 'sound/effects/phasein.ogg', 100, 1)
+ playsound(TO, 'sound/effects/phasein.ogg', 100, 1)
- var/list/flashers = list()
- for(var/mob/living/carbon/human/M in viewers(TO, null))
- if(M:eyecheck() <= 0)
- flick("e_flash", M.flash)
- flashers += M
+ var/list/flashers = list()
+ for(var/mob/living/carbon/human/M in viewers(TO, null))
+ if(M:eyecheck() <= 0)
+ flick("e_flash", M.flash)
+ flashers += M
- var/y_distance = TO.y - FROM.y
- var/x_distance = TO.x - FROM.x
- for (var/atom/movable/A in range(2, FROM )) // iterate thru list of mobs in the area
- if(istype(A, /obj/item/device/radio/beacon)) continue // don't teleport beacons because that's just insanely stupid
- if( A.anchored && !istype(A, /mob/dead/observer) ) continue // don't teleport anchored things (computers, tables, windows, grilles, etc) because this causes problems!
- // do teleport ghosts however because hell why not
+ var/y_distance = TO.y - FROM.y
+ var/x_distance = TO.x - FROM.x
+ for (var/atom/movable/A in range(2, FROM )) // iterate thru list of mobs in the area
+ if(istype(A, /obj/item/device/radio/beacon)) continue // don't teleport beacons because that's just insanely stupid
+ if( A.anchored && !istype(A, /mob/dead/observer) ) continue // don't teleport anchored things (computers, tables, windows, grilles, etc) because this causes problems!
+ // do teleport ghosts however because hell why not
- var/turf/newloc = locate(A.x + x_distance, A.y + y_distance, TO.z) // calculate the new place
- if(!A.Move(newloc)) // if the atom, for some reason, can't move, FORCE them to move! :) We try Move() first to invoke any movement-related checks the atom needs to perform after moving
- A.loc = locate(A.x + x_distance, A.y + y_distance, TO.z)
+ var/turf/newloc = locate(A.x + x_distance, A.y + y_distance, TO.z) // calculate the new place
+ if(!A.Move(newloc)) // if the atom, for some reason, can't move, FORCE them to move! :) We try Move() first to invoke any movement-related checks the atom needs to perform after moving
+ A.loc = locate(A.x + x_distance, A.y + y_distance, TO.z)
- spawn()
- if(ismob(A) && !(A in flashers)) // don't flash if we're already doing an effect
- var/mob/M = A
- if(M.client)
- var/obj/blueeffect = new /obj(src)
- blueeffect.screen_loc = "WEST,SOUTH to EAST,NORTH"
- blueeffect.icon = 'icons/effects/effects.dmi'
- blueeffect.icon_state = "shieldsparkles"
- blueeffect.layer = 17
- blueeffect.mouse_opacity = 0
- M.client.screen += blueeffect
- sleep(20)
- M.client.screen -= blueeffect
- del(blueeffect)
- slimecrit
- name = "Slime Crit"
- id = "m_tele"
- result = null
- required_reagents = list("sacid" = 1, "blood" = 1)
- required_catalysts = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_core
- required_other = 4
- on_reaction(var/datum/reagents/holder, var/created_volume)
+ spawn()
+ if(ismob(A) && !(A in flashers)) // don't flash if we're already doing an effect
+ var/mob/M = A
+ if(M.client)
+ var/obj/blueeffect = new /obj(src)
+ blueeffect.screen_loc = "WEST,SOUTH to EAST,NORTH"
+ blueeffect.icon = 'icons/effects/effects.dmi'
+ blueeffect.icon_state = "shieldsparkles"
+ blueeffect.layer = 17
+ blueeffect.mouse_opacity = 0
+ M.client.screen += blueeffect
+ sleep(20)
+ M.client.screen -= blueeffect
+ qdel(blueeffect)
+slimecrit
+ name = "Slime Crit"
+ id = "m_tele"
+ result = null
+ required_reagents = list("sacid" = 1, "blood" = 1)
+ required_catalysts = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_core
+ required_other = 4
+ on_reaction(var/datum/reagents/holder, var/created_volume)
- var/blocked = list(/mob/living/simple_animal/hostile,
- /mob/living/simple_animal/hostile/pirate,
- /mob/living/simple_animal/hostile/pirate/ranged,
- /mob/living/simple_animal/hostile/russian,
- /mob/living/simple_animal/hostile/russian/ranged,
- /mob/living/simple_animal/hostile/syndicate,
- /mob/living/simple_animal/hostile/syndicate/melee,
- /mob/living/simple_animal/hostile/syndicate/melee/space,
- /mob/living/simple_animal/hostile/syndicate/ranged,
- /mob/living/simple_animal/hostile/syndicate/ranged/space,
- /mob/living/simple_animal/hostile/alien/queen/large,
- /mob/living/simple_animal/clown
- )//exclusion list for things you don't want the reaction to create.
- var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
+ var/blocked = list(/mob/living/simple_animal/hostile,
+ /mob/living/simple_animal/hostile/pirate,
+ /mob/living/simple_animal/hostile/pirate/ranged,
+ /mob/living/simple_animal/hostile/russian,
+ /mob/living/simple_animal/hostile/russian/ranged,
+ /mob/living/simple_animal/hostile/syndicate,
+ /mob/living/simple_animal/hostile/syndicate/melee,
+ /mob/living/simple_animal/hostile/syndicate/melee/space,
+ /mob/living/simple_animal/hostile/syndicate/ranged,
+ /mob/living/simple_animal/hostile/syndicate/ranged/space,
+ /mob/living/simple_animal/hostile/alien/queen/large,
+ /mob/living/simple_animal/clown
+ )//exclusion list for things you don't want the reaction to create.
+ var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
- for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
- if(M:eyecheck() <= 0)
- flick("e_flash", M.flash)
+ for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
+ if(M:eyecheck() <= 0)
+ flick("e_flash", M.flash)
- for(var/i = 1, i <= created_volume, i++)
- var/chosen = pick(critters)
- var/mob/living/simple_animal/hostile/C = new chosen
- C.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(C, pick(NORTH,SOUTH,EAST,WEST))
- slimebork
- name = "Slime Bork"
- id = "m_tele"
- result = null
- required_reagents = list("sugar" = 1, "water" = 1)
- result_amount = 2
- required_container = /obj/item/slime_core
- required_other = 4
- on_reaction(var/datum/reagents/holder, var/created_volume)
+ for(var/i = 1, i <= created_volume, i++)
+ var/chosen = pick(critters)
+ var/mob/living/simple_animal/hostile/C = new chosen
+ C.loc = get_turf(holder.my_atom)
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(C, pick(NORTH,SOUTH,EAST,WEST))
+slimebork
+ name = "Slime Bork"
+ id = "m_tele"
+ result = null
+ required_reagents = list("sugar" = 1, "water" = 1)
+ result_amount = 2
+ required_container = /obj/item/slime_core
+ required_other = 4
+ on_reaction(var/datum/reagents/holder, var/created_volume)
- var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks
- // BORK BORK BORK
+ var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks
+ // BORK BORK BORK
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
- for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
- if(M:eyecheck() <= 0)
- flick("e_flash", M.flash)
+ for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
+ if(M:eyecheck() <= 0)
+ flick("e_flash", M.flash)
- for(var/i = 1, i <= created_volume + rand(1,2), i++)
- var/chosen = pick(borks)
- var/obj/B = new chosen
- if(B)
- B.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(B, pick(NORTH,SOUTH,EAST,WEST))
+ for(var/i = 1, i <= created_volume + rand(1,2), i++)
+ var/chosen = pick(borks)
+ var/obj/B = new chosen
+ if(B)
+ B.loc = get_turf(holder.my_atom)
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(B, pick(NORTH,SOUTH,EAST,WEST))
- slimechloral
- name = "Slime Chloral"
- id = "m_bunch"
- result = "chloralhydrate"
- required_reagents = list("blood" = 1, "water" = 2)
- result_amount = 2
- required_container = /obj/item/slime_core
- required_other = 5
- slimeretro
- name = "Slime Retro"
- id = "m_xeno"
- result = null
- required_reagents = list("sugar" = 1)
- result_amount = 1
- required_container = /obj/item/slime_core
- required_other = 5
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/datum/disease/F = new /datum/disease/dna_retrovirus(0)
- var/list/data = list("viruses"= list(F))
- holder.add_reagent("blood", 20, data)
- slimefoam
- name = "Slime Foam"
- id = "m_foam"
- result = null
- required_reagents = list("sacid" = 1)
- result_amount = 2
- required_container = /obj/item/slime_core
- required_other = 5
+slimechloral
+ name = "Slime Chloral"
+ id = "m_bunch"
+ result = "chloralhydrate"
+ required_reagents = list("blood" = 1, "water" = 2)
+ result_amount = 2
+ required_container = /obj/item/slime_core
+ required_other = 5
+slimeretro
+ name = "Slime Retro"
+ id = "m_xeno"
+ result = null
+ required_reagents = list("sugar" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_core
+ required_other = 5
+ on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/datum/disease/F = new /datum/disease/dna_retrovirus(0)
+ var/list/data = list("viruses"= list(F))
+ holder.add_reagent("blood", 20, data)
+slimefoam
+ name = "Slime Foam"
+ id = "m_foam"
+ result = null
+ required_reagents = list("sacid" = 1)
+ result_amount = 2
+ required_container = /obj/item/slime_core
+ required_other = 5
- on_reaction(var/datum/reagents/holder, var/created_volume)
+ on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- for(var/mob/M in viewers(5, location))
- M << "\red The solution violently bubbles!"
+ var/location = get_turf(holder.my_atom)
+ for(var/mob/M in viewers(5, location))
+ M << "\red The solution violently bubbles!"
- location = get_turf(holder.my_atom)
+ location = get_turf(holder.my_atom)
- for(var/mob/M in viewers(5, location))
- M << "\red The solution spews out foam!"
+ for(var/mob/M in viewers(5, location))
+ M << "\red The solution spews out foam!"
- //world << "Holder volume is [holder.total_volume]"
- //for(var/datum/reagent/R in holder.reagent_list)
- // world << "[R.name] = [R.volume]"
+ //world << "Holder volume is [holder.total_volume]"
+ //for(var/datum/reagent/R in holder.reagent_list)
+ // world << "[R.name] = [R.volume]"
- var/datum/effect/effect/system/foam_spread/s = new()
- s.set_up(created_volume, location, holder, 0)
- s.start()
- holder.clear_reagents()
- return
+ var/datum/effect/effect/system/foam_spread/s = new()
+ s.set_up(created_volume, location, holder, 0)
+ s.start()
+ holder.clear_reagents()
+ return
*/
/////////////////////////////////////////////NEW SLIME CORE REACTIONS/////////////////////////////////////////////
//Grey
- slimespawn
- name = "Slime Spawn"
- id = "m_spawn"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/grey
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1)
- var/mob/living/carbon/slime/S = new /mob/living/carbon/slime
- S.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimespawn
+ name = "Slime Spawn"
+ id = "m_spawn"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/grey
+ required_other = 1
+
+/datum/chemical_reaction/slimespawn/on_reaction(var/datum/reagents/holder)
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("\red Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1)
+ var/mob/living/carbon/slime/S = new /mob/living/carbon/slime
+ S.loc = get_turf(holder.my_atom)
- slimemonkey
- name = "Slime Monkey"
- id = "m_monkey"
- result = null
- required_reagents = list("blood" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/grey
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/i = 1, i <= 3, i++)
- var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube
- M.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimemonkey
+ name = "Slime Monkey"
+ id = "m_monkey"
+ result = null
+ required_reagents = list("blood" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/grey
+ required_other = 1
+
+/datum/chemical_reaction/slimemonkey/on_reaction(var/datum/reagents/holder)
+ for(var/i = 1, i <= 3, i++)
+ var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube
+ M.loc = get_turf(holder.my_atom)
//Green
- slimemutate
- name = "Mutation Toxin"
- id = "mutationtoxin"
- result = "mutationtoxin"
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_other = 1
- required_container = /obj/item/slime_extract/green
+/datum/chemical_reaction/slimemutate
+ name = "Mutation Toxin"
+ id = "mutationtoxin"
+ result = "mutationtoxin"
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_other = 1
+ required_container = /obj/item/slime_extract/green
//Metal
- slimemetal
- name = "Slime Metal"
- id = "m_metal"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/metal
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal
- M.amount = 15
- M.loc = get_turf(holder.my_atom)
- var/obj/item/stack/sheet/plasteel/P = new /obj/item/stack/sheet/plasteel
- P.amount = 5
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimemetal
+ name = "Slime Metal"
+ id = "m_metal"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/metal
+ required_other = 1
+
+/datum/chemical_reaction/slimemetal/on_reaction(var/datum/reagents/holder)
+ var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal
+ M.amount = 15
+ M.loc = get_turf(holder.my_atom)
+ var/obj/item/stack/sheet/plasteel/P = new /obj/item/stack/sheet/plasteel
+ P.amount = 5
+ P.loc = get_turf(holder.my_atom)
//Gold
- slimecrit
- name = "Slime Crit"
- id = "m_tele"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/gold
- required_other = 1
- on_reaction(var/datum/reagents/holder)
+/datum/chemical_reaction/slimecrit
+ name = "Slime Crit"
+ id = "m_tele"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/gold
+ required_other = 1
- /*var/blocked = list(/mob/living/simple_animal/hostile,
- /mob/living/simple_animal/hostile/pirate,
- /mob/living/simple_animal/hostile/pirate/ranged,
- /mob/living/simple_animal/hostile/russian,
- /mob/living/simple_animal/hostile/russian/ranged,
- /mob/living/simple_animal/hostile/syndicate,
- /mob/living/simple_animal/hostile/syndicate/melee,
- /mob/living/simple_animal/hostile/syndicate/melee/space,
- /mob/living/simple_animal/hostile/syndicate/ranged,
- /mob/living/simple_animal/hostile/syndicate/ranged/space,
- /mob/living/simple_animal/hostile/alien/queen/large,
- /mob/living/simple_animal/hostile/faithless,
- /mob/living/simple_animal/hostile/panther,
- /mob/living/simple_animal/hostile/snake,
- /mob/living/simple_animal/hostile/retaliate,
- /mob/living/simple_animal/hostile/retaliate/clown
- )//exclusion list for things you don't want the reaction to create.
- var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
+/datum/chemical_reaction/slimecrit/on_reaction(var/datum/reagents/holder)
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+ /*var/blocked = list(/mob/living/simple_animal/hostile,
+ /mob/living/simple_animal/hostile/pirate,
+ /mob/living/simple_animal/hostile/pirate/ranged,
+ /mob/living/simple_animal/hostile/russian,
+ /mob/living/simple_animal/hostile/russian/ranged,
+ /mob/living/simple_animal/hostile/syndicate,
+ /mob/living/simple_animal/hostile/syndicate/melee,
+ /mob/living/simple_animal/hostile/syndicate/melee/space,
+ /mob/living/simple_animal/hostile/syndicate/ranged,
+ /mob/living/simple_animal/hostile/syndicate/ranged/space,
+ /mob/living/simple_animal/hostile/alien/queen/large,
+ /mob/living/simple_animal/hostile/faithless,
+ /mob/living/simple_animal/hostile/panther,
+ /mob/living/simple_animal/hostile/snake,
+ /mob/living/simple_animal/hostile/retaliate,
+ /mob/living/simple_animal/hostile/retaliate/clown
+ )//exclusion list for things you don't want the reaction to create.
+ var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
- for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
- if(M:eyecheck() <= 0)
- flick("e_flash", M.flash)
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
- for(var/i = 1, i <= 5, i++)
- var/chosen = pick(critters)
- var/mob/living/simple_animal/hostile/C = new chosen
- C.faction = "slimesummon"
- C.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(C, pick(NORTH,SOUTH,EAST,WEST))*/
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The slime core fizzles disappointingly,"), 1)
+ for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
+ if(M:eyecheck() <= 0)
+ flick("e_flash", M.flash)
+
+ for(var/i = 1, i <= 5, i++)
+ var/chosen = pick(critters)
+ var/mob/living/simple_animal/hostile/C = new chosen
+ C.faction = "slimesummon"
+ C.loc = get_turf(holder.my_atom)
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(C, pick(NORTH,SOUTH,EAST,WEST))*/
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("\red The slime core fizzles disappointingly,"), 1)
//Silver
- slimebork
- name = "Slime Bork"
- id = "m_tele2"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/silver
- required_other = 1
- on_reaction(var/datum/reagents/holder)
+/datum/chemical_reaction/slimebork
+ name = "Slime Bork"
+ id = "m_tele2"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/silver
+ required_other = 1
- var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks
- // BORK BORK BORK
+/datum/chemical_reaction/slimebork/on_reaction(var/datum/reagents/holder)
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+ var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks
+ // BORK BORK BORK
- for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
- if(M:eyecheck() <= 0)
- flick("e_flash", M.flash)
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
- for(var/i = 1, i <= 4 + rand(1,2), i++)
- var/chosen = pick(borks)
- var/obj/B = new chosen
- if(B)
- B.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(B, pick(NORTH,SOUTH,EAST,WEST))
+ for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
+ if(M:eyecheck() <= 0)
+ flick("e_flash", M.flash)
+
+ for(var/i = 1, i <= 4 + rand(1,2), i++)
+ var/chosen = pick(borks)
+ var/obj/B = new chosen
+ if(B)
+ B.loc = get_turf(holder.my_atom)
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(B, pick(NORTH,SOUTH,EAST,WEST))
//Blue
- slimefrost
- name = "Slime Frost Oil"
- id = "m_frostoil"
- result = "frostoil"
- required_reagents = list("phoron" = 5)
- result_amount = 10
- required_container = /obj/item/slime_extract/blue
- required_other = 1
+/datum/chemical_reaction/slimefrost
+ name = "Slime Frost Oil"
+ id = "m_frostoil"
+ result = "frostoil"
+ required_reagents = list("phoron" = 5)
+ result_amount = 10
+ required_container = /obj/item/slime_extract/blue
+ required_other = 1
//Dark Blue
- slimefreeze
- name = "Slime Freeze"
- id = "m_freeze"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/darkblue
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
- sleep(50)
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
- for(var/mob/living/M in range (get_turf(holder.my_atom), 7))
- M.bodytemperature -= 140
- M << "\blue You feel a chill!"
+/datum/chemical_reaction/slimefreeze
+ name = "Slime Freeze"
+ id = "m_freeze"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/darkblue
+ required_other = 1
+
+/datum/chemical_reaction/slimefreeze/on_reaction(var/datum/reagents/holder)
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
+ sleep(50)
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+ for(var/mob/living/M in range (get_turf(holder.my_atom), 7))
+ M.bodytemperature -= 140
+ M << "\blue You feel a chill!"
//Orange
- slimecasp
- name = "Slime Capsaicin Oil"
- id = "m_capsaicinoil"
- result = "capsaicin"
- required_reagents = list("blood" = 5)
- result_amount = 10
- required_container = /obj/item/slime_extract/orange
- required_other = 1
+/datum/chemical_reaction/slimecasp
+ name = "Slime Capsaicin Oil"
+ id = "m_capsaicinoil"
+ result = "capsaicin"
+ required_reagents = list("blood" = 5)
+ result_amount = 10
+ required_container = /obj/item/slime_extract/orange
+ required_other = 1
- slimefire
- name = "Slime fire"
- id = "m_fire"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/orange
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
- sleep(50)
- var/turf/location = get_turf(holder.my_atom.loc)
- for(var/turf/simulated/floor/target_tile in range(0,location))
- target_tile.assume_gas("phoron", 25, 1400)
- spawn (0) target_tile.hotspot_expose(700, 400)
+/datum/chemical_reaction/slimefire
+ name = "Slime fire"
+ id = "m_fire"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/orange
+ required_other = 1
+
+/datum/chemical_reaction/slimefire/on_reaction(var/datum/reagents/holder)
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
+ sleep(50)
+ var/turf/location = get_turf(holder.my_atom.loc)
+ for(var/turf/simulated/floor/target_tile in range(0,location))
+ target_tile.assume_gas("phoron", 25, 1400)
+ spawn (0) target_tile.hotspot_expose(700, 400)
//Yellow
- slimeoverload
- name = "Slime EMP"
- id = "m_emp"
- result = null
- required_reagents = list("blood" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/yellow
- required_other = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- empulse(get_turf(holder.my_atom), 3, 7)
+/datum/chemical_reaction/slimeoverload
+ name = "Slime EMP"
+ id = "m_emp"
+ result = null
+ required_reagents = list("blood" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/yellow
+ required_other = 1
+
+/datum/chemical_reaction/slimeoverload/on_reaction(var/datum/reagents/holder, var/created_volume)
+ empulse(get_turf(holder.my_atom), 3, 7)
- slimecell
- name = "Slime Powercell"
- id = "m_cell"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/yellow
- required_other = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/obj/item/weapon/cell/slime/P = new /obj/item/weapon/cell/slime
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimecell
+ name = "Slime Powercell"
+ id = "m_cell"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/yellow
+ required_other = 1
- slimeglow
- name = "Slime Glow"
- id = "m_glow"
- result = null
- required_reagents = list("water" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/yellow
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The contents of the slime core harden and begin to emit a warm, bright light."), 1)
- var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime
- F.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimecell/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/obj/item/weapon/cell/slime/P = new /obj/item/weapon/cell/slime
+ P.loc = get_turf(holder.my_atom)
+
+/datum/chemical_reaction/slimeglow
+ name = "Slime Glow"
+ id = "m_glow"
+ result = null
+ required_reagents = list("water" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/yellow
+ required_other = 1
+
+/datum/chemical_reaction/slimeglow/on_reaction(var/datum/reagents/holder)
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("\red The contents of the slime core harden and begin to emit a warm, bright light."), 1)
+ var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime
+ F.loc = get_turf(holder.my_atom)
//Purple
- slimepsteroid
- name = "Slime Steroid"
- id = "m_steroid"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/purple
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimepsteroid
+ name = "Slime Steroid"
+ id = "m_steroid"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/purple
+ required_other = 1
+
+/datum/chemical_reaction/slimepsteroid/on_reaction(var/datum/reagents/holder)
+ var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid
+ P.loc = get_turf(holder.my_atom)
- slimejam
- name = "Slime Jam"
- id = "m_jam"
- result = "slimejelly"
- required_reagents = list("sugar" = 5)
- result_amount = 10
- required_container = /obj/item/slime_extract/purple
- required_other = 1
+/datum/chemical_reaction/slimejam
+ name = "Slime Jam"
+ id = "m_jam"
+ result = "slimejelly"
+ required_reagents = list("sugar" = 5)
+ result_amount = 10
+ required_container = /obj/item/slime_extract/purple
+ required_other = 1
//Dark Purple
- slimeplasma
- name = "Slime Plasma"
- id = "m_plasma"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/darkpurple
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/stack/sheet/mineral/phoron/P = new /obj/item/stack/sheet/mineral/phoron
- P.amount = 10
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimeplasma
+ name = "Slime Plasma"
+ id = "m_plasma"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/darkpurple
+ required_other = 1
+
+/datum/chemical_reaction/slimeplasma/on_reaction(var/datum/reagents/holder)
+ var/obj/item/stack/sheet/mineral/phoron/P = new /obj/item/stack/sheet/mineral/phoron
+ P.amount = 10
+ P.loc = get_turf(holder.my_atom)
//Red
- slimeglycerol
- name = "Slime Glycerol"
- id = "m_glycerol"
- result = "glycerol"
- required_reagents = list("phoron" = 5)
- result_amount = 8
- required_container = /obj/item/slime_extract/red
- required_other = 1
+/datum/chemical_reaction/slimeglycerol
+ name = "Slime Glycerol"
+ id = "m_glycerol"
+ result = "glycerol"
+ required_reagents = list("phoron" = 5)
+ result_amount = 8
+ required_container = /obj/item/slime_extract/red
+ required_other = 1
- slimebloodlust
- name = "Bloodlust"
- id = "m_bloodlust"
- result = null
- required_reagents = list("blood" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/red
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/mob/living/carbon/slime/slime in viewers(get_turf(holder.my_atom), null))
- slime.rabid = 1
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The [slime] is driven into a frenzy!"), 1)
+/datum/chemical_reaction/slimebloodlust
+ name = "Bloodlust"
+ id = "m_bloodlust"
+ result = null
+ required_reagents = list("blood" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/red
+ required_other = 1
+
+/datum/chemical_reaction/slimebloodlust/on_reaction(var/datum/reagents/holder)
+ for(var/mob/living/carbon/slime/slime in viewers(get_turf(holder.my_atom), null))
+ slime.rabid = 1
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("\red The [slime] is driven into a frenzy!"), 1)
//Pink
- slimeppotion
- name = "Slime Potion"
- id = "m_potion"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/pink
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/weapon/slimepotion/P = new /obj/item/weapon/slimepotion
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimeppotion
+ name = "Slime Potion"
+ id = "m_potion"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/pink
+ required_other = 1
+
+/datum/chemical_reaction/slimeppotion/on_reaction(var/datum/reagents/holder)
+ var/obj/item/weapon/slimepotion/P = new /obj/item/weapon/slimepotion
+ P.loc = get_turf(holder.my_atom)
//Black
- slimemutate2
- name = "Advanced Mutation Toxin"
- id = "mutationtoxin2"
- result = "amutationtoxin"
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_other = 1
- required_container = /obj/item/slime_extract/black
+/datum/chemical_reaction/slimemutate2
+ name = "Advanced Mutation Toxin"
+ id = "mutationtoxin2"
+ result = "amutationtoxin"
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_other = 1
+ required_container = /obj/item/slime_extract/black
//Oil
- slimeexplosion
- name = "Slime Explosion"
- id = "m_explosion"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/oil
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
- sleep(50)
- explosion(get_turf(holder.my_atom), 1 ,3, 6)
+/datum/chemical_reaction/slimeexplosion
+ name = "Slime Explosion"
+ id = "m_explosion"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/oil
+ required_other = 1
+
+/datum/chemical_reaction/slimeexplosion/on_reaction(var/datum/reagents/holder)
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
+ sleep(50)
+ explosion(get_turf(holder.my_atom), 1 ,3, 6)
//Light Pink
- slimepotion2
- name = "Slime Potion 2"
- id = "m_potion2"
- result = null
- result_amount = 1
- required_container = /obj/item/slime_extract/lightpink
- required_reagents = list("phoron" = 5)
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/weapon/slimepotion2/P = new /obj/item/weapon/slimepotion2
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimepotion2
+ name = "Slime Potion 2"
+ id = "m_potion2"
+ result = null
+ result_amount = 1
+ required_container = /obj/item/slime_extract/lightpink
+ required_reagents = list("phoron" = 5)
+ required_other = 1
+
+/datum/chemical_reaction/slimepotion2/on_reaction(var/datum/reagents/holder)
+ var/obj/item/weapon/slimepotion2/P = new /obj/item/weapon/slimepotion2
+ P.loc = get_turf(holder.my_atom)
//Adamantine
- slimegolem
- name = "Slime Golem"
- id = "m_golem"
- result = null
- required_reagents = list("phoron" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/adamantine
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/effect/golemrune/Z = new /obj/effect/golemrune
- Z.loc = get_turf(holder.my_atom)
- Z.announce_to_ghosts()
+/datum/chemical_reaction/slimegolem
+ name = "Slime Golem"
+ id = "m_golem"
+ result = null
+ required_reagents = list("phoron" = 5)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/adamantine
+ required_other = 1
+
+/datum/chemical_reaction/slimegolem/on_reaction(var/datum/reagents/holder)
+ var/obj/effect/golemrune/Z = new /obj/effect/golemrune
+ Z.loc = get_turf(holder.my_atom)
+ Z.announce_to_ghosts()
//////////////////////////////////////////PAINT///////////////////////////////////////////
//Crayon dust -> paint
- red_paint
- name = "Red paint"
- id = "red_paint"
- result = "paint"
- resultcolor = "#FE191A"
- required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_red" = 1)
- result_amount = 5
+/datum/chemical_reaction/red_paint
+ name = "Red paint"
+ id = "red_paint"
+ result = "paint"
+ resultcolor = "#FE191A"
+ required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_red" = 1)
+ result_amount = 5
- orange_paint
- name = "Orange paint"
- id = "orange_paint"
- result = "paint"
- resultcolor = "#FFBE4F"
- required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_orange" = 1)
- result_amount = 5
+/datum/chemical_reaction/orange_paint
+ name = "Orange paint"
+ id = "orange_paint"
+ result = "paint"
+ resultcolor = "#FFBE4F"
+ required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_orange" = 1)
+ result_amount = 5
- yellow_paint
- name = "Yellow paint"
- id = "yellow_paint"
- result = "paint"
- resultcolor = "#FDFE7D"
- required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_yellow" = 1)
- result_amount = 5
+/datum/chemical_reaction/yellow_paint
+ name = "Yellow paint"
+ id = "yellow_paint"
+ result = "paint"
+ resultcolor = "#FDFE7D"
+ required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_yellow" = 1)
+ result_amount = 5
- green_paint
- name = "Green paint"
- id = "green_paint"
- result = "paint"
- resultcolor = "#18A31A"
- required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_green" = 1)
- result_amount = 5
+/datum/chemical_reaction/green_paint
+ name = "Green paint"
+ id = "green_paint"
+ result = "paint"
+ resultcolor = "#18A31A"
+ required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_green" = 1)
+ result_amount = 5
- blue_paint
- name = "Blue paint"
- id = "blue_paint"
- result = "paint"
- resultcolor = "#247CFF"
- required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_blue" = 1)
- result_amount = 5
+/datum/chemical_reaction/blue_paint
+ name = "Blue paint"
+ id = "blue_paint"
+ result = "paint"
+ resultcolor = "#247CFF"
+ required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_blue" = 1)
+ result_amount = 5
- purple_paint
- name = "Purple paint"
- id = "purple_paint"
- result = "paint"
- resultcolor = "#CC0099"
- required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_purple" = 1)
- result_amount = 5
+/datum/chemical_reaction/purple_paint
+ name = "Purple paint"
+ id = "purple_paint"
+ result = "paint"
+ resultcolor = "#CC0099"
+ required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_purple" = 1)
+ result_amount = 5
- grey_paint //mime
- name = "Grey paint"
- id = "grey_paint"
- result = "paint"
- resultcolor = "#808080"
- required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_grey" = 1)
- result_amount = 5
+/datum/chemical_reaction/grey_paint //mime
+ name = "Grey paint"
+ id = "grey_paint"
+ result = "paint"
+ resultcolor = "#808080"
+ required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_grey" = 1)
+ result_amount = 5
- brown_paint
- name = "Brown paint"
- id = "brown_paint"
- result = "paint"
- resultcolor = "#846F35"
- required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_brown" = 1)
- result_amount = 5
+/datum/chemical_reaction/brown_paint
+ name = "Brown paint"
+ id = "brown_paint"
+ result = "paint"
+ resultcolor = "#846F35"
+ required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_brown" = 1)
+ result_amount = 5
//Ghetto reactions
/* Ideally the paint should take on the blood's colour (for each of the species)
- but I could not think of a way. - RKF
+but I could not think of a way. - RKF
- blood_paint
- name = "Blood paint"
- id = "blood_paint"
- result = "paint"
- resultcolor = "#C80000"
- required_reagents = list("plasticide" = 1, "water" = 3, "blood" = 2)
- result_amount = 5
+blood_paint
+ name = "Blood paint"
+ id = "blood_paint"
+ result = "paint"
+ resultcolor = "#C80000"
+ required_reagents = list("plasticide" = 1, "water" = 3, "blood" = 2)
+ result_amount = 5
*/
- milk_paint
- name = "Milk paint"
- id = "milk_paint"
- result = "paint"
- resultcolor = "#F0F8FF"
- required_reagents = list("plasticide" = 1, "water" = 3, "milk" = 5)
- result_amount = 5
+/datum/chemical_reaction/milk_paint
+ name = "Milk paint"
+ id = "milk_paint"
+ result = "paint"
+ resultcolor = "#F0F8FF"
+ required_reagents = list("plasticide" = 1, "water" = 3, "milk" = 5)
+ result_amount = 5
- orange_juice_paint
- name = "Orange juice paint"
- id = "orange_juice_paint"
- result = "paint"
- resultcolor = "#E78108"
- required_reagents = list("plasticide" = 1, "water" = 3, "orangejuice" = 5)
- result_amount = 5
+/datum/chemical_reaction/orange_juice_paint
+ name = "Orange juice paint"
+ id = "orange_juice_paint"
+ result = "paint"
+ resultcolor = "#E78108"
+ required_reagents = list("plasticide" = 1, "water" = 3, "orangejuice" = 5)
+ result_amount = 5
- tomato_juice_paint
- name = "Tomato juice paint"
- id = "tomato_juice_paint"
- result = "paint"
- resultcolor = "#731008"
- required_reagents = list("plasticide" = 1, "water" = 3, "tomatojuice" = 5)
- result_amount = 5
+/datum/chemical_reaction/tomato_juice_paint
+ name = "Tomato juice paint"
+ id = "tomato_juice_paint"
+ result = "paint"
+ resultcolor = "#731008"
+ required_reagents = list("plasticide" = 1, "water" = 3, "tomatojuice" = 5)
+ result_amount = 5
- lime_juice_paint
- name = "Lime juice paint"
- id = "lime_juice_paint"
- result = "paint"
- resultcolor = "#365E30"
- required_reagents = list("plasticide" = 1, "water" = 3, "limejuice" = 5)
- result_amount = 5
+/datum/chemical_reaction/lime_juice_paint
+ name = "Lime juice paint"
+ id = "lime_juice_paint"
+ result = "paint"
+ resultcolor = "#365E30"
+ required_reagents = list("plasticide" = 1, "water" = 3, "limejuice" = 5)
+ result_amount = 5
- carrot_juice_paint
- name = "Carrot juice paint"
- id = "carrot_juice_paint"
- result = "paint"
- resultcolor = "#973800"
- required_reagents = list("plasticide" = 1, "water" = 3, "carrotjuice" = 5)
- result_amount = 5
+/datum/chemical_reaction/carrot_juice_paint
+ name = "Carrot juice paint"
+ id = "carrot_juice_paint"
+ result = "paint"
+ resultcolor = "#973800"
+ required_reagents = list("plasticide" = 1, "water" = 3, "carrotjuice" = 5)
+ result_amount = 5
- berry_juice_paint
- name = "Berry juice paint"
- id = "berry_juice_paint"
- result = "paint"
- resultcolor = "#990066"
- required_reagents = list("plasticide" = 1, "water" = 3, "berryjuice" = 5)
- result_amount = 5
+/datum/chemical_reaction/berry_juice_paint
+ name = "Berry juice paint"
+ id = "berry_juice_paint"
+ result = "paint"
+ resultcolor = "#990066"
+ required_reagents = list("plasticide" = 1, "water" = 3, "berryjuice" = 5)
+ result_amount = 5
- grape_juice_paint
- name = "Grape juice paint"
- id = "grape_juice_paint"
- result = "paint"
- resultcolor = "#863333"
- required_reagents = list("plasticide" = 1, "water" = 3, "grapejuice" = 5)
- result_amount = 5
+/datum/chemical_reaction/grape_juice_paint
+ name = "Grape juice paint"
+ id = "grape_juice_paint"
+ result = "paint"
+ resultcolor = "#863333"
+ required_reagents = list("plasticide" = 1, "water" = 3, "grapejuice" = 5)
+ result_amount = 5
- poisonberry_juice_paint
- name = "Poison berry juice paint"
- id = "poisonberry_juice_paint"
- result = "paint"
- resultcolor = "#863353"
- required_reagents = list("plasticide" = 1, "water" = 3, "poisonberryjuice" = 5)
- result_amount = 5
+/datum/chemical_reaction/poisonberry_juice_paint
+ name = "Poison berry juice paint"
+ id = "poisonberry_juice_paint"
+ result = "paint"
+ resultcolor = "#863353"
+ required_reagents = list("plasticide" = 1, "water" = 3, "poisonberryjuice" = 5)
+ result_amount = 5
- watermelon_juice_paint
- name = "Watermelon juice paint"
- id = "watermelon_juice_paint"
- result = "paint"
- resultcolor = "#B83333"
- required_reagents = list("plasticide" = 1, "water" = 3, "watermelonjuice" = 5)
- result_amount = 5
+/datum/chemical_reaction/watermelon_juice_paint
+ name = "Watermelon juice paint"
+ id = "watermelon_juice_paint"
+ result = "paint"
+ resultcolor = "#B83333"
+ required_reagents = list("plasticide" = 1, "water" = 3, "watermelonjuice" = 5)
+ result_amount = 5
- lemon_juice_paint
- name = "Lemon juice paint"
- id = "lemon_juice_paint"
- result = "paint"
- resultcolor = "#AFAF00"
- required_reagents = list("plasticide" = 1, "water" = 3, "lemonjuice" = 5)
- result_amount = 5
+/datum/chemical_reaction/lemon_juice_paint
+ name = "Lemon juice paint"
+ id = "lemon_juice_paint"
+ result = "paint"
+ resultcolor = "#AFAF00"
+ required_reagents = list("plasticide" = 1, "water" = 3, "lemonjuice" = 5)
+ result_amount = 5
- banana_juice_paint
- name = "Banana juice paint"
- id = "banana_juice_paint"
- result = "paint"
- resultcolor = "#C3AF00"
- required_reagents = list("plasticide" = 1, "water" = 3, "banana" = 5)
- result_amount = 5
+/datum/chemical_reaction/banana_juice_paint
+ name = "Banana juice paint"
+ id = "banana_juice_paint"
+ result = "paint"
+ resultcolor = "#C3AF00"
+ required_reagents = list("plasticide" = 1, "water" = 3, "banana" = 5)
+ result_amount = 5
- potato_juice_paint
- name = "Potato juice paint"
- id = "potato_juice_paint"
- result = "paint"
- resultcolor = "#302000"
- required_reagents = list("plasticide" = 1, "water" = 3, "potatojuice" = 5)
- result_amount = 5
+/datum/chemical_reaction/potato_juice_paint
+ name = "Potato juice paint"
+ id = "potato_juice_paint"
+ result = "paint"
+ resultcolor = "#302000"
+ required_reagents = list("plasticide" = 1, "water" = 3, "potatojuice" = 5)
+ result_amount = 5
//Other paint
- carbon_paint
- name = "Carbon paint"
- id = "carbon_paint"
- result = "paint"
- resultcolor = "#333333"
- required_reagents = list("plasticide" = 1, "water" = 3, "carbon" = 1)
- result_amount = 5
+/datum/chemical_reaction/carbon_paint
+ name = "Carbon paint"
+ id = "carbon_paint"
+ result = "paint"
+ resultcolor = "#333333"
+ required_reagents = list("plasticide" = 1, "water" = 3, "carbon" = 1)
+ result_amount = 5
- aluminum_paint
- name = "Aluminum paint"
- id = "aluminum_paint"
- result = "paint"
- resultcolor = "#F0F8FF"
- required_reagents = list("plasticide" = 1, "water" = 3, "aluminum" = 1)
- result_amount = 5
+/datum/chemical_reaction/aluminum_paint
+ name = "Aluminum paint"
+ id = "aluminum_paint"
+ result = "paint"
+ resultcolor = "#F0F8FF"
+ required_reagents = list("plasticide" = 1, "water" = 3, "aluminum" = 1)
+ result_amount = 5
//////////////////////////////////////////FOOD MIXTURES////////////////////////////////////
- tofu
- name = "Tofu"
- id = "tofu"
- result = null
- required_reagents = list("soymilk" = 10)
- required_catalysts = list("enzyme" = 5)
- result_amount = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- for(var/i = 1, i <= created_volume, i++)
- new /obj/item/weapon/reagent_containers/food/snacks/tofu(location)
- return
+/datum/chemical_reaction/tofu
+ name = "Tofu"
+ id = "tofu"
+ result = null
+ required_reagents = list("soymilk" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 1
- chocolate_bar
- name = "Chocolate Bar"
- id = "chocolate_bar"
- result = null
- required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2)
- result_amount = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- for(var/i = 1, i <= created_volume, i++)
- new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
- return
+/datum/chemical_reaction/tofu/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ for(var/i = 1, i <= created_volume, i++)
+ new /obj/item/weapon/reagent_containers/food/snacks/tofu(location)
+ return
- chocolate_bar2
- name = "Chocolate Bar"
- id = "chocolate_bar"
- result = null
- required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2)
- result_amount = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- for(var/i = 1, i <= created_volume, i++)
- new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
- return
+/datum/chemical_reaction/chocolate_bar
+ name = "Chocolate Bar"
+ id = "chocolate_bar"
+ result = null
+ required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2)
+ result_amount = 1
- hot_coco
- name = "Hot Coco"
- id = "hot_coco"
- result = "hot_coco"
- required_reagents = list("water" = 5, "coco" = 1)
- result_amount = 5
+/datum/chemical_reaction/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ for(var/i = 1, i <= created_volume, i++)
+ new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
+ return
- soysauce
- name = "Soy Sauce"
- id = "soysauce"
- result = "soysauce"
- required_reagents = list("soymilk" = 4, "sacid" = 1)
- result_amount = 5
+/datum/chemical_reaction/chocolate_bar2
+ name = "Chocolate Bar"
+ id = "chocolate_bar"
+ result = null
+ required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2)
+ result_amount = 1
- cheesewheel
- name = "Cheesewheel"
- id = "cheesewheel"
- result = null
- required_reagents = list("milk" = 40)
- required_catalysts = list("enzyme" = 5)
- result_amount = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- new /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel(location)
- return
+/datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ for(var/i = 1, i <= created_volume, i++)
+ new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
+ return
- meatball
- name = "Meatball"
- id = "meatball"
- result = null
- required_reagents = list("protein" = 3, "flour" = 5)
- result_amount = 3
- on_reaction(var/datum/reagents/holder, var/created_volume)
- new /obj/item/weapon/reagent_containers/food/snacks/meatball(get_turf(holder.my_atom))
- return
+/datum/chemical_reaction/hot_coco
+ name = "Hot Coco"
+ id = "hot_coco"
+ result = "hot_coco"
+ required_reagents = list("water" = 5, "coco" = 1)
+ result_amount = 5
- dough
- name = "Dough"
- id = "dough"
- result = null
- required_reagents = list("egg" = 3, "flour" = 10)
- result_amount = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/turf/T = get_turf(holder.my_atom)
- for(var/i = 1 to created_volume)
- new /obj/item/weapon/reagent_containers/food/snacks/dough(T)
- return
+/datum/chemical_reaction/soysauce
+ name = "Soy Sauce"
+ id = "soysauce"
+ result = "soysauce"
+ required_reagents = list("soymilk" = 4, "sacid" = 1)
+ result_amount = 5
- syntiflesh
- name = "Syntiflesh"
- id = "syntiflesh"
- result = null
- required_reagents = list("blood" = 5, "clonexadone" = 1)
- result_amount = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/turf/T = get_turf(holder.my_atom)
- for(var/i = 1 to created_volume)
- new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(T)
- return
+/datum/chemical_reaction/cheesewheel
+ name = "Cheesewheel"
+ id = "cheesewheel"
+ result = null
+ required_reagents = list("milk" = 40)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 1
- hot_ramen
- name = "Hot Ramen"
- id = "hot_ramen"
- result = "hot_ramen"
- required_reagents = list("water" = 1, "dry_ramen" = 3)
- result_amount = 3
+/datum/chemical_reaction/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ new /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel(location)
+ return
- hell_ramen
- name = "Hell Ramen"
- id = "hell_ramen"
- result = "hell_ramen"
- required_reagents = list("capsaicin" = 1, "hot_ramen" = 6)
- result_amount = 6
+/datum/chemical_reaction/meatball
+ name = "Meatball"
+ id = "meatball"
+ result = null
+ required_reagents = list("protein" = 3, "flour" = 5)
+ result_amount = 3
+
+/datum/chemical_reaction/meatball/on_reaction(var/datum/reagents/holder, var/created_volume)
+ new /obj/item/weapon/reagent_containers/food/snacks/meatball(get_turf(holder.my_atom))
+ return
+
+/datum/chemical_reaction/dough
+ name = "Dough"
+ id = "dough"
+ result = null
+ required_reagents = list("egg" = 3, "flour" = 10)
+ result_amount = 1
+
+/datum/chemical_reaction/dough/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/turf/T = get_turf(holder.my_atom)
+ for(var/i = 1 to created_volume)
+ new /obj/item/weapon/reagent_containers/food/snacks/dough(T)
+ return
+
+/datum/chemical_reaction/syntiflesh
+ name = "Syntiflesh"
+ id = "syntiflesh"
+ result = null
+ required_reagents = list("blood" = 5, "clonexadone" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/turf/T = get_turf(holder.my_atom)
+ for(var/i = 1 to created_volume)
+ new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(T)
+ return
+
+/datum/chemical_reaction/hot_ramen
+ name = "Hot Ramen"
+ id = "hot_ramen"
+ result = "hot_ramen"
+ required_reagents = list("water" = 1, "dry_ramen" = 3)
+ result_amount = 3
+
+/datum/chemical_reaction/hell_ramen
+ name = "Hell Ramen"
+ id = "hell_ramen"
+ result = "hell_ramen"
+ required_reagents = list("capsaicin" = 1, "hot_ramen" = 6)
+ result_amount = 6
////////////////////////////////////////// COCKTAILS //////////////////////////////////////
- goldschlager
- name = "Goldschlager"
- id = "goldschlager"
- result = "goldschlager"
- required_reagents = list("vodka" = 10, "gold" = 1)
- result_amount = 10
+/datum/chemical_reaction/goldschlager
+ name = "Goldschlager"
+ id = "goldschlager"
+ result = "goldschlager"
+ required_reagents = list("vodka" = 10, "gold" = 1)
+ result_amount = 10
- patron
- name = "Patron"
- id = "patron"
- result = "patron"
- required_reagents = list("tequilla" = 10, "silver" = 1)
- result_amount = 10
+/datum/chemical_reaction/patron
+ name = "Patron"
+ id = "patron"
+ result = "patron"
+ required_reagents = list("tequilla" = 10, "silver" = 1)
+ result_amount = 10
- bilk
- name = "Bilk"
- id = "bilk"
- result = "bilk"
- required_reagents = list("milk" = 1, "beer" = 1)
- result_amount = 2
+/datum/chemical_reaction/bilk
+ name = "Bilk"
+ id = "bilk"
+ result = "bilk"
+ required_reagents = list("milk" = 1, "beer" = 1)
+ result_amount = 2
- icetea
- name = "Iced Tea"
- id = "icetea"
- result = "icetea"
- required_reagents = list("ice" = 1, "tea" = 3)
- result_amount = 4
+/datum/chemical_reaction/icetea
+ name = "Iced Tea"
+ id = "icetea"
+ result = "icetea"
+ required_reagents = list("ice" = 1, "tea" = 3)
+ result_amount = 4
- icecoffee
- name = "Iced Coffee"
- id = "icecoffee"
- result = "icecoffee"
- required_reagents = list("ice" = 1, "coffee" = 3)
- result_amount = 4
+/datum/chemical_reaction/icecoffee
+ name = "Iced Coffee"
+ id = "icecoffee"
+ result = "icecoffee"
+ required_reagents = list("ice" = 1, "coffee" = 3)
+ result_amount = 4
- nuka_cola
- name = "Nuka Cola"
- id = "nuka_cola"
- result = "nuka_cola"
- required_reagents = list("uranium" = 1, "cola" = 6)
- result_amount = 6
+/datum/chemical_reaction/nuka_cola
+ name = "Nuka Cola"
+ id = "nuka_cola"
+ result = "nuka_cola"
+ required_reagents = list("uranium" = 1, "cola" = 6)
+ result_amount = 6
- moonshine
- name = "Moonshine"
- id = "moonshine"
- result = "moonshine"
- required_reagents = list("nutriment" = 10)
- required_catalysts = list("enzyme" = 5)
- result_amount = 10
+/datum/chemical_reaction/moonshine
+ name = "Moonshine"
+ id = "moonshine"
+ result = "moonshine"
+ required_reagents = list("nutriment" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 10
- grenadine
- name = "Grenadine Syrup"
- id = "grenadine"
- result = "grenadine"
- required_reagents = list("berryjuice" = 10)
- required_catalysts = list("enzyme" = 5)
- result_amount = 10
+/datum/chemical_reaction/grenadine
+ name = "Grenadine Syrup"
+ id = "grenadine"
+ result = "grenadine"
+ required_reagents = list("berryjuice" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 10
- wine
- name = "Wine"
- id = "wine"
- result = "wine"
- required_reagents = list("grapejuice" = 10)
- required_catalysts = list("enzyme" = 5)
- result_amount = 10
+/datum/chemical_reaction/wine
+ name = "Wine"
+ id = "wine"
+ result = "wine"
+ required_reagents = list("grapejuice" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 10
- pwine
- name = "Poison Wine"
- id = "pwine"
- result = "pwine"
- required_reagents = list("poisonberryjuice" = 10)
- required_catalysts = list("enzyme" = 5)
- result_amount = 10
+/datum/chemical_reaction/pwine
+ name = "Poison Wine"
+ id = "pwine"
+ result = "pwine"
+ required_reagents = list("poisonberryjuice" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 10
- melonliquor
- name = "Melon Liquor"
- id = "melonliquor"
- result = "melonliquor"
- required_reagents = list("watermelonjuice" = 10)
- required_catalysts = list("enzyme" = 5)
- result_amount = 10
+/datum/chemical_reaction/melonliquor
+ name = "Melon Liquor"
+ id = "melonliquor"
+ result = "melonliquor"
+ required_reagents = list("watermelonjuice" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 10
- bluecuracao
- name = "Blue Curacao"
- id = "bluecuracao"
- result = "bluecuracao"
- required_reagents = list("orangejuice" = 10)
- required_catalysts = list("enzyme" = 5)
- result_amount = 10
+/datum/chemical_reaction/bluecuracao
+ name = "Blue Curacao"
+ id = "bluecuracao"
+ result = "bluecuracao"
+ required_reagents = list("orangejuice" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 10
- spacebeer
- name = "Space Beer"
- id = "spacebeer"
- result = "beer"
- required_reagents = list("cornoil" = 10)
- required_catalysts = list("enzyme" = 5)
- result_amount = 10
+/datum/chemical_reaction/spacebeer
+ name = "Space Beer"
+ id = "spacebeer"
+ result = "beer"
+ required_reagents = list("cornoil" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 10
- vodka
- name = "Vodka"
- id = "vodka"
- result = "vodka"
- required_reagents = list("potato" = 10)
- required_catalysts = list("enzyme" = 5)
- result_amount = 10
- sake
- name = "Sake"
- id = "sake"
- result = "sake"
- required_reagents = list("rice" = 10)
- required_catalysts = list("enzyme" = 5)
- result_amount = 10
+/datum/chemical_reaction/vodka
+ name = "Vodka"
+ id = "vodka"
+ result = "vodka"
+ required_reagents = list("potato" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 10
+/datum/chemical_reaction/sake
+ name = "Sake"
+ id = "sake"
+ result = "sake"
+ required_reagents = list("rice" = 10)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 10
- kahlua
- name = "Kahlua"
- id = "kahlua"
- result = "kahlua"
- required_reagents = list("coffee" = 5, "sugar" = 5)
- required_catalysts = list("enzyme" = 5)
- result_amount = 5
+/datum/chemical_reaction/kahlua
+ name = "Kahlua"
+ id = "kahlua"
+ result = "kahlua"
+ required_reagents = list("coffee" = 5, "sugar" = 5)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 5
- gin_tonic
- name = "Gin and Tonic"
- id = "gintonic"
- result = "gintonic"
- required_reagents = list("gin" = 2, "tonic" = 1)
- result_amount = 3
+/datum/chemical_reaction/gin_tonic
+ name = "Gin and Tonic"
+ id = "gintonic"
+ result = "gintonic"
+ required_reagents = list("gin" = 2, "tonic" = 1)
+ result_amount = 3
- cuba_libre
- name = "Cuba Libre"
- id = "cubalibre"
- result = "cubalibre"
- required_reagents = list("rum" = 2, "cola" = 1)
- result_amount = 3
+/datum/chemical_reaction/cuba_libre
+ name = "Cuba Libre"
+ id = "cubalibre"
+ result = "cubalibre"
+ required_reagents = list("rum" = 2, "cola" = 1)
+ result_amount = 3
- martini
- name = "Classic Martini"
- id = "martini"
- result = "martini"
- required_reagents = list("gin" = 2, "vermouth" = 1)
- result_amount = 3
+/datum/chemical_reaction/martini
+ name = "Classic Martini"
+ id = "martini"
+ result = "martini"
+ required_reagents = list("gin" = 2, "vermouth" = 1)
+ result_amount = 3
- vodkamartini
- name = "Vodka Martini"
- id = "vodkamartini"
- result = "vodkamartini"
- required_reagents = list("vodka" = 2, "vermouth" = 1)
- result_amount = 3
+/datum/chemical_reaction/vodkamartini
+ name = "Vodka Martini"
+ id = "vodkamartini"
+ result = "vodkamartini"
+ required_reagents = list("vodka" = 2, "vermouth" = 1)
+ result_amount = 3
- white_russian
- name = "White Russian"
- id = "whiterussian"
- result = "whiterussian"
- required_reagents = list("blackrussian" = 3, "cream" = 2)
- result_amount = 5
+/datum/chemical_reaction/white_russian
+ name = "White Russian"
+ id = "whiterussian"
+ result = "whiterussian"
+ required_reagents = list("blackrussian" = 3, "cream" = 2)
+ result_amount = 5
- whiskey_cola
- name = "Whiskey Cola"
- id = "whiskeycola"
- result = "whiskeycola"
- required_reagents = list("whiskey" = 2, "cola" = 1)
- result_amount = 3
+/datum/chemical_reaction/whiskey_cola
+ name = "Whiskey Cola"
+ id = "whiskeycola"
+ result = "whiskeycola"
+ required_reagents = list("whiskey" = 2, "cola" = 1)
+ result_amount = 3
- screwdriver
- name = "Screwdriver"
- id = "screwdrivercocktail"
- result = "screwdrivercocktail"
- required_reagents = list("vodka" = 2, "orangejuice" = 1)
- result_amount = 3
+/datum/chemical_reaction/screwdriver
+ name = "Screwdriver"
+ id = "screwdrivercocktail"
+ result = "screwdrivercocktail"
+ required_reagents = list("vodka" = 2, "orangejuice" = 1)
+ result_amount = 3
- bloody_mary
- name = "Bloody Mary"
- id = "bloodymary"
- result = "bloodymary"
- required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1)
- result_amount = 4
+/datum/chemical_reaction/bloody_mary
+ name = "Bloody Mary"
+ id = "bloodymary"
+ result = "bloodymary"
+ required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1)
+ result_amount = 4
- gargle_blaster
- name = "Pan-Galactic Gargle Blaster"
- id = "gargleblaster"
- result = "gargleblaster"
- required_reagents = list("vodka" = 1, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1)
- result_amount = 5
+/datum/chemical_reaction/gargle_blaster
+ name = "Pan-Galactic Gargle Blaster"
+ id = "gargleblaster"
+ result = "gargleblaster"
+ required_reagents = list("vodka" = 1, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1)
+ result_amount = 5
- brave_bull
- name = "Brave Bull"
- id = "bravebull"
- result = "bravebull"
- required_reagents = list("tequilla" = 2, "kahlua" = 1)
- result_amount = 3
+/datum/chemical_reaction/brave_bull
+ name = "Brave Bull"
+ id = "bravebull"
+ result = "bravebull"
+ required_reagents = list("tequilla" = 2, "kahlua" = 1)
+ result_amount = 3
- tequilla_sunrise
- name = "Tequilla Sunrise"
- id = "tequillasunrise"
- result = "tequillasunrise"
- required_reagents = list("tequilla" = 2, "orangejuice" = 1)
- result_amount = 3
+/datum/chemical_reaction/tequilla_sunrise
+ name = "Tequilla Sunrise"
+ id = "tequillasunrise"
+ result = "tequillasunrise"
+ required_reagents = list("tequilla" = 2, "orangejuice" = 1)
+ result_amount = 3
- phoron_special
- name = "Toxins Special"
- id = "phoronspecial"
- result = "phoronspecial"
- required_reagents = list("rum" = 2, "vermouth" = 1, "phoron" = 2)
- result_amount = 5
+/datum/chemical_reaction/phoron_special
+ name = "Toxins Special"
+ id = "phoronspecial"
+ result = "phoronspecial"
+ required_reagents = list("rum" = 2, "vermouth" = 1, "phoron" = 2)
+ result_amount = 5
- beepsky_smash
- name = "Beepksy Smash"
- id = "beepksysmash"
- result = "beepskysmash"
- required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1)
- result_amount = 4
+/datum/chemical_reaction/beepsky_smash
+ name = "Beepksy Smash"
+ id = "beepksysmash"
+ result = "beepskysmash"
+ required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1)
+ result_amount = 4
- doctor_delight
- name = "The Doctor's Delight"
- id = "doctordelight"
- result = "doctorsdelight"
- required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "tricordrazine" = 1)
- result_amount = 5
+/datum/chemical_reaction/doctor_delight
+ name = "The Doctor's Delight"
+ id = "doctordelight"
+ result = "doctorsdelight"
+ required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "tricordrazine" = 1)
+ result_amount = 5
- irish_cream
- name = "Irish Cream"
- id = "irishcream"
- result = "irishcream"
- required_reagents = list("whiskey" = 2, "cream" = 1)
- result_amount = 3
+/datum/chemical_reaction/irish_cream
+ name = "Irish Cream"
+ id = "irishcream"
+ result = "irishcream"
+ required_reagents = list("whiskey" = 2, "cream" = 1)
+ result_amount = 3
- manly_dorf
- name = "The Manly Dorf"
- id = "manlydorf"
- result = "manlydorf"
- required_reagents = list ("beer" = 1, "ale" = 2)
- result_amount = 3
+/datum/chemical_reaction/manly_dorf
+ name = "The Manly Dorf"
+ id = "manlydorf"
+ result = "manlydorf"
+ required_reagents = list ("beer" = 1, "ale" = 2)
+ result_amount = 3
- hooch
- name = "Hooch"
- id = "hooch"
- result = "hooch"
- required_reagents = list ("sugar" = 1, "ethanol" = 2, "fuel" = 1)
- result_amount = 3
+/datum/chemical_reaction/hooch
+ name = "Hooch"
+ id = "hooch"
+ result = "hooch"
+ required_reagents = list ("sugar" = 1, "ethanol" = 2, "fuel" = 1)
+ result_amount = 3
- irish_coffee
- name = "Irish Coffee"
- id = "irishcoffee"
- result = "irishcoffee"
- required_reagents = list("irishcream" = 1, "coffee" = 1)
- result_amount = 2
+/datum/chemical_reaction/irish_coffee
+ name = "Irish Coffee"
+ id = "irishcoffee"
+ result = "irishcoffee"
+ required_reagents = list("irishcream" = 1, "coffee" = 1)
+ result_amount = 2
- b52
- name = "B-52"
- id = "b52"
- result = "b52"
- required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
- result_amount = 3
+/datum/chemical_reaction/b52
+ name = "B-52"
+ id = "b52"
+ result = "b52"
+ required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
+ result_amount = 3
- atomicbomb
- name = "Atomic Bomb"
- id = "atomicbomb"
- result = "atomicbomb"
- required_reagents = list("b52" = 10, "uranium" = 1)
- result_amount = 10
+/datum/chemical_reaction/atomicbomb
+ name = "Atomic Bomb"
+ id = "atomicbomb"
+ result = "atomicbomb"
+ required_reagents = list("b52" = 10, "uranium" = 1)
+ result_amount = 10
- margarita
- name = "Margarita"
- id = "margarita"
- result = "margarita"
- required_reagents = list("tequilla" = 2, "limejuice" = 1)
- result_amount = 3
+/datum/chemical_reaction/margarita
+ name = "Margarita"
+ id = "margarita"
+ result = "margarita"
+ required_reagents = list("tequilla" = 2, "limejuice" = 1)
+ result_amount = 3
- longislandicedtea
- name = "Long Island Iced Tea"
- id = "longislandicedtea"
- result = "longislandicedtea"
- required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
- result_amount = 4
+/datum/chemical_reaction/longislandicedtea
+ name = "Long Island Iced Tea"
+ id = "longislandicedtea"
+ result = "longislandicedtea"
+ required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
+ result_amount = 4
- icedtea
- name = "Long Island Iced Tea"
- id = "longislandicedtea"
- result = "longislandicedtea"
- required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
- result_amount = 4
+/datum/chemical_reaction/icedtea
+ name = "Long Island Iced Tea"
+ id = "longislandicedtea"
+ result = "longislandicedtea"
+ required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
+ result_amount = 4
- threemileisland
- name = "Three Mile Island Iced Tea"
- id = "threemileisland"
- result = "threemileisland"
- required_reagents = list("longislandicedtea" = 10, "uranium" = 1)
- result_amount = 10
+/datum/chemical_reaction/threemileisland
+ name = "Three Mile Island Iced Tea"
+ id = "threemileisland"
+ result = "threemileisland"
+ required_reagents = list("longislandicedtea" = 10, "uranium" = 1)
+ result_amount = 10
- whiskeysoda
- name = "Whiskey Soda"
- id = "whiskeysoda"
- result = "whiskeysoda"
- required_reagents = list("whiskey" = 2, "sodawater" = 1)
- result_amount = 3
+/datum/chemical_reaction/whiskeysoda
+ name = "Whiskey Soda"
+ id = "whiskeysoda"
+ result = "whiskeysoda"
+ required_reagents = list("whiskey" = 2, "sodawater" = 1)
+ result_amount = 3
- black_russian
- name = "Black Russian"
- id = "blackrussian"
- result = "blackrussian"
- required_reagents = list("vodka" = 3, "kahlua" = 2)
- result_amount = 5
+/datum/chemical_reaction/black_russian
+ name = "Black Russian"
+ id = "blackrussian"
+ result = "blackrussian"
+ required_reagents = list("vodka" = 3, "kahlua" = 2)
+ result_amount = 5
- manhattan
- name = "Manhattan"
- id = "manhattan"
- result = "manhattan"
- required_reagents = list("whiskey" = 2, "vermouth" = 1)
- result_amount = 3
+/datum/chemical_reaction/manhattan
+ name = "Manhattan"
+ id = "manhattan"
+ result = "manhattan"
+ required_reagents = list("whiskey" = 2, "vermouth" = 1)
+ result_amount = 3
- manhattan_proj
- name = "Manhattan Project"
- id = "manhattan_proj"
- result = "manhattan_proj"
- required_reagents = list("manhattan" = 10, "uranium" = 1)
- result_amount = 10
+/datum/chemical_reaction/manhattan_proj
+ name = "Manhattan Project"
+ id = "manhattan_proj"
+ result = "manhattan_proj"
+ required_reagents = list("manhattan" = 10, "uranium" = 1)
+ result_amount = 10
- vodka_tonic
- name = "Vodka and Tonic"
- id = "vodkatonic"
- result = "vodkatonic"
- required_reagents = list("vodka" = 2, "tonic" = 1)
- result_amount = 3
+/datum/chemical_reaction/vodka_tonic
+ name = "Vodka and Tonic"
+ id = "vodkatonic"
+ result = "vodkatonic"
+ required_reagents = list("vodka" = 2, "tonic" = 1)
+ result_amount = 3
- gin_fizz
- name = "Gin Fizz"
- id = "ginfizz"
- result = "ginfizz"
- required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
- result_amount = 4
+/datum/chemical_reaction/gin_fizz
+ name = "Gin Fizz"
+ id = "ginfizz"
+ result = "ginfizz"
+ required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
+ result_amount = 4
- bahama_mama
- name = "Bahama mama"
- id = "bahama_mama"
- result = "bahama_mama"
- required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
- result_amount = 6
+/datum/chemical_reaction/bahama_mama
+ name = "Bahama mama"
+ id = "bahama_mama"
+ result = "bahama_mama"
+ required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
+ result_amount = 6
- singulo
- name = "Singulo"
- id = "singulo"
- result = "singulo"
- required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
- result_amount = 10
+/datum/chemical_reaction/singulo
+ name = "Singulo"
+ id = "singulo"
+ result = "singulo"
+ required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
+ result_amount = 10
- alliescocktail
- name = "Allies Cocktail"
- id = "alliescocktail"
- result = "alliescocktail"
- required_reagents = list("martini" = 1, "vodka" = 1)
- result_amount = 2
+/datum/chemical_reaction/alliescocktail
+ name = "Allies Cocktail"
+ id = "alliescocktail"
+ result = "alliescocktail"
+ required_reagents = list("martini" = 1, "vodka" = 1)
+ result_amount = 2
- demonsblood
- name = "Demons Blood"
- id = "demonsblood"
- result = "demonsblood"
- required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
- result_amount = 4
+/datum/chemical_reaction/demonsblood
+ name = "Demons Blood"
+ id = "demonsblood"
+ result = "demonsblood"
+ required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
+ result_amount = 4
- booger
- name = "Booger"
- id = "booger"
- result = "booger"
- required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
- result_amount = 4
+/datum/chemical_reaction/booger
+ name = "Booger"
+ id = "booger"
+ result = "booger"
+ required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
+ result_amount = 4
- antifreeze
- name = "Anti-freeze"
- id = "antifreeze"
- result = "antifreeze"
- required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1)
- result_amount = 4
+/datum/chemical_reaction/antifreeze
+ name = "Anti-freeze"
+ id = "antifreeze"
+ result = "antifreeze"
+ required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1)
+ result_amount = 4
- barefoot
- name = "Barefoot"
- id = "barefoot"
- result = "barefoot"
- required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1)
- result_amount = 3
+/datum/chemical_reaction/barefoot
+ name = "Barefoot"
+ id = "barefoot"
+ result = "barefoot"
+ required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1)
+ result_amount = 3
- grapesoda
- name = "Grape Soda"
- id = "grapesoda"
- result = "grapesoda"
- required_reagents = list("grapejuice" = 2, "cola" = 1)
- result_amount = 3
+/datum/chemical_reaction/grapesoda
+ name = "Grape Soda"
+ id = "grapesoda"
+ result = "grapesoda"
+ required_reagents = list("grapejuice" = 2, "cola" = 1)
+ result_amount = 3
////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
- sbiten
- name = "Sbiten"
- id = "sbiten"
- result = "sbiten"
- required_reagents = list("vodka" = 10, "capsaicin" = 1)
- result_amount = 10
+/datum/chemical_reaction/sbiten
+ name = "Sbiten"
+ id = "sbiten"
+ result = "sbiten"
+ required_reagents = list("vodka" = 10, "capsaicin" = 1)
+ result_amount = 10
- red_mead
- name = "Red Mead"
- id = "red_mead"
- result = "red_mead"
- required_reagents = list("blood" = 1, "mead" = 1)
- result_amount = 2
+/datum/chemical_reaction/red_mead
+ name = "Red Mead"
+ id = "red_mead"
+ result = "red_mead"
+ required_reagents = list("blood" = 1, "mead" = 1)
+ result_amount = 2
- mead
- name = "Mead"
- id = "mead"
- result = "mead"
- required_reagents = list("sugar" = 1, "water" = 1)
- required_catalysts = list("enzyme" = 5)
- result_amount = 2
+/datum/chemical_reaction/mead
+ name = "Mead"
+ id = "mead"
+ result = "mead"
+ required_reagents = list("sugar" = 1, "water" = 1)
+ required_catalysts = list("enzyme" = 5)
+ result_amount = 2
- iced_beer
- name = "Iced Beer"
- id = "iced_beer"
- result = "iced_beer"
- required_reagents = list("beer" = 10, "frostoil" = 1)
- result_amount = 10
+/datum/chemical_reaction/iced_beer
+ name = "Iced Beer"
+ id = "iced_beer"
+ result = "iced_beer"
+ required_reagents = list("beer" = 10, "frostoil" = 1)
+ result_amount = 10
- iced_beer2
- name = "Iced Beer"
- id = "iced_beer"
- result = "iced_beer"
- required_reagents = list("beer" = 5, "ice" = 1)
- result_amount = 6
+/datum/chemical_reaction/iced_beer2
+ name = "Iced Beer"
+ id = "iced_beer"
+ result = "iced_beer"
+ required_reagents = list("beer" = 5, "ice" = 1)
+ result_amount = 6
- grog
- name = "Grog"
- id = "grog"
- result = "grog"
- required_reagents = list("rum" = 1, "water" = 1)
- result_amount = 2
+/datum/chemical_reaction/grog
+ name = "Grog"
+ id = "grog"
+ result = "grog"
+ required_reagents = list("rum" = 1, "water" = 1)
+ result_amount = 2
- soy_latte
- name = "Soy Latte"
- id = "soy_latte"
- result = "soy_latte"
- required_reagents = list("coffee" = 1, "soymilk" = 1)
- result_amount = 2
+/datum/chemical_reaction/soy_latte
+ name = "Soy Latte"
+ id = "soy_latte"
+ result = "soy_latte"
+ required_reagents = list("coffee" = 1, "soymilk" = 1)
+ result_amount = 2
- cafe_latte
- name = "Cafe Latte"
- id = "cafe_latte"
- result = "cafe_latte"
- required_reagents = list("coffee" = 1, "milk" = 1)
- result_amount = 2
+/datum/chemical_reaction/cafe_latte
+ name = "Cafe Latte"
+ id = "cafe_latte"
+ result = "cafe_latte"
+ required_reagents = list("coffee" = 1, "milk" = 1)
+ result_amount = 2
- acidspit
- name = "Acid Spit"
- id = "acidspit"
- result = "acidspit"
- required_reagents = list("sacid" = 1, "wine" = 5)
- result_amount = 6
+/datum/chemical_reaction/acidspit
+ name = "Acid Spit"
+ id = "acidspit"
+ result = "acidspit"
+ required_reagents = list("sacid" = 1, "wine" = 5)
+ result_amount = 6
- amasec
- name = "Amasec"
- id = "amasec"
- result = "amasec"
- required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
- result_amount = 10
+/datum/chemical_reaction/amasec
+ name = "Amasec"
+ id = "amasec"
+ result = "amasec"
+ required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
+ result_amount = 10
- changelingsting
- name = "Changeling Sting"
- id = "changelingsting"
- result = "changelingsting"
- required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1)
- result_amount = 5
+/datum/chemical_reaction/changelingsting
+ name = "Changeling Sting"
+ id = "changelingsting"
+ result = "changelingsting"
+ required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1)
+ result_amount = 5
- aloe
- name = "Aloe"
- id = "aloe"
- result = "aloe"
- required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1)
- result_amount = 2
+/datum/chemical_reaction/aloe
+ name = "Aloe"
+ id = "aloe"
+ result = "aloe"
+ required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1)
+ result_amount = 2
- andalusia
- name = "Andalusia"
- id = "andalusia"
- result = "andalusia"
- required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
- result_amount = 3
+/datum/chemical_reaction/andalusia
+ name = "Andalusia"
+ id = "andalusia"
+ result = "andalusia"
+ required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
+ result_amount = 3
- neurotoxin
- name = "Neurotoxin"
- id = "neurotoxin"
- result = "neurotoxin"
- required_reagents = list("gargleblaster" = 1, "stoxin" = 1)
- result_amount = 2
+/datum/chemical_reaction/neurotoxin
+ name = "Neurotoxin"
+ id = "neurotoxin"
+ result = "neurotoxin"
+ required_reagents = list("gargleblaster" = 1, "stoxin" = 1)
+ result_amount = 2
- snowwhite
- name = "Snow White"
- id = "snowwhite"
- result = "snowwhite"
- required_reagents = list("beer" = 1, "lemon_lime" = 1)
- result_amount = 2
+/datum/chemical_reaction/snowwhite
+ name = "Snow White"
+ id = "snowwhite"
+ result = "snowwhite"
+ required_reagents = list("beer" = 1, "lemon_lime" = 1)
+ result_amount = 2
- irishcarbomb
- name = "Irish Car Bomb"
- id = "irishcarbomb"
- result = "irishcarbomb"
- required_reagents = list("ale" = 1, "irishcream" = 1)
- result_amount = 2
+/datum/chemical_reaction/irishcarbomb
+ name = "Irish Car Bomb"
+ id = "irishcarbomb"
+ result = "irishcarbomb"
+ required_reagents = list("ale" = 1, "irishcream" = 1)
+ result_amount = 2
- syndicatebomb
- name = "Syndicate Bomb"
- id = "syndicatebomb"
- result = "syndicatebomb"
- required_reagents = list("beer" = 1, "whiskeycola" = 1)
- result_amount = 2
+/datum/chemical_reaction/syndicatebomb
+ name = "Syndicate Bomb"
+ id = "syndicatebomb"
+ result = "syndicatebomb"
+ required_reagents = list("beer" = 1, "whiskeycola" = 1)
+ result_amount = 2
- erikasurprise
- name = "Erika Surprise"
- id = "erikasurprise"
- result = "erikasurprise"
- required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
- result_amount = 5
+/datum/chemical_reaction/erikasurprise
+ name = "Erika Surprise"
+ id = "erikasurprise"
+ result = "erikasurprise"
+ required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
+ result_amount = 5
- devilskiss
- name = "Devils Kiss"
- id = "devilskiss"
- result = "devilskiss"
- required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1)
- result_amount = 3
+/datum/chemical_reaction/devilskiss
+ name = "Devils Kiss"
+ id = "devilskiss"
+ result = "devilskiss"
+ required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1)
+ result_amount = 3
- hippiesdelight
- name = "Hippies Delight"
- id = "hippiesdelight"
- result = "hippiesdelight"
- required_reagents = list("psilocybin" = 1, "gargleblaster" = 1)
- result_amount = 2
+/datum/chemical_reaction/hippiesdelight
+ name = "Hippies Delight"
+ id = "hippiesdelight"
+ result = "hippiesdelight"
+ required_reagents = list("psilocybin" = 1, "gargleblaster" = 1)
+ result_amount = 2
- bananahonk
- name = "Banana Honk"
- id = "bananahonk"
- result = "bananahonk"
- required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1)
- result_amount = 3
+/datum/chemical_reaction/bananahonk
+ name = "Banana Honk"
+ id = "bananahonk"
+ result = "bananahonk"
+ required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1)
+ result_amount = 3
- silencer
- name = "Silencer"
- id = "silencer"
- result = "silencer"
- required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
- result_amount = 3
+/datum/chemical_reaction/silencer
+ name = "Silencer"
+ id = "silencer"
+ result = "silencer"
+ required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
+ result_amount = 3
- driestmartini
- name = "Driest Martini"
- id = "driestmartini"
- result = "driestmartini"
- required_reagents = list("nothing" = 1, "gin" = 1)
- result_amount = 2
+/datum/chemical_reaction/driestmartini
+ name = "Driest Martini"
+ id = "driestmartini"
+ result = "driestmartini"
+ required_reagents = list("nothing" = 1, "gin" = 1)
+ result_amount = 2
- lemonade
- name = "Lemonade"
- id = "lemonade"
- result = "lemonade"
- required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1)
- result_amount = 3
+/datum/chemical_reaction/lemonade
+ name = "Lemonade"
+ id = "lemonade"
+ result = "lemonade"
+ required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1)
+ result_amount = 3
- kiraspecial
- name = "Kira Special"
- id = "kiraspecial"
- result = "kiraspecial"
- required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1)
- result_amount = 2
+/datum/chemical_reaction/kiraspecial
+ name = "Kira Special"
+ id = "kiraspecial"
+ result = "kiraspecial"
+ required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1)
+ result_amount = 2
- brownstar
- name = "Brown Star"
- id = "brownstar"
- result = "brownstar"
- required_reagents = list("orangejuice" = 2, "cola" = 1)
- result_amount = 2
+/datum/chemical_reaction/brownstar
+ name = "Brown Star"
+ id = "brownstar"
+ result = "brownstar"
+ required_reagents = list("orangejuice" = 2, "cola" = 1)
+ result_amount = 2
- milkshake
- name = "Milkshake"
- id = "milkshake"
- result = "milkshake"
- required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2)
- result_amount = 5
+/datum/chemical_reaction/milkshake
+ name = "Milkshake"
+ id = "milkshake"
+ result = "milkshake"
+ required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2)
+ result_amount = 5
- rewriter
- name = "Rewriter"
- id = "rewriter"
- result = "rewriter"
- required_reagents = list("spacemountainwind" = 1, "coffee" = 1)
- result_amount = 2
+/datum/chemical_reaction/rewriter
+ name = "Rewriter"
+ id = "rewriter"
+ result = "rewriter"
+ required_reagents = list("spacemountainwind" = 1, "coffee" = 1)
+ result_amount = 2
- suidream
- name = "Sui Dream"
- id = "suidream"
- result = "suidream"
- required_reagents = list("space_up" = 2, "bluecuracao" = 1, "melonliquor" = 1)
- result_amount = 4
+/datum/chemical_reaction/suidream
+ name = "Sui Dream"
+ id = "suidream"
+ result = "suidream"
+ required_reagents = list("space_up" = 2, "bluecuracao" = 1, "melonliquor" = 1)
+ result_amount = 4
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index d82ded7bba..e53d118898 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -31,7 +31,7 @@
processing_objects.Add(src)
-/obj/item/weapon/reagent_containers/borghypo/Del()
+/obj/item/weapon/reagent_containers/borghypo/Destroy()
processing_objects.Remove(src)
..()
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 58b11a61ac..8681503304 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -23,7 +23,7 @@
var/fillevel = gulp_size
if(!R.total_volume || !R)
- user << "\red The [src.name] is empty!"
+ user << "The [src.name] is empty!"
return 0
if(M == user)
@@ -31,10 +31,15 @@
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC)
- H << "\red You have a monitor for a head, where do you think you're going to put that?"
+ H << "You have a monitor for a head, where do you think you're going to put that?"
+ return
+
+ var/obj/item/blocked = H.check_mouth_coverage()
+ if(blocked)
+ user << "\The [blocked] is in the way!"
return
- M << "\blue You swallow a gulp from \the [src]."
+ M << "You swallow a gulp from \the [src]."
if(reagents.total_volume)
reagents.trans_to_ingest(M, gulp_size)
@@ -44,14 +49,17 @@
var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC)
- H << "\red They have a monitor for a head, where do you think you're going to put that?"
+ user << "They have a monitor for a head, where do you think you're going to put that?"
+ return
+
+ var/obj/item/blocked = H.check_mouth_coverage()
+ if(blocked)
+ user << "\The [blocked] is in the way!"
return
- for(var/mob/O in viewers(world.view, user))
- O.show_message("\red [user] attempts to feed [M] [src].", 1)
+ user.visible_message("[user] attempts to feed [M] [src].")
if(!do_mob(user, M)) return
- for(var/mob/O in viewers(world.view, user))
- O.show_message("\red [user] feeds [M] [src].", 1)
+ user.visible_message("[user] feeds [M] [src].")
M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]")
user.attack_log += text("\[[time_stamp()]\] Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]")
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index bc36317521..6be4fce8e4 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -30,7 +30,7 @@
user.put_in_active_hand(B)
src.transfer_fingerprints_to(B)
- del(src)
+ qdel(src)
/obj/item/weapon/reagent_containers/food/drinks/bottle/attack(mob/living/target as mob, mob/living/user as mob)
@@ -83,7 +83,7 @@
O.show_message(text("\blue The contents of the [src] splashes all over [target]!"), 1)
src.reagents.reaction(target, TOUCH)
- //Finally, smash the bottle. This kills (del) the bottle.
+ //Finally, smash the bottle. This kills (qdel) the bottle.
src.smash(target, user)
return
diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm
index 0d8e614468..3be62c7d7c 100644
--- a/code/modules/reagents/reagent_containers/food/sandwich.dm
+++ b/code/modules/reagents/reagent_containers/food/sandwich.dm
@@ -3,7 +3,7 @@
if(istype(W,/obj/item/weapon/shard) || istype(W,/obj/item/weapon/reagent_containers/food/snacks))
var/obj/item/weapon/reagent_containers/food/snacks/csandwich/S = new(get_turf(src))
S.attackby(W,user)
- del(src)
+ qdel(src)
..()
/obj/item/weapon/reagent_containers/food/snacks/csandwich
@@ -73,9 +73,9 @@
if(length(name) > 80) name = "[pick(list("absurd","colossal","enormous","ridiculous"))] sandwich"
w_class = n_ceil(Clamp((ingredients.len/2),2,4))
-/obj/item/weapon/reagent_containers/food/snacks/csandwich/Del()
+/obj/item/weapon/reagent_containers/food/snacks/csandwich/Destroy()
for(var/obj/item/O in ingredients)
- del(O)
+ qdel(O)
..()
/obj/item/weapon/reagent_containers/food/snacks/csandwich/examine(mob/user)
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index c8609074b6..6e1d443300 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -27,7 +27,7 @@
usr.put_in_hands(TrashItem)
else if(istype(trash,/obj/item))
usr.put_in_hands(trash)
- del(src)
+ qdel(src)
return
/obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user as mob)
@@ -38,7 +38,7 @@
if(!reagents.total_volume)
user << "None of [src] left!"
user.drop_from_inventory(src)
- del(src)
+ qdel(src)
return 0
if(istype(M, /mob/living/carbon))
@@ -47,35 +47,44 @@
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC)
- H << "\red You have a monitor for a head, where do you think you're going to put that?"
+ H << "You have a monitor for a head, where do you think you're going to put that?"
return
+
+ var/obj/item/blocked = H.check_mouth_coverage()
+ if(blocked)
+ user << "\The [blocked] is in the way!"
+ return
+
if (fullness <= 50)
- M << "\red You hungrily chew out a piece of [src] and gobble it!"
+ M << "You hungrily chew out a piece of [src] and gobble it!"
if (fullness > 50 && fullness <= 150)
- M << "\blue You hungrily begin to eat [src]."
+ M << "You hungrily begin to eat [src]."
if (fullness > 150 && fullness <= 350)
- M << "\blue You take a bite of [src]."
+ M << "You take a bite of [src]."
if (fullness > 350 && fullness <= 550)
- M << "\blue You unwillingly chew a bit of [src]."
+ M << "You unwillingly chew a bit of [src]."
if (fullness > (550 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat
- M << "\red You cannot force any more of [src] to go down your throat."
+ M << "You cannot force any more of [src] to go down your throat."
return 0
else
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC)
- H << "\red They have a monitor for a head, where do you think you're going to put that?"
+ user << "They have a monitor for a head, where do you think you're going to put that?"
+ return
+
+ var/obj/item/blocked = H.check_mouth_coverage()
+ if(blocked)
+ user << "\The [blocked] is in the way!"
return
if(!istype(M, /mob/living/carbon/slime)) //If you're feeding it to someone else.
if (fullness <= (550 * (1 + M.overeatduration / 1000)))
- for(var/mob/O in viewers(world.view, user))
- O.show_message("\red [user] attempts to feed [M] [src].", 1)
+ user.visible_message("[user] attempts to feed [M] [src].")
else
- for(var/mob/O in viewers(world.view, user))
- O.show_message("\red [user] cannot force anymore of [src] down [M]'s throat.", 1)
- return 0
+ user.visible_message("[user] cannot force anymore of [src] down [M]'s throat.")
+ return 0
if(!do_mob(user, M)) return
@@ -83,8 +92,7 @@
user.attack_log += text("\[[time_stamp()]\] Fed [src.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]")
msg_admin_attack("[key_name(user)] fed [key_name(M)] with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)])")
- for(var/mob/O in viewers(world.view, user))
- O.show_message("\red [user] feeds [M] [src].", 1)
+ user.visible_message("[user] feeds [M] [src].")
else
user << "This creature does not seem to have a mouth!"
@@ -152,7 +160,7 @@
reagents.trans_to(U,min(reagents.total_volume,5))
if (reagents.total_volume <= 0)
- del(src)
+ qdel(src)
return
if (is_sliceable())
@@ -161,7 +169,7 @@
var/hide_item = !has_edge(W) || !can_slice_here
if (hide_item)
- if (W.w_class >= src.w_class || W.is_robot_module())
+ if (W.w_class >= src.w_class || is_robot_module(W))
return
user << "\red You slip [W] inside [src]."
@@ -187,13 +195,13 @@
for(var/i=1 to (slices_num-slices_lost))
var/obj/slice = new slice_path (src.loc)
reagents.trans_to(slice,reagents_per_slice)
- del(src)
+ qdel(src)
return
/obj/item/weapon/reagent_containers/food/snacks/proc/is_sliceable()
return (slices_num && slice_path && slices_num > 0)
-/obj/item/weapon/reagent_containers/food/snacks/Del()
+/obj/item/weapon/reagent_containers/food/snacks/Destroy()
if(contents)
for(var/atom/movable/something in contents)
something.loc = get_turf(src)
@@ -212,7 +220,7 @@
spawn(5)
if(!src && !user.client)
user.custom_emote(1,"[pick("burps", "cries for more", "burps twice", "looks at the area where the food was")]")
- del(src)
+ qdel(src)
On_Consume(user)
//////////////////////////////////////////////////
@@ -477,18 +485,18 @@
user << "You crack \the [src] into \the [O]."
reagents.trans_to(O, reagents.total_volume)
user.drop_from_inventory(src)
- del(src)
+ qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
..()
new/obj/effect/decal/cleanable/egg_smudge(src.loc)
src.reagents.reaction(hit_atom, TOUCH)
src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
- del(src)
+ qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype( W, /obj/item/toy/crayon ))
- var/obj/item/toy/crayon/C = W
+ if(istype( W, /obj/item/weapon/pen/crayon ))
+ var/obj/item/weapon/pen/crayon/C = W
var/clr = C.colourName
if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
@@ -497,41 +505,32 @@
usr << "\blue You color \the [src] [clr]"
icon_state = "egg-[clr]"
- item_color = clr
else
..()
/obj/item/weapon/reagent_containers/food/snacks/egg/blue
icon_state = "egg-blue"
- item_color = "blue"
/obj/item/weapon/reagent_containers/food/snacks/egg/green
icon_state = "egg-green"
- item_color = "green"
/obj/item/weapon/reagent_containers/food/snacks/egg/mime
icon_state = "egg-mime"
- item_color = "mime"
/obj/item/weapon/reagent_containers/food/snacks/egg/orange
icon_state = "egg-orange"
- item_color = "orange"
/obj/item/weapon/reagent_containers/food/snacks/egg/purple
icon_state = "egg-purple"
- item_color = "purple"
/obj/item/weapon/reagent_containers/food/snacks/egg/rainbow
icon_state = "egg-rainbow"
- item_color = "rainbow"
/obj/item/weapon/reagent_containers/food/snacks/egg/red
icon_state = "egg-red"
- item_color = "red"
/obj/item/weapon/reagent_containers/food/snacks/egg/yellow
icon_state = "egg-yellow"
- item_color = "yellow"
/obj/item/weapon/reagent_containers/food/snacks/friedegg
name = "Fried egg"
@@ -924,7 +923,7 @@
..()
new/obj/effect/decal/cleanable/pie_smudge(src.loc)
src.visible_message("\red [src.name] splats.","\red You hear a splat.")
- del(src)
+ qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/berryclafoutis
name = "Berry Clafoutis"
@@ -1588,7 +1587,7 @@
M << "\red \The [src] expands!"
var/mob/living/carbon/human/H = new (src)
H.set_species(monkey_type)
- del(src)
+ qdel(src)
proc/Unwrap(mob/user as mob)
icon_state = "monkeycube"
@@ -2830,7 +2829,7 @@
if(istype(W,/obj/item/weapon/kitchen/rollingpin))
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(src)
user << "You flatten the dough."
- del(src)
+ qdel(src)
// slicable into 3xdoughslices
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
@@ -2872,30 +2871,30 @@
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/meatball))
new /obj/item/weapon/reagent_containers/food/snacks/monkeyburger(src)
user << "You make a burger."
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
// Bun + cutlet = hamburger
else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/cutlet))
new /obj/item/weapon/reagent_containers/food/snacks/monkeyburger(src)
user << "You make a burger."
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
// Bun + sausage = hotdog
else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/sausage))
new /obj/item/weapon/reagent_containers/food/snacks/hotdog(src)
user << "You make a hotdog."
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
// Burger + cheese wedge = cheeseburger
/obj/item/weapon/reagent_containers/food/snacks/monkeyburger/attackby(obj/item/weapon/reagent_containers/food/snacks/cheesewedge/W as obj, mob/user as mob)
if(istype(W))// && !istype(src,/obj/item/weapon/reagent_containers/food/snacks/cheesewedge))
new /obj/item/weapon/reagent_containers/food/snacks/cheeseburger(src)
user << "You make a cheeseburger."
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
return
else
..()
@@ -2905,8 +2904,8 @@
if(istype(W))
new /obj/item/weapon/reagent_containers/food/snacks/cheeseburger(src)
user << "You make a cheeseburger."
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
return
else
..()
@@ -2975,7 +2974,7 @@
if(istype(W,/obj/item/weapon/kitchen/utensil/knife))
new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(src)
user << "You cut the potato."
- del(src)
+ qdel(src)
else
..()
diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
index d703a6acb7..797f605b08 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
@@ -15,7 +15,7 @@
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
user << "You cut the meat into thin strips."
- del(src)
+ qdel(src)
else
..()
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 12b56021d4..181df457d4 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -28,7 +28,7 @@
/obj/machinery/atmospherics/unary/cryo_cell,
/obj/machinery/dna_scannernew,
/obj/item/weapon/grenade/chem_grenade,
- /obj/machinery/bot/medbot,
+ /mob/living/bot/medbot,
/obj/machinery/computer/pandemic,
/obj/item/weapon/storage/secure/safe,
/obj/machinery/iv_drip,
@@ -195,7 +195,7 @@
if(80 to 90) filling.icon_state = "[icon_state]80"
if(91 to INFINITY) filling.icon_state = "[icon_state]100"
- filling.color = mix_color_from_reagents(reagents.reagent_list)
+ filling.color = reagents.get_color()
overlays += filling
if (!is_open_container())
@@ -260,7 +260,7 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "bucket"
item_state = "bucket"
- matter = list("metal" = 200)
+ matter = list(DEFAULT_WALL_MATERIAL = 200)
w_class = 3.0
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,60,120)
@@ -270,10 +270,10 @@
attackby(var/obj/D, mob/user as mob)
if(isprox(D))
user << "You add [D] to [src]."
- del(D)
+ qdel(D)
user.put_in_hands(new /obj/item/weapon/bucket_sensor)
user.drop_from_inventory(src)
- del(src)
+ qdel(src)
update_icon()
overlays.Cut()
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index ab01d11eaf..cbfea73a94 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -48,7 +48,7 @@
if(80 to 90) filling.icon_state = "[icon_state]-80"
if(91 to INFINITY) filling.icon_state = "[icon_state]-100"
- filling.color = mix_color_from_reagents(reagents.reagent_list)
+ filling.color = reagents.get_color()
overlays += filling
if (!is_open_container())
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 4d23bb30ed..d38c159868 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -24,33 +24,41 @@
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC)
- H << "\red You have a monitor for a head, where do you think you're going to put that?"
+ H << "You have a monitor for a head, where do you think you're going to put that?"
+ return
+
+ var/obj/item/blocked = H.check_mouth_coverage()
+ if(blocked)
+ user << "\The [blocked] is in the way!"
return
- M << "\blue You swallow [src]."
+ M << "You swallow [src]."
M.drop_from_inventory(src) //icon update
if(reagents.total_volume)
reagents.trans_to_ingest(M, reagents.total_volume)
- del(src)
+ qdel(src)
else
- del(src)
+ qdel(src)
return 1
else if(istype(M, /mob/living/carbon/human) )
var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC)
- H << "\red They have a monitor for a head, where do you think you're going to put that?"
+ user << "They have a monitor for a head, where do you think you're going to put that?"
+ return
+
+ var/obj/item/blocked = H.check_mouth_coverage()
+ if(blocked)
+ user << "\The [blocked] is in the way!"
return
- for(var/mob/O in viewers(world.view, user))
- O.show_message("\red [user] attempts to force [M] to swallow [src].", 1)
+ user.visible_message("[user] attempts to force [M] to swallow [src].")
if(!do_mob(user, M)) return
user.drop_from_inventory(src) //icon update
- for(var/mob/O in viewers(world.view, user))
- O.show_message("\red [user] forces [M] to swallow [src].", 1)
+ user.visible_message("[user] forces [M] to swallow [src].")
M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]")
user.attack_log += text("\[[time_stamp()]\] Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]")
@@ -58,9 +66,9 @@
if(reagents.total_volume)
reagents.trans_to_ingest(M, reagents.total_volume)
- del(src)
+ qdel(src)
else
- del(src)
+ qdel(src)
return 1
@@ -83,7 +91,7 @@
O.show_message("\red [user] puts something in \the [target].", 1)
spawn(5)
- del(src)
+ qdel(src)
return
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 20c4445e55..2e929c6d12 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -67,16 +67,16 @@
var/obj/D = new/obj()
D.create_reagents(amount_per_transfer_from_this)
reagents.trans_to(D, amount_per_transfer_from_this)
- D.icon += mix_color_from_reagents(D.reagents.reagent_list)
+ D.icon += D.reagents.get_color()
spawn(0)
D.reagents.reaction(A)
sleep(5)
- del(D)
+ qdel(D)
else
var/obj/effect/decal/chempuff/D = new/obj/effect/decal/chempuff(get_turf(src))
D.create_reagents(amount_per_transfer_from_this)
reagents.trans_to(D, amount_per_transfer_from_this, 1/spray_size)
- D.icon += mix_color_from_reagents(D.reagents.reagent_list)
+ D.icon += D.reagents.get_color()
var/turf/A_turf = get_turf(A)//BS12
@@ -93,7 +93,7 @@
D.reagents.reaction(A_turf)
sleep(2)
sleep(3)
- del(D)
+ qdel(D)
return
@@ -204,7 +204,7 @@
D.create_reagents(amount_per_transfer_from_this)
src.reagents.trans_to(D, amount_per_transfer_from_this)
- D.icon += mix_color_from_reagents(D.reagents.reagent_list)
+ D.icon += D.reagents.get_color()
Sprays[i] = D
@@ -229,7 +229,7 @@
for(var/atom/t in get_turf(D))
D.reagents.reaction(t)
sleep(2)
- del(D)
+ qdel(D)
return
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index a1c2fc4415..9b2eee7d65 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -222,7 +222,7 @@
filling.icon_state = "syringe[rounded_vol]"
- filling.color = mix_color_from_reagents(reagents.reagent_list)
+ filling.color = reagents.get_color()
overlays += filling
@@ -251,7 +251,7 @@
for(var/mob/O in viewers(world.view, user))
O.show_message(text("\red [user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1)
user.remove_from_mob(src)
- del(src)
+ qdel(src)
return
for(var/mob/O in viewers(world.view, user))
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 0a42e8dee3..185f6b1342 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -44,17 +44,17 @@
ex_act(severity)
switch(severity)
if(1.0)
- del(src)
+ qdel(src)
return
if(2.0)
if (prob(50))
new /obj/effect/effect/water(src.loc)
- del(src)
+ qdel(src)
return
if(3.0)
if (prob(5))
new /obj/effect/effect/water(src.loc)
- del(src)
+ qdel(src)
return
else
return
@@ -62,7 +62,7 @@
blob_act()
if(prob(50))
new /obj/effect/effect/water(src.loc)
- del(src)
+ qdel(src)
@@ -168,7 +168,7 @@
else
explosion(src.loc,-1,1,2)
if(src)
- del(src)
+ qdel(src)
/obj/structure/reagent_dispensers/fueltank/fire_act(datum/gas_mixture/air, temperature, volume)
if(temperature > T0C+500)
@@ -225,7 +225,7 @@
/obj/structure/reagent_dispensers/beerkeg/blob_act()
explosion(src.loc,0,3,5,7,10)
- del(src)
+ qdel(src)
/obj/structure/reagent_dispensers/virusfood
name = "Virus Food Dispenser"
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 8b26dd3133..4032d00a89 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -10,7 +10,7 @@
anchored = 0
density = 0
pressure_resistance = 5*ONE_ATMOSPHERE
- matter = list("metal" = 1850)
+ matter = list(DEFAULT_WALL_MATERIAL = 1850)
level = 2
var/ptype = 0
// 0=straight, 1=bent, 2=junction-j1, 3=junction-j2, 4=junction-y, 5=trunk, 6=disposal bin, 7=outlet, 8=inlet
@@ -288,7 +288,7 @@
src.transfer_fingerprints_to(P)
P.set_dir(dir)
- del(src)
+ qdel(src)
return
else
user << "You need more welding fuel to complete this task."
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index e1a5407d0a..ead3ba3d91 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -43,6 +43,11 @@
air_contents.volume = PRESSURE_TANK_VOLUME
update()
+/obj/machinery/disposal/Destroy()
+ eject()
+ if(trunk)
+ trunk.linked = null
+ ..()
// attack by item places it in to disposal
/obj/machinery/disposal/attackby(var/obj/item/I, var/mob/user)
@@ -83,7 +88,7 @@
C.anchored = 1
C.density = 1
C.update()
- del(src)
+ qdel(src)
return
else
user << "You need more welding fuel to complete this task."
@@ -115,7 +120,7 @@
GM.loc = src
for (var/mob/C in viewers(src))
C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
- del(G)
+ qdel(G)
usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals.")
GM.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [usr.name] ([usr.ckey])")
msg_admin_attack("[usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit. (JMP)")
@@ -452,7 +457,7 @@
AM.throw_at(target, 5, 1)
H.vent_gas(loc)
- del(H)
+ qdel(H)
/obj/machinery/disposal/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if (istype(mover,/obj/item) && mover.throwing)
@@ -600,7 +605,7 @@
if(other.has_fat_guy)
has_fat_guy = 1
- del(other)
+ qdel(other)
proc/settag(var/new_tag)
@@ -638,6 +643,11 @@
location.assume_air(gas) // vent all gas to turf
return
+/obj/structure/disposalholder/Destroy()
+ qdel(gas)
+ active = 0
+ ..()
+
// Disposal pipes
/obj/structure/disposalpipe
@@ -663,7 +673,7 @@
// pipe is deleted
// ensure if holder is present, it is expelled
- Del()
+ Destroy()
var/obj/structure/disposalholder/H = locate() in src
if(H)
// holder was present
@@ -676,7 +686,7 @@
for(var/atom/movable/AM in H)
AM.loc = T
AM.pipe_eject(0)
- del(H)
+ qdel(H)
..()
return
@@ -773,7 +783,7 @@
if(AM)
AM.throw_at(target, 100, 1)
H.vent_gas(T)
- del(H)
+ qdel(H)
else // no specified direction, so throw in random direction
@@ -789,7 +799,7 @@
AM.throw_at(target, 5, 1)
H.vent_gas(T) // all gas vent to turf
- del(H)
+ qdel(H)
return
@@ -817,7 +827,7 @@
for(var/atom/movable/AM in H)
AM.loc = T
AM.pipe_eject(0)
- del(H)
+ qdel(H)
return
// otherwise, do normal expel from turf
@@ -825,7 +835,7 @@
expel(H, T, 0)
spawn(2) // delete pipe after 2 ticks to ensure expel proc finished
- del(src)
+ qdel(src)
// pipe affected by explosion
@@ -918,7 +928,31 @@
C.anchored = 1
C.update()
- del(src)
+ qdel(src)
+
+// pipe is deleted
+// ensure if holder is present, it is expelled
+/obj/structure/disposalpipe/Destroy()
+ var/obj/structure/disposalholder/H = locate() in src
+ if(H)
+ // holder was present
+ H.active = 0
+ var/turf/T = src.loc
+ if(T.density)
+ // deleting pipe is inside a dense turf (wall)
+ // this is unlikely, but just dump out everything into the turf in case
+
+ for(var/atom/movable/AM in H)
+ AM.loc = T
+ AM.pipe_eject(0)
+ qdel(H)
+ ..()
+ return
+
+ // otherwise, do normal expel from turf
+ if(H)
+ expel(H, T, 0)
+ ..()
// *** TEST verb
//client/verb/dispstop()
@@ -1386,7 +1420,7 @@
welded()
// var/obj/item/scrap/S = new(src.loc)
// S.set_components(200,0,0)
- del(src)
+ qdel(src)
// the disposal outlet machine
@@ -1429,7 +1463,7 @@
spawn(5)
AM.throw_at(target, 3, 1)
H.vent_gas(src.loc)
- del(H)
+ qdel(H)
return
@@ -1462,14 +1496,12 @@
C.update()
C.anchored = 1
C.density = 1
- del(src)
+ qdel(src)
return
else
user << "You need more welding fuel to complete this task."
return
-
-
// called when movable is expelled from a disposal pipe or outlet
// by default does nothing, override for special behaviour
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 7a7622dd77..eb76325832 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -15,13 +15,15 @@
var/tag_x
attack_hand(mob/user as mob)
+ unwrap()
+
+ proc/unwrap()
if(wrapped) //sometimes items can disappear. For example, bombs. --rastaf0
wrapped.loc = (get_turf(src.loc))
if(istype(wrapped, /obj/structure/closet))
var/obj/structure/closet/O = wrapped
O.welded = 0
- del(src)
- return
+ qdel(src)
attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/device/destTagger))
@@ -127,7 +129,7 @@
else
wrapped.loc = get_turf(src)
- del(src)
+ qdel(src)
return
attackby(obj/item/W as obj, mob/user as mob)
@@ -297,7 +299,7 @@
user << "\blue The object you are trying to wrap is unsuitable for the sorting machinery!"
if (src.amount <= 0)
new /obj/item/weapon/c_tube( src.loc )
- del(src)
+ qdel(src)
return
return
@@ -307,6 +309,16 @@
return
+/obj/structure/bigDelivery/Destroy()
+ if(wrapped) //sometimes items can disappear. For example, bombs. --rastaf0
+ wrapped.loc = (get_turf(loc))
+ if(istype(wrapped, /obj/structure/closet))
+ var/obj/structure/closet/O = wrapped
+ O.welded = 0
+ var/turf/T = get_turf(src)
+ for(var/atom/movable/AM in contents)
+ AM.loc = T
+ ..()
/obj/item/device/destTagger
name = "destination tagger"
@@ -435,8 +447,13 @@
C.update()
C.anchored = 1
C.density = 1
- del(src)
+ qdel(src)
return
else
user << "You need more welding fuel to complete this task."
return
+
+/obj/machinery/disposal/deliveryChute/Destroy()
+ if(trunk)
+ trunk.linked = null
+ ..()
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index e1e63c08dc..aacdbbb345 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -54,10 +54,10 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
/obj/machinery/r_n_d/circuit_imprinter/blob_act()
if(prob(50))
- del(src)
+ qdel(src)
/obj/machinery/r_n_d/circuit_imprinter/meteorhit()
- del(src)
+ qdel(src)
return
/obj/machinery/r_n_d/circuit_imprinter/proc/TotalMaterials()
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index 3fc97cc6ab..b8d0fca209 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -35,7 +35,7 @@ Note: Must be placed within 3 tiles of the R&D Console
min_reliability = 93 - T
/obj/machinery/r_n_d/destructive_analyzer/meteorhit()
- del(src)
+ qdel(src)
return
/obj/machinery/r_n_d/destructive_analyzer/update_icon()
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index b0cc8d6050..aa1e1a52e4 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -75,7 +75,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
..()
return
-/obj/machinery/message_server/Del()
+/obj/machinery/message_server/Destroy()
message_servers -= src
..()
return
@@ -122,7 +122,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
istype(O,/obj/item/weapon/circuitboard/message_monitor))
spamfilter_limit += round(MESSAGE_SERVER_DEFAULT_SPAM_LIMIT / 2)
user.drop_item()
- del(O)
+ qdel(O)
user << "You install additional memory and processors into message server. Its filtering capabilities been enhanced."
else
..(O, user)
@@ -221,14 +221,14 @@ var/obj/machinery/blackbox_recorder/blackbox
var/list/datum/feedback_variable/feedback = new()
- //Only one can exsist in the world!
+ //Only one can exist in the world!
/obj/machinery/blackbox_recorder/New()
if(blackbox)
if(istype(blackbox,/obj/machinery/blackbox_recorder))
- del(src)
+ qdel(src)
blackbox = src
-/obj/machinery/blackbox_recorder/Del()
+/obj/machinery/blackbox_recorder/Destroy()
var/turf/T = locate(1,1,2)
if(T)
blackbox = null
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 89e31574d2..8f1113043d 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -30,6 +30,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole
name = "R&D control console"
icon_state = "rdcomp"
+ light_color = "#a97faa"
circuit = /obj/item/weapon/circuitboard/rdconsole
var/datum/research/files //Stores all the collected research data.
var/obj/item/weapon/disk/tech_disk/t_disk = null //Stores the technology disk.
@@ -54,7 +55,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
check_tech = new T()
if(check_tech.id == ID)
return_name = check_tech.name
- del(check_tech)
+ qdel(check_tech)
check_tech = null
break
@@ -66,8 +67,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if (copytext(ID, 1, 2) == "$")
return_name = copytext(ID, 2)
switch(return_name)
- if("metal")
- return_name = "Metal"
+ if(DEFAULT_WALL_MATERIAL)
+ return_name = "Steel"
if("glass")
return_name = "Glass"
if("gold")
@@ -86,7 +87,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
temp_reagent = new R()
if(temp_reagent.id == ID)
return_name = temp_reagent.name
- del(temp_reagent)
+ qdel(temp_reagent)
temp_reagent = null
break
return return_name
@@ -262,7 +263,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(linked_destroy.loaded_item.reliability < 100 && linked_destroy.loaded_item.crit_fail)
files.UpdateDesign(linked_destroy.loaded_item.type)
if(linked_lathe && linked_destroy.loaded_item.matter) //Also sends salvaged materials to a linked protolathe, if any.
- linked_lathe.m_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.matter["metal"]*linked_destroy.decon_mod))
+ linked_lathe.m_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.matter[DEFAULT_WALL_MATERIAL]*linked_destroy.decon_mod))
linked_lathe.g_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.matter["glass"]*linked_destroy.decon_mod))
linked_destroy.loaded_item = null
for(var/obj/I in linked_destroy.contents)
@@ -274,11 +275,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
S.use(1)
linked_destroy.loaded_item = S
else
- del(S)
+ qdel(S)
linked_destroy.icon_state = "d_analyzer"
else
if(!(I in linked_destroy.component_parts))
- del(I)
+ qdel(I)
linked_destroy.icon_state = "d_analyzer"
use_power(linked_destroy.active_power_usage)
screen = 1.0
@@ -438,27 +439,24 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else if(href_list["lathe_ejectsheet"] && linked_lathe) //Causes the protolathe to eject a sheet of material
var/desired_num_sheets = text2num(href_list["amount"])
var/res_amount, type
- switch(href_list["lathe_ejectsheet"])
- if("metal")
- type = /obj/item/stack/sheet/metal
+ var/material/M = name_to_material[href_list["lathe_ejectsheet"]]
+ if(istype(M))
+ type = M.stack_type
+
+ switch(name_to_material[href_list["lathe_ejectsheet"]])
+ if(DEFAULT_WALL_MATERIAL)
res_amount = "m_amount"
if("glass")
- type = /obj/item/stack/sheet/glass
res_amount = "g_amount"
if("gold")
- type = /obj/item/stack/sheet/mineral/gold
res_amount = "gold_amount"
if("silver")
- type = /obj/item/stack/sheet/mineral/silver
res_amount = "silver_amount"
if("phoron")
- type = /obj/item/stack/sheet/mineral/phoron
res_amount = "phoron_amount"
if("uranium")
- type = /obj/item/stack/sheet/mineral/uranium
res_amount = "uranium_amount"
if("diamond")
- type = /obj/item/stack/sheet/mineral/diamond
res_amount = "diamond_amount"
if(ispath(type) && hasvar(linked_lathe, res_amount))
@@ -468,7 +466,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
sheet.amount = min(available_num_sheets, desired_num_sheets)
linked_lathe.vars[res_amount] = max(0, (linked_lathe.vars[res_amount]-sheet.amount * sheet.perunit))
else
- del sheet
+ qdel(sheet)
else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the protolathe to eject a sheet of material
var/desired_num_sheets = text2num(href_list["amount"])
var/res_amount, type
@@ -492,7 +490,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
sheet.amount = min(available_num_sheets, desired_num_sheets)
linked_imprinter.vars[res_amount] = max(0, (linked_imprinter.vars[res_amount]-sheet.amount * sheet.perunit))
else
- del sheet
+ qdel(sheet)
else if(href_list["find_device"]) //The R&D console looks for devices nearby to link up with.
screen = 0.0
@@ -518,7 +516,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/choice = alert("R&D Console Database Reset", "Are you sure you want to reset the R&D console's database? Data lost cannot be recovered.", "Continue", "Cancel")
if(choice == "Continue")
screen = 0.0
- del(files)
+ qdel(files)
files = new /datum/research(src)
spawn(20)
screen = 1.6
@@ -817,11 +815,11 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Protolathe Menu
"
dat += "Material Storage
"
dat += ""
- for(var/M in list("metal", "glass", "gold", "silver", "phoron", "uranium", "diamond"))
+ for(var/M in list(DEFAULT_WALL_MATERIAL, "glass", "gold", "silver", "phoron", "uranium", "diamond"))
var/amount
var/sheetsize = 2000
switch(M)
- if("metal")
+ if(DEFAULT_WALL_MATERIAL)
amount = linked_lathe.m_amount
sheetsize = 3750
if("glass")
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index 72127cfa89..a397728b73 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -269,7 +269,7 @@ datum/tech/robotics
icon_state = "datadisk2"
item_state = "card-id"
w_class = 2.0
- matter = list("metal" = 30, "glass" = 10)
+ matter = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
var/datum/tech/stored
/obj/item/weapon/disk/tech_disk/New()
@@ -283,7 +283,7 @@ datum/tech/robotics
icon_state = "datadisk2"
item_state = "card-id"
w_class = 2.0
- matter = list("metal" = 30,"glass" = 10)
+ matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
var/datum/design/blueprint
/obj/item/weapon/disk/design_disk/New()
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 6a5311e62b..d57c995755 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -24,7 +24,7 @@
RefreshParts()
src.initialize(); //Agouri
-/obj/machinery/r_n_d/server/Del()
+/obj/machinery/r_n_d/server/Destroy()
griefProtection()
..()
@@ -149,7 +149,7 @@
if(I.reliability != 100 && crit_fail)
I.crit_fail = 1
I.loc = src.loc
- del(src)
+ qdel(src)
return 1
/obj/machinery/r_n_d/server/attack_hand(mob/user as mob)
@@ -196,6 +196,7 @@
/obj/machinery/computer/rdservercontrol
name = "R&D Server Controller"
icon_state = "rdcomp"
+ light_color = "#a97faa"
circuit = /obj/item/weapon/circuitboard/rdservercontrol
var/screen = 0
var/obj/machinery/r_n_d/server/temp_server
@@ -355,4 +356,4 @@
name = "Core R&D Server"
id_with_upload_string = "1"
id_with_download_string = "1"
- server_id = 1
\ No newline at end of file
+ server_id = 1
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm
index 666d361a2b..a3256d6f53 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm
@@ -1,124 +1,124 @@
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Large finds - (Potentially) active alien machinery from the dawn of time
-
-/datum/artifact_find
- var/artifact_id
- var/artifact_find_type
- var/artifact_detect_range
-
-/datum/artifact_find/New()
- artifact_detect_range = rand(5,300)
-
- artifact_id = "[pick("kappa","sigma","antaeres","beta","omicron","iota","epsilon","omega","gamma","delta","tau","alpha")]-[rand(100,999)]"
-
- artifact_find_type = pick(\
- 5;/obj/machinery/power/supermatter,\
- 5;/obj/structure/constructshell,\
- 5;/obj/machinery/syndicate_beacon,\
- 25;/obj/machinery/power/supermatter/shard,\
- 50;/obj/structure/cult/pylon,\
- 100;/obj/machinery/auto_cloner,\
- 100;/obj/machinery/giga_drill,\
- 100;/obj/machinery/replicator,\
- 150;/obj/structure/crystal,\
- 1000;/obj/machinery/artifact)
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Boulders - sometimes turn up after excavating turf - excavate further to try and find large xenoarch finds
-
-/obj/structure/boulder
- name = "rocky debris"
- desc = "Leftover rock from an excavation, it's been partially dug out already but there's still a lot to go."
- icon = 'icons/obj/mining.dmi'
- icon_state = "boulder1"
- density = 1
- opacity = 1
- anchored = 1
- var/excavation_level = 0
- var/datum/geosample/geological_data
- var/datum/artifact_find/artifact_find
- var/last_act = 0
-
-/obj/structure/boulder/New()
- icon_state = "boulder[rand(1,4)]"
- excavation_level = rand(5,50)
-
-/obj/structure/boulder/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if (istype(W, /obj/item/device/core_sampler))
- src.geological_data.artifact_distance = rand(-100,100) / 100
- src.geological_data.artifact_id = artifact_find.artifact_id
-
- var/obj/item/device/core_sampler/C = W
- C.sample_item(src, user)
- return
-
- if (istype(W, /obj/item/device/depth_scanner))
- var/obj/item/device/depth_scanner/C = W
- C.scan_atom(user, src)
- return
-
- if (istype(W, /obj/item/device/measuring_tape))
- var/obj/item/device/measuring_tape/P = W
- user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].")
- if(do_after(user,40))
- user << "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm."
- return
-
- if (istype(W, /obj/item/weapon/pickaxe))
- var/obj/item/weapon/pickaxe/P = W
-
- if(last_act + P.digspeed > world.time)//prevents message spam
- return
- last_act = world.time
-
- user << "\red You start [P.drill_verb] [src]."
-
-
-
- if(!do_after(user,P.digspeed))
- return
-
- user << "\blue You finish [P.drill_verb] [src]."
- excavation_level += P.excavation_amount
-
- if(excavation_level > 100)
- //failure
- user.visible_message("[src] suddenly crumbles away.",\
- "\red [src] has disintegrated under your onslaught, any secrets it was holding are long gone.")
- del(src)
- return
-
- if(prob(excavation_level))
- //success
- if(artifact_find)
- var/spawn_type = artifact_find.artifact_find_type
- var/obj/O = new spawn_type(get_turf(src))
- if(istype(O,/obj/machinery/artifact))
- var/obj/machinery/artifact/X = O
- if(X.my_effect)
- X.my_effect.artifact_id = artifact_find.artifact_id
- src.visible_message("[src] suddenly crumbles away.")
- else
- user.visible_message("[src] suddenly crumbles away.",\
- "\blue [src] has been whittled away under your careful excavation, but there was nothing of interest inside.")
- del(src)
-
-/obj/structure/boulder/Bumped(AM)
- . = ..()
- if(istype(AM,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = AM
- if((istype(H.l_hand,/obj/item/weapon/pickaxe)) && (!H.hand))
- attackby(H.l_hand,H)
- else if((istype(H.r_hand,/obj/item/weapon/pickaxe)) && H.hand)
- attackby(H.r_hand,H)
-
- else if(istype(AM,/mob/living/silicon/robot))
- var/mob/living/silicon/robot/R = AM
- if(istype(R.module_active,/obj/item/weapon/pickaxe))
- attackby(R.module_active,R)
-
- else if(istype(AM,/obj/mecha))
- var/obj/mecha/M = AM
- if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/tool/drill))
- M.selected.action(src)
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Large finds - (Potentially) active alien machinery from the dawn of time
+
+/datum/artifact_find
+ var/artifact_id
+ var/artifact_find_type
+ var/artifact_detect_range
+
+/datum/artifact_find/New()
+ artifact_detect_range = rand(5,300)
+
+ artifact_id = "[pick("kappa","sigma","antaeres","beta","omicron","iota","epsilon","omega","gamma","delta","tau","alpha")]-[rand(100,999)]"
+
+ artifact_find_type = pick(\
+ 5;/obj/machinery/power/supermatter,\
+ 5;/obj/structure/constructshell,\
+ 5;/obj/machinery/syndicate_beacon,\
+ 25;/obj/machinery/power/supermatter/shard,\
+ 50;/obj/structure/cult/pylon,\
+ 100;/obj/machinery/auto_cloner,\
+ 100;/obj/machinery/giga_drill,\
+ 100;/obj/machinery/replicator,\
+ 150;/obj/structure/crystal,\
+ 1000;/obj/machinery/artifact)
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Boulders - sometimes turn up after excavating turf - excavate further to try and find large xenoarch finds
+
+/obj/structure/boulder
+ name = "rocky debris"
+ desc = "Leftover rock from an excavation, it's been partially dug out already but there's still a lot to go."
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "boulder1"
+ density = 1
+ opacity = 1
+ anchored = 1
+ var/excavation_level = 0
+ var/datum/geosample/geological_data
+ var/datum/artifact_find/artifact_find
+ var/last_act = 0
+
+/obj/structure/boulder/New()
+ icon_state = "boulder[rand(1,4)]"
+ excavation_level = rand(5,50)
+
+/obj/structure/boulder/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if (istype(W, /obj/item/device/core_sampler))
+ src.geological_data.artifact_distance = rand(-100,100) / 100
+ src.geological_data.artifact_id = artifact_find.artifact_id
+
+ var/obj/item/device/core_sampler/C = W
+ C.sample_item(src, user)
+ return
+
+ if (istype(W, /obj/item/device/depth_scanner))
+ var/obj/item/device/depth_scanner/C = W
+ C.scan_atom(user, src)
+ return
+
+ if (istype(W, /obj/item/device/measuring_tape))
+ var/obj/item/device/measuring_tape/P = W
+ user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].")
+ if(do_after(user,40))
+ user << "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm."
+ return
+
+ if (istype(W, /obj/item/weapon/pickaxe))
+ var/obj/item/weapon/pickaxe/P = W
+
+ if(last_act + P.digspeed > world.time)//prevents message spam
+ return
+ last_act = world.time
+
+ user << "\red You start [P.drill_verb] [src]."
+
+
+
+ if(!do_after(user,P.digspeed))
+ return
+
+ user << "\blue You finish [P.drill_verb] [src]."
+ excavation_level += P.excavation_amount
+
+ if(excavation_level > 100)
+ //failure
+ user.visible_message("[src] suddenly crumbles away.",\
+ "\red [src] has disintegrated under your onslaught, any secrets it was holding are long gone.")
+ qdel(src)
+ return
+
+ if(prob(excavation_level))
+ //success
+ if(artifact_find)
+ var/spawn_type = artifact_find.artifact_find_type
+ var/obj/O = new spawn_type(get_turf(src))
+ if(istype(O,/obj/machinery/artifact))
+ var/obj/machinery/artifact/X = O
+ if(X.my_effect)
+ X.my_effect.artifact_id = artifact_find.artifact_id
+ src.visible_message("[src] suddenly crumbles away.")
+ else
+ user.visible_message("[src] suddenly crumbles away.",\
+ "\blue [src] has been whittled away under your careful excavation, but there was nothing of interest inside.")
+ qdel(src)
+
+/obj/structure/boulder/Bumped(AM)
+ . = ..()
+ if(istype(AM,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = AM
+ if((istype(H.l_hand,/obj/item/weapon/pickaxe)) && (!H.hand))
+ attackby(H.l_hand,H)
+ else if((istype(H.r_hand,/obj/item/weapon/pickaxe)) && H.hand)
+ attackby(H.r_hand,H)
+
+ else if(istype(AM,/mob/living/silicon/robot))
+ var/mob/living/silicon/robot/R = AM
+ if(istype(R.module_active,/obj/item/weapon/pickaxe))
+ attackby(R.module_active,R)
+
+ else if(istype(AM,/obj/mecha))
+ var/obj/mecha/M = AM
+ if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/tool/drill))
+ M.selected.action(src)
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm
index 9829c35ec8..44f257060a 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm
@@ -1,36 +1,36 @@
-
-/obj/structure/crystal
- name = "large crystal"
- icon = 'icons/obj/xenoarchaeology.dmi'
- icon_state = "crystal"
- density = 1
-
-/obj/structure/crystal/New()
- ..()
-
- icon_state = pick("ano70","ano80")
-
- desc = pick(\
- "It shines faintly as it catches the light.",\
- "It appears to have a faint inner glow.",\
- "It seems to draw you inward as you look it at.",\
- "Something twinkles faintly as you look at it.",\
- "It's mesmerizing to behold.")
-
-/obj/structure/crystal/Del()
- src.visible_message("\red[src] shatters!")
- if(prob(75))
- new /obj/item/weapon/shard/phoron(src.loc)
- if(prob(50))
- new /obj/item/weapon/shard/phoron(src.loc)
- if(prob(25))
- new /obj/item/weapon/shard/phoron(src.loc)
- if(prob(75))
- new /obj/item/weapon/shard(src.loc)
- if(prob(50))
- new /obj/item/weapon/shard(src.loc)
- if(prob(25))
- new /obj/item/weapon/shard(src.loc)
- ..()
-
-//todo: laser_act
+
+/obj/structure/crystal
+ name = "large crystal"
+ icon = 'icons/obj/xenoarchaeology.dmi'
+ icon_state = "crystal"
+ density = 1
+
+/obj/structure/crystal/New()
+ ..()
+
+ icon_state = pick("ano70","ano80")
+
+ desc = pick(\
+ "It shines faintly as it catches the light.",\
+ "It appears to have a faint inner glow.",\
+ "It seems to draw you inward as you look it at.",\
+ "Something twinkles faintly as you look at it.",\
+ "It's mesmerizing to behold.")
+
+/obj/structure/crystal/Destroy()
+ src.visible_message("\red[src] shatters!")
+ if(prob(75))
+ new /obj/item/weapon/shard/phoron(src.loc)
+ if(prob(50))
+ new /obj/item/weapon/shard/phoron(src.loc)
+ if(prob(25))
+ new /obj/item/weapon/shard/phoron(src.loc)
+ if(prob(75))
+ new /obj/item/weapon/shard(src.loc)
+ if(prob(50))
+ new /obj/item/weapon/shard(src.loc)
+ if(prob(25))
+ new /obj/item/weapon/shard(src.loc)
+ ..()
+
+//todo: laser_act
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
index 4108986789..7617468b41 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
@@ -102,7 +102,7 @@
spawned_obj.desc += " It is made of [source_material]."
else
spawned_obj.desc = "It is made of [source_material]."
- del(source_material)
+ qdel(source_material)
spawn_progress_time = 0
max_spawn_time = rand(30,100)
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
index 22593fa4f5..5fbe8dcd41 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
@@ -1,366 +1,366 @@
-
-#define EFFECT_TOUCH 0
-#define EFFECT_AURA 1
-#define EFFECT_PULSE 2
-#define MAX_EFFECT 2
-
-#define TRIGGER_TOUCH 0
-#define TRIGGER_WATER 1
-#define TRIGGER_ACID 2
-#define TRIGGER_VOLATILE 3
-#define TRIGGER_TOXIN 4
-#define TRIGGER_FORCE 5
-#define TRIGGER_ENERGY 6
-#define TRIGGER_HEAT 7
-#define TRIGGER_COLD 8
-#define TRIGGER_PHORON 9
-#define TRIGGER_OXY 10
-#define TRIGGER_CO2 11
-#define TRIGGER_NITRO 12
-#define MAX_TRIGGER 12
-/*
-//sleeping gas appears to be bugged, currently
-var/list/valid_primary_effect_types = list(\
- /datum/artifact_effect/cellcharge,\
- /datum/artifact_effect/celldrain,\
- /datum/artifact_effect/forcefield,\
- /datum/artifact_effect/gasoxy,\
- /datum/artifact_effect/gasplasma,\
-/* /datum/artifact_effect/gassleeping,\*/
- /datum/artifact_effect/heal,\
- /datum/artifact_effect/hurt,\
- /datum/artifact_effect/emp,\
- /datum/artifact_effect/teleport,\
- /datum/artifact_effect/robohurt,\
- /datum/artifact_effect/roboheal)
-
-var/list/valid_secondary_effect_types = list(\
- /datum/artifact_effect/cold,\
- /datum/artifact_effect/badfeeling,\
- /datum/artifact_effect/cellcharge,\
- /datum/artifact_effect/celldrain,\
- /datum/artifact_effect/dnaswitch,\
- /datum/artifact_effect/emp,\
- /datum/artifact_effect/gasco2,\
- /datum/artifact_effect/gasnitro,\
- /datum/artifact_effect/gasoxy,\
- /datum/artifact_effect/gasphoron,\
-/* /datum/artifact_effect/gassleeping,\*/
- /datum/artifact_effect/goodfeeling,\
- /datum/artifact_effect/heal,\
- /datum/artifact_effect/hurt,\
- /datum/artifact_effect/radiate,\
- /datum/artifact_effect/roboheal,\
- /datum/artifact_effect/robohurt,\
- /datum/artifact_effect/sleepy,\
- /datum/artifact_effect/stun,\
- /datum/artifact_effect/teleport)
- */
-
-/obj/machinery/artifact
- name = "alien artifact"
- desc = "A large alien device."
- icon = 'icons/obj/xenoarchaeology.dmi'
- icon_state = "ano00"
- var/icon_num = 0
- density = 1
- var/datum/artifact_effect/my_effect
- var/datum/artifact_effect/secondary_effect
- var/being_used = 0
-
-/obj/machinery/artifact/New()
- ..()
-
- //setup primary effect - these are the main ones (mixed)
- var/effecttype = pick(typesof(/datum/artifact_effect) - /datum/artifact_effect)
- my_effect = new effecttype(src)
-
- //75% chance to have a secondary stealthy (and mostly bad) effect
- if(prob(75))
- effecttype = pick(typesof(/datum/artifact_effect) - /datum/artifact_effect)
- secondary_effect = new effecttype(src)
- if(prob(75))
- secondary_effect.ToggleActivate(0)
-
- icon_num = rand(0,11)
- icon_state = "ano[icon_num]0"
- if(icon_num == 7 || icon_num == 8)
- name = "large crystal"
- desc = pick("It shines faintly as it catches the light.",\
- "It appears to have a faint inner glow.",\
- "It seems to draw you inward as you look it at.",\
- "Something twinkles faintly as you look at it.",\
- "It's mesmerizing to behold.")
- if(prob(50))
- my_effect.trigger = TRIGGER_ENERGY
- else if(icon_num == 9)
- name = "alien computer"
- desc = "It is covered in strange markings."
- if(prob(75))
- my_effect.trigger = TRIGGER_TOUCH
- else if(icon_num == 10)
- desc = "A large alien device, there appear to be some kind of vents in the side."
- if(prob(50))
- my_effect.trigger = rand(6,12)
- else if(icon_num == 11)
- name = "sealed alien pod"
- desc = "A strange alien device."
- if(prob(25))
- my_effect.trigger = rand(1,4)
-
-#define TRIGGER_PHORON 9
-#define TRIGGER_OXY 10
-#define TRIGGER_CO2 11
-#define TRIGGER_NITRO 12
-
-/obj/machinery/artifact/process()
-
- var/turf/L = loc
- if(isnull(L) || !istype(L)) // We're inside a container or on null turf, either way stop processing effects
- return
-
- if(my_effect)
- my_effect.process()
- if(secondary_effect)
- secondary_effect.process()
-
- if(pulledby)
- Bumped(pulledby)
-
- //if either of our effects rely on environmental factors, work that out
- var/trigger_cold = 0
- var/trigger_hot = 0
- var/trigger_phoron = 0
- var/trigger_oxy = 0
- var/trigger_co2 = 0
- var/trigger_nitro = 0
- if( (my_effect.trigger >= TRIGGER_HEAT && my_effect.trigger <= TRIGGER_NITRO) || (my_effect.trigger >= TRIGGER_HEAT && my_effect.trigger <= TRIGGER_NITRO) )
- var/turf/T = get_turf(src)
- var/datum/gas_mixture/env = T.return_air()
- if(env)
- if(env.temperature < 225)
- trigger_cold = 1
- else if(env.temperature > 375)
- trigger_hot = 1
-
- if(env.gas["phoron"] >= 10)
- trigger_phoron = 1
- if(env.gas["oxygen"] >= 10)
- trigger_oxy = 1
- if(env.gas["carbon_dioxide"] >= 10)
- trigger_co2 = 1
- if(env.gas["nitrogen"] >= 10)
- trigger_nitro = 1
-
- //COLD ACTIVATION
- if(trigger_cold)
- if(my_effect.trigger == TRIGGER_COLD && !my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_COLD && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
- else
- if(my_effect.trigger == TRIGGER_COLD && my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_COLD && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
-
- //HEAT ACTIVATION
- if(trigger_hot)
- if(my_effect.trigger == TRIGGER_HEAT && !my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
- else
- if(my_effect.trigger == TRIGGER_HEAT && my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
-
- //PHORON GAS ACTIVATION
- if(trigger_phoron)
- if(my_effect.trigger == TRIGGER_PHORON && !my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_PHORON && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
- else
- if(my_effect.trigger == TRIGGER_PHORON && my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_PHORON && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
-
- //OXYGEN GAS ACTIVATION
- if(trigger_oxy)
- if(my_effect.trigger == TRIGGER_OXY && !my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_OXY && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
- else
- if(my_effect.trigger == TRIGGER_OXY && my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_OXY && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
-
- //CO2 GAS ACTIVATION
- if(trigger_co2)
- if(my_effect.trigger == TRIGGER_CO2 && !my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_CO2 && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
- else
- if(my_effect.trigger == TRIGGER_CO2 && my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_CO2 && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
-
- //NITROGEN GAS ACTIVATION
- if(trigger_nitro)
- if(my_effect.trigger == TRIGGER_NITRO && !my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_NITRO && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
- else
- if(my_effect.trigger == TRIGGER_NITRO && my_effect.activated)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_NITRO && !secondary_effect.activated)
- secondary_effect.ToggleActivate(0)
-
-/obj/machinery/artifact/attack_hand(var/mob/user as mob)
- if (get_dist(user, src) > 1)
- user << "\red You can't reach [src] from here."
- return
- if(ishuman(user) && user:gloves)
- user << "You touch [src] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")]."
- return
-
- src.add_fingerprint(user)
-
- if(my_effect.trigger == TRIGGER_TOUCH)
- user << "You touch [src]."
- my_effect.ToggleActivate()
- else
- user << "You touch [src], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")]."
-
- if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH)
- secondary_effect.ToggleActivate(0)
-
- if (my_effect.effect == EFFECT_TOUCH)
- my_effect.DoEffectTouch(user)
-
- if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated)
- secondary_effect.DoEffectTouch(user)
-
-/obj/machinery/artifact/attackby(obj/item/weapon/W as obj, mob/living/user as mob)
-
- if (istype(W, /obj/item/weapon/reagent_containers/))
- if(W.reagents.has_reagent("hydrogen", 1) || W.reagents.has_reagent("water", 1))
- if(my_effect.trigger == TRIGGER_WATER)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_WATER && prob(25))
- secondary_effect.ToggleActivate(0)
- else if(W.reagents.has_reagent("acid", 1) || W.reagents.has_reagent("pacid", 1) || W.reagents.has_reagent("diethylamine", 1))
- if(my_effect.trigger == TRIGGER_ACID)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_ACID && prob(25))
- secondary_effect.ToggleActivate(0)
- else if(W.reagents.has_reagent("phoron", 1) || W.reagents.has_reagent("thermite", 1))
- if(my_effect.trigger == TRIGGER_VOLATILE)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_VOLATILE && prob(25))
- secondary_effect.ToggleActivate(0)
- else if(W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amanitin", 1) || W.reagents.has_reagent("neurotoxin", 1))
- if(my_effect.trigger == TRIGGER_TOXIN)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_TOXIN && prob(25))
- secondary_effect.ToggleActivate(0)
- else if(istype(W,/obj/item/weapon/melee/baton) && W:status ||\
- istype(W,/obj/item/weapon/melee/energy) ||\
- istype(W,/obj/item/weapon/melee/cultblade) ||\
- istype(W,/obj/item/weapon/card/emag) ||\
- istype(W,/obj/item/device/multitool))
- if (my_effect.trigger == TRIGGER_ENERGY)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25))
- secondary_effect.ToggleActivate(0)
-
- else if (istype(W,/obj/item/weapon/flame) && W:lit ||\
- istype(W,/obj/item/weapon/weldingtool) && W:welding)
- if(my_effect.trigger == TRIGGER_HEAT)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && prob(25))
- secondary_effect.ToggleActivate(0)
- else
- ..()
- if (my_effect.trigger == TRIGGER_FORCE && W.force >= 10)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
- secondary_effect.ToggleActivate(0)
-
-/obj/machinery/artifact/Bumped(M as mob|obj)
- ..()
- if(istype(M,/obj))
- if(M:throwforce >= 10)
- if(my_effect.trigger == TRIGGER_FORCE)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
- secondary_effect.ToggleActivate(0)
- else if(ishuman(M) && !istype(M:gloves,/obj/item/clothing/gloves))
- var/warn = 0
-
- if (my_effect.trigger == TRIGGER_TOUCH && prob(50))
- my_effect.ToggleActivate()
- warn = 1
- if(secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH && prob(25))
- secondary_effect.ToggleActivate(0)
- warn = 1
-
- if (my_effect.effect == EFFECT_TOUCH && prob(50))
- my_effect.DoEffectTouch(M)
- warn = 1
- if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated && prob(50))
- secondary_effect.DoEffectTouch(M)
- warn = 1
-
- if(warn)
- M << "You accidentally touch [src]."
- ..()
-
-/obj/machinery/artifact/bullet_act(var/obj/item/projectile/P)
- if(istype(P,/obj/item/projectile/bullet) ||\
- istype(P,/obj/item/projectile/hivebotbullet))
- if(my_effect.trigger == TRIGGER_FORCE)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
- secondary_effect.ToggleActivate(0)
-
- else if(istype(P,/obj/item/projectile/beam) ||\
- istype(P,/obj/item/projectile/ion) ||\
- istype(P,/obj/item/projectile/energy))
- if(my_effect.trigger == TRIGGER_ENERGY)
- my_effect.ToggleActivate()
- if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25))
- secondary_effect.ToggleActivate(0)
-
-/obj/machinery/artifact/ex_act(severity)
- switch(severity)
- if(1.0) del src
- if(2.0)
- if (prob(50))
- del src
- else
- if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
- my_effect.ToggleActivate()
- if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25))
- secondary_effect.ToggleActivate(0)
- if(3.0)
- if (my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
- my_effect.ToggleActivate()
- if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25))
- secondary_effect.ToggleActivate(0)
- return
-
-/obj/machinery/artifact/Move()
- ..()
- if(my_effect)
- my_effect.UpdateMove()
- if(secondary_effect)
- secondary_effect.UpdateMove()
+
+#define EFFECT_TOUCH 0
+#define EFFECT_AURA 1
+#define EFFECT_PULSE 2
+#define MAX_EFFECT 2
+
+#define TRIGGER_TOUCH 0
+#define TRIGGER_WATER 1
+#define TRIGGER_ACID 2
+#define TRIGGER_VOLATILE 3
+#define TRIGGER_TOXIN 4
+#define TRIGGER_FORCE 5
+#define TRIGGER_ENERGY 6
+#define TRIGGER_HEAT 7
+#define TRIGGER_COLD 8
+#define TRIGGER_PHORON 9
+#define TRIGGER_OXY 10
+#define TRIGGER_CO2 11
+#define TRIGGER_NITRO 12
+#define MAX_TRIGGER 12
+/*
+//sleeping gas appears to be bugged, currently
+var/list/valid_primary_effect_types = list(\
+ /datum/artifact_effect/cellcharge,\
+ /datum/artifact_effect/celldrain,\
+ /datum/artifact_effect/forcefield,\
+ /datum/artifact_effect/gasoxy,\
+ /datum/artifact_effect/gasplasma,\
+/* /datum/artifact_effect/gassleeping,\*/
+ /datum/artifact_effect/heal,\
+ /datum/artifact_effect/hurt,\
+ /datum/artifact_effect/emp,\
+ /datum/artifact_effect/teleport,\
+ /datum/artifact_effect/robohurt,\
+ /datum/artifact_effect/roboheal)
+
+var/list/valid_secondary_effect_types = list(\
+ /datum/artifact_effect/cold,\
+ /datum/artifact_effect/badfeeling,\
+ /datum/artifact_effect/cellcharge,\
+ /datum/artifact_effect/celldrain,\
+ /datum/artifact_effect/dnaswitch,\
+ /datum/artifact_effect/emp,\
+ /datum/artifact_effect/gasco2,\
+ /datum/artifact_effect/gasnitro,\
+ /datum/artifact_effect/gasoxy,\
+ /datum/artifact_effect/gasphoron,\
+/* /datum/artifact_effect/gassleeping,\*/
+ /datum/artifact_effect/goodfeeling,\
+ /datum/artifact_effect/heal,\
+ /datum/artifact_effect/hurt,\
+ /datum/artifact_effect/radiate,\
+ /datum/artifact_effect/roboheal,\
+ /datum/artifact_effect/robohurt,\
+ /datum/artifact_effect/sleepy,\
+ /datum/artifact_effect/stun,\
+ /datum/artifact_effect/teleport)
+ */
+
+/obj/machinery/artifact
+ name = "alien artifact"
+ desc = "A large alien device."
+ icon = 'icons/obj/xenoarchaeology.dmi'
+ icon_state = "ano00"
+ var/icon_num = 0
+ density = 1
+ var/datum/artifact_effect/my_effect
+ var/datum/artifact_effect/secondary_effect
+ var/being_used = 0
+
+/obj/machinery/artifact/New()
+ ..()
+
+ //setup primary effect - these are the main ones (mixed)
+ var/effecttype = pick(typesof(/datum/artifact_effect) - /datum/artifact_effect)
+ my_effect = new effecttype(src)
+
+ //75% chance to have a secondary stealthy (and mostly bad) effect
+ if(prob(75))
+ effecttype = pick(typesof(/datum/artifact_effect) - /datum/artifact_effect)
+ secondary_effect = new effecttype(src)
+ if(prob(75))
+ secondary_effect.ToggleActivate(0)
+
+ icon_num = rand(0,11)
+ icon_state = "ano[icon_num]0"
+ if(icon_num == 7 || icon_num == 8)
+ name = "large crystal"
+ desc = pick("It shines faintly as it catches the light.",\
+ "It appears to have a faint inner glow.",\
+ "It seems to draw you inward as you look it at.",\
+ "Something twinkles faintly as you look at it.",\
+ "It's mesmerizing to behold.")
+ if(prob(50))
+ my_effect.trigger = TRIGGER_ENERGY
+ else if(icon_num == 9)
+ name = "alien computer"
+ desc = "It is covered in strange markings."
+ if(prob(75))
+ my_effect.trigger = TRIGGER_TOUCH
+ else if(icon_num == 10)
+ desc = "A large alien device, there appear to be some kind of vents in the side."
+ if(prob(50))
+ my_effect.trigger = rand(6,12)
+ else if(icon_num == 11)
+ name = "sealed alien pod"
+ desc = "A strange alien device."
+ if(prob(25))
+ my_effect.trigger = rand(1,4)
+
+#define TRIGGER_PHORON 9
+#define TRIGGER_OXY 10
+#define TRIGGER_CO2 11
+#define TRIGGER_NITRO 12
+
+/obj/machinery/artifact/process()
+
+ var/turf/L = loc
+ if(isnull(L) || !istype(L)) // We're inside a container or on null turf, either way stop processing effects
+ return
+
+ if(my_effect)
+ my_effect.process()
+ if(secondary_effect)
+ secondary_effect.process()
+
+ if(pulledby)
+ Bumped(pulledby)
+
+ //if either of our effects rely on environmental factors, work that out
+ var/trigger_cold = 0
+ var/trigger_hot = 0
+ var/trigger_phoron = 0
+ var/trigger_oxy = 0
+ var/trigger_co2 = 0
+ var/trigger_nitro = 0
+ if( (my_effect.trigger >= TRIGGER_HEAT && my_effect.trigger <= TRIGGER_NITRO) || (my_effect.trigger >= TRIGGER_HEAT && my_effect.trigger <= TRIGGER_NITRO) )
+ var/turf/T = get_turf(src)
+ var/datum/gas_mixture/env = T.return_air()
+ if(env)
+ if(env.temperature < 225)
+ trigger_cold = 1
+ else if(env.temperature > 375)
+ trigger_hot = 1
+
+ if(env.gas["phoron"] >= 10)
+ trigger_phoron = 1
+ if(env.gas["oxygen"] >= 10)
+ trigger_oxy = 1
+ if(env.gas["carbon_dioxide"] >= 10)
+ trigger_co2 = 1
+ if(env.gas["nitrogen"] >= 10)
+ trigger_nitro = 1
+
+ //COLD ACTIVATION
+ if(trigger_cold)
+ if(my_effect.trigger == TRIGGER_COLD && !my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_COLD && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+ else
+ if(my_effect.trigger == TRIGGER_COLD && my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_COLD && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+
+ //HEAT ACTIVATION
+ if(trigger_hot)
+ if(my_effect.trigger == TRIGGER_HEAT && !my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+ else
+ if(my_effect.trigger == TRIGGER_HEAT && my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+
+ //PHORON GAS ACTIVATION
+ if(trigger_phoron)
+ if(my_effect.trigger == TRIGGER_PHORON && !my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_PHORON && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+ else
+ if(my_effect.trigger == TRIGGER_PHORON && my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_PHORON && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+
+ //OXYGEN GAS ACTIVATION
+ if(trigger_oxy)
+ if(my_effect.trigger == TRIGGER_OXY && !my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_OXY && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+ else
+ if(my_effect.trigger == TRIGGER_OXY && my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_OXY && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+
+ //CO2 GAS ACTIVATION
+ if(trigger_co2)
+ if(my_effect.trigger == TRIGGER_CO2 && !my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_CO2 && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+ else
+ if(my_effect.trigger == TRIGGER_CO2 && my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_CO2 && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+
+ //NITROGEN GAS ACTIVATION
+ if(trigger_nitro)
+ if(my_effect.trigger == TRIGGER_NITRO && !my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_NITRO && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+ else
+ if(my_effect.trigger == TRIGGER_NITRO && my_effect.activated)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_NITRO && !secondary_effect.activated)
+ secondary_effect.ToggleActivate(0)
+
+/obj/machinery/artifact/attack_hand(var/mob/user as mob)
+ if (get_dist(user, src) > 1)
+ user << "\red You can't reach [src] from here."
+ return
+ if(ishuman(user) && user:gloves)
+ user << "You touch [src] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")]."
+ return
+
+ src.add_fingerprint(user)
+
+ if(my_effect.trigger == TRIGGER_TOUCH)
+ user << "You touch [src]."
+ my_effect.ToggleActivate()
+ else
+ user << "You touch [src], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")]."
+
+ if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH)
+ secondary_effect.ToggleActivate(0)
+
+ if (my_effect.effect == EFFECT_TOUCH)
+ my_effect.DoEffectTouch(user)
+
+ if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated)
+ secondary_effect.DoEffectTouch(user)
+
+/obj/machinery/artifact/attackby(obj/item/weapon/W as obj, mob/living/user as mob)
+
+ if (istype(W, /obj/item/weapon/reagent_containers/))
+ if(W.reagents.has_reagent("hydrogen", 1) || W.reagents.has_reagent("water", 1))
+ if(my_effect.trigger == TRIGGER_WATER)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_WATER && prob(25))
+ secondary_effect.ToggleActivate(0)
+ else if(W.reagents.has_reagent("acid", 1) || W.reagents.has_reagent("pacid", 1) || W.reagents.has_reagent("diethylamine", 1))
+ if(my_effect.trigger == TRIGGER_ACID)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_ACID && prob(25))
+ secondary_effect.ToggleActivate(0)
+ else if(W.reagents.has_reagent("phoron", 1) || W.reagents.has_reagent("thermite", 1))
+ if(my_effect.trigger == TRIGGER_VOLATILE)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_VOLATILE && prob(25))
+ secondary_effect.ToggleActivate(0)
+ else if(W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amanitin", 1) || W.reagents.has_reagent("neurotoxin", 1))
+ if(my_effect.trigger == TRIGGER_TOXIN)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_TOXIN && prob(25))
+ secondary_effect.ToggleActivate(0)
+ else if(istype(W,/obj/item/weapon/melee/baton) && W:status ||\
+ istype(W,/obj/item/weapon/melee/energy) ||\
+ istype(W,/obj/item/weapon/melee/cultblade) ||\
+ istype(W,/obj/item/weapon/card/emag) ||\
+ istype(W,/obj/item/device/multitool))
+ if (my_effect.trigger == TRIGGER_ENERGY)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25))
+ secondary_effect.ToggleActivate(0)
+
+ else if (istype(W,/obj/item/weapon/flame) && W:lit ||\
+ istype(W,/obj/item/weapon/weldingtool) && W:welding)
+ if(my_effect.trigger == TRIGGER_HEAT)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && prob(25))
+ secondary_effect.ToggleActivate(0)
+ else
+ ..()
+ if (my_effect.trigger == TRIGGER_FORCE && W.force >= 10)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
+ secondary_effect.ToggleActivate(0)
+
+/obj/machinery/artifact/Bumped(M as mob|obj)
+ ..()
+ if(istype(M,/obj))
+ if(M:throwforce >= 10)
+ if(my_effect.trigger == TRIGGER_FORCE)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
+ secondary_effect.ToggleActivate(0)
+ else if(ishuman(M) && !istype(M:gloves,/obj/item/clothing/gloves))
+ var/warn = 0
+
+ if (my_effect.trigger == TRIGGER_TOUCH && prob(50))
+ my_effect.ToggleActivate()
+ warn = 1
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH && prob(25))
+ secondary_effect.ToggleActivate(0)
+ warn = 1
+
+ if (my_effect.effect == EFFECT_TOUCH && prob(50))
+ my_effect.DoEffectTouch(M)
+ warn = 1
+ if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated && prob(50))
+ secondary_effect.DoEffectTouch(M)
+ warn = 1
+
+ if(warn)
+ M << "You accidentally touch [src]."
+ ..()
+
+/obj/machinery/artifact/bullet_act(var/obj/item/projectile/P)
+ if(istype(P,/obj/item/projectile/bullet) ||\
+ istype(P,/obj/item/projectile/hivebotbullet))
+ if(my_effect.trigger == TRIGGER_FORCE)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
+ secondary_effect.ToggleActivate(0)
+
+ else if(istype(P,/obj/item/projectile/beam) ||\
+ istype(P,/obj/item/projectile/ion) ||\
+ istype(P,/obj/item/projectile/energy))
+ if(my_effect.trigger == TRIGGER_ENERGY)
+ my_effect.ToggleActivate()
+ if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25))
+ secondary_effect.ToggleActivate(0)
+
+/obj/machinery/artifact/ex_act(severity)
+ switch(severity)
+ if(1.0) qdel(src)
+ if(2.0)
+ if (prob(50))
+ qdel(src)
+ else
+ if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
+ my_effect.ToggleActivate()
+ if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25))
+ secondary_effect.ToggleActivate(0)
+ if(3.0)
+ if (my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
+ my_effect.ToggleActivate()
+ if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25))
+ secondary_effect.ToggleActivate(0)
+ return
+
+/obj/machinery/artifact/Move()
+ ..()
+ if(my_effect)
+ my_effect.UpdateMove()
+ if(secondary_effect)
+ secondary_effect.UpdateMove()
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_forcefield.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_forcefield.dm
index e076eedd2b..0139ea935f 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_forcefield.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_forcefield.dm
@@ -1,80 +1,80 @@
-
-/datum/artifact_effect/forcefield
- effecttype = "forcefield"
- var/list/created_field = list()
- effect_type = 4
-
-/datum/artifact_effect/forcefield/New()
- ..()
- trigger = TRIGGER_TOUCH
-
-/datum/artifact_effect/forcefield/ToggleActivate()
- ..()
- if(created_field.len)
- for(var/obj/effect/energy_field/F in created_field)
- created_field.Remove(F)
- del F
- else if(holder)
- var/turf/T = get_turf(holder)
- while(created_field.len < 16)
- var/obj/effect/energy_field/E = new (locate(T.x,T.y,T.z))
- created_field.Add(E)
- E.strength = 1
- E.density = 1
- E.anchored = 1
- E.invisibility = 0
- spawn(10)
- UpdateMove()
- return 1
-
-/datum/artifact_effect/forcefield/process()
- ..()
- for(var/obj/effect/energy_field/E in created_field)
- if(E.strength < 1)
- E.Strengthen(0.15)
- else if(E.strength < 5)
- E.Strengthen(0.25)
-
-/datum/artifact_effect/forcefield/UpdateMove()
- if(created_field.len && holder)
- var/turf/T = get_turf(holder)
- while(created_field.len < 16)
- //for now, just instantly respawn the fields when they get destroyed
- var/obj/effect/energy_field/E = new (locate(T.x,T.y,T))
- created_field.Add(E)
- E.anchored = 1
- E.density = 1
- E.invisibility = 0
-
- var/obj/effect/energy_field/E = created_field[1]
- E.loc = locate(T.x + 2,T.y + 2,T.z)
- E = created_field[2]
- E.loc = locate(T.x + 2,T.y + 1,T.z)
- E = created_field[3]
- E.loc = locate(T.x + 2,T.y,T.z)
- E = created_field[4]
- E.loc = locate(T.x + 2,T.y - 1,T.z)
- E = created_field[5]
- E.loc = locate(T.x + 2,T.y - 2,T.z)
- E = created_field[6]
- E.loc = locate(T.x + 1,T.y + 2,T.z)
- E = created_field[7]
- E.loc = locate(T.x + 1,T.y - 2,T.z)
- E = created_field[8]
- E.loc = locate(T.x,T.y + 2,T.z)
- E = created_field[9]
- E.loc = locate(T.x,T.y - 2,T.z)
- E = created_field[10]
- E.loc = locate(T.x - 1,T.y + 2,T.z)
- E = created_field[11]
- E.loc = locate(T.x - 1,T.y - 2,T.z)
- E = created_field[12]
- E.loc = locate(T.x - 2,T.y + 2,T.z)
- E = created_field[13]
- E.loc = locate(T.x - 2,T.y + 1,T.z)
- E = created_field[14]
- E.loc = locate(T.x - 2,T.y,T.z)
- E = created_field[15]
- E.loc = locate(T.x - 2,T.y - 1,T.z)
- E = created_field[16]
- E.loc = locate(T.x - 2,T.y - 2,T.z)
+
+/datum/artifact_effect/forcefield
+ effecttype = "forcefield"
+ var/list/created_field = list()
+ effect_type = 4
+
+/datum/artifact_effect/forcefield/New()
+ ..()
+ trigger = TRIGGER_TOUCH
+
+/datum/artifact_effect/forcefield/ToggleActivate()
+ ..()
+ if(created_field.len)
+ for(var/obj/effect/energy_field/F in created_field)
+ created_field.Remove(F)
+ qdel(F)
+ else if(holder)
+ var/turf/T = get_turf(holder)
+ while(created_field.len < 16)
+ var/obj/effect/energy_field/E = new (locate(T.x,T.y,T.z))
+ created_field.Add(E)
+ E.strength = 1
+ E.density = 1
+ E.anchored = 1
+ E.invisibility = 0
+ spawn(10)
+ UpdateMove()
+ return 1
+
+/datum/artifact_effect/forcefield/process()
+ ..()
+ for(var/obj/effect/energy_field/E in created_field)
+ if(E.strength < 1)
+ E.Strengthen(0.15)
+ else if(E.strength < 5)
+ E.Strengthen(0.25)
+
+/datum/artifact_effect/forcefield/UpdateMove()
+ if(created_field.len && holder)
+ var/turf/T = get_turf(holder)
+ while(created_field.len < 16)
+ //for now, just instantly respawn the fields when they get destroyed
+ var/obj/effect/energy_field/E = new (locate(T.x,T.y,T))
+ created_field.Add(E)
+ E.anchored = 1
+ E.density = 1
+ E.invisibility = 0
+
+ var/obj/effect/energy_field/E = created_field[1]
+ E.loc = locate(T.x + 2,T.y + 2,T.z)
+ E = created_field[2]
+ E.loc = locate(T.x + 2,T.y + 1,T.z)
+ E = created_field[3]
+ E.loc = locate(T.x + 2,T.y,T.z)
+ E = created_field[4]
+ E.loc = locate(T.x + 2,T.y - 1,T.z)
+ E = created_field[5]
+ E.loc = locate(T.x + 2,T.y - 2,T.z)
+ E = created_field[6]
+ E.loc = locate(T.x + 1,T.y + 2,T.z)
+ E = created_field[7]
+ E.loc = locate(T.x + 1,T.y - 2,T.z)
+ E = created_field[8]
+ E.loc = locate(T.x,T.y + 2,T.z)
+ E = created_field[9]
+ E.loc = locate(T.x,T.y - 2,T.z)
+ E = created_field[10]
+ E.loc = locate(T.x - 1,T.y + 2,T.z)
+ E = created_field[11]
+ E.loc = locate(T.x - 1,T.y - 2,T.z)
+ E = created_field[12]
+ E.loc = locate(T.x - 2,T.y + 2,T.z)
+ E = created_field[13]
+ E.loc = locate(T.x - 2,T.y + 1,T.z)
+ E = created_field[14]
+ E.loc = locate(T.x - 2,T.y,T.z)
+ E = created_field[15]
+ E.loc = locate(T.x - 2,T.y - 1,T.z)
+ E = created_field[16]
+ E.loc = locate(T.x - 2,T.y - 2,T.z)
diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm
index 6748aea41e..7de8474aef 100644
--- a/code/modules/research/xenoarchaeology/finds/finds.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds.dm
@@ -57,7 +57,7 @@
else
for(var/mob/M in viewers(world.view, user))
M.show_message("[src] burns away into nothing.",1)
- del(src)
+ qdel(src)
w.remove_fuel(4)
else
for(var/mob/M in viewers(world.view, user))
@@ -73,7 +73,7 @@
..()
if(prob(33))
src.visible_message("[src] crumbles away, leaving some dust and gravel behind.")
- del(src)
+ qdel(src)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Archaeological finds
@@ -101,7 +101,7 @@
var/apply_prefix = 1
if(prob(40))
material_descriptor = pick("rusted ","dusty ","archaic ","fragile ")
- source_material = pick("cordite","quadrinium","steel","titanium","aluminium","ferritic-alloy","plasteel","duranium")
+ source_material = pick("cordite","quadrinium",DEFAULT_WALL_MATERIAL,"titanium","aluminium","ferritic-alloy","plasteel","duranium")
var/talkative = 0
if(prob(5))
@@ -323,7 +323,7 @@
apply_material_decorations = 0
if(23)
apply_prefix = 0
- new_item = new /obj/item/stack/rods(src.loc)
+ new_item = PoolOrNew(/obj/item/stack/rods, src.loc)
apply_image_decorations = 0
apply_material_decorations = 0
if(24)
@@ -490,7 +490,7 @@
new_item = new /obj/item/clothing/mask/gas(src.loc)
var/decorations = ""
if(apply_material_decorations)
- source_material = pick("cordite","quadrinium","steel","titanium","aluminium","ferritic-alloy","plasteel","duranium")
+ source_material = pick("cordite","quadrinium",DEFAULT_WALL_MATERIAL,"titanium","aluminium","ferritic-alloy","plasteel","duranium")
desc = "A [material_descriptor ? "[material_descriptor] " : ""][item_type] made of [source_material], all craftsmanship is of [pick("the lowest","low","average","high","the highest")] quality."
var/list/descriptors = list()
@@ -548,7 +548,7 @@
if(talkative)
new_item.talking_atom = new(new_item)
- del(src)
+ qdel(src)
else if(talkative)
src.talking_atom = new(src)
diff --git a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm
index 80dbf549c0..8df5b92623 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm
@@ -17,7 +17,7 @@
var/turf/T = get_turf(src)
if(istype(T, /turf/simulated/mineral))
T:last_find = W
- del src
+ qdel(src)
/obj/item/weapon/fossil/bone
name = "Fossilised bone"
@@ -40,8 +40,8 @@
var/b = new src.type
o.contents.Add(a)
o.contents.Add(b)
- del W
- del src
+ qdel(W)
+ qdel(src)
/obj/skeleton
name = "Incomplete skeleton"
@@ -62,7 +62,7 @@
if(!bstate)
bnum++
src.contents.Add(new/obj/item/weapon/fossil/bone)
- del W
+ qdel(W)
if(bnum==breq)
usr = user
icon_state = "skel"
diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm
index e3e0d96197..8b7dd3fdfa 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm
@@ -1,74 +1,74 @@
-
-/obj/item/weapon/shard/phoron
- name = "phoron shard"
- desc = "A shard of phoron glass. Considerably tougher then normal glass shards. Apparently not tough enough to be a window."
- force = 8.0
- throwforce = 15.0
- icon_state = "phoronlarge"
- sharp = 1
- edge = 1
-
-/obj/item/weapon/shard/phoron/New()
-
- src.icon_state = pick("phoronlarge", "phoronmedium", "phoronsmall")
- switch(src.icon_state)
- if("phoronsmall")
- src.pixel_x = rand(-12, 12)
- src.pixel_y = rand(-12, 12)
- if("phoronmedium")
- src.pixel_x = rand(-8, 8)
- src.pixel_y = rand(-8, 8)
- if("phoronlarge")
- src.pixel_x = rand(-5, 5)
- src.pixel_y = rand(-5, 5)
- else
- return
-
-/obj/item/weapon/shard/phoron/attackby(obj/item/weapon/W as obj, mob/user as mob)
- ..()
- if ( istype(W, /obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/WT = W
- if(WT.remove_fuel(0, user))
- var/obj/item/stack/sheet/glass/phoronglass/NG = new (user.loc)
- for (var/obj/item/stack/sheet/glass/phoronglass/G in user.loc)
- if(G==NG)
- continue
- if(G.amount>=G.max_amount)
- continue
- G.attackby(NG, user)
- usr << "You add the newly-formed phoron glass to the stack. It now contains [NG.amount] sheets."
- //SN src = null
- del(src)
- return
- return ..()
-
-//legacy crystal
-/obj/machinery/crystal
- name = "Crystal"
- icon = 'icons/obj/mining.dmi'
- icon_state = "crystal"
-
-/obj/machinery/crystal/New()
- if(prob(50))
- icon_state = "crystal2"
-
-//large finds
- /*
- /obj/machinery/syndicate_beacon
- /obj/machinery/wish_granter
- if(18)
- item_type = "jagged green crystal"
- additional_desc = pick("It shines faintly as it catches the light.","It appears to have a faint inner glow.","It seems to draw you inward as you look it at.","Something twinkles faintly as you look at it.","It's mesmerizing to behold.")
- icon_state = "crystal"
- apply_material_decorations = 0
- if(prob(10))
- apply_image_decorations = 1
- if(19)
- item_type = "jagged pink crystal"
- additional_desc = pick("It shines faintly as it catches the light.","It appears to have a faint inner glow.","It seems to draw you inward as you look it at.","Something twinkles faintly as you look at it.","It's mesmerizing to behold.")
- icon_state = "crystal2"
- apply_material_decorations = 0
- if(prob(10))
- apply_image_decorations = 1
- */
- //machinery type artifacts?
+
+/obj/item/weapon/shard/phoron
+ name = "phoron shard"
+ desc = "A shard of phoron glass. Considerably tougher then normal glass shards. Apparently not tough enough to be a window."
+ force = 8.0
+ throwforce = 15.0
+ icon_state = "phoronlarge"
+ sharp = 1
+ edge = 1
+
+/obj/item/weapon/shard/phoron/New()
+
+ src.icon_state = pick("phoronlarge", "phoronmedium", "phoronsmall")
+ switch(src.icon_state)
+ if("phoronsmall")
+ src.pixel_x = rand(-12, 12)
+ src.pixel_y = rand(-12, 12)
+ if("phoronmedium")
+ src.pixel_x = rand(-8, 8)
+ src.pixel_y = rand(-8, 8)
+ if("phoronlarge")
+ src.pixel_x = rand(-5, 5)
+ src.pixel_y = rand(-5, 5)
+ else
+ return
+
+/obj/item/weapon/shard/phoron/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ ..()
+ if ( istype(W, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = W
+ if(WT.remove_fuel(0, user))
+ var/obj/item/stack/sheet/glass/phoronglass/NG = new (user.loc)
+ for (var/obj/item/stack/sheet/glass/phoronglass/G in user.loc)
+ if(G==NG)
+ continue
+ if(G.amount>=G.max_amount)
+ continue
+ G.attackby(NG, user)
+ usr << "You add the newly-formed phoron glass to the stack. It now contains [NG.amount] sheets."
+ //SN src = null
+ qdel(src)
+ return
+ return ..()
+
+//legacy crystal
+/obj/machinery/crystal
+ name = "Crystal"
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "crystal"
+
+/obj/machinery/crystal/New()
+ if(prob(50))
+ icon_state = "crystal2"
+
+//large finds
+ /*
+ /obj/machinery/syndicate_beacon
+ /obj/machinery/wish_granter
+ if(18)
+ item_type = "jagged green crystal"
+ additional_desc = pick("It shines faintly as it catches the light.","It appears to have a faint inner glow.","It seems to draw you inward as you look it at.","Something twinkles faintly as you look at it.","It's mesmerizing to behold.")
+ icon_state = "crystal"
+ apply_material_decorations = 0
+ if(prob(10))
+ apply_image_decorations = 1
+ if(19)
+ item_type = "jagged pink crystal"
+ additional_desc = pick("It shines faintly as it catches the light.","It appears to have a faint inner glow.","It seems to draw you inward as you look it at.","Something twinkles faintly as you look at it.","It's mesmerizing to behold.")
+ icon_state = "crystal2"
+ apply_material_decorations = 0
+ if(prob(10))
+ apply_image_decorations = 1
+ */
+ //machinery type artifacts?
diff --git a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
index 38d6a52465..5b2a6fed40 100644
--- a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
+++ b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
@@ -60,7 +60,7 @@ datum/genesequence
visible_message("\red \icon[src] [src] can not extract any more genetic data from new fossils.")
if(4)
src.visible_message("\blue \icon[src] [user] inserts [W] into [src], the fossil is consumed as [src] extracts genetic data from it.")
- del(W)
+ qdel(W)
updateDialog()
else if (istype(W, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = W
@@ -77,7 +77,7 @@ datum/genesequence
if(SCANFOSSIL_RETVAL_SUCCESS)
numaccepted += 1
S.remove_from_storage(F, src) //This will move the item to this item's contents
- del(F)
+ qdel(F)
updateDialog()
user.visible_message("[user] empties all the fossils from [S] into [src].", "\blue You empty all the fossils from [S] into [src].", "You hear the sound of rocks being poured into a container")
@@ -302,7 +302,6 @@ datum/genesequence
name = "Circuit board (Flora Reconstitution Console)"
build_path = "/obj/machinery/computer/reconstitutor"
origin_tech = "programming=2;biotech=4;materials=6"
- frame_desc = "Requires 2 Advanced Scanning Module, 1 Nano Manipulator, 1 Matter Bin and 1 Advanced Capacitor."
req_components = list(
"/obj/item/weapon/stock_parts/scanning_module/adv" = 2,
"/obj/item/weapon/stock_parts/manipulator/nano" = 1,
@@ -313,7 +312,6 @@ datum/genesequence
name = "Circuit board (Fauna Reconstitution Console)"
build_path = "/obj/machinery/computer/reconstitutor/animal"
origin_tech = "programming=2;biotech=4;materials=6"
- frame_desc = "Requires 2 Advanced Scanning Module, 1 Nano Manipulator, 1 Matter Bin and 1 Advanced Capacitor."
req_components = list(
"/obj/item/weapon/stock_parts/scanning_module/adv" = 2,
"/obj/item/weapon/stock_parts/manipulator/nano" = 1,
diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm
index 689f61b888..535a0b4f07 100644
--- a/code/modules/research/xenoarchaeology/geosample.dm
+++ b/code/modules/research/xenoarchaeology/geosample.dm
@@ -61,44 +61,19 @@
age = rand(1,999)
if(container.mineral)
- switch(container.mineral.name)
- if("Uranium")
- age_million = rand(1, 704)
- age_thousand = rand(1,999)
- find_presence["potassium"] = rand(1,1000) / 100
- source_mineral = "potassium"
- if("Iron")
- age_thousand = rand(1, 999)
- age_million = rand(1, 999)
- find_presence["iron"] = rand(1,1000) / 100
- source_mineral = "iron"
- if("Diamond")
- age_thousand = rand(1,999)
- age_million = rand(1,999)
- find_presence["nitrogen"] = rand(1,1000) / 100
- source_mineral = "nitrogen"
- if("Gold")
- age_thousand = rand(1,999)
- age_million = rand(1,999)
- age_billion = rand(3,4)
- find_presence["iron"] = rand(1,1000) / 100
- source_mineral = "iron"
- if("Silver")
- age_thousand = rand(1,999)
- age_million = rand(1,999)
- find_presence["iron"] = rand(1,1000) / 100
- source_mineral = "iron"
- if("Phoron")
- age_thousand = rand(1,999)
- age_million = rand(1,999)
- age_billion = rand(10, 13)
- find_presence["phoron"] = rand(1,1000) / 100
- source_mineral = "phoron"
- if("Clown")
- age = rand(-1,-999) //thats the joke
- age_thousand = rand(-1,-999)
- find_presence["phoron"] = rand(1,1000) / 100
- source_mineral = "phoron"
+ if(islist(container.mineral.xarch_ages))
+ var/list/ages = container.mineral.xarch_ages
+ if(ages["thousand"])
+ age_thousand = rand(1,ages["thousand"])
+ if(ages["million"])
+ age_million = rand(1,ages["million"])
+ if(ages["billion"])
+ if(ages["billion_lower"])
+ age_billion = rand(ages["billion_lower"],ages["billion"])
+ else
+ age_billion = rand(1,ages["billion"])
+ if(container.mineral.xarch_source_mineral)
+ source_mineral = container.mineral.xarch_source_mineral
if(prob(75))
find_presence["phosphorus"] = rand(1,500) / 100
diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
index 441630af30..912d0a062e 100644
--- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
+++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
@@ -156,7 +156,7 @@
//see if we can clear out an old effect
//delete it when the ids match to account for duplicate ids having different effects
if(inserted_battery.battery_effect && inserted_battery.stored_charge <= 0)
- del(inserted_battery.battery_effect)
+ qdel(inserted_battery.battery_effect)
//
var/datum/artifact_effect/source_effect
diff --git a/code/modules/research/xenoarchaeology/machinery/coolant.dm b/code/modules/research/xenoarchaeology/machinery/coolant.dm
index b2f2cd3d67..a1690aa83e 100644
--- a/code/modules/research/xenoarchaeology/machinery/coolant.dm
+++ b/code/modules/research/xenoarchaeology/machinery/coolant.dm
@@ -56,4 +56,4 @@ datum/chemical_reaction/coolant
sleep(10)
if(src)
- del(src)
+ qdel(src)
diff --git a/code/modules/research/xenoarchaeology/master_controller.dm b/code/modules/research/xenoarchaeology/master_controller.dm
index 9d347e19c6..fa09ca6470 100644
--- a/code/modules/research/xenoarchaeology/master_controller.dm
+++ b/code/modules/research/xenoarchaeology/master_controller.dm
@@ -1,145 +1,145 @@
-
-/datum/controller/game_controller
- var/list/all_animal_genesequences = list()
- var/list/all_plant_genesequences = list()
- var/list/genome_prefixes = null
- var/list/artifact_spawning_turfs = list()
- var/list/digsite_spawning_turfs = list()
-
- var/list/spawn_types_animal = list("/mob/living/carbon/slime",\
- "/mob/living/simple_animal/hostile/alien",\
- "/mob/living/simple_animal/hostile/alien/drone",\
- "/mob/living/simple_animal/hostile/alien/sentinel",\
- "/mob/living/simple_animal/hostile/giant_spider",\
- "/mob/living/simple_animal/hostile/giant_spider/hunter",\
- "/mob/living/simple_animal/hostile/giant_spider/nurse",\
- "/mob/living/simple_animal/hostile/creature",\
- "/mob/living/simple_animal/hostile/samak",\
- "/mob/living/simple_animal/hostile/diyaab",\
- "/mob/living/simple_animal/hostile/shantak",\
- "/mob/living/simple_animal/tindalos",\
- "/mob/living/simple_animal/yithian")
-
- var/list/spawn_types_plant = list("/obj/item/seeds/walkingmushroommycelium",\
- "/obj/item/seeds/killertomatoseed",\
- "/obj/item/seeds/shandseed",
- "/obj/item/seeds/mtearseed",
- "/obj/item/seeds/thaadra",\
- "/obj/item/seeds/telriis",\
- "/obj/item/seeds/jurlmah",\
- "/obj/item/seeds/amauri",\
- "/obj/item/seeds/gelthi",\
- "/obj/item/seeds/vale",\
- "/obj/item/seeds/surik")
-
-#define XENOARCH_SPAWN_CHANCE 0.5
-#define DIGSITESIZE_LOWER 4
-#define DIGSITESIZE_UPPER 12
-#define ARTIFACTSPAWNNUM_LOWER 6
-#define ARTIFACTSPAWNNUM_UPPER 12
-
-datum/controller/game_controller/proc/SetupXenoarch()
- //create digsites
- for(var/turf/simulated/mineral/M in block(locate(1,1,1), locate(world.maxx, world.maxy, world.maxz)))
- if(isnull(M.geologic_data))
- M.geologic_data = new/datum/geosample(M)
-
- if(!prob(XENOARCH_SPAWN_CHANCE))
- continue
-
- digsite_spawning_turfs.Add(M)
- var/digsite = get_random_digsite_type()
- var/target_digsite_size = rand(DIGSITESIZE_LOWER, DIGSITESIZE_UPPER)
- var/list/processed_turfs = list()
- var/list/turfs_to_process = list(M)
- while(turfs_to_process.len)
- var/turf/simulated/mineral/archeo_turf = pop(turfs_to_process)
-
- if(target_digsite_size > 1)
- var/list/viable_adjacent_turfs = orange(1, archeo_turf)
- for(var/turf/simulated/mineral/T in orange(1, archeo_turf))
- if(T.finds)
- continue
- if(T in processed_turfs)
- continue
- viable_adjacent_turfs.Add(T)
-
- for(var/turf/simulated/mineral/T in viable_adjacent_turfs)
- if(prob(target_digsite_size/viable_adjacent_turfs.len))
- turfs_to_process.Add(T)
- target_digsite_size -= 1
- if(target_digsite_size <= 0)
- break
-
- processed_turfs.Add(archeo_turf)
- if(isnull(archeo_turf.finds))
- archeo_turf.finds = list()
- if(prob(50))
- archeo_turf.finds.Add(new /datum/find(digsite, rand(5,95)))
- else if(prob(75))
- archeo_turf.finds.Add(new /datum/find(digsite, rand(5,45)))
- archeo_turf.finds.Add(new /datum/find(digsite, rand(55,95)))
- else
- archeo_turf.finds.Add(new /datum/find(digsite, rand(5,30)))
- archeo_turf.finds.Add(new /datum/find(digsite, rand(35,75)))
- archeo_turf.finds.Add(new /datum/find(digsite, rand(75,95)))
-
- //sometimes a find will be close enough to the surface to show
- var/datum/find/F = archeo_turf.finds[1]
- if(F.excavation_required <= F.view_range)
- archeo_turf.archaeo_overlay = "overlay_archaeo[rand(1,3)]"
- archeo_turf.overlays += archeo_turf.archaeo_overlay
-
- //have a chance for an artifact to spawn here, but not in animal or plant digsites
- if(isnull(M.artifact_find) && digsite != 1 && digsite != 2)
- artifact_spawning_turfs.Add(archeo_turf)
-
- //create artifact machinery
- var/num_artifacts_spawn = rand(ARTIFACTSPAWNNUM_LOWER, ARTIFACTSPAWNNUM_UPPER)
- while(artifact_spawning_turfs.len > num_artifacts_spawn)
- pick_n_take(artifact_spawning_turfs)
-
- var/list/artifacts_spawnturf_temp = artifact_spawning_turfs.Copy()
- while(artifacts_spawnturf_temp.len > 0)
- var/turf/simulated/mineral/artifact_turf = pop(artifacts_spawnturf_temp)
- artifact_turf.artifact_find = new()
-
- //make sure we have some prefixes for the gene sequences
- if(!genome_prefixes)
- genome_prefixes = alphabet_uppercase.Copy()
- if(!genome_prefixes.len)
- del genome_prefixes
- genome_prefixes = alphabet_uppercase.Copy()
-
- //create animal gene sequences
- while(spawn_types_animal.len && genome_prefixes.len)
- var/datum/genesequence/new_sequence = new/datum/genesequence()
- new_sequence.spawned_type_text = pick(spawn_types_animal)
- new_sequence.spawned_type = text2path(new_sequence.spawned_type_text)
- spawn_types_animal -= new_sequence.spawned_type_text
-
- var/prefixletter = pick(genome_prefixes)
- genome_prefixes -= prefixletter
- while(new_sequence.full_genome_sequence.len < 7)
- new_sequence.full_genome_sequence.Add("[prefixletter][pick(alphabet_uppercase)][pick(alphabet_uppercase)][pick(1,2,3,4,5,6,7,8,9,0)][pick(1,2,3,4,5,6,7,8,9,0)]")
-
- all_animal_genesequences.Add(new_sequence)
-
- //create plant gene sequences
- while(spawn_types_plant.len && genome_prefixes.len)
- var/datum/genesequence/new_sequence = new/datum/genesequence()
- new_sequence.spawned_type = pick(spawn_types_plant)
- spawn_types_plant -= new_sequence.spawned_type_text
-
- var/prefixletter = pick(genome_prefixes)
- genome_prefixes -= prefixletter
- while(new_sequence.full_genome_sequence.len < 7)
- new_sequence.full_genome_sequence.Add("[prefixletter][pick(1,2,3,4,5,6,7,8,9,0)][pick(1,2,3,4,5,6,7,8,9,0)][pick(alphabet_uppercase)][pick(alphabet_uppercase)]")
-
- all_plant_genesequences.Add(new_sequence)
-
-#undef XENOARCH_SPAWN_CHANCE
-#undef DIGSITESIZE_LOWER
-#undef DIGSITESIZE_UPPER
-#undef ARTIFACTSPAWNNUM_LOWER
-#undef ARTIFACTSPAWNNUM_UPPER
+
+/datum/controller/game_controller
+ var/list/all_animal_genesequences = list()
+ var/list/all_plant_genesequences = list()
+ var/list/genome_prefixes = null
+ var/list/artifact_spawning_turfs = list()
+ var/list/digsite_spawning_turfs = list()
+
+ var/list/spawn_types_animal = list("/mob/living/carbon/slime",\
+ "/mob/living/simple_animal/hostile/alien",\
+ "/mob/living/simple_animal/hostile/alien/drone",\
+ "/mob/living/simple_animal/hostile/alien/sentinel",\
+ "/mob/living/simple_animal/hostile/giant_spider",\
+ "/mob/living/simple_animal/hostile/giant_spider/hunter",\
+ "/mob/living/simple_animal/hostile/giant_spider/nurse",\
+ "/mob/living/simple_animal/hostile/creature",\
+ "/mob/living/simple_animal/hostile/samak",\
+ "/mob/living/simple_animal/hostile/diyaab",\
+ "/mob/living/simple_animal/hostile/shantak",\
+ "/mob/living/simple_animal/tindalos",\
+ "/mob/living/simple_animal/yithian")
+
+ var/list/spawn_types_plant = list("/obj/item/seeds/walkingmushroommycelium",\
+ "/obj/item/seeds/killertomatoseed",\
+ "/obj/item/seeds/shandseed",
+ "/obj/item/seeds/mtearseed",
+ "/obj/item/seeds/thaadra",\
+ "/obj/item/seeds/telriis",\
+ "/obj/item/seeds/jurlmah",\
+ "/obj/item/seeds/amauri",\
+ "/obj/item/seeds/gelthi",\
+ "/obj/item/seeds/vale",\
+ "/obj/item/seeds/surik")
+
+#define XENOARCH_SPAWN_CHANCE 0.5
+#define DIGSITESIZE_LOWER 4
+#define DIGSITESIZE_UPPER 12
+#define ARTIFACTSPAWNNUM_LOWER 6
+#define ARTIFACTSPAWNNUM_UPPER 12
+
+datum/controller/game_controller/proc/SetupXenoarch()
+ //create digsites
+ for(var/turf/simulated/mineral/M in block(locate(1,1,1), locate(world.maxx, world.maxy, world.maxz)))
+ if(isnull(M.geologic_data))
+ M.geologic_data = new/datum/geosample(M)
+
+ if(!prob(XENOARCH_SPAWN_CHANCE))
+ continue
+
+ digsite_spawning_turfs.Add(M)
+ var/digsite = get_random_digsite_type()
+ var/target_digsite_size = rand(DIGSITESIZE_LOWER, DIGSITESIZE_UPPER)
+ var/list/processed_turfs = list()
+ var/list/turfs_to_process = list(M)
+ while(turfs_to_process.len)
+ var/turf/simulated/mineral/archeo_turf = pop(turfs_to_process)
+
+ if(target_digsite_size > 1)
+ var/list/viable_adjacent_turfs = orange(1, archeo_turf)
+ for(var/turf/simulated/mineral/T in orange(1, archeo_turf))
+ if(T.finds)
+ continue
+ if(T in processed_turfs)
+ continue
+ viable_adjacent_turfs.Add(T)
+
+ for(var/turf/simulated/mineral/T in viable_adjacent_turfs)
+ if(prob(target_digsite_size/viable_adjacent_turfs.len))
+ turfs_to_process.Add(T)
+ target_digsite_size -= 1
+ if(target_digsite_size <= 0)
+ break
+
+ processed_turfs.Add(archeo_turf)
+ if(isnull(archeo_turf.finds))
+ archeo_turf.finds = list()
+ if(prob(50))
+ archeo_turf.finds.Add(new /datum/find(digsite, rand(5,95)))
+ else if(prob(75))
+ archeo_turf.finds.Add(new /datum/find(digsite, rand(5,45)))
+ archeo_turf.finds.Add(new /datum/find(digsite, rand(55,95)))
+ else
+ archeo_turf.finds.Add(new /datum/find(digsite, rand(5,30)))
+ archeo_turf.finds.Add(new /datum/find(digsite, rand(35,75)))
+ archeo_turf.finds.Add(new /datum/find(digsite, rand(75,95)))
+
+ //sometimes a find will be close enough to the surface to show
+ var/datum/find/F = archeo_turf.finds[1]
+ if(F.excavation_required <= F.view_range)
+ archeo_turf.archaeo_overlay = "overlay_archaeo[rand(1,3)]"
+ archeo_turf.overlays += archeo_turf.archaeo_overlay
+
+ //have a chance for an artifact to spawn here, but not in animal or plant digsites
+ if(isnull(M.artifact_find) && digsite != 1 && digsite != 2)
+ artifact_spawning_turfs.Add(archeo_turf)
+
+ //create artifact machinery
+ var/num_artifacts_spawn = rand(ARTIFACTSPAWNNUM_LOWER, ARTIFACTSPAWNNUM_UPPER)
+ while(artifact_spawning_turfs.len > num_artifacts_spawn)
+ pick_n_take(artifact_spawning_turfs)
+
+ var/list/artifacts_spawnturf_temp = artifact_spawning_turfs.Copy()
+ while(artifacts_spawnturf_temp.len > 0)
+ var/turf/simulated/mineral/artifact_turf = pop(artifacts_spawnturf_temp)
+ artifact_turf.artifact_find = new()
+
+ //make sure we have some prefixes for the gene sequences
+ if(!genome_prefixes)
+ genome_prefixes = alphabet_uppercase.Copy()
+ if(!genome_prefixes.len)
+ qdel(genome_prefixes)
+ genome_prefixes = alphabet_uppercase.Copy()
+
+ //create animal gene sequences
+ while(spawn_types_animal.len && genome_prefixes.len)
+ var/datum/genesequence/new_sequence = new/datum/genesequence()
+ new_sequence.spawned_type_text = pick(spawn_types_animal)
+ new_sequence.spawned_type = text2path(new_sequence.spawned_type_text)
+ spawn_types_animal -= new_sequence.spawned_type_text
+
+ var/prefixletter = pick(genome_prefixes)
+ genome_prefixes -= prefixletter
+ while(new_sequence.full_genome_sequence.len < 7)
+ new_sequence.full_genome_sequence.Add("[prefixletter][pick(alphabet_uppercase)][pick(alphabet_uppercase)][pick(1,2,3,4,5,6,7,8,9,0)][pick(1,2,3,4,5,6,7,8,9,0)]")
+
+ all_animal_genesequences.Add(new_sequence)
+
+ //create plant gene sequences
+ while(spawn_types_plant.len && genome_prefixes.len)
+ var/datum/genesequence/new_sequence = new/datum/genesequence()
+ new_sequence.spawned_type = pick(spawn_types_plant)
+ spawn_types_plant -= new_sequence.spawned_type_text
+
+ var/prefixletter = pick(genome_prefixes)
+ genome_prefixes -= prefixletter
+ while(new_sequence.full_genome_sequence.len < 7)
+ new_sequence.full_genome_sequence.Add("[prefixletter][pick(1,2,3,4,5,6,7,8,9,0)][pick(1,2,3,4,5,6,7,8,9,0)][pick(alphabet_uppercase)][pick(alphabet_uppercase)]")
+
+ all_plant_genesequences.Add(new_sequence)
+
+#undef XENOARCH_SPAWN_CHANCE
+#undef DIGSITESIZE_LOWER
+#undef DIGSITESIZE_UPPER
+#undef ARTIFACTSPAWNNUM_LOWER
+#undef ARTIFACTSPAWNNUM_UPPER
diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
index c189273bd5..fc50c956e7 100644
--- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
+++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
@@ -190,7 +190,7 @@
p = min(p, 100)
icon_state = "anodev[round(p,25)]"
-/obj/item/weapon/anodevice/Del()
+/obj/item/weapon/anodevice/Destroy()
processing_objects.Remove(src)
..()
diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
index 9f498d3faa..b14c892cd0 100644
--- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
+++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
@@ -306,10 +306,10 @@
M.weakened = min(M.weakened, 3)
src.visible_message("\blue \icon[src] [src] deactivates with a gentle shudder.")
- del(suspension_field)
+ qdel(suspension_field)
icon_state = "suspension2"
-/obj/machinery/suspension_gen/Del()
+/obj/machinery/suspension_gen/Destroy()
//safety checks: clear the field and drop anything it's holding
deactivate()
..()
@@ -341,7 +341,7 @@
density = 1
var/field_type = "chlorine"
-/obj/effect/suspension_field/Del()
+/obj/effect/suspension_field/Destroy()
for(var/obj/I in src)
I.loc = src.loc
..()
diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
index 7c357b53da..0ed24ad248 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
@@ -32,7 +32,7 @@
/obj/item/device/core_sampler/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/evidencebag))
if(num_stored_bags < 10)
- del(W)
+ qdel(W)
num_stored_bags += 1
user << "\blue You insert the [W] into the core sampler."
else
diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
index 425b3e0dc3..e242838a1e 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
@@ -118,11 +118,11 @@
if(index <= positive_locations.len)
var/datum/depth_scan/D = positive_locations[index]
positive_locations.Remove(D)
- del(D)
+ qdel(D)
else
//GC will hopefully pick them up before too long
positive_locations = list()
- del(current)
+ qdel(current)
else if(href_list["close"])
usr.unset_machine()
usr << browse(null, "window=depth_scanner")
diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm
index ad84f0e010..fb6adf795a 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm
@@ -16,7 +16,7 @@
..()
processing_objects.Add(src)
-/obj/item/device/beacon_locator/Del()
+/obj/item/device/beacon_locator/Destroy()
processing_objects.Remove(src)
..()
diff --git a/code/modules/scripting/Parser/Keywords.dm b/code/modules/scripting/Parser/Keywords.dm
index bdd33d8bda..7d933c52ef 100644
--- a/code/modules/scripting/Parser/Keywords.dm
+++ b/code/modules/scripting/Parser/Keywords.dm
@@ -46,7 +46,7 @@ var/const/Represents a special statement in the code triggered by a keyword.
nS_Keyword
New(inline=0)
if(inline)
- del src
+ qdel(src)
kwReturn
Parse(n_Parser/nS_Parser/parser)
diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm
index a361631960..2400070ba3 100644
--- a/code/modules/shieldgen/emergency_shield.dm
+++ b/code/modules/shieldgen/emergency_shield.dm
@@ -17,7 +17,7 @@
..()
update_nearby_tiles(need_rebuild=1)
-/obj/machinery/shield/Del()
+/obj/machinery/shield/Destroy()
opacity = 0
density = 0
update_nearby_tiles()
@@ -41,7 +41,7 @@
if (src.health <= 0)
visible_message("\blue The [src] dissipates!")
- del(src)
+ qdel(src)
return
opacity = 1
@@ -54,7 +54,7 @@
if(src.health <= 0)
visible_message("\blue The [src] dissipates!")
- del(src)
+ qdel(src)
return
opacity = 1
@@ -66,7 +66,7 @@
..()
if(health <=0)
visible_message("\blue The [src] dissipates!")
- del(src)
+ qdel(src)
return
opacity = 1
spawn(20) if(src) opacity = 0
@@ -75,25 +75,25 @@
switch(severity)
if(1.0)
if (prob(75))
- del(src)
+ qdel(src)
if(2.0)
if (prob(50))
- del(src)
+ qdel(src)
if(3.0)
if (prob(25))
- del(src)
+ qdel(src)
return
/obj/machinery/shield/emp_act(severity)
switch(severity)
if(1)
- del(src)
+ qdel(src)
if(2)
if(prob(50))
- del(src)
+ qdel(src)
/obj/machinery/shield/blob_act()
- del(src)
+ qdel(src)
/obj/machinery/shield/hitby(AM as mob|obj)
@@ -115,7 +115,7 @@
//Handle the destruction of the shield
if (src.health <= 0)
visible_message("\blue The [src] dissipates!")
- del(src)
+ qdel(src)
return
//The shield becomes dense to absorb the blow.. purely asthetic.
@@ -149,11 +149,10 @@
use_power = 0
idle_power_usage = 0
-/obj/machinery/shieldgen/Del()
+/obj/machinery/shieldgen/Destroy()
collapse_shields()
..()
-
/obj/machinery/shieldgen/proc/shields_up()
if(active) return 0 //If it's already turned on, how did this get called?
@@ -161,7 +160,7 @@
update_icon()
create_shields()
-
+
idle_power_usage = 0
for(var/obj/machinery/shield/shield_tile in deployed_shields)
idle_power_usage += shield_tile.shield_idle_power
@@ -174,7 +173,7 @@
update_icon()
collapse_shields()
-
+
update_use_power(0)
/obj/machinery/shieldgen/proc/create_shields()
@@ -187,7 +186,7 @@
/obj/machinery/shieldgen/proc/collapse_shields()
for(var/obj/machinery/shield/shield_tile in deployed_shields)
- del(shield_tile)
+ qdel(shield_tile)
/obj/machinery/shieldgen/power_change()
..()
@@ -201,22 +200,22 @@
/obj/machinery/shieldgen/process()
if (!active || (stat & NOPOWER))
return
-
+
if(malfunction)
if(deployed_shields.len && prob(5))
- del(pick(deployed_shields))
+ qdel(pick(deployed_shields))
else
if (check_delay <= 0)
create_shields()
-
+
var/new_power_usage = 0
for(var/obj/machinery/shield/shield_tile in deployed_shields)
new_power_usage += shield_tile.shield_idle_power
-
+
if (new_power_usage != idle_power_usage)
idle_power_usage = new_power_usage
use_power(0)
-
+
check_delay = 60
else
check_delay--
@@ -227,7 +226,7 @@
if(health <= 0)
spawn(0)
explosion(get_turf(src.loc), 0, 0, 1, 0, 0, 0)
- del(src)
+ qdel(src)
update_icon()
return
diff --git a/code/modules/shieldgen/energy_field.dm b/code/modules/shieldgen/energy_field.dm
index 7558c19ad6..074d3abbfa 100644
--- a/code/modules/shieldgen/energy_field.dm
+++ b/code/modules/shieldgen/energy_field.dm
@@ -17,7 +17,7 @@
..()
update_nearby_tiles()
-/obj/effect/energy_field/Del()
+/obj/effect/energy_field/Destroy()
update_nearby_tiles()
..()
diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm
index 067dd313ca..7ca422bed4 100644
--- a/code/modules/shieldgen/sheldwallgen.dm
+++ b/code/modules/shieldgen/sheldwallgen.dm
@@ -199,14 +199,14 @@
T2 = T
if(locate(/obj/machinery/shieldwall) in T)
F = (locate(/obj/machinery/shieldwall) in T)
- del(F)
+ qdel(F)
if(locate(/obj/machinery/shieldwallgen) in T)
G = (locate(/obj/machinery/shieldwallgen) in T)
if(!G.active)
break
-/obj/machinery/shieldwallgen/Del()
+/obj/machinery/shieldwallgen/Destroy()
src.cleanup(1)
src.cleanup(2)
src.cleanup(4)
@@ -228,7 +228,7 @@
anchored = 1
density = 1
unacidable = 1
- luminosity = 3
+ light_range = 3
var/needs_power = 0
var/active = 1
// var/power = 10
@@ -252,9 +252,9 @@
else
B.storedpower -= generate_power_usage
else
- del(src) //need at least two generator posts
+ qdel(src) //need at least two generator posts
-/obj/machinery/shieldwall/Del()
+/obj/machinery/shieldwall/Destroy()
update_nearby_tiles()
..()
@@ -265,11 +265,11 @@
/obj/machinery/shieldwall/process()
if(needs_power)
if(isnull(gen_primary)||isnull(gen_secondary))
- del(src)
+ qdel(src)
return
if(!(gen_primary.active)||!(gen_secondary.active))
- del(src)
+ qdel(src)
return
if(prob(50))
diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm
index 7483dd02fb..9f89ede039 100644
--- a/code/modules/shieldgen/shield_gen.dm
+++ b/code/modules/shieldgen/shield_gen.dm
@@ -39,6 +39,12 @@
field = new/list()
..()
+/obj/machinery/shield_gen/Destroy()
+ for(var/obj/effect/energy_field/D in field)
+ field.Remove(D)
+ D.loc = null
+ ..()
+
/obj/machinery/shield_gen/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/C = W
@@ -208,7 +214,7 @@
for(var/turf/O in covered_turfs)
var/obj/effect/energy_field/E = new(O)
field.Add(E)
- del covered_turfs
+ qdel(covered_turfs)
for(var/mob/M in view(5,src))
M << "\icon[src] You hear heavy droning start up."
diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index b3478322f7..03942ee5f0 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -105,7 +105,7 @@
for(var/atom/movable/AM as mob|obj in T)
AM.Move(D)
if(istype(T, /turf/simulated))
- del(T)
+ qdel(T)
for(var/mob/living/carbon/bug in destination)
bug.gib()
diff --git a/code/modules/spells/aoe_turf/charge.dm b/code/modules/spells/aoe_turf/charge.dm
index eb8fb76de2..6e7f5b0050 100644
--- a/code/modules/spells/aoe_turf/charge.dm
+++ b/code/modules/spells/aoe_turf/charge.dm
@@ -48,7 +48,7 @@
var/obj/item/weapon/spellbook/oneuse/I = target
if(prob(50))
I.visible_message("[I] catches fire!")
- del(I)
+ qdel(I)
else
I.used = 0
charged_item = I
diff --git a/code/modules/spells/aoe_turf/conjure/conjure.dm b/code/modules/spells/aoe_turf/conjure/conjure.dm
index 98377948fa..6dff0fdb65 100644
--- a/code/modules/spells/aoe_turf/conjure/conjure.dm
+++ b/code/modules/spells/aoe_turf/conjure/conjure.dm
@@ -71,4 +71,4 @@ How they spawn stuff is decided by behaviour vars, which are explained below
return
/spell/aoe_turf/conjure/proc/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
- del(animation)
\ No newline at end of file
+ qdel(animation)
\ No newline at end of file
diff --git a/code/modules/spells/aoe_turf/conjure/construct.dm b/code/modules/spells/aoe_turf/conjure/construct.dm
index fb04db349b..e33d1f2b3c 100644
--- a/code/modules/spells/aoe_turf/conjure/construct.dm
+++ b/code/modules/spells/aoe_turf/conjure/construct.dm
@@ -38,7 +38,7 @@
animation.icon_state = "cultfloor"
flick("cultfloor",animation)
spawn(10)
- del(animation)
+ qdel(animation)
/spell/aoe_turf/conjure/wall
name = "Lesser Construction"
@@ -57,7 +57,7 @@
animation.icon_state = "cultwall"
flick("cultwall",animation)
spawn(10)
- del(animation)
+ qdel(animation)
/spell/aoe_turf/conjure/wall/reinforced
name = "Greater Construction"
@@ -130,8 +130,8 @@
name = "Juggerwall"
icon = 'icons/effects/effects.dmi'
icon_state = "m_shield_cult"
- l_color = "#B40000"
- luminosity = 2
+ light_color = "#B40000"
+ light_range = 2
/obj/effect/forcefield/cult/cultify()
return
diff --git a/code/modules/spells/aoe_turf/summons.dm b/code/modules/spells/aoe_turf/summons.dm
index f9f1242bc9..996b583585 100644
--- a/code/modules/spells/aoe_turf/summons.dm
+++ b/code/modules/spells/aoe_turf/summons.dm
@@ -2,7 +2,7 @@
name = "Dispense Wizard Justice"
desc = "This spell dispenses wizard justice."
- summon_type = list(/obj/machinery/bot/secbot/ed209)
+ summon_type = list(/mob/living/bot/secbot/ed209)
summon_amt = 10
range = 3
newVars = list("emagged" = 1,"name" = "Wizard's Justicebot")
diff --git a/code/modules/spells/spell_code.dm b/code/modules/spells/spell_code.dm
index 0a3078507a..0847146c9a 100644
--- a/code/modules/spells/spell_code.dm
+++ b/code/modules/spells/spell_code.dm
@@ -153,7 +153,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
spell.anchored = 1
spell.density = 0
spawn(overlay_lifespan)
- del(spell)
+ qdel(spell)
return valid_targets
/spell/proc/after_cast(list/targets)
diff --git a/code/modules/spells/targeted/ethereal_jaunt.dm b/code/modules/spells/targeted/ethereal_jaunt.dm
index 2a0e52cc13..12dfd55caa 100644
--- a/code/modules/spells/targeted/ethereal_jaunt.dm
+++ b/code/modules/spells/targeted/ethereal_jaunt.dm
@@ -52,8 +52,8 @@
break
target.canmove = 1
target.client.eye = target
- del(animation)
- del(holder)
+ qdel(animation)
+ qdel(holder)
/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target)
animation.icon_state = "liquify"
@@ -80,7 +80,7 @@
// Eject contents if deleted somehow
for(var/atom/movable/AM in src)
AM.loc = get_turf(src)
- ..()
+ return ..()
/obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
if (!src.canmove || reappearing) return
diff --git a/code/modules/spells/targeted/harvest.dm b/code/modules/spells/targeted/harvest.dm
index 844f223744..6903efbfd9 100644
--- a/code/modules/spells/targeted/harvest.dm
+++ b/code/modules/spells/targeted/harvest.dm
@@ -21,7 +21,7 @@
..()
var/destination = null
- for(var/obj/machinery/singularity/narsie/large/N in narsie_list)
+ for(var/obj/singularity/narsie/large/N in narsie_list)
destination = N.loc
break
if(destination)
diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm
index 83d8d4a23b..bf5d6957a6 100644
--- a/code/modules/supermatter/supermatter.dm
+++ b/code/modules/supermatter/supermatter.dm
@@ -37,7 +37,7 @@
icon_state = "darkmatter"
density = 1
anchored = 0
- luminosity = 4
+ light_range = 4
var/gasefficency = 0.25
@@ -54,7 +54,7 @@
var/emergency_alert = "CRYSTAL DELAMINATION IMMINENT."
var/explosion_point = 1000
- l_color = "#8A8A00"
+ light_color = "#8A8A00"
var/warning_color = "#B8B800"
var/emergency_color = "#D9D900"
@@ -92,8 +92,8 @@
radio = new /obj/item/device/radio{channels=list("Engineering")}(src)
-/obj/machinery/power/supermatter/Del()
- del radio
+/obj/machinery/power/supermatter/Destroy()
+ qdel(radio)
. = ..()
/obj/machinery/power/supermatter/proc/explode()
@@ -112,15 +112,13 @@
mob.apply_effect(rads, IRRADIATE)
spawn(pull_time)
explosion(get_turf(src), explosion_power, explosion_power * 2, explosion_power * 3, explosion_power * 4, 1)
- del src
+ qdel(src)
return
//Changes color and luminosity of the light to these values if they were not already set
/obj/machinery/power/supermatter/proc/shift_light(var/lum, var/clr)
- if(l_color != clr)
- l_color = clr
- if(luminosity != lum)
- SetLuminosity(lum)
+ if(lum != light_range || clr != light_color)
+ set_light(lum, l_color = clr)
/obj/machinery/power/supermatter/proc/announce_warning()
var/integrity = damage / explosion_point
@@ -174,7 +172,7 @@
if(!istype(L, /turf/space) && (world.timeofday - lastwarning) >= WARNING_DELAY * 10)
announce_warning()
else
- shift_light(4,initial(l_color))
+ shift_light(4,initial(light_color))
if(grav_pulling)
supermatter_pull()
@@ -320,7 +318,7 @@
user.dust()
power += 200
else
- del user
+ qdel(user)
power += 200
diff --git a/code/modules/surgery/robolimbs.dm b/code/modules/surgery/robolimbs.dm
index 578833e418..d8214837bf 100644
--- a/code/modules/surgery/robolimbs.dm
+++ b/code/modules/surgery/robolimbs.dm
@@ -54,7 +54,7 @@
target.updatehealth()
target.UpdateDamageIcon()
- del(tool)
+ qdel(tool)
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("\red [user]'s hand slips, damaging [target]'s flesh!", \
diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index 968a09c287..b539dde039 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -306,7 +306,7 @@
var/datum/vehicle_dummy_load/dummy_load = load
load = dummy_load.actual_load
dummy_load.actual_load = null
- del(dummy_load)
+ qdel(dummy_load)
overlays.Cut()
..()
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index c39c8ec047..9407dc937a 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -11,7 +11,7 @@
density = 1
anchored = 1
animate_movement=1
- luminosity = 3
+ light_range = 3
can_buckle = 1
buckle_movable = 1
@@ -149,7 +149,7 @@
/obj/vehicle/emp_act(severity)
var/was_on = on
stat |= EMPED
- var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
+ var/obj/effect/overlay/pulse2 = PoolOrNew(new/obj/effect/overlay, src.loc)
pulse2.icon = 'icons/effects/effects.dmi'
pulse2.icon_state = "empdisable"
pulse2.name = "emp sparks"
@@ -157,7 +157,7 @@
pulse2.set_dir(pick(cardinal))
spawn(10)
- pulse2.delete()
+ qdel(pulse2)
if(on)
turn_off()
spawn(severity*300)
@@ -181,13 +181,13 @@
if(powered && cell.charge < charge_use)
return 0
on = 1
- luminosity = initial(luminosity)
+ set_light(initial(light_range))
update_icon()
return 1
/obj/vehicle/proc/turn_off()
on = 0
- luminosity = 0
+ set_light(0)
update_icon()
/obj/vehicle/proc/Emag(mob/user as mob)
@@ -201,8 +201,8 @@
src.visible_message("\red [src] blows apart!", 1)
var/turf/Tsec = get_turf(src)
- new /obj/item/stack/rods(Tsec)
- new /obj/item/stack/rods(Tsec)
+ PoolOrNew(/obj/item/stack/rods, Tsec)
+ PoolOrNew(/obj/item/stack/rods, Tsec)
new /obj/item/stack/cable_coil/cut(Tsec)
if(cell)
@@ -220,7 +220,7 @@
new /obj/effect/gibspawner/robot(Tsec)
new /obj/effect/decal/cleanable/blood/oil(src.loc)
- del(src)
+ qdel(src)
/obj/vehicle/proc/healthcheck()
if(health <= 0)
@@ -367,4 +367,4 @@
if(prob(10))
new /obj/effect/decal/cleanable/blood/oil(src.loc)
spawn(1) healthcheck()
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/virus2/biohazard destroyer.dm b/code/modules/virus2/biohazard destroyer.dm
index abd1803de8..c6281e1680 100644
--- a/code/modules/virus2/biohazard destroyer.dm
+++ b/code/modules/virus2/biohazard destroyer.dm
@@ -10,7 +10,7 @@
for(var/path in accepts)
if(I.type in typesof(path))
user.drop_item()
- del(I)
+ qdel(I)
overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle")
return
user.drop_item()
diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm
index 741fdb099d..7508818a6d 100644
--- a/code/modules/virus2/items_devices.dm
+++ b/code/modules/virus2/items_devices.dm
@@ -64,7 +64,7 @@
for(var/mob/living/carbon/target in view(1, get_turf(src)))
if(airborne_can_reach(get_turf(src), get_turf(target)))
infect_virus2(target, src.virus2)
- del src
+ qdel(src)
/obj/item/weapon/virusdish/examine(mob/user)
..()
@@ -91,7 +91,7 @@
if(prob(50))
user << "\The [src] shatters!"
- del src
+ qdel(src)
///////////////GNA DISK///////////////
diff --git a/code/setup.dm b/code/setup.dm
index 38836d54d5..7ebb286a0d 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -1,5 +1,10 @@
#define DEBUG
+#define GAME_STATE_PREGAME 1
+#define GAME_STATE_SETTING_UP 2
+#define GAME_STATE_PLAYING 3
+#define GAME_STATE_FINISHED 4
+
// Math constants.
#define M_E 2.71828183
#define M_PI 3.14159265
@@ -192,6 +197,7 @@
#define NOBLOODY 512 // Used for items if they don't want to get a blood overlay.
#define NODELAY 8192 // 1 second attack-by delay skipped (Can be used once every 0.2s). Most objects have a 1s attack-by delay, which doesn't require a flag.
+//Use these flags to indicate if an item obscures the specified slots from view, whereas body_parts_covered seems to be used to indicate what body parts the item protects.
#define GLASSESCOVERSEYES 256
#define MASKCOVERSEYES 256 // Get rid of some of the other retardation in these flags.
#define HEADCOVERSEYES 256 // Feel free to reallocate these numbers for other purposes.
@@ -255,10 +261,12 @@
#define slot_legs 21
#define slot_tie 22
-// Mob sprite sheets. These need to be strings as numbers
-// cannot be used as associative list keys.
-#define icon_l_hand "slot_l_hand"
-#define icon_r_hand "slot_r_hand"
+// Inventory slot strings.
+// since numbers cannot be used as associative list keys.
+#define slot_back_str "back"
+#define slot_l_hand_str "slot_l_hand"
+#define slot_r_hand_str "slot_r_hand"
+#define slot_w_uniform_str "w_uniform"
// Bitflags for clothing parts.
#define HEAD 1
@@ -917,3 +925,39 @@ var/list/be_special_flags = list(
#define STAGE_FOUR 7
#define STAGE_FIVE 9
#define STAGE_SUPER 11
+
+// Camera networks
+#define NETWORK_CRESCENT "Crescent"
+#define NETWORK_CIVILIAN_EAST "Civilian East"
+#define NETWORK_CIVILIAN_WEST "Civilian West"
+#define NETWORK_COMMAND "Command"
+#define NETWORK_ENGINE "Engine"
+#define NETWORK_ENGINEERING "Engineering"
+#define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost"
+#define NETWORK_ERT "ERT"
+#define NETWORK_EXODUS "Exodus"
+#define NETWORK_MEDICAL "Medical"
+#define NETWORK_MINE "MINE"
+#define NETWORK_RESEARCH "Research"
+#define NETWORK_RESEARCH_OUTPOST "Research Outpost"
+#define NETWORK_PRISON "Prison"
+#define NETWORK_SECURITY "Security"
+#define NETWORK_TELECOM "Tcomsat"
+#define NETWORK_THUNDER "thunder"
+
+// Languages
+#define LANGUAGE_SOL_COMMON "Sol Common"
+#define LANGUAGE_UNATHI "Sinta'unathi"
+#define LANGUAGE_SIIK_MAAS "Siik'maas"
+#define LANGUAGE_SIIK_TAJR "Siik'tajr"
+#define LANGUAGE_SKRELLIAN "Skrellian"
+#define LANGUAGE_ROOTSPEAK "Rootspeak"
+#define LANGUAGE_TRADEBAND "Tradeband"
+#define LANGUAGE_GUTTER "Gutter"
+
+#define WALL_CAN_OPEN 1
+#define WALL_OPENING 2
+
+#define CLAMP01(x) max(0, min(1, x))
+
+#define DEFAULT_WALL_MATERIAL "steel"
\ No newline at end of file
diff --git a/code/world.dm b/code/world.dm
index 01c6b0d1c5..acb7ad075d 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -8,7 +8,7 @@ var/global/datum/global_init/init = new ()
makeDatumRefLists()
load_configuration()
- del(src)
+ qdel(src)
/world
@@ -55,6 +55,9 @@ var/global/datum/global_init/init = new ()
// Set up roundstart seed list.
plant_controller = new()
+ // This is kinda important. Set up details of what the hell things are made of.
+ populate_material_list()
+
//Create the asteroid Z-level.
if(config.generate_asteroid)
new /datum/random_map(null,13,32,5,217,223)
diff --git a/html/changelog.css b/html/changelog.css
index 0637dffa67..9d43ecc076 100644
--- a/html/changelog.css
+++ b/html/changelog.css
@@ -20,6 +20,7 @@ a img {border:none;}
.imagedel {background-image:url(image-minus.png)}
.spellcheck {background-image:url(spell-check.png)}
.experiment {background-image:url(burn-exclamation.png)}
+.maptweak {background-image:url(map-pencil.png)}
.sansserif {font-family:Tahoma,sans-serif;font-size:12px;}
.commit {margin-bottom:20px;font-size:100%;font-weight:normal;}
.changes {list-style:none;margin:5px 0;padding:0 0 0 25px;font-size:0.8em;}
diff --git a/html/changelog.html b/html/changelog.html
index 8d999fd9ec..8e4e854561 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -26,7 +26,7 @@
Space Station 13
- Code licensed under GPLv3. Content licensed under CC BY-SA 3.0.
+ Code licensed under AGPLv3. Content licensed under CC BY-SA 3.0.
Visit our IRC channel: #bs12 on irc.sorcery.net
|
@@ -56,6 +56,223 @@
-->