[M] is hit by \a [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
+ M.visible_message("[M] is hit by \a [src] in the [parse_zone(def_zone)]!", \
+ "[M] is hit by \a [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
add_logs(firer, M, "shot", object="[src]", addition=reagent_note)
var/turf/new_loc = get_turf(A)
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index d9bba99275d..e0a9ff034e6 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -41,6 +41,7 @@
icon_state = "omnilaser"
damage = 33
damage_type = STAMINA
+ hitsound = 'sound/weapons/tap.ogg'
eyeblur = 0
/obj/item/projectile/beam/pulse
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index a6d6d2572e2..254b10db479 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -247,7 +247,9 @@ datum/reagents/proc/handle_reactions()
else
if(my_atom.type == C.required_container)
matching_container = 1
-
+ if (isliving(my_atom)) //Makes it so certain chemical reactions don't occur in mobs
+ if (C.mob_react)
+ return
if(!C.required_other)
matching_other = 1
@@ -282,7 +284,7 @@ datum/reagents/proc/handle_reactions()
ME2.Uses--
if(ME2.Uses <= 0) // give the notification that the slime core is dead
for(var/mob/M in seen)
- M << "\icon[my_atom] The [my_atom]'s power is consumed in the reaction."
+ M << "\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."
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
index 641c0916c0f..257948ffc79 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
@@ -88,7 +88,7 @@ datum/reagent/proc/on_update(var/atom/A)
return
datum/reagent/blood
- data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null)
+ data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
name = "Blood"
id = "blood"
color = "#C80000" // rgb: 200, 0, 0
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 11cfec3f0dc..e174ee01f2f 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -12,6 +12,7 @@
var/result_amount = 0
var/secondary = 0 // set to nonzero if secondary reaction
+ var/mob_react = 0 //Determines if a chemical reaction can occur inside a mob
/datum/chemical_reaction/proc/on_reaction(var/datum/reagents/holder, var/created_volume)
return
@@ -384,6 +385,7 @@ silicate
required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1)
result_amount = null
secondary = 1
+ mob_react = 1
/datum/chemical_reaction/chemsmoke/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
@@ -448,6 +450,7 @@ silicate
result = null
required_reagents = list("iron" = 5, "frostoil" = 5, "plasma" = 20)
result_amount = 1
+ mob_react = 1
/datum/chemical_reaction/plasmasolidification/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
@@ -537,6 +540,7 @@ silicate
result = null
required_reagents = list("fluorosurfactant" = 1, "water" = 1)
result_amount = 2
+ mob_react = 1
/datum/chemical_reaction/foam/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -566,6 +570,7 @@ silicate
result = null
required_reagents = list("aluminium" = 3, "foaming_agent" = 1, "pacid" = 1)
result_amount = 5
+ mob_react = 1
/datum/chemical_reaction/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -586,6 +591,7 @@ silicate
result = null
required_reagents = list("iron" = 3, "foaming_agent" = 1, "pacid" = 1)
result_amount = 5
+ mob_react = 1
/datum/chemical_reaction/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 92c325faedf..ab30aa772f6 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -24,7 +24,7 @@
/obj/item/weapon/grenade/chem_grenade,
/obj/machinery/bot/medbot,
/obj/machinery/computer/pandemic,
- /obj/item/weapon/storage/secure/safe,
+ /obj/structure/safe,
/obj/machinery/disposal,
/obj/machinery/hydroponics,
/obj/machinery/biogenerator,
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 3e08174bdaa..ce8256a3d34 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -79,7 +79,7 @@
user << "You are unable to locate any blood."
return
if(target != user)
- target.visible_message("[user] is trying to take a blood sample from [target]!", \
+ target.visible_message("[user] is trying to take a blood sample from [target]!", \
"[user] is trying to take a blood sample from [target]!")
if(!do_mob(user, target))
return
@@ -118,6 +118,7 @@
B.data["cloneable"] = 1
B.data["gender"] = T.gender
B.data["real_name"] = T.real_name
+ B.data["factions"] = T.faction
reagents.reagent_list += B
reagents.update_total()
on_reagent_change()
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 9be7c88ea13..d67da5e6504 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -55,198 +55,6 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
return
-///////////////////////////////////
-/////Non-Board Computer Stuff//////
-///////////////////////////////////
-
-datum/design/intellicard
- name = "Intellicard AI Transportation System"
- desc = "Allows for the construction of an intellicard."
- id = "intellicard"
- req_tech = list("programming" = 4, "materials" = 4)
- build_type = PROTOLATHE
- materials = list("$glass" = 1000, "$gold" = 200)
- build_path = /obj/item/device/aicard
-
-datum/design/paicard
- name = "Personal Artificial Intelligence Card"
- desc = "Allows for the construction of a pAI Card."
- id = "paicard"
- req_tech = list("programming" = 2)
- build_type = PROTOLATHE
- materials = list("$glass" = 500, "$metal" = 500)
- build_path = /obj/item/device/paicard
-
-
-////////////////////////////////////////
-//////////Disk Construction Disks///////
-////////////////////////////////////////
-datum/design/design_disk
- name = "Design Storage Disk"
- desc = "Produce additional disks for storing device designs."
- id = "design_disk"
- req_tech = list("programming" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 30, "$glass" = 10)
- build_path = /obj/item/weapon/disk/design_disk
-
-datum/design/tech_disk
- name = "Technology Data Storage Disk"
- desc = "Produce additional disks for storing technology data."
- id = "tech_disk"
- req_tech = list("programming" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 30, "$glass" = 10)
- build_path = /obj/item/weapon/disk/tech_disk
-
-
-/////////////////////////////////////////
-/////////////////Mining//////////////////
-/////////////////////////////////////////
-
-datum/design/jackhammer
- name = "Sonic Jackhammer"
- desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
- id = "jackhammer"
- req_tech = list("materials" = 3, "powerstorage" = 2, "engineering" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 2000, "$glass" = 500, "$silver" = 500)
- build_path = /obj/item/weapon/pickaxe/jackhammer
-
-datum/design/drill
- name = "Mining Drill"
- desc = "Yours is the drill that will pierce through the rock walls."
- id = "drill"
- req_tech = list("materials" = 2, "powerstorage" = 3, "engineering" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 6000, "$glass" = 1000) //expensive, but no need for miners.
- build_path = /obj/item/weapon/pickaxe/drill
-
-datum/design/plasmacutter
- name = "Plasma Cutter"
- desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
- id = "plasmacutter"
- req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500)
- reliability = 79
- build_path = /obj/item/weapon/pickaxe/plasmacutter
-
-datum/design/pick_diamond
- name = "Diamond Pickaxe"
- desc = "A pickaxe with a diamond pick head, this is just like minesim 2554!."
- id = "pick_diamond"
- req_tech = list("materials" = 6)
- build_type = PROTOLATHE
- materials = list("$diamond" = 3000)
- build_path = /obj/item/weapon/pickaxe/diamond
-
-datum/design/drill_diamond
- name = "Diamond Mining Drill"
- desc = "Yours is the drill that will pierce the heavens!"
- id = "drill_diamond"
- req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4)
- build_type = PROTOLATHE
- materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
- reliability = 79
- build_path = /obj/item/weapon/pickaxe/drill/diamonddrill
-
-/////////////////////////////////////////
-//////////////Blue Space/////////////////
-/////////////////////////////////////////
-
-datum/design/beacon
- name = "Tracking Beacon"
- desc = "A blue space tracking beacon."
- id = "beacon"
- req_tech = list("bluespace" = 1)
- build_type = PROTOLATHE
- materials = list("$metal" = 20, "$glass" = 10)
- build_path = /obj/item/device/radio/beacon
-
-datum/design/bag_holding
- name = "Bag of Holding"
- desc = "A backpack that opens into a localized pocket of Blue Space."
- id = "bag_holding"
- req_tech = list("bluespace" = 4, "materials" = 6)
- build_type = PROTOLATHE
- materials = list("$gold" = 3000, "$diamond" = 1500, "$uranium" = 250)
- reliability = 80
- build_path = /obj/item/weapon/storage/backpack/holding
-
-datum/design/bluespace_crystal
- name = "Artificial Bluespace Crystal"
- desc = "A small blue crystal with mystical properties."
- id = "bluespace_crystal"
- req_tech = list("bluespace" = 4, "materials" = 6)
- build_type = PROTOLATHE
- materials = list("$diamond" = 1500, "$plasma" = 1500)
- reliability = 100
- build_path = /obj/item/bluespace_crystal/artificial
-
-datum/design/telesci_gps
- name = "GPS Device"
- desc = "Little thingie that can track its position at all times."
- id = "telesci_gps"
- req_tech = list("materials" = 2, "magnets" = 3, "bluespace" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 500, "$glass" = 1000)
- build_path = /obj/item/device/gps
-
-
-/////////////////////////////////////////
-/////////////////HUDs////////////////////
-/////////////////////////////////////////
-
-datum/design/health_hud
- name = "Health Scanner HUD"
- desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
- id = "health_hud"
- req_tech = list("biotech" = 2, "magnets" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/clothing/glasses/hud/health
-
-datum/design/health_hud_night
- name = "Night Vision Health Scanner HUD"
- desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
- id = "health_hud_night"
- req_tech = list("biotech" = 4, "magnets" = 5)
- build_type = PROTOLATHE
- materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$silver" = 250)
- build_path = /obj/item/clothing/glasses/hud/health/night
-
-datum/design/security_hud
- name = "Security HUD"
- desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
- id = "security_hud"
- req_tech = list("magnets" = 3, "combat" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/clothing/glasses/hud/security
-
-datum/design/security_hud_night
- name = "Night Vision Security HUD"
- desc = "A heads-up display which provides id data and vision in complete darkness."
- id = "security_hud_night"
- req_tech = list("magnets" = 5, "combat" = 4)
- build_type = PROTOLATHE
- materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$gold" = 350)
- build_path = /obj/item/clothing/glasses/hud/security/night
-
-/////////////////////////////////////////
-//////////////////Test///////////////////
-/////////////////////////////////////////
-
- /* test
- name = "Test Design"
- desc = "A design to test the new protolathe."
- id = "protolathe_test"
- build_type = PROTOLATHE
- req_tech = list("materials" = 1)
- materials = list("$gold" = 3000, "iron" = 15, "copper" = 10, "$silver" = 2500)
- build_path = /obj/item/weapon/banhammer" */
-
////////////////////////////////////////
//Disks for transporting design datums//
////////////////////////////////////////
@@ -266,28 +74,221 @@ datum/design/security_hud_night
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
+///////////////////////////////////
+/////Non-Board Computer Stuff//////
+///////////////////////////////////
+
+/datum/design/intellicard
+ name = "Intellicard AI Transportation System"
+ desc = "Allows for the construction of an intellicard."
+ id = "intellicard"
+ req_tech = list("programming" = 4, "materials" = 4)
+ build_type = PROTOLATHE
+ materials = list("$glass" = 1000, "$gold" = 200)
+ build_path = /obj/item/device/aicard
+ category = list("Electronics")
+
+/datum/design/paicard
+ name = "Personal Artificial Intelligence Card"
+ desc = "Allows for the construction of a pAI Card."
+ id = "paicard"
+ req_tech = list("programming" = 2)
+ build_type = PROTOLATHE
+ materials = list("$glass" = 500, "$metal" = 500)
+ build_path = /obj/item/device/paicard
+ category = list("Electronics")
+
+
+////////////////////////////////////////
+//////////Disk Construction Disks///////
+////////////////////////////////////////
+/datum/design/design_disk
+ name = "Design Storage Disk"
+ desc = "Produce additional disks for storing device designs."
+ id = "design_disk"
+ req_tech = list("programming" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 30, "$glass" = 10)
+ build_path = /obj/item/weapon/disk/design_disk
+ category = list("Electronics")
+
+/datum/design/tech_disk
+ name = "Technology Data Storage Disk"
+ desc = "Produce additional disks for storing technology data."
+ id = "tech_disk"
+ req_tech = list("programming" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 30, "$glass" = 10)
+ build_path = /obj/item/weapon/disk/tech_disk
+ category = list("Electronics")
+
/////////////////////////////////////////
-//////////////Borg Upgrades//////////////
+/////////////////Mining//////////////////
/////////////////////////////////////////
-datum/design/borg_syndicate_module
- name = "Borg Illegal Weapons Upgrade"
- desc = "Allows for the construction of illegal upgrades for cyborgs"
- id = "borg_syndicate_module"
- build_type = MECHFAB
- req_tech = list("combat" = 4, "syndicate" = 3)
- build_path = /obj/item/borg/upgrade/syndicate
- materials = list("$metal"=10000,"$glass"=15000,"$diamond" = 10000)
- construction_time = 120
- category = list("Cyborg Upgrade Modules")
+/datum/design/jackhammer
+ name = "Sonic Jackhammer"
+ desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
+ id = "jackhammer"
+ req_tech = list("materials" = 3, "powerstorage" = 2, "engineering" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 2000, "$glass" = 500, "$silver" = 500)
+ build_path = /obj/item/weapon/pickaxe/jackhammer
+ category = list("Mining Designs")
+/datum/design/drill
+ name = "Mining Drill"
+ desc = "Yours is the drill that will pierce through the rock walls."
+ id = "drill"
+ req_tech = list("materials" = 2, "powerstorage" = 3, "engineering" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 6000, "$glass" = 1000) //expensive, but no need for miners.
+ build_path = /obj/item/weapon/pickaxe/drill
+ category = list("Mining Designs")
+
+/datum/design/plasmacutter
+ name = "Plasma Cutter"
+ desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
+ id = "plasmacutter"
+ req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500)
+ reliability = 79
+ build_path = /obj/item/weapon/pickaxe/plasmacutter
+ category = list("Mining Designs")
+
+/datum/design/pick_diamond
+ name = "Diamond Pickaxe"
+ desc = "A pickaxe with a diamond pick head, this is just like minesim 2554!."
+ id = "pick_diamond"
+ req_tech = list("materials" = 6)
+ build_type = PROTOLATHE
+ materials = list("$diamond" = 3000)
+ build_path = /obj/item/weapon/pickaxe/diamond
+ category = list("Mining Designs")
+
+/datum/design/drill_diamond
+ name = "Diamond Mining Drill"
+ desc = "Yours is the drill that will pierce the heavens!"
+ id = "drill_diamond"
+ req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
+ reliability = 79
+ build_path = /obj/item/weapon/pickaxe/drill/diamonddrill
+ category = list("Mining Designs")
+
+/////////////////////////////////////////
+//////////////Blue Space/////////////////
+/////////////////////////////////////////
+
+/datum/design/beacon
+ name = "Tracking Beacon"
+ desc = "A blue space tracking beacon."
+ id = "beacon"
+ req_tech = list("bluespace" = 1)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 20, "$glass" = 10)
+ build_path = /obj/item/device/radio/beacon
+ category = list("Bluespace Designs")
+
+/datum/design/bag_holding
+ name = "Bag of Holding"
+ desc = "A backpack that opens into a localized pocket of Blue Space."
+ id = "bag_holding"
+ req_tech = list("bluespace" = 4, "materials" = 6)
+ build_type = PROTOLATHE
+ materials = list("$gold" = 3000, "$diamond" = 1500, "$uranium" = 250)
+ reliability = 80
+ build_path = /obj/item/weapon/storage/backpack/holding
+ category = list("Bluespace Designs")
+
+/datum/design/bluespace_crystal
+ name = "Artificial Bluespace Crystal"
+ desc = "A small blue crystal with mystical properties."
+ id = "bluespace_crystal"
+ req_tech = list("bluespace" = 4, "materials" = 6)
+ build_type = PROTOLATHE
+ materials = list("$diamond" = 1500, "$plasma" = 1500)
+ reliability = 100
+ build_path = /obj/item/bluespace_crystal/artificial
+ category = list("Bluespace Designs")
+
+/datum/design/telesci_gps
+ name = "GPS Device"
+ desc = "Little thingie that can track its position at all times."
+ id = "telesci_gps"
+ req_tech = list("materials" = 2, "magnets" = 3, "bluespace" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 500, "$glass" = 1000)
+ build_path = /obj/item/device/gps
+ category = list("Bluespace Designs")
+
+
+/////////////////////////////////////////
+/////////////////HUDs////////////////////
+/////////////////////////////////////////
+
+/datum/design/health_hud
+ name = "Health Scanner HUD"
+ desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
+ id = "health_hud"
+ req_tech = list("biotech" = 2, "magnets" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/clothing/glasses/hud/health
+ category = list("Equipement")
+
+/datum/design/health_hud_night
+ name = "Night Vision Health Scanner HUD"
+ desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
+ id = "health_hud_night"
+ req_tech = list("biotech" = 4, "magnets" = 5)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$silver" = 250)
+ build_path = /obj/item/clothing/glasses/hud/health/night
+ category = list("Equipement")
+
+/datum/design/security_hud
+ name = "Security HUD"
+ desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
+ id = "security_hud"
+ req_tech = list("magnets" = 3, "combat" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/clothing/glasses/hud/security
+ category = list("Equipement")
+
+/datum/design/security_hud_night
+ name = "Night Vision Security HUD"
+ desc = "A heads-up display which provides id data and vision in complete darkness."
+ id = "security_hud_night"
+ req_tech = list("magnets" = 5, "combat" = 4)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$gold" = 350)
+ build_path = /obj/item/clothing/glasses/hud/security/night
+ category = list("Equipement")
+
+/////////////////////////////////////////
+//////////////////Test///////////////////
+/////////////////////////////////////////
+
+ /* test
+ name = "Test Design"
+ desc = "A design to test the new protolathe."
+ id = "protolathe_test"
+ build_type = PROTOLATHE
+ req_tech = list("materials" = 1)
+ materials = list("$gold" = 3000, "iron" = 15, "copper" = 10, "$silver" = 2500)
+ build_path = /obj/item/weapon/banhammer"
+ category = list("Weapons") */
/////////////////////////////////////////
//////////////////Misc///////////////////
/////////////////////////////////////////
-datum/design/welding_mask
+/datum/design/welding_mask
name = "Welding Gas Mask"
desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd."
id = "weldingmask"
@@ -295,8 +296,9 @@ datum/design/welding_mask
build_type = PROTOLATHE
materials = list("$metal" = 4000, "$glass" = 1000)
build_path = /obj/item/clothing/mask/gas/welding
+ category = list("Equipement")
-datum/design/mesons
+/datum/design/mesons
name = "Optical Meson Scanners"
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
id = "mesons"
@@ -304,8 +306,9 @@ datum/design/mesons
build_type = PROTOLATHE
materials = list("$metal" = 200, "$glass" = 300, "$plasma" = 100)
build_path = /obj/item/clothing/glasses/meson
+ category = list("Equipement")
-datum/design/night_vision_goggles
+/datum/design/night_vision_goggles
name = "Night Vision Goggles"
desc = "Goggles that let you see through darkness unhindered."
id = "night_visision_goggles"
@@ -313,8 +316,9 @@ datum/design/night_vision_goggles
build_type = PROTOLATHE
materials = list("$metal" = 100, "$glass" = 100, "$uranium" = 1000)
build_path = /obj/item/clothing/glasses/night
+ category = list("Equipement")
-datum/design/magboots
+/datum/design/magboots
name = "Magnetic Boots"
desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
id = "magboots"
@@ -322,23 +326,13 @@ datum/design/magboots
build_type = PROTOLATHE
materials = list("$metal" = 4500, "$silver" = 1500, "$gold" = 2500)
build_path = /obj/item/clothing/shoes/magboots
-
-datum/design/drone_shell
- name = "Drone Shell"
- desc = "A shell of a maintenance drone, an expendable robot built to perform station repairs."
- id = "drone_shell"
- req_tech = list("programming" = 2, "biotech" = 4)
- build_type = MECHFAB
- materials = list("$metal" = 800, "$glass" = 350)
- construction_time=150
- build_path = /obj/item/drone_shell
- category = list("Misc")
+ category = list("Equipement")
/////////////////////////////////////////
////////////Janitor Designs//////////////
/////////////////////////////////////////
-datum/design/advmop
+/datum/design/advmop
name = "Advanced Mop"
desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals."
id = "advmop"
@@ -346,12 +340,14 @@ datum/design/advmop
build_type = PROTOLATHE
materials = list("$metal" = 2500, "$glass" = 200)
build_path = /obj/item/weapon/mop/advanced
+ category = list("Equipement")
-datum/design/holosign
+/datum/design/holosign
name = "Holographic Sign Projector"
desc = "A holograpic projector used to project various warning signs."
id = "holosign"
req_tech = list("magnets" = 3, "powerstorage" = 2)
build_type = PROTOLATHE
materials = list("$metal" = 2000, "$glass" = 1000)
- build_path = /obj/item/weapon/holosign_creator
\ No newline at end of file
+ build_path = /obj/item/weapon/holosign_creator
+ category = list("Equipement")
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 26f834ff7e2..158b666f29d 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -594,7 +594,10 @@
construction_time = 500
category = list("Exosuit Equipment")
-//Cyborg Upgrade Modules
+/////////////////////////////////////////
+//////////////Borg Upgrades//////////////
+/////////////////////////////////////////
+
/datum/design/borg_upgrade_reset
name = "Cyborg Upgrade Module (Reset Module)"
id = "borg_upgrade_reset"
@@ -649,6 +652,17 @@
construction_time = 120
category = list("Cyborg Upgrade Modules")
+/datum/design/borg_syndicate_module
+ name = "Borg Illegal Weapons Upgrade"
+ desc = "Allows for the construction of illegal upgrades for cyborgs"
+ id = "borg_syndicate_module"
+ build_type = MECHFAB
+ req_tech = list("combat" = 4, "syndicate" = 3)
+ build_path = /obj/item/borg/upgrade/syndicate
+ materials = list("$metal"=10000,"$glass"=15000,"$diamond" = 10000)
+ construction_time = 120
+ category = list("Cyborg Upgrade Modules")
+
//Misc
/datum/design/mecha_tracking
name = "Exosuit Tracking Beacon"
@@ -657,4 +671,15 @@
build_path =/obj/item/mecha_parts/mecha_tracking
materials = list("$metal"=500)
construction_time = 50
+ category = list("Misc")
+
+/datum/design/drone_shell
+ name = "Drone Shell"
+ desc = "A shell of a maintenance drone, an expendable robot built to perform station repairs."
+ id = "drone_shell"
+ req_tech = list("programming" = 2, "biotech" = 4)
+ build_type = MECHFAB
+ materials = list("$metal" = 800, "$glass" = 350)
+ construction_time=150
+ build_path = /obj/item/drone_shell
category = list("Misc")
\ No newline at end of file
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index 73cb40dc456..807541815a7 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -67,6 +67,7 @@ datum/design/pacman
reliability = 79
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/pacman
+ category = list("Engineering Machinery")
datum/design/superpacman
name = "Machine Design (SUPERPACMAN-type Generator Board)"
@@ -77,6 +78,7 @@ datum/design/superpacman
reliability = 76
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/pacman/super
+ category = list("Engineering Machinery")
datum/design/mrspacman
name = "Machine Design (MRSPACMAN-type Generator Board)"
@@ -87,3 +89,4 @@ datum/design/mrspacman
reliability = 74
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/pacman/mrs
+ category = list("Engineering Machinery")
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 771d53cd16e..c6ed0a4f8f3 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -27,8 +27,12 @@ Note: Must be placed west/left of and R&D console to function.
var/list/categories = list(
"Power Designs",
- "Stock Parts",
"Medical Designs",
+ "Bluespace Designs",
+ "Stock Parts",
+ "Equipement",
+ "Mining Designs",
+ "Electronics",
"Weapons",
"Ammo",
)
diff --git a/config/config.txt b/config/config.txt
index d3fb04150a5..0d112194334 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -152,4 +152,7 @@ TICKCOMP 0
#AUTOMUTE_ON
## Communication key for receiving data through world/Topic(), you don't want to give this out
-#COMMS_KEY default_pwd
\ No newline at end of file
+#COMMS_KEY default_pwd
+
+## Uncomment this to let players see their own notes (they can still be set by admins only)
+#SEE_OWN_NOTES
diff --git a/config/game_options.txt b/config/game_options.txt
index 7f469d35001..00fad47a4de 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -27,6 +27,10 @@ REVIVAL_BRAIN_LIFE -1
#Comment this out if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
OOC_DURING_ROUND
+### EMOJI ###
+#Comment this out if you want to disable emojis
+EMOJIS
+
### MOB MOVEMENT ###
## We suggest editing these variables ingame to find a good speed for your server.
diff --git a/html/changelog.html b/html/changelog.html
index c0dafcb126f..092b4c9d99f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,28 @@
-->
+
+
27 December 2014
+
Dorsidwarf updated:
+
+ - Buffs the RCD from 30 matter units to max capacity 100, and increases the value of matter charges.
+
+
Paprika updated:
+
+ - Taser electrodes now have a limited range of 7 tiles.
+ - The energy gun's stun mode has been replaced with a disable mode.
+ - Security officers will now spawn with tasers.
+ - Disabler beams now go through windows and grilles.
+ - Disabler beams now do 33 stamina damage instead of 34. This means they will only stun in 3 hits on someone that is NOT 100% healthy.
+ - Most ballistic projectiles now do stamina damage in addition to their regular damage instead of stunning. This includes nuke op c-20r .45, detective's revolver, etc. They are effectively better than disablers at stunning people, as well as do significant damage, but they do not stun instantly like a taser. Expect engagements to be a little longer and plan ahead for this.
+ - Added an advanced taser for RnD, the child of a disabler and a taser.
+
+
Tkdrg updated:
+
+ - Envoys from the distant Viji sector have brought an exotic contraption to Centcomm. Known as the 'supermatter shard', it is a fragment of an ancient alien artifact, believed to have a dangerous and mysterious power. This precious item has been made available to the Space Station 13 cargo team for the cost of a hundred supply points, as a reward for all your hard work. Good luck, and stay safe.
+
+
16 December 2014
Paprika updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 11d9482ac4a..c68eb21a486 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2205,3 +2205,27 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: The number of junk food in snack vending machine is lowered from 6 to 5
of each type.
- bugfix: Fixing not being able to load an omelette du fromage on a tray.
+2014-12-27:
+ Dorsidwarf:
+ - tweak: Buffs the RCD from 30 matter units to max capacity 100, and increases the
+ value of matter charges.
+ Paprika:
+ - experiment: Taser electrodes now have a limited range of 7 tiles.
+ - experiment: The energy gun's stun mode has been replaced with a disable mode.
+ - experiment: Security officers will now spawn with tasers.
+ - tweak: Disabler beams now go through windows and grilles.
+ - tweak: Disabler beams now do 33 stamina damage instead of 34. This means they
+ will only stun in 3 hits on someone that is NOT 100% healthy.
+ - tweak: Most ballistic projectiles now do stamina damage in addition to their regular
+ damage instead of stunning. This includes nuke op c-20r .45, detective's revolver,
+ etc. They are effectively better than disablers at stunning people, as well
+ as do significant damage, but they do not stun instantly like a taser. Expect
+ engagements to be a little longer and plan ahead for this.
+ - rscadd: Added an advanced taser for RnD, the child of a disabler and a taser.
+ Tkdrg:
+ - rscadd: Envoys from the distant Viji sector have brought an exotic contraption
+ to Centcomm. Known as the 'supermatter shard', it is a fragment of an ancient
+ alien artifact, believed to have a dangerous and mysterious power. This precious
+ item has been made available to the Space Station 13 cargo team for the cost
+ of a hundred supply points, as a reward for all your hard work. Good luck, and
+ stay safe.
diff --git a/html/changelogs/Dorsidwarf-RCDbuff-6242.yml.txt b/html/changelogs/Dorsidwarf-RCDbuff-6242.yml.txt
deleted file mode 100644
index 885ecc9ef6a..00000000000
--- a/html/changelogs/Dorsidwarf-RCDbuff-6242.yml.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscdel (general adding of nice things)
-# rscadd (general deleting of nice things)
-# imageadd
-# imagedel
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-#################################
-# Your name.
-author: Dorsidwarf
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
-- tweak: "Buffs the RCD from 30 matter units to max capacity 100, and increases the value of matter charges.
\ No newline at end of file
diff --git a/html/changelogs/JJRcop-OOCemoji.yml b/html/changelogs/JJRcop-OOCemoji.yml
new file mode 100644
index 00000000000..fa65b93fb7e
--- /dev/null
+++ b/html/changelogs/JJRcop-OOCemoji.yml
@@ -0,0 +1,4 @@
+author: JJRcop, Nienhaus
+delete-after: True
+changes:
+ - rscadd: "Adds emoji to OOC chat."
\ No newline at end of file
diff --git a/html/changelogs/Paprika - stuntweaks.yml b/html/changelogs/Paprika - stuntweaks.yml
deleted file mode 100644
index a37a27e1fc8..00000000000
--- a/html/changelogs/Paprika - stuntweaks.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-author: Paprika
-delete-after: True
-
-
-changes:
-
- - experiment: "Taser electrodes now have a limited range of 7 tiles."
- - experiment: "The energy gun's stun mode has been replaced with a disable mode."
- - experiment: "Security officers will now spawn with tasers."
- - tweak: "Disabler beams now go through windows and grilles."
- - tweak: "Disabler beams now do 33 stamina damage instead of 34. This means they will only stun in 3 hits on someone that is NOT 100% healthy."
- - tweak: "Most ballistic projectiles now do stamina damage in addition to their regular damage instead of stunning. This includes nuke op c-20r .45, detective's revolver, etc. They are effectively better than disablers at stunning people, as well as do significant damage, but they do not stun instantly like a taser. Expect engagements to be a little longer and plan ahead for this."
- - rscadd: "Added an advanced taser for RnD, the child of a disabler and a taser."
\ No newline at end of file
diff --git a/html/changelogs/Tkdrg-FUCKING_SUPERMATTER.yml b/html/changelogs/Tkdrg-FUCKING_SUPERMATTER.yml
deleted file mode 100644
index 8a39d30d075..00000000000
--- a/html/changelogs/Tkdrg-FUCKING_SUPERMATTER.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Tkdrg
-delete-after: True
-
-changes:
- - rscadd: "Envoys from the distant Viji sector have brought an exotic contraption to Centcomm. Known as the 'supermatter shard', it is a fragment of an ancient alien artifact, believed to have a dangerous and mysterious power. This precious item has been made available to the Space Station 13 cargo team for the cost of a hundred supply points, as a reward for all your hard work. Good luck, and stay safe."
diff --git a/icons/emoji.dmi b/icons/emoji.dmi
new file mode 100644
index 00000000000..a78a7e3df79
Binary files /dev/null and b/icons/emoji.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 2b363ca9647..05e667d2553 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 045ac438a26..b10bcfce92b 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index fbfafed94df..b6923194bb1 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 367ef6ee234..df6f3a4ba10 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 6ac0661e122..605c08c4590 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index d258dd1d68c..24f9048fc45 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 81a2fb808b8..30fd1979df8 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 810fa7af430..0e7af4bc429 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -854,6 +854,7 @@
#include "code\modules\detectivework\evidence.dm"
#include "code\modules\detectivework\footprints_and_rag.dm"
#include "code\modules\detectivework\scanner.dm"
+#include "code\modules\emoji\emoji_parse.dm"
#include "code\modules\events\alien_infestation.dm"
#include "code\modules\events\anomaly.dm"
#include "code\modules\events\anomaly_bluespace.dm"
Cleanbot Access
Signaler System
Newscaster Access 
[scanmode == 3 ? "Disable" : "Enable"] Reagent Scanner