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

Revert "Garbage collection, asset delivery, icon2html revolution, and general…" (#15815)

Browse Source 
This reverts commit cc05d51b69.
This commit is contained in:
Heroman3003
2024-03-10 20:01:05 +10:00
committed by GitHub
parent 484ffed97a
commit f6d0f62622
251 changed files with 1629 additions and 2362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/modify_robot.dm
+2 -5
View File
@@ -43,17 +43,14 @@
var/list/all_modules = robot.module.modules
all_modules += robot.module.emag
while(TRUE)
var/add_item_select = tgui_input_list(usr, "Please select the module to add", "Modules", all_modules)//ChompEDIT
if(!istype(add_item_select, /obj/item/))//ChompEDIT
var/add_item = tgui_input_list(usr, "Please select the module to add", "Modules", all_modules)
if(!istype(add_item, /obj/item/))
break
var/obj/item/add_item = add_item_select//ChompEDIT
robot.module.emag.Remove(add_item)
robot.module.modules.Remove(add_item)
robot.module.contents.Remove(add_item)
target.module.modules.Add(add_item)
target.module.contents.Add(add_item)
spawn(0) //ChompEDIT Must be after to allow the movement to finish
SEND_SIGNAL(add_item, COMSIG_OBSERVER_MOVED)//ChompEDIT - report the movement since setting loc doesn't call Move or Moved
target.hud_used.update_robot_modules_display()
to_chat(usr, "<span class='danger'>You added \"[add_item]\" to [target].</span>")
if(istype(add_item, /obj/item/stack/))
code/modules/admin/verbs/pray.dm
+1 -1
View File
@@ -17,7 +17,7 @@
return
var/icon/cross = icon('icons/obj/storage.dmi',"bible")
var/msg = "<span class='filter_pray'>" + span_blue("[icon2html(cross, GLOB.admins)] <b>" + span_purple("PRAY: ") + "[key_name(src, 1)] [ADMIN_QUE(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] ([admin_jump_link(src, src)]) [ADMIN_CA(src)] [ADMIN_SC(src)] [ADMIN_SMITE(src)]:</b> [raw_msg]") + "</span>"
var/msg = "<span class='filter_pray'>" + span_blue("\icon[cross][bicon(cross)] <b>" + span_purple("PRAY: ") + "[key_name(src, 1)] [ADMIN_QUE(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] ([admin_jump_link(src, src)]) [ADMIN_CA(src)] [ADMIN_SC(src)] [ADMIN_SMITE(src)]:</b> [raw_msg]") + "</span>"
for(var/client/C in GLOB.admins)
if(R_ADMIN|R_EVENT & C.holder.rights)