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

Minor fixes. Removes Plastic

Browse Source
This commit is contained in:
warior4356
2020-07-14 21:26:45 -07:00
parent 0911425f2b
commit b30ff7e2e9
8 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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, "<span class='warning'>You begin decompiling the other drone.</span>")
to_chat(user, "<span class='warning'>You begin decompiling the other drone.</span>")
if(!do_after(D, 50, target = src.loc))
to_chat(D, "<span class='warning'>You need to remain still while decompiling such a large object.</span>")
if(!do_after(user, 5 SECONDS, target = loc))
to_chat(user, "<span class='warning'>You need to remain still while decompiling such a large object.</span>")
return
if(!src || !D) return ..()
if(QDELETED(src) || QDELETED(user))
return ..()
to_chat(D, "<span class='warning'>You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself.</span>")
to_chat(user, "<span class='warning'>You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself.</span>")
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 ..()

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

@@ -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, "<span class='notice'>You deploy your decompiler and clear out the contents of \the [T].</span>")
@@ -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]--

7
code/modules/mob/living/simple_animal/friendly/lizard.dm
View File

@@ -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("<span class='notice'>[C.loc] sucks [src] into its decompiler. There's a horrible crunching noise.</span>","<span class='warning'>It's a bit of a struggle, but you manage to suck [src] into your decompiler. It makes a series of visceral crunching noises.</span>")
user.visible_message("<span class='notice'>[user] sucks [src] into its decompiler. There's a horrible crunching noise.</span>", \
"<span class='warning'>It's a bit of a struggle, but you manage to suck [src] into your decompiler. It makes a series of visceral crunching noises.</span>")
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 ..()

7
code/modules/mob/living/simple_animal/friendly/mouse.dm
View File

@@ -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("<span class='notice'>[C.loc] sucks [src] into its decompiler. There's a horrible crunching noise.</span>","<span class='warning'>It's a bit of a struggle, but you manage to suck [src] into your decompiler. It makes a series of visceral crunching noises.</span>")
user.visible_message("<span class='notice'>[user] sucks [src] into its decompiler. There's a horrible crunching noise.</span>", \
"<span class='warning'>It's a bit of a struggle, but you manage to suck [src] into your decompiler. It makes a series of visceral crunching noises.</span>")
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 ..()