mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
New opendream pragmas (#20260)
Enabled new opendream pragmas Fixed some runtime access check operators (`:`) around the codebase (not all, some are unfixable as they're used in macros) No player facing changes (hopefully)
This commit is contained in:
@@ -206,12 +206,12 @@ steam.start() -- spawns the effect
|
||||
for(var/mob/living/carbon/M in get_turf(src))
|
||||
affect(M)
|
||||
|
||||
/obj/effect/effect/smoke/sleepy/affect(mob/living/carbon/M as mob )
|
||||
/obj/effect/effect/smoke/sleepy/affect(mob/living/carbon/M)
|
||||
if (!..())
|
||||
return 0
|
||||
|
||||
M.drop_item()
|
||||
M:sleeping += 1
|
||||
M.sleeping += 1
|
||||
if (M.coughedtime != 1)
|
||||
M.coughedtime = 1
|
||||
M.emote("cough")
|
||||
|
||||
@@ -141,7 +141,7 @@
|
||||
log_attack("[s] ([H.ckey])")
|
||||
|
||||
if(O.take_damage(3, 0, damage_flags = DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE, used_weapon = "teeth marks"))
|
||||
H:UpdateDamageIcon()
|
||||
H.UpdateDamageIcon()
|
||||
|
||||
last_chew = world.time
|
||||
|
||||
|
||||
@@ -229,7 +229,7 @@
|
||||
/obj/item/storage/box/fancy/crayons/attackby(obj/item/attacking_item, mob/user)
|
||||
if(istype(attacking_item, /obj/item/pen/crayon))
|
||||
var/obj/item/pen/crayon/W = attacking_item
|
||||
switch(W:colourName)
|
||||
switch(W.colourName)
|
||||
if("mime")
|
||||
to_chat(usr, "This crayon is too sad to be contained in this box.")
|
||||
return
|
||||
|
||||
@@ -254,7 +254,8 @@
|
||||
for(var/obj/item/gift/G in src)
|
||||
. += G.gift
|
||||
if (istype(G.gift, /obj/item/storage))
|
||||
. += G.gift:return_inv()
|
||||
var/obj/item/storage/gift_storage = G.gift
|
||||
. += gift_storage.return_inv()
|
||||
|
||||
/obj/item/storage/proc/show_to(mob/user as mob)
|
||||
if(user.s_active != src)
|
||||
|
||||
@@ -40,7 +40,8 @@
|
||||
/obj/structure/closet/secure_closet/personal/attackby(obj/item/attacking_item, mob/user)
|
||||
if (opened)
|
||||
if (istype(attacking_item, /obj/item/grab))
|
||||
mouse_drop_receive(attacking_item:affecting, user) //act like they were dragged onto the closet
|
||||
var/obj/item/grab/G = attacking_item
|
||||
mouse_drop_receive(G.affecting, user) //act like they were dragged onto the closet
|
||||
if(attacking_item)
|
||||
user.drop_from_inventory(attacking_item,loc)
|
||||
else
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
src.name = "Anchored Windoor Assembly"
|
||||
|
||||
//Adding airlock electronics for access. Step 6 complete.
|
||||
else if(istype(attacking_item, /obj/item/airlock_electronics) && attacking_item:icon_state != "door_electronics_smoked")
|
||||
else if(istype(attacking_item, /obj/item/airlock_electronics) && attacking_item.icon_state != "door_electronics_smoked")
|
||||
var/obj/item/airlock_electronics/EL = attacking_item
|
||||
if(!EL.is_installed)
|
||||
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
|
||||
|
||||
Reference in New Issue
Block a user