cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-21 20:27:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4938 from CHOMPStation2/upstream-merge-13738

Browse Source 
[MIRROR] Fixes some adminverb runtimes
This commit is contained in:
Nadyr
2022-09-18 21:14:10 -04:00
committed by GitHub
parent 8e50c6cfd9 e62c484dda
commit cf8ada40c1
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/buildmode.dm
+1 -1
View File
@@ -364,7 +364,7 @@
if(ispath(holder.buildmode.objholder,/turf))
var/turf/T = get_turf(object)
T.ChangeTurf(holder.buildmode.objholder)
else
else if(ispath(holder.buildmode.objholder))
var/obj/A = new holder.buildmode.objholder (get_turf(object))
A.set_dir(holder.builddir.dir)
else if(pa.Find("right"))
code/modules/admin/verbs/randomverbs.dm
+3 -2
View File
@@ -530,8 +530,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(equipment)
if(charjob)
job_master.EquipRank(new_character, charjob, 1, announce)
new_character.mind.assigned_role = charjob
new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
if(new_character.mind)
new_character.mind.assigned_role = charjob
new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
equip_custom_items(new_character) //CHOMPEdit readded to enable custom_item.txt
//If desired, add records.