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

This should add magboots and plasteel to maintenance drones. This should also add plasteel to engineers, and make synthetics capable of using plasteel.

Browse Source
This commit is contained in:
ProperPants
2016-03-27 21:26:45 -04:00
parent b40a6d2573
commit f79d33d47b
4 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/silicon/robot/drone/drone.dm
View File

@@ -15,10 +15,12 @@
req_access = list(access_engine, access_robotics)
local_transmit = 1
ventcrawler = 2
magpulse = 1
// We need to keep track of a few module items so we don't need to do list operations
// every time we need them. These get set in New() after the module is chosen.
var/obj/item/stack/sheet/metal/cyborg/stack_metal = null
var/obj/item/stack/sheet/plasteel/cyborg/stack_plasteel = null //does stack_plasteel work here?
var/obj/item/stack/sheet/wood/cyborg/stack_wood = null
var/obj/item/stack/sheet/glass/cyborg/stack_glass = null
var/obj/item/stack/sheet/mineral/plastic/cyborg/stack_plastic = null
@@ -60,6 +62,7 @@
//Grab stacks.
stack_metal = locate(/obj/item/stack/sheet/metal/cyborg) in src.module
stack_plasteel = locate(/obj/item/stack/sheet/plasteel/cyborg) in src.module
stack_wood = locate(/obj/item/stack/sheet/wood/cyborg) in src.module
stack_glass = locate(/obj/item/stack/sheet/glass/cyborg) in src.module
stack_plastic = locate(/obj/item/stack/sheet/mineral/plastic/cyborg) in src.module

13
code/modules/mob/living/silicon/robot/drone/drone_items.dm
View File

@@ -157,9 +157,10 @@
icon = 'icons/obj/device.dmi'
icon_state = "decompiler"
//Metal, glass, wood, plastic.
//Metal, plasteel, glass, wood, plastic.
var/list/stored_comms = list(
"metal" = 0,
"plasteel" = 0,
"glass" = 0,
"wood" = 0,
"plastic" = 0
@@ -212,6 +213,7 @@
new/obj/effect/decal/cleanable/blood/oil(get_turf(src))
stored_comms["metal"] += 15
stored_comms["plasteel"] += 15
stored_comms["glass"] += 15
stored_comms["wood"] += 5
stored_comms["plastic"] += 5
@@ -242,6 +244,7 @@
stored_comms["plastic"]++
stored_comms["plastic"]++
stored_comms["glass"]++
stored_comms["plasteel"]++
else if(istype(W,/obj/item/trash))
stored_comms["metal"]++
stored_comms["plastic"]++
@@ -251,6 +254,7 @@
stored_comms["metal"]++
stored_comms["glass"]++
stored_comms["glass"]++
stored_comms["plasteel"]++
else if(istype(W,/obj/item/ammo_casing))
stored_comms["metal"]++
else if(istype(W,/obj/item/weapon/shard/shrapnel))
@@ -357,6 +361,11 @@
stack_metal = new /obj/item/stack/sheet/metal/cyborg(src.module)
stack_metal.amount = 1
stack = stack_metal
if("plasteel")
if(!stack_plasteel)
stack_plasteel = new /obj/item/stack/sheet/plasteel/cyborg(src.module)
stack_plasteel.amount = 1
stack = stack_plasteel
if("glass")
if(!stack_glass)
stack_glass = new /obj/item/stack/sheet/glass/cyborg(src.module)
@@ -374,4 +383,4 @@
stack = stack_plastic
stack.amount++
decompiler.stored_comms[type]--;
decompiler.stored_comms[type]--;

53
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -172,11 +172,12 @@
stacktypes = list(
/obj/item/stack/sheet/metal = 50,
/obj/item/stack/sheet/plasteel = 50,
/obj/item/stack/sheet/glass = 50,
/obj/item/stack/sheet/rglass = 50,
/obj/item/stack/cable_coil/cyborg = 50,
/obj/item/stack/rods = 15,
/obj/item/stack/tile/plasteel = 15
/obj/item/stack/cable_coil/cyborg = 30,
/obj/item/stack/rods = 30,
/obj/item/stack/tile/plasteel = 20
)
/obj/item/weapon/robot_module/engineering/New()
@@ -198,29 +199,10 @@
src.emag = new /obj/item/borg/stun(src)
var/obj/item/stack/sheet/metal/cyborg/M = new /obj/item/stack/sheet/metal/cyborg(src)
M.amount = 50
src.modules += M
var/obj/item/stack/sheet/rglass/cyborg/R = new /obj/item/stack/sheet/rglass/cyborg(src)
R.amount = 50
src.modules += R
var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src)
G.amount = 50
src.modules += G
var/obj/item/stack/cable_coil/cyborg/W = new /obj/item/stack/cable_coil/cyborg(src)
W.amount = 50
src.modules += W
var/obj/item/stack/rods/Q = new /obj/item/stack/rods(src)
Q.amount = 15
src.modules += Q
var/obj/item/stack/tile/plasteel/F = new /obj/item/stack/tile/plasteel(src) //floor tiles not regular plasteel, calm down
F.amount = 15
src.modules += F
for(var/G in stacktypes) //Attempt to unify Engi-Borg material stacks into fewer lines. See Line 492 for example. Variables changed out of paranoia.
var/obj/item/stack/sheet/M = new G(src)
M.amount = stacktypes[G]
src.modules += M
fix_modules()
@@ -479,14 +461,15 @@
name = "drone module"
module_type = "Engineer"
stacktypes = list(
/obj/item/stack/sheet/wood = 1,
/obj/item/stack/sheet/mineral/plastic = 1,
/obj/item/stack/sheet/rglass = 5,
/obj/item/stack/tile/wood = 5,
/obj/item/stack/rods = 15,
/obj/item/stack/tile/plasteel = 15,
/obj/item/stack/sheet/metal = 20,
/obj/item/stack/sheet/glass = 20,
/obj/item/stack/sheet/wood = 10,
/obj/item/stack/sheet/mineral/plastic = 10,
/obj/item/stack/sheet/rglass = 50,
/obj/item/stack/tile/wood = 20,
/obj/item/stack/rods = 30,
/obj/item/stack/tile/plasteel = 20,
/obj/item/stack/sheet/metal = 50,
/obj/item/stack/sheet/plasteel = 50,
/obj/item/stack/sheet/glass = 50,
/obj/item/stack/cable_coil/cyborg = 30
)
@@ -531,4 +514,4 @@
var/mob/living/silicon/robot/R = src.loc
return (src in R.module.modules)
return (src in R.module.modules)