mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-20 10:37:17 +01:00
Engineering borg nerf (just their decompiler ;p) (#23227)
* Engi borg nerf * Update code/game/objects/items/devices/flashlight.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/fancy.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/fancy.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/food_and_drinks/drinks/drinks/bottle.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/friendly/lizard.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/projectiles/ammunition.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/reagents/reagent_containers/chemical_bottle.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update lighters.dm * Update spiders.dm * reverts some that maybe should stay * oops --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
@@ -173,9 +173,11 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/grown/decompile_act(obj/item/matter_decompiler/C, mob/user)
|
||||
C.stored_comms["wood"] += 4
|
||||
qdel(src)
|
||||
return TRUE
|
||||
if(isdrone(user))
|
||||
C.stored_comms["wood"] += 4
|
||||
qdel(src)
|
||||
return TRUE
|
||||
return ..()
|
||||
|
||||
// For item-containing growns such as eggy or gatfruit
|
||||
/obj/item/reagent_containers/food/snacks/grown/shell/attack_self(mob/user)
|
||||
|
||||
@@ -58,9 +58,11 @@
|
||||
icon_state = "[icon_state]_[rand(1, 3)]"
|
||||
|
||||
/obj/item/grown/bananapeel/decompile_act(obj/item/matter_decompiler/C, mob/user)
|
||||
C.stored_comms["wood"] += 1
|
||||
qdel(src)
|
||||
return TRUE
|
||||
if(isdrone(user))
|
||||
C.stored_comms["wood"] += 1
|
||||
qdel(src)
|
||||
return TRUE
|
||||
return ..()
|
||||
|
||||
/obj/item/grown/bananapeel/suicide_act(mob/user)
|
||||
user.visible_message("<span class='suicide'>[user] is deliberately slipping on [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
|
||||
|
||||
@@ -83,8 +83,8 @@
|
||||
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))
|
||||
C.stored_comms["wood"] += 2 //TODO make this stuff not wood because borgs don't have a wood module, only drones, and this doesn't work with drones - GDN
|
||||
C.stored_comms["glass"] += 2
|
||||
C.stored_comms["metal"] += 2 // having more metal than glass because blood has iron in it
|
||||
C.stored_comms["glass"] += 1
|
||||
qdel(src)
|
||||
return TRUE
|
||||
return ..()
|
||||
|
||||
@@ -212,8 +212,8 @@
|
||||
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))
|
||||
C.stored_comms["wood"] += 2
|
||||
C.stored_comms["glass"] += 2
|
||||
C.stored_comms["metal"] += 2
|
||||
C.stored_comms["glass"] += 1
|
||||
qdel(src)
|
||||
return TRUE
|
||||
return ..()
|
||||
|
||||
@@ -559,9 +559,11 @@
|
||||
icon_state = "scrap_words"
|
||||
|
||||
/obj/item/paper/crumpled/decompile_act(obj/item/matter_decompiler/C, mob/user)
|
||||
C.stored_comms["wood"] += 1
|
||||
qdel(src)
|
||||
return TRUE
|
||||
if(isdrone(user))
|
||||
C.stored_comms["wood"] += 1
|
||||
qdel(src)
|
||||
return TRUE
|
||||
return ..()
|
||||
|
||||
/obj/item/paper/crumpled/bloody
|
||||
icon_state = "scrap_bloodied"
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
|
||||
|
||||
/obj/item/ammo_casing/decompile_act(obj/item/matter_decompiler/C, mob/user)
|
||||
if(!BB)
|
||||
if(isdrone(user) && !BB)
|
||||
C.stored_comms["metal"] += 1
|
||||
qdel(src)
|
||||
return TRUE
|
||||
|
||||
Reference in New Issue
Block a user