From b30ff7e2e967b0ffb25caec9983a017ad8656d7c Mon Sep 17 00:00:00 2001 From: warior4356 Date: Tue, 14 Jul 2020 21:26:45 -0700 Subject: [PATCH] Minor fixes. Removes Plastic --- code/game/objects/effects/decals/remains.dm | 5 ++--- code/game/objects/effects/spiders.dm | 7 ++++--- code/game/objects/items/trash.dm | 5 +++-- code/game/objects/items/weapons/cigs.dm | 2 +- .../mob/living/silicon/robot/drone/drone.dm | 15 +++++++-------- .../mob/living/silicon/robot/drone/drone_items.dm | 15 ++++----------- .../mob/living/simple_animal/friendly/lizard.dm | 7 ++++--- .../mob/living/simple_animal/friendly/mouse.dm | 7 ++++--- 8 files changed, 29 insertions(+), 34 deletions(-) diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index 9747630fff1..e750c15e761 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -29,9 +29,8 @@ anchored = TRUE /obj/effect/decal/remains/robot/decompile_act(obj/item/matter_decompiler/C, mob/user) - C.stored_comms["glass"] += 1 - C.stored_comms["metal"] += 2 - C.stored_comms["plastic"] += 2 + C.stored_comms["glass"] += 2 + C.stored_comms["metal"] += 3 qdel(src) return TRUE diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 54560d817eb..9dd1c771b17 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -192,10 +192,11 @@ /obj/structure/spider/spiderling/decompile_act(obj/item/matter_decompiler/C, mob/user) if(!istype(user, /mob/living/silicon/robot/drone)) - C.loc.visible_message("[C.loc] sucks [src] into its decompiler. There's a horrible crunching noise.","It's a bit of a struggle, but you manage to suck [src] into your decompiler. It makes a series of visceral crunching noises.") - qdel(src) + user.visible_message("[user] sucks [src] into its decompiler. There's a horrible crunching noise.", \ + "It's a bit of a struggle, but you manage to suck [user] into your decompiler. It makes a series of visceral crunching noises.") C.stored_comms["wood"] += 2 - C.stored_comms["plastic"] += 2 + C.stored_comms["glass"] += 2 + qdel(src) return TRUE return ..() diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index bbb8ebd55b8..8508c741524 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -9,8 +9,9 @@ resistance_flags = FLAMMABLE /obj/item/trash/decompile_act(obj/item/matter_decompiler/C, mob/user) - C.stored_comms["metal"] += 1 - C.stored_comms["plastic"] += 2 + C.stored_comms["metal"] += 2 + C.stored_comms["wood"] += 1 + C.stored_comms["glass"] += 1 qdel(src) return TRUE diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 73e6a93ffc9..30ad91beffa 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -312,7 +312,7 @@ LIGHTERS ARE IN LIGHTERS.DM transform = turn(transform,rand(0,360)) /obj/item/cigbutt/decompile_act(obj/item/matter_decompiler/C, mob/user) - C.stored_comms["plastic"] += 1 + C.stored_comms["wood"] += 1 qdel(src) return TRUE diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 383dee9057a..295fa15a672 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -357,24 +357,23 @@ /mob/living/silicon/robot/drone/decompile_act(obj/item/matter_decompiler/C, mob/user) if(!client && istype(user, /mob/living/silicon/robot/drone)) - var/mob/living/silicon/robot/drone/D = C.loc - to_chat(D, "You begin decompiling the other drone.") + to_chat(user, "You begin decompiling the other drone.") - if(!do_after(D, 50, target = src.loc)) - to_chat(D, "You need to remain still while decompiling such a large object.") + if(!do_after(user, 5 SECONDS, target = loc)) + to_chat(user, "You need to remain still while decompiling such a large object.") return - if(!src || !D) return ..() + if(QDELETED(src) || QDELETED(user)) + return ..() - to_chat(D, "You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself.") + to_chat(user, "You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself.") new/obj/effect/decal/cleanable/blood/oil(get_turf(src)) - qdel(src) C.stored_comms["metal"] += 15 C.stored_comms["glass"] += 15 C.stored_comms["wood"] += 5 - C.stored_comms["plastic"] += 5 + qdel(src) return TRUE return ..() 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 7ac12c0a3e4..a0582c135e4 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -151,8 +151,7 @@ var/list/stored_comms = list( "metal" = 0, "glass" = 0, - "wood" = 0, - "plastic" = 0 + "wood" = 0 ) /obj/item/matter_decompiler/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) @@ -167,11 +166,11 @@ return //Used to give the right message. - var/grabbed_something = 0 + var/grabbed_something = FALSE for(var/atom/movable/A in T) - if(A.decompile_act(src, usr)) // Each decompileable mob or obj needs to have this defined - grabbed_something = 1 + if(A.decompile_act(src, user)) // Each decompileable mob or obj needs to have this defined + grabbed_something = TRUE if(grabbed_something) to_chat(user, "You deploy your decompiler and clear out the contents of \the [T].") @@ -262,11 +261,5 @@ stack_wood = new /obj/item/stack/sheet/wood(src.module) stack_wood.amount = 1 stack = stack_wood - if("plastic") - if(!stack_plastic) - stack_plastic = new /obj/item/stack/sheet/plastic(src.module) - stack_plastic.amount = 1 - stack = stack_plastic - stack.amount++ decompiler.stored_comms[type]-- diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index b8c3ac607fd..566791786f6 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -26,10 +26,11 @@ /mob/living/simple_animal/lizard/decompile_act(obj/item/matter_decompiler/C, mob/user) if(!istype(user, /mob/living/silicon/robot/drone)) - C.loc.visible_message("[C.loc] sucks [src] into its decompiler. There's a horrible crunching noise.","It's a bit of a struggle, but you manage to suck [src] into your decompiler. It makes a series of visceral crunching noises.") + user.visible_message("[user] sucks [src] into its decompiler. There's a horrible crunching noise.", \ + "It's a bit of a struggle, but you manage to suck [src] into your decompiler. It makes a series of visceral crunching noises.") new/obj/effect/decal/cleanable/blood/splatter(get_turf(src)) - qdel(src) C.stored_comms["wood"] += 2 - C.stored_comms["plastic"] += 2 + C.stored_comms["glass"] += 2 + qdel(src) return TRUE return ..() diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index fd91278761f..152e2494132 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -237,10 +237,11 @@ /mob/living/simple_animal/mouse/decompile_act(obj/item/matter_decompiler/C, mob/user) if(!(istype(user, /mob/living/silicon/robot/drone))) - C.loc.visible_message("[C.loc] sucks [src] into its decompiler. There's a horrible crunching noise.","It's a bit of a struggle, but you manage to suck [src] into your decompiler. It makes a series of visceral crunching noises.") + user.visible_message("[user] sucks [src] into its decompiler. There's a horrible crunching noise.", \ + "It's a bit of a struggle, but you manage to suck [src] into your decompiler. It makes a series of visceral crunching noises.") new/obj/effect/decal/cleanable/blood/splatter(get_turf(src)) - qdel(src) C.stored_comms["wood"] += 2 - C.stored_comms["plastic"] += 2 + C.stored_comms["glass"] += 2 + qdel(src) return TRUE return ..()