cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolves conflicts.

Browse Source
This commit is contained in:
Desolate
2018-10-11 05:36:22 -05:00
parent 4c062212ab 44ba995aa6
commit f7627d2fcb
486 changed files with 16260 additions and 10647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
+3 -3
View File
@@ -357,15 +357,15 @@
character.lastarea = get_area(loc)
// Moving wheelchair if they have one
if(character.buckled && istype(character.buckled, /obj/structure/stool/bed/chair/wheelchair))
if(character.buckled && istype(character.buckled, /obj/structure/chair/wheelchair))
character.buckled.loc = character.loc
character.buckled.dir = character.dir
ticker.mode.latespawn(character)
character = job_master.EquipRank(character, rank, 1) //equips the human
EquipCustomItems(character)
ticker.mode.latespawn(character)
if(character.mind.assigned_role == "Cyborg")
AnnounceCyborg(character, rank, join_message)
callHook("latespawn", list(character))