cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-30 16:16:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pr/784

Browse Source
This commit is contained in:
BongaTheProto
2024-05-14 19:23:36 -05:00
parent 5d35347b47 839379c08d
commit 68ff25e205
1986 changed files with 300592 additions and 259562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_sand/code/game/objects/items/borg_shapeshifter.dm
+11 -11
View File
@@ -136,7 +136,7 @@
"Clown" = image(icon = 'icons/mob/robots.dmi', icon_state = "clown"),
"Syndicate" = image(icon = 'icons/mob/robots.dmi', icon_state = "synd_sec")
))
var/module_selection = show_radial_menu(R, R , module_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
var/module_selection = show_radial_menu(R, R , module_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!module_selection)
return FALSE
@@ -145,7 +145,7 @@
var/static/list/standard_icons = sort_list(list(
"Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "robot")
))
var/borg_icon = show_radial_menu(R, R , standard_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
var/borg_icon = show_radial_menu(R, R , standard_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -171,7 +171,7 @@
wide.pixel_x = -16
med_icons[a] = wide
med_icons = sort_list(med_icons)
var/borg_icon = show_radial_menu(R, R , med_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
var/borg_icon = show_radial_menu(R, R , med_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -235,7 +235,7 @@
wide.pixel_x = -16
engi_icons[a] = wide
engi_icons = sort_list(engi_icons)
var/borg_icon = show_radial_menu(R, R , engi_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
var/borg_icon = show_radial_menu(R, R , engi_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -305,7 +305,7 @@
wide.pixel_x = -16
sec_icons[a] = wide
sec_icons = sort_list(sec_icons)
var/borg_icon = show_radial_menu(R, R , sec_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
var/borg_icon = show_radial_menu(R, R , sec_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -380,7 +380,7 @@
wide.pixel_x = -16
service_icons[a] = wide
service_icons = sort_list(service_icons)
var/borg_icon = show_radial_menu(R, R , service_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
var/borg_icon = show_radial_menu(R, R , service_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -464,7 +464,7 @@
wide.pixel_x = -16
mining_icons[a] = wide
mining_icons = sort_list(mining_icons)
var/borg_icon = show_radial_menu(R, R , mining_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
var/borg_icon = show_radial_menu(R, R , mining_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -516,7 +516,7 @@
"Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "whitespider"),
"Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakepeacebox")
))
var/borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
var/borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -540,7 +540,7 @@
var/static/list/clown_icons = sort_list(list(
"Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "clown")
))
var/borg_icon = show_radial_menu(R, R , clown_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
var/borg_icon = show_radial_menu(R, R , clown_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -555,7 +555,7 @@
"Medical" = image(icon = 'icons/mob/robots.dmi', icon_state = "synd_medical"),
"Assault" = image(icon = 'icons/mob/robots.dmi', icon_state = "synd_sec")
))
var/borg_icon = show_radial_menu(R, R , syndicatejack_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
var/borg_icon = show_radial_menu(R, R , syndicatejack_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -632,7 +632,7 @@
return
if(listeningTo)
UnregisterSignal(listeningTo, signalCache)
RegisterSignal(user, signalCache, .proc/disrupt)
RegisterSignal(user, signalCache, PROC_REF(disrupt))
listeningTo = user
/obj/item/borg_shapeshifter/proc/deactivate(mob/living/silicon/robot/user)
modular_sand/code/game/objects/items/chrono_eraser.dm
+4 -4
View File
@@ -39,7 +39,7 @@
/obj/item/chrono_eraser/item_action_slot_check(slot, mob/user, datum/action/A)
if(slot == ITEM_SLOT_BACK)
return 1
return TRUE
/obj/item/gun/energy/chrono_gun
name = "T.E.D. Projection Apparatus"
@@ -114,9 +114,9 @@
var/turf/currentpos = get_turf(src)
var/mob/living/user = loc
if((currentpos == startpos) && (field in view(CHRONO_BEAM_RANGE, currentpos)) && (user.mobility_flags & MOBILITY_STAND) && (user.stat == CONSCIOUS))
return 1
return TRUE
field_disconnect(F)
return 0
return FALSE
/obj/item/gun/energy/chrono_gun/proc/pass_mind(datum/mind/M)
if(TED)
@@ -262,7 +262,7 @@
return BULLET_ACT_HIT
/obj/structure/chrono_field/assume_air()
return 0
return FALSE
/obj/structure/chrono_field/return_air() //we always have nominal air and temperature
var/datum/gas_mixture/GM = new
modular_sand/code/game/objects/items/fleshlight.dm
+4 -3
View File
@@ -668,7 +668,7 @@
playsound(src, 'sound/machines/ping.ogg', 50, FALSE)
to_chat(user, "<span class='notice'>[P] has been linked up successfully.</span>")
update_portal()
RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/drop_out)
RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(drop_out))
else
to_chat(user, "<span class='notice'>One of these pieces has already been paired.</span>")
else
@@ -712,7 +712,7 @@
to_chat(user, span_notice("The panties are not linked to a portal fleshlight."))
else
update_portal()
RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/drop_out)
RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(drop_out))
else
update_portal()
UnregisterSignal(user, COMSIG_PARENT_QDELETING)
@@ -755,6 +755,7 @@
desc = "A small silver box with Silver Love Co embossed."
icon_state = "box"
custom_price = 15
illustration = null
// portal fleshlight box
/obj/item/storage/box/portallight/PopulateContents()
@@ -765,7 +766,7 @@
/obj/item/paper/fluff/portallight
name = "Portal Fleshlight Instructions"
info = "Thank you for purchasing the Silver Love Portal Fleshlight!<BR>\
To use, simply register your new portal fleshlight with the provided underwear to link them together. The ask your lover to wear the underwear.<BR>\
To use, simply register your new portal fleshlight with the provided underwear to link them together. Then ask your lover to wear the underwear.<BR>\
Have fun lovers,<BR>\
<BR>\
Wilhelmina Steiner."
modular_sand/code/game/objects/items/robot/robot_upgrades.dm
-32
View File
@@ -101,38 +101,6 @@
R.module.basic_modules += PD
R.module.add_module(PD, FALSE, TRUE)
/obj/item/borg/upgrade/premiumka
name = "mining cyborg premium KA"
desc = "A premium kinetic accelerator replacement for the mining module's standard kinetic accelerator."
icon_state = "cyborg_upgrade3"
require_module = TRUE
module_type = list(/obj/item/robot_module/miner)
module_flags = BORG_MODULE_MINER
/obj/item/borg/upgrade/premiumka/action(mob/living/silicon/robot/R, user = usr)
. = ..()
if(.)
for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/KA in R.module)
for(var/obj/item/borg/upgrade/modkit/M in KA.modkits)
M.uninstall(src)
R.module.remove_module(KA, TRUE)
var/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg/PKA = new /obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg(R.module)
R.module.basic_modules += PKA
R.module.add_module(PKA, FALSE, TRUE)
/obj/item/borg/upgrade/premiumka/deactivate(mob/living/silicon/robot/R, user = usr)
. = ..()
if (.)
for(var/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg/PKA in R.module)
for(var/obj/item/borg/upgrade/modkit/M in PKA.modkits)
M.uninstall(src)
R.module.remove_module(PKA, TRUE)
var/obj/item/gun/energy/kinetic_accelerator/cyborg/KA = new (R.module)
R.module.basic_modules += KA
R.module.add_module(KA, FALSE, TRUE)
/obj/item/borg/upgrade/expand/action(mob/living/silicon/robot/R, user = usr)
. = ..()
if(.)