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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace

Browse Source 
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
This commit is contained in:
Markolie
2017-04-14 18:15:12 +02:00
parent 2d1c04c112 e9156ef71b
commit d9653c79f5
280 changed files with 2179 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_designs.dm
+8
View File
@@ -608,6 +608,14 @@
build_path = /obj/item/weapon/rcd
category = list("hacked", "Construction")
/datum/design/rcl
name = "Rapid Cable Layer"
id = "rcl"
build_type = AUTOLATHE
materials = list(MAT_METAL = 5000)
build_path = /obj/item/weapon/twohanded/rcl
category = list("hacked", "Construction")
/datum/design/electropack
name = "Electropack"
id = "electropack"
code/modules/research/designs/equipment_designs.dm
+2 -2
View File
@@ -190,7 +190,7 @@
materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 200)
build_path = /obj/item/clothing/glasses/hud/hydroponic/night
category = list("Equipment")
/datum/design/handdrill
name = "Hand Drill"
desc = "A small electric hand drill with an interchangable screwdriver and bolt bit"
@@ -210,7 +210,7 @@
build_type = PROTOLATHE
materials = list(MAT_METAL = 4500, MAT_SILVER = 2500, MAT_DIAMOND = 1000)
category = list("Equipment")
/datum/design/alienwrench
name = "Alien Wrench"
desc = "An advanced wrench obtained through Abductor technology."
code/modules/research/designs/mecha_designs.dm
+15 -15
View File
@@ -167,32 +167,32 @@
build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting
category = list("Exosuit Modules")
/datum/design/recitence_main
name = "Exosuit Module (\"Recitence\" Central Control module)"
desc = "Allows for the construction of a \"Recitence\" Central Control module."
id = "recitence_main"
/datum/design/reticence_main
name = "Exosuit Module (\"Reticence\" Central Control module)"
desc = "Allows for the construction of a \"Reticence\" Central Control module."
id = "reticence_main"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/recitence/main
build_path = /obj/item/weapon/circuitboard/mecha/reticence/main
category = list("Exosuit Modules")
/datum/design/recitence_peri
name = "Exosuit Module (\"Recitence\" Peripherals Control module)"
desc = "Allows for the construction of a \"Recitence\" Peripheral Control module."
id = "recitence_peri"
/datum/design/reticence_peri
name = "Exosuit Module (\"Reticence\" Peripherals Control module)"
desc = "Allows for the construction of a \"Reticence\" Peripheral Control module."
id = "reticence_peri"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/recitence/peripherals
build_path = /obj/item/weapon/circuitboard/mecha/reticence/peripherals
category = list("Exosuit Modules")
/datum/design/recitence_targ
name = "Exosuit Module (\"Recitence\" Weapons & Targeting Control module)"
desc = "Allows for the construction of a \"Recitence\" Weapons & Targeting Control module."
id = "recitence_targ"
/datum/design/reticence_targ
name = "Exosuit Module (\"Reticence\" Weapons & Targeting Control module)"
desc = "Allows for the construction of a \"Reticence\" Weapons & Targeting Control module."
id = "reticence_targ"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/recitence/targeting
build_path = /obj/item/weapon/circuitboard/mecha/reticence/targeting
category = list("Exosuit Modules")
code/modules/research/designs/mechfabricator_designs.dm
+36 -36
View File
@@ -459,69 +459,69 @@
construction_time = 200
category = list("H.O.N.K")
//Recitence
/datum/design/recitence_chassis
name = "Exosuit Chassis (\"Recitence\")"
id = "recitence_chassis"
//Reticence
/datum/design/reticence_chassis
name = "Exosuit Chassis (\"Reticence\")"
id = "reticence_chassis"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/recitence
build_path = /obj/item/mecha_parts/chassis/reticence
materials = list(MAT_METAL=20000)
construction_time = 100
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_torso
name = "Exosuit Torso (\"Recitence\")"
id = "recitence_torso"
/datum/design/reticence_torso
name = "Exosuit Torso (\"Reticence\")"
id = "reticence_torso"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_torso
build_path = /obj/item/mecha_parts/part/reticence_torso
materials = list(MAT_METAL=20000,MAT_GLASS=10000,MAT_TRANQUILLITE=10000)
construction_time = 300
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_head
name = "Exosuit Head (\"Recitence\")"
id = "recitence_head"
/datum/design/reticence_head
name = "Exosuit Head (\"Reticence\")"
id = "reticence_head"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_head
build_path = /obj/item/mecha_parts/part/reticence_head
materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_left_arm
name = "Exosuit Left Arm (\"Recitence\")"
id = "recitence_left_arm"
/datum/design/reticence_left_arm
name = "Exosuit Left Arm (\"Reticence\")"
id = "reticence_left_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_left_arm
build_path = /obj/item/mecha_parts/part/reticence_left_arm
materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_right_arm
name = "Exosuit Right Arm (\"Recitence\")"
id = "recitence_right_arm"
/datum/design/reticence_right_arm
name = "Exosuit Right Arm (\"Reticence\")"
id = "reticence_right_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_right_arm
build_path = /obj/item/mecha_parts/part/reticence_right_arm
materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_left_leg
name = "Exosuit Left Leg (\"Recitence\")"
id = "recitence_left_leg"
/datum/design/reticence_left_leg
name = "Exosuit Left Leg (\"Reticence\")"
id = "reticence_left_leg"
build_type = MECHFAB
build_path =/obj/item/mecha_parts/part/recitence_left_leg
build_path =/obj/item/mecha_parts/part/reticence_left_leg
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_right_leg
name = "Exosuit Right Leg (\"Recitence\")"
id = "recitence_right_leg"
/datum/design/reticence_right_leg
name = "Exosuit Right Leg (\"Reticence\")"
id = "reticence_right_leg"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_right_leg
build_path = /obj/item/mecha_parts/part/reticence_right_leg
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
category = list("Reticence")
//Phazon
/datum/design/phazon_chassis
code/modules/research/protolathe.dm
+1 -2
View File
@@ -62,8 +62,7 @@ Note: Must be placed west/left of and R&D console to function.
reagents.my_atom = src
/obj/machinery/r_n_d/protolathe/Destroy()
qdel(materials)
materials = null
QDEL_NULL(materials)
return ..()
/obj/machinery/r_n_d/protolathe/RefreshParts()
code/modules/research/xenobiology/xenobio_camera.dm
+5 -5
View File
@@ -77,11 +77,11 @@
else if(istype(O, /obj/item/weapon/storage/bag))
var/obj/item/weapon/storage/P = O
var/loaded = 0
for(var/obj/G in P.contents)
if(istype(G, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
loaded = 1
monkeys++
qdel(G)
for(var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/MC in P.contents)
loaded = 1
monkeys++
P.remove_from_storage(MC)
qdel(MC)
if(loaded)
to_chat(user, "<span class='notice'>You fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.</span>")
return