cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11283 from Fox-McCloud/emote-refactor

Browse Source 
Emote Refactor
This commit is contained in:
variableundefined
2019-04-23 19:44:26 +08:00
committed by GitHub
parent fb40516301 c536c55b28
commit b738f9a92f
29 changed files with 99 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implant.dm
+1 -1
View File
@@ -14,7 +14,7 @@
flags = DROPDEL
/obj/item/implant/proc/trigger(emote, mob/source)
/obj/item/implant/proc/trigger(emote, mob/source, force)
return
/obj/item/implant/proc/activate()
code/game/objects/items/weapons/implants/implant_chem.dm
+2 -2
View File
@@ -33,8 +33,8 @@
/obj/item/implant/chem/trigger(emote, mob/source)
if(emote == "deathgasp")
/obj/item/implant/chem/trigger(emote, mob/source, force)
if(force && emote == "deathgasp")
activate(reagents.total_volume)
/obj/item/implant/chem/activate(cause)
code/game/objects/items/weapons/implants/implant_explosive.dm
+4 -4
View File
@@ -20,8 +20,8 @@
"}
return dat
/obj/item/implant/explosive/trigger(emote, mob/source)
if(emote == "deathgasp")
/obj/item/implant/explosive/trigger(emote, mob/source, force)
if(force && emote == "deathgasp")
activate("death")
/obj/item/implant/explosive/activate(cause)
@@ -148,8 +148,8 @@
"}
return dat
/obj/item/implant/dust/trigger(emote, mob/source)
if(emote == "deathgasp")
/obj/item/implant/dust/trigger(emote, mob/source, force)
if(force && emote == "deathgasp")
activate("death")
/obj/item/implant/dust/activate(cause)