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

Removes plasteel from drones and borgs.

Browse Source
This commit is contained in:
ProperPants
2016-03-28 21:32:46 -04:00
parent 0d9fc37065
commit b5c073e58b
5 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/drone/drone.dm
-2
View File
@@ -20,7 +20,6 @@
// 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
@@ -62,7 +61,6 @@
//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
code/modules/mob/living/silicon/robot/drone/drone_items.dm
+1 -9
View File
@@ -157,7 +157,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "decompiler"
//Metal, plasteel, glass, wood, plastic.
//Metal, glass, wood, plastic.
var/list/stored_comms = list(
"metal" = 0,
"plasteel" = 0,
@@ -213,7 +213,6 @@
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
@@ -244,7 +243,6 @@
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"]++
@@ -254,7 +252,6 @@
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))
@@ -361,11 +358,6 @@
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)
code/modules/mob/living/silicon/robot/robot_modules.dm
-3
View File
@@ -172,7 +172,6 @@
stacktypes = list(
/obj/item/stack/sheet/metal = 50,
/obj/item/stack/sheet/plasteel/cyborg = 50,
/obj/item/stack/sheet/glass = 50,
/obj/item/stack/sheet/rglass = 50,
/obj/item/stack/cable_coil/cyborg = 50,
@@ -462,13 +461,11 @@
module_type = "Engineer"
stacktypes = list(
/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/cyborg = 50,
/obj/item/stack/sheet/glass = 50,
/obj/item/stack/cable_coil/cyborg = 30
)