cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from ParadiseSS13/master

Browse Source 
update lmao
This commit is contained in:
Superhats
2018-08-10 10:53:02 +02:00
committed by GitHub
parent 3fa8817383 91f3e80265
commit 2ae12ac2f7
466 changed files with 12390 additions and 7720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_designs.dm
+8
View File
@@ -591,6 +591,14 @@
build_path = /obj/item/reagent_containers/syringe
category = list("initial", "Medical")
/datum/design/safety_hypo
name = "Medical Hypospray"
id = "safetyhypo"
build_type = AUTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 500)
build_path = /obj/item/reagent_containers/hypospray/safety
category = list("initial", "Medical")
/datum/design/prox_sensor
name = "Proximity Sensor"
id = "prox_sensor"
code/modules/research/designs/mechfabricator_designs.dm
+9
View File
@@ -1120,6 +1120,15 @@
construction_time = 350
category = list("Misc")
/datum/design/integrated_robotic_chassis
name = "Integrated Robotic Chassis"
id = "integrated_robotic_chassis"
build_type = MECHFAB
build_path = /mob/living/carbon/human/machine/created
materials = list(MAT_METAL = 40000)
construction_time = 400
category = list("Misc")
/datum/design/ipc_cell
name = "IPC Microbattery"
id = "ipc_cell"
code/modules/research/designs/medical_designs.dm
+35 -5
View File
@@ -103,15 +103,15 @@
build_path = /obj/item/mass_spectrometer
category = list("Medical")
/datum/design/posibrain
name = "Positronic Brain"
desc = "The latest in Artificial Intelligences."
id = "mmi_posi"
/datum/design/robotic_brain
name = "Robotic Brain"
desc = "The latest in non-sentient Artificial Intelligences."
id = "mmi_robotic"
req_tech = list("programming" = 5, "biotech" = 4, "plasmatech" = 3)
build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 1700, MAT_GLASS = 1350, MAT_GOLD = 500) //Gold, because SWAG.
construction_time = 75
build_path = /obj/item/mmi/posibrain
build_path = /obj/item/mmi/robotic_brain
category = list("Misc","Medical")
/datum/design/mmi_radio_upgrade
@@ -245,6 +245,36 @@
materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500)
category = list("Medical")
/datum/design/alienbonegel
name = "Alien Bone Gel"
desc = "Advanced bone gel obtained through Abductor technology."
id = "alien_bonegel"
req_tech = list("biotech" = 4, "materials" = 4, "abductor" = 3)
build_path = /obj/item/bonegel/alien
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500)
category = list("Medical")
/datum/design/alienbonesetter
name = "Alien Bone Setter"
desc = "An advanced bone setter obtained through Abductor technology."
id = "alien_bonesetter"
req_tech = list("biotech" = 4, "materials" = 4, "abductor" = 3)
build_path = /obj/item/bonesetter/alien
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500)
category = list("Medical")
/datum/design/alienfixovein
name = "Alien FixOVein"
desc = "An advanced FixOVein obtained through Abductor technology."
id = "alien_fixovein"
req_tech = list("biotech" = 4, "materials" = 4, "abductor" = 3)
build_path = /obj/item/FixOVein/alien
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500)
category = list("Medical")
/////////////////////////////////////////
//////////Cybernetic Implants////////////
/////////////////////////////////////////
code/modules/research/rdmachines.dm
+7 -7
View File
@@ -43,15 +43,15 @@
if(shocked)
shock(user,50)
if(panel_open)
var/dat as text
var/list/dat = list()
dat += "[src.name] Wires:<BR>"
for(var/wire in src.wires)
dat += text("[wire] Wire: <A href='?src=[UID()];wire=[wire];cut=1'>[src.wires[wire] ? "Mend" : "Cut"]</A> <A href='?src=[UID()];wire=[wire];pulse=1'>Pulse</A><BR>")
for(var/wire in wires)
dat += "[wire] Wire: <A href='?src=[UID()];wire=[wire];cut=1'>[src.wires[wire] ? "Mend" : "Cut"]</A> <A href='?src=[UID()];wire=[wire];pulse=1'>Pulse</A><BR>"
dat += text("The red light is [src.disabled ? "off" : "on"].<BR>")
dat += text("The green light is [src.shocked ? "off" : "on"].<BR>")
dat += text("The blue light is [src.hacked ? "off" : "on"].<BR>")
user << browse("<HTML><HEAD><TITLE>[src.name] Hacking</TITLE></HEAD><BODY>[dat]</BODY></HTML>","window=hack_win")
dat += "The red light is [src.disabled ? "off" : "on"].<BR>"
dat += "The green light is [src.shocked ? "off" : "on"].<BR>"
dat += "The blue light is [src.hacked ? "off" : "on"].<BR>"
user << browse("<HTML><HEAD><TITLE>[src.name] Hacking</TITLE></HEAD><BODY>[dat.Join("")]</BODY></HTML>","window=hack_win")
return