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

Ports TG cursed katana to replace our cursed katana. (#18757)

Browse Source 
* Ports TG cursed katana to replace our cursed katana.

* OH, IT'S JUST A SIMPLE NUMBERS GAME!

* More changes / additions / removals

* unneeded comments

* more things

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/__HELPERS/lists.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/mining/lavaland/necropolis_chests.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* should have commited this too

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/game/gamemodes/wizard/spellbook.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* removes status, death signal, turf rename, return true

* sprites my hated

* Hal / steel requested changes

* built in

* quest 1/2

* Extra spacing / github instantly resolved status_effects and did not let me change it.

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2022-09-07 13:36:29 +01:00
committed by GitHub
co-authored by Luc Sirryan2002 Charlie
parent f47101ecf4
commit 7d9213e0c2
11 changed files with 324 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/status_effects/buffs.dm
+10 -4
View File
@@ -55,7 +55,7 @@
/datum/status_effect/shadow_mend
id = "shadow_mend"
duration = 30
duration = 3 SECONDS
alert_type = /obj/screen/alert/status_effect/shadow_mend
/obj/screen/alert/status_effect/shadow_mend
@@ -80,9 +80,11 @@
/datum/status_effect/void_price
id = "void_price"
duration = 300
tick_interval = 30
duration = 30 SECONDS
tick_interval = 3 SECONDS
status_type = STATUS_EFFECT_REFRESH
alert_type = /obj/screen/alert/status_effect/void_price
var/price = 3 //This is how much hp you lose per tick. Each time the buff is refreshed, it increased by 1. Healing too much in a short period of time will cause your swift demise
/obj/screen/alert/status_effect/void_price
name = "Void Price"
@@ -91,8 +93,12 @@
/datum/status_effect/void_price/tick()
playsound(owner, 'sound/weapons/bite.ogg', 50, 1)
owner.adjustBruteLoss(3)
owner.adjustBruteLoss(price)
/datum/status_effect/void_price/refresh()
price++
return ..()
/datum/status_effect/blooddrunk
id = "blooddrunk"
duration = 10
code/datums/status_effects/debuffs.dm
+8 -1
View File
@@ -77,6 +77,7 @@
var/delay_before_decay = 5
var/bleed_damage = 200
var/needs_to_bleed = FALSE
var/bleed_cap = 10
/datum/status_effect/saw_bleed/Destroy()
if(owner)
@@ -113,7 +114,7 @@
owner.underlays -= bleed_underlay
bleed_amount += amount
if(bleed_amount)
if(bleed_amount >= 10)
if(bleed_amount >= bleed_cap)
needs_to_bleed = TRUE
qdel(src)
else
@@ -137,6 +138,12 @@
else
new /obj/effect/temp_visual/bleed(get_turf(owner))
/datum/status_effect/saw_bleed/bloodletting
id = "bloodletting"
bleed_cap = 7
bleed_damage = 25 //Seems weak (it is) but it also works on humans and bypasses armor SOOOO
bleed_amount = 6
/datum/status_effect/stacking/ground_pound
id = "ground_pound"
tick_interval = 5 SECONDS