mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
2 new traitor items: sticky tar applicator and sticky tar grenade (#25529)
* Update MechaControlConsole.js * Changes breakout time to 30, refactors ds into s * Update bot_construction.dm * Revert "Update bot_construction.dm" This reverts commitddba7627dc. * Revert "Merge branch 'master' of https://github.com/Daylight2/Paradise" This reverts commit8f1bc8c6a3, reversing changes made toddba7627dc. * 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:
@@ -461,3 +461,20 @@
|
||||
reagent_state = LIQUID
|
||||
color = "#29262b"
|
||||
taste_description = "burnt dirt"
|
||||
|
||||
/datum/reagent/tar_compound
|
||||
name = "Sticky tar"
|
||||
id = "sticky_tar"
|
||||
description = "A sticky compound that creates tar on contact with surfaces."
|
||||
reagent_state = LIQUID
|
||||
color = "#4B4B4B"
|
||||
harmless = FALSE
|
||||
taste_description = "processed sludge"
|
||||
|
||||
/datum/reagent/tar_compound/reaction_turf(turf/simulated/T, volume)
|
||||
if(volume < 1 || !issimulatedturf(T))
|
||||
return
|
||||
var/obj/effect/decal/cleanable/tar/C = locate() in T
|
||||
if(C) // We don't want the slowdown to stack
|
||||
return
|
||||
new /obj/effect/decal/cleanable/tar(T)
|
||||
|
||||
@@ -37,6 +37,10 @@
|
||||
to_chat(user, "<span class='notice'>[src] is full.</span>")
|
||||
return
|
||||
|
||||
if(!is_open_container())
|
||||
to_chat(user, "<span class='notice'>[src] cannot be refilled.</span>")
|
||||
return
|
||||
|
||||
var/trans = A.reagents.trans_to(src, 50) //This is a static amount, otherwise, it'll take forever to fill.
|
||||
to_chat(user, "<span class='notice'>You fill [src] with [trans] units of the contents of [A].</span>")
|
||||
return
|
||||
@@ -281,3 +285,18 @@
|
||||
belt_icon = null
|
||||
volume = 100
|
||||
list_reagents = list("glyphosate" = 100)
|
||||
|
||||
/// Sticky tar spray
|
||||
/obj/item/reagent_containers/spray/sticky_tar
|
||||
name = "sticky tar applicator"
|
||||
desc = "A suspicious looking spraycan filled with an extremely viscous and sticky fluid."
|
||||
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
|
||||
icon_state = "syndie_spraycan"
|
||||
item_state = "syndie_spraycan"
|
||||
container_type = AMOUNT_VISIBLE
|
||||
spray_maxrange = 2
|
||||
spray_currentrange = 2
|
||||
amount_per_transfer_from_this = 10
|
||||
list_reagents = list("sticky_tar" = 100)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user