cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-06-22 19:42:55 -04:00
committed by GitHub
parent c1187d1942
commit d8d0af1e83
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/admin/admin_verbs.dm
View File

@@ -64,11 +64,9 @@
else else
//ghostize //ghostize
var/mob/body = mob var/mob/body = mob
<<<<<<< HEAD
var/mob/observer/dead/ghost = body.ghostize(1) var/mob/observer/dead/ghost = body.ghostize(1)
ghost.admin_ghosted = 1 ghost.admin_ghosted = 1
log_and_message_admins("[key_name(src)] admin-ghosted.") // CHOMPEdit - Add logging. log_and_message_admins("[key_name(src)] admin-ghosted.") // CHOMPEdit - Add logging.
=======
var/mob/observer/dead/ghost var/mob/observer/dead/ghost
if(build_mode) if(build_mode)
togglebuildmode(body) togglebuildmode(body)
@@ -79,7 +77,6 @@
else else
ghost = body.ghostize(1) ghost = body.ghostize(1)
ghost.admin_ghosted = 1 ghost.admin_ghosted = 1
>>>>>>> 2c7c9c3fec... Merge pull request #13094 from ItsSelis/rcon-fix
if(body) if(body)
body.teleop = ghost body.teleop = ghost
if(!body.key) if(!body.key)