Merge pull request #6711 from Crazylemon64/playercreation_assembly_line

Streamlines the ghost-to-player creation process
This commit is contained in:
Fox McCloud
2017-03-09 21:30:22 -05:00
committed by GitHub
9 changed files with 542 additions and 335 deletions
@@ -23,6 +23,9 @@
var/created_window = /obj/structure/window/basic
var/full_window = /obj/structure/window/full/basic
/obj/item/stack/sheet/glass/fifty
amount = 50
/obj/item/stack/sheet/glass/cyborg
materials = list()
@@ -98,14 +98,17 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
flags = CONDUCT
origin_tech = "materials=1"
/obj/item/stack/sheet/metal/cyborg
materials = list()
/obj/item/stack/sheet/metal/fifty
amount = 50
/obj/item/stack/sheet/metal/narsie_act()
if(prob(20))
new /obj/item/stack/sheet/runed_metal(loc, amount)
qdel(src)
/obj/item/stack/sheet/metal/cyborg
materials = list()
/obj/item/stack/sheet/metal/New(var/loc, var/amount=null)
recipes = metal_recipes
return ..()
@@ -285,4 +288,4 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
w_class = 3
throw_speed = 1
throw_range = 3
origin_tech = "materials=2;biotech=2"
origin_tech = "materials=2;biotech=2"
+3
View File
@@ -378,6 +378,9 @@ RCD
explosion(src, 0, 0, 3, 1, flame_range = 1)
qdel(src)
/obj/item/weapon/rcd/preloaded
matter = 100
/obj/item/weapon/rcd/combat
name = "combat RCD"
max_matter = 500
@@ -715,6 +715,18 @@
desc = "A modified ID card given only to those people who have devoted their lives to the better interests of Nanotrasen. It sparkles blue."
icon_state = "lifetimeid"
/obj/item/weapon/card/id/ert
name = "ERT ID"
icon_state = "ERT_empty"
/obj/item/weapon/card/id/ert/commander
icon_state = "ERT_leader"
/obj/item/weapon/card/id/ert/security
icon_state = "ERT_security"
/obj/item/weapon/card/id/ert/engineering
icon_state = "ERT_engineering"
/obj/item/weapon/card/id/ert/medic
icon_state = "ERT_medical"
// Decals
/obj/item/weapon/id_decal
name = "identification card decal"