cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 20:14:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into replicators

Browse Source
This commit is contained in:
SatinIsle
2024-09-27 11:39:35 +01:00
parent 21bf516fc0 5070bbd9df
commit a71620516b
106 changed files with 7881 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/body_snatcher_vr.dm
+6
View File
@@ -29,6 +29,12 @@
to_chat(usr,"<span class='danger'>The target's mind is too complex to be affected!</span>")
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.resleeve_lock && usr.ckey != H.resleeve_lock)
to_chat(src, span_danger("[H] cannot be impersonated!"))
return
if(M.stat == DEAD) //Are they dead?
to_chat(usr,"<span class='warning'>A warning pops up on the device, informing you that [M] is dead, and, as such, the mind transfer can not be done.</span>")
return
code/game/objects/items/weapons/id cards/station_ids.dm
+4 -1
View File
@@ -74,7 +74,10 @@
/mob/living/carbon/human/set_id_info(var/obj/item/weapon/card/id/id_card)
..()
id_card.age = age
id_card.species = "[custom_species ? "[custom_species] ([species.name])" : species.name]"
if(species.name == SPECIES_HANNER)
id_card.species = "[custom_species ? "[custom_species]" : species.name]"
else
id_card.species = "[custom_species ? "[custom_species] ([species.name])" : species.name]"
id_card.sex = capitalize(name_gender())
/obj/item/weapon/card/id/tgui_data(mob/user)