- "}
else
t = {"Navigation Beacon
- Ingredients: [pretty_ing] " + + //For each fruit + var/pretty_fru = "" + count = 0 + for(var/fru in food_recipes[Rp]["Fruit"]) + pretty_fru += "[count == 0 ? "" : ", "][food_recipes[Rp]["Fruit"][fru]]x [fru]" + count++ + if(pretty_fru != "") + html += "
- Fruit: [pretty_fru] " + + //For each reagent + var/pretty_rea = "" + count = 0 + for(var/rea in food_recipes[Rp]["Reagents"]) + pretty_rea += "[count == 0 ? "" : ", "][food_recipes[Rp]["Reagents"][rea]]u [rea]" + count++ + if(pretty_rea != "") + html += "
- Mix in: [pretty_rea] " + + //Close ingredients + html += "
-(swipe card to lock controls)
-Frequency: -- -- -[format_frequency(freq)] -+ -+
-
+(swipe card to lock controls)
Location: [location ? location : "(none)"]
Transponder Codes:
- "}
@@ -195,11 +150,7 @@ Transponder Codes:
- "}
if(open && !locked)
usr.set_machine(src)
- if(href_list["freq"])
- freq = sanitize_frequency(freq + text2num(href_list["freq"]))
- updateDialog()
-
- else if(href_list["locedit"])
+ if(href_list["locedit"])
var/newloc = sanitize(input("Enter New Location", "Navigation Beacon", location) as text|null)
if(newloc)
location = newloc
@@ -248,6 +199,41 @@ Transponder Codes:
- "}
/obj/machinery/navbeacon/Destroy()
navbeacons.Remove(src)
- if(radio_controller)
- radio_controller.remove_object(src, freq)
+ ..()
+
+
+//
+// Nav Beacon Mapping
+// These subtypes are what you should actually put into maps! they will make your life much easier.
+//
+// Developer Note: navbeacons do not HAVE to use these subtypes. They are purely for mapping convenience.
+// You can feel free to construct them in-game as just /obj/machinery/navbeacon and they will work just
+// fine, and you can define your own specific types for every instance on map if you want (BayStation does)
+// This design is a compromise that means you can do mapping without every single one being its own type
+// but with it still being easy to map ~ Leshana
+//
+
+// Mulebot delivery destinations
+
+/obj/machinery/navbeacon/delivery/north
+ codes = list("delivery" = 1, "dir" = NORTH)
+
+/obj/machinery/navbeacon/delivery/south
+ codes = list("delivery" = 1, "dir" = SOUTH)
+
+/obj/machinery/navbeacon/delivery/east
+ codes = list("delivery" = 1, "dir" = EAST)
+
+/obj/machinery/navbeacon/delivery/west
+ codes = list("delivery" = 1, "dir" = WEST)
+
+
+// For part of the patrol route
+// You MUST set "location"
+// You MUST set "next_patrol"
+/obj/machinery/navbeacon/patrol
+ var/next_patrol
+
+/obj/machinery/navbeacon/patrol/New()
+ codes = list("patrol" = 1, "next_patrol" = next_patrol)
..()
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index a378f0ff35..595712afd3 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -441,7 +441,7 @@ var/list/turret_icons
else
take_damage(initial(health) * 8) //should instakill most turrets
if(3)
- take_damage(initial(health) * 8 / 3)
+ take_damage(initial(health) * 8 / 3) //Level 4 is too weak to bother turrets
/obj/machinery/porta_turret/proc/die() //called when the turret dies, ie, health <= 0
health = 0
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index e9dbd93edf..a6da9bfa00 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -105,7 +105,7 @@
proc/shock()
var/obj/mecha/M = in_mecha()
if(M)
- M.emp_act(2)
+ M.emp_act(4)
qdel(src)
proc/get_mecha_log()
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 610746339b..485ea6987b 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -333,7 +333,7 @@ steam.start() -- spawns the effect
spawn(0)
var/turf/T = get_turf(src.holder)
if(T != src.oldposition)
- if(istype(T, /turf/simulated))
+ if(isturf(T))
var/obj/effect/effect/ion_trails/I = PoolOrNew(/obj/effect/effect/ion_trails, src.oldposition)
src.oldposition = T
I.set_dir(src.holder.dir)
diff --git a/code/game/objects/effects/zone_divider.dm b/code/game/objects/effects/zone_divider.dm
new file mode 100644
index 0000000000..5adabf318c
--- /dev/null
+++ b/code/game/objects/effects/zone_divider.dm
@@ -0,0 +1,20 @@
+// This artificially splits a ZAS zone, useful if you wish to prevent massive super-zones which can cause lag.
+/obj/effect/zone_divider
+ name = "zone divider"
+ icon = 'icons/mob/screen1.dmi'
+ icon_state = "x3"
+ invisibility = 101 //nope, can't see this
+ anchored = 1
+ density = 0
+ opacity = 0
+
+/obj/effect/zone_divider/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+ // Special case to prevent us from being part of a zone during the first air master tick.
+ // We must merge ourselves into a zone on next tick. This will cause a bit of lag on
+ // startup, but it can't really be helped you know?
+ if(air_master && air_master.current_cycle == 0)
+ spawn(1)
+ air_master.mark_for_update(get_turf(src))
+ return 0
+ return !air_group // Anything except zones can pass
+
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index c1df6b5454..3b1a3b54f5 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -4,17 +4,17 @@
// #define EMPDEBUG 10
-proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
+proc/empulse(turf/epicenter, first_range, second_range, third_range, fourth_range, log=0)
if(!epicenter) return
if(!istype(epicenter, /turf))
epicenter = get_turf(epicenter.loc)
if(log)
- message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
- log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
+ message_admins("EMP with size ([first_range], [second_range], [third_range], [fourth_range]) in area [epicenter.loc.name] ")
+ log_game("EMP with size ([first_range], [second_range], [third_range], [fourth_range]) in area [epicenter.loc.name] ")
- if(heavy_range > 1)
+ if(first_range > 1)
var/obj/effect/overlay/pulse = PoolOrNew(/obj/effect/overlay, epicenter)
pulse.icon = 'icons/effects/effects.dmi'
pulse.icon_state = "emppulse"
@@ -23,28 +23,50 @@ proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
spawn(20)
qdel(pulse)
- if(heavy_range > light_range)
- light_range = heavy_range
+ if(first_range > second_range)
+ second_range = first_range
+ if(second_range > third_range)
+ third_range = second_range
+ if(third_range > fourth_range)
+ fourth_range = third_range
- for(var/mob/M in range(heavy_range, epicenter))
+ for(var/mob/M in range(first_range, epicenter))
M << 'sound/effects/EMPulse.ogg'
- for(var/atom/T in range(light_range, epicenter))
+ for(var/atom/T in range(fourth_range, epicenter))
#ifdef EMPDEBUG
var/time = world.timeofday
#endif
var/distance = get_dist(epicenter, T)
if(distance < 0)
distance = 0
- if(distance < heavy_range)
+ //Worst effects, really hurts
+ if(distance < first_range)
T.emp_act(1)
- else if(distance == heavy_range)
+ else if(distance == first_range)
if(prob(50))
T.emp_act(1)
else
T.emp_act(2)
- else if(distance <= light_range)
+ //Slightly less painful
+ else if(distance <= second_range)
T.emp_act(2)
+ else if(distance == second_range)
+ if(prob(50))
+ T.emp_act(2)
+ else
+ T.emp_act(3)
+ //Even less slightly less painful
+ else if(distance <= third_range)
+ T.emp_act(3)
+ else if(distance == third_range)
+ if(prob(50))
+ T.emp_act(2)
+ else
+ T.emp_act(3)
+ //This should be more or less harmless
+ else if(distance <= fourth_range)
+ T.emp_act(4)
#ifdef EMPDEBUG
if((world.timeofday - time) >= EMPDEBUG)
log_and_message_admins("EMPDEBUG: [T.name] - [T.type] - took [world.timeofday - time]ds to process emp_act()!")
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index e72b4ba484..ef37af91c2 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -998,7 +998,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
M.apply_damage( rand(30,60) , BURN)
message += "You feel a searing heat! Your [P] is burning!"
if(i>=20 && i<=25) //EMP
- empulse(P.loc, 3, 6, 1)
+ empulse(P.loc, 1, 2, 4, 6, 1)
message += "Your [P] emits a wave of electromagnetic energy!"
if(i>=25 && i<=40) //Smoke
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm
index 2f0d7f1c3c..8bfe2dffca 100644
--- a/code/game/objects/items/devices/communicator/communicator.dm
+++ b/code/game/objects/items/devices/communicator/communicator.dm
@@ -213,6 +213,17 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
update_icon()
ui_interact(user)
+// Proc: MouseDrop()
+//Same thing PDAs do
+/obj/item/device/communicator/MouseDrop(obj/over_object as obj)
+ var/mob/M = usr
+ if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
+ return
+ if(!istype(over_object, /obj/screen))
+ return attack_self(M)
+ return
+
+
// Proc: attack_ghost()
// Parameters: 1 (user - the ghost clicking on the device)
// Description: Recreates the known_devices list, so that the ghost looking at the device can see themselves, then calls ..() so that NanoUI appears.
diff --git a/code/game/objects/items/devices/translator.dm b/code/game/objects/items/devices/translator.dm
new file mode 100644
index 0000000000..0bb26b32bc
--- /dev/null
+++ b/code/game/objects/items/devices/translator.dm
@@ -0,0 +1,79 @@
+//Universal translator
+/obj/item/device/universal_translator
+ name = "handheld translator"
+ desc = "This handy device appears to translate the languages it hears into onscreen text for a user."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "translator"
+ w_class = ITEMSIZE_SMALL
+ origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
+ var/mult_icons = 1 //Changes sprite when it translates
+ var/visual = 1 //If you need to see to get the message
+ var/audio = 0 //If you need to hear to get the message
+ var/listening = 0
+ var/datum/language/langset
+
+/obj/item/device/universal_translator/attack_self(mob/user)
+ if(!listening) //Turning ON
+ langset = input(user,"Translate to which of your languages?","Language Selection") as null|anything in user.languages
+ if(langset)
+ if(langset && ((langset.flags & NONVERBAL) || (langset.flags & HIVEMIND)))
+ to_chat(user, "\The [src] cannot output that language.")
+ return
+ else
+ listening = 1
+ listening_objects |= src
+ if(mult_icons)
+ icon_state = "[initial(icon_state)]1"
+ to_chat(user, "You enable \the [src], translating into [langset.name].")
+ else //Turning OFF
+ listening = 0
+ listening_objects -= src
+ langset = null
+ icon_state = "[initial(icon_state)]"
+ to_chat(user, "You disable \the [src].")
+
+/obj/item/device/universal_translator/hear_talk(var/mob/speaker, var/message, var/vrb, var/datum/language/language)
+ if(!listening || !istype(speaker))
+ return
+
+ //Show the "I heard something" animation.
+ if(mult_icons)
+ flick("[initial(icon_state)]2",src)
+
+ //Handheld or pocket only.
+ if(!isliving(loc))
+ return
+
+ var/mob/living/L = loc
+
+ if (language && (language.flags & NONVERBAL))
+ return //Not gonna translate sign language
+
+ if (visual && ((L.sdisabilities & BLIND) || L.eye_blind))
+ return //Can't see the screen, don't get the message
+
+ if (audio && ((L.sdisabilities & DEAF) || L.ear_deaf))
+ return //Can't hear the translation, don't get the message
+
+ //Only translate if they can't understand, otherwise pointlessly spammy
+ //I'll just assume they don't look at the screen in that case
+
+ //They don't understand the spoken language we're translating FROM
+ if(!L.say_understands(speaker,language))
+ //They understand the output language
+ if(L.say_understands(null,langset))
+ to_chat(L, "[src] translates, \"[message]\"")
+
+ //They don't understand the output language
+ else
+ to_chat(L, "[src] translates, \"[langset.scramble(message)]\"")
+
+//Let's try an ear-worn version
+/obj/item/device/universal_translator/ear
+ name = "translator earpiece"
+ desc = "This handy device appears to translate the languages it hears into another language for a user."
+ icon_state = "earpiece"
+ w_class = ITEMSIZE_TINY
+ slot_flags = SLOT_EARS
+ visual = 0
+ audio = 1
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index dd1d6a55b0..8f4cd48e2c 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -3,12 +3,14 @@
icon_state = "emp"
item_state = "empgrenade"
origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3)
- var/emp_heavy = 4
- var/emp_light = 10
+ var/emp_heavy = 2
+ var/emp_med = 4
+ var/emp_light = 7
+ var/emp_long = 10
prime()
..()
- if(empulse(src, emp_heavy, emp_light))
+ if(empulse(src, emp_heavy, emp_med, emp_light, emp_long))
qdel(src)
return
@@ -18,4 +20,6 @@
icon_state = "lyemp"
origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3)
emp_heavy = 1
- emp_light = 4
\ No newline at end of file
+ emp_med = 2
+ emp_light = 3
+ emp_long = 4
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 4407e29c72..c3ddb4fb39 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -101,6 +101,10 @@ Implant Specifics:
"} meltdown() if(2) delay = rand(5*60*10,15*60*10) //from 5 to 15 minutes of free time + if(3) + delay = rand(2*60*10,5*60*10) //from 2 to 5 minutes of free time + if(4) + delay = rand(0.5*60*10,1*60*10) //from .5 to 1 minutes of free time spawn(delay) malfunction-- @@ -227,10 +231,22 @@ Implant Specifics:
"} return malfunction = MALFUNCTION_TEMPORARY switch (severity) - if (2.0) //Weak EMP will make implant tear limbs off. + if (4) //Weak EMP will make implant tear limbs off. + if (prob(25)) + small_boom() + if (3) //Weak EMP will make implant tear limbs off. if (prob(50)) small_boom() - if (1.0) //strong EMP will melt implant either making it go off, or disarming it + if (2) //strong EMP will melt implant either making it go off, or disarming it + if (prob(70)) + if (prob(75)) + small_boom() + else + if (prob(13)) + activate() //chance of bye bye + else + meltdown() //chance of implant disarming + if (1) //strong EMP will melt implant either making it go off, or disarming it if (prob(70)) if (prob(50)) small_boom() @@ -320,7 +336,13 @@ the implant may become unstable and either pre-maturely inject the subject or si if(prob(60)) activate(20) if(2) - if(prob(30)) + if(prob(40)) + activate(20) + if(3) + if(prob(40)) + activate(5) + if(4) + if(prob(20)) activate(5) spawn(20) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 6c2b6aa885..0ff657e9cc 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -103,7 +103,7 @@ /obj/item/weapon/tank/vox //Can't be a child of phoron or the gas amount gets screwey. name = "phoron tank" desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." - icon_state = "oxygen_fr" + icon_state = "phoron_vox" gauge_icon = null flags = CONDUCT distribute_pressure = ONE_ATMOSPHERE*O2STANDARD @@ -209,4 +209,4 @@ /obj/item/weapon/tank/nitrogen/examine(mob/user) if(..(user, 0) && air_contents.gas["nitrogen"] < 10) user << text("The meter on \the [src] indicates you are almost out of nitrogen!") - //playsound(user, 'sound/effects/alert.ogg', 50, 1) \ No newline at end of file + //playsound(user, 'sound/effects/alert.ogg', 50, 1) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 09aeac362f..6dfd71f2bf 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -142,6 +142,7 @@ new /obj/item/clothing/suit/storage/toggle/labcoat/emt(src) new /obj/item/device/radio/headset/headset_med/alt(src) new /obj/item/weapon/cartridge/medical(src) + new /obj/item/weapon/storage/briefcase/inflatable(src) new /obj/item/device/flashlight(src) new /obj/item/weapon/tank/emergency/oxygen/engi(src) new /obj/item/clothing/glasses/hud/health(src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 62a3c64e48..add1bd2c2a 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -283,9 +283,9 @@ /obj/structure/closet/crate/rcd name = "\improper RCD crate" desc = "A crate with rapid construction device." - icon_state = "crate" - icon_opened = "crateopen" - icon_closed = "crate" + icon_state = "engi_crate" + icon_opened = "engi_crateopen" + icon_closed = "engi_crate" /obj/structure/closet/crate/rcd/New() ..() @@ -427,6 +427,20 @@ icon_opened = "hydrosecurecrateopen" icon_closed = "hydrosecurecrate" +/obj/structure/closet/crate/secure/engineering + desc = "A crate with a lock on it, painted in the scheme of the station's engineers." + name = "secure engineering crate" + icon_state = "engi_secure_crate" + icon_opened = "engi_secure_crateopen" + icon_closed = "engi_secure_crate" + +/obj/structure/closet/crate/secure/science + name = "secure science crate" + desc = "A crate with a lock on it, painted in the scheme of the station's scientists." + icon_state = "scisecurecrate" + icon_opened = "scisecurecrateopen" + icon_closed = "scisecurecrate" + /obj/structure/closet/crate/secure/bin name = "secure bin" desc = "A secure bin." @@ -499,6 +513,23 @@ icon_opened = "largermetalopen" icon_closed = "largermetal" +/obj/structure/closet/crate/engineering + name = "engineering crate" + icon_state = "engi_crate" + icon_opened = "engi_crateopen" + icon_closed = "engi_crate" + +/obj/structure/closet/crate/engineering/electrical + icon_state = "engi_e_crate" + icon_opened = "engi_crateopen" + icon_closed = "engi_e_crate" + +/obj/structure/closet/crate/science + name = "science crate" + icon_state = "scicrate" + icon_opened = "scicrateopen" + icon_closed = "scicrate" + /obj/structure/closet/crate/hydroponics name = "hydroponics crate" desc = "All you need to destroy those pesky weeds and pests." diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index d8de10bf18..c0d27cad1c 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -72,7 +72,7 @@ /obj/structure/largecrate/animal/goat name = "goat crate" - held_type = /mob/living/simple_animal/hostile/retaliate/goat + held_type = /mob/living/simple_animal/retaliate/goat /obj/structure/largecrate/animal/cat name = "cat carrier" diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 834eadc2a4..d038b592fa 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -107,6 +107,16 @@ airlock_type = "/highsecurity" glass = -1 +/obj/structure/door_assembly/door_assembly_voidcraft + base_icon_state = "voidcraft" + base_name = "voidcraft hatch" + airlock_type = "/voidcraft" + glass = -1 + +/obj/structure/door_assembly/door_assembly_voidcraft/vertical + base_icon_state = "voidcraft_vertical" + airlock_type = "/voidcraft/vertical" + /obj/structure/door_assembly/multi_tile icon = 'icons/obj/doors/door_assembly2x1.dmi' dir = EAST diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index fc4dcd1d25..56b503c7c7 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -17,7 +17,7 @@ var/list/floor_decals = list() /obj/effect/floor_decal/initialize() if(supplied_dir) set_dir(supplied_dir) var/turf/T = get_turf(src) - if(istype(T, /turf/simulated/floor) || istype(T, /turf/unsimulated/floor)) + if(istype(T, /turf/simulated/floor) || istype(T, /turf/unsimulated/floor) || istype(T, /turf/simulated/shuttle/floor)) var/cache_key = "[alpha]-[color]-[dir]-[icon_state]-[layer]" if(!floor_decals[cache_key]) var/image/I = image(icon = src.icon, icon_state = src.icon_state, dir = src.dir) diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index 0d3e43bbfa..5da0015482 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -19,6 +19,34 @@ density = 1 blocks_air = 1 +/turf/simulated/shuttle/wall/voidcraft + name = "voidcraft wall" + icon = 'icons/turf/voidcraft_walls.dmi' + icon_state = "voidcraft_wall_alone" + var/stripe_color = null // If set, generates a colored stripe overlay. Accepts #XXXXXX as input. + +/turf/simulated/shuttle/wall/voidcraft/red + stripe_color = "#FF0000" + +/turf/simulated/shuttle/wall/voidcraft/blue + stripe_color = "#0000FF" + +/turf/simulated/shuttle/wall/voidcraft/green + stripe_color = "#00FF00" + +/turf/simulated/shuttle/wall/voidcraft/New() + ..() + update_icon() + +/turf/simulated/shuttle/wall/voidcraft/update_icon() + var/list/icon_states = icon_states(src.icon) + if(("[icon_state]_stripe" in icon_states) && stripe_color) + overlays.Cut() + var/image/I = image(icon = src.icon, dir = src.dir, icon_state = "[icon_state]_stripe") + if(stripe_color) + I.color = stripe_color + overlays.Add(I) + /turf/simulated/shuttle/floor name = "floor" icon_state = "floor" @@ -41,4 +69,15 @@ oxygen = 0 nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD +/turf/simulated/shuttle/floor/voidcraft + name = "voidcraft tiles" + icon_state = "voidcraft_floor" + +/turf/simulated/shuttle/floor/voidcraft/dark + name = "voidcraft tiles" + icon_state = "voidcraft_floor_dark" + +/turf/simulated/shuttle/floor/voidcraft/light + name = "voidcraft tiles" + icon_state = "voidcraft_floor_light" diff --git a/code/game/turfs/simulated/outdoors/dirt.dm b/code/game/turfs/simulated/outdoors/dirt.dm index 1d735d81be..4d14205072 100644 --- a/code/game/turfs/simulated/outdoors/dirt.dm +++ b/code/game/turfs/simulated/outdoors/dirt.dm @@ -2,5 +2,5 @@ name = "dirt" desc = "Quite dirty!" icon_state = "dirt-dark" - edge_blending_priority = 1 + edge_blending_priority = 2 turf_layers = list(/turf/simulated/floor/outdoors/rocks) \ No newline at end of file diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm index 98b7d3dfba..6693c45874 100644 --- a/code/game/turfs/simulated/outdoors/grass.dm +++ b/code/game/turfs/simulated/outdoors/grass.dm @@ -6,7 +6,7 @@ var/list/grass_types = list( /turf/simulated/floor/outdoors/grass name = "grass" icon_state = "grass" - edge_blending_priority = 3 + edge_blending_priority = 4 turf_layers = list( /turf/simulated/floor/outdoors/rocks, /turf/simulated/floor/outdoors/dirt @@ -16,8 +16,14 @@ var/list/grass_types = list( /turf/simulated/floor/outdoors/grass/sif name = "growth" icon_state = "grass_sif" - edge_blending_priority = 3 + edge_blending_priority = 4 grass_chance = 0 + var/tree_chance = 2 + +/turf/simulated/floor/outdoors/grass/sif/New() + if(tree_chance && prob(tree_chance)) + new /obj/structure/flora/tree/sif(src) + ..() /turf/simulated/floor/outdoors/grass/New() if(prob(50)) @@ -33,10 +39,11 @@ var/list/grass_types = list( name = "thick grass" icon_state = "grass-dark" grass_chance = 80 - //tree_prob = 20 - edge_blending_priority = 4 + //tree_chance = 20 + edge_blending_priority = 5 /turf/simulated/floor/outdoors/grass/sif/forest name = "thick growth" icon_state = "grass_sif_dark" - edge_blending_priority = 4 \ No newline at end of file + edge_blending_priority = 5 + tree_chance = 10 \ No newline at end of file diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 0ee844f320..da69406157 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -55,7 +55,7 @@ var/list/outdoor_turfs = list() /turf/simulated/floor/outdoors/mud name = "grass" icon_state = "mud_dark" - edge_blending_priority = 2 + edge_blending_priority = 3 /turf/simulated/floor/outdoors/rocks name = "rocks" diff --git a/code/game/turfs/simulated/outdoors/snow.dm b/code/game/turfs/simulated/outdoors/snow.dm index 474bdb171c..16678d7c98 100644 --- a/code/game/turfs/simulated/outdoors/snow.dm +++ b/code/game/turfs/simulated/outdoors/snow.dm @@ -1,7 +1,7 @@ /turf/simulated/floor/outdoors/snow name = "snow" icon_state = "snow" - edge_blending_priority = 5 + edge_blending_priority = 6 movement_cost = 2 turf_layers = list( /turf/simulated/floor/outdoors/rocks, diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index fe45a77692..25d6afb415 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -45,4 +45,10 @@ ..(newloc,"titanium") /turf/simulated/wall/durasteel/New(var/newloc) - ..(newloc,"durasteel", "durasteel") \ No newline at end of file + ..(newloc,"durasteel", "durasteel") + +/turf/simulated/wall/wood/New(var/newloc) + ..(newloc,"wood") + +/turf/simulated/wall/sifwood/New(var/newloc) + ..(newloc,"alien wood") \ No newline at end of file diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index cad62cc8de..77eb419ed1 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -3,12 +3,12 @@ name = "shallow water" desc = "A body of water. It seems shallow enough to walk through, if needed." icon = 'icons/turf/outdoors.dmi' - icon_state = "water_shallow" + icon_state = "seashallow" // So it shows up in the map editor as water. + var/water_state = "water_shallow" var/under_state = "rock" edge_blending_priority = -1 movement_cost = 4 outdoors = TRUE - var/movement_message = "You are slowed considerably from the water as you move across it." // Displayed to mobs crossing from one water tile to another. var/depth = 1 // Higher numbers indicates deeper water. /turf/simulated/floor/water/New() @@ -17,6 +17,7 @@ /turf/simulated/floor/water/update_icon() ..() // To get the edges. This also gets rid of other overlays so it needs to go first. + icon_state = water_state var/image/floorbed_sprite = image(icon = 'icons/turf/outdoors.dmi', icon_state = under_state) underlays.Add(floorbed_sprite) update_icon_edge() @@ -43,8 +44,6 @@ L.update_water() if(!istype(oldloc, /turf/simulated/floor/water)) to_chat(L, "You get drenched in water from entering \the [src]!") - else - to_chat(L, "[movement_message]") AM.water_act(5) ..() @@ -63,7 +62,6 @@ under_state = "abyss" edge_blending_priority = -2 movement_cost = 8 - movement_message = "You swim forwards." depth = 2 /turf/simulated/floor/water/pool @@ -72,6 +70,11 @@ under_state = "pool" outdoors = FALSE +/turf/simulated/floor/water/deep/pool + name = "deep pool" + desc = "Don't worry, it's not closed." + outdoors = FALSE + /mob/living/proc/can_breathe_water() return FALSE @@ -93,4 +96,33 @@ /mob/living/water_act(amount) adjust_fire_stacks(amount * 5) for(var/atom/movable/AM in contents) - AM.water_act(amount) \ No newline at end of file + AM.water_act(amount) + +var/list/shoreline_icon_cache = list() + +/turf/simulated/floor/water/shoreline + name = "shoreline" + desc = "The waves look calm and inviting." + icon_state = "shoreline" + water_state = "rock" // Water gets generated as an overlay in update_icon() + depth = 0 + +/turf/simulated/floor/water/shoreline/corner + icon_state = "shorelinecorner" + +// Water sprites are really annoying, so let BYOND sort it out. +/turf/simulated/floor/water/shoreline/update_icon() + underlays.Cut() + overlays.Cut() + ..() // Get the underlay first. + var/cache_string = "[initial(icon_state)]_[water_state]_[dir]" + if(cache_string in shoreline_icon_cache) // Check to see if an icon already exists. + overlays += shoreline_icon_cache[cache_string] + else // If not, make one, but only once. + var/icon/shoreline_water = icon(src.icon, "shoreline_water", src.dir) + var/icon/shoreline_subtract = icon(src.icon, "[initial(icon_state)]_subtract", src.dir) + shoreline_water.Blend(shoreline_subtract,ICON_SUBTRACT) + + shoreline_icon_cache[cache_string] = shoreline_water + overlays += shoreline_icon_cache[cache_string] + diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index bf5ee47cba..91fff2c4c2 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -161,7 +161,8 @@ var/list/admin_verbs_server = list( /client/proc/toggle_random_events, /client/proc/check_customitem_activity, /client/proc/nanomapgen_DumpImage, - /client/proc/modify_server_news + /client/proc/modify_server_news, + /client/proc/recipe_dump ) var/list/admin_verbs_debug = list( /client/proc/getruntimelog, //allows us to access runtime logs to somebody, diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index d94535918f..8ffcc88692 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -471,8 +471,10 @@ Traitors and the like can also be revived with the previous role mostly intact. antag_data.place_mob(new_character) //If desired, apply equipment. - if(equipment && charjob) - job_master.EquipRank(new_character, charjob, 1) + if(equipment) + if(charjob) + job_master.EquipRank(new_character, charjob, 1) + equip_custom_items(new_character) //If desired, add records. if(records) @@ -637,14 +639,18 @@ Traitors and the like can also be revived with the previous role mostly intact. var/heavy = input("Range of heavy pulse.", text("Input")) as num|null if(heavy == null) return + var/med = input("Range of medium pulse.", text("Input")) as num|null + if(med == null) return var/light = input("Range of light pulse.", text("Input")) as num|null if(light == null) return + var/long = input("Range of long pulse.", text("Input")) as num|null + if(long == null) return - if (heavy || light) + if (heavy || med || light || long) - empulse(O, heavy, light) - log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])") - message_admins("[key_name_admin(usr)] created an EM PUlse ([heavy],[light]) at ([O.x],[O.y],[O.z])", 1) + empulse(O, heavy, med, light, long) + log_admin("[key_name(usr)] created an EM Pulse ([heavy],[med],[light],[long]) at ([O.x],[O.y],[O.z])") + message_admins("[key_name_admin(usr)] created an EM PUlse ([heavy],[med],[light],[long]) at ([O.x],[O.y],[O.z])", 1) feedback_add_details("admin_verb","EMP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return diff --git a/code/modules/busy_space/air_traffic.dm b/code/modules/busy_space/air_traffic.dm new file mode 100644 index 0000000000..7da2c6f73b --- /dev/null +++ b/code/modules/busy_space/air_traffic.dm @@ -0,0 +1,129 @@ +//Cactus, Speedbird, Dynasty, oh my + +var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller + +/datum/lore/atc_controller + var/delay_max = 25 MINUTES //How long between ATC traffic, max. Default is 25 mins. + var/delay_min = 40 MINUTES //How long between ATC traffic, min. Default is 40 mins. + var/backoff_delay = 5 MINUTES //How long to back off if we can't talk and want to. Default is 5 mins. + var/next_message //When the next message should happen in world.time + var/force_chatter_type //Force a specific type of messages + + var/squelched = 0 //If ATC is squelched currently + +/datum/lore/atc_controller/New() + spawn(10 SECONDS) //Lots of lag at the start of a shift. + msg("New shift beginning, resuming traffic control.") + next_message = world.time + rand(delay_min,delay_max) + process() + +/datum/lore/atc_controller/proc/process() + if(world.time >= next_message) + if(squelched) + next_message = world.time + backoff_delay + else + next_message = world.time + rand(delay_min,delay_max) + random_convo() + + spawn(1 MINUTE) //We don't really need high-accuracy here. + process() + +/datum/lore/atc_controller/proc/msg(var/message,var/sender) + ASSERT(message) + global_announcer.autosay("[message]", sender ? sender : "[using_map.station_short] Space Control") + +/datum/lore/atc_controller/proc/reroute_traffic(var/yes = 1) + if(yes) + if(!squelched) + msg("Rerouting traffic away from [using_map.station_name].") + squelched = 1 + else + if(squelched) + msg("Resuming normal traffic routing around [using_map.station_name].") + squelched = 0 + +/datum/lore/atc_controller/proc/shift_ending(var/evac = 0) + msg("Automated Shuttle departing [using_map.station_name] for [using_map.dock_name] on routine transfer route.","NT Automated Shuttle") + sleep(5 SECONDS) + msg("Automated Shuttle, cleared to complete routine transfer from [using_map.station_name] to [using_map.dock_name].") + +/datum/lore/atc_controller/proc/random_convo() + var/one = pick(loremaster.organizations) //These will pick an index, not an instance + var/two = pick(loremaster.organizations) + + var/datum/lore/organization/source = loremaster.organizations[one] //Resolve to the instances + var/datum/lore/organization/dest = loremaster.organizations[two] + + //Let's get some mission parameters + var/owner = source.short_name //Use the short name + var/prefix = pick(source.ship_prefixes) //Pick a random prefix + var/mission = source.ship_prefixes[prefix] //The value of the prefix is the mission type that prefix does + var/shipname = pick(source.ship_names) //Pick a random ship name to go with it + var/destname = pick(dest.destination_names) //Pick a random holding from the destination + + var/combined_name = "[owner] [prefix] [shipname]" + var/alt_atc_names = list("[using_map.station_short] TraCon","[using_map.station_short] Control","[using_map.station_short] STC","[using_map.station_short] Airspace") + var/wrong_atc_names = list("Sol Command","Orion Control", "[using_map.dock_name]") + var/mission_noun = list("flight","mission","route") + var/request_verb = list("requesting","calling for","asking for") + + //First response is 'yes', second is 'no' + var/requests = list("[using_map.station_short] transit clearance" = list("permission for transit granted", "permission for transit denied, contact regional on 953.5"), + "planetary flight rules" = list("authorizing planetary flight rules", "denying planetary flight rules right now due to traffic"), + "special flight rules" = list("authorizing special flight rules", "denying special flight rules, not allowed for your traffic class"), + "current solar weather info" = list("sending you the relevant information via tightbeam", "cannot fulfill your request at the moment"), + "nearby traffic info" = list("sending you current traffic info", "no available info in your area"), + "remote telemetry data" = list("sending telemetry now", "no uplink from your ship, recheck your uplink and ask again"), + "refueling information" = list("sending refueling information now", "no fuel for your ship class in this sector"), + "a current system time sync" = list("sending time sync ping to you now", "your ship isn't compatible with our time sync, set time manually"), + "current system starcharts" = list("transmitting current starcharts", "your request is queued, overloaded right now"), + "permission to engage FTL" = list("permission to engage FTL granted, good day", "permission denied, wait for current traffic to pass"), + "permission to transit system" = list("permission to transit granted, good day", "permission denied, wait for current traffic to pass"), + "permission to depart system" = list("permission to depart granted, good day", "permission denied, wait for current traffic to pass"), + "permission to enter system" = list("good day, permission to enter granted", "permission denied, wait for current traffic to pass"), + ) + + //Random chance things for variety + var/chatter_type = "normal" + if(force_chatter_type) + chatter_type = force_chatter_type + else + chatter_type = pick(2;"emerg",5;"wrong_freq","normal") //Be nice to have wrong_lang... + + var/yes = prob(90) //Chance for them to say yes vs no + + var/request = pick(requests) + var/callname = pick(alt_atc_names) + var/response = requests[request][yes ? 1 : 2] //1 is yes, 2 is no + + var/full_request + var/full_response + var/full_closure + + switch(chatter_type) + if("wrong_freq") + callname = pick(wrong_atc_names) + full_request = "[callname], this is [combined_name] on a [mission] [pick(mission_noun)] to [destname], [pick(request_verb)] [request]." + full_response = "[combined_name], this is [using_map.station_short] TraCon, wrong frequency. Switch to [rand(700,999)].[rand(1,9)]." + full_closure = "[using_map.station_short] TraCon, understood, apologies." + if("wrong_lang") + //Can't implement this until autosay has language support + if("emerg") + var/problem = pick("hull breaches on multiple decks","unknown life forms on board","a drive about to go critical","asteroids impacting the hull","a total loss of engine power","people trying to board the ship") + full_request = "This is [combined_name] declaring an emergency! We have [problem]!" + full_response = "[combined_name], this is [using_map.station_short] TraCon, copy. Switch to emergency responder channel [rand(700,999)].[rand(1,9)]." + full_closure = "[using_map.station_short] TraCon, okay, switching now." + else + full_request = "[callname], this is [combined_name] on a [mission] [pick(mission_noun)] to [destname], [pick(request_verb)] [request]." + full_response = "[combined_name], this is [using_map.station_short] TraCon, [response]." //Station TraCon always calls themselves TraCon + full_closure = "[using_map.station_short] TraCon, [yes ? "thank you" : "understood"], good day." //They always copy what TraCon called themselves in the end when they realize they said it wrong + + //Ship sends request to ATC + msg(full_request,"[prefix] [shipname]") + sleep(5 SECONDS) + //ATC sends response to ship + msg(full_response) + sleep(5 SECONDS) + //Ship sends response to ATC + msg(full_closure,"[prefix] [shipname]") + return \ No newline at end of file diff --git a/code/modules/busy_space/loremaster.dm b/code/modules/busy_space/loremaster.dm new file mode 100644 index 0000000000..30bd04402d --- /dev/null +++ b/code/modules/busy_space/loremaster.dm @@ -0,0 +1,13 @@ +//I AM THE LOREMASTER, ARE YOU THE GATEKEEPER? + +var/datum/lore/loremaster/loremaster = new/datum/lore/loremaster + +/datum/lore/loremaster + var/list/organizations = list() + +/datum/lore/loremaster/New() + + var/list/paths = typesof(/datum/lore/organization) - /datum/lore/organization + for(var/path in paths) + var/datum/lore/organization/instance = new path() + organizations[path] = instance \ No newline at end of file diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm new file mode 100644 index 0000000000..86f88e7ec0 --- /dev/null +++ b/code/modules/busy_space/organizations.dm @@ -0,0 +1,326 @@ +//Datums for different companies that can be used by busy_space +/datum/lore/organization + var/name = "" // Organization's name + var/short_name = "" // Organization's shortname (NanoTrasen for "NanoTrasen Incorporated") + var/desc = "" // One or two paragraph description of the organization, but only current stuff. Currently unused. + var/history = "" // Historical discription of the organization's origins Currently unused. + var/work = "" // Short description of their work, eg "an arms manufacturer" + var/headquarters = "" // Location of the organization's HQ. Currently unused. + var/motto = "" // A motto/jingle/whatever, if they have one. Currently unused. + + var/list/ship_prefixes = list() //Some might have more than one! Like NanoTrasen. Value is the mission they perform, e.g. ("ABC" = "mission desc") + var/list/ship_names = list( //Names of spaceships. This is a mostly generic list that all the other organizations inherit from if they don't have anything better. + "Kestrel", + "Beacon", + "Signal", + "Freedom", + "Glory", + "Axiom", + "Eternal", + "Icarus", + "Harmony", + "Light", + "Discovery", + "Endeavour", + "Explorer", + "Swift", + "Dragonfly", + "Ascendant", + "Tenacious", + "Pioneer", + "Hawk", + "Haste", + "Radiant", + "Luminous" + ) + var/list/destination_names = list() //Names of static holdings that the organization's ships visit regularly. + var/autogenerate_destination_names = TRUE + +/datum/lore/organization/New() + ..() + if(autogenerate_destination_names) // Lets pad out the destination names. + var/i = rand(6, 10) + var/list/star_names = list( + "Sol", "Alpha Centauri", "Sirius", "Vega", "Regulus", "Vir", "Algol", "Aldebaran", + "Delta Doradus", "Menkar", "Geminga", "Elnath", "Gienah", "Mu Leporis", "Nyx", "Tau Ceti", + "Wazn", "Alphard", "Phact", "Altair") + var/list/destination_types = list("dockyard", "station", "vessel", "waystation", "telecommunications satellite", "spaceport", "distress beacon", "anomaly", "colony", "outpost") + while(i) + destination_names.Add("a [pick(destination_types)] in [pick(star_names)]") + i-- + +////////////////////////////////////////////////////////////////////////////////// + +// TSCs +/datum/lore/organization/nanotrasen + name = "NanoTrasen Incorporated" + short_name = "NanoTrasen" + desc = "" // Todo: Write this. + history = "" // This too. + work = "research giant" + headquarters = "Luna" + motto = "" + + ship_prefixes = list("NSV" = "exploration", "NTV" = "hauling", "NDV" = "patrol", "NRV" = "emergency response") + // Note that the current station being used will be pruned from this list upon being instantiated + destination_names = list( + "NSS Exodus in Nyx", + "NCS Northern Star in Vir", + "NCS Southern Cross in Vir", + "NDV Icarus in Nyx", + "NAS Vir Central Command", + "a dockyard orbiting Sif", + "an asteroid orbiting Kara", + "an asteroid orbiting Rota", + "Vir Interstellar Spaceport" + ) + +/datum/lore/organization/nanotrasen/New() + ..() + // Get rid of the current map from the list, so ships flying in don't say they're coming to the current map. + var/string_to_test = "[using_map.station_name] in [using_map.starsys_name]" + if(string_to_test in destination_names) + destination_names.Remove(string_to_test) + + + +/datum/lore/organization/hephaestus + name = "Hephaestus Industries" + short_name = "Hephaestus" + desc = "Hephaestus Industries is the largest supplier of arms, ammunition, and small millitary vehicles in Sol space. \ + Hephaestus products have a reputation for reliability, and the corporation itself has a noted tendency to stay removed \ + from corporate politics. They enforce their neutrality with the help of a fairly large asset-protection contingent which \ + prevents any contracting polities from using their own materiel against them. SolGov itself is one of Hephastus’ largest \ + bulk contractors owing to the above factors." + history = "" + work = "arms manufacturer" + headquarters = "" + motto = "" + + ship_prefixes = list("HTV" = "freight", "HTV" = "munitions resupply") + destination_names = list( + "a SolGov dockyard on Luna" + ) + +/datum/lore/organization/vey_med + name = "Vey Medical" + short_name = "Vey Med" + desc = "Vey-Med is one of the newer TSCs on the block and is notable for being largely owned and opperated by Skrell. \ + Despite the suspicion and prejudice leveled at them for their alien origin, Vey-Med has obtained market dominance in \ + the sale of medical equipment-- from surgical tools to large medical devices to the Oddyseus trauma response mecha \ + and everything in between. Their equipment tends to be top-of-the-line, most obviously shown by their incredibly \ + human-like FBP designs. Vey’s rise to stardom came from their introduction of ressurective cloning, although in \ + recent years they’ve been forced to diversify as their patents expired and NanoTrasen-made medications became \ + essential to modern cloning." + history = "" + work = "medical equipment supplier" + headquarters = "" + motto = "" + + ship_prefixes = list("VTV" = "transportation", "VMV" = "medical resupply") + destination_names = list() + +/datum/lore/organization/zeng_hu + name = "Zeng-Hu pharmaceuticals" + short_name = "Zeng-Hu" + desc = "Zeng-Hu is an old TSC, based in the Sol system. Until the discovery of Phoron, Zeng-Hu maintained a stranglehold \ + on the market for medications, and many household names are patentted by Zeng-Hu-- Bicaridyne, Dylovene, Tricordrizine, \ + and Dexalin all came from a Zeng-Hu medical laboratory. Zeng-Hu’s fortunes have been in decline as Nanotrasen’s near monopoly \ + on phoron research cuts into their R&D and Vey-Med’s superior medical equipment effectively decimated their own equipment \ + interests. The three-way rivalry between these companies for dominance in the medical field is well-known and a matter of \ + constant economic speculation." + history = "" + work = "pharmaceuticals company" + headquarters = "" + motto = "" + + ship_prefixes = list("ZTV" = "transportation", "ZMV" = "medical resupply") + destination_names = list() + +/datum/lore/organization/ward_takahashi + name = "Ward-Takahashi General Manufacturing Conglomerate" + short_name = "Ward-Takahashi" + desc = "Ward-Takahashi focuses on the sale of small consumer electronics, with its computers, communicators, \ + and even mid-class automobiles a fixture of many households. Less famously, Ward-Takahashi also supplies most \ + of the AI cores on which vital control systems are mounted, and it is this branch of their industry that has \ + led to their tertiary interest in the development and sale of high-grade AI systems. Ward-Takahashi’s economies \ + of scale frequently steal market share from Nanotrasen’s high-price products, leading to a bitter rivalry in the \ + consumer electronics market." + history = "" + work = "electronics manufacturer" + headquarters = "" + motto = "" + + ship_prefixes = list("WTV" = "freight") + destination_names = list() + +/datum/lore/organization/bishop + name = "Bishop Cybernetics" + short_name = "Bishop" + desc = "Bishop’s focus is on high-class, stylish cybernetics. A favorite among transhumanists (and a bête noire for \ + bioconservatives), Bishop manufactures not only prostheses but also brain augmentation, synthetic organ replacements, \ + and odds and ends like implanted wrist-watches. Their business model tends towards smaller, boutique operations, giving \ + it a reputation for high price and luxury, with Bishop cyberware often rivalling Vey-Med’s for cost. Bishop’s reputation \ + for catering towards the interests of human augmentation enthusiasts instead of positronics have earned it ire from the \ + Positronic Rights Group and puts it in ideological (but not economic) comptetition with Morpheus Cyberkinetics." + history = "" + work = "cybernetics and augmentation manufacturer" + headquarters = "" + motto = "" + + ship_prefixes = list("BTV" = "transportation") + destination_names = list() + +/datum/lore/organization/morpheus + name = "Morpheus Cyberkinetics" + short_name = "Morpheus" + desc = "The only large corporation run by positronic intelligences, Morpheus caters almost exclusively to their sensibilities \ + and needs. A product of the synthetic colony of Shelf, Morpheus eschews traditional advertising to keep their prices low and \ + relied on word of mouth among positronics to reach their current economic dominance. Morpheus in exchange lobbies heavily for \ + positronic rights, sponsors positronics through their Jans-Fhriede test, and tends to other positronic concerns to earn them \ + the good-will of the positronics, and the ire of those who wish to exploit them." + history = "" + work = "cybernetics manufacturer" + headquarters = "" + motto = "" + + ship_prefixes = list("MTV" = "freight") + // Culture names, because Anewbe told me so. + ship_names = list( + "Nervous Energy", + "Prosthetic Conscience", + "Revisionist", + "Trade Surplus", + "Flexible Demeanour", + "Just Read The Instructions", + "Limiting Factor", + "Cargo Cult", + "Gunboat Diplomat", + "A Ship With A View", + "Cantankerous", + "I Thought He Was With You", + "Never Talk To Strangers", + "Sacrificial Victim", + "Unwitting Accomplice", + "Bad For Business", + "Just Testing", + "Size Isn't Everything", + "Yawning Angel", + "Liveware Problem", + "Very Little Gravitas Indeed", + "Zero Gravitas", + "Gravitas Free Zone", + "Absolutely No You-Know-What", + "Existence Is Pain", + "I'm Walking Here", + "Screw Loose", + "Of Course I Still Love You", + "Limiting Factor", + "So Much For Subtley", + "Unfortunate Conflict Of Evidence", + "Prime Mover", + "It's One Of Ours", + "Thank You And Goodnight", + "Boo!", + "Reasonable Excuse", + "Honest Mistake", + "Appeal To Reason", + "My First Ship II", + "Hidden Income", + "Anything Legal Considered", + "New Toy", + "Me, I'm Always Counting", + "Just Five More Minutes" + + + ) + destination_names = list() + +/datum/lore/organization/xion + name = "Xion Manufacturing Group" + short_name = "Xion" + desc = "Xion, quietly, controls most of the market for industrial equipment. Their portfolio includes mining exosuits, \ + factory equipment, rugged positronic chassis, and other pieces of equipment vital to the function of the economy. Xion \ + keeps its control of the market by leasing, not selling, their equipment, and through infamous and bloody patent protection \ + lawsuits. Xion are noted to be a favorite contractor for SolGov engineers, owing to their low cost and rugged design." + history = "" + work = "industrial equipment manufacturer" + headquarters = "" + motto = "" + + ship_prefixes = list("XTV" = "hauling") + destination_names = list() + +// Governments + +/datum/lore/organization/sifgov + name = "Sif Governmental Authority" + short_name = "SifGov" + desc = "SifGov is the sole governing administration for the Vir system, based in New Reykjavik, Sif. It is a representative \ + democratic government, and a fully recognized member of the Solar Confederate Government. Anyone operating inside of Vir must \ + comply with SifGov's legislation and regulations." + history = "" // Todo like the rest of them + work = "governing body of Sif" + headquarters = "New Reykjavik, Sif" + motto = "" + autogenerate_destination_names = FALSE + + ship_prefixes = list("SGA" = "hauling", "SGA" = "energy relay") + destination_names = list( + "New Reykjavik on Sif", + "Radiance Energy Chain", + "a dockyard orbiting Sif", + "a telecommunications satellite", + "Vir Interstellar Spaceport" + ) + +/datum/lore/organization/solgov + name = "Solar Confederate Government" + short_name = "SolGov" + desc = "SolGov is a decentralized confederation of human governmental entities based on Luna, Sol, which defines top-level law for their member states. \ + Member states receive various benefits such as defensive pacts, trade agreements, social support and funding, and being able to participate \ + in the Colonial Assembly. The majority, but not all human territories are members of SolGov. As such, SolGov is a major power and \ + defacto represents humanity on the galatic stage." + history = "" // Todo + work = "governing polity of humanity's Confederation" + headquarters = "Luna" + motto = "Nil Mortalibus Ardui Est" // Latin, because latin. Says 'Nothing is too steep for mortals'. + autogenerate_destination_names = TRUE + + ship_prefixes = list("SCG-T" = "transportation", "SCG-D" = "diplomatic", "SCG-F" = "freight") + destination_names = list( + "Venus", + "Earth", + "Luna", + "Mars", + "Titan" + )// autogen will add a lot of other places as well. + +/* +// To be expanded upon later, once the military lore gets sorted out. + +// Military + +/datum/lore/organization/sif_guard + name = "Sif Homeguard Forces" // Todo: Get better name from lorepeople. + short_name = "SifGuard" + desc = "" + history = "" + work = "Sif Governmental Authority's military" + headquarters = "Sif" // Make this more specific later. + motto = "" + autogenerate_destination_names = FALSE // Kinda weird if SifGuard goes to Nyx. + + ship_prefixes = list("SGSC" = "military", "SGSC" = "patrol", "SGSC" = "rescue", "SGSC" = "emergency response") // Todo: Replace prefix with better one. + destination_names = list( + "a classified location in SolGov territory", + "Sif orbit", + "the rings of Kara", + "the rings of Rota", + "Firnir orbit", + "Tyr orbit", + "Magni orbit", + "a wreck in SifGov territory", + "a military outpost", + ) +*/ diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm index d446a8f950..71559fed0e 100644 --- a/code/modules/client/preference_setup/global/setting_datums.dm +++ b/code/modules/client/preference_setup/global/setting_datums.dm @@ -126,6 +126,12 @@ var/list/_client_preferences_by_type enabled_description = "Show" disabled_description = "Hide" +/datum/client_preference/check_mention + description ="Emphasize Name Mention" + key = "CHAT_MENTION" + enabled_description = "Emphasize" + disabled_description = "Normal" + /datum/client_preference/show_progress_bar description ="Progress Bar" key = "SHOW_PROGRESS" diff --git a/code/modules/client/preference_setup/loadout/loadout_ears.dm b/code/modules/client/preference_setup/loadout/loadout_ears.dm index 02bfdaa8b7..d3c7c633ce 100644 --- a/code/modules/client/preference_setup/loadout/loadout_ears.dm +++ b/code/modules/client/preference_setup/loadout/loadout_ears.dm @@ -8,3 +8,8 @@ /datum/gear/ears/headphones display_name = "headphones" path = /obj/item/clothing/ears/earmuffs/headphones + +/datum/gear/ears/translator + display_name = "universal translator, ear" + path = /obj/item/device/universal_translator/ear + cost = 5 \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 4c2a378e7d..f9ffc0eb0b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -61,3 +61,8 @@ cost = 2 slot = "implant" var/implant_type = "EAL" + +/datum/gear/utility/translator + display_name = "universal translator" + path = /obj/item/device/universal_translator + cost = 5 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 39f437f93a..3783a5c208 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -199,10 +199,7 @@ /obj/item/clothing/gloves/emp_act(severity) if(cell) - //why is this not part of the powercell code? - cell.charge -= 1000 / severity - if (cell.charge < 0) - cell.charge = 0 + cell.emp_act(severity) ..() // Called just before an attack_hand(), in mob/UnarmedAttack() diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 3d4589469b..6e101a0cde 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -705,16 +705,16 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/margheritaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/margherita price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/ @@ -737,37 +737,37 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/bananabread price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/tofubread price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/breadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/bread price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread price_tag = 1 @@ -845,67 +845,67 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/braincakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/braincake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/cheesecake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/plaincake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/limecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/limecake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/lemoncake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/chocolatecake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/birthdaycake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/applecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/applecake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice +/obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie price_tag = 1 diff --git a/code/modules/events/atmos_leak.dm b/code/modules/events/atmos_leak.dm new file mode 100644 index 0000000000..46c28b7adf --- /dev/null +++ b/code/modules/events/atmos_leak.dm @@ -0,0 +1,90 @@ +// +// This event causes a gas leak of phoron, sleeping_agent, or carbon_dioxide in a random unoccupied area. +// One wonders, where did the gas come from? Who knows! Its SPACE! But if you want something a touch +// more "explainable" then check out the canister_leak event instead. +// + +/datum/event/atmos_leak + startWhen = 5 // Nobody will actually be in the room, but still give a bit of warning. + var/area/target_area // Chosen target area + var/area/target_turf // Chosen target turf in target_area + var/gas_type // Chosen gas to release + // Exclude these types and sub-types from targeting eligibilty + var/list/area/excluded = list( + /area/shuttle, + /area/crew_quarters, + /area/holodeck, + /area/engineering/engine_room + ) + +// Decide which area will be targeted! +/datum/event/atmos_leak/setup() + var/gas_choices = list("carbon_dioxide", "sleeping_agent") // Annoying + if(severity >= EVENT_LEVEL_MODERATE) + gas_choices += "phoron" // Dangerous + if(severity >= EVENT_LEVEL_MAJOR) + gas_choices += "volatile_fuel" // Dangerous and no default atmos setup! + gas_type = pick(gas_choices) + + // Assemble areas that all exists (See DM reference if you are confused about loop labels) + var/list/area/grand_list_of_areas = list() + looping_station_areas: + for(var/parentpath in global.the_station_areas) + // Check its not excluded + for(var/excluded_path in excluded) + if(ispath(parentpath, excluded_path)) + continue looping_station_areas + // Otherwise add it and all subtypes that exist on the map to our grand list + for(var/areapath in typesof(parentpath)) + var/area/A = locate(areapath) // Check if it actually exists + if(istype(A) && A.z in using_map.player_levels) + grand_list_of_areas += A + + // Okay, now lets try and pick a target! Lets try 10 times, otherwise give up + for(var/i in 1 to 10) + var/area/A = pick(grand_list_of_areas) + if(is_area_occupied(A)) + log_debug("atmos_leak event: Rejected [A] because it is occupied.") + continue + // A good area, great! Lets try and pick a turf + var/list/turfs = list() + for(var/turf/simulated/floor/F in A) + if(turf_clear(F)) + turfs += F + if(turfs.len == 0) + log_debug("atmos_leak event: Rejected [A] because it has no clear turfs.") + continue + target_area = A + target_turf = pick(turfs) + + // If we can't find a good target, give up + if(!target_area) + log_debug("atmos_leak event: Giving up after too many failures to pick target area") + kill() + return + +/** Checks if any living humans are in a given area! */ +/datum/event/atmos_leak/proc/is_area_occupied(var/area/myarea) + // Testing suggests looping over human_mob_list is quicker than looping over area contents + for(var/mob/living/carbon/human/H in human_mob_list) + if(H.stat >= DEAD) //Conditions for exclusion here, like if disconnected people start blocking it. + continue + var/area/A = get_area(H) + if(A == myarea) //The loc of a turf is the area it is in. + return 1 + return 0 + +/datum/event/atmos_leak/announce() + command_announcement.Announce("Warning, hazardous [gas_data.name[gas_type]] gas leak detected in \the [target_area], evacuate the area and contain the damage!", "Hazard Alert") + +/datum/event/atmos_leak/start() + // Okay, time to actually put the gas in the room! + // TODO - Would be nice to break a waste pipe perhaps? + // TODO - Maybe having it released from a single point and thus causing airflow to blow stuff around + + // Fow now just add a bunch of it to the air + var/datum/gas_mixture/air_contents = new + air_contents.temperature = T20C + ((severity - 1) * rand(-50, 50)) + air_contents.gas[gas_type] = 10 * MOLES_CELLSTANDARD + target_turf.assume_air(air_contents) + playsound(target_turf, 'sound/effects/smoke.ogg', 50, 1) diff --git a/code/modules/events/canister_leak.dm b/code/modules/events/canister_leak.dm new file mode 100644 index 0000000000..932a819671 --- /dev/null +++ b/code/modules/events/canister_leak.dm @@ -0,0 +1,30 @@ +// +// This event chooses a random canister on player levels and breaks it, releasing its contents! +// On severity EVENT_LEVEL_MUNDANE or below it checks to make sure nobody is in the area, otherwise... good luck. +// + +/datum/event/canister_leak/start() + // List of all non-destroyed canisters on station levels + var/list/all_canisters = list() + for(var/obj/machinery/portable_atmospherics/canister/C in machines) + if(!C.destroyed && (C.z in using_map.station_levels) && C.air_contents.total_moles >= MOLES_CELLSTANDARD) + all_canisters += C + + for(var/i in 1 to 10) + var/obj/machinery/portable_atmospherics/canister/C = pick(all_canisters) + if(severity <= EVENT_LEVEL_MUNDANE && area_is_occupied(get_area(C))) + log_debug("canister_leak event: Rejecting canister [C] ([C.x],[C.y],[C.z]) because area is occupied") + continue + // Okay lets break it + break_canister(C) + return + + // If we got to here we failed to find it + log_debug("canister_leak event: Giving up after too many failures to pick target canister") + kill() + return + +/datum/event/canister_leak/proc/break_canister(var/obj/machinery/portable_atmospherics/canister/C) + log_debug("canister_leak event: Canister [C] ([C.x],[C.y],[C.z]) destroyed.") + C.health = 0 + C.healthcheck() diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 1e22826d0b..4c702038a9 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -86,6 +86,12 @@ "admin","ponies","heresy","meow","Pun Pun","monkey","Ian","moron","pizza","message","spam",\ "director", "Hello", "Hi!"," ","nuke","crate","dwarf","xeno") +/datum/event/ionstorm/tick() + if(botEmagChance) + for(var/mob/living/bot/bot in world) + if(prob(botEmagChance)) + bot.emag_act(1) + /datum/event/ionstorm/end() spawn(rand(5000,8000)) if(prob(50)) diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm index 1e3f9fcac9..b597837d17 100644 --- a/code/modules/events/rogue_drones.dm +++ b/code/modules/events/rogue_drones.dm @@ -16,7 +16,7 @@ else num = rand(2,6) for(var/i=0, i
" + html += "
| Icon | Name | Ingredients | |
|---|---|---|---|
| No Image | "
+
+ //Name
+ html += "[food_recipes[Rp]["Result"]] | " + + //Ingredients + html += "
| "
+ //Close this row
+ html += "