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

2 new traitor items: sticky tar applicator and sticky tar grenade (#25529)

Browse Source 
* Update MechaControlConsole.js

* Changes breakout time to 30, refactors ds into s

* Update bot_construction.dm

* Revert "Update bot_construction.dm"

This reverts commit ddba7627dc.

* Revert "Merge branch 'master' of https://github.com/Daylight2/Paradise"

This reverts commit 8f1bc8c6a3, reversing
changes made to ddba7627dc.

* Code works!

* Sprites, uplink, and more!

* More cleanability, sprites, grenade

* Formatting

* New tar sprites!

* forgot this

* How did this even break

* More price tweaks

* Apply suggestions from code review

* Part 2

* One last fix

* Sirryans suggestion

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>

* Part 1 of code review part 2

* Part 2 of code review part 2

* This took many hours too long.  @Daylight2 Part 3 of code review part 2

* Update code/datums/uplink_items/uplink_general.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/spray.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>

* Part 4 of code review part 2

* Forgot to take this out after testing

* Load-bearing whitespace

* Fixes runtime

* Moved, clusterbuster, bugfix

* Apply suggestion from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>

* Sirryan's Review

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>

* final final commit for real this time v3

---------

Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Daylight
2024-06-12 18:35:47 +00:00
committed by GitHub
co-authored by Ryan DGamerL
parent a1dbb9a2c4
commit 0388f953c5
12 changed files with 120 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/Cleanable/tar.dm
+43
View File
@@ -0,0 +1,43 @@
/obj/effect/decal/cleanable/tar
gender = PLURAL
name = "tar"
desc = "A sticky substance."
icon_state = "tar2"
/// The turf that the tar is sitting on
var/turf/simulated/target
/obj/effect/decal/cleanable/tar/Initialize(mapload)
. = ..()
if(issimulatedturf(loc)) // Ensure the location is a simulated turf
target = loc
target.slowdown += 10 // Apply the slowdown effect to the turf
if(prob(50))
icon_state = "tar3"
/obj/effect/decal/cleanable/tar/Destroy()
if(target)
target.slowdown -= 10
return ..()
/obj/effect/decal/cleanable/tar/Moved(atom/OldLoc, Dir, Forced)
. = ..()
target.slowdown -= 10
target = loc
target.slowdown += 10
if(!issimulatedturf(target)) // We remove slowdown in Destroy(), so we run this check after adding the slowdown.
qdel(src)
/obj/effect/decal/cleanable/tar/Crossed(atom/movable/movable_atom)
if(isliving(movable_atom))
var/mob/living/L = movable_atom
playsound(L, 'sound/effects/attackblob.ogg', 50, TRUE)
to_chat(L, "<span class='userdanger'>[src] sticks to you!</span>")
/obj/effect/decal/cleanable/tar/attackby(obj/item/welder, mob/living/user, params)
if(!welder.get_heat() || !Adjacent(user))
return
playsound(welder, 'sound/items/welder.ogg', 50, TRUE)
if(do_after(user, 3 SECONDS, FALSE, user))
if(welder.get_heat() && Adjacent(user))
user.visible_message("<span class='danger'>[user] burns away [src] with [welder]!</span>", "<span class='danger'>You burn away [src]!</span>")
qdel(src)
code/game/objects/effects/spawners/lootdrop.dm
+1
View File
@@ -168,6 +168,7 @@
/obj/item/clothing/suit/jacket/bomber/syndicate = 5,
/obj/item/clothing/suit/storage/iaa/blackjacket/armored = 2, // More armored than bomber and has pockets, so it is rarer
/obj/item/melee/knuckleduster/syndie = 2,
/obj/item/reagent_containers/spray/sticky_tar = 1,
"" = 61 // This should be a decently high number for chances where no loot will spawn
)
code/game/objects/items/weapons/grenades/chem_grenade.dm
+18
View File
@@ -592,6 +592,24 @@
beakers += B2
update_icon(UPDATE_ICON_STATE)
/obj/item/grenade/chem_grenade/tar
payload_name = "sticky tar"
desc = "For spreading sticky tar. Become the anti-janitor!"
stage = READY
/obj/item/grenade/chem_grenade/tar/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/beaker_1 = new(src)
var/obj/item/reagent_containers/glass/beaker/beaker_2 = new(src)
beaker_1.reagents.add_reagent("sticky_tar", 15)
beaker_1.reagents.add_reagent("potassium", 10)
beaker_2.reagents.add_reagent("phosphorus", 10)
beaker_2.reagents.add_reagent("sugar", 10)
beakers += beaker_1
beakers += beaker_2
update_icon(UPDATE_ICON_STATE)
#undef EMPTY
#undef WIRED
#undef READY
code/game/objects/items/weapons/grenades/clusterbuster.dm
+5
View File
@@ -232,6 +232,11 @@
desc = "For when you need to do something between everything and nothing."
payload = /obj/item/grenade/iedcasing
/obj/item/grenade/clusterbuster/tar
name = "\improper Sticky Tar Cluster Grenade"
desc = "Speed limit enforced by goop."
payload = /obj/item/grenade/chem_grenade/tar
////////////Clusterbuster of Clusterbusters////////////
//As a note: be extrodinarily careful about make the payload clusterbusters as it can quickly destroy the MC/Server