shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into tools_andstuff

Browse Source
This commit is contained in:
Trilbyspaceclone
2020-04-14 10:10:32 -04:00
committed by GitHub
parent d6c819cad2 8f71aafde5
commit 5833ed8029
624 changed files with 7433 additions and 4664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/medical_designs.dm
+34 -10
View File
@@ -122,16 +122,6 @@
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/bluespacebodybag
name = "Bluespace Body Bag"
desc = "A bluespace body bag, powered by experimental bluespace technology. It can hold loads of bodies and the largest of creatures."
id = "bluespacebodybag"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 3000, /datum/material/plasma = 2000, /datum/material/diamond = 500, /datum/material/bluespace = 500)
build_path = /obj/item/bodybag/bluespace
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/plasmarefiller
name = "Plasma-Man Jumpsuit Refill"
desc = "A refill pack for the auto-extinguisher on Plasma-man suits."
@@ -242,6 +232,40 @@
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
////////////////////////////////////////
//////////Body Bags/////////////////////
////////////////////////////////////////
/datum/design/bodybag
name = "Body Bag"
desc = "A normal body bag used for storge of dead crew."
id = "bodybag"
build_type = PROTOLATHE
materials = list(/datum/material/plastic = 4000)
build_path = /obj/item/bodybag
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/bluespacebodybag
name = "Bluespace Body Bag"
desc = "A bluespace body bag, powered by experimental bluespace technology. It can hold loads of bodies and the largest of creatures."
id = "bluespacebodybag"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 3000, /datum/material/plasma = 2000, /datum/material/diamond = 500, /datum/material/bluespace = 500)
build_path = /obj/item/bodybag/bluespace
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/containmentbodybag
name = "Containment Body Bag"
desc = "A containment body bag, heavy and radiation proof."
id = "containmentbodybag"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 6000, /datum/material/plastic = 4000, /datum/material/titanium = 2000)
build_path = /obj/item/bodybag/containment
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
////////////////////////////////////////
//////////Defibrillator Tech////////////
////////////////////////////////////////
code/modules/research/techweb/all_nodes.dm
+8 -10
View File
@@ -79,7 +79,7 @@
display_name = "Advanced Biotechnology"
description = "Advanced Biotechnology"
prereq_ids = list("biotech")
design_ids = list("piercesyringe", "crewpinpointer", "smoke_machine", "plasmarefiller", "limbgrower", "meta_beaker", "healthanalyzer_advanced", "harvester", "holobarrier_med", "defibrillator_compact", "smartdartgun", "medicinalsmartdart", "pHmeter")
design_ids = list("piercesyringe", "crewpinpointer", "smoke_machine", "plasmarefiller", "limbgrower", "meta_beaker", "healthanalyzer_advanced", "harvester", "holobarrier_med", "defibrillator_compact", "smartdartgun", "medicinalsmartdart", "pHmeter", "containmentbodybag")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
/datum/techweb_node/bio_process
@@ -221,16 +221,14 @@
description = "Unlock the potential of the mysterious of why CC decided to not build these around the station themselves."
prereq_ids = list("adv_engi", "high_efficiency")
design_ids = list("meteor_defence", "meteor_console")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
*/
//datum/techweb_node/adv_meteor_defense
//id = "adv_meteor_defense"
//display_name = "Meteor Defense Research"
//description = "New and improved coding and lock on tech for meteor defence!"
//prereq_ids = list("basic_meteor_defense", "adv_datatheory", "emp_adv")
//design_ids = list("meteor_disk")
//research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
/datum/techweb_node/adv_meteor_defense
id = "adv_meteor_defense"
display_name = "Meteor Defense Research"
description = "New and improved coding and lock on tech for meteor defence!"
prereq_ids = list("basic_meteor_defense", "adv_datatheory", "emp_adv")
design_ids = list("meteor_disk")
*/
/datum/techweb_node/computer_board_gaming
id = "computer_board_gaming"
code/modules/research/xenobiology/crossbreeding/_clothing.dm
+4 -5
View File
@@ -137,8 +137,7 @@ Slimecrossing Armor
var/hit_reflect_chance = 10 // Citadel Change: because 40% chance of bouncing lasers back into peoples faces isn't good.
armor = list("melee" = 70, "bullet" = 70, "laser" = 40, "energy" = 40, "bomb" = 80, "bio" = 80, "rad" = 80, "fire" = 70, "acid" = 90) //Citadel Change to avoid immortal Xenobiologists.
/obj/item/clothing/suit/armor/heavy/adamantine/IsReflect(def_zone)
if(def_zone in list(BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) && prob(hit_reflect_chance))
return TRUE
else
return FALSE
/obj/item/clothing/suit/armor/heavy/adamantine/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(is_energy_reflectable_projectile(object) && prob(hit_reflect_chance))
return BLOCK_SUCCESS | BLOCK_REDIRECTED | BLOCK_SHOULD_REDIRECT | BLOCK_PHYSICAL_INTERNAL
return ..()