Hotfixes for March 3, 2017 (#260)
* fixes sterile mask box * fixes admin map templates https://github.com/tgstation/tgstation/pull/24581 * syndicate beacon refactor https://github.com/tgstation/tgstation/pull/24612 * singularity tracking https://github.com/tgstation/tgstation/pull/24609 * puddle description https://github.com/tgstation/tgstation/pull/24601 * aux base landing fix https://github.com/tgstation/tgstation/pull/24594 * comms console cooldown https://github.com/tgstation/tgstation/pull/24579 * cult fixes + pronouns https://github.com/tgstation/tgstation/pull/24590 * minebots now check for pressure https://github.com/tgstation/tgstation/pull/24604 * fixes a very annoying spawn https://github.com/tgstation/tgstation/pull/24588 * fixes false positive AI cheat check https://github.com/tgstation/tgstation/pull/24558 mso is bae * Fixes abductor surgery designs https://github.com/tgstation/tgstation/pull/24593 * Allows transit space shuttle repairs https://github.com/tgstation/tgstation/pull/24582 * fixes indentation error
This commit is contained in:
@@ -62,7 +62,7 @@
|
||||
T.ratvar_act(1)
|
||||
var/dir_to_step_in = pick(cardinal)
|
||||
if(!prey)
|
||||
for(var/obj/singularity/narsie/N in poi_list)
|
||||
for(var/obj/singularity/narsie/N in singularities)
|
||||
if(N.z == z)
|
||||
prey = N
|
||||
break
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
user << "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>"
|
||||
user.Dizzy(120)
|
||||
else
|
||||
user << "<span class='cultlarge'>\"One of Ratvar's toys is trying to play with things [user.gender == FEMALE ? "s" : ""]he shouldn't. Cute.\"</span>"
|
||||
user << "<span class='cultlarge'>\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"</span>"
|
||||
user << "<span class='userdanger'>A horrible force yanks at your arm!</span>"
|
||||
user.emote("scream")
|
||||
user.apply_damage(30, BRUTE, pick("l_arm", "r_arm"))
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
/obj/structure/destructible/cult/attack_animal(mob/living/simple_animal/M)
|
||||
if(istype(M, /mob/living/simple_animal/hostile/construct/builder))
|
||||
if(obj_integrity < max_integrity)
|
||||
M.changeNext_move(CLICK_CD_MELEE)
|
||||
obj_integrity = min(max_integrity, obj_integrity + 5)
|
||||
Beam(M, icon_state="sendbeam", time=4)
|
||||
M.visible_message("<span class='danger'>[M] repairs \the <b>[src]</b>.</span>", \
|
||||
|
||||
Reference in New Issue
Block a user