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

it compiles, that's better than it not compiling, right?

Browse Source
This commit is contained in:
Pinta
2024-03-24 06:36:59 -04:00
parent d46cf2d981
commit 63009681fa
452 changed files with 1046 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/clothing/glasses/phantomthief.dm
+1 -1
View File
@@ -35,7 +35,7 @@
return
if(slot != SLOT_GLASSES)
return
RegisterSignal(user, COMSIG_COMBAT_TOGGLED, .proc/injectadrenaline)
RegisterSignal(user, COMSIG_COMBAT_TOGGLED,PROC_REF(injectadrenaline))
/obj/item/clothing/glasses/phantomthief/syndicate/dropped(mob/user)
. = ..()
modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
+12 -12
View File
@@ -89,7 +89,7 @@
bad_snowflake.pixel_x = -16
k9_models["Alina"] = bad_snowflake
k9_models = sortList(k9_models)
var/k9_borg_icon = show_radial_menu(R, R , k9_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/k9_borg_icon = show_radial_menu(R, R , k9_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!k9_borg_icon)
return
switch(k9_borg_icon)
@@ -162,7 +162,7 @@
bad_snowflake.pixel_x = -16
medihound_models["Alina"] = bad_snowflake
medihound_models = sortList(medihound_models)
var/medihound_borg_icon = show_radial_menu(R, R , medihound_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/medihound_borg_icon = show_radial_menu(R, R , medihound_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!medihound_borg_icon)
return
switch(medihound_borg_icon)
@@ -216,7 +216,7 @@
scrubpup_models = list(
"scrubpup" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "scrubpup")
)
var/scrubpup_borg_icon = show_radial_menu(R, R , scrubpup_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/scrubpup_borg_icon = show_radial_menu(R, R , scrubpup_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!scrubpup_borg_icon)
return
switch(scrubpup_borg_icon)
@@ -317,7 +317,7 @@
"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_medical")
)
med_models = sortList(med_models)
var/medi_borg_icon = show_radial_menu(R, R , med_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/medi_borg_icon = show_radial_menu(R, R , med_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!medi_borg_icon)
return
switch(medi_borg_icon)
@@ -376,7 +376,7 @@
"BootyS" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootyjanitorS")
)
jani_models = sortList(jani_models)
var/jani_borg_icon = show_radial_menu(R, R , jani_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/jani_borg_icon = show_radial_menu(R, R , jani_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!jani_borg_icon)
return
switch(jani_borg_icon)
@@ -421,7 +421,7 @@
"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_peacekeeper")
)
peace_models = sortList(peace_models)
var/peace_borg_icon = show_radial_menu(R, R , peace_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/peace_borg_icon = show_radial_menu(R, R , peace_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!peace_borg_icon)
return
switch(peace_borg_icon)
@@ -466,7 +466,7 @@
"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_security")
)
sec_models = sortList(sec_models)
var/sec_borg_icon = show_radial_menu(R, R , sec_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/sec_borg_icon = show_radial_menu(R, R , sec_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!sec_borg_icon)
return
switch(sec_borg_icon)
@@ -528,7 +528,7 @@
"Busty" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "busty_service")
)
butler_models = sortList(butler_models)
var/butler_borg_icon = show_radial_menu(R, R , butler_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/butler_borg_icon = show_radial_menu(R, R , butler_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!butler_borg_icon)
return
switch(butler_borg_icon)
@@ -605,7 +605,7 @@
bad_snowflake.pixel_x = -16
eng_models["Alina"] = bad_snowflake*/ //removes pupdozer,engihound (this option doesn't work anyways)
eng_models = sortList(eng_models)
var/eng_borg_icon = show_radial_menu(R, R , eng_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/eng_borg_icon = show_radial_menu(R, R , eng_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!eng_borg_icon)
return
switch(eng_borg_icon)
@@ -699,7 +699,7 @@
"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_mining")
)
miner_models = sortList(miner_models)
var/miner_borg_icon = show_radial_menu(R, R , miner_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/miner_borg_icon = show_radial_menu(R, R , miner_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!miner_borg_icon)
return
switch(miner_borg_icon)
@@ -756,7 +756,7 @@
"BootyS" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootystandardS")
)
stand_models = sortList(stand_models)
var/stand_borg_icon = show_radial_menu(R, R , stand_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/stand_borg_icon = show_radial_menu(R, R , stand_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!stand_borg_icon)
return
switch(stand_borg_icon)
@@ -787,7 +787,7 @@
"BootyS" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootystandardS")
)
clown_models = sortList(clown_models)
var/clown_borg_icon = show_radial_menu(R, R , clown_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
var/clown_borg_icon = show_radial_menu(R, R , clown_models, custom_check = CALLBACK(src,PROC_REF(check_menu), R), radius = 42, require_near = TRUE, tooltips = TRUE)
if(!clown_borg_icon)
return
switch(clown_borg_icon)
modular_citadel/code/modules/reagents/objects/clothes.dm
+2 -2
View File
@@ -39,14 +39,14 @@
/obj/item/clothing/head/hattip/equipped(mob/M, slot)
. = ..()
if (slot == SLOT_HEAD)
RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
RegisterSignal(M, COMSIG_MOB_SAY,PROC_REF(handle_speech))
else
UnregisterSignal(M, COMSIG_MOB_SAY)
/obj/item/clothing/head/hattip/dropped(mob/M)
. = ..()
UnregisterSignal(M, COMSIG_MOB_SAY)
addtimer(CALLBACK(GLOBAL_PROC, .proc/root_and_toot, src, src, 200))
addtimer(CALLBACK(PROC_REF(root_and_toot), src, src, 200))
/obj/item/clothing/head/hattip/proc/root_and_toot(obj/item/clothing/head/hattip/hat)
hat.animate_atom_living()
modular_citadel/code/modules/vore/eating/belly_obj_vr.dm
+2 -2
View File
@@ -301,7 +301,7 @@
// Setup the autotransfer checks if needed
if(transferlocation != null && autotransferchance > 0)
addtimer(CALLBACK(src, /obj/belly/.proc/check_autotransfer, prey), autotransferwait)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/belly/,check_autotransfer), prey), autotransferwait)
/obj/belly/proc/check_autotransfer(var/mob/prey, var/obj/belly/target)
// Some sanity checks
@@ -310,7 +310,7 @@
transfer_contents(prey, transferlocation)
else
// Didn't transfer, so wait before retrying
addtimer(CALLBACK(src, /obj/belly/.proc/check_autotransfer, prey), autotransferwait)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/belly/,check_autotransfer), prey), autotransferwait)
//Transfers contents from one belly to another
/obj/belly/proc/transfer_contents(var/atom/movable/content, var/obj/belly/target, silent = FALSE)
modular_citadel/code/modules/vore/eating/vore_vr.dm
+1 -1
View File
@@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(vore_preferences_datums)
//Write it out
//#ifdef RUST_G
// call(RUST_G, "file_write")(json_to_file, path)
// LIBCALL(RUST_G, "file_write")(json_to_file, path)
//#else
// Fall back to using old format if we are not using rust-g
if(fexists(path))