mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] end of file Fix (#10355)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
2af001e7e5
commit
65f21fb1d3
@@ -22,7 +22,6 @@
|
||||
#define open_link(target, url) target << link(url)
|
||||
|
||||
// From TG, might be useful to have.
|
||||
// Didn't port SEND_TEXT() since to_chat() appears to serve the same purpose.
|
||||
#define DIRECT_OUTPUT(A, B) A << B
|
||||
#define DIRECT_INPUT(A, B) A >> B
|
||||
#define SEND_IMAGE(target, image) DIRECT_OUTPUT(target, image)
|
||||
|
||||
@@ -9,4 +9,3 @@
|
||||
/datum/category_item/autolathe/general/drinkingglass/pitcher
|
||||
name = "plastic pitcher"
|
||||
path =/obj/item/reagent_containers/food/drinks/glass2/pitcher
|
||||
|
||||
@@ -59,5 +59,3 @@ var/list/modules = list( // global associative list
|
||||
modcount["[type]"] = num
|
||||
|
||||
return 2**num-1
|
||||
|
||||
|
||||
|
||||
@@ -109,5 +109,3 @@
|
||||
ticker.station_explosion_cinematic(0,null)
|
||||
if(ticker.mode)
|
||||
ticker.mode:station_was_nuked = 1
|
||||
|
||||
|
||||
|
||||
@@ -4,4 +4,3 @@
|
||||
name = "fence"
|
||||
desc = "It's a fence! Not much else to say about it."
|
||||
icon = 'icons/obj/props/decor_fences.dmi'
|
||||
|
||||
|
||||
@@ -20,4 +20,3 @@
|
||||
|
||||
/turf/simulated/floor/fixed/set_flooring()
|
||||
return
|
||||
|
||||
|
||||
@@ -146,7 +146,8 @@
|
||||
|
||||
propogate_sunlight_changes(oldtype, old_density, W)
|
||||
var/turf/simulated/cur_turf = src
|
||||
if(istype(cur_turf) && is_open != was_open)
|
||||
if(istype(cur_turf))
|
||||
if(is_open != was_open)
|
||||
do
|
||||
cur_turf = GetBelow(cur_turf)
|
||||
var/area/A = cur_turf.loc
|
||||
|
||||
@@ -47,4 +47,3 @@ Be sure to include required js functions in your page, or it'll raise an excepti
|
||||
*/
|
||||
receiver << output(argums,"[control_id]:replaceContent")
|
||||
return
|
||||
|
||||
|
||||
@@ -5,4 +5,3 @@
|
||||
icon = 'icons/inventory/head/item_vr.dmi'
|
||||
icon_override = 'icons/inventory/head/mob_vr.dmi'
|
||||
flags_inv = HIDEEARS|HIDEEYES|BLOCKHAIR
|
||||
|
||||
@@ -29,5 +29,3 @@
|
||||
SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi',
|
||||
SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi'
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
new /obj/structure/ghost_pod/ghost_activated/morphspawn(get_turf(spawnspot))
|
||||
|
||||
|
||||
//YW Addition: Adding named landmark for events
|
||||
/obj/effect/landmark/event_spawn/morphspawn
|
||||
name = "morphspawn"
|
||||
|
||||
@@ -17,4 +17,3 @@
|
||||
volume = 120
|
||||
possible_transfer_amounts = list(5,15,30)
|
||||
matter = list(MAT_PLASTIC = 50)
|
||||
|
||||
@@ -23,4 +23,3 @@
|
||||
log_debug("canister_leak event: Canister [C] ([C.x],[C.y],[C.z]) destroyed.")
|
||||
C.health = 0
|
||||
C.healthcheck()
|
||||
|
||||
|
||||
@@ -41,6 +41,3 @@
|
||||
rot_count++
|
||||
if(rot_count >= target_rot)
|
||||
break
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -96,4 +96,3 @@
|
||||
// log_debug("ELECTRICAL EVENT: Emagged \the [A].")
|
||||
playsound(A, 'sound/machines/chime.ogg', 50, 1)
|
||||
apcs_emagged++
|
||||
|
||||
|
||||
@@ -44,4 +44,3 @@
|
||||
P.card_icon = "[colour]_[number]"
|
||||
P.back_icon = "deck1"
|
||||
cards += P
|
||||
|
||||
|
||||
@@ -240,4 +240,3 @@
|
||||
for(var/turf/t in view(5))
|
||||
var/obj/s = new /obj/square(t)
|
||||
s.icon = generate_bluespace_icon(s.icon, s.icon_state)
|
||||
|
||||
|
||||
@@ -91,6 +91,3 @@
|
||||
out.Insert(I, "", 2, frame_num++, 0, frame[2])
|
||||
|
||||
return out
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -86,4 +86,3 @@
|
||||
animate(src, color = null, time = 3 SECONDS)
|
||||
sleep(3 SECONDS)
|
||||
icon_state = "origin"
|
||||
|
||||
|
||||
@@ -82,4 +82,3 @@
|
||||
Many nouveau riche and lottery winners have splurged on a Vey-Med chassis, only to discover that they couldn't keep it maintained. Such individuals contribute to the large and semi-legal market of second, third, and fourth-hand Vey-Med chasses, which are cheaper than a store-bought one, but not by very much. Vey-Medical forbids resale of its prosthetics line, and works hard to shut down illicit sales. Potential buyers of a pre-owned Vey-Medical chassis should avoid deals that seem too good to be true, lest they discover that their new body is a Zeng-Hu with a layer of epoxy.\
|
||||
<br><br>\
|
||||
Vey-Med bodies are only accessible to the extremely wealthy, almost exclusively humans. Positronics find them unsettling in much the same way humans do Morpheus, and the idea of putting a non-sapient drone in a Vey-Med body, if not a crude joke, is utterly ridiculous to anyone with any sort of sense. They are absolutely inappropriate for manual labor or combat, being fragile and usually fairly weak compared to other prosthetics."
|
||||
|
||||
|
||||
@@ -12,4 +12,3 @@
|
||||
DEPARTMENT_CIVILIAN,
|
||||
DEPARTMENT_SYNTHETIC
|
||||
)
|
||||
|
||||
|
||||
@@ -446,7 +446,7 @@
|
||||
msg += "Custom link: " + span_linkify("[custom_link]")
|
||||
|
||||
if(ooc_notes)
|
||||
msg += "OOC Notes: <a href='byond://?src=\ref[src];ooc_notes=1'>\[View\]</a> - <a href='byond://?src=\ref[src];print_ooc_notes_to_chat=1'>\[Print\]</a>"
|
||||
msg += "OOC Notes: <a href='byond://?src=\ref[src];ooc_notes=1'>\[View\]</a> - <a href='byond://?src=\ref[src];print_ooc_notes_chat=1'>\[Print\]</a>"
|
||||
msg += "<a href='byond://?src=\ref[src];vore_prefs=1'>\[Mechanical Vore Preferences\]</a>"
|
||||
// VOREStation End
|
||||
msg = list(span_info(jointext(msg, "<br>")))
|
||||
|
||||
@@ -10,7 +10,7 @@ Given the apply() proc is only called if they have verbs - this should avoid it
|
||||
This ability intends to retrieve all positive, neutral and negative traits chosen in the character set-up
|
||||
then retrieve their relevant vars by assuming the character's species has the full list. This should always work. Should
|
||||
|
||||
The ability is intended to be developed both as a to_chat() and a tgui window.
|
||||
The ability is intended to be developed both as a message to chat and a tgui window.
|
||||
The user is given the ability to choose which they would like whenever they press the ability to better suit whatever scenario they find themselves
|
||||
thirsty for knowledge.
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
if(client.prefs.save_character())
|
||||
to_chat(src, span_filter_notice("Character preferences saved."))
|
||||
|
||||
/mob/living/proc/print_ooc_notes_to_chat(mob/user)
|
||||
/mob/living/proc/print_ooc_notes_chat(mob/user)
|
||||
if(!ooc_notes)
|
||||
return
|
||||
var/msg = ooc_notes
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
"}
|
||||
dat += {"
|
||||
<td class="button">
|
||||
<a href='byond://?src=\ref[src];print_ooc_notes_to_chat=1' class='button'>Print to chat</a>
|
||||
<a href='byond://?src=\ref[src];print_ooc_notes_chat=1' class='button'>Print to chat</a>
|
||||
</td>
|
||||
</table>
|
||||
"}
|
||||
|
||||
@@ -121,4 +121,3 @@
|
||||
armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 100)
|
||||
transformed = 1
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -219,14 +219,14 @@
|
||||
/proc/sanitize_or_reflect(message,user)
|
||||
//Way too long to send
|
||||
if(length(message) > MAX_HUGE_MESSAGE_LEN)
|
||||
fail_to_chat(user)
|
||||
fail_chat_message(user)
|
||||
return
|
||||
|
||||
message = sanitize(message, max_length = MAX_HUGE_MESSAGE_LEN)
|
||||
|
||||
//Came back still too long to send
|
||||
if(length(message) > MAX_MESSAGE_LEN)
|
||||
fail_to_chat(user,message)
|
||||
fail_chat_message(user,message)
|
||||
return null
|
||||
else
|
||||
return message
|
||||
@@ -234,11 +234,11 @@
|
||||
// returns true if it failed
|
||||
/proc/reflect_if_needed(message, user)
|
||||
if(length(message) > MAX_HUGE_MESSAGE_LEN)
|
||||
fail_to_chat(user)
|
||||
fail_chat_message(user)
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/proc/fail_to_chat(user,message)
|
||||
/proc/fail_chat_message(user,message)
|
||||
if(!message)
|
||||
to_chat(user, span_danger("Your message was NOT SENT, either because it was FAR too long, or sanitized to nothing at all."))
|
||||
return
|
||||
|
||||
@@ -81,4 +81,3 @@
|
||||
|
||||
/mob/proc/update_targeted()
|
||||
return
|
||||
|
||||
|
||||
@@ -29,4 +29,3 @@
|
||||
|
||||
/datum/computer_file/data/email_message/proc/set_timestamp()
|
||||
timestamp = stationtime2text()
|
||||
|
||||
|
||||
23
code/modules/multiz/admin_upload.dm
Normal file
23
code/modules/multiz/admin_upload.dm
Normal file
@@ -0,0 +1,23 @@
|
||||
/obj/effect/landmark/map_data/admin_upload
|
||||
name = "Unknown"
|
||||
desc = "An unknown location."
|
||||
|
||||
/obj/effect/landmark/map_data/admin_upload/two
|
||||
desc = "An unknown location. It's two levels tall."
|
||||
height = 2
|
||||
|
||||
/obj/effect/landmark/map_data/admin_upload/three
|
||||
desc = "An unknown location. It's three levels tall."
|
||||
height = 3
|
||||
|
||||
/obj/effect/landmark/map_data/admin_upload/four
|
||||
desc = "An unknown location. It's four levels tall."
|
||||
height = 4
|
||||
|
||||
/obj/effect/landmark/map_data/admin_upload/five
|
||||
desc = "An unknown location. It's five levels tall."
|
||||
height = 5
|
||||
|
||||
/obj/effect/landmark/map_data/admin_upload/six
|
||||
desc = "An unknown location. It's six levels tall."
|
||||
height = 6
|
||||
@@ -16,4 +16,3 @@
|
||||
ammo_type = /obj/item/ammo_casing/a380
|
||||
max_ammo = 8
|
||||
multiple_sprites = 1
|
||||
|
||||
|
||||
@@ -63,4 +63,3 @@
|
||||
The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. \
|
||||
Uses .44 magnum revolver rounds."
|
||||
icon_state = "vintagerevolvingrifle"
|
||||
|
||||
|
||||
@@ -152,4 +152,3 @@
|
||||
for(var/obj/effect/energy_field/F in T)
|
||||
if(!(F in affected_shields))
|
||||
F.impact_effect(i, affected_shields) // Spread the effect to them.
|
||||
|
||||
|
||||
@@ -44,4 +44,3 @@
|
||||
|
||||
/obj/machinery/computer/shuttle_control/research
|
||||
name = "research elevator control console"
|
||||
|
||||
|
||||
@@ -19,4 +19,3 @@
|
||||
icon = 'icons/obj/tables.dmi'
|
||||
icon_state = "debugium"
|
||||
default_type = "debugium"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ GLOBAL_LIST_INIT(vchatFiles, list(
|
||||
"code/modules/vchat/js/vchat.min.js"
|
||||
))
|
||||
|
||||
// The to_chat() macro calls this proc
|
||||
// The to chat macro calls this proc, deprecated
|
||||
/proc/__to_chat(var/target, var/message)
|
||||
// First do logging in database
|
||||
if(isclient(target))
|
||||
|
||||
@@ -1181,7 +1181,7 @@
|
||||
if(custom_link)
|
||||
. += "Custom link: " + span_linkify("[custom_link]")
|
||||
if(ooc_notes)
|
||||
. += "OOC Notes: <a href='byond://?src=\ref[src];ooc_notes=1'>\[View\]</a> - <a href='byond://?src=\ref[src];print_ooc_notes_to_chat=1'>\[Print\]</a>"
|
||||
. += "OOC Notes: <a href='byond://?src=\ref[src];ooc_notes=1'>\[View\]</a> - <a href='byond://?src=\ref[src];print_ooc_notes_chat=1'>\[Print\]</a>"
|
||||
. += "<a href='byond://?src=\ref[src];vore_prefs=1'>\[Mechanical Vore Preferences\]</a>"
|
||||
|
||||
|
||||
@@ -1192,27 +1192,27 @@
|
||||
do_examine_ooc(usr)
|
||||
if(href_list["edit_ooc_notes"])
|
||||
if(usr == src)
|
||||
set_metainfo_panel(usr) //ChompEDIT - usr arg
|
||||
set_metainfo_panel(usr)
|
||||
if(href_list["edit_ooc_note_likes"])
|
||||
if(usr == src)
|
||||
set_metainfo_likes(usr) //ChompEDIT - usr arg
|
||||
set_metainfo_likes(usr)
|
||||
if(href_list["edit_ooc_note_dislikes"])
|
||||
if(usr == src)
|
||||
set_metainfo_dislikes(usr) //ChompEDIT - usr arg
|
||||
set_metainfo_dislikes(usr)
|
||||
if(href_list["save_ooc_panel"])
|
||||
if(usr == src)
|
||||
save_ooc_panel(usr) //ChompEDIT - usr arg
|
||||
if(href_list["print_ooc_notes_to_chat"])
|
||||
print_ooc_notes_to_chat(usr) //ChompEDIT - usr arg
|
||||
save_ooc_panel(usr)
|
||||
if(href_list["print_ooc_notes_chat"])
|
||||
print_ooc_notes_chat(usr)
|
||||
//CHOMPEdit Start
|
||||
if(href_list["edit_ooc_note_favs"])
|
||||
if(usr == src)
|
||||
set_metainfo_favs(usr) //ChompEDIT - usr arg
|
||||
set_metainfo_favs(usr)
|
||||
if(href_list["edit_ooc_note_maybes"])
|
||||
if(usr == src)
|
||||
set_metainfo_maybes(usr) //ChompEDIT - usr arg
|
||||
set_metainfo_maybes(usr)
|
||||
if(href_list["set_metainfo_ooc_style"])
|
||||
set_metainfo_ooc_style(usr) //ChompEDIT - usr arg
|
||||
set_metainfo_ooc_style(usr)
|
||||
//CHOMPEdit End
|
||||
if(href_list["save_private_notes"])
|
||||
if(usr == src)
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
. += "[flavor_text]"
|
||||
|
||||
if(master.ooc_notes)
|
||||
. += span_deptradio("OOC Notes:") + "<a href='byond://?src=\ref[master];ooc_notes=1'>\[View\]</a> - <a href='byond://?src=\ref[master];print_ooc_notes_to_chat=1'>\[Print\]</a>"
|
||||
. += span_deptradio("OOC Notes:") + "<a href='byond://?src=\ref[master];ooc_notes=1'>\[View\]</a> - <a href='byond://?src=\ref[master];print_ooc_notes_chat=1'>\[Print\]</a>"
|
||||
|
||||
// Allow dissipating ai holograms by attacking them
|
||||
/obj/effect/overlay/aiholo/attack_hand(mob/living/user)
|
||||
|
||||
@@ -8,5 +8,3 @@ Slime core lives here.
|
||||
icon_state = "slime extract"
|
||||
source = "Slime"
|
||||
product = "core"
|
||||
|
||||
|
||||
@@ -14,4 +14,3 @@ Xenobiological product lives here as a basic type.
|
||||
/obj/item/xenoproduct/Destroy()
|
||||
QDEL_NULL(traits)
|
||||
..()
|
||||
|
||||
@@ -70,4 +70,3 @@
|
||||
else
|
||||
pass("[name] matched all expected outputs.")
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
"}
|
||||
dat += {"
|
||||
<td class="button">
|
||||
<a href='byond://?src=\ref[src];print_ooc_notes_to_chat=1' class='button'>Print to chat</a>
|
||||
<a href='byond://?src=\ref[src];print_ooc_notes_chat=1' class='button'>Print to chat</a>
|
||||
</td>
|
||||
"}
|
||||
if(user == src)
|
||||
|
||||
Reference in New Issue
Block a user