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

Fixes some adminverb runtimes

Browse Source
This commit is contained in:
Heroman
2022-09-15 15:37:12 +10:00
parent 7b3ae52b1e
commit 0c9cd7a7ff
3 changed files with 11 additions and 10 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
+9 -8
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)
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) //VOREStation Removal
//If desired, add records.
@@ -550,10 +551,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
log_admin("[admin] has spawned [player_key]'s character [new_character.real_name].")
message_admins("[admin] has spawned [player_key]'s character [new_character.real_name].", 1)
feedback_add_details("admin_verb","RSPCH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
// Drop pods
if(showy == "Polite")
var/turf/T = get_turf(new_character)
@@ -1078,7 +1079,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "Drop Pod Atom"
set desc = "Spawn a new atom/movable in a drop pod where you are."
set category = "Fun"
if(!check_rights(R_SPAWN))
return
@@ -1099,7 +1100,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
chosen = tgui_input_list(usr, "Select a movable type:", "Spawn in Drop Pod", matches)
if(!chosen)
return
var/podtype = tgui_alert(src,"Destructive drop pods cause damage in a 3x3 and may break turfs. Polite drop pods lightly damage the turfs but won't break through.", "Drop Pod", list("Polite", "Destructive", "Cancel"))
if(podtype == "Cancel")
return
@@ -1120,14 +1121,14 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "Drop Pod Deploy"
set desc = "Drop an existing mob where you are in a drop pod."
set category = "Fun"
if(!check_rights(R_SPAWN))
return
var/mob/living/L = tgui_input_list(usr, "Select the mob to drop:", "Mob Picker", living_mob_list)
if(!L)
return
var/podtype = tgui_alert(src,"Destructive drop pods cause damage in a 3x3 and may break turfs. Polite drop pods lightly damage the turfs but won't break through.", "Drop Pod", list("Polite", "Destructive", "Cancel"))
if(podtype == "Cancel")
return