mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-09 07:48:55 +00:00
some fixes
I have no idea if these works, this just allows the server to compile
This commit is contained in:
@@ -133,7 +133,6 @@
|
||||
src.avoid = avoid
|
||||
|
||||
/datum/pathfind/Destroy(force, ...)
|
||||
caller = null
|
||||
id = null
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -28,10 +28,10 @@
|
||||
if(!hook_path)
|
||||
CRASH("Invalid hook '/hook/[hook]' called.")
|
||||
|
||||
var/caller = new hook_path
|
||||
var/thingtocall = new hook_path
|
||||
var/status = 1
|
||||
for(var/P in typesof("[hook_path]/proc"))
|
||||
if(!call(caller, P)(arglist(args)))
|
||||
if(!call(thingtocall, P)(arglist(args)))
|
||||
CRASH("Hook '[P]' failed or runtimed.")
|
||||
|
||||
return status
|
||||
|
||||
@@ -46,10 +46,10 @@ The hooks you're calling should return nonzero values on success.
|
||||
if(!hook_path)
|
||||
CRASH("hook_vr: Invalid hook '/hook/[hook]' called.")
|
||||
|
||||
var/caller = new hook_path
|
||||
var/thingtocall = new hook_path
|
||||
var/status = 1
|
||||
for(var/P in typesof("[hook_path]/proc"))
|
||||
if(!call(caller, P)(arglist(args)))
|
||||
if(!call(thingtocall, P)(arglist(args)))
|
||||
stack_trace("hook_vr: Hook '[P]' failed or runtimed.")
|
||||
status = 0
|
||||
|
||||
|
||||
@@ -4,5 +4,5 @@
|
||||
|
||||
using = new /atom/movable/screen/navigate
|
||||
using.screen_loc = ui_alien_navigate_menu
|
||||
using.hud = src
|
||||
|
||||
static_inventory += using
|
||||
|
||||
@@ -4,5 +4,5 @@
|
||||
|
||||
using = new /atom/movable/screen/navigate
|
||||
using.screen_loc = ui_alien_navigate_menu
|
||||
using.hud = src
|
||||
|
||||
static_inventory += using
|
||||
|
||||
@@ -5,7 +5,7 @@ GLOBAL_LIST_INIT(splurt_ui_styles, list(
|
||||
'icons/mob/screen_slimecore.dmi' = 'modular_splurt/icons/hud/screen_slimecore.dmi',
|
||||
'icons/mob/screen_operative.dmi' = 'modular_splurt/icons/hud/screen_operative.dmi',
|
||||
'icons/mob/screen_clockwork.dmi' = 'modular_splurt/icons/hud/screen_clockwork.dmi',
|
||||
'modular_sand/icons/mob/screen_liteweb.dmi' = 'modular_splurt/icons/hud/screen_midnight.dmi'
|
||||
'modular_sand/icons/hud/screen_liteweb/base.dmi' = 'modular_splurt/icons/hud/screen_midnight.dmi'
|
||||
))
|
||||
|
||||
/proc/ui_style_splurt(ui_style)
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
using = new/atom/movable/screen/navigate
|
||||
using.icon = ui_style_splurt(ui_style)
|
||||
using.hud = src
|
||||
|
||||
static_inventory += using
|
||||
|
||||
if(owner.client?.prefs.arousable)
|
||||
using = new /atom/movable/screen/arousal(null, owner)
|
||||
using.icon_state = "arousal0"
|
||||
using.hud = src
|
||||
|
||||
infodisplay += using
|
||||
|
||||
@@ -4,9 +4,6 @@
|
||||
. = ..()
|
||||
|
||||
/atom/movable/screen/lobby/button/Click(location, control, params)
|
||||
if(owner != REF(usr)) //No idea what this even means but
|
||||
return ..()
|
||||
|
||||
var/vibe_check = SSdiscord?.check_login(usr)
|
||||
if(isnull(vibe_check))
|
||||
to_chat(usr, span_notice("The server is still starting up. Please wait... "))
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
var/require_target_legs
|
||||
var/require_target_num_legs
|
||||
|
||||
/datum/interaction/lewd/evaluate_user(mob/living/user, silent = TRUE, action_check = TRUE)
|
||||
/datum/interaction/lewd/evaluate_user(mob/living/user, silent = TRUE, apply_cooldown = TRUE)
|
||||
|
||||
var/user_require_belly_exposed = !!(required_from_user_exposed & INTERACTION_REQUIRE_BELLY)
|
||||
var/user_require_belly_unexposed = !!(required_from_user_unexposed & INTERACTION_REQUIRE_BELLY)
|
||||
|
||||
@@ -50,8 +50,7 @@
|
||||
|
||||
/obj/effect/mob_spawn/human/wandering_hermit/special(mob/living/carbon/human/new_spawn)
|
||||
ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
|
||||
new_spawn.language_holder.understood_languages += /datum/language/draconic
|
||||
new_spawn.language_holder.spoken_languages += /datum/language/draconic
|
||||
new_spawn.grant_language(/datum/language/draconic)
|
||||
|
||||
//Splurt-Specific Space Hotel Staff
|
||||
/obj/effect/mob_spawn/human/hotel_staff/splurt //not free antag u little shits
|
||||
@@ -159,5 +158,5 @@
|
||||
|
||||
/datum/outfit/ghostcafeVR/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
|
||||
H.internal = H.get_item_for_held_index(1)
|
||||
H.update_internals_hud_icon(1)
|
||||
H.update_action_buttons_icon(1)
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
burnt_states = null
|
||||
bullet_sizzle = TRUE
|
||||
bullet_bounce_sound = null
|
||||
digResult = /obj/item/stack/ore/glass/basalt
|
||||
dig_result = /obj/item/stack/ore/glass/basalt
|
||||
floor_variance = 50 //This means 50% chance of variating from the default tile.
|
||||
//light_range = 2
|
||||
//light_power = 0.15
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
var/datum/outfit/vox/O = new /datum/outfit/vox
|
||||
H.equipOutfit(O, visualsOnly)
|
||||
H.internal = H.get_item_for_held_index(2)
|
||||
H.update_internals_hud_icon(1)
|
||||
H.update_action_buttons_icon()
|
||||
return 0
|
||||
|
||||
/datum/species/vox/on_species_gain(mob/living/carbon/human/C, datum/species/old_species, pref_load)
|
||||
|
||||
Reference in New Issue
Block a user