mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-20 20:37:34 +01:00
OpenDream linting (#16468)
* I wanna set the universe on fire * dfsaaf * setup * dir issue? * dsf * Perhaps the script * saf * cry * pain * sdfas * Try reintroduction of tag-matcher * Failed * Tries to suppress dotnet compile warnings * Like this maybe? * woopsie * Damn pathings * Hate * Pragmas * unlint? * Maybe? * GDI * Redundant ifdef removed and changelog * Did I forgot the tag matcher, or it was still broken? * Yea no that script is still broken * Removed tag-matcher as requested * *sigh* * test * bro what? * hope * just fixing the input * Let's see if we catch it...
This commit is contained in:
@@ -28,8 +28,6 @@
|
||||
return
|
||||
if("Cancel")
|
||||
return
|
||||
if("No")
|
||||
; // do nothing
|
||||
|
||||
callproc_targetpicked(targetselected, target)
|
||||
|
||||
@@ -137,8 +135,6 @@
|
||||
current = get_area(M)
|
||||
if(!current)
|
||||
switch(alert("\The [M] appears to not have an area; do you want to pass null instead?",, "Yes", "Cancel"))
|
||||
if("Yes")
|
||||
; // do nothing
|
||||
if("Cancel")
|
||||
return
|
||||
|
||||
@@ -146,8 +142,6 @@
|
||||
current = holder.marked_datum
|
||||
if(!current)
|
||||
switch(alert("You do not currently have a marked datum; do you want to pass null instead?",, "Yes", "Cancel"))
|
||||
if("Yes")
|
||||
; // do nothing
|
||||
if("Cancel")
|
||||
return
|
||||
if(!done)
|
||||
|
||||
@@ -310,11 +310,10 @@ var/list/VVdynamic_lock = list(
|
||||
mod_list(variable, O, original_name, objectvar)
|
||||
|
||||
if("restore to default")
|
||||
new_var = initial(variable)
|
||||
if(assoc)
|
||||
L[assoc_key] = new_var
|
||||
L[assoc_key] = variable
|
||||
else
|
||||
L[L.Find(variable)] = new_var
|
||||
L[L.Find(variable)] = variable
|
||||
|
||||
if("edit referenced object")
|
||||
modify_variables(variable)
|
||||
|
||||
@@ -131,9 +131,7 @@
|
||||
var/vtext = ""
|
||||
var/debug_type = get_debug_type(value, FALSE)
|
||||
var/extra = list()
|
||||
if(isnull(value))
|
||||
// get_debug_type displays this
|
||||
else if(istext(value))
|
||||
if(istext(value))
|
||||
debug_type = null // it's kinda annoying here; we can tell the type by the quotes
|
||||
vtext = "\"[html_encode(value)]\""
|
||||
else if(isicon(value))
|
||||
|
||||
@@ -582,7 +582,7 @@ var/list/asset_datums = list()
|
||||
"sovjetbox.woff" = 'html/fonts/OFL/SovjetBox.woff',
|
||||
"torsha.woff" = 'html/fonts/OFL/Torsha.woff',
|
||||
"web3of9ascii.woff" = 'html/fonts/OFL/Web3Of9ASCII.woff',
|
||||
"zeshit.woff" = 'html/fonts/OFL/zeshit.woff',
|
||||
"zeshit.woff" = 'html/fonts/OFL/Zeshit.woff',
|
||||
"bilboinc.woff" = 'html/fonts/OFL/BilboINC.woff',
|
||||
"fproject.woff" = 'html/fonts/OFL/FProject.woff',
|
||||
"gelasio.woff" = 'html/fonts/OFL/Gelasio.woff',
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
item_flags = NOBLUDGEON
|
||||
w_class = ITEMSIZE_SMALL
|
||||
siemens_coefficient = 1
|
||||
var/obj/machinery/computer/cargo/cargo_console = null
|
||||
|
||||
/obj/item/export_scanner/afterattack(obj/O, mob/user, proximity)
|
||||
. = ..()
|
||||
|
||||
@@ -134,30 +134,30 @@
|
||||
|
||||
/datum/category_item/player_setup_item/general/flavor/OnTopic(var/href,var/list/href_list, var/mob/user)
|
||||
if(href_list["flavor_text"])
|
||||
switch(href_list["flavor_text"])
|
||||
if("open")
|
||||
if("general")
|
||||
var/msg = sanitize(input(usr,"Give a general description of your character. This will be shown regardless of clothing.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0)
|
||||
if(CanUseTopic(user))
|
||||
pref.flavor_texts[href_list["flavor_text"]] = msg
|
||||
else
|
||||
var/msg = sanitize(input(usr,"Set the flavor text for your [href_list["flavor_text"]].","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0)
|
||||
if(CanUseTopic(user))
|
||||
pref.flavor_texts[href_list["flavor_text"]] = msg
|
||||
if(href_list["flavor_text"] != "open")
|
||||
switch(href_list["flavor_text"])
|
||||
if("general")
|
||||
var/msg = sanitize(input(usr,"Give a general description of your character. This will be shown regardless of clothing.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0)
|
||||
if(CanUseTopic(user))
|
||||
pref.flavor_texts[href_list["flavor_text"]] = msg
|
||||
else
|
||||
var/msg = sanitize(input(usr,"Set the flavor text for your [href_list["flavor_text"]].","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0)
|
||||
if(CanUseTopic(user))
|
||||
pref.flavor_texts[href_list["flavor_text"]] = msg
|
||||
SetFlavorText(user)
|
||||
return TOPIC_HANDLED
|
||||
|
||||
else if(href_list["flavour_text_robot"])
|
||||
switch(href_list["flavour_text_robot"])
|
||||
if("open")
|
||||
if("Default")
|
||||
var/msg = sanitize(input(usr,"Set the default flavour text for your robot. It will be used for any module without individual setting.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"])) as message, extra = 0)
|
||||
if(CanUseTopic(user))
|
||||
pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
|
||||
else
|
||||
var/msg = sanitize(input(usr,"Set the flavour text for your robot with [href_list["flavour_text_robot"]] module. If you leave this empty, default flavour text will be used for this module.","Flavour Text",html_decode(pref.flavour_texts_robot[href_list["flavour_text_robot"]])) as message, extra = 0)
|
||||
if(CanUseTopic(user))
|
||||
pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
|
||||
if(href_list["flavour_text_robot"] != "open")
|
||||
switch(href_list["flavour_text_robot"])
|
||||
if("Default")
|
||||
var/msg = sanitize(input(usr,"Set the default flavour text for your robot. It will be used for any module without individual setting.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"])) as message, extra = 0)
|
||||
if(CanUseTopic(user))
|
||||
pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
|
||||
else
|
||||
var/msg = sanitize(input(usr,"Set the flavour text for your robot with [href_list["flavour_text_robot"]] module. If you leave this empty, default flavour text will be used for this module.","Flavour Text",html_decode(pref.flavour_texts_robot[href_list["flavour_text_robot"]])) as message, extra = 0)
|
||||
if(CanUseTopic(user))
|
||||
pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
|
||||
SetFlavourTextRobot(user)
|
||||
return TOPIC_HANDLED
|
||||
|
||||
|
||||
@@ -465,7 +465,7 @@
|
||||
update_icon()
|
||||
return
|
||||
|
||||
playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
|
||||
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
|
||||
user.visible_message(SPAN_WARNING("[user] cuts the fingertips off of \the [src]."),SPAN_WARNING("You cut the fingertips off of \the [src]."))
|
||||
|
||||
clipped = 1
|
||||
|
||||
@@ -277,7 +277,7 @@
|
||||
var/choice = input("What component would you like to remove?") as null|anything in list(helmet,boots,tank,cooler)
|
||||
if(!choice) return
|
||||
|
||||
playsound(src, 'sound/items/screwdriver.ogg', 50, 1)
|
||||
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
|
||||
if(choice == tank) //No, a switch doesn't work here. Sorry. ~Techhead
|
||||
to_chat(user, "You pop \the [tank] out of \the [src]'s storage compartment.")
|
||||
tank.forceMove(get_turf(src))
|
||||
|
||||
@@ -346,7 +346,7 @@
|
||||
name = "tallit"
|
||||
desc = "A tallit is a fringed garment worn as a prayer shawl by religious Jews. \
|
||||
The tallit has special twined and knotted fringes known as tzitzit attached to its four corners."
|
||||
icon = 'icons/clothing/accessories/tallit.dmi'
|
||||
icon = 'icons/clothing/accessories/Tallit.dmi'
|
||||
item_state = "tallit"
|
||||
icon_state = "tallit"
|
||||
contained_sprite = TRUE
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
icon_state = "watch_gold"
|
||||
item_state = "watch_gold"
|
||||
|
||||
/obj/item/clothing/wrists/watch/holo
|
||||
/obj/item/clothing/wrists/watch/holo
|
||||
desc = "It's a GaussIo ZeitMeister with a holographic screen."
|
||||
desc_extended = "The latest Elyran technology!"
|
||||
icon_state = "watch_holo"
|
||||
@@ -77,7 +77,7 @@
|
||||
/obj/item/clothing/wrists/watch/attackby(obj/item/W, mob/user)
|
||||
if(W.isscrewdriver())
|
||||
user.visible_message(SPAN_NOTICE("<b>[user]</b> [screwed ? "unscrews" : "screws"] the cover of the [src] [screwed ? "open" : "closed"]."), SPAN_NOTICE("You [screwed ? "unscrews" : "screws"] the cover of the [src] [screwed ? "open" : "closed"]."))
|
||||
playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
|
||||
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
|
||||
screwed = !screwed
|
||||
return
|
||||
if(wired)
|
||||
|
||||
@@ -268,8 +268,6 @@
|
||||
|
||||
|
||||
switch(reagent_mix)
|
||||
if (RECIPE_REAGENT_REPLACE)
|
||||
//We do no transferring
|
||||
if (RECIPE_REAGENT_SUM)
|
||||
//Sum is easy, just shove the entire buffer into the result
|
||||
buffer.trans_to_holder(holder, buffer.total_volume)
|
||||
|
||||
@@ -433,7 +433,7 @@
|
||||
installed_cell.forceMove(src)
|
||||
update_stats()
|
||||
update_icon()
|
||||
playsound(src,'sound/items/wirecutter.ogg', 50, 0)
|
||||
playsound(src,'sound/items/Wirecutter.ogg', 50, 0)
|
||||
return TRUE
|
||||
else if(istype(I,/obj/item/custom_ka_upgrade/barrels))
|
||||
if(!installed_cell)
|
||||
@@ -447,7 +447,7 @@
|
||||
installed_barrel.forceMove(src)
|
||||
update_stats()
|
||||
update_icon()
|
||||
playsound(src,'sound/items/wirecutter.ogg', 50, 0)
|
||||
playsound(src,'sound/items/Wirecutter.ogg', 50, 0)
|
||||
return TRUE
|
||||
else if(istype(I,/obj/item/custom_ka_upgrade/upgrade_chips))
|
||||
if(!installed_cell || !installed_barrel)
|
||||
@@ -465,7 +465,7 @@
|
||||
installed_upgrade_chip.forceMove(src)
|
||||
update_stats()
|
||||
update_icon()
|
||||
playsound(src,'sound/items/wirecutter.ogg', 50, 0)
|
||||
playsound(src,'sound/items/Wirecutter.ogg', 50, 0)
|
||||
return TRUE
|
||||
|
||||
if(installed_cell)
|
||||
|
||||
@@ -237,8 +237,8 @@
|
||||
authenticated_account = SSeconomy.attempt_account_access(text2num(params["account_num"]), tried_pin, potential_account.security_level)
|
||||
if (3) // Security level two
|
||||
if (held_card)
|
||||
if (text2num(params["account_num"]) != held_card.associated_account_number)
|
||||
else authenticated_account = SSeconomy.attempt_account_access(tried_account_num, tried_pin, potential_account.security_level)
|
||||
if (text2num(params["account_num"]) == held_card.associated_account_number)
|
||||
authenticated_account = SSeconomy.attempt_account_access(tried_account_num, tried_pin, potential_account.security_level)
|
||||
else to_chat(usr, SPAN_WARNING("Account not found."))
|
||||
if (!authenticated_account)
|
||||
number_incorrect_tries++
|
||||
|
||||
@@ -243,13 +243,13 @@
|
||||
key = "growl"
|
||||
emote_message_3p_target = "USER growls at TARGET."
|
||||
emote_message_3p = "USER growls."
|
||||
emote_sound = 'sound/voice/Lizardgrowl.ogg'
|
||||
emote_sound = 'sound/voice/lizardgrowl.ogg'
|
||||
|
||||
/singleton/emote/audible/hiss/long
|
||||
key = "hiss2"
|
||||
emote_message_3p_target = "USER hisses loudly at TARGET!"
|
||||
emote_message_3p = "USER hisses loudly!"
|
||||
emote_sound = 'sound/voice/lizardhiss2.ogg'
|
||||
emote_sound = 'sound/voice/Lizardhiss2.ogg'
|
||||
|
||||
/singleton/emote/audible/lizard_bellow
|
||||
key = "bellow"
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
'sound/voice/chitter2.ogg',
|
||||
'sound/effects/squelch1.ogg',
|
||||
'sound/items/wrench.ogg',
|
||||
'sound/items/welder.ogg',
|
||||
'sound/items/Welder.ogg',
|
||||
/singleton/sound_category/crowbar_sound,
|
||||
'sound/items/screwdriver.ogg',
|
||||
'sound/items/Screwdriver.ogg',
|
||||
'sound/items/drill_use.ogg',
|
||||
'sound/items/air_wrench.ogg')
|
||||
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
if(brute_damage)
|
||||
repair_brute_damage(repair_value)
|
||||
to_chat(user, SPAN_NOTICE("You mend the damage to \the [src]."))
|
||||
playsound(user.loc, 'sound/items/welder.ogg', 25, 1)
|
||||
playsound(user.loc, 'sound/items/Welder.ogg', 25, 1)
|
||||
|
||||
/obj/item/mech_component/proc/repair_burn_generic(var/obj/item/stack/cable_coil/CC, var/mob/user)
|
||||
if(!istype(CC))
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
// We're all done. Finalize the mech and pass the frame to the new system.
|
||||
var/mob/living/heavy_vehicle/M = new(get_turf(src), src)
|
||||
visible_message("\The [user] finishes off \the [M].")
|
||||
playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
|
||||
playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
|
||||
|
||||
arms = null
|
||||
legs = null
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
|
||||
if(user.unEquip(system))
|
||||
to_chat(user, "<span class='notice'>You install \the [system] in \the [src]'s [system_hardpoint].</span>")
|
||||
playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
|
||||
playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
|
||||
else return FALSE
|
||||
var/obj/item/mecha_equipment/ME = system
|
||||
if(istype(ME))
|
||||
@@ -201,6 +201,6 @@
|
||||
system.forceMove(get_turf(user))
|
||||
user.put_in_hands(system)
|
||||
to_chat(user, "<span class='notice'>You remove \the [system] in \the [src]'s [system_hardpoint].</span>")
|
||||
playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
|
||||
playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
|
||||
|
||||
return system
|
||||
|
||||
@@ -475,7 +475,7 @@
|
||||
thing.forceMove(body)
|
||||
body.cell = thing
|
||||
to_chat(user, "<span class='notice'>You install \the [body.cell] into \the [src].</span>")
|
||||
playsound(user.loc, 'sound/items/screwdriver.ogg', 50, 1)
|
||||
playsound(user.loc, 'sound/items/Screwdriver.ogg', 50, 1)
|
||||
visible_message("<span class='notice'>\The [user] installs \the [body.cell] into \the [src].</span>")
|
||||
return
|
||||
else if(istype(thing, /obj/item/device/robotanalyzer))
|
||||
|
||||
@@ -57,9 +57,6 @@
|
||||
var/obj/item/mech_component/sensors/head
|
||||
var/obj/item/mech_component/chassis/body
|
||||
|
||||
// Invisible components.
|
||||
var/datum/effect/effect/system/spark_spread/sparks
|
||||
|
||||
// Equipment tracking vars.
|
||||
var/obj/item/mecha_equipment/selected_system
|
||||
var/selected_hardpoint
|
||||
|
||||
@@ -284,7 +284,7 @@
|
||||
if (prob(5))
|
||||
die_off()
|
||||
return
|
||||
else
|
||||
|
||||
return
|
||||
|
||||
/obj/effect/plant/proc/check_health()
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
b.forceMove(get_turf(src))
|
||||
qdel(src)
|
||||
return
|
||||
else
|
||||
|
||||
return
|
||||
|
||||
/obj/structure/bookcase/update_icon()
|
||||
|
||||
@@ -187,62 +187,6 @@
|
||||
qdel(areas)
|
||||
..()
|
||||
|
||||
/*
|
||||
Savefile format:
|
||||
map
|
||||
id
|
||||
x // size, not coords
|
||||
y
|
||||
z
|
||||
areas // list of areas, not including default
|
||||
[each z; 1 to depth]
|
||||
[each y; 1 to height]
|
||||
[each x; 1 to width]
|
||||
type // of turf
|
||||
AREA // if non-default; saved as a number (index into areas list)
|
||||
vars // all other changed vars
|
||||
*/
|
||||
/swapmap/Write(savefile/S)
|
||||
var/x
|
||||
var/y
|
||||
var/z
|
||||
var/n
|
||||
var/list/areas
|
||||
var/area/defarea=locate(world.area)
|
||||
if(!defarea) defarea=new world.area
|
||||
areas=list()
|
||||
for(var/turf/T in block(locate(x1,y1,z1),locate(x2,y2,z2)))
|
||||
areas[T.loc]=null
|
||||
for(n in areas) // quickly eliminate associations for smaller storage
|
||||
areas-=n
|
||||
areas+=n
|
||||
areas-=defarea
|
||||
InitializeSwapMaps()
|
||||
locked=1
|
||||
S["id"] << id
|
||||
S["z"] << z2-z1+1
|
||||
S["y"] << y2-y1+1
|
||||
S["x"] << x2-x1+1
|
||||
S["areas"] << areas
|
||||
for(n in 1 to areas.len) areas[areas[n]]=n
|
||||
var/oldcd=S.cd
|
||||
for(z=z1,z<=z2,++z)
|
||||
S.cd="[z-z1+1]"
|
||||
for(y=y1,y<=y2,++y)
|
||||
S.cd="[y-y1+1]"
|
||||
for(x=x1,x<=x2,++x)
|
||||
S.cd="[x-x1+1]"
|
||||
var/turf/T=locate(x,y,z)
|
||||
S["type"] << T.type
|
||||
if(T.loc!=defarea) S["AREA"] << areas[T.loc]
|
||||
T.Write(S)
|
||||
S.cd=".."
|
||||
S.cd=".."
|
||||
sleep()
|
||||
S.cd=oldcd
|
||||
locked=0
|
||||
qdel(areas)
|
||||
|
||||
/swapmap/Read(savefile/S,_id,turf/locorner)
|
||||
var/x
|
||||
var/y
|
||||
@@ -453,28 +397,6 @@
|
||||
/swapmap/proc/BuildInTurfs(list/turfs,item)
|
||||
for(var/T in turfs) new item(T)
|
||||
|
||||
/atom/Write(savefile/S)
|
||||
for(var/V in vars-"x"-"y"-"z"-"contents"-"icon"-"overlays"-"underlays")
|
||||
if(issaved(vars[V]))
|
||||
if(vars[V]!=initial(vars[V])) S[V]<<vars[V]
|
||||
else S.dir.Remove(V)
|
||||
if(icon!=initial(icon))
|
||||
if(swapmaps_iconcache && swapmaps_iconcache[icon])
|
||||
S["icon"]<<swapmaps_iconcache[icon]
|
||||
else S["icon"]<<icon
|
||||
// do not save mobs with keys; do save other mobs
|
||||
var/mob/M
|
||||
for(M in src) if(M.key) break
|
||||
if(overlays.len) S["overlays"]<<overlays
|
||||
if(underlays.len) S["underlays"]<<underlays
|
||||
if(contents.len && !isarea(src))
|
||||
var/list/l=contents
|
||||
if(M)
|
||||
l=l.Copy()
|
||||
for(M in src) if(M.key) l-=M
|
||||
if(l.len) S["contents"]<<l
|
||||
if(l!=contents) qdel(l)
|
||||
|
||||
/atom/Read(savefile/S)
|
||||
var/list/l
|
||||
if(contents.len) l=contents
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
// Noise made when a simple door made of this material opens or closes.
|
||||
var/dooropen_noise = 'sound/effects/stonedoor_openclose.ogg'
|
||||
// Noise made when you hit structure made of this material.
|
||||
var/hitsound = 'sound/weapons/genhit.ogg'
|
||||
var/hitsound = 'sound/weapons/Genhit.ogg'
|
||||
// Path to resulting stacktype. Todo remove need for this.
|
||||
var/stack_type
|
||||
// Wallrot crumble message.
|
||||
|
||||
@@ -172,8 +172,7 @@ var/global/list/minevendor_list = list( //keep in order of price
|
||||
return
|
||||
if(prize.amount <= 0 && prize.amount != -1)
|
||||
return
|
||||
if(prize.cost > ID.mining_points)
|
||||
else
|
||||
if(prize.cost <= ID.mining_points)
|
||||
if(prize.shuttle)
|
||||
if(SScargo.order_mining(prize.equipment_path))
|
||||
ID.mining_points -= prize.cost
|
||||
|
||||
@@ -1208,7 +1208,7 @@ var/list/total_extraction_beacons = list()
|
||||
user.visible_message(SPAN_NOTICE("\The [user] begins sculpting."), SPAN_NOTICE("You begin sculpting."))
|
||||
|
||||
if(prob(25))
|
||||
playsound(loc, 'sound/items/screwdriver.ogg', 20, TRUE)
|
||||
playsound(loc, 'sound/items/Screwdriver.ogg', 20, TRUE)
|
||||
else
|
||||
playsound(loc, /singleton/sound_category/pickaxe_sound, 20, TRUE)
|
||||
|
||||
|
||||
@@ -710,7 +710,7 @@ var/list/asteroid_floor_smooth = list(
|
||||
var/obj/item/stack/rods/R = W
|
||||
if(R.use(1))
|
||||
to_chat(user, SPAN_NOTICE("Constructing support lattice..."))
|
||||
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
||||
ReplaceWithLattice()
|
||||
return
|
||||
|
||||
@@ -721,7 +721,7 @@ var/list/asteroid_floor_smooth = list(
|
||||
if(S.get_amount() < 1)
|
||||
return
|
||||
qdel(L)
|
||||
playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, TRUE)
|
||||
S.use(1)
|
||||
ChangeTurf(/turf/simulated/floor/airless)
|
||||
return
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
invisibility = INVISIBILITY_OBSERVER
|
||||
simulated = FALSE
|
||||
var/can_reenter_corpse
|
||||
var/datum/hud/living/carbon/hud = null // hud
|
||||
var/datum/hud/hud = null // hud
|
||||
var/bootime = 0
|
||||
var/started_as_observer //This variable is set to 1 when you enter the game as an observer.
|
||||
//If you died in the game and are a ghsot - this will remain as null.
|
||||
|
||||
@@ -235,11 +235,12 @@
|
||||
if("whisper")
|
||||
whisper(message, speaking, is_singing)
|
||||
return TRUE
|
||||
else if(message_mode)
|
||||
var/obj/item/device/radio/R = get_radio()
|
||||
if(R)
|
||||
used_radios += R
|
||||
R.talk_into(src, message, message_mode, verb, speaking)
|
||||
else
|
||||
if(message_mode)
|
||||
var/obj/item/device/radio/R = get_radio()
|
||||
if(R)
|
||||
used_radios += R
|
||||
R.talk_into(src, message, message_mode, verb, speaking)
|
||||
|
||||
/mob/living/carbon/human/handle_speech_sound()
|
||||
var/list/returns = ..()
|
||||
|
||||
@@ -236,7 +236,7 @@
|
||||
attack_verb = list("scorched", "burned")
|
||||
attack_noun = list("flaming fist")
|
||||
damage = 10
|
||||
attack_sound = 'sound/items/welder.ogg'
|
||||
attack_sound = 'sound/items/Welder.ogg'
|
||||
attack_name = "flaming touch"
|
||||
damage_type = DAMAGE_BURN
|
||||
|
||||
@@ -289,4 +289,4 @@
|
||||
user.visible_message(SPAN_DANGER("\The [user] crackles with energy!"))
|
||||
if(iscarbon(target))
|
||||
var/mob/living/carbon/L = target
|
||||
L.electrocute_act(20,user, 1, user.zone_sel.selecting)
|
||||
L.electrocute_act(20,user, 1, user.zone_sel.selecting)
|
||||
|
||||
@@ -816,7 +816,7 @@ var/global/list/golem_types = list(SPECIES_GOLEM_COAL,
|
||||
death_message = "collapses into a pile of flesh!"
|
||||
death_message_range = 7
|
||||
|
||||
death_sound = 'sound/magic/disintegrate.ogg'
|
||||
death_sound = 'sound/magic/Disintegrate.ogg'
|
||||
|
||||
golem_designation = "Flesh"
|
||||
|
||||
|
||||
@@ -589,8 +589,7 @@ default behaviour is:
|
||||
|
||||
if (!restrained())
|
||||
var/diag = get_dir(src, pulling)
|
||||
if ((diag - 1) & diag)
|
||||
else
|
||||
if (!((diag - 1) & diag))
|
||||
diag = null
|
||||
if ((get_dist(src, pulling) > 1 || diag))
|
||||
if (isliving(pulling))
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
var/mob/living/silicon/ai/user = src
|
||||
// Setup Variables
|
||||
malfunctioning = 1
|
||||
research = new/datum/malf_research()
|
||||
research = /datum/malf_research
|
||||
research.owner = src
|
||||
hacked_apcs = list()
|
||||
recalc_cpu()
|
||||
|
||||
add_verb(src, new/datum/game_mode/malfunction/verb/ai_select_hardware())
|
||||
add_verb(src, new/datum/game_mode/malfunction/verb/ai_select_research())
|
||||
add_verb(src, new/datum/game_mode/malfunction/verb/ai_help())
|
||||
add_verb(src, /datum/game_mode/malfunction/verb/ai_select_hardware)
|
||||
add_verb(src, /datum/game_mode/malfunction/verb/ai_select_research)
|
||||
add_verb(src, /datum/game_mode/malfunction/verb/ai_help)
|
||||
|
||||
// And greet user with some OOC info.
|
||||
to_chat(user, "You are malfunctioning, you do not have to follow any laws.")
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
if(wood)
|
||||
wood.add_charge(4000)
|
||||
else if(istype(W, /obj/item/pipe))
|
||||
// This allows drones and engiborgs to clear pipe assemblies from floors.
|
||||
continue // This allows drones and engiborgs to clear pipe assemblies from floors.
|
||||
else if(istype(W, /obj/item/broken_bottle))
|
||||
if(glass)
|
||||
glass.add_charge(2000)
|
||||
@@ -194,4 +194,4 @@
|
||||
|
||||
dat += resources
|
||||
|
||||
src << browse(dat, "window=robotmod")
|
||||
src << browse(dat, "window=robotmod")
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
var/icon_selected = 0 //If icon selection has been completed yet
|
||||
var/spawn_sound = 'sound/voice/liveagain.ogg'
|
||||
var/pitch_toggle = TRUE
|
||||
var/datum/effect/effect/system/ion_trail_follow/ion_trail
|
||||
var/datum/effect_system/ion_trail/ion_trail
|
||||
var/datum/effect_system/sparks/spark_system
|
||||
|
||||
// Wiring
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
var/obj/screen/gun/item/item_use_icon = null
|
||||
var/obj/screen/gun/radio/radio_use_icon = null
|
||||
var/obj/screen/gun/move/gun_move_icon = null
|
||||
var/obj/screen/gun/run/gun_run_icon = null
|
||||
var/obj/screen/gun/mode/gun_setting_icon = null
|
||||
var/obj/screen/gun/unique_action_icon = null
|
||||
var/obj/screen/gun/toggle_firing_mode = null
|
||||
@@ -207,7 +206,6 @@
|
||||
|
||||
//Monkey/infected mode
|
||||
var/list/resistances = list()
|
||||
var/datum/disease/virus = null
|
||||
|
||||
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
|
||||
|
||||
|
||||
@@ -232,7 +232,7 @@
|
||||
new_slime = new /mob/living/carbon/slime(loc)
|
||||
if(adult)
|
||||
new_slime.is_adult = 1
|
||||
else
|
||||
|
||||
new_slime.key = key
|
||||
|
||||
to_chat(new_slime, "<B>You are now a slime. Skreee!</B>")
|
||||
|
||||
@@ -289,7 +289,7 @@
|
||||
return TRUE
|
||||
|
||||
to_chat(user, SPAN_NOTICE("You begin repairing the damage to \the [src]..."))
|
||||
playsound(get_turf(src), 'sound/items/welder.ogg', 100, 1)
|
||||
playsound(get_turf(src), 'sound/items/Welder.ogg', 100, 1)
|
||||
if(WT.use(round(damage / 75)) && do_after(user, damage / 10))
|
||||
damage = 0
|
||||
to_chat(user, SPAN_NOTICE("You fully repair \the [src]."))
|
||||
|
||||
@@ -5,15 +5,3 @@
|
||||
|
||||
var/height = 1 ///< The number of Z-Levels in the map.
|
||||
var/turf/edge_type ///< What the map edge should be formed with. (null = world.turf)
|
||||
|
||||
// FOR THE LOVE OF GOD USE THESE. DO NOT FUCKING SPAGHETTIFY THIS.
|
||||
// Use the Has*() functions if you ONLY need to check.
|
||||
// If you need to do something, use Get*().
|
||||
/HasAbove(var/z)
|
||||
|
||||
/HasBelow(var/z)
|
||||
|
||||
// These give either the turf or null.
|
||||
/GetAbove(var/atom/atom)
|
||||
|
||||
/GetBelow(var/atom/atom)
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
var/obj/item/stack/rods/R = C
|
||||
if (R.use(1))
|
||||
to_chat(user, "<span class='notice'>You lay down the support lattice.</span>")
|
||||
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
||||
new /obj/structure/lattice(locate(src.x, src.y, src.z))
|
||||
return
|
||||
|
||||
@@ -229,7 +229,7 @@
|
||||
if (S.get_amount() < 1)
|
||||
return
|
||||
qdel(L)
|
||||
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
|
||||
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
|
||||
S.use(1)
|
||||
ChangeTurf(/turf/simulated/floor/airless)
|
||||
return
|
||||
|
||||
@@ -364,7 +364,7 @@
|
||||
|
||||
if(WT.use(0,user))
|
||||
to_chat(user, "<span class='notice'>You start repairing the damage to [src].</span>")
|
||||
playsound(src, 'sound/items/welder.ogg', 100, 1)
|
||||
playsound(src, 'sound/items/Welder.ogg', 100, 1)
|
||||
if(WT.use_tool(src, user, max(5, damage / 5), volume = 50) && WT && WT.isOn())
|
||||
to_chat(user, "<span class='notice'>You finish repairing the damage to [src].</span>")
|
||||
take_damage(-damage)
|
||||
|
||||
@@ -681,7 +681,7 @@
|
||||
user.visible_message(SPAN_WARNING("[user.name] welds [src]."), \
|
||||
"You start welding the APC frame...", \
|
||||
"You hear welding.")
|
||||
playsound(loc, 'sound/items/welder.ogg', 50, 1)
|
||||
playsound(loc, 'sound/items/Welder.ogg', 50, 1)
|
||||
if(W.use_tool(src, user, 50, volume = 50))
|
||||
if(!src || !WT.use(3, user))
|
||||
return
|
||||
@@ -765,7 +765,7 @@
|
||||
if (WT.get_fuel() <1)
|
||||
to_chat(user, SPAN_WARNING("You need more welding fuel to complete this task."))
|
||||
return
|
||||
playsound(loc, 'sound/items/welder.ogg', 50, 1)
|
||||
playsound(loc, 'sound/items/Welder.ogg', 50, 1)
|
||||
if(W.use_tool(src, user, 10, volume = 50))
|
||||
if(!src || !WT.use(1, user))
|
||||
return
|
||||
|
||||
@@ -156,7 +156,7 @@ By design, d1 is the smallest direction and d2 is the highest
|
||||
|
||||
for(var/mob/O in viewers(src, null))
|
||||
O.show_message(SPAN_WARNING("[user] cuts the cable."), 1)
|
||||
playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
|
||||
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
|
||||
|
||||
if(d1 == 11 || d2 == 11)
|
||||
var/turf/turf = GetBelow(src)
|
||||
@@ -605,7 +605,7 @@ By design, d1 is the smallest direction and d2 is the highest
|
||||
)
|
||||
affecting.heal_damage(burn = 15, robo_repair = TRUE)
|
||||
user.visible_message(SPAN_NOTICE("\The [user] [pick(repair_messages)] in [target]'s [affecting.name] with \the [src]."))
|
||||
playsound(target, 'sound/items/wirecutter.ogg', 15)
|
||||
playsound(target, 'sound/items/Wirecutter.ogg', 15)
|
||||
repair_organ(user, target, affecting)
|
||||
else
|
||||
to_chat(user, SPAN_WARNING("You don't have enough cable for this!"))
|
||||
@@ -1043,7 +1043,7 @@ By design, d1 is the smallest direction and d2 is the highest
|
||||
/obj/structure/noose/attackby(obj/item/I, mob/user, params)
|
||||
if(I.iswirecutter())
|
||||
user.visible_message("<b>[user]</b> cuts \the [src].", SPAN_NOTICE("You cut \the [src]."))
|
||||
playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
|
||||
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
|
||||
if(istype(buckled, /mob/living))
|
||||
var/mob/living/M = buckled
|
||||
M.visible_message(SPAN_DANGER("[M] falls over and hits the ground!"),\
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
icon_state = "bulb-construct-stage1"
|
||||
new /obj/item/stack/cable_coil(get_turf(src), 1, "red")
|
||||
user.visible_message(SPAN_NOTICE("\The [user] removes the wiring from \the [src]."), SPAN_NOTICE("You remove the wiring from [src]."), SPAN_WARNING("You hear something being cut."))
|
||||
playsound(get_turf(src), 'sound/items/wirecutter.ogg', 100, TRUE)
|
||||
playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 100, TRUE)
|
||||
return
|
||||
|
||||
if(W.iscoil())
|
||||
|
||||
@@ -125,7 +125,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
|
||||
if(prob(25))
|
||||
qdel(src)
|
||||
return
|
||||
else
|
||||
|
||||
return
|
||||
|
||||
/obj/structure/particle_accelerator/update_icon()
|
||||
@@ -273,7 +273,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
|
||||
if(prob(25))
|
||||
qdel(src)
|
||||
return
|
||||
else
|
||||
|
||||
return
|
||||
|
||||
/obj/machinery/particle_accelerator/proc/update_state()
|
||||
|
||||
@@ -384,7 +384,7 @@
|
||||
|
||||
/obj/machinery/power/solar_control/attackby(var/obj/I, user as mob)
|
||||
if(I.isscrewdriver())
|
||||
playsound(src.loc, 'sound/items/screwdriver.ogg', 50, 1)
|
||||
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
|
||||
if(do_after(user, 20))
|
||||
if (src.stat & BROKEN)
|
||||
to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
|
||||
|
||||
@@ -226,7 +226,7 @@
|
||||
fire_sound = 'sound/weapons/Laser2.ogg'
|
||||
modifystate = null
|
||||
charge_failure_message = "'s charging socket was removed to make room for a recharger."
|
||||
secondary_fire_sound = 'sound/weapons/Laser3.ogg'
|
||||
secondary_fire_sound = 'sound/weapons/laser3.ogg'
|
||||
|
||||
/obj/item/gun/energy/gun/skrell/emp_act(severity)
|
||||
return //Fuck robots.
|
||||
@@ -244,7 +244,7 @@
|
||||
|
||||
firemodes = list(
|
||||
list(mode_name="disable", projectile_type=/obj/item/projectile/beam/stun/skrell, fire_sound='sound/weapons/Laser2.ogg'),
|
||||
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pulse/skrell, fire_sound='sound/weapons/Laser3.ogg')
|
||||
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pulse/skrell, fire_sound='sound/weapons/laser3.ogg')
|
||||
)
|
||||
|
||||
/obj/item/gun/energy/gun/skrell/smg
|
||||
@@ -261,7 +261,7 @@
|
||||
|
||||
firemodes = list(
|
||||
list(mode_name="disable", projectile_type=/obj/item/projectile/beam/stun/skrell, fire_sound='sound/weapons/Laser2.ogg'),
|
||||
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pulse/skrell, fire_sound='sound/weapons/Laser3.ogg', burst = 2, burst_delay = 2)
|
||||
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pulse/skrell, fire_sound='sound/weapons/laser3.ogg', burst = 2, burst_delay = 2)
|
||||
)
|
||||
|
||||
/obj/item/gun/energy/gun/qukala
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 2000)
|
||||
slot_flags = SLOT_BELT
|
||||
silenced = 1
|
||||
fire_sound = 'sound/weapons/genhit.ogg'
|
||||
fire_sound = 'sound/weapons/Genhit.ogg'
|
||||
projectile_type = /obj/item/projectile/energy/bolt
|
||||
max_shots = 5
|
||||
self_recharge = 1
|
||||
|
||||
@@ -412,7 +412,7 @@
|
||||
projectile = /obj/item/projectile/energy/dart
|
||||
damage = 0.25
|
||||
icon_state = "dart"
|
||||
firing_sound = 'sound/weapons/genhit.ogg'
|
||||
firing_sound = 'sound/weapons/Genhit.ogg'
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 3)
|
||||
|
||||
/obj/item/laser_components/modulator/blaster
|
||||
@@ -452,4 +452,4 @@
|
||||
projectile = /obj/item/projectile/beam/freezer
|
||||
icon_state = "blue"
|
||||
firing_sound = 'sound/weapons/pulse3.ogg'
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 5, TECH_MATERIAL = 4)
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 5, TECH_MATERIAL = 4)
|
||||
|
||||
@@ -70,7 +70,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/proc/boom(mob/user as mob)
|
||||
user.visible_message("<span class='danger'>\The [src] explodes all over [user] as they open it!</span>","<span class='danger'>\The [src] explodes all over you as you open it!</span>","You can hear a soda can explode.")
|
||||
playsound(loc,'sound/items/soda_burst.ogg', rand(20,50), 1)
|
||||
playsound(loc,'sound/items/Soda_Burst.ogg', rand(20,50), 1)
|
||||
reagents.clear_reagents()
|
||||
flags |= OPENCONTAINER
|
||||
shaken = 0
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
force = 2.0
|
||||
desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)."
|
||||
excavation_amount = 1
|
||||
drill_sound = 'sound/items/screwdriver.ogg'
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
drill_verb = "delicately picking"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
can_wield = 0
|
||||
@@ -52,7 +52,7 @@
|
||||
force = 2.0
|
||||
desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)."
|
||||
excavation_amount = 2
|
||||
drill_sound = 'sound/items/screwdriver.ogg'
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
drill_verb = "delicately picking"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
can_wield = 0
|
||||
@@ -71,7 +71,7 @@
|
||||
force = 2.0
|
||||
desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)."
|
||||
excavation_amount = 3
|
||||
drill_sound = 'sound/items/screwdriver.ogg'
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
drill_verb = "delicately picking"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
can_wield = 0
|
||||
@@ -90,7 +90,7 @@
|
||||
force = 2.0
|
||||
desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)."
|
||||
excavation_amount = 4
|
||||
drill_sound = 'sound/items/screwdriver.ogg'
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
drill_verb = "delicately picking"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
can_wield = 0
|
||||
@@ -109,7 +109,7 @@
|
||||
force = 2.0
|
||||
desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)."
|
||||
excavation_amount = 5
|
||||
drill_sound = 'sound/items/screwdriver.ogg'
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
drill_verb = "delicately picking"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
can_wield = 0
|
||||
@@ -128,7 +128,7 @@
|
||||
force = 2.0
|
||||
desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)."
|
||||
excavation_amount = 6
|
||||
drill_sound = 'sound/items/screwdriver.ogg'
|
||||
drill_sound = 'sound/items/Screwdriver.ogg'
|
||||
drill_verb = "delicately picking"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
can_wield = 0
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
ui.open()
|
||||
ui.set_auto_update(1)
|
||||
|
||||
/obj/machinery/computer/shuttle_control/Topic(href_list, href_list)
|
||||
/obj/machinery/computer/shuttle_control/Topic(href, href_list)
|
||||
..()
|
||||
handle_topic_href(SSshuttle.shuttles[shuttle_tag], href_list, usr)
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ How they spawn stuff is decided by behaviour vars, which are explained below
|
||||
var/list/newVars = list() //vars of the summoned objects will be replaced with those where they meet
|
||||
//should have format of list("emagged" = 1,"name" = "Wizard's Justicebot"), for example
|
||||
|
||||
cast_sound = 'sound/items/welder.ogg'
|
||||
cast_sound = 'sound/items/Welder.ogg'
|
||||
|
||||
/spell/aoe_turf/conjure/cast(list/targets, mob/user)
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
hud_state = "const_floor"
|
||||
|
||||
cast_sound = 'sound/items/welder.ogg'
|
||||
cast_sound = 'sound/items/Welder.ogg'
|
||||
|
||||
/spell/aoe_turf/cultify_area/cast(list/targets, mob/user)
|
||||
for(var/turf/target in targets)
|
||||
|
||||
@@ -228,7 +228,7 @@
|
||||
SPAN_NOTICE("You clamp bleeders in [target]'s [affected.name] with \the [tool]."))
|
||||
affected.clamp_organ()
|
||||
spread_germs_to_organ(affected, user)
|
||||
playsound(target.loc, 'sound/items/welder.ogg', 15, 1)
|
||||
playsound(target.loc, 'sound/items/Welder.ogg', 15, 1)
|
||||
|
||||
/singleton/surgery_step/generic/clamp_bleeders/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||
var/obj/item/organ/external/affected = target.get_organ(target_zone)
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
/datum/instrument/brass/crisis_trombone
|
||||
name = "Crisis Trombone"
|
||||
id = "crtrombone"
|
||||
samples = list("36"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/c2.ogg',
|
||||
"48"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/c3.ogg',
|
||||
"60"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/c4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/c5.ogg')
|
||||
samples = list("36"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C2.ogg',
|
||||
"48"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C3.ogg',
|
||||
"60"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C5.ogg')
|
||||
|
||||
|
||||
/datum/instrument/brass/crisis_trumpet
|
||||
name = "Crisis Trumpet"
|
||||
id = "crtrumpet"
|
||||
samples = list("60"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/c4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/c5.ogg')
|
||||
samples = list("60"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/C4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/C5.ogg')
|
||||
|
||||
@@ -24,10 +24,10 @@
|
||||
/datum/instrument/chromatic/fluid_celeste
|
||||
name = "FluidR3 Celeste"
|
||||
id = "r3celeste"
|
||||
samples = list("36"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c2.ogg',
|
||||
"48"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c3.ogg',
|
||||
"60"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c5.ogg',
|
||||
"84"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c6.ogg',
|
||||
"96"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c7.ogg',
|
||||
"108"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c8.ogg')
|
||||
samples = list("36"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C2.ogg',
|
||||
"48"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C3.ogg',
|
||||
"60"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C5.ogg',
|
||||
"84"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C6.ogg',
|
||||
"96"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C7.ogg',
|
||||
"108"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C8.ogg')
|
||||
|
||||
@@ -24,16 +24,16 @@
|
||||
/datum/instrument/guitar/clean_crisis
|
||||
name = "Crisis Clean Guitar"
|
||||
id = "ccleangt"
|
||||
samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/c2.ogg',
|
||||
"48"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/c3.ogg',
|
||||
"60"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/c4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/c5.ogg')
|
||||
samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C2.ogg',
|
||||
"48"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C3.ogg',
|
||||
"60"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C5.ogg')
|
||||
|
||||
|
||||
/datum/instrument/guitar/muted_crisis
|
||||
name = "Crisis Muted Guitar"
|
||||
id = "cmutedgt"
|
||||
samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/c2.ogg',
|
||||
"48"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/c3.ogg',
|
||||
"60"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/c4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/c5.ogg')
|
||||
samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C2.ogg',
|
||||
"48"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C3.ogg',
|
||||
"60"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C5.ogg')
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
/datum/instrument/piano/fluid_harpsichord
|
||||
name = "FluidR3 Harpsichord"
|
||||
id = "r3harpsi"
|
||||
samples = list("36"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c2.ogg',
|
||||
"48"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c3.ogg',
|
||||
"60"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c5.ogg',
|
||||
"84"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c6.ogg',
|
||||
"96"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c7.ogg',
|
||||
"108"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c8.ogg')
|
||||
samples = list("36"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C2.ogg',
|
||||
"48"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C3.ogg',
|
||||
"60"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C4.ogg',
|
||||
"72"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C5.ogg',
|
||||
"84"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C6.ogg',
|
||||
"96"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C7.ogg',
|
||||
"108"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C8.ogg')
|
||||
|
||||
|
||||
/datum/instrument/piano/crisis_harpsichord
|
||||
@@ -57,4 +57,4 @@
|
||||
"72"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c5.ogg',
|
||||
"84"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c6.ogg',
|
||||
"96"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c7.ogg',
|
||||
"108"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c8.ogg')
|
||||
"108"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c8.ogg')
|
||||
|
||||
@@ -254,7 +254,7 @@
|
||||
return null
|
||||
|
||||
/obj/structure/table/proc/remove_reinforced(obj/item/screwdriver/S, mob/user)
|
||||
reinforced = common_material_remove(user, reinforced, 40, "reinforcements", "screws", 'sound/items/screwdriver.ogg')
|
||||
reinforced = common_material_remove(user, reinforced, 40, "reinforcements", "screws", 'sound/items/Screwdriver.ogg')
|
||||
breakable = TRUE
|
||||
|
||||
/obj/structure/table/proc/remove_material(obj/item/wrench/W, mob/user)
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
to_chat(user, "<span class='caution'>You screw in the telepad's tracking beacon.</span>")
|
||||
stage = 0
|
||||
if(W.iswelder() && stage == 1)
|
||||
playsound(src, 'sound/items/welder.ogg', 50, 1)
|
||||
playsound(src, 'sound/items/Welder.ogg', 50, 1)
|
||||
to_chat(user, "<span class='caution'>You disassemble the telepad.</span>")
|
||||
new /obj/item/stack/material/steel(get_turf(src))
|
||||
new /obj/item/stack/material/glass(get_turf(src))
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
nuke_chat()
|
||||
|
||||
// Failed to fix, using tgalert as fallback
|
||||
action = input(src, "Did that work?", "", "Yes", "No, switch to old ui")
|
||||
action = input(src, "Did that work?", "", "Yes") in list("Yes", "No, switch to old ui")
|
||||
if (action == "No, switch to old ui")
|
||||
winset(src, "output", "on-show=&is-disabled=0&is-visible=1")
|
||||
winset(src, "browseroutput", "is-disabled=1;is-visible=0")
|
||||
|
||||
Reference in New Issue
Block a user