From bca3c683e2f68b46657ba8ba70b53ab2c8007a0f Mon Sep 17 00:00:00 2001 From: ProperPants Date: Wed, 30 Mar 2016 20:55:57 -0400 Subject: [PATCH 1/7] Cyborg versions of stacks that didn't already have them. Increased cyborg starting rods to one full stack (60 rods). --- code/game/objects/items/stacks/rods.dm | 21 ++++++++++++++-- .../objects/items/stacks/tiles/tile_types.dm | 25 ++++++++++++++++++- .../mob/living/silicon/robot/robot_modules.dm | 10 ++++---- 3 files changed, 48 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 75432a86da2..49f737a29db 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -15,6 +15,23 @@ attack_verb = list("hit", "bludgeoned", "whacked") hitsound = 'sound/weapons/grenadelaunch.ogg' +/obj/item/stack/rods/cyborg + name = "metal rod" + desc = "Some rods. Can be used for building, or something." + singular_name = "metal rod" + icon_state = "rods" + item_state = "rods" + flags = CONDUCT + w_class = 3.0 + force = 9.0 + throwforce = 10.0 + throw_speed = 3 + throw_range = 7 + materials = list() + max_amount = 60 + attack_verb = list("hit", "bludgeoned", "whacked") + hitsound = 'sound/weapons/grenadelaunch.ogg' + /obj/item/stack/rods/New(var/loc, var/amount=null) ..() @@ -41,11 +58,11 @@ if(new_item.get_amount() <= 0) // stack was moved into another one on the pile new_item = locate() in user.loc - + user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ "You shaped [src] into metal with the weldingtool.", \ "You hear welding.") - + var/replace = user.get_inactive_hand() == src use(2) if (get_amount() <= 0 && replace) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index da5d36327f0..c6af5c5beee 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -49,6 +49,14 @@ icon_state = "tile-wood" turf_type = /turf/simulated/floor/wood +/obj/item/stack/tile/wood/cyborg + name = "wood floor tiles" + gender = PLURAL + singular_name = "wood floor tile" + desc = "an easy to fit wood floor tile" + icon_state = "tile-wood" + turf_type = /turf/simulated/floor/wood + /* * Carpets */ @@ -77,6 +85,21 @@ turf_type = /turf/simulated/floor/plasteel mineralType = "metal" +/obj/item/stack/tile/plasteel/cyborg + name = "floor tiles" + gender = PLURAL + singular_name = "floor tile" + desc = "Those could work as a pretty decent throwing weapon." + icon_state = "tile" + force = 6 + materials = list(MAT_METAL=500) + throwforce = 10 + throw_speed = 3 + throw_range = 7 + flags = CONDUCT + turf_type = /turf/simulated/floor/plasteel + mineralType = "metal" + /* * Light */ @@ -124,4 +147,4 @@ origin_tech = "materials=1" turf_type = /turf/simulated/floor/silent mineralType = "tranquillite" - materials = list(MAT_TRANQUILLITE=500) \ No newline at end of file + materials = list(MAT_TRANQUILLITE=500) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 104ef75a0dc..2e69b38c18b 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -175,8 +175,8 @@ /obj/item/stack/sheet/glass/cyborg = 50, /obj/item/stack/sheet/rglass/cyborg = 50, /obj/item/stack/cable_coil/cyborg = 50, - /obj/item/stack/rods = 30, - /obj/item/stack/tile/plasteel = 20 + /obj/item/stack/rods/cyborg = 60, + /obj/item/stack/tile/plasteel/cyborg = 20 ) /obj/item/weapon/robot_module/engineering/New() @@ -462,9 +462,9 @@ stacktypes = list( /obj/item/stack/sheet/wood/cyborg = 10, /obj/item/stack/sheet/rglass/cyborg = 50, - /obj/item/stack/tile/wood = 20, - /obj/item/stack/rods = 30, - /obj/item/stack/tile/plasteel = 20, + /obj/item/stack/tile/wood/cyborg = 20, + /obj/item/stack/rods/cyborg/ = 60, + /obj/item/stack/tile/plasteel/cyborg = 20, /obj/item/stack/sheet/metal/cyborg = 50, /obj/item/stack/sheet/glass/cyborg = 50, /obj/item/stack/cable_coil/cyborg = 30 From 065f3c8a9dbff720d16892000438006796f5c7fe Mon Sep 17 00:00:00 2001 From: ProperPants Date: Wed, 30 Mar 2016 21:32:41 -0400 Subject: [PATCH 2/7] Removed the tiles because apparently they're pointless. --- code/game/objects/items/stacks/rods.dm | 12 +++++----- .../objects/items/stacks/tiles/tile_types.dm | 23 ------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 49f737a29db..c0eebb4871b 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -22,13 +22,13 @@ icon_state = "rods" item_state = "rods" flags = CONDUCT - w_class = 3.0 - force = 9.0 - throwforce = 10.0 - throw_speed = 3 - throw_range = 7 + w_class = + force = + throwforce = + throw_speed = + throw_range = materials = list() - max_amount = 60 + max_amount = attack_verb = list("hit", "bludgeoned", "whacked") hitsound = 'sound/weapons/grenadelaunch.ogg' diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index c6af5c5beee..d7fcf1bcb53 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -49,14 +49,6 @@ icon_state = "tile-wood" turf_type = /turf/simulated/floor/wood -/obj/item/stack/tile/wood/cyborg - name = "wood floor tiles" - gender = PLURAL - singular_name = "wood floor tile" - desc = "an easy to fit wood floor tile" - icon_state = "tile-wood" - turf_type = /turf/simulated/floor/wood - /* * Carpets */ @@ -85,21 +77,6 @@ turf_type = /turf/simulated/floor/plasteel mineralType = "metal" -/obj/item/stack/tile/plasteel/cyborg - name = "floor tiles" - gender = PLURAL - singular_name = "floor tile" - desc = "Those could work as a pretty decent throwing weapon." - icon_state = "tile" - force = 6 - materials = list(MAT_METAL=500) - throwforce = 10 - throw_speed = 3 - throw_range = 7 - flags = CONDUCT - turf_type = /turf/simulated/floor/plasteel - mineralType = "metal" - /* * Light */ From 2b4456c12f8c45daf021f28bf4fc1aa57e902fb7 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Wed, 30 Mar 2016 22:13:28 -0400 Subject: [PATCH 3/7] Cleaned up some cyborg stacks to take almost everything from the parent. --- code/game/objects/items/stacks/rods.dm | 14 -------------- code/game/objects/items/stacks/sheets/glass.dm | 9 --------- .../objects/items/stacks/sheets/sheet_types.dm | 11 ----------- 3 files changed, 34 deletions(-) diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index c0eebb4871b..431e74209d8 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -16,21 +16,7 @@ hitsound = 'sound/weapons/grenadelaunch.ogg' /obj/item/stack/rods/cyborg - name = "metal rod" - desc = "Some rods. Can be used for building, or something." - singular_name = "metal rod" - icon_state = "rods" - item_state = "rods" - flags = CONDUCT - w_class = - force = - throwforce = - throw_speed = - throw_range = materials = list() - max_amount = - attack_verb = list("hit", "bludgeoned", "whacked") - hitsound = 'sound/weapons/grenadelaunch.ogg' /obj/item/stack/rods/New(var/loc, var/amount=null) ..() diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index d0477eead0d..09c8b51ded9 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -24,12 +24,7 @@ var/full_window = /obj/structure/window/full/basic /obj/item/stack/sheet/glass/cyborg - name = "glass" - desc = "HOLY SHEET! That is a lot of glass." - singular_name = "glass sheet" - icon_state = "sheet-glass" materials = list() - created_window = /obj/structure/window/basic /obj/item/stack/sheet/glass/attack_self(mob/user as mob) construct_window(user) @@ -159,10 +154,6 @@ var/full_window = /obj/structure/window/full/reinforced /obj/item/stack/sheet/rglass/cyborg - name = "reinforced glass" - desc = "Glass which seems to have rods or something stuck in them." - singular_name = "reinforced glass sheet" - icon_state = "sheet-rglass" materials = list() /obj/item/stack/sheet/rglass/attack_self(mob/user as mob) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 5bc05d970fe..ada50c6b2aa 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -96,13 +96,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ origin_tech = "materials=1" /obj/item/stack/sheet/metal/cyborg - name = "metal" - desc = "Sheets made out of metal." - singular_name = "metal sheet" - icon_state = "sheet-metal" - materials = list() - throwforce = 10.0 - flags = CONDUCT /obj/item/stack/sheet/metal/New(var/loc, var/amount=null) recipes = metal_recipes @@ -162,10 +155,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ origin_tech = "materials=1;biotech=1" /obj/item/stack/sheet/wood/cyborg - name = "wooden plank" - desc = "One can only guess that this is a bunch of wood." - singular_name = "wood plank" - icon_state = "sheet-wood" /obj/item/stack/sheet/wood/New(var/loc, var/amount=null) recipes = wood_recipes From b764f188409fa8a572a6c6ca45f8eb5cfc0d2650 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Wed, 30 Mar 2016 22:16:09 -0400 Subject: [PATCH 4/7] I forgot to change the cyborg modules back to normal for the tiles. --- code/game/objects/items/stacks/sheets/sheet_types.dm | 1 + code/modules/mob/living/silicon/robot/robot_modules.dm | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index ada50c6b2aa..197a11eeb4a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -96,6 +96,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ origin_tech = "materials=1" /obj/item/stack/sheet/metal/cyborg + materials = list() /obj/item/stack/sheet/metal/New(var/loc, var/amount=null) recipes = metal_recipes diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 2e69b38c18b..194f76770e9 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -176,7 +176,7 @@ /obj/item/stack/sheet/rglass/cyborg = 50, /obj/item/stack/cable_coil/cyborg = 50, /obj/item/stack/rods/cyborg = 60, - /obj/item/stack/tile/plasteel/cyborg = 20 + /obj/item/stack/tile/plasteel = 20 ) /obj/item/weapon/robot_module/engineering/New() @@ -462,9 +462,9 @@ stacktypes = list( /obj/item/stack/sheet/wood/cyborg = 10, /obj/item/stack/sheet/rglass/cyborg = 50, - /obj/item/stack/tile/wood/cyborg = 20, - /obj/item/stack/rods/cyborg/ = 60, - /obj/item/stack/tile/plasteel/cyborg = 20, + /obj/item/stack/tile/wood = 20, + /obj/item/stack/rods/cyborg = 60, + /obj/item/stack/tile/plasteel = 20, /obj/item/stack/sheet/metal/cyborg = 50, /obj/item/stack/sheet/glass/cyborg = 50, /obj/item/stack/cable_coil/cyborg = 30 From 0f9797a7c20263283c38c9194ca54d10ab0449dc Mon Sep 17 00:00:00 2001 From: ProperPants Date: Thu, 31 Mar 2016 08:18:39 -0400 Subject: [PATCH 5/7] Cyborg wood is gone. I don't know why it was there in the first place. --- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 -- code/modules/mob/living/silicon/robot/robot_modules.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 197a11eeb4a..21680521d34 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -155,8 +155,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ icon_state = "sheet-wood" origin_tech = "materials=1;biotech=1" -/obj/item/stack/sheet/wood/cyborg - /obj/item/stack/sheet/wood/New(var/loc, var/amount=null) recipes = wood_recipes return ..() diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 194f76770e9..3a9a3fcc2c4 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -460,7 +460,7 @@ name = "drone module" module_type = "Engineer" stacktypes = list( - /obj/item/stack/sheet/wood/cyborg = 10, + /obj/item/stack/sheet/wood = 10, /obj/item/stack/sheet/rglass/cyborg = 50, /obj/item/stack/tile/wood = 20, /obj/item/stack/rods/cyborg = 60, From bd4230f469824208e0c002bc4b6ed806682805e2 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Thu, 31 Mar 2016 08:25:03 -0400 Subject: [PATCH 6/7] Cyborg wood was being used by drones. No longer. --- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- code/modules/mob/living/silicon/robot/drone/drone_items.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 6868765250b..fe6bd4c158c 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -20,7 +20,7 @@ // 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/wood/cyborg/stack_wood = null + var/obj/item/stack/sheet/wood/stack_wood = null var/obj/item/stack/sheet/glass/cyborg/stack_glass = null var/obj/item/stack/sheet/mineral/plastic/cyborg/stack_plastic = null var/obj/item/weapon/matter_decompiler/decompiler = null diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 9eaf627858b..2bd7a29f815 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -364,7 +364,7 @@ stack = stack_glass if("wood") if(!stack_wood) - stack_wood = new /obj/item/stack/sheet/wood/cyborg(src.module) + stack_wood = new /obj/item/stack/sheet/wood(src.module) stack_wood.amount = 1 stack = stack_wood if("plastic") From f91b5ee332a96a2e9c5df148afedd3f3695066b6 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Thu, 31 Mar 2016 08:31:35 -0400 Subject: [PATCH 7/7] Never make commits literally five minutes after waking up. --- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index fe6bd4c158c..d7a2a659be4 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -61,7 +61,7 @@ //Grab stacks. stack_metal = locate(/obj/item/stack/sheet/metal/cyborg) in src.module - stack_wood = locate(/obj/item/stack/sheet/wood/cyborg) in src.module + stack_wood = locate(/obj/item/stack/sheet/wood) 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