Merge pull request #3474 from VOREStation/vplk-sundry-runtimes

Sundry Runtime Fixes
This commit is contained in:
Neerti
2017-05-28 17:44:04 -04:00
committed by GitHub
3 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -206,7 +206,7 @@
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if (W.force >= src.toughness)
user.do_attack_animation(src)
visible_message("<span class='warning'><b>[src] has been [pick(W.attack_verb)] with [W] by [user]!</b></span>")
visible_message("<span class='warning'><b>[src] has been [W.attack_verb.len? pick(W.attack_verb) : "attacked"] with [W] by [user]!</b></span>")
if (istype(W, /obj/item)) //is it even possible to get into attackby() with non-items?
var/obj/item/I = W
if (I.hitsound)
+1 -1
View File
@@ -37,7 +37,7 @@
if(istype(loc, /turf/simulated/open))
var/turf/simulated/open/O = loc
spawn(1)
if(O) // If we built a new floor with the lattice, the open turf won't exist anymore.
if(istype(O)) // If we built a new floor with the lattice, the open turf won't exist anymore.
O.update() // This lattice may be supporting things on top of it. If it's being deleted, they need to fall down.
..()
@@ -224,12 +224,14 @@
var/datum/gear/G = gear_datums[thing]
if(G)
var/permitted = 0
if(G.allowed_roles)
if(!G.allowed_roles)
permitted = 1
else if(!previewJob)
permitted = 0
else
for(var/job_name in G.allowed_roles)
if(previewJob.title == job_name)
permitted = 1
else
permitted = 1
if(G.whitelisted && (G.whitelisted != mannequin.species.name))
permitted = 0