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

Engineering borg nerf (just their decompiler ;p) (#23227)

Browse Source 
* 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:
1080pCat
2023-11-14 22:51:13 +10:00
committed by GitHub
parent f55d619fd6
commit e2ffb8a882
13 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spiders.dm
+3 -3
View File
@@ -218,9 +218,9 @@
/obj/structure/spider/spiderling/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(!isdrone(user))
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 [user] into your decompiler. It makes a series of visceral crunching noises.</span>")
C.stored_comms["wood"] += 2
C.stored_comms["glass"] += 2
"<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>")
C.stored_comms["metal"] += 2
C.stored_comms["glass"] += 1
qdel(src)
return TRUE
return ..()
code/game/objects/items/devices/flashlight.dm
+1 -1
View File
@@ -218,7 +218,7 @@
START_PROCESSING(SSobj, src)
/obj/item/flashlight/flare/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(!fuel)
if(isdrone(user) && !fuel)
C.stored_comms["metal"] += 1
C.stored_comms["glass"] += 1
qdel(src)
code/game/objects/items/trash.dm
+7 -5
View File
@@ -9,11 +9,13 @@
resistance_flags = FLAMMABLE
/obj/item/trash/decompile_act(obj/item/matter_decompiler/C, mob/user)
C.stored_comms["metal"] += 2
C.stored_comms["wood"] += 1
C.stored_comms["glass"] += 1
qdel(src)
return TRUE
if(isdrone(user))
C.stored_comms["metal"] += 2
C.stored_comms["wood"] += 1
C.stored_comms["glass"] += 1
qdel(src)
return TRUE
return ..()
/obj/item/trash/raisins
name = "4no raisins"
code/game/objects/items/weapons/cigs.dm
+10 -6
View File
@@ -54,9 +54,11 @@ LIGHTERS ARE IN LIGHTERS.DM
return ..()
/obj/item/clothing/mask/cigarette/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/clothing/mask/cigarette/attack(mob/living/M, mob/living/user, def_zone)
if(istype(M) && M.on_fire)
@@ -348,9 +350,11 @@ 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["wood"] += 1
qdel(src)
return TRUE
if(isdrone(user))
C.stored_comms["wood"] += 1
qdel(src)
return TRUE
return ..()
/obj/item/cigbutt/cigarbutt
name = "cigar butt"
code/game/objects/items/weapons/handcuffs.dm
+5 -3
View File
@@ -209,9 +209,11 @@
icon_state = "cablecuff_used"
/obj/item/restraints/handcuffs/cable/zipties/used/decompile_act(obj/item/matter_decompiler/C, mob/user)
C.stored_comms["glass"] += 1
qdel(src)
return TRUE
if(isdrone(user))
C.stored_comms["glass"] += 1
qdel(src)
return TRUE
return ..()
/obj/item/restraints/handcuffs/cable/zipties/used/attack()
return
code/game/objects/items/weapons/lighters.dm
+1 -1
View File
@@ -293,7 +293,7 @@
..()
/obj/item/match/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(burnt)
if(isdrone(user) && burnt)
C.stored_comms["wood"] += 1
qdel(src)
return TRUE
code/game/objects/items/weapons/storage/fancy.dm
+2 -2
View File
@@ -66,7 +66,7 @@
return
/obj/item/storage/fancy/donut_box/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(!length(contents))
if(isdrone(user) && !length(contents))
C.stored_comms["wood"] += 1
qdel(src)
return TRUE
@@ -229,7 +229,7 @@
. = ..()
/obj/item/storage/fancy/cigarettes/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(!length(contents))
if(isdrone(user) && !length(contents))
C.stored_comms["wood"] += 1
qdel(src)
return TRUE
code/modules/hydroponics/grown.dm
+5 -3
View File
@@ -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)
code/modules/hydroponics/grown/banana.dm
+5 -3
View File
@@ -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>")
code/modules/mob/living/simple_animal/friendly/lizard.dm
+2 -2
View File
@@ -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 ..()
code/modules/mob/living/simple_animal/friendly/mouse.dm
+2 -2
View File
@@ -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 ..()
code/modules/paperwork/paper.dm
+5 -3
View File
@@ -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"
code/modules/projectiles/ammunition.dm
+1 -1
View File
@@ -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