cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor R&D changes, defib/IPC fix attempt 999

Browse Source
This commit is contained in:
Markolie
2015-01-09 05:37:21 +01:00
parent 29f5bd1b2f
commit c65c9c8a7a
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_damage.dm
+4
View File
@@ -23,12 +23,16 @@
mob_list += src
stat = CONSCIOUS
ear_deaf = 0
deafness = 0
tod = 0
if (stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
mob_list -= src
dead_mob_list -= src
living_mob_list += src
mob_list += src
ear_deaf = 0
deafness = 0
tod = 0
return
/mob/living/carbon/human/getBrainLoss()
code/modules/research/designs/autolathe_designs.dm
+2 -2
View File
@@ -163,7 +163,7 @@
category = list("initial", "Miscellaneous")
/datum/design/prox_sensor
name = "Proximity sensor"
name = "Proximity Sensor"
id = "prox_sensor"
build_type = AUTOLATHE
materials = list("$metal" = 800, "$glass" = 200)
@@ -187,7 +187,7 @@
category = list("initial", "Miscellaneous")
/datum/design/voice_analyser
name = "Voice analyser"
name = "Voice Analyser"
id = "voice_analyser"
build_type = AUTOLATHE
materials = list("$metal" = 500, "$glass" = 50)
code/modules/research/designs/machine_designs.dm
+12 -12
View File
@@ -60,7 +60,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/bodyscanner
category = list ("Medical Machinery")
category = list("Medical Machinery")
/datum/design/sleep_console
name = "Machine Board (Body Scanner Console)"
@@ -70,7 +70,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/bodyscanner_console
category = list ("Medical Machinery")
category = list("Medical Machinery")
/datum/design/clonepod
name = "Machine Board (Cloning Pod)"
@@ -80,7 +80,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/clonepod
category = list ("Medical Machinery")
category = list("Medical Machinery")
/datum/design/clonescanner
name = "Machine Board (Cloning Scanner)"
@@ -90,7 +90,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/clonescanner
category = list ("Medical Machinery")
category = list("Medical Machinery")
/datum/design/cryotube
name = "Machine Board (Cryotube Board)"
@@ -100,7 +100,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/cryo_tube
category = list ("Medical Machinery")
category = list("Medical Machinery")
/datum/design/chem_dispenser
name = "Machine Board (Portable Chem Dispenser)"
@@ -110,7 +110,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/chem_dispenser
category = list ("Medical Machinery")
category = list("Medical Machinery")
/datum/design/sleeper
name = "Machine Board (Sleeper)"
@@ -120,7 +120,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/sleeper
category = list ("Medical Machinery")
category = list("Medical Machinery")
/datum/design/sleep_console
name = "Machine Board (Sleeper Console)"
@@ -130,7 +130,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/sleep_console
category = list ("Medical Machinery")
category = list("Medical Machinery")
/datum/design/biogenerator
name = "Machine Board (Biogenerator)"
@@ -240,7 +240,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/arcade/battle
category = list ("Misc. Machinery")
category = list("Misc. Machinery")
/datum/design/microwave
name = "Machine Board (Microwave)"
@@ -250,7 +250,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/microwave
category = list ("Misc. Machinery")
category = list("Misc. Machinery")
/datum/design/orion_trail
name = "Machine Board (Orion Trail Arcade Machine)"
@@ -260,7 +260,7 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/arcade/orion_trail
category = list ("Misc. Machinery")
category = list("Misc. Machinery")
/datum/design/vendor
name = "Machine Board (Vendor)"
@@ -270,4 +270,4 @@
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/vendor
category = list ("Misc. Machinery")
category = list("Misc. Machinery")
code/modules/research/designs/power_designs.dm
+1 -1
View File
@@ -7,7 +7,7 @@
desc = "A basic power cell that holds 1000 units of energy"
id = "basic_cell"
req_tech = list("powerstorage" = 1)
build_type = PROTOLATHE | AUTOLATHE |MECHFAB
build_type = PROTOLATHE | AUTOLATHE | MECHFAB
materials = list("$metal" = 700, "$glass" = 50)
build_path = /obj/item/weapon/cell
category = list("Misc","Power")