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

readds the mind batterer, fully reworked (#21193)

Browse Source 
* readds the mind batterer, fully reworked

* Update code/datums/uplink_items/uplink_general.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* moer changes

* Update code/game/objects/items/devices/traitordevices.dm

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

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* sean review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
GDN
2023-07-17 14:57:25 +01:00
committed by GitHub
co-authored by Henri215 Luc S34N
parent 0074140d71
commit 4c1144db1d
4 changed files with 124 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/status_effects/debuffs.dm
+9
View File
@@ -223,6 +223,11 @@
/datum/status_effect/pacifism/on_remove()
REMOVE_TRAIT(owner, TRAIT_PACIFISM, id)
/datum/status_effect/pacifism/batterer
id = "pacifism_debuff_batterer"
alert_type = null
duration = 10 SECONDS
// used to track if hitting someone with a cult dagger/sword should stamina crit.
/datum/status_effect/cult_stun_mark
id = "cult_stun"
@@ -289,6 +294,10 @@
/datum/status_effect/cling_tentacle/on_remove()
REMOVE_TRAIT(owner, TRAIT_IMMOBILIZED, "[id]")
/datum/status_effect/cling_tentacle/batterer
id = "cling_tentacle_batterer"
alert_type = null
duration = 7 SECONDS
// start of `living` level status procs.
/**
code/datums/uplink_items/uplink_general.dm
+6
View File
@@ -215,6 +215,12 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/weaponcrafting/gunkit/universal_gun_kit
cost = 8
/datum/uplink_item/dangerous/batterer
name = "Mind Batterer"
desc = "A dangerous syndicate device focused on crowd control and escapes. Causes brain damage, confusion, and other nasty effects to those surrounding the user. Has 5 charges."
reference = "BTR"
item = /obj/item/batterer
cost = 5
// Ammunition