mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-13 16:13:49 +01:00
VS: Strange incorrect code times
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
update_icon()
|
||||
return ..(loc)
|
||||
|
||||
/obj/effect/blob/CanPass(var/atom/movable/mover, vra/turf/target)
|
||||
/obj/effect/blob/CanPass(var/atom/movable/mover, var/turf/target)
|
||||
return FALSE
|
||||
|
||||
/obj/effect/blob/ex_act(var/severity)
|
||||
|
||||
@@ -49,7 +49,7 @@ var/global/list/all_tooltip_styles = list(
|
||||
if(!UI_style_new) return
|
||||
|
||||
var/UI_style_alpha_new = input(usr, "Select a new alpha (transparency) parameter for your UI, between 50 and 255") as null|num
|
||||
if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
|
||||
if(!UI_style_alpha_new || !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
|
||||
|
||||
var/UI_style_color_new = input(usr, "Choose your UI color. Dark colors are not recommended!") as color|null
|
||||
if(!UI_style_color_new) return
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
set src in usr
|
||||
|
||||
adjust_fibers(usr)
|
||||
..()
|
||||
|
||||
/obj/item/clothing/under/hyperfiber/proc/adjust_fibers(mob/user)
|
||||
if(hides_bulges == FALSE)
|
||||
@@ -63,7 +62,6 @@
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
bluespace_size(usr)
|
||||
..()
|
||||
|
||||
/obj/item/clothing/under/hyperfiber/bluespace/proc/bluespace_size(mob/usr as mob)
|
||||
if (!ishuman(usr))
|
||||
|
||||
@@ -10,4 +10,3 @@
|
||||
"sound" = H.species.male_scream_sound,
|
||||
"vol" = emote_volume
|
||||
)
|
||||
return ..()
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/proc/send2irc(var/channel, var/msg)
|
||||
return // VOREStation Edit - Can't exploit shell if we never call shell!
|
||||
/* Unreachable with above VOREStation Edit
|
||||
if (config.use_irc_bot)
|
||||
if (config.use_node_bot)
|
||||
shell("node bridge.js -h \"[config.irc_bot_host]\" -p \"[config.irc_bot_port]\" -c \"[channel]\" -m \"[escape_shell_arg(msg)]\"")
|
||||
@@ -22,6 +23,7 @@
|
||||
spawn(0)
|
||||
ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [escape_shell_arg(msg)]")
|
||||
return
|
||||
*/
|
||||
|
||||
/proc/send2mainirc(var/msg)
|
||||
if(config.main_irc)
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
/proc/ext_python(var/script, var/args, var/scriptsprefix = 1)
|
||||
return // VOREStation Edit - Can't exploit shell if we never call shell!
|
||||
/* Unreachable with above vorestation edit
|
||||
if(scriptsprefix)
|
||||
script = "scripts/" + script
|
||||
|
||||
@@ -25,4 +26,6 @@
|
||||
script = replacetext(script, "/", "\\")
|
||||
|
||||
var/command = config.python_path + " " + script + " " + args
|
||||
return shell(command)
|
||||
return shell(command)
|
||||
*/
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
for(var/obj/item/organ/I in H.internal_organs)
|
||||
I.removed()
|
||||
|
||||
for(var/obj/item/I in src)
|
||||
for(var/obj/item/I in H.contents)
|
||||
H.drop_from_inventory(I)
|
||||
|
||||
qdel(H)
|
||||
|
||||
@@ -481,7 +481,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
|
||||
|
||||
overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER, "pixel_y" = head_organ.head_offset)
|
||||
apply_layer(HAIR_LAYER)
|
||||
return
|
||||
//return //VOREStation Edit
|
||||
|
||||
// VOREStation Edit - START
|
||||
var/icon/hair_acc_s = get_hair_accessory_overlay()
|
||||
|
||||
@@ -55,8 +55,7 @@
|
||||
var/mob/living/silicon/ai/O = ..(move)
|
||||
if(O)
|
||||
O.flavor_text = O.client?.prefs?.flavor_texts["general"]
|
||||
|
||||
return O
|
||||
return O
|
||||
//VOREStation Edit End
|
||||
|
||||
return ..(move)
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
return TRUE
|
||||
|
||||
var/obj/effect/overmap/event/finaltarget = pick(candidates)
|
||||
log_and_message_admins("A type [chargetype] disperser beam was launched at [finaltarget].", location=finaltarget)
|
||||
log_and_message_admins("A type [chargetype] disperser beam was launched at [finaltarget].")
|
||||
|
||||
fire_at_event(finaltarget, chargetype)
|
||||
return TRUE
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
if(istype(other_batt,chambered.type) && other_batt.shots_left)
|
||||
switch_to(other_batt)
|
||||
return new chambered.projectile_type()
|
||||
break
|
||||
|
||||
return null
|
||||
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
// Irradiate everyone in telescience!
|
||||
for(var/obj/machinery/telepad/E in machines)
|
||||
var/L = get_turf(E)
|
||||
sparks(target = L)
|
||||
sparks()
|
||||
for(var/mob/living/carbon/human/M in viewers(L, null))
|
||||
M.apply_effect((rand(10, 20)), IRRADIATE, 0)
|
||||
to_chat(M, "<span class='warning'>You feel strange.</span>")
|
||||
|
||||
@@ -58,11 +58,11 @@
|
||||
target = V.restricted_waypoints[1]
|
||||
else
|
||||
to_chat(C, "<span class='warning'>Unable to jump to [V].</span>")
|
||||
return FALSE
|
||||
return
|
||||
var/turf/T = get_turf(target)
|
||||
if(!istype(T))
|
||||
to_chat(C, "<span class='warning'>Unable to jump to [V].</span>")
|
||||
return FALSE
|
||||
return
|
||||
C.jumptoturf(T)
|
||||
return TRUE
|
||||
if("classicmove")
|
||||
|
||||
@@ -158,7 +158,6 @@
|
||||
. = ..()
|
||||
if(!istype(new_linked))
|
||||
CRASH("Warning, [new_linked] is not an overmap ship! Something went horribly wrong for [usr]!")
|
||||
return
|
||||
linked = new_linked
|
||||
name = initial(name) + " ([linked.name])"
|
||||
// HELM
|
||||
|
||||
@@ -48,12 +48,12 @@
|
||||
// Okay this mob has a real loaded-from-savefile mind in it!
|
||||
var/datum/preferences/prefs = preferences_datums[persister.mind.loaded_from_ckey]
|
||||
if(!prefs)
|
||||
WARNING("Persist (P4P): [persister.mind] was loaded from ckey [persister.mind.loaded_from_ckey] but no prefs datum found.")
|
||||
warning("Persist (P4P): [persister.mind] was loaded from ckey [persister.mind.loaded_from_ckey] but no prefs datum found.")
|
||||
return
|
||||
|
||||
// Okay, lets do a few checks to see if we should really save tho!
|
||||
if(!prefs.load_character(persister.mind.loaded_from_slot))
|
||||
WARNING("Persist (P4P): [persister.mind] was loaded from slot [persister.mind.loaded_from_slot] but loading prefs failed.")
|
||||
warning("Persist (P4P): [persister.mind] was loaded from slot [persister.mind.loaded_from_slot] but loading prefs failed.")
|
||||
return // Failed to load character
|
||||
|
||||
// For now as a safety measure we will only save if the name matches.
|
||||
@@ -79,7 +79,7 @@
|
||||
|
||||
var/datum/preferences/prefs = prep_for_persist(occupant)
|
||||
if(!prefs)
|
||||
WARNING("Persist (PID): Skipping [occupant] for persisting, as they have no prefs.")
|
||||
warning("Persist (PID): Skipping [occupant] for persisting, as they have no prefs.")
|
||||
return
|
||||
|
||||
//This one doesn't rely on persistence prefs
|
||||
@@ -232,7 +232,7 @@
|
||||
prefs = prep_for_persist(H)
|
||||
|
||||
if(!prefs)
|
||||
WARNING("Persist (NIF): [H] has no prefs datum, skipping")
|
||||
warning("Persist (NIF): [H] has no prefs datum, skipping")
|
||||
return
|
||||
|
||||
var/obj/item/device/nif/nif = H.nif
|
||||
@@ -254,6 +254,6 @@
|
||||
var/datum/category_item/player_setup_item/vore/nif/nif_prefs = vore_cat.items_by_name["NIF Data"]
|
||||
|
||||
var/savefile/S = new /savefile(prefs.path)
|
||||
if(!S) WARNING ("Persist (NIF): Couldn't load NIF save savefile? [prefs.real_name]")
|
||||
if(!S) warning("Persist (NIF): Couldn't load NIF save savefile? [prefs.real_name]")
|
||||
S.cd = "/character[prefs.default_slot]"
|
||||
nif_prefs.save_character(S)
|
||||
|
||||
@@ -24,10 +24,7 @@
|
||||
|
||||
/obj/item/weapon/gun/energy/sizegun/New()
|
||||
..()
|
||||
if(istype(src, /obj/item/weapon/gun/energy/sizegun/admin))
|
||||
verbs += /obj/item/weapon/gun/energy/sizegun/admin/select_size
|
||||
else
|
||||
verbs += /obj/item/weapon/gun/energy/sizegun/proc/select_size
|
||||
verbs += .proc/select_size
|
||||
|
||||
/obj/item/weapon/gun/energy/sizegun/attack_self(mob/user)
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user