mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
Runtime fixes
Moved delete to trial admins because they can already mass delete and that's not particularly as helpful as regular delete (but a lot more destructive) Trialmins can now toggle adminhelp sounds without observing git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3397 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -2051,7 +2051,7 @@ It can still be worn/put on as normal.
|
||||
var/obj/item/device/pda/pda = wear_id
|
||||
var/obj/item/weapon/card/id/id = wear_id
|
||||
if (istype(pda))
|
||||
if (pda.id)
|
||||
if (pda.id && istype(pda.id, /obj/item/weapon/card/id))
|
||||
. = pda.id.assignment
|
||||
else
|
||||
. = pda.ownjob
|
||||
|
||||
@@ -467,7 +467,7 @@
|
||||
var/transfer_coefficient
|
||||
|
||||
transfer_coefficient = 1
|
||||
if(head && (head.body_parts_covered & HEAD) && (environment.temperature < head.protective_temperature))
|
||||
if(head && (head.body_parts_covered & HEAD) && (environment.temperature < head.protective_temperature) && !istype(head, /obj/item/weapon/paper))
|
||||
transfer_coefficient *= head.heat_transfer_coefficient
|
||||
if(wear_mask && (wear_mask.body_parts_covered & HEAD) && (environment.temperature < wear_mask.protective_temperature))
|
||||
transfer_coefficient *= wear_mask.heat_transfer_coefficient
|
||||
|
||||
@@ -83,6 +83,8 @@
|
||||
|
||||
|
||||
/obj/item/weapon/grab/proc/s_click(obj/screen/S as obj)
|
||||
if (!affecting)
|
||||
return
|
||||
if (assailant.next_move > world.time)
|
||||
return
|
||||
if ((!( assailant.canmove ) || assailant.lying))
|
||||
|
||||
@@ -374,6 +374,8 @@ datum/preferences
|
||||
|
||||
|
||||
proc/process_link(mob/user, list/link_tags)
|
||||
if(!usr)
|
||||
return
|
||||
if(link_tags["occ"])
|
||||
if(link_tags["cancel"])
|
||||
user << browse(null, "window=\ref[user]occupation")
|
||||
|
||||
Reference in New Issue
Block a user