mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 20:47:43 +01:00
Replaces most of the gender macros. (#4681)
* Fixes #4632. * 1:27 am coding best coding * fixes a warning * Removes the last of the gender macros. Gender is dead. * gender II: the travis-ing * linebreaks are dead too. * oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
This commit is contained in:
@@ -19,7 +19,8 @@
|
||||
to_chat(user, "<span class = 'danger'>The spike already has something on it, finish collecting its meat first!</span>")
|
||||
else
|
||||
if(spike(G.affecting))
|
||||
visible_message("<span class = 'danger'>[user] has forced [G.affecting] onto the spike, killing \him instantly!</span>")
|
||||
var/datum/gender/T = gender_datums[G.affecting.get_visible_gender()]
|
||||
visible_message("<span class = 'danger'>[user] has forced [G.affecting] onto the spike, killing [T.him] instantly!</span>")
|
||||
var/mob/M = G.affecting
|
||||
M.forceMove(src)
|
||||
qdel(G)
|
||||
|
||||
@@ -411,9 +411,10 @@
|
||||
R.cell.charge -= 20
|
||||
else
|
||||
B.deductcharge(B.hitcost)
|
||||
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
|
||||
user.visible_message( \
|
||||
"<span class='danger'>[user] was stunned by \his wet [O]!</span>", \
|
||||
"<span class='userdanger'>[user] was stunned by \his wet [O]!</span>")
|
||||
"<span class='danger'>[user] was stunned by [TU.his] wet [O]!</span>", \
|
||||
"<span class='userdanger'>[user] was stunned by [TU.his] wet [O]!</span>")
|
||||
return 1
|
||||
else if(istype(O, /obj/item/weapon/mop))
|
||||
O.reagents.add_reagent("water", 5)
|
||||
|
||||
Reference in New Issue
Block a user