mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Makes bear traps do damage when stepped on
This commit is contained in:
@@ -198,18 +198,26 @@
|
|||||||
if(armed)
|
if(armed)
|
||||||
if(ishuman(AM))
|
if(ishuman(AM))
|
||||||
if(isturf(src.loc))
|
if(isturf(src.loc))
|
||||||
var/mob/living/carbon/H = AM
|
var/mob/living/carbon/human/H = AM
|
||||||
if(H.m_intent == "run")
|
if(H.m_intent == "run")
|
||||||
armed = 0
|
armed = 0
|
||||||
H.legcuffed = src
|
H.legcuffed = src
|
||||||
src.loc = H
|
src.loc = H
|
||||||
H.update_inv_legcuffed()
|
H.update_inv_legcuffed()
|
||||||
H << "\red <B>You step on \the [src]!</B>"
|
H << "<span class='danger'>You step on \the [src]!</span>"
|
||||||
|
|
||||||
|
var/obj/item/organ/external/affecting = H.get_organ(pick("l_leg", "r_leg"))
|
||||||
feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
|
feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
|
||||||
for(var/mob/O in viewers(H, null))
|
for(var/mob/O in viewers(H, null))
|
||||||
if(O == H)
|
if(O == H)
|
||||||
continue
|
continue
|
||||||
O.show_message("\red <B>[H] steps on \the [src].</B>", 1)
|
O.show_message("<span class='danger'>[H] steps on \the [src].</span>", 1)
|
||||||
|
|
||||||
|
affecting.take_damage(35, 0)
|
||||||
|
H.UpdateDamageIcon()
|
||||||
|
H.updatehealth()
|
||||||
|
|
||||||
|
|
||||||
if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator))
|
if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator))
|
||||||
armed = 0
|
armed = 0
|
||||||
var/mob/living/simple_animal/SA = AM
|
var/mob/living/simple_animal/SA = AM
|
||||||
|
|||||||
36
html/changelogs/Yoshax - trapping.YML
Normal file
36
html/changelogs/Yoshax - trapping.YML
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Yoshax
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- rscadd: "Bear traps now do damage when stood on, enough to break bones!"
|
||||||
Reference in New Issue
Block a user