mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 04:28:12 +01:00
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Conflicts: code/__HELPERS/maths.dm code/__HELPERS/type2type.dm code/modules/clothing/head/hardhat.dm code/modules/clothing/spacesuits/captain.dm code/modules/clothing/spacesuits/miscellaneous.dm code/modules/clothing/spacesuits/rig/rig_pieces.dm code/modules/clothing/spacesuits/rig/suits/light.dm code/modules/clothing/spacesuits/spacesuits.dm code/modules/clothing/suits/armor.dm code/modules/clothing/suits/utility.dm code/modules/events/event_manager.dm code/modules/mob/living/living.dm code/setup.dm
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
return
|
||||
if((!in_range(src, usr) && src.loc != user))
|
||||
return
|
||||
t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
|
||||
t = sanitize(copytext(t,1,MAX_MESSAGE_LEN))
|
||||
if(t)
|
||||
src.name = text("Glass Case - '[]'", t)
|
||||
else
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
if (source.handcuffed)
|
||||
var/obj/item/weapon/W = source.handcuffed
|
||||
source.handcuffed = null
|
||||
if(source.buckled && source.buckled.buckle_require_restraints)
|
||||
source.buckled.unbuckle_mob()
|
||||
source.update_inv_handcuffed()
|
||||
if (source.client)
|
||||
source.client.screen -= W
|
||||
|
||||
Reference in New Issue
Block a user