cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6655 from dylanstrategie/Xeno-Griff

Browse Source 
Xenomorphs can now slash atmos canisters
This commit is contained in:
clusterfack
2015-11-19 09:50:54 -06:00
parent b576f68a56 fbfd1b3dd5
commit 0539b8f07c
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/machinery/atmoalter/canister.dm
View File

@@ -171,7 +171,7 @@
playsound(get_turf(src), 'sound/effects/spray.ogg', 10, 1, -3) playsound(get_turf(src), 'sound/effects/spray.ogg', 10, 1, -3)
src.density = 0 src.density = 0
update_icon() update_icon()
investigation_log(I_ATMOS, "was destoyed by heat/gunfire.") investigation_log(I_ATMOS, "was destoyed by excessive damage.")
if (src.holding) if (src.holding)
src.holding.loc = src.loc src.holding.loc = src.loc
@@ -295,6 +295,16 @@
/obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob) /obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob)
return src.ui_interact(user) return src.ui_interact(user)
/obj/machinery/portable_atmospherics/canister/attack_alien(var/mob/living/carbon/alien/user as mob)
src.add_hiddenprint(user)
health -= rand(15, 30)
user.visible_message("<span class='danger'>\The [user] slashes away at \the [src]!</span>", \
"<span class='danger'>You slash away at \the [src]!</span>")
user.delayNextAttack(10) //Hold on there amigo
investigation_log(I_ATMOS, "<span style='danger'>was slashed at by alien [key_name(user)]</span>")
playsound(get_turf(src), 'sound/weapons/slice.ogg', 25, 1, -1)
healthcheck()
/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) /obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
if (src.destroyed || gcDestroyed || !get_turf(src)) if (src.destroyed || gcDestroyed || !get_turf(src))
if(!ui) if(!ui)

4
html/changelogs/Dylanstrategie_Aliuminium.yml Normal file
View File

@@ -0,0 +1,4 @@
author: Dylanstrategie
delete-after: True
changes:
- rscadd: Xenomorphs can now slash atmospheric canisters open