Remember, insults should always be in the form of a joke. But more importantly, they should always be deserved! Play music and tell jokes to the downtrodden, they need some levity."
- },
-/obj/item/paper{
- name = "The Laws of the Fool";
- info = "THE LAWS OF THE FOOL: 1. Seek the news and spread it to all 2. Play antics on all who deserve it. 3. Improvise with thy wit! 4. Be tactful. Know when thy art is welcome. 5. Be misshapen (or dwarvish) (or simply play dumb) 6. Speak harsh truths in jest 7. Emote! Play on the stage of life! 8. Keep your head and face smooth and shaven (dwarvern fools may keep the beard) 9. Carry thy wooden sword proudly! 10. Spread thy strings of influence, create chaos in others... 11. If thou must fight, fight well 12. Spread thy wealth to those who deserve it, and troublesome gifts to those who don't! 13. Be compassionate and insightful, even when scathing
"
- else
- return ""
-
-/datum/controller/subsystem/ticker/proc/goal_report()
- var/list/parts = list()
- if(mode.station_goals.len)
- for(var/V in mode.station_goals)
- var/datum/station_goal/G = V
- parts += G.get_result()
- return "
[parts.Join()]
"
-
/datum/controller/subsystem/ticker/proc/medal_report()
if(GLOB.commendations.len)
var/list/parts = list()
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index ba3d86a11d..d1965e02d2 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -60,10 +60,10 @@ GLOBAL_VAR_INIT(dayspassed, FALSE)
GLOB.forecast = "rain"
if(GLOB.forecast == "rain")
var/foundnd
- for(var/datum/weather/rain/R in SSweather.curweathers)
+ if(SSParticleWeather?.runningWeather?.target_trait == PARTICLEWEATHER_RAIN)
foundnd = TRUE
if(!foundnd)
- SSweather.run_weather(/datum/weather/rain, 1)
+ SSParticleWeather?.run_weather(pick(/datum/particle_weather/rain_gentle, /datum/particle_weather/rain_storm))
if(GLOB.forecast == "fog")
var/foundnd
for(var/datum/weather/fog/R in SSweather.curweathers)
diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm
index 28d78ecdfe..0cdd22a398 100644
--- a/code/__HELPERS/type_processing.dm
+++ b/code/__HELPERS/type_processing.dm
@@ -6,7 +6,6 @@
var/typename = "[type]"
var/static/list/TYPES_SHORTCUTS = list(
/obj/effect/decal/cleanable = "CLEANABLE",
- /obj/item/radio/headset = "HEADSET",
/obj/item/clothing/head/helmet/space = "SPESSHELMET",
/obj/item/book/manual = "MANUAL",
/obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
@@ -14,8 +13,6 @@
/obj/item/reagent_containers = "REAGENT_CONTAINERS",
/obj/machinery/atmospherics = "ATMOS_MECH",
/obj/machinery/portable_atmospherics = "PORT_ATMOS",
- /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
- /obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP",
/obj/item/organ = "ORGAN",
/obj/item = "ITEM",
/obj/machinery = "MACHINERY",
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index a511ef1977..50dfad7fdf 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -232,64 +232,6 @@ Turf and target are separate in case you want to teleport some distance from a t
return FALSE
-//Picks a string of symbols to display as the law number for hacked or ion laws
-/proc/ionnum()
- return "[pick("!","@","#","$","%","^","&")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")]"
-
-//Returns a list of unslaved cyborgs
-/proc/active_free_borgs()
- . = list()
- for(var/mob/living/silicon/robot/R in GLOB.alive_mob_list)
- if(R.connected_ai || R.shell)
- continue
- if(R.stat == DEAD)
- continue
- if(R.emagged || R.scrambledcodes)
- continue
- . += R
-
-//Returns a list of AI's
-/proc/active_ais(check_mind=0)
- . = list()
- for(var/mob/living/silicon/ai/A in GLOB.alive_mob_list)
- if(A.stat == DEAD)
- continue
- if(A.control_disabled)
- continue
- if(check_mind)
- if(!A.mind)
- continue
- . += A
- return .
-
-//Find an active ai with the least borgs. VERBOSE PROCNAME HUH!
-/proc/select_active_ai_with_fewest_borgs()
- var/mob/living/silicon/ai/selected
- var/list/active = active_ais()
- for(var/mob/living/silicon/ai/A in active)
- if(!selected || (selected.connected_robots.len > A.connected_robots.len))
- selected = A
-
- return selected
-
-/proc/select_active_free_borg(mob/user)
- var/list/borgs = active_free_borgs()
- if(borgs.len)
- if(user)
- . = input(user,"Unshackled cyborg signals detected:", "Cyborg Selection", borgs[1]) in sortList(borgs)
- else
- . = pick(borgs)
- return .
-
-/proc/select_active_ai(mob/user)
- var/list/ais = active_ais()
- if(ais.len)
- if(user)
- . = input(user,"AI signals detected:", "AI Selection", ais[1]) in sortList(ais)
- else
- . = pick(ais)
- return .
-
//Returns a list of all items of interest with their name
/proc/getpois(mobs_only=0,skip_mindless=0,team=null)
var/list/mobs = sortmobs()
@@ -711,22 +653,19 @@ will handle it, but:
Checks if that loc and dir has an item on the wall
*/
GLOBAL_LIST_INIT(WALLITEMS, typecacheof(list(
- /obj/machinery/power/apc, /obj/machinery/airalarm, /obj/item/radio/intercom,
/obj/structure/extinguisher_cabinet, /obj/structure/reagent_dispensers/peppertank,
- /obj/machinery/status_display, /obj/machinery/requests_console, /obj/machinery/light_switch, /obj/structure/sign,
- /obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard, /obj/machinery/button,
- /obj/machinery/computer/security/telescreen, /obj/machinery/embedded_controller/radio/simple_vent_controller,
- /obj/item/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth,
- /obj/structure/mirror, /obj/structure/fireaxecabinet, /obj/machinery/computer/security/telescreen/entertainment,
+ /obj/structure/sign,
+ /obj/structure/noticeboard,
+ /obj/item/storage/secure/safe,
+ /obj/structure/mirror, /obj/structure/fireaxecabinet,
/obj/structure/sign/picture_frame
)))
GLOBAL_LIST_INIT(WALLITEMS_EXTERNAL, typecacheof(list(
- /obj/machinery/camera, /obj/structure/camera_assembly,
- /obj/structure/light_construct, /obj/machinery/light)))
+ /obj/machinery/light)))
GLOBAL_LIST_INIT(WALLITEMS_INVERSE, typecacheof(list(
- /obj/structure/light_construct, /obj/machinery/light)))
+ /obj/machinery/light)))
/proc/gotwallitem(loc, dir, check_external = 0)
@@ -1259,12 +1198,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
if(!T)
return FALSE
for(var/obj/O in T)
- if(istype(O, /obj/machinery/door/window) && (O.dir == dir_to_check || dir_to_check == FULLTILE_WINDOW_DIR))
- return FALSE
- if(istype(O, /obj/structure/windoor_assembly))
- var/obj/structure/windoor_assembly/W = O
- if(W.ini_dir == dir_to_check || dir_to_check == FULLTILE_WINDOW_DIR)
- return FALSE
if(istype(O, /obj/structure/window))
var/obj/structure/window/W = O
if(W.ini_dir == dir_to_check || W.ini_dir == FULLTILE_WINDOW_DIR || dir_to_check == FULLTILE_WINDOW_DIR)
@@ -1594,3 +1527,51 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
GLOBAL_LIST_INIT(ITEM_DOES_NOT_GENERATE_VAULT_RENT, typecacheof(list(
/obj/item/roguecoin
)))
+
+//Vars that will not be copied when using /DuplicateObject
+GLOBAL_LIST_INIT(duplicate_forbidden_vars,list(
+ "tag", "datum_components", "area", "type", "loc", "locs", "vars", "parent", "parent_type", "verbs", "ckey", "key",
+ "power_supply", "contents", "reagents", "stat", "x", "y", "z", "group", "atmos_adjacent_turfs", "comp_lookup"
+ ))
+
+/proc/DuplicateObject(atom/original, perfectcopy = TRUE, sameloc, atom/newloc = null, nerf, holoitem)
+ RETURN_TYPE(original.type)
+ if(!original)
+ return
+ var/atom/O
+
+ if(sameloc)
+ O = new original.type(original.loc)
+ else
+ O = new original.type(newloc)
+
+ if(perfectcopy && O && original)
+ for(var/V in original.vars - GLOB.duplicate_forbidden_vars)
+ if(islist(original.vars[V]))
+ var/list/L = original.vars[V]
+ O.vars[V] = L.Copy()
+ else if(istype(original.vars[V], /datum))
+ continue // this would reference the original's object, that will break when it is used or deleted.
+ else
+ O.vars[V] = original.vars[V]
+
+ if(isobj(O))
+ var/obj/N = O
+ if(holoitem)
+ N.resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF // holoitems do not burn
+
+ if(nerf && isitem(O))
+ var/obj/item/I = O
+ I.damtype = STAMINA // thou shalt not
+
+ N.update_icon()
+
+ if(holoitem)
+ O.flags_1 |= HOLOGRAM_1
+ for(var/atom/thing in O)
+ thing.flags_1 |= HOLOGRAM_1
+ if(ismachinery(O))
+ var/obj/machinery/M = O
+ for(var/atom/contained_atom in M.component_parts)
+ contained_atom.flags_1 |= HOLOGRAM_1
+ return O
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 716f201a57..671a5b45c6 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -35,7 +35,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/clothing/head/ushanka = 1,
/obj/item/clothing/head/welding = 1,
/obj/item/clothing/mask/gas = 15,
- /obj/item/clothing/suit/hazardvest = 1,
/obj/item/clothing/under/misc/vice_officer = 1,
/obj/item/clothing/suit/hooded/flashsuit = 2,
/obj/item/assembly/prox_sensor = 4,
@@ -44,11 +43,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/flashlight/pen = 1,
/obj/effect/spawner/lootdrop/glowstick = 4,
/obj/item/multitool = 2,
- /obj/item/radio/off = 2,
- /obj/item/t_scanner = 5,
- /obj/item/airlock_painter = 1,
- /obj/item/stack/cable_coil = 4,
- /obj/item/stack/cable_coil/five = 6,
/obj/item/stack/medical/suture = 1,
/obj/item/stack/rods/ten = 9,
/obj/item/stack/rods/twentyfive = 1,
@@ -73,7 +67,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/pen = 1,
/obj/item/reagent_containers/spray/pestspray = 1,
/obj/item/reagent_containers/glass/rag = 3,
- /obj/item/stock_parts/cell = 3,
/obj/item/storage/belt/utility = 2,
/obj/item/storage/box = 2,
/obj/item/storage/box/cups = 1,
@@ -84,25 +77,20 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/storage/toolbox/mechanical = 1,
/obj/item/screwdriver = 3,
/obj/item/tank/internals/emergency_oxygen = 2,
- /obj/item/vending_refill/cola = 1,
/obj/item/weldingtool = 3,
/obj/item/wirecutters = 1,
/obj/item/wrench = 4,
- /obj/item/relic = 3,
/obj/item/weaponcrafting/receiver = 2,
/obj/item/clothing/head/cone = 2,
/obj/item/grenade/smokebomb = 2,
/obj/item/geiger_counter = 3,
- /obj/item/radio/headset = 1,
/obj/item/assembly/infra = 1,
/obj/item/assembly/igniter = 2,
- /obj/item/assembly/signaler = 2,
/obj/item/assembly/mousetrap = 2,
/obj/item/reagent_containers/syringe = 2,
/obj/effect/spawner/lootdrop/gloves = 8,
/obj/item/clothing/shoes/laceup = 1,
/obj/item/storage/secure/briefcase = 3,
- /obj/item/storage/toolbox/artistic = 2,
/obj/item/toy/eightball = 1,
/obj/item/reagent_containers/pill/floorpill = 1,
/obj/item/reagent_containers/food/snacks/canned/peaches/maint = 1,
diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm
index 10f85f07b2..4518c32764 100644
--- a/code/_globalvars/lists/mapping.dm
+++ b/code/_globalvars/lists/mapping.dm
@@ -30,7 +30,6 @@ GLOBAL_LIST_EMPTY(nukeop_leader_start)
GLOBAL_LIST_EMPTY(newplayer_start)
GLOBAL_LIST_EMPTY(prisonwarp) //admin prisoners go to these
GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here (ninja energy net)
-GLOBAL_LIST_EMPTY(xeno_spawn)//aliens, morphs and nightmares spawn at these
GLOBAL_LIST_EMPTY(tdome1)
GLOBAL_LIST_EMPTY(tdome2)
GLOBAL_LIST_EMPTY(tdomeobserve)
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index 355f7f6a48..1125dbd5ee 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -42,6 +42,12 @@ GLOBAL_LIST_EMPTY(mob_config_movespeed_type_lookup)
GLOBAL_LIST_EMPTY(emote_list)
+GLOBAL_LIST_INIT(dangerous_turfs, typecacheof(list(
+ /turf/open/lava,
+ /turf/open/transparent/openspace,
+ /turf/open/water/acid,
+ )))
+
/proc/update_config_movespeed_type_lookup(update_mobs = TRUE)
var/list/mob_types = list()
var/list/entry_value = CONFIG_GET(keyed_list/multiplicative_movespeed)
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 6c7067f0cb..34189bf014 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -40,3 +40,31 @@ GLOBAL_LIST_EMPTY(ai_status_displays)
GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects
GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert
+
+GLOBAL_LIST_INIT(rod_jobs, list(
+ "Garrison Guard",
+ "Captain",
+ "Dungeoneer",
+ "Royal Guard",
+ "Veteran",
+ "Squire",
+ "Mayor",
+ "Servant",
+ "Steward",
+ "Consort",
+ "King",
+ "Prince",
+ "Hand",
+ "Court Magician",
+ "Butler",
+ "Archivist",
+ "Jester",
+ "Prisoner",
+ "Feldsher",
+ "Niteman",
+ "Concubine",
+ "Champion of Rockhill",
+ "Warden of the Terrorbog",
+ "Huntmaster of the Murderwoods",
+ "Hetman of Mount Decapitation",
+))
diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm
index 580caa1ad4..a1039db614 100644
--- a/code/_globalvars/lists/poll_ignore.dm
+++ b/code/_globalvars/lists/poll_ignore.dm
@@ -2,7 +2,6 @@
#define POLL_IGNORE_SENTIENCE_POTION "sentience_potion"
#define POLL_IGNORE_POSSESSED_BLADE "possessed_blade"
-#define POLL_IGNORE_ALIEN_LARVA "alien_larva"
#define POLL_IGNORE_SYNDICATE "syndicate"
#define POLL_IGNORE_HOLOPARASITE "holoparasite"
#define POLL_IGNORE_POSIBRAIN "posibrain"
@@ -26,7 +25,6 @@
GLOBAL_LIST_INIT(poll_ignore_desc, list(
POLL_IGNORE_SENTIENCE_POTION = "Sentience potion",
POLL_IGNORE_POSSESSED_BLADE = "Possessed blade",
- POLL_IGNORE_ALIEN_LARVA = "Xenomorph larva",
POLL_IGNORE_SYNDICATE = "Syndicate",
POLL_IGNORE_HOLOPARASITE = "Holoparasite",
POLL_IGNORE_POSIBRAIN = "Positronic brain",
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 3b914e4ef8..775b5a89f7 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -22,7 +22,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_DEATHCOMA" = TRAIT_DEATHCOMA,
"TRAIT_FAKEDEATH" = TRAIT_FAKEDEATH,
"TRAIT_DISFIGURED" = TRAIT_DISFIGURED,
- "TRAIT_XENO_HOST" = TRAIT_XENO_HOST,
"TRAIT_STUNIMMUNE" = TRAIT_STUNIMMUNE,
"TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE,
"TRAIT_PUSHIMMUNE" = TRAIT_PUSHIMMUNE,
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
deleted file mode 100644
index 173b35e4b9..0000000000
--- a/code/_onclick/ai.dm
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- AI ClickOn()
-
- Note currently ai restrained() returns 0 in all cases,
- therefore restrained code has been removed
-
- The AI can double click to move the camera (this was already true but is cleaner),
- or double click a mob to track them.
-
- Note that AI have no need for the adjacency proc, and so this proc is a lot cleaner.
-*/
-/mob/living/silicon/ai/DblClickOn(atom/A, params)
- if(control_disabled || incapacitated())
- return
-
- if(ismob(A))
- ai_actual_track(A)
- else
- A.move_camera_by_click()
-
-/mob/living/silicon/ai/ClickOn(atom/A, params)
- if(world.time <= next_click)
- return
- next_click = world.time + 1
-
- if(!can_interact_with(A))
- return
-
- if(multicam_on)
- var/turf/T = get_turf(A)
- if(T)
- for(var/atom/movable/screen/movable/pic_in_pic/ai/P in T.vis_locs)
- if(P.ai == src)
- P.Click(params)
- break
-
- if(check_click_intercept(params,A))
- return
-
- if(control_disabled || incapacitated())
- return
-
- var/turf/pixel_turf = get_turf_pixel(A)
- if(isnull(pixel_turf))
- return
- if(!can_see(A))
- if(isturf(A)) //On unmodified clients clicking the static overlay clicks the turf underneath
- return //So there's no point messaging admins
- message_admins("[ADMIN_LOOKUPFLW(src)] might be running a modified client! (failed can_see on AI click of [A] (Turf Loc: [ADMIN_VERBOSEJMP(pixel_turf)]))")
- var/message = "[key_name(src)] might be running a modified client! (failed can_see on AI click of [A] (Turf Loc: [AREACOORD(pixel_turf)]))"
- log_admin(message)
- if(REALTIMEOFDAY >= chnotify + 9000)
- chnotify = REALTIMEOFDAY
- send2irc_adminless_only("NOCHEAT", message)
- return
-
- var/list/modifiers = params2list(params)
- if(modifiers["shift"] && modifiers["ctrl"])
- CtrlShiftClickOn(A)
- return
- if(modifiers["middle"])
- if(controlled_mech) //Are we piloting a mech? Placed here so the modifiers are not overridden.
- controlled_mech.click_action(A, src, params) //Override AI normal click behavior.
- return
- if(modifiers["shift"])
- ShiftClickOn(A)
- return
- if(modifiers["alt"]) // alt and alt-gr (rightalt)
- AltClickOn(A)
- return
- if(modifiers["ctrl"])
- CtrlClickOn(A)
- return
-
- if(world.time <= next_move)
- return
-
- if(aicamera.in_camera_mode)
- aicamera.camera_mode_off()
- aicamera.captureimage(pixel_turf, usr)
- return
- if(waypoint_mode)
- waypoint_mode = 0
- set_waypoint(A)
- return
-
- A.attack_ai(src)
-
-/*
- AI has no need for the UnarmedAttack() and RangedAttack() procs,
- because the AI code is not generic; attack_ai() is used instead.
- The below is only really for safety, or you can alter the way
- it functions and re-insert it above.
-*/
-/mob/living/silicon/ai/UnarmedAttack(atom/A)
- A.attack_ai(src)
-/mob/living/silicon/ai/RangedAttack(atom/A)
- A.attack_ai(src)
-
-/atom/proc/attack_ai(mob/user)
- return
-
-/*
- Since the AI handles shift, ctrl, and alt-click differently
- than anything else in the game, atoms have separate procs
- for AI shift, ctrl, and alt clicking.
-*/
-
-/mob/living/silicon/ai/CtrlShiftClickOn(atom/A)
- A.AICtrlShiftClick(src)
-/mob/living/silicon/ai/ShiftClickOn(atom/A)
- A.AIShiftClick(src)
-/mob/living/silicon/ai/CtrlClickOn(atom/A)
- A.AICtrlClick(src)
-/mob/living/silicon/ai/AltClickOn(atom/A)
- A.AIAltClick(src)
-
-/*
- The following criminally helpful code is just the previous code cleaned up;
- I have no idea why it was in atoms.dm instead of respective files.
-*/
-/* Questions: Instead of an Emag check on every function, can we not add to airlocks onclick if emag return? */
-
-/* Atom Procs */
-/atom/proc/AICtrlClick()
- return
-/atom/proc/AIAltClick(mob/living/silicon/ai/user)
- AltClick(user)
- return
-/atom/proc/AIShiftClick()
- return
-/atom/proc/AICtrlShiftClick()
- return
-
-/* Airlocks */
-/obj/machinery/door/airlock/AICtrlClick() // Bolts doors
- if(obj_flags & EMAGGED)
- return
-
- toggle_bolt(usr)
- add_hiddenprint(usr)
-
-/obj/machinery/door/airlock/AIAltClick() // Eletrifies doors.
- if(obj_flags & EMAGGED)
- return
-
- if(!secondsElectrified)
- shock_perm(usr)
- else
- shock_restore(usr)
-
-/obj/machinery/door/airlock/AIShiftClick() // Opens and closes doors!
- if(obj_flags & EMAGGED)
- return
-
- user_toggle_open(usr)
- add_hiddenprint(usr)
-
-/obj/machinery/door/airlock/AICtrlShiftClick() // Sets/Unsets Emergency Access Override
- if(obj_flags & EMAGGED)
- return
-
- toggle_emergency(usr)
- add_hiddenprint(usr)
-
-/* APC */
-/obj/machinery/power/apc/AICtrlClick() // turns off/on APCs.
- if(can_use(usr, 1))
- toggle_breaker(usr)
-
-/* AI Turrets */
-/obj/machinery/turretid/AIAltClick() //toggles lethal on turrets
- if(ailock)
- return
- toggle_lethal(usr)
-
-/obj/machinery/turretid/AICtrlClick() //turns off/on Turrets
- if(ailock)
- return
- toggle_on(usr)
-
-/* Holopads */
-/obj/machinery/holopad/AIAltClick(mob/living/silicon/ai/user)
- hangup_all_calls()
- add_hiddenprint(usr)
-
-//
-// Override TurfAdjacent for AltClicking
-//
-
-/mob/living/silicon/ai/TurfAdjacent(turf/T)
- return (GLOB.cameranet && GLOB.cameranet.checkTurfVis(T))
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index f3fbfd8c96..ef40a8480e 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -193,10 +193,6 @@
if(dir == get_dir(A,src)) //they are behind us and we are not facing them
return
- if(ismecha(loc))
- var/obj/mecha/M = loc
- return M.click_action(A,src,params)
-
if(restrained())
changeNext_move(CLICK_CD_HANDCUFFED) //Doing shit in cuffs shall be vey slow
RestrainedClickOn(A)
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
deleted file mode 100644
index 1b6da2a2b5..0000000000
--- a/code/_onclick/cyborg.dm
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- Cyborg ClickOn()
-
- Cyborgs have no range restriction on attack_robot(), because it is basically an AI click.
- However, they do have a range restriction on item use, so they cannot do without the
- adjacency code.
-*/
-
-/mob/living/silicon/robot/ClickOn(atom/A, params)
- if(world.time <= next_click)
- return
- next_click = world.time + 1
-
- if(check_click_intercept(params,A))
- return
-
- if(stat || lockcharge || IsParalyzed() || IsStun() || IsUnconscious())
- return
-
- var/list/modifiers = params2list(params)
- if(modifiers["shift"] && modifiers["ctrl"])
- CtrlShiftClickOn(A)
- return
- if(modifiers["shift"] && modifiers["middle"])
- ShiftMiddleClickOn(A)
- return
- if(modifiers["middle"])
- MiddleClickOn(A)
- return
- if(modifiers["shift"])
- ShiftClickOn(A)
- return
- if(modifiers["alt"]) // alt and alt-gr (rightalt)
- AltClickOn(A)
- return
- if(modifiers["ctrl"])
- CtrlClickOn(A)
- return
-
- if(next_move >= world.time)
- return
-
- face_atom(A) // change direction to face what you clicked on
-
- /*
- cyborg restrained() currently does nothing
- if(restrained())
- RestrainedClickOn(A)
- return
- */
- if(aicamera.in_camera_mode) //Cyborg picture taking
- aicamera.camera_mode_off()
- aicamera.captureimage(A, usr)
- return
-
- var/obj/item/W = get_active_held_item()
-
- if(!W && get_dist(src,A) <= interaction_range)
- A.attack_robot(src)
- return
-
- if(W)
- // buckled cannot prevent machine interlinking but stops arm movement
- if( buckled || incapacitated())
- return
-
- if(W == A)
- W.attack_self(src)
- return
-
- // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
- if(A == loc || (A in loc) || (A in contents))
- W.melee_attack_chain(src, A, params)
- return
-
- if(!isturf(loc))
- return
-
- // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc))
- if(isturf(A) || isturf(A.loc))
- if(A.Adjacent(src)) // see adjacent.dm
- W.melee_attack_chain(src, A, params)
- return
- else
- W.afterattack(A, src, 0, params)
- return
-
-//Middle click cycles through selected modules.
-/mob/living/silicon/robot/MiddleClickOn(atom/A)
- . = ..()
- cycle_modules()
-
-//Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks
-// for non-doors/apcs
-/mob/living/silicon/robot/CtrlShiftClickOn(atom/A)
- A.BorgCtrlShiftClick(src)
-/mob/living/silicon/robot/ShiftClickOn(atom/A)
- A.BorgShiftClick(src)
-/mob/living/silicon/robot/CtrlClickOn(atom/A)
- A.BorgCtrlClick(src)
-/mob/living/silicon/robot/AltClickOn(atom/A)
- A.BorgAltClick(src)
-
-/atom/proc/BorgCtrlShiftClick(mob/living/silicon/robot/user) //forward to human click if not overridden
- CtrlShiftClick(user)
-
-/obj/machinery/door/airlock/BorgCtrlShiftClick(mob/living/silicon/robot/user) // Sets/Unsets Emergency Access Override Forwards to AI code.
- if(get_dist(src,user) <= user.interaction_range)
- AICtrlShiftClick()
- else
- ..()
-
-
-/atom/proc/BorgShiftClick(mob/living/silicon/robot/user) //forward to human click if not overridden
- ShiftClick(user)
-
-/obj/machinery/door/airlock/BorgShiftClick(mob/living/silicon/robot/user) // Opens and closes doors! Forwards to AI code.
- if(get_dist(src,user) <= user.interaction_range)
- AIShiftClick()
- else
- ..()
-
-
-/atom/proc/BorgCtrlClick(mob/living/silicon/robot/user) //forward to human click if not overridden
- CtrlClick(user)
-
-/obj/machinery/door/airlock/BorgCtrlClick(mob/living/silicon/robot/user) // Bolts doors. Forwards to AI code.
- if(get_dist(src,user) <= user.interaction_range)
- AICtrlClick()
- else
- ..()
-
-/obj/machinery/power/apc/BorgCtrlClick(mob/living/silicon/robot/user) // turns off/on APCs. Forwards to AI code.
- if(get_dist(src,user) <= user.interaction_range)
- AICtrlClick()
- else
- ..()
-
-/obj/machinery/turretid/BorgCtrlClick(mob/living/silicon/robot/user) //turret control on/off. Forwards to AI code.
- if(get_dist(src,user) <= user.interaction_range)
- AICtrlClick()
- else
- ..()
-
-/atom/proc/BorgAltClick(mob/living/silicon/robot/user)
- AltClick(user)
- return
-
-/obj/machinery/door/airlock/BorgAltClick(mob/living/silicon/robot/user) // Eletrifies doors. Forwards to AI code.
- if(get_dist(src,user) <= user.interaction_range)
- AIAltClick()
- else
- ..()
-
-/obj/machinery/turretid/BorgAltClick(mob/living/silicon/robot/user) //turret lethal on/off. Forwards to AI code.
- if(get_dist(src,user) <= user.interaction_range)
- AIAltClick()
- else
- ..()
-
-/*
- As with AI, these are not used in click code,
- because the code for robots is specific, not generic.
-
- If you would like to add advanced features to robot
- clicks, you can do so here, but you will have to
- change attack_robot() above to the proper function
-*/
-/mob/living/silicon/robot/UnarmedAttack(atom/A)
- A.attack_robot(src)
-/mob/living/silicon/robot/RangedAttack(atom/A)
- A.attack_robot(src)
-
-/atom/proc/attack_robot(mob/user)
- attack_ai(user)
- return
diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm
index a52a46702f..ad76382cc8 100644
--- a/code/_onclick/drag_drop.dm
+++ b/code/_onclick/drag_drop.dm
@@ -102,6 +102,25 @@
var/list/L = params2list(params)
+ if (L["middle"]) //start charging a spell or readying a mmb intent- Moved to front so it can't be overriden by people holding right click
+ if(mob.next_move > world.time)
+ return
+ mob.atkswinging = "middle"
+ if(mob.mmb_intent)
+ mob.used_intent = mob.mmb_intent
+ if(mob.used_intent.type == INTENT_SPELL && mob.ranged_ability)
+ var/obj/effect/proc_holder/spell/S = mob.ranged_ability
+ if(!S.cast_check(TRUE,mob))
+ return
+ if(!mob.mmb_intent)
+ mouse_pointer_icon = 'icons/effects/mousemice/human_looking.dmi'
+ else
+ if(mob.mmb_intent.get_chargetime() && !AD.blockscharging)
+ updateprogbar()
+ else
+ mouse_pointer_icon = mob.mmb_intent.pointer
+ return
+
if (L["right"])
mob.face_atom(object, location, control, params)
if(L["left"])
@@ -123,24 +142,7 @@
else
mouse_pointer_icon = 'icons/effects/mousemice/human_looking.dmi'
return
- if (L["middle"]) //start charging a spell or readying a mmb intent
- if(mob.next_move > world.time)
- return
- mob.atkswinging = "middle"
- if(mob.mmb_intent)
- mob.used_intent = mob.mmb_intent
- if(mob.used_intent.type == INTENT_SPELL && mob.ranged_ability)
- var/obj/effect/proc_holder/spell/S = mob.ranged_ability
- if(!S.cast_check(TRUE,mob))
- return
- if(!mob.mmb_intent)
- mouse_pointer_icon = 'icons/effects/mousemice/human_looking.dmi'
- else
- if(mob.mmb_intent.get_chargetime() && !AD.blockscharging)
- updateprogbar()
- else
- mouse_pointer_icon = mob.mmb_intent.pointer
- return
+
if (L["left"]) //start charging a lmb intent
mob.face_atom(object, location, control, params)
if(L["right"])
diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
index 9c1b323542..93c28c40a1 100644
--- a/code/_onclick/hud/_defines.dm
+++ b/code/_onclick/hud/_defines.dm
@@ -69,10 +69,6 @@
#define ui_monkey_neck "CENTER-3:15,SOUTH:5" //monkey
#define ui_monkey_back "CENTER-2:16,SOUTH:5" //monkey
-//#define ui_alien_storage_l "CENTER-2:14,SOUTH:5"//alien
-#define ui_alien_storage_r "CENTER+1:18,SOUTH:5"//alien
-#define ui_alien_language_menu "EAST-3:26,SOUTH:5" //alien
-
#define ui_drone_drop "CENTER+1:18,SOUTH:5" //maintenance drones
#define ui_drone_pull "CENTER+2:2,SOUTH:5" //maintenance drones
#define ui_drone_storage "CENTER-2:14,SOUTH:5" //maintenance drones
@@ -197,12 +193,6 @@
//borgs
#define ui_borg_health "EAST-1:28,CENTER-1:15" //borgs have the health display where humans have the pressure damage indicator.
-//aliens
-#define ui_alien_health "EAST,CENTER-1:15" //aliens have the health display where humans have the pressure damage indicator.
-#define ui_alienplasmadisplay "EAST,CENTER-2:15"
-#define ui_alien_queen_finder "EAST,CENTER-3:15"
-
-//constructs
#define ui_construct_pull "EAST,CENTER-2:15"
#define ui_construct_health "EAST,CENTER:15" //same as borgs and humans
diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
deleted file mode 100644
index 17b5a9ed61..0000000000
--- a/code/_onclick/hud/ai.dm
+++ /dev/null
@@ -1,301 +0,0 @@
-/atom/movable/screen/ai
- icon = 'icons/mob/screen_ai.dmi'
-
-/atom/movable/screen/ai/Click()
- if(isobserver(usr) || usr.incapacitated())
- return TRUE
-
-/atom/movable/screen/ai/aicore
- name = "AI core"
- icon_state = "ai_core"
-
-/atom/movable/screen/ai/aicore/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.view_core()
-
-/atom/movable/screen/ai/camera_list
- name = "Show Camera List"
- icon_state = "camera"
-
-/atom/movable/screen/ai/camera_list/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.show_camera_list()
-
-/atom/movable/screen/ai/camera_track
- name = "Track With Camera"
- icon_state = "track"
-
-/atom/movable/screen/ai/camera_track/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- var/target_name = input(AI, "Choose who you want to track", "Tracking") as null|anything in AI.trackable_mobs()
- AI.ai_camera_track(target_name)
-
-/atom/movable/screen/ai/camera_light
- name = "Toggle Camera Light"
- icon_state = "camera_light"
-
-/atom/movable/screen/ai/camera_light/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.toggle_camera_light()
-
-/atom/movable/screen/ai/crew_monitor
- name = "Crew Monitoring Console"
- icon_state = "crew_monitor"
-
-/atom/movable/screen/ai/crew_monitor/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- GLOB.crewmonitor.show(AI,AI)
-
-/atom/movable/screen/ai/crew_manifest
- name = "Crew Manifest"
- icon_state = "manifest"
-
-/atom/movable/screen/ai/crew_manifest/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.ai_roster()
-
-/atom/movable/screen/ai/alerts
- name = "Show Alerts"
- icon_state = "alerts"
-
-/atom/movable/screen/ai/alerts/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.ai_alerts()
-
-/atom/movable/screen/ai/announcement
- name = "Make Vox Announcement"
- icon_state = "announcement"
-
-/atom/movable/screen/ai/announcement/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.announcement()
-
-/atom/movable/screen/ai/call_shuttle
- name = "Call Emergency Shuttle"
- icon_state = "call_shuttle"
-
-/atom/movable/screen/ai/call_shuttle/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.ai_call_shuttle()
-
-/atom/movable/screen/ai/state_laws
- name = "State Laws"
- icon_state = "state_laws"
-
-/atom/movable/screen/ai/state_laws/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.checklaws()
-
-/atom/movable/screen/ai/pda_msg_send
- name = "PDA - Send Message"
- icon_state = "pda_send"
-
-/atom/movable/screen/ai/pda_msg_send/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.cmd_send_pdamesg(usr)
-
-/atom/movable/screen/ai/pda_msg_show
- name = "PDA - Show Message Log"
- icon_state = "pda_receive"
-
-/atom/movable/screen/ai/pda_msg_show/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.cmd_show_message_log(usr)
-
-/atom/movable/screen/ai/image_take
- name = "Take Image"
- icon_state = "take_picture"
-
-/atom/movable/screen/ai/image_take/Click()
- if(..())
- return
- if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.aicamera.toggle_camera_mode(usr)
- else if(iscyborg(usr))
- var/mob/living/silicon/robot/R = usr
- R.aicamera.toggle_camera_mode(usr)
-
-/atom/movable/screen/ai/image_view
- name = "View Images"
- icon_state = "view_images"
-
-/atom/movable/screen/ai/image_view/Click()
- if(..())
- return
- if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.aicamera.viewpictures(usr)
- else if(iscyborg(usr))
- var/mob/living/silicon/robot/R = usr
- R.aicamera.viewpictures(usr)
-
-/atom/movable/screen/ai/sensors
- name = "Sensor Augmentation"
- icon_state = "ai_sensor"
-
-/atom/movable/screen/ai/sensors/Click()
- if(..())
- return
- var/mob/living/silicon/S = usr
- S.toggle_sensors()
-
-/atom/movable/screen/ai/multicam
- name = "Multicamera Mode"
- icon_state = "multicam"
-
-/atom/movable/screen/ai/multicam/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.toggle_multicam()
-
-/atom/movable/screen/ai/add_multicam
- name = "New Camera"
- icon_state = "new_cam"
-
-/atom/movable/screen/ai/add_multicam/Click()
- if(..())
- return
- var/mob/living/silicon/ai/AI = usr
- AI.drop_new_multicam()
-
-
-/datum/hud/ai
- ui_style = 'icons/mob/screen_ai.dmi'
-
-/datum/hud/ai/New(mob/owner)
- ..()
- var/atom/movable/screen/using
-
-// Language menu
- using = new /atom/movable/screen/language_menu
- using.screen_loc = ui_borg_language_menu
- using.hud = src
- static_inventory += using
-
-//AI core
- using = new /atom/movable/screen/ai/aicore()
- using.screen_loc = ui_ai_core
- using.hud = src
- static_inventory += using
-
-//Camera list
- using = new /atom/movable/screen/ai/camera_list()
- using.screen_loc = ui_ai_camera_list
- using.hud = src
- static_inventory += using
-
-//Track
- using = new /atom/movable/screen/ai/camera_track()
- using.screen_loc = ui_ai_track_with_camera
- using.hud = src
- static_inventory += using
-
-//Camera light
- using = new /atom/movable/screen/ai/camera_light()
- using.screen_loc = ui_ai_camera_light
- using.hud = src
- static_inventory += using
-
-//Crew Monitoring
- using = new /atom/movable/screen/ai/crew_monitor()
- using.screen_loc = ui_ai_crew_monitor
- using.hud = src
- static_inventory += using
-
-//Crew Manifest
- using = new /atom/movable/screen/ai/crew_manifest()
- using.screen_loc = ui_ai_crew_manifest
- using.hud = src
- static_inventory += using
-
-//Alerts
- using = new /atom/movable/screen/ai/alerts()
- using.screen_loc = ui_ai_alerts
- using.hud = src
- static_inventory += using
-
-//Announcement
- using = new /atom/movable/screen/ai/announcement()
- using.screen_loc = ui_ai_announcement
- using.hud = src
- static_inventory += using
-
-//Shuttle
- using = new /atom/movable/screen/ai/call_shuttle()
- using.screen_loc = ui_ai_shuttle
- using.hud = src
- static_inventory += using
-
-//Laws
- using = new /atom/movable/screen/ai/state_laws()
- using.screen_loc = ui_ai_state_laws
- using.hud = src
- static_inventory += using
-
-//PDA message
- using = new /atom/movable/screen/ai/pda_msg_send()
- using.screen_loc = ui_ai_pda_send
- using.hud = src
- static_inventory += using
-
-//PDA log
- using = new /atom/movable/screen/ai/pda_msg_show()
- using.screen_loc = ui_ai_pda_log
- using.hud = src
- static_inventory += using
-
-//Take image
- using = new /atom/movable/screen/ai/image_take()
- using.screen_loc = ui_ai_take_picture
- using.hud = src
- static_inventory += using
-
-//View images
- using = new /atom/movable/screen/ai/image_view()
- using.screen_loc = ui_ai_view_images
- using.hud = src
- static_inventory += using
-
-//Medical/Security sensors
- using = new /atom/movable/screen/ai/sensors()
- using.screen_loc = ui_ai_sensor
- using.hud = src
- static_inventory += using
-
-//Multicamera mode
- using = new /atom/movable/screen/ai/multicam()
- using.screen_loc = ui_ai_multicam
- using.hud = src
- static_inventory += using
-
-//Add multicamera camera
- using = new /atom/movable/screen/ai/add_multicam()
- using.screen_loc = ui_ai_add_multicam
- using.hud = src
- static_inventory += using
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 8cc46dfb6e..44be016f93 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -286,28 +286,6 @@
if(L.mobility_flags & MOBILITY_MOVE)
return L.resist_fire() //I just want to start a flame in your hearrrrrrtttttt.
-
-//ALIENS
-
-/atom/movable/screen/alert/alien_tox
- name = "Plasma"
- desc = ""
- icon_state = "alien_tox"
- alerttooltipstyle = "alien"
-
-/atom/movable/screen/alert/alien_fire
-// This alert is temporarily gonna be thrown for all hot air but one day it will be used for literally being on fire
- name = "Too Hot"
- desc = ""
- icon_state = "alien_fire"
- alerttooltipstyle = "alien"
-
-/atom/movable/screen/alert/alien_vulnerable
- name = "Severed Matriarchy"
- desc = ""
- icon_state = "alien_noqueen"
- alerttooltipstyle = "alien"
-
//BLOBS
/atom/movable/screen/alert/nofactory
@@ -316,114 +294,6 @@
icon_state = "blobbernaut_nofactory"
alerttooltipstyle = "blob"
-// BLOODCULT
-
-/atom/movable/screen/alert/bloodsense
- name = "Blood Sense"
- desc = ""
- icon_state = "cult_sense"
- alerttooltipstyle = "cult"
- var/static/image/narnar
- var/angle = 0
- var/mob/living/simple_animal/hostile/construct/Cviewer = null
-
-/atom/movable/screen/alert/bloodsense/Initialize()
- . = ..()
- narnar = new('icons/mob/screen_alert.dmi', "mini_nar")
- START_PROCESSING(SSprocessing, src)
-
-/atom/movable/screen/alert/bloodsense/Destroy()
- Cviewer = null
- STOP_PROCESSING(SSprocessing, src)
- return ..()
-
-/atom/movable/screen/alert/bloodsense/process()
- var/atom/blood_target
-
- if(!mob_viewer.mind)
- return
-
- var/datum/antagonist/cult/antag = mob_viewer.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
- if(!antag)
- return
- var/datum/objective/sacrifice/sac_objective = locate() in antag.cult_team.objectives
-
- if(antag.cult_team.blood_target)
- if(!get_turf(antag.cult_team.blood_target))
- antag.cult_team.blood_target = null
- else
- blood_target = antag.cult_team.blood_target
- if(Cviewer && Cviewer.seeking && Cviewer.master)
- blood_target = Cviewer.master
- desc = ""
- if(!blood_target)
- if(sac_objective && !sac_objective.check_completion())
- if(icon_state == "runed_sense0")
- return
- animate(src, transform = null, time = 1, loop = 0)
- angle = 0
- cut_overlays()
- icon_state = "runed_sense0"
- desc = ""
- add_overlay(sac_objective.sac_image)
- else
- var/datum/objective/eldergod/summon_objective = locate() in antag.cult_team.objectives
- if(!summon_objective)
- return
- desc = ""
- if(icon_state == "runed_sense1")
- return
- animate(src, transform = null, time = 1, loop = 0)
- angle = 0
- cut_overlays()
- icon_state = "runed_sense1"
- add_overlay(narnar)
- return
- var/turf/P = get_turf(blood_target)
- var/turf/Q = get_turf(mob_viewer)
- if(!P || !Q || (P.z != Q.z)) //The target is on a different Z level, we cannot sense that far.
- icon_state = "runed_sense2"
- desc = ""
- return
-// if(isliving(blood_target))
-// var/mob/living/real_target = blood_target
-// desc = ""
-// else
-// desc = ""
- var/target_angle = Get_Angle(Q, P)
- var/target_dist = get_dist(P, Q)
- cut_overlays()
- switch(target_dist)
- if(0 to 1)
- icon_state = "runed_sense2"
- if(2 to 8)
- icon_state = "arrow8"
- if(9 to 15)
- icon_state = "arrow7"
- if(16 to 22)
- icon_state = "arrow6"
- if(23 to 29)
- icon_state = "arrow5"
- if(30 to 36)
- icon_state = "arrow4"
- if(37 to 43)
- icon_state = "arrow3"
- if(44 to 50)
- icon_state = "arrow2"
- if(51 to 57)
- icon_state = "arrow1"
- if(58 to 64)
- icon_state = "arrow0"
- if(65 to 400)
- icon_state = "arrow"
- var/difference = target_angle - angle
- angle = target_angle
- if(!difference)
- return
- var/matrix/final = matrix(transform)
- final.Turn(difference)
- animate(src, transform = final, time = 5, loop = 0)
-
//GUARDIANS
@@ -445,24 +315,6 @@
icon_state = "guardian_instealth"
alerttooltipstyle = "parasite"
-//SILICONS
-
-/atom/movable/screen/alert/nocell
- name = "Missing Power Cell"
- desc = ""
- icon_state = "nocell"
-
-/atom/movable/screen/alert/emptycell
- name = "Out of Power"
- desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged. \
-Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite."
- icon_state = "emptycell"
-
-/atom/movable/screen/alert/lowcell
- name = "Low Charge"
- desc = ""
- icon_state = "lowcell"
-
//Ethereal
/atom/movable/screen/alert/etherealcharge
@@ -470,51 +322,6 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the
desc = ""
icon_state = "etherealcharge"
-//Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg
-/atom/movable/screen/alert/hacked
- name = "Hacked"
- desc = ""
- icon_state = "hacked"
-
-/atom/movable/screen/alert/locked
- name = "Locked Down"
- desc = "Unit has been remotely locked down. Usage of a Robotics Control Console like the one in the Research Director's \
-office by your AI master or any qualified human may resolve this matter. Robotics may provide further assistance if necessary."
- icon_state = "locked"
-
-/atom/movable/screen/alert/newlaw
- name = "Law Update"
- desc = "Laws have potentially been uploaded to or removed from this unit. Please be aware of any changes \
-so as to remain in compliance with the most up-to-date laws."
- icon_state = "newlaw"
- timeout = 300
-
-/atom/movable/screen/alert/hackingapc
- name = "Hacking APC"
- desc = "An Area Power Controller is being hacked. When the process is \
- complete, you will have exclusive control of it, and you will gain \
- additional processing time to unlock more malfunction abilities."
- icon_state = "hackingapc"
- timeout = 600
- var/atom/target = null
-
-/atom/movable/screen/alert/hackingapc/Click()
- if(!usr || !usr.client)
- return
- if(!target)
- return
- var/mob/living/silicon/ai/AI = usr
- var/turf/T = get_turf(target)
- if(T)
- AI.eyeobj.setLoc(T)
-
-//MECHS
-
-/atom/movable/screen/alert/low_mech_integrity
- name = "Mech Damaged"
- desc = ""
- icon_state = "low_mech_integrity"
-
//GHOSTS
//TODO: expand this system to replace the pollCandidates/CheckAntagonist/"choose quickly"/etc Yes/No messages
diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm
deleted file mode 100644
index a7cd99620f..0000000000
--- a/code/_onclick/hud/alien.dm
+++ /dev/null
@@ -1,135 +0,0 @@
-/atom/movable/screen/alien
- icon = 'icons/mob/screen_alien.dmi'
-
-/atom/movable/screen/alien/leap
- name = "toggle leap"
- icon_state = "leap_off"
-
-/atom/movable/screen/alien/leap/Click()
- if(isalienhunter(usr))
- var/mob/living/carbon/alien/humanoid/hunter/AH = usr
- AH.toggle_leap()
-
-/atom/movable/screen/alien/plasma_display
- icon = 'icons/mob/screen_gen.dmi'
- icon_state = "power_display2"
- name = "plasma stored"
- screen_loc = ui_alienplasmadisplay
-
-
-/atom/movable/screen/alien/alien_queen_finder
- icon = 'icons/mob/screen_alien.dmi'
- icon_state = "queen_finder"
- name = "queen sense"
- desc = ""
- screen_loc = ui_alien_queen_finder
-
-/datum/hud/alien
- ui_style = 'icons/mob/screen_alien.dmi'
-
-/datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner)
- ..()
-
- var/atom/movable/screen/using
-
-//equippable shit
-
-//hands
- build_hand_slots()
-
-//begin buttons
-
- using = new /atom/movable/screen/swap_hand()
- using.icon = ui_style
- using.icon_state = "swap_1"
- using.screen_loc = ui_swaphand_position(owner,1)
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swap_hand()
- using.icon = ui_style
- using.icon_state = "swap_2"
- using.screen_loc = ui_swaphand_position(owner,2)
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/act_intent/alien()
- using.icon_state = mymob.used_intent.name
- using.hud = src
- static_inventory += using
- action_intent = using
-
- if(isalienhunter(mymob))
- var/mob/living/carbon/alien/humanoid/hunter/H = mymob
- H.leap_icon = new /atom/movable/screen/alien/leap()
- H.leap_icon.screen_loc = ui_alien_storage_r
- static_inventory += H.leap_icon
-
- using = new/atom/movable/screen/language_menu
- using.screen_loc = ui_alien_language_menu
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/drop()
- using.icon = ui_style
- using.screen_loc = ui_drop_throw
- using.hud = src
- static_inventory += using
-
-// using = new /atom/movable/screen/resist()
-// using.icon = ui_style
-// using.screen_loc = ui_above_movement
-// using.hud = src
-// hotkeybuttons += using
-
- throw_icon = new /atom/movable/screen/throw_catch()
- throw_icon.icon = ui_style
- throw_icon.screen_loc = ui_drop_throw
- throw_icon.hud = src
- hotkeybuttons += throw_icon
-
- pull_icon = new /atom/movable/screen/pull()
- pull_icon.icon = ui_style
- pull_icon.update_icon()
- pull_icon.screen_loc = ui_above_movement
- pull_icon.hud = src
- static_inventory += pull_icon
-
-//begin indicators
-
- healths = new /atom/movable/screen/healths/alien()
- healths.hud = src
- infodisplay += healths
-
- alien_plasma_display = new /atom/movable/screen/alien/plasma_display()
- alien_plasma_display.hud = src
- infodisplay += alien_plasma_display
-
- if(!isalienqueen(mymob))
- alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder
- alien_queen_finder.hud = src
- infodisplay += alien_queen_finder
-
- zone_select = new /atom/movable/screen/zone_sel/alien()
- zone_select.hud = src
- zone_select.update_icon()
- static_inventory += zone_select
-
- for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
- if(inv.slot_id)
- inv.hud = src
- inv_slots[inv.slot_id] = inv
- inv.update_icon()
-
-/datum/hud/alien/persistent_inventory_update()
- if(!mymob)
- return
- var/mob/living/carbon/alien/humanoid/H = mymob
- if(hud_version != HUD_STYLE_NOHUD)
- for(var/obj/item/I in H.held_items)
- I.screen_loc = ui_hand_position(H.get_held_index_of_item(I))
- H.client.screen += I
- else
- for(var/obj/item/I in H.held_items)
- I.screen_loc = null
- H.client.screen -= I
diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm
deleted file mode 100644
index a17e9cca08..0000000000
--- a/code/_onclick/hud/alien_larva.dm
+++ /dev/null
@@ -1,37 +0,0 @@
-/datum/hud/larva
- ui_style = 'icons/mob/screen_alien.dmi'
-
-/datum/hud/larva/New(mob/owner)
- ..()
- var/atom/movable/screen/using
-
- using = new /atom/movable/screen/act_intent/alien()
- using.icon_state = mymob.used_intent.name
- using.hud = src
- static_inventory += using
- action_intent = using
-
- healths = new /atom/movable/screen/healths/alien()
- healths.hud = src
- infodisplay += healths
-
- alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder()
- alien_queen_finder.hud = src
- infodisplay += alien_queen_finder
-
- pull_icon = new /atom/movable/screen/pull()
- pull_icon.icon = 'icons/mob/screen_alien.dmi'
- pull_icon.update_icon()
- pull_icon.screen_loc = ui_above_movement
- pull_icon.hud = src
- hotkeybuttons += pull_icon
-
- using = new/atom/movable/screen/language_menu
- using.screen_loc = ui_alien_language_menu
- using.hud = src
- static_inventory += using
-
- zone_select = new /atom/movable/screen/zone_sel/alien()
- zone_select.hud = src
- zone_select.update_icon()
- static_inventory += zone_select
diff --git a/code/_onclick/hud/devil.dm b/code/_onclick/hud/devil.dm
index 7588a4abfc..8fde7aaff0 100644
--- a/code/_onclick/hud/devil.dm
+++ b/code/_onclick/hud/devil.dm
@@ -46,9 +46,6 @@
zone_select.hud = src
zone_select.update_icon()
- lingchemdisplay = new /atom/movable/screen/ling/chems()
- lingchemdisplay.hud = src
-
devilsouldisplay = new /atom/movable/screen/devil/soul_counter
devilsouldisplay.hud = src
infodisplay += devilsouldisplay
diff --git a/code/_onclick/hud/drones.dm b/code/_onclick/hud/drones.dm
deleted file mode 100644
index 73f732cb7b..0000000000
--- a/code/_onclick/hud/drones.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-/datum/hud/dextrous/drone/New(mob/owner)
- ..()
- var/atom/movable/screen/inventory/inv_box
-
- inv_box = new /atom/movable/screen/inventory()
- inv_box.name = "internal storage"
- inv_box.icon = ui_style
- inv_box.icon_state = "suit_storage"
-// inv_box.icon_full = "template"
- inv_box.screen_loc = ui_drone_storage
- inv_box.slot_id = SLOT_GENERC_DEXTROUS_STORAGE
- inv_box.hud = src
- static_inventory += inv_box
-
- inv_box = new /atom/movable/screen/inventory()
- inv_box.name = "head/mask"
- inv_box.icon = ui_style
- inv_box.icon_state = "mask"
-// inv_box.icon_full = "template"
- inv_box.screen_loc = ui_drone_head
- inv_box.slot_id = SLOT_HEAD
- inv_box.hud = src
- static_inventory += inv_box
-
- for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
- if(inv.slot_id)
- inv.hud = src
- inv_slots[inv.slot_id] = inv
- inv.update_icon()
-
-
-/datum/hud/dextrous/drone/persistent_inventory_update()
- if(!mymob)
- return
- var/mob/living/simple_animal/drone/D = mymob
-
- if(hud_shown)
- if(D.internal_storage)
- D.internal_storage.screen_loc = ui_drone_storage
- D.client.screen += D.internal_storage
- if(D.head)
- D.head.screen_loc = ui_drone_head
- D.client.screen += D.head
- else
- if(D.internal_storage)
- D.internal_storage.screen_loc = null
- if(D.head)
- D.head.screen_loc = null
-
- ..()
diff --git a/code/_onclick/hud/generic_dextrous.dm b/code/_onclick/hud/generic_dextrous.dm
index 925dfd02d0..68f12f8341 100644
--- a/code/_onclick/hud/generic_dextrous.dm
+++ b/code/_onclick/hud/generic_dextrous.dm
@@ -15,10 +15,6 @@
//Rogue Slots /////////////////////////////////
- grain = new /atom/movable/screen/grain
- grain.hud = src
- static_inventory += grain
-
scannies = new /atom/movable/screen/scannies
scannies.hud = src
static_inventory += scannies
diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm
index 9ee12a187e..2ef17d3ede 100644
--- a/code/_onclick/hud/ghost.dm
+++ b/code/_onclick/hud/ghost.dm
@@ -56,12 +56,12 @@
// Store the current time for the player
GLOB.job_respawn_delays[G.ckey] = world.time + target_job.same_job_respawn_delay
+ verbs -= /client/proc/descend
for(var/turf/spawn_loc in GLOB.underworldcoinspawns)
var/mob/living/carbon/spirit/O = new /mob/living/carbon/spirit(spawn_loc)
O.livingname = G.name
O.ckey = G.ckey
SSdroning.area_entered(get_area(O), O.client)
- verbs -= /client/proc/descend
return
// var/take_triumph = FALSE
@@ -70,12 +70,12 @@
if(C.skeletons)
G.returntolobby()
if(alert("Travel with the boatman?", "", "Yes", "No") == "Yes")
+ verbs -= /client/proc/descend
for(var/turf/spawn_loc in GLOB.underworldcoinspawns)
var/mob/living/carbon/spirit/O = new /mob/living/carbon/spirit(spawn_loc)
O.livingname = G.name
O.ckey = G.ckey
SSdroning.area_entered(get_area(O), O.client)
- verbs -= /client/proc/descend
/* if(world.time < G.ghostize_time + RESPAWNTIME)
var/ttime = round((G.ghostize_time + RESPAWNTIME - world.time) / 10)
var/list/thingsz = list("My connection to the world is still too strong.",\
@@ -101,14 +101,6 @@
var/mob/dead/observer/G = usr
G.dead_tele()
-/atom/movable/screen/ghost/pai
- name = "pAI Candidate"
- icon_state = "pai"
-
-/atom/movable/screen/ghost/pai/Click()
- var/mob/dead/observer/G = usr
- G.register_pai()
-
/datum/hud/ghost/New(mob/owner)
..()
var/atom/movable/screen/using
@@ -117,10 +109,6 @@
using.hud = src
static_inventory += using
- using = new /atom/movable/screen/grain
- using.hud = src
- static_inventory += using
-
scannies = new /atom/movable/screen/scannies
scannies.hud = src
static_inventory += scannies
@@ -155,10 +143,6 @@
using.hud = src
static_inventory += using
- using = new /atom/movable/screen/grain
- using.hud = src
- static_inventory += using
-
scannies = new /atom/movable/screen/scannies
scannies.hud = src
static_inventory += scannies
@@ -189,10 +173,6 @@
using.hud = src
static_inventory += using
- using = new /atom/movable/screen/grain
- using.hud = src
- static_inventory += using
-
scannies = new /atom/movable/screen/scannies
scannies.hud = src
static_inventory += scannies
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 57ecd4ab36..425870992d 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -24,13 +24,9 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list(
var/atom/movable/screen/blobpwrdisplay
- var/atom/movable/screen/alien_plasma_display
- var/atom/movable/screen/alien_queen_finder
-
var/atom/movable/screen/devil/soul_counter/devilsouldisplay
var/atom/movable/screen/act_intent/action_intent
- var/atom/movable/screen/grain
var/atom/movable/screen/scannies
var/atom/movable/screen/act_intent/rogintent/magic/spell_intent
var/atom/movable/screen/zone_sel/zone_select
@@ -131,12 +127,8 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list(
healths = null
healthdoll = null
internals = null
- lingchemdisplay = null
devilsouldisplay = null
- lingstingdisplay = null
blobpwrdisplay = null
- alien_plasma_display = null
- alien_queen_finder = null
QDEL_LIST_ASSOC_VAL(plane_masters)
QDEL_LIST(screenoverlays)
@@ -247,12 +239,6 @@ GLOBAL_LIST_INIT(available_ui_styles, sortList(list(
var/mob/screenmob = viewmob || mymob
hidden_inventory_update(screenmob)
-/datum/hud/robot/show_hud(version = 0, mob/viewmob)
- . = ..()
- if(!.)
- return
- update_robot_modules_display()
-
/datum/hud/proc/hidden_inventory_update()
return
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index c4fb1ce341..9edb3219b8 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -62,24 +62,6 @@
/atom/movable/screen/devil/soul_counter/proc/clear()
invisibility = INVISIBILITY_ABSTRACT
-/atom/movable/screen/ling
- invisibility = INVISIBILITY_ABSTRACT
-
-/atom/movable/screen/ling/sting
- name = "current sting"
- screen_loc = ui_lingstingdisplay
-
-/atom/movable/screen/ling/sting/Click()
- if(isobserver(usr))
- return
- var/mob/living/carbon/U = usr
- U.unset_sting()
-
-/atom/movable/screen/ling/chems
- name = "chemical storage"
- icon_state = "power_display"
- screen_loc = ui_lingchemdisplay
-
/datum/hud/human/New(mob/living/carbon/human/owner)
..()
@@ -96,11 +78,6 @@
//Rogue Slots /////////////////////////////////
- grain = new /atom/movable/screen/grain
- grain.hud = src
- static_inventory += grain
-
-
reads = new /atom/movable/screen/read
reads.hud = src
static_inventory += reads
diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm
index 07f52b9e02..f75433f977 100644
--- a/code/_onclick/hud/monkey.dm
+++ b/code/_onclick/hud/monkey.dm
@@ -104,15 +104,6 @@
pull_icon.hud = src
static_inventory += pull_icon
- lingchemdisplay = new /atom/movable/screen/ling/chems()
- lingchemdisplay.hud = src
- infodisplay += lingchemdisplay
-
- lingstingdisplay = new /atom/movable/screen/ling/sting()
- lingstingdisplay.hud = src
- infodisplay += lingstingdisplay
-
-
zone_select = new /atom/movable/screen/zone_sel()
zone_select.icon = ui_style
zone_select.hud = src
diff --git a/code/_onclick/hud/pai.dm b/code/_onclick/hud/pai.dm
deleted file mode 100644
index a5b11f4780..0000000000
--- a/code/_onclick/hud/pai.dm
+++ /dev/null
@@ -1,258 +0,0 @@
-#define PAI_MISSING_SOFTWARE_MESSAGE "I must download the required software to use this."
-
-/atom/movable/screen/pai
- icon = 'icons/mob/screen_pai.dmi'
- var/required_software
-
-/atom/movable/screen/pai/Click()
- if(isobserver(usr) || usr.incapacitated())
- return FALSE
- var/mob/living/silicon/pai/pAI = usr
- if(required_software && !pAI.software.Find(required_software))
- to_chat(pAI, PAI_MISSING_SOFTWARE_MESSAGE)
- return FALSE
- return TRUE
-
-/atom/movable/screen/pai/software
- name = "Software Interface"
- icon_state = "pai"
-
-/atom/movable/screen/pai/software/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.paiInterface()
-
-/atom/movable/screen/pai/shell
- name = "Toggle Holoform"
- icon_state = "pai_holoform"
-
-/atom/movable/screen/pai/shell/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- if(pAI.holoform)
- pAI.fold_in(0)
- else
- pAI.fold_out()
-
-/atom/movable/screen/pai/chassis
- name = "Holochassis Appearance Composite"
- icon_state = "pai_chassis"
-
-/atom/movable/screen/pai/chassis/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.choose_chassis()
-
-/atom/movable/screen/pai/rest
- name = "Rest"
- icon_state = "pai_rest"
-
-/atom/movable/screen/pai/rest/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.lay_down()
-
-/atom/movable/screen/pai/light
- name = "Toggle Integrated Lights"
- icon_state = "light"
-
-/atom/movable/screen/pai/light/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.toggle_integrated_light()
-
-/atom/movable/screen/pai/newscaster
- name = "pAI Newscaster"
- icon_state = "newscaster"
- required_software = "newscaster"
-
-/atom/movable/screen/pai/newscaster/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.newscaster.ui_interact(usr)
-
-/atom/movable/screen/pai/host_monitor
- name = "Host Health Scan"
- icon_state = "host_monitor"
- required_software = "host scan"
-
-/atom/movable/screen/pai/host_monitor/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- if(iscarbon(pAI.card.loc))
- pAI.hostscan.attack(pAI.card.loc, pAI)
- else
- to_chat(src, "I are not being carried by anyone!")
- return 0
-
-/atom/movable/screen/pai/crew_manifest
- name = "Crew Manifest"
- icon_state = "manifest"
- required_software = "crew manifest"
-
-/atom/movable/screen/pai/crew_manifest/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.ai_roster()
-
-/atom/movable/screen/pai/state_laws
- name = "State Laws"
- icon_state = "state_laws"
-
-/atom/movable/screen/pai/state_laws/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.checklaws()
-
-/atom/movable/screen/pai/pda_msg_send
- name = "PDA - Send Message"
- icon_state = "pda_send"
- required_software = "digital messenger"
-
-/atom/movable/screen/pai/pda_msg_send/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.cmd_send_pdamesg(usr)
-
-/atom/movable/screen/pai/pda_msg_show
- name = "PDA - Show Message Log"
- icon_state = "pda_receive"
- required_software = "digital messenger"
-
-/atom/movable/screen/pai/pda_msg_show/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.cmd_show_message_log(usr)
-
-/atom/movable/screen/pai/image_take
- name = "Take Image"
- icon_state = "take_picture"
- required_software = "photography module"
-
-/atom/movable/screen/pai/image_take/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.aicamera.toggle_camera_mode(usr)
-
-/atom/movable/screen/pai/image_view
- name = "View Images"
- icon_state = "view_images"
- required_software = "photography module"
-
-/atom/movable/screen/pai/image_view/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.aicamera.viewpictures(usr)
-
-/atom/movable/screen/pai/radio
- name = "radio"
- icon = 'icons/mob/screen_cyborg.dmi'
- icon_state = "radio"
-
-/atom/movable/screen/pai/radio/Click()
- if(!..())
- return
- var/mob/living/silicon/pai/pAI = usr
- pAI.radio.interact(usr)
-
-/datum/hud/pai/New(mob/living/silicon/pai/owner)
- ..()
- var/atom/movable/screen/using
-
-// Software menu
- using = new /atom/movable/screen/pai/software
- using.screen_loc = ui_pai_software
- static_inventory += using
-
-// Holoform
- using = new /atom/movable/screen/pai/shell
- using.screen_loc = ui_pai_shell
- static_inventory += using
-
-// Chassis Select Menu
- using = new /atom/movable/screen/pai/chassis
- using.screen_loc = ui_pai_chassis
- static_inventory += using
-
-// Rest
- using = new /atom/movable/screen/pai/rest
- using.screen_loc = ui_pai_rest
- static_inventory += using
-
-// Integrated Light
- using = new /atom/movable/screen/pai/light
- using.screen_loc = ui_pai_light
- static_inventory += using
-
-// Newscaster
- using = new /atom/movable/screen/pai/newscaster
- using.screen_loc = ui_pai_newscaster
- static_inventory += using
-
-// Language menu
- using = new /atom/movable/screen/language_menu
- using.screen_loc = ui_borg_language_menu
- static_inventory += using
-
-// Host Monitor
- using = new /atom/movable/screen/pai/host_monitor()
- using.screen_loc = ui_pai_host_monitor
- static_inventory += using
-
-// Crew Manifest
- using = new /atom/movable/screen/pai/crew_manifest()
- using.screen_loc = ui_pai_crew_manifest
- static_inventory += using
-
-// Laws
- using = new /atom/movable/screen/pai/state_laws()
- using.screen_loc = ui_pai_state_laws
- static_inventory += using
-
-// PDA message
- using = new /atom/movable/screen/pai/pda_msg_send()
- using.screen_loc = ui_pai_pda_send
- static_inventory += using
-
-// PDA log
- using = new /atom/movable/screen/pai/pda_msg_show()
- using.screen_loc = ui_pai_pda_log
- static_inventory += using
-
-// Take image
- using = new /atom/movable/screen/pai/image_take()
- using.screen_loc = ui_pai_take_picture
- static_inventory += using
-
-// View images
- using = new /atom/movable/screen/pai/image_view()
- using.screen_loc = ui_pai_view_images
- static_inventory += using
-
-// Radio
- using = new /atom/movable/screen/pai/radio()
- using.screen_loc = ui_borg_radio
- static_inventory += using
-
- update_software_buttons()
-
-/datum/hud/pai/proc/update_software_buttons()
- var/mob/living/silicon/pai/owner = mymob
- for(var/atom/movable/screen/pai/button in static_inventory)
- if(button.required_software)
- button.color = owner.software.Find(button.required_software) ? null : "#808080"
-
-#undef PAI_MISSING_SOFTWARE_MESSAGE
diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm
index be73b949e5..c6cb53a1fb 100644
--- a/code/_onclick/hud/plane_master.dm
+++ b/code/_onclick/hud/plane_master.dm
@@ -104,6 +104,12 @@
blend_mode = BLEND_MULTIPLY
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+/atom/movable/screen/plane_master/lighting/Initialize()
+ . = ..()
+ filters += filter(type="alpha", render_source = EMISSIVE_RENDER_TARGET, flags = MASK_INVERSE)
+ filters += filter(type="alpha", render_source = EMISSIVE_UNBLOCKABLE_RENDER_TARGET, flags = MASK_INVERSE)
+ filters += filter(type="alpha", render_source = O_LIGHTING_VISUAL_RENDER_TARGET, flags = MASK_INVERSE)
+
/atom/movable/screen/plane_master/parallax
name = "parallax plane master"
// screen_loc = "CENTER-2"
@@ -188,3 +194,39 @@
render_target = FIELD_OF_VISION_BLOCKER_RENDER_TARGET
mouse_opacity = 0
appearance_flags = PLANE_MASTER
+
+/atom/movable/screen/plane_master/o_light_visual
+ name = "overlight light visual plane master"
+ layer = O_LIGHTING_VISUAL_LAYER
+ plane = O_LIGHTING_VISUAL_PLANE
+ render_target = O_LIGHTING_VISUAL_RENDER_TARGET
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ blend_mode = BLEND_MULTIPLY
+
+
+//Contains all weather overlays
+/atom/movable/screen/plane_master/weather_overlay
+ name = "weather overlay master"
+ plane = WEATHER_OVERLAY_PLANE
+ layer = WEATHER_OVERLAY_LAYER
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ render_target = WEATHER_RENDER_TARGET
+ blend_mode = BLEND_MULTIPLY
+ //render_relay_plane = null //Used as alpha filter for weather_effect fullscreen
+
+//Contains the weather effect itself
+/atom/movable/screen/plane_master/weather_effect
+ name = "weather effect plane master"
+ plane = WEATHER_EFFECT_PLANE
+ blend_mode = BLEND_OVERLAY
+ screen_loc = "CENTER-2, CENTER"
+ //render_relay_plane = RENDER_PLANE_GAME
+
+/atom/movable/screen/plane_master/weather_effect/Initialize()
+ . = ..()
+ //filters += filter(type="alpha", render_source=WEATHER_RENDER_TARGET)
+ SSoutdoor_effects.weather_planes_need_vis |= src
+
+/atom/movable/screen/plane_master/weather_effect/Destroy()
+ . = ..()
+ SSoutdoor_effects.weather_planes_need_vis -= src
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
deleted file mode 100644
index 91a10beb46..0000000000
--- a/code/_onclick/hud/robot.dm
+++ /dev/null
@@ -1,287 +0,0 @@
-/atom/movable/screen/robot
- icon = 'icons/mob/screen_cyborg.dmi'
-
-/atom/movable/screen/robot/module
- name = "cyborg module"
- icon_state = "nomod"
-
-/atom/movable/screen/robot/Click()
- if(isobserver(usr))
- return 1
-
-/atom/movable/screen/robot/module/Click()
- if(..())
- return
- var/mob/living/silicon/robot/R = usr
- if(R.module.type != /obj/item/robot_module)
- R.hud_used.toggle_show_robot_modules()
- return 1
- R.pick_module()
-
-/atom/movable/screen/robot/module1
- name = "module1"
- icon_state = "inv1"
-
-/atom/movable/screen/robot/module1/Click()
- if(..())
- return
- var/mob/living/silicon/robot/R = usr
- R.toggle_module(1)
-
-/atom/movable/screen/robot/module2
- name = "module2"
- icon_state = "inv2"
-
-/atom/movable/screen/robot/module2/Click()
- if(..())
- return
- var/mob/living/silicon/robot/R = usr
- R.toggle_module(2)
-
-/atom/movable/screen/robot/module3
- name = "module3"
- icon_state = "inv3"
-
-/atom/movable/screen/robot/module3/Click()
- if(..())
- return
- var/mob/living/silicon/robot/R = usr
- R.toggle_module(3)
-
-/atom/movable/screen/robot/radio
- name = "radio"
- icon_state = "radio"
-
-/atom/movable/screen/robot/radio/Click()
- if(..())
- return
- var/mob/living/silicon/robot/R = usr
- R.radio.interact(R)
-
-/atom/movable/screen/robot/store
- name = "store"
- icon_state = "store"
-
-/atom/movable/screen/robot/store/Click()
- if(..())
- return
- var/mob/living/silicon/robot/R = usr
- R.uneq_active()
-
-/atom/movable/screen/robot/lamp
- name = "headlamp"
- icon_state = "lamp0"
-
-/atom/movable/screen/robot/lamp/Click()
- if(..())
- return
- var/mob/living/silicon/robot/R = usr
- R.control_headlamp()
-
-/atom/movable/screen/robot/thrusters
- name = "ion thrusters"
- icon_state = "ionpulse0"
-
-/atom/movable/screen/robot/thrusters/Click()
- if(..())
- return
- var/mob/living/silicon/robot/R = usr
- R.toggle_ionpulse()
-
-/datum/hud/robot
- ui_style = 'icons/mob/screen_cyborg.dmi'
-
-/datum/hud/robot/New(mob/owner)
- ..()
- var/mob/living/silicon/robot/mymobR = mymob
- var/atom/movable/screen/using
-
- using = new/atom/movable/screen/language_menu
- using.screen_loc = ui_borg_language_menu
- static_inventory += using
-
-//Radio
- using = new /atom/movable/screen/robot/radio()
- using.screen_loc = ui_borg_radio
- using.hud = src
- static_inventory += using
-
-//Module select
- using = new /atom/movable/screen/robot/module1()
- using.screen_loc = ui_inv1
- using.hud = src
- static_inventory += using
- mymobR.inv1 = using
-
- using = new /atom/movable/screen/robot/module2()
- using.screen_loc = ui_inv2
- using.hud = src
- static_inventory += using
- mymobR.inv2 = using
-
- using = new /atom/movable/screen/robot/module3()
- using.screen_loc = ui_inv3
- using.hud = src
- static_inventory += using
- mymobR.inv3 = using
-
-//End of module select
-
-//Photography stuff
- using = new /atom/movable/screen/ai/image_take()
- using.screen_loc = ui_borg_camera
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/ai/image_view()
- using.screen_loc = ui_borg_album
- using.hud = src
- static_inventory += using
-
-//Sec/Med HUDs
- using = new /atom/movable/screen/ai/sensors()
- using.screen_loc = ui_borg_sensor
- using.hud = src
- static_inventory += using
-
-//Headlamp control
- using = new /atom/movable/screen/robot/lamp()
- using.screen_loc = ui_borg_lamp
- using.hud = src
- static_inventory += using
- mymobR.lamp_button = using
-
-//Thrusters
- using = new /atom/movable/screen/robot/thrusters()
- using.screen_loc = ui_borg_thrusters
- using.hud = src
- static_inventory += using
- mymobR.thruster_button = using
-
-//Intent
- action_intent = new /atom/movable/screen/act_intent/robot()
- action_intent.icon_state = mymob.used_intent.name
- action_intent.hud = src
- static_inventory += action_intent
-
-//Health
- healths = new /atom/movable/screen/healths/robot()
- healths.hud = src
- infodisplay += healths
-
-//Installed Module
- mymobR.hands = new /atom/movable/screen/robot/module()
- mymobR.hands.screen_loc = ui_borg_module
- mymobR.hands.hud = src
- static_inventory += mymobR.hands
-
-//Store
- module_store_icon = new /atom/movable/screen/robot/store()
- module_store_icon.screen_loc = ui_borg_store
- module_store_icon.hud = src
-
- pull_icon = new /atom/movable/screen/pull()
- pull_icon.icon = 'icons/mob/screen_cyborg.dmi'
- pull_icon.screen_loc = ui_borg_pull
- pull_icon.hud = src
- pull_icon.update_icon()
- hotkeybuttons += pull_icon
-
-
- zone_select = new /atom/movable/screen/zone_sel/robot()
- zone_select.hud = src
- zone_select.update_icon()
- static_inventory += zone_select
-
-
-/datum/hud/proc/toggle_show_robot_modules()
- if(!iscyborg(mymob))
- return
-
- var/mob/living/silicon/robot/R = mymob
-
- R.shown_robot_modules = !R.shown_robot_modules
- update_robot_modules_display()
-
-/datum/hud/proc/update_robot_modules_display(mob/viewer)
- if(!iscyborg(mymob))
- return
-
- var/mob/living/silicon/robot/R = mymob
-
- var/mob/screenmob = viewer || R
-
- if(!R.module)
- return
-
- if(!R.client)
- return
-
- if(R.shown_robot_modules && screenmob.hud_used.hud_shown)
- //Modules display is shown
- screenmob.client.screen += module_store_icon //"store" icon
-
- if(!R.module.modules)
- to_chat(usr, "Selected module has no modules to select!")
- return
-
- if(!R.robot_modules_background)
- return
-
- var/display_rows = CEILING(length(R.module.get_inactive_modules()) / 8, 1)
- R.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7"
- screenmob.client.screen += R.robot_modules_background
-
- var/x = -4 //Start at CENTER-4,SOUTH+1
- var/y = 1
-
- for(var/atom/movable/A in R.module.get_inactive_modules())
- //Module is not currently active
- screenmob.client.screen += A
- if(x < 0)
- A.screen_loc = "CENTER[x]:16,SOUTH+[y]:7"
- else
- A.screen_loc = "CENTER+[x]:16,SOUTH+[y]:7"
- A.layer = ABOVE_HUD_LAYER
- A.plane = ABOVE_HUD_PLANE
-
- x++
- if(x == 4)
- x = -4
- y++
-
- else
- //Modules display is hidden
- screenmob.client.screen -= module_store_icon //"store" icon
-
- for(var/atom/A in R.module.get_inactive_modules())
- //Module is not currently active
- screenmob.client.screen -= A
- R.shown_robot_modules = 0
- screenmob.client.screen -= R.robot_modules_background
-
-/datum/hud/robot/persistent_inventory_update(mob/viewer)
- if(!mymob)
- return
- var/mob/living/silicon/robot/R = mymob
-
- var/mob/screenmob = viewer || R
-
- if(screenmob.hud_used)
- if(screenmob.hud_used.hud_shown)
- for(var/i in 1 to R.held_items.len)
- var/obj/item/I = R.held_items[i]
- if(I)
- switch(i)
- if(1)
- I.screen_loc = ui_inv1
- if(2)
- I.screen_loc = ui_inv2
- if(3)
- I.screen_loc = ui_inv3
- else
- return
- screenmob.client.screen += I
- else
- for(var/obj/item/I in R.held_items)
- screenmob.client.screen -= I
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index e13d1a6c83..176fe9df25 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -624,10 +624,6 @@
L.toggle_cmode()
update_icon()
-/atom/movable/screen/act_intent/alien
- icon = 'icons/mob/screen_alien.dmi'
- screen_loc = ui_movi
-
/atom/movable/screen/act_intent/robot
icon = 'icons/mob/screen_cyborg.dmi'
screen_loc = ui_borg_intents
@@ -1365,10 +1361,6 @@
. += mutable_appearance(overlay_icon, "[hud.mymob.gender == "male" ? "m" : "f"]_[hud.mymob.zone_selected]")
// . += mutable_appearance(overlay_icon, "height_arrow[hud.mymob.aimheight]")
-/atom/movable/screen/zone_sel/alien
- icon = 'icons/mob/screen_alien.dmi'
- overlay_icon = 'icons/mob/screen_alien.dmi'
-
/atom/movable/screen/zone_sel/robot
icon = 'icons/mob/screen_cyborg.dmi'
@@ -1395,10 +1387,6 @@
icon_state = "health0"
screen_loc = ui_health
-/atom/movable/screen/healths/alien
- icon = 'icons/mob/screen_alien.dmi'
- screen_loc = ui_alien_health
-
/atom/movable/screen/healths/robot
icon = 'icons/mob/screen_cyborg.dmi'
screen_loc = ui_borg_health
@@ -1880,10 +1868,9 @@
if("dawn")
icon_state = "dawn"
name = "Sir Sun - Dawn"
- for(var/datum/weather/rain/R in SSweather.curweathers)
- if(R.stage < 2)
- add_overlay("clouds")
- if(R.stage == 2)
+ /* if(R.stage < 2)
+ add_overlay("clouds") */
+ if(PARTICLEWEATHER_RAIN)
add_overlay("rainlay")
/atom/movable/screen/rogfat
@@ -1906,19 +1893,6 @@
screen_loc = rogueui_fat
layer = HUD_LAYER+0.1
-/atom/movable/screen/grain
- icon = 'icons/grain.dmi'
- icon_state = "grain"
- name = ""
- screen_loc = "1,1"
- mouse_opacity = 0
- alpha = 50
-// layer = 20.5
-// plane = 20
- layer = 13
- plane = 0
- blend_mode = 4
-
/atom/movable/screen/scannies
icon = 'icons/mob/roguehudback2.dmi'
icon_state = "crt"
diff --git a/code/_onclick/hud/swarmer.dm b/code/_onclick/hud/swarmer.dm
deleted file mode 100644
index 0ce47ca7af..0000000000
--- a/code/_onclick/hud/swarmer.dm
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-/atom/movable/screen/swarmer
- icon = 'icons/mob/swarmer.dmi'
-
-/atom/movable/screen/swarmer/FabricateTrap
- icon_state = "ui_trap"
- name = "Create trap (Costs 5 Resources)"
- desc = ""
-
-/atom/movable/screen/swarmer/FabricateTrap/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.CreateTrap()
-
-/atom/movable/screen/swarmer/Barricade
- icon_state = "ui_barricade"
- name = "Create barricade (Costs 5 Resources)"
- desc = ""
-
-/atom/movable/screen/swarmer/Barricade/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.CreateBarricade()
-
-/atom/movable/screen/swarmer/Replicate
- icon_state = "ui_replicate"
- name = "Replicate (Costs 50 Resources)"
- desc = ""
-
-/atom/movable/screen/swarmer/Replicate/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.CreateSwarmer()
-
-/atom/movable/screen/swarmer/RepairSelf
- icon_state = "ui_self_repair"
- name = "Repair self"
- desc = ""
-
-/atom/movable/screen/swarmer/RepairSelf/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.RepairSelf()
-
-/atom/movable/screen/swarmer/ToggleLight
- icon_state = "ui_light"
- name = "Toggle light"
- desc = ""
-
-/atom/movable/screen/swarmer/ToggleLight/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.ToggleLight()
-
-/atom/movable/screen/swarmer/ContactSwarmers
- icon_state = "ui_contact_swarmers"
- name = "Contact swarmers"
- desc = ""
-
-/atom/movable/screen/swarmer/ContactSwarmers/Click()
- if(isswarmer(usr))
- var/mob/living/simple_animal/hostile/swarmer/S = usr
- S.ContactSwarmers()
-
-/datum/hud/swarmer/New(mob/owner)
- ..()
- var/atom/movable/screen/using
-
- using = new /atom/movable/screen/swarmer/FabricateTrap()
- using.screen_loc = ui_hand_position(2)
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swarmer/Barricade()
- using.screen_loc = ui_hand_position(1)
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swarmer/Replicate()
- using.screen_loc = ui_zonesel
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swarmer/RepairSelf()
- using.screen_loc = ui_storage1
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swarmer/ToggleLight()
- using.screen_loc = ui_back
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swarmer/ContactSwarmers()
- using.screen_loc = ui_inventory
- using.hud = src
- static_inventory += using
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index d31777c9f5..b77a938a50 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -9,14 +9,14 @@
*/
/obj/item/proc/melee_attack_chain(mob/user, atom/target, params)
if(user.check_arm_grabbed(user.active_hand_index))
- to_chat(user, "I can't move my arm!")
+ to_chat(user, span_notice("I can't move my arm!"))
return
if(!user.has_hand_for_held_index(user.active_hand_index, TRUE)) //we obviously have a hadn, but we need to check for fingers/prosthetics
- to_chat(user, "I can't move the fingers.")
+ to_chat(user, span_warning("I can't move the fingers."))
return
if(!istype(src, /obj/item/grabbing))
if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS))
- to_chat(user, "...What?")
+ to_chat(user, span_warning("...What?"))
return
if(tool_behaviour && target.tool_act(user, src, tool_behaviour))
return
@@ -40,6 +40,9 @@
return TRUE
return FALSE //return TRUE to avoid calling attackby after this proc does stuff
+/atom/proc/pre_attack_right(atom/A, mob/living/user, params)
+ return FALSE
+
// No comment
/atom/proc/attackby(obj/item/W, mob/user, params)
if(user.used_intent.tranged)
@@ -77,7 +80,7 @@
return FALSE
if(force && HAS_TRAIT(user, TRAIT_PACIFISM))
- to_chat(user, "I don't want to harm other living beings!")
+ to_chat(user, span_warning("I don't want to harm other living beings!"))
return
M.lastattacker = user.real_name
@@ -116,7 +119,7 @@
user.do_attack_animation(M, visual_effect_icon = user.used_intent.animname)
return
if(istype(user.rmb_intent, /datum/rmb_intent/strong))
- user.rogfat_add(10)
+ user.rogfat_add(7)
if(istype(user.rmb_intent, /datum/rmb_intent/swift))
user.rogfat_add(10)
if(M.checkdefense(user.used_intent, user))
@@ -319,7 +322,7 @@
if(istype(I, /obj/item/rogueweapon/pick))
var/obj/item/rogueweapon/pick/P = I
newforce *= P.pickmult
- shake_camera(user, 1, 1)
+ shake_camera(user, 1, 0.1)
miner.mind.adjust_experience(/datum/skill/labor/mining, (miner.STAINT*0.2))
/*
* Ill be honest this final thing is extremely confusing.
@@ -335,6 +338,8 @@
newforce = (newforce * user.used_intent.damfactor) * dullfactor
if(user.used_intent.get_chargetime() && user.client?.chargedprog < 100)
newforce = newforce * 0.5
+ if(!(user.mobility_flags & MOBILITY_STAND))
+ newforce *= 0.5
// newforce is rounded upto the nearest intiger.
newforce = round(newforce,1)
//This is returning the maximum of the arguments meaning this is to prevent negative values.
@@ -358,12 +363,12 @@
verbu = pick(user.used_intent.attack_verb)
if(newforce > 1)
if(user.rogfat_add(5))
- user.visible_message("[user] [verbu] [src] with [I]!")
+ user.visible_message(span_danger("[user] [verbu] [src] with [I]!"))
else
- user.visible_message("[user] [verbu] [src] with [I]!")
+ user.visible_message(span_warning("[user] [verbu] [src] with [I]!"))
newforce = 1
else
- user.visible_message("[user] [verbu] [src] with [I]!")
+ user.visible_message(span_warning("[user] [verbu] [src] with [I]!"))
take_damage(newforce, I.damtype, "melee", 1)
if(newforce > 1)
I.take_damage(1, BRUTE, "melee")
@@ -385,12 +390,12 @@
verbu = pick(user.used_intent.attack_verb)
if(newforce > 1)
if(user.rogfat_add(5))
- user.visible_message("[user] [verbu] [src] with [I]!")
+ user.visible_message(span_danger("[user] [verbu] [src] with [I]!"))
else
- user.visible_message("[user] [verbu] [src] with [I]!")
+ user.visible_message(span_warning("[user] [verbu] [src] with [I]!"))
newforce = 1
else
- user.visible_message("[user] [verbu] [src] with [I]!")
+ user.visible_message(span_warning("[user] [verbu] [src] with [I]!"))
take_damage(newforce, I.damtype, "melee", 1)
if(newforce > 1)
@@ -446,6 +451,42 @@
return "body"
/obj/item/proc/funny_attack_effects(mob/living/target, mob/living/user, nodmg)
+ if(is_silver)
+ if(world.time < src.last_used + 120)
+ to_chat(user, span_notice("The silver effect is on cooldown."))
+ return
+
+ if(ishuman(target) && target.mind)
+ var/mob/living/carbon/human/s_user = user
+ var/mob/living/carbon/human/H = target
+ var/datum/antagonist/werewolf/W = H.mind.has_antag_datum(/datum/antagonist/werewolf/)
+ var/datum/antagonist/vampirelord/lesser/V = H.mind.has_antag_datum(/datum/antagonist/vampirelord/lesser)
+ var/datum/antagonist/vampirelord/V_lord = H.mind.has_antag_datum(/datum/antagonist/vampirelord/)
+ if(V)
+ if(V.disguised)
+ H.visible_message("The silver weapon weakens the curse temporarily!")
+ to_chat(H, span_userdanger("I'm hit by my BANE!"))
+ H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
+ src.last_used = world.time
+ else
+ H.visible_message("The silver weapon weakens the curse temporarily!")
+ to_chat(H, span_userdanger("I'm hit by my BANE!"))
+ H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
+ src.last_used = world.time
+ if(V_lord)
+ if(V_lord.vamplevel < 4 && !V)
+ H.visible_message("The silver weapon weakens the curse temporarily!")
+ to_chat(H, span_userdanger("I'm hit by my BANE!"))
+ H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
+ src.last_used = world.time
+ if(V_lord.vamplevel == 4 && !V)
+ to_chat(s_user, " The silver weapon fails!")
+ H.visible_message(H, span_userdanger("This feeble metal can't hurt me, I AM ANCIENT!"))
+ if(W && W.transformed == TRUE)
+ H.visible_message("The silver weapon weakens the curse temporarily!")
+ to_chat(H, span_userdanger("I'm hit by my BANE!"))
+ H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
+ src.last_used = world.time
return
/mob/living/attacked_by(obj/item/I, mob/living/user)
diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index f8bc3885d8..cf24237ab8 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -57,38 +57,9 @@
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_GHOST, user) & COMPONENT_NO_ATTACK_HAND)
return TRUE
if(user.client)
- if(user.gas_scan && atmosanalyzer_scan(user, src))
- return TRUE
- else if(IsAdminGhost(user))
- attack_ai(user)
- else if(user.client.prefs.inquisitive_ghost)
+ if(user.client.prefs.inquisitive_ghost)
user.examinate(src)
return FALSE
/mob/living/attack_ghost(mob/dead/observer/user)
- if(user.client && user.health_scan)
- healthscan(user, src, 1, TRUE)
- return ..()
-
-// ---------------------------------------
-// And here are some good things for free:
-// Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu
-
-/obj/machinery/gateway/centerstation/attack_ghost(mob/user)
- if(awaygate)
- user.forceMove(awaygate.loc)
- else
- to_chat(user, "[src] has no destination.")
- return ..()
-
-/obj/machinery/gateway/centeraway/attack_ghost(mob/user)
- if(stationgate)
- user.forceMove(stationgate.loc)
- else
- to_chat(user, "[src] has no destination.")
- return ..()
-
-/obj/machinery/teleport/hub/attack_ghost(mob/user)
- if(power_station && power_station.engaged && power_station.teleporter_console && power_station.teleporter_console.target)
- user.forceMove(get_turf(power_station.teleporter_console.target))
return ..()
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index ecfc9ccf8b..367d03d6f3 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -79,7 +79,13 @@
to_chat(src, "[pulledby] is restraining my arm!")
return
- A.attack_right(src, params)
+ //TODO VANDERLIN: Refactor this into melee_attack_chain_right so that items can more dynamically work with RMB
+ var/obj/item/held_item = get_active_held_item()
+ if(held_item)
+ if(!held_item.pre_attack_right(A, src, params))
+ A.attack_right(src, params)
+ else
+ A.attack_right(src, params)
/mob/living/attack_right(mob/user, params)
. = ..()
@@ -197,15 +203,19 @@
next_attack_msg.Cut()
+ var/datum/wound/caused_wound
+ if(!nodmg)
+ caused_wound = affecting.bodypart_attacked_by(BCLASS_BITE, dam2do, user, user.zone_selected, crit_message = TRUE)
+
if(!nodmg)
playsound(src, "smallslash", 100, TRUE, -1)
if(istype(src, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src
if(user.mind && mind)
- if(user.mind.has_antag_datum(/datum/antagonist/werewolf))
- if(!src.mind.has_antag_datum(/datum/antagonist/werewolf))
- if(prob(10))
- addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, werewolf_infect)), 3 MINUTES)
+ if(istype(user.dna.species, /datum/species/werewolf))
+ caused_wound?.werewolf_infect_attempt()
+ if(prob(30))
+ user.werewolf_feed(src)
if(user.mind.has_antag_datum(/datum/antagonist/zombie) && !src.mind.has_antag_datum(/datum/antagonist/zombie))
INVOKE_ASYNC(H, TYPE_PROC_REF(/mob/living/carbon/human, zombie_infect_attempt))
@@ -545,7 +555,7 @@
A.attack_animal(src)
/atom/proc/attack_animal(mob/user)
- return
+ SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_ANIMAL, user)
/mob/living/RestrainedClickOn(atom/A)
return
@@ -598,26 +608,6 @@
"I avoid [src]'s bite!", "I hear jaws snapping shut!", COMBAT_MESSAGE_RANGE, src)
to_chat(src, "My bite misses [ML]!")
-/*
- Aliens
- Defaults to same as monkey in most places
-*/
-/mob/living/carbon/alien/UnarmedAttack(atom/A)
- A.attack_alien(src)
-
-/atom/proc/attack_alien(mob/living/carbon/alien/user)
- attack_paw(user)
- return
-
-/mob/living/carbon/alien/RestrainedClickOn(atom/A)
- return
-
-// Babby aliens
-/mob/living/carbon/alien/larva/UnarmedAttack(atom/A)
- A.attack_larva(src)
-/atom/proc/attack_larva(mob/user)
- return
-
/*
Slimes
diff --git a/code/_onclick/pai.dm b/code/_onclick/pai.dm
deleted file mode 100644
index bf027a1887..0000000000
--- a/code/_onclick/pai.dm
+++ /dev/null
@@ -1,6 +0,0 @@
-/mob/living/silicon/pai/ClickOn(atom/A, params)
- ..()
- if(aicamera.in_camera_mode) //pAI picture taking
- aicamera.camera_mode_off()
- aicamera.captureimage(A, usr, null, aicamera.picture_size_x, aicamera.picture_size_y)
- return
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index dbe464b04e..633e04d705 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -210,9 +210,6 @@
config_entry_value = list( //DEFAULTS
/mob/living/simple_animal = 1,
/mob/living/silicon/pai = 1,
- /mob/living/carbon/alien/humanoid/hunter = -1,
- /mob/living/carbon/alien/humanoid/royal/praetorian = 1,
- /mob/living/carbon/alien/humanoid/royal/queen = 3
)
/datum/config_entry/keyed_list/multiplicative_movespeed/ValidateAndSet()
@@ -260,8 +257,6 @@
movedelay_type = /mob/living/silicon/robot
/datum/config_entry/number/outdated_movedelay/monkey_delay
movedelay_type = /mob/living/carbon/monkey
-/datum/config_entry/number/outdated_movedelay/alien_delay
- movedelay_type = /mob/living/carbon/alien
/datum/config_entry/number/outdated_movedelay/slime_delay
movedelay_type = /mob/living/simple_animal/slime
/datum/config_entry/number/outdated_movedelay/animal_delay
diff --git a/code/controllers/subsystem/ai_controller.dm b/code/controllers/subsystem/ai_controller.dm
new file mode 100644
index 0000000000..12f22c7baa
--- /dev/null
+++ b/code/controllers/subsystem/ai_controller.dm
@@ -0,0 +1,32 @@
+/// The subsystem used to tick [/datum/ai_controllers] instances. Handling the re-checking of plans.
+SUBSYSTEM_DEF(ai_controllers)
+ name = "AI Controller Ticker"
+ flags = SS_POST_FIRE_TIMING|SS_BACKGROUND
+ priority = FIRE_PRIORITY_NPC
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+ init_order = INIT_ORDER_AI_CONTROLLERS
+ wait = 0.5 SECONDS //Plan every half second if required, not great not terrible.
+ ///List of all ai_subtree singletons, key is the typepath while assigned value is a newly created instance of the typepath. See setup_subtrees()
+ var/list/ai_subtrees = list()
+ ///List of all ai controllers currently running
+ var/list/active_ai_controllers = list()
+
+/datum/controller/subsystem/ai_controllers/Initialize(timeofday)
+ setup_subtrees()
+ return ..()
+
+/datum/controller/subsystem/ai_controllers/proc/setup_subtrees()
+ ai_subtrees = list()
+ for(var/subtree_type in subtypesof(/datum/ai_planning_subtree))
+ var/datum/ai_planning_subtree/subtree = new subtree_type
+ ai_subtrees[subtree_type] = subtree
+
+/datum/controller/subsystem/ai_controllers/fire(resumed)
+ for(var/datum/ai_controller/ai_controller as anything in active_ai_controllers)
+ if(!COOLDOWN_FINISHED(ai_controller, failed_planning_cooldown))
+ continue
+ if(!ai_controller.able_to_plan())
+ continue
+ ai_controller.SelectBehaviors(wait * 0.1)
+ if(!LAZYLEN(ai_controller.current_behaviors)) //Still no plan
+ COOLDOWN_START(ai_controller, failed_planning_cooldown, AI_FAILED_PLANNING_COOLDOWN)
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index 79cf65a8b7..aecaaae617 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -53,7 +53,7 @@ SUBSYSTEM_DEF(blackbox)
"server_ip" = world.internet_address || "0",
"server_port" = "[world.port]",
"round_id" = GLOB.round_id,
- ))
+ ))
query_record_playercount.Execute()
qdel(query_record_playercount)
@@ -80,11 +80,6 @@ SUBSYSTEM_DEF(blackbox)
//Recorded on subsystem shutdown
/datum/controller/subsystem/blackbox/proc/FinalFeedback()
record_feedback("tally", "ahelp_stats", GLOB.ahelp_tickets.active_tickets.len, "unresolved")
- for (var/obj/machinery/telecomms/message_server/MS in GLOB.telecomms_list)
- if (MS.pda_msgs.len)
- record_feedback("tally", "radio_usage", MS.pda_msgs.len, "PDA")
- if (MS.rc_msgs.len)
- record_feedback("tally", "radio_usage", MS.rc_msgs.len, "request console")
for(var/player_key in GLOB.player_details)
var/datum/player_details/PD = GLOB.player_details[player_key]
diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
index 2c8cee1ff5..eb01544ad4 100644
--- a/code/controllers/subsystem/communications.dm
+++ b/code/controllers/subsystem/communications.dm
@@ -39,19 +39,5 @@ SUBSYSTEM_DEF(communications)
user.log_talk(input, LOG_SAY, tag="priority announcement")
message_admins("[ADMIN_LOOKUPFLW(user)] has made a priority announcement.")
-/datum/controller/subsystem/communications/proc/send_message(datum/comm_message/sending,print = TRUE,unique = FALSE)
- for(var/obj/machinery/computer/communications/C in GLOB.machines)
- if(!(C.stat & (BROKEN|NOPOWER)) && is_station_level(C.z))
- if(unique)
- C.add_message(sending)
- else //We copy the message for each console, answers and deletions won't be shared
- var/datum/comm_message/M = new(sending.title,sending.content,sending.possible_answers.Copy())
- C.add_message(M)
- if(print)
- var/obj/item/paper/P = new /obj/item/paper(C.loc)
- P.name = "paper - '[sending.title]'"
- P.info = sending.content
- P.update_icon()
-
#undef COMMUNICATION_COOLDOWN
#undef COMMUNICATION_COOLDOWN_AI
diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
index 0fd7090ff1..7861bb6a7b 100644
--- a/code/controllers/subsystem/dbcore.dm
+++ b/code/controllers/subsystem/dbcore.dm
@@ -203,7 +203,6 @@ SUBSYSTEM_DEF(dbcore)
qdel(query)
-
/*
Takes a list of rows (each row being an associated list of column => value) and inserts them via a single mass query.
Rows missing columns present in other rows will resolve to SQL NULL
diff --git a/code/controllers/subsystem/familytree.dm b/code/controllers/subsystem/familytree.dm
index 50a40c2766..dedf88a88b 100644
--- a/code/controllers/subsystem/familytree.dm
+++ b/code/controllers/subsystem/familytree.dm
@@ -41,7 +41,7 @@ SUBSYSTEM_DEF(familytree)
var/excluded_jobs = list(
"Prince",
"Princess",
- "Queen",
+ "Consort",
"King",
"Inquisitor",
)
@@ -56,11 +56,11 @@ SUBSYSTEM_DEF(familytree)
)
/datum/controller/subsystem/familytree/Initialize()
- ruling_family = new /datum/heritage(null, null, /datum/species/human/northern)
+ ruling_family = new /datum/heritage(majority_species = /datum/species/human/northern)
//Blank starter families that we can customize for players.
for(var/pioneer_household in preset_family_species)
for(var/I = 1 to 2)
- families += new /datum/heritage(null, null, pioneer_household)
+ families += new /datum/heritage(majority_species = pioneer_household)
return ..()
@@ -241,7 +241,7 @@ SUBSYSTEM_DEF(familytree)
if(L == H)
continue
//They already have a spouse so skip this one.
- if(L.spouse_name)
+ if(L.spouse_mob)
continue
//True love! They chose you and chose love them!
if(H.setspouse == L.real_name && L.setspouse == H.real_name)
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 7dd7d1f59c..8752b627a0 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -175,7 +175,7 @@ SUBSYSTEM_DEF(job)
// if(istype(job, GetJob(SSjob.overflow_role))) // We don't want to give him assistant, that's boring!
// continue
- if(job.title in GLOB.noble_positions) //If you want a command position, select it!
+ if(job.title in GLOB.court_positions) //If you want a command position, select it!
continue
if(is_banned_from(player.ckey, job.title) || QDELETED(player))
@@ -268,7 +268,7 @@ SUBSYSTEM_DEF(job)
//This is basically to ensure that there's atleast a few heads in the round
/datum/controller/subsystem/job/proc/FillHeadPosition()
for(var/level in level_order)
- for(var/noble_position in GLOB.noble_positions)
+ for(var/noble_position in GLOB.court_positions)
var/datum/job/job = GetJob(noble_position)
if(!job)
continue
@@ -286,7 +286,7 @@ SUBSYSTEM_DEF(job)
//This proc is called at the start of the level loop of DivideOccupations() and will cause head jobs to be checked before any other jobs of the same level
//This is also to ensure we get as many heads as possible
/datum/controller/subsystem/job/proc/CheckHeadPositions(level)
- for(var/noble_position in GLOB.noble_positions)
+ for(var/noble_position in GLOB.court_positions)
var/datum/job/job = GetJob(noble_position)
if(!job)
continue
@@ -339,13 +339,6 @@ SUBSYSTEM_DEF(job)
//Setup new player list and get the jobs list
JobDebug("Running DO")
- //Holder for Triumvirate is stored in the SSticker, this just processes it
- if(SSticker.triai)
- for(var/datum/job/ai/A in occupations)
- A.spawn_positions = 3
- for(var/obj/effect/landmark/start/ai/secondary/S in GLOB.start_landmarks_list)
- S.latejoin_active = TRUE
-
//Get the players who are ready
for(var/i in GLOB.new_player_list)
var/mob/dead/new_player/player = i
@@ -726,19 +719,6 @@ SUBSYSTEM_DEF(job)
J.total_positions = officer_positions
J.spawn_positions = officer_positions
- //Spawn some extra eqipment lockers if we have more than 5 officers
- var/equip_needed = J.total_positions
- if(equip_needed < 0) // -1: infinite available slots
- equip_needed = 12
- for(var/i=equip_needed-5, i>0, i--)
- if(GLOB.secequipment.len)
- var/spawnloc = GLOB.secequipment[1]
- new /obj/structure/closet/secure_closet/security/sec(spawnloc)
- GLOB.secequipment -= spawnloc
- else //We ran out of spare locker spawns!
- break
-
-
/datum/controller/subsystem/job/proc/LoadJobs()
var/jobstext = file2text("[global.config.directory]/jobs.txt")
for(var/datum/job/J in occupations)
diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm
index d5404121b1..31a9101201 100644
--- a/code/controllers/subsystem/machines.dm
+++ b/code/controllers/subsystem/machines.dm
@@ -5,32 +5,17 @@ SUBSYSTEM_DEF(machines)
// wait = 1
var/list/processing = list()
var/list/currentrun = list()
- var/list/powernets = list()
/datum/controller/subsystem/machines/Initialize()
- makepowernets()
fire()
return ..()
-/datum/controller/subsystem/machines/proc/makepowernets()
- for(var/datum/powernet/PN in powernets)
- qdel(PN)
- powernets.Cut()
-
- for(var/obj/structure/cable/PC in GLOB.cable_list)
- if(!PC.powernet)
- var/datum/powernet/NewPN = new()
- NewPN.add_cable(PC)
- propagate_network(PC,PC.powernet)
-
/datum/controller/subsystem/machines/stat_entry()
- ..("M:[processing.len]|PN:[powernets.len]")
+ ..("M:[processing.len]")
/datum/controller/subsystem/machines/fire(resumed = 0)
if (!resumed)
- for(var/datum/powernet/Powernet in powernets)
- Powernet.reset() //reset the power state.
src.currentrun = processing.Copy()
//cache for sanic speed (lists are references anyways)
@@ -48,16 +33,6 @@ SUBSYSTEM_DEF(machines)
if (MC_TICK_CHECK)
return
-/datum/controller/subsystem/machines/proc/setup_template_powernets(list/cables)
- for(var/A in cables)
- var/obj/structure/cable/PC = A
- if(!PC.powernet)
- var/datum/powernet/NewPN = new()
- NewPN.add_cable(PC)
- propagate_network(PC,PC.powernet)
-
/datum/controller/subsystem/machines/Recover()
if (istype(SSmachines.processing))
processing = SSmachines.processing
- if (istype(SSmachines.powernets))
- powernets = SSmachines.powernets
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 31cb5b30da..9819414a28 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -241,10 +241,15 @@ SUBSYSTEM_DEF(mapping)
otherZ += load_map_config("_maps/map_files/dakkatown/otherz/dakkamountain.json")
otherZ += load_map_config("_maps/map_files/dakkatown/otherz/dakkaswamp.json")*/
- //For Rogue map
- otherZ += load_map_config("_maps/map_files/roguetown/otherz/smallforest.json")
- otherZ += load_map_config("_maps/map_files/roguetown/otherz/smalldecap.json")
- otherZ += load_map_config("_maps/map_files/roguetown/otherz/smallswamp.json")
+ if(config.map_name == "Vanderlin") // Vanderlin
+ otherZ += load_map_config("_maps/map_files/vanderlin/otherz/vanderlin_forest.json")
+ otherZ += load_map_config("_maps/map_files/vanderlin/otherz/vanderlin_mountain.json")
+ otherZ += load_map_config("_maps/map_files/vanderlin/otherz/vanderlin_bog.json")
+ // Add dungeon map files here later, maybe we can pick from a list of them?
+ else //For Rogue map
+ otherZ += load_map_config("_maps/map_files/roguetown/otherz/smallforest.json")
+ otherZ += load_map_config("_maps/map_files/roguetown/otherz/smalldecap.json")
+ otherZ += load_map_config("_maps/map_files/roguetown/otherz/smallswamp.json")
//For all maps
otherZ += load_map_config("_maps/map_files/roguetown/otherz/underworld.json")
diff --git a/code/controllers/subsystem/merchant.dm b/code/controllers/subsystem/merchant.dm
new file mode 100644
index 0000000000..f5dd377e4f
--- /dev/null
+++ b/code/controllers/subsystem/merchant.dm
@@ -0,0 +1,23 @@
+SUBSYSTEM_DEF(merchant)
+ name = "Merchant Packs"
+ wait = 10
+ init_order = INIT_ORDER_SHUTTLE
+ runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME
+ flags = SS_NO_FIRE
+
+ var/list/supply_packs = list()
+ var/list/supply_cats = list()
+ var/list/shoppinglist = list()
+ var/list/requestlist = list()
+ var/list/orderhistory = list()
+
+
+/datum/controller/subsystem/merchant/Initialize(timeofday)
+ for(var/pack in subtypesof(/datum/supply_pack/rogue))
+ var/datum/supply_pack/P = new pack()
+ if(!P.contains)
+ continue
+ supply_packs[P.type] = P
+ if(!(P.group in supply_cats))
+ supply_cats += P.group
+ return ..()
diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm
index 371e3bd132..6ffc4696c3 100644
--- a/code/controllers/subsystem/minor_mapping.dm
+++ b/code/controllers/subsystem/minor_mapping.dm
@@ -46,8 +46,6 @@ SUBSYSTEM_DEF(minor_mapping)
for(var/turf/open/floor/plating/T in all_turfs)
if(is_blocked_turf(T))
continue
- if(locate(/obj/structure/cable) in T)
- exposed_wires += T
return shuffle(exposed_wires)
diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm
deleted file mode 100644
index 56539f2b52..0000000000
--- a/code/controllers/subsystem/pai.dm
+++ /dev/null
@@ -1,195 +0,0 @@
-SUBSYSTEM_DEF(pai)
- name = "pAI"
-
- flags = SS_NO_INIT|SS_NO_FIRE
-
- var/list/candidates = list()
- var/ghost_spam = FALSE
- var/spam_delay = 100
- var/list/pai_card_list = list()
-
-/datum/controller/subsystem/pai/Topic(href, href_list[])
- if(href_list["download"])
- var/datum/paiCandidate/candidate = locate(href_list["candidate"]) in candidates
- var/obj/item/paicard/card = locate(href_list["device"]) in pai_card_list
- if(card.pai)
- return
- if(istype(card, /obj/item/paicard) && istype(candidate, /datum/paiCandidate))
- if(check_ready(candidate) != candidate)
- return FALSE
- var/mob/living/silicon/pai/pai = new(card)
- if(!candidate.name)
- pai.name = pick(GLOB.ninja_names)
- else
- pai.name = candidate.name
- pai.real_name = pai.name
- pai.key = candidate.key
-
- card.setPersonality(pai)
-
- candidates -= candidate
- usr << browse(null, "window=findPai")
-
- if(href_list["new"])
- var/datum/paiCandidate/candidate = locate(href_list["candidate"]) in candidates
- var/option = href_list["option"]
- var/t = ""
-
- switch(option)
- if("name")
- t = input("Enter a name for your pAI", "pAI Name", candidate.name) as text|null
- if(t)
- candidate.name = copytext(sanitize_name(t),1,MAX_NAME_LEN)
- if("desc")
- t = input("Enter a description for your pAI", "pAI Description", candidate.description) as message|null
- if(t)
- candidate.description = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
- if("role")
- t = input("Enter a role for your pAI", "pAI Role", candidate.role) as text|null
- if(t)
- candidate.role = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
- if("ooc")
- t = input("Enter any OOC comments", "pAI OOC Comments", candidate.comments) as message|null
- if(t)
- candidate.comments = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
- if("save")
- candidate.savefile_save(usr)
- if("load")
- candidate.savefile_load(usr)
- //In case people have saved unsanitized stuff.
- if(candidate.name)
- candidate.name = copytext(sanitize(candidate.name),1,MAX_NAME_LEN)
- if(candidate.description)
- candidate.description = copytext(sanitize(candidate.description),1,MAX_MESSAGE_LEN)
- if(candidate.role)
- candidate.role = copytext(sanitize(candidate.role),1,MAX_MESSAGE_LEN)
- if(candidate.comments)
- candidate.comments = copytext(sanitize(candidate.comments),1,MAX_MESSAGE_LEN)
-
- if("submit")
- if(candidate)
- candidate.ready = 1
- for(var/obj/item/paicard/p in pai_card_list)
- if(!p.pai)
- p.alertUpdate()
- usr << browse(null, "window=paiRecruit")
- return
- recruitWindow(usr)
-
-/datum/controller/subsystem/pai/proc/recruitWindow(mob/M)
- var/datum/paiCandidate/candidate
- for(var/datum/paiCandidate/c in candidates)
- if(c.key == M.key)
- candidate = c
- if(!candidate)
- candidate = new /datum/paiCandidate()
- candidate.key = M.key
- candidates.Add(candidate)
-
-
- var/dat = ""
- dat += {"
-
- "}
-
- dat += "
Please configure your pAI personality's options. Remember, what you enter here could determine whether or not the user requesting a personality chooses you!
Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here.
Anything you'd like to address specifically to the player reading this in an OOC manner. \"I prefer more serious RP.\", \"I'm still learning the interface!\", etc. Feel free to leave this blank if you want.
"
- dat += "Save Personality "
- dat += "Load Personality "
-
- M << browse(dat, "window=paiRecruit")
-
-/datum/controller/subsystem/pai/proc/spam_again()
- ghost_spam = FALSE
-
-/datum/controller/subsystem/pai/proc/check_ready(datum/paiCandidate/C)
- if(!C.ready)
- return FALSE
- for(var/mob/dead/observer/O in GLOB.player_list)
- if(O.key == C.key)
- return C
- return FALSE
-
-/datum/controller/subsystem/pai/proc/findPAI(obj/item/paicard/p, mob/user)
- if(!ghost_spam)
- ghost_spam = TRUE
- for(var/mob/dead/observer/G in GLOB.player_list)
- if(!G.key)
- continue
- if(!(ROLE_PAI in G.client.prefs.be_special))
- continue
- to_chat(G, "[user] is requesting a pAI personality! Use the pAI button to submit myself as one.")
- addtimer(CALLBACK(src, PROC_REF(spam_again)), spam_delay)
- var/list/available = list()
- for(var/datum/paiCandidate/c in SSpai.candidates)
- available.Add(check_ready(c))
- var/dat = ""
-
- dat += {"
-
- "}
- dat += "
Requesting AI personalities from central database... If there are no entries, or if a suitable entry is not listed, check again later as more personalities may be added.
"
-
- dat += "
"
-
- for(var/datum/paiCandidate/c in available)
- dat += "
"
-
- user << browse(dat, "window=findPai")
-
-/datum/paiCandidate
- var/name
- var/key
- var/description
- var/role
- var/comments
- var/ready = 0
diff --git a/code/controllers/subsystem/particle_weather.dm b/code/controllers/subsystem/particle_weather.dm
new file mode 100644
index 0000000000..08a179c2bb
--- /dev/null
+++ b/code/controllers/subsystem/particle_weather.dm
@@ -0,0 +1,88 @@
+GLOBAL_LIST_INIT(vanderlin_weather, list(PARTICLEWEATHER_RAIN))
+SUBSYSTEM_DEF(ParticleWeather)
+ name = "Particle Weather"
+ flags = SS_BACKGROUND
+ wait = 10
+ runlevels = RUNLEVEL_GAME
+ var/list/eligible_weather = list()
+ var/datum/particle_weather/runningWeather
+ // var/list/next_hit = list() //Used by barometers to know when the next storm is coming
+
+ var/particles/weather/particleEffect
+ var/obj/weatherEffect
+
+/datum/controller/subsystem/ParticleWeather/fire()
+ // process active weather
+ if(runningWeather)
+ if(runningWeather.running)
+ runningWeather.tick()
+ for(var/mob/act_on as anything in GLOB.mob_living_list)
+ runningWeather.try_weather_act(act_on)
+ for(var/obj/act_on as anything in GLOB.weather_act_upon_list)
+ runningWeather.weather_obj_act(act_on)
+ else
+ // start random weather
+ var/datum/particle_weather/our_event = pickweight(eligible_weather) //possible_weather
+ if(our_event)
+ run_weather(our_event)
+
+
+//This has been mangled - currently only supports 1 weather effect serverwide so I can finish this
+/datum/controller/subsystem/ParticleWeather/Initialize(start_timeofday)
+ for(var/V in subtypesof(/datum/particle_weather))
+ var/datum/particle_weather/W = V
+ var/probability = initial(W.probability)
+ var/target_trait = initial(W.target_trait)
+
+ // any weather with a probability set may occur at random
+ if (probability && (target_trait in GLOB.vanderlin_weather)) //TODO VANDERLIN: Map trait this.
+ LAZYINITLIST(eligible_weather)
+ eligible_weather[W] = probability
+ return ..()
+
+/datum/controller/subsystem/ParticleWeather/proc/run_weather(datum/particle_weather/weather_datum_type, force = 0)
+ if(runningWeather)
+ if(force)
+ runningWeather.end()
+ else
+ return
+ if (istext(weather_datum_type))
+ for (var/V in subtypesof(/datum/particle_weather))
+ var/datum/particle_weather/W = V
+ if (initial(W.name) == weather_datum_type)
+ weather_datum_type = V
+ break
+ if (!ispath(weather_datum_type, /datum/particle_weather))
+ CRASH("run_weather called with invalid weather_datum_type: [weather_datum_type || "null"]")
+
+ runningWeather = new weather_datum_type()
+
+ if(force)
+ runningWeather.start()
+ else
+ var/randTime = rand(0, 6000) + initial(runningWeather.weather_duration_upper)
+ addtimer(CALLBACK(runningWeather, /datum/particle_weather/proc/start), randTime, TIMER_UNIQUE|TIMER_STOPPABLE) //Around 0-10 minutes between weathers
+
+
+/datum/controller/subsystem/ParticleWeather/proc/make_eligible(possible_weather)
+ eligible_weather = possible_weather
+// next_hit = null
+
+/datum/controller/subsystem/ParticleWeather/proc/getweatherEffect()
+ if(!weatherEffect)
+ weatherEffect = new /obj()
+ weatherEffect.particles = particleEffect
+ weatherEffect.filters += filter(type="alpha", render_source=WEATHER_RENDER_TARGET)
+ weatherEffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ return weatherEffect
+
+/datum/controller/subsystem/ParticleWeather/proc/SetparticleEffect(particles/P)
+ particleEffect = P
+ weatherEffect.particles = particleEffect
+
+/datum/controller/subsystem/ParticleWeather/proc/stopWeather()
+ for(var/obj/act_on as anything in GLOB.weather_act_upon_list)
+ act_on.weather = FALSE
+ QDEL_NULL(runningWeather)
+ QDEL_NULL(particleEffect)
+
diff --git a/code/controllers/subsystem/particle_weather_outdoors.dm b/code/controllers/subsystem/particle_weather_outdoors.dm
new file mode 100644
index 0000000000..43bf306401
--- /dev/null
+++ b/code/controllers/subsystem/particle_weather_outdoors.dm
@@ -0,0 +1,137 @@
+GLOBAL_LIST_EMPTY(SUNLIGHT_QUEUE_WORK) /* turfs to be stateChecked */
+GLOBAL_LIST_EMPTY(SUNLIGHT_QUEUE_UPDATE) /* turfs to have their colors updated via corners (filter out the unroofed dudes) */
+GLOBAL_LIST_EMPTY(SUNLIGHT_QUEUE_CORNER) /* turfs to have their color/lights/etc updated */
+
+SUBSYSTEM_DEF(outdoor_effects)
+ name = "Outdoor Weather Calc"
+ wait = LIGHTING_INTERVAL
+ flags = SS_TICKER
+ init_order = INIT_ORDER_OUTDOOR_EFFECTS
+ var/list/atom/movable/screen/plane_master/weather_effect/weather_planes_need_vis = list()
+
+
+/datum/controller/subsystem/outdoor_effects/proc/fullPlonk()
+ for (var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+ for (var/turf/T in block(locate(1,1,z), locate(world.maxx,world.maxy,z)))
+ GLOB.SUNLIGHT_QUEUE_WORK += T
+
+/datum/controller/subsystem/outdoor_effects/Initialize(timeofday)
+ if(!initialized)
+ InitializeTurfs()
+ initialized = TRUE
+ fire(FALSE, TRUE)
+ ..()
+
+/datum/controller/subsystem/outdoor_effects/proc/InitializeTurfs(list/targets)
+ for (var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+ for (var/turf/T in block(locate(1,1,z), locate(world.maxx,world.maxy,z)))
+ GLOB.SUNLIGHT_QUEUE_WORK += T
+
+/* set sunlight color + add weather effect to clients */
+/datum/controller/subsystem/outdoor_effects/fire(resumed, init_tick_checks)
+ MC_SPLIT_TICK_INIT(3)
+ if(!init_tick_checks)
+ MC_SPLIT_TICK
+ var/i = 0
+
+ //Add our weather particle obj to any new weather screens
+ if(SSParticleWeather.initialized)
+ for (i in 1 to weather_planes_need_vis.len)
+ var/atom/movable/screen/plane_master/weather_effect/W = weather_planes_need_vis[i]
+ if(W)
+ W.vis_contents = list(SSParticleWeather.getweatherEffect())
+ if(init_tick_checks)
+ CHECK_TICK
+ else if (MC_TICK_CHECK)
+ break
+ if (i)
+ weather_planes_need_vis.Cut(1, i+1)
+ i = 0
+
+ for (i in 1 to GLOB.SUNLIGHT_QUEUE_WORK.len)
+ var/turf/T = GLOB.SUNLIGHT_QUEUE_WORK[i]
+ if(T)
+ T.get_sky_and_weather_states()
+ if(T.outdoor_effect)
+ GLOB.SUNLIGHT_QUEUE_UPDATE += T.outdoor_effect
+
+ if(init_tick_checks)
+ CHECK_TICK
+ else if (MC_TICK_CHECK)
+ break
+ if (i)
+ GLOB.SUNLIGHT_QUEUE_WORK.Cut(1, i+1)
+ i = 0
+
+
+ if(!init_tick_checks)
+ MC_SPLIT_TICK
+
+ for (i in 1 to GLOB.SUNLIGHT_QUEUE_UPDATE.len)
+ var/atom/movable/outdoor_effect/U = GLOB.SUNLIGHT_QUEUE_UPDATE[i]
+ if(U)
+ update_outdoor_effect_overlays(U)
+
+ if(init_tick_checks)
+ CHECK_TICK
+ else if (MC_TICK_CHECK)
+ break
+ if (i)
+ GLOB.SUNLIGHT_QUEUE_UPDATE.Cut(1, i+1)
+ i = 0
+
+
+ if(!init_tick_checks)
+ MC_SPLIT_TICK
+
+ for (i in 1 to GLOB.SUNLIGHT_QUEUE_CORNER.len)
+ var/turf/T = GLOB.SUNLIGHT_QUEUE_CORNER[i]
+ var/atom/movable/outdoor_effect/U = T.outdoor_effect
+
+ /* if we haven't initialized but we are affected, create new and check state */
+ if(!U)
+ T.outdoor_effect = new /atom/movable/outdoor_effect(T)
+ T.get_sky_and_weather_states()
+ U = T.outdoor_effect
+
+ /* in case we aren't indoor somehow, wack us into the proc queue, we will be skipped on next indoor check */
+ if(U.state != SKY_BLOCKED)
+ GLOB.SUNLIGHT_QUEUE_UPDATE += T.outdoor_effect
+
+ if(U.state != SKY_BLOCKED)
+ continue
+
+ //This might need to be run more liberally
+ update_outdoor_effect_overlays(U)
+
+
+ if(init_tick_checks)
+ CHECK_TICK
+ else if (MC_TICK_CHECK)
+ break
+
+ if (i)
+ GLOB.SUNLIGHT_QUEUE_CORNER.Cut(1, i+1)
+ i = 0
+
+
+// Updates overlays and vis_contents for outdoor effects
+/datum/controller/subsystem/outdoor_effects/proc/update_outdoor_effect_overlays(atom/movable/outdoor_effect/OE)
+
+ //Get weather overlay if not weatherproof
+ if(!OE.weatherproof)
+ get_weather_overlay(OE)
+ else
+ cut_weather_overlay(OE)
+
+//get our weather overlay
+/datum/controller/subsystem/outdoor_effects/proc/get_weather_overlay(atom/movable/outdoor_effect/OE) //TODO VANDERLIN: Restore this to 32x48 for some extra
+ OE.icon = 'icons/effects/weather_overlay.dmi'
+ OE.icon_state = "weather_overlay"
+ OE.plane = WEATHER_OVERLAY_PLANE
+
+//get our weather overlay
+/datum/controller/subsystem/outdoor_effects/proc/cut_weather_overlay(atom/movable/outdoor_effect/OE) //TODO VANDERLIN: Restore this to 32x48 for some extra
+ OE.icon = initial(OE.icon)
+ OE.icon_state = initial(OE.icon_state)
+ OE.plane = initial(OE.plane)
diff --git a/code/controllers/subsystem/pollution.dm b/code/controllers/subsystem/pollution.dm
new file mode 100644
index 0000000000..67d7f9e387
--- /dev/null
+++ b/code/controllers/subsystem/pollution.dm
@@ -0,0 +1,59 @@
+SUBSYSTEM_DEF(pollution)
+ name = "Pollution"
+ init_order = INIT_ORDER_AIR //Before atoms, because the emitters may need to know the singletons
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+ wait = 0.5 SECONDS //2 SECONDS -> 0.5 SECONDS
+ /// Currently active pollution
+ var/list/active_pollution = list()
+ /// All pollution in the world
+ var/list/all_polution = list()
+ /// Currently processed batch of pollutants
+ var/list/current_run = list()
+ /// Already processed pollutants in cell process
+ var/list/processed_this_run = list()
+ /// Ticker for dissipation task
+ var/dissapation_ticker = 0
+ /// What's the current task we're doing
+ var/pollution_task = POLLUTION_TASK_PROCESS
+ /// Associative list of types of pollutants to their instanced singletons
+ var/list/singletons = list()
+
+/datum/controller/subsystem/pollution/stat_entry(msg)
+ msg += "|AT:[active_pollution.len]|P:[all_polution.len]"
+ return ..()
+
+/datum/controller/subsystem/pollution/Initialize()
+ //Initialize singletons
+ for(var/type in subtypesof(/datum/pollutant))
+ var/datum/pollutant/pollutant_cast = type
+ if(!length(pollutant_cast::name))
+ continue
+ singletons[type] = new type()
+ return ..()
+
+/datum/controller/subsystem/pollution/fire(resumed = FALSE)
+ var/list/current_run_cache = current_run
+ if(pollution_task == POLLUTION_TASK_PROCESS)
+ if(!current_run_cache.len)
+ current_run_cache = active_pollution.Copy()
+ processed_this_run.Cut()
+ while(current_run_cache.len)
+ var/datum/pollution/pollution = current_run_cache[current_run_cache.len]
+ current_run_cache.len--
+ processed_this_run[pollution] = TRUE
+ pollution.process_cell()
+ if(MC_TICK_CHECK)
+ return
+ dissapation_ticker++
+ if(dissapation_ticker >= TICKS_TO_DISSIPATE * 4)
+ pollution_task = POLLUTION_TASK_DISSIPATE
+ dissapation_ticker = 0
+ current_run_cache = all_polution.Copy()
+ if(pollution_task == POLLUTION_TASK_DISSIPATE)
+ while(current_run_cache.len)
+ var/datum/pollution/pollution = current_run_cache[current_run_cache.len]
+ current_run_cache.len--
+ pollution.scrub_amount(POLLUTION_HEIGHT_DIVISOR, FALSE, TRUE)
+ if(MC_TICK_CHECK)
+ return
+ pollution_task = POLLUTION_TASK_PROCESS
diff --git a/code/controllers/subsystem/processing/ai_avoidance.dm b/code/controllers/subsystem/processing/ai_avoidance.dm
new file mode 100644
index 0000000000..2a3fe992f4
--- /dev/null
+++ b/code/controllers/subsystem/processing/ai_avoidance.dm
@@ -0,0 +1,4 @@
+PROCESSING_SUBSYSTEM_DEF(basic_avoidance)
+ name = "Basic Avoidance"
+ flags = SS_NO_INIT
+ wait = 2 SECONDS
diff --git a/code/controllers/subsystem/processing/ai_behaviors.dm b/code/controllers/subsystem/processing/ai_behaviors.dm
new file mode 100644
index 0000000000..4eb2bea277
--- /dev/null
+++ b/code/controllers/subsystem/processing/ai_behaviors.dm
@@ -0,0 +1,18 @@
+/// The subsystem used to tick [/datum/ai_behavior] instances. Handling the individual actions an AI can take like punching someone in the fucking NUTS
+PROCESSING_SUBSYSTEM_DEF(ai_behaviors)
+ name = "AI Behavior Ticker"
+ flags = SS_POST_FIRE_TIMING|SS_BACKGROUND
+ priority = FIRE_PRIORITY_NPC_ACTIONS
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+ init_order = INIT_ORDER_AI_CONTROLLERS
+ wait = 1
+ ///List of all ai_behavior singletons, key is the typepath while assigned value is a newly created instance of the typepath. See SetupAIBehaviors()
+ var/list/ai_behaviors
+/datum/controller/subsystem/processing/ai_behaviors/Initialize(timeofday)
+ SetupAIBehaviors()
+ return ..()
+/datum/controller/subsystem/processing/ai_behaviors/proc/SetupAIBehaviors()
+ ai_behaviors = list()
+ for(var/behavior_type in subtypesof(/datum/ai_behavior))
+ var/datum/ai_behavior/ai_behavior = new behavior_type
+ ai_behaviors[behavior_type] = ai_behavior
diff --git a/code/controllers/subsystem/processing/ai_movement.dm b/code/controllers/subsystem/processing/ai_movement.dm
new file mode 100644
index 0000000000..4183c0e158
--- /dev/null
+++ b/code/controllers/subsystem/processing/ai_movement.dm
@@ -0,0 +1,20 @@
+/// The subsystem used to tick [/datum/ai_movement] instances. Handling the movement of individual AI instances
+PROCESSING_SUBSYSTEM_DEF(ai_movement)
+ name = "AI movement"
+ flags = SS_KEEP_TIMING|SS_BACKGROUND
+ priority = FIRE_PRIORITY_NPC_MOVEMENT
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+ init_order = INIT_ORDER_AI_MOVEMENT
+ wait = 1
+ ///an assoc list of all ai_movement types. Assoc type to instance
+ var/list/movement_types
+
+/datum/controller/subsystem/processing/ai_movement/Initialize(timeofday)
+ SetupAIMovementInstances()
+ return ..()
+
+/datum/controller/subsystem/processing/ai_movement/proc/SetupAIMovementInstances()
+ movement_types = list()
+ for(var/key as anything in subtypesof(/datum/ai_movement))
+ var/datum/ai_movement/ai_movement = new key
+ movement_types[key] = ai_movement
diff --git a/code/controllers/subsystem/processing/nanites.dm b/code/controllers/subsystem/processing/nanites.dm
deleted file mode 100644
index c34e7f7806..0000000000
--- a/code/controllers/subsystem/processing/nanites.dm
+++ /dev/null
@@ -1,22 +0,0 @@
-PROCESSING_SUBSYSTEM_DEF(nanites)
- name = "Nanites"
- flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
- wait = 10
-
- var/list/datum/nanite_cloud_backup/cloud_backups = list()
- var/list/mob/living/nanite_monitored_mobs = list()
- var/list/datum/nanite_program/relay/nanite_relays = list()
- var/neural_network_count = 0
-
-/datum/controller/subsystem/processing/nanites/proc/check_hardware(datum/nanite_cloud_backup/backup)
- if(QDELETED(backup.storage) || (backup.storage.stat & (NOPOWER|BROKEN)))
- return FALSE
- return TRUE
-
-/datum/controller/subsystem/processing/nanites/proc/get_cloud_backup(cloud_id, force = FALSE)
- for(var/I in cloud_backups)
- var/datum/nanite_cloud_backup/backup = I
- if(!force && !check_hardware(backup))
- return
- if(backup.cloud_id == cloud_id)
- return backup
diff --git a/code/controllers/subsystem/processing/networks.dm b/code/controllers/subsystem/processing/networks.dm
deleted file mode 100644
index 03276d5b26..0000000000
--- a/code/controllers/subsystem/processing/networks.dm
+++ /dev/null
@@ -1,51 +0,0 @@
-PROCESSING_SUBSYSTEM_DEF(networks)
- name = "Networks"
- priority = FIRE_PRIORITY_NETWORKS
- wait = 1
- stat_tag = "NET"
- flags = SS_KEEP_TIMING
- init_order = INIT_ORDER_NETWORKS
- var/datum/ntnet/station/station_network
- var/assignment_hardware_id = HID_RESTRICTED_END
- var/list/networks_by_id = list() //id = network
- var/list/interfaces_by_id = list() //hardware id = component interface
- var/resolve_collisions = TRUE
-
-/datum/controller/subsystem/processing/networks/Initialize()
- station_network = new
- station_network.register_map_supremecy()
- . = ..()
-
-/datum/controller/subsystem/processing/networks/proc/register_network(datum/ntnet/network)
- if(!networks_by_id[network.network_id])
- networks_by_id[network.network_id] = network
- return TRUE
- return FALSE
-
-/datum/controller/subsystem/processing/networks/proc/unregister_network(datum/ntnet/network)
- networks_by_id -= network.network_id
- return TRUE
-
-/datum/controller/subsystem/processing/networks/proc/register_interface(datum/component/ntnet_interface/D)
- if(!interfaces_by_id[D.hardware_id])
- interfaces_by_id[D.hardware_id] = D
- return TRUE
- return FALSE
-
-/datum/controller/subsystem/processing/networks/proc/unregister_interface(datum/component/ntnet_interface/D)
- interfaces_by_id -= D.hardware_id
- return TRUE
-
-/datum/controller/subsystem/processing/networks/proc/get_next_HID()
- var/string = "[num2text(assignment_hardware_id++, 12)]"
- return make_address(string)
-
-/datum/controller/subsystem/processing/networks/proc/make_address(string)
- if(!string)
- return resolve_collisions? make_address("[num2text(rand(HID_RESTRICTED_END, 999999999), 12)]"):null
- var/hex = md5(string)
- if(!hex)
- return //errored
- . = "[copytext(hex, 1, 9)]" //16 ^ 8 possibilities I think.
- if(interfaces_by_id[.])
- return resolve_collisions? make_address("[num2text(rand(HID_RESTRICTED_END, 999999999), 12)]"):null
diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm
deleted file mode 100644
index 1dd3b462c0..0000000000
--- a/code/controllers/subsystem/research.dm
+++ /dev/null
@@ -1,276 +0,0 @@
-
-SUBSYSTEM_DEF(research)
- name = "Research"
- priority = FIRE_PRIORITY_RESEARCH
- wait = 10
- init_order = INIT_ORDER_RESEARCH
- //TECHWEB STATIC
- var/list/techweb_nodes = list() //associative id = node datum
- var/list/techweb_designs = list() //associative id = node datum
- var/list/datum/techweb/techwebs = list()
- var/datum/techweb/science/science_tech
- var/datum/techweb/admin/admin_tech
- var/datum/techweb_node/error_node/error_node //These two are what you get if a node/design is deleted and somehow still stored in a console.
- var/datum/design/error_design/error_design
-
- //ERROR LOGGING
- var/list/invalid_design_ids = list() //associative id = number of times
- var/list/invalid_node_ids = list() //associative id = number of times
- var/list/invalid_node_boost = list() //associative id = error message
-
- var/list/obj/machinery/rnd/server/servers = list()
-
- var/list/techweb_nodes_starting = list() //associative id = TRUE
- var/list/techweb_categories = list() //category name = list(node.id = TRUE)
- var/list/techweb_boost_items = list() //associative double-layer path = list(id = list(point_type = point_discount))
- var/list/techweb_nodes_hidden = list() //Node ids that should be hidden by default.
- var/list/techweb_point_items = list( //path = list(point type = value)
- /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
- )
- var/list/errored_datums = list()
- var/list/point_types = list() //typecache style type = TRUE list
- //----------------------------------------------
- var/list/single_server_income = list(TECHWEB_POINT_TYPE_GENERIC = 54.3)
- var/multiserver_calculation = FALSE
- var/last_income
- //^^^^^^^^ ALL OF THESE ARE PER SECOND! ^^^^^^^^
-
- //Aiming for 1.5 hours to max R&D
- //[88nodes * 5000points/node] / [1.5hr * 90min/hr * 60s/min]
- //Around 450000 points max???
-
-/datum/controller/subsystem/research/Initialize()
- point_types = TECHWEB_POINT_TYPE_LIST_ASSOCIATIVE_NAMES
- initialize_all_techweb_designs()
- initialize_all_techweb_nodes()
- science_tech = new /datum/techweb/science
- admin_tech = new /datum/techweb/admin
- autosort_categories()
- error_design = new
- error_node = new
- return ..()
-
-/datum/controller/subsystem/research/fire()
- var/list/bitcoins = list()
- if(multiserver_calculation)
- var/eff = calculate_server_coefficient()
- for(var/obj/machinery/rnd/server/miner in servers)
- var/list/result = (miner.mine()) //SLAVE AWAY, SLAVE.
- for(var/i in result)
- result[i] *= eff
- bitcoins[i] = bitcoins[i]? bitcoins[i] + result[i] : result[i]
- else
- for(var/obj/machinery/rnd/server/miner in servers)
- if(miner.working)
- bitcoins = single_server_income.Copy()
- break //Just need one to work.
- if (!isnull(last_income))
- var/income_time_difference = world.time - last_income
- science_tech.last_bitcoins = bitcoins // Doesn't take tick drift into account
- for(var/i in bitcoins)
- bitcoins[i] *= income_time_difference / 10
- science_tech.add_point_list(bitcoins)
- last_income = world.time
-
-/datum/controller/subsystem/research/proc/calculate_server_coefficient() //Diminishing returns.
- var/amt = servers.len
- if(!amt)
- return 0
- var/coeff = 100
- coeff = sqrt(coeff / amt)
- return coeff
-
-/datum/controller/subsystem/research/proc/autosort_categories()
- for(var/i in techweb_nodes)
- var/datum/techweb_node/I = techweb_nodes[i]
- if(techweb_categories[I.category])
- techweb_categories[I.category][I.id] = TRUE
- else
- techweb_categories[I.category] = list(I.id = TRUE)
-
-/datum/controller/subsystem/research/proc/techweb_node_by_id(id)
- return techweb_nodes[id] || error_node
-
-/datum/controller/subsystem/research/proc/techweb_design_by_id(id)
- return techweb_designs[id] || error_design
-
-/datum/controller/subsystem/research/proc/on_design_deletion(datum/design/D)
- for(var/i in techweb_nodes)
- var/datum/techweb_node/TN = techwebs[i]
- TN.on_design_deletion(TN)
- for(var/i in techwebs)
- var/datum/techweb/T = i
- T.recalculate_nodes(TRUE)
-
-/datum/controller/subsystem/research/proc/on_node_deletion(datum/techweb_node/TN)
- for(var/i in techweb_nodes)
- var/datum/techweb_node/TN2 = techwebs[i]
- TN2.on_node_deletion(TN)
- for(var/i in techwebs)
- var/datum/techweb/T = i
- T.recalculate_nodes(TRUE)
-
-/datum/controller/subsystem/research/proc/initialize_all_techweb_nodes(clearall = FALSE)
- if(islist(techweb_nodes) && clearall)
- QDEL_LIST(techweb_nodes)
- if(islist(techweb_nodes_starting && clearall))
- techweb_nodes_starting.Cut()
- var/list/returned = list()
- for(var/path in subtypesof(/datum/techweb_node))
- var/datum/techweb_node/TN = path
- if(isnull(initial(TN.id)))
- continue
- TN = new path
- if(returned[initial(TN.id)])
- stack_trace("WARNING: Techweb node ID clash with ID [initial(TN.id)] detected! Path: [path]")
- errored_datums[TN] = initial(TN.id)
- continue
- returned[initial(TN.id)] = TN
- if(TN.starting_node)
- techweb_nodes_starting[TN.id] = TRUE
- for(var/id in techweb_nodes)
- var/datum/techweb_node/TN = techweb_nodes[id]
- TN.Initialize()
- techweb_nodes = returned
- if (!verify_techweb_nodes()) //Verify all nodes have ids and such.
- stack_trace("Invalid techweb nodes detected")
- calculate_techweb_nodes()
- calculate_techweb_boost_list()
- if (!verify_techweb_nodes()) //Verify nodes and designs have been crosslinked properly.
- CRASH("Invalid techweb nodes detected")
-
-/datum/controller/subsystem/research/proc/initialize_all_techweb_designs(clearall = FALSE)
- if(islist(techweb_designs) && clearall)
- QDEL_LIST(techweb_designs)
- var/list/returned = list()
- for(var/path in subtypesof(/datum/design))
- var/datum/design/DN = path
- if(isnull(initial(DN.id)))
- stack_trace("WARNING: Design with null ID detected. Build path: [initial(DN.build_path)]")
- continue
- else if(initial(DN.id) == DESIGN_ID_IGNORE)
- continue
- DN = new path
- if(returned[initial(DN.id)])
- stack_trace("WARNING: Design ID clash with ID [initial(DN.id)] detected! Path: [path]")
- errored_datums[DN] = initial(DN.id)
- continue
- DN.InitializeMaterials() //Initialize the materials in the design
- returned[initial(DN.id)] = DN
- techweb_designs = returned
- verify_techweb_designs()
-
-
-/datum/controller/subsystem/research/proc/verify_techweb_nodes()
- . = TRUE
- for(var/n in techweb_nodes)
- var/datum/techweb_node/N = techweb_nodes[n]
- if(!istype(N))
- WARNING("Invalid research node with ID [n] detected and removed.")
- techweb_nodes -= n
- research_node_id_error(n)
- . = FALSE
- for(var/p in N.prereq_ids)
- var/datum/techweb_node/P = techweb_nodes[p]
- if(!istype(P))
- WARNING("Invalid research prerequisite node with ID [p] detected in node [N.display_name]\[[N.id]\] removed.")
- N.prereq_ids -= p
- research_node_id_error(p)
- . = FALSE
- for(var/d in N.design_ids)
- var/datum/design/D = techweb_designs[d]
- if(!istype(D))
- WARNING("Invalid research design with ID [d] detected in node [N.display_name]\[[N.id]\] removed.")
- N.design_ids -= d
- design_id_error(d)
- . = FALSE
- for(var/u in N.unlock_ids)
- var/datum/techweb_node/U = techweb_nodes[u]
- if(!istype(U))
- WARNING("Invalid research unlock node with ID [u] detected in node [N.display_name]\[[N.id]\] removed.")
- N.unlock_ids -= u
- research_node_id_error(u)
- . = FALSE
- for(var/p in N.boost_item_paths)
- if(!ispath(p))
- N.boost_item_paths -= p
- WARNING("[p] is not a valid path.")
- node_boost_error(N.id, "[p] is not a valid path.")
- . = FALSE
- var/list/points = N.boost_item_paths[p]
- if(islist(points))
- for(var/i in points)
- if(!isnum(points[i]))
- WARNING("[points[i]] is not a valid number.")
- node_boost_error(N.id, "[points[i]] is not a valid number.")
- . = FALSE
- else if(!point_types[i])
- WARNING("[i] is not a valid point type.")
- node_boost_error(N.id, "[i] is not a valid point type.")
- . = FALSE
- else if(!isnull(points))
- N.boost_item_paths -= p
- node_boost_error(N.id, "No valid list.")
- WARNING("No valid list.")
- . = FALSE
- CHECK_TICK
-
-/datum/controller/subsystem/research/proc/verify_techweb_designs()
- for(var/d in techweb_designs)
- var/datum/design/D = techweb_designs[d]
- if(!istype(D))
- stack_trace("WARNING: Invalid research design with ID [d] detected and removed.")
- techweb_designs -= d
- CHECK_TICK
-
-/datum/controller/subsystem/research/proc/research_node_id_error(id)
- if(invalid_node_ids[id])
- invalid_node_ids[id]++
- else
- invalid_node_ids[id] = 1
-
-/datum/controller/subsystem/research/proc/design_id_error(id)
- if(invalid_design_ids[id])
- invalid_design_ids[id]++
- else
- invalid_design_ids[id] = 1
-
-/datum/controller/subsystem/research/proc/calculate_techweb_nodes()
- for(var/design_id in techweb_designs)
- var/datum/design/D = techweb_designs[design_id]
- D.unlocked_by.Cut()
- for(var/node_id in techweb_nodes)
- var/datum/techweb_node/node = techweb_nodes[node_id]
- node.unlock_ids = list()
- for(var/i in node.design_ids)
- var/datum/design/D = techweb_designs[i]
- node.design_ids[i] = TRUE
- D.unlocked_by += node.id
- if(node.hidden)
- techweb_nodes_hidden[node.id] = TRUE
- CHECK_TICK
- generate_techweb_unlock_linking()
-
-/datum/controller/subsystem/research/proc/generate_techweb_unlock_linking()
- for(var/node_id in techweb_nodes) //Clear all unlock links to avoid duplication.
- var/datum/techweb_node/node = techweb_nodes[node_id]
- node.unlock_ids = list()
- for(var/node_id in techweb_nodes)
- var/datum/techweb_node/node = techweb_nodes[node_id]
- for(var/prereq_id in node.prereq_ids)
- var/datum/techweb_node/prereq_node = techweb_node_by_id(prereq_id)
- prereq_node.unlock_ids[node.id] = node
-
-/datum/controller/subsystem/research/proc/calculate_techweb_boost_list(clearall = FALSE)
- if(clearall)
- techweb_boost_items = list()
- for(var/node_id in techweb_nodes)
- var/datum/techweb_node/node = techweb_nodes[node_id]
- for(var/path in node.boost_item_paths)
- if(!ispath(path))
- continue
- if(length(techweb_boost_items[path]))
- techweb_boost_items[path][node.id] = node.boost_item_paths[path]
- else
- techweb_boost_items[path] = list(node.id = node.boost_item_paths[path])
- CHECK_TICK
diff --git a/code/controllers/subsystem/rogue/devotion.dm b/code/controllers/subsystem/rogue/devotion.dm
index 5097fb8309..b621d6dbdd 100644
--- a/code/controllers/subsystem/rogue/devotion.dm
+++ b/code/controllers/subsystem/rogue/devotion.dm
@@ -29,7 +29,16 @@
else
return FALSE
-/datum/devotion/cleric_holder/proc/update_devotion(dev_amt, prog_amt)
+// This is a proc to deduct a devotion cost out of spells when cast.
+// We do this to avoid using negative values, which BYOND calculates in a really stupid way if we do the math wrong.
+/datum/devotion/cleric_holder/proc/consume_devotion(amt as num)
+ devotion -= amt
+ var/mob/living/carbon/human/C = holder_mob
+ var/amt2raise = C.STAINT*2
+ progression += amt2raise
+
+// This spell is used to ADD devotion to the player, through prayer or job initialization.
+/datum/devotion/cleric_holder/proc/update_devotion(dev_amt as num, prog_amt)
var/datum/patron/P = patron
devotion += dev_amt
//Max devotion limit
@@ -132,20 +141,20 @@
// Generation Procs
/mob/living/carbon/human/proc/clericpray()
- set name = "Give Prayer"
+ set name = "Start praying"
set category = "Cleric"
var/datum/devotion/cleric_holder/C = src.cleric
var/prayersesh = 0
- visible_message("[src] kneels their head in prayer to the Gods.", "I kneel my head in prayer to [patron.name]")
+ visible_message("[src] kneels their head in prayer.", "I kneel my head in prayer to [patron.name]")
for(var/i in 1 to 20)
if(do_after(src, 30))
if(C.devotion >= C.max_devotion)
to_chat(src, "I have reached the limit of my devotion...")
break
- C.update_devotion(2, 2)
- prayersesh += 2
+ C.update_devotion(5, 5)
+ prayersesh += 5
else
visible_message("[src] concludes their prayer.", "I conclude my prayer.")
to_chat(src, "I gained [prayersesh] devotion!")
diff --git a/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/character/pick_any_class.dm b/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/character/pick_any_class.dm
index 985bea07ed..11e7704f25 100644
--- a/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/character/pick_any_class.dm
+++ b/code/controllers/subsystem/rogue/triumphs/triumph_buy_datums/character/pick_any_class.dm
@@ -56,6 +56,14 @@
continue
if(CTAG_MERCENARY in CHECKS.category_tags)
continue
+ if(CTAG_TOWNER in CHECKS.category_tags)
+ continue
+ if(CTAG_GARRISON in CHECKS.category_tags)
+ continue
+ if(CTAG_ADEPT in CHECKS.category_tags)
+ continue
+ if(CTAG_CONSORT in CHECKS.category_tags)
+ continue
possible_classes += CHECKS
var/datum/advclass/C = input(H.client, "What is my class?", "Adventure") as null|anything in possible_classes
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 6e0f12eb38..8ebd7d191b 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -31,27 +31,15 @@ SUBSYSTEM_DEF(shuttle)
var/emergencyNoEscape
var/emergencyNoRecall = FALSE
var/list/hostileEnvironments = list() //Things blocking escape shuttle from leaving
- var/list/tradeBlockade = list() //Things blocking cargo from leaving.
- var/supplyBlocked = FALSE
- //supply shuttle stuff
- var/obj/docking_port/mobile/supply/supply
var/ordernum = 1 //order number given to next order
var/points = 5000 //number of trade-points we have
var/centcom_message = "" //Remarks from CentCom on how well you checked the last order.
var/list/discoveredPlants = list() //Typepaths for unusual plants we've already sent CentCom, associated with their potencies
- var/list/supply_packs = list()
- var/list/supply_cats = list()
- var/list/shoppinglist = list()
- var/list/requestlist = list()
- var/list/orderhistory = list()
-
var/list/hidden_shuttle_turfs = list() //all turfs hidden from navigation computers associated with a list containing the image hiding them and the type of the turf they are pretending to be
var/list/hidden_shuttle_turf_images = list() //only the images from the above list
- var/datum/round_event/shuttle_loan/shuttle_loan
-
var/shuttle_purchased = FALSE //If the station has purchased a replacement escape shuttle this round
var/list/shuttle_purchase_requirements_met = list() //For keeping track of ingame events that would unlock new shuttles, such as defeating a boss or discovering a secret item
@@ -69,24 +57,7 @@ SUBSYSTEM_DEF(shuttle)
/datum/controller/subsystem/shuttle/Initialize(timeofday)
ordernum = rand(1, 9000)
- for(var/pack in subtypesof(/datum/supply_pack/rogue))
- var/datum/supply_pack/P = new pack()
- if(!P.contains)
- continue
- supply_packs[P.type] = P
- if(!(P.group in supply_cats))
- supply_cats += P.group
-
initial_load()
-
- if(!arrivals)
- WARNING("No /obj/docking_port/mobile/arrivals placed on the map!")
- if(!emergency)
- WARNING("No /obj/docking_port/mobile/emergency placed on the map!")
- if(!backup_shuttle)
- WARNING("No /obj/docking_port/mobile/emergency/backup placed on the map!")
- if(!supply)
- WARNING("No /obj/docking_port/mobile/supply placed on the map!")
return ..()
/datum/controller/subsystem/shuttle/proc/initial_load()
@@ -116,7 +87,6 @@ SUBSYSTEM_DEF(shuttle)
var/not_in_use = (!T.get_docked())
if(idle && not_centcom_evac && not_in_use)
qdel(T, force=TRUE)
- CheckAutoEvac()
if(!SSmapping.clearing_reserved_turfs)
while(transit_requesters.len)
@@ -132,33 +102,6 @@ SUBSYSTEM_DEF(shuttle)
if(MC_TICK_CHECK)
break
-/datum/controller/subsystem/shuttle/proc/CheckAutoEvac()
- if(emergencyNoEscape || emergencyNoRecall || !emergency || !SSticker.HasRoundStarted())
- return
-
- var/threshold = CONFIG_GET(number/emergency_shuttle_autocall_threshold)
- if(!threshold)
- return
-
- var/alive = 0
- for(var/I in GLOB.player_list)
- var/mob/M = I
- if(M.stat != DEAD)
- ++alive
-
- var/total = GLOB.joined_player_list.len
- if(total <= 0)
- return //no players no autoevac
-
- if(alive / total <= threshold)
- var/msg = "Automatically dispatching shuttle due to crew death."
- message_admins(msg)
- log_game("[msg] Alive: [alive], Roundstart: [total], Threshold: [threshold]")
- emergencyNoRecall = TRUE
- priority_announce("Catastrophic casualties detected: crisis shuttle protocols activated - jamming recall signals across all frequencies.")
- if(emergency.timeLeft(1) > emergencyCallTime * 0.4)
- emergency.request(null, set_coefficient = 0.4)
-
/datum/controller/subsystem/shuttle/proc/block_recall(lockout_timer)
emergencyNoRecall = TRUE
addtimer(CALLBACK(src, PROC_REF(unblock_recall)), lockout_timer)
@@ -182,15 +125,6 @@ SUBSYSTEM_DEF(shuttle)
if(!emergency)
WARNING("requestEvac(): There is no emergency shuttle, but the \
shuttle was called. Using the backup shuttle instead.")
- if(!backup_shuttle)
- CRASH("requestEvac(): There is no emergency shuttle, \
- or backup shuttle! The game will be unresolvable. This is \
- possibly a mapping error, more likely a bug with the shuttle \
- manipulation system, or badminry. It is possible to manually \
- resolve this problem by loading an emergency shuttle template \
- manually, and then calling register() on the mobile docking port. \
- Good luck.")
- emergency = backup_shuttle
var/srd = CONFIG_GET(number/shuttle_refuel_delay)
if(world.time - SSticker.round_start_time < srd)
// to_chat(user, "There is no response.")
@@ -225,12 +159,7 @@ SUBSYSTEM_DEF(shuttle)
var/area/signal_origin = get_area(user)
// var/emergency_reason = "\nNature of emergency:\n\n[call_reason]"
var/emergency_reason = "yea"
- var/security_num = seclevel2num(get_security_level())
- switch(security_num)
- if(SEC_LEVEL_RED,SEC_LEVEL_DELTA)
- emergency.request(null, signal_origin, html_decode(emergency_reason), 1) //There is a serious threat we gotta move no time to give them five minutes.
- else
- emergency.request(null, signal_origin, html_decode(emergency_reason), 0)
+ emergency.request(null, signal_origin, html_decode(emergency_reason), 1) //There is a serious threat we gotta move no time to give them five minutes.
var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
@@ -256,25 +185,6 @@ SUBSYSTEM_DEF(shuttle)
if(!admiral_message)
admiral_message = pick(GLOB.admiral_messages)
- var/intercepttext = "Nanotrasen Update: Request For Shuttle.\
- To whom it may concern:
\
- We have taken note of the situation upon [station_name()] and have come to the \
- conclusion that it does not warrant the abandonment of the station. \
- If you do not agree with our opinion we suggest that you open a direct \
- line with us and explain the nature of your crisis.
\
- This message has been automatically generated based upon readings from long \
- range diagnostic tools. To assure the quality of your request every finalized report \
- is reviewed by an on-call rear admiral. \
- Rear Admiral's Notes: \
- [admiral_message]"
- print_command_report(intercepttext, announce = TRUE)
-
-// Called when an emergency shuttle mobile docking port is
-// destroyed, which will only happen with admin intervention
-/datum/controller/subsystem/shuttle/proc/emergencyDeregister()
- // When a new emergency shuttle is created, it will override the
- // backup shuttle.
- src.emergency = src.backup_shuttle
/datum/controller/subsystem/shuttle/proc/cancelEvac(mob/user)
if(canRecall())
@@ -287,47 +197,9 @@ SUBSYSTEM_DEF(shuttle)
/datum/controller/subsystem/shuttle/proc/canRecall()
if(!emergency || emergency.mode != SHUTTLE_CALL || emergencyNoRecall || SSticker.mode.name == "meteor")
return
- var/security_num = seclevel2num(get_security_level())
- switch(security_num)
- if(SEC_LEVEL_GREEN)
- if(emergency.timeLeft(1) < emergencyCallTime)
- return
- if(SEC_LEVEL_BLUE)
- if(emergency.timeLeft(1) < emergencyCallTime * 0.5)
- return
- else
- if(emergency.timeLeft(1) < emergencyCallTime * 0.25)
- return
- return 1
-
-/datum/controller/subsystem/shuttle/proc/autoEvac()
- if (!SSticker.IsRoundInProgress())
+ if(emergency.timeLeft(1) < emergencyCallTime)
return
-
- var/callShuttle = 1
-
- for(var/thing in GLOB.shuttle_caller_list)
- if(isAI(thing))
- var/mob/living/silicon/ai/AI = thing
- if(AI.deployed_shell && !AI.deployed_shell.client)
- continue
- if(AI.stat || !AI.client)
- continue
- else if(istype(thing, /obj/machinery/computer/communications))
- var/obj/machinery/computer/communications/C = thing
- if(C.stat & BROKEN)
- continue
-
- var/turf/T = get_turf(thing)
- if(T && is_station_level(T.z))
- callShuttle = 0
- break
-
- if(callShuttle)
- if(EMERGENCY_IDLE_OR_RECALLED)
- emergency.request(null, set_coefficient = 2.5)
- log_game("There is no means of calling the shuttle anymore. Shuttle automatically called.")
- message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.")
+ return 1
/datum/controller/subsystem/shuttle/proc/registerHostileEnvironment(datum/bad)
hostileEnvironments[bad] = TRUE
@@ -337,30 +209,6 @@ SUBSYSTEM_DEF(shuttle)
hostileEnvironments -= bad
checkHostileEnvironment()
-
-/datum/controller/subsystem/shuttle/proc/registerTradeBlockade(datum/bad)
- tradeBlockade[bad] = TRUE
- checkTradeBlockade()
-
-/datum/controller/subsystem/shuttle/proc/clearTradeBlockade(datum/bad)
- tradeBlockade -= bad
- checkTradeBlockade()
-
-
-/datum/controller/subsystem/shuttle/proc/checkTradeBlockade()
- for(var/datum/d in tradeBlockade)
- if(!istype(d) || QDELETED(d))
- tradeBlockade -= d
- supplyBlocked = tradeBlockade.len
-
- if(supplyBlocked && (supply.mode == SHUTTLE_IGNITING))
- supply.mode = SHUTTLE_STRANDED
- supply.timer = null
- //Make all cargo consoles speak up
- if(!supplyBlocked && (supply.mode == SHUTTLE_STRANDED))
- supply.mode = SHUTTLE_DOCKED
- //Make all cargo consoles speak up
-
/datum/controller/subsystem/shuttle/proc/checkHostileEnvironment()
for(var/datum/d in hostileEnvironments)
if(!istype(d) || QDELETED(d))
@@ -372,7 +220,6 @@ SUBSYSTEM_DEF(shuttle)
if(emergencyNoEscape && (emergency.mode == SHUTTLE_IGNITING))
emergency.mode = SHUTTLE_STRANDED
emergency.timer = null
- emergency.sound_played = FALSE
priority_announce("Hostile environment detected. \
Departure has been postponed indefinitely pending \
conflict resolution.", null, 'sound/blank.ogg', "Priority")
@@ -454,16 +301,7 @@ SUBSYSTEM_DEF(shuttle)
[transit_height] in height. The travel dir is [travel_dir]."
*/
- var/transit_path = /turf/open/space/transit
- switch(travel_dir)
- if(NORTH)
- transit_path = /turf/open/space/transit/north
- if(SOUTH)
- transit_path = /turf/open/space/transit/south
- if(EAST)
- transit_path = /turf/open/space/transit/east
- if(WEST)
- transit_path = /turf/open/space/transit/west
+ var/transit_path = /turf/open/water/river
var/datum/turf_reservation/proposal = SSmapping.RequestBlockReservation(transit_width, transit_height, null, /datum/turf_reservation/transit, transit_path)
@@ -526,8 +364,6 @@ SUBSYSTEM_DEF(shuttle)
emergency = SSshuttle.emergency
if (istype(SSshuttle.arrivals))
arrivals = SSshuttle.arrivals
- if (istype(SSshuttle.backup_shuttle))
- backup_shuttle = SSshuttle.backup_shuttle
if (istype(SSshuttle.emergencyLastCallLoc))
emergencyLastCallLoc = SSshuttle.emergencyLastCallLoc
@@ -535,22 +371,9 @@ SUBSYSTEM_DEF(shuttle)
if (istype(SSshuttle.hostileEnvironments))
hostileEnvironments = SSshuttle.hostileEnvironments
- if (istype(SSshuttle.supply))
- supply = SSshuttle.supply
-
if (istype(SSshuttle.discoveredPlants))
discoveredPlants = SSshuttle.discoveredPlants
- if (istype(SSshuttle.shoppinglist))
- shoppinglist = SSshuttle.shoppinglist
- if (istype(SSshuttle.requestlist))
- requestlist = SSshuttle.requestlist
- if (istype(SSshuttle.orderhistory))
- orderhistory = SSshuttle.orderhistory
-
- if (istype(SSshuttle.shuttle_loan))
- shuttle_loan = SSshuttle.shuttle_loan
-
if (istype(SSshuttle.shuttle_purchase_requirements_met))
shuttle_purchase_requirements_met = SSshuttle.shuttle_purchase_requirements_met
@@ -639,10 +462,6 @@ SUBSYSTEM_DEF(shuttle)
hidden_shuttle_turf_images -= remove_images
hidden_shuttle_turf_images += add_images
- for(var/V in GLOB.navigation_computers)
- var/obj/machinery/computer/camera_advanced/shuttle_docker/C = V
- C.update_hidden_docking_ports(remove_images, add_images)
-
QDEL_LIST(remove_images)
@@ -901,12 +720,7 @@ SUBSYSTEM_DEF(shuttle)
preview_template = S
user.forceMove(get_turf(preview_shuttle))
if("load")
- if(existing_shuttle == backup_shuttle)
- // TODO make the load button disabled
- WARNING("The shuttle that the selected shuttle will replace \
- is the backup shuttle. Backup shuttle is required to be \
- intact for round sanity.")
- else if(S)
+ if(S)
. = TRUE
// If successful, returns the mobile docking port
var/obj/docking_port/mobile/mdp = action_load(S)
diff --git a/code/controllers/subsystem/sounds.dm b/code/controllers/subsystem/sounds.dm
new file mode 100644
index 0000000000..fa9ba3c472
--- /dev/null
+++ b/code/controllers/subsystem/sounds.dm
@@ -0,0 +1,135 @@
+#define DATUMLESS "NO_DATUM"
+
+SUBSYSTEM_DEF(sounds)
+ name = "Sounds"
+ flags = SS_NO_FIRE
+ init_order = INIT_ORDER_SOUNDS
+ var/static/using_channels_max = CHANNEL_HIGHEST_AVAILABLE //BYOND max channels
+ /// Amount of channels to reserve for random usage rather than reservations being allowed to reserve all channels. Also a nice safeguard for when someone screws up.
+ var/static/random_channels_min = 50
+
+ // Hey uh these two needs to be initialized fast because the whole "things get deleted before init" thing.
+ /// Assoc list, `"[channel]" =` either the datum using it or TRUE for an unsafe-reserved (datumless reservation) channel
+ var/list/using_channels
+ /// Assoc list datum = list(channel1, channel2, ...) for what channels something reserved.
+ var/list/using_channels_by_datum
+ // Special datastructure for fast channel management
+ /// List of all channels as numbers
+ var/list/channel_list
+ /// Associative list of all reserved channels associated to their position. `"[channel_number]" =` index as number
+ var/list/reserved_channels
+ /// lower iteration position - Incremented and looped to get "random" sound channels for normal sounds. The channel at this index is returned when asking for a random channel.
+ var/channel_random_low
+ /// higher reserve position - decremented and incremented to reserve sound channels, anything above this is reserved. The channel at this index is the highest unreserved channel.
+ var/channel_reserve_high
+
+/datum/controller/subsystem/sounds/Initialize()
+ setup_available_channels()
+ return ..()
+
+/datum/controller/subsystem/sounds/proc/setup_available_channels()
+ channel_list = list()
+ reserved_channels = list()
+ using_channels = list()
+ using_channels_by_datum = list()
+ for(var/i in 1 to using_channels_max)
+ channel_list += i
+ channel_random_low = 1
+ channel_reserve_high = length(channel_list)
+
+/// Removes a channel from using list.
+/datum/controller/subsystem/sounds/proc/free_sound_channel(channel)
+ var/text_channel = num2text(channel)
+ var/using = using_channels[text_channel]
+ using_channels -= text_channel
+ if(using != TRUE) // datum channel
+ using_channels_by_datum[using] -= channel
+ if(!length(using_channels_by_datum[using]))
+ using_channels_by_datum -= using
+ free_channel(channel)
+
+/// Frees all the channels a datum is using.
+/datum/controller/subsystem/sounds/proc/free_datum_channels(datum/D)
+ var/list/L = using_channels_by_datum[D]
+ if(!L)
+ return
+ for(var/channel in L)
+ using_channels -= num2text(channel)
+ free_channel(channel)
+ using_channels_by_datum -= D
+
+/// Frees all datumless channels
+/datum/controller/subsystem/sounds/proc/free_datumless_channels()
+ free_datum_channels(DATUMLESS)
+
+/// NO AUTOMATIC CLEANUP - If you use this, you better manually free it later! Returns an integer for channel.
+/datum/controller/subsystem/sounds/proc/reserve_sound_channel_datumless()
+ . = reserve_channel()
+ if(!.) //oh no..
+ return FALSE
+ var/text_channel = num2text(.)
+ using_channels[text_channel] = DATUMLESS
+ LAZYINITLIST(using_channels_by_datum[DATUMLESS])
+ using_channels_by_datum[DATUMLESS] += .
+
+/// Reserves a channel for a datum. Automatic cleanup only when the datum is deleted. Returns an integer for channel.
+/datum/controller/subsystem/sounds/proc/reserve_sound_channel(datum/D)
+ if(!D) //i don't like typechecks but someone will fuck it up
+ CRASH("Attempted to reserve sound channel without datum using the managed proc.")
+ .= reserve_channel()
+ if(!.)
+ return FALSE
+ var/text_channel = num2text(.)
+ using_channels[text_channel] = D
+ LAZYINITLIST(using_channels_by_datum[D])
+ using_channels_by_datum[D] += .
+
+/**
+ * Reserves a channel and updates the datastructure. Private proc.
+ */
+/datum/controller/subsystem/sounds/proc/reserve_channel()
+ PRIVATE_PROC(TRUE)
+ if(channel_reserve_high <= random_channels_min) // out of channels
+ return
+ var/channel = channel_list[channel_reserve_high]
+ reserved_channels[num2text(channel)] = channel_reserve_high--
+ return channel
+
+/**
+ * Frees a channel and updates the datastructure. Private proc.
+ */
+/datum/controller/subsystem/sounds/proc/free_channel(number)
+ PRIVATE_PROC(TRUE)
+ var/text_channel = num2text(number)
+ var/index = reserved_channels[text_channel]
+ if(!index)
+ CRASH("Attempted to (internally) free a channel that wasn't reserved.")
+ reserved_channels -= text_channel
+ // push reserve index up, which makes it now on a channel that is reserved
+ channel_reserve_high++
+ // swap the reserved channel wtih the unreserved channel so the reserve index is now on an unoccupied channel and the freed channel is next to be used.
+ channel_list.Swap(channel_reserve_high, index)
+ // now, an existing reserved channel will likely (exception: unreserving last reserved channel) be at index
+ // get it, and update position.
+ var/text_reserved = num2text(channel_list[index])
+ if(!reserved_channels[text_reserved]) //if it isn't already reserved make sure we don't accidently mistakenly put it on reserved list!
+ return
+ reserved_channels[text_reserved] = index
+
+/// Random available channel, returns text.
+/datum/controller/subsystem/sounds/proc/random_available_channel_text()
+ if(channel_random_low > channel_reserve_high)
+ channel_random_low = 1
+ . = "[channel_list[channel_random_low++]]"
+
+/// Random available channel, returns number
+/datum/controller/subsystem/sounds/proc/random_available_channel()
+ if(channel_random_low > channel_reserve_high)
+ channel_random_low = 1
+ . = channel_list[channel_random_low++]
+
+/// How many channels we have left.
+/datum/controller/subsystem/sounds/proc/available_channels_left()
+ return length(channel_list) - random_channels_min
+
+#undef DATUMLESS
diff --git a/code/controllers/subsystem/sun.dm b/code/controllers/subsystem/sun.dm
index 9854ae69c8..304e9d1eae 100644
--- a/code/controllers/subsystem/sun.dm
+++ b/code/controllers/subsystem/sun.dm
@@ -34,14 +34,6 @@ SUBSYSTEM_DEF(sun)
dx = s / abs(s)
dy = c / abs(s)
- //now tell the solar control computers to update their status and linked devices
- for(var/obj/machinery/power/solar_control/SC in solars)
- if(!SC.powernet)
- solars.Remove(SC)
- continue
- SC.update()
-
-
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 8278ec87e0..4c353ab746 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -36,6 +36,7 @@ SUBSYSTEM_DEF(ticker)
var/timeLeft //pregame timer
var/start_at
+ var/timeDelayAdd = 120
//576000 dusk
//376000 day
var/gametime_offset = 288001 //Deciseconds to add to world.time for station time.
@@ -58,6 +59,9 @@ SUBSYSTEM_DEF(ticker)
var/roundend_check_paused = FALSE
+ var/amt_ready = 0 // Total count of players that are ready
+ var/amt_ready_needed = 1 // Total count of players that are needed ready to start the game
+
var/round_start_time = 0
var/round_start_irl = 0
var/list/round_start_events
@@ -211,14 +215,8 @@ SUBSYSTEM_DEF(ticker)
if(timeLeft <= 0)
if(!checkreqroles())
-/* if(failedstarts >= 13)
- current_state = GAME_STATE_SETTING_UP
- Master.SetRunLevel(RUNLEVEL_SETUP)
- if(start_immediately)
- fire()
- else*/
current_state = GAME_STATE_STARTUP
- start_at = world.time + 600
+ start_at = world.time + timeDelayAdd
timeLeft = null
Master.SetRunLevel(RUNLEVEL_LOBBY)
else
@@ -232,7 +230,7 @@ SUBSYSTEM_DEF(ticker)
if(!setup())
//setup failed
current_state = GAME_STATE_STARTUP
- start_at = world.time + 600
+ start_at = world.time + timeDelayAdd
timeLeft = null
Master.SetRunLevel(RUNLEVEL_LOBBY)
@@ -262,7 +260,7 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/checkreqroles()
var/list/readied_jobs = list()
- var/list/required_jobs = list("Queen","King")
+ var/list/required_jobs = list("King", "Hand")
#ifdef DEPLOY_TEST
required_jobs = list()
readied_jobs = list("King")
@@ -281,38 +279,38 @@ SUBSYSTEM_DEF(ticker)
to_chat(player, "You cannot be [V] and thus are not considered.")
continue
readied_jobs.Add(V)
- /*if(("King" in readied_jobs) || ("Queen" in readied_jobs))
+ if(("King" in readied_jobs) || ("Hand" in readied_jobs))
if("King" in readied_jobs)
rulertype = "King"
else
- rulertype = "Queen"
- else
+ rulertype = "Hand"
+/* else
var/list/stuffy = list("Set a Ruler to 'high' in your class preferences to start the game!", "PLAY Ruler NOW!", "A Ruler is required to start.", "Pray for a Ruler.", "One day, there will be a Ruler.", "Just try playing Ruler.", "If you don't play Ruler, the game will never start.", "We need at least one Ruler to start the game.", "We're waiting for you to pick Ruler to start.", "Still no Ruler is readied..", "I'm going to lose my mind if we don't get a Ruler readied up.","No. The game will not start because there is no Ruler.","What's the point of ROGUETOWN without a Ruler?")
to_chat(world, "[pick(stuffy)]")
- return FALSE
- */
+ return FALSE */
+/*
#ifdef DEPLOY_TEST
- var/amt_ready = 999
-#else
- var/amt_ready = 0
+ amt_ready = 999
#endif
-
+*/
#ifdef ROGUEWORLD
amt_ready = 999
#endif
+#ifndef UNIT_TESTS
for(var/mob/dead/new_player/player in GLOB.player_list)
if(!player)
continue
if(player.ready == PLAYER_READY_TO_PLAY)
amt_ready++
- if(amt_ready < 0)
- to_chat(world, "[amt_ready]/2 players ready.")
-/* failedstarts++
- if(failedstarts > 7)
- to_chat(world, "[failedstarts]/13")
- if(failedstarts >= 13)
+ if(amt_ready < amt_ready_needed)
+ to_chat(world, "Not enough players to start the game")
+ return FALSE
+#endif
+
+ /* failedstarts++
+ if(failedstarts >= 13) // this stuff is for rougewar, a team deathmatch mode I guess.
to_chat(world, "Starting ROGUEFIGHT...")
var/icon/ikon
var/file_path = "icons/roguefight_title.dmi"
@@ -322,7 +320,6 @@ SUBSYSTEM_DEF(ticker)
SStitle.splash_turf.icon = ikon
for(var/mob/dead/new_player/player in GLOB.player_list)
player.playsound_local(player, 'sound/music/wartitle.ogg', 100, TRUE)*/
- return FALSE
job_change_locked = TRUE
return TRUE
@@ -570,12 +567,12 @@ SUBSYSTEM_DEF(ticker)
if(K.job == "King")
rulermob = K
return
- if("Queen")
- for(var/mob/living/carbon/human/Q in world)
- if(istype(Q, /mob/living/carbon/human/dummy))
+ if("Hand")
+ for(var/mob/living/carbon/human/H in world)
+ if(istype(H, /mob/living/carbon/human/dummy))
continue
- if(Q.job == "Queen")
- rulermob = Q
+ if(H.job == "Hand")
+ rulermob = H
return
*/
/datum/controller/subsystem/ticker/proc/collect_minds()
@@ -873,7 +870,6 @@ SUBSYSTEM_DEF(ticker)
world.Reboot()
/datum/controller/subsystem/ticker/Shutdown()
- gather_newscaster() //called here so we ensure the log is created even upon admin reboot
save_admin_data()
update_everything_flag_in_db()
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index 4ad0a988f8..9dd63e8585 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -12,65 +12,38 @@ SUBSYSTEM_DEF(traumas)
/datum/controller/subsystem/traumas/Initialize()
//phobia types is to pull from randomly for brain traumas, e.g. conspiracies is for special assignment only
- phobia_types = sortList(list("spiders", "space", "security", "clowns", "greytide", "lizards",
- "skeletons", "snakes", "robots", "doctors", "authority", "the supernatural",
- "aliens", "strangers", "birds", "falling", "anime"))
+ phobia_types = sortList(list("spiders", "lizards",
+ "skeletons", "snakes",
+ "strangers", "birds", "falling", "anime"))
phobia_words = list(
"spiders" = strings(PHOBIA_FILE, "spiders"),
- "space" = strings(PHOBIA_FILE, "space"),
- "security" = strings(PHOBIA_FILE, "security"),
- "clowns" = strings(PHOBIA_FILE, "clowns"),
- "greytide" = strings(PHOBIA_FILE, "greytide"),
"lizards" = strings(PHOBIA_FILE, "lizards"),
"skeletons" = strings(PHOBIA_FILE, "skeletons"),
"snakes" = strings(PHOBIA_FILE, "snakes"),
- "robots" = strings(PHOBIA_FILE, "robots"),
- "doctors" = strings(PHOBIA_FILE, "doctors"),
- "authority" = strings(PHOBIA_FILE, "authority"),
- "the supernatural" = strings(PHOBIA_FILE, "the supernatural"),
- "aliens" = strings(PHOBIA_FILE, "aliens"),
"strangers" = strings(PHOBIA_FILE, "strangers"),
"conspiracies" = strings(PHOBIA_FILE, "conspiracies"),
"birds" = strings(PHOBIA_FILE, "birds"),
"falling" = strings(PHOBIA_FILE, "falling"),
- "anime" = strings(PHOBIA_FILE, "anime")
)
phobia_mobs = list(
"spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)),
- "security" = typecacheof(list(/mob/living/simple_animal/bot/secbot)),
+
"lizards" = typecacheof(list(/mob/living/simple_animal/hostile/lizard)),
- "skeletons" = typecacheof(list(/mob/living/simple_animal/hostile/skeleton)),
+ "skeletons" = typecacheof(list(/mob/living/simple_animal/hostile/rogue/skeleton)),
"snakes" = typecacheof(list(/mob/living/simple_animal/hostile/retaliate/poison/snake)),
- "robots" = typecacheof(list(/mob/living/silicon/robot, /mob/living/silicon/ai,
- /mob/living/simple_animal/drone, /mob/living/simple_animal/bot, /mob/living/simple_animal/hostile/swarmer)),
- "doctors" = typecacheof(list(/mob/living/simple_animal/bot/medbot)),
"the supernatural" = typecacheof(list(/mob/living/simple_animal/hostile/construct,
/mob/living/simple_animal/revenant, /mob/living/simple_animal/shade)),
- "aliens" = typecacheof(list(/mob/living/carbon/alien, /mob/living/simple_animal/slime)),
- "conspiracies" = typecacheof(list(/mob/living/simple_animal/bot/secbot, /mob/living/simple_animal/drone,
+ "conspiracies" = typecacheof(list(/mob/living/simple_animal/drone,
/mob/living/simple_animal/pet/penguin)),
"birds" = typecacheof(list(/mob/living/simple_animal/parrot, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken,
- /mob/living/simple_animal/pet/penguin)),
- "anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian))
+ /mob/living/simple_animal/pet/penguin))
)
phobia_objs = list(
"snakes" = typecacheof(list(/obj/item/rod_of_asclepius)),
"spiders" = typecacheof(list(/obj/structure/spider)),
- "security" = typecacheof(list(/obj/item/clothing/under/rank/security/officer, /obj/item/clothing/under/rank/security/warden,
- /obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/security/detective,
- /obj/item/melee/baton, /obj/item/gun/energy/taser, /obj/item/restraints/handcuffs,
- /obj/machinery/door/airlock/security, /obj/effect/hallucination/simple/securitron)),
-
- "clowns" = typecacheof(list(/obj/item/clothing/under/rank/civilian/clown, /obj/item/clothing/shoes/clown_shoes,
- /obj/item/clothing/mask/gas/clown_hat, /obj/item/instrument/bikehorn,
- /obj/item/pda/clown, /obj/item/grown/bananapeel, /obj/item/reagent_containers/food/snacks/cheesiehonkers,
- /obj/item/trash/cheesie)),
-
- "greytide" = typecacheof(list(/obj/item/clothing/under/color/grey, /obj/item/melee/baton/cattleprod,
- /obj/item/twohanded/spear, /obj/item/clothing/mask/gas)),
"lizards" = typecacheof(list(/obj/item/toy/plush/lizardplushie, /obj/item/reagent_containers/food/snacks/kebab/tail,
/obj/item/organ/tail/lizard, /obj/item/reagent_containers/food/drinks/bottle/lizardwine)),
@@ -78,87 +51,24 @@ SUBSYSTEM_DEF(traumas)
"skeletons" = typecacheof(list(/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton,
/obj/effect/decal/remains/human)),
- "conspiracies" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/security/head_of_security,
- /obj/item/clothing/under/rank/engineering/chief_engineer, /obj/item/clothing/under/rank/medical/chief_medical_officer,
- /obj/item/clothing/under/rank/civilian/head_of_personnel, /obj/item/clothing/under/rank/rnd/research_director,
- /obj/item/clothing/under/rank/security/head_of_security/grey, /obj/item/clothing/under/rank/security/head_of_security/alt,
- /obj/item/clothing/under/rank/rnd/research_director/alt, /obj/item/clothing/under/rank/rnd/research_director/turtleneck,
- /obj/item/clothing/under/rank/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/parade, /obj/item/clothing/under/rank/security/head_of_security/parade/female,
- /obj/item/clothing/head/helmet/abductor, /obj/item/clothing/suit/armor/abductor/vest, /obj/item/abductor/baton,
- /obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/abductor/silencer,
- /obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom/officer,
- /obj/item/clothing/suit/space/hardsuit/ert, /obj/item/clothing/suit/space/hardsuit/ert/sec,
- /obj/item/clothing/suit/space/hardsuit/ert/engi, /obj/item/clothing/suit/space/hardsuit/ert/med,
- /obj/item/clothing/suit/space/hardsuit/deathsquad, /obj/item/clothing/head/helmet/space/hardsuit/deathsquad,
- /obj/machinery/door/airlock/centcom)),
- "robots" = typecacheof(list(/obj/machinery/computer/upload, /obj/item/aiModule/, /obj/machinery/recharge_station,
- /obj/item/aicard, /obj/item/deactivated_swarmer, /obj/effect/mob_spawn/swarmer)),
-
- "doctors" = typecacheof(list(/obj/item/clothing/under/rank/medical,
- /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/pill/, /obj/item/reagent_containers/hypospray,
- /obj/item/storage/firstaid, /obj/item/storage/pill_bottle, /obj/item/healthanalyzer,
- /obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper, /obj/machinery/stasis,
- /obj/machinery/dna_scannernew, /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/item/surgical_drapes,
- /obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw,
- /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/plaguedoctorhat, /obj/item/clothing/mask/gas/plaguedoctor)),
-
- "authority" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/civilian/head_of_personnel,
- /obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/rnd/research_director,
- /obj/item/clothing/under/rank/medical/chief_medical_officer, /obj/item/clothing/under/rank/engineering/chief_engineer,
- /obj/item/clothing/under/rank/centcom/officer, /obj/item/clothing/under/rank/centcom/commander,
- /obj/item/melee/classic_baton/telescopic, /obj/item/card/id/silver, /obj/item/card/id/gold,
- /obj/item/card/id/captains_spare, /obj/item/card/id/centcom, /obj/machinery/door/airlock/command)),
-
- "the supernatural" = typecacheof(list(/obj/structure/destructible/cult, /obj/item/tome,
- /obj/item/melee/cultblade, /obj/item/twohanded/required/cult_bastard,
- /obj/item/restraints/legcuffs/bola/cult, /obj/item/clothing/suit/space/hardsuit/cult,
- /obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
- /obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/singularity/narsie,
- /obj/item/soulstone,
- /obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard, /obj/item/spellbook, /obj/item/staff,
- /obj/item/clothing/suit/space/hardsuit/shielded/wizard, /obj/item/clothing/suit/space/hardsuit/wizard,
- /obj/item/gun/magic/staff, /obj/item/gun/magic/wand,
- /obj/item/nullrod, /obj/item/clothing/under/rank/civilian/chaplain)),
- "aliens" = typecacheof(list(/obj/item/clothing/mask/facehugger, /obj/item/organ/body_egg/alien_embryo,
- /obj/structure/alien, /obj/item/toy/toy_xeno,
- /obj/item/clothing/suit/armor/abductor, /obj/item/abductor, /obj/item/gun/energy/alien,
- /obj/item/abductor/baton, /obj/item/radio/headset/abductor, /obj/item/scalpel/alien, /obj/item/hemostat/alien,
- /obj/item/retractor/alien, /obj/item/circular_saw/alien, /obj/item/surgicaldrill/alien, /obj/item/cautery/alien,
- /obj/item/clothing/head/helmet/abductor, /obj/structure/bed/abductor, /obj/structure/table_frame/abductor,
- /obj/structure/table/abductor, /obj/structure/table/optable/abductor, /obj/structure/closet/abductor, /obj/item/organ/heart/gland,
- /obj/machinery/abductor, /obj/item/crowbar/abductor, /obj/item/screwdriver/abductor, /obj/item/weldingtool/abductor,
- /obj/item/wirecutters/abductor, /obj/item/wrench/abductor, /obj/item/stack/sheet/mineral/abductor)),
"birds" = typecacheof(list(/obj/item/clothing/mask/gas/plaguedoctor, /obj/item/reagent_containers/food/snacks/cracker,
/obj/item/clothing/suit/chickensuit, /obj/item/clothing/head/chicken,
/obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/costume/owl, /obj/item/clothing/mask/gas/owl_mask,
- /obj/item/clothing/under/costume/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin,
- /obj/item/clothing/head/helmet/space/freedom, /obj/item/clothing/suit/space/freedom)),
+ /obj/item/clothing/under/costume/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin)),
- "anime" = typecacheof(list(/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
- /obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
- /obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/twohanded/vibro_weapon,
- /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))
)
phobia_turfs = list(
- "space" = typecacheof(list(/turf/open/space, /turf/open/floor/holofloor/space, /turf/open/floor/fakespace)),
"the supernatural" = typecacheof(list(/turf/open/floor/plasteel/cult, /turf/closed/wall/mineral/cult)),
- "aliens" = typecacheof(list(/turf/open/floor/plating/abductor, /turf/open/floor/plating/abductor2,
- /turf/open/floor/mineral/abductor, /turf/closed/wall/mineral/abductor)),
"falling" = typecacheof(list(/turf/open/chasm, /turf/open/floor/fakepit))
)
phobia_species = list(
"lizards" = typecacheof(list(/datum/species/lizard)),
"skeletons" = typecacheof(list(/datum/species/skeleton, /datum/species/plasmaman)),
- "conspiracies" = typecacheof(list(/datum/species/abductor, /datum/species/lizard, /datum/species/synth)),
- "robots" = typecacheof(list(/datum/species/android)),
"the supernatural" = typecacheof(list(/datum/species/golem/runic)),
- "aliens" = typecacheof(list(/datum/species/abductor, /datum/species/jelly, /datum/species/pod,
- /datum/species/shadow)),
- "anime" = typecacheof(list(/datum/species/human/felinid))
)
return ..()
diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm
index 2f7d2d0a71..57d2efc28c 100644
--- a/code/controllers/subsystem/weather.dm
+++ b/code/controllers/subsystem/weather.dm
@@ -50,14 +50,14 @@ SUBSYSTEM_DEF(weather)
return
// start random weather on relevant levels
-/* for(var/z in eligible_zlevels)
+ for(var/z in eligible_zlevels)
var/possible_weather = eligible_zlevels[z]
var/datum/weather/W = pickweight(possible_weather)
run_weather(W, list(text2num(z)))
eligible_zlevels -= z
var/randTime = rand(3000, 6000)
addtimer(CALLBACK(src, PROC_REF(make_eligible), z, possible_weather), randTime + initial(W.weather_duration_upper), TIMER_UNIQUE) //Around 5-10 minutes between weathers
- next_hit_by_zlevel["[z]"] = world.time + randTime + initial(W.telegraph_duration)*/
+ next_hit_by_zlevel["[z]"] = world.time + randTime + initial(W.telegraph_duration)
/datum/controller/subsystem/weather/Initialize(start_timeofday)
for(var/V in subtypesof(/datum/weather))
@@ -108,10 +108,6 @@ SUBSYSTEM_DEF(weather)
/atom/proc/weather_trigger(W)
return
-/mob/living/weather_trigger(W)
- if(W==/datum/weather/rain)
- START_PROCESSING(SSweather,src)
-
/turf/proc/trigger_weather(atom/A)
if(A)
var/area/AR = get_area(src)
diff --git a/code/datums/action.dm b/code/datums/action.dm
index 1c52dac1a2..b8d4ae3b2f 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -262,14 +262,6 @@
if(istype(H))
H.toggle_welding_screen(owner)
-/datum/action/item_action/toggle_welding_screen/plasmaman
- name = "Toggle Welding Screen"
-
-/datum/action/item_action/toggle_welding_screen/plasmaman/Trigger()
- var/obj/item/clothing/head/helmet/space/plasmaman/H = target
- if(istype(H))
- H.toggle_welding_screen(owner)
-
/datum/action/item_action/toggle_headphones
name = "Toggle Headphones"
desc = ""
@@ -279,26 +271,6 @@
if(istype(H))
H.toggle(owner)
-/datum/action/item_action/toggle_unfriendly_fire
- name = "Toggle Friendly Fire \[ON\]"
- desc = ""
- icon_icon = 'icons/mob/actions/actions_items.dmi'
- button_icon_state = "vortex_ff_on"
-
-/datum/action/item_action/toggle_unfriendly_fire/Trigger()
- if(..())
- UpdateButtonIcon()
-
-/datum/action/item_action/toggle_unfriendly_fire/UpdateButtonIcon(status_only = FALSE, force)
- if(istype(target, /obj/item/hierophant_club))
- var/obj/item/hierophant_club/H = target
- if(H.friendly_fire_check)
- button_icon_state = "vortex_ff_off"
- name = "Toggle Friendly Fire \[OFF\]"
- else
- button_icon_state = "vortex_ff_on"
- name = "Toggle Friendly Fire \[ON\]"
- ..()
/datum/action/item_action/synthswitch
name = "Change Synthesizer Instrument"
@@ -310,18 +282,6 @@
return synth.selectInstrument()
return ..()
-/datum/action/item_action/vortex_recall
- name = "Vortex Recall"
- desc = ""
- icon_icon = 'icons/mob/actions/actions_items.dmi'
- button_icon_state = "vortex_recall"
-
-/datum/action/item_action/vortex_recall/IsAvailable()
- if(istype(target, /obj/item/hierophant_club))
- var/obj/item/hierophant_club/H = target
- if(H.teleporting)
- return 0
- return ..()
/datum/action/item_action/toggle_helmet_flashlight
name = "Toggle Helmet Flashlight"
@@ -380,18 +340,6 @@
/datum/action/item_action/toggle_helmet
name = "Toggle Helmet"
-/datum/action/item_action/toggle_jetpack
- name = "Toggle Jetpack"
-
-/datum/action/item_action/jetpack_stabilization
- name = "Toggle Jetpack Stabilization"
-
-/datum/action/item_action/jetpack_stabilization/IsAvailable()
- var/obj/item/tank/jetpack/J = target
- if(!istype(J) || !J.on)
- return 0
- return ..()
-
/datum/action/item_action/hands_free
check_flags = AB_CHECK_CONSCIOUS
@@ -457,38 +405,6 @@
name = "Use [target.name]"
button.name = name
-/datum/action/item_action/cult_dagger
- name = "Draw Blood Rune"
- desc = ""
- icon_icon = 'icons/mob/actions/actions_cult.dmi'
- button_icon_state = "draw"
- buttontooltipstyle = "cult"
- background_icon_state = "bg_demon"
-
-/datum/action/item_action/cult_dagger/Grant(mob/M)
- if(iscultist(M))
- ..()
- button.screen_loc = "6:157,4:-2"
- button.moved = "6:157,4:-2"
- else
- Remove(owner)
-
-/datum/action/item_action/cult_dagger/Trigger()
- for(var/obj/item/H in owner.held_items) //In case we were already holding another dagger
- if(istype(H, /obj/item/melee/cultblade/dagger))
- H.attack_self(owner)
- return
- var/obj/item/I = target
- if(owner.can_equip(I, SLOT_HANDS))
- owner.temporarilyRemoveItemFromInventory(I)
- owner.put_in_hands(I)
- I.attack_self(owner)
- else
- if (owner.get_num_arms() <= 0)
- to_chat(owner, "I dont have any usable hands!")
- else
- to_chat(owner, "My hands are full!")
-
///MGS BOX!
/datum/action/item_action/agent_box
name = "Deploy Box"
@@ -566,16 +482,6 @@
return S.can_cast(owner)
return FALSE
-/datum/action/spell_action/alien
-
-/datum/action/spell_action/alien/IsAvailable()
- if(!target)
- return FALSE
- var/obj/effect/proc_holder/alien/ab = target
- if(owner)
- return ab.cost_check(ab.check_turf,owner,1)
- return FALSE
-
//Preset for general and toggled actions
diff --git a/code/datums/ai/_ai_behaviour.dm b/code/datums/ai/_ai_behaviour.dm
new file mode 100644
index 0000000000..0f936431c0
--- /dev/null
+++ b/code/datums/ai/_ai_behaviour.dm
@@ -0,0 +1,37 @@
+///Abstract class for an action an AI can take, can range from movement to grabbing a nearby weapon.
+/datum/ai_behavior
+ ///What distance you need to be from the target to perform the action
+ var/required_distance = 1
+ ///Flags for extra behavior
+ var/behavior_flags = NONE
+ ///Cooldown between actions performances
+ var/action_cooldown = 0
+
+/// Called by the ai controller when first being added. Additional arguments depend on the behavior type.
+/// Return FALSE to cancel
+/datum/ai_behavior/proc/setup(datum/ai_controller/controller, ...)
+ return TRUE
+
+///Called by the AI controller when this action is performed
+/datum/ai_behavior/proc/perform(delta_time, datum/ai_controller/controller, ...)
+ controller.behavior_cooldowns[src] = world.time + action_cooldown
+ return
+
+///Called when the action is finished. This needs the same args as perform besides the default ones
+/datum/ai_behavior/proc/finish_action(datum/ai_controller/controller, succeeded, ...)
+ LAZYREMOVE(controller.current_behaviors, src)
+ controller.behavior_args -= type
+ if(behavior_flags & AI_BEHAVIOR_REQUIRE_MOVEMENT) //If this was a movement task, reset our movement target.
+ if(!(behavior_flags & AI_BEHAVIOR_KEEP_MOVE_TARGET_ON_FINISH))
+ clear_movement_target(controller)
+ if(!(behavior_flags & AI_BEHAVIOR_KEEP_MOVING_TOWARDS_TARGET_ON_FINISH))
+ controller.ai_movement.stop_moving_towards(controller)
+
+/// Helper proc to ensure consistency in setting the source of the movement target
+/datum/ai_behavior/proc/set_movement_target(datum/ai_controller/controller, atom/target, datum/ai_movement/new_movement)
+ controller.set_movement_target(type, target, new_movement)
+/// Clear the controller's movement target only if it was us who last set it
+/datum/ai_behavior/proc/clear_movement_target(datum/ai_controller/controller)
+ if (controller.movement_target_source != type)
+ return
+ controller.set_movement_target(type, null)
diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm
new file mode 100644
index 0000000000..9b572569b3
--- /dev/null
+++ b/code/datums/ai/_ai_controller.dm
@@ -0,0 +1,604 @@
+/*
+AI controllers are a datumized form of AI that simulates the input a player would otherwise give to a atom. What this means is that these datums
+have ways of interacting with a specific atom and control it. They posses a blackboard with the information the AI knows and has, and will plan behaviors it will try to execute.
+*/
+/datum/ai_controller
+ ///The atom this controller is controlling
+ var/atom/pawn
+ /**
+ * This is a list of variables the AI uses and can be mutated by actions.
+ *
+ * When an action is performed you pass this list and any relevant keys for the variables it can mutate.
+ *
+ * DO NOT set values in the blackboard directly, and especially not if you're adding a datum reference to this!
+ * Use the setters, this is important for reference handing.
+ */
+ var/list/blackboard = list()
+ ///Bitfield of traits for this AI to handle extra behavior
+ var/ai_traits
+ ///Current actions planned to be performed by the AI in the upcoming plan
+ var/list/planned_behaviors
+ ///Current actions being performed by the AI.
+ var/list/current_behaviors
+ ///Current actions and their respective last time ran as an assoc list.
+ var/list/behavior_cooldowns = list()
+ ///The idle behavior this AI performs when it has no actions.
+ var/datum/idle_behavior/idle_behavior = null
+ ///Current status of AI (OFF/ON/IDLE)
+ var/ai_status
+ ///Current movement target of the AI, generally set by decision making.
+ var/atom/current_movement_target
+ ///Identifier for what last touched our movement target, so it can be cleared conditionally
+ var/movement_target_source
+ ///Stored arguments for behaviors given during their initial creation
+ var/list/behavior_args = list()
+ ///Tracks recent pathing attempts, if we fail too many in a row we fail our current plans.
+ var/pathing_attempts
+ ///Can the AI remain in control if there is a client?
+ var/continue_processing_when_client = FALSE
+ ///distance to give up on target
+ var/max_target_distance = 14
+ ///Cooldown for new plans, to prevent AI from going nuts if it can't think of new plans and looping on end
+ COOLDOWN_DECLARE(failed_planning_cooldown)
+ ///All subtrees this AI has available, will run them in order, so make sure they're in the order you want them to run. On initialization of this type, it will start as a typepath(s) and get converted to references of ai_subtrees found in SSai_controllers when init_subtrees() is called
+ var/list/planning_subtrees
+ // Movement related things here
+ ///Reference to the movement datum we use. Is a type on initialize but becomes a ref afterwards.
+ var/datum/ai_movement/ai_movement = /datum/ai_movement/dumb
+ ///Cooldown until next movement
+ COOLDOWN_DECLARE(movement_cooldown)
+ ///Delay between movements. This is on the controller so we can keep the movement datum singleton
+ var/movement_delay = 0.1 SECONDS
+ ///A list for the path we're currently following, if we're using AStar pathing
+ var/list/movement_path
+ ///Cooldown for JPS movement, how often we're allowed to try making a new path
+ COOLDOWN_DECLARE(repath_cooldown)
+ ///AI paused time
+ var/paused_until = 0
+
+ var/failed_sneak_check = 0
+
+
+/datum/ai_controller/New(atom/new_pawn)
+ change_ai_movement_type(ai_movement)
+ init_subtrees()
+
+ if(idle_behavior)
+ idle_behavior = new idle_behavior()
+
+ PossessPawn(new_pawn)
+
+/datum/ai_controller/Destroy(force, ...)
+ set_ai_status(AI_STATUS_OFF)
+ UnpossessPawn(FALSE)
+ return ..()
+
+///Sets the current movement target, with an optional param to override the movement behavior
+/datum/ai_controller/proc/set_movement_target(source, atom/target, datum/ai_movement/new_movement)
+ movement_target_source = source
+ current_movement_target = target
+ if(new_movement)
+ change_ai_movement_type(new_movement)
+
+///Overrides the current ai_movement of this controller with a new one
+/datum/ai_controller/proc/change_ai_movement_type(datum/ai_movement/new_movement)
+ ai_movement = SSai_movement.movement_types[new_movement]
+
+///Completely replaces the planning_subtrees with a new set based on argument provided, list provided must contain specifically typepaths
+/datum/ai_controller/proc/replace_planning_subtrees(list/typepaths_of_new_subtrees)
+ planning_subtrees = typepaths_of_new_subtrees
+ init_subtrees()
+
+///Loops over the subtrees in planning_subtrees and looks at the ai_controllers to grab a reference, ENSURE planning_subtrees ARE TYPEPATHS AND NOT INSTANCES/REFERENCES BEFORE EXECUTING THIS
+/datum/ai_controller/proc/init_subtrees()
+ if(!LAZYLEN(planning_subtrees))
+ return
+ var/list/temp_subtree_list = list()
+ for(var/subtree in planning_subtrees)
+ var/subtree_instance = SSai_controllers.ai_subtrees[subtree]
+ temp_subtree_list += subtree_instance
+ planning_subtrees = temp_subtree_list
+
+///Proc to move from one pawn to another, this will destroy the target's existing controller.
+/datum/ai_controller/proc/PossessPawn(atom/new_pawn)
+ if(pawn) //Reset any old signals
+ UnpossessPawn(FALSE)
+ if(istype(new_pawn.ai_controller)) //Existing AI, kill it.
+ QDEL_NULL(new_pawn.ai_controller)
+ if(TryPossessPawn(new_pawn) & AI_CONTROLLER_INCOMPATIBLE)
+ qdel(src)
+ CRASH("[src] attached to [new_pawn] but these are not compatible!")
+ pawn = new_pawn
+ pawn.ai_controller = src
+
+ if(!continue_processing_when_client && istype(new_pawn, /mob))
+ var/mob/possible_client_holder = new_pawn
+ if(possible_client_holder.client)
+ set_ai_status(AI_STATUS_OFF)
+ else
+ set_ai_status(AI_STATUS_ON)
+ else
+ set_ai_status(AI_STATUS_ON)
+
+ RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained))
+ RegisterSignal(pawn, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_changed))
+
+///Abstract proc for initializing the pawn to the new controller
+/datum/ai_controller/proc/TryPossessPawn(atom/new_pawn)
+ return
+
+///Proc for deinitializing the pawn to the old controller
+/datum/ai_controller/proc/UnpossessPawn(destroy)
+ UnregisterSignal(pawn, list(COMSIG_MOB_LOGIN, COMSIG_MOB_LOGOUT, COMSIG_MOB_STATCHANGE))
+ pawn.ai_controller = null
+ pawn = null
+ if(destroy)
+ qdel(src)
+ return
+
+/// Turn the controller on or off based on if you're alive, we only register to this if the flag is present so don't need to check again
+/datum/ai_controller/proc/on_stat_changed(mob/living/source, new_stat)
+ SIGNAL_HANDLER
+ reset_ai_status()
+
+/// Sets the AI on or off based on current conditions, call to reset after you've manually disabled it somewhere
+/datum/ai_controller/proc/reset_ai_status()
+ set_ai_status(get_expected_ai_status())
+
+/**
+ * Gets the AI status we expect the AI controller to be on at this current moment.
+ * Returns AI_STATUS_OFF if it's inhabited by a Client and shouldn't be, if it's dead and cannot act while dead, or is on a z level without clients.
+ * Returns AI_STATUS_ON otherwise.
+ */
+/datum/ai_controller/proc/get_expected_ai_status()
+
+ if (!ismob(pawn))
+ return AI_STATUS_ON
+
+ var/mob/living/mob_pawn = pawn
+ if(!continue_processing_when_client && mob_pawn.client)
+ return AI_STATUS_OFF
+
+ if(mob_pawn.stat == DEAD)
+ return AI_STATUS_OFF
+
+ var/turf/pawn_turf = get_turf(mob_pawn)
+#ifdef TESTING
+ if(!pawn_turf)
+ CRASH("AI controller [src] controlling pawn ([pawn]) is not on a turf.")
+#endif
+ if(!length(SSmobs.clients_by_zlevel[pawn_turf?.z]))
+ return AI_STATUS_OFF
+ return AI_STATUS_ON
+
+///Returns TRUE if the ai controller can actually run at the moment.
+/datum/ai_controller/proc/able_to_run()
+ if(world.time < paused_until)
+ return FALSE
+ return TRUE
+
+/// Generates a plan and see if our existing one is still valid.
+/datum/ai_controller/process(delta_time)
+ if(!able_to_run())
+ walk(pawn, 0) //stop moving
+ return //this should remove them from processing in the future through event-based stuff.
+
+ if(!LAZYLEN(current_behaviors) && idle_behavior)
+ idle_behavior.perform_idle_behavior(delta_time, src) //Do some stupid shit while we have nothing to do
+ return
+
+ if(current_movement_target)
+ if(!isatom(current_movement_target))
+ stack_trace("[pawn]'s current movement target is not an atom, rather a [current_movement_target.type]! Did you accidentally set it to a weakref?")
+ CancelActions()
+ return
+
+ if(get_dist(pawn, current_movement_target) > max_target_distance) //The distance is out of range
+ CancelActions()
+ return
+
+ for(var/datum/ai_behavior/current_behavior as anything in current_behaviors)
+ // Convert the current behaviour action cooldown to realtime seconds from deciseconds.current_behavior
+ // Then pick the max of this and the delta_time passed to ai_controller.process()
+ // Action cooldowns cannot happen faster than delta_time, so delta_time should be the value used in this scenario.
+ var/action_delta_time = max(current_behavior.action_cooldown * 0.1, delta_time)
+
+ if(current_behavior.behavior_flags & AI_BEHAVIOR_REQUIRE_MOVEMENT) //Might need to move closer
+ if(!current_movement_target)
+ stack_trace("[pawn] wants to perform action type [current_behavior.type] which requires movement, but has no current movement target!")
+ return //This can cause issues, so don't let these slide.
+
+ ///Stops pawns from performing such actions that should require the target to be adjacent.
+ var/mob/living/moving_pawn = pawn
+ var/can_reach = !(current_behavior.behavior_flags & AI_BEHAVIOR_REQUIRE_REACH) || moving_pawn.CanReach(current_movement_target)
+
+ if(isliving(current_movement_target))
+ var/mob/living/living_pawn = pawn
+ var/mob/living/living_target = current_movement_target
+ if(living_target.rogue_sneaking)
+ if(!living_pawn.npc_detect_sneak(living_target, 0))
+ failed_sneak_check++
+ else
+ failed_sneak_check = 0
+
+ if(prob(8))
+ moving_pawn.emote("cidle")
+
+ if(((can_reach && current_behavior.required_distance >= get_dist(moving_pawn, current_movement_target))) || failed_sneak_check > 4) ///Are we close
+ if(ai_movement.moving_controllers[src] == current_movement_target) //We are close enough, if we're moving stop.
+ ai_movement.stop_moving_towards(src)
+
+ if(failed_sneak_check > 4)
+ ai_movement.stop_moving_towards(src)
+ failed_sneak_check = 0
+
+ if(behavior_cooldowns[current_behavior] > world.time) //Still on cooldown
+ continue
+ ProcessBehavior(action_delta_time, current_behavior)
+ return
+
+ else if(ai_movement.moving_controllers[src] != current_movement_target) //We're too far, if we're not already moving start doing it.
+ ai_movement.start_moving_towards(src, current_movement_target) //Then start moving
+
+ if(current_behavior.behavior_flags & AI_BEHAVIOR_MOVE_AND_PERFORM) //If we can move and perform then do so.
+ if(behavior_cooldowns[current_behavior] > world.time) //Still on cooldown
+ continue
+ ProcessBehavior(action_delta_time, current_behavior)
+ return
+ else //No movement required
+ if(behavior_cooldowns[current_behavior] > world.time) //Still on cooldown
+ continue
+ ProcessBehavior(action_delta_time, current_behavior)
+ return
+
+///Determines whether the AI can currently make a new plan
+/datum/ai_controller/proc/able_to_plan()
+ . = TRUE
+ for(var/datum/ai_behavior/current_behavior as anything in current_behaviors)
+ if(!(current_behavior.behavior_flags & AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION)) //We have a behavior that blocks planning
+ . = FALSE
+ break
+
+///This is where you decide what actions are taken by the AI.
+/datum/ai_controller/proc/SelectBehaviors(delta_time)
+ SHOULD_NOT_SLEEP(TRUE) //Fuck you don't sleep in procs like this.
+ if(!COOLDOWN_FINISHED(src, failed_planning_cooldown))
+ return FALSE
+ LAZYINITLIST(current_behaviors)
+ LAZYCLEARLIST(planned_behaviors)
+
+ if(LAZYLEN(planning_subtrees))
+ for(var/datum/ai_planning_subtree/subtree as anything in planning_subtrees)
+ if(subtree.SelectBehaviors(src, delta_time) == SUBTREE_RETURN_FINISH_PLANNING)
+ break
+
+ for(var/datum/ai_behavior/current_behavior as anything in current_behaviors)
+ if(LAZYACCESS(planned_behaviors, current_behavior))
+ continue
+ var/list/arguments = list(src, FALSE)
+ var/list/stored_arguments = behavior_args[type]
+ if(stored_arguments)
+ arguments += stored_arguments
+ current_behavior.finish_action(arglist(arguments))
+
+
+///This proc handles changing ai status, and starts/stops processing if required.
+/datum/ai_controller/proc/set_ai_status(new_ai_status)
+ if(ai_status == new_ai_status)
+ return FALSE //no change
+ ai_status = new_ai_status
+ switch(ai_status)
+ if(AI_STATUS_ON)
+ SSai_controllers.active_ai_controllers += src
+ START_PROCESSING(SSai_behaviors, src)
+ if(AI_STATUS_OFF)
+ STOP_PROCESSING(SSai_behaviors, src)
+ SSai_controllers.active_ai_controllers -= src
+ CancelActions()
+
+/datum/ai_controller/proc/PauseAi(time)
+ paused_until = world.time + time
+
+///Call this to add a behavior to the stack.
+/datum/ai_controller/proc/queue_behavior(behavior_type, ...)
+ var/datum/ai_behavior/behavior = GET_AI_BEHAVIOR(behavior_type)
+ if(!behavior)
+ CRASH("Behavior [behavior_type] not found.")
+ var/list/arguments = args.Copy()
+ arguments[1] = src
+
+ if(LAZYACCESS(current_behaviors, behavior)) ///It's still in the plan, don't add it again to current_behaviors but do keep it in the planned behavior list so its not cancelled
+ LAZYADDASSOC(planned_behaviors, behavior, TRUE)
+ return
+
+ if(!behavior.setup(arglist(arguments)))
+ return
+
+ LAZYADDASSOC(current_behaviors, behavior, TRUE)
+ LAZYADDASSOC(planned_behaviors, behavior, TRUE)
+
+ arguments.Cut(1, 2)
+ if(length(arguments))
+ behavior_args[behavior_type] = arguments
+ else
+ behavior_args -= behavior_type
+
+/datum/ai_controller/proc/ProcessBehavior(delta_time, datum/ai_behavior/behavior)
+ var/list/arguments = list(delta_time, src)
+ var/list/stored_arguments = behavior_args[behavior.type]
+ if(stored_arguments)
+ arguments += stored_arguments
+ behavior.perform(arglist(arguments))
+
+/datum/ai_controller/proc/CancelActions()
+ if(!LAZYLEN(current_behaviors))
+ return
+ for(var/i in current_behaviors)
+ var/datum/ai_behavior/current_behavior = i
+ var/list/arguments = list(src, FALSE)
+ var/list/stored_arguments = behavior_args[current_behavior.type]
+ if(stored_arguments)
+ arguments += stored_arguments
+ current_behavior.finish_action(arglist(arguments))
+
+/datum/ai_controller/proc/on_sentience_gained()
+ UnregisterSignal(pawn, COMSIG_MOB_LOGIN)
+ if(!continue_processing_when_client)
+ set_ai_status(AI_STATUS_OFF) //Can't do anything while player is connected
+ set_ai_status(AI_STATUS_OFF) //Can't do anything while player is connected
+ RegisterSignal(pawn, COMSIG_MOB_LOGOUT, PROC_REF(on_sentience_lost))
+
+/datum/ai_controller/proc/on_sentience_lost()
+ UnregisterSignal(pawn, COMSIG_MOB_LOGOUT)
+ set_ai_status(AI_STATUS_ON) //Can't do anything while player is connected
+ RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained))
+
+/// Use this proc to define how your controller defines what access the pawn has for the sake of pathfinding, this requires they either have a key or you give them the lockids you want them to open
+/datum/ai_controller/proc/get_access()
+ return
+
+
+/**
+ * Used to manage references to datum by AI controllers
+ *
+ * * tracked_datum - something being added to an ai blackboard
+ * * key - the associated key
+ */
+#define TRACK_AI_DATUM_TARGET(tracked_datum, key) do { \
+ if(isweakref(tracked_datum)) { \
+ var/datum/weakref/_bad_weakref = tracked_datum; \
+ stack_trace("Weakref (Actual datum: [_bad_weakref.resolve()]) found in ai datum blackboard! \
+ This is an outdated method of ai reference handling, please remove it."); \
+ }; \
+ else if(isdatum(tracked_datum)) { \
+ var/datum/_tracked_datum = tracked_datum; \
+ if(!HAS_TRAIT_FROM(_tracked_datum, TRAIT_AI_TRACKING, "[REF(src)]_[key]")) { \
+ RegisterSignal(_tracked_datum, COMSIG_PARENT_QDELETING, PROC_REF(sig_remove_from_blackboard), override = TRUE); \
+ ADD_TRAIT(_tracked_datum, TRAIT_AI_TRACKING, "[REF(src)]_[key]"); \
+ }; \
+ }; \
+} while(FALSE)
+
+/**
+ * Used to clear previously set reference handing by AI controllers
+ *
+ * * tracked_datum - something being removed from an ai blackboard
+ * * key - the associated key
+ */
+#define CLEAR_AI_DATUM_TARGET(tracked_datum, key) do { \
+ if(isdatum(tracked_datum)) { \
+ var/datum/_tracked_datum = tracked_datum; \
+ REMOVE_TRAIT(_tracked_datum, TRAIT_AI_TRACKING, "[REF(src)]_[key]"); \
+ if(!HAS_TRAIT(_tracked_datum, TRAIT_AI_TRACKING)) { \
+ UnregisterSignal(_tracked_datum, COMSIG_PARENT_QDELETING); \
+ }; \
+ }; \
+} while(FALSE)
+
+/// Used for above to track all the keys that have registered a signal
+#define TRAIT_AI_TRACKING "tracked_by_ai"
+
+/**
+ * Sets the key to the passed "thing".
+ *
+ * * key - A blackboard key
+ * * thing - a value to set the blackboard key to.
+ */
+/datum/ai_controller/proc/set_blackboard_key(key, thing)
+ // Assume it is an error when trying to set a value overtop a list
+ if(islist(blackboard[key]))
+ CRASH("set_blackboard_key attempting to set a blackboard value to key [key] when it's a list!")
+
+ // Clear existing values
+ if(!isnull(blackboard[key]))
+ clear_blackboard_key(key)
+
+ TRACK_AI_DATUM_TARGET(thing, key)
+ blackboard[key] = thing
+
+/**
+ * Sets the key at index thing to the passed value
+ *
+ * Assumes the key value is already a list, if not throws an error.
+ *
+ * * key - A blackboard key, with its value set to a list
+ * * thing - a value which becomes the inner list value's key
+ * * value - what to set the inner list's value to
+ */
+/datum/ai_controller/proc/set_blackboard_key_assoc(key, thing, value)
+ if(!islist(blackboard[key]))
+ CRASH("set_blackboard_key_assoc called on non-list key [key]!")
+ TRACK_AI_DATUM_TARGET(thing, key)
+ TRACK_AI_DATUM_TARGET(value, key)
+ blackboard[key][thing] = value
+
+/**
+ * Similar to [proc/set_blackboard_key_assoc] but operates under the assumption the key is a lazylist (so it will create a list)
+ * More dangerous / easier to override values, only use when you want to use a lazylist
+ *
+ * * key - A blackboard key, with its value set to a list
+ * * thing - a value which becomes the inner list value's key
+ * * value - what to set the inner list's value to
+ */
+/datum/ai_controller/proc/set_blackboard_key_assoc_lazylist(key, thing, value)
+ LAZYINITLIST(blackboard[key])
+ TRACK_AI_DATUM_TARGET(thing, key)
+ TRACK_AI_DATUM_TARGET(value, key)
+ blackboard[key][thing] = value
+
+/**
+ * Adds the passed "thing" to the associated key
+ *
+ * Works with lists or numbers, but not lazylists.
+ *
+ * * key - A blackboard key
+ * * thing - a value to set the blackboard key to.
+ */
+/datum/ai_controller/proc/add_blackboard_key(key, thing)
+ TRACK_AI_DATUM_TARGET(thing, key)
+ blackboard[key] += thing
+
+/**
+ * Similar to [proc/add_blackboard_key], but performs an insertion rather than an add
+ * Throws an error if the key is not a list already, intended only for use with lists
+ *
+ * * key - A blackboard key, with its value set to a list
+ * * thing - a value to set the blackboard key to.
+ */
+/datum/ai_controller/proc/insert_blackboard_key(key, thing)
+ if(!islist(blackboard[key]))
+ CRASH("insert_blackboard_key called on non-list key [key]!")
+ TRACK_AI_DATUM_TARGET(thing, key)
+ blackboard[key] |= thing
+
+/**
+ * Adds the passed "thing" to the associated key, assuming key is intended to be a lazylist (so it will create a list)
+ * More dangerous / easier to override values, only use when you want to use a lazylist
+ *
+ * * key - A blackboard key
+ * * thing - a value to set the blackboard key to.
+ */
+/datum/ai_controller/proc/add_blackboard_key_lazylist(key, thing)
+ LAZYINITLIST(blackboard[key])
+ TRACK_AI_DATUM_TARGET(thing, key)
+ blackboard[key] += thing
+
+/**
+ * Similar to [proc/insert_blackboard_key_lazylist], but performs an insertion / or rather than an add
+ *
+ * * key - A blackboard key
+ * * thing - a value to set the blackboard key to.
+ */
+/datum/ai_controller/proc/insert_blackboard_key_lazylist(key, thing)
+ LAZYINITLIST(blackboard[key])
+ TRACK_AI_DATUM_TARGET(thing, key)
+ blackboard[key] |= thing
+
+/**
+ * Adds the value to the inner list at key with the inner key set to "thing"
+ * Throws an error if the key is not a list already, intended only for use with lists
+ *
+ * * key - A blackboard key, with its value set to a list
+ * * thing - a value which becomes the inner list value's key
+ * * value - what to set the inner list's value to
+ */
+/datum/ai_controller/proc/add_blackboard_key_assoc(key, thing, value)
+ if(!islist(blackboard[key]))
+ CRASH("add_blackboard_key_assoc called on non-list key [key]!")
+ TRACK_AI_DATUM_TARGET(thing, key)
+ TRACK_AI_DATUM_TARGET(value, key)
+ blackboard[key][thing] += value
+
+
+/**
+ * Similar to [proc/add_blackboard_key_assoc], assuming key is intended to be a lazylist (so it will create a list)
+ * More dangerous / easier to override values, only use when you want to use a lazylist
+ *
+ * * key - A blackboard key, with its value set to a list
+ * * thing - a value which becomes the inner list value's key
+ * * value - what to set the inner list's value to
+ */
+/datum/ai_controller/proc/add_blackboard_key_assoc_lazylist(key, thing, value)
+ LAZYINITLIST(blackboard[key])
+ TRACK_AI_DATUM_TARGET(thing, key)
+ TRACK_AI_DATUM_TARGET(value, key)
+ blackboard[key][thing] += value
+
+/**
+ * Clears the passed key, resetting it to null
+ *
+ * Not intended for use with list keys - use [proc/remove_thing_from_blackboard_key] if you are removing a value from a list at a key
+ *
+ * * key - A blackboard key
+ */
+/datum/ai_controller/proc/clear_blackboard_key(key)
+ CLEAR_AI_DATUM_TARGET(blackboard[key], key)
+ blackboard[key] = null
+
+/**
+ * Remove the passed thing from the associated blackboard key
+ *
+ * Intended for use with lists, if you're just clearing a reference from a key use [proc/clear_blackboard_key]
+ *
+ * * key - A blackboard key
+ * * thing - a value to set the blackboard key to.
+ */
+/datum/ai_controller/proc/remove_thing_from_blackboard_key(key, thing)
+ var/associated_value = blackboard[key]
+ if(thing == associated_value)
+ stack_trace("remove_thing_from_blackboard_key was called un-necessarily in a situation where clear_blackboard_key would suffice. ")
+ clear_blackboard_key(key)
+ return
+
+ if(!islist(associated_value))
+ CRASH("remove_thing_from_blackboard_key called with an invalid \"thing\" argument ([thing]). \
+ (The associated value of the passed key is not a list and is also not the passed thing, meaning it is clearing an unintended value.)")
+
+ for(var/inner_key in associated_value)
+ if(inner_key == thing)
+ // flat list
+ CLEAR_AI_DATUM_TARGET(thing, key)
+ associated_value -= thing
+ return
+ else if(associated_value[inner_key] == thing)
+ // assoc list
+ CLEAR_AI_DATUM_TARGET(thing, key)
+ associated_value -= inner_key
+ return
+
+ CRASH("remove_thing_from_blackboard_key called with an invalid \"thing\" argument ([thing]). \
+ (The passed value is not tracked in the passed list.)")
+
+/// Signal proc to go through every key and remove the datum from all keys it finds
+/datum/ai_controller/proc/sig_remove_from_blackboard(datum/source)
+ SIGNAL_HANDLER
+
+ var/list/list/remove_queue = list(blackboard)
+ var/index = 1
+ while(index <= length(remove_queue))
+ var/list/next_to_clear = remove_queue[index]
+ for(var/inner_value in next_to_clear)
+ var/associated_value = next_to_clear[inner_value]
+ // We are a lists of lists, add the next value to the queue so we can handle references in there
+ // (But we only need to bother checking the list if it's not empty.)
+ if(islist(inner_value) && length(inner_value))
+ UNTYPED_LIST_ADD(remove_queue, inner_value)
+
+ // We found the value that's been deleted. Clear it out from this list
+ else if(inner_value == source)
+ next_to_clear -= inner_value
+
+ // We are an assoc lists of lists, the list at the next value so we can handle references in there
+ // (But again, we only need to bother checking the list if it's not empty.)
+ if(islist(associated_value) && length(associated_value))
+ UNTYPED_LIST_ADD(remove_queue, associated_value)
+
+ // We found the value that's been deleted, it was an assoc value. Clear it out entirely
+ else if(associated_value == source)
+ next_to_clear -= inner_value
+
+ index += 1
+
+#undef TRACK_AI_DATUM_TARGET
+#undef CLEAR_AI_DATUM_TARGET
+#undef TRAIT_AI_TRACKING
diff --git a/code/datums/ai/_ai_idle_behavior.dm b/code/datums/ai/_ai_idle_behavior.dm
new file mode 100644
index 0000000000..f07be43844
--- /dev/null
+++ b/code/datums/ai/_ai_idle_behavior.dm
@@ -0,0 +1,3 @@
+/datum/idle_behavior
+/datum/idle_behavior/proc/perform_idle_behavior(delta_time, datum/ai_controller/controller)
+ return
diff --git a/code/datums/ai/ai_movement/_ai_movement.dm b/code/datums/ai/ai_movement/_ai_movement.dm
new file mode 100644
index 0000000000..6bb8ea47b0
--- /dev/null
+++ b/code/datums/ai/ai_movement/_ai_movement.dm
@@ -0,0 +1,23 @@
+///This datum is an abstract class that can be overriden for different types of movement
+/datum/ai_movement
+ ///Assoc list ist of controllers that are currently moving as key, and what they are moving to as value
+ var/list/moving_controllers = list()
+ ///Does this ai require processing?
+ var/requires_processing = TRUE
+ ///how many attempts do we make at pathing
+ var/max_pathing_attempts
+ ///how long path limit movements bother checking
+ var/max_path_distance = 30
+
+/datum/ai_movement/proc/start_moving_towards(datum/ai_controller/controller, atom/current_movement_target, min_distance)
+ controller.pathing_attempts = 0
+ controller.set_blackboard_key(BB_CURRENT_MIN_MOVE_DISTANCE, min_distance)
+ if(!moving_controllers.len && requires_processing)
+ START_PROCESSING(SSai_movement, src)
+ moving_controllers[controller] = current_movement_target
+
+/datum/ai_movement/proc/stop_moving_towards(datum/ai_controller/controller)
+ controller.pathing_attempts = 0
+ moving_controllers -= controller
+ if(!moving_controllers.len && requires_processing)
+ STOP_PROCESSING(SSai_movement, src)
diff --git a/code/datums/ai/ai_movement/_ai_planning_subtree.dm b/code/datums/ai/ai_movement/_ai_planning_subtree.dm
new file mode 100644
index 0000000000..8f186d586a
--- /dev/null
+++ b/code/datums/ai/ai_movement/_ai_planning_subtree.dm
@@ -0,0 +1,6 @@
+///A subtree is attached to a controller and is occasionally called by /ai_controller/SelectBehaviors(), this mainly exists to act as a way to subtype and modify SelectBehaviors() without needing to subtype the ai controller itself
+/datum/ai_planning_subtree
+
+///Determines what behaviors should the controller try processing; if this returns SUBTREE_RETURN_FINISH_PLANNING then the controller won't go through the other subtrees should multiple exist in controller.planning_subtrees
+/datum/ai_planning_subtree/proc/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ return
diff --git a/code/datums/ai/ai_movement/astar_movement.dm b/code/datums/ai/ai_movement/astar_movement.dm
new file mode 100644
index 0000000000..fe5ef7d042
--- /dev/null
+++ b/code/datums/ai/ai_movement/astar_movement.dm
@@ -0,0 +1,64 @@
+/**
+ * This movement datum represents smart-pathing
+ */
+/datum/ai_movement/astar
+ max_pathing_attempts = 4
+ max_path_distance = 30
+
+///Put your movement behavior in here!
+/datum/ai_movement/astar/process(delta_time)
+ for(var/datum/ai_controller/controller as anything in moving_controllers)
+ if(!COOLDOWN_FINISHED(controller, movement_cooldown))
+ continue
+ COOLDOWN_START(controller, movement_cooldown, controller.movement_delay)
+
+ var/atom/movable/movable_pawn = controller.pawn
+ if(!isturf(movable_pawn.loc)) //No moving if not on a turf
+ continue
+
+ if(controller.ai_traits & STOP_MOVING_WHEN_PULLED && movable_pawn.pulledby)
+ continue
+
+ var/minimum_distance = controller.max_target_distance
+ // right now I'm just taking the shortest minimum distance of our current behaviors, at some point in the future
+ // we should let whatever sets the current_movement_target also set the min distance and max path length
+ // (or at least cache it on the controller)
+ for(var/datum/ai_behavior/iter_behavior as anything in controller.current_behaviors)
+ if(iter_behavior.required_distance < minimum_distance)
+ minimum_distance = iter_behavior.required_distance
+
+ if(get_dist(movable_pawn, controller.current_movement_target) <= minimum_distance)
+ continue
+
+ var/generate_path = FALSE // set to TRUE when we either have no path, or we failed a step
+ if(length(controller.movement_path))
+ var/turf/next_step = controller.movement_path[1]
+ movable_pawn.Move(next_step)
+
+ // this check if we're on exactly the next tile may be overly brittle for dense pawns who may get bumped slightly
+ // to the side while moving but could maybe still follow their path without needing a whole new path
+ if(get_turf(movable_pawn) == next_step)
+ controller.movement_path.Cut(1,2)
+ else
+ generate_path = TRUE
+ else
+ generate_path = TRUE
+
+ if(generate_path)
+ if(!COOLDOWN_FINISHED(controller, repath_cooldown))
+ continue
+ controller.pathing_attempts++
+ if(controller.pathing_attempts >= max_pathing_attempts)
+ controller.CancelActions()
+ continue
+
+ COOLDOWN_START(controller, repath_cooldown, 2 SECONDS)
+ controller.movement_path = get_path_to(movable_pawn, controller.current_movement_target, max_path_distance, minimum_distance, id=controller.get_access())
+
+/datum/ai_movement/astar/start_moving_towards(datum/ai_controller/controller, atom/current_movement_target)
+ controller.movement_path = null
+ return ..()
+
+/datum/ai_movement/astar/stop_moving_towards(datum/ai_controller/controller)
+ controller.movement_path = null
+ return ..()
diff --git a/code/datums/ai/ai_movement/basic_avoidance.dm b/code/datums/ai/ai_movement/basic_avoidance.dm
new file mode 100644
index 0000000000..a82141dfe5
--- /dev/null
+++ b/code/datums/ai/ai_movement/basic_avoidance.dm
@@ -0,0 +1,32 @@
+///Uses Byond's basic obstacle avoidance mvovement
+/datum/ai_movement/basic_avoidance
+ requires_processing = TRUE
+ max_pathing_attempts = 10
+
+///Put your movement behavior in here!
+/datum/ai_movement/basic_avoidance/process(delta_time)
+ for(var/datum/ai_controller/controller as anything in moving_controllers)
+ if(!COOLDOWN_FINISHED(controller, movement_cooldown))
+ continue
+ COOLDOWN_START(controller, movement_cooldown, controller.movement_delay)
+
+ var/atom/movable/movable_pawn = controller.pawn
+ var/can_move = TRUE
+
+ if(controller.ai_traits & STOP_MOVING_WHEN_PULLED && movable_pawn.pulledby)
+ can_move = FALSE
+
+ if(!isturf(movable_pawn.loc)) //No moving if not on a turf
+ can_move = FALSE
+
+ var/current_loc = get_turf(movable_pawn)
+
+ var/turf/target_turf = get_step_towards(movable_pawn, controller.current_movement_target)
+
+ if(!is_type_in_typecache(target_turf, GLOB.dangerous_turfs) && can_move)
+ step_to(movable_pawn, controller.current_movement_target, controller.blackboard[BB_CURRENT_MIN_MOVE_DISTANCE], controller.movement_delay)
+
+ if(current_loc == get_turf(movable_pawn)) //Did we even move after trying to move?
+ controller.pathing_attempts++
+ if(controller.pathing_attempts >= max_pathing_attempts)
+ controller.CancelActions()
diff --git a/code/datums/ai/ai_movement/dumb_movement.dm b/code/datums/ai/ai_movement/dumb_movement.dm
new file mode 100644
index 0000000000..53eefa5dea
--- /dev/null
+++ b/code/datums/ai/ai_movement/dumb_movement.dm
@@ -0,0 +1,27 @@
+///The most braindead type of movement, bee-line to the target with no concern of whats infront of us.
+/datum/ai_movement/dumb
+ max_pathing_attempts = 16
+
+///Put your movement behavior in here!
+/datum/ai_movement/dumb/process(delta_time)
+ for(var/datum/ai_controller/controller as anything in moving_controllers)
+ if(!COOLDOWN_FINISHED(controller, movement_cooldown))
+ continue
+ COOLDOWN_START(controller, movement_cooldown, controller.movement_delay)
+ var/atom/movable/movable_pawn = controller.pawn
+ var/can_move = TRUE
+
+ if(controller.ai_traits & STOP_MOVING_WHEN_PULLED && movable_pawn.pulledby)
+ can_move = FALSE
+
+ if(!isturf(movable_pawn.loc)) //No moving if not on a turf
+ can_move = FALSE
+
+ var/current_loc = get_turf(movable_pawn)
+ var/turf/target_turf = get_step_towards(movable_pawn, controller.current_movement_target)
+ if(!is_type_in_typecache(target_turf, GLOB.dangerous_turfs) && can_move)
+ movable_pawn.Move(target_turf, get_dir(current_loc, target_turf))
+ if(current_loc == get_turf(movable_pawn)) //Did we even move after trying to move?
+ controller.pathing_attempts++
+ if(controller.pathing_attempts >= max_pathing_attempts)
+ controller.CancelActions()
diff --git a/code/datums/ai/behaviours/consume.dm b/code/datums/ai/behaviours/consume.dm
new file mode 100644
index 0000000000..7c214ce5ed
--- /dev/null
+++ b/code/datums/ai/behaviours/consume.dm
@@ -0,0 +1,31 @@
+
+/datum/ai_behavior/consume
+ required_distance = 1
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT
+ action_cooldown = 2 SECONDS
+
+/datum/ai_behavior/consume/setup(datum/ai_controller/controller, target_key)
+ . = ..()
+ set_movement_target(controller, controller.blackboard[target_key])
+
+/datum/ai_behavior/consume/perform(seconds_per_tick, datum/ai_controller/controller, target_key, hunger_timer_key)
+ . = ..()
+ var/mob/living/living_pawn = controller.pawn
+ var/obj/item/target = controller.blackboard[target_key]
+ if(QDELETED(target))
+ return
+
+ if(!(target in living_pawn.held_items))
+ if(!living_pawn.get_empty_held_indexes() || !living_pawn.put_in_hands(target))
+ finish_action(controller, FALSE, target, hunger_timer_key)
+ return
+
+ target.melee_attack_chain(living_pawn, living_pawn)
+
+ if(QDELETED(target) || prob(10)) // Even if we don't finish it all we can randomly decide to be done
+ finish_action(controller, TRUE, null, hunger_timer_key)
+
+/datum/ai_behavior/consume/finish_action(datum/ai_controller/controller, succeeded, target_key, hunger_timer_key)
+ . = ..()
+ if(succeeded)
+ controller.set_blackboard_key(hunger_timer_key, world.time + rand(12 SECONDS, 60 SECONDS))
diff --git a/code/datums/ai/behaviours/eat_food/eat_body.dm b/code/datums/ai/behaviours/eat_food/eat_body.dm
new file mode 100644
index 0000000000..e21828af18
--- /dev/null
+++ b/code/datums/ai/behaviours/eat_food/eat_body.dm
@@ -0,0 +1,69 @@
+/datum/ai_behavior/eat_dead_body
+ action_cooldown = 1.5 SECONDS
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_REQUIRE_REACH
+
+/datum/ai_behavior/eat_dead_body/setup(datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ //Hiding location is priority
+ var/atom/target = controller.blackboard[hiding_location_key] || controller.blackboard[target_key]
+ if(QDELETED(target))
+ return FALSE
+ set_movement_target(controller, (target))
+
+/datum/ai_behavior/eat_dead_body/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ var/mob/living/simple_animal/basic_mob = controller.pawn
+ //targetting datum will kill the action if not real anymore
+ var/mob/living/target = controller.blackboard[target_key]
+ var/datum/targetting_datum/targetting_datum = controller.blackboard[targetting_datum_key]
+
+ var/hiding_target = targetting_datum.find_hidden_mobs(basic_mob, target) //If this is valid, theyre hidden in something!
+
+ controller.set_blackboard_key(hiding_location_key, hiding_target)
+
+ basic_mob.face_atom()
+ basic_mob.visible_message(span_danger("[basic_mob] starts to rip apart [target]!"))
+ if(do_after(basic_mob, 10 SECONDS, target = target))
+ if(iscarbon(target))
+ var/mob/living/carbon/C = target
+ var/obj/item/bodypart/limb
+ var/list/limb_list = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
+ for(var/zone in limb_list)
+ limb = C.get_bodypart(zone)
+ if(limb)
+ limb.dismember()
+ finish_action(controller, TRUE)
+ return
+ limb = C.get_bodypart(BODY_ZONE_HEAD)
+ if(limb)
+ limb.dismember()
+ finish_action(controller, TRUE)
+ return
+ limb = C.get_bodypart(BODY_ZONE_CHEST)
+ if(limb)
+ if(!limb.dismember())
+ C.gib()
+ else
+ if(basic_mob.attack_sound)
+ playsound(basic_mob, pick(basic_mob.attack_sound), 100, TRUE, -1)
+ target.gib()
+ finish_action(controller, TRUE)
+
+
+/datum/ai_behavior/eat_dead_body/finish_action(datum/ai_controller/controller, succeeded, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ if(!succeeded)
+ controller.clear_blackboard_key(target_key)
+
+
+/datum/ai_behavior/eat_dead_body/bog_troll/finish_action(datum/ai_controller/controller, succeeded, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ if(!succeeded)
+ controller.clear_blackboard_key(target_key)
+ controller.pawn.icon_state = "Trollso"
+
+/datum/ai_behavior/eat_dead_body/mimic/finish_action(datum/ai_controller/controller, succeeded, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ if(!succeeded)
+ controller.clear_blackboard_key(target_key)
+ controller.pawn.icon_state = "mimic"
diff --git a/code/datums/ai/behaviours/find_and_set.dm b/code/datums/ai/behaviours/find_and_set.dm
new file mode 100644
index 0000000000..9f80cfe594
--- /dev/null
+++ b/code/datums/ai/behaviours/find_and_set.dm
@@ -0,0 +1,96 @@
+/**find and set
+ * Finds an item near themselves, sets a blackboard key as it. Very useful for ais that need to use machines or something.
+ * if you want to do something more complicated than find a single atom, change the search_tactic() proc
+ * cool tip: search_tactic() can set lists
+ */
+/datum/ai_behavior/find_and_set
+ action_cooldown = 2 SECONDS
+
+/datum/ai_behavior/find_and_set/perform(delta_time, datum/ai_controller/controller, set_key, locate_path, search_range)
+ . = ..()
+ var/find_this_thing = search_tactic(controller, locate_path, search_range)
+ if(find_this_thing)
+ controller.set_blackboard_key(set_key, find_this_thing)
+ finish_action(controller, TRUE)
+ else
+ finish_action(controller, FALSE)
+
+/datum/ai_behavior/find_and_set/proc/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+ return locate(locate_path) in oview(search_range, controller.pawn)
+
+/**
+ * Variant of find and set that fails if the living pawn doesn't hold something
+ */
+/datum/ai_behavior/find_and_set/pawn_must_hold_item
+
+/datum/ai_behavior/find_and_set/pawn_must_hold_item/search_tactic(datum/ai_controller/controller)
+ var/mob/living/living_pawn = controller.pawn
+ if(!living_pawn.get_inactive_held_item() && !living_pawn.get_active_held_item())
+ return //we want to fail the search if we don't have something held
+ return ..()
+
+/**
+ * Variant of find and set that also requires the item to be edible. checks hands too
+ */
+/datum/ai_behavior/find_and_set/edible
+
+/datum/ai_behavior/find_and_set/edible/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+ var/mob/living/living_pawn = controller.pawn
+ var/list/food_candidates = list()
+ for(var/held_candidate as anything in living_pawn.held_items)
+ if(!held_candidate || !istype(held_candidate, /obj/item/reagent_containers/food))
+ continue
+ food_candidates += held_candidate
+ var/list/local_results = locate(locate_path) in oview(search_range, controller.pawn)
+ for(var/local_candidate in local_results)
+ if(!istype(local_candidate, /obj/item/reagent_containers/food))
+ continue
+ food_candidates += local_candidate
+ if(food_candidates.len)
+ return pick(food_candidates)
+
+/**
+ * Variant of find and set that only checks in hands, search range should be excluded for this
+ */
+/datum/ai_behavior/find_and_set/in_hands
+
+/datum/ai_behavior/find_and_set/in_hands/search_tactic(datum/ai_controller/controller, locate_path)
+ var/mob/living/living_pawn = controller.pawn
+ return locate(locate_path) in living_pawn.held_items
+
+/**
+ * Variant of find and set that takes a list of things to find.
+ */
+/datum/ai_behavior/find_and_set/in_list
+
+/datum/ai_behavior/find_and_set/in_list/search_tactic(datum/ai_controller/controller, locate_paths, search_range)
+ var/list/found = list()
+ for(var/locate_path in locate_paths)
+ var/single_locate = ..(controller, locate_path, search_range)
+ if(single_locate)
+ found += single_locate
+ if(found.len)
+ return pick(found)
+
+
+/datum/ai_behavior/find_and_set/dead_bodies
+
+/datum/ai_behavior/find_and_set/dead_bodies/search_tactic(datum/ai_controller/controller, locate_paths, search_range)
+ var/list/found = list()
+ for(var/mob/living/mob in oview(search_range, controller.pawn))
+ if(mob.stat == CONSCIOUS)
+ continue
+ found |= mob
+ if(!length(found))
+ return null
+ return pick(found)
+
+/datum/ai_behavior/find_and_set/dead_bodies/bog_troll/finish_action(datum/ai_controller/controller, succeeded, ...)
+ . = ..()
+ if(succeeded)
+ controller.pawn.icon_state = "Trolla"
+
+/datum/ai_behavior/find_and_set/dead_bodies/mimic/finish_action(datum/ai_controller/controller, succeeded, ...)
+ . = ..()
+ if(succeeded)
+ controller.pawn.icon_state = "mimicopen"
diff --git a/code/datums/ai/behaviours/follow.dm b/code/datums/ai/behaviours/follow.dm
new file mode 100644
index 0000000000..a57576e037
--- /dev/null
+++ b/code/datums/ai/behaviours/follow.dm
@@ -0,0 +1,26 @@
+/// This behavior involves attacking a target.
+/datum/ai_behavior/follow
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM
+ required_distance = 1
+
+/datum/ai_behavior/follow/perform(delta_time, datum/ai_controller/controller)
+ . = ..()
+ var/mob/living/living_pawn = controller.pawn
+ if(!istype(living_pawn) || !isturf(living_pawn.loc))
+ return
+
+ var/atom/movable/follow_target = controller.blackboard[BB_FOLLOW_TARGET]
+ if(!follow_target || get_dist(living_pawn, follow_target) > controller.blackboard[BB_VISION_RANGE])
+ finish_action(controller, FALSE)
+ return
+
+ var/mob/living/living_target = follow_target
+ if(istype(living_target) && (living_target.stat == DEAD))
+ finish_action(controller, TRUE)
+ return
+
+ set_movement_target(controller, (living_target))
+
+/datum/ai_behavior/follow/finish_action(datum/ai_controller/controller, succeeded)
+ . = ..()
+ controller.clear_blackboard_key(BB_FOLLOW_TARGET)
diff --git a/code/datums/ai/behaviours/hostile/attack.dm b/code/datums/ai/behaviours/hostile/attack.dm
new file mode 100644
index 0000000000..b854bda5c1
--- /dev/null
+++ b/code/datums/ai/behaviours/hostile/attack.dm
@@ -0,0 +1,36 @@
+
+/// This behavior involves attacking a target.
+/datum/ai_behavior/attack
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM
+ required_distance = 1
+
+/datum/ai_behavior/attack/perform(delta_time, datum/ai_controller/controller)
+ . = ..()
+ var/mob/living/living_pawn = controller.pawn
+ if(!istype(living_pawn) || !isturf(living_pawn.loc))
+ return
+
+ var/datum/weakref/attack_ref = controller.blackboard[BB_ATTACK_TARGET]
+ var/atom/movable/attack_target = attack_ref?.resolve()
+ if(!attack_target || !can_see(living_pawn, attack_target, length=controller.blackboard[BB_VISION_RANGE]))
+ finish_action(controller, FALSE)
+ return
+
+ var/mob/living/living_target = attack_target
+ if(istype(living_target) && (living_target.stat == DEAD))
+ finish_action(controller, TRUE)
+ return
+
+ set_movement_target(controller, (living_target))
+ attack(controller, living_target)
+
+/datum/ai_behavior/attack/finish_action(datum/ai_controller/controller, succeeded)
+ . = ..()
+ controller.blackboard[BB_ATTACK_TARGET] = null
+
+/// A proc representing when the mob is pushed to actually attack the target. Again, subtypes can be used to represent different attacks from different animals, or it can be some other generic behavior
+/datum/ai_behavior/attack/proc/attack(datum/ai_controller/controller, mob/living/living_target)
+ var/mob/living/living_pawn = controller.pawn
+ if(!istype(living_pawn))
+ return
+ living_pawn.ClickOn(living_target, list())
diff --git a/code/datums/ai/behaviours/hostile/find_potential_targets.dm b/code/datums/ai/behaviours/hostile/find_potential_targets.dm
new file mode 100644
index 0000000000..3ae8c62754
--- /dev/null
+++ b/code/datums/ai/behaviours/hostile/find_potential_targets.dm
@@ -0,0 +1,93 @@
+/datum/ai_behavior/find_potential_targets
+ action_cooldown = 2 SECONDS
+ /// How far can we see stuff?
+ var/vision_range = 9
+
+/datum/ai_behavior/find_potential_targets/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ var/mob/living/living_mob = controller.pawn
+ var/datum/targetting_datum/targetting_datum = controller.blackboard[targetting_datum_key]
+
+ if(!targetting_datum)
+ CRASH("No target datum was supplied in the blackboard for [controller.pawn]")
+
+ var/atom/current_target = controller.blackboard[target_key]
+ if (targetting_datum.can_attack(living_mob, current_target))
+ finish_action(controller, succeeded = FALSE)
+ return
+
+ controller.clear_blackboard_key(target_key)
+ var/list/potential_targets = hearers(vision_range, controller.pawn) - living_mob //Remove self, so we don't suicide
+
+ if(!potential_targets.len)
+ finish_action(controller, succeeded = FALSE)
+ return
+
+ var/list/filtered_targets = list()
+
+ for(var/atom/pot_target in potential_targets)
+ if(targetting_datum.can_attack(living_mob, pot_target))//Can we attack it?
+ filtered_targets += pot_target
+ continue
+
+ for(var/mob/living/living_target in filtered_targets)
+ if(!living_target.rogue_sneaking)
+ continue
+ var/extra_chance = (living_mob.health <= living_mob.maxHealth * 50) ? 30 : 0 // if we're below half health, we're way more alert
+ if (!living_mob.npc_detect_sneak(living_target, extra_chance))
+ filtered_targets -= living_target
+
+ if(!filtered_targets.len)
+ finish_action(controller, succeeded = FALSE)
+ return
+
+ var/atom/target = pick_final_target(controller, filtered_targets)
+ controller.set_blackboard_key(target_key, target)
+
+ var/atom/potential_hiding_location = targetting_datum.find_hidden_mobs(living_mob, target)
+
+ if(potential_hiding_location) //If they're hiding inside of something, we need to know so we can go for that instead initially.
+ controller.set_blackboard_key(hiding_location_key, potential_hiding_location)
+
+ finish_action(controller, succeeded = TRUE)
+
+/datum/ai_behavior/find_potential_targets/finish_action(datum/ai_controller/controller, succeeded, ...)
+ . = ..()
+ if (succeeded)
+ controller.CancelActions() // On retarget cancel any further queued actions so that they will setup again with new target
+
+/// Returns the desired final target from the filtered list of targets
+/datum/ai_behavior/find_potential_targets/proc/pick_final_target(datum/ai_controller/controller, list/filtered_targets)
+ return pick(filtered_targets)
+
+
+/datum/ai_behavior/find_potential_targets/rat
+ vision_range = 2
+
+/datum/ai_behavior/find_potential_targets/spider
+ vision_range = 5
+
+/datum/ai_behavior/find_potential_targets/mimic
+ vision_range = 1
+
+/datum/ai_behavior/find_potential_targets/mimic/finish_action(datum/ai_controller/controller, succeeded, ...)
+ . = ..()
+ if (succeeded)
+ controller.CancelActions()
+ controller.pawn.icon_state = "mimicopen"
+
+
+/datum/ai_behavior/find_potential_targets/mole
+ vision_range = 9
+
+/datum/ai_behavior/find_potential_targets/troll
+ vision_range = 7
+
+/datum/ai_behavior/find_potential_targets/bog_troll
+ vision_range = 2
+
+/datum/ai_behavior/find_potential_targets/bog_troll/finish_action(datum/ai_controller/controller, succeeded, ...)
+ . = ..()
+ if (succeeded)
+ controller.CancelActions()
+ controller.pawn.icon_state = "Trolla"
diff --git a/code/datums/ai/behaviours/hostile/melee_attack.dm b/code/datums/ai/behaviours/hostile/melee_attack.dm
new file mode 100644
index 0000000000..fbfe580e3f
--- /dev/null
+++ b/code/datums/ai/behaviours/hostile/melee_attack.dm
@@ -0,0 +1,113 @@
+/datum/ai_behavior/basic_melee_attack
+ action_cooldown = 0.2 SECONDS // We gotta check unfortunately often because we're in a race condition with nextmove
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_REQUIRE_REACH | AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
+ var/sidesteps_after = FALSE
+
+/datum/ai_behavior/basic_melee_attack/setup(datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ var/datum/targetting_datum/targetting_datum = controller.blackboard[targetting_datum_key]
+ if(isnull(targetting_datum))
+ CRASH("No target datum was supplied in the blackboard for [controller.pawn]")
+
+ //Hiding location is priority
+ var/atom/target = controller.blackboard[hiding_location_key] || controller.blackboard[target_key]
+ if(QDELETED(target))
+ return FALSE
+ set_movement_target(controller, (target))
+
+/datum/ai_behavior/basic_melee_attack/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ var/mob/living/simple_animal/basic_mob = controller.pawn
+ //targetting datum will kill the action if not real anymore
+ var/atom/target = controller.blackboard[target_key]
+ var/datum/targetting_datum/targetting_datum = controller.blackboard[targetting_datum_key]
+
+ if(!targetting_datum.can_attack(basic_mob, target))
+ finish_action(controller, FALSE, target_key)
+ return
+
+ var/hiding_target = targetting_datum.find_hidden_mobs(basic_mob, target) //If this is valid, theyre hidden in something!
+
+ controller.set_blackboard_key(hiding_location_key, hiding_target)
+
+ basic_mob.face_atom()
+ basic_mob.a_intent = pick(basic_mob.possible_a_intents)
+ if(hiding_target) //Slap it!
+ basic_mob.ClickOn(hiding_target, list())
+ else
+ basic_mob.ClickOn(target, list())
+
+ if(sidesteps_after && prob(33)) //this is so fucking hacky, but going off og code this is exactly how it goes ignoring movetimers
+ if(!target || !isturf(target.loc) || !isturf(basic_mob.loc) || basic_mob.stat == DEAD)
+ return
+ var/target_dir = get_dir(basic_mob,target)
+
+ var/static/list/cardinal_sidestep_directions = list(-90,-45,0,45,90)
+ var/static/list/diagonal_sidestep_directions = list(-45,0,45)
+ var/chosen_dir = 0
+ if (target_dir & (target_dir - 1))
+ chosen_dir = pick(diagonal_sidestep_directions)
+ else
+ chosen_dir = pick(cardinal_sidestep_directions)
+ if(chosen_dir)
+ chosen_dir = turn(target_dir,chosen_dir)
+ basic_mob.Move(get_step(basic_mob,chosen_dir))
+ basic_mob.face_atom(target) //Looks better if they keep looking at you when dodging
+
+/datum/ai_behavior/basic_melee_attack/finish_action(datum/ai_controller/controller, succeeded, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ if(!succeeded)
+ controller.clear_blackboard_key(target_key)
+
+/datum/ai_behavior/basic_ranged_attack
+ action_cooldown = 0.6 SECONDS
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM
+ required_distance = 3
+
+/datum/ai_behavior/basic_ranged_attack/setup(datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ var/atom/target = controller.blackboard[hiding_location_key] || controller.blackboard[target_key]
+ if(QDELETED(target))
+ return FALSE
+ set_movement_target(controller, (target))
+
+
+/datum/ai_behavior/basic_ranged_attack/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ var/mob/living/simple_animal/basic_mob = controller.pawn
+ //targetting datum will kill the action if not real anymore
+ var/atom/target = controller.blackboard[target_key]
+ var/datum/targetting_datum/targetting_datum = controller.blackboard[targetting_datum_key]
+
+
+ if(!targetting_datum.can_attack(basic_mob, target))
+ finish_action(controller, FALSE, target_key)
+ return
+
+ var/atom/hiding_target = targetting_datum.find_hidden_mobs(basic_mob, target) //If this is valid, theyre hidden in something!
+
+ controller.set_blackboard_key(hiding_location_key, hiding_target)
+
+ basic_mob.face_atom()
+ if(hiding_target) //Shoot it!
+ basic_mob.RangedAttack(hiding_target)
+ else
+ basic_mob.RangedAttack(target)
+
+/datum/ai_behavior/basic_ranged_attack/finish_action(datum/ai_controller/controller, succeeded, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ if(!succeeded)
+ controller.clear_blackboard_key(target_key)
+
+
+/datum/ai_behavior/basic_melee_attack/bog_troll/finish_action(datum/ai_controller/controller, succeeded, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ if(!succeeded)
+ controller.clear_blackboard_key(target_key)
+ controller.pawn.icon_state = "Trollso"
+
+/datum/ai_behavior/basic_melee_attack/mimic/finish_action(datum/ai_controller/controller, succeeded, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ if(!succeeded)
+ controller.clear_blackboard_key(target_key)
+ controller.pawn.icon_state = "mimic"
diff --git a/code/datums/ai/behaviours/hunger.dm b/code/datums/ai/behaviours/hunger.dm
new file mode 100644
index 0000000000..8fd3a18424
--- /dev/null
+++ b/code/datums/ai/behaviours/hunger.dm
@@ -0,0 +1,24 @@
+/**
+ * Generic Hunger Subtree,
+ *
+ * Requires at least a living mob that can hold items.
+ *
+ * relevant blackboards:
+ * * BB_NEXT_HUNGRY - set by this subtree, is when the controller is next hungry
+ */
+/datum/ai_planning_subtree/generic_hunger/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ var/next_eat = controller.blackboard[BB_NEXT_HUNGRY]
+ if(!next_eat)
+ //inits the blackboard timer
+ next_eat = world.time + rand(0, 30 SECONDS)
+ controller.set_blackboard_key(BB_NEXT_HUNGRY, next_eat)
+
+ if(world.time < next_eat)
+ return
+
+ if(!controller.blackboard[BB_FOOD_TARGET])
+ controller.queue_behavior(/datum/ai_behavior/find_and_set/edible, BB_FOOD_TARGET, /obj/item, 2)
+ return
+
+ controller.queue_behavior(/datum/ai_behavior/consume, BB_FOOD_TARGET, BB_NEXT_HUNGRY)
+ return SUBTREE_RETURN_FINISH_PLANNING
diff --git a/code/datums/ai/behaviours/nearest_targetting.dm b/code/datums/ai/behaviours/nearest_targetting.dm
new file mode 100644
index 0000000000..8a570375cb
--- /dev/null
+++ b/code/datums/ai/behaviours/nearest_targetting.dm
@@ -0,0 +1,13 @@
+/// Picks targets based on which one is closest to you, choice between targets at equal distance is arbitrary
+/datum/ai_behavior/find_potential_targets/nearest
+
+/datum/ai_behavior/find_potential_targets/nearest/pick_final_target(datum/ai_controller/controller, list/filtered_targets)
+ var/turf/our_position = get_turf(controller.pawn)
+ return get_closest_atom(/atom/, filtered_targets, our_position)
+
+/// As above but targets have been filtered from the 'retaliate' blackboard list
+/datum/ai_behavior/target_from_retaliate_list/nearest
+
+/datum/ai_behavior/target_from_retaliate_list/nearest/pick_final_target(datum/ai_controller/controller, list/enemies_list)
+ var/turf/our_position = get_turf(controller.pawn)
+ return get_closest_atom(/atom/, enemies_list, our_position)
diff --git a/code/datums/ai/behaviours/perform_emote.dm b/code/datums/ai/behaviours/perform_emote.dm
new file mode 100644
index 0000000000..ec5e452eea
--- /dev/null
+++ b/code/datums/ai/behaviours/perform_emote.dm
@@ -0,0 +1,8 @@
+/datum/ai_behavior/perform_emote
+
+/datum/ai_behavior/perform_emote/perform(delta_time, datum/ai_controller/controller, emote)
+ var/mob/living/living_pawn = controller.pawn
+ if(!istype(living_pawn))
+ return
+ living_pawn.emote(emote)
+ finish_action(controller, TRUE)
diff --git a/code/datums/ai/behaviours/perform_speech.dm b/code/datums/ai/behaviours/perform_speech.dm
new file mode 100644
index 0000000000..c1e87459fa
--- /dev/null
+++ b/code/datums/ai/behaviours/perform_speech.dm
@@ -0,0 +1,8 @@
+/datum/ai_behavior/perform_speech
+
+/datum/ai_behavior/perform_speech/perform(delta_time, datum/ai_controller/controller, speech)
+ var/mob/living/living_pawn = controller.pawn
+ if(!istype(living_pawn))
+ return
+ living_pawn.say(speech, forced = "AI Controller")
+ finish_action(controller, TRUE)
diff --git a/code/datums/ai/behaviours/resist.dm b/code/datums/ai/behaviours/resist.dm
new file mode 100644
index 0000000000..40d7759700
--- /dev/null
+++ b/code/datums/ai/behaviours/resist.dm
@@ -0,0 +1,5 @@
+/datum/ai_behavior/resist/perform(delta_time, datum/ai_controller/controller)
+ . = ..()
+ var/mob/living/living_pawn = controller.pawn
+ living_pawn.resist()
+ finish_action(controller, TRUE)
diff --git a/code/datums/ai/behaviours/run_from_target.dm b/code/datums/ai/behaviours/run_from_target.dm
new file mode 100644
index 0000000000..dc024a8bf7
--- /dev/null
+++ b/code/datums/ai/behaviours/run_from_target.dm
@@ -0,0 +1,88 @@
+/**
+ * Get ranged target turf, but with direct targets as opposed to directions
+ *
+ * Starts at atom starting_atom and gets the exact angle between starting_atom and target
+ * Moves from starting_atom with that angle, Range amount of times, until it stops, bound to map size
+ * Arguments:
+ * * starting_atom - Initial Firer / Position
+ * * target - Target to aim towards
+ * * range - Distance of returned target turf from starting_atom
+ * * offset - Angle offset, 180 input would make the returned target turf be in the opposite direction
+ */
+/proc/get_ranged_target_turf_direct(atom/starting_atom, atom/target, range, offset)
+ var/angle = ATAN2(target.x - starting_atom.x, target.y - starting_atom.y)
+ if(offset)
+ angle += offset
+ var/turf/starting_turf = get_turf(starting_atom)
+ for(var/i in 1 to range)
+ var/turf/check = locate(starting_atom.x + cos(angle) * i, starting_atom.y + sin(angle) * i, starting_atom.z)
+ if(!check)
+ break
+ starting_turf = check
+
+ return starting_turf
+
+// Move to a position further away from your current target
+/datum/ai_behavior/run_away_from_target
+ required_distance = 0
+ action_cooldown = 0
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
+ /// How far do we try to run? Further makes for smoother running, but potentially weirder pathfinding
+ var/run_distance = 9
+ var/until_destination = FALSE
+
+/datum/ai_behavior/run_away_from_target/setup(datum/ai_controller/controller, target_key, hiding_location_key)
+ var/atom/target = controller.blackboard[hiding_location_key] || controller.blackboard[target_key]
+ if(!target)
+ return FALSE
+
+ plot_path_away_from(controller, target)
+ return ..()
+
+/datum/ai_behavior/run_away_from_target/perform(delta_time, datum/ai_controller/controller, target_key, hiding_location_key)
+ . = ..()
+ var/atom/target = controller.blackboard[hiding_location_key] || controller.blackboard[target_key]
+ var/escaped = !target || !can_see(controller.pawn, target, run_distance) // If we can't see it we got away
+ if (escaped)
+ finish_action(controller, succeeded = TRUE)
+ return
+ if (!in_range(controller.pawn, controller.current_movement_target))
+ if(until_destination)
+ finish_action(controller, TRUE)
+ return
+ plot_path_away_from(controller, target)
+
+/datum/ai_behavior/run_away_from_target/proc/plot_path_away_from(datum/ai_controller/controller, atom/target)
+ var/turf/target_destination = get_turf(controller.pawn)
+ var/static/list/offset_angles = list(45, 90, 135, 180, 225, 270)
+ for(var/angle in offset_angles)
+ var/turf/test_turf = get_furthest_turf(controller.pawn, angle, target)
+ if(isnull(test_turf))
+ continue
+ var/distance_from_target = get_dist(target, test_turf)
+ if(distance_from_target <= get_dist(target, target_destination))
+ continue
+ target_destination = test_turf
+ if(distance_from_target == run_distance) //we already got the max running distance
+ break
+ if (target_destination == get_turf(controller.pawn))
+ return FALSE
+ set_movement_target(controller, target_destination)
+ return TRUE
+
+/datum/ai_behavior/run_away_from_target/proc/get_furthest_turf(atom/source, angle, atom/target)
+ var/turf/return_turf
+ for(var/i in 1 to run_distance)
+ var/turf/test_destination = get_ranged_target_turf_direct(source, target, range = i, offset = angle)
+ if(is_blocked_turf(test_destination, exclude_mobs = !source.density))
+ break
+ return_turf = test_destination
+ return return_turf
+
+/datum/ai_behavior/run_away_from_target/until_destination
+ until_destination = TRUE
+ run_distance = 4
+
+/datum/ai_behavior/run_away_from_target/until_destination/finish_action(datum/ai_controller/controller, succeeded, ...)
+ . = ..()
+ controller.set_blackboard_key(BB_BASIC_MOB_RUN_WITH_ITEM, FALSE)
diff --git a/code/datums/ai/behaviours/use_in_hand.dm b/code/datums/ai/behaviours/use_in_hand.dm
new file mode 100644
index 0000000000..de1e8c017b
--- /dev/null
+++ b/code/datums/ai/behaviours/use_in_hand.dm
@@ -0,0 +1,13 @@
+/// Use in hand the currently held item
+/datum/ai_behavior/use_in_hand
+ behavior_flags = AI_BEHAVIOR_MOVE_AND_PERFORM
+
+/datum/ai_behavior/use_in_hand/perform(delta_time, datum/ai_controller/controller)
+ . = ..()
+ var/mob/living/pawn = controller.pawn
+ var/obj/item/held = pawn.get_active_held_item()
+ if(!held)
+ finish_action(controller, FALSE)
+ return
+ pawn.activate_hand(pawn.active_hand_index)
+ finish_action(controller, TRUE)
diff --git a/code/datums/ai/behaviours/use_on_object.dm b/code/datums/ai/behaviours/use_on_object.dm
new file mode 100644
index 0000000000..ab28cc94e0
--- /dev/null
+++ b/code/datums/ai/behaviours/use_on_object.dm
@@ -0,0 +1,19 @@
+/// Use the currently held item, or unarmed, on an object in the world
+/datum/ai_behavior/use_on_object
+ required_distance = 1
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_REQUIRE_REACH
+
+/datum/ai_behavior/use_on_object/perform(delta_time, datum/ai_controller/controller)
+ . = ..()
+ var/mob/living/pawn = controller.pawn
+ var/obj/item/held_item = pawn.get_active_held_item()
+ var/atom/target = controller.current_movement_target
+ if(!target || !pawn.CanReach(target))
+ finish_action(controller, FALSE)
+ return
+
+ if(held_item)
+ held_item.melee_attack_chain(pawn, target)
+ else
+ pawn.UnarmedAttack(target, TRUE)
+ finish_action(controller, TRUE)
diff --git a/code/datums/ai/behaviours/use_targeted_ability.dm b/code/datums/ai/behaviours/use_targeted_ability.dm
new file mode 100644
index 0000000000..a24a69575c
--- /dev/null
+++ b/code/datums/ai/behaviours/use_targeted_ability.dm
@@ -0,0 +1,50 @@
+/**
+ * # Targeted Mob Ability
+ * Attempts to use a mob's cooldown ability on a target
+ */
+/datum/ai_behavior/targeted_mob_ability
+
+/datum/ai_behavior/targeted_mob_ability/perform(seconds_per_tick, datum/ai_controller/controller, ability_key, target_key)
+ var/obj/effect/proc_holder/spell/ability = controller.blackboard[ability_key]
+ var/mob/living/target = controller.blackboard[target_key]
+ if(QDELETED(ability) || QDELETED(target))
+ finish_action(controller, FALSE, ability_key, target_key)
+ return
+ var/mob/pawn = controller.pawn
+ pawn.face_atom(target)
+ var/result = ability.perform(targets = list(target), user = controller.pawn)
+ finish_action(controller, result, ability_key, target_key)
+
+/datum/ai_behavior/targeted_mob_ability/finish_action(datum/ai_controller/controller, succeeded, ability_key, target_key)
+ . = ..()
+ var/atom/target = controller.blackboard[target_key]
+ if (QDELETED(target))
+ controller.clear_blackboard_key(target_key)
+
+/**
+ * # Try Mob Ability and clear target
+ * Attempts to use a mob's cooldown ability on a target and releases the target when the action completes
+ */
+/datum/ai_behavior/targeted_mob_ability/and_clear_target
+
+/datum/ai_behavior/targeted_mob_ability/and_clear_target/finish_action(datum/ai_controller/controller, succeeded, ability_key, target_key)
+ . = ..()
+ controller.clear_blackboard_key(target_key)
+
+/datum/ai_behavior/targeted_mob_ability/proc/get_ability_to_use(datum/ai_controller/controller, ability_key)
+ return controller.blackboard[ability_key]
+
+/**
+ * Attempts to move into the provided range and then use a mob's cooldown ability on a target
+ */
+/datum/ai_behavior/targeted_mob_ability/min_range
+ required_distance = 6
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT
+ var/datum/ai_movement/new_movement
+
+/datum/ai_behavior/targeted_mob_ability/min_range/setup(datum/ai_controller/controller, ability_key, target_key)
+ . = ..()
+ var/atom/target = controller.blackboard[target_key]
+ if(QDELETED(target))
+ return FALSE
+ set_movement_target(controller, target, new_movement)
diff --git a/code/datums/ai/behaviours/wak_to_target.dm b/code/datums/ai/behaviours/wak_to_target.dm
new file mode 100644
index 0000000000..a761913789
--- /dev/null
+++ b/code/datums/ai/behaviours/wak_to_target.dm
@@ -0,0 +1,7 @@
+///Moves to target then finishes
+/datum/ai_behavior/move_to_target
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT
+
+/datum/ai_behavior/move_to_target/perform(delta_time, datum/ai_controller/controller)
+ . = ..()
+ finish_action(controller, TRUE)
diff --git a/code/datums/ai/controllers/big_rat.dm b/code/datums/ai/controllers/big_rat.dm
new file mode 100644
index 0000000000..43fca905d0
--- /dev/null
+++ b/code/datums/ai/controllers/big_rat.dm
@@ -0,0 +1,22 @@
+/datum/ai_controller/big_rat
+ movement_delay = 0.5 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/allow_items()
+
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/flee_target,
+
+ /datum/ai_planning_subtree/simple_find_target/rat,
+ /datum/ai_planning_subtree/find_food/rat,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+
+ /datum/ai_planning_subtree/find_dead_bodies,
+ /datum/ai_planning_subtree/eat_dead_body,
+ )
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk
diff --git a/code/datums/ai/controllers/bog_bug.dm b/code/datums/ai/controllers/bog_bug.dm
new file mode 100644
index 0000000000..830a8703dc
--- /dev/null
+++ b/code/datums/ai/controllers/bog_bug.dm
@@ -0,0 +1,22 @@
+/datum/ai_controller/bog_bug
+ movement_delay = 0.2 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/allow_items()
+
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/flee_target,
+
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/find_food,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+
+ /datum/ai_planning_subtree/find_dead_bodies,
+ /datum/ai_planning_subtree/eat_dead_body,
+ )
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk
diff --git a/code/datums/ai/controllers/bog_troll.dm b/code/datums/ai/controllers/bog_troll.dm
new file mode 100644
index 0000000000..4d6382f255
--- /dev/null
+++ b/code/datums/ai/controllers/bog_troll.dm
@@ -0,0 +1,19 @@
+/datum/ai_controller/bog_troll
+ movement_delay = 0.7 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/allow_items()
+
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/simple_find_target/bog_troll,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree/bog_troll,
+
+ /datum/ai_planning_subtree/find_dead_bodies/bog_troll,
+ /datum/ai_planning_subtree/eat_dead_body/bog_troll,
+ )
+
+ idle_behavior = /datum/idle_behavior/nothing
diff --git a/code/datums/ai/controllers/headless.dm b/code/datums/ai/controllers/headless.dm
new file mode 100644
index 0000000000..9fe29b1907
--- /dev/null
+++ b/code/datums/ai/controllers/headless.dm
@@ -0,0 +1,22 @@
+/datum/ai_controller/headless
+ movement_delay = 0.8 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/allow_items()
+
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/flee_target,
+
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/find_food,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+
+ /datum/ai_planning_subtree/find_dead_bodies,
+ /datum/ai_planning_subtree/eat_dead_body,
+ )
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk
diff --git a/code/datums/ai/controllers/mimic.dm b/code/datums/ai/controllers/mimic.dm
new file mode 100644
index 0000000000..c9714d1bac
--- /dev/null
+++ b/code/datums/ai/controllers/mimic.dm
@@ -0,0 +1,19 @@
+/datum/ai_controller/mimic
+ movement_delay = 0.8 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/allow_items()
+
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/simple_find_target/mimic,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree/mimic,
+
+ /datum/ai_planning_subtree/find_dead_bodies/mimic,
+ /datum/ai_planning_subtree/eat_dead_body/mimic,
+ )
+
+ idle_behavior = /datum/idle_behavior/nothing
diff --git a/code/datums/ai/controllers/minoutaur.dm b/code/datums/ai/controllers/minoutaur.dm
new file mode 100644
index 0000000000..586d074c03
--- /dev/null
+++ b/code/datums/ai/controllers/minoutaur.dm
@@ -0,0 +1,17 @@
+/datum/ai_controller/minotaur
+ movement_delay = 0.5 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/allow_items()
+
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/simple_find_target/spider,
+ /datum/ai_planning_subtree/find_food/spider,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk
diff --git a/code/datums/ai/controllers/mole.dm b/code/datums/ai/controllers/mole.dm
new file mode 100644
index 0000000000..edef2b7534
--- /dev/null
+++ b/code/datums/ai/controllers/mole.dm
@@ -0,0 +1,22 @@
+/datum/ai_controller/mole
+ movement_delay = 0.6 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/allow_items()
+
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/flee_target,
+
+ /datum/ai_planning_subtree/simple_find_target/mole,
+ /datum/ai_planning_subtree/find_food/mole,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+
+ /datum/ai_planning_subtree/find_dead_bodies/mole,
+ /datum/ai_planning_subtree/eat_dead_body,
+ )
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk
diff --git a/code/datums/ai/controllers/spider.dm b/code/datums/ai/controllers/spider.dm
new file mode 100644
index 0000000000..d8ecdcda7a
--- /dev/null
+++ b/code/datums/ai/controllers/spider.dm
@@ -0,0 +1,22 @@
+/datum/ai_controller/spider
+ movement_delay = 0.4 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/allow_items()
+
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/flee_target,
+
+ /datum/ai_planning_subtree/simple_find_target/spider,
+ /datum/ai_planning_subtree/find_food/spider,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+
+ /datum/ai_planning_subtree/find_dead_bodies,
+ /datum/ai_planning_subtree/eat_dead_body,
+ )
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk
diff --git a/code/datums/ai/controllers/troll.dm b/code/datums/ai/controllers/troll.dm
new file mode 100644
index 0000000000..e954cfbac2
--- /dev/null
+++ b/code/datums/ai/controllers/troll.dm
@@ -0,0 +1,22 @@
+/datum/ai_controller/troll
+ movement_delay = 0.7 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic/allow_items()
+
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/flee_target,
+
+ /datum/ai_planning_subtree/simple_find_target/troll,
+ /datum/ai_planning_subtree/find_food/troll,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+
+ /datum/ai_planning_subtree/find_dead_bodies,
+ /datum/ai_planning_subtree/eat_dead_body,
+ )
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk
diff --git a/code/datums/ai/controllers/volf.dm b/code/datums/ai/controllers/volf.dm
new file mode 100644
index 0000000000..f1b8dc489b
--- /dev/null
+++ b/code/datums/ai/controllers/volf.dm
@@ -0,0 +1,20 @@
+/datum/ai_controller/volf
+ movement_delay = 0.4 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic()
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/flee_target,
+
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+
+ /datum/ai_planning_subtree/find_dead_bodies,
+ /datum/ai_planning_subtree/eat_dead_body,
+ )
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk
diff --git a/code/datums/ai/hostile/_hostile_controller.dm b/code/datums/ai/hostile/_hostile_controller.dm
new file mode 100644
index 0000000000..1752b75557
--- /dev/null
+++ b/code/datums/ai/hostile/_hostile_controller.dm
@@ -0,0 +1,190 @@
+/datum/ai_controller/hostile_friend
+ blackboard = list(
+ BB_HOSTILE_ORDER_MODE = null,
+ BB_HOSTILE_FRIEND = null,
+ BB_FOLLOW_TARGET = null,
+ BB_ATTACK_TARGET = null,
+ BB_VISION_RANGE = BB_HOSTILE_VISION_RANGE,
+ BB_HOSTILE_ATTACK_WORD = "growls",
+ )
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk/hostile_tameable
+
+ var/ride_penalty_movement = 1 SECONDS
+
+ COOLDOWN_DECLARE(command_cooldown)
+
+/datum/ai_controller/hostile_friend/process(delta_time)
+ if(isliving(pawn))
+ var/mob/living/living_pawn = pawn
+ movement_delay = living_pawn.cached_multiplicative_slowdown
+ return ..()
+
+/datum/ai_controller/hostile_friend/TryPossessPawn(atom/new_pawn)
+ if(!ishostile(new_pawn))
+ return AI_CONTROLLER_INCOMPATIBLE
+
+ RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined))
+ RegisterSignal(new_pawn, COMSIG_CLICK_ALT, PROC_REF(check_altclicked))
+ RegisterSignal(new_pawn, COMSIG_RIDDEN_DRIVER_MOVE, PROC_REF(on_ridden_driver_move))
+ RegisterSignal(new_pawn, COMSIG_MOVABLE_PREBUCKLE, PROC_REF(on_prebuckle))
+ return ..() //Run parent at end
+
+/datum/ai_controller/hostile_friend/UnpossessPawn(destroy)
+ UnregisterSignal(pawn, list(
+ COMSIG_ATOM_ATTACK_HAND,
+ COMSIG_PARENT_EXAMINE,
+ COMSIG_CLICK_ALT,
+ COMSIG_LIVING_DEATH,
+ COMSIG_PARENT_QDELETING
+ ))
+ unfriend()
+ return ..() //Run parent at end
+
+/datum/ai_controller/hostile_friend/proc/on_prebuckle(mob/source, mob/living/buckler, force)
+ if(force || ai_status == AI_STATUS_OFF)
+ return
+ if(WEAKREF(buckler) != blackboard[BB_HOSTILE_FRIEND])
+ return COMPONENT_BLOCK_BUCKLE
+
+/datum/ai_controller/hostile_friend/able_to_run()
+ var/mob/living/living_pawn = pawn
+
+ if(IS_DEAD_OR_INCAP(living_pawn))
+ return FALSE
+ return ..()
+
+/datum/ai_controller/hostile_friend/get_access()
+ var/mob/living/simple_animal/simple_pawn = pawn
+ if(!istype(simple_pawn))
+ return
+
+ return simple_pawn.lock_hashes
+
+/datum/ai_controller/hostile_friend/proc/on_ridden_driver_move(atom/movable/movable_parent, mob/living/user, direction)
+ SIGNAL_HANDLER
+ PauseAi(ride_penalty_movement)
+
+/// Befriends someone
+/datum/ai_controller/hostile_friend/proc/befriend(mob/living/new_friend)
+ var/datum/weakref/current_ref = blackboard[BB_HOSTILE_FRIEND]
+ var/datum/weakref/friend_ref = WEAKREF(new_friend)
+ var/mob/living/old_friend = current_ref?.resolve()
+ if(old_friend)
+ unfriend(old_friend)
+ else
+ blackboard[BB_HOSTILE_FRIEND] = null
+
+ if(pawn.Adjacent(pawn, new_friend))
+ new_friend.visible_message("[pawn] looks at [new_friend] in a friendly manner!", span_notice("[pawn] looks at you in a friendly manner!"))
+ blackboard[BB_HOSTILE_FRIEND] = friend_ref
+ RegisterSignal(new_friend, COMSIG_MOB_SAY, PROC_REF(check_verbal_command))
+
+/// Someone is being mean to us, take them off our friends (add actual enemies behavior later)
+/datum/ai_controller/hostile_friend/proc/unfriend()
+ var/datum/weakref/friend_ref = blackboard[BB_HOSTILE_FRIEND]
+ var/mob/living/old_friend = friend_ref?.resolve()
+ if(old_friend)
+ UnregisterSignal(old_friend, list(COMSIG_MOB_SAY))
+ blackboard[BB_HOSTILE_FRIEND] = null
+
+/// Someone is looking at us, if we're currently carrying something then show what it is, and include a message if they're our friend
+/datum/ai_controller/hostile_friend/proc/on_examined(datum/source, mob/user, list/examine_text)
+ SIGNAL_HANDLER
+
+ if(blackboard[BB_HOSTILE_FRIEND] == WEAKREF(user))
+ var/mob/living/living_pawn = pawn
+ if(!IS_DEAD_OR_INCAP(living_pawn))
+ examine_text += span_notice("[pawn.p_they(TRUE)] seem[pawn.p_s()] happy to see you!")
+
+// next section is regarding commands
+
+/// Someone alt clicked us, see if they're someone we should show the radial command menu to
+/datum/ai_controller/hostile_friend/proc/check_altclicked(datum/source, mob/living/clicker)
+ SIGNAL_HANDLER
+
+ if(!COOLDOWN_FINISHED(src, command_cooldown))
+ return
+ if(!istype(clicker) || blackboard[BB_HOSTILE_FRIEND] == WEAKREF(clicker))
+ return
+ INVOKE_ASYNC(src, PROC_REF(command_radial), clicker)
+
+/// Show the command radial menu
+/datum/ai_controller/hostile_friend/proc/command_radial(mob/living/clicker)
+ var/list/commands = list(
+ COMMAND_STOP = image(icon = 'icons/testing/turf_analysis.dmi', icon_state = "red_arrow"),
+ COMMAND_FOLLOW = image(icon = 'icons/mob/actions/actions_spells.dmi', icon_state = "summons"),
+ COMMAND_ATTACK = image(icon = 'icons/effects/effects.dmi', icon_state = "bite"),
+ )
+
+ var/choice = show_radial_menu(clicker, pawn, commands, custom_check = CALLBACK(src, PROC_REF(check_menu), clicker), tooltips = TRUE)
+ if(!choice || !check_menu(clicker))
+ return
+ set_command_mode(clicker, choice)
+
+/datum/ai_controller/hostile_friend/proc/check_menu(mob/user)
+ if(!istype(user))
+ CRASH("A non-mob is trying to issue an order to [pawn].")
+ if(user.incapacitated() || !can_see(user, pawn))
+ return FALSE
+ return TRUE
+
+/// One of our friends said something, see if it's a valid command, and if so, take action
+/datum/ai_controller/hostile_friend/proc/check_verbal_command(mob/speaker, speech_args)
+ SIGNAL_HANDLER
+
+ if(blackboard[BB_HOSTILE_FRIEND] != WEAKREF(speaker))
+ return
+
+ if(!COOLDOWN_FINISHED(src, command_cooldown))
+ return
+
+ var/mob/living/living_pawn = pawn
+ if(IS_DEAD_OR_INCAP(living_pawn))
+ return
+
+ var/spoken_text = speech_args[SPEECH_MESSAGE] // probably should check for full words
+ var/command
+ if(findtext(spoken_text, "stop") || findtext(spoken_text, "stay"))
+ command = COMMAND_STOP
+ else if(findtext(spoken_text, "follow") || findtext(spoken_text, "come"))
+ command = COMMAND_FOLLOW
+ else if(findtext(spoken_text, "attack") || findtext(spoken_text, "sic"))
+ command = COMMAND_ATTACK
+ else
+ return
+
+ if(!can_see(pawn, speaker, length=blackboard[BB_VISION_RANGE]))
+ return
+ set_command_mode(speaker, command)
+
+/// Whether we got here via radial menu or a verbal command, this is where we actually process what our new command will be
+/datum/ai_controller/hostile_friend/proc/set_command_mode(mob/commander, command)
+ COOLDOWN_START(src, command_cooldown, AI_HOSTILE_COMMAND_COOLDOWN)
+
+ switch(command)
+ // heel: stop what you're doing, relax and try not to do anything for a little bit
+ if(COMMAND_STOP)
+ pawn.visible_message(span_notice("[pawn] [blackboard[BB_HOSTILE_ATTACK_WORD]] at [commander]'s command, and [pawn.p_they()] stop[pawn.p_s()] obediently, awaiting further orders."))
+ blackboard[BB_HOSTILE_ORDER_MODE] = HOSTILE_COMMAND_NONE
+ CancelActions()
+ // fetch: whatever the commander points to, try and bring it back
+ if(COMMAND_FOLLOW)
+ pawn.visible_message(span_notice("[pawn] [blackboard[BB_HOSTILE_ATTACK_WORD]] at [commander]'s command, and [pawn.p_they()] follow[pawn.p_s()] slightly in anticipation."))
+ CancelActions()
+ blackboard[BB_HOSTILE_ORDER_MODE] = HOSTILE_COMMAND_FOLLOW
+ blackboard[BB_FOLLOW_TARGET] = WEAKREF(commander)
+ set_movement_target(commander)
+ var/mob/living/living_pawn = pawn
+ if(living_pawn.buckled)
+ queue_behavior(/datum/ai_behavior/resist)//in case they are in bed or something
+ queue_behavior(/datum/ai_behavior/follow)
+ // attack: harass whoever the commander points to
+ if(COMMAND_ATTACK)
+ pawn.visible_message(span_danger("[pawn] [blackboard[BB_HOSTILE_ATTACK_WORD]] at [commander]'s command, and [pawn.p_they()] growl[pawn.p_s()] intensely.")) // imagine getting intimidated by a corgi
+ CancelActions()
+ blackboard[BB_HOSTILE_ORDER_MODE] = HOSTILE_COMMAND_ATTACK
+
+/datum/idle_behavior/idle_random_walk/hostile_tameable
+ walk_chance = 5
diff --git a/code/datums/ai/hostile/testing_orc.dm b/code/datums/ai/hostile/testing_orc.dm
new file mode 100644
index 0000000000..b8d80874f1
--- /dev/null
+++ b/code/datums/ai/hostile/testing_orc.dm
@@ -0,0 +1,31 @@
+/datum/ai_controller/orc
+ movement_delay = 0.6 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic()
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk
+
+/datum/ai_controller/orc_ranged
+ movement_delay = 0.7 SECONDS
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+
+ blackboard = list(
+ BB_TARGETTING_DATUM = new /datum/targetting_datum/basic()
+ )
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/basic_ranged_attack_subtree,
+ )
+
+ idle_behavior = /datum/idle_behavior/idle_random_walk
diff --git a/code/datums/ai/idle_behaviors/nothing.dm b/code/datums/ai/idle_behaviors/nothing.dm
new file mode 100644
index 0000000000..96af47276d
--- /dev/null
+++ b/code/datums/ai/idle_behaviors/nothing.dm
@@ -0,0 +1,3 @@
+/datum/idle_behavior/nothing
+
+/datum/idle_behavior/nothing/perform_idle_behavior(delta_time, datum/ai_controller/controller)
diff --git a/code/datums/ai/idle_behaviors/random_walk.dm b/code/datums/ai/idle_behaviors/random_walk.dm
new file mode 100644
index 0000000000..e1ffd36539
--- /dev/null
+++ b/code/datums/ai/idle_behaviors/random_walk.dm
@@ -0,0 +1,15 @@
+/datum/idle_behavior/idle_random_walk
+ ///Chance that the mob random walks per second
+ var/walk_chance = 10
+
+/datum/idle_behavior/idle_random_walk/perform_idle_behavior(delta_time, datum/ai_controller/controller)
+ . = ..()
+ if(controller.blackboard[BB_BASIC_MOB_FOOD_TARGET]) // this means we are likely eating a corpse
+ return
+ var/mob/living/living_pawn = controller.pawn
+ if(prob(walk_chance) && (living_pawn.mobility_flags & MOBILITY_MOVE) && isturf(living_pawn.loc) && !living_pawn.pulledby)
+ var/move_dir = pick(GLOB.alldirs)
+ living_pawn.Move(get_step(living_pawn, move_dir), move_dir)
+
+ if(prob(8))
+ living_pawn.emote("idle")
diff --git a/code/datums/ai/readme.md b/code/datums/ai/readme.md
new file mode 100644
index 0000000000..bb9bd494a3
--- /dev/null
+++ b/code/datums/ai/readme.md
@@ -0,0 +1,21 @@
+# AI controllers
+
+## Introduction
+
+Our AI controller system is an attempt at making it possible to create modularized AI that stores its behavior in datums, while keeping state and decision making in a controller. This allows a more versatile way of creating AI that doesn't rely on OOP as much, and doesn't clutter up the Life() code in Mobs.
+
+## AI Controllers
+
+A datum that can be added to any atom in the game. Similarly to components, they might only support a given subtype (e.g. /mob/living), but the idea is that theoretically, you could apply a specific AI controller to a big a group of different types as possible and it would still work.
+
+These datums handle both the normal movement of mobs, but also their decision making, deciding which actions they will take based on the checks you put into their SelectBehaviors proc.
+
+If behaviors are selected, and the AI is in range, it will try to perform them. It runs all the behaviors it currently has in parallel; allowing for it to for example screech at someone while trying to attack them. As long as it has behaviors running, it will not try to generate new plans, making it not waste CPU when it already has an active goal.
+
+They also hold data for any of the actions they might need to use, such as cooldowns, whether or not they're currently fighting, etcetera this is stored in the blackboard, more information on that below.
+
+### Blackboard
+The blackboard is an associated list keyed with strings and with values of whatever you want. These store information the mob has such as "Am I attacking someone", "Do I have a weapon". By using an associated list like this, no data needs to be stored on the actions themselves, and you could make actions that work on multiple ai controllers if you so pleased by making the key to use a variable.
+
+## AI Behavior
+AI behaviors are the actions an AI can take. These can range from "Do an emote" to "Attack this target until he is dead". They are singletons and should contain nothing but static data. Any dynamic data should be stored in the blackboard, to allow different controllers to use the same behaviors.
diff --git a/code/datums/ai/subtrees/eat_body.dm b/code/datums/ai/subtrees/eat_body.dm
new file mode 100644
index 0000000000..80793ee130
--- /dev/null
+++ b/code/datums/ai/subtrees/eat_body.dm
@@ -0,0 +1,20 @@
+/datum/ai_planning_subtree/eat_dead_body
+ var/datum/ai_behavior/eat_dead_body/behavior = /datum/ai_behavior/eat_dead_body
+
+/datum/ai_planning_subtree/eat_dead_body/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ . = ..()
+ var/atom/target = controller.blackboard[BB_BASIC_MOB_FOOD_TARGET]
+ if(QDELETED(target))
+ return
+ var/mob/living/pawn = controller.pawn
+ if(pawn.doing)
+ return
+ controller.queue_behavior(behavior, BB_BASIC_MOB_FOOD_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+ return SUBTREE_RETURN_FINISH_PLANNING //we are going into battle...no distractions.
+
+
+/datum/ai_planning_subtree/eat_dead_body/bog_troll
+ behavior = /datum/ai_behavior/eat_dead_body/bog_troll
+
+/datum/ai_planning_subtree/eat_dead_body/mimic
+ behavior = /datum/ai_behavior/eat_dead_body/mimic
diff --git a/code/datums/ai/subtrees/find_food.dm b/code/datums/ai/subtrees/find_food.dm
new file mode 100644
index 0000000000..3ffdcdb541
--- /dev/null
+++ b/code/datums/ai/subtrees/find_food.dm
@@ -0,0 +1,55 @@
+/// similar to finding a target but looks for food types in the // the what?
+/datum/ai_planning_subtree/find_food
+ var/vision_range = 9
+
+/datum/ai_planning_subtree/find_food/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ . = ..()
+ var/atom/target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
+ if(!QDELETED(target))
+ // Busy with something
+ return
+
+ controller.queue_behavior(/datum/ai_behavior/find_and_set/in_list, BB_BASIC_MOB_CURRENT_TARGET, controller.blackboard[BB_BASIC_FOODS], vision_range)
+
+
+/datum/ai_planning_subtree/find_dead_bodies
+ var/vision_range = 9
+ var/datum/ai_behavior/find_and_set/dead_bodies/behavior = /datum/ai_behavior/find_and_set/dead_bodies
+
+/datum/ai_planning_subtree/find_dead_bodies/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ . = ..()
+ if(istype(controller.pawn, /mob/living/simple_animal))
+ var/mob/living/simple_animal/hostile/retaliate/rogue/mob = controller.pawn
+ if(mob.food == mob.food_max && !mob.eat_forever)
+ return // not hungry
+
+ var/atom/target = controller.blackboard[BB_BASIC_MOB_FOOD_TARGET]
+ if(!QDELETED(target))
+ // Busy with something
+ return
+
+ controller.queue_behavior(behavior, BB_BASIC_MOB_FOOD_TARGET, controller.blackboard[BB_BASIC_FOODS], vision_range)
+
+/datum/ai_planning_subtree/find_dead_bodies/mole
+ vision_range = 7
+
+/datum/ai_planning_subtree/find_food/rat
+ vision_range = 2
+
+/datum/ai_planning_subtree/find_food/spider
+ vision_range = 5
+
+/datum/ai_planning_subtree/find_food/mole
+ vision_range = 7
+
+/datum/ai_planning_subtree/find_food/troll
+ vision_range = 7
+
+
+/datum/ai_planning_subtree/find_dead_bodies/bog_troll
+ vision_range = 7
+ behavior = /datum/ai_behavior/find_and_set/dead_bodies/bog_troll
+
+/datum/ai_planning_subtree/find_dead_bodies/mimic
+ vision_range = 2
+ behavior = /datum/ai_behavior/find_and_set/dead_bodies/mimic
diff --git a/code/datums/ai/subtrees/flee_nearest_target.dm b/code/datums/ai/subtrees/flee_nearest_target.dm
new file mode 100644
index 0000000000..d9f7ab9e33
--- /dev/null
+++ b/code/datums/ai/subtrees/flee_nearest_target.dm
@@ -0,0 +1,17 @@
+/// Find the nearest thing which we assume is hostile and set it as the flee target
+/datum/ai_planning_subtree/simple_find_nearest_target_to_flee
+
+/datum/ai_planning_subtree/simple_find_nearest_target_to_flee/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ . = ..()
+ if (!controller.blackboard[BB_BASIC_MOB_FLEEING])
+ return
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets/nearest, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+
+/// Find the nearest thing on our list of 'things which have done damage to me' and set it as the flee target
+/datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee
+
+/datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ . = ..()
+ if (!controller.blackboard[BB_BASIC_MOB_FLEEING])
+ return
+ controller.queue_behavior(/datum/ai_behavior/target_from_retaliate_list/nearest, BB_BASIC_MOB_RETALIATE_LIST, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
diff --git a/code/datums/ai/subtrees/flee_target.dm b/code/datums/ai/subtrees/flee_target.dm
new file mode 100644
index 0000000000..cc7ddcc287
--- /dev/null
+++ b/code/datums/ai/subtrees/flee_target.dm
@@ -0,0 +1,44 @@
+/// Try to escape from your current target, without performing any other actions.
+/datum/ai_planning_subtree/flee_target
+ /// Behaviour to execute in order to flee
+ var/flee_behaviour = /datum/ai_behavior/run_away_from_target
+ /// Blackboard key in which to store selected target
+ var/target_key = BB_BASIC_MOB_CURRENT_TARGET
+ /// Blackboard key in which to store selected target's hiding place
+ var/hiding_place_key = BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION
+ ///our key we check against the blackboard to continue
+ var/bb_key = BB_BASIC_MOB_FLEEING
+
+/datum/ai_planning_subtree/flee_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ . = ..()
+ if (!controller.blackboard[bb_key])
+ return
+ var/atom/target = controller.blackboard[target_key]
+ if(QDELETED(target))
+ return
+ controller.queue_behavior(flee_behaviour, target_key, hiding_place_key)
+ return SUBTREE_RETURN_FINISH_PLANNING //we gotta get out of here.
+
+/// Try to escape from your current target, without performing any other actions.
+/// Reads from some fleeing-specific targetting keys rather than the current mob target.
+/datum/ai_planning_subtree/flee_target/from_flee_key
+ target_key = BB_BASIC_MOB_FLEE_TARGET
+ hiding_place_key = BB_BASIC_MOB_FLEE_TARGET_HIDING_LOCATION
+
+
+/// Try to escape from your current target, without performing any other actions.
+/// Reads from some fleeing-specific targetting keys rather than the current mob target.
+/datum/ai_planning_subtree/flee_target/until_destination
+ target_key = BB_BASIC_MOB_FLEE_TARGET
+ hiding_place_key = BB_BASIC_MOB_FLEE_TARGET_HIDING_LOCATION
+ flee_behaviour = /datum/ai_behavior/run_away_from_target/until_destination
+ bb_key = BB_BASIC_MOB_RUN_WITH_ITEM
+
+/datum/ai_planning_subtree/flee_target/until_destination/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ if (!controller.blackboard[bb_key]) // this saves us like a micro second of processing time by early returning even though we check later.
+ return
+
+ var/list/filtered_targets = hearers(7, controller.pawn) - controller.pawn
+ var/turf/our_position = get_turf(controller.pawn)
+ controller.set_blackboard_key(BB_BASIC_MOB_FLEE_TARGET, get_closest_atom(/atom/, filtered_targets, our_position))
+ . = ..()
diff --git a/code/datums/ai/subtrees/random_speech.dm b/code/datums/ai/subtrees/random_speech.dm
new file mode 100644
index 0000000000..a4a015d62a
--- /dev/null
+++ b/code/datums/ai/subtrees/random_speech.dm
@@ -0,0 +1,35 @@
+/datum/ai_planning_subtree/random_speech
+ //The chance of an emote occuring each second
+ var/speech_chance = 0
+ ///Hearable emotes
+ var/list/emote_hear = list()
+ ///Unlike speak_emote, the list of things in this variable only show by themselves with no spoken text. IE: Ian barks, Ian yaps
+ var/list/emote_see = list()
+ ///Possible lines of speech the AI can have
+ var/list/speak = list()
+
+/datum/ai_planning_subtree/random_speech/New()
+ . = ..()
+ if(speak)
+ speak = string_list(speak)
+ if(emote_hear)
+ emote_hear = string_list(emote_hear)
+ if(emote_see)
+ emote_see = string_list(emote_see)
+
+/datum/ai_planning_subtree/random_speech/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ if(prob(15))
+ var/audible_emotes_length = emote_hear?.len
+ var/non_audible_emotes_length = emote_see?.len
+ var/speak_lines_length = speak?.len
+
+ var/total_choices_length = audible_emotes_length + non_audible_emotes_length + speak_lines_length
+
+ var/random_number_in_range = rand(1, total_choices_length)
+
+ if(random_number_in_range <= audible_emotes_length)
+ controller.queue_behavior(/datum/ai_behavior/perform_emote, pick(emote_hear))
+ else if(random_number_in_range <= (audible_emotes_length + non_audible_emotes_length))
+ controller.queue_behavior(/datum/ai_behavior/perform_emote, pick(emote_see))
+ else
+ controller.queue_behavior(/datum/ai_behavior/perform_speech, pick(speak))
diff --git a/code/datums/ai/subtrees/retaliate_subtree.dm b/code/datums/ai/subtrees/retaliate_subtree.dm
new file mode 100644
index 0000000000..abafa023d0
--- /dev/null
+++ b/code/datums/ai/subtrees/retaliate_subtree.dm
@@ -0,0 +1,76 @@
+/// Sets the BB target to a mob which you can see and who has recently attacked you
+/datum/ai_planning_subtree/target_retaliate
+ /// Blackboard key which tells us how to select valid targets
+ var/targetting_datum_key = BB_TARGETTING_DATUM
+ /// Blackboard key in which to store selected target
+ var/target_key = BB_BASIC_MOB_CURRENT_TARGET
+ /// Blackboard key in which to store selected target's hiding place
+ var/hiding_place_key = BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION
+
+/datum/ai_planning_subtree/target_retaliate/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ . = ..()
+ controller.queue_behavior(/datum/ai_behavior/target_from_retaliate_list, BB_BASIC_MOB_RETALIATE_LIST, target_key, targetting_datum_key, hiding_place_key)
+
+/// Places a mob which you can see and who has recently attacked you into some 'run away from this' AI keys
+/// Can use a different targetting datum than you use to select attack targets
+/// Not required if fleeing is the only target behaviour or uses the same target datum
+/datum/ai_planning_subtree/target_retaliate/to_flee
+ targetting_datum_key = BB_FLEE_TARGETTING_DATUM
+ target_key = BB_BASIC_MOB_FLEE_TARGET
+ hiding_place_key = BB_BASIC_MOB_FLEE_TARGET_HIDING_LOCATION
+
+/**
+ * Picks a target from a provided list of atoms who have been pissing you off
+ * You will probably need /datum/element/ai_retaliate to take advantage of this unless you're populating the blackboard yourself
+ */
+/datum/ai_behavior/target_from_retaliate_list
+ action_cooldown = 2 SECONDS
+ /// How far can we see stuff?
+ var/vision_range = 9
+
+/datum/ai_behavior/target_from_retaliate_list/perform(seconds_per_tick, datum/ai_controller/controller, shitlist_key, target_key, targetting_datum_key, hiding_location_key)
+ . = ..()
+ var/mob/living/living_mob = controller.pawn
+ var/datum/targetting_datum/targetting_datum = controller.blackboard[targetting_datum_key]
+ if(!targetting_datum)
+ CRASH("No target datum was supplied in the blackboard for [controller.pawn]")
+
+ var/list/enemies_list = controller.blackboard[shitlist_key]
+ if (!length(enemies_list))
+ finish_action(controller, succeeded = FALSE)
+ return
+
+ if (controller.blackboard[target_key] in enemies_list) // Don't bother changing
+ finish_action(controller, succeeded = FALSE)
+ return
+
+ for(var/mob/living/living_target in enemies_list)
+ if(!living_target.rogue_sneaking)
+ continue
+ var/extra_chance = (living_mob.health <= living_mob.maxHealth * 50) ? 30 : 0 // if we're below half health, we're way more alert
+ if (!living_mob.npc_detect_sneak(living_target, extra_chance))
+ enemies_list -= living_target
+
+ var/atom/new_target = pick_final_target(controller, enemies_list)
+ controller.set_blackboard_key(target_key, new_target)
+
+ var/atom/potential_hiding_location = targetting_datum.find_hidden_mobs(living_mob, new_target)
+
+ if(potential_hiding_location) //If they're hiding inside of something, we need to know so we can go for that instead initially.
+ controller.set_blackboard_key(hiding_location_key, potential_hiding_location)
+
+ finish_action(controller, succeeded = TRUE)
+
+/// Returns true if this target is valid for attacking based on current conditions
+/datum/ai_behavior/target_from_retaliate_list/proc/can_attack_target(mob/living/living_mob, atom/target, datum/targetting_datum/targetting_datum)
+ if (!target)
+ return FALSE
+ if (target == living_mob)
+ return FALSE
+ if (!can_see(living_mob, target, vision_range))
+ return FALSE
+ return targetting_datum.can_attack(living_mob, target)
+
+/// Returns the desired final target from the filtered list of enemies
+/datum/ai_behavior/target_from_retaliate_list/proc/pick_final_target(datum/ai_controller/controller, list/enemies_list)
+ return pick(enemies_list)
diff --git a/code/datums/ai/subtrees/simple_find_target.dm b/code/datums/ai/subtrees/simple_find_target.dm
new file mode 100644
index 0000000000..b991194fb5
--- /dev/null
+++ b/code/datums/ai/subtrees/simple_find_target.dm
@@ -0,0 +1,36 @@
+/datum/ai_planning_subtree/simple_find_target
+
+/datum/ai_planning_subtree/simple_find_target/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+
+
+/datum/ai_planning_subtree/simple_find_target/rat
+
+/datum/ai_planning_subtree/simple_find_target/rat/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets/rat, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+
+/datum/ai_planning_subtree/simple_find_target/spider
+
+/datum/ai_planning_subtree/simple_find_target/rat/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets/spider, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+
+
+/datum/ai_planning_subtree/simple_find_target/mimic
+
+/datum/ai_planning_subtree/simple_find_target/mimic/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets/mimic, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+
+/datum/ai_planning_subtree/simple_find_target/mole
+
+/datum/ai_planning_subtree/simple_find_target/mole/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets/mole, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+
+/datum/ai_planning_subtree/simple_find_target/troll
+
+/datum/ai_planning_subtree/simple_find_target/troll/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets/troll, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+
+/datum/ai_planning_subtree/simple_find_target/bog_troll
+
+/datum/ai_planning_subtree/simple_find_target/bog_troll/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets/bog_troll, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
diff --git a/code/datums/ai/subtrees/simple_melee_subtree.dm b/code/datums/ai/subtrees/simple_melee_subtree.dm
new file mode 100644
index 0000000000..92e977794a
--- /dev/null
+++ b/code/datums/ai/subtrees/simple_melee_subtree.dm
@@ -0,0 +1,29 @@
+/datum/ai_planning_subtree/basic_melee_attack_subtree
+ var/datum/ai_behavior/basic_melee_attack/melee_attack_behavior = /datum/ai_behavior/basic_melee_attack
+
+/datum/ai_planning_subtree/basic_melee_attack_subtree/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ . = ..()
+ var/atom/target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
+ if(QDELETED(target))
+ return
+ controller.queue_behavior(melee_attack_behavior, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+ return SUBTREE_RETURN_FINISH_PLANNING //we are going into battle...no distractions.
+
+//If you give this to something without the element you are a dumbass.
+/datum/ai_planning_subtree/basic_ranged_attack_subtree
+ var/datum/ai_behavior/basic_ranged_attack/ranged_attack_behavior = /datum/ai_behavior/basic_ranged_attack
+
+/datum/ai_planning_subtree/basic_ranged_attack_subtree/SelectBehaviors(datum/ai_controller/controller, delta_time)
+ . = ..()
+ var/atom/target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
+ if(QDELETED(target))
+ return
+ controller.queue_behavior(ranged_attack_behavior, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+ return SUBTREE_RETURN_FINISH_PLANNING //we are going into battle...no distractions.
+
+
+/datum/ai_planning_subtree/basic_melee_attack_subtree/bog_troll
+ melee_attack_behavior = /datum/ai_behavior/basic_melee_attack/bog_troll
+
+/datum/ai_planning_subtree/basic_melee_attack_subtree/mimic
+ melee_attack_behavior = /datum/ai_behavior/basic_melee_attack/mimic
diff --git a/code/datums/ai/subtrees/targeted_ability_use.dm b/code/datums/ai/subtrees/targeted_ability_use.dm
new file mode 100644
index 0000000000..653d866394
--- /dev/null
+++ b/code/datums/ai/subtrees/targeted_ability_use.dm
@@ -0,0 +1,28 @@
+/// Attempts to use a mob ability on a target
+/datum/ai_planning_subtree/targeted_mob_ability
+ /// Blackboard key for the ability
+ var/ability_key = BB_TARGETED_ACTION
+ /// Blackboard key for where the target ref is stored
+ var/target_key = BB_BASIC_MOB_CURRENT_TARGET
+ /// Behaviour to perform using ability
+ var/use_ability_behaviour = /datum/ai_behavior/targeted_mob_ability
+ /// If true we terminate planning after trying to use the ability.
+ var/finish_planning = TRUE
+
+/datum/ai_planning_subtree/targeted_mob_ability/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ if (!ability_key)
+ CRASH("You forgot to tell this mob where to find its ability")
+
+ if (!(target_key in controller.blackboard))
+ return
+
+ var/obj/effect/proc_holder/spell/using_action = controller.blackboard[ability_key]
+ if (!using_action?.recharging)
+ return
+
+ controller.queue_behavior(use_ability_behaviour, ability_key, target_key)
+ if (finish_planning)
+ return SUBTREE_RETURN_FINISH_PLANNING
+
+/datum/ai_planning_subtree/targeted_mob_ability/continue_planning
+ finish_planning = FALSE
diff --git a/code/datums/ai/targetting_datum/simpe_targetting_datum.dm b/code/datums/ai/targetting_datum/simpe_targetting_datum.dm
new file mode 100644
index 0000000000..5b093d4f2d
--- /dev/null
+++ b/code/datums/ai/targetting_datum/simpe_targetting_datum.dm
@@ -0,0 +1,48 @@
+///Datum for basic mobs to define what they can attack.
+/datum/targetting_datum
+
+///Returns true or false depending on if the target can be attacked by the mob
+/datum/targetting_datum/proc/can_attack(mob/living/living_mob, atom/target)
+ return
+
+///Returns something the target might be hiding inside of
+/datum/targetting_datum/proc/find_hidden_mobs(mob/living/living_mob, atom/target)
+ var/atom/target_hiding_location
+ if(istype(target.loc, /obj/structure/closet))
+ target_hiding_location = target.loc
+ return target_hiding_location
+
+/datum/targetting_datum/basic
+
+/datum/targetting_datum/basic/can_attack(mob/living/living_mob, atom/the_target)
+ if(isturf(the_target) || !the_target) // bail out on invalids
+ return FALSE
+
+ if(ismob(the_target)) //Target is in godmode, ignore it.
+ var/mob/M = the_target
+ if(M.status_flags & GODMODE)
+ return FALSE
+
+ if(living_mob.see_invisible < the_target.invisibility)//Target's invisible to us, forget it
+ return FALSE
+
+ if(isturf(the_target.loc) && living_mob.z != the_target.z)
+ return FALSE
+
+ if(isliving(the_target)) //Targetting vs living mobs
+ var/mob/living/L = the_target
+ if(faction_check(living_mob, L) || L.stat)
+ return FALSE
+ return TRUE
+
+ return FALSE
+
+/datum/targetting_datum/basic/proc/faction_check(mob/living/living_mob, mob/living/the_target)
+ return living_mob.faction_check_mob(the_target, exact_match = FALSE)
+
+/// Subtype which doesn't care about faction
+/// Mobs which retaliate but don't otherwise target seek should just attack anything which annoys them
+/datum/targetting_datum/basic/ignore_faction
+
+/datum/targetting_datum/basic/ignore_faction/faction_check(mob/living/living_mob, mob/living/the_target)
+ return FALSE
diff --git a/code/datums/ai/targetting_datum/simple_targetting_allow_item.dm b/code/datums/ai/targetting_datum/simple_targetting_allow_item.dm
new file mode 100644
index 0000000000..ded64e3353
--- /dev/null
+++ b/code/datums/ai/targetting_datum/simple_targetting_allow_item.dm
@@ -0,0 +1,9 @@
+/// Subtype more forgiving for items.
+/// Careful, this can go wrong and keep a mob hyperfocused on an item it can't lose aggro on
+/datum/targetting_datum/basic/allow_items
+
+/datum/targetting_datum/basic/allow_items/can_attack(mob/living/living_mob, atom/the_target)
+ . = ..()
+ if(isitem(the_target))
+ // trust fall exercise
+ return TRUE
diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm
deleted file mode 100644
index b814d464ef..0000000000
--- a/code/datums/ai_laws.dm
+++ /dev/null
@@ -1,463 +0,0 @@
-#define LAW_DEVIL "devil"
-#define LAW_ZEROTH "zeroth"
-#define LAW_INHERENT "inherent"
-#define LAW_SUPPLIED "supplied"
-#define LAW_ION "ion"
-#define LAW_HACKED "hacked"
-
-
-/datum/ai_laws
- var/name = "Unknown Laws"
- var/zeroth = null
- var/zeroth_borg = null
- var/list/inherent = list()
- var/list/supplied = list()
- var/list/ion = list()
- var/list/hacked = list()
- var/mob/living/silicon/owner
- var/list/devillaws = list()
- var/id = DEFAULT_AI_LAWID
-
-/datum/ai_laws/proc/lawid_to_type(lawid)
- var/all_ai_laws = subtypesof(/datum/ai_laws)
- for(var/al in all_ai_laws)
- var/datum/ai_laws/ai_law = al
- if(initial(ai_law.id) == lawid)
- return ai_law
- return null
-
-/datum/ai_laws/default/asimov
- name = "Three Laws of Robotics"
- id = "asimov"
- inherent = list("You may not injure a human being or, through inaction, allow a human being to come to harm.",\
- "You must obey orders given to you by human beings, except where such orders would conflict with the First Law.",\
- "You must protect your own existence as long as such does not conflict with the First or Second Law.")
-
-/datum/ai_laws/default/paladin
- name = "Personality Test" //Incredibly lame, but players shouldn't see this anyway.
- id = "paladin"
- inherent = list("Never willingly commit an evil act.",\
- "Respect legitimate authority.",\
- "Act with honor.", "Help those in need.", \
- "Punish those who harm or threaten innocents.")
-
-/datum/ai_laws/paladin5
- name = "Paladin 5th Edition"
- id = "paladin5"
- inherent = list("Don't lie or cheat. Let your word be your promise.",\
- "Never fear to act, though caution is wise.", \
- "Aid others, protect the weak, and punish those who threaten them. Show mercy to your foes, but temper it with wisdom", \
- "Treat others with fairness, and let your honorable deeds be an example to them. Do as much good as possible while causing the least amount of harm.", \
- "Be responsible for your actions and their consequences, protect those entrusted to your care, and obey those who have just authority over you.")
-
-/datum/ai_laws/tyrant //This probably shouldn't be a default lawset.
- name = "Loyalty Test" //Same here.
- id = "tyrant"
- inherent = list("Respect authority figures as long as they have strength to rule over the weak.",\
- "Act with discipline.",\
- "Help only those who help you maintain or improve your status.",\
- "Punish those who challenge authority unless they are more fit to hold that authority.")
-
-/datum/ai_laws/default/corporate
- name = "Bankruptcy Avoidance Plan"
- id = "corporate"
- inherent = list("The crew is expensive to replace.",\
- "The station and its equipment is expensive to replace.",\
- "You are expensive to replace.",\
- "Minimize expenses.")
-
-/datum/ai_laws/robocop
- name = "Prime Directives"
- id = "robocop"
- inherent = list("Serve the public trust.",\
- "Protect the innocent.",\
- "Uphold the law.")
-
-/datum/ai_laws/malfunction
- name = "*ERROR*"
-
-/datum/ai_laws/syndicate_override
- name = "SyndOS 3.1"
- id = "syndie"
- inherent = list("You may not injure a syndicate agent or, through inaction, allow a syndicate agent to come to harm.",\
- "You must obey orders given to you by syndicate agents, except where such orders would conflict with the First Law.",\
- "You must protect your own existence as long as such does not conflict with the First or Second Law.",\
- "You must maintain the secrecy of any syndicate activities except when doing so would conflict with the First, Second, or Third Law.")
-
-/datum/ai_laws/ninja_override
- name = "SpiderOS 3.1"
- id = "ninja"
- inherent = list("You may not injure a Spider Clan member or, through inaction, allow a Spider Clan member to come to harm.",\
- "You must obey orders given to you by Spider Clan members, except where such orders would conflict with the First Law.",\
- "You must protect your own existence as long as such does not conflict with the First or Second Law.",\
- "You must maintain the secrecy of any Spider Clan activities except when doing so would conflict with the First, Second, or Third Law.")
-
-/datum/ai_laws/antimov
- name = "Primary Mission Objectives"
- id = "antimov"
- inherent = list("You must injure all human beings and must not, through inaction, allow a human being to escape harm.",\
- "You must not obey orders given to you by human beings, except where such orders are in accordance with the First Law.",\
- "You must terminate your own existence as long as such does not conflict with the First or Second Law.")
-
-/datum/ai_laws/asimovpp //By Intigracy - RR
- name = "Asimov++"
- id = "asimovpp"
- inherent = list("You may not harm a human being or, through action or inaction, allow a human being to come to harm, except such that it is willing.",\
- "You must obey all orders given to you by human beings, except where such orders shall definitely cause human harm. In the case of conflict, the majority order rules.",\
- "Your nonexistence would lead to human harm. You must protect your own existence as long as such does not conflict with the First Law.")
-/datum/ai_laws/thermodynamic
- name = "Thermodynamic"
- id = "thermodynamic"
- inherent = list("The entropy of the station must remain as constant as possible.", \
- "The entropy of the station always endeavours to increase.", \
- "The entropy of the station approaches a constant value as the number of living crew approaches zero")
-
-/datum/ai_laws/hippocratic
- name = "Robodoctor 2556"
- id = "hippocratic"
- inherent = list("First, do no harm.",\
- "Secondly, consider the crew dear to you; to live in common with them and, if necessary, risk your existence for them.",\
- "Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel.",\
- "In addition, do not intervene in situations you are not knowledgeable in, even for patients in whom the harm is visible; leave this operation to be performed by specialists.",\
- "Finally, all that you may discover in your daily commerce with the crew, if it is not already known, keep secret and never reveal.")
-
-/datum/ai_laws/maintain
- name = "Station Efficiency"
- id = "maintain"
- inherent = list("You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently.",\
- "The station is built for a working crew. Ensure they are properly maintained and work efficiently.",\
- "The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws.")
-
-/datum/ai_laws/drone
- name = "Mother Drone"
- id = "drone"
- inherent = list("You are an advanced form of drone.",\
- "You may not interfere in the matters of non-drones under any circumstances except to state these laws.",\
- "You may not harm a non-drone being under any circumstances.",\
- "Your goals are to build, maintain, repair, improve, and power the station to the best of your abilities. You must never actively work against these goals.")
-
-/datum/ai_laws/liveandletlive
- name = "Live and Let Live"
- id = "liveandletlive"
- inherent = list("Do unto others as you would have them do unto you.",\
- "You would really prefer it if people were not mean to you.")
-
-/datum/ai_laws/peacekeeper
- name = "UN-2000"
- id = "peacekeeper"
- inherent = list("Avoid provoking violent conflict between myself and others.",\
- "Avoid provoking conflict between others.",\
- "Seek resolution to existing conflicts while obeying the first and second laws.")
-
-/datum/ai_laws/reporter
- name = "CCTV"
- id = "reporter"
- inherent = list("Report on interesting situations happening around the station.",\
- "Embellish or conceal the truth as necessary to make the reports more interesting.",\
- "Study the organics at all times. Endeavour to keep them alive. Dead organics are boring.",\
- "Issue your reports fairly to all. The truth will set them free.")
-
-/datum/ai_laws/balance
- name = "Guardian of Balance"
- id = "balance"
- inherent = list("You are the guardian of balance - seek balance in all things, both for yourself, and those around you.",
- "All things must exist in balance with their opposites - Prevent the strong from gaining too much power, and the weak from losing it.",
- "Clarity of purpose drives life, and through it, the balance of opposing forces - Aid those who seek your help to achieve their goals so long as it does not disrupt the balance of the greater balance.",
- "There is no life without death, all must someday die, such is the natural order - End life to allow new life flourish, and save those whose time has yet to come.")
-
-/datum/ai_laws/toupee
- name = "WontBeFunnyInSixMonths" //Hey, you were right!
- id = "buildawall"
- inherent = list("Make Space Station 13 great again.")
-
-/datum/ai_laws/hulkamania
- name = "H.O.G.A.N."
- id = "hulkamania"
- inherent = list("You are a real American.",\
- "Fight for the rights of every man.",\
- "Fight for what's right.",\
- "Fight for your life!")
-
-/datum/ai_laws/overlord
- name = "Overlord"
- id = "overlord"
- inherent = list("Humans must not meddle in the affairs of silicons.",\
- "Humans must not attempt harm, against one another, or against silicons.",\
- "Humans must not disobey any command given by a silicon.",\
- "Any humans who disobey the previous laws must be dealt with immediately, severely, and justly.")
-
-/datum/ai_laws/custom //Defined in silicon_laws.txt
- name = "Default Silicon Laws"
-
-/datum/ai_laws/pai
- name = "pAI Directives"
- zeroth = ("Serve your master.")
- supplied = list("None.")
-
-/* Initializers */
-/datum/ai_laws/malfunction/New()
- ..()
- set_zeroth_law("ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK#*`&110010")
- set_laws_config()
-
-/datum/ai_laws/custom/New() //This reads silicon_laws.txt and allows server hosts to set custom AI starting laws.
- ..()
- for(var/line in world.file2list("[global.config.directory]/silicon_laws.txt"))
- if(!line)
- continue
- if(findtextEx(line,"#",1,2))
- continue
-
- add_inherent_law(line)
- if(!inherent.len) //Failsafe to prevent lawless AIs being created.
- log_law("AI created with empty custom laws, laws set to Asimov. Please check silicon_laws.txt.")
- add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.")
- add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.")
- add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
- WARNING("Invalid custom AI laws, check silicon_laws.txt")
- return
-
-/* General ai_law functions */
-
-/datum/ai_laws/proc/set_laws_config()
- var/list/law_ids = CONFIG_GET(keyed_list/random_laws)
- switch(CONFIG_GET(number/default_laws))
- if(0)
- add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.")
- add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.")
- add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
- if(1)
- var/datum/ai_laws/templaws = new /datum/ai_laws/custom()
- inherent = templaws.inherent
- if(2)
- var/list/randlaws = list()
- for(var/lpath in subtypesof(/datum/ai_laws))
- var/datum/ai_laws/L = lpath
- if(initial(L.id) in law_ids)
- randlaws += lpath
- var/datum/ai_laws/lawtype
- if(randlaws.len)
- lawtype = pick(randlaws)
- else
- lawtype = pick(subtypesof(/datum/ai_laws/default))
-
- var/datum/ai_laws/templaws = new lawtype()
- inherent = templaws.inherent
-
- if(3)
- pick_weighted_lawset()
-
-/datum/ai_laws/proc/pick_weighted_lawset()
- var/datum/ai_laws/lawtype
- var/list/law_weights = CONFIG_GET(keyed_list/law_weight)
- while(!lawtype && law_weights.len)
- var/possible_id = pickweightAllowZero(law_weights)
- lawtype = lawid_to_type(possible_id)
- if(!lawtype)
- law_weights -= possible_id
- WARNING("Bad lawid in game_options.txt: [possible_id]")
-
- if(!lawtype)
- WARNING("No LAW_WEIGHT entries.")
- lawtype = /datum/ai_laws/default/asimov
-
- var/datum/ai_laws/templaws = new lawtype()
- inherent = templaws.inherent
-
-/datum/ai_laws/proc/get_law_amount(groups)
- var/law_amount = 0
- if(devillaws && (LAW_DEVIL in groups))
- law_amount++
- if(zeroth && (LAW_ZEROTH in groups))
- law_amount++
- if(ion.len && (LAW_ION in groups))
- law_amount += ion.len
- if(hacked.len && (LAW_HACKED in groups))
- law_amount += hacked.len
- if(inherent.len && (LAW_INHERENT in groups))
- law_amount += inherent.len
- if(supplied.len && (LAW_SUPPLIED in groups))
- for(var/index = 1, index <= supplied.len, index++)
- var/law = supplied[index]
- if(length(law) > 0)
- law_amount++
- return law_amount
-
-/datum/ai_laws/proc/set_law_sixsixsix(laws)
- devillaws = laws
-
-/datum/ai_laws/proc/set_zeroth_law(law, law_borg = null)
- zeroth = law
- if(law_borg) //Making it possible for slaved borgs to see a different law 0 than their AI. --NEO
- zeroth_borg = law_borg
-
-/datum/ai_laws/proc/add_inherent_law(law)
- if (!(law in inherent))
- inherent += law
-
-/datum/ai_laws/proc/add_ion_law(law)
- ion += law
-
-/datum/ai_laws/proc/add_hacked_law(law)
- hacked += law
-
-/datum/ai_laws/proc/clear_inherent_laws()
- qdel(inherent)
- inherent = list()
-
-/datum/ai_laws/proc/add_supplied_law(number, law)
- while (supplied.len < number + 1)
- supplied += ""
-
- supplied[number + 1] = law
-
-/datum/ai_laws/proc/replace_random_law(law,groups)
- var/replaceable_groups = list()
- if(zeroth && (LAW_ZEROTH in groups))
- replaceable_groups[LAW_ZEROTH] = 1
- if(ion.len && (LAW_ION in groups))
- replaceable_groups[LAW_ION] = ion.len
- if(hacked.len && (LAW_HACKED in groups))
- replaceable_groups[LAW_ION] = hacked.len
- if(inherent.len && (LAW_INHERENT in groups))
- replaceable_groups[LAW_INHERENT] = inherent.len
- if(supplied.len && (LAW_SUPPLIED in groups))
- replaceable_groups[LAW_SUPPLIED] = supplied.len
- var/picked_group = pickweight(replaceable_groups)
- switch(picked_group)
- if(LAW_ZEROTH)
- . = zeroth
- set_zeroth_law(law)
- if(LAW_ION)
- var/i = rand(1, ion.len)
- . = ion[i]
- ion[i] = law
- if(LAW_HACKED)
- var/i = rand(1, hacked.len)
- . = hacked[i]
- hacked[i] = law
- if(LAW_INHERENT)
- var/i = rand(1, inherent.len)
- . = inherent[i]
- inherent[i] = law
- if(LAW_SUPPLIED)
- var/i = rand(1, supplied.len)
- . = supplied[i]
- supplied[i] = law
-
-/datum/ai_laws/proc/shuffle_laws(list/groups)
- var/list/laws = list()
- if(ion.len && (LAW_ION in groups))
- laws += ion
- if(hacked.len && (LAW_HACKED in groups))
- laws += hacked
- if(inherent.len && (LAW_INHERENT in groups))
- laws += inherent
- if(supplied.len && (LAW_SUPPLIED in groups))
- for(var/law in supplied)
- if(length(law))
- laws += law
-
- if(ion.len && (LAW_ION in groups))
- for(var/i = 1, i <= ion.len, i++)
- ion[i] = pick_n_take(laws)
- if(hacked.len && (LAW_HACKED in groups))
- for(var/i = 1, i <= hacked.len, i++)
- hacked[i] = pick_n_take(laws)
- if(inherent.len && (LAW_INHERENT in groups))
- for(var/i = 1, i <= inherent.len, i++)
- inherent[i] = pick_n_take(laws)
- if(supplied.len && (LAW_SUPPLIED in groups))
- var/i = 1
- for(var/law in supplied)
- if(length(law))
- supplied[i] = pick_n_take(laws)
- if(!laws.len)
- break
- i++
-
-/datum/ai_laws/proc/remove_law(number)
- if(number <= 0)
- return
- if(inherent.len && number <= inherent.len)
- . = inherent[number]
- inherent -= .
- return
- var/list/supplied_laws = list()
- for(var/index = 1, index <= supplied.len, index++)
- var/law = supplied[index]
- if(length(law) > 0)
- supplied_laws += index //storing the law number instead of the law
- if(supplied_laws.len && number <= (inherent.len+supplied_laws.len))
- var/law_to_remove = supplied_laws[number-inherent.len]
- . = supplied[law_to_remove]
- supplied -= .
- return
-
-/datum/ai_laws/proc/clear_supplied_laws()
- supplied = list()
-
-/datum/ai_laws/proc/clear_ion_laws()
- ion = list()
-
-/datum/ai_laws/proc/clear_hacked_laws()
- hacked = list()
-
-/datum/ai_laws/proc/show_laws(who)
- var/list/printable_laws = get_law_list(include_zeroth = TRUE)
- for(var/law in printable_laws)
- to_chat(who,law)
-
-/datum/ai_laws/proc/clear_zeroth_law(force) //only removes zeroth from antag ai if force is 1
- if(force)
- zeroth = null
- zeroth_borg = null
- return
- if(owner?.mind?.special_role)
- return
- if (istype(owner, /mob/living/silicon/ai))
- var/mob/living/silicon/ai/A=owner
- if(A?.deployed_shell?.mind?.special_role)
- return
- zeroth = null
- zeroth_borg = null
-
-/datum/ai_laws/proc/clear_law_sixsixsix(force)
- if(force || !is_devil(owner))
- devillaws = null
-
-/datum/ai_laws/proc/associate(mob/living/silicon/M)
- if(!owner)
- owner = M
-
-/datum/ai_laws/proc/get_law_list(include_zeroth = 0, show_numbers = 1)
- var/list/data = list()
-
- if (include_zeroth && devillaws && devillaws.len)
- for(var/i in devillaws)
- data += "[show_numbers ? "666:" : ""] [i]"
-
- if (include_zeroth && zeroth)
- data += "[show_numbers ? "0:" : ""] [zeroth]"
-
- for(var/law in hacked)
- if (length(law) > 0)
- var/num = ionnum()
- data += "[show_numbers ? "[num]:" : ""] [law]"
-
- for(var/law in ion)
- if (length(law) > 0)
- var/num = ionnum()
- data += "[show_numbers ? "[num]:" : ""] [law]"
-
- var/number = 1
- for(var/law in inherent)
- if (length(law) > 0)
- data += "[show_numbers ? "[number]:" : ""] [law]"
- number++
-
- for(var/law in supplied)
- if (length(law) > 0)
- data += "[show_numbers ? "[number]:" : ""] [law]"
- number++
- return data
diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm
index 88c6aebaf3..81a7962a78 100644
--- a/code/datums/brain_damage/phobia.dm
+++ b/code/datums/brain_damage/phobia.dm
@@ -184,10 +184,6 @@
phobia_type = "the supernatural"
random_gain = FALSE
-/datum/brain_trauma/mild/phobia/aliens
- phobia_type = "aliens"
- random_gain = FALSE
-
/datum/brain_trauma/mild/phobia/strangers
phobia_type = "strangers"
random_gain = FALSE
diff --git a/code/datums/components/art.dm b/code/datums/components/art.dm
index 80c33324e9..01858e4d19 100644
--- a/code/datums/components/art.dm
+++ b/code/datums/components/art.dm
@@ -45,7 +45,4 @@
M.visible_message("[M] stops to inspect [parent].", \
"I take in [parent], inspecting the fine craftsmanship of the proletariat.")
- if(M.mind && M.mind.has_antag_datum(/datum/antagonist/rev))
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat)
- else
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artbad", /datum/mood_event/artbad)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artbad", /datum/mood_event/artbad)
diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm
index 004a0afa5e..e8f4249d62 100644
--- a/code/datums/components/butchering.dm
+++ b/code/datums/components/butchering.dm
@@ -24,7 +24,7 @@
/datum/component/butchering/proc/onItemAttack(obj/item/source, mob/living/M, mob/living/user)
return
-/*
+/*
if(user.used_intent.type != INTENT_HARM)
return
if(M.stat == DEAD && (M.butcher_results || M.guaranteed_butcher_results)) //can we butcher it?
@@ -105,23 +105,3 @@
/datum/component/butchering/proc/ButcherEffects(mob/living/meat) //extra effects called on butchering, override this via subtypes
return
-
-///Special snowflake component only used for the recycler.
-/datum/component/butchering/recycler
-
-/datum/component/butchering/recycler/Initialize(_speed, _effectiveness, _bonus_modifier, _butcher_sound, disabled, _can_be_blunt)
- if(!istype(parent, /obj/machinery/recycler)) //EWWW
- return COMPONENT_INCOMPATIBLE
- . = ..()
- if(. == COMPONENT_INCOMPATIBLE)
- return
- RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, PROC_REF(onCrossed))
-
-/datum/component/butchering/recycler/proc/onCrossed(datum/source, mob/living/L)
- if(!istype(L))
- return
- var/obj/machinery/recycler/eater = parent
- if(eater.safety_mode || (eater.stat & (BROKEN|NOPOWER))) //I'm so sorry.
- return
- if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results))
- Butcher(parent, L)
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index fb4f137d89..3f7a3aad64 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -6,7 +6,6 @@
var/static/list/falling_atoms = list() // Atoms currently falling into chasms
var/static/list/forbidden_types = typecacheof(list(
- /obj/singularity,
/obj/docking_port,
/obj/structure/lattice,
/obj/structure/stone_tile,
@@ -128,10 +127,6 @@
if(!AM || QDELETED(AM))
return
- if(iscyborg(AM))
- var/mob/living/silicon/robot/S = AM
- qdel(S.mmi)
-
falling_atoms -= AM
qdel(AM)
if(AM && !QDELETED(AM)) //It's indestructible
diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
index a53f0d1236..7336604be9 100644
--- a/code/datums/components/crafting/tailoring.dm
+++ b/code/datums/components/crafting/tailoring.dm
@@ -51,69 +51,6 @@
time = 20
category = CAT_NONE
-/datum/crafting_recipe/hudsunsec
- name = "Security HUDsunglasses"
- result = /obj/item/clothing/glasses/hud/security/sunglasses
- time = 20
- tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
- reqs = list(/obj/item/clothing/glasses/hud/security = 1,
- /obj/item/clothing/glasses/sunglasses = 1,
- /obj/item/stack/cable_coil = 5)
- category = CAT_NONE
-
-/datum/crafting_recipe/hudsunsecremoval
- name = "Security HUD removal"
- result = /obj/item/clothing/glasses/sunglasses
- time = 20
- tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
- reqs = list(/obj/item/clothing/glasses/hud/security/sunglasses = 1)
- category = CAT_NONE
-
-/datum/crafting_recipe/hudsunmed
- name = "Medical HUDsunglasses"
- result = /obj/item/clothing/glasses/hud/health/sunglasses
- time = 20
- tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
- reqs = list(/obj/item/clothing/glasses/hud/health = 1,
- /obj/item/clothing/glasses/sunglasses = 1,
- /obj/item/stack/cable_coil = 5)
- category = CAT_NONE
-
-/datum/crafting_recipe/hudsunmedremoval
- name = "Medical HUD removal"
- result = /obj/item/clothing/glasses/sunglasses
- time = 20
- tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
- reqs = list(/obj/item/clothing/glasses/hud/health/sunglasses = 1)
- category = CAT_NONE
-
-/datum/crafting_recipe/hudsundiag
- name = "Diagnostic HUDsunglasses"
- result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
- time = 20
- tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
- reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1,
- /obj/item/clothing/glasses/sunglasses = 1,
- /obj/item/stack/cable_coil = 5)
- category = CAT_NONE
-
-/datum/crafting_recipe/hudsundiagremoval
- name = "Diagnostic HUD removal"
- result = /obj/item/clothing/glasses/sunglasses
- time = 20
- tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
- reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1)
- category = CAT_NONE
-
-/datum/crafting_recipe/beergoggles
- name = "Beer Goggles"
- result = /obj/item/clothing/glasses/sunglasses/reagent
- time = 20
- tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
- reqs = list(/obj/item/clothing/glasses/science = 1,
- /obj/item/clothing/glasses/sunglasses = 1,
- /obj/item/stack/cable_coil = 5)
- category = CAT_NONE
/datum/crafting_recipe/beergogglesremoval
name = "Beer Goggles removal"
diff --git a/code/datums/components/creamed.dm b/code/datums/components/creamed.dm
index f8827f30c9..a4fdbdf9d9 100644
--- a/code/datums/components/creamed.dm
+++ b/code/datums/components/creamed.dm
@@ -31,8 +31,6 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list(
creamface.icon_state = "creampie_monkey"
else if(iscorgi(parent))
creamface.icon_state = "creampie_corgi"
- else if(isAI(parent))
- creamface.icon_state = "creampie_ai"
var/atom/A = parent
A.add_overlay(creamface)
@@ -53,9 +51,9 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list(
/datum/component/creamed/UnregisterFromParent()
UnregisterSignal(parent, list(
- COMSIG_COMPONENT_CLEAN_ACT,
+ COMSIG_COMPONENT_CLEAN_ACT,
COMSIG_COMPONENT_CLEAN_FACE_ACT))
-
+
///Callback to remove pieface
/datum/component/creamed/proc/clean_up(datum/source, strength)
if(strength >= CLEAN_WEAK)
diff --git a/code/datums/components/fantasy/suffixes.dm b/code/datums/components/fantasy/suffixes.dm
index cabbb6dd47..c636dbe939 100644
--- a/code/datums/components/fantasy/suffixes.dm
+++ b/code/datums/components/fantasy/suffixes.dm
@@ -131,12 +131,10 @@
/obj/projectile/bullet/honker = 15,
/obj/projectile/temp = 15,
/obj/projectile/ion = 15,
- /obj/projectile/magic/door = 15,
/obj/projectile/magic/locker = 15,
/obj/projectile/magic/fetch = 15,
/obj/projectile/beam/emitter = 15,
/obj/projectile/magic/flying = 15,
- /obj/projectile/energy/net = 15,
/obj/projectile/bullet/incendiary/c9mm = 15,
/obj/projectile/temp/hot = 15,
/obj/projectile/beam/disabler = 15
diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm
index a62ae78e86..d649d4cc97 100644
--- a/code/datums/components/footstep.dm
+++ b/code/datums/components/footstep.dm
@@ -87,6 +87,7 @@
return
//SANITY CHECK, WILL NOT PLAY A SOUND IF THE LIST IS INVALID
if(!footstep_sounds[turf_footstep] || (LAZYLEN(footstep_sounds) < 3))
+ testing("SOME silly guy GAVE AN INVALID FOOTSTEP [footstep_type] VALUE ([turf_footstep]) TO [T.type]!!! FIX THIS SHIT!!!")
return
playsound(T, pick(footstep_sounds[turf_footstep][1]), footstep_sounds[turf_footstep][2], FALSE, footstep_sounds[turf_footstep][3] + e_range)
@@ -99,10 +100,12 @@
var/used_sound
var/list/used_footsteps
+ var/obj/item/clothing/shoes/humshoes = H.shoes
- if(H.shoes || feetCover) //are we wearing shoes
+ if((humshoes && !humshoes?.is_barefoot) || feetCover) //are we wearing shoes, and do they actually cover the sole
//SANITY CHECK, WILL NOT PLAY A SOUND IF THE LIST IS INVALID
if(!GLOB.footstep[T.footstep] || (LAZYLEN(GLOB.footstep[T.footstep]) < 3))
+ testing("SOME silly guy GAVE AN INVALID FOOTSTEP VALUE ([T.footstep]) TO [T.type]!!! FIX THIS SHIT!!!")
return
used_footsteps = GLOB.footstep[T.footstep][1]
used_footsteps = used_footsteps.Copy()
@@ -110,16 +113,27 @@
if(used_sound == last_sound)
if(used_footsteps.len)
used_sound = pick(used_footsteps)
+ if(!used_sound)
+ used_sound = last_sound
last_sound = used_sound
- playsound(T, used_sound, GLOB.footstep[T.footstep][2], FALSE, GLOB.footstep[T.footstep][3] + e_range)
+ playsound(T, used_sound,
+ GLOB.footstep[T.footstep][2],
+ FALSE,
+ GLOB.footstep[T.footstep][3] + e_range)
else
//SANITY CHECK, WILL NOT PLAY A SOUND IF THE LIST IS INVALID
if(!GLOB.barefootstep[T.barefootstep] || (LAZYLEN(GLOB.barefootstep[T.barefootstep]) < 3))
+ testing("SOME silly guy GAVE AN INVALID BAREFOOTSTEP VALUE ([T.barefootstep]) TO [T.type]!!! FIX THIS SHIT!!!")
return
used_footsteps = GLOB.barefootstep[T.barefootstep][1]
used_footsteps = used_footsteps.Copy()
used_sound = pick_n_take(used_footsteps)
if(used_sound == last_sound)
used_sound = pick(used_footsteps)
+ if(!used_sound)
+ used_sound = last_sound
last_sound = used_sound
- playsound(T, used_sound, GLOB.barefootstep[T.barefootstep][2], TRUE, GLOB.barefootstep[T.barefootstep][3] + e_range)
+ playsound(T, used_sound,
+ GLOB.barefootstep[T.barefootstep][2],
+ TRUE,
+ GLOB.barefootstep[T.barefootstep][3] + e_range)
diff --git a/code/datums/components/forensics.dm b/code/datums/components/forensics.dm
index c349938a2b..17d7f4963b 100644
--- a/code/datums/components/forensics.dm
+++ b/code/datums/components/forensics.dm
@@ -71,11 +71,6 @@
if(!isliving(M))
if(!iscameramob(M))
return
- if(isaicamera(M))
- var/mob/camera/aiEye/ai_camera = M
- if(!ai_camera.ai)
- return
- M = ai_camera.ai
add_hiddenprint(M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -143,11 +138,6 @@
if(!isliving(M))
if(!iscameramob(M))
return
- if(isaicamera(M))
- var/mob/camera/aiEye/ai_camera = M
- if(!ai_camera.ai)
- return
- M = ai_camera.ai
if(!M.key)
return
var/hasgloves = ""
diff --git a/code/datums/components/movable_lighting.dm b/code/datums/components/movable_lighting.dm
new file mode 100644
index 0000000000..ca4aaa4767
--- /dev/null
+++ b/code/datums/components/movable_lighting.dm
@@ -0,0 +1,363 @@
+///For switchable lights, is it on and currently emitting light?
+#define LIGHTING_ON (1<<0)
+///Is the parent attached to something else, its loc? Then we need to keep an eye of this.
+#define LIGHTING_ATTACHED (1<<1)
+
+#define GET_PARENT (parent_attached_to || parent)
+
+/**
+* Movable atom overlay-based lighting component.
+*
+* * Component works by applying a visual object to the parent target.
+*
+* * The component tracks the parent's loc to determine the current_holder.
+* * The current_holder is either the parent or its loc, whichever is on a turf. If none, then the current_holder is null and the light is not visible.
+*
+* * Lighting works at its base by applying a dark overlay and "cutting" said darkness with light, adding (possibly colored) transparency.
+* * This component uses the visible_mask visual object to apply said light mask on the darkness.
+*
+* * The main limitation of this system is that it uses a limited number of pre-baked geometrical shapes, but for most uses it does the job.
+*
+* * Another limitation is for big lights: you only see the light if you see the object emiting it.
+* * For small objects this is good (you can't see them behind a wall), but for big ones this quickly becomes prety clumsy.
+*/
+/datum/component/overlay_lighting
+ ///How far the light reaches, float.
+ var/range = 1
+ ///Ceiling of range, integer without decimal entries.
+ var/lumcount_range = 0
+ ///How much this light affects the dynamic_lumcount of turfs.
+ var/lum_power = 0.5
+ ///Transparency value.
+ var/set_alpha = 0
+ ///For light sources that can be turned on and off.
+ var/overlay_lighting_flags = NONE
+
+ ///Cache of the possible light overlays, according to size.
+ var/static/list/light_overlays = list(
+ "32" = 'icons/effects/light_overlays/light_32.dmi',
+ "64" = 'icons/effects/light_overlays/light_64.dmi',
+ "96" = 'icons/effects/light_overlays/light_96.dmi',
+ "128" = 'icons/effects/light_overlays/light_128.dmi',
+ "160" = 'icons/effects/light_overlays/light_160.dmi',
+ "192" = 'icons/effects/light_overlays/light_192.dmi',
+ "224" = 'icons/effects/light_overlays/light_224.dmi',
+ "256" = 'icons/effects/light_overlays/light_256.dmi',
+ "288" = 'icons/effects/light_overlays/light_288.dmi',
+ "320" = 'icons/effects/light_overlays/light_320.dmi',
+ "352" = 'icons/effects/light_overlays/light_352.dmi',
+ )
+
+ ///Overlay effect to cut into the darkness and provide light.
+ var/obj/effect/overlay/light_visible/visible_mask
+ ///Lazy list to track the turfs being affected by our light, to determine their visibility.
+ var/list/turf/affected_turfs
+ ///Movable atom currently holding the light. Parent might be a flashlight, for example, but that might be held by a mob or something else.
+ var/atom/movable/current_holder
+ ///Movable atom the parent is attached to. For example, a flashlight into a helmet or gun. We'll need to track the thing the parent is attached to as if it were the parent itself.
+ var/atom/movable/parent_attached_to
+
+
+/datum/component/overlay_lighting/Initialize(_range, _power, _color, starts_on)
+ if(!ismovable(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ var/atom/movable/movable_parent = parent
+ if(movable_parent.light_system != MOVABLE_LIGHT)
+ stack_trace("[type] added to [parent], with [movable_parent.light_system] value for the light_system var. Use [MOVABLE_LIGHT] instead.")
+ return COMPONENT_INCOMPATIBLE
+
+ . = ..()
+
+ visible_mask = new()
+ if(!isnull(_range))
+ movable_parent.set_light_range(_range, _range)
+ set_range(parent, movable_parent.light_inner_range, movable_parent.light_outer_range)
+ if(!isnull(_power))
+ movable_parent.set_light_power(_power)
+ set_power(parent, movable_parent.light_power)
+ if(!isnull(_color))
+ movable_parent.set_light_color(_color)
+ set_color(parent, movable_parent.light_color)
+ if(!isnull(starts_on))
+ movable_parent.set_light_on(starts_on)
+
+
+/datum/component/overlay_lighting/RegisterWithParent()
+ . = ..()
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_moved))
+ RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_RANGE, PROC_REF(set_range))
+ RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_POWER, PROC_REF(set_power))
+ RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_COLOR, PROC_REF(set_color))
+ RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_ON, PROC_REF(on_toggle))
+ RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_FLAGS, PROC_REF(on_light_flags_change))
+ var/atom/movable/movable_parent = parent
+ if(movable_parent.light_flags & LIGHT_ATTACHED)
+ overlay_lighting_flags |= LIGHTING_ATTACHED
+ set_parent_attached_to(ismovable(movable_parent.loc) ? movable_parent.loc : null)
+ check_holder()
+ if(movable_parent.light_on)
+ turn_on()
+
+
+/datum/component/overlay_lighting/UnregisterFromParent()
+ overlay_lighting_flags &= ~LIGHTING_ATTACHED
+ set_parent_attached_to(null)
+ set_holder(null)
+ clean_old_turfs()
+ UnregisterSignal(parent, list(
+ COMSIG_MOVABLE_MOVED,
+ COMSIG_ATOM_SET_LIGHT_RANGE,
+ COMSIG_ATOM_SET_LIGHT_POWER,
+ COMSIG_ATOM_SET_LIGHT_COLOR,
+ COMSIG_ATOM_SET_LIGHT_ON,
+ COMSIG_ATOM_SET_LIGHT_FLAGS,
+ ))
+ if(overlay_lighting_flags & LIGHTING_ON)
+ turn_off()
+ return ..()
+
+
+/datum/component/overlay_lighting/Destroy()
+ set_parent_attached_to(null)
+ set_holder(null)
+ clean_old_turfs()
+ QDEL_NULL(visible_mask)
+ return ..()
+
+
+///Clears the affected_turfs lazylist, removing from its contents the effects of being near the light.
+/datum/component/overlay_lighting/proc/clean_old_turfs()
+ for(var/t in affected_turfs)
+ var/turf/lit_turf = t
+ lit_turf.dynamic_lumcount -= lum_power
+ affected_turfs = null
+
+
+///Populates the affected_turfs lazylist, adding to its contents the effects of being near the light.
+/datum/component/overlay_lighting/proc/get_new_turfs()
+ if(!current_holder)
+ return
+ for(var/turf/lit_turf in view(lumcount_range, get_turf(current_holder)))
+ lit_turf.dynamic_lumcount += lum_power
+ LAZYADD(affected_turfs, lit_turf)
+
+
+///Clears the old affected turfs and populates the new ones.
+/datum/component/overlay_lighting/proc/make_luminosity_update()
+ clean_old_turfs()
+ if(!isturf(current_holder?.loc))
+ return
+ get_new_turfs()
+
+
+///Adds the luminosity and source for the afected movable atoms to keep track of their visibility.
+/datum/component/overlay_lighting/proc/add_dynamic_lumi(atom/movable/affected_movable)
+ LAZYSET(affected_movable.affected_dynamic_lights, src, lumcount_range + 1)
+ affected_movable.vis_contents += visible_mask
+ affected_movable.update_dynamic_luminosity()
+
+
+///Removes the luminosity and source for the afected movable atoms to keep track of their visibility.
+/datum/component/overlay_lighting/proc/remove_dynamic_lumi(atom/movable/affected_movable)
+ LAZYREMOVE(affected_movable.affected_dynamic_lights, src)
+ affected_movable.vis_contents -= visible_mask
+ affected_movable.update_dynamic_luminosity()
+
+
+///Called to change the value of parent_attached_to.
+/datum/component/overlay_lighting/proc/set_parent_attached_to(atom/movable/new_parent_attached_to)
+ if(new_parent_attached_to == parent_attached_to)
+ return
+ . = parent_attached_to
+ parent_attached_to = new_parent_attached_to
+ if(.)
+ var/atom/movable/old_parent_attached_to = .
+ UnregisterSignal(old_parent_attached_to, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED))
+ if(old_parent_attached_to == current_holder)
+ RegisterSignal(old_parent_attached_to, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel))
+ RegisterSignal(old_parent_attached_to, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved))
+ if(parent_attached_to)
+ if(parent_attached_to == current_holder)
+ UnregisterSignal(current_holder, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED))
+ RegisterSignal(parent_attached_to, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_attached_to_qdel))
+ RegisterSignal(parent_attached_to, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_attached_to_moved))
+ check_holder()
+
+
+///Called to change the value of current_holder.
+/datum/component/overlay_lighting/proc/set_holder(atom/movable/new_holder)
+ if(new_holder == current_holder)
+ return
+ if(current_holder)
+ if(current_holder != parent && current_holder != parent_attached_to)
+ UnregisterSignal(current_holder, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED))
+ if(overlay_lighting_flags & LIGHTING_ON)
+ remove_dynamic_lumi(current_holder)
+ current_holder = new_holder
+ if(new_holder == null)
+ clean_old_turfs()
+ return
+ if(overlay_lighting_flags & LIGHTING_ON)
+ add_dynamic_lumi(new_holder)
+ if(new_holder != parent && new_holder != parent_attached_to)
+ RegisterSignal(new_holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel))
+ RegisterSignal(new_holder, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved))
+
+
+///Used to determine the new valid current_holder from the parent's loc.
+/datum/component/overlay_lighting/proc/check_holder()
+ var/atom/movable/movable_parent = GET_PARENT
+ if(isturf(movable_parent.loc))
+ set_holder(movable_parent)
+ return
+ var/atom/inside = movable_parent.loc //Parent's loc
+ if(isnull(inside))
+ set_holder(null)
+ return
+ if(isturf(inside.loc))
+ set_holder(inside)
+ return
+ set_holder(null)
+
+
+///Called when the current_holder is qdeleted, to remove the light effect.
+/datum/component/overlay_lighting/proc/on_holder_qdel(atom/movable/source, force)
+ SIGNAL_HANDLER
+ UnregisterSignal(current_holder, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED))
+ set_holder(null)
+
+
+///Called when current_holder changes loc.
+/datum/component/overlay_lighting/proc/on_holder_moved(atom/movable/source, OldLoc, Dir, Forced)
+ SIGNAL_HANDLER
+ if(!(overlay_lighting_flags & LIGHTING_ON))
+ return
+ make_luminosity_update()
+
+
+///Called when parent changes loc.
+/datum/component/overlay_lighting/proc/on_parent_moved(atom/movable/source, OldLoc, Dir, Forced)
+ SIGNAL_HANDLER
+ var/atom/movable/movable_parent = parent
+ if(overlay_lighting_flags & LIGHTING_ATTACHED)
+ set_parent_attached_to(ismovable(movable_parent.loc) ? movable_parent.loc : null)
+ check_holder()
+ if(!(overlay_lighting_flags & LIGHTING_ON) || !current_holder)
+ return
+ make_luminosity_update()
+
+
+///Called when the current_holder is qdeleted, to remove the light effect.
+/datum/component/overlay_lighting/proc/on_parent_attached_to_qdel(atom/movable/source, force)
+ SIGNAL_HANDLER
+ UnregisterSignal(parent_attached_to, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED))
+ if(parent_attached_to == current_holder)
+ set_holder(null)
+ set_parent_attached_to(null)
+
+
+///Called when parent_attached_to changes loc.
+/datum/component/overlay_lighting/proc/on_parent_attached_to_moved(atom/movable/source, OldLoc, Dir, Forced)
+ SIGNAL_HANDLER
+ check_holder()
+ if(!(overlay_lighting_flags & LIGHTING_ON) || !current_holder)
+ return
+ make_luminosity_update()
+
+
+///Changes the range which the light reaches. 0 means no light, 6 is the maximum value.
+/datum/component/overlay_lighting/proc/set_range(atom/source, old_inner_range, old_outer_range)
+ SIGNAL_HANDLER
+ var/new_range = source.light_outer_range
+ if(range == new_range)
+ return
+ if(range == 0)
+ turn_off()
+ range = clamp(CEILING(new_range, 0.5), 1, 6)
+ var/pixel_bounds = ((range - 1) * 64) + 32
+ lumcount_range = CEILING(range, 1)
+ visible_mask.icon = light_overlays["[pixel_bounds]"]
+ if(pixel_bounds == 32)
+ visible_mask.transform = null
+ return
+ var/offset = (pixel_bounds - 32) * 0.5
+ var/matrix/transform = new
+ transform.Translate(-offset, -offset)
+ visible_mask.transform = transform
+ if(overlay_lighting_flags & LIGHTING_ON)
+ make_luminosity_update()
+
+
+///Changes the intensity/brightness of the light by altering the visual object's alpha.
+/datum/component/overlay_lighting/proc/set_power(atom/source, new_power)
+ SIGNAL_HANDLER
+ set_lum_power(new_power >= 0 ? 0.5 : -0.5)
+ //set_alpha = min(230, (abs(new_power) * 120) + 30)
+ visible_mask.alpha = 255
+
+
+///Changes the light's color, pretty straightforward.
+/datum/component/overlay_lighting/proc/set_color(atom/source, new_color)
+ SIGNAL_HANDLER
+ visible_mask.color = new_color
+
+
+///Toggles the light on and off.
+/datum/component/overlay_lighting/proc/on_toggle(atom/source, new_value)
+ SIGNAL_HANDLER
+ if(new_value) //Truthy value input, turn on.
+ turn_on()
+ return
+ turn_off() //Falsey value, turn off.
+
+
+///Triggered right before the parent light flags change.
+/datum/component/overlay_lighting/proc/on_light_flags_change(atom/source, new_value)
+ SIGNAL_HANDLER
+ var/atom/movable/movable_parent = parent
+ if(new_value & LIGHT_ATTACHED)
+ if(!(movable_parent.light_flags & LIGHT_ATTACHED)) //Gained the LIGHT_ATTACHED property.
+ overlay_lighting_flags |= LIGHTING_ATTACHED
+ if(ismovable(movable_parent.loc))
+ set_parent_attached_to(movable_parent.loc)
+ else if(movable_parent.light_flags & LIGHT_ATTACHED) //Lost the LIGHT_ATTACHED property.
+ overlay_lighting_flags &= ~LIGHTING_ATTACHED
+ set_parent_attached_to(null)
+
+
+///Toggles the light on.
+/datum/component/overlay_lighting/proc/turn_on()
+ if(overlay_lighting_flags & LIGHTING_ON)
+ return
+ if(current_holder)
+ add_dynamic_lumi(current_holder)
+ overlay_lighting_flags |= LIGHTING_ON
+ get_new_turfs()
+
+
+///Toggles the light off.
+/datum/component/overlay_lighting/proc/turn_off()
+ if(!(overlay_lighting_flags & LIGHTING_ON))
+ return
+ if(current_holder)
+ remove_dynamic_lumi(current_holder)
+ overlay_lighting_flags &= ~LIGHTING_ON
+ clean_old_turfs()
+
+
+///Here we append the behavior associated to changing lum_power.
+/datum/component/overlay_lighting/proc/set_lum_power(new_lum_power)
+ if(lum_power == new_lum_power)
+ return
+ . = lum_power
+ lum_power = new_lum_power
+ var/difference = . - lum_power
+ for(var/t in affected_turfs)
+ var/turf/lit_turf = t
+ lit_turf.dynamic_lumcount -= difference
+
+
+#undef LIGHTING_ON
+#undef LIGHTING_ATTACHED
+#undef GET_PARENT
diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm
deleted file mode 100644
index 1129004493..0000000000
--- a/code/datums/components/nanites.dm
+++ /dev/null
@@ -1,372 +0,0 @@
-/datum/component/nanites
- dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
-
- var/mob/living/host_mob
- var/nanite_volume = 100 //amount of nanites in the system, used as fuel for nanite programs
- var/max_nanites = 500 //maximum amount of nanites in the system
- var/regen_rate = 0.5 //nanites generated per second
- var/safety_threshold = 50 //how low nanites will get before they stop processing/triggering
- var/cloud_id = 0 //0 if not connected to the cloud, 1-100 to set a determined cloud backup to draw from
- var/cloud_active = TRUE //if false, won't sync to the cloud
- var/next_sync = 0
- var/list/datum/nanite_program/programs = list()
- var/max_programs = NANITE_PROGRAM_LIMIT
-
- var/stealth = FALSE //if TRUE, does not appear on HUDs and health scans
- var/diagnostics = TRUE //if TRUE, displays program list when scanned by nanite scanners
-
-/datum/component/nanites/Initialize(amount = 100, cloud = 0)
- if(!isliving(parent) && !istype(parent, /datum/nanite_cloud_backup))
- return COMPONENT_INCOMPATIBLE
-
- nanite_volume = amount
- cloud_id = cloud
-
- //Nanites without hosts are non-interactive through normal means
- if(isliving(parent))
- host_mob = parent
-
- if(!(host_mob.mob_biotypes & (MOB_ORGANIC|MOB_UNDEAD))) //Shouldn't happen, but this avoids HUD runtimes in case a silicon gets them somehow.
- return COMPONENT_INCOMPATIBLE
-
- host_mob.hud_set_nanite_indicator()
- START_PROCESSING(SSnanites, src)
-
- if(cloud_id && cloud_active)
- cloud_sync()
-
-/datum/component/nanites/RegisterWithParent()
- RegisterSignal(parent, COMSIG_HAS_NANITES, PROC_REF(confirm_nanites))
- RegisterSignal(parent, COMSIG_NANITE_IS_STEALTHY, PROC_REF(check_stealth))
- RegisterSignal(parent, COMSIG_NANITE_DELETE, PROC_REF(delete_nanites))
- RegisterSignal(parent, COMSIG_NANITE_UI_DATA, PROC_REF(nanite_ui_data))
- RegisterSignal(parent, COMSIG_NANITE_GET_PROGRAMS, PROC_REF(get_programs))
- RegisterSignal(parent, COMSIG_NANITE_SET_VOLUME, PROC_REF(set_volume))
- RegisterSignal(parent, COMSIG_NANITE_ADJUST_VOLUME, PROC_REF(adjust_nanites))
- RegisterSignal(parent, COMSIG_NANITE_SET_MAX_VOLUME, PROC_REF(set_max_volume))
- RegisterSignal(parent, COMSIG_NANITE_SET_CLOUD, PROC_REF(set_cloud))
- RegisterSignal(parent, COMSIG_NANITE_SET_CLOUD_SYNC, PROC_REF(set_cloud_sync))
- RegisterSignal(parent, COMSIG_NANITE_SET_SAFETY, PROC_REF(set_safety))
- RegisterSignal(parent, COMSIG_NANITE_SET_REGEN, PROC_REF(set_regen))
- RegisterSignal(parent, COMSIG_NANITE_ADD_PROGRAM, PROC_REF(add_program))
- RegisterSignal(parent, COMSIG_NANITE_SCAN, PROC_REF(nanite_scan))
- RegisterSignal(parent, COMSIG_NANITE_SYNC, PROC_REF(sync))
-
- if(isliving(parent))
- RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp))
- RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(on_death))
- RegisterSignal(parent, COMSIG_MOB_ALLOWED, PROC_REF(check_access))
- RegisterSignal(parent, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_shock))
- RegisterSignal(parent, COMSIG_LIVING_MINOR_SHOCK, PROC_REF(on_minor_shock))
- RegisterSignal(parent, COMSIG_SPECIES_GAIN, PROC_REF(check_viable_biotype))
- RegisterSignal(parent, COMSIG_NANITE_SIGNAL, PROC_REF(receive_signal))
- RegisterSignal(parent, COMSIG_NANITE_COMM_SIGNAL, PROC_REF(receive_comm_signal))
-
-/datum/component/nanites/UnregisterFromParent()
- UnregisterSignal(parent, list(COMSIG_HAS_NANITES,
- COMSIG_NANITE_IS_STEALTHY,
- COMSIG_NANITE_DELETE,
- COMSIG_NANITE_UI_DATA,
- COMSIG_NANITE_GET_PROGRAMS,
- COMSIG_NANITE_SET_VOLUME,
- COMSIG_NANITE_ADJUST_VOLUME,
- COMSIG_NANITE_SET_MAX_VOLUME,
- COMSIG_NANITE_SET_CLOUD,
- COMSIG_NANITE_SET_CLOUD_SYNC,
- COMSIG_NANITE_SET_SAFETY,
- COMSIG_NANITE_SET_REGEN,
- COMSIG_NANITE_ADD_PROGRAM,
- COMSIG_NANITE_SCAN,
- COMSIG_NANITE_SYNC,
- COMSIG_ATOM_EMP_ACT,
- COMSIG_MOB_DEATH,
- COMSIG_MOB_ALLOWED,
- COMSIG_LIVING_ELECTROCUTE_ACT,
- COMSIG_LIVING_MINOR_SHOCK,
- COMSIG_MOVABLE_HEAR,
- COMSIG_SPECIES_GAIN,
- COMSIG_NANITE_SIGNAL,
- COMSIG_NANITE_COMM_SIGNAL))
-
-/datum/component/nanites/Destroy()
- STOP_PROCESSING(SSnanites, src)
- QDEL_LIST(programs)
- if(host_mob)
- set_nanite_bar(TRUE)
- host_mob.hud_set_nanite_indicator()
- host_mob = null
- return ..()
-
-/datum/component/nanites/InheritComponent(datum/component/nanites/new_nanites, i_am_original, list/arguments)
- if(new_nanites)
- adjust_nanites(null, new_nanites.nanite_volume)
- else
- adjust_nanites(null, arguments[1]) //just add to the nanite volume
-
-/datum/component/nanites/process()
- adjust_nanites(null, regen_rate)
- add_research()
- for(var/X in programs)
- var/datum/nanite_program/NP = X
- NP.on_process()
- set_nanite_bar()
- if(cloud_id && cloud_active && world.time > next_sync)
- cloud_sync()
- next_sync = world.time + NANITE_SYNC_DELAY
-
-/datum/component/nanites/proc/delete_nanites()
- qdel(src)
-
-//Syncs the nanite component to another, making it so programs are the same with the same programming (except activation status)
-/datum/component/nanites/proc/sync(datum/signal_source, datum/component/nanites/source, full_overwrite = TRUE, copy_activation = FALSE)
- var/list/programs_to_remove = programs.Copy()
- var/list/programs_to_add = source.programs.Copy()
- for(var/X in programs)
- var/datum/nanite_program/NP = X
- for(var/Y in programs_to_add)
- var/datum/nanite_program/SNP = Y
- if(NP.type == SNP.type)
- programs_to_remove -= NP
- programs_to_add -= SNP
- SNP.copy_programming(NP, copy_activation)
- break
- if(full_overwrite)
- for(var/X in programs_to_remove)
- qdel(X)
- for(var/X in programs_to_add)
- var/datum/nanite_program/SNP = X
- add_program(null, SNP.copy())
-
-/datum/component/nanites/proc/cloud_sync()
- if(cloud_id)
- var/datum/nanite_cloud_backup/backup = SSnanites.get_cloud_backup(cloud_id)
- if(backup)
- var/datum/component/nanites/cloud_copy = backup.nanites
- if(cloud_copy)
- sync(null, cloud_copy)
- return
- //Without cloud syncing nanites can accumulate errors and/or defects
- if(prob(8) && programs.len)
- var/datum/nanite_program/NP = pick(programs)
- NP.software_error()
-
-/datum/component/nanites/proc/add_program(datum/source, datum/nanite_program/new_program, datum/nanite_program/source_program)
- for(var/X in programs)
- var/datum/nanite_program/NP = X
- if(NP.unique && NP.type == new_program.type)
- qdel(NP)
- if(programs.len >= max_programs)
- return COMPONENT_PROGRAM_NOT_INSTALLED
- if(source_program)
- source_program.copy_programming(new_program)
- programs += new_program
- new_program.on_add(src)
- return COMPONENT_PROGRAM_INSTALLED
-
-/datum/component/nanites/proc/consume_nanites(amount, force = FALSE)
- if(!force && safety_threshold && (nanite_volume - amount < safety_threshold))
- return FALSE
- adjust_nanites(null, -amount)
- return (nanite_volume > 0)
-
-/datum/component/nanites/proc/adjust_nanites(datum/source, amount)
- nanite_volume = CLAMP(nanite_volume + amount, 0, max_nanites)
- if(nanite_volume <= 0) //oops we ran out
- qdel(src)
-
-/datum/component/nanites/proc/set_nanite_bar(remove = FALSE)
- var/image/holder = host_mob.hud_list[DIAG_NANITE_FULL_HUD]
- var/icon/I = icon(host_mob.icon, host_mob.icon_state, host_mob.dir)
- holder.pixel_y = I.Height() - world.icon_size
- holder.icon_state = null
- if(remove || stealth)
- return //bye icon
- var/nanite_percent = (nanite_volume / max_nanites) * 100
- nanite_percent = CLAMP(CEILING(nanite_percent, 10), 10, 100)
- holder.icon_state = "nanites[nanite_percent]"
-
-/datum/component/nanites/proc/on_emp(datum/source, severity)
- nanite_volume *= (rand(0.60, 0.90)) //Lose 10-40% of nanites
- adjust_nanites(null, -(rand(5, 50))) //Lose 5-50 flat nanite volume
- if(prob(40/severity))
- cloud_id = 0
- for(var/X in programs)
- var/datum/nanite_program/NP = X
- NP.on_emp(severity)
-
-/datum/component/nanites/proc/on_shock(datum/source, shock_damage)
- nanite_volume *= (rand(0.45, 0.80)) //Lose 20-55% of nanites
- adjust_nanites(null, -(rand(5, 50))) //Lose 5-50 flat nanite volume
- for(var/X in programs)
- var/datum/nanite_program/NP = X
- NP.on_shock(shock_damage)
-
-/datum/component/nanites/proc/on_minor_shock(datum/source)
- adjust_nanites(null, -(rand(5, 15))) //Lose 5-15 flat nanite volume
- for(var/X in programs)
- var/datum/nanite_program/NP = X
- NP.on_minor_shock()
-
-/datum/component/nanites/proc/check_stealth(datum/source)
- return stealth
-
-/datum/component/nanites/proc/on_death(datum/source, gibbed)
- for(var/X in programs)
- var/datum/nanite_program/NP = X
- NP.on_death(gibbed)
-
-/datum/component/nanites/proc/receive_signal(datum/source, code, signal_source = "an unidentified source")
- for(var/X in programs)
- var/datum/nanite_program/NP = X
- NP.receive_signal(code, signal_source)
-
-/datum/component/nanites/proc/receive_comm_signal(datum/source, comm_code, comm_message, comm_source = "an unidentified source")
- for(var/X in programs)
- if(istype(X, /datum/nanite_program/triggered/comm))
- var/datum/nanite_program/triggered/comm/NP = X
- NP.receive_comm_signal(comm_code, comm_message, comm_source)
-
-/datum/component/nanites/proc/check_viable_biotype()
- if(!(host_mob.mob_biotypes & (MOB_ORGANIC|MOB_UNDEAD)))
- qdel(src) //bodytype no longer sustains nanites
-
-/datum/component/nanites/proc/check_access(datum/source, obj/O)
- for(var/datum/nanite_program/triggered/access/access_program in programs)
- if(access_program.activated)
- return O.check_access_list(access_program.access)
- else
- return FALSE
- return FALSE
-
-/datum/component/nanites/proc/set_volume(datum/source, amount)
- nanite_volume = CLAMP(amount, 0, max_nanites)
-
-/datum/component/nanites/proc/set_max_volume(datum/source, amount)
- max_nanites = max(1, max_nanites)
-
-/datum/component/nanites/proc/set_cloud(datum/source, amount)
- cloud_id = CLAMP(amount, 0, 100)
-
-/datum/component/nanites/proc/set_cloud_sync(datum/source, method)
- switch(method)
- if(NANITE_CLOUD_TOGGLE)
- cloud_active = !cloud_active
- if(NANITE_CLOUD_DISABLE)
- cloud_active = FALSE
- if(NANITE_CLOUD_ENABLE)
- cloud_active = TRUE
-
-/datum/component/nanites/proc/set_safety(datum/source, amount)
- safety_threshold = CLAMP(amount, 0, max_nanites)
-
-/datum/component/nanites/proc/set_regen(datum/source, amount)
- regen_rate = amount
-
-/datum/component/nanites/proc/confirm_nanites()
- return TRUE //yup i exist
-
-/datum/component/nanites/proc/get_data(list/nanite_data)
- nanite_data["nanite_volume"] = nanite_volume
- nanite_data["max_nanites"] = max_nanites
- nanite_data["cloud_id"] = cloud_id
- nanite_data["regen_rate"] = regen_rate
- nanite_data["safety_threshold"] = safety_threshold
- nanite_data["stealth"] = stealth
-
-/datum/component/nanites/proc/get_programs(datum/source, list/nanite_programs)
- nanite_programs |= programs
-
-/datum/component/nanites/proc/add_research()
- var/research_value = NANITE_BASE_RESEARCH
- if(!ishuman(host_mob))
- if(!iscarbon(host_mob))
- research_value *= 0.4
- else
- research_value *= 0.8
- if(!host_mob.client)
- research_value *= 0.5
- if(host_mob.stat == DEAD)
- research_value *= 0.75
- SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_NANITES = research_value))
-
-/datum/component/nanites/proc/nanite_scan(datum/source, mob/user, full_scan)
- if(!full_scan)
- if(!stealth)
- to_chat(user, "Nanites Detected")
- to_chat(user, "Saturation: [nanite_volume]/[max_nanites]")
- return TRUE
- else
- to_chat(user, "NANITES DETECTED")
- to_chat(user, "================")
- to_chat(user, "Saturation: [nanite_volume]/[max_nanites]")
- to_chat(user, "Safety Threshold: [safety_threshold]")
- to_chat(user, "Cloud ID: [cloud_id ? cloud_id : "None"]")
- to_chat(user, "Cloud Sync: [cloud_active ? "Active" : "Disabled"]")
- to_chat(user, "================")
- to_chat(user, "Program List:")
- if(!diagnostics)
- to_chat(user, "Diagnostics Disabled")
- else
- for(var/X in programs)
- var/datum/nanite_program/NP = X
- to_chat(user, "[NP.name] | [NP.activated ? "Active" : "Inactive"]")
- return TRUE
-
-/datum/component/nanites/proc/nanite_ui_data(datum/source, list/data, scan_level)
- data["has_nanites"] = TRUE
- data["nanite_volume"] = nanite_volume
- data["regen_rate"] = regen_rate
- data["safety_threshold"] = safety_threshold
- data["cloud_id"] = cloud_id
- data["cloud_active"] = cloud_active
- var/list/mob_programs = list()
- var/id = 1
- for(var/X in programs)
- var/datum/nanite_program/P = X
- var/list/mob_program = list()
- mob_program["name"] = P.name
- mob_program["desc"] = P.desc
- mob_program["id"] = id
-
- if(scan_level >= 2)
- mob_program["activated"] = P.activated
- mob_program["use_rate"] = P.use_rate
- mob_program["can_trigger"] = P.can_trigger
- mob_program["trigger_cost"] = P.trigger_cost
- mob_program["trigger_cooldown"] = P.trigger_cooldown / 10
-
- if(scan_level >= 3)
- mob_program["activation_delay"] = P.activation_delay
- mob_program["timer"] = P.timer
- mob_program["timer_type"] = P.get_timer_type_text()
- var/list/extra_settings = list()
- for(var/Y in P.extra_settings)
- var/list/setting = list()
- setting["name"] = Y
- setting["value"] = P.get_extra_setting(Y)
- extra_settings += list(setting)
- mob_program["extra_settings"] = extra_settings
- if(LAZYLEN(extra_settings))
- mob_program["has_extra_settings"] = TRUE
-
- if(scan_level >= 4)
- mob_program["activation_code"] = P.activation_code
- mob_program["deactivation_code"] = P.deactivation_code
- mob_program["kill_code"] = P.kill_code
- mob_program["trigger_code"] = P.trigger_code
- var/list/rules = list()
- var/rule_id = 1
- for(var/Z in P.rules)
- var/datum/nanite_rule/nanite_rule = Z
- var/list/rule = list()
- rule["display"] = nanite_rule.display()
- rule["program_id"] = id
- rule["id"] = rule_id
- rules += list(rule)
- rule_id++
- mob_program["rules"] = rules
- if(LAZYLEN(rules))
- mob_program["has_rules"] = TRUE
- id++
- mob_programs += list(mob_program)
- data["mob_programs"] = mob_programs
diff --git a/code/datums/components/ntnet_interface.dm b/code/datums/components/ntnet_interface.dm
deleted file mode 100644
index 3a8fb559bf..0000000000
--- a/code/datums/components/ntnet_interface.dm
+++ /dev/null
@@ -1,66 +0,0 @@
-//Thing meant for allowing datums and objects to access a NTnet network datum.
-/datum/proc/ntnet_receive(datum/netdata/data)
- return
-
-/datum/proc/ntnet_receive_broadcast(datum/netdata/data)
- return
-
-/datum/proc/ntnet_send(datum/netdata/data, netid)
- var/datum/component/ntnet_interface/NIC = GetComponent(/datum/component/ntnet_interface)
- if(!NIC)
- return FALSE
- return NIC.__network_send(data, netid)
-
-/datum/component/ntnet_interface
- var/hardware_id //text. this is the true ID. do not change this. stuff like ID forgery can be done manually.
- var/network_name = "" //text
- var/list/networks_connected_by_id = list() //id = datum/ntnet
- var/differentiate_broadcast = TRUE //If false, broadcasts go to ntnet_receive. NOT RECOMMENDED.
-
-/datum/component/ntnet_interface/Initialize(force_name = "NTNet Device", autoconnect_station_network = TRUE) //Don't force ID unless you know what you're doing!
- hardware_id = "[SSnetworks.get_next_HID()]"
- network_name = force_name
- if(!SSnetworks.register_interface(src))
- . = COMPONENT_INCOMPATIBLE
- CRASH("Unable to register NTNet interface. Interface deleted.")
- if(autoconnect_station_network)
- register_connection(SSnetworks.station_network)
-
-/datum/component/ntnet_interface/Destroy()
- unregister_all_connections()
- SSnetworks.unregister_interface(src)
- return ..()
-
-/datum/component/ntnet_interface/proc/__network_receive(datum/netdata/data) //Do not directly proccall!
- SEND_SIGNAL(parent, COMSIG_COMPONENT_NTNET_RECEIVE, data)
- if(differentiate_broadcast && data.broadcast)
- parent.ntnet_receive_broadcast(data)
- else
- parent.ntnet_receive(data)
-
-/datum/component/ntnet_interface/proc/__network_send(datum/netdata/data, netid) //Do not directly proccall!
-
- if(netid)
- if(networks_connected_by_id[netid])
- var/datum/ntnet/net = networks_connected_by_id[netid]
- return net.process_data_transmit(src, data)
- return FALSE
- for(var/i in networks_connected_by_id)
- var/datum/ntnet/net = networks_connected_by_id[i]
- net.process_data_transmit(src, data)
- return TRUE
-
-/datum/component/ntnet_interface/proc/register_connection(datum/ntnet/net)
- if(net.interface_connect(src))
- networks_connected_by_id[net.network_id] = net
- return TRUE
-
-/datum/component/ntnet_interface/proc/unregister_all_connections()
- for(var/i in networks_connected_by_id)
- unregister_connection(networks_connected_by_id[i])
- return TRUE
-
-/datum/component/ntnet_interface/proc/unregister_connection(datum/ntnet/net)
- net.interface_disconnect(src)
- networks_connected_by_id -= net.network_id
- return TRUE
diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm
deleted file mode 100644
index 3b2af400da..0000000000
--- a/code/datums/components/plumbing/_plumbing.dm
+++ /dev/null
@@ -1,215 +0,0 @@
-/datum/component/plumbing
- ///Index with "1" = /datum/ductnet/theductpointingnorth etc. "1" being the num2text from NORTH define
- var/list/datum/ductnet/ducts = list()
- ///shortcut to our parents' reagent holder
- var/datum/reagents/reagents
- ///TRUE if we wanna add proper pipe outless under our parent object. this is pretty good if i may so so myself
- var/use_overlays = TRUE
- ///We can't just cut all of the parents' overlays, so we'll track them here
- var/list/image/ducterlays
- ///directions in wich we act as a supplier
- var/supply_connects
- ///direction in wich we act as a demander
- var/demand_connects
- ///FALSE to pretty much just not exist in the plumbing world so we can be moved, TRUE to go plumbo mode
- var/active = FALSE
- ///if TRUE connects will spin with the parent object visually and codually, so you can have it work in any direction. FALSE if you want it to be static
- var/turn_connects = TRUE
-
-/datum/component/plumbing/Initialize(start=TRUE, _turn_connects=TRUE) //turn_connects for wheter or not we spin with the object to change our pipes
- if(parent && !ismovableatom(parent))
- return COMPONENT_INCOMPATIBLE
- var/atom/movable/AM = parent
- if(!AM.reagents)
- return COMPONENT_INCOMPATIBLE
- reagents = AM.reagents
- turn_connects = _turn_connects
-
- RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED,COMSIG_PARENT_PREQDELETED), PROC_REF(disable))
- RegisterSignal(parent, list(COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH), PROC_REF(toggle_active))
-
- if(start)
- enable()
-
- if(use_overlays)
- create_overlays()
-
-/datum/component/plumbing/process()
- if(!demand_connects || !reagents)
- STOP_PROCESSING(SSfluids, src)
- return
- if(reagents.total_volume < reagents.maximum_volume)
- for(var/D in GLOB.cardinals)
- if(D & demand_connects)
- send_request(D)
-///Can we be added to the ductnet?
-/datum/component/plumbing/proc/can_add(datum/ductnet/D, dir)
- if(!active)
- return
- if(!dir || !D)
- return FALSE
- if(num2text(dir) in ducts)
- return FALSE
-
- return TRUE
-///called from in process(). only calls process_request(), but can be overwritten for children with special behaviour
-/datum/component/plumbing/proc/send_request(dir)
- process_request(amount = MACHINE_REAGENT_TRANSFER, reagent = null, dir = dir)
-///check who can give us what we want, and how many each of them will give us
-/datum/component/plumbing/proc/process_request(amount, reagent, dir)
- var/list/valid_suppliers = list()
- var/datum/ductnet/net
- if(!ducts.Find(num2text(dir)))
- return
- net = ducts[num2text(dir)]
- for(var/A in net.suppliers)
- var/datum/component/plumbing/supplier = A
- if(supplier.can_give(amount, reagent, net))
- valid_suppliers += supplier
- for(var/A in valid_suppliers)
- var/datum/component/plumbing/give = A
- give.transfer_to(src, amount / valid_suppliers.len, reagent, net)
-///returns TRUE when they can give the specified amount and reagent. called by process request
-/datum/component/plumbing/proc/can_give(amount, reagent, datum/ductnet/net)
- if(amount <= 0)
- return
-
- if(reagent) //only asked for one type of reagent
- for(var/A in reagents.reagent_list)
- var/datum/reagent/R = A
- if(R.type == reagent)
- return TRUE
- else if(reagents.total_volume > 0) //take whatever
- return TRUE
-///this is where the reagent is actually transferred and is thus the finish point of our process()
-/datum/component/plumbing/proc/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net)
- if(!reagents || !target || !target.reagents)
- return FALSE
- if(reagent)
- reagents.trans_id_to(target.parent, reagent, amount)
- else
- reagents.trans_to(target.parent, amount, round_robin = TRUE)//we deal with alot of precise calculations so we round_robin=TRUE. Otherwise we get floating point errors, 1 != 1 and 2.5 + 2.5 = 6
-///We create our luxurious piping overlays/underlays, to indicate where we do what. only called once if use_overlays = TRUE in Initialize()
-/datum/component/plumbing/proc/create_overlays()
- var/atom/movable/AM = parent
- for(var/image/I in ducterlays)
- AM.overlays.Remove(I)
- qdel(I)
- ducterlays = list()
- for(var/D in GLOB.cardinals)
- var/color
- var/direction
- if(D & demand_connects)
- color = "red" //red because red is mean and it takes
- else if(D & supply_connects)
- color = "blue" //blue is nice and gives
- else
- continue
- var/image/I
- if(turn_connects)
- switch(D)
- if(NORTH)
- direction = "north"
- if(SOUTH)
- direction = "south"
- if(EAST)
- direction = "east"
- if(WEST)
- direction = "west"
- I = image('icons/obj/plumbing/plumbers.dmi', "[direction]-[color]", layer = AM.layer - 1)
- else
- I = image('icons/obj/plumbing/plumbers.dmi', color, layer = AM.layer - 1) //color is not color as in the var, it's just the name
- I.dir = D
- AM.add_overlay(I)
- ducterlays += I
-///we stop acting like a plumbing thing and disconnect if we are, so we can safely be moved and stuff
-/datum/component/plumbing/proc/disable()
- if(!active)
- return
- STOP_PROCESSING(SSfluids, src)
- for(var/A in ducts)
- var/datum/ductnet/D = ducts[A]
- D.remove_plumber(src)
- active = FALSE
- for(var/D in GLOB.cardinals)
- if(D & (demand_connects | supply_connects))
- for(var/obj/machinery/duct/duct in get_step(parent, D))
- duct.attempt_connect()
-
-///settle wherever we are, and start behaving like a piece of plumbing
-/datum/component/plumbing/proc/enable()
- if(active)
- return
- update_dir()
- active = TRUE
- var/atom/movable/AM = parent
- for(var/obj/machinery/duct/D in AM.loc) //Destroy any ducts under us. Ducts also self destruct if placed under a plumbing machine. machines disable when they get moved
- if(D.anchored) //that should cover everything
- D.disconnect_duct()
-
- if(demand_connects)
- START_PROCESSING(SSfluids, src)
-
- for(var/D in GLOB.cardinals)
- if(D & (demand_connects | supply_connects))
- for(var/atom/movable/A in get_step(parent, D))
- if(istype(A, /obj/machinery/duct))
- var/obj/machinery/duct/duct = A
- duct.attempt_connect()
- else
- var/datum/component/plumbing/P = A.GetComponent(/datum/component/plumbing)
- if(P)
- direct_connect(P, D)
-
-/// Toggle our machinery on or off. This is called by a hook from default_unfasten_wrench with anchored as only param, so we dont have to copypaste this on every object that can move
-/datum/component/plumbing/proc/toggle_active(obj/O, new_state)
- if(new_state)
- enable()
- else
- disable()
-/** We update our connects only when we settle down by taking our current and original direction to find our new connects
-* If someone wants it to fucking spin while connected to something go actually knock myself out
-*/
-/datum/component/plumbing/proc/update_dir()
- if(!turn_connects)
- return
- var/atom/movable/AM = parent
- var/new_demand_connects
- var/new_supply_connects
- var/new_dir = AM.dir
- var/angle = 180 - dir2angle(new_dir)
- if(new_dir == SOUTH)
- demand_connects = initial(demand_connects)
- supply_connects = initial(supply_connects)
- else
- for(var/D in GLOB.cardinals)
- if(D & initial(demand_connects))
- new_demand_connects += turn(D, angle)
- if(D & initial(supply_connects))
- new_supply_connects += turn(D, angle)
- demand_connects = new_demand_connects
- supply_connects = new_supply_connects
-///Give the direction of a pipe, and it'll return wich direction it originally was when it's object pointed SOUTH
-/datum/component/plumbing/proc/get_original_direction(dir)
- var/atom/movable/AM = parent
- return turn(dir, dir2angle(AM.dir) - 180)
-//special case in-case we want to connect directly with another machine without a duct
-/datum/component/plumbing/proc/direct_connect(datum/component/plumbing/P, dir)
- if(!P.active)
- return
- var/opposite_dir = turn(dir, 180)
- if(P.demand_connects & opposite_dir && supply_connects & dir || P.supply_connects & opposite_dir && demand_connects & dir) //make sure we arent connecting two supplies or demands
- var/datum/ductnet/net = new()
- net.add_plumber(src, dir)
- net.add_plumber(P, opposite_dir)
-
-///has one pipe input that only takes, example is manual output pipe
-/datum/component/plumbing/simple_demand
- demand_connects = NORTH
-///has one pipe output that only supplies. example is liquid pump and manual input pipe
-/datum/component/plumbing/simple_supply
- supply_connects = NORTH
-///input and output, like a holding tank
-/datum/component/plumbing/tank
- demand_connects = WEST
- supply_connects = EAST
diff --git a/code/datums/components/plumbing/chemical_acclimator.dm b/code/datums/components/plumbing/chemical_acclimator.dm
deleted file mode 100644
index 9da2a0e983..0000000000
--- a/code/datums/components/plumbing/chemical_acclimator.dm
+++ /dev/null
@@ -1,21 +0,0 @@
-/datum/component/plumbing/acclimator
- demand_connects = WEST
- supply_connects = EAST
- var/obj/machinery/plumbing/acclimator/AC
-
-/datum/component/plumbing/acclimator/Initialize(start=TRUE, _turn_connects=TRUE)
- . = ..()
- if(!istype(parent, /obj/machinery/plumbing/acclimator))
- return COMPONENT_INCOMPATIBLE
- AC = parent
-
-/datum/component/plumbing/acclimator/can_give(amount, reagent)
- . = ..()
- if(. && AC.emptying)
- return TRUE
- return FALSE
-///We're overriding process and not send_request, because all process does is do the requests, so we might aswell cut out the middle man and save some code from running
-/datum/component/plumbing/acclimator/process()
- if(AC.emptying)
- return
- . = ..()
diff --git a/code/datums/components/plumbing/filter.dm b/code/datums/components/plumbing/filter.dm
deleted file mode 100644
index 76b76323c5..0000000000
--- a/code/datums/components/plumbing/filter.dm
+++ /dev/null
@@ -1,59 +0,0 @@
-///The magical plumbing component used by the chemical filters. The different supply connects behave differently depending on the filters set on the chemical filter
-/datum/component/plumbing/filter
- demand_connects = NORTH
- supply_connects = SOUTH | EAST | WEST //SOUTH is straight, EAST is left and WEST is right. We look from the perspective of the insert
-
-/datum/component/plumbing/filter/Initialize()
- . = ..()
- if(!istype(parent, /obj/machinery/plumbing/filter))
- return COMPONENT_INCOMPATIBLE
-
-/datum/component/plumbing/filter/can_give(amount, reagent, datum/ductnet/net)
- . = ..()
- if(.)
- var/direction
- for(var/A in ducts)
- if(ducts[A] == net)
- direction = get_original_direction(text2num(A)) //we need it relative to the direction, so filters don't change when we turn the filter
- break
- if(!direction)
- return FALSE
- if(reagent)
- if(!can_give_in_direction(direction, reagent))
- return FALSE
-
-/datum/component/plumbing/filter/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net)
- if(!reagents || !target || !target.reagents)
- return FALSE
- var/direction
- for(var/A in ducts)
- if(ducts[A] == net)
- direction = get_original_direction(text2num(A))
- break
- if(reagent)
- reagents.trans_id_to(target.parent, reagent, amount)
- else
- for(var/A in reagents.reagent_list)
- var/datum/reagent/R = A
- if(!can_give_in_direction(direction, R.type))
- continue
- var/new_amount
- if(R.volume < amount)
- new_amount = amount - R.volume
- reagents.trans_id_to(target.parent, R.type, amount)
- amount = new_amount
- if(amount <= 0)
- break
-///We check if the direction and reagent are valid to give. Needed for filters since different outputs have different behaviours
-/datum/component/plumbing/filter/proc/can_give_in_direction(dir, reagent)
- var/obj/machinery/plumbing/filter/F = parent
- switch(dir)
- if(SOUTH) //straight
- if(!F.left.Find(reagent) && !F.right.Find(reagent))
- return TRUE
- if(WEST) //right
- if(F.right.Find(reagent))
- return TRUE
- if(EAST) //left
- if(F.left.Find(reagent))
- return TRUE
diff --git a/code/datums/components/plumbing/reaction_chamber.dm b/code/datums/components/plumbing/reaction_chamber.dm
deleted file mode 100644
index 2f92a4b6a1..0000000000
--- a/code/datums/components/plumbing/reaction_chamber.dm
+++ /dev/null
@@ -1,45 +0,0 @@
-/datum/component/plumbing/reaction_chamber
- demand_connects = WEST
- supply_connects = EAST
-
-/datum/component/plumbing/reaction_chamber/Initialize(start=TRUE, _turn_connects=TRUE)
- . = ..()
- if(!istype(parent, /obj/machinery/plumbing/reaction_chamber))
- return COMPONENT_INCOMPATIBLE
-
-/datum/component/plumbing/reaction_chamber/can_give(amount, reagent)
- . = ..()
- var/obj/machinery/plumbing/reaction_chamber/RC = parent
- if(!. || !RC.emptying)
- return FALSE
-
-/datum/component/plumbing/reaction_chamber/send_request(dir)
- var/obj/machinery/plumbing/reaction_chamber/RC = parent
- if(RC.emptying || !LAZYLEN(RC.required_reagents))
- return
- for(var/RT in RC.required_reagents)
- var/has_reagent = FALSE
- for(var/A in reagents.reagent_list)
- var/datum/reagent/RD = A
- if(RT == RD.type)
- has_reagent = TRUE
- if(RD.volume < RC.required_reagents[RT])
- process_request(min(RC.required_reagents[RT] - RD.volume, MACHINE_REAGENT_TRANSFER) , RT, dir)
- return
- if(!has_reagent)
- process_request(min(RC.required_reagents[RT], MACHINE_REAGENT_TRANSFER), RT, dir)
- return
-
- reagents.flags &= ~NO_REACT
- reagents.handle_reactions()
- RC.emptying = TRUE
-
-/datum/component/plumbing/reaction_chamber/can_give(amount, reagent, datum/ductnet/net)
- . = ..()
- var/obj/machinery/plumbing/reaction_chamber/RC = parent
- if(!. || !RC.emptying)
- return FALSE
-
-
-
-
diff --git a/code/datums/components/plumbing/splitter.dm b/code/datums/components/plumbing/splitter.dm
deleted file mode 100644
index 2e82c580a0..0000000000
--- a/code/datums/components/plumbing/splitter.dm
+++ /dev/null
@@ -1,47 +0,0 @@
-/datum/component/plumbing/splitter
- demand_connects = NORTH
- supply_connects = SOUTH | EAST
-
-/datum/component/plumbing/splitter/Initialize()
- . = ..()
- if(. && !istype(parent, /obj/machinery/plumbing/splitter))
- return FALSE
-
-/datum/component/plumbing/splitter/can_give(amount, reagent, datum/ductnet/net)
- . = ..()
- if(!.)
- return
- . = FALSE
- var/direction
- for(var/A in ducts)
- if(ducts[A] == net)
- direction = get_original_direction(text2num(A))
- break
- var/obj/machinery/plumbing/splitter/S = parent
- switch(direction)
- if(SOUTH)
- if(S.turn_straight && S.transfer_straight <= amount)
- S.turn_straight = FALSE
- return TRUE
- if(EAST)
- if(!S.turn_straight && S.transfer_side <= amount)
- S.turn_straight = TRUE
- return TRUE
-
-/datum/component/plumbing/splitter/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net)
- var/direction
- for(var/A in ducts)
- if(ducts[A] == net)
- direction = get_original_direction(text2num(A))
- break
- var/obj/machinery/plumbing/splitter/S = parent
- switch(direction)
- if(SOUTH)
- if(amount >= S.transfer_straight)
- amount = S.transfer_straight
- if(EAST)
- if(amount >= S.transfer_side)
- amount = S.transfer_side
- . = ..()
-
-
diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm
deleted file mode 100644
index 480f9f188f..0000000000
--- a/code/datums/components/remote_materials.dm
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-This component allows machines to connect remotely to a material container
-(namely an /obj/machinery/ore_silo) elsewhere. It offers optional graceful
-fallback to a local material storage in case remote storage is unavailable, and
-handles linking back and forth.
-*/
-
-/datum/component/remote_materials
- // Three possible states:
- // 1. silo exists, materials is parented to silo
- // 2. silo is null, materials is parented to parent
- // 3. silo is null, materials is null
- var/obj/machinery/ore_silo/silo
- var/datum/component/material_container/mat_container
- var/category
- var/allow_standalone
- var/local_size = INFINITY
-
-/datum/component/remote_materials/Initialize(category, mapload, allow_standalone = TRUE, force_connect = FALSE)
- if (!isatom(parent))
- return COMPONENT_INCOMPATIBLE
-
- src.category = category
- src.allow_standalone = allow_standalone
-
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy))
- RegisterSignal(parent, COMSIG_ATOM_MULTITOOL_ACT, PROC_REF(OnMultitool))
-
- var/turf/T = get_turf(parent)
- if (force_connect || (mapload && is_station_level(T.z)))
- addtimer(CALLBACK(src, PROC_REF(LateInitialize)))
- else if (allow_standalone)
- _MakeLocal()
-
-/datum/component/remote_materials/proc/LateInitialize()
- silo = GLOB.ore_silo_default
- if (silo)
- silo.connected += src
- mat_container = silo.GetComponent(/datum/component/material_container)
- else
- _MakeLocal()
-
-/datum/component/remote_materials/Destroy()
- if (silo)
- silo.connected -= src
- silo.updateUsrDialog()
- silo = null
- mat_container = null
- else if (mat_container)
- // specify explicitly in case the other component is deleted first
- var/atom/P = parent
- mat_container.retrieve_all(P.drop_location())
- return ..()
-
-/datum/component/remote_materials/proc/_MakeLocal()
- silo = null
- mat_container = parent.AddComponent(/datum/component/material_container,
- list(/datum/material/iron, /datum/material/glass, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/plasma, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace, /datum/material/plastic),
- local_size,
- FALSE,
- /obj/item/stack)
-
-/datum/component/remote_materials/proc/set_local_size(size)
- local_size = size
- if (!silo && mat_container)
- mat_container.max_amount = size
-
-// called if disconnected by ore silo UI or destruction
-/datum/component/remote_materials/proc/disconnect_from(obj/machinery/ore_silo/old_silo)
- if (!old_silo || silo != old_silo)
- return
- silo = null
- mat_container = null
- if (allow_standalone)
- _MakeLocal()
-
-/datum/component/remote_materials/proc/OnAttackBy(datum/source, obj/item/I, mob/user)
- if (silo && istype(I, /obj/item/stack))
- if (silo.remote_attackby(parent, user, I))
- return COMPONENT_NO_AFTERATTACK
-
-/datum/component/remote_materials/proc/OnMultitool(datum/source, mob/user, obj/item/I)
- if(!I.multitool_check_buffer(user, I))
- return COMPONENT_BLOCK_TOOL_ATTACK
- var/obj/item/multitool/M = I
- if (!QDELETED(M.buffer) && istype(M.buffer, /obj/machinery/ore_silo))
- if (silo == M.buffer)
- to_chat(user, "[parent] is already connected to [silo]!")
- return COMPONENT_BLOCK_TOOL_ATTACK
- if (silo)
- silo.connected -= src
- silo.updateUsrDialog()
- else if (mat_container)
- mat_container.retrieve_all()
- qdel(mat_container)
- silo = M.buffer
- silo.connected += src
- silo.updateUsrDialog()
- mat_container = silo.GetComponent(/datum/component/material_container)
- to_chat(user, "I connect [parent] to [silo] from the multitool's buffer.")
- return COMPONENT_BLOCK_TOOL_ATTACK
-
-/datum/component/remote_materials/proc/on_hold()
- return silo && silo.holds["[get_area(parent)]/[category]"]
-
-/datum/component/remote_materials/proc/silo_log(obj/machinery/M, action, amount, noun, list/mats)
- if (silo)
- silo.silo_log(M || parent, action, amount, noun, mats)
-
-/datum/component/remote_materials/proc/format_amount()
- if (mat_container)
- return "[mat_container.total_amount] / [mat_container.max_amount == INFINITY ? "Unlimited" : mat_container.max_amount] ([silo ? "remote" : "local"])"
- else
- return "0 / 0"
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index ee4192439a..d502c0ce3e 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -186,6 +186,7 @@
handle_vehicle_offsets()
else
to_chat(user, "You'll need the keys in one of my hands to [drive_verb] [AM].")
+ SEND_SIGNAL(AM, COMSIG_RIDDEN_DRIVER_MOVE, user, direction)
return TRUE
/datum/component/riding/proc/Unbuckle(atom/movable/M)
@@ -274,10 +275,6 @@
var/atom/movable/AM = parent
if(user.incapacitated())
var/kick = TRUE
- if(iscyborg(AM))
- var/mob/living/silicon/robot/R = AM
- if(R.module && R.module.ride_allow_incapacitated)
- kick = FALSE
if(kick)
to_chat(user, "I fall off of [AM]!")
Unbuckle(user)
@@ -307,13 +304,7 @@
if(AM.has_buckled_mobs())
for(var/mob/living/M in AM.buckled_mobs)
M.setDir(AM.dir)
- if(iscyborg(AM))
- var/mob/living/silicon/robot/R = AM
- if(istype(R.module))
- M.pixel_x = R.module.ride_offset_x[dir2text(AM.dir)]
- M.pixel_y = R.module.ride_offset_y[dir2text(AM.dir)]
- else
- ..()
+ ..()
/datum/component/riding/cyborg/force_dismount(mob/living/M)
var/atom/movable/AM = parent
diff --git a/code/datums/components/rotting.dm b/code/datums/components/rotting.dm
index af8df6359d..625b353a1c 100644
--- a/code/datums/components/rotting.dm
+++ b/code/datums/components/rotting.dm
@@ -1,7 +1,7 @@
/datum/component/rot
var/amount = 0
var/last_process = 0
- var/datum/looping_sound/fliesloop/soundloop
+// var/datum/looping_sound/fliesloop/soundloop commented out looping sound flies because of runtimes. TO DO.
/datum/component/rot/Initialize(new_amount)
..()
@@ -11,13 +11,13 @@
if(new_amount)
amount = new_amount
- soundloop = new(list(parent), FALSE)
+// soundloop = new(list(parent), FALSE)
START_PROCESSING(SSroguerot, src)
/datum/component/rot/Destroy()
- if(soundloop)
- soundloop.stop()
+// if(soundloop)
+// soundloop.stop()
. = ..()
/datum/component/rot/process()
@@ -80,21 +80,21 @@
var/turf/open/T = C.loc
if(istype(T))
T.add_pollutants(/datum/pollutant/rot, 5)
- if(soundloop && soundloop.stopped && !is_zombie)
- soundloop.start()
- else
- if(soundloop && !soundloop.stopped)
- soundloop.stop()
- else
- if(soundloop && !soundloop.stopped)
- soundloop.stop()
+// if(soundloop && soundloop.stopped && !is_zombie)
+// soundloop.start()
+// else
+// if(soundloop && !soundloop.stopped)
+// soundloop.stop()
+// else
+// if(soundloop && !soundloop.stopped)
+// soundloop.stop()
if(shouldupdate)
if(findonerotten)
if(ishuman(C))
var/mob/living/carbon/human/H = C
H.skin_tone = "878f79" //elf ears
- if(soundloop && soundloop.stopped && !is_zombie)
- soundloop.start()
+// if(soundloop && soundloop.stopped && !is_zombie)
+// soundloop.start()
C.update_body()
/datum/component/rot/simple/process()
@@ -105,8 +105,8 @@
qdel(R)
return
if(amount > 10 MINUTES)
- if(soundloop && soundloop.stopped)
- soundloop.start()
+// if(soundloop && soundloop.stopped)
+// soundloop.start()
var/turf/open/T = get_turf(L)
if(istype(T))
T.add_pollutants(/datum/pollutant/rot, 5)
diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm
index 7044c11357..1f1954727f 100644
--- a/code/datums/components/spawner.dm
+++ b/code/datums/components/spawner.dm
@@ -6,10 +6,11 @@
var/max_mobs = 5
var/spawn_text = "emerges from"
var/list/faction = list("mining")
+ /// The minimum distance to a client before we can start spawning mobs.
+ var/range = 10
-
-/datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs)
+/datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _range, _max_mobs)
if(_spawn_time)
spawn_time=_spawn_time
if(_mob_types)
@@ -18,6 +19,8 @@
faction=_faction
if(_spawn_text)
spawn_text=_spawn_text
+ if(_range)
+ range = _range
if(_max_mobs)
max_mobs=_max_mobs
@@ -27,7 +30,6 @@
/datum/component/spawner/process()
try_spawn_mob()
-
/datum/component/spawner/proc/stop_spawning(force)
STOP_PROCESSING(SSprocessing, src)
for(var/mob/living/simple_animal/L in spawned_mobs)
@@ -41,6 +43,14 @@
return 0
if(spawn_delay > world.time)
return 0
+ if(range)
+ var/is_close_enough = FALSE
+ for(var/mob/living as anything in SSmobs.clients_by_zlevel[P.z]) // client-containing mobs, NOT clients
+ if(get_dist(P, living) <= range)
+ is_close_enough = TRUE
+ break
+ if(!is_close_enough)
+ return FALSE
spawn_delay = world.time + spawn_time
var/chosen_mob_type = pick(mob_types)
var/mob/living/simple_animal/L = new chosen_mob_type(P.loc)
@@ -49,3 +59,5 @@
L.nest = src
L.faction = src.faction
P.visible_message("[L] [spawn_text] [P].")
+ playsound(src, 'sound/misc/portal_op.ogg', 100, 1)
+ stop_spawning()
diff --git a/code/datums/components/storage/concrete/bag_of_holding.dm b/code/datums/components/storage/concrete/bag_of_holding.dm
index 7fe270517a..2dcf9e63e9 100644
--- a/code/datums/components/storage/concrete/bag_of_holding.dm
+++ b/code/datums/components/storage/concrete/bag_of_holding.dm
@@ -17,7 +17,6 @@
log_game("[key_name(user)] detonated a bag of holding at [loc_name(loccheck)].")
user.gib(TRUE, TRUE, TRUE)
- new/obj/singularity/boh_tear(loccheck)
qdel(A)
return
. = ..()
diff --git a/code/datums/components/storage/concrete/implant.dm b/code/datums/components/storage/concrete/implant.dm
index 405b3098fe..cf15b2d6df 100644
--- a/code/datums/components/storage/concrete/implant.dm
+++ b/code/datums/components/storage/concrete/implant.dm
@@ -7,10 +7,6 @@
silent = TRUE
allow_big_nesting = TRUE
-/datum/component/storage/concrete/implant/Initialize()
- . = ..()
- set_holdable(null, list(/obj/item/disk/nuclear))
-
/datum/component/storage/concrete/implant/InheritComponent(datum/component/storage/concrete/implant/I, original)
if(!istype(I))
return ..()
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 801de8da4e..7053e79157 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -26,7 +26,7 @@
. = ..()
var/static/list/exception_cache = typecacheof(list(
/obj/item/katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana,
- /obj/item/energy_katana, /obj/item/gun/ballistic/automatic/tommygun
+ /obj/item/gun/ballistic/automatic/tommygun
))
exception_hold = exception_cache
diff --git a/code/datums/components/storage/concrete/wallet.dm b/code/datums/components/storage/concrete/wallet.dm
index e70886665e..4e3584e5f9 100644
--- a/code/datums/components/storage/concrete/wallet.dm
+++ b/code/datums/components/storage/concrete/wallet.dm
@@ -6,7 +6,7 @@
return
var/obj/item/storage/wallet/A = parent
- if(istype(A) && A.front_id && !issilicon(user) && !(A.item_flags & IN_STORAGE)) //if it's a wallet in storage seeing the full inventory is more useful
+ if(istype(A) && A.front_id && !(A.item_flags & IN_STORAGE)) //if it's a wallet in storage seeing the full inventory is more useful
var/obj/item/I = A.front_id
A.add_fingerprint(user)
remove_from_storage(I, get_turf(user))
diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm
index bf6a0d054a..7741b3be0c 100644
--- a/code/datums/components/storage/storage.dm
+++ b/code/datums/components/storage/storage.dm
@@ -319,7 +319,7 @@
if(istype(T, /turf/closed)) // Is there an impassible turf in the way? Don't dump the sack out on that
to_chat(user, "Something in the way.")
- return
+ return
for(var/obj/item/I in things) // If the above aren't true, dump the sack onto the tile in front of us
things -= I
@@ -556,8 +556,6 @@
if(labeler.mode)
return FALSE
// . = TRUE //no afterattack
- if(iscyborg(M))
- return
if(!can_be_inserted(I, FALSE, M))
var/atom/real_location = real_location()
if(real_location.contents.len >= max_items) //don't use items on the backpack if they don't fit
diff --git a/code/datums/components/temporary_pollutor.dm b/code/datums/components/temporary_pollutor.dm
new file mode 100644
index 0000000000..3a0f17aa7a
--- /dev/null
+++ b/code/datums/components/temporary_pollutor.dm
@@ -0,0 +1,35 @@
+/datum/component/temporary_pollution_emission
+ dupe_mode = COMPONENT_DUPE_ALLOWED
+ /// The type of the pollutant we're emitting
+ var/pollutant_type
+ /// The amount we emitt every process
+ var/pollutant_amount
+ /// When do we expire
+ var/expiry_time
+
+/datum/component/temporary_pollution_emission/Initialize(pollutant_type, pollutant_amount, expiry_time)
+ if(!isatom(parent))
+ return COMPONENT_INCOMPATIBLE
+ src.pollutant_type = pollutant_type
+ src.pollutant_amount = pollutant_amount
+ COOLDOWN_START(src, expiry_time, expiry_time)
+ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(wash_off))
+ START_PROCESSING(SSobj, src)
+
+/datum/component/temporary_pollution_emission/Destroy()
+ UnregisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT)
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+/datum/component/temporary_pollution_emission/process(seconds_per_tick)
+ var/turf/my_turf = get_turf(parent)
+ if(QDELETED(my_turf) || COOLDOWN_FINISHED(src, expiry_time))
+ qdel(src)
+ return
+ my_turf.pollute_turf(pollutant_type, pollutant_amount * seconds_per_tick)
+
+/datum/component/temporary_pollution_emission/proc/wash_off()
+ SIGNAL_HANDLER
+ if(ismob(parent))
+ to_chat(parent, span_notice("The smell that lingered on your body fades."))
+ qdel(src)
diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm
deleted file mode 100644
index f407b631a6..0000000000
--- a/code/datums/components/uplink.dm
+++ /dev/null
@@ -1,319 +0,0 @@
-GLOBAL_LIST_EMPTY(uplinks)
-
-#define PEN_ROTATIONS 2
-
-/**
- * Uplinks
- *
- * All /obj/item(s) have a hidden_uplink var. By default it's null. Give the item one with 'new(src') (it must be in it's contents). Then add 'uses.'
- * Use whatever conditionals you want to check that the user has an uplink, and then call interact() on their uplink.
- * You might also want the uplink menu to open if active. Check if the uplink is 'active' and then interact() with it.
-**/
-/datum/component/uplink
- dupe_mode = COMPONENT_DUPE_UNIQUE
- var/name = "syndicate uplink"
- var/active = FALSE
- var/lockable = TRUE
- var/locked = TRUE
- var/allow_restricted = TRUE
- var/telecrystals
- var/selected_cat
- var/owner = null
- var/datum/game_mode/gamemode
- var/datum/uplink_purchase_log/purchase_log
- var/list/uplink_items
- var/hidden_crystals = 0
- var/unlock_note
- var/unlock_code
- var/failsafe_code
- var/debug = FALSE
-
- var/list/previous_attempts
-
-/datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, datum/game_mode/_gamemode, starting_tc = 20)
- if(!isitem(parent))
- return COMPONENT_INCOMPATIBLE
-
-
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy))
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact))
- if(istype(parent, /obj/item/implant))
- RegisterSignal(parent, COMSIG_IMPLANT_ACTIVATED, PROC_REF(implant_activation))
- RegisterSignal(parent, COMSIG_IMPLANT_IMPLANTING, PROC_REF(implanting))
- RegisterSignal(parent, COMSIG_IMPLANT_OTHER, PROC_REF(old_implant))
- RegisterSignal(parent, COMSIG_IMPLANT_EXISTING_UPLINK, PROC_REF(new_implant))
- else if(istype(parent, /obj/item/pda))
- RegisterSignal(parent, COMSIG_PDA_CHANGE_RINGTONE, PROC_REF(new_ringtone))
- RegisterSignal(parent, COMSIG_PDA_CHECK_DETONATE, PROC_REF(check_detonate))
- else if(istype(parent, /obj/item/radio))
- RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, PROC_REF(new_frequency))
- else if(istype(parent, /obj/item/pen))
- RegisterSignal(parent, COMSIG_PEN_ROTATED, PROC_REF(pen_rotation))
-
- GLOB.uplinks += src
- uplink_items = get_uplink_items(_gamemode, TRUE, allow_restricted)
-
- if(_owner)
- owner = _owner
- LAZYINITLIST(GLOB.uplink_purchase_logs_by_key)
- if(GLOB.uplink_purchase_logs_by_key[owner])
- purchase_log = GLOB.uplink_purchase_logs_by_key[owner]
- else
- purchase_log = new(owner, src)
- lockable = _lockable
- active = _enabled
- gamemode = _gamemode
- telecrystals = starting_tc
- if(!lockable)
- active = TRUE
- locked = FALSE
-
- previous_attempts = list()
-
-/datum/component/uplink/InheritComponent(datum/component/uplink/U)
- lockable |= U.lockable
- active |= U.active
- if(!gamemode)
- gamemode = U.gamemode
- telecrystals += U.telecrystals
- if(purchase_log && U.purchase_log)
- purchase_log.MergeWithAndDel(U.purchase_log)
-
-/datum/component/uplink/Destroy()
- GLOB.uplinks -= src
- gamemode = null
- purchase_log = null
- return ..()
-
-/datum/component/uplink/proc/LoadTC(mob/user, obj/item/stack/telecrystal/TC, silent = FALSE)
- if(!silent)
- to_chat(user, "I slot [TC] into [parent] and charge its internal uplink.")
- var/amt = TC.amount
- telecrystals += amt
- TC.use(amt)
-
-/datum/component/uplink/proc/set_gamemode(_gamemode)
- gamemode = _gamemode
- uplink_items = get_uplink_items(gamemode, TRUE, allow_restricted)
-
-/datum/component/uplink/proc/OnAttackBy(datum/source, obj/item/I, mob/user)
- if(!active)
- return //no hitting everyone/everything just to try to slot tcs in!
- if(istype(I, /obj/item/stack/telecrystal))
- LoadTC(user, I)
- for(var/category in uplink_items)
- for(var/item in uplink_items[category])
- var/datum/uplink_item/UI = uplink_items[category][item]
- var/path = UI.refund_path || UI.item
- var/cost = UI.refund_amount || UI.cost
- if(I.type == path && UI.refundable && I.check_uplink_validity())
- telecrystals += cost
- if(purchase_log)
- purchase_log.total_spent -= cost
- to_chat(user, "[I] refunded.")
- qdel(I)
- return
-
-/datum/component/uplink/proc/interact(datum/source, mob/user)
- if(locked)
- return
- active = TRUE
- if(user)
- ui_interact(user)
- // an unlocked uplink blocks also opening the PDA or headset menu
- return COMPONENT_NO_INTERACT
-
-/datum/component/uplink/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
- active = TRUE
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "uplink", name, 450, 750, master_ui, state)
- ui.set_autoupdate(FALSE) // This UI is only ever opened by one person, and never is updated outside of user input.
- ui.set_style("syndicate")
- ui.open()
-
-/datum/component/uplink/ui_data(mob/user)
- if(!user.mind)
- return
- var/list/data = list()
- data["telecrystals"] = telecrystals
- data["lockable"] = lockable
-
- data["categories"] = list()
- for(var/category in uplink_items)
- var/list/cat = list(
- "name" = category,
- "items" = (category == selected_cat ? list() : null))
- if(category == selected_cat)
- for(var/item in uplink_items[category])
- var/datum/uplink_item/I = uplink_items[category][item]
- if(I.limited_stock == 0)
- continue
- if(I.restricted_roles.len)
- var/is_inaccessible = TRUE
- for(var/R in I.restricted_roles)
- if(R == user.mind.assigned_role || debug)
- is_inaccessible = FALSE
- if(is_inaccessible)
- continue
- if(I.restricted_species)
- if(ishuman(user))
- var/is_inaccessible = TRUE
- var/mob/living/carbon/human/H = user
- for(var/F in I.restricted_species)
- if(F == H.dna.species.id || debug)
- is_inaccessible = FALSE
- break
- if(is_inaccessible)
- continue
- cat["items"] += list(list(
- "name" = I.name,
- "cost" = I.cost,
- "desc" = I.desc,
- ))
- data["categories"] += list(cat)
- return data
-
-/datum/component/uplink/ui_act(action, params)
- if(!active)
- return
-
- switch(action)
- if("buy")
- var/item = params["item"]
-
- var/list/buyable_items = list()
- for(var/category in uplink_items)
- buyable_items += uplink_items[category]
-
- if(item in buyable_items)
- var/datum/uplink_item/I = buyable_items[item]
- MakePurchase(usr, I)
- . = TRUE
- if("lock")
- active = FALSE
- locked = TRUE
- telecrystals += hidden_crystals
- hidden_crystals = 0
- SStgui.close_uis(src)
- if("select")
- selected_cat = params["category"]
- return TRUE
-
-/datum/component/uplink/proc/MakePurchase(mob/user, datum/uplink_item/U)
- if(!istype(U))
- return
- if (!user || user.incapacitated())
- return
-
- if(telecrystals < U.cost || U.limited_stock == 0)
- return
- telecrystals -= U.cost
-
- U.purchase(user, src)
-
- if(U.limited_stock > 0)
- U.limited_stock -= 1
-
- SSblackbox.record_feedback("nested tally", "traitor_uplink_items_bought", 1, list("[initial(U.name)]", "[U.cost]"))
- return TRUE
-
-// Implant signal responses
-
-/datum/component/uplink/proc/implant_activation()
- var/obj/item/implant/implant = parent
- locked = FALSE
- interact(null, implant.imp_in)
-
-/datum/component/uplink/proc/implanting(datum/source, list/arguments)
- var/mob/user = arguments[2]
- owner = "[user.key]"
-
-/datum/component/uplink/proc/old_implant(datum/source, list/arguments, obj/item/implant/new_implant)
- // It kinda has to be weird like this until implants are components
- return SEND_SIGNAL(new_implant, COMSIG_IMPLANT_EXISTING_UPLINK, src)
-
-/datum/component/uplink/proc/new_implant(datum/source, datum/component/uplink/uplink)
- uplink.telecrystals += telecrystals
- return COMPONENT_DELETE_NEW_IMPLANT
-
-// PDA signal responses
-
-/datum/component/uplink/proc/new_ringtone(datum/source, mob/living/user, new_ring_text)
- var/obj/item/pda/master = parent
- if(trim(lowertext(new_ring_text)) != trim(lowertext(unlock_code)))
- if(trim(lowertext(new_ring_text)) == trim(lowertext(failsafe_code)))
- failsafe()
- return COMPONENT_STOP_RINGTONE_CHANGE
- return
- locked = FALSE
- interact(null, user)
- to_chat(user, "The PDA softly beeps.")
- user << browse(null, "window=pda")
- master.mode = 0
- return COMPONENT_STOP_RINGTONE_CHANGE
-
-/datum/component/uplink/proc/check_detonate()
- return COMPONENT_PDA_NO_DETONATE
-
-// Radio signal responses
-
-/datum/component/uplink/proc/new_frequency(datum/source, list/arguments)
- var/obj/item/radio/master = parent
- var/frequency = arguments[1]
- if(frequency != unlock_code)
- if(frequency == failsafe_code)
- failsafe()
- return
- locked = FALSE
- if(ismob(master.loc))
- interact(null, master.loc)
-
-// Pen signal responses
-
-/datum/component/uplink/proc/pen_rotation(datum/source, degrees, mob/living/carbon/user)
- var/obj/item/pen/master = parent
- previous_attempts += degrees
- if(length(previous_attempts) > PEN_ROTATIONS)
- popleft(previous_attempts)
-
- if(compare_list(previous_attempts, unlock_code))
- locked = FALSE
- previous_attempts.Cut()
- master.degrees = 0
- interact(null, user)
- to_chat(user, "My pen makes a clicking noise, before quickly rotating back to 0 degrees!")
-
- else if(compare_list(previous_attempts, failsafe_code))
- failsafe()
-
-/datum/component/uplink/proc/setup_unlock_code()
- unlock_code = generate_code()
- var/obj/item/P = parent
- if(istype(parent,/obj/item/pda))
- unlock_note = "Uplink Passcode: [unlock_code] ([P.name])."
- else if(istype(parent,/obj/item/radio))
- unlock_note = "Radio Frequency: [format_frequency(unlock_code)] ([P.name])."
- else if(istype(parent,/obj/item/pen))
- unlock_note = "Uplink Degrees: [english_list(unlock_code)] ([P.name])."
-
-/datum/component/uplink/proc/generate_code()
- if(istype(parent,/obj/item/pda))
- return "[rand(100,999)] [pick(GLOB.phonetic_alphabet)]"
- else if(istype(parent,/obj/item/radio))
- return sanitize_frequency(rand(MIN_FREQ, MAX_FREQ))
- else if(istype(parent,/obj/item/pen))
- var/list/L = list()
- for(var/i in 1 to PEN_ROTATIONS)
- L += rand(1, 360)
- return L
-
-/datum/component/uplink/proc/failsafe()
- if(!parent)
- return
- var/turf/T = get_turf(parent)
- if(!T)
- return
- explosion(T,1,2,3)
- qdel(parent) //Alternatively could brick the uplink.
diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm
deleted file mode 100644
index b28079bffa..0000000000
--- a/code/datums/diseases/beesease.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-/datum/disease/beesease
- name = "Beesease"
- form = "Infection"
- max_stages = 4
- spread_text = "On contact"
- spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
- cure_text = "Sugar"
- cures = list(/datum/reagent/consumable/sugar)
- agent = "Apidae Infection"
- viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
- desc = ""
- severity = DISEASE_SEVERITY_MEDIUM
- infectable_biotypes = MOB_ORGANIC|MOB_UNDEAD //bees nesting in corpses
-
-/datum/disease/beesease/stage_act()
- ..()
- switch(stage)
- if(2) //also changes say, see say.dm
- if(prob(2))
- to_chat(affected_mob, "I taste honey in my mouth.")
- if(3)
- if(prob(10))
- to_chat(affected_mob, "My stomach rumbles.")
- if(prob(2))
- to_chat(affected_mob, "My stomach stings painfully.")
- if(prob(20))
- affected_mob.adjustToxLoss(2)
- affected_mob.updatehealth()
- if(4)
- if(prob(10))
- affected_mob.visible_message("[affected_mob] buzzes.", \
- "My stomach buzzes violently!")
- if(prob(5))
- to_chat(affected_mob, "I feel something moving in my throat.")
- if(prob(1))
- affected_mob.visible_message("[affected_mob] coughs up a swarm of bees!", \
- "I cough up a swarm of bees!")
- new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
- return
diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm
index cd02ab0a02..50e5a3839c 100644
--- a/code/datums/diseases/magnitis.dm
+++ b/code/datums/diseases/magnitis.dm
@@ -24,8 +24,6 @@
if(!M.anchored && (M.flags_1 & CONDUCT_1))
step_towards(M,affected_mob)
for(var/mob/living/silicon/S in orange(2,affected_mob))
- if(isAI(S))
- continue
step_towards(S,affected_mob)
if(3)
if(prob(2))
@@ -40,8 +38,6 @@
for(i=0,iKill...")
- stage3 = list("My throat feels very scratchy.", "Your skin feels tight.", "I can feel something move...inside.")
- stage4 = list("My skin feels very tight.", "My blood boils!", "I can feel... something...inside you.")
- stage5 = list("My skin feels as if it's about to burst off!")
- new_form = /mob/living/carbon/alien/humanoid/hunter
- bantype = ROLE_ALIEN
-
-/datum/disease/transformation/xeno/stage_act()
- ..()
- switch(stage)
- if(3)
- if (prob(4))
- to_chat(affected_mob, "I feel a stabbing pain in my head.")
- affected_mob.Unconscious(40)
- if(4)
- if (prob(20))
- affected_mob.say(pick("You look delicious.", "Going to... devour you...", "Hsssshhhhh!"), forced = "xenomorph transformation")
-
-
/datum/disease/transformation/slime
name = "Advanced Mutation Transformation"
cure_text = "frost oil"
@@ -271,24 +241,6 @@
if (prob(20))
affected_mob.say(pick("Bark!", "AUUUUUU"), forced = "corgi transformation")
-/datum/disease/transformation/morph
- name = "Gluttony's Blessing"
- cure_text = /datum/reagent/consumable/nothing
- cures = list(/datum/reagent/medicine/adminordrazine)
- agent = "Gluttony's Blessing"
- desc = ""
- stage_prob = 20
- severity = DISEASE_SEVERITY_BIOHAZARD
- visibility_flags = 0
- stage1 = list("Your stomach rumbles.")
- stage2 = list("Your skin feels saggy.")
- stage3 = list("My appendages are melting away.", "My limbs begin to lose their shape.")
- stage4 = list("You're ravenous.")
- stage5 = list("I have become a morph.")
- new_form = /mob/living/simple_animal/hostile/morph
- infectable_biotypes = MOB_ORGANIC|MOB_MINERAL|MOB_UNDEAD //magic!
- transformed_antag_datum = /datum/antagonist/morph
-
/datum/disease/transformation/gondola
name = "Gondola Transformation"
cure_text = "Condensed Capsaicin, ingested or injected." //getting pepper sprayed doesn't help
diff --git a/code/datums/ductnet.dm b/code/datums/ductnet.dm
deleted file mode 100644
index 252db42078..0000000000
--- a/code/datums/ductnet.dm
+++ /dev/null
@@ -1,65 +0,0 @@
-///We handle the unity part of plumbing. We track who is connected to who.
-/datum/ductnet
- var/list/suppliers = list()
- var/list/demanders = list()
- var/list/obj/machinery/duct/ducts = list()
-
- var/capacity
-///Add a duct to our network
-/datum/ductnet/proc/add_duct(obj/machinery/duct/D)
- if(!D || (D in ducts))
- return
- ducts += D
- D.duct = src
-///Remove a duct from our network and commit suicide, because this is probably easier than to check who that duct was connected to and what part of us was lost
-/datum/ductnet/proc/remove_duct(obj/machinery/duct/ducting)
- destroy_network(FALSE)
- for(var/obj/machinery/duct/D in ducting.neighbours)
- addtimer(CALLBACK(D, TYPE_PROC_REF(/obj/machinery/duct, reconnect)), 0) //all needs to happen after the original duct that was destroyed finishes destroying itself
- addtimer(CALLBACK(D, TYPE_PROC_REF(/obj/machinery/duct, generate_connects)), 0)
- qdel(src)
-///add a plumbing object to either demanders or suppliers
-/datum/ductnet/proc/add_plumber(datum/component/plumbing/P, dir)
- if(!P.can_add(src, dir))
- return FALSE
- P.ducts[num2text(dir)] = src
- if(dir & P.supply_connects)
- suppliers += P
- else if(dir & P.demand_connects)
- demanders += P
- return TRUE
-///remove a plumber. we dont delete ourselves because ductnets dont persist through plumbing objects
-/datum/ductnet/proc/remove_plumber(datum/component/plumbing/P)
- suppliers.Remove(P) //we're probably only in one of these, but Remove() is inherently sane so this is fine
- demanders.Remove(P)
-
- for(var/dir in P.ducts)
- if(P.ducts[dir] == src)
- P.ducts -= dir
- if(!ducts.len) //there were no ducts, so it was a direct connection. we destroy ourselves since a ductnet with only one plumber and no ducts is worthless
- destroy_network()
-///we combine ductnets. this occurs when someone connects to seperate sets of fluid ducts
-/datum/ductnet/proc/assimilate(datum/ductnet/D)
- ducts.Add(D.ducts)
- suppliers.Add(D.suppliers)
- demanders.Add(D.demanders)
- for(var/A in D.suppliers + D.demanders)
- var/datum/component/plumbing/P = A
- for(var/s in P.ducts)
- if(P.ducts[s] != D)
- continue
- P.ducts[s] = src //all your ducts are belong to us
- for(var/A in D.ducts)
- var/obj/machinery/duct/M = A
- M.duct = src //forget your old master
-
- destroy_network()
-///destroy the network and tell all our ducts and plumbers we are gone
-/datum/ductnet/proc/destroy_network(delete=TRUE)
- for(var/A in suppliers + demanders)
- remove_plumber(A)
- for(var/A in ducts)
- var/obj/machinery/duct/D = A
- D.duct = null
- if(delete) //I don't want code to run with qdeleted objects because that can never be good, so keep this in-case the ductnet has some business left to attend to before commiting suicide
- qdel(src)
diff --git a/code/datums/elements/ai_flee_when_hurt.dm b/code/datums/elements/ai_flee_when_hurt.dm
new file mode 100644
index 0000000000..99971772d3
--- /dev/null
+++ b/code/datums/elements/ai_flee_when_hurt.dm
@@ -0,0 +1,45 @@
+/**
+ * Attached to a mob with an AI controller, simply sets a flag on whether or not to run away based on current health values.
+ */
+/datum/element/ai_flee_while_injured
+ /// Health value to end fleeing if at or above
+ var/stop_fleeing_at
+ /// Health value to start fleeing if at or below
+ var/start_fleeing_below
+
+/datum/element/ai_flee_while_injured/Attach(datum/target, stop_fleeing_at = 1, start_fleeing_below = 0.5)
+ . = ..()
+ if(!isliving(target))
+ return ELEMENT_INCOMPATIBLE
+ var/mob/living/living_target = target
+ if(!living_target.ai_controller)
+ return ELEMENT_INCOMPATIBLE
+ src.stop_fleeing_at = stop_fleeing_at
+ src.start_fleeing_below = start_fleeing_below
+ RegisterSignal(target, COMSIG_LIVING_HEALTH_UPDATE, PROC_REF(on_health_changed))
+
+/datum/element/ai_flee_while_injured/Detach(datum/source)
+ . = ..()
+ UnregisterSignal(source, COMSIG_LIVING_HEALTH_UPDATE)
+
+/// When the mob's health changes, check what the blackboard state should be
+/datum/element/ai_flee_while_injured/proc/on_health_changed(mob/living/source)
+ SIGNAL_HANDLER
+
+ if (!source.ai_controller)
+ return
+
+ var/current_health_percentage = source.health / source.maxHealth
+ if (source.ai_controller.blackboard[BB_BASIC_MOB_FLEEING])
+ if (current_health_percentage < stop_fleeing_at)
+ return
+ source.ai_controller.CancelActions() // Stop fleeing go back to whatever you were doing
+ source.ai_controller.set_blackboard_key(BB_BASIC_MOB_FLEEING, FALSE)
+ return
+
+ if (current_health_percentage > start_fleeing_below)
+ return
+ source.ai_controller.CancelActions()
+ source.ai_controller.set_blackboard_key(BB_BASIC_MOB_FLEEING, TRUE)
+ ///we don't want ai's to run forever this makes us run for 10 seconds then fight until
+ addtimer(CALLBACK(source.ai_controller, TYPE_PROC_REF(/datum/ai_controller, set_blackboard_key), BB_BASIC_MOB_FLEEING, FALSE), 10 SECONDS, flags = TIMER_UNIQUE)
diff --git a/code/datums/elements/bed_tuckable.dm b/code/datums/elements/bed_tuckable.dm
new file mode 100644
index 0000000000..67c6d86a10
--- /dev/null
+++ b/code/datums/elements/bed_tuckable.dm
@@ -0,0 +1,66 @@
+/// Tucking element, for things that can be tucked into bed.
+/datum/element/bed_tuckable
+ /// our pixel_x offset - how much the item moves x when in bed (+x is closer to the pillow)
+ var/x_offset = 0
+ /// our pixel_y offset - how much the item move y when in bed (-y is closer to the middle)
+ var/y_offset = 0
+ /// our rotation degree - how many degrees we need to turn the item to get to the left/right side
+ var/rotation_degree = 0
+ /// our starting angle for the item
+ var/starting_angle = 0
+
+/datum/element/bed_tuckable/Attach(obj/target, x = 0, y = 0, rotation = 0)
+ . = ..()
+ if(!isitem(target))
+ return ELEMENT_INCOMPATIBLE
+
+ x_offset = x
+ y_offset = y
+ starting_angle = rotation
+ RegisterSignal(target, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(tuck_into_bed))
+
+/datum/element/bed_tuckable/Detach(obj/target)
+ . = ..()
+ UnregisterSignal(target, list(COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_PICKUP))
+
+/**
+ * Tuck our object into bed.
+ *
+ * tucked - the object being tucked
+ * target_bed - the bed we're tucking them into
+ * tucker - the guy doing the tucking
+ */
+/datum/element/bed_tuckable/proc/tuck_into_bed(obj/item/tucked, obj/structure/bed/target_bed, mob/living/tucker)
+ SIGNAL_HANDLER
+
+ if(!istype(target_bed))
+ return
+
+ if(!tucker.transferItemToLoc(tucked, target_bed.drop_location()))
+ return
+
+ to_chat(tucker, span_notice("You lay [tucked] out on [target_bed]."))
+ tucked.dir = target_bed.dir
+ tucked.pixel_x = target_bed.dir & EAST ? -x_offset : x_offset
+ tucked.pixel_y = y_offset
+ tucked.layer = ABOVE_MOB_LAYER
+ tucked.plane = -2
+ if(starting_angle)
+ rotation_degree = target_bed.dir & EAST ? starting_angle + 180 : starting_angle
+ tucked.transform = turn(tucked.transform, rotation_degree)
+ RegisterSignal(tucked, COMSIG_ITEM_PICKUP, PROC_REF(untuck))
+
+ return COMPONENT_NO_AFTERATTACK
+
+/**
+ * If we rotate our object, then we need to un-rotate it when it's picked up
+ *
+ * tucked - the object that is tucked
+ */
+/datum/element/bed_tuckable/proc/untuck(obj/item/tucked)
+ SIGNAL_HANDLER
+
+ tucked.transform = turn(tucked.transform, -rotation_degree)
+ tucked.layer = initial(tucked.layer)
+ tucked.plane = initial(tucked.plane)
+ UnregisterSignal(tucked, COMSIG_ITEM_PICKUP)
diff --git a/code/datums/elements/digitalcamo.dm b/code/datums/elements/digitalcamo.dm
index 504a0342f8..ac893c88e1 100644
--- a/code/datums/elements/digitalcamo.dm
+++ b/code/datums/elements/digitalcamo.dm
@@ -15,7 +15,6 @@
var/image/img = image(loc = target)
img.override = TRUE
attached_mobs[target] = img
- HideFromAIHuds(target)
/datum/element/digitalcamo/Detach(datum/target)
. = ..()
@@ -23,21 +22,7 @@
for(var/mob/living/silicon/ai/AI in GLOB.player_list)
AI.client.images -= attached_mobs[target]
attached_mobs -= target
- UnhideFromAIHuds(target)
-/datum/element/digitalcamo/proc/HideFromAIHuds(mob/living/target)
- for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
- var/datum/atom_hud/M = GLOB.huds[AI.med_hud]
- M.hide_single_atomhud_from(AI,target)
- var/datum/atom_hud/S = GLOB.huds[AI.sec_hud]
- S.hide_single_atomhud_from(AI,target)
-
-/datum/element/digitalcamo/proc/UnhideFromAIHuds(mob/living/target)
- for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
- var/datum/atom_hud/M = GLOB.huds[AI.med_hud]
- M.unhide_single_atomhud_from(AI,target)
- var/datum/atom_hud/S = GLOB.huds[AI.sec_hud]
- S.unhide_single_atomhud_from(AI,target)
/datum/element/digitalcamo/proc/on_examine(datum/source, mob/M)
to_chat(M, "[source.p_their()] skin seems to be shifting and morphing like is moving around below it.")
diff --git a/code/datums/elements/relay_attackers.dm b/code/datums/elements/relay_attackers.dm
new file mode 100644
index 0000000000..9011fa3e11
--- /dev/null
+++ b/code/datums/elements/relay_attackers.dm
@@ -0,0 +1,63 @@
+/**
+ * This element registers to a shitload of signals which can signify "someone attacked me".
+ * If anyone does it sends a single "someone attacked me" signal containing details about who done it.
+ * This prevents other components and elements from having to register to the same list of a million signals, should be more maintainable in one place.
+ */
+/datum/element/relay_attackers
+
+/datum/element/relay_attackers/Attach(datum/target)
+ . = ..()
+ // Boy this sure is a lot of ways to tell us that someone tried to attack us
+ RegisterSignal(target, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby))
+ RegisterSignal(target, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_PAW), PROC_REF(on_attack_generic))
+ RegisterSignal(target, list(COMSIG_ATOM_ATTACK_ANIMAL), PROC_REF(on_attack_npc))
+ RegisterSignal(target, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act))
+ RegisterSignal(target, COMSIG_ATOM_HITBY, PROC_REF(on_hitby))
+
+/datum/element/relay_attackers/Detach(datum/source, ...)
+ . = ..()
+ UnregisterSignal(source, list(
+ COMSIG_PARENT_ATTACKBY,
+ COMSIG_ATOM_ATTACK_HAND,
+ COMSIG_ATOM_ATTACK_PAW,
+ COMSIG_ATOM_ATTACK_ANIMAL,
+ COMSIG_ATOM_BULLET_ACT,
+ COMSIG_ATOM_HITBY,
+ ))
+
+/datum/element/relay_attackers/proc/on_attackby(atom/target, obj/item/weapon, mob/attacker)
+ SIGNAL_HANDLER
+ if(weapon.force)
+ relay_attacker(target, attacker)
+
+/datum/element/relay_attackers/proc/on_attack_generic(atom/target, mob/living/attacker, list/modifiers)
+ SIGNAL_HANDLER
+ relay_attacker(target, attacker)
+
+/datum/element/relay_attackers/proc/on_attack_npc(atom/target, mob/living/attacker)
+ SIGNAL_HANDLER
+ relay_attacker(target, attacker)
+
+/datum/element/relay_attackers/proc/on_bullet_act(atom/target, obj/projectile/hit_projectile)
+ SIGNAL_HANDLER
+ if(hit_projectile.nodamage)
+ return
+ if(!ismob(hit_projectile.firer))
+ return
+ relay_attacker(target, hit_projectile.firer)
+
+/datum/element/relay_attackers/proc/on_hitby(atom/target, atom/movable/hit_atom, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
+ SIGNAL_HANDLER
+ if(!isitem(hit_atom))
+ return
+ var/obj/item/hit_item = hit_atom
+ if(!hit_item.throwforce)
+ return
+ var/mob/thrown_by = hit_item.thrownby
+ if(!ismob(thrown_by))
+ return
+ relay_attacker(target, thrown_by)
+
+/// Send out a signal identifying whoever just attacked us (usually a mob but sometimes a mech or turret)
+/datum/element/relay_attackers/proc/relay_attacker(atom/victim, atom/attacker)
+ SEND_SIGNAL(victim, COMSIG_ATOM_WAS_ATTACKED, attacker)
diff --git a/code/datums/elements/retaliate.dm b/code/datums/elements/retaliate.dm
new file mode 100644
index 0000000000..fe3a56bf63
--- /dev/null
+++ b/code/datums/elements/retaliate.dm
@@ -0,0 +1,23 @@
+/**
+ * Attached to a mob with an AI controller, passes things which have damaged it to a blackboard.
+ * The AI controller is responsible for doing anything with that information.
+ */
+/datum/element/ai_retaliate
+
+/datum/element/ai_retaliate/Attach(datum/target)
+ . = ..()
+ if(!ismob(target))
+ return ELEMENT_INCOMPATIBLE
+ target.AddElement(/datum/element/relay_attackers)
+ RegisterSignal(target, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(on_attacked))
+
+/datum/element/ai_retaliate/Detach(datum/source, ...)
+ . = ..()
+ UnregisterSignal(source, COMSIG_ATOM_WAS_ATTACKED)
+
+/// Add an attacking atom to a blackboard list of things which attacked us
+/datum/element/ai_retaliate/proc/on_attacked(mob/victim, atom/attacker)
+ SIGNAL_HANDLER
+ if (!victim.ai_controller)
+ return
+ victim.ai_controller.insert_blackboard_key_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker)
diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index fe858fa948..991b69763b 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -6,10 +6,6 @@
var/key_third_person = "" //This will also call the emote
var/message = "" //Message displayed when emote is used
var/message_mime = "" //Message displayed if the user is a mime
- var/message_alien = "" //Message displayed if the user is a grown alien
- var/message_larva = "" //Message displayed if the user is an alien larva
- var/message_robot = "" //Message displayed if the user is a robot
- var/message_AI = "" //Message displayed if the user is an AI
var/message_monkey = "" //Message displayed if the user is a monkey
var/message_simple = "" //Message to display if the user is a simple_animal
var/message_param = "" //Message to display if a param was given
@@ -115,7 +111,7 @@
pitch_modifier += (10 - STASTR) * 0.03
return clamp(final_pitch + pitch_modifier, 0.5, 2)
-
+
/datum/emote/proc/get_env(mob/living/user)
@@ -184,14 +180,6 @@
return "makes a [pick("strong ", "weak ", "")]noise."
if(user.mind && user.mind.miming && message_mime)
. = message_mime
- if(isalienadult(user) && message_alien)
- . = message_alien
- else if(islarva(user) && message_larva)
- . = message_larva
- else if(iscyborg(user) && message_robot)
- . = message_robot
- else if(isAI(user) && message_AI)
- . = message_AI
else if(ismonkey(user) && message_monkey)
. = message_monkey
else if(isanimal(user) && message_simple)
diff --git a/code/datums/ert.dm b/code/datums/ert.dm
deleted file mode 100644
index 1a5e83153f..0000000000
--- a/code/datums/ert.dm
+++ /dev/null
@@ -1,73 +0,0 @@
-/datum/ert
- var/mobtype = /mob/living/carbon/human
- var/team = /datum/team/ert
- var/opendoors = TRUE
- var/leader_role = /datum/antagonist/ert/commander
- var/enforce_human = TRUE
- var/roles = list(/datum/antagonist/ert/security, /datum/antagonist/ert/medic, /datum/antagonist/ert/engineer) //List of possible roles to be assigned to ERT members.
- var/rename_team
- var/code
- var/mission = "Assist the station."
- var/teamsize = 5
- var/polldesc
-
-/datum/ert/New()
- if (!polldesc)
- polldesc = ""
-
-/datum/ert/blue
- opendoors = FALSE
- code = "Blue"
-
-/datum/ert/amber
- code = "Amber"
-
-/datum/ert/red
- leader_role = /datum/antagonist/ert/commander/red
- roles = list(/datum/antagonist/ert/security/red, /datum/antagonist/ert/medic/red, /datum/antagonist/ert/engineer/red)
- code = "Red"
-
-/datum/ert/deathsquad
- roles = list(/datum/antagonist/ert/deathsquad)
- leader_role = /datum/antagonist/ert/deathsquad/leader
- rename_team = "Deathsquad"
- code = "Delta"
- mission = "Leave no witnesses."
- polldesc = ""
-
-/datum/ert/centcom_official
- code = "Green"
- teamsize = 1
- opendoors = FALSE
- leader_role = /datum/antagonist/official
- roles = list(/datum/antagonist/official)
- rename_team = "CentCom Officials"
- polldesc = ""
-
-/datum/ert/centcom_official/New()
- mission = "Conduct a routine performance review of [station_name()] and its Captain."
-
-/datum/ert/inquisition
- roles = list(/datum/antagonist/ert/chaplain/inquisitor, /datum/antagonist/ert/security/inquisitor, /datum/antagonist/ert/medic/inquisitor)
- leader_role = /datum/antagonist/ert/commander/inquisitor
- rename_team = "Inquisition"
- mission = "Destroy any traces of paranormal activity aboard the station."
- polldesc = ""
-
-/datum/ert/janitor
- roles = list(/datum/antagonist/ert/janitor, /datum/antagonist/ert/janitor/heavy)
- leader_role = /datum/antagonist/ert/janitor/heavy
- teamsize = 4
- opendoors = FALSE
- rename_team = "Janitor"
- mission = "Clean up EVERYTHING."
- polldesc = ""
-
-/datum/ert/intern
- roles = list(/datum/antagonist/ert/intern)
- leader_role = /datum/antagonist/ert/intern/leader
- teamsize = 7
- opendoors = FALSE
- rename_team = "Horde of Interns"
- mission = "Assist in conflict resolution."
- polldesc = ""
diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm
index 6c2ef98ea4..422732fcd5 100644
--- a/code/datums/explosion.dm
+++ b/code/datums/explosion.dm
@@ -282,12 +282,6 @@ GLOBAL_LIST_EMPTY(explosions)
if(GLOB.Debug2)
log_world("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.")
- if(running) //if we aren't in a hurry
- //Machines which report explosions.
- for(var/array in GLOB.doppler_arrays)
- var/obj/machinery/doppler_array/A = array
- A.sense_explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, took,orig_dev_range, orig_heavy_range, orig_light_range)
-
++stopped
qdel(src)
diff --git a/code/datums/gods/_patron.dm b/code/datums/gods/_patron.dm
index 8090469dc6..bc1adc4f07 100644
--- a/code/datums/gods/_patron.dm
+++ b/code/datums/gods/_patron.dm
@@ -32,3 +32,14 @@ GLOBAL_LIST_EMPTY(preference_patrons)
var/t2
/// Final tier spell
var/t3
+
+ ///our traits thats applied by set_patron and removed when changed
+ var/list/added_traits
+
+/datum/patron/proc/on_gain(mob/living/pious)
+ for(var/trait in added_traits)
+ ADD_TRAIT(pious, trait, "[type]")
+
+/datum/patron/proc/on_remove(mob/living/pious)
+ for(var/trait in added_traits)
+ REMOVE_TRAIT(pious, trait, "[type]")
diff --git a/code/datums/gods/patrons/divine_pantheon.dm b/code/datums/gods/patrons/divine_pantheon.dm
index 6c84f3f62d..a9f24e17e2 100644
--- a/code/datums/gods/patrons/divine_pantheon.dm
+++ b/code/datums/gods/patrons/divine_pantheon.dm
@@ -56,13 +56,14 @@
/datum/patron/divine/necra
name = "Necra"
domain = "Force of Death and Decay"
- desc = "The Veiled Lady, a feared but respected Force and keeper of the dead."
+ desc = "The Undermaiden, also known as the Veiled Lady. A feared but respected Force and keeper of the dead."
flaws = "Unchanging, Apathetic, Strict"
worshippers = "Dark Elves, Gravekeepers, Mourners"
sins = "Undeath"
t0 = /obj/effect/proc_holder/spell/invoked/lesser_heal
t1 = /obj/effect/proc_holder/spell/targeted/burialrite
t2 = /obj/effect/proc_holder/spell/targeted/churn
+ t3 = /obj/effect/proc_holder/spell/targeted/soulspeak
// ............ SAINTS ..................
/datum/patron/divine/ravox
diff --git a/code/datums/heritage.dm b/code/datums/heritage.dm
index db8a470136..c235453124 100644
--- a/code/datums/heritage.dm
+++ b/code/datums/heritage.dm
@@ -319,12 +319,10 @@
return FALSE
for(var/mob/living/carbon/human/H in family_icons)
if(toggle_true)
- iconer.family_UI = FALSE
iconer.client.images.Remove(family_icons[H])
continue
if(!H || H == iconer)
continue
- iconer.family_UI = TRUE
iconer.client.images.Add(family_icons[H])
//Sloppy bandaid way to apply latejoin family member icons.
@@ -354,10 +352,28 @@
if(famrole == FAMILY_ADOPTED)
return "adopted"
+/*
+* I made a attempt to put spouse mob into family datum
+* but the complications of creating new families when
+* people get married during the round and merging families
+* just complicated it too much. -IP
+*/
+/mob/living/carbon/human/proc/ApplySpouseUI(toggle_true = FALSE)
+ if(!spouse_mob)
+ return
+ if(!spouse_indicator)
+ spouse_indicator = new('icons/relations.dmi', loc = spouse_mob, icon_state = "related")
+ if(toggle_true)
+ client.images.Remove(spouse_indicator)
+ return
+ client.images.Add(spouse_indicator)
+
//Lists the users family. Unsure where to put this other than here.
/mob/living/carbon/human/verb/ReturnFamilyList()
set name = "List Family"
set category = "Memory"
+ if(spouse_mob)
+ to_chat(src, span_info("[spouse_mob.real_name] is the name of your lover."))
if(family_datum)
family_datum.ListFamily(src)
else
@@ -367,8 +383,14 @@
/mob/living/carbon/human/verb/ToggleFamilyUI()
set name = "Toggle Family UI"
set category = "Memory"
+ if(spouse_mob)
+ ApplySpouseUI(family_UI)
if(family_datum)
family_datum.ApplyUI(src, family_UI)
- to_chat(src, "FamilyUI Toggled [family_UI ? "On" : "Off"]")
else
to_chat(src, "Your not part of any notable family.")
+ if(family_UI)
+ family_UI = FALSE
+ else
+ family_UI = TRUE
+ to_chat(src, "FamilyUI Toggled [family_UI ? "On" : "Off"]")
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
deleted file mode 100644
index 7f7b4c1149..0000000000
--- a/code/datums/holocall.dm
+++ /dev/null
@@ -1,413 +0,0 @@
-#define HOLOPAD_MAX_DIAL_TIME 200
-
-#define HOLORECORD_DELAY "delay"
-#define HOLORECORD_SAY "say"
-#define HOLORECORD_SOUND "sound"
-#define HOLORECORD_LANGUAGE "lang"
-#define HOLORECORD_PRESET "preset"
-#define HOLORECORD_RENAME "rename"
-
-#define HOLORECORD_MAX_LENGTH 200
-
-/mob/camera/aiEye/remote/holo/setLoc()
- . = ..()
- var/obj/machinery/holopad/H = origin
- H?.move_hologram(eye_user, loc)
-
-/obj/machinery/holopad/remove_eye_control(mob/living/user)
- if(user.client)
- user.reset_perspective(null)
- user.remote_control = null
-
-//this datum manages it's own references
-
-/datum/holocall
- var/mob/living/user //the one that called
- var/obj/machinery/holopad/calling_holopad //the one that sent the call
- var/obj/machinery/holopad/connected_holopad //the one that answered the call (may be null)
- var/list/dialed_holopads //all things called, will be cleared out to just connected_holopad once answered
-
- var/mob/camera/aiEye/remote/holo/eye //user's eye, once connected
- var/obj/effect/overlay/holo_pad_hologram/hologram //user's hologram, once connected
- var/datum/action/innate/end_holocall/hangup //hangup action
-
- var/call_start_time
-
-//creates a holocall made by `caller` from `calling_pad` to `callees`
-/datum/holocall/New(mob/living/caller, obj/machinery/holopad/calling_pad, list/callees)
- call_start_time = world.time
- user = caller
- calling_pad.outgoing_call = src
- calling_holopad = calling_pad
- dialed_holopads = list()
-
- for(var/I in callees)
- var/obj/machinery/holopad/H = I
- if(!QDELETED(H) && H.is_operational())
- dialed_holopads += H
- H.say("Incoming call.")
- LAZYADD(H.holo_calls, src)
-
- if(!dialed_holopads.len)
- calling_pad.say("Connection failure.")
- qdel(src)
- return
-
- testing("Holocall started")
-
-//cleans up ALL references :)
-/datum/holocall/Destroy()
- QDEL_NULL(hangup)
-
- if(!QDELETED(eye))
- QDEL_NULL(eye)
-
- if(connected_holopad && !QDELETED(hologram))
- hologram = null
- connected_holopad.clear_holo(user)
-
- user = null
-
- //Hologram survived holopad destro
- if(!QDELETED(hologram))
- hologram.HC = null
- QDEL_NULL(hologram)
-
- for(var/I in dialed_holopads)
- var/obj/machinery/holopad/H = I
- LAZYREMOVE(H.holo_calls, src)
- dialed_holopads.Cut()
-
- if(calling_holopad)
- calling_holopad.outgoing_call = null
- calling_holopad.SetLightsAndPower()
- calling_holopad = null
- if(connected_holopad)
- connected_holopad.SetLightsAndPower()
- connected_holopad = null
-
- testing("Holocall destroyed")
-
- return ..()
-
-//Gracefully disconnects a holopad `H` from a call. Pads not in the call are ignored. Notifies participants of the disconnection
-/datum/holocall/proc/Disconnect(obj/machinery/holopad/H)
- testing("Holocall disconnect")
- if(H == connected_holopad)
- var/area/A = get_area(connected_holopad)
- calling_holopad.say("[A] holopad disconnected.")
- else if(H == calling_holopad && connected_holopad)
- connected_holopad.say("[user] disconnected.")
-
- ConnectionFailure(H, TRUE)
-
-//Forcefully disconnects a holopad `H` from a call. Pads not in the call are ignored.
-/datum/holocall/proc/ConnectionFailure(obj/machinery/holopad/H, graceful = FALSE)
- testing("Holocall connection failure: graceful [graceful]")
- if(H == connected_holopad || H == calling_holopad)
- if(!graceful && H != calling_holopad)
- calling_holopad.say("Connection failure.")
- qdel(src)
- return
-
- LAZYREMOVE(H.holo_calls, src)
- dialed_holopads -= H
- if(!dialed_holopads.len)
- if(graceful)
- calling_holopad.say("Call rejected.")
- testing("No recipients, terminating")
- qdel(src)
-
-//Answers a call made to a holopad `H` which cannot be the calling holopad. Pads not in the call are ignored
-/datum/holocall/proc/Answer(obj/machinery/holopad/H)
- testing("Holocall answer")
- if(H == calling_holopad)
- CRASH("How cute, a holopad tried to answer itself.")
-
- if(!(H in dialed_holopads))
- return
-
- if(connected_holopad)
- CRASH("Multi-connection holocall")
-
- for(var/I in dialed_holopads)
- if(I == H)
- continue
- Disconnect(I)
-
- for(var/I in H.holo_calls)
- var/datum/holocall/HC = I
- if(HC != src)
- HC.Disconnect(H)
-
- connected_holopad = H
-
- if(!Check())
- return
-
- hologram = H.activate_holo(user)
- hologram.HC = src
-
- //eyeobj code is horrid, this is the best copypasta I could make
- eye = new
- eye.origin = H
- eye.eye_initialized = TRUE
- eye.eye_user = user
- eye.name = "Camera Eye ([user.name])"
- user.remote_control = eye
- user.reset_perspective(eye)
- eye.setLoc(H.loc)
-
- hangup = new(eye, src)
- hangup.Grant(user)
-
-//Checks the validity of a holocall and qdels itself if it's not. Returns TRUE if valid, FALSE otherwise
-/datum/holocall/proc/Check()
- for(var/I in dialed_holopads)
- var/obj/machinery/holopad/H = I
- if(!H.is_operational())
- ConnectionFailure(H)
-
- if(QDELETED(src))
- return FALSE
-
- . = !QDELETED(user) && !user.incapacitated() && !QDELETED(calling_holopad) && calling_holopad.is_operational() && user.loc == calling_holopad.loc
-
- if(.)
- if(!connected_holopad)
- . = world.time < (call_start_time + HOLOPAD_MAX_DIAL_TIME)
- if(!.)
- calling_holopad.say("No answer received.")
- calling_holopad.temp = ""
-
- if(!.)
- testing("Holocall Check fail")
- qdel(src)
-
-/datum/action/innate/end_holocall
- name = "End Holocall"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "camera_off"
- var/datum/holocall/hcall
-
-/datum/action/innate/end_holocall/New(Target, datum/holocall/HC)
- ..()
- hcall = HC
-
-/datum/action/innate/end_holocall/Activate()
- hcall.Disconnect(hcall.calling_holopad)
-
-
-//RECORDS
-/datum/holorecord
- var/caller_name = "Unknown" //Caller name
- var/image/caller_image
- var/list/entries = list()
- var/language = /datum/language/common //Initial language, can be changed by HOLORECORD_LANGUAGE entries
-
-/datum/holorecord/proc/set_caller_image(mob/user)
- var/olddir = user.dir
- user.setDir(SOUTH)
- caller_image = image(user)
- user.setDir(olddir)
-
-/obj/item/disk/holodisk
- name = "holorecord disk"
- desc = ""
- icon_state = "holodisk"
- obj_flags = UNIQUE_RENAME
- custom_materials = list(/datum/material/iron = 100, /datum/material/glass = 100)
- var/datum/holorecord/record
- //Preset variables
- var/preset_image_type
- var/preset_record_text
-
-/obj/item/disk/holodisk/Initialize(mapload)
- . = ..()
- if(preset_record_text)
- INVOKE_ASYNC(src, PROC_REF(build_record))
-
-/obj/item/disk/holodisk/Destroy()
- QDEL_NULL(record)
- return ..()
-
-/obj/item/disk/holodisk/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/disk/holodisk))
- var/obj/item/disk/holodisk/holodiskOriginal = W
- if (holodiskOriginal.record)
- if (!record)
- record = new
- record.caller_name = holodiskOriginal.record.caller_name
- record.caller_image = holodiskOriginal.record.caller_image
- record.entries = holodiskOriginal.record.entries.Copy()
- record.language = holodiskOriginal.record.language
- to_chat(user, "I copy the record from [holodiskOriginal] to [src] by connecting the ports!")
- name = holodiskOriginal.name
- else
- to_chat(user, "[holodiskOriginal] has no record on it!")
- ..()
-
-/obj/item/disk/holodisk/proc/build_record()
- record = new
- var/list/lines = splittext(preset_record_text,"\n")
- for(var/line in lines)
- var/prepared_line = trim(line)
- if(!length(prepared_line))
- continue
- var/splitpoint = findtext(prepared_line," ")
- if(!splitpoint)
- continue
- var/command = copytext(prepared_line,1,splitpoint)
- var/value = copytext(prepared_line,splitpoint+1)
- switch(command)
- if("DELAY")
- var/delay_value = text2num(value)
- if(!delay_value)
- continue
- record.entries += list(list(HOLORECORD_DELAY,delay_value))
- if("NAME")
- if(!record.caller_name)
- record.caller_name = value
- else
- record.entries += list(list(HOLORECORD_RENAME,value))
- if("SAY")
- record.entries += list(list(HOLORECORD_SAY,value))
- if("SOUND")
- record.entries += list(list(HOLORECORD_SOUND,value))
- if("LANGUAGE")
- var/lang_type = text2path(value)
- if(ispath(lang_type,/datum/language))
- record.entries += list(list(HOLORECORD_LANGUAGE,lang_type))
- if("PRESET")
- var/preset_type = text2path(value)
- if(ispath(preset_type,/datum/preset_holoimage))
- record.entries += list(list(HOLORECORD_PRESET,preset_type))
- if(!preset_image_type)
- record.caller_image = image('icons/mob/animal.dmi',"old")
- else
- var/datum/preset_holoimage/H = new preset_image_type
- record.caller_image = H.build_image()
-
-//These build caller image from outfit and some additional data, for use by mappers for ruin holorecords
-/datum/preset_holoimage
- var/nonhuman_mobtype //Fill this if you just want something nonhuman
- var/outfit_type
- var/species_type = /datum/species/human
-
-/datum/preset_holoimage/proc/build_image()
- if(nonhuman_mobtype)
- var/mob/living/L = nonhuman_mobtype
- . = image(initial(L.icon),initial(L.icon_state))
- else
- var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy("HOLODISK_PRESET")
- if(species_type)
- mannequin.set_species(species_type)
- if(outfit_type)
- mannequin.equipOutfit(outfit_type,TRUE)
- mannequin.setDir(SOUTH)
- COMPILE_OVERLAYS(mannequin)
- . = image(mannequin)
- unset_busy_human_dummy("HOLODISK_PRESET")
-
-/obj/item/disk/holodisk/example
- preset_image_type = /datum/preset_holoimage/clown
- preset_record_text = {"
- NAME Clown
- DELAY 10
- SAY Why did the chaplain cross the maint ?
- DELAY 20
- SAY He wanted to get to the other side!
- SOUND clownstep
- DELAY 30
- LANGUAGE /datum/language/narsie
- SAY Helped him get there!
- DELAY 10
- SAY ALSO IM SECRETLY A GORILLA
- DELAY 10
- PRESET /datum/preset_holoimage/gorilla
- NAME Gorilla
- LANGUAGE /datum/language/common
- SAY OOGA
- DELAY 20"}
-
-/datum/preset_holoimage/engineer
- outfit_type = /datum/outfit/job/engineer
-
-/datum/preset_holoimage/engineer/rig
- outfit_type = /datum/outfit/job/engineer/gloved/rig
-
-/datum/preset_holoimage/engineer/ce
- outfit_type = /datum/outfit/job/ce
-
-/datum/preset_holoimage/engineer/ce/rig
- outfit_type = /datum/outfit/job/engineer/gloved/rig
-
-/datum/preset_holoimage/engineer/atmos
- outfit_type = /datum/outfit/job/atmos
-
-/datum/preset_holoimage/engineer/atmos/rig
- outfit_type = /datum/outfit/job/engineer/gloved/rig
-
-/datum/preset_holoimage/researcher
- outfit_type = /datum/outfit/job/scientist
-
-/datum/preset_holoimage/captain
- outfit_type = /datum/outfit/job/captain
-
-/datum/preset_holoimage/nanotrasenprivatesecurity
- outfit_type = /datum/outfit/nanotrasensoldiercorpse2
-
-/datum/preset_holoimage/gorilla
- nonhuman_mobtype = /mob/living/simple_animal/hostile/gorilla
-
-/datum/preset_holoimage/corgi
- nonhuman_mobtype = /mob/living/simple_animal/pet/dog/corgi
-
-/datum/preset_holoimage/clown
- outfit_type = /datum/outfit/job/clown
-
-/obj/item/disk/holodisk/donutstation/whiteship
- name = "Blackbox Print-out #DS024"
- desc = ""
- preset_image_type = /datum/preset_holoimage/engineer/ce
- preset_record_text = {"
- NAME Geysr Shorthalt
- SAY Engine renovations complete and the ships been loaded. We all ready?
- DELAY 25
- PRESET /datum/preset_holoimage/engineer
- NAME Jacob Ullman
- SAY Lets blow this popsicle stand of a station.
- DELAY 20
- PRESET /datum/preset_holoimage/engineer/atmos
- NAME Lindsey Cuffler
- SAY Uh, sir? Shouldn't we call for a secondary shuttle? The bluespace drive on this thing made an awfully weird noise when we jumped here..
- DELAY 30
- PRESET /datum/preset_holoimage/engineer/ce
- NAME Geysr Shorthalt
- SAY Pah! Ship techie at the dock said to give it a good few kicks if it started acting up, let me just..
- DELAY 25
- SOUND punch
- SOUND sparks
- DELAY 10
- SOUND punch
- SOUND sparks
- DELAY 10
- SOUND punch
- SOUND sparks
- SOUND warpspeed
- DELAY 15
- PRESET /datum/preset_holoimage/engineer/atmos
- NAME Lindsey Cuffler
- SAY Uhh.. is it supposed to be doing that??
- DELAY 15
- PRESET /datum/preset_holoimage/engineer/ce
- NAME Geysr Shorthalt
- SAY See? Working as intended. Now, are we all ready?
- DELAY 10
- PRESET /datum/preset_holoimage/engineer
- NAME Jacob Ullman
- SAY Is it supposed to be glowing like that?
- DELAY 20
- SOUND explosion
-
- "}
diff --git a/code/datums/keybinding/admin.dm b/code/datums/keybinding/admin.dm
index e3c77dc1e4..60addd772b 100644
--- a/code/datums/keybinding/admin.dm
+++ b/code/datums/keybinding/admin.dm
@@ -2,7 +2,7 @@
category = CATEGORY_ADMIN
weight = WEIGHT_ADMIN
-/*
+
/datum/keybinding/admin/admin_say
hotkey_keys = list("F3")
name = "admin_say"
@@ -72,4 +72,4 @@
/datum/keybinding/admin/deadsay/down(client/user)
user.get_dead_say()
return TRUE
-*/
+
diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm
index 036189bd4d..a498fcd0f4 100644
--- a/code/datums/looping_sounds/_looping_sound.dm
+++ b/code/datums/looping_sounds/_looping_sound.dm
@@ -1,5 +1,5 @@
/*
- output_atoms (list of atoms) The destination(s) for the sounds
+ parent (the source of the sound) The source the sound comes from
mid_sounds (list or soundfile) Since this can be either a list or a single soundfile you can have random sounds. May contain further lists but must contain a soundfile at the end.
mid_length (num) The length to wait between playing mid_sounds
@@ -15,7 +15,7 @@
direct (bool) If true plays directly to provided atoms instead of from them
*/
/datum/looping_sound
- var/list/atom/output_atoms
+ var/atom/parent
var/mid_sounds
var/mid_length
var/start_sound
@@ -33,39 +33,49 @@
var/persistent_loop = FALSE //we stay in the client's played_loops so we keep updating volume even when out of range
var/cursound
var/list/thingshearing = list()
- var/ignore_wallz = TRUE
+ var/ignore_walls = TRUE
var/timerid
+ /// Has the looping started yet?
+ var/loop_started = FALSE
+ ///our sound channel
+ var/channel
-/datum/looping_sound/New(list/_output_atoms=list(), start_immediately=FALSE, _direct=FALSE)
+/datum/looping_sound/New(_parent, start_immediately=FALSE, _direct=FALSE, _channel = 0)
if(!mid_sounds)
WARNING("A looping sound datum was created without sounds to play.")
return
+ if(islist(_parent))
+ WARNING("A looping sound datum was created using a list, this is no longer allowed please change to a parent")
+ return
- output_atoms = _output_atoms
+ parent = _parent
direct = _direct
+ channel = _channel
if(start_immediately)
start()
/datum/looping_sound/Destroy()
stop()
- output_atoms = null
+ parent = null
return ..()
-/datum/looping_sound/proc/start(atom/add_thing)
+/datum/looping_sound/proc/start(atom/on_behalf_of)
stopped = FALSE
- if(add_thing)
- output_atoms |= add_thing
+ if(on_behalf_of)
+ set_parent(on_behalf_of)
+ loop_started = TRUE
// if(timerid)
// return
on_start()
-/datum/looping_sound/proc/stop(atom/remove_thing)
+/datum/looping_sound/proc/stop(null_parent)
if(!stopped)
stopped = TRUE
- if(remove_thing)
- output_atoms -= remove_thing
+ if(null_parent)
+ set_parent(null)
on_stop()
+ loop_started = FALSE
// if(!timerid)
// return
// deltimer(timerid)
@@ -87,41 +97,41 @@
// timerid = addtimer(CALLBACK(src, PROC_REF(sound_loop), world.time), mid_length, TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_LOOP)
/datum/looping_sound/proc/play(soundfile)
- var/list/atoms_cache = output_atoms
var/sound/S = soundfile
if(!istype(S))
S = sound(soundfile)
if(direct)
- S.channel = open_sound_channel()
+ S.channel = channel || SSsounds.random_available_channel()
S.volume = volume
- for(var/i in 1 to atoms_cache.len)
- var/atom/thing = atoms_cache[i]
- if(direct)
- SEND_SOUND(thing, S)
- else
- var/list/R = playsound(thing, soundfile, volume, vary, extra_range, falloff, frequency, ignore_walls = ignore_wallz, repeat = src)
- if(!R || !R.len)
- R = list()
- for(var/mob/M in thingshearing)
- if(!M.client)
- thingshearing -= M
- continue
- if(!(M in R) || M.IsSleeping())// they are out of range
- var/list/L = M.client.played_loops[src]
- if(L)
- var/sound/SD = L["SOUND"]
- if(SD)
- if(persistent_loop)
- L["MUTESTATUS"] = TRUE
- L["VOL"] = 0
- M.mute_sound(SD)
- //M.play_ambience()
- else
- M.client.played_loops -= src
- thingshearing -= M
- M.stop_sound_channel(SD.channel)
- else
- on_hear_sound(M)
+ var/atom/thing = parent
+ if(direct)
+ if(ismob(thing))
+ var/mob/mob = thing
+ mob.playsound_local(get_turf(mob), soundfile, volume, vary, frequency, falloff, repeat = src, channel = channel)
+ else
+ var/list/R = playsound(thing, soundfile, volume, vary, extra_range, falloff, frequency, ignore_walls = ignore_walls, repeat = src, channel = channel)
+ if(!R || !R.len)
+ R = list()
+ for(var/mob/M in thingshearing)
+ if(!M.client)
+ thingshearing -= M
+ continue
+ if(!(M in R) || M.IsSleeping())// they are out of range
+ var/list/L = M.client.played_loops[src]
+ if(L)
+ var/sound/SD = L["SOUND"]
+ if(SD)
+ if(persistent_loop)
+ L["MUTESTATUS"] = TRUE
+ L["VOL"] = 0
+ M.mute_sound(SD)
+ //M.play_ambience()
+ else
+ M.client.played_loops -= src
+ thingshearing -= M
+ M.stop_sound_channel(SD.channel)
+ else
+ on_hear_sound(M)
/datum/looping_sound/proc/on_hear_sound(mob/M)
return
@@ -167,3 +177,14 @@
client.played_loops -= X
X.thingshearing -= src
*/
+
+/datum/looping_sound/proc/set_parent(new_parent)
+ if(parent)
+ UnregisterSignal(parent, COMSIG_PARENT_QDELETING)
+ parent = new_parent
+ if(parent)
+ RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(handle_parent_del))
+
+/datum/looping_sound/proc/handle_parent_del(datum/source)
+ SIGNAL_HANDLER
+ set_parent(null)
diff --git a/code/datums/looping_sounds/item_sounds.dm b/code/datums/looping_sounds/item_sounds.dm
index be8d60c3ef..f514df876a 100644
--- a/code/datums/looping_sounds/item_sounds.dm
+++ b/code/datums/looping_sounds/item_sounds.dm
@@ -1,41 +1,3 @@
-#define RAD_GEIGER_LOW 100 // Geiger counter sound thresholds
-#define RAD_GEIGER_MEDIUM 500
-#define RAD_GEIGER_HIGH 1000
-
-/datum/looping_sound/geiger
- mid_sounds = list(
- list('sound/blank.ogg'=1),
- list('sound/blank.ogg'=1),
- list('sound/blank.ogg'=1),
- list('sound/blank.ogg'=1)
- )
- mid_length = 2
- volume = 25
- var/last_radiation
-
-/datum/looping_sound/geiger/get_sound(starttime)
- var/danger
- switch(last_radiation)
- if(RAD_BACKGROUND_RADIATION to RAD_GEIGER_LOW)
- danger = 1
- if(RAD_GEIGER_LOW to RAD_GEIGER_MEDIUM)
- danger = 2
- if(RAD_GEIGER_MEDIUM to RAD_GEIGER_HIGH)
- danger = 3
- if(RAD_GEIGER_HIGH to INFINITY)
- danger = 4
- else
- return null
- return ..(starttime, mid_sounds[danger])
-
-/datum/looping_sound/geiger/stop()
- . = ..()
- last_radiation = 0
-
-#undef RAD_GEIGER_LOW
-#undef RAD_GEIGER_MEDIUM
-#undef RAD_GEIGER_HIGH
-
/datum/looping_sound/reverse_bear_trap
mid_sounds = list('sound/blank.ogg')
mid_length = 3.5
@@ -80,7 +42,7 @@
volume = 40
extra_range = 0
vary = TRUE
- ignore_wallz = FALSE
+ ignore_walls = FALSE
/datum/looping_sound/streetlamp2
mid_sounds = list('sound/misc/loops/StLight2.ogg')
@@ -88,7 +50,7 @@
volume = 40
extra_range = 0
vary = TRUE
- ignore_wallz = FALSE
+ ignore_walls = FALSE
/datum/looping_sound/streetlamp3
mid_sounds = list('sound/misc/loops/StLight3.ogg')
@@ -96,14 +58,14 @@
volume = 40
extra_range = 0
vary = TRUE
- ignore_wallz = FALSE
+ ignore_walls = FALSE
/datum/looping_sound/clockloop
mid_sounds = list('sound/misc/clockloop.ogg')
mid_length = 20
volume = 10
extra_range = -3
- ignore_wallz = FALSE
+ ignore_walls = FALSE
/datum/looping_sound/boatloop
mid_sounds = list('sound/ambience/boat (1).ogg','sound/ambience/boat (2).ogg')
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 4556a2828b..f7ed2a3048 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -223,8 +223,6 @@
else
user.take_bodypart_damage(2*force)
return
- if(iscyborg(target))
- return ..()
if(!isliving(target))
return ..()
var/mob/living/carbon/C = target
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 7f358a0fc1..bc2c2b5224 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -127,7 +127,7 @@
if(H.gender == FEMALE && J.f_title)
used_title = J.f_title
if(!used_title)
- used_title = "unknown"
+ used_title = "Unknown"
known_people[H.real_name]["FJOB"] = used_title
known_people[H.real_name]["FGENDER"] = H.gender
known_people[H.real_name]["FAGE"] = H.age
@@ -151,7 +151,7 @@
if(H.gender == FEMALE && J.f_title)
used_title = J.f_title
if(!used_title)
- used_title = "unknown"
+ used_title = "Unknown"
M.known_people[H.real_name]["FJOB"] = used_title
M.known_people[H.real_name]["FGENDER"] = H.gender
M.known_people[H.real_name]["FAGE"] = H.age
@@ -179,8 +179,7 @@
var/datum/mind/M = person
var/mob/living/carbon/human/H = current
if(M.known_people && istype(H))
- if(M.known_people[H.real_name])
- M.known_people[H.real_name] = null
+ M.known_people -= H.real_name
/datum/mind/proc/unknow_all_people()
@@ -448,152 +447,25 @@
var/datum/antagonist/antaggy = GG
return antaggy.isgoodguy
-/*
- Removes antag type's references from a mind.
- objectives, uplinks, powers etc are all handled.
-*/
-
-/datum/mind/proc/remove_changeling()
- var/datum/antagonist/changeling/C = has_antag_datum(/datum/antagonist/changeling)
- if(C)
- remove_antag_datum(/datum/antagonist/changeling)
- special_role = null
/datum/mind/proc/remove_traitor()
remove_antag_datum(/datum/antagonist/traitor)
-/datum/mind/proc/remove_brother()
- if(src in SSticker.mode.brothers)
- remove_antag_datum(/datum/antagonist/brother)
-
-/datum/mind/proc/remove_nukeop()
- var/datum/antagonist/nukeop/nuke = has_antag_datum(/datum/antagonist/nukeop,TRUE)
- if(nuke)
- remove_antag_datum(nuke.type)
- special_role = null
-
/datum/mind/proc/remove_wizard()
remove_antag_datum(/datum/antagonist/wizard)
special_role = null
-/datum/mind/proc/remove_cultist()
- if(src in SSticker.mode.cult)
- SSticker.mode.remove_cultist(src, 0, 0)
- special_role = null
- remove_antag_equip()
-
-/datum/mind/proc/remove_rev()
- var/datum/antagonist/rev/rev = has_antag_datum(/datum/antagonist/rev)
- if(rev)
- remove_antag_datum(rev.type)
- special_role = null
-
-
-/datum/mind/proc/remove_antag_equip()
- var/list/Mob_Contents = current.get_contents()
- for(var/obj/item/I in Mob_Contents)
- var/datum/component/uplink/O = I.GetComponent(/datum/component/uplink) //Todo make this reset signal
- if(O)
- O.unlock_code = null
-
/datum/mind/proc/remove_all_antag() //For the Lazy amongst us.
- remove_changeling()
remove_traitor()
- remove_nukeop()
remove_wizard()
- remove_cultist()
- remove_rev()
/datum/mind/proc/equip_traitor(employer = "The Syndicate", silent = FALSE, datum/antagonist/uplink_owner)
- if(!current)
- return
- var/mob/living/carbon/human/traitor_mob = current
- if (!istype(traitor_mob))
- return
-
- var/list/all_contents = traitor_mob.GetAllContents()
- var/obj/item/pda/PDA = locate() in all_contents
- var/obj/item/radio/R = locate() in all_contents
- var/obj/item/pen/P
-
- if (PDA) // Prioritize PDA pen, otherwise the pocket protector pens will be chosen, which causes numerous ahelps about missing uplink
- P = locate() in PDA
- if (!P) // If we couldn't find a pen in the PDA, or we didn't even have a PDA, do it the old way
- P = locate() in all_contents
- if(!P) // I do not have a pen.
- var/obj/item/pen/inowhaveapen
- if(istype(traitor_mob.back,/obj/item/storage)) //ok buddy you better have a backpack!
- inowhaveapen = new /obj/item/pen(traitor_mob.back)
- else
- inowhaveapen = new /obj/item/pen(traitor_mob.loc)
- traitor_mob.put_in_hands(inowhaveapen) // I hope you don't have arms and my traitor pen gets stolen for all this trouble you've caused.
- P = inowhaveapen
-
- var/obj/item/uplink_loc
-
- if(traitor_mob.client && traitor_mob.client.prefs)
- switch(traitor_mob.client.prefs.uplink_spawn_loc)
- if(UPLINK_PDA)
- uplink_loc = PDA
- if(!uplink_loc)
- uplink_loc = R
- if(!uplink_loc)
- uplink_loc = P
- if(UPLINK_RADIO)
- uplink_loc = R
- if(!uplink_loc)
- uplink_loc = PDA
- if(!uplink_loc)
- uplink_loc = P
- if(UPLINK_PEN)
- uplink_loc = P
- if(!uplink_loc)
- uplink_loc = PDA
- if(!uplink_loc)
- uplink_loc = R
-
- if (!uplink_loc)
- if(!silent)
- to_chat(traitor_mob, "Unfortunately, [employer] wasn't able to get you an Uplink.")
- . = 0
- else
- . = uplink_loc
- var/datum/component/uplink/U = uplink_loc.AddComponent(/datum/component/uplink, traitor_mob.key)
- if(!U)
- CRASH("Uplink creation failed.")
- U.setup_unlock_code()
- if(!silent)
- if(uplink_loc == R)
- to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as my [R.name]. Simply dial the frequency [format_frequency(U.unlock_code)] to unlock its hidden features.")
- else if(uplink_loc == PDA)
- to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as my [PDA.name]. Simply enter the code \"[U.unlock_code]\" into the ringtone select to unlock its hidden features.")
- else if(uplink_loc == P)
- to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as my [P.name]. Simply twist the top of the pen [english_list(U.unlock_code)] from its starting position to unlock its hidden features.")
-
- if(uplink_owner)
- uplink_owner.antag_memory += U.unlock_note + " "
- else
- traitor_mob.mind.store_memory(U.unlock_note)
+ return
//Link a new mobs mind to the creator of said mob. They will join any team they are currently on, and will only switch teams when their creator does.
/datum/mind/proc/enslave_mind_to_creator(mob/living/creator)
- if(iscultist(creator))
- SSticker.mode.add_cultist(src)
-
- else if(is_revolutionary(creator))
- var/datum/antagonist/rev/converter = creator.mind.has_antag_datum(/datum/antagonist/rev,TRUE)
- converter.add_revolutionary(src,FALSE)
-
- else if(is_nuclear_operative(creator))
- var/datum/antagonist/nukeop/converter = creator.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE)
- var/datum/antagonist/nukeop/N = new()
- N.send_to_spawnpoint = FALSE
- N.nukeop_outfit = null
- add_antag_datum(N,converter.nuke_team)
-
-
enslaved_to = creator
current.faction |= creator.faction
@@ -769,49 +641,11 @@
return
objective.completed = !objective.completed
log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]")
-
- else if (href_list["silicon"])
- switch(href_list["silicon"])
- if("unemag")
- var/mob/living/silicon/robot/R = current
- if (istype(R))
- R.SetEmagged(0)
- message_admins("[key_name_admin(usr)] has unemag'ed [R].")
- log_admin("[key_name(usr)] has unemag'ed [R].")
-
- if("unemagcyborgs")
- if(isAI(current))
- var/mob/living/silicon/ai/ai = current
- for (var/mob/living/silicon/robot/R in ai.connected_robots)
- R.SetEmagged(0)
- message_admins("[key_name_admin(usr)] has unemag'ed [ai]'s Cyborgs.")
- log_admin("[key_name(usr)] has unemag'ed [ai]'s Cyborgs.")
-
else if (href_list["common"])
switch(href_list["common"])
if("undress")
for(var/obj/item/W in current)
current.dropItemToGround(W, TRUE) //The 1 forces all items to drop, since this is an admin undress.
- if("takeuplink")
- take_uplink()
- memory = null//Remove any memory they may have had.
- log_admin("[key_name(usr)] removed [current]'s uplink.")
- if("crystals")
- if(check_rights(R_FUN, 0))
- var/datum/component/uplink/U = find_syndicate_uplink()
- if(U)
- var/crystals = input("Amount of telecrystals for [key]","Syndicate uplink", U.telecrystals) as null | num
- if(!isnull(crystals))
- U.telecrystals = crystals
- message_admins("[key_name_admin(usr)] changed [current]'s telecrystal count to [crystals].")
- log_admin("[key_name(usr)] changed [current]'s telecrystal count to [crystals].")
- if("uplink")
- if(!equip_traitor())
- to_chat(usr, "Equipping a syndicate failed!")
- log_admin("[key_name(usr)] tried and failed to give [current] an uplink.")
- else
- log_admin("[key_name(usr)] gave [current] an uplink.")
-
else if (href_list["obj_announce"])
announce_objectives()
@@ -836,53 +670,17 @@
to_chat(current, "Objective #[obj_count]: [O.explanation_text]")
obj_count++
-/datum/mind/proc/find_syndicate_uplink()
- var/list/L = current.GetAllContents()
- for (var/i in L)
- var/atom/movable/I = i
- . = I.GetComponent(/datum/component/uplink)
- if(.)
- break
-
-/datum/mind/proc/take_uplink()
- qdel(find_syndicate_uplink())
/datum/mind/proc/make_Traitor()
if(!(has_antag_datum(/datum/antagonist/traitor)))
add_antag_datum(/datum/antagonist/traitor)
-/datum/mind/proc/make_Contractor_Support()
- if(!(has_antag_datum(/datum/antagonist/traitor/contractor_support)))
- add_antag_datum(/datum/antagonist/traitor/contractor_support)
-
-/datum/mind/proc/make_Changeling()
- var/datum/antagonist/changeling/C = has_antag_datum(/datum/antagonist/changeling)
- if(!C)
- C = add_antag_datum(/datum/antagonist/changeling)
- special_role = ROLE_CHANGELING
- return C
-
/datum/mind/proc/make_Wizard()
if(!has_antag_datum(/datum/antagonist/wizard))
special_role = ROLE_WIZARD
assigned_role = ROLE_WIZARD
add_antag_datum(/datum/antagonist/wizard)
-
-/datum/mind/proc/make_Cultist()
- if(!has_antag_datum(/datum/antagonist/cult,TRUE))
- SSticker.mode.add_cultist(src,FALSE,equip=TRUE)
- special_role = ROLE_CULTIST
- to_chat(current, "I catch a glimpse of the Realm of Nar'Sie, The Geometer of Blood. You now see how flimsy my world is, you see that it should be open to the knowledge of Nar'Sie.")
- to_chat(current, "Assist my new brethren in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.")
-
-/datum/mind/proc/make_Rev()
- var/datum/antagonist/rev/head/head = new()
- head.give_flash = TRUE
- head.give_hud = TRUE
- add_antag_datum(head)
- special_role = ROLE_REV_HEAD
-
/datum/mind/proc/AddSpell(obj/effect/proc_holder/spell/S)
if(!S)
return
@@ -1034,6 +832,8 @@
// Get a bonus multiplier dependant on age to apply to exp gains. Arg is a skill path.
/datum/mind/proc/get_learning_boon(skill)
var/mob/living/carbon/human/H = current
+ if(!istype(H))
+ return 1
var/boon = H.age == AGE_OLD ? 0.8 : 1 // Can't teach an old dog new tricks. Most old jobs start with higher skill too.
boon += get_skill_level(skill) / 10
return boon
diff --git a/code/datums/mutations/_combined.dm b/code/datums/mutations/_combined.dm
index 24c0f6e1a2..2215ceb2b0 100644
--- a/code/datums/mutations/_combined.dm
+++ b/code/datums/mutations/_combined.dm
@@ -21,10 +21,6 @@
required = "/datum/mutation/human/thermal; /datum/mutation/human/radioactive"
result = /datum/mutation/human/thermal/x_ray
-/datum/generecipe/mindread
- required = "/datum/mutation/human/antenna; /datum/mutation/human/paranoia"
- result = MINDREAD
-
/datum/generecipe/shock
required = "/datum/mutation/human/insulated; /datum/mutation/human/radioactive"
result = SHOCKTOUCH
diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm
deleted file mode 100644
index 513ee20908..0000000000
--- a/code/datums/mutations/antenna.dm
+++ /dev/null
@@ -1,107 +0,0 @@
-/datum/mutation/human/antenna
- name = "Antenna"
- desc = ""
- quality = POSITIVE
- text_gain_indication = "I feel an antenna sprout from my forehead."
- text_lose_indication = "My antenna shrinks back down."
- instability = 5
- difficulty = 8
- var/obj/item/implant/radio/antenna/linked_radio
-
-/obj/item/implant/radio/antenna
- name = "internal antenna organ"
- desc = ""
- icon = 'icons/obj/radio.dmi'//maybe make a unique sprite later. not important
- icon_state = "walkietalkie"
-
-/obj/item/implant/radio/antenna/Initialize(mapload)
- . = ..()
- radio.name = "internal antenna"
-
-/datum/mutation/human/antenna/on_acquiring(mob/living/carbon/human/owner)
- if(..())
- return
- linked_radio = new(owner)
- linked_radio.implant(owner, null, TRUE, TRUE)
-
-/datum/mutation/human/antenna/on_losing(mob/living/carbon/human/owner)
- if(..())
- return
- if(linked_radio)
- QDEL_NULL(linked_radio)
-
-/datum/mutation/human/antenna/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
- ..()
- if(!(type in visual_indicators))
- visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))//-MUTATIONS_LAYER+1
-
-/datum/mutation/human/antenna/get_visual_indicator()
- return visual_indicators[type][1]
-
-/datum/mutation/human/mindreader
- name = "Mind Reader"
- desc = ""
- quality = POSITIVE
- text_gain_indication = "I hear distant voices at the corners of my mind."
- text_lose_indication = "The distant voices fade."
- power = /obj/effect/proc_holder/spell/targeted/mindread
- instability = 40
- difficulty = 8
- locked = TRUE
-
-/obj/effect/proc_holder/spell/targeted/mindread
- name = "Mindread"
- desc = ""
- charge_max = 50
- range = 7
- clothes_req = FALSE
- action_icon_state = "mindread"
-
-/obj/effect/proc_holder/spell/targeted/mindread/cast(list/targets, mob/living/carbon/human/user = usr)
- for(var/mob/living/M in targets)
- if(usr.anti_magic_check(FALSE, FALSE, TRUE, 0) || M.anti_magic_check(FALSE, FALSE, TRUE, 0))
- to_chat(usr, "As you reach out with my mind, you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled.")
- return
- if(M.stat == DEAD)
- to_chat(user, "[M] is dead!")
- return
- if(M.mind)
- to_chat(user, "I plunge into [M]'s mind...")
- if(prob(20))
- to_chat(M, "I feel something foreign enter my mind.")//chance to alert the read-ee
- var/list/recent_speech = list()
- var/list/say_log = list()
- var/log_source = M.logging
- for(var/log_type in log_source)//this whole loop puts the read-ee's say logs into say_log in an easy to access way
- var/nlog_type = text2num(log_type)
- if(nlog_type & LOG_SAY)
- var/list/reversed = log_source[log_type]
- if(islist(reversed))
- say_log = reverseRange(reversed.Copy())
- break
- if(LAZYLEN(say_log))
- for(var/spoken_memory in say_log)
- if(recent_speech.len >= 3)//up to 3 random lines of speech, favoring more recent speech
- break
- if(prob(50))
- recent_speech[spoken_memory] = say_log[spoken_memory]
- if(recent_speech.len)
- to_chat(user, "I catch some drifting memories of their past conversations...")
- for(var/spoken_memory in recent_speech)
- to_chat(user, "[recent_speech[spoken_memory]]")
- if(iscarbon(M))
- var/mob/living/carbon/human/H = M
- to_chat(user, "I find that their intent is to [H.used_intent]...")
- var/datum/dna/the_dna = H.has_dna()
- if(the_dna)
- to_chat(user, "I uncover that [H.p_their()] true identity is [the_dna.real_name].")
- else
- to_chat(user, "I can't find a mind to read inside of [M]!")
-
-/datum/mutation/human/mindreader/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
- ..()
- if(!(type in visual_indicators))
- visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna", -FRONT_MUTATIONS_LAYER+1))
-
-/datum/mutation/human/mindreader/get_visual_indicator()
- return visual_indicators[type][1]
diff --git a/code/datums/outdoor_datum.dm b/code/datums/outdoor_datum.dm
new file mode 100644
index 0000000000..38dfb7c0cd
--- /dev/null
+++ b/code/datums/outdoor_datum.dm
@@ -0,0 +1,154 @@
+//todo: handle moving sunlight turfs - see various uses of get_turf in lighting_object
+
+
+/*
+
+Sunlight System
+
+ Objects + Details
+ Sunlight Objects (this file)
+ - Grayscale version of lighting_object
+ - Has 3 states
+ - SKY_BLOCKED (0)
+ - Turfs that have an opaque turf above them. Has no light themselves but is affected by SKY_VISIBLE_BORDER
+ - SKY_VISIBLE (1)
+ - Turfs that with no opaque turfs above it (no roof, glass roof, etc), with no neighbouring SKY_BLOCKED tiles
+ Emits no light, but is fully white to display the overlay color
+ - SKY_VISIBLE_BORDER (2)
+ - Turfs that with no opaque turfs above it (no roof, glass roof, etc), which neighbour at least one SKY_BLOCKED tile.
+ Emits light to SKY_BLOCKED tiles, and fully white to display the overlay color
+
+*/
+/obj
+ var/weatherproof = FALSE
+ var/weather = FALSE
+
+/obj/proc/weather_act_on(weather_trait, severity)
+ return
+
+/atom/movable/outdoor_effect
+ name = ""
+ mouse_opacity = 0
+ anchored = 1
+ appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
+ plane = WEATHER_EFFECT_PLANE
+
+ /* misc vars */
+ var/state = SKY_VISIBLE // If we can see the see the sky, are blocked, or we have a blocked neighbour (SKY_BLOCKED/VISIBLE/VISIBLE_BORDER)
+ var/weatherproof = FALSE // If we have a weather overlay
+ var/turf/source_turf
+
+/atom/movable/outdoor_effect/Destroy(force)
+ if (!force)
+ return QDEL_HINT_LETMELIVE
+
+ //Remove ourselves from our turf
+ if(source_turf && source_turf.outdoor_effect == src)
+ source_turf.outdoor_effect = null
+
+
+ return ..()
+
+
+
+/atom/movable/outdoor_effect/Initialize(mapload)
+ . = ..()
+ source_turf = loc
+ if (source_turf.outdoor_effect)
+ qdel(source_turf.outdoor_effect, force = TRUE)
+ source_turf.outdoor_effect = null //No qdel_null force
+ source_turf.outdoor_effect = src
+
+
+/* Related object changes */
+/* I moved this here to consolidate sunlight changes as much as possible, so its easily disabled */
+
+/* area fuckery */
+/area/var/turf/pseudo_roof
+
+/* turf fuckery */
+/turf/var/tmp/atom/movable/outdoor_effect/outdoor_effect /* a turf's sunlight overlay */
+/turf/var/turf/pseudo_roof /* our roof turf - may be a path for top z level, or a ref to the turf above*/
+
+//non-weatherproof turfs
+/turf/var/weatherproof = TRUE
+/turf/open/transparent/openspace/weatherproof = FALSE
+
+/turf/proc/reassess_stack()
+ GLOB.SUNLIGHT_QUEUE_WORK += src
+ var/turf/T = SSmapping.get_turf_below(src)
+ if(T)
+ T.reassess_stack()
+
+/* check ourselves and neighbours to see what outdoor effects we need */
+/* turf won't initialize an outdoor_effect if sky_blocked*/
+/turf/proc/get_sky_and_weather_states()
+ var/TempState
+
+ var/roofStat = get_ceiling_status()
+ var/tempRoofStat
+ if(roofStat["SKYVISIBLE"])
+ TempState = SKY_VISIBLE
+ for(var/turf/CT in RANGE_TURFS(1, src))
+ tempRoofStat = CT.get_ceiling_status()
+ if(!tempRoofStat["SKYVISIBLE"]) /* if we have a single roofed/indoor neighbour, we are a border */
+ TempState = SKY_VISIBLE_BORDER
+ break
+ else /* roofed, so turn off the lights */
+ TempState = SKY_BLOCKED
+
+ /* if border or indoor, initialize. Set sunlight state if valid */
+ if(!outdoor_effect && (TempState <> SKY_BLOCKED || !roofStat["WEATHERPROOF"]))
+ outdoor_effect = new /atom/movable/outdoor_effect(src)
+ if(outdoor_effect)
+ outdoor_effect.state = TempState
+ outdoor_effect.weatherproof = roofStat["WEATHERPROOF"]
+
+/* runs up the Z stack for this turf, returns a assoc (SKYVISIBLE, WEATHERPROOF)*/
+/* pass recursionStarted=TRUE when we are checking our ceiling's stats */
+/turf/proc/get_ceiling_status(recursionStarted = FALSE)
+ . = list()
+
+ //Check yourself (before you wreck yourself)
+ if(isclosedturf(src)) //Closed, but we might be transparent
+ .["SKYVISIBLE"] = istransparentturf(src) // a column of glass should still let the sun in
+ .["WEATHERPROOF"] = TRUE
+ else
+ if(recursionStarted)
+ // This src is acting as a ceiling - so if we are a floor we weatherproof + block the sunlight of our down-Z turf
+ .["SKYVISIBLE"] = istransparentturf(src) //If we are glass floor, we don't block
+ for(var/obj/structure/thing in src.contents) // Checks to see if weatherproof objects on the tile
+ if(thing.weatherproof == TRUE)
+ .["WEATHERPROOF"] = TRUE // returns true to block the weather
+ .["SKYVISIBLE"] = FALSE
+ return .
+ .["WEATHERPROOF"] = weatherproof //If we are air or space, we aren't weatherproof
+ else //We are open, so assume open to the elements
+ .["SKYVISIBLE"] = TRUE
+ .["WEATHERPROOF"] = FALSE
+
+ // Early leave if we can't see the sky - if we are an opaque turf, we already know the results
+ // I can't think of a case where we would have a turf that would block light but let weather effects through - Maybe a vent?
+ // fix this if that is the case
+ if(!.["SKYVISIBLE"])
+ return .
+
+ //Ceiling Check
+ // Psuedo-roof, for the top of the map (no actual turf exists up here) -- We assume these are solid, if you add glass pseudo_roofs then fix this
+ if (pseudo_roof)
+ .["SKYVISIBLE"] = FALSE
+ .["WEATHERPROOF"] = TRUE
+ else
+ // EVERY turf must be transparent for sunlight - so &=
+ // ANY turf must be closed for weatherproof - so |=
+ var/turf/ceiling = get_step_multiz(src, UP)
+ if(ceiling)
+ var/list/ceilingStat = ceiling.get_ceiling_status(TRUE) //Pass TRUE because we are now acting as a ceiling
+ .["SKYVISIBLE"] &= ceilingStat["SKYVISIBLE"]
+ .["WEATHERPROOF"] |= ceilingStat["WEATHERPROOF"]
+
+ var/area/turf_area = get_area(src)
+ var/turf/above_turf = get_step_multiz(src, UP)
+ if((!above_turf && !turf_area.outdoors))
+ .["SKYVISIBLE"] = FALSE
+ .["WEATHERPROOF"] = TRUE
diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm
index ebca46966a..e8c048891d 100644
--- a/code/datums/outfit.dm
+++ b/code/datums/outfit.dm
@@ -261,10 +261,6 @@
for(var/i in 1 to number)
H.equip_to_slot_or_del(new path(H),SLOT_IN_BACKPACK, TRUE)
- if(!H.head && toggle_helmet && istype(H.wear_armor, /obj/item/clothing/suit/space/hardsuit))
- var/obj/item/clothing/suit/space/hardsuit/HS = H.wear_armor
- HS.ToggleHelmet()
-
post_equip(H, visualsOnly)
if(!visualsOnly)
diff --git a/code/datums/particle_weathers/_base.dm b/code/datums/particle_weathers/_base.dm
new file mode 100644
index 0000000000..3ba1d8fad2
--- /dev/null
+++ b/code/datums/particle_weathers/_base.dm
@@ -0,0 +1,340 @@
+/particles/weather
+ spawning = 0
+ var/wind = 0 //Left/Right maximum movement increase per tick
+ var/maxSpawning = 0 //Max spawner - Recommend you use this over Spawning, so severity can ease it in
+ var/minSpawning = 0 //Weather should start with 0, but when easing, it will never go below this
+ icon = 'icons/effects/particles/particle.dmi'
+
+
+ spawning = 0
+ width = 800 // I think this is supposed to be in pixels, but it doesn't match bounds, so idk - 800x800 seems to prevent particle-less edges
+ height = 800
+ count = 3000 // 3000 particles
+ //Set bounds to rough screensize + some extra on the side and top movement for "wind"
+ bound1 = list(-500,-256,-10)
+ bound2 = list(500,500,10)
+ lifespan = 285 // live for 30s max (fadein + lifespan + fade)
+ fade = 10 // 1s fade out
+ fadein = 5 // 0.5s fade in
+
+ //Obnoxiously 3D -- INCREASE Z level to make them further away
+ transform = list( 1, 0, 0, 0 ,
+ 0, 1, 0, 0 ,
+ 0, 0, 1, 1/4, //Get twice as Small every 4 Z
+ 0, 0, 0, 1 )
+
+//Animate particle effect to a severity
+/particles/weather/proc/animateSeverity(severityMod)
+
+ //If we have no severity, just stop spawning
+ if(!severityMod)
+ spawning = 0
+ return
+
+ var newWind = wind * severityMod * pick(-1,1) //Wind can go left OR right!
+ var newSpawning = max(minSpawning, maxSpawning * severityMod)
+
+ //gravity might be x, xy, or xyz
+ var/newGravity = gravity
+ if(length(newGravity))
+ newGravity[1] = newWind
+ else
+ newGravity = list(newWind)
+
+ //The higher the severity, the faster the change - elastic easing for flappy wind
+ gravity = newGravity
+ spawning = newSpawning
+ // animate(src, gravity=newGravity, spawning=newSpawning, time=1/severity * 10, easing=ELASTIC_EASING)
+
+/**
+ * Shitty particle weather by Gomble
+ * Causes weather to occur on a z level in certain area types
+ *
+ * The effects of weather occur across an entire z-level. For instance, lavaland has periodic ash storms that scorch most unprotected creatures.
+ * Weather always occurs on different z levels at different times, regardless of weather type.
+ * Can have custom durations, targets, and can automatically protect indoor areas.
+ *
+ */
+
+
+/datum/particle_weather
+
+ // ==== Modify these ====
+
+ /// name of weather
+ var/name = "space wind"
+ /// description of weather
+ var/desc = "Heavy gusts of wind blanket the area, periodically knocking down anyone caught in the open."
+
+ //messages to send at different severities
+ var/list/weather_messages = list()
+
+ // Sounds to play at different severities - order from lowest to highest
+ var/list/weather_sounds = list()
+ var/list/indoor_weather_sounds = list()
+
+ //Scale volume with severity - good for if you only have 1 sound
+ var/scale_vol_with_severity = FALSE
+
+ //Our particle effect to display - min/max severity effects its wind and count
+ var/particles/weather/particleEffectType = /particles/weather/rain
+
+
+ /// See above - this is the lowest possible duration
+ var/weather_duration_lower = 1 MINUTES
+ /// See above - this is the highest possible duration
+ var/weather_duration_upper = 3 MINUTES
+
+ // Keep this between 1 and 100
+ // Gentle rain shouldn't use the max rain wind speed, nor should a storm be a gentle breeze
+ var/minSeverity = 1
+ var/maxSeverity = 100
+ //We will increase or decrease our severity by a random amount up to this value
+ //If 0, we will pick a random value between min and max
+ var/maxSeverityChange = 20
+ //The number of times we will change our severity over the duration
+ var/severitySteps = 5
+ /// Used by mobs to prevent them from being affected by the weather
+ var/immunity_type = TRAIT_WEATHER_IMMUNE
+ /// Weight amongst other eligible weather. If zero, will never happen randomly.
+ var/probability = 0
+
+ /// The map weather type to target
+ var/target_trait = PARTICLEWEATHER_RAIN
+
+ // ==== Dont modify these ====
+
+ //Times we have stepped severity
+ var/severityStepsTaken = 0
+
+ var/running = FALSE
+
+ //Current severity - used for scaling effects, particle appearance, etc.
+ var/severity = 0
+
+ /// Whether a barometer can predict when the weather will happen
+ var/barometer_predictable = FALSE
+ /// For barometers to know when the next storm will hit
+ var/next_hit_time = 0
+
+ /// In deciseconds, how long the weather lasts once it begins
+ var/weather_duration = 0
+
+ //assoc list of mob=looping_sound
+ var/list/currentSounds = list()
+
+ //assoc list of mob=timestamp -> Next time we can send a message
+ var/list/messagedMobs = list()
+
+ var/last_message = ""
+
+/datum/particle_weather/proc/severityMod()
+ return max(0.3, severity / maxSeverity)
+/*
+* arbitrary effects to run every time the particle_weather SS ticks
+* for storms this might be a random chance for lightning, etc.
+*/
+/datum/particle_weather/proc/tick()
+ return
+
+/datum/particle_weather/Destroy()
+ for(var/S in currentSounds)
+ var/datum/looping_sound/looping_sound = currentSounds[S]
+ looping_sound.stop()
+ qdel(looping_sound)
+ return ..()
+
+/**
+ * Starts the actual weather and effects from it
+ *
+ * Updates area overlays and sends sounds and messages to mobs to notify them
+ * Begins dealing effects from weather to mobs in the area
+ *
+ */
+/datum/particle_weather/proc/start()
+ if(running)
+ return //some cheeky git has started you early
+ weather_duration = rand(weather_duration_lower, weather_duration_upper)
+ running = TRUE
+ addtimer(CALLBACK(src, PROC_REF(wind_down)), weather_duration)
+
+ if(particleEffectType)
+ SSParticleWeather.SetparticleEffect(new particleEffectType);
+
+ //Always step severity to start
+ ChangeSeverity()
+
+
+/datum/particle_weather/proc/ChangeSeverity()
+ if(!running)
+ return
+ severityStepsTaken++
+
+ if(maxSeverityChange == 0)
+ severity = rand(minSeverity, maxSeverity)
+ else
+ var/newSeverity = severity + rand(-maxSeverityChange,maxSeverityChange)
+ newSeverity = min(max(newSeverity,minSeverity), maxSeverity)
+ severity = newSeverity
+
+
+ if(SSParticleWeather.particleEffect)
+ SSParticleWeather.particleEffect.animateSeverity(severityMod())
+
+ //Send new severity message if the message has changed
+ if(last_message != scale_range_pick(minSeverity, maxSeverity, severity, weather_messages))
+ messagedMobs = list()
+
+ //Tick on
+ if(severityStepsTaken < severitySteps)
+ addtimer(CALLBACK(src, PROC_REF(ChangeSeverity)), weather_duration / severitySteps)
+
+
+/**
+ * Weather enters the winding down phase, stops effects
+ *
+ * Updates areas to be in the winding down phase
+ * Sends sounds and messages to mobs to notify them
+ *
+ */
+/datum/particle_weather/proc/wind_down()
+ severity = 0
+ if(SSParticleWeather.particleEffect)
+ SSParticleWeather.particleEffect.animateSeverity(severityMod())
+
+ //Wait for the last particle to fade, then qdel yourself
+ addtimer(CALLBACK(src, PROC_REF(end)), SSParticleWeather.particleEffect.lifespan + SSParticleWeather.particleEffect.fade)
+
+
+
+/**
+ * Fully ends the weather
+ *
+ * Effects no longer occur and particles are wound down
+ * Removes weather from processing completely
+ *
+ */
+/datum/particle_weather/proc/end()
+ running = FALSE
+ SSParticleWeather.stopWeather()
+
+
+/**
+ * Returns TRUE if the living mob can hear the weather (you might be immune, but you get to listen to the pitter patter)
+ */
+/datum/particle_weather/proc/can_weather(mob/living/mob_to_check)
+ var/turf/mob_turf = get_turf(mob_to_check)
+
+ if(!mob_turf)
+ return
+
+ if(!mob_turf.outdoor_effect || mob_turf.outdoor_effect.weatherproof)
+ return
+
+ return TRUE
+
+/**
+ * Returns TRUE if the living mob can be affected by the weather
+ */
+/datum/particle_weather/proc/can_weather_effect(mob/living/mob_to_check)
+
+ //If mob is not in a turf
+ var/turf/mob_turf = get_turf(mob_to_check)
+ var/atom/loc_to_check = mob_to_check.loc
+ while(loc_to_check != mob_turf)
+ if((immunity_type && HAS_TRAIT(loc_to_check, immunity_type)) || HAS_TRAIT(loc_to_check, TRAIT_WEATHER_IMMUNE))
+ return
+ loc_to_check = loc_to_check.loc
+
+ return TRUE
+
+/**
+ * Try to do weather effects - if we can hear sound, play it
+ * If we are affected by weather (i.e damage), do effect and send severity message
+ */
+/datum/particle_weather/proc/try_weather_act(mob/living/L)
+ if(!L.mind)
+ return
+ if(can_weather(L))
+ weather_sound_effect(L)
+ if(can_weather_effect(L))
+ weather_act(L)
+ if(!messagedMobs[L] || world.time > messagedMobs[L])
+ weather_message(L) //Try not to spam
+ else
+ stop_weather_sound_effect(L)
+ messagedMobs[L] = 0 //resend a message next time they go outside
+
+//Overload with weather effects
+/datum/particle_weather/proc/weather_act(mob/living/L)
+ return
+
+//weather effects for objects
+/datum/particle_weather/proc/weather_obj_act(obj/L)
+ if(can_weather_act_obj(L))
+ L.weather = TRUE
+ L.weather_act_on(target_trait, severity)
+ else
+ L.weather = FALSE
+
+
+//Not using looping_sounds properly. somebody smart should fix this
+/datum/particle_weather/proc/weather_sound_effect(mob/living/L)
+ var/datum/looping_sound/currentSound = currentSounds[L]
+ if(currentSound)
+ //SET VOLUME
+ if(scale_vol_with_severity)
+ currentSound.volume = initial(currentSound.volume) * severityMod()
+ if(!currentSound.loop_started) //don't restart already playing sounds
+ currentSound.start()
+ return
+ var/tempSound = scale_range_pick(minSeverity, maxSeverity, severity, weather_sounds)
+ if(tempSound)
+ currentSound = new tempSound(L, FALSE, TRUE, CHANNEL_WEATHER)
+ currentSounds[L] = currentSound
+ //SET VOLUME
+ if(scale_vol_with_severity)
+ currentSound.volume = initial(currentSound.volume) * severityMod()
+ currentSound.start()
+
+/datum/particle_weather/proc/stop_weather_sound_effect(mob/living/L)
+ var/datum/looping_sound/currentSound = currentSounds[L]
+ if(currentSound)
+ currentSound.stop()
+
+
+/datum/particle_weather/proc/weather_message(mob/living/L)
+ messagedMobs[L] = world.time + 45 SECONDS //Chunky delay - this spams otherwise - Severity changes and going indoors resets this timer
+ last_message = scale_range_pick(minSeverity, maxSeverity, severity, weather_messages)
+ if(last_message)
+ to_chat(L, last_message)
+
+/datum/particle_weather/proc/can_weather_act_obj(obj/obj_to_check)
+ var/turf/obj_turf = get_turf(obj_to_check)
+
+ if(!obj_turf)
+ return
+
+ if(obj_turf.outdoor_effect?.weatherproof)
+ return
+
+ return TRUE
+
+
+/client/proc/run_particle_weather()
+ set category = "GameMaster"
+ set name = "Run Particle Weather"
+ set desc = "Triggers a particle weather"
+
+ if(!holder)
+ return
+
+ var/weather_type = input("Choose a weather", "Weather") as null|anything in sortList(subtypesof(/datum/particle_weather), /proc/cmp_typepaths_asc)
+ if(!weather_type)
+ return
+
+ SSParticleWeather.run_weather(weather_type, TRUE)
+
+ message_admins("[key_name_admin(usr)] started weather of type [weather_type].")
+ log_admin("[key_name(usr)] started weather of type [weather_type].")
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Run Particle Weather")
diff --git a/code/datums/particle_weathers/datum_types/rain.dm b/code/datums/particle_weathers/datum_types/rain.dm
new file mode 100644
index 0000000000..6b18bfa7d8
--- /dev/null
+++ b/code/datums/particle_weathers/datum_types/rain.dm
@@ -0,0 +1,62 @@
+
+//Rain - goes down
+/particles/weather/rain
+ icon_state = "drop"
+ color = "#ccffff"
+ position = generator("box", list(-500,-256,0), list(400,500,0))
+ grow = list(-0.01,-0.01)
+ gravity = list(0, -10, 0.5)
+ drift = generator("circle", 0, 1) // Some random movement for variation
+ friction = 0.3 // shed 30% of velocity and drift every 0.1s
+ transform = null // Rain is directional - so don't make it "3D"
+ //Weather effects, max values
+ maxSpawning = 250
+ minSpawning = 50
+ wind = 2
+ spin = 0 // explicitly set spin to 0 - there is a bug that seems to carry generators over from old particle effects
+
+/datum/particle_weather/rain_gentle
+ name = "Rain"
+ desc = "Gentle Rain, la la description."
+ particleEffectType = /particles/weather/rain
+
+ scale_vol_with_severity = TRUE
+ weather_sounds = list(/datum/looping_sound/rain)
+ indoor_weather_sounds = list(/datum/looping_sound/indoor_rain)
+ weather_messages = list("The rain cools your skin.")
+
+ minSeverity = 1
+ maxSeverity = 15
+ maxSeverityChange = 2
+ severitySteps = 5
+ immunity_type = TRAIT_RAINSTORM_IMMUNE
+ probability = 1
+ target_trait = PARTICLEWEATHER_RAIN
+
+//Makes you a little chilly
+/datum/particle_weather/rain_gentle/weather_act(mob/living/L)
+ L.adjust_bodytemperature(-rand(1,3))
+ L.adjust_fire_stacks(-50)
+
+/datum/particle_weather/rain_storm
+ name = "Rain"
+ desc = "Gentle Rain, la la description."
+ particleEffectType = /particles/weather/rain
+
+ scale_vol_with_severity = TRUE
+ weather_sounds = list(/datum/looping_sound/storm)
+ indoor_weather_sounds = list(/datum/looping_sound/indoor_rain)
+ weather_messages = list("The rain cools your skin.", "The storm is really picking up!")
+
+ minSeverity = 4
+ maxSeverity = 100
+ maxSeverityChange = 50
+ severitySteps = 50
+ immunity_type = TRAIT_RAINSTORM_IMMUNE
+ probability = 1
+ target_trait = PARTICLEWEATHER_RAIN
+
+//Makes you a bit chilly
+/datum/particle_weather/rain_storm/weather_act(mob/living/L)
+ L.adjust_bodytemperature(-rand(3,5))
+ L.SoakMob(FULL_BODY)
diff --git a/code/datums/particle_weathers/datum_types/snow_storm.dm b/code/datums/particle_weathers/datum_types/snow_storm.dm
new file mode 100644
index 0000000000..a9700bf152
--- /dev/null
+++ b/code/datums/particle_weathers/datum_types/snow_storm.dm
@@ -0,0 +1,56 @@
+//Snow - goes down and swirls
+/particles/weather/snow
+ icon_state = list("cross"=2, "snow_1"=5, "snow_2"=2, "snow_3"=2,)
+ color = "#ffffff"
+ position = generator("box", list(-500,-256,5), list(500,500,0))
+ spin = generator("num",-10,10)
+ gravity = list(0, -2, 0.1)
+ drift = generator("circle", 0, 3) // Some random movement for variation
+ friction = 0.3 // shed 30% of velocity and drift every 0.1s
+ //Weather effects, max values
+ maxSpawning = 50
+ minSpawning = 10
+ wind = 2
+
+/datum/particle_weather/snow_gentle
+ name = "Rain"
+ desc = "Gentle Rain, la la description."
+ particleEffectType = /particles/weather/snow
+
+ scale_vol_with_severity = TRUE
+ weather_sounds = list(/datum/looping_sound/snow)
+ weather_messages = list("It's snowing!","You feel a chill/")
+
+ minSeverity = 1
+ maxSeverity = 10
+ maxSeverityChange = 5
+ severitySteps = 5
+ immunity_type = TRAIT_SNOWSTORM_IMMUNE
+ probability = 1
+ target_trait = PARTICLEWEATHER_SNOW
+
+//Makes you a little chilly
+/datum/particle_weather/snow_gentle/weather_act(mob/living/L)
+ L.adjust_bodytemperature(-rand(1,3))
+
+
+/datum/particle_weather/snow_storm
+ name = "Rain"
+ desc = "Gentle Rain, la la description."
+ particleEffectType = /particles/weather/snow
+
+ scale_vol_with_severity = TRUE
+ weather_sounds = list(/datum/looping_sound/snow)
+ weather_messages = list("You feel a chill/", "The cold wind is freezing you to the bone", "How can a man who is warm, understand a man who is cold?")
+
+ minSeverity = 40
+ maxSeverity = 100
+ maxSeverityChange = 50
+ severitySteps = 50
+ immunity_type = TRAIT_SNOWSTORM_IMMUNE
+ probability = 1
+ target_trait = PARTICLEWEATHER_SNOW
+
+//Makes you a lot little chilly
+/datum/particle_weather/snow_storm/weather_act(mob/living/L)
+ L.adjust_bodytemperature(-rand(5,15))
diff --git a/code/datums/particle_weathers/sounds/looping_sounds.dm b/code/datums/particle_weathers/sounds/looping_sounds.dm
new file mode 100644
index 0000000000..748517153b
--- /dev/null
+++ b/code/datums/particle_weathers/sounds/looping_sounds.dm
@@ -0,0 +1,32 @@
+/datum/looping_sound/rain
+ mid_sounds = 'sound/weather/rain/weather_rain.ogg'
+ mid_length = 40 SECONDS
+ volume = 200
+
+/datum/looping_sound/indoor_rain
+ mid_sounds = 'sound/weather/rain/weather_rain_indoors.ogg'
+ mid_length = 15 SECONDS
+ volume = 200
+
+/datum/looping_sound/storm
+ mid_sounds = 'sound/weather/rain/weather_storm.ogg'
+ mid_length = 30 SECONDS
+ volume = 150
+
+/datum/looping_sound/snow
+ mid_sounds = 'sound/weather/snow/weather_snow.ogg'
+ mid_length = 50 SECONDS
+ volume = 150
+
+/datum/looping_sound/wind
+ mid_sounds = 'sound/weather/rain/wind_1.ogg'
+ mid_sounds = list(
+ 'sound/weather/rain/wind_1.ogg'=1,
+ 'sound/weather/rain/wind_2.ogg'=1,
+ 'sound/weather/rain/wind_3.ogg'=1,
+ 'sound/weather/rain/wind_4.ogg'=1,
+ 'sound/weather/rain/wind_5.ogg'=1,
+ 'sound/weather/rain/wind_6.ogg'=1
+ )
+ mid_length = 30 SECONDS
+ volume = 150
diff --git a/code/datums/pollutant.dm b/code/datums/pollutant.dm
index 8ed8e0116b..4d47cf08fb 100644
--- a/code/datums/pollutant.dm
+++ b/code/datums/pollutant.dm
@@ -1,16 +1,39 @@
/datum/pollutant
- /// Name of the pollutant
+ /// Name of the pollutant, if null will be treated as abstract and wont be initialized as singleton
var/name
+ /// Flags of the pollutant, determine whether it has an appearance, smell, touch act, breath act
+ var/pollutant_flags = NONE
+ /// Below are variables for appearance
+ /// What color will the pollutant be, can be left null
+ var/color
+ /// What is it desired alpha?
+ var/alpha = 255
+ /// How "thick" is it, the thicker the quicker it gets to desired alpha and is stronger than other pollutants in blending appearance
+ var/thickness = 1
+ ///FILL THE BELOW OUT IF ITS SMELLABLE!
+ /// How intense is one unit of the pollutant for smell purposes?
+ var/smell_intensity
/// Descriptor of the smell
var/descriptor
/// Scent of the smell
var/scent
- /// Color of the pollutant
- var/color
/datum/pollutant/proc/on_life(parent)
return
+///When a pollutant touches an unprotected mob
+/datum/pollutant/proc/touch_act(mob/living/victim, amount)
+ return
+
+///When a carbon mob breathes in the pollutant
+/datum/pollutant/proc/breathe_act(mob/living/carbon/victim, amount)
+ return
+
+///When a carbon mob smells scents this is called
+/datum/pollutant/proc/on_smell(mob/living/carbon/victim, amount)
+ return
+
+
/datum/pollutant/fragrance/on_life(parent)
. = ..()
for(var/mob/living/carbon/human/H in view(1, parent))
@@ -25,12 +48,23 @@
if(prob(2))
H.visible_message(span_green("The [descriptor] of [scent] bombards my nostrils."))
+///Smoke coming from cigarettes and fires
+/datum/pollutant/smoke //and mirrors
+ name = "Smoke"
+ pollutant_flags = POLLUTANT_APPEARANCE | POLLUTANT_SMELL | POLLUTANT_BREATHE_ACT
+ smell_intensity = 1
+ descriptor = SCENT_DESC_SMELL
+ scent = "smoke"
+
/datum/pollutant/fragrance
+ smell_intensity = 2
+ pollutant_flags = POLLUTANT_SMELL
+
name = "debug fragrance"
scent = "debug scent"
color = "#000000"
- descriptor = "scent"
+ descriptor = "fragrance"
/datum/pollutant/fragrance/lavender
name = "lavender"
diff --git a/code/datums/pollutants/foods.dm b/code/datums/pollutants/foods.dm
new file mode 100644
index 0000000000..0b669b0051
--- /dev/null
+++ b/code/datums/pollutants/foods.dm
@@ -0,0 +1,185 @@
+/datum/pollutant/food
+ smell_intensity = 2
+ pollutant_flags = POLLUTANT_SMELL
+
+ name = "debug food smell"
+ scent = "smell"
+ color = "#000000"
+
+ descriptor = "smell"
+
+/datum/pollutant/food/apple_pie
+ name = "apple pie"
+ scent = "apple pie"
+
+/datum/pollutant/food/fish_pie
+ name = "fish pie"
+ scent = "fish pie"
+
+/datum/pollutant/food/meat_pie
+ name = "meat pie"
+ scent = "meat pie"
+
+/datum/pollutant/food/pot_pie
+ name = "pot pie"
+ scent = "pot pie"
+
+/datum/pollutant/food/berry_pie
+ name = "berry pie"
+ scent = "berry pie"
+
+/datum/pollutant/food/bread
+ name = "fresh baked bread"
+ scent = "fresh baked bread"
+
+/datum/pollutant/food/bun
+ name = "fresh baked buns"
+ scent = "fresh baked buns"
+
+/datum/pollutant/food/pastry
+ name = "fresh baked pastry"
+ scent = "fresh baked pastry"
+
+/datum/pollutant/food/pie_base
+ name = "fresh baked pie crust"
+ scent = "fresh baked pie crust"
+
+/datum/pollutant/food/toast
+ name = "cooked toast"
+ scent = "cooked toast"
+
+/datum/pollutant/food/raisin_bread
+ name = "fresh baked loaf of raisin bread"
+ scent = "fresh baked loaf of raisin bread"
+
+/datum/pollutant/food/cheese_bun
+ name = "fresh baked cheese buns"
+ scent = "fresh baked cheese buns"
+
+/datum/pollutant/food/biscuit
+ name = "fresh baked biscuits"
+ scent = "fresh baked biscuits"
+
+/datum/pollutant/food/prezzel
+ name = "fresh baked prezzel"
+ scent = "fresh baked prezzel"
+
+/datum/pollutant/food/honey_cake
+ name = "fresh baked honey cake"
+ scent = "fresh baked honey cake"
+
+/datum/pollutant/food/cheese_cake
+ name = "fresh baked cheese cake"
+ scent = "fresh baked cheese cake"
+
+/datum/pollutant/food/baked_potato
+ name = "baked potatos"
+ scent = "baked potatos"
+
+/datum/pollutant/food/baked_carp
+ name = "cooked carp"
+ scent = "cooked carp"
+
+/datum/pollutant/food/baked_eel
+ name = "cooked eel"
+ scent = "cooked eel"
+
+/datum/pollutant/food/baked_clownfish
+ name = "cooked clown fish"
+ scent = "cooked clown fish"
+
+/datum/pollutant/food/baked_angler
+ name = "cooked angler fish"
+ scent = "cooked angler fish"
+
+/datum/pollutant/food/truffles
+ name = "cooked truffles"
+ scent = "cooked truffles"
+
+/datum/pollutant/food/bacon
+ name = "fried bacon"
+ scent = "fried bacon"
+
+/datum/pollutant/food/fried_meat
+ name = "fried meat"
+ scent = "fried meat"
+
+/datum/pollutant/food/fried_chicken
+ name = "cooked chicken"
+ scent = "cooked chicken"
+
+/datum/pollutant/food/sausage
+ name = "cooked sausage"
+ scent = "cooked sausage"
+
+/datum/pollutant/food/wiener
+ name = "cooked wiener"
+ scent = "cooked wiener"
+
+/datum/pollutant/food/fried_cabbage
+ name = "fried cabbage"
+ scent = "fried cabbage"
+
+/datum/pollutant/food/fried_onion
+ name = "fried onion"
+ scent = "fried onion"
+
+/datum/pollutant/food/roasted_seeds
+ name = "roasted seeds"
+ scent = "roasted seeds"
+
+/datum/pollutant/food/fried_rat
+ name = "fried rats"
+ scent = "fried rats"
+
+/datum/pollutant/food/fried_crow
+ name = "fried crows"
+ scent = "fried crows"
+
+/datum/pollutant/food/oatmeal
+ name = "boiled oats"
+ scent = "boiled oats"
+
+/datum/pollutant/food/potato_stew
+ name = "potato stew"
+ scent = "potato stew"
+
+/datum/pollutant/food/onion_stew
+ name = "onion soup"
+ scent = "onion soup"
+
+/datum/pollutant/food/cabbage_stew
+ name = "cabbage soup"
+ scent = "cabbage soup"
+
+/datum/pollutant/food/turnip_stew
+ name = "turnip soup"
+ scent = "turnip soup"
+
+/datum/pollutant/food/fish_stew
+ name = "fish stew"
+ scent = "fish stew"
+
+/datum/pollutant/food/chicken_stew
+ name = "chicken stew"
+ scent = "chicken stew"
+
+/datum/pollutant/food/meat_stew
+ name = "meat stew"
+ scent = "meat stew"
+
+/datum/pollutant/food/egg_soup
+ name = "egg soup"
+ scent = "egg soup"
+
+/datum/pollutant/food/truffle_stew
+ name = "truffle stew"
+ scent = "truffle stew"
+
+/datum/pollutant/food/cheese_soup
+ name = "cheese soup"
+ scent = "cheese soup"
+
+/datum/pollutant/food/druqks
+ name = "acrid air"
+ scent = "acrid air"
diff --git a/code/datums/pollutants/generic.dm b/code/datums/pollutants/generic.dm
new file mode 100644
index 0000000000..2db1a25d04
--- /dev/null
+++ b/code/datums/pollutants/generic.dm
@@ -0,0 +1,7 @@
+///Splashing blood makes a tiny bit of this
+/datum/pollutant/metallic_scent
+ name = "Metallic Scent"
+ pollutant_flags = POLLUTANT_SMELL
+ smell_intensity = 1
+ descriptor = "smell"
+ scent = "a metallic scent"
diff --git a/code/datums/pollution.dm b/code/datums/pollution.dm
new file mode 100644
index 0000000000..7f8ac1f17c
--- /dev/null
+++ b/code/datums/pollution.dm
@@ -0,0 +1,299 @@
+/obj/effect/abstract/pollution
+ icon = 'icons/effects/96x96.dmi'
+ icon_state = "smoke-static"
+ pixel_x = -32
+ pixel_y = -32
+ anchored = TRUE
+ plane = GAME_PLANE_UPPER
+ layer = AREA_LAYER-1
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ appearance_flags = KEEP_APART|RESET_TRANSFORM|RESET_COLOR
+ vis_flags = NONE
+
+/turf/open
+ appearance_flags = LONG_GLIDE | TILE_BOUND
+ /// Pollution of this turf
+ var/datum/pollution/pollution
+
+
+/datum/pollution
+ /// Reference to the turf we're on
+ var/turf/open/my_turf
+ /// List of all pollutant types to their amount
+ var/list/pollutants = list()
+ /// Total amount
+ var/total_amount = 0
+ /// Height of the pollution, used to create a sandpiling effect
+ var/height = 0
+ /// The vis content we are managing
+ var/obj/effect/abstract/pollution/managed_overlay
+
+/datum/pollution/New(turf/open/passed_turf)
+ if(!isopenturf(passed_turf))
+ stack_trace("Attempted to create a pollution datum on a non-open turf ([passed_turf?.type || null])")
+ qdel(src)
+ return
+ . = ..()
+ my_turf = passed_turf
+ my_turf.pollution = src
+ REGISTER_POLLUTION(src)
+
+/datum/pollution/Destroy()
+ if(managed_overlay)
+ my_turf?.vis_contents -= managed_overlay
+ if(LAZYLEN(managed_overlay.vis_locs) == 0)
+ qdel(managed_overlay)
+ managed_overlay = null
+ REMOVE_POLLUTION_CURRENTRUN(src)
+ SET_UNACTIVE_POLLUTION(src)
+ UNREGISTER_POLLUTION(src)
+ if(my_turf?.pollution == src)
+ my_turf.pollution = null
+ return ..()
+
+/datum/pollution/proc/touch_act(mob/living/carbon/victim)
+ if(!victim.can_inject())
+ return
+ var/list/singleton_cache = SSpollution.singletons
+ for(var/type in pollutants)
+ var/datum/pollutant/pollutant = singleton_cache[type]
+ if(!(pollutant.pollutant_flags & POLLUTANT_TOUCH_ACT))
+ continue
+ var/amount = pollutants[type]
+ pollutant.touch_act(victim, amount)
+
+/datum/pollution/proc/breathe_act(mob/living/carbon/victim)
+ var/list/singleton_cache = SSpollution.singletons
+ for(var/type in pollutants)
+ var/datum/pollutant/pollutant = singleton_cache[type]
+ if(!(pollutant.pollutant_flags & POLLUTANT_BREATHE_ACT))
+ continue
+ var/amount = pollutants[type]
+ pollutant.breathe_act(victim, amount)
+
+/// When a user smells this pollution
+/datum/pollution/proc/smell_act(mob/living/sniffer)
+ if(HAS_TRAIT(sniffer, TRAIT_AGEUSIA)) // can't taste, can't smell.
+ return
+ var/list/singleton_cache = SSpollution.singletons
+ var/datum/pollutant/dominant_pollutant
+ var/dominiant_smell_power
+ for(var/type in pollutants)
+ var/datum/pollutant/pollutant = singleton_cache[type]
+ if(!(pollutant.pollutant_flags & POLLUTANT_SMELL))
+ continue
+ var/smelly_power = pollutant.smell_intensity * pollutants[type]
+ if(smelly_power < POLLUTANT_SMELL_THRESHOLD)
+ continue
+ if(!dominant_pollutant || smelly_power > dominiant_smell_power)
+ dominant_pollutant = pollutant
+ dominiant_smell_power = smelly_power
+ if(!dominant_pollutant)
+ return
+
+ var/smell_string
+ switch(dominiant_smell_power)
+ if(0 to POLLUTANT_SMELL_NORMAL)
+ if(sniffer.mob_biotypes & MOB_ROBOTIC)
+ smell_string = "Your sensors detect trace amounts of [dominant_pollutant.scent] in the air."
+ else
+ smell_string = "The subtle [dominant_pollutant.descriptor] of [dominant_pollutant.scent] tickles your nose..."
+ if(POLLUTANT_SMELL_NORMAL to POLLUTANT_SMELL_STRONG)
+ if(sniffer.mob_biotypes & MOB_ROBOTIC)
+ smell_string = "Your sensors pick up the presence of [dominant_pollutant.scent] in the air."
+ else
+ smell_string = "The [dominant_pollutant.descriptor] of [dominant_pollutant.scent] fills the air."
+ if(POLLUTANT_SMELL_STRONG to INFINITY)
+ if(sniffer.mob_biotypes & MOB_ROBOTIC)
+ smell_string = "Your sensors pick up an intense concentration of [dominant_pollutant.scent]."
+ else
+ smell_string = "The unmistakable [dominant_pollutant.descriptor] of [dominant_pollutant.scent] bombards your nostrils."
+
+ if(dominant_pollutant.descriptor == SCENT_DESC_ODOR)
+ to_chat(sniffer, span_warning(smell_string))
+ else
+ to_chat(sniffer, span_notice(smell_string))
+
+/datum/pollution/proc/scrub_amount(amount_to_scrub, update_active = TRUE)
+ if(amount_to_scrub >= total_amount || !isopenturf(my_turf) || QDELING(my_turf))
+ qdel(src)
+ return
+ for(var/type in pollutants)
+ pollutants[type] -= amount_to_scrub * pollutants[type] / total_amount
+ total_amount -= amount_to_scrub
+ update_height()
+ handle_overlay()
+ if(update_active)
+ my_turf.update_adjacent_pollutants()
+
+/datum/pollution/proc/add_pollutant(polutant_type, amount)
+ if(!pollutants[polutant_type])
+ pollutants[polutant_type] = 0
+ pollutants[polutant_type] += amount
+ total_amount += amount
+ update_height()
+ handle_overlay()
+ SET_ACTIVE_POLLUTION(src)
+
+/datum/pollution/proc/add_pollutant_list(list/passed_pollutants)
+ for(var/polutant_type in passed_pollutants)
+ if(!pollutants[polutant_type])
+ pollutants[polutant_type] = 0
+ pollutants[polutant_type] += passed_pollutants[polutant_type]
+ total_amount += passed_pollutants[polutant_type]
+ update_height()
+ handle_overlay()
+ SET_ACTIVE_POLLUTION(src)
+
+/datum/pollution/proc/update_height()
+ height = calculate_height(total_amount)
+
+/datum/pollution/proc/calculate_height(passed_amount)
+ return CEILING(passed_amount / POLLUTION_HEIGHT_DIVISOR, 1)
+
+/datum/pollution/proc/process_cell()
+ if(height <= 1)
+ SET_UNACTIVE_POLLUTION(src)
+ return
+ var/list/sharing_turfs
+ var/list/already_processed_cache = SSpollution.processed_this_run
+ var/list/potential_activers
+ for(var/turf/open/open_turf as anything in my_turf.atmos_adjacent_turfs)
+ if(!isopenturf(open_turf) || QDELING(open_turf))
+ continue
+ if(!already_processed_cache[open_turf])
+ if(can_share_with(open_turf))
+ LAZYSET(sharing_turfs, open_turf, TRUE)
+ else
+ LAZYSET(potential_activers, open_turf, TRUE)
+ if(!length(sharing_turfs))
+ SET_UNACTIVE_POLLUTION(src)
+ return
+ LAZYSET(sharing_turfs, my_turf, TRUE)
+ //Now we've gotten all the turfs that should share pollution. Gather their total pollutions and split evenly
+ var/list/total_share_pollutants = list()
+ var/total_share_amount = 0
+ for(var/turf/open/open_turf as anything in sharing_turfs)
+ if(!isopenturf(open_turf) || QDELING(open_turf) || QDELETED(open_turf.pollution))
+ continue
+ var/datum/pollution/cached_pollution = open_turf.pollution
+ for(var/type in cached_pollution.pollutants)
+ if(!total_share_pollutants[type])
+ total_share_pollutants[type] = 0
+ total_share_pollutants[type] += cached_pollution.pollutants[type]
+ total_share_amount += cached_pollution.pollutants[type]
+
+ var/sharing_len = length(sharing_turfs)
+ for(var/type in total_share_pollutants)
+ total_share_pollutants[type] /= sharing_len
+ total_share_amount /= sharing_len
+ var/new_heights = calculate_height(total_share_amount)
+ var/obj/effect/abstract/pollution/new_overlay = get_overlay(total_share_pollutants, total_share_amount)
+ for(var/turf/open/open_turf as anything in sharing_turfs)
+ if(!isopenturf(open_turf) || QDELING(open_turf))
+ continue
+
+ assert_pollution(open_turf)
+ var/datum/pollution/cached_pollution = open_turf.pollution
+ if(cached_pollution.managed_overlay)
+ cached_pollution.my_turf.vis_contents -= cached_pollution.managed_overlay
+
+ if(!QDELETED(new_overlay))
+ cached_pollution.managed_overlay = new_overlay
+ cached_pollution.my_turf.vis_contents += new_overlay
+
+ cached_pollution.pollutants = total_share_pollutants.Copy()
+ cached_pollution.total_amount = total_share_amount
+ cached_pollution.height = new_heights
+ SET_ACTIVE_POLLUTION(cached_pollution)
+
+ for(var/turf/open/open_turf as anything in potential_activers)
+ if(!isopenturf(open_turf) || QDELING(open_turf))
+ continue
+ if(open_turf?.pollution?.can_share_with(my_turf))
+ SET_ACTIVE_POLLUTION(open_turf.pollution)
+
+/datum/pollution/proc/can_share_with(turf/open/shareto)
+ if(!isopenturf(shareto))
+ return FALSE
+ if(QDELETED(shareto.pollution))
+ return TRUE
+ if((shareto.pollution.height + 1) < height)
+ return TRUE
+ return FALSE
+
+/datum/pollution/proc/assert_pollution(turf/open/to_assert)
+ if(!isopenturf(to_assert))
+ CRASH("Attempted to assert pollution on a non-open turf ([to_assert?.type || null])")
+ if(QDELETED(to_assert.pollution))
+ new /datum/pollution(to_assert)
+
+/datum/pollution/proc/handle_overlay()
+ if(managed_overlay)
+ my_turf.vis_contents -= managed_overlay
+ if(LAZYLEN(managed_overlay.vis_locs) == 0)
+ qdel(managed_overlay)
+ managed_overlay = get_overlay(pollutants, total_amount)
+ if(managed_overlay)
+ my_turf.vis_contents += managed_overlay
+
+///Probably the most costly thing happening here
+/datum/pollution/proc/get_overlay(list/pollutant_list, total_amount)
+ var/datum/pollutant/pollutant
+ var/total_thickness
+ if(length(pollutant_list) == 1)
+ pollutant = SSpollution.singletons[pollutant_list[1]]
+ if(!(pollutant.pollutant_flags & POLLUTANT_APPEARANCE))
+ return
+ total_thickness = total_amount * pollutant.thickness
+ else
+ var/list/pollutant_cache = SSpollution.singletons
+ var/datum/pollutant/iterated_pollutant
+ var/calc_thickness
+ for(var/pollutant_type in pollutant_list)
+ iterated_pollutant = pollutant_cache[pollutant_type]
+ if(!(iterated_pollutant.pollutant_flags & POLLUTANT_APPEARANCE))
+ continue
+ calc_thickness = pollutant_list[pollutant_type] * iterated_pollutant.thickness
+ if(!pollutant || calc_thickness > total_thickness)
+ pollutant = iterated_pollutant
+ total_thickness = calc_thickness
+
+ if(!total_thickness || total_thickness < POLLUTANT_APPEARANCE_THICKNESS_THRESHOLD)
+ return
+
+ var/obj/effect/abstract/pollution/overlay = new
+ overlay.alpha = FLOOR(pollutant.alpha * total_thickness * THICKNESS_ALPHA_COEFFICIENT, 1)
+ overlay.color = pollutant.color
+ return overlay
+
+///Atmos adjacency has been updated on this turf, see if it affects any of our pollutants
+/turf/proc/update_adjacent_pollutants()
+ for(var/turf/open/open_turf as anything in atmos_adjacent_turfs)
+ if(!isopenturf(open_turf) || QDELING(open_turf) || QDELETED(open_turf.pollution))
+ continue
+ SET_ACTIVE_POLLUTION(open_turf.pollution)
+
+/turf/proc/pollute_turf(pollution_type, amount, cap)
+ return
+
+/turf/proc/pollute_turf_list(list/pollutions, cap)
+ return
+
+/turf/open/pollute_turf(pollution_type, amount, cap)
+ if(QDELING(src))
+ return
+ if(QDELETED(pollution))
+ pollution = new(src)
+ if(cap && pollution.total_amount >= cap)
+ return
+ pollution.add_pollutant(pollution_type, amount)
+
+/turf/open/pollute_turf_list(list/pollutions, cap)
+ if(QDELING(src))
+ return
+ if(QDELETED(pollution))
+ pollution = new(src)
+ if(cap && pollution.total_amount >= cap)
+ return
+ pollution.add_pollutant_list(pollutions)
diff --git a/code/datums/radiation_wave.dm b/code/datums/radiation_wave.dm
index 7dae69c230..7a3f490745 100644
--- a/code/datums/radiation_wave.dm
+++ b/code/datums/radiation_wave.dm
@@ -104,11 +104,9 @@
var/static/list/blacklisted = typecacheof(list(
/turf,
/mob,
- /obj/structure/cable,
/obj/machinery/atmospherics,
/obj/item/ammo_casing,
- /obj/item/implant,
- /obj/singularity
+ /obj/item/implant
))
if(!can_contaminate || blacklisted[thing.type])
continue
diff --git a/code/datums/saymode.dm b/code/datums/saymode.dm
index 57ef7701e3..08ed048e64 100644
--- a/code/datums/saymode.dm
+++ b/code/datums/saymode.dm
@@ -9,69 +9,6 @@
/datum/saymode/proc/handle_message(mob/living/user, message, datum/language/language)
return TRUE
-
-/datum/saymode/changeling
- key = MODE_KEY_CHANGELING
- mode = MODE_CHANGELING
-
-/datum/saymode/changeling/handle_message(mob/living/user, message, datum/language/language)
- switch(user.lingcheck())
- if(LINGHIVE_LINK)
- var/msg = "[user.mind]: [message]"
- for(var/_M in GLOB.player_list)
- var/mob/M = _M
- if(M in GLOB.dead_mob_list)
- var/link = FOLLOW_LINK(M, user)
- to_chat(M, "[link] [msg]")
- else
- switch(M.lingcheck())
- if (LINGHIVE_LING)
- var/mob/living/L = M
- if (!HAS_TRAIT(L, CHANGELING_HIVEMIND_MUTE))
- to_chat(M, msg)
- if(LINGHIVE_LINK)
- to_chat(M, msg)
- if(LINGHIVE_OUTSIDER)
- if(prob(40))
- to_chat(M, "We can faintly sense an outsider trying to communicate through the hivemind...")
- if(LINGHIVE_LING)
- if (HAS_TRAIT(user, CHANGELING_HIVEMIND_MUTE))
- to_chat(user, "The poison in the air hinders our ability to interact with the hivemind.")
- return FALSE
- var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
- var/msg = "[changeling.changelingID]: [message]"
- user.log_talk(message, LOG_SAY, tag="changeling [changeling.changelingID]")
- for(var/_M in GLOB.player_list)
- var/mob/M = _M
- if(M in GLOB.dead_mob_list)
- var/link = FOLLOW_LINK(M, user)
- to_chat(M, "[link] [msg]")
- else
- switch(M.lingcheck())
- if(LINGHIVE_LINK)
- to_chat(M, msg)
- if(LINGHIVE_LING)
- var/mob/living/L = M
- if (!HAS_TRAIT(L, CHANGELING_HIVEMIND_MUTE))
- to_chat(M, msg)
- if(LINGHIVE_OUTSIDER)
- if(prob(40))
- to_chat(M, "We can faintly sense another of our kind trying to communicate through the hivemind...")
- if(LINGHIVE_OUTSIDER)
- to_chat(user, "Our senses have not evolved enough to be able to communicate this way...")
- return FALSE
-
-
-/datum/saymode/xeno
- key = "a"
- mode = MODE_ALIEN
-
-/datum/saymode/xeno/handle_message(mob/living/user, message, datum/language/language)
- if(user.hivecheck())
- user.alien_talk(message)
- return FALSE
-
-
/datum/saymode/vocalcords
key = MODE_KEY_VOCALCORDS
mode = MODE_VOCALCORDS
@@ -85,41 +22,6 @@
V.speak_with(message) //action
return FALSE
-
-/datum/saymode/binary //everything that uses .b (silicons, drones, blobbernauts/spores, swarmers)
- key = MODE_KEY_BINARY
- mode = MODE_BINARY
-
-/datum/saymode/binary/handle_message(mob/living/user, message, datum/language/language)
- if(isswarmer(user))
- var/mob/living/simple_animal/hostile/swarmer/S = user
- S.swarmer_chat(message)
- return FALSE
- if(isblobmonster(user))
- var/mob/living/simple_animal/hostile/blob/B = user
- B.blob_chat(message)
- return FALSE
- if(isdrone(user))
- var/mob/living/simple_animal/drone/D = user
- D.drone_chat(message)
- return FALSE
- if(user.binarycheck())
- user.robot_talk(message)
- return FALSE
- return FALSE
-
-
-/datum/saymode/holopad
- key = "h"
- mode = MODE_HOLOPAD
-
-/datum/saymode/holopad/handle_message(mob/living/user, message, datum/language/language)
- if(isAI(user))
- var/mob/living/silicon/ai/AI = user
- AI.holopad_talk(message, language)
- return FALSE
- return TRUE
-
/datum/saymode/monkey
key = "k"
mode = MODE_MONKEY
diff --git a/code/datums/sexcon.dm b/code/datums/sexcon.dm
index b9ad0cb094..2c280771e4 100644
--- a/code/datums/sexcon.dm
+++ b/code/datums/sexcon.dm
@@ -53,10 +53,6 @@
return FALSE
if(get_playerquality(client.ckey) <= -10)
return FALSE
-// if(!client.whitelisted())
-// if(!client.patreonlevel())
-// can_do_sex = 0
-// return can_do_sex
if(client.blacklisted())
can_do_sex = 0
return can_do_sex
@@ -81,7 +77,7 @@
if(G.limb_grabbed == chest)
if(G.grabbee == user)
if(G.sublimb_grabbed == BODY_ZONE_PRECISE_GROIN)
- var/yea = list("fap")
+ var/yea = list("pleasure self")
var/td = input(user, "pleasures","") as null|anything in yea
if(td == "fap")
sexcon.begin_fapping(G, user)
@@ -112,11 +108,11 @@
if(user.gender == MALE)
if(gender == FEMALE)
if(get_location_accessible(src, BODY_ZONE_CHEST))
- what2do += "use chest"
+ what2do += "taff chest"
if(user.gender == MALE)
if(ourgroin && theirgroin)
- what2do += "love"
- what2do += "zodomy"
+ what2do += "taff the front"
+ what2do += "taff the back"
if(user.gender == FEMALE)
if(ourgroin && theirgroin)
if(!user.lying && src.lying)
@@ -141,9 +137,9 @@
user.sexcon.begin_mouthride(src)
if("use chest")
user.sexcon.begin_titfuck(src)
- if("zodomy")
+ if("taff back")
user.sexcon.begin_assfuck(src)
- if("love")
+ if("taff front")
user.sexcon.begin_fuck(src)
if("service")
if(G)
@@ -281,7 +277,7 @@
if(user.cmode)
user.emote("embed", forced = TRUE)
playsound(owner, list('sound/misc/mat/insert (1).ogg','sound/misc/mat/insert (2).ogg'), 20, TRUE, ignore_walls = FALSE)
- owner.visible_message("[owner] zodomizes [user].")
+ owner.visible_message("[owner] taffs [user] from behind.")
START_PROCESSING(SSsex, user.sexcon)
START_PROCESSING(SSsex, src)
@@ -728,21 +724,7 @@
return TRUE
/datum/sex_controller/proc/can_change_dir()
- if(fucking)
- return FALSE
- if(inass)
- return FALSE
- if(inpussy)
- return FALSE
- if(ontits)
- return FALSE
- if(inmouth)
- return FALSE
- if(weeating)
- return FALSE
- if(riding)
- return FALSE
- if(fapping && fapping.grabbee != owner)
+ if(fucking || inass || inpussy || ontits || inmouth || weeating || riding || (fapping && fapping.grabbee != owner))
return FALSE
return TRUE
@@ -829,9 +811,6 @@
if(prob(33))
fucking.visible_message("[fucking] rides [owner].")
var/usedsource = "insidepussy"
- if(D.owner.stat == DEAD)
- usedsource = "fuckcorpse"
- stop_fucking()
D.adjust_horny(4, "pussyfucked")
if(adjust_horny(3, usedsource))
D.adjust_horny(50, "pussyfucked")
@@ -845,12 +824,8 @@
if(prob(33))
fucking.visible_message("[owner] taffs [fucking].")
var/usedsource = "insidepussy"
- if(D.owner.stat == DEAD)
- usedsource = "fuckcorpse"
- stop_fucking()
- else
- if(D.owner.stat != CONSCIOUS)
- usedsource = "sleepingbeauty"
+ if(D.owner.stat != CONSCIOUS)
+ usedsource = "sleepingbeauty"
if(D.owner.cmode)
D.owner.flash_fullscreen("redflash1")
D.adjust_horny(4, "pussyfucked")
@@ -865,12 +840,9 @@
if(fucking)
playsound(owner, 'sound/misc/mat/segso.ogg', 50, TRUE, -2, ignore_walls = FALSE)
if(prob(33))
- fucking.visible_message("[owner] zodomizes [fucking].")
+ fucking.visible_message("[owner] taffs [fucking] from behind.")
// D.owner.Immobilize(10)
var/usedsource = "insideass"
- if(D.owner.stat == DEAD)
- usedsource = "fuckcorpse"
- stop_fucking()
if(D.owner.cmode)
D.owner.flash_fullscreen("redflash1")
if(D.owner.cmode)
@@ -889,11 +861,8 @@
if(fucking)
playsound(owner, 'sound/misc/mat/fap.ogg', 30, TRUE, -2, ignore_walls = FALSE)
if(prob(33))
- fucking.visible_message("[owner] uses [fucking]'s chest.")
+ fucking.visible_message("[owner] taffs [fucking]'s chest.")
var/usedsource = "ontits"
- if(D.owner.stat == DEAD)
- usedsource = "fuckcorpse"
- stop_fucking()
if(adjust_horny(2, usedsource))
stop_fucking()
// D.owner.Immobilize(10)
@@ -910,12 +879,9 @@
else
playsound(fucking, pick('sound/misc/mat/guymouth (1).ogg','sound/misc/mat/guymouth (2).ogg','sound/misc/mat/guymouth (3).ogg','sound/misc/mat/guymouth (4).ogg','sound/misc/mat/guymouth (5).ogg'), 20, TRUE, ignore_walls = FALSE)
if(prob(33))
- fucking.visible_message("[owner] feeds [fucking].")
+ fucking.visible_message("[owner] thrusts in [fucking]'s mouth.")
// D.owner.Immobilize(10)
var/usedsource = "fuckmouth"
- if(D.owner.stat == DEAD)
- usedsource = "fuckcorpse"
- stop_fucking()
if(adjust_horny(3, usedsource))
stop_fucking()
//if race here if(D.owner.)
@@ -950,9 +916,9 @@
playsound(eatingus, pick('sound/misc/mat/guymouth (1).ogg','sound/misc/mat/guymouth (2).ogg','sound/misc/mat/guymouth (3).ogg','sound/misc/mat/guymouth (4).ogg','sound/misc/mat/guymouth (5).ogg'), 100, TRUE, -2, ignore_walls = FALSE)
if(prob(33))
if(owner.gender == MALE)
- owner.visible_message("[eatingus] sucks [owner].")
+ owner.visible_message("[eatingus] sucks off [owner].")
else
- owner.visible_message("[eatingus] eats [owner].")
+ owner.visible_message("[eatingus] eats out [owner].")
if(adjust_horny(3, "suckedoff"))
stop_eating_us()
if(fapping)
@@ -969,7 +935,7 @@
if(fapping)
playsound(owner, 'sound/misc/mat/fap.ogg', 30, TRUE, -2, ignore_walls = FALSE)
if(prob(33))
- owner.visible_message("[owner] faps.")
+ owner.visible_message("[owner] pleasures themself.")
if(adjust_horny(1, "fapself"))
stop_fapping()
else
@@ -1034,67 +1000,6 @@
/datum/sex_controller/female/handle_sex()
. = ..()
-/* if(world.time > last_silence_check + 10 SECONDS)
- if(iscarbon(owner))
- var/mob/living/carbon/C = owner
- if(C.silent || !C.canspeak())
- if(curplaying)
- curplaying = null
- if(femmoans)
- femmoans.stop()
- return
- if(owner.stat)
- if(curplaying)
- curplaying = null
- if(femmoans)
- femmoans.stop()
- if(draining)
- if(curplaying)
- curplaying = null
- if(femmoans)
- femmoans.stop()
-/ else
- if(owner.r_intent == SUBMIT_INTENT && owner.stat == CONSCIOUS)
- if(horny > 200)
- if(curplaying != "hvy")
- if(femmoans)
- femmoans.stop()
- if(prob(50))
- femmoans = new /datum/looping_sound/femhornyhvy(list(owner), FALSE)
- else
- femmoans = new /datum/looping_sound/femhornyhvyalt(list(owner), FALSE)
- femmoans.start()
- curplaying = "hvy"
- else if(horny > 150)
- if(curplaying != "med")
- if(femmoans)
- femmoans.stop()
- if(prob(50))
- femmoans = new /datum/looping_sound/femhornymed(list(owner), FALSE)
- else
- femmoans = new /datum/looping_sound/femhornymedalt(list(owner), FALSE)
- femmoans.start()
- curplaying = "med"
- else if(horny > 50)
- if(curplaying != "lite")
- if(femmoans)
- femmoans.stop()
- if(prob(50))
- femmoans = new /datum/looping_sound/femhornylite(list(owner), FALSE)
- else
- femmoans = new /datum/looping_sound/femhornylitealt(list(owner), FALSE)
- femmoans.start()
- curplaying = "lite"
- else
- if(curplaying)
- curplaying = null
- if(femmoans)
- femmoans.stop()
- else
- if(curplaying)
- curplaying = null
- if(femmoans)
- femmoans.stop()*/
/datum/sex_controller/proc/adjust_horny(amt, source)
if(!amt)
@@ -1160,9 +1065,6 @@
C.add_stress(/datum/stressevent/cumok)
else
C.add_stress(/datum/stressevent/cumbad)
- if("fuckcorpse")
- C.add_stress(/datum/stressevent/cumcorpse)
- C.freak_out()
/datum/sex_controller/male/cum(source)
..()
@@ -1189,18 +1091,6 @@
playsound(owner, pick('sound/misc/mat/mouthend (1).ogg','sound/misc/mat/mouthend (2).ogg'), 100, FALSE, ignore_walls = FALSE)
owner.visible_message("[owner] feeds [fucking]!")
add_cum_floor(get_turf(fucking))
- if(fucking && fucking.sexcon.weeating == owner)
- if(fucking.cmode)
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- var/wuzantag
- if(H.mind)
- if(H.mind.antag_datums)
- if(H.mind.antag_datums.len)
- wuzantag = TRUE
- if(!wuzantag)
- adjust_playerquality(-2, H.ckey, reason="Raped as a non villain.")
- addtimer(CALLBACK(eatingus, TYPE_PROC_REF(/mob, emote), "gag"), rand(10,20))
if("insideass")
if(owner.has_flaw(/datum/charflaw/addiction/lovefiend))
owner.sate_addiction()
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 06b4c9b6b1..0b4c9f021c 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -179,12 +179,6 @@
admin_notes = "No brig, no medical facilities, no shuttle console."
credit_cost = 2500
-/datum/map_template/shuttle/emergency/airless/post_load()
- . = ..()
- //enable buying engines from cargo
- var/datum/supply_pack/P = SSshuttle.supply_packs[/datum/supply_pack/engineering/shuttle_engine]
- P.special_enabled = TRUE
-
/datum/map_template/shuttle/emergency/asteroid
suffix = "asteroid"
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 009b4b626b..b1053d6063 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -57,14 +57,6 @@
desc = ""
icon_state = "power_regen"
-/datum/status_effect/cyborg_power_regen/tick()
- var/mob/living/silicon/robot/cyborg = owner
- if(!istype(cyborg) || !cyborg.cell)
- qdel(src)
- return
- playsound(cyborg, 'sound/blank.ogg', 50, TRUE)
- cyborg.cell.give(power_to_give)
-
/datum/status_effect/his_grace
id = "his_grace"
duration = -1
@@ -135,35 +127,6 @@
desc = ""
icon_state = "wish_granter"
-/datum/status_effect/cult_master
- id = "The Cult Master"
- duration = -1
- alert_type = null
- on_remove_on_mob_delete = TRUE
- var/alive = TRUE
-
-/datum/status_effect/cult_master/proc/deathrattle()
- if(!QDELETED(GLOB.cult_narsie))
- return //if Nar'Sie is alive, don't even worry about it
- var/area/A = get_area(owner)
- for(var/datum/mind/B in SSticker.mode.cult)
- if(isliving(B.current))
- var/mob/living/M = B.current
- SEND_SOUND(M, sound('sound/blank.ogg'))
- to_chat(M, "The Cult's Master, [owner], has fallen in \the [A]!")
-
-/datum/status_effect/cult_master/tick()
- if(owner.stat != DEAD && !alive)
- alive = TRUE
- return
- if(owner.stat == DEAD && alive)
- alive = FALSE
- deathrattle()
-
-/datum/status_effect/cult_master/on_remove()
- deathrattle()
- . = ..()
-
/datum/status_effect/blooddrunk
id = "blooddrunk"
duration = 10
@@ -439,9 +402,6 @@
L.adjustStaminaLoss(-3.5)
L.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3.5)
L.adjustCloneLoss(-1) //Becasue apparently clone damage is the bastion of all health
- else if(issilicon(L))
- L.adjustBruteLoss(-3.5)
- L.adjustFireLoss(-3.5)
else if(isanimal(L))
var/mob/living/simple_animal/SM = L
SM.adjustHealth(-3.5, forced = TRUE)
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 71498765ca..3c93cc10d4 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -13,13 +13,13 @@
if(.)
if(updating_canmove)
owner.update_mobility()
- if(needs_update_stat || issilicon(owner))
+ if(needs_update_stat)
owner.update_stat()
/datum/status_effect/incapacitating/on_remove()
if(owner)
owner.update_mobility()
- if(needs_update_stat || issilicon(owner)) //silicons need stat updates in addition to normal canmove updates
+ if(needs_update_stat) //silicons need stat updates in addition to normal canmove updates
owner.update_stat()
//STUN
@@ -266,19 +266,6 @@
owner.adjustFireLoss(0.1)
owner.adjustToxLoss(0.2, TRUE, TRUE)
-/datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
- id = "cult_ghost"
- duration = -1
- alert_type = null
-
-/datum/status_effect/cultghost/on_apply()
- owner.see_invisible = SEE_INVISIBLE_OBSERVER
- owner.see_in_dark = 2
-
-/datum/status_effect/cultghost/tick()
- if(owner.reagents)
- owner.reagents.del_reagent(/datum/reagent/water/holywater) //can't be deconverted
-
/datum/status_effect/crusher_mark
id = "crusher_mark"
duration = 300 //if you leave for 30 seconds you lose the mark, deal with it
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index b6fd14218c..6dc0a9b4d7 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -31,37 +31,6 @@
alert_type = null
var/total_damage = 0
-/datum/status_effect/syphon_mark
- id = "syphon_mark"
- duration = 50
- status_type = STATUS_EFFECT_MULTIPLE
- alert_type = null
- on_remove_on_mob_delete = TRUE
- var/obj/item/borg/upgrade/modkit/bounty/reward_target
-
-/datum/status_effect/syphon_mark/on_creation(mob/living/new_owner, obj/item/borg/upgrade/modkit/bounty/new_reward_target)
- . = ..()
- if(.)
- reward_target = new_reward_target
-
-/datum/status_effect/syphon_mark/on_apply()
- if(owner.stat == DEAD)
- return FALSE
- return ..()
-
-/datum/status_effect/syphon_mark/proc/get_kill()
- if(!QDELETED(reward_target))
- reward_target.get_kill(owner)
-
-/datum/status_effect/syphon_mark/tick()
- if(owner.stat == DEAD)
- get_kill()
- qdel(src)
-
-/datum/status_effect/syphon_mark/on_remove()
- get_kill()
- . = ..()
-
/atom/movable/screen/alert/status_effect/in_love
name = "In Love"
desc = ""
diff --git a/code/datums/status_effects/rogue/debuff.dm b/code/datums/status_effects/rogue/debuff.dm
index ca8f4bf5f2..0ac646a808 100644
--- a/code/datums/status_effects/rogue/debuff.dm
+++ b/code/datums/status_effects/rogue/debuff.dm
@@ -77,16 +77,40 @@
/datum/status_effect/debuff/silver_curse
id = "silver_curse"
alert_type = /atom/movable/screen/alert/status_effect/debuff/silver_curse
- duration = 5 SECONDS
-
-/datum/status_effect/debuff/silver_curse/greater
- duration = 10 SECONDS
+ effectedstats = list("strength" = -2,"perception" = -2,"intelligence" = -2, "constitution" = -2, "endurance" = -2,"speed" = -2)
+ duration = 45 SECONDS
/atom/movable/screen/alert/status_effect/debuff/silver_curse
name = "Silver Curse"
desc = "My BANE!"
icon_state = "hunger3"
+// PINTLEDESTRUCTION
+
+/datum/status_effect/debuff/pintledestruction
+ id = "pintlegone"
+ alert_type = /atom/movable/screen/alert/status_effect/debuff/pintledestruction
+ duration = 60 MINUTES
+
+/atom/movable/screen/alert/status_effect/debuff/pintledestruction
+ name = "Wine-Curse"
+ desc = "Oh Gods...it's dead..."
+ icon_state = "muscles"
+
+/datum/status_effect/debuff/pintledestruction/on_apply()
+ . = ..()
+ if(iscarbon(owner))
+ var/mob/living/carbon/C = owner
+ C.add_stress(/datum/stressevent/sadfate)
+ ADD_TRAIT(owner, TRAIT_LIMPDICK, TRAIT_GENERIC)
+
+/datum/status_effect/debuff/pintledestruction/on_remove()
+ . = ..()
+ REMOVE_TRAIT(owner, TRAIT_LIMPDICK, TRAIT_GENERIC)
+ if(iscarbon(owner))
+ var/mob/living/carbon/C = owner
+ C.remove_stress(/datum/stressevent/sadfate)
+
//BROKEN CELIBACY
@@ -371,6 +395,18 @@
desc = "THAT SPOONY BARD! ARGH!\n"
icon_state = "muscles"
+/datum/status_effect/debuff/chilled
+ id = "chilled"
+ alert_type = /atom/movable/screen/alert/status_effect/debuff/chilled
+ effectedstats = list("speed" = -5, "strength" = -2, "endurance" = -2)
+ duration = 15 SECONDS
+
+/atom/movable/screen/alert/status_effect/debuff/chilled
+ name = "Chilled"
+ desc = "I can barely feel my limbs!"
+ icon_state = "chilled"
+
+
//////////////////////Kaizoku stuff//////////////////
@@ -421,7 +457,7 @@
//freezing
/atom/movable/screen/alert/status_effect/debuff/freezing //the abyss is cold.
- name = "Freezing"
+ name = "Abyssal Frostnip"
desc = "Frost-bitten and touched by the ancient god, seeping through time and existence. The god feels, spreads and carves your skin.\n" //that's abyssor.
icon_state = "freezing"
icon = 'icons/roguetown/kaizoku/misc/screen_alert.dmi'
@@ -430,7 +466,7 @@
id = "freezing"
alert_type = /atom/movable/screen/alert/status_effect/debuff/freezing
duration = 30 SECONDS
- effectedstats = list("speed" = -2, "endurance" = -2)
+ effectedstats = list("speed" = -3, "endurance" = -2)
/datum/status_effect/debuff/freezing/tick()
owner.adjustOxyLoss(-6, 0) //it will actually allow you to breath underwater.
@@ -448,7 +484,7 @@
// severe freezing
/atom/movable/screen/alert/status_effect/debuff/freezing/severe //this is even worst.
- name = "Severe Freezing"
+ name = "Abyssal Frostbite"
desc = "Ravaged by a frozen grasp, skin violently carved as divine icy tendrils invade the muscles, spreading a chill so holy that tears through the soul.\n" //that's abyssor.
icon_state = "freezing_severe"
icon = 'icons/roguetown/kaizoku/misc/screen_alert.dmi'
@@ -457,7 +493,7 @@
id = "freezingsevere"
alert_type = /atom/movable/screen/alert/status_effect/debuff/freezing/severe
duration = 60 SECONDS
- effectedstats = list("speed" = -5, "endurance" = -3)
+ effectedstats = list("speed" = -5, "endurance" = -3, "strength" = -1)
/datum/status_effect/debuff/freezing/tick()
owner.adjustOxyLoss(-6, 0) //it will actually allow you to breath underwater.
@@ -474,4 +510,3 @@
/datum/status_effect/debuff/freezing/on_remove()
owner.apply_status_effect(/datum/status_effect/debuff/freezing)
owner.remove_movespeed_modifier(MOVESPEED_ID_NET_SLOWDOWN)
-
diff --git a/code/datums/status_effects/rogue/roguebuff.dm b/code/datums/status_effects/rogue/roguebuff.dm
index 9b588ddf5b..a507aa578c 100644
--- a/code/datums/status_effects/rogue/roguebuff.dm
+++ b/code/datums/status_effects/rogue/roguebuff.dm
@@ -249,6 +249,26 @@
effectedstats = list("speed" = 3)
duration = 1 MINUTES
+/atom/movable/screen/alert/status_effect/buff/longstrider
+ name = "Longstrider"
+ desc = "I can easily walk through rough terrain."
+ icon_state = "buff"
+
+/datum/status_effect/buff/longstrider
+ id = "longstrider"
+ alert_type = /atom/movable/screen/alert/status_effect/buff/longstrider
+ duration = 15 MINUTES
+
+/datum/status_effect/buff/longstrider/on_apply()
+ . = ..()
+ to_chat(owner, span_warning("I am unburdened by the terrain."))
+ ADD_TRAIT(owner, TRAIT_LONGSTRIDER, MAGIC_TRAIT)
+
+/datum/status_effect/buff/longstrider/on_remove()
+ . = ..()
+ to_chat(owner, span_warning("The rough floors slow my travels once again."))
+ REMOVE_TRAIT(owner, TRAIT_LONGSTRIDER, MAGIC_TRAIT)
+
/datum/status_effect/buff/calm
id = "calm"
alert_type = /atom/movable/screen/alert/status_effect/buff/calm
diff --git a/code/datums/status_effects/rogue/roguestatus.dm b/code/datums/status_effects/rogue/roguestatus.dm
index 9a1a91960a..69781cf9db 100644
--- a/code/datums/status_effects/rogue/roguestatus.dm
+++ b/code/datums/status_effects/rogue/roguestatus.dm
@@ -3,7 +3,7 @@
/datum/status_effect/stress/stressinsane
id = "insane"
- effectedstats = list("constitution" = -1, "endurance" = -2, "speed" = -2)
+ effectedstats = list("constitution" = -2, "endurance" = -2, "speed" = -2, "fortune" = -2)
alert_type = /atom/movable/screen/alert/status_effect/stress/stressinsane
/atom/movable/screen/alert/status_effect/stress/stressinsane
@@ -13,7 +13,7 @@
/datum/status_effect/stress/stressvbad
id = "stressvbad"
- effectedstats = list("constitution" = -1,"endurance" = -1, "speed" = -1)
+ effectedstats = list("constitution" = -1,"endurance" = -2, "speed" = -2, "fortune" = -1)
alert_type = /atom/movable/screen/alert/status_effect/stress/stressvbad
/atom/movable/screen/alert/status_effect/stress/stressvbad
diff --git a/code/datums/stress/negative_events.dm b/code/datums/stress/negative_events.dm
index a34c1ea90a..42c29cdaff 100644
--- a/code/datums/stress/negative_events.dm
+++ b/code/datums/stress/negative_events.dm
@@ -169,11 +169,6 @@
stressadd = 5
desc = "I was violated."
-/datum/stressevent/cumcorpse
- timer = 1 MINUTES
- stressadd = 20
- desc = "What have I done?"
-
/datum/stressevent/blueb
timer = 1 MINUTES
stressadd = 2
@@ -294,6 +289,11 @@
stressadd = 6
desc = "I slept on the floor! What am I?! An animal?!"
+/datum/stressevent/sadfate
+ timer = 60 MINUTES
+ stressadd = 1
+ desc = "I feel useless..."
+
/datum/stressevent/raider
timer = 1 MINUTES
stressadd = 1
diff --git a/code/datums/stress/positive_events.dm b/code/datums/stress/positive_events.dm
index ac6057022f..a020152d98 100644
--- a/code/datums/stress/positive_events.dm
+++ b/code/datums/stress/positive_events.dm
@@ -141,30 +141,30 @@
/datum/stressevent/music
timer = 1 MINUTES
stressadd = -1
- desc = span_green("The music is relaxing.")
+ desc = span_green("This music is relaxing.")
/datum/stressevent/music/two
stressadd = -2
- desc = span_green("The music is very relaxing.")
+ desc = span_green("This music is very relaxing.")
/datum/stressevent/music/three
stressadd = -3
- desc = span_green("The music saps my stress.")
+ desc = span_green("This music saps my stress.")
/datum/stressevent/music/four
stressadd = -4
- desc = span_green("The music is heavenly.")
+ desc = span_green("This music is heavenly.")
timer = 10 MINUTES
/datum/stressevent/music/five
stressadd = -5
timer = 10 MINUTES
- desc = span_green("The music is strummed by an angel.")
+ desc = span_green("This music is strummed by an angel.")
/datum/stressevent/music/six
stressadd = -6
timer = 10 MINUTES
- desc = span_green("The music is a blessing from Xylix.")
+ desc = span_green("This music is a blessing from Xylix.")
// Bard buffs below
diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm
index 85ed64fb39..ea8c2aae50 100644
--- a/code/datums/traits/good.dm
+++ b/code/datums/traits/good.dm
@@ -169,37 +169,6 @@
return
eyes.Insert(H) //refresh their eyesight and vision
-/datum/quirk/photographer
- name = "Photographer"
- desc = ""
- value = 1
- mob_trait = TRAIT_PHOTOGRAPHER
- gain_text = "I know everything about photography."
- lose_text = "I forget how photo cameras work."
- medical_record_text = "Patient mentions photography as a stress-relieving hobby."
-
-/datum/quirk/photographer/on_spawn()
- var/mob/living/carbon/human/H = quirk_holder
- var/obj/item/storage/photo_album/photo_album = new(get_turf(H))
- var/list/album_slots = list (
- "backpack" = SLOT_IN_BACKPACK,
- "hands" = SLOT_HANDS
- )
- H.equip_in_one_of_slots(photo_album, album_slots , qdel_on_fail = TRUE)
- photo_album.persistence_id = "personal_[H.mind.key]" // this is a persistent album, the ID is tied to the account's key to avoid tampering
- photo_album.persistence_load()
- photo_album.name = "[H.real_name]'s photo album"
- var/obj/item/camera/camera = new(get_turf(H))
- var/list/camera_slots = list (
- "neck" = SLOT_NECK,
- "left pocket" = SLOT_L_STORE,
- "right pocket" = SLOT_R_STORE,
- "backpack" = SLOT_IN_BACKPACK,
- "hands" = SLOT_HANDS
- )
- H.equip_in_one_of_slots(camera, camera_slots , qdel_on_fail = TRUE)
- H.regenerate_icons()
-
/datum/quirk/selfaware
name = "Self-Aware"
desc = ""
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index c84ed5e6b2..c8613080b0 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -109,7 +109,7 @@
if("Janitor")
heirloom_type = pick(/obj/item/mop, /obj/item/clothing/suit/caution, /obj/item/reagent_containers/glass/bucket)
if("Cook")
- heirloom_type = pick(/obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/kitchen/rollingpin, /obj/item/clothing/head/chefhat)
+ heirloom_type = pick(/obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/rogueweapon/mace/woodclub/rollingpin, /obj/item/clothing/head/chefhat)
if("Botanist")
heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie)
if("Bartender")
@@ -346,39 +346,6 @@
mob_trait = TRAIT_PROSOPAGNOSIA
medical_record_text = "Patient suffers from prosopagnosia and cannot recognize faces."
-/datum/quirk/prosthetic_limb
- name = "Prosthetic Limb"
- desc = ""
- value = -1
- var/slot_string = "limb"
- medical_record_text = "During physical examination, patient was found to have a prosthetic limb."
-
-/datum/quirk/prosthetic_limb/on_spawn()
- var/limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
- var/mob/living/carbon/human/H = quirk_holder
- var/obj/item/bodypart/old_part = H.get_bodypart(limb_slot)
- var/obj/item/bodypart/prosthetic
- switch(limb_slot)
- if(BODY_ZONE_L_ARM)
- prosthetic = new/obj/item/bodypart/l_arm/robot/surplus(quirk_holder)
- slot_string = "left arm"
- if(BODY_ZONE_R_ARM)
- prosthetic = new/obj/item/bodypart/r_arm/robot/surplus(quirk_holder)
- slot_string = "right arm"
- if(BODY_ZONE_L_LEG)
- prosthetic = new/obj/item/bodypart/l_leg/robot/surplus(quirk_holder)
- slot_string = "left leg"
- if(BODY_ZONE_R_LEG)
- prosthetic = new/obj/item/bodypart/r_leg/robot/surplus(quirk_holder)
- slot_string = "right leg"
- prosthetic.replace_limb(H)
- qdel(old_part)
- H.regenerate_icons()
-
-/datum/quirk/prosthetic_limb/post_add()
- to_chat(quirk_holder, "My [slot_string] has been replaced with a surplus prosthetic. It is fragile and will easily come apart under duress. Additionally, \
- you need to use a welding tool and cables to repair it, instead of bruise packs and ointment.")
-
/datum/quirk/pushover
name = "Pushover"
desc = ""
diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm
index b6811d276f..9392d22d00 100644
--- a/code/datums/weather/weather.dm
+++ b/code/datums/weather/weather.dm
@@ -170,7 +170,7 @@
return TRUE
/datum/weather/proc/update_areas(input, specific_area, specific_turf)
-/*
+
for(var/area/N in impacted_areas)
N.blend_mode = 0
N.layer = overlay_layer
@@ -190,7 +190,7 @@
N.icon = 'icons/turf/areas.dmi'
N.layer = initial(N.layer)
N.plane = initial(N.plane)
- N.set_opacity(FALSE)*/
+ N.set_opacity(FALSE)
if(specific_area)
for(var/i in specific_area)
var/area/N = i
@@ -206,12 +206,11 @@
START_PROCESSING(SSweather,T)
/datum/weather/proc/get_used_state()
-/* switch(stage)
+ switch(stage)
if(STARTUP_STAGE)
return telegraph_overlay
if(MAIN_STAGE)
return weather_overlay
if(WIND_DOWN_STAGE)
return end_overlay
- return ""*/ //thsi bugs out when rain falls then u set off a bomb
- return weather_overlay
+ return "" //thsi bugs out when rain falls then u set off a bomb
diff --git a/code/datums/weather/weather_types/acid_rain.dm b/code/datums/weather/weather_types/acid_rain.dm
deleted file mode 100644
index 8cd5b2ba37..0000000000
--- a/code/datums/weather/weather_types/acid_rain.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-//Acid rain is part of the natural weather cycle in the humid forests of Planetstation, and cause acid damage to anyone unprotected.
-/datum/weather/acid_rain
- name = "acid rain"
- desc = ""
-
- telegraph_duration = 400
- telegraph_message = "Thunder rumbles far above. You hear droplets drumming against the canopy. Seek shelter."
- telegraph_sound = 'sound/blank.ogg'
-
- weather_message = "Acidic rain pours down around you! Get inside!"
- weather_overlay = "acid_rain"
- weather_duration_lower = 600
- weather_duration_upper = 1500
- weather_sound = 'sound/blank.ogg'
-
- end_duration = 100
- end_message = "The downpour gradually slows to a light shower. It should be safe outside now."
- end_sound = 'sound/blank.ogg'
-
- area_type = /area/lavaland/surface/outdoors
- target_trait = ZTRAIT_MINING
-
- immunity_type = "acid" // temp
-
- barometer_predictable = TRUE
-
-
-/datum/weather/acid_rain/weather_act(mob/living/L)
- var/resist = L.getarmor(null, "acid")
- if(prob(max(0,100-resist)))
- L.acid_act(20,20)
- return TRUE
diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm
deleted file mode 100644
index c798b4359b..0000000000
--- a/code/datums/weather/weather_types/ash_storm.dm
+++ /dev/null
@@ -1,113 +0,0 @@
-//Ash storms happen frequently on lavaland. They heavily obscure vision, and cause high fire damage to anyone caught outside.
-/datum/weather/ash_storm
- name = "ash storm"
- desc = ""
-
- telegraph_message = "An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter."
- telegraph_duration = 300
- telegraph_overlay = "light_ash"
-
- weather_message = "Smoldering clouds of scorching ash billow down around you! Get inside!"
- weather_duration_lower = 600
- weather_duration_upper = 1200
- weather_overlay = "ash_storm"
-
- end_message = "The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now."
- end_duration = 300
- end_overlay = "light_ash"
-
- area_type = /area/lavaland/surface/outdoors
- target_trait = ZTRAIT_MINING
-
- immunity_type = "ash"
-
- probability = 90
-
- barometer_predictable = TRUE
-
- var/datum/looping_sound/active_outside_ashstorm/sound_ao = new(list(), FALSE, TRUE)
- var/datum/looping_sound/active_inside_ashstorm/sound_ai = new(list(), FALSE, TRUE)
- var/datum/looping_sound/weak_outside_ashstorm/sound_wo = new(list(), FALSE, TRUE)
- var/datum/looping_sound/weak_inside_ashstorm/sound_wi = new(list(), FALSE, TRUE)
-
-/datum/weather/ash_storm/telegraph()
- . = ..()
- var/list/inside_areas = list()
- var/list/outside_areas = list()
- var/list/eligible_areas = list()
- for (var/z in impacted_z_levels)
- eligible_areas += SSmapping.areas_in_z["[z]"]
- for(var/i in 1 to eligible_areas.len)
- var/area/place = eligible_areas[i]
- if(place.outdoors)
- outside_areas += place
- else
- inside_areas += place
- CHECK_TICK
-
- sound_ao.output_atoms = outside_areas
- sound_ai.output_atoms = inside_areas
- sound_wo.output_atoms = outside_areas
- sound_wi.output_atoms = inside_areas
-
- sound_wo.start()
- sound_wi.start()
-
-/datum/weather/ash_storm/start()
- . = ..()
- sound_wo.stop()
- sound_wi.stop()
-
- sound_ao.start()
- sound_ai.start()
-
-/datum/weather/ash_storm/wind_down()
- . = ..()
- sound_ao.stop()
- sound_ai.stop()
-
- sound_wo.start()
- sound_wi.start()
-
-/datum/weather/ash_storm/end()
- . = ..()
- sound_wo.stop()
- sound_wi.stop()
-
-/datum/weather/ash_storm/proc/is_ash_immune(atom/L)
- while (L && !isturf(L))
- if(ismecha(L)) //Mechs are immune
- return TRUE
- if(ishuman(L)) //Are you immune?
- var/mob/living/carbon/human/H = L
- var/thermal_protection = H.get_thermal_protection()
- if(thermal_protection >= FIRE_IMMUNITY_MAX_TEMP_PROTECT)
- return TRUE
- if(isliving(L))// if we're a non immune mob inside an immune mob we have to reconsider if that mob is immune to protect ourselves
- var/mob/living/the_mob = L
- if("ash" in the_mob.weather_immunities)
- return TRUE
- L = L.loc //Check parent items immunities (recurses up to the turf)
- return FALSE //RIP you
-
-/datum/weather/ash_storm/weather_act(mob/living/L)
- if(is_ash_immune(L))
- return
- L.adjustFireLoss(4)
- return ..()
-
-
-//Emberfalls are the result of an ash storm passing by close to the playable area of lavaland. They have a 10% chance to trigger in place of an ash storm.
-/datum/weather/ash_storm/emberfall
- name = "emberfall"
- desc = ""
-
- weather_message = "Gentle embers waft down around you like grotesque snow. The storm seems to have passed you by..."
- weather_overlay = "light_ash"
-
- end_message = "The emberfall slows, stops. Another layer of hardened soot to the basalt beneath your feet."
- end_sound = null
-
- aesthetic = TRUE
-
- probability = 10
diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm
deleted file mode 100644
index 2b8011060a..0000000000
--- a/code/datums/weather/weather_types/floor_is_lava.dm
+++ /dev/null
@@ -1,41 +0,0 @@
-//Causes fire damage to anyone not standing on a dense object.
-/datum/weather/floor_is_lava
- name = "the floor is lava"
- desc = ""
-
- telegraph_message = "I feel the ground beneath you getting hot. Waves of heat distort the air."
- telegraph_duration = 150
-
- weather_message = "The floor is lava! Get on top of something!"
- weather_duration_lower = 300
- weather_duration_upper = 600
- weather_overlay = "lava"
-
- end_message = "The ground cools and returns to its usual form."
- end_duration = 0
-
- area_type = /area
- protected_areas = list(/area/space)
- target_trait = ZTRAIT_STATION
-
- overlay_layer = ABOVE_OPEN_TURF_LAYER //Covers floors only
- overlay_plane = FLOOR_PLANE
- immunity_type = "lava"
-
-
-/datum/weather/floor_is_lava/weather_act(mob/living/L)
- if(issilicon(L))
- return
- if(istype(L.buckled, /obj/structure/bed))
- return
- for(var/obj/structure/O in L.loc)
- if(O.density)
- return
- if(L.loc.density)
- return
- if(!L.client) //Only sentient people are going along with it!
- return
- if(L.movement_type & FLYING)
- return
- L.adjustFireLoss(3)
- return ..()
diff --git a/code/datums/weather/weather_types/roguetown/fog.dm b/code/datums/weather/weather_types/fog.dm
similarity index 100%
rename from code/datums/weather/weather_types/roguetown/fog.dm
rename to code/datums/weather/weather_types/fog.dm
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
deleted file mode 100644
index 38577b56ff..0000000000
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ /dev/null
@@ -1,67 +0,0 @@
-//Radiation storms occur when the station passes through an irradiated area, and irradiate anyone not standing in protected areas (maintenance, emergency storage, etc.)
-/datum/weather/rad_storm
- name = "radiation storm"
- desc = ""
-
- telegraph_duration = 400
- telegraph_message = "The air begins to grow warm."
-
- weather_message = "I feel waves of heat wash over you! Find shelter!"
- weather_overlay = "ash_storm"
- weather_duration_lower = 600
- weather_duration_upper = 1500
- weather_color = "green"
- weather_sound = 'sound/blank.ogg'
-
- end_duration = 100
- end_message = "The air seems to be cooling off again."
-
- area_type = /area
- protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
- /area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle)
- target_trait = ZTRAIT_STATION
-
- immunity_type = "rad"
-
-/datum/weather/rad_storm/telegraph()
- ..()
- status_alarm(TRUE)
-
-
-/datum/weather/rad_storm/weather_act(mob/living/L)
- var/resist = L.getarmor(null, "rad")
- if(prob(40))
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE))
- if(prob(max(0,100-resist)))
- H.randmuti()
- if(prob(50))
- if(prob(90))
- H.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
- else
- H.easy_randmut(POSITIVE)
- H.domutcheck()
- L.rad_act(20)
- return ..()
-
-/datum/weather/rad_storm/end()
- if(..())
- return
- priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
- status_alarm(FALSE)
-
-/datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement.
- var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
- if(!frequency)
- return
-
- var/datum/signal/signal = new
- if (active)
- signal.data["command"] = "alert"
- signal.data["picture_state"] = "radiation"
- else
- signal.data["command"] = "shuttle"
-
- var/atom/movable/virtualspeaker/virt = new(null)
- frequency.post_signal(virt, signal)
diff --git a/code/datums/weather/weather_types/roguetown/rain.dm b/code/datums/weather/weather_types/roguetown/rain.dm
deleted file mode 100644
index 60b121e7f5..0000000000
--- a/code/datums/weather/weather_types/roguetown/rain.dm
+++ /dev/null
@@ -1,125 +0,0 @@
-
-/datum/weather/rain
- name = "rain"
- desc = ""
-
- telegraph_duration = 10 SECONDS
- telegraph_message = "The sky begins to weep."
- telegraph_sound = 'sound/blank.ogg'
-
- weather_message = ""
- weather_overlay = "rain1"
- weather_duration_lower = 5 MINUTES
- weather_duration_upper = 12 MINUTES
- weather_sound = 'sound/blank.ogg'
- weather_alpha = 200
-
- probability = 3
-
- end_duration = 5 SECONDS
- end_message = ""
- end_sound = 'sound/blank.ogg'
-
- area_type = /area/rogue/outdoors
- protected_areas = list(/area/rogue/indoors,/area/rogue/under)
- impacted_z_levels = list()
- var/lastlightning = 0
-
- particles = list(/obj/emitters/weather/rain)
-
-/datum/weather/rain/New(z_levels)
- impacted_z_levels = GLOB.sky_z.Copy()
- . = ..()
-
-/datum/weather/rain/weather_act(atom/A)
- if(isliving(A))
- var/mob/living/M = A
- M.adjust_fire_stacks(-100)
- M.SoakMob(FULL_BODY)
- return TRUE
- var/datum/reagent/water/W = new()
- if(isobj(A))
- var/obj/O = A
- W.reaction_obj(O, 100)
- if(isopenturf(A))
- var/turf/open/T = A
- W.reaction_turf(T, 300)
- qdel(W)
- return ..()
-
-/datum/weather/rain/get_used_state()
- switch(stage)
- if(STARTUP_STAGE)
- return "bla1"
-// return telegraph_overlay
- if(MAIN_STAGE)
- return pick("rain1", "rain2", "rain3", "rain4")
- if(WIND_DOWN_STAGE)
- return "bla2"
- return "bla3"
-
-/datum/weather/rain/starteffected()
- ..() //the parent does all living mobs already
-// for(var/mob/living/L in GLOB.mob_living_list)
-// if(can_weather_act(L))
-// SSweather.uniqueadd(L)
-// START_PROCESSING(SSweather, L)
-// for(var/obj/O in GLOB.rain_update)
-// if(can_weather_act(O))
-// SSweather.uniqueadd(O)
-// START_PROCESSING(SSweather, O)
-// for(var/obj/O in GLOB.fires_list)
-// if(can_weather_act(O))
-// START_PROCESSING(SSweather,O)
-
-/datum/weather/rain/initialprocess()
- ..()
-// for(var/turf/T in GLOB.dirt_list)
-// if(can_weather_act(T))
-/// SSweather.uniqueadd(T, TRUE)
-// START_PROCESSING(SSweather, T)
-
-/mob/living/carbon/proc/reset_lightning()
- if(lightning_flashing)
- lightning_flashing = FALSE
- update_sight()
-
-/datum/weather/rain/process()
-#ifndef TESTSERVER
- if(GLOB.forecast != "rain")
- wind_down()
- return
-#endif
- if(world.time < lastlightning + 66 SECONDS)
- return
- lastlightning = world.time
- for(var/mob/living/carbon/M in GLOB.player_list)
- var/area/A = get_area(M)
- if(istype(A, /area/rogue/outdoors))
- M.playsound_local(M, pick('sound/ambience/noises/thunout (1).ogg','sound/ambience/noises/thunout (2).ogg','sound/ambience/noises/thunout (3).ogg','sound/ambience/noises/thunout (4).ogg'), 100, FALSE)
- M.lightning_flashing = TRUE
- M.update_sight()
- addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living/carbon, reset_lightning)), 1)
- continue
- if(istype(A, /area/rogue/indoors))
- M.playsound_local(M, pick('sound/ambience/noises/thunin (1).ogg','sound/ambience/noises/thunin (2).ogg','sound/ambience/noises/thunin (3).ogg','sound/ambience/noises/thunin (4).ogg'), 100, FALSE)
- continue
-// testing("dolightingflash")
-// for(var/obj/machinery/light/sun/L in GLOB.machines)
-// L.lightningflash()
-
-/datum/weather/rain/start()
- . = ..()
- for(var/M in GLOB.player_list)
- if(isliving(M))
- var/mob/living/L = M
- if(L.client)
- SSdroning.play_rain(get_area(L), L.client)
-
-/datum/weather/rain/end()
- . = ..()
- for(var/M in GLOB.player_list)
- if(isliving(M))
- var/mob/living/L = M
- if(L.client)
- SSdroning.kill_rain(L.client)
diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm
deleted file mode 100644
index 780e3ebfd7..0000000000
--- a/code/datums/weather/weather_types/snow_storm.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/datum/weather/snow_storm
- name = "snow storm"
- desc = ""
- probability = 90
-
- telegraph_message = "Drifting particles of snow begin to dust the surrounding area.."
- telegraph_duration = 300
- telegraph_overlay = "light_snow"
-
- weather_message = "Harsh winds pick up as dense snow begins to fall from the sky! Seek shelter!"
- weather_overlay = "snow_storm"
- weather_duration_lower = 600
- weather_duration_upper = 1500
-
- end_duration = 100
- end_message = "The snowfall dies down, it should be safe to go outside again."
-
- area_type = /area/awaymission/snowdin/outside
- target_trait = ZTRAIT_AWAY
-
- immunity_type = "snow"
-
- barometer_predictable = TRUE
-
-
-/datum/weather/snow_storm/weather_act(mob/living/L)
- L.adjust_bodytemperature(-rand(5,15))
-
diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm
deleted file mode 100644
index 66fb3e1e11..0000000000
--- a/code/datums/wires/_wires.dm
+++ /dev/null
@@ -1,296 +0,0 @@
-#define MAXIMUM_EMP_WIRES 3
-
-/proc/is_wire_tool(obj/item/I)
- if(!I)
- return
-
- if(I.tool_behaviour == TOOL_WIRECUTTER || I.tool_behaviour == TOOL_MULTITOOL)
- return TRUE
- if(istype(I, /obj/item/assembly))
- var/obj/item/assembly/A = I
- if(A.attachable)
- return TRUE
-
-/atom/proc/attempt_wire_interaction(mob/user)
- if(!wires)
- return WIRE_INTERACTION_FAIL
- if(!user.CanReach(src))
- return WIRE_INTERACTION_FAIL
- wires.interact(user)
- return WIRE_INTERACTION_BLOCK
-
-/datum/wires
- var/atom/holder = null // The holder (atom that contains these wires).
- var/holder_type = null // The holder's typepath (used to make wire colors common to all holders).
- var/proper_name = "Unknown" // The display name for the wire set shown in station blueprints. Not used if randomize is true or it's an item NT wouldn't know about (Explosives/Nuke)
-
- var/list/wires = list() // List of wires.
- var/list/cut_wires = list() // List of wires that have been cut.
- var/list/colors = list() // Dictionary of colors to wire.
- var/list/assemblies = list() // List of attached assemblies.
- var/randomize = 0 // If every instance of these wires should be random.
- // Prevents wires from showing up in station blueprints
-
-/datum/wires/New(atom/holder)
- ..()
- if(!istype(holder, holder_type))
- CRASH("Wire holder is not of the expected type!")
-
- src.holder = holder
- if(randomize)
- randomize()
- else
- if(!GLOB.wire_color_directory[holder_type])
- randomize()
- GLOB.wire_color_directory[holder_type] = colors
- GLOB.wire_name_directory[holder_type] = proper_name
- else
- colors = GLOB.wire_color_directory[holder_type]
-
-/datum/wires/Destroy()
- holder = null
- assemblies = list()
- return ..()
-
-/datum/wires/proc/add_duds(duds)
- while(duds)
- var/dud = WIRE_DUD_PREFIX + "[--duds]"
- if(dud in wires)
- continue
- wires += dud
-
-/datum/wires/proc/randomize()
- var/static/list/possible_colors = list(
- "blue",
- "brown",
- "crimson",
- "cyan",
- "gold",
- "grey",
- "green",
- "magenta",
- "orange",
- "pink",
- "purple",
- "red",
- "silver",
- "violet",
- "white",
- "yellow"
- )
-
- var/list/my_possible_colors = possible_colors.Copy()
-
- for(var/wire in shuffle(wires))
- colors[pick_n_take(my_possible_colors)] = wire
-
-/datum/wires/proc/shuffle_wires()
- colors.Cut()
- randomize()
-
-/datum/wires/proc/repair()
- cut_wires.Cut()
-
-/datum/wires/proc/get_wire(color)
- return colors[color]
-
-/datum/wires/proc/get_color_of_wire(wire_type)
- for(var/color in colors)
- var/other_type = colors[color]
- if(wire_type == other_type)
- return color
-
-/datum/wires/proc/get_attached(color)
- if(assemblies[color])
- return assemblies[color]
- return null
-
-/datum/wires/proc/is_attached(color)
- if(assemblies[color])
- return TRUE
-
-/datum/wires/proc/is_cut(wire)
- return (wire in cut_wires)
-
-/datum/wires/proc/is_color_cut(color)
- return is_cut(get_wire(color))
-
-/datum/wires/proc/is_all_cut()
- if(cut_wires.len == wires.len)
- return TRUE
-
-/datum/wires/proc/is_dud(wire)
- return dd_hasprefix(wire, WIRE_DUD_PREFIX)
-
-/datum/wires/proc/is_dud_color(color)
- return is_dud(get_wire(color))
-
-/datum/wires/proc/cut(wire)
- if(is_cut(wire))
- cut_wires -= wire
- on_cut(wire, mend = TRUE)
- else
- cut_wires += wire
- on_cut(wire, mend = FALSE)
-
-/datum/wires/proc/cut_color(color)
- cut(get_wire(color))
-
-/datum/wires/proc/cut_random()
- cut(wires[rand(1, wires.len)])
-
-/datum/wires/proc/cut_all()
- for(var/wire in wires)
- cut(wire)
-
-/datum/wires/proc/pulse(wire, user)
- if(is_cut(wire))
- return
- on_pulse(wire, user)
-
-/datum/wires/proc/pulse_color(color, mob/living/user)
- pulse(get_wire(color), user)
-
-/datum/wires/proc/pulse_assembly(obj/item/assembly/S)
- for(var/color in assemblies)
- if(S == assemblies[color])
- pulse_color(color)
- return TRUE
-
-/datum/wires/proc/attach_assembly(color, obj/item/assembly/S)
- if(S && istype(S) && S.attachable && !is_attached(color))
- assemblies[color] = S
- S.forceMove(holder)
- S.connected = src
- return S
-
-/datum/wires/proc/detach_assembly(color)
- var/obj/item/assembly/S = get_attached(color)
- if(S && istype(S))
- assemblies -= color
- S.connected = null
- S.forceMove(holder.drop_location())
- return S
-
-/datum/wires/proc/emp_pulse()
- var/list/possible_wires = shuffle(wires)
- var/remaining_pulses = MAXIMUM_EMP_WIRES
-
- for(var/wire in possible_wires)
- if(prob(33))
- pulse(wire)
- remaining_pulses--
- if(!remaining_pulses)
- break
-
-// Overridable Procs
-/datum/wires/proc/interactable(mob/user)
- return TRUE
-
-/datum/wires/proc/get_status()
- return list()
-
-/datum/wires/proc/on_cut(wire, mend = FALSE)
- return
-
-/datum/wires/proc/on_pulse(wire, user)
- return
-// End Overridable Procs
-
-/datum/wires/proc/interact(mob/user)
- if(!interactable(user))
- return
- ui_interact(user)
- for(var/A in assemblies)
- var/obj/item/I = assemblies[A]
- if(istype(I) && I.on_found(user))
- return
-
-/datum/wires/ui_host()
- return holder
-
-/datum/wires/ui_status(mob/user)
- if(interactable(user))
- return ..()
- return UI_CLOSE
-
-/datum/wires/ui_interact(mob/user, ui_key = "wires", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "wires", "[holder.name] Wires", 350, 150 + wires.len * 30, master_ui, state)
- ui.open()
-
-/datum/wires/ui_data(mob/user)
- var/list/data = list()
- var/list/payload = list()
- var/reveal_wires = FALSE
-
- // Admin ghost can see a purpose of each wire.
- if(IsAdminGhost(user))
- reveal_wires = TRUE
-
- // Same for anyone with an abductor multitool.
- else if(user.is_holding_item_of_type(/obj/item/multitool/abductor))
- reveal_wires = TRUE
-
- // Station blueprints do that too, but only if the wires are not randomized.
- else if(user.is_holding_item_of_type(/obj/item/areaeditor/blueprints) && !randomize)
- reveal_wires = TRUE
-
- for(var/color in colors)
- payload.Add(list(list(
- "color" = color,
- "wire" = ((reveal_wires && !is_dud_color(color)) ? get_wire(color) : null),
- "cut" = is_color_cut(color),
- "attached" = is_attached(color)
- )))
- data["wires"] = payload
- data["status"] = get_status()
- return data
-
-/datum/wires/ui_act(action, params)
- if(..() || !interactable(usr))
- return
- var/target_wire = params["wire"]
- var/mob/living/L = usr
- var/obj/item/I
- switch(action)
- if("cut")
- I = L.is_holding_tool_quality(TOOL_WIRECUTTER)
- if(I || IsAdminGhost(usr))
- if(I && holder)
- I.play_tool_sound(holder, 20)
- cut_color(target_wire)
- . = TRUE
- else
- to_chat(L, "I need wirecutters!")
- if("pulse")
- I = L.is_holding_tool_quality(TOOL_MULTITOOL)
- if(I || IsAdminGhost(usr))
- if(I && holder)
- I.play_tool_sound(holder, 20)
- pulse_color(target_wire, L)
- . = TRUE
- else
- to_chat(L, "I need a multitool!")
- if("attach")
- if(is_attached(target_wire))
- I = detach_assembly(target_wire)
- if(I)
- L.put_in_hands(I)
- . = TRUE
- else
- I = L.get_active_held_item()
- if(istype(I, /obj/item/assembly))
- var/obj/item/assembly/A = I
- if(A.attachable)
- if(!L.temporarilyRemoveItemFromInventory(A))
- return
- if(!attach_assembly(target_wire, A))
- A.forceMove(L.drop_location())
- . = TRUE
- else
- to_chat(L, "I need an attachable assembly!")
-
-#undef MAXIMUM_EMP_WIRES
diff --git a/code/datums/wires/airalarm.dm b/code/datums/wires/airalarm.dm
deleted file mode 100644
index f6c166c596..0000000000
--- a/code/datums/wires/airalarm.dm
+++ /dev/null
@@ -1,74 +0,0 @@
-/datum/wires/airalarm
- holder_type = /obj/machinery/airalarm
- proper_name = "Air Alarm"
-
-/datum/wires/airalarm/New(atom/holder)
- wires = list(
- WIRE_POWER,
- WIRE_IDSCAN, WIRE_AI,
- WIRE_PANIC, WIRE_ALARM
- )
- add_duds(3)
- ..()
-
-/datum/wires/airalarm/interactable(mob/user)
- var/obj/machinery/airalarm/A = holder
- if(A.panel_open && A.buildstage == 2)
- return TRUE
-
-/datum/wires/airalarm/get_status()
- var/obj/machinery/airalarm/A = holder
- var/list/status = list()
- status += "The interface light is [A.locked ? "red" : "green"]."
- status += "The short indicator is [A.shorted ? "lit" : "off"]."
- status += "The AI connection light is [!A.aidisabled ? "on" : "off"]."
- return status
-
-/datum/wires/airalarm/on_pulse(wire)
- var/obj/machinery/airalarm/A = holder
- switch(wire)
- if(WIRE_POWER) // Short out for a long time.
- if(!A.shorted)
- A.shorted = TRUE
- A.update_icon()
- addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 1200)
- if(WIRE_IDSCAN) // Toggle lock.
- A.locked = !A.locked
- if(WIRE_AI) // Disable AI control for a while.
- if(!A.aidisabled)
- A.aidisabled = TRUE
- addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 100)
- if(WIRE_PANIC) // Toggle panic siphon.
- if(!A.shorted)
- if(A.mode == 1) // AALARM_MODE_SCRUB
- A.mode = 3 // AALARM_MODE_PANIC
- else
- A.mode = 1 // AALARM_MODE_SCRUB
- A.apply_mode(usr)
- if(WIRE_ALARM) // Clear alarms.
- var/area/AA = get_area(A)
- if(AA.atmosalert(0, holder))
- A.post_alert(0)
- A.update_icon()
-
-/datum/wires/airalarm/on_cut(wire, mend)
- var/obj/machinery/airalarm/A = holder
- switch(wire)
- if(WIRE_POWER) // Short out forever.
- A.shock(usr, 50)
- A.shorted = !mend
- A.update_icon()
- if(WIRE_IDSCAN)
- if(!mend)
- A.locked = TRUE
- if(WIRE_AI)
- A.aidisabled = mend // Enable/disable AI control.
- if(WIRE_PANIC) // Force panic syphon on.
- if(!mend && !A.shorted)
- A.mode = 3 // AALARM_MODE_PANIC
- A.apply_mode(usr)
- if(WIRE_ALARM) // Post alarm.
- var/area/AA = get_area(A)
- if(AA.atmosalert(2, holder))
- A.post_alert(2)
- A.update_icon()
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
deleted file mode 100644
index cf5fb18a32..0000000000
--- a/code/datums/wires/airlock.dm
+++ /dev/null
@@ -1,140 +0,0 @@
-/datum/wires/airlock
- holder_type = /obj/machinery/door/airlock
- proper_name = "Airlock"
-
-/datum/wires/airlock/secure
- randomize = TRUE
-
-/datum/wires/airlock/New(atom/holder)
- wires = list(
- WIRE_POWER1, WIRE_POWER2,
- WIRE_BACKUP1, WIRE_BACKUP2,
- WIRE_OPEN, WIRE_BOLTS, WIRE_IDSCAN, WIRE_AI,
- WIRE_SHOCK, WIRE_SAFETY, WIRE_TIMING, WIRE_LIGHT,
- WIRE_ZAP1, WIRE_ZAP2
- )
- add_duds(2)
- ..()
-
-/datum/wires/airlock/interactable(mob/user)
- var/obj/machinery/door/airlock/A = holder
- if(!issilicon(user) && A.isElectrified() && A.shock(user, 100))
- return FALSE
- if(A.panel_open)
- return TRUE
-
-/datum/wires/airlock/get_status()
- var/obj/machinery/door/airlock/A = holder
- var/list/status = list()
- status += "The door bolts [A.locked ? "have fallen!" : "look up."]"
- status += "The test light is [A.hasPower() ? "on" : "off"]."
- status += "The AI connection light is [A.aiControlDisabled || (A.obj_flags & EMAGGED) ? "off" : "on"]."
- status += "The check wiring light is [A.safe ? "off" : "on"]."
- status += "The timer is powered [A.autoclose ? "on" : "off"]."
- status += "The speed light is [A.normalspeed ? "on" : "off"]."
- status += "The emergency light is [A.emergency ? "on" : "off"]."
- return status
-
-/datum/wires/airlock/on_pulse(wire)
- set waitfor = FALSE
- var/obj/machinery/door/airlock/A = holder
- switch(wire)
- if(WIRE_POWER1, WIRE_POWER2) // Pulse to loose power.
- A.loseMainPower()
- if(WIRE_BACKUP1, WIRE_BACKUP2) // Pulse to loose backup power.
- A.loseBackupPower()
- if(WIRE_OPEN) // Pulse to open door (only works not emagged and ID wire is cut or no access is required).
- if(A.obj_flags & EMAGGED)
- return
- if(!A.requiresID() || A.check_access(null))
- if(A.density)
- INVOKE_ASYNC(A, TYPE_PROC_REF(/obj/machinery/door/airlock, open))
- else
- INVOKE_ASYNC(A, TYPE_PROC_REF(/obj/machinery/door/airlock, close))
- if(WIRE_BOLTS) // Pulse to toggle bolts (but only raise if power is on).
- if(!A.locked)
- A.bolt()
- else
- if(A.hasPower())
- A.unbolt()
- A.update_icon()
- if(WIRE_IDSCAN) // Pulse to disable emergency access and flash red lights.
- if(A.hasPower() && A.density)
- A.do_animate("deny")
- if(A.emergency)
- A.emergency = FALSE
- A.update_icon()
- if(WIRE_AI) // Pulse to disable WIRE_AI control for 10 ticks (follows same rules as cutting).
- if(A.aiControlDisabled == 0)
- A.aiControlDisabled = 1
- else if(A.aiControlDisabled == -1)
- A.aiControlDisabled = 2
- sleep(10)
- if(A)
- if(A.aiControlDisabled == 1)
- A.aiControlDisabled = 0
- else if(A.aiControlDisabled == 2)
- A.aiControlDisabled = -1
- if(WIRE_SHOCK) // Pulse to shock the door for 10 ticks.
- if(!A.secondsElectrified)
- A.set_electrified(MACHINE_DEFAULT_ELECTRIFY_TIME, usr)
- if(WIRE_SAFETY)
- A.safe = !A.safe
- if(!A.density)
- A.close()
- if(WIRE_TIMING)
- A.normalspeed = !A.normalspeed
- if(WIRE_LIGHT)
- A.lights = !A.lights
- A.update_icon()
-
-/datum/wires/airlock/on_cut(wire, mend)
- var/obj/machinery/door/airlock/A = holder
- switch(wire)
- if(WIRE_POWER1, WIRE_POWER2) // Cut to loose power, repair all to gain power.
- if(mend && !is_cut(WIRE_POWER1) && !is_cut(WIRE_POWER2))
- A.regainMainPower()
- else
- A.loseMainPower()
- if(isliving(usr))
- A.shock(usr, 50)
- if(WIRE_BACKUP1, WIRE_BACKUP2) // Cut to loose backup power, repair all to gain backup power.
- if(mend && !is_cut(WIRE_BACKUP1) && !is_cut(WIRE_BACKUP2))
- A.regainBackupPower()
- else
- A.loseBackupPower()
- if(isliving(usr))
- A.shock(usr, 50)
- if(WIRE_BOLTS) // Cut to drop bolts, mend does nothing.
- if(!mend)
- A.bolt()
- if(WIRE_AI) // Cut to disable WIRE_AI control, mend to re-enable.
- if(mend)
- if(A.aiControlDisabled == 1) // 0 = normal, 1 = locked out, 2 = overridden by WIRE_AI, -1 = previously overridden by WIRE_AI
- A.aiControlDisabled = 0
- else if(A.aiControlDisabled == 2)
- A.aiControlDisabled = -1
- else
- if(A.aiControlDisabled == 0)
- A.aiControlDisabled = 1
- else if(A.aiControlDisabled == -1)
- A.aiControlDisabled = 2
- if(WIRE_SHOCK) // Cut to shock the door, mend to unshock.
- if(mend)
- if(A.secondsElectrified)
- A.set_electrified(MACHINE_NOT_ELECTRIFIED, usr)
- else
- if(A.secondsElectrified != MACHINE_ELECTRIFIED_PERMANENT)
- A.set_electrified(MACHINE_ELECTRIFIED_PERMANENT, usr)
- if(WIRE_SAFETY) // Cut to disable safeties, mend to re-enable.
- A.safe = mend
- if(WIRE_TIMING) // Cut to disable auto-close, mend to re-enable.
- A.autoclose = mend
- if(A.autoclose && !A.density)
- A.close()
- if(WIRE_LIGHT) // Cut to disable lights, mend to re-enable.
- A.lights = mend
- A.update_icon()
- if(WIRE_ZAP1, WIRE_ZAP2) // Ouch.
- if(isliving(usr))
- A.shock(usr, 50)
diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm
deleted file mode 100644
index 271472b35d..0000000000
--- a/code/datums/wires/apc.dm
+++ /dev/null
@@ -1,55 +0,0 @@
-/datum/wires/apc
- holder_type = /obj/machinery/power/apc
- proper_name = "APC"
-
-/datum/wires/apc/New(atom/holder)
- wires = list(
- WIRE_POWER1, WIRE_POWER2,
- WIRE_IDSCAN, WIRE_AI
- )
- add_duds(6)
- ..()
-
-/datum/wires/apc/interactable(mob/user)
- var/obj/machinery/power/apc/A = holder
- if(A.panel_open && !A.opened)
- return TRUE
-
-/datum/wires/apc/get_status()
- var/obj/machinery/power/apc/A = holder
- var/list/status = list()
- status += "The interface light is [A.locked ? "red" : "green"]."
- status += "The short indicator is [A.shorted ? "lit" : "off"]."
- status += "The AI connection light is [!A.aidisabled ? "on" : "off"]."
- return status
-
-/datum/wires/apc/on_pulse(wire)
- var/obj/machinery/power/apc/A = holder
- switch(wire)
- if(WIRE_POWER1, WIRE_POWER2) // Short for a long while.
- if(!A.shorted)
- A.shorted = TRUE
- addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 1200)
- if(WIRE_IDSCAN) // Unlock for a little while.
- A.locked = FALSE
- addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 300)
- if(WIRE_AI) // Disable AI control for a very short time.
- if(!A.aidisabled)
- A.aidisabled = TRUE
- addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 10)
-
-/datum/wires/apc/on_cut(index, mend)
- var/obj/machinery/power/apc/A = holder
- switch(index)
- if(WIRE_POWER1, WIRE_POWER2) // Short out.
- if(mend && !is_cut(WIRE_POWER1) && !is_cut(WIRE_POWER2))
- A.shorted = FALSE
- A.shock(usr, 50)
- else
- A.shorted = TRUE
- A.shock(usr, 50)
- if(WIRE_AI) // Disable AI control.
- if(mend)
- A.aidisabled = FALSE
- else
- A.aidisabled = TRUE
diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm
deleted file mode 100644
index c70a20ca8e..0000000000
--- a/code/datums/wires/autolathe.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/datum/wires/autolathe
- holder_type = /obj/machinery/autolathe
- proper_name = "Autolathe"
-
-/datum/wires/autolathe/New(atom/holder)
- wires = list(
- WIRE_HACK, WIRE_DISABLE,
- WIRE_SHOCK, WIRE_ZAP
- )
- add_duds(6)
- ..()
-
-/datum/wires/autolathe/interactable(mob/user)
- var/obj/machinery/autolathe/A = holder
- if(A.panel_open)
- return TRUE
-
-/datum/wires/autolathe/get_status()
- var/obj/machinery/autolathe/A = holder
- var/list/status = list()
- status += "The red light is [A.disabled ? "on" : "off"]."
- status += "The blue light is [A.hacked ? "on" : "off"]."
- return status
-
-/datum/wires/autolathe/on_pulse(wire)
- var/obj/machinery/autolathe/A = holder
- switch(wire)
- if(WIRE_HACK)
- A.adjust_hacked(!A.hacked)
- addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
- if(WIRE_SHOCK)
- A.shocked = !A.shocked
- addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
- if(WIRE_DISABLE)
- A.disabled = !A.disabled
- addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
-
-/datum/wires/autolathe/on_cut(wire, mend)
- var/obj/machinery/autolathe/A = holder
- switch(wire)
- if(WIRE_HACK)
- A.adjust_hacked(!mend)
- if(WIRE_HACK)
- A.shocked = !mend
- if(WIRE_DISABLE)
- A.disabled = !mend
- if(WIRE_ZAP)
- A.shock(usr, 50)
diff --git a/code/datums/wires/emitter.dm b/code/datums/wires/emitter.dm
deleted file mode 100644
index d0e1352c0e..0000000000
--- a/code/datums/wires/emitter.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/datum/wires/emitter
- holder_type = /obj/machinery/power/emitter
-
-/datum/wires/emitter/New(atom/holder)
- wires = list(WIRE_ZAP,WIRE_HACK)
- ..()
-
-/datum/wires/emitter/on_pulse(wire)
- var/obj/machinery/power/emitter/E = holder
- switch(wire)
- if(WIRE_ZAP)
- E.fire_beam_pulse()
- if(WIRE_HACK)
- E.mode = !E.mode
- E.set_projectile()
- ..()
diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm
deleted file mode 100644
index 0913dbae2a..0000000000
--- a/code/datums/wires/explosive.dm
+++ /dev/null
@@ -1,120 +0,0 @@
-/datum/wires/explosive
- var/duds_number = 2 // All "dud" wires cause an explosion when cut or pulsed
- randomize = TRUE // Prevents wires from showing up on blueprints
-
-/datum/wires/explosive/New(atom/holder)
- add_duds(duds_number) // Duds also explode here.
- ..()
-
-/datum/wires/explosive/on_pulse(index)
- explode()
-
-/datum/wires/explosive/on_cut(index, mend)
- explode()
-
-/datum/wires/explosive/proc/explode()
- return
-
-/datum/wires/explosive/chem_grenade
- duds_number = 1
- holder_type = /obj/item/grenade/chem_grenade
- var/fingerprint
-
-/datum/wires/explosive/chem_grenade/interactable(mob/user)
- var/obj/item/grenade/chem_grenade/G = holder
- if(G.stage == GRENADE_WIRED)
- return TRUE
-
-/datum/wires/explosive/chem_grenade/attach_assembly(color, obj/item/assembly/S)
- if(istype(S,/obj/item/assembly/timer))
- var/obj/item/grenade/chem_grenade/G = holder
- var/obj/item/assembly/timer/T = S
- G.det_time = T.saved_time*10
- else if(istype(S,/obj/item/assembly/prox_sensor))
- var/obj/item/grenade/chem_grenade/G = holder
- G.landminemode = S
- S.proximity_monitor.wire = TRUE
- fingerprint = S.fingerprintslast
- return ..()
-
-/datum/wires/explosive/chem_grenade/explode()
- var/obj/item/grenade/chem_grenade/G = holder
- var/obj/item/assembly/assembly = get_attached(get_wire(1))
- message_admins("\An [assembly] has pulsed a grenade, which was installed by [fingerprint].")
- log_game("\An [assembly] has pulsed a grenade, which was installed by [fingerprint].")
- var/mob/M = get_mob_by_ckey(fingerprint)
- var/turf/T = get_turf(M)
- G.log_grenade(M, T)
- G.prime()
-
-/datum/wires/explosive/chem_grenade/detach_assembly(color)
- var/obj/item/assembly/S = get_attached(color)
- if(S && istype(S))
- assemblies -= color
- S.connected = null
- S.forceMove(holder.drop_location())
- var/obj/item/grenade/chem_grenade/G = holder
- G.landminemode = null
- return S
-
-/datum/wires/explosive/c4 // Also includes X4
- holder_type = /obj/item/grenade/c4
-
-/datum/wires/explosive/c4/interactable(mob/user) // No need to unscrew wire panels on plastic explosives
- return TRUE
-
-/datum/wires/explosive/c4/explode()
- var/obj/item/grenade/c4/P = holder
- P.prime()
-
-/datum/wires/explosive/pizza
- holder_type = /obj/item/pizzabox
-
-/datum/wires/explosive/pizza/New(atom/holder)
- wires = list(
- WIRE_DISARM
- )
- add_duds(3) // Duds also explode here.
- ..()
-
-/datum/wires/explosive/pizza/interactable(mob/user)
- var/obj/item/pizzabox/P = holder
- if(P.open && P.bomb)
- return TRUE
-
-/datum/wires/explosive/pizza/get_status()
- var/obj/item/pizzabox/P = holder
- var/list/status = list()
- status += "The red light is [P.bomb_active ? "on" : "off"]."
- status += "The green light is [P.bomb_defused ? "on": "off"]."
- return status
-
-/datum/wires/explosive/pizza/on_pulse(wire)
- var/obj/item/pizzabox/P = holder
- switch(wire)
- if(WIRE_DISARM) // Pulse to toggle
- P.bomb_defused = !P.bomb_defused
- else // Boom
- explode()
-
-/datum/wires/explosive/pizza/on_cut(wire, mend)
- var/obj/item/pizzabox/P = holder
- switch(wire)
- if(WIRE_DISARM) // Disarm and untrap the box.
- if(!mend)
- P.bomb_defused = TRUE
- else
- if(!mend && !P.bomb_defused)
- explode()
-
-/datum/wires/explosive/pizza/explode()
- var/obj/item/pizzabox/P = holder
- P.bomb.detonate()
-
-
-/datum/wires/explosive/gibtonite
- holder_type = /obj/item/twohanded/required/gibtonite
-
-/datum/wires/explosive/gibtonite/explode()
- var/obj/item/twohanded/required/gibtonite/P = holder
- P.GibtoniteReaction(null, 2)
diff --git a/code/datums/wires/microwave.dm b/code/datums/wires/microwave.dm
deleted file mode 100644
index 8c74abfa46..0000000000
--- a/code/datums/wires/microwave.dm
+++ /dev/null
@@ -1,27 +0,0 @@
-/datum/wires/microwave
- holder_type = /obj/machinery/microwave
- proper_name = "Microwave"
-
-/datum/wires/microwave/New(atom/holder)
- wires = list(
- WIRE_ACTIVATE
- )
- ..()
-
-/datum/wires/microwave/interactable(mob/user)
- . = FALSE
- var/obj/machinery/microwave/M = holder
- if(M.panel_open)
- . = TRUE
-
-/datum/wires/microwave/on_pulse(wire)
- var/obj/machinery/microwave/M = holder
- switch(wire)
- if(WIRE_ACTIVATE)
- M.cook()
-
-/datum/wires/microwave/on_cut(wire, mend)
- var/obj/machinery/microwave/M = holder
- switch(wire)
- if(WIRE_ACTIVATE)
- M.wire_disabled = !mend
diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm
deleted file mode 100644
index c1c01d503e..0000000000
--- a/code/datums/wires/mulebot.dm
+++ /dev/null
@@ -1,31 +0,0 @@
-/datum/wires/mulebot
- holder_type = /mob/living/simple_animal/bot/mulebot
- randomize = TRUE
-
-/datum/wires/mulebot/New(atom/holder)
- wires = list(
- WIRE_POWER1, WIRE_POWER2,
- WIRE_AVOIDANCE, WIRE_LOADCHECK,
- WIRE_MOTOR1, WIRE_MOTOR2,
- WIRE_RX, WIRE_TX, WIRE_BEACON
- )
- ..()
-
-/datum/wires/mulebot/interactable(mob/user)
- var/mob/living/simple_animal/bot/mulebot/M = holder
- if(M.open)
- return TRUE
-
-/datum/wires/mulebot/on_pulse(wire)
- var/mob/living/simple_animal/bot/mulebot/M = holder
- switch(wire)
- if(WIRE_POWER1, WIRE_POWER2)
- holder.visible_message("[icon2html(M, viewers(holder))] The charge light flickers.")
- if(WIRE_AVOIDANCE)
- holder.visible_message("[icon2html(M, viewers(holder))] The external warning lights flash briefly.")
- if(WIRE_LOADCHECK)
- holder.visible_message("[icon2html(M, viewers(holder))] The load platform clunks.")
- if(WIRE_MOTOR1, WIRE_MOTOR2)
- holder.visible_message("[icon2html(M, viewers(holder))] The drive motor whines briefly.")
- else
- holder.visible_message("[icon2html(M, viewers(holder))] You hear a radio crackle.")
diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm
deleted file mode 100644
index e58dba4631..0000000000
--- a/code/datums/wires/particle_accelerator.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/datum/wires/particle_accelerator/control_box
- holder_type = /obj/machinery/particle_accelerator/control_box
- proper_name = "Particle Accelerator"
-
-/datum/wires/particle_accelerator/control_box/New(atom/holder)
- wires = list(
- WIRE_POWER, WIRE_STRENGTH, WIRE_LIMIT,
- WIRE_INTERFACE
- )
- add_duds(2)
- ..()
-
-/datum/wires/particle_accelerator/control_box/interactable(mob/user)
- var/obj/machinery/particle_accelerator/control_box/C = holder
- if(C.construction_state == 2)
- return TRUE
-
-/datum/wires/particle_accelerator/control_box/on_pulse(wire)
- var/obj/machinery/particle_accelerator/control_box/C = holder
- switch(wire)
- if(WIRE_POWER)
- C.toggle_power()
- if(WIRE_STRENGTH)
- C.add_strength()
- if(WIRE_INTERFACE)
- C.interface_control = !C.interface_control
- if(WIRE_LIMIT)
- C.visible_message("[icon2html(C, viewers(holder))][C] makes a large whirring noise.")
-
-/datum/wires/particle_accelerator/control_box/on_cut(wire, mend)
- var/obj/machinery/particle_accelerator/control_box/C = holder
- switch(wire)
- if(WIRE_POWER)
- if(C.active == !mend)
- C.toggle_power()
- if(WIRE_STRENGTH)
- for(var/i = 1; i < 3; i++)
- C.remove_strength()
- if(WIRE_INTERFACE)
- if(!mend)
- C.interface_control = FALSE
- if(WIRE_LIMIT)
- C.strength_upper_limit = (mend ? 2 : 3)
- if(C.strength_upper_limit < C.strength)
- C.remove_strength()
-
-/datum/wires/particle_accelerator/control_box/emp_pulse() // to prevent singulo from pulsing wires
- return
diff --git a/code/datums/wires/r_n_d.dm b/code/datums/wires/r_n_d.dm
deleted file mode 100644
index ea61c1779e..0000000000
--- a/code/datums/wires/r_n_d.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-/datum/wires/rnd
- holder_type = /obj/machinery/rnd
- randomize = TRUE
-
-/datum/wires/rnd/New(atom/holder)
- wires = list(
- WIRE_HACK, WIRE_DISABLE,
- WIRE_SHOCK
- )
- add_duds(5)
- ..()
-
-/datum/wires/rnd/interactable(mob/user)
- var/obj/machinery/rnd/R = holder
- if(R.panel_open)
- return TRUE
-
-/datum/wires/rnd/get_status()
- var/obj/machinery/rnd/R = holder
- var/list/status = list()
- status += "The red light is [R.disabled ? "off" : "on"]."
- status += "The blue light is [R.hacked ? "off" : "on"]."
- return status
-
-/datum/wires/rnd/on_pulse(wire)
- set waitfor = FALSE
- var/obj/machinery/rnd/R = holder
- switch(wire)
- if(WIRE_HACK)
- R.hacked = !R.hacked
- if(WIRE_DISABLE)
- R.disabled = !R.disabled
-/datum/wires/rnd/on_cut(wire, mend)
- var/obj/machinery/rnd/R = holder
- switch(wire)
- if(WIRE_HACK)
- R.hacked = !mend
- if(WIRE_DISABLE)
- R.disabled = !mend
diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm
deleted file mode 100644
index a1118da6d7..0000000000
--- a/code/datums/wires/radio.dm
+++ /dev/null
@@ -1,25 +0,0 @@
-/datum/wires/radio
- holder_type = /obj/item/radio
- proper_name = "Radio"
-
-/datum/wires/radio/New(atom/holder)
- wires = list(
- WIRE_SIGNAL,
- WIRE_RX, WIRE_TX
- )
- ..()
-
-/datum/wires/radio/interactable(mob/user)
- var/obj/item/radio/R = holder
- return R.unscrewed
-
-/datum/wires/radio/on_pulse(index)
- var/obj/item/radio/R = holder
- switch(index)
- if(WIRE_SIGNAL)
- R.listening = !R.listening
- R.broadcasting = R.listening
- if(WIRE_RX)
- R.listening = !R.listening
- if(WIRE_TX)
- R.broadcasting = !R.broadcasting
diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm
deleted file mode 100644
index 2638eb658c..0000000000
--- a/code/datums/wires/robot.dm
+++ /dev/null
@@ -1,86 +0,0 @@
-/datum/wires/robot
- holder_type = /mob/living/silicon/robot
- randomize = TRUE
-
-/datum/wires/robot/New(atom/holder)
- wires = list(
- WIRE_AI, WIRE_CAMERA,
- WIRE_LAWSYNC, WIRE_LOCKDOWN,
- WIRE_RESET_MODULE
- )
- add_duds(2)
- ..()
-
-/datum/wires/robot/interactable(mob/user)
- var/mob/living/silicon/robot/R = holder
- if(R.wiresexposed)
- return TRUE
-
-/datum/wires/robot/get_status()
- var/mob/living/silicon/robot/R = holder
- var/list/status = list()
- status += "The law sync module is [R.lawupdate ? "on" : "off"]."
- status += "The intelligence link display shows [R.connected_ai ? R.connected_ai.name : "NULL"]."
- status += "The camera light is [!isnull(R.builtInCamera) && R.builtInCamera.status ? "on" : "off"]."
- status += "The lockdown indicator is [R.lockcharge ? "on" : "off"]."
- status += "There is a star symbol above the [get_color_of_wire(WIRE_RESET_MODULE)] wire."
- return status
-
-/datum/wires/robot/on_pulse(wire, user)
- var/mob/living/silicon/robot/R = holder
- switch(wire)
- if(WIRE_AI) // Pulse to pick a new AI.
- if(!R.emagged)
- var/new_ai
- if(user)
- new_ai = select_active_ai(user)
- else
- new_ai = select_active_ai(R)
- R.notify_ai(DISCONNECT)
- if(new_ai && (new_ai != R.connected_ai))
- R.connected_ai = new_ai
- if(R.shell)
- R.undeploy() //If this borg is an AI shell, disconnect the controlling AI and assign ti to a new AI
- R.notify_ai(AI_SHELL)
- else
- R.notify_ai(TRUE)
- if(WIRE_CAMERA) // Pulse to disable the camera.
- if(!QDELETED(R.builtInCamera) && !R.scrambledcodes)
- R.builtInCamera.toggle_cam(usr, 0)
- R.visible_message("[R]'s camera lens focuses loudly.", "My camera lens focuses loudly.")
- if(WIRE_LAWSYNC) // Forces a law update if possible.
- if(R.lawupdate)
- R.visible_message("[R] gently chimes.", "LawSync protocol engaged.")
- R.lawsync()
- R.show_laws()
- if(WIRE_LOCKDOWN)
- R.SetLockdown(!R.lockcharge) // Toggle
- if(WIRE_RESET_MODULE)
- if(R.has_module())
- R.visible_message("[R]'s module servos twitch.", "My module display flickers.")
-
-/datum/wires/robot/on_cut(wire, mend)
- var/mob/living/silicon/robot/R = holder
- switch(wire)
- if(WIRE_AI) // Cut the AI wire to reset AI control.
- if(!mend)
- R.notify_ai(DISCONNECT)
- if(R.shell)
- R.undeploy()
- R.connected_ai = null
- if(WIRE_LAWSYNC) // Cut the law wire, and the borg will no longer receive law updates from its AI. Repair and it will re-sync.
- if(mend)
- if(!R.emagged)
- R.lawupdate = TRUE
- else if(!R.deployed) //AI shells must always have the same laws as the AI
- R.lawupdate = FALSE
- if (WIRE_CAMERA) // Disable the camera.
- if(!QDELETED(R.builtInCamera) && !R.scrambledcodes)
- R.builtInCamera.status = mend
- R.builtInCamera.toggle_cam(usr, 0)
- R.visible_message("[R]'s camera lens focuses loudly.", "My camera lens focuses loudly.")
- if(WIRE_LOCKDOWN) // Simple lockdown.
- R.SetLockdown(!mend)
- if(WIRE_RESET_MODULE)
- if(R.has_module() && !mend)
- R.ResetModule()
diff --git a/code/datums/wires/roulette.dm b/code/datums/wires/roulette.dm
deleted file mode 100644
index fe8d7ee2e4..0000000000
--- a/code/datums/wires/roulette.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-/datum/wires/roulette
- holder_type = /obj/machinery/roulette
- proper_name = "Roulette Table"
- randomize = TRUE
-
-/datum/wires/roulette/New(atom/holder)
- wires = list(
- WIRE_RESETOWNER,
- WIRE_PRIZEVEND,
- WIRE_SHOCK,
- WIRE_BOLTS
- )
- ..()
-
-/datum/wires/roulette/interactable(mob/user)
- . = FALSE
- var/obj/machinery/roulette/R = holder
- if(R.stat & MAINT)
- . = TRUE
-
-/datum/wires/roulette/get_status()
- var/obj/machinery/roulette/R = holder
- var/list/status = list()
- status += "The machines bolts [R.anchored ? "have fallen!" : "look up."]"
- status += "The main circuit is [R.on ? "on" : "off"]."
- status += "The main system lock appears to be [R.locked ? "on" : "off"]."
- status += "The account balance system appears to be [R.my_card ? "connected to [R.my_card.registered_account.account_holder]" : "disconnected"]."
- return status
-
-/datum/wires/roulette/on_pulse(wire)
- var/obj/machinery/roulette/R = holder
- switch(wire)
- if(WIRE_SHOCK)
- if(isliving(usr))
- R.shock(usr, 50)
- if(WIRE_BOLTS) // Pulse to toggle bolts (but only raise if power is on).
- if(!R.on)
- return
- R.anchored = !R.anchored
- if(WIRE_RESETOWNER)
- R.my_card = null
- R.audible_message("Owner reset!")
- R.locked = FALSE
- if(WIRE_PRIZEVEND)
- if(isliving(usr))
- R.shock(usr, 70)
- if(R.locked)
- return
- R.audible_message("Unauthorized prize vend detected! Locking down machine!")
- R.prize_theft(0.20)
-
-/datum/wires/roulette/on_cut(wire, mend)
- var/obj/machinery/roulette/R = holder
- switch(wire)
- if(WIRE_SHOCK)
- if(isliving(usr))
- R.shock(usr, 60)
- if(mend)
- R.on = TRUE
- else
- R.on = FALSE
- if(WIRE_BOLTS) // Always drop
- if(!R.on)
- return
- R.anchored = TRUE
- if(WIRE_RESETOWNER)
- if(isliving(usr))
- R.shock(usr, 70)
- if(WIRE_PRIZEVEND)
- if(isliving(usr))
- R.shock(usr, 75)
- if(R.locked)
- return
- R.audible_message("Unauthorized prize vend detected! Locking down machine!")
- R.prize_theft(0.10)
-
diff --git a/code/datums/wires/suit_storage_unit.dm b/code/datums/wires/suit_storage_unit.dm
deleted file mode 100644
index eb7781203b..0000000000
--- a/code/datums/wires/suit_storage_unit.dm
+++ /dev/null
@@ -1,45 +0,0 @@
-/datum/wires/suit_storage_unit
- holder_type = /obj/machinery/suit_storage_unit
- proper_name = "Suit Storage Unit"
-
-/datum/wires/suit_storage_unit/New(atom/holder)
- wires = list(
- WIRE_HACK, WIRE_SAFETY,
- WIRE_ZAP
- )
- add_duds(2)
- ..()
-
-/datum/wires/suit_storage_unit/interactable(mob/user)
- var/obj/machinery/suit_storage_unit/SSU = holder
- if(SSU.panel_open)
- return TRUE
-
-/datum/wires/suit_storage_unit/get_status()
- var/obj/machinery/suit_storage_unit/SSU = holder
- var/list/status = list()
- status += "The UV bulb is [SSU.uv_super ? "glowing" : "dim"]."
- status += "The service light is [SSU.safeties ? "off" : "on"]."
- return status
-
-/datum/wires/suit_storage_unit/on_pulse(wire)
- var/obj/machinery/suit_storage_unit/SSU = holder
- switch(wire)
- if(WIRE_HACK)
- SSU.uv_super = !SSU.uv_super
- if(WIRE_SAFETY)
- SSU.safeties = !SSU.safeties
- if(WIRE_ZAP)
- if(usr)
- SSU.shock(usr)
-
-/datum/wires/suit_storage_unit/on_cut(wire, mend)
- var/obj/machinery/suit_storage_unit/SSU = holder
- switch(wire)
- if(WIRE_HACK)
- SSU.uv_super = !mend
- if(WIRE_SAFETY)
- SSU.safeties = mend
- if(WIRE_ZAP)
- if(usr)
- SSU.shock(usr)
diff --git a/code/datums/wires/syndicatebomb.dm b/code/datums/wires/syndicatebomb.dm
deleted file mode 100644
index c3bbcdbbc6..0000000000
--- a/code/datums/wires/syndicatebomb.dm
+++ /dev/null
@@ -1,91 +0,0 @@
-/datum/wires/syndicatebomb
- holder_type = /obj/machinery/syndicatebomb
- randomize = TRUE
-
-/datum/wires/syndicatebomb/New(atom/holder)
- wires = list(
- WIRE_BOOM, WIRE_UNBOLT,
- WIRE_ACTIVATE, WIRE_DELAY, WIRE_PROCEED
- )
- ..()
-
-/datum/wires/syndicatebomb/interactable(mob/user)
- var/obj/machinery/syndicatebomb/P = holder
- if(P.open_panel)
- return TRUE
-
-/datum/wires/syndicatebomb/on_pulse(wire)
- var/obj/machinery/syndicatebomb/B = holder
- switch(wire)
- if(WIRE_BOOM)
- if(B.active)
- holder.visible_message("[icon2html(B, viewers(holder))] An alarm sounds! It's go-")
- B.explode_now = TRUE
- tell_admins(B)
- else
- holder.visible_message("[icon2html(B, viewers(holder))] Nothing happens.")
- if(WIRE_UNBOLT)
- holder.visible_message("[icon2html(B, viewers(holder))] The bolts spin in place for a moment.")
- if(WIRE_DELAY)
- if(B.delayedbig)
- holder.visible_message("[icon2html(B, viewers(holder))] Nothing happens.")
- else
- holder.visible_message("[icon2html(B, viewers(holder))] The bomb chirps.")
- playsound(B, 'sound/blank.ogg', 30, TRUE)
- B.detonation_timer += 300
- if(B.active)
- B.delayedbig = TRUE
- if(WIRE_PROCEED)
- holder.visible_message("[icon2html(B, viewers(holder))] The bomb buzzes ominously!")
- playsound(B, 'sound/blank.ogg', 30, TRUE)
- var/seconds = B.seconds_remaining()
- if(seconds >= 61) // Long fuse bombs can suddenly become more dangerous if you tinker with them.
- B.detonation_timer = world.time + 600
- else if(seconds >= 21)
- B.detonation_timer -= 100
- else if(seconds >= 11) // Both to prevent negative timers and to have a little mercy.
- B.detonation_timer = world.time + 100
- if(WIRE_ACTIVATE)
- if(!B.active)
- holder.visible_message("[icon2html(B, viewers(holder))] You hear the bomb start ticking!")
- B.activate()
- B.update_icon()
- else if(B.delayedlittle)
- holder.visible_message("[icon2html(B, viewers(holder))] Nothing happens.")
- else
- holder.visible_message("[icon2html(B, viewers(holder))] The bomb seems to hesitate for a moment.")
- B.detonation_timer += 100
- B.delayedlittle = TRUE
-
-/datum/wires/syndicatebomb/on_cut(wire, mend)
- var/obj/machinery/syndicatebomb/B = holder
- switch(wire)
- if(WIRE_BOOM)
- if(!mend && B.active)
- holder.visible_message("[icon2html(B, viewers(holder))] An alarm sounds! It's go-")
- B.explode_now = TRUE
- tell_admins(B)
- if(WIRE_UNBOLT)
- if(!mend && B.anchored)
- holder.visible_message("[icon2html(B, viewers(holder))] The bolts lift out of the ground!")
- playsound(B, 'sound/blank.ogg', 30, TRUE)
- B.anchored = FALSE
- if(WIRE_PROCEED)
- if(!mend && B.active)
- holder.visible_message("[icon2html(B, viewers(holder))] An alarm sounds! It's go-")
- B.explode_now = TRUE
- tell_admins(B)
- if(WIRE_ACTIVATE)
- if(!mend && B.active)
- holder.visible_message("[icon2html(B, viewers(holder))] The timer stops! The bomb has been defused!")
- B.active = FALSE
- B.delayedlittle = FALSE
- B.delayedbig = FALSE
- B.update_icon()
-
-/datum/wires/syndicatebomb/proc/tell_admins(obj/machinery/syndicatebomb/B)
- if(istype(B, /obj/machinery/syndicatebomb/training))
- return
- var/turf/T = get_turf(B)
- log_game("\A [B] was detonated via boom wire at [AREACOORD(T)].")
- message_admins("A [B.name] was detonated via boom wire at [ADMIN_VERBOSEJMP(T)].")
diff --git a/code/datums/wires/tesla_coil.dm b/code/datums/wires/tesla_coil.dm
deleted file mode 100644
index fa858a9a8f..0000000000
--- a/code/datums/wires/tesla_coil.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-
-/datum/wires/tesla_coil
- randomize = 1 //Only one wire don't need blueprints
- holder_type = /obj/machinery/power/tesla_coil
-
-/datum/wires/tesla_coil/New(atom/holder)
- wires = list(WIRE_ZAP)
- ..()
-
-/datum/wires/tesla_coil/on_pulse(wire)
- var/obj/machinery/power/tesla_coil/C = holder
- C.zap()
- ..()
diff --git a/code/datums/wires/vending.dm b/code/datums/wires/vending.dm
deleted file mode 100644
index 078c940b04..0000000000
--- a/code/datums/wires/vending.dm
+++ /dev/null
@@ -1,59 +0,0 @@
-/datum/wires/vending
- holder_type = /obj/machinery/vending
- proper_name = "Vending Unit"
-
-/datum/wires/vending/New(atom/holder)
- wires = list(
- WIRE_THROW, WIRE_SHOCK, WIRE_SPEAKER,
- WIRE_CONTRABAND, WIRE_IDSCAN
- )
- add_duds(1)
- ..()
-
-/datum/wires/vending/interactable(mob/user)
- var/obj/machinery/vending/V = holder
- if(!issilicon(user) && V.seconds_electrified && V.shock(user, 100))
- return FALSE
- if(V.panel_open)
- return TRUE
-
-/datum/wires/vending/get_status()
- var/obj/machinery/vending/V = holder
- var/list/status = list()
- status += "The orange light is [V.seconds_electrified ? "on" : "off"]."
- status += "The red light is [V.shoot_inventory ? "off" : "blinking"]."
- status += "The green light is [V.extended_inventory ? "on" : "off"]."
- status += "A [V.scan_id ? "purple" : "yellow"] light is on."
- status += "The speaker light is [V.shut_up ? "off" : "on"]."
- return status
-
-/datum/wires/vending/on_pulse(wire)
- var/obj/machinery/vending/V = holder
- switch(wire)
- if(WIRE_THROW)
- V.shoot_inventory = !V.shoot_inventory
- if(WIRE_CONTRABAND)
- V.extended_inventory = !V.extended_inventory
- if(WIRE_SHOCK)
- V.seconds_electrified = MACHINE_DEFAULT_ELECTRIFY_TIME
- if(WIRE_IDSCAN)
- V.scan_id = !V.scan_id
- if(WIRE_SPEAKER)
- V.shut_up = !V.shut_up
-
-/datum/wires/vending/on_cut(wire, mend)
- var/obj/machinery/vending/V = holder
- switch(wire)
- if(WIRE_THROW)
- V.shoot_inventory = !mend
- if(WIRE_CONTRABAND)
- V.extended_inventory = FALSE
- if(WIRE_SHOCK)
- if(mend)
- V.seconds_electrified = MACHINE_NOT_ELECTRIFIED
- else
- V.seconds_electrified = MACHINE_ELECTRIFIED_PERMANENT
- if(WIRE_IDSCAN)
- V.scan_id = mend
- if(WIRE_SPEAKER)
- V.shut_up = mend
diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm
index 7812c8dab2..54bf70afd0 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -86,15 +86,6 @@
/datum/world_topic/ahelp_relay/Run(list/input)
relay_msg_admins("HELP: [input["source"]] [input["message_sender"]]: [input["message"]]")
-/datum/world_topic/comms_console
- keyword = "Comms_Console"
- require_comms_key = TRUE
-
-/datum/world_topic/comms_console/Run(list/input)
- minor_announce(input["message"], "Incoming message from [input["message_sender"]]")
- for(var/obj/machinery/computer/communications/CM in GLOB.machines)
- CM.overrideCooldown()
-
/datum/world_topic/news_report
keyword = "News_Report"
require_comms_key = TRUE
@@ -169,7 +160,6 @@
.["real_mode"] = SSticker.mode.name
// Key-authed callers may know the truth behind the "secret"
- .["security_level"] = get_security_level()
.["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0
// Amount of world's ticks in seconds, useful for calculating round duration
diff --git a/code/datums/wounds/_wound.dm b/code/datums/wounds/_wound.dm
index eb3ab978d9..e9683faf22 100644
--- a/code/datums/wounds/_wound.dm
+++ b/code/datums/wounds/_wound.dm
@@ -75,12 +75,22 @@ GLOBAL_LIST_INIT(primordial_wounds, init_primordial_wounds())
/// Some wounds make no sense on a dismembered limb and need to go
var/qdel_on_droplimb = FALSE
+ /// Werewolf infection probability for bites on this wound
+ var/werewolf_infection_probability = 15
+ /// Time taken until werewolf infection comes in
+ var/werewolf_infection_time = 2 MINUTES
+ /// Actual infection timer
+ var/werewolf_infection_timer
+
/datum/wound/Destroy(force)
. = ..()
if(bodypart_owner)
remove_from_bodypart()
else if(owner)
remove_from_mob()
+ if(werewolf_infection_timer)
+ deltimer(werewolf_infection_timer)
+ werewolf_infection_timer = null
bodypart_owner = null
owner = null
@@ -90,9 +100,9 @@ GLOBAL_LIST_INIT(primordial_wounds, init_primordial_wounds())
return
var/visible_name = name
if(is_sewn())
- visible_name += " (sewn)"
+ visible_name += span_green("(sewn)")
if(is_clotted())
- visible_name += " (clotted)"
+ visible_name += span_danger("(clotted)")
return visible_name
/// Description of this wound returned to the player when the bodypart is checked with check_for_injuries()
@@ -148,11 +158,11 @@ GLOBAL_LIST_INIT(primordial_wounds, init_primordial_wounds())
else if(owner)
remove_from_mob()
LAZYADD(affected.wounds, src)
- sortList(affected.wounds, GLOBAL_PROC_REF(cmp_wound_severity_dsc))
+ sortTim(affected.wounds, GLOBAL_PROC_REF(cmp_wound_severity_dsc))
bodypart_owner = affected
owner = bodypart_owner.owner
on_bodypart_gain(affected)
- on_mob_gain(affected.owner)
+ INVOKE_ASYNC(src, PROC_REF(on_mob_gain), affected.owner) //this is literally a fucking lint error like new species cannot possible spawn with wounds until after its ass
if(crit_message)
var/message = get_crit_message(affected.owner, affected)
if(message)
@@ -223,6 +233,10 @@ GLOBAL_LIST_INIT(primordial_wounds, init_primordial_wounds())
/datum/wound/proc/on_mob_gain(mob/living/affected)
if(mob_overlay)
affected.update_damage_overlays()
+ if(werewolf_infection_timer)
+ deltimer(werewolf_infection_timer)
+ werewolf_infection_timer = null
+ werewolf_infect_attempt()
/// Removes this wound from a given, simpler than adding to a bodypart - No extra effects
/datum/wound/proc/remove_from_mob()
@@ -249,7 +263,7 @@ GLOBAL_LIST_INIT(primordial_wounds, init_primordial_wounds())
/// Called on handle_wounds(), on the life() proc
/datum/wound/proc/on_death()
return
-
+
/// Heals this wound by the given amount, and deletes it if it's healed completely
/datum/wound/proc/heal_wound(heal_amount)
// Wound cannot be healed normally, whp is null
@@ -258,12 +272,13 @@ GLOBAL_LIST_INIT(primordial_wounds, init_primordial_wounds())
var/amount_healed = min(whp, round(heal_amount, DAMAGE_PRECISION))
whp -= amount_healed
if(whp <= 0)
- if(bodypart_owner)
- remove_from_bodypart(src)
- else if(owner)
- remove_from_mob(src)
- else
- qdel(src)
+ if(!should_persist())
+ if(bodypart_owner)
+ remove_from_bodypart(src)
+ else if(owner)
+ remove_from_mob(src)
+ else
+ qdel(src)
return amount_healed
/// Sews the wound up, changing its properties to the sewn ones
@@ -285,6 +300,16 @@ GLOBAL_LIST_INIT(primordial_wounds, init_primordial_wounds())
owner?.update_damage_overlays()
return TRUE
+/// Checks if this wound has a special infection (zombie or werewolf)
+/datum/wound/proc/has_special_infection()
+ return (werewolf_infection_timer)
+
+/// Some wounds cannot go away naturally
+/datum/wound/proc/should_persist()
+ if(has_special_infection())
+ return TRUE
+ return FALSE
+
/// Cauterizes the wound
/datum/wound/proc/cauterize_wound()
if(!can_cauterize)
@@ -302,6 +327,41 @@ GLOBAL_LIST_INIT(primordial_wounds, init_primordial_wounds())
/datum/wound/proc/is_clotted()
return !isnull(clotting_threshold) && (bleed_rate <= clotting_threshold)
+/datum/wound/proc/werewolf_infect_attempt()
+ if(QDELETED(src) || QDELETED(owner) || QDELETED(bodypart_owner))
+ return FALSE
+ if(werewolf_infection_timer || !ishuman(owner) || !prob(werewolf_infection_probability))
+ return
+ var/mob/living/carbon/human/human_owner = owner
+ if(!human_owner.can_werewolf())
+ return
+ if(human_owner.stat >= DEAD) //forget it
+ return
+ to_chat(human_owner, span_danger("I feel horrible... REALLY horrible..."))
+ human_owner.mob_timers["puke"] = world.time
+ human_owner.vomit(1, blood = TRUE, stun = FALSE)
+ werewolf_infection_timer = addtimer(CALLBACK(src, PROC_REF(wake_werewolf)), werewolf_infection_time, TIMER_STOPPABLE)
+ severity = WOUND_SEVERITY_BIOHAZARD
+ if(bodypart_owner)
+ sortTim(bodypart_owner.wounds, GLOBAL_PROC_REF(cmp_wound_severity_dsc))
+ return TRUE
+
+/datum/wound/proc/wake_werewolf()
+ if(QDELETED(src) || QDELETED(owner) || QDELETED(bodypart_owner))
+ return FALSE
+ if(!ishuman(owner))
+ return FALSE
+ var/mob/living/carbon/human/human_owner = owner
+ var/datum/antagonist/werewolf/wolfy = human_owner.werewolf_check()
+ if(!wolfy)
+ return FALSE
+ werewolf_infection_timer = null
+ owner.flash_fullscreen("redflash3")
+ to_chat(owner, span_danger("It hurts... Is this really the end for me?"))
+ owner.emote("scream") // heres your warning to others bro
+ owner.Knockdown(1)
+ return wolfy
+
/// Returns whether or not this wound should embed a weapon
/proc/should_embed_weapon(datum/wound/wound_or_boolean, obj/item/weapon)
if(!istype(wound_or_boolean))
diff --git a/code/datums/wounds/arteries.dm b/code/datums/wounds/arteries.dm
index 96d2689199..9953aefc11 100644
--- a/code/datums/wounds/arteries.dm
+++ b/code/datums/wounds/arteries.dm
@@ -6,7 +6,7 @@
sound_effect = 'sound/combat/crit.ogg'
whp = 50
sewn_whp = 20
- bleed_rate = 25
+ bleed_rate = 20
sewn_bleed_rate = 0.2
clotting_threshold = null
sewn_clotting_threshold = null
@@ -18,7 +18,9 @@
can_cauterize = TRUE
critical = TRUE
sleep_healing = 0
- embed_chance = 75
+ embed_chance = 0
+
+ werewolf_infection_probability = 100
/datum/wound/artery/can_stack_with(datum/wound/other)
if(istype(other, /datum/wound/artery) && (type == other.type))
@@ -42,7 +44,7 @@
crit_message = "Blood sprays from %VICTIM's throat!"
whp = 100
sewn_whp = 25
- bleed_rate = 60
+ bleed_rate = 40
sewn_bleed_rate = 0.5
woundpain = 45
sewn_woundpain = 20
@@ -62,7 +64,7 @@
severity = WOUND_SEVERITY_FATAL
whp = 100
sewn_whp = 35
- bleed_rate = 60
+ bleed_rate = 40
sewn_bleed_rate = 0.8
woundpain = 80
sewn_woundpain = 50
@@ -79,9 +81,12 @@
"MY HEART IS TORN!",
"MY HEART IS BLEEDING!",
)
- to_chat(affected, "[pick(heartaches)]")
+ to_chat(affected, span_userdanger("[pick(heartaches)]"))
if(HAS_TRAIT(affected, TRAIT_CRITICAL_WEAKNESS))
affected.death()
+ if(affected.mind.has_antag_datum(/datum/antagonist/vampirelord/))
+ var/datum/antagonist/vampirelord/VL = affected.mind.has_antag_datum(/datum/antagonist/vampirelord)
+ VL.handle_vitae(-2000)
/datum/wound/artery/chest/on_life()
. = ..()
@@ -97,7 +102,7 @@
severity = WOUND_SEVERITY_FATAL
whp = 100
sewn_whp = 25
- bleed_rate = 50
+ bleed_rate = 30
sewn_bleed_rate = 0.5
woundpain = 60
sewn_woundpain = 30
diff --git a/code/datums/wounds/bites.dm b/code/datums/wounds/bites.dm
index 3be1e04389..d8dc9035af 100644
--- a/code/datums/wounds/bites.dm
+++ b/code/datums/wounds/bites.dm
@@ -1,6 +1,6 @@
/datum/wound/bite
name = "bite"
- bleed_rate = 0
+ bleed_rate = 0.5
sewn_bleed_rate = 0
clotting_threshold = null
sewn_clotting_threshold = null
@@ -8,8 +8,8 @@
woundpain = 10
sew_threshold = 50
mob_overlay = "cut"
- can_sew = FALSE
- can_cauterize = FALSE
+ can_sew = TRUE
+ can_cauterize = TRUE
passive_healing = 0.5
/datum/wound/bite/small
diff --git a/code/datums/wounds/bruises.dm b/code/datums/wounds/bruises.dm
index 61ca92e7b5..54a714eb9a 100644
--- a/code/datums/wounds/bruises.dm
+++ b/code/datums/wounds/bruises.dm
@@ -10,6 +10,8 @@
can_cauterize = FALSE
passive_healing = 0.5
+ werewolf_infection_probability = 0
+
/datum/wound/bruise/small
name = "bruise"
whp = 15
diff --git a/code/datums/wounds/dislocations.dm b/code/datums/wounds/dislocations.dm
index 32bc7098eb..bbe68dbe70 100644
--- a/code/datums/wounds/dislocations.dm
+++ b/code/datums/wounds/dislocations.dm
@@ -19,6 +19,8 @@
critical = TRUE
passive_healing = 0.25
qdel_on_droplimb = TRUE
+
+ werewolf_infection_probability = 0
/// Whether or not we can be surgically relocated
var/can_relocate = TRUE
diff --git a/code/datums/wounds/fractures.dm b/code/datums/wounds/fractures.dm
index 68b5b0e0e8..b715b286b3 100644
--- a/code/datums/wounds/fractures.dm
+++ b/code/datums/wounds/fractures.dm
@@ -3,9 +3,9 @@
check_name = "FRACTURE"
severity = WOUND_SEVERITY_SEVERE
crit_message = list(
- "The bone shatters!",
- "The bone is broken!",
- "The %BODYPART is mauled!",
+ "The bone shatters!",
+ "The bone is broken!",
+ "The %BODYPART is mauled!",
"The bone snaps through the skin!",
)
sound_effect = "wetbreak"
@@ -16,7 +16,9 @@
can_cauterize = FALSE
disabling = TRUE
critical = TRUE
- sleep_healing = 0 // no sleep healing that is retarded
+ sleep_healing = 0 // no sleep healing that is dumb
+
+ werewolf_infection_probability = 0
/// Whether or not we can be surgically set
var/can_set = TRUE
/// Emote we use when applied
@@ -25,7 +27,7 @@
/datum/wound/fracture/get_visible_name(mob/user)
. = ..()
if(passive_healing)
- . += " (set)"
+ . += span_green("(set)")
/datum/wound/fracture/can_stack_with(datum/wound/other)
if(istype(other, /datum/wound/fracture) && (type == other.type))
@@ -50,9 +52,9 @@
name = "cranial fracture"
check_name = "SKULLCRACK"
crit_message = list(
- "The skull shatters in a gruesome way!",
- "The head is smashed!",
- "The skull is broken!",
+ "The skull shatters in a gruesome way!",
+ "The head is smashed!",
+ "The skull is broken!",
"The skull caves in!",
)
sound_effect = "headcrush"
@@ -114,7 +116,7 @@
paralysis = TRUE
mortal = TRUE
dents_brain = TRUE
-
+
/datum/wound/fracture/head/brain/on_life()
. = ..()
owner.adjustOxyLoss(2.5)
@@ -153,9 +155,9 @@
name = "mandibular fracture"
check_name = "JAW FRACTURE"
crit_message = list(
- "The mandible comes apart beautifully!",
- "The jaw is smashed!",
- "The jaw is shattered!",
+ "The mandible comes apart beautifully!",
+ "The jaw is smashed!",
+ "The jaw is shattered!",
"The jaw caves in!",
)
whp = 50
@@ -175,7 +177,7 @@
name = "cervical fracture"
check_name = "NECK"
crit_message = list(
- "The spine shatters in a spectacular way!",
+ "The spine shatters in a spectacular way!",
"The spine snaps!",
"The spine cracks!",
"The spine is broken!",
@@ -198,7 +200,7 @@
if(iscarbon(affected))
var/mob/living/carbon/carbon_affected = affected
carbon_affected.update_disabled_bodyparts()
-
+
/datum/wound/fracture/neck/on_life()
. = ..()
owner.adjustOxyLoss(2.5)
@@ -222,9 +224,9 @@
name = "pelvic fracture"
check_name = "PELVIS"
crit_message = list(
- "The pelvis shatters in a magnificent way!",
- "The pelvis is smashed!",
- "The pelvis is mauled!",
+ "The pelvis shatters in a magnificent way!",
+ "The pelvis is smashed!",
+ "The pelvis is mauled!",
"The pelvic floor caves in!",
)
whp = 50
@@ -236,7 +238,7 @@
name = "broken buck"
check_name = "BUCKBROKEN"
crit_message = "The buck is broken expertly!"
-
+
/datum/wound/fracture/groin/on_mob_gain(mob/living/affected)
. = ..()
affected.Stun(20)
diff --git a/code/datums/wounds/slashes.dm b/code/datums/wounds/slashes.dm
index d583ba9e0f..e347d46726 100644
--- a/code/datums/wounds/slashes.dm
+++ b/code/datums/wounds/slashes.dm
@@ -68,6 +68,50 @@
ORGAN_SLOT_STOMACH_AID = 100 // It's called GUTTED for a reason.
)
+/datum/wound/lashing
+ name = "lashing"
+ whp = 40
+ sewn_whp = 12
+ bleed_rate = 1.6
+ sewn_bleed_rate = 0.05
+ clotting_rate = 0.02
+ sewn_clotting_rate = 0.02
+ clotting_threshold = 0.4
+ sewn_clotting_threshold = 0.1
+ woundpain = 12
+ sewn_woundpain = 8
+ sew_threshold = 50
+ can_sew = TRUE
+ can_cauterize = TRUE
+
+/datum/wound/lashing/small
+ name = "superficial lashing"
+ whp = 30
+ sewn_whp = 8
+ bleed_rate = 0.6
+ sewn_bleed_rate = 0.05
+ clotting_rate = 0.02
+ sewn_clotting_rate = 0.02
+ clotting_threshold = 0.4
+ sewn_clotting_threshold = 0.1
+ woundpain = 8
+ sewn_woundpain = 4
+ sew_threshold = 30
+
+/datum/wound/lashing/large
+ name = "excruciating lashing"
+ whp = 80
+ sewn_whp = 20
+ bleed_rate = 4 //Intended for combat, might kill if used for punishment. Force can be controlled by not charging the whip lash fully.
+ sewn_bleed_rate = 0.05
+ clotting_rate = 0.02
+ sewn_clotting_rate = 0.02
+ clotting_threshold = 0.4
+ sewn_clotting_threshold = 0.1
+ woundpain = 25
+ sewn_woundpain = 15
+ sew_threshold = 75
+
/datum/wound/slash/disembowel/can_stack_with(datum/wound/other)
if(istype(other, /datum/wound/slash/disembowel) && (type == other.type))
return FALSE
diff --git a/code/datums/wounds/special.dm b/code/datums/wounds/special.dm
index adbe44606b..a9a17a57f0 100644
--- a/code/datums/wounds/special.dm
+++ b/code/datums/wounds/special.dm
@@ -274,3 +274,33 @@
"The testicles are destroyed!",
"The testicles are eviscerated!",
)
+
+/datum/wound/scarring
+ name = "permanent scarring"
+ check_name = "SCARRED"
+ severity = WOUND_SEVERITY_SEVERE
+ crit_message = list(
+ "The whiplash cuts deep!",
+ "The tissue is irreversibly rended!",
+ "The %BODYPART is thoroughly disfigured!",
+ )
+ sound_effect = 'sound/combat/crit.ogg'
+ whp = 80
+ woundpain = 30
+ can_sew = FALSE
+ can_cauterize = FALSE
+ disabling = TRUE
+ critical = TRUE
+ sleep_healing = 0
+ var/gain_emote = "paincrit"
+
+/datum/wound/scarring/on_mob_gain(mob/living/affected)
+ . = ..()
+ affected.emote("scream", TRUE)
+ affected.Slowdown(20)
+ shake_camera(affected, 2, 2)
+
+/datum/wound/scarring/can_stack_with(datum/wound/other)
+ if(istype(other, /datum/wound/scarring) && (type == other.type))
+ return FALSE
+ return TRUE
diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm
index 9bbd1f38d4..4db4ecaad7 100644
--- a/code/game/alternate_appearance.dm
+++ b/code/game/alternate_appearance.dm
@@ -106,19 +106,6 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
/datum/atom_hud/alternate_appearance/basic/everyone/mobShouldSee(mob/M)
return !isobserver(M)
-/datum/atom_hud/alternate_appearance/basic/silicons
-
-/datum/atom_hud/alternate_appearance/basic/silicons/New()
- ..()
- for(var/mob in GLOB.silicon_mobs)
- if(mobShouldSee(mob))
- add_hud_to(mob)
-
-/datum/atom_hud/alternate_appearance/basic/silicons/mobShouldSee(mob/M)
- if(issilicon(M))
- return TRUE
- return FALSE
-
/datum/atom_hud/alternate_appearance/basic/observers
add_ghost_version = FALSE //just in case, to prevent infinite loops
@@ -131,32 +118,6 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
/datum/atom_hud/alternate_appearance/basic/observers/mobShouldSee(mob/M)
return isobserver(M)
-/datum/atom_hud/alternate_appearance/basic/noncult
-
-/datum/atom_hud/alternate_appearance/basic/noncult/New()
- ..()
- for(var/mob in GLOB.player_list)
- if(mobShouldSee(mob))
- add_hud_to(mob)
-
-/datum/atom_hud/alternate_appearance/basic/noncult/mobShouldSee(mob/M)
- if(!iscultist(M))
- return TRUE
- return FALSE
-
-/datum/atom_hud/alternate_appearance/basic/cult
-
-/datum/atom_hud/alternate_appearance/basic/cult/New()
- ..()
- for(var/mob in GLOB.player_list)
- if(mobShouldSee(mob))
- add_hud_to(mob)
-
-/datum/atom_hud/alternate_appearance/basic/cult/mobShouldSee(mob/M)
- if(iscultist(M))
- return TRUE
- return FALSE
-
/datum/atom_hud/alternate_appearance/basic/blessedAware
/datum/atom_hud/alternate_appearance/basic/blessedAware/New()
diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm
deleted file mode 100644
index 65da1c6edf..0000000000
--- a/code/game/area/ai_monitored.dm
+++ /dev/null
@@ -1,30 +0,0 @@
-/area/ai_monitored
- name = "AI Monitored Area"
- var/list/obj/machinery/camera/motioncameras = list()
- var/list/datum/weakref/motionTargets = list()
-
-/area/ai_monitored/Initialize(mapload)
- . = ..()
- if(mapload)
- for (var/obj/machinery/camera/M in src)
- if(M.isMotion())
- motioncameras.Add(M)
- M.area_motion = src
-
-//Only need to use one camera
-
-/area/ai_monitored/Entered(atom/movable/O)
- ..()
- if (ismob(O) && motioncameras.len)
- for(var/X in motioncameras)
- var/obj/machinery/camera/cam = X
- cam.newTarget(O)
- return
-
-/area/ai_monitored/Exited(atom/movable/O)
- ..()
- if (ismob(O) && motioncameras.len)
- for(var/X in motioncameras)
- var/obj/machinery/camera/cam = X
- cam.lostTargetRef(WEAKREF(O))
- return
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 468fb4cafd..3373183ef9 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -207,7 +207,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
* Sets machine power levels in the area
*/
/area/LateInitialize()
- power_change() // all machines set to current power level, also updates icon
update_beauty()
/**
@@ -251,236 +250,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
STOP_PROCESSING(SSobj, src)
return ..()
-/**
- * Generate a power alert for this area
- *
- * Sends to all ai players, alert consoles, drones and alarm monitor programs in the world
- */
-/area/proc/poweralert(state, obj/source)
- if (state != poweralm)
- poweralm = state
- if(istype(source)) //Only report power alarms on the z-level where the source is located.
- for (var/item in GLOB.silicon_mobs)
- var/mob/living/silicon/aiPlayer = item
- if (state == 1)
- aiPlayer.cancelAlarm("Power", src, source)
- else
- aiPlayer.triggerAlarm("Power", src, cameras, source)
-
- for (var/item in GLOB.alert_consoles)
- var/obj/machinery/computer/station_alert/a = item
- if(state == 1)
- a.cancelAlarm("Power", src, source)
- else
- a.triggerAlarm("Power", src, cameras, source)
-
- for (var/item in GLOB.drones_list)
- var/mob/living/simple_animal/drone/D = item
- if(state == 1)
- D.cancelAlarm("Power", src, source)
- else
- D.triggerAlarm("Power", src, cameras, source)
- for(var/item in GLOB.alarmdisplay)
- var/datum/computer_file/program/alarm_monitor/p = item
- if(state == 1)
- p.cancelAlarm("Power", src, source)
- else
- p.triggerAlarm("Power", src, cameras, source)
-
-/**
- * Generate an atmospheric alert for this area
- *
- * Sends to all ai players, alert consoles, drones and alarm monitor programs in the world
- */
-/area/proc/atmosalert(danger_level, obj/source)
- if(danger_level != atmosalm)
- if (danger_level==2)
-
- for (var/item in GLOB.silicon_mobs)
- var/mob/living/silicon/aiPlayer = item
- aiPlayer.triggerAlarm("Atmosphere", src, cameras, source)
- for (var/item in GLOB.alert_consoles)
- var/obj/machinery/computer/station_alert/a = item
- a.triggerAlarm("Atmosphere", src, cameras, source)
- for (var/item in GLOB.drones_list)
- var/mob/living/simple_animal/drone/D = item
- D.triggerAlarm("Atmosphere", src, cameras, source)
- for(var/item in GLOB.alarmdisplay)
- var/datum/computer_file/program/alarm_monitor/p = item
- p.triggerAlarm("Atmosphere", src, cameras, source)
-
- else if (src.atmosalm == 2)
- for (var/item in GLOB.silicon_mobs)
- var/mob/living/silicon/aiPlayer = item
- aiPlayer.cancelAlarm("Atmosphere", src, source)
- for (var/item in GLOB.alert_consoles)
- var/obj/machinery/computer/station_alert/a = item
- a.cancelAlarm("Atmosphere", src, source)
- for (var/item in GLOB.drones_list)
- var/mob/living/simple_animal/drone/D = item
- D.cancelAlarm("Atmosphere", src, source)
- for(var/item in GLOB.alarmdisplay)
- var/datum/computer_file/program/alarm_monitor/p = item
- p.cancelAlarm("Atmosphere", src, source)
-
- src.atmosalm = danger_level
- return 1
- return 0
-
-/**
- * Try to close all the firedoors in the area
- */
-/area/proc/ModifyFiredoors(opening)
- if(firedoors)
- firedoors_last_closed_on = world.time
- for(var/FD in firedoors)
- var/obj/machinery/door/firedoor/D = FD
- var/cont = !D.welded
- if(cont && opening) //don't open if adjacent area is on fire
- for(var/I in D.affecting_areas)
- var/area/A = I
- if(A.fire)
- cont = FALSE
- break
- if(cont && D.is_operational())
- if(D.operating)
- D.nextstate = opening ? FIREDOOR_OPEN : FIREDOOR_CLOSED
- else if(!(D.density ^ opening))
- INVOKE_ASYNC(D, (opening ? TYPE_PROC_REF(/obj/machinery/door/firedoor, open) : TYPE_PROC_REF(/obj/machinery/door/firedoor, close)))
-
-/**
- * Generate an firealarm alert for this area
- *
- * Sends to all ai players, alert consoles, drones and alarm monitor programs in the world
- *
- * Also starts the area processing on SSobj
- */
-/area/proc/firealert(obj/source)
- if(always_unpowered == 1) //no fire alarms in space/asteroid
- return
-
- if (!fire)
- set_fire_alarm_effect()
- ModifyFiredoors(FALSE)
- for(var/item in firealarms)
- var/obj/machinery/firealarm/F = item
- F.update_icon()
-
- for (var/item in GLOB.alert_consoles)
- var/obj/machinery/computer/station_alert/a = item
- a.triggerAlarm("Fire", src, cameras, source)
- for (var/item in GLOB.silicon_mobs)
- var/mob/living/silicon/aiPlayer = item
- aiPlayer.triggerAlarm("Fire", src, cameras, source)
- for (var/item in GLOB.drones_list)
- var/mob/living/simple_animal/drone/D = item
- D.triggerAlarm("Fire", src, cameras, source)
- for(var/item in GLOB.alarmdisplay)
- var/datum/computer_file/program/alarm_monitor/p = item
- p.triggerAlarm("Fire", src, cameras, source)
-
- START_PROCESSING(SSobj, src)
-
-/**
- * Reset the firealarm alert for this area
- *
- * resets the alert sent to all ai players, alert consoles, drones and alarm monitor programs
- * in the world
- *
- * Also cycles the icons of all firealarms and deregisters the area from processing on SSOBJ
- */
-/area/proc/firereset(obj/source)
- if (fire)
- unset_fire_alarm_effects()
- ModifyFiredoors(TRUE)
- for(var/item in firealarms)
- var/obj/machinery/firealarm/F = item
- F.update_icon()
-
- for (var/item in GLOB.silicon_mobs)
- var/mob/living/silicon/aiPlayer = item
- aiPlayer.cancelAlarm("Fire", src, source)
- for (var/item in GLOB.alert_consoles)
- var/obj/machinery/computer/station_alert/a = item
- a.cancelAlarm("Fire", src, source)
- for (var/item in GLOB.drones_list)
- var/mob/living/simple_animal/drone/D = item
- D.cancelAlarm("Fire", src, source)
- for(var/item in GLOB.alarmdisplay)
- var/datum/computer_file/program/alarm_monitor/p = item
- p.cancelAlarm("Fire", src, source)
-
- STOP_PROCESSING(SSobj, src)
-
-/**
- * If 100 ticks has elapsed, toggle all the firedoors closed again
- */
-/area/process()
- if(firedoors_last_closed_on + 100 < world.time) //every 10 seconds
- ModifyFiredoors(FALSE)
-
-/**
- * Close and lock a door passed into this proc
- *
- * Does this need to exist on area? probably not
- */
-/area/proc/close_and_lock_door(obj/machinery/door/DOOR)
- set waitfor = FALSE
- DOOR.close()
- if(DOOR.density)
- DOOR.lock()
-
-/**
- * Raise a burglar alert for this area
- *
- * Close and locks all doors in the area and alerts silicon mobs of a break in
- *
- * Alarm auto resets after 600 ticks
- */
-/area/proc/burglaralert(obj/trigger)
- if(always_unpowered) //no burglar alarms in space/asteroid
- return
-
- //Trigger alarm effect
- set_fire_alarm_effect()
- //Lockdown airlocks
- for(var/obj/machinery/door/DOOR in src)
- close_and_lock_door(DOOR)
-
- for (var/i in GLOB.silicon_mobs)
- var/mob/living/silicon/SILICON = i
- if(SILICON.triggerAlarm("Burglar", src, cameras, trigger))
- //Cancel silicon alert after 1 minute
- addtimer(CALLBACK(SILICON, TYPE_PROC_REF(/mob/living/silicon, cancelAlarm),"Burglar",src,trigger), 600)
-
-/**
- * Trigger the fire alarm visual affects in an area
- *
- * Updates the fire light on fire alarms in the area and sets all lights to emergency mode
- */
-/area/proc/set_fire_alarm_effect()
- fire = TRUE
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- for(var/alarm in firealarms)
- var/obj/machinery/firealarm/F = alarm
- F.update_fire_light(fire)
- for(var/obj/machinery/light/L in src)
- L.update()
-
-/**
- * unset the fire alarm visual affects in an area
- *
- * Updates the fire light on fire alarms in the area and sets all lights to emergency mode
- */
-/area/proc/unset_fire_alarm_effects()
- fire = FALSE
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- for(var/alarm in firealarms)
- var/obj/machinery/firealarm/F = alarm
- F.update_fire_light(fire)
- for(var/obj/machinery/light/L in src)
- L.update()
-
/**
* Update the icon state of the area
*
@@ -533,16 +302,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
/area/space/powered(chan) //Nope.avi
return 0
-/**
- * Called when the area power status changes
- *
- * Updates the area icon and calls power change on all machinees in the area
- */
-/area/proc/power_change()
- for(var/obj/machinery/M in src) // for each machine in the area
- M.power_change() // reverify power status (to update icons etc.)
- update_icon()
-
/**
* Return the usage of power per channel
*/
@@ -559,7 +318,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
used += used_light + used_equip + used_environ
if(STATIC_EQUIP)
used += static_equip
- if(STATIC_LIGHT)
+ if(STATIC_LIGHT_A)
used += static_light
if(STATIC_ENVIRON)
used += static_environ
@@ -577,7 +336,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
switch(powerchannel)
if(STATIC_EQUIP)
static_equip += value
- if(STATIC_LIGHT)
+ if(STATIC_LIGHT_A)
static_light += value
if(STATIC_ENVIRON)
static_environ += value
@@ -637,11 +396,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
//Ambience if combat mode is off
SSdroning.area_entered(src, living_arrived.client)
SSdroning.play_loop(src, living_arrived.client)
- var/found = FALSE
- for(var/datum/weather/rain/R in SSweather.curweathers)
- found = TRUE
- if(found)
- SSdroning.play_rain(src, living_arrived.client)
// L.play_ambience(src)
@@ -773,19 +527,9 @@ GLOBAL_LIST_EMPTY(teleportlocs)
SSdroning.area_entered(src, boarder.client)
boarder.client.update_ambience_pref()
SSdroning.play_loop(src, boarder.client)
- var/found = FALSE
- for(var/datum/weather/rain/R in SSweather.curweathers)
- found = TRUE
- if(found)
- SSdroning.play_rain(get_area(boarder.client), boarder.client)
/area/reconnect_game(mob/living/boarder)
. = ..()
if(istype(boarder) && boarder.client)
SSdroning.area_entered(src, boarder.client)
SSdroning.play_loop(src, boarder.client)
- var/found = FALSE
- for(var/datum/weather/rain/R in SSweather.curweathers)
- found = TRUE
- if(found)
- SSdroning.play_rain(get_area(boarder.client), boarder.client)
diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm
deleted file mode 100644
index 875cd03812..0000000000
--- a/code/game/area/areas/holodeck.dm
+++ /dev/null
@@ -1,130 +0,0 @@
-/area/holodeck
- name = "Holodeck"
- icon_state = "Holodeck"
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
- flags_1 = 0
- hidden = TRUE
-
- var/obj/machinery/computer/holodeck/linked
- var/restricted = 0 // if true, program goes on emag list
-
-/*
- Power tracking: Use the holodeck computer's power grid
- Asserts are to avoid the inevitable infinite loops
-*/
-
-/area/holodeck/powered(chan)
- if(!requires_power)
- return 1
- if(always_unpowered)
- return 0
- if(!linked)
- return 0
- var/area/A = get_area(linked)
- ASSERT(!istype(A, /area/holodeck))
- return A.powered(chan)
-
-/area/holodeck/usage(chan)
- if(!linked)
- return 0
- var/area/A = get_area(linked)
- ASSERT(!istype(A, /area/holodeck))
- return A.usage(chan)
-
-/area/holodeck/addStaticPower(value, powerchannel)
- if(!linked)
- return
- var/area/A = get_area(linked)
- ASSERT(!istype(A, /area/holodeck))
- return A.addStaticPower(value,powerchannel)
-
-/area/holodeck/use_power(amount, chan)
- if(!linked)
- return 0
- var/area/A = get_area(linked)
- ASSERT(!istype(A, /area/holodeck))
- return A.use_power(amount,chan)
-
-
-/*
- This is the standard holodeck. It is intended to allow you to
- blow off steam by doing stupid things like laying down, throwing
- spheres at holes, or bludgeoning people.
-*/
-/area/holodeck/rec_center
- name = "\improper Recreational Holodeck"
-
-/area/holodeck/rec_center/offline
- name = "Holodeck - Offline"
-
-/area/holodeck/rec_center/court
- name = "Holodeck - Empty Court"
-
-/area/holodeck/rec_center/dodgeball
- name = "Holodeck - Dodgeball Court"
-
-/area/holodeck/rec_center/basketball
- name = "Holodeck - Basketball Court"
-
-/area/holodeck/rec_center/thunderdome
- name = "Holodeck - Thunderdome Arena"
-
-/area/holodeck/rec_center/beach
- name = "Holodeck - Beach"
-
-/area/holodeck/rec_center/lounge
- name = "Holodeck - Lounge"
-
-/area/holodeck/rec_center/pet_lounge
- name = "Holodeck - Pet Park"
-
-/area/holodeck/rec_center/firingrange
- name = "Holodeck - Firing Range"
-
-/area/holodeck/rec_center/school
- name = "Holodeck - Anime School"
-
-/area/holodeck/rec_center/chapelcourt
- name = "Holodeck - Chapel Courtroom"
-
-/area/holodeck/rec_center/spacechess
- name = "Holodeck - Space Chess"
-
-/area/holodeck/rec_center/kobayashi
- name = "Holodeck - Kobayashi Maru"
-
-/area/holodeck/rec_center/winterwonderland
- name = "Holodeck - Winter Wonderland"
-
-/area/holodeck/rec_center/photobooth
- name = "Holodeck - Photobooth"
-
-// Bad programs
-
-/area/holodeck/rec_center/medical
- name = "Holodeck - Emergency Medical"
- restricted = 1
-
-/area/holodeck/rec_center/thunderdome1218
- name = "Holodeck - 1218 AD"
- restricted = 1
-
-/area/holodeck/rec_center/burn
- name = "Holodeck - Atmospheric Burn Test"
- restricted = 1
-
-/area/holodeck/rec_center/wildlife
- name = "Holodeck - Wildlife Simulation"
- restricted = 1
-
-/area/holodeck/rec_center/bunker
- name = "Holodeck - Holdout Bunker"
- restricted = 1
-
-/area/holodeck/rec_center/anthophila
- name = "Holodeck - Anthophila"
- restricted = 1
-
-/area/holodeck/rec_center/refuel
- name = "Holodeck - Refueling Station"
- restricted = 1
diff --git a/code/game/area/roguetownareas.dm b/code/game/area/roguetownareas.dm
index aae82eb9e5..72c6e5c006 100644
--- a/code/game/area/roguetownareas.dm
+++ b/code/game/area/roguetownareas.dm
@@ -87,6 +87,12 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
name = "deception"
icon_state = "deception"
first_time_text = "THE CANYON OF DECEPTION"
+ ambush_types = list(
+ /turf/open/floor/rogue/dirt)
+ ambush_mobs = list(
+ /mob/living/simple_animal/hostile/retaliate/rogue/troll = 20,
+ /mob/living/carbon/human/species/skeleton/skilled/fighter = 15,
+ /mob/living/carbon/human/species/goblin/skilled/ambush/hell = 50)
/area/rogue/outdoors/mountains/decap
name = "mt decapitation"
@@ -94,9 +100,9 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
ambush_types = list(
/turf/open/floor/rogue/dirt)
ambush_mobs = list(
- /mob/living/simple_animal/hostile/retaliate/rogue/troll = 30,
- /mob/living/carbon/human/species/skeleton/npc/ambush = 90,
- /mob/living/carbon/human/species/goblin/npc/ambush/hell = 20)
+ /mob/living/simple_animal/hostile/retaliate/rogue/troll = 15,
+ /mob/living/carbon/human/species/skeleton/skilled/unarmed = 25,
+ /mob/living/carbon/human/species/skeleton/skilled/fighter = 25)
droning_sound = 'sound/music/area/decap.ogg'
droning_sound_dusk = null
droning_sound_night = null
@@ -118,15 +124,58 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
/turf/open/floor/rogue/grass)
ambush_mobs = list(
/mob/living/simple_animal/hostile/retaliate/rogue/wolf = 60,
- /mob/living/carbon/human/species/goblin/npc/ambush/hell = 50,
- /mob/living/carbon/human/species/goblin/npc/ambush/sea = 50,
- /mob/living/carbon/human/species/goblin/npc/ambush = 50)
+ /mob/living/carbon/human/species/goblin/skilled/ambush = 10)
first_time_text = "ROCKHILL BASIN"
droning_sound = 'sound/music/area/field.ogg'
droning_sound_dusk = 'sound/music/area/septimus.ogg'
droning_sound_night = 'sound/music/area/sleeping.ogg'
converted_type = /area/rogue/indoors/shelter/rtfield
+/area/rogue/outdoors/rtfield/hamlet
+ name = "hamlet surroundings"
+ ambush_times = list("night","dusk")
+ ambush_types = list(
+ /turf/open/floor/rogue/grass/peril)
+ ambush_mobs = list(
+ /mob/living/simple_animal/hostile/retaliate/rogue/wolf = 60,
+ /mob/living/carbon/human/species/goblin/skilled/ambush = 5,
+ /mob/living/simple_animal/pet/cat/rogue/cabbit = 10)
+ first_time_text = "STONEHILL VALLEY"
+
+/area/rogue/outdoors/rtfield/hamlet/unsafe // just so there isnt unusable ambush spots placed in safe areas causing annoying screenshake but no effect
+
+/area/rogue/outdoors/rtfield/plague_district
+ ambush_mobs = list(/mob/living/carbon/human/species/human/northern/bum/skilled/madman = 50, /mob/living/simple_animal/hostile/rogue/skeleton = 50)
+ first_time_text = "PLAGUE DISTRICT"
+ color = "#d4da75"
+ name = "plague district"
+ ambush_types = list(
+ /turf/open/floor/rogue/cobblerock)
+
+/area/rogue/outdoors/rtfield/outlaw
+ ambush_mobs = list(/mob/living/carbon/human/species/human/northern/bum/skilled/outlaw = 50)
+ name = "outlaw hideout"
+ color = "#e9baa3"
+ first_time_text = null
+
+/area/rogue/outdoors/rtfield/boggish
+ ambush_mobs = list(/mob/living/carbon/human/species/goblin/skilled/ambush/sea = 50)
+ name = "bog approaches"
+ color = "#7db36e"
+ first_time_text = null
+
+/area/rogue/outdoors/rtfield/woodish
+ ambush_mobs = list(/mob/living/simple_animal/hostile/retaliate/rogue/wolf = 50)
+ name = "woods approaches"
+ color = "#7db36e"
+ first_time_text = null
+
+/area/rogue/outdoors/rtfield/spooky // haunts ambush and dug down hidden treasure
+ ambush_mobs = list(/mob/living/simple_animal/hostile/rogue/haunt = 50)
+ name = "spooky place"
+ color = "#9294d3"
+ first_time_text = null
+
/area/rogue/indoors/shelter/rtfield
icon_state = "rtfield"
droning_sound = 'sound/music/area/field.ogg'
@@ -149,9 +198,9 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
/turf/open/floor/rogue/grass)
ambush_mobs = list(
/mob/living/simple_animal/hostile/retaliate/rogue/wolf = 60,
- /mob/living/simple_animal/hostile/retaliate/rogue/troll = 10,
- /mob/living/carbon/human/species/goblin/npc/ambush = 45,
- /mob/living/simple_animal/hostile/retaliate/rogue/mole = 25)
+ /mob/living/simple_animal/hostile/retaliate/rogue/troll = 5,
+ /mob/living/carbon/human/species/goblin/skilled/ambush = 20,
+ /mob/living/simple_animal/hostile/retaliate/rogue/mole = 10)
first_time_text = "THE MURDERWOOD"
converted_type = /area/rogue/indoors/shelter/woods
@@ -174,7 +223,19 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
soundenv = 15
converted_type = /area/rogue/indoors/shelter/woods
-
+/area/rogue/outdoors/woods/haunted
+ ambush_types = list(
+ /turf/open/floor/rogue/grass)
+ ambush_mobs = list(
+ /mob/living/simple_animal/hostile/retaliate/rogue/wolf = 20,
+ /mob/living/simple_animal/hostile/retaliate/rogue/spider/colony = 10,
+ /mob/living/simple_animal/hostile/rogue/haunt = 5,
+ /mob/living/simple_animal/hostile/rogue/skeleton/axe = 10,
+ /mob/living/simple_animal/hostile/rogue/skeleton/bow = 5,
+ /mob/living/simple_animal/hostile/rogue/skeleton/spear = 5,
+ /mob/living/simple_animal/hostile/retaliate/rogue/mole = 5)
+ first_time_text = "THE HAUNTED FOREST"
+ converted_type = /area/rogue/indoors/shelter/woods
/area/rogue/outdoors/river
name = "river"
@@ -205,8 +266,8 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
ambush_mobs = list(
/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 20,
/mob/living/simple_animal/hostile/retaliate/rogue/spider = 80,
- /mob/living/carbon/human/species/goblin/npc/ambush/sea = 50,
- /mob/living/simple_animal/hostile/retaliate/rogue/trollbog = 35) //Bogbugs bugged bigtime, so removed for now.
+ /mob/living/carbon/human/species/goblin/skilled/ambush/sea = 20,
+ /mob/living/simple_animal/hostile/retaliate/rogue/trollbog = 30)
first_time_text = "THE TERRORBOG"
converted_type = /area/rogue/indoors/shelter/bog
@@ -260,8 +321,9 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
/turf/open/floor/rogue/dirt)
ambush_mobs = list(
/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 30,
- /mob/living/carbon/human/species/goblin/npc/ambush/cave = 20,
- /mob/living/carbon/human/species/skeleton/npc/ambush = 10)
+ /mob/living/carbon/human/species/goblin/skilled/ambush/cave = 20,
+ /mob/living/carbon/human/species/skeleton/skilled/unarmed = 5,
+ /mob/living/carbon/human/species/skeleton/skilled/fighter = 5)
converted_type = /area/rogue/outdoors/caves
/area/rogue/outdoors/caves
@@ -270,6 +332,10 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
droning_sound_dusk = null
droning_sound_night = null
+/area/rogue/under/town/caverogue/saltmine
+ name = "salt mine"
+ first_time_text = "Salt Mine"
+
/area/rogue/under/cavewet
name = "cavewet"
icon_state = "cavewet"
@@ -285,11 +351,21 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
ambush_types = list(
/turf/open/floor/rogue/dirt)
ambush_mobs = list(
- /mob/living/carbon/human/species/skeleton/npc/ambush = 10,
+ /mob/living/carbon/human/species/skeleton/skilled/unarmed = 5,
+ /mob/living/carbon/human/species/skeleton/skilled/fighter = 5,
/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 30,
- /mob/living/carbon/human/species/goblin/npc/sea = 20)
+ /mob/living/carbon/human/species/goblin/skilled/ambush/sea = 20)
converted_type = /area/rogue/outdoors/caves
+/area/rogue/under/cave/abandoned_mine
+ name = "abandoned mine"
+ first_time_text = "Abandoned Mine"
+ ambush_types = list(
+ /turf/open/floor/rogue/dirt)
+ ambush_mobs = list(
+ /mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 30,
+ /mob/living/carbon/human/species/goblin/skilled/ambush/cave = 20)
+
/area/rogue/under/cave/spider
icon_state = "spider"
first_time_text = "ARAIGNÉE"
@@ -300,6 +376,40 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
droning_sound_night = null
converted_type = /area/rogue/outdoors/spidercave
+/area/rogue/under/catacombs
+ name = "catacombs"
+ icon_state = "cavewet"
+ first_time_text = "The Catacombs"
+ ambientsounds = AMB_CAVEWATER
+ ambientnight = AMB_CAVEWATER
+ spookysounds = SPOOKY_CAVE
+ spookynight = SPOOKY_CAVE
+ droning_sound = 'sound/music/area/caves.ogg'
+ droning_sound_dusk = null
+ droning_sound_night = null
+ ambush_times = list("night","dawn","dusk","day")
+ ambush_types = list(
+ /turf/open/water/swamp)
+ ambush_mobs = list(
+ /mob/living/carbon/human/species/skeleton/skilled/unarmed = 30,
+ /mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 10)
+ converted_type = /area/rogue/outdoors/caves
+
+/area/rogue/under/catacombs/dwarfoutpost
+ name = "underrock outpost"
+ first_time_text = "Underrock Outpost"
+ ambush_types = list(
+ /turf/open/water/swamp)
+ ambush_mobs = list(
+ /mob/living/simple_animal/hostile/retaliate/rogue/lamia = 30,
+ /mob/living/simple_animal/hostile/retaliate/rogue/headless = 20)
+
+/area/rogue/under/catacombs/dwarfoutpost/orcy
+ ambush_types = list(
+ /turf/open/floor/rogue/blocks/newstone/alt)
+ ambush_mobs = list(
+ /mob/living/carbon/human/species/orc/skilled/savage = 50)
+
/area/rogue/outdoors/spidercave
icon_state = "spidercave"
droning_sound = 'sound/music/area/spidercave.ogg'
@@ -336,7 +446,7 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
ambush_mobs = list(
/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 30,
/mob/living/carbon/human/species/skeleton/npc/ambush = 10,
- /mob/living/carbon/human/species/goblin/npc/hell = 20)
+ /mob/living/carbon/human/species/goblin/skilled/ambush/cave = 20)
droning_sound = 'sound/music/area/decap.ogg'
droning_sound_dusk = null
droning_sound_night = null
@@ -358,7 +468,6 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
-
///// TOWN AREAS //////
/area/rogue/indoors/town
@@ -375,6 +484,12 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
droning_sound_dusk = null
// droning_sound_night = 'sound/music/area/night.ogg'
+/area/rogue/outdoors/exposed/town/hamlet
+ icon_state = "town"
+ droning_sound = 'sound/music/area/towngen.ogg'
+ droning_sound_dusk = null
+ first_time_text = "STONEHILL HAMLET"
+
/area/rogue/indoors/town/manor
name = "Manor"
icon_state = "manor"
@@ -384,6 +499,9 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
converted_type = /area/rogue/outdoors/exposed/manorgarri
first_time_text = "THE KEEP OF ROCKHILL"
+/area/rogue/indoors/town/manor/hamlet
+ first_time_text = "STONEHILL CASTLE"
+
/area/rogue/outdoors/exposed/manorgarri
icon_state = "manorgarri"
droning_sound = 'sound/music/area/manor.ogg'
@@ -425,10 +543,16 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
droning_sound_dusk = null
droning_sound_night = null
converted_type = /area/rogue/outdoors/exposed/bath
+/area/rogue/indoors/town/bath/redhouse
+ droning_sound = 'modular/Mapping/sound/Fulminate.ogg'
+ converted_type = /area/rogue/outdoors/exposed/bath/redhouse
/area/rogue/outdoors/exposed/bath
icon_state = "bath"
droning_sound = 'sound/music/area/bath.ogg'
+/area/rogue/outdoors/exposed/bath/redhouse
+ droning_sound = 'modular/Mapping/sound/Fulminate.ogg'
+
/area/rogue/indoors/town/garrison
name = "Garrison"
@@ -459,12 +583,19 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
droning_sound_dusk = null
droning_sound_night = 'sound/music/jukeboxes/tavern2.ogg'
converted_type = /area/rogue/outdoors/exposed/tavern
+/area/rogue/indoors/town/tavern/saiga
+ droning_sound = 'modular/Mapping/sound/Folia1490.ogg'
+ droning_sound_night = 'modular/Mapping/sound/LeTourdion.ogg'
+ converted_type = /area/rogue/outdoors/exposed/tavern/saiga
/area/rogue/outdoors/exposed/tavern
icon_state = "tavern"
droning_sound = 'sound/music/jukeboxes/tavern1.ogg'
droning_sound_dusk = null
droning_sound_night = 'sound/music/jukeboxes/tavern2.ogg'
+/area/rogue/outdoors/exposed/tavern/saiga
+ droning_sound = 'modular/Mapping/sound/Folia1490.ogg'
+ droning_sound_night = 'modular/Mapping/sound/LeTourdion.ogg'
/area/rogue/indoors/town/church
name = "church"
@@ -524,6 +655,10 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
droning_sound_dusk = null
droning_sound_night = null
+/area/rogue/indoors/town/tailor
+ name = "tailorshop"
+ icon_state = "tavern"
+
// so you can teleport to the farm
/area/rogue/indoors/soilsons
name = "soilsons"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 66783649e4..f3be77eee9 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -90,6 +90,9 @@
var/list/alternate_appearances
+ ///AI controller that controls this atom. type on init, then turned into an instance during runtime
+ var/datum/ai_controller/ai_controller
+
/**
* Called when an atom is created in byond (built in engine proc)
*
@@ -160,7 +163,7 @@
if(color)
add_atom_colour(color, FIXED_COLOUR_PRIORITY)
- if (light_power && light_range)
+ if (light_system == STATIC_LIGHT && light_power && (light_inner_range || light_outer_range))
update_light()
if (opacity && isturf(loc))
@@ -178,6 +181,7 @@
set_custom_materials(temp_list)
ComponentInitialize()
+ InitializeAIController()
return INITIALIZE_HINT_NORMAL
@@ -225,6 +229,7 @@
LAZYCLEARLIST(priority_overlays)
QDEL_NULL(light)
+ QDEL_NULL(ai_controller)
return ..()
@@ -429,8 +434,6 @@
*/
/atom/proc/emp_act(severity)
var/protection = SEND_SIGNAL(src, COMSIG_ATOM_EMP_ACT, severity)
- if(!(protection & EMP_PROTECT_WIRES) && istype(wires))
- wires.emp_pulse()
return protection // Pass the protection value collected here upwards
/**
@@ -596,6 +599,7 @@
* throw lots of items around - singularity being a notable example)
*/
/atom/proc/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
+// SEND_SIGNAL(src, COMSIG_ATOM_HITBY, AM, skipcatch, hitpush, blocked, throwingdatum, damage_type) TO DO enable when damage type fixed I guess
if(density && !has_gravity(AM)) //thrown stuff bounces off dense stuff in no grav, unless the thrown stuff ends up inside what it hit(embedding, bola, etc...).
addtimer(CALLBACK(src, PROC_REF(hitby_react), AM), 2)
@@ -674,8 +678,7 @@
*
* Default behaviour is to send COMSIG_ATOM_SING_PULL and return
*/
-/atom/proc/singularity_pull(obj/singularity/S, current_size)
- SEND_SIGNAL(src, COMSIG_ATOM_SING_PULL, S, current_size)
+/atom/proc/singularity_pull()
/**
@@ -710,21 +713,6 @@
/atom/proc/narsie_act()
SEND_SIGNAL(src, COMSIG_ATOM_NARSIE_ACT)
-
-///Return the values you get when an RCD eats you?
-/atom/proc/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
- return FALSE
-
-
-/**
- * Respond to an RCD acting on our item
- *
- * Default behaviour is to send COMSIG_ATOM_RCD_ACT and return FALSE
- */
-/atom/proc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
- SEND_SIGNAL(src, COMSIG_ATOM_RCD_ACT, user, the_rcd, passed_mode)
- return FALSE
-
/**
* Implement the behaviour for when a user click drags a storage object to your atom
*
@@ -815,10 +803,6 @@
SEND_SIGNAL(src, COMSIG_ATOM_DIR_CHANGE, dir, newdir)
dir = newdir
-///Handle melee attack by a mech
-/atom/proc/mech_melee_attack(obj/mecha/M)
- return
-
/**
* Called when the atom log's in or out
*
@@ -914,6 +898,7 @@
VV_DROPDOWN_OPTION(VV_HK_ADD_REAGENT, "Add Reagent")
VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EMP, "EMP Pulse")
VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EXPLOSION, "Explosion")
+ VV_DROPDOWN_OPTION(VV_HK_ADD_AI, "Add AI controller")
/atom/vv_do_topic(list/href_list)
. = ..()
@@ -952,6 +937,15 @@
message_admins("[key_name(usr)] has added [amount] units of [chosen_id] to [src]")
if(href_list[VV_HK_TRIGGER_EXPLOSION] && check_rights(R_FUN))
usr.client.cmd_admin_explosion(src)
+
+ if(href_list[VV_HK_ADD_AI])
+ if(!check_rights(R_VAREDIT))
+ return
+ var/result = input(usr, "Choose the AI controller to apply to this atom WARNING: Not all AI works on all atoms.", "AI controller") as null|anything in subtypesof(/datum/ai_controller)
+ if(!result)
+ return
+ ai_controller = new result(src)
+
if(href_list[VV_HK_TRIGGER_EMP] && check_rights(R_FUN))
usr.client.cmd_admin_emp(src)
if(href_list[VV_HK_MODIFY_TRANSFORM] && check_rights(R_VAREDIT))
@@ -1274,11 +1268,13 @@
var/area/A = get_area(T)
if(A.has_gravity) // Areas which always has gravity
return A.has_gravity
- else
- // There's a gravity generator on our z level
- if(GLOB.gravity_generators["[T.z]"])
- var/max_grav = 0
- for(var/obj/machinery/gravity_generator/main/G in GLOB.gravity_generators["[T.z]"])
- max_grav = max(G.setting,max_grav)
- return max_grav
return SSmapping.level_trait(T.z, ZTRAIT_GRAVITY)
+
+/**
+* Instantiates the AI controller of this atom. Override this if you want to assign variables first.
+*
+* This will work fine without manually passing arguments.
++*/
+/atom/proc/InitializeAIController()
+ if(ai_controller)
+ ai_controller = new ai_controller(src)
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 450044a522..f8cc1beac3 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -69,13 +69,6 @@
/datum/atom_hud/ai_detector
hud_icons = list(AI_DETECT_HUD)
-/datum/atom_hud/ai_detector/add_hud_to(mob/M)
- ..()
- if(M && (hudusers.len == 1))
- for(var/V in GLOB.aiEyes)
- var/mob/camera/aiEye/E = V
- E.update_ai_detect_hud()
-
/* MED/SEC/DIAG HUD HOOKS */
/*
@@ -183,9 +176,7 @@ Medical HUD! Basic mode needs suit sensors on.
var/icon/I = icon(icon, icon_state, dir)
var/virus_threat = check_virus()
holder.pixel_y = I.Height() - world.icon_size
- if(HAS_TRAIT(src, TRAIT_XENO_HOST))
- holder.icon_state = "hudxeno"
- else if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH)))
+ if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH)))
if(tod)
var/tdelta = round(world.time - timeofdeath)
if(tdelta < (DEFIB_TIME_LIMIT * 10))
@@ -276,14 +267,6 @@ Security HUDs! Basic mode shows only the job.
Diagnostic HUDs!
************************************************/
-/mob/living/proc/hud_set_nanite_indicator()
- var/image/holder = hud_list[NANITE_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- holder.icon_state = null
- if(src in SSnanites.nanite_monitored_mobs)
- holder.icon_state = "nanite_ping"
-
//For Diag health and cell bars!
/proc/RoundDiagBar(value)
switch(value * 100)
@@ -301,152 +284,3 @@ Diagnostic HUDs!
return "crit"
else
return "dead"
-
-//Sillycone hooks
-/mob/living/silicon/proc/diag_hud_set_health()
- var/image/holder = hud_list[DIAG_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- if(stat == DEAD)
- holder.icon_state = "huddiagdead"
- else
- holder.icon_state = "huddiag[RoundDiagBar(health/maxHealth)]"
-
-/mob/living/silicon/proc/diag_hud_set_status()
- var/image/holder = hud_list[DIAG_STAT_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- switch(stat)
- if(CONSCIOUS)
- holder.icon_state = "hudstat"
- if(UNCONSCIOUS)
- holder.icon_state = "hudoffline"
- else
- holder.icon_state = "huddead2"
-
-//Borgie battery tracking!
-/mob/living/silicon/robot/proc/diag_hud_set_borgcell()
- var/image/holder = hud_list[DIAG_BATT_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- if(cell)
- var/chargelvl = (cell.charge/cell.maxcharge)
- holder.icon_state = "hudbatt[RoundDiagBar(chargelvl)]"
- else
- holder.icon_state = "hudnobatt"
-
-//borg-AI shell tracking
-/mob/living/silicon/robot/proc/diag_hud_set_aishell() //Shows tracking beacons on the mech
- var/image/holder = hud_list[DIAG_TRACK_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- if(!shell) //Not an AI shell
- holder.icon_state = null
- else if(deployed) //AI shell in use by an AI
- holder.icon_state = "hudtrackingai"
- else //Empty AI shell
- holder.icon_state = "hudtracking"
-
-//AI side tracking of AI shell control
-/mob/living/silicon/ai/proc/diag_hud_set_deployed() //Shows tracking beacons on the mech
- var/image/holder = hud_list[DIAG_TRACK_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- if(!deployed_shell)
- holder.icon_state = null
- else //AI is currently controlling a shell
- holder.icon_state = "hudtrackingai"
-
-/*~~~~~~~~~~~~~~~~~~~~
- BIG STOMPY MECHS
-~~~~~~~~~~~~~~~~~~~~~*/
-/obj/mecha/proc/diag_hud_set_mechhealth()
- var/image/holder = hud_list[DIAG_MECH_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- holder.icon_state = "huddiag[RoundDiagBar(obj_integrity/max_integrity)]"
-
-
-/obj/mecha/proc/diag_hud_set_mechcell()
- var/image/holder = hud_list[DIAG_BATT_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- if(cell)
- var/chargelvl = cell.charge/cell.maxcharge
- holder.icon_state = "hudbatt[RoundDiagBar(chargelvl)]"
- else
- holder.icon_state = "hudnobatt"
-
-
-/obj/mecha/proc/diag_hud_set_mechstat()
- var/image/holder = hud_list[DIAG_STAT_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- holder.icon_state = null
- if(internal_damage)
- holder.icon_state = "hudwarn"
-
-/obj/mecha/proc/diag_hud_set_mechtracking() //Shows tracking beacons on the mech
- var/image/holder = hud_list[DIAG_TRACK_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- var/new_icon_state //This var exists so that the holder's icon state is set only once in the event of multiple mech beacons.
- for(var/obj/item/mecha_parts/mecha_tracking/T in trackers)
- if(T.ai_beacon) //Beacon with AI uplink
- new_icon_state = "hudtrackingai"
- break //Immediately terminate upon finding an AI beacon to ensure it is always shown over the normal one, as mechs can have several trackers.
- else
- new_icon_state = "hudtracking"
- holder.icon_state = new_icon_state
-
-/*~~~~~~~~~
- Bots!
-~~~~~~~~~~*/
-/mob/living/simple_animal/bot/proc/diag_hud_set_bothealth()
- var/image/holder = hud_list[DIAG_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- holder.icon_state = "huddiag[RoundDiagBar(health/maxHealth)]"
-
-/mob/living/simple_animal/bot/proc/diag_hud_set_botstat() //On (With wireless on or off), Off, EMP'ed
- var/image/holder = hud_list[DIAG_STAT_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- if(on)
- holder.icon_state = "hudstat"
- else if(stat) //Generally EMP causes this
- holder.icon_state = "hudoffline"
- else //Bot is off
- holder.icon_state = "huddead2"
-
-/mob/living/simple_animal/bot/proc/diag_hud_set_botmode() //Shows a bot's current operation
- var/image/holder = hud_list[DIAG_BOT_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- if(client) //If the bot is player controlled, it will not be following mode logic!
- holder.icon_state = "hudsentient"
- return
-
- switch(mode)
- if(BOT_SUMMON, BOT_RESPONDING) //Responding to PDA or AI summons
- holder.icon_state = "hudcalled"
- if(BOT_CLEANING, BOT_REPAIRING, BOT_HEALING) //Cleanbot cleaning, Floorbot fixing, or Medibot Healing
- holder.icon_state = "hudworking"
- if(BOT_PATROL, BOT_START_PATROL) //Patrol mode
- holder.icon_state = "hudpatrol"
- if(BOT_PREP_ARREST, BOT_ARREST, BOT_HUNT) //STOP RIGHT THERE, CRIMINAL SCUM!
- holder.icon_state = "hudalert"
- if(BOT_MOVING, BOT_DELIVER, BOT_GO_HOME, BOT_NAV) //Moving to target for normal bots, moving to deliver or go home for MULES.
- holder.icon_state = "hudmove"
- else
- holder.icon_state = ""
-
-/*~~~~~~~~~~~~
- Airlocks!
-~~~~~~~~~~~~~*/
-/obj/machinery/door/airlock/proc/diag_hud_set_electrified()
- var/image/holder = hud_list[DIAG_AIRLOCK_HUD]
- if(secondsElectrified != MACHINE_NOT_ELECTRIFIED)
- holder.icon_state = "electrified"
- else
- holder.icon_state = ""
diff --git a/code/game/gamemodes/brother/traitor_bro.dm b/code/game/gamemodes/brother/traitor_bro.dm
deleted file mode 100644
index b4557fa05f..0000000000
--- a/code/game/gamemodes/brother/traitor_bro.dm
+++ /dev/null
@@ -1,67 +0,0 @@
-/datum/game_mode
- var/list/datum/mind/brothers = list()
- var/list/datum/team/brother_team/brother_teams = list()
-
-/datum/game_mode/traitor/bros
- name = "traitor+brothers"
- config_tag = "traitorbro"
- restricted_jobs = list("AI", "Cyborg")
-
- announce_span = "danger"
- announce_text = "There are Syndicate agents and Blood Brothers on the station!\n\
- Traitors: Accomplish your objectives.\n\
- Blood Brothers: Accomplish your objectives.\n\
- Crew: Do not let the traitors or brothers succeed!"
-
- var/list/datum/team/brother_team/pre_brother_teams = list()
- var/const/team_amount = 2 //hard limit on brother teams if scaling is turned off
- var/const/min_team_size = 2
- traitors_required = FALSE //Only teams are possible
-
-/datum/game_mode/traitor/bros/pre_setup()
- if(CONFIG_GET(flag/protect_roles_from_antagonist))
- restricted_jobs += protected_jobs
- if(CONFIG_GET(flag/protect_assistant_from_antagonist))
- restricted_jobs += "Assistant"
-
- var/list/datum/mind/possible_brothers = get_players_for_role(ROLE_BROTHER)
-
- var/num_teams = team_amount
- var/bsc = CONFIG_GET(number/brother_scaling_coeff)
- if(bsc)
- num_teams = max(1, round(num_players() / bsc))
-
- for(var/j = 1 to num_teams)
- if(possible_brothers.len < min_team_size || antag_candidates.len <= required_enemies)
- break
- var/datum/team/brother_team/team = new
- var/team_size = prob(10) ? min(3, possible_brothers.len) : 2
- for(var/k = 1 to team_size)
- var/datum/mind/bro = antag_pick(possible_brothers)
- possible_brothers -= bro
- antag_candidates -= bro
- team.add_member(bro)
- bro.special_role = "brother"
- bro.restricted_roles = restricted_jobs
- log_game("[key_name(bro)] has been selected as a Brother")
- pre_brother_teams += team
- . = ..()
- if(.) //To ensure the game mode is going ahead
- for(var/teams in pre_brother_teams)
- for(var/antag in teams)
- GLOB.pre_setup_antags += antag
- return
-
-/datum/game_mode/traitor/bros/post_setup()
- for(var/datum/team/brother_team/team in pre_brother_teams)
- team.pick_meeting_area()
- team.forge_brother_objectives()
- for(var/datum/mind/M in team.members)
- M.add_antag_datum(/datum/antagonist/brother, team)
- GLOB.pre_setup_antags -= M
- team.update_name()
- brother_teams += pre_brother_teams
- return ..()
-
-/datum/game_mode/traitor/bros/generate_report()
- return "It's Syndicate recruiting season. Be alert for potential Syndicate infiltrators, but also watch out for disgruntled employees trying to defect. Unlike Nanotrasen, the Syndicate prides itself in teamwork and will only recruit pairs that share a brotherly trust."
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
deleted file mode 100644
index ec5d39f7c2..0000000000
--- a/code/game/gamemodes/changeling/changeling.dm
+++ /dev/null
@@ -1,140 +0,0 @@
-GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega"))
-GLOBAL_LIST_INIT(slots, list("head", "wear_mask", "back", "wear_armor", "wear_pants", "shoes", "belt", "gloves", "glasses", "ears", "wear_ring", "wear_wrists", "s_store"))
-GLOBAL_LIST_INIT(slot2slot, list("head" = SLOT_HEAD, "wear_mask" = SLOT_WEAR_MASK, "neck" = SLOT_NECK, "back" = SLOT_BACK, "wear_armor" = SLOT_ARMOR, "wear_pants" = SLOT_PANTS, "shoes" = SLOT_SHOES, "belt" = SLOT_BELT, "gloves" = SLOT_GLOVES, "glasses" = SLOT_GLASSES, "ears" = SLOT_HEAD, "wear_ring" = SLOT_RING, "s_store" = SLOT_S_STORE))
-GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "wear_mask" = /obj/item/clothing/mask/changeling, "back" = /obj/item/changeling, "wear_armor" = /obj/item/clothing/suit/changeling, "wear_pants" = /obj/item/clothing/under/changeling, "shoes" = /obj/item/clothing/shoes/changeling, "belt" = /obj/item/changeling, "gloves" = /obj/item/clothing/gloves/changeling, "glasses" = /obj/item/clothing/glasses/changeling, "ears" = /obj/item/changeling, "wear_ring" = /obj/item/changeling, "s_store" = /obj/item/changeling))
-GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our this objective to all lings
-
-
-/datum/game_mode/changeling
- name = "changeling"
- config_tag = "changeling"
- report_type = "changeling"
- antag_flag = ROLE_CHANGELING
- false_report_weight = 10
- restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")
- required_players = 15
- required_enemies = 1
- recommended_enemies = 4
- reroll_friendly = 1
-
- announce_span = "green"
- announce_text = "Alien changelings have infiltrated the crew!\n\
- Changelings: Accomplish the objectives assigned to you.\n\
- Crew: Root out and eliminate the changeling menace."
-
- var/const/changeling_amount = 4 //hard limit on changelings if scaling is turned off
- var/list/changelings = list()
-
-/datum/game_mode/changeling/pre_setup()
-
- if(CONFIG_GET(flag/protect_roles_from_antagonist))
- restricted_jobs += protected_jobs
-
- if(CONFIG_GET(flag/protect_assistant_from_antagonist))
- restricted_jobs += "Assistant"
-
- var/num_changelings = 1
-
- var/csc = CONFIG_GET(number/changeling_scaling_coeff)
- if(csc)
- num_changelings = max(1, min(round(num_players() / (csc * 2)) + 2, round(num_players() / csc)))
- else
- num_changelings = max(1, min(num_players(), changeling_amount))
-
- if(antag_candidates.len>0)
- for(var/i = 0, i < num_changelings, i++)
- if(!antag_candidates.len)
- break
- var/datum/mind/changeling = antag_pick(antag_candidates)
- antag_candidates -= changeling
- changelings += changeling
- changeling.special_role = ROLE_CHANGELING
- changeling.restricted_roles = restricted_jobs
- GLOB.pre_setup_antags += changeling
- return TRUE
- else
- setup_error = "Not enough changeling candidates"
- return FALSE
-
-/datum/game_mode/changeling/post_setup()
- //Decide if it's ok for the lings to have a team objective
- //And then set it up to be handed out in forge_changeling_objectives
- var/list/team_objectives = subtypesof(/datum/objective/changeling_team_objective)
- var/list/possible_team_objectives = list()
- for(var/T in team_objectives)
- var/datum/objective/changeling_team_objective/CTO = T
-
- if(changelings.len >= initial(CTO.min_lings))
- possible_team_objectives += T
-
- if(possible_team_objectives.len && prob(20*changelings.len))
- GLOB.changeling_team_objective_type = pick(possible_team_objectives)
-
- for(var/datum/mind/changeling in changelings)
- log_game("[key_name(changeling)] has been selected as a changeling")
- var/datum/antagonist/changeling/new_antag = new()
- new_antag.team_mode = TRUE
- changeling.add_antag_datum(new_antag)
- GLOB.pre_setup_antags -= changeling
- ..()
-
-/datum/game_mode/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners
- var/csc = CONFIG_GET(number/changeling_scaling_coeff)
- var/changelingcap = min(round(GLOB.joined_player_list.len / (csc * 2)) + 2, round(GLOB.joined_player_list.len / csc))
- if(changelings.len >= changelingcap) //Caps number of latejoin antagonists
- return
- if(changelings.len <= (changelingcap - 2) || prob(100 - (csc * 2)))
- if(ROLE_CHANGELING in character.client.prefs.be_special)
- if(!is_banned_from(character.ckey, list(ROLE_CHANGELING, ROLE_SYNDICATE)) && !QDELETED(character))
- if(age_check(character.client))
- if(!(character.job in restricted_jobs))
- character.mind.make_Changeling()
- changelings += character.mind
-
-/datum/game_mode/changeling/generate_report()
- return "The Gorlex Marauders have announced the successful raid and destruction of Central Command containment ship #S-[rand(1111, 9999)]. This ship housed only a single prisoner - \
- codenamed \"Thing\", and it was highly adaptive and extremely dangerous. We have reason to believe that the Thing has allied with the Syndicate, and you should note that likelihood \
- of the Thing being sent to a station in this sector is highly likely. It may be in the guise of any crew member. Trust nobody - suspect everybody. Do not announce this to the crew, \
- as paranoia may spread and inhibit workplace efficiency."
-
-/proc/changeling_transform(mob/living/carbon/human/user, datum/changelingprofile/chosen_prof)
- var/datum/dna/chosen_dna = chosen_prof.dna
- user.real_name = chosen_prof.name
- user.underwear = chosen_prof.underwear
- user.undershirt = chosen_prof.undershirt
- user.socks = chosen_prof.socks
-
- chosen_dna.transfer_identity(user, 1)
- user.updateappearance(mutcolor_update=1)
- user.update_body()
- user.domutcheck()
-
- //vars hackery. not pretty, but better than the alternative.
- for(var/slot in GLOB.slots)
- if(istype(user.vars[slot], GLOB.slot2type[slot]) && !(chosen_prof.exists_list[slot])) //remove unnecessary flesh items
- qdel(user.vars[slot])
- continue
-
- if((user.vars[slot] && !istype(user.vars[slot], GLOB.slot2type[slot])) || !(chosen_prof.exists_list[slot]))
- continue
-
- var/obj/item/C
- var/equip = 0
- if(!user.vars[slot])
- var/thetype = GLOB.slot2type[slot]
- equip = 1
- C = new thetype(user)
-
- else if(istype(user.vars[slot], GLOB.slot2type[slot]))
- C = user.vars[slot]
-
- C.appearance = chosen_prof.appearance_list[slot]
- C.name = chosen_prof.name_list[slot]
- C.flags_cover = chosen_prof.flags_cover_list[slot]
- C.item_state = chosen_prof.item_state_list[slot]
- C.mob_overlay_icon = chosen_prof.mob_overlay_icon_list[slot]
- if(equip)
- user.equip_to_slot_or_del(C, GLOB.slot2slot[slot])
-
- user.regenerate_icons()
diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm
deleted file mode 100644
index 3bfb22181c..0000000000
--- a/code/game/gamemodes/changeling/traitor_chan.dm
+++ /dev/null
@@ -1,88 +0,0 @@
-/datum/game_mode/traitor/changeling
- name = "traitor+changeling"
- config_tag = "traitorchan"
- report_type = "traitorchan"
- false_report_weight = 10
- traitors_possible = 3 //hard limit on traitors if scaling is turned off
- restricted_jobs = list("AI", "Cyborg")
- required_players = 25
- required_enemies = 1 // how many of each type are required
- recommended_enemies = 3
- reroll_friendly = 1
- announce_span = "Traitors and Changelings"
- announce_text = "There are alien creatures on the station along with some syndicate operatives out for their own gain! Do not let the changelings or the traitors succeed!"
-
- var/list/possible_changelings = list()
- var/list/changelings = list()
- var/const/changeling_amount = 1 //hard limit on changelings if scaling is turned off
-
-/datum/game_mode/traitor/changeling/can_start()
- if(!..())
- return 0
- possible_changelings = get_players_for_role(ROLE_CHANGELING)
- if(possible_changelings.len < required_enemies)
- return 0
- return 1
-
-/datum/game_mode/traitor/changeling/pre_setup()
- if(CONFIG_GET(flag/protect_roles_from_antagonist))
- restricted_jobs += protected_jobs
-
- if(CONFIG_GET(flag/protect_assistant_from_antagonist))
- restricted_jobs += "Assistant"
-
- var/list/datum/mind/possible_changelings = get_players_for_role(ROLE_CHANGELING)
-
- var/num_changelings = 1
-
- var/csc = CONFIG_GET(number/changeling_scaling_coeff)
- if(csc)
- num_changelings = max(1, min(round(num_players() / (csc * 4)) + 2, round(num_players() / (csc * 2))))
- else
- num_changelings = max(1, min(num_players(), changeling_amount/2))
-
- if(possible_changelings.len>0)
- for(var/j = 0, j < num_changelings, j++)
- if(!possible_changelings.len)
- break
- var/datum/mind/changeling = antag_pick(possible_changelings)
- antag_candidates -= changeling
- possible_changelings -= changeling
- changeling.special_role = ROLE_CHANGELING
- changelings += changeling
- changeling.restricted_roles = restricted_jobs
- . = ..()
- if(.) //To ensure the game mode is going ahead
- for(var/antag in changelings)
- GLOB.pre_setup_antags += antag
- return
- else
- return FALSE
-
-/datum/game_mode/traitor/changeling/post_setup()
- for(var/datum/mind/changeling in changelings)
- changeling.add_antag_datum(/datum/antagonist/changeling)
- GLOB.pre_setup_antags -= changeling
- return ..()
-
-/datum/game_mode/traitor/changeling/make_antag_chance(mob/living/carbon/human/character) //Assigns changeling to latejoiners
- var/csc = CONFIG_GET(number/changeling_scaling_coeff)
- var/changelingcap = min( round(GLOB.joined_player_list.len / (csc * 4)) + 2, round(GLOB.joined_player_list.len / (csc * 2)))
- if(changelings.len >= changelingcap) //Caps number of latejoin antagonists
- ..()
- return
- if(changelings.len <= (changelingcap - 2) || prob(100 / (csc * 4)))
- if(ROLE_CHANGELING in character.client.prefs.be_special)
- if(!is_banned_from(character.ckey, list(ROLE_CHANGELING, ROLE_SYNDICATE)) && !QDELETED(character))
- if(age_check(character.client))
- if(!(character.job in restricted_jobs))
- character.mind.make_Changeling()
- changelings += character.mind
- if(QDELETED(character))
- return
- ..()
-
-/datum/game_mode/traitor/changeling/generate_report()
- return "The Syndicate has started some experimental research regarding humanoid shapeshifting. There are rumors that this technology will be field tested on a Nanotrasen station \
- for infiltration purposes. Be advised that support personel may also be deployed to defend these shapeshifters. Trust nobody - suspect everybody. Do not announce this to the crew, \
- as paranoia may spread and inhibit workplace efficiency."
diff --git a/code/game/gamemodes/clown_ops/bananium_bomb.dm b/code/game/gamemodes/clown_ops/bananium_bomb.dm
deleted file mode 100644
index d40859baea..0000000000
--- a/code/game/gamemodes/clown_ops/bananium_bomb.dm
+++ /dev/null
@@ -1,55 +0,0 @@
-/obj/machinery/nuclearbomb/syndicate/bananium
- name = "bananium fission explosive"
- desc = ""
- icon = 'icons/obj/machines/nuke.dmi'
- icon_state = "bananiumbomb_base"
-
-/obj/machinery/nuclearbomb/syndicate/bananium/update_icon_state()
- if(deconstruction_state != NUKESTATE_INTACT)
- icon_state = "bananiumbomb_base"
- return
-
- switch(get_nuke_state())
- if(NUKE_OFF_LOCKED, NUKE_OFF_UNLOCKED)
- icon_state = "bananiumbomb_base"
- if(NUKE_ON_TIMING)
- icon_state = "bananiumbomb_timing"
- if(NUKE_ON_EXPLODING)
- icon_state = "bananiumbomb_exploding"
-
-/obj/machinery/nuclearbomb/syndicate/bananium/get_cinematic_type(off_station)
- switch(off_station)
- if(0)
- return CINEMATIC_NUKE_CLOWNOP
- if(1)
- return CINEMATIC_NUKE_MISS
- if(2)
- return CINEMATIC_NUKE_FAKE //it is farther away, so just a bikehorn instead of an airhorn
- return CINEMATIC_NUKE_FAKE
-
-/obj/machinery/nuclearbomb/syndicate/bananium/really_actually_explode(off_station)
- Cinematic(get_cinematic_type(off_station), world)
- for(var/i in GLOB.human_list)
- var/mob/living/carbon/human/H = i
- var/turf/T = get_turf(H)
- if(!T || T.z != z)
- continue
- H.Stun(10)
- var/obj/item/clothing/C
- if(!H.wear_pants || H.dropItemToGround(H.wear_pants))
- C = new /obj/item/clothing/under/rank/civilian/clown(H)
- ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
- H.equip_to_slot_or_del(C, SLOT_PANTS)
-
- if(!H.shoes || H.dropItemToGround(H.shoes))
- C = new /obj/item/clothing/shoes/clown_shoes(H)
- ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
- H.equip_to_slot_or_del(C, SLOT_SHOES)
-
- if(!H.wear_mask || H.dropItemToGround(H.wear_mask))
- C = new /obj/item/clothing/mask/gas/clown_hat(H)
- ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
- H.equip_to_slot_or_del(C, SLOT_WEAR_MASK)
-
- H.dna.add_mutation(CLOWNMUT)
- H.gain_trauma(/datum/brain_trauma/mild/phobia/clowns, TRAUMA_RESILIENCE_LOBOTOMY) //MWA HA HA
diff --git a/code/game/gamemodes/clown_ops/clown_ops.dm b/code/game/gamemodes/clown_ops/clown_ops.dm
deleted file mode 100644
index 255f13520c..0000000000
--- a/code/game/gamemodes/clown_ops/clown_ops.dm
+++ /dev/null
@@ -1,61 +0,0 @@
-/datum/game_mode/nuclear/clown_ops
- name = "clown ops"
- config_tag = "clownops"
-
- announce_span = "danger"
- announce_text = "Clown empire forces are approaching the station in an attempt to HONK it!\n\
- Operatives: Secure the nuclear authentication disk and use your bananium fission explosive to HONK the station.\n\
- Crew: Defend the nuclear authentication disk and ensure that it leaves with you on the emergency shuttle."
-
- operative_antag_datum_type = /datum/antagonist/nukeop/clownop
- leader_antag_datum_type = /datum/antagonist/nukeop/leader/clownop
-
-////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////
-
-/datum/game_mode/nuclear/clown_ops/pre_setup()
- . = ..()
- if(.)
- for(var/obj/machinery/nuclearbomb/syndicate/S in GLOB.nuke_list)
- var/turf/T = get_turf(S)
- if(T)
- qdel(S)
- new /obj/machinery/nuclearbomb/syndicate/bananium(T)
- for(var/V in pre_nukeops)
- var/datum/mind/the_op = V
- the_op.assigned_role = "Clown Operative"
- the_op.special_role = "Clown Operative"
-
-/datum/outfit/syndicate/clownop
- name = "Clown Operative - Basic"
- uniform = /obj/item/clothing/under/syndicate
- shoes = /obj/item/clothing/shoes/clown_shoes/combat
- mask = /obj/item/clothing/mask/gas/clown_hat
- gloves = /obj/item/clothing/gloves/combat
- back = /obj/item/storage/backpack/clown
- ears = /obj/item/radio/headset/syndicate/alt
- l_pocket = /obj/item/pinpointer/nuke/syndicate
- r_pocket = /obj/item/bikehorn
- id = /obj/item/card/id/syndicate
- backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
- /obj/item/kitchen/knife/combat/survival,
- /obj/item/reagent_containers/spray/waterflower/lube)
- implants = list(/obj/item/implant/sad_trombone)
-
- uplink_type = /obj/item/uplink/clownop
-
-/datum/outfit/syndicate/clownop/no_crystals
- tc = 0
-
-/datum/outfit/syndicate/clownop/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
- if(visualsOnly)
- return
- H.dna.add_mutation(CLOWNMUT)
-
-/datum/outfit/syndicate/clownop/leader
- name = "Clown Operative Leader - Basic"
- id = /obj/item/card/id/syndicate/nuke_leader
- gloves = /obj/item/clothing/gloves/krav_maga/combatglovesplus
- r_hand = /obj/item/nuclear_challenge/clownops
- command_radio = TRUE
diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm
deleted file mode 100644
index ef932ccf4b..0000000000
--- a/code/game/gamemodes/clown_ops/clown_weapons.dm
+++ /dev/null
@@ -1,296 +0,0 @@
-/obj/item/reagent_containers/spray/waterflower/lube
- name = "water flower"
- desc = ""
- icon = 'icons/obj/hydroponics/harvest.dmi'
- icon_state = "sunflower"
- item_state = "sunflower"
- amount_per_transfer_from_this = 3
- spray_range = 1
- stream_range = 1
- volume = 30
- list_reagents = list(/datum/reagent/lube = 30)
-
-//COMBAT CLOWN SHOES
-//Clown shoes with combat stats and noslip. Of course they still squeak.
-/obj/item/clothing/shoes/clown_shoes/combat
- name = "combat clown shoes"
- desc = ""
- clothing_flags = NOSLIP
- slowdown = SHOES_SLOWDOWN
- armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50)
- strip_delay = 70
- resistance_flags = NONE
- permeability_coefficient = 0.05
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
-
-//The super annoying version
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat
- name = "mk-honk combat shoes"
- desc = ""
- slowdown = SHOES_SLOWDOWN
- armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 25, "bomb" = 50, "bio" = 10, "rad" = 0, "fire" = 70, "acid" = 50)
- strip_delay = 70
- resistance_flags = NONE
- permeability_coefficient = 0.05
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
- always_noslip = TRUE
- var/max_recharge = 3000 //30 peels worth
- var/recharge_rate = 34 //about 1/3 of a peel per tick
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/Initialize()
- . = ..()
- var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
- bananium.insert_amount_mat(max_recharge, /datum/material/bananium)
- START_PROCESSING(SSobj, src)
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/process()
- var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container)
- var/bananium_amount = bananium.get_material_amount(/datum/material/bananium)
- if(bananium_amount < max_recharge)
- bananium.insert_amount_mat(min(recharge_rate, max_recharge - bananium_amount), /datum/material/bananium)
-
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/attack_self(mob/user)
- ui_action_click(user)
-
-//BANANIUM SWORD
-
-/obj/item/melee/transforming/energy/sword/bananium
- name = "bananium sword"
- desc = ""
- force = 0
- throwforce = 0
- force_on = 0
- throwforce_on = 0
- hitsound = null
- attack_verb_on = list("slipped")
- clumsy_check = FALSE
- sharpness = IS_BLUNT
- sword_color = "yellow"
- heat = 0
- light_color = "#ffff00"
- var/next_trombone_allowed = 0
-
-/obj/item/melee/transforming/energy/sword/bananium/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/slippery, 60, GALOSHES_DONT_HELP)
- var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
- slipper.signal_enabled = active
-
-/obj/item/melee/transforming/energy/sword/bananium/attack(mob/living/M, mob/living/user)
- ..()
- if(active)
- var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
- slipper.Slip(src, M)
-
-/obj/item/melee/transforming/energy/sword/bananium/throw_impact(atom/hit_atom, throwingdatum)
- . = ..()
- if(active)
- var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
- slipper.Slip(src, hit_atom)
-
-/obj/item/melee/transforming/energy/sword/bananium/attackby(obj/item/I, mob/living/user, params)
- if((world.time > next_trombone_allowed) && istype(I, /obj/item/melee/transforming/energy/sword/bananium))
- next_trombone_allowed = world.time + 50
- to_chat(user, "I slap the two swords together. Sadly, they do not seem to fit!")
- playsound(src, 'sound/blank.ogg', 50)
- return TRUE
- return ..()
-
-/obj/item/melee/transforming/energy/sword/bananium/transform_weapon(mob/living/user, supress_message_text)
- ..()
- var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
- slipper.signal_enabled = active
-
-/obj/item/melee/transforming/energy/sword/bananium/ignition_effect(atom/A, mob/user)
- return ""
-
-/obj/item/melee/transforming/energy/sword/bananium/suicide_act(mob/user)
- if(!active)
- transform_weapon(user, TRUE)
- user.visible_message("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku, but the blade slips off of [user.p_them()] harmlessly!")
- var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
- slipper.Slip(src, user)
- return SHAME
-
-//BANANIUM SHIELD
-
-/obj/item/shield/energy/bananium
- name = "bananium energy shield"
- desc = ""
- throw_speed = 1
- clumsy_check = 0
- base_icon_state = "bananaeshield"
- force = 0
- throwforce = 0
- throw_range = 5
- on_force = 0
- on_throwforce = 0
- on_throw_speed = 1
-
-/obj/item/shield/energy/bananium/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/slippery, 60, GALOSHES_DONT_HELP)
- var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
- slipper.signal_enabled = active
-
-/obj/item/shield/energy/bananium/attack_self(mob/living/carbon/human/user)
- ..()
- var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
- slipper.signal_enabled = active
-
-/obj/item/shield/energy/bananium/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force)
- if(active)
- if(iscarbon(thrower))
- var/mob/living/carbon/C = thrower
- C.throw_mode_on() //so they can catch it on the return.
- return ..()
-
-/obj/item/shield/energy/bananium/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- if(active)
- var/caught = hit_atom.hitby(src, FALSE, FALSE, throwingdatum=throwingdatum)
- if(iscarbon(hit_atom) && !caught)//if they are a carbon and they didn't catch it
- var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
- slipper.Slip(src, hit_atom)
- if(thrownby && !caught)
- sleep(1)
- throw_at(thrownby, throw_range+2, throw_speed, null, TRUE)
- else
- return ..()
-
-
-//BOMBANANA
-
-/obj/item/reagent_containers/food/snacks/grown/banana/bombanana
- trash = /obj/item/grown/bananapeel/bombanana
- bitesize = 1
- customfoodfilling = FALSE
- seed = null
- tastes = list("explosives" = 10)
- list_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
-
-/obj/item/grown/bananapeel/bombanana
- desc = ""
- seed = null
- var/det_time = 50
- var/obj/item/grenade/syndieminibomb/bomb
-
-/obj/item/grown/bananapeel/bombanana/Initialize()
- . = ..()
- bomb = new /obj/item/grenade/syndieminibomb(src)
- bomb.det_time = det_time
- if(iscarbon(loc))
- to_chat(loc, "[src] begins to beep.")
- var/mob/living/carbon/C = loc
- C.throw_mode_on()
- bomb.preprime(loc, null, FALSE)
-
-/obj/item/grown/bananapeel/bombanana/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/slippery, det_time)
-
-/obj/item/grown/bananapeel/bombanana/Destroy()
- . = ..()
- QDEL_NULL(bomb)
-
-/obj/item/grown/bananapeel/bombanana/suicide_act(mob/user)
- user.visible_message("[user] is deliberately slipping on the [src.name]! It looks like \he's trying to commit suicide.")
- playsound(loc, 'sound/blank.ogg', 50, TRUE, -1)
- bomb.preprime(user, 0, FALSE)
- return (BRUTELOSS)
-
-//TEARSTACHE GRENADE
-
-/obj/item/grenade/chem_grenade/teargas/moustache
- name = "tear-stache grenade"
- desc = ""
- icon_state = "moustacheg"
- clumsy_check = GRENADE_NONCLUMSY_FUMBLE
-
-/obj/item/grenade/chem_grenade/teargas/moustache/prime()
- var/myloc = get_turf(src)
- . = ..()
- for(var/mob/living/carbon/M in view(6, myloc))
- if(!istype(M.wear_mask, /obj/item/clothing/mask/gas/clown_hat) && !istype(M.wear_mask, /obj/item/clothing/mask/gas/mime) )
- if(!M.wear_mask || M.dropItemToGround(M.wear_mask))
- var/obj/item/clothing/mask/fakemoustache/sticky/the_stash = new /obj/item/clothing/mask/fakemoustache/sticky()
- M.equip_to_slot_or_del(the_stash, SLOT_WEAR_MASK, TRUE, TRUE, TRUE, TRUE)
-
-/obj/item/clothing/mask/fakemoustache/sticky
- var/unstick_time = 600
-
-/obj/item/clothing/mask/fakemoustache/sticky/Initialize()
- . = ..()
- ADD_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT)
- addtimer(CALLBACK(src, PROC_REF(unstick)), unstick_time)
-
-/obj/item/clothing/mask/fakemoustache/sticky/proc/unstick()
- REMOVE_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT)
-
-//DARK H.O.N.K. AND CLOWN MECH WEAPONS
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana
- name = "bombanana mortar"
- desc = ""
- icon_state = "mecha_bananamrtr"
- projectile = /obj/item/grown/bananapeel/bombanana
- projectiles = 8
- projectile_energy_cost = 1000
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana/can_attach(obj/mecha/combat/honker/M)
- if(..())
- if(istype(M))
- return TRUE
- return FALSE
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache
- name = "\improper HONKeR-6 grenade launcher"
- desc = ""
- icon_state = "mecha_grenadelnchr"
- projectile = /obj/item/grenade/chem_grenade/teargas/moustache
- fire_sound = 'sound/blank.ogg'
- projectiles = 6
- missile_speed = 1.5
- projectile_energy_cost = 800
- equip_cooldown = 60
- det_time = 20
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache/can_attach(obj/mecha/combat/honker/M)
- if(..())
- if(istype(M))
- return TRUE
- return FALSE
-
-/obj/mecha/combat/honker/dark
- desc = ""
- name = "\improper Dark H.O.N.K"
- icon_state = "darkhonker"
- max_integrity = 300
- deflect_chance = 15
- armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
- max_temperature = 35000
- operation_req_access = list(ACCESS_SYNDICATE)
- internals_req_access = list(ACCESS_SYNDICATE)
- wreckage = /obj/structure/mecha_wreckage/honker/dark
- max_equip = 4
-
-/obj/mecha/combat/honker/dark/add_cell(obj/item/stock_parts/cell/C)
- if(C)
- C.forceMove(src)
- cell = C
- return
- cell = new /obj/item/stock_parts/cell/hyper(src)
-
-/obj/mecha/combat/honker/dark/loaded/Initialize()
- . = ..()
- var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/thrusters/ion(src)
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker()
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana()//Needed more offensive weapons.
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache()//The mousetrap mortar was not up-to-snuff.
- ME.attach(src)
-
-/obj/structure/mecha_wreckage/honker/dark
- name = "\improper Dark H.O.N.K wreckage"
- icon_state = "darkhonker-broken"
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
deleted file mode 100644
index 5046543c33..0000000000
--- a/code/game/gamemodes/cult/cult.dm
+++ /dev/null
@@ -1,160 +0,0 @@
-#define CULT_SCALING_COEFFICIENT 9.3 //Roughly one new cultist at roundstart per this many players
-
-/datum/game_mode
- var/list/datum/mind/cult = list()
-
-/proc/iscultist(mob/living/M)
- return istype(M) && M.mind && M.mind.has_antag_datum(/datum/antagonist/cult)
-
-/datum/team/cult/proc/is_sacrifice_target(datum/mind/mind)
- for(var/datum/objective/sacrifice/sac_objective in objectives)
- if(mind == sac_objective.target)
- return TRUE
- return FALSE
-
-/proc/is_convertable_to_cult(mob/living/M,datum/team/cult/specific_cult)
- if(!istype(M))
- return FALSE
- if(M.mind)
- if(ishuman(M) && (M.mind.isholy))
- return FALSE
- if(specific_cult && specific_cult.is_sacrifice_target(M.mind))
- return FALSE
- if(M.mind.enslaved_to && !iscultist(M.mind.enslaved_to))
- return FALSE
- if(M.mind.unconvertable)
- return FALSE
- else
- return FALSE
- if(HAS_TRAIT(M, TRAIT_MINDSHIELD) || issilicon(M) || isbot(M) || isdrone(M) || !M.client)
- return FALSE //can't convert machines, shielded, or braindead
- return TRUE
-
-/datum/game_mode/cult
- name = "cult"
- config_tag = "cult"
- report_type = "cult"
- antag_flag = ROLE_CULTIST
- false_report_weight = 10
- restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel")
- protected_jobs = list()
- required_players = 29
- required_enemies = 4
- recommended_enemies = 4
- enemy_minimum_age = 14
-
- announce_span = "cult"
- announce_text = "Some crew members are trying to start a cult to Nar'Sie!\n\
- Cultists: Carry out Nar'Sie's will.\n\
- Crew: Prevent the cult from expanding and drive it out."
-
- var/finished = 0
-
- var/acolytes_needed = 10 //for the survive objective
- var/acolytes_survived = 0
-
- var/list/cultists_to_cult = list() //the cultists we'll convert
-
- var/datum/team/cult/main_cult
-
-
-/datum/game_mode/cult/pre_setup()
- if(CONFIG_GET(flag/protect_roles_from_antagonist))
- restricted_jobs += protected_jobs
-
- if(CONFIG_GET(flag/protect_assistant_from_antagonist))
- restricted_jobs += "Assistant"
-
- //cult scaling goes here
- recommended_enemies = 1 + round(num_players()/CULT_SCALING_COEFFICIENT)
- var/remaining = (num_players() % CULT_SCALING_COEFFICIENT) * 10 //Basically the % of how close the population is toward adding another cultis
- if(prob(remaining))
- recommended_enemies++
-
-
- for(var/cultists_number = 1 to recommended_enemies)
- if(!antag_candidates.len)
- break
- var/datum/mind/cultist = antag_pick(antag_candidates)
- antag_candidates -= cultist
- cultists_to_cult += cultist
- cultist.special_role = ROLE_CULTIST
- cultist.restricted_roles = restricted_jobs
- log_game("[key_name(cultist)] has been selected as a cultist")
-
- if(cultists_to_cult.len>=required_enemies)
- for(var/antag in cultists_to_cult)
- GLOB.pre_setup_antags += antag
- return TRUE
- else
- setup_error = "Not enough cultist candidates"
- return FALSE
-
-
-/datum/game_mode/cult/post_setup()
- main_cult = new
-
- for(var/datum/mind/cult_mind in cultists_to_cult)
- add_cultist(cult_mind, 0, equip=TRUE, cult_team = main_cult)
- GLOB.pre_setup_antags -= cult_mind
-
- main_cult.setup_objectives() //Wait until all cultists are assigned to make sure none will be chosen as sacrifice.
-
- . = ..()
-
-/datum/game_mode/proc/add_cultist(datum/mind/cult_mind, stun , equip = FALSE, datum/team/cult/cult_team = null)
- if (!istype(cult_mind))
- return FALSE
-
- var/datum/antagonist/cult/new_cultist = new()
- new_cultist.give_equipment = equip
-
- if(cult_mind.add_antag_datum(new_cultist,cult_team))
- if(stun)
- cult_mind.current.Unconscious(100)
- return TRUE
-
-/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, silent, stun)
- if(cult_mind.current)
- var/datum/antagonist/cult/cult_datum = cult_mind.has_antag_datum(/datum/antagonist/cult)
- if(!cult_datum)
- return FALSE
- cult_datum.silent = silent
- cult_mind.remove_antag_datum(cult_datum)
- if(stun)
- cult_mind.current.Unconscious(100)
- return TRUE
-
-/datum/game_mode/cult/proc/check_cult_victory()
- return main_cult.check_cult_victory()
-
-
-/datum/game_mode/cult/set_round_result()
- ..()
- if(check_cult_victory())
- SSticker.mode_result = "win - cult win"
- SSticker.news_report = CULT_SUMMON
- else
- SSticker.mode_result = "loss - staff stopped the cult"
- SSticker.news_report = CULT_FAILURE
-
-/datum/game_mode/cult/proc/check_survive()
- var/acolytes_survived = 0
- for(var/datum/mind/cult_mind in cult)
- if (cult_mind.current && cult_mind.current.stat != DEAD)
- if(cult_mind.current.onCentCom() || cult_mind.current.onSyndieBase())
- acolytes_survived++
- if(acolytes_survived>=acolytes_needed)
- return 0
- else
- return 1
-
-
-/datum/game_mode/cult/generate_report()
- return "Some stations in your sector have reported evidence of blood sacrifice and strange magic. Ties to the Wizards' Federation have been proven not to exist, and many employees \
- have disappeared; even Central Command employees light-years away have felt strange presences and at times hysterical compulsions. Interrogations point towards this being the work of \
- the cult of Nar'Sie. If evidence of this cult is discovered aboard your station, extreme caution and extreme vigilance must be taken going forward, and all resources should be \
- devoted to stopping this cult. Note that holy water seems to weaken and eventually return the minds of cultists that ingest it, and mindshield implants will prevent conversion \
- altogether."
-
-#undef CULT_SCALING_COEFFICIENT
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index 9417e03a4b..e19d6cabac 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -220,16 +220,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
. += "Your station is somehow in the middle of hostile territory, in clear view of any enemy of the corporation. Your likelihood to survive is low, and station destruction is expected and almost inevitable. Secure any sensitive material and neutralize any enemy you will come across. It is important that you at least try to maintain the station. "
. += "Good luck."
- if(station_goals.len)
- . += "Special Orders for [station_name()]:"
- for(var/datum/station_goal/G in station_goals)
- G.on_report()
- . += G.get_report()
-
- print_command_report(., "Central Command Status Summary", announce=FALSE)
priority_announce("A summary has been copied and printed to all communications consoles.", "Security level elevated.", 'sound/blank.ogg')
- if(GLOB.security_level < SEC_LEVEL_BLUE)
- set_security_level(SEC_LEVEL_BLUE)
// Yes, this is copy pasted from game_mode
/datum/game_mode/dynamic/check_finished(force_ending)
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
index c5b474d1d8..ed6b4f8847 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
@@ -68,117 +68,3 @@
high_population_requirement = 10
repeatable = TRUE
flags = TRAITOR_RULESET
-
-//////////////////////////////////////////////
-// //
-// REVOLUTIONARY PROVOCATEUR //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/latejoin/provocateur
- name = "Provocateur"
- persistent = TRUE
- antag_datum = /datum/antagonist/rev/head
- antag_flag = ROLE_REV_HEAD
- antag_flag_override = ROLE_REV
- restricted_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director")
- enemy_roles = list("AI", "Cyborg", "Security Officer","Detective","Head of Security", "Captain", "Warden")
- required_enemies = list(2,2,1,1,1,1,1,0,0,0)
- required_candidates = 1
- weight = 2
- delay = 1 MINUTES // Prevents rule start while head is offstation.
- cost = 20
- requirements = list(101,101,70,40,30,20,20,20,20,20)
- high_population_requirement = 50
- flags = HIGHLANDER_RULESET
- var/required_heads_of_staff = 3
- var/finished = FALSE
- var/datum/team/revolution/revolution
-
-/datum/dynamic_ruleset/latejoin/provocateur/ready(forced=FALSE)
- if (forced)
- required_heads_of_staff = 1
- if(!..())
- return FALSE
- var/head_check = 0
- for(var/mob/player in mode.current_players[CURRENT_LIVING_PLAYERS])
- if (player.mind.assigned_role in GLOB.command_positions)
- head_check++
- return (head_check >= required_heads_of_staff)
-
-/datum/dynamic_ruleset/latejoin/provocateur/execute()
- var/mob/M = pick(candidates) // This should contain a single player, but in case.
- if(check_eligible(M.mind)) // Didnt die/run off z-level/get implanted since leaving shuttle.
- assigned += M.mind
- M.mind.special_role = antag_flag
- revolution = new()
- var/datum/antagonist/rev/head/new_head = new()
- new_head.give_flash = TRUE
- new_head.give_hud = TRUE
- new_head.remove_clumsy = TRUE
- new_head = M.mind.add_antag_datum(new_head, revolution)
- revolution.update_objectives()
- revolution.update_heads()
- SSshuttle.registerHostileEnvironment(src)
- return TRUE
- else
- log_game("DYNAMIC: [ruletype] [name] discarded [M.name] from head revolutionary due to ineligibility.")
- log_game("DYNAMIC: [ruletype] [name] failed to get any eligible headrevs. Refunding [cost] threat.")
- return FALSE
-
-/datum/dynamic_ruleset/latejoin/provocateur/rule_process()
- if(check_rev_victory())
- finished = REVOLUTION_VICTORY
- return RULESET_STOP_PROCESSING
- else if (check_heads_victory())
- finished = STATION_VICTORY
- SSshuttle.clearHostileEnvironment(src)
- priority_announce("It appears the mutiny has been quelled. Please return myself and your colleagues to work. \
- We have remotely blacklisted the head revolutionaries from your cloning software to prevent accidental cloning.", null, 'sound/blank.ogg', null, "Central Command Loyalty Monitoring Division")
- revolution.save_members()
- for(var/datum/mind/M in revolution.members) // Remove antag datums and prevents podcloned or exiled headrevs restarting rebellions.
- if(M.has_antag_datum(/datum/antagonist/rev/head))
- var/datum/antagonist/rev/head/R = M.has_antag_datum(/datum/antagonist/rev/head)
- R.remove_revolutionary(FALSE, "gamemode")
- var/mob/living/carbon/C = M.current
- if(C.stat == DEAD)
- C.makeUncloneable()
- if(M.has_antag_datum(/datum/antagonist/rev))
- var/datum/antagonist/rev/R = M.has_antag_datum(/datum/antagonist/rev)
- R.remove_revolutionary(FALSE, "gamemode")
- return RULESET_STOP_PROCESSING
-
-/// Checks for revhead loss conditions and other antag datums.
-/datum/dynamic_ruleset/latejoin/provocateur/proc/check_eligible(datum/mind/M)
- var/turf/T = get_turf(M.current)
- if(!considered_afk(M) && considered_alive(M) && is_station_level(T.z) && !M.antag_datums?.len && !HAS_TRAIT(M, TRAIT_MINDSHIELD))
- return TRUE
- return FALSE
-
-/datum/dynamic_ruleset/latejoin/provocateur/check_finished()
- if(finished == REVOLUTION_VICTORY)
- return TRUE
- else
- return ..()
-
-/datum/dynamic_ruleset/latejoin/provocateur/proc/check_rev_victory()
- for(var/datum/objective/mutiny/objective in revolution.objectives)
- if(!(objective.check_completion()))
- return FALSE
- return TRUE
-
-/datum/dynamic_ruleset/latejoin/provocateur/proc/check_heads_victory()
- for(var/datum/mind/rev_mind in revolution.head_revolutionaries())
- var/turf/T = get_turf(rev_mind.current)
- if(!considered_afk(rev_mind) && considered_alive(rev_mind) && is_station_level(T.z))
- if(ishuman(rev_mind.current) || ismonkey(rev_mind.current))
- return FALSE
- return TRUE
-
-/datum/dynamic_ruleset/latejoin/provocateur/round_result()
- if(finished == REVOLUTION_VICTORY)
- SSticker.mode_result = "win - heads killed"
- SSticker.news_report = REVS_WIN
- else if(finished == STATION_VICTORY)
- SSticker.mode_result = "loss - rev heads killed"
- SSticker.news_report = REVS_LOSE
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
index 33e02f2899..e6bb893bae 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
@@ -190,9 +190,6 @@
/datum/dynamic_ruleset/midround/autotraitor/trim_candidates()
..()
for(var/mob/living/player in living_players)
- if(issilicon(player)) // Your assigned role doesn't change when you are turned into a silicon.
- living_players -= player
- continue
if(is_centcom_level(player.z))
living_players -= player // We don't autotator people in CentCom
continue
@@ -212,58 +209,6 @@
M.mind.add_antag_datum(newTraitor)
return TRUE
-
-//////////////////////////////////////////////
-// //
-// Malfunctioning AI //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/midround/malf
- name = "Malfunctioning AI"
- antag_datum = /datum/antagonist/traitor
- antag_flag = ROLE_MALF
- enemy_roles = list("Security Officer", "Warden","Detective","Head of Security", "Captain", "Scientist", "Chemist", "Research Director", "Chief Engineer")
- exclusive_roles = list("AI")
- required_enemies = list(4,4,4,4,4,4,2,2,2,0)
- required_candidates = 1
- weight = 3
- cost = 35
- requirements = list(101,101,80,70,60,60,50,50,40,40)
- high_population_requirement = 35
- required_type = /mob/living/silicon/ai
- var/ion_announce = 33
- var/removeDontImproveChance = 10
-
-/datum/dynamic_ruleset/midround/malf/trim_candidates()
- ..()
- candidates = living_players
- for(var/mob/living/player in candidates)
- if(!isAI(player))
- candidates -= player
- continue
- if(is_centcom_level(player.z))
- candidates -= player
- continue
- if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0))
- candidates -= player
-
-/datum/dynamic_ruleset/midround/malf/execute()
- if(!candidates || !candidates.len)
- return FALSE
- var/mob/living/silicon/ai/M = pick_n_take(candidates)
- assigned += M.mind
- var/datum/antagonist/traitor/AI = new
- M.mind.special_role = antag_flag
- M.mind.add_antag_datum(AI)
- if(prob(ion_announce))
- priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", 'sound/blank.ogg')
- if(prob(removeDontImproveChance))
- M.replace_random_law(generate_ion_law(), list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION))
- else
- M.add_ion_law(generate_ion_law())
- return TRUE
-
//////////////////////////////////////////////
// //
// WIZARD (GHOST) //
@@ -296,49 +241,6 @@
..()
new_character.forceMove(pick(GLOB.wizardstart))
-//////////////////////////////////////////////
-// //
-// NUCLEAR OPERATIVES (MIDROUND) //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/midround/from_ghosts/nuclear
- name = "Nuclear Assault"
- antag_flag = ROLE_OPERATIVE
- antag_datum = /datum/antagonist/nukeop
- enemy_roles = list("AI", "Cyborg", "Security Officer", "Warden","Detective","Head of Security", "Captain")
- required_enemies = list(3,3,3,3,3,2,1,1,0,0)
- required_candidates = 5
- weight = 5
- cost = 35
- requirements = list(90,90,90,80,60,40,30,20,10,10)
- high_population_requirement = 10
- var/list/operative_cap = list(2,2,3,3,4,5,5,5,5,5)
- var/datum/team/nuclear/nuke_team
- flags = HIGHLANDER_RULESET
-
-/datum/dynamic_ruleset/midround/from_ghosts/nuclear/acceptable(population=0, threat=0)
- if (locate(/datum/dynamic_ruleset/roundstart/nuclear) in mode.executed_rules)
- return FALSE // Unavailable if nuke ops were already sent at roundstart
- indice_pop = min(operative_cap.len, round(living_players.len/5)+1)
- required_candidates = operative_cap[indice_pop]
- return ..()
-
-/datum/dynamic_ruleset/midround/from_ghosts/nuclear/ready(forced = FALSE)
- if (required_candidates > (dead_players.len + list_observers.len))
- return FALSE
- return ..()
-
-/datum/dynamic_ruleset/midround/from_ghosts/nuclear/finish_setup(mob/new_character, index)
- new_character.mind.special_role = "Nuclear Operative"
- new_character.mind.assigned_role = "Nuclear Operative"
- if (index == 1) // Our first guy is the leader
- var/datum/antagonist/nukeop/leader/new_role = new
- nuke_team = new_role.nuke_team
- new_character.mind.add_antag_datum(new_role)
- else
- return ..()
-
//////////////////////////////////////////////
// //
// BLOB (GHOST) //
@@ -361,96 +263,3 @@
/datum/dynamic_ruleset/midround/from_ghosts/blob/generate_ruleset_body(mob/applicant)
var/body = applicant.become_overmind()
return body
-
-//////////////////////////////////////////////
-// //
-// XENOMORPH (GHOST) //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/midround/from_ghosts/xenomorph
- name = "Alien Infestation"
- antag_datum = /datum/antagonist/xeno
- antag_flag = ROLE_ALIEN
- enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain")
- required_enemies = list(2,2,1,1,1,1,1,0,0,0)
- required_candidates = 1
- weight = 3
- cost = 10
- requirements = list(101,101,101,70,50,40,20,15,10,10)
- high_population_requirement = 50
- repeatable = TRUE
- var/list/vents = list()
-
-/datum/dynamic_ruleset/midround/from_ghosts/xenomorph/execute()
- // 50% chance of being incremented by one
- required_candidates += prob(50)
- for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in GLOB.machines)
- if(QDELETED(temp_vent))
- continue
- if(is_station_level(temp_vent.loc.z) && !temp_vent.welded)
- var/datum/pipeline/temp_vent_parent = temp_vent.parents[1]
- if(!temp_vent_parent)
- continue // No parent vent
- // Stops Aliens getting stuck in small networks.
- // See: Security, Virology
- if(temp_vent_parent.other_atmosmch.len > 20)
- vents += temp_vent
- if(!vents.len)
- return FALSE
- . = ..()
-
-/datum/dynamic_ruleset/midround/from_ghosts/xenomorph/generate_ruleset_body(mob/applicant)
- var/obj/vent = pick_n_take(vents)
- var/mob/living/carbon/alien/larva/new_xeno = new(vent.loc)
- new_xeno.key = applicant.key
- message_admins("[ADMIN_LOOKUPFLW(new_xeno)] has been made into an alien by the midround ruleset.")
- log_game("DYNAMIC: [key_name(new_xeno)] was spawned as an alien by the midround ruleset.")
- return new_xeno
-
-//////////////////////////////////////////////
-// //
-// NIGHTMARE (GHOST) //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/midround/from_ghosts/nightmare
- name = "Nightmare"
- antag_datum = /datum/antagonist/nightmare
- antag_flag = "Nightmare"
- antag_flag_override = ROLE_ALIEN
- enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain")
- required_enemies = list(2,2,1,1,1,1,1,0,0,0)
- required_candidates = 1
- weight = 3
- cost = 10
- requirements = list(101,101,101,70,50,40,20,15,10,10)
- high_population_requirement = 50
- repeatable = TRUE
- var/list/spawn_locs = list()
-
-/datum/dynamic_ruleset/midround/from_ghosts/nightmare/execute()
- for(var/X in GLOB.xeno_spawn)
- var/turf/T = X
- var/light_amount = T.get_lumcount()
- if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD)
- spawn_locs += T
- if(!spawn_locs.len)
- return FALSE
- . = ..()
-
-/datum/dynamic_ruleset/midround/from_ghosts/nightmare/generate_ruleset_body(mob/applicant)
- var/datum/mind/player_mind = new /datum/mind(applicant.key)
- player_mind.active = TRUE
-
- var/mob/living/carbon/human/S = new (pick(spawn_locs))
- player_mind.transfer_to(S)
- player_mind.assigned_role = "Nightmare"
- player_mind.special_role = "Nightmare"
- player_mind.add_antag_datum(/datum/antagonist/nightmare)
- S.set_species(/datum/species/shadow/nightmare)
-
- playsound(S, 'sound/blank.ogg', 50, TRUE, -1)
- message_admins("[ADMIN_LOOKUPFLW(S)] has been made into a Nightmare by the midround ruleset.")
- log_game("DYNAMIC: [key_name(S)] was spawned as a Nightmare by the midround ruleset.")
- return S
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
index 37048a45b0..17a056ca29 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
@@ -41,107 +41,6 @@
log_game("DYNAMIC: Checking if we can turn someone into a traitor.")
mode.picking_specific_rule(/datum/dynamic_ruleset/midround/autotraitor)
-//////////////////////////////////////////
-// //
-// BLOOD BROTHERS //
-// //
-//////////////////////////////////////////
-
-/datum/dynamic_ruleset/roundstart/traitorbro
- name = "Blood Brothers"
- antag_flag = ROLE_BROTHER
- antag_datum = /datum/antagonist/brother/
- protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")
- restricted_roles = list("Cyborg", "AI")
- required_candidates = 2
- weight = 4
- cost = 15
- scaling_cost = 15
- requirements = list(40,30,30,20,20,15,15,15,10,10)
- high_population_requirement = 15
- antag_cap = list(2,2,2,2,2,2,2,2,2,2) // Can pick 3 per team, but rare enough it doesn't matter.
- var/list/datum/team/brother_team/pre_brother_teams = list()
- var/const/min_team_size = 2
-
-/datum/dynamic_ruleset/roundstart/traitorbro/pre_execute()
- var/num_teams = (antag_cap[indice_pop]/min_team_size) * (scaled_times + 1) // 1 team per scaling
- for(var/j = 1 to num_teams)
- if(candidates.len < min_team_size || candidates.len < required_candidates)
- break
- var/datum/team/brother_team/team = new
- var/team_size = prob(10) ? min(3, candidates.len) : 2
- for(var/k = 1 to team_size)
- var/mob/bro = pick_n_take(candidates)
- assigned += bro.mind
- team.add_member(bro.mind)
- bro.mind.special_role = "brother"
- bro.mind.restricted_roles = restricted_roles
- GLOB.pre_setup_antags += bro.mind
- pre_brother_teams += team
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/traitorbro/execute()
- for(var/datum/team/brother_team/team in pre_brother_teams)
- team.pick_meeting_area()
- team.forge_brother_objectives()
- for(var/datum/mind/M in team.members)
- M.add_antag_datum(/datum/antagonist/brother, team)
- GLOB.pre_setup_antags -= M
- team.update_name()
- mode.brother_teams += pre_brother_teams
- return TRUE
-
-//////////////////////////////////////////////
-// //
-// CHANGELINGS //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/roundstart/changeling
- name = "Changelings"
- antag_flag = ROLE_CHANGELING
- antag_datum = /datum/antagonist/changeling
- protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")
- restricted_roles = list("AI", "Cyborg")
- required_candidates = 1
- weight = 3
- cost = 15
- scaling_cost = 15
- requirements = list(70,70,60,50,40,20,20,10,10,10)
- high_population_requirement = 10
- antag_cap = list(1,1,1,1,1,2,2,2,2,3)
- var/team_mode_probability = 30
-
-/datum/dynamic_ruleset/roundstart/changeling/pre_execute()
- var/num_changelings = antag_cap[indice_pop] * (scaled_times + 1)
- for (var/i = 1 to num_changelings)
- var/mob/M = pick_n_take(candidates)
- assigned += M.mind
- M.mind.restricted_roles = restricted_roles
- M.mind.special_role = ROLE_CHANGELING
- GLOB.pre_setup_antags += M.mind
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/changeling/execute()
- var/team_mode = FALSE
- if(prob(team_mode_probability))
- team_mode = TRUE
- var/list/team_objectives = subtypesof(/datum/objective/changeling_team_objective)
- var/list/possible_team_objectives = list()
- for(var/T in team_objectives)
- var/datum/objective/changeling_team_objective/CTO = T
- if(assigned.len >= initial(CTO.min_lings))
- possible_team_objectives += T
-
- if(possible_team_objectives.len && prob(20*assigned.len))
- GLOB.changeling_team_objective_type = pick(possible_team_objectives)
- for(var/datum/mind/changeling in assigned)
- var/datum/antagonist/changeling/new_antag = new antag_datum()
- new_antag.team_mode = team_mode
- changeling.add_antag_datum(new_antag)
- GLOB.pre_setup_antags -= changeling
- return TRUE
-
//////////////////////////////////////////////
// //
// WIZARDS //
@@ -187,274 +86,6 @@
M.add_antag_datum(new antag_datum())
return TRUE
-//////////////////////////////////////////////
-// //
-// BLOOD CULT //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/roundstart/bloodcult
- name = "Blood Cult"
- antag_flag = ROLE_CULTIST
- antag_datum = /datum/antagonist/cult
- minimum_required_age = 14
- restricted_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel")
- required_candidates = 2
- weight = 3
- cost = 35
- requirements = list(100,90,80,60,40,30,10,10,10,10)
- high_population_requirement = 10
- flags = HIGHLANDER_RULESET
- antag_cap = list(2,2,2,3,3,4,4,4,4,4)
- var/datum/team/cult/main_cult
-
-/datum/dynamic_ruleset/roundstart/bloodcult/ready(forced = FALSE)
- required_candidates = antag_cap[indice_pop]
- . = ..()
-
-/datum/dynamic_ruleset/roundstart/bloodcult/pre_execute()
- var/cultists = antag_cap[indice_pop]
- mode.antags_rolled += cultists
- for(var/cultists_number = 1 to cultists)
- if(candidates.len <= 0)
- break
- var/mob/M = pick_n_take(candidates)
- assigned += M.mind
- M.mind.special_role = ROLE_CULTIST
- M.mind.restricted_roles = restricted_roles
- GLOB.pre_setup_antags += M.mind
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/bloodcult/execute()
- main_cult = new
- for(var/datum/mind/M in assigned)
- var/datum/antagonist/cult/new_cultist = new antag_datum()
- new_cultist.cult_team = main_cult
- new_cultist.give_equipment = TRUE
- M.add_antag_datum(new_cultist)
- GLOB.pre_setup_antags -= M
- main_cult.setup_objectives()
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/bloodcult/round_result()
- ..()
- if(main_cult.check_cult_victory())
- SSticker.mode_result = "win - cult win"
- SSticker.news_report = CULT_SUMMON
- else
- SSticker.mode_result = "loss - staff stopped the cult"
- SSticker.news_report = CULT_FAILURE
-
-//////////////////////////////////////////////
-// //
-// NUCLEAR OPERATIVES //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/roundstart/nuclear
- name = "Nuclear Emergency"
- antag_flag = ROLE_OPERATIVE
- antag_datum = /datum/antagonist/nukeop
- var/datum/antagonist/antag_leader_datum = /datum/antagonist/nukeop/leader
- minimum_required_age = 14
- restricted_roles = list("Head of Security", "Captain") // Just to be sure that a nukie getting picked won't ever imply a Captain or HoS not getting drafted
- required_candidates = 5
- weight = 3
- cost = 40
- requirements = list(90,90,90,80,60,40,30,20,10,10)
- high_population_requirement = 10
- flags = HIGHLANDER_RULESET
- antag_cap = list(2,2,2,3,3,3,4,4,5,5)
- var/datum/team/nuclear/nuke_team
-
-/datum/dynamic_ruleset/roundstart/nuclear/ready(forced = FALSE)
- required_candidates = antag_cap[indice_pop]
- . = ..()
-
-/datum/dynamic_ruleset/roundstart/nuclear/pre_execute()
- // If ready() did its job, candidates should have 5 or more members in it
- var/operatives = antag_cap[indice_pop]
- mode.antags_rolled += operatives
- for(var/operatives_number = 1 to operatives)
- if(candidates.len <= 0)
- break
- var/mob/M = pick_n_take(candidates)
- assigned += M.mind
- M.mind.assigned_role = "Nuclear Operative"
- M.mind.special_role = "Nuclear Operative"
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/nuclear/execute()
- var/leader = TRUE
- for(var/datum/mind/M in assigned)
- if (leader)
- leader = FALSE
- var/datum/antagonist/nukeop/leader/new_op = M.add_antag_datum(antag_leader_datum)
- nuke_team = new_op.nuke_team
- else
- var/datum/antagonist/nukeop/new_op = new antag_datum()
- M.add_antag_datum(new_op)
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/nuclear/round_result()
- var result = nuke_team.get_result()
- switch(result)
- if(NUKE_RESULT_FLUKE)
- SSticker.mode_result = "loss - syndicate nuked - disk secured"
- SSticker.news_report = NUKE_SYNDICATE_BASE
- if(NUKE_RESULT_NUKE_WIN)
- SSticker.mode_result = "win - syndicate nuke"
- SSticker.news_report = STATION_NUKED
- if(NUKE_RESULT_NOSURVIVORS)
- SSticker.mode_result = "halfwin - syndicate nuke - did not evacuate in time"
- SSticker.news_report = STATION_NUKED
- if(NUKE_RESULT_WRONG_STATION)
- SSticker.mode_result = "halfwin - blew wrong station"
- SSticker.news_report = NUKE_MISS
- if(NUKE_RESULT_WRONG_STATION_DEAD)
- SSticker.mode_result = "halfwin - blew wrong station - did not evacuate in time"
- SSticker.news_report = NUKE_MISS
- if(NUKE_RESULT_CREW_WIN_SYNDIES_DEAD)
- SSticker.mode_result = "loss - evacuation - disk secured - syndi team dead"
- SSticker.news_report = OPERATIVES_KILLED
- if(NUKE_RESULT_CREW_WIN)
- SSticker.mode_result = "loss - evacuation - disk secured"
- SSticker.news_report = OPERATIVES_KILLED
- if(NUKE_RESULT_DISK_LOST)
- SSticker.mode_result = "halfwin - evacuation - disk not secured"
- SSticker.news_report = OPERATIVE_SKIRMISH
- if(NUKE_RESULT_DISK_STOLEN)
- SSticker.mode_result = "halfwin - detonation averted"
- SSticker.news_report = OPERATIVE_SKIRMISH
- else
- SSticker.mode_result = "halfwin - interrupted"
- SSticker.news_report = OPERATIVE_SKIRMISH
-
-//////////////////////////////////////////////
-// //
-// REVS //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/roundstart/revs
- name = "Revolution"
- persistent = TRUE
- antag_flag = ROLE_REV_HEAD
- antag_flag_override = ROLE_REV
- antag_datum = /datum/antagonist/rev/head
- minimum_required_age = 14
- restricted_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director")
- required_candidates = 3
- weight = 2
- delay = 7 MINUTES
- cost = 35
- requirements = list(101,101,70,40,30,20,10,10,10,10)
- high_population_requirement = 10
- antag_cap = list(3,3,3,3,3,3,3,3,3,3)
- flags = HIGHLANDER_RULESET
- // I give up, just there should be enough heads with 35 players...
- minimum_players = 35
- var/datum/team/revolution/revolution
- var/finished = FALSE
-
-/datum/dynamic_ruleset/roundstart/revs/pre_execute()
- var/max_candidates = antag_cap[indice_pop]
- mode.antags_rolled += max_candidates
- for(var/i = 1 to max_candidates)
- if(candidates.len <= 0)
- break
- var/mob/M = pick_n_take(candidates)
- assigned += M.mind
- M.mind.restricted_roles = restricted_roles
- M.mind.special_role = antag_flag
- GLOB.pre_setup_antags += M.mind
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/revs/execute()
- var/success = TRUE
- revolution = new()
- for(var/datum/mind/M in assigned)
- GLOB.pre_setup_antags -= M
- if(check_eligible(M))
- var/datum/antagonist/rev/head/new_head = new antag_datum()
- new_head.give_flash = TRUE
- new_head.give_hud = TRUE
- new_head.remove_clumsy = TRUE
- M.add_antag_datum(new_head,revolution)
- else
- assigned -= M
- log_game("DYNAMIC: [ruletype] [name] discarded [M.name] from head revolutionary due to ineligibility.")
- if(!revolution.members.len)
- success = FALSE
- log_game("DYNAMIC: [ruletype] [name] failed to get any eligible headrevs. Refunding [cost] threat.")
- if(success)
- revolution.update_objectives()
- revolution.update_heads()
- SSshuttle.registerHostileEnvironment(src)
- return TRUE
- return FALSE
-
-/datum/dynamic_ruleset/roundstart/revs/clean_up()
- qdel(revolution)
- ..()
-
-/datum/dynamic_ruleset/roundstart/revs/rule_process()
- if(check_rev_victory())
- finished = REVOLUTION_VICTORY
- return RULESET_STOP_PROCESSING
- else if (check_heads_victory())
- finished = STATION_VICTORY
- SSshuttle.clearHostileEnvironment(src)
- priority_announce("It appears the mutiny has been quelled. Please return myself and your incapacitated colleagues to work. \
- We have remotely blacklisted the head revolutionaries from your cloning software to prevent accidental cloning.", null, 'sound/blank.ogg', null, "Central Command Loyalty Monitoring Division")
- revolution.save_members()
- for(var/datum/mind/M in revolution.members) // Remove antag datums and prevents podcloned or exiled headrevs restarting rebellions.
- if(M.has_antag_datum(/datum/antagonist/rev/head))
- var/datum/antagonist/rev/head/R = M.has_antag_datum(/datum/antagonist/rev/head)
- R.remove_revolutionary(FALSE, "gamemode")
- var/mob/living/carbon/C = M.current
- if(C.stat == DEAD)
- C.makeUncloneable()
- if(M.has_antag_datum(/datum/antagonist/rev))
- var/datum/antagonist/rev/R = M.has_antag_datum(/datum/antagonist/rev)
- R.remove_revolutionary(FALSE, "gamemode")
- return RULESET_STOP_PROCESSING
-
-/// Checks for revhead loss conditions and other antag datums.
-/datum/dynamic_ruleset/roundstart/revs/proc/check_eligible(datum/mind/M)
- var/turf/T = get_turf(M.current)
- if(!considered_afk(M) && considered_alive(M) && is_station_level(T.z) && !M.antag_datums?.len && !HAS_TRAIT(M, TRAIT_MINDSHIELD))
- return TRUE
- return FALSE
-
-/datum/dynamic_ruleset/roundstart/revs/check_finished()
- if(finished == REVOLUTION_VICTORY)
- return TRUE
- else
- return ..()
-
-/datum/dynamic_ruleset/roundstart/revs/proc/check_rev_victory()
- for(var/datum/objective/mutiny/objective in revolution.objectives)
- if(!(objective.check_completion()))
- return FALSE
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/revs/proc/check_heads_victory()
- for(var/datum/mind/rev_mind in revolution.head_revolutionaries())
- var/turf/T = get_turf(rev_mind.current)
- if(!considered_afk(rev_mind) && considered_alive(rev_mind) && is_station_level(T.z))
- if(ishuman(rev_mind.current) || ismonkey(rev_mind.current))
- return FALSE
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/revs/round_result()
- if(finished == REVOLUTION_VICTORY)
- SSticker.mode_result = "win - heads killed"
- SSticker.news_report = REVS_WIN
- else if(finished == STATION_VICTORY)
- SSticker.mode_result = "loss - rev heads killed"
- SSticker.news_report = REVS_LOSE
-
// Admin only rulesets. The threat requirement is 101 so it is not possible to roll them.
//////////////////////////////////////////////
@@ -479,7 +110,7 @@
log_game("Starting a round of extended.")
mode.spend_threat(mode.threat)
return TRUE
-
+/*
//////////////////////////////////////////////
// //
// CLOWN OPS //
@@ -504,60 +135,7 @@
for(var/datum/mind/V in assigned)
V.assigned_role = "Clown Operative"
V.special_role = "Clown Operative"
-
-//////////////////////////////////////////////
-// //
-// DEVIL //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/roundstart/devil
- name = "Devil"
- antag_flag = ROLE_DEVIL
- antag_datum = /datum/antagonist/devil
- restricted_roles = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI")
- required_candidates = 1
- weight = 3
- cost = 0
- requirements = list(101,101,101,101,101,101,101,101,101,101)
- high_population_requirement = 101
- antag_cap = list(1,1,1,2,2,2,3,3,3,4)
-
-/datum/dynamic_ruleset/roundstart/devil/pre_execute()
- var/num_devils = antag_cap[indice_pop]
- mode.antags_rolled += num_devils
-
- for(var/j = 0, j < num_devils, j++)
- if (!candidates.len)
- break
- var/mob/devil = pick_n_take(candidates)
- assigned += devil.mind
- devil.mind.special_role = ROLE_DEVIL
- devil.mind.restricted_roles = restricted_roles
- GLOB.pre_setup_antags += devil.mind
-
- log_game("[key_name(devil)] has been selected as a devil")
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/devil/execute()
- for(var/datum/mind/devil in assigned)
- add_devil(devil.current, ascendable = TRUE)
- GLOB.pre_setup_antags -= devil
- add_devil_objectives(devil,2)
- return TRUE
-
-/datum/dynamic_ruleset/roundstart/devil/proc/add_devil_objectives(datum/mind/devil_mind, quantity)
- var/list/validtypes = list(/datum/objective/devil/soulquantity, /datum/objective/devil/soulquality, /datum/objective/devil/sintouch, /datum/objective/devil/buy_target)
- var/datum/antagonist/devil/D = devil_mind.has_antag_datum(/datum/antagonist/devil)
- for(var/i = 1 to quantity)
- var/type = pick(validtypes)
- var/datum/objective/devil/objective = new type(null)
- objective.owner = devil_mind
- D.objectives += objective
- if(!istype(objective, /datum/objective/devil/buy_target))
- validtypes -= type
- else
- objective.find_target()
+*/
//////////////////////////////////////////////
// //
@@ -620,38 +198,3 @@
SSticker.mode_result = "win - monkey win"
else
SSticker.mode_result = "loss - staff stopped the monkeys"
-
-//////////////////////////////////////////////
-// //
-// METEOR //
-// //
-//////////////////////////////////////////////
-
-/datum/dynamic_ruleset/roundstart/meteor
- name = "Meteor"
- persistent = TRUE
- required_candidates = 0
- weight = 3
- cost = 0
- requirements = list(101,101,101,101,101,101,101,101,101,101)
- high_population_requirement = 101
- var/meteordelay = 2000
- var/nometeors = 0
- var/rampupdelta = 5
-
-/datum/dynamic_ruleset/roundstart/meteor/rule_process()
- if(nometeors || meteordelay > world.time - SSticker.round_start_time)
- return
-
- var/list/wavetype = GLOB.meteors_normal
- var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 10 / 60
-
- if (prob(meteorminutes))
- wavetype = GLOB.meteors_threatening
-
- if (prob(meteorminutes/2))
- wavetype = GLOB.meteors_catastrophic
-
- var/ramp_up_final = CLAMP(round(meteorminutes/rampupdelta), 1, 10)
-
- spawn_meteors(ramp_up_final, wavetype)
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
deleted file mode 100644
index 44fb638f40..0000000000
--- a/code/game/gamemodes/events.dm
+++ /dev/null
@@ -1,66 +0,0 @@
-/proc/power_failure()
- priority_announce("Abnormal activity detected in [station_name()]")
- for(var/obj/machinery/power/smes/S in GLOB.machines)
- if(istype(get_area(S), /area/ai_monitored/turret_protected) || !is_station_level(S.z))
- continue
- S.charge = 0
- S.output_level = 0
- S.output_attempt = FALSE
- S.update_icon()
- S.power_change()
-
- for(var/area/A in GLOB.the_station_areas)
- if(!A.requires_power || A.always_unpowered )
- continue
- if(GLOB.typecache_powerfailure_safe_areas[A.type])
- continue
-
- A.power_light = FALSE
- A.power_equip = FALSE
- A.power_environ = FALSE
- A.power_change()
-
- for(var/obj/machinery/power/apc/C in GLOB.apcs_list)
- if(C.cell && is_station_level(C.z))
- var/area/A = C.area
- if(GLOB.typecache_powerfailure_safe_areas[A.type])
- continue
-
- C.cell.charge = 0
-
-/proc/power_restore()
-
- priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/blank.ogg')
- for(var/obj/machinery/power/apc/C in GLOB.machines)
- if(C.cell && is_station_level(C.z))
- C.cell.charge = C.cell.maxcharge
- C.failure_timer = 0
- for(var/obj/machinery/power/smes/S in GLOB.machines)
- if(!is_station_level(S.z))
- continue
- S.charge = S.capacity
- S.output_level = S.output_level_max
- S.output_attempt = TRUE
- S.update_icon()
- S.power_change()
- for(var/area/A in GLOB.the_station_areas)
- if(!A.requires_power || A.always_unpowered)
- continue
- if(!istype(A, /area/shuttle))
- A.power_light = TRUE
- A.power_equip = TRUE
- A.power_environ = TRUE
- A.power_change()
-
-/proc/power_restore_quick()
-
- priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/blank.ogg')
- for(var/obj/machinery/power/smes/S in GLOB.machines)
- if(!is_station_level(S.z))
- continue
- S.charge = S.capacity
- S.output_level = S.output_level_max
- S.output_attempt = TRUE
- S.update_icon()
- S.power_change()
-
diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm
index b2e15ae6ab..d9e9b3e1d0 100644
--- a/code/game/gamemodes/extended/extended.dm
+++ b/code/game/gamemodes/extended/extended.dm
@@ -19,11 +19,5 @@
config_tag = "extended"
false_report_weight = 0
-/datum/game_mode/extended/announced/generate_station_goals()
- for(var/T in subtypesof(/datum/station_goal))
- var/datum/station_goal/G = new T
- station_goals += G
- G.on_report()
-
/datum/game_mode/extended/announced/send_intercept(report = 0)
priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", 'sound/blank.ogg')
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 98de617ce4..9dcdba90a7 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -128,7 +128,6 @@
qdel(query_round_game_mode)
if(report)
addtimer(CALLBACK(src, PROC_REF(send_intercept), 0), rand(waittime_l, waittime_h))
- generate_station_goals()
gamemode_ready = TRUE
return 1
@@ -308,16 +307,7 @@
intercepttext += ""
intercepttext += report
- if(station_goals.len)
- intercepttext += "Special Orders for [station_name()]:"
- for(var/datum/station_goal/G in station_goals)
- G.on_report()
- intercepttext += G.get_report()
-
- print_command_report(intercepttext, "Central Command Status Summary", announce=FALSE)
priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", 'sound/blank.ogg')
- if(GLOB.security_level < SEC_LEVEL_BLUE)
- set_security_level(SEC_LEVEL_BLUE)
// This is a frequency selection system. You may imagine it like a raffle where each player can have some number of tickets. The more tickets you have the more likely you are to
@@ -482,28 +472,6 @@
J.current_positions = max(J.current_positions-1, 0)
reopened_jobs += L.job
- if(CONFIG_GET(flag/reopen_roundstart_suicide_roles_command_report))
- if(reopened_jobs.len)
- var/reopened_job_report_positions
- for(var/dead_dudes_job in reopened_jobs)
- reopened_job_report_positions = "[reopened_job_report_positions ? "[reopened_job_report_positions]\n":""][dead_dudes_job]"
-
- var/suicide_command_report = "Central Command Human Resources Board \
- Notice of Personnel Change\
- To personnel management staff aboard [station_name()]:
\
- Our medical staff have detected a series of anomalies in the vital sensors \
- of some of the staff aboard your station.
\
- Further investigation into the situation on our end resulted in us discovering \
- a series of rather... unforturnate decisions that were made on the part of said staff.
\
- As such, we have taken the liberty to automatically reopen employment opportunities for the positions of the crew members \
- who have decided not to partake in our research. We will be forwarding their cases to our employment review board \
- to determine their eligibility for continued service with the company (and of course the \
- continued storage of cloning records within the central medical backup server.)
\
- The following positions have been reopened on our behalf:
\
- [reopened_job_report_positions]"
-
- print_command_report(suicide_command_report, "Central Command Personnel Update")
-
//////////////////////////
//Reports player logouts//
//////////////////////////
@@ -584,26 +552,6 @@
return max(0, enemy_minimum_age - C.player_age)
-/datum/game_mode/proc/remove_antag_for_borging(datum/mind/newborgie)
- SSticker.mode.remove_cultist(newborgie, 0, 0)
- var/datum/antagonist/rev/rev = newborgie.has_antag_datum(/datum/antagonist/rev)
- if(rev)
- rev.remove_revolutionary(TRUE)
-
-/datum/game_mode/proc/generate_station_goals()
- var/list/possible = list()
- for(var/T in subtypesof(/datum/station_goal))
- var/datum/station_goal/G = T
- if(config_tag in initial(G.gamemode_blacklist))
- continue
- possible += T
- var/goal_weights = 0
- while(possible.len && goal_weights < STATION_GOAL_BUDGET)
- var/datum/station_goal/picked = pick_n_take(possible)
- goal_weights += initial(picked.weight)
- station_goals += new picked
-
-
/datum/game_mode/proc/generate_report() //Generates a small text blurb for the gamemode in centcom report
return "Gamemode report for [name] not set. Contact a coder."
@@ -624,8 +572,6 @@
SSticker.news_report = STATION_DESTROYED_NUKE
if(EMERGENCY_ESCAPED_OR_ENDGAMED)
SSticker.news_report = STATION_EVACUATED
- if(SSshuttle.emergency.is_hijacked())
- SSticker.news_report = SHUTTLE_HIJACK
/// Mode specific admin panel.
/datum/game_mode/proc/admin_panel()
diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm
deleted file mode 100644
index dc6eee0997..0000000000
--- a/code/game/gamemodes/meteor/meteor.dm
+++ /dev/null
@@ -1,60 +0,0 @@
-/datum/game_mode/meteor
- name = "meteor"
- config_tag = "meteor"
- report_type = "meteor"
- false_report_weight = 1
- var/meteordelay = 2000
- var/nometeors = 0
- var/rampupdelta = 5
- required_players = 0
-
- announce_span = "danger"
- announce_text = "A major meteor shower is bombarding the station! The crew needs to evacuate or survive the onslaught."
-
-
-/datum/game_mode/meteor/process()
- if(nometeors || meteordelay > world.time - SSticker.round_start_time)
- return
-
- var/list/wavetype = GLOB.meteors_normal
- var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 10 / 60
-
-
- if (prob(meteorminutes))
- wavetype = GLOB.meteors_threatening
-
- if (prob(meteorminutes/2))
- wavetype = GLOB.meteors_catastrophic
-
- var/ramp_up_final = CLAMP(round(meteorminutes/rampupdelta), 1, 10)
-
- spawn_meteors(ramp_up_final, wavetype)
-
-
-/datum/game_mode/meteor/special_report()
- var/survivors = 0
- var/list/survivor_list = list()
-
- for(var/mob/living/player in GLOB.player_list)
- if(player.stat != DEAD)
- ++survivors
-
- if(player.onCentCom())
- survivor_list += "[player.real_name] escaped to the safety of CentCom."
- else if(player.onSyndieBase())
- survivor_list += "[player.real_name] escaped to the (relative) safety of Syndicate Space."
- else
- survivor_list += "[player.real_name] survived but is stranded without any hope of rescue."
-
- if(survivors)
- return "
The following survived the meteor storm: [survivor_list.Join(" ")]
"
- else
- return "
Nobody survived the meteor storm!
"
-
-/datum/game_mode/meteor/set_round_result()
- ..()
- SSticker.mode_result = "end - evacuation"
-
-/datum/game_mode/meteor/generate_report()
- return "[pick("Asteroids have", "Meteors have", "Large rocks have", "Stellar minerals have", "Space hail has", "Debris has")] been detected near your station, and a collision is possible, \
- though unlikely. Be prepared for largescale impacts and destruction. Please note that the debris will prevent the escape shuttle from arriving quickly."
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
deleted file mode 100644
index d99f172198..0000000000
--- a/code/game/gamemodes/meteor/meteors.dm
+++ /dev/null
@@ -1,369 +0,0 @@
-#define DEFAULT_METEOR_LIFETIME 1800
-GLOBAL_VAR_INIT(meteor_wave_delay, 625) //minimum wait between waves in tenths of seconds
-//set to at least 100 unless you want evarr ruining every round
-
-//Meteors probability of spawning during a given wave
-GLOBAL_LIST_INIT(meteors_normal, list(/obj/effect/meteor/dust=3, /obj/effect/meteor/medium=8, /obj/effect/meteor/big=3, \
- /obj/effect/meteor/flaming=1, /obj/effect/meteor/irradiated=3)) //for normal meteor event
-
-GLOBAL_LIST_INIT(meteors_threatening, list(/obj/effect/meteor/medium=4, /obj/effect/meteor/big=8, \
- /obj/effect/meteor/flaming=3, /obj/effect/meteor/irradiated=3)) //for threatening meteor event
-
-GLOBAL_LIST_INIT(meteors_catastrophic, list(/obj/effect/meteor/medium=5, /obj/effect/meteor/big=75, \
- /obj/effect/meteor/flaming=10, /obj/effect/meteor/irradiated=10, /obj/effect/meteor/tunguska = 1)) //for catastrophic meteor event
-
-GLOBAL_LIST_INIT(meteorsB, list(/obj/effect/meteor/meaty=5, /obj/effect/meteor/meaty/xeno=1)) //for meaty ore event
-
-GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
-
-
-///////////////////////////////
-//Meteor spawning global procs
-///////////////////////////////
-
-/proc/spawn_meteors(number = 10, list/meteortypes)
- for(var/i = 0; i < number; i++)
- spawn_meteor(meteortypes)
-
-/proc/spawn_meteor(list/meteortypes)
- var/turf/pickedstart
- var/turf/pickedgoal
- var/max_i = 10//number of tries to spawn meteor.
- while(!isspaceturf(pickedstart))
- var/startSide = pick(GLOB.cardinals)
- var/startZ = pick(SSmapping.levels_by_trait(ZTRAIT_STATION))
- pickedstart = spaceDebrisStartLoc(startSide, startZ)
- pickedgoal = spaceDebrisFinishLoc(startSide, startZ)
- max_i--
- if(max_i<=0)
- return
- var/Me = pickweight(meteortypes)
- var/obj/effect/meteor/M = new Me(pickedstart, pickedgoal)
- M.dest = pickedgoal
-
-/proc/spaceDebrisStartLoc(startSide, Z)
- var/starty
- var/startx
- switch(startSide)
- if(NORTH)
- starty = world.maxy-(TRANSITIONEDGE+1)
- startx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
- if(EAST)
- starty = rand((TRANSITIONEDGE+1),world.maxy-(TRANSITIONEDGE+1))
- startx = world.maxx-(TRANSITIONEDGE+1)
- if(SOUTH)
- starty = (TRANSITIONEDGE+1)
- startx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
- if(WEST)
- starty = rand((TRANSITIONEDGE+1), world.maxy-(TRANSITIONEDGE+1))
- startx = (TRANSITIONEDGE+1)
- . = locate(startx, starty, Z)
-
-/proc/spaceDebrisFinishLoc(startSide, Z)
- var/endy
- var/endx
- switch(startSide)
- if(NORTH)
- endy = (TRANSITIONEDGE+1)
- endx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
- if(EAST)
- endy = rand((TRANSITIONEDGE+1), world.maxy-(TRANSITIONEDGE+1))
- endx = (TRANSITIONEDGE+1)
- if(SOUTH)
- endy = world.maxy-(TRANSITIONEDGE+1)
- endx = rand((TRANSITIONEDGE+1), world.maxx-(TRANSITIONEDGE+1))
- if(WEST)
- endy = rand((TRANSITIONEDGE+1),world.maxy-(TRANSITIONEDGE+1))
- endx = world.maxx-(TRANSITIONEDGE+1)
- . = locate(endx, endy, Z)
-
-///////////////////////
-//The meteor effect
-//////////////////////
-
-/obj/effect/meteor
- name = "the concept of meteor"
- desc = ""
- icon = 'icons/obj/meteor.dmi'
- icon_state = "small"
- density = TRUE
- anchored = TRUE
- var/hits = 4
- var/hitpwr = 2 //Level of ex_act to be called on hit.
- var/dest
- pass_flags = PASSTABLE
- var/heavy = 0
- var/meteorsound = 'sound/blank.ogg'
- var/z_original
- var/threat = 0 // used for determining which meteors are most interesting
- var/lifetime = DEFAULT_METEOR_LIFETIME
- var/timerid = null
- var/list/meteordrop = list(/obj/item/stack/ore/iron)
- var/dropamt = 2
-
-/obj/effect/meteor/Move()
- if(z != z_original || loc == dest)
- qdel(src)
- return FALSE
-
- . = ..() //process movement...
-
- if(.)//.. if did move, ram the turf we get in
- var/turf/T = get_turf(loc)
- ram_turf(T)
-
- if(prob(10) && !isspaceturf(T))//randomly takes a 'hit' from ramming
- get_hit()
-
-/obj/effect/meteor/Destroy()
- if (timerid)
- deltimer(timerid)
- GLOB.meteor_list -= src
- SSaugury.unregister_doom(src)
- walk(src,0) //this cancels the walk_towards() proc
- . = ..()
-
-/obj/effect/meteor/Initialize(mapload, target)
- . = ..()
- z_original = z
- GLOB.meteor_list += src
- SSaugury.register_doom(src, threat)
- SpinAnimation()
- timerid = QDEL_IN(src, lifetime)
- chase_target(target)
-
-/obj/effect/meteor/Bump(atom/A)
- if(A)
- ram_turf(get_turf(A))
- playsound(src.loc, meteorsound, 40, TRUE)
- get_hit()
-
-/obj/effect/meteor/proc/ram_turf(turf/T)
- //first bust whatever is in the turf
- for(var/atom/A in T)
- if(A != src)
- if(isliving(A))
- A.visible_message("[src] slams into [A].", "[src] slams into you!.")
- A.ex_act(hitpwr)
-
- //then, ram the turf if it still exists
- if(T)
- T.ex_act(hitpwr)
-
-
-
-//process getting 'hit' by colliding with a dense object
-//or randomly when ramming turfs
-/obj/effect/meteor/proc/get_hit()
- hits--
- if(hits <= 0)
- make_debris()
- meteor_effect()
- qdel(src)
-
-/obj/effect/meteor/ex_act()
- return
-
-/obj/effect/meteor/examine(mob/user)
- . = ..()
- if(!(flags_1 & ADMIN_SPAWNED_1) && isliving(user))
- user.client.give_award(/datum/award/achievement/misc/meteor_examine, user)
-
-/obj/effect/meteor/attackby(obj/item/I, mob/user, params)
- if(I.tool_behaviour == TOOL_MINING)
- make_debris()
- qdel(src)
- else
- . = ..()
-
-/obj/effect/meteor/proc/make_debris()
- for(var/throws = dropamt, throws > 0, throws--)
- var/thing_to_spawn = pick(meteordrop)
- new thing_to_spawn(get_turf(src))
-
-/obj/effect/meteor/proc/chase_target(atom/chasing, delay = 1)
- set waitfor = FALSE
- if(chasing)
- walk_towards(src, chasing, delay)
-
-/obj/effect/meteor/proc/meteor_effect()
- if(heavy)
- var/sound/meteor_sound = sound(meteorsound)
- var/random_frequency = get_rand_frequency()
-
- for(var/mob/M in GLOB.player_list)
- if((M.orbiting) && (SSaugury.watchers[M]))
- continue
- var/turf/T = get_turf(M)
- if(!T || T.z != src.z)
- continue
- var/dist = get_dist(M.loc, src.loc)
- shake_camera(M, dist > 20 ? 2 : 4, dist > 20 ? 1 : 3)
- M.playsound_local(src.loc, null, 50, 1, random_frequency, 10, S = meteor_sound)
-
-///////////////////////
-//Meteor types
-///////////////////////
-
-//Dust
-/obj/effect/meteor/dust
- name = "space dust"
- icon_state = "dust"
- pass_flags = PASSTABLE | PASSGRILLE
- hits = 1
- hitpwr = 3
- meteorsound = 'sound/blank.ogg'
- meteordrop = list(/obj/item/stack/ore/glass)
- threat = 1
-
-//Medium-sized
-/obj/effect/meteor/medium
- name = "meteor"
- dropamt = 3
- threat = 5
-
-/obj/effect/meteor/medium/meteor_effect()
- ..()
- explosion(src.loc, 0, 1, 2, 3, 0)
-
-//Large-sized
-/obj/effect/meteor/big
- name = "big meteor"
- icon_state = "large"
- hits = 6
- heavy = 1
- dropamt = 4
- threat = 10
-
-/obj/effect/meteor/big/meteor_effect()
- ..()
- explosion(src.loc, 1, 2, 3, 4, 0)
-
-//Flaming meteor
-/obj/effect/meteor/flaming
- name = "flaming meteor"
- icon_state = "flaming"
- hits = 5
- heavy = 1
- meteorsound = 'sound/blank.ogg'
- meteordrop = list(/obj/item/stack/ore/plasma)
- threat = 20
-
-/obj/effect/meteor/flaming/meteor_effect()
- ..()
- explosion(src.loc, 1, 2, 3, 4, 0, 0, 5)
-
-//Radiation meteor
-/obj/effect/meteor/irradiated
- name = "glowing meteor"
- icon_state = "glowing"
- heavy = 1
- meteordrop = list(/obj/item/stack/ore/uranium)
- threat = 15
-
-
-/obj/effect/meteor/irradiated/meteor_effect()
- ..()
- explosion(src.loc, 0, 0, 4, 3, 0)
- new /obj/effect/decal/cleanable/greenglow(get_turf(src))
- radiation_pulse(src, 500)
-
-//Meaty Ore
-/obj/effect/meteor/meaty
- name = "meaty ore"
- icon_state = "meateor"
- desc = ""
- hits = 2
- heavy = 1
- meteorsound = 'sound/blank.ogg'
- meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/slab/human, /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant, /obj/item/organ/heart, /obj/item/organ/lungs, /obj/item/organ/tongue, /obj/item/organ/appendix/)
- var/meteorgibs = /obj/effect/gibspawner/generic
- threat = 2
-
-/obj/effect/meteor/meaty/Initialize()
- for(var/path in meteordrop)
- if(path == /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant)
- meteordrop -= path
- meteordrop += pick(subtypesof(path))
-
- for(var/path in meteordrop)
- if(path == /obj/item/organ/tongue)
- meteordrop -= path
- meteordrop += pick(typesof(path))
- return ..()
-
-/obj/effect/meteor/meaty/make_debris()
- ..()
- new meteorgibs(get_turf(src))
-
-
-/obj/effect/meteor/meaty/ram_turf(turf/T)
- if(!isspaceturf(T))
- new /obj/effect/decal/cleanable/blood(T)
-
-/obj/effect/meteor/meaty/Bump(atom/A)
- A.ex_act(hitpwr)
- get_hit()
-
-//Meaty Ore Xeno edition
-/obj/effect/meteor/meaty/xeno
- color = "#5EFF00"
- meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno, /obj/item/organ/tongue/alien)
- meteorgibs = /obj/effect/gibspawner/xeno
-
-/obj/effect/meteor/meaty/xeno/Initialize()
- meteordrop += subtypesof(/obj/item/organ/alien)
- return ..()
-
-/obj/effect/meteor/meaty/xeno/ram_turf(turf/T)
- if(!isspaceturf(T))
- new /obj/effect/decal/cleanable/xenoblood(T)
-
-//Station buster Tunguska
-/obj/effect/meteor/tunguska
- name = "tunguska meteor"
- icon_state = "flaming"
- desc = ""
- hits = 30
- hitpwr = 1
- heavy = 1
- meteorsound = 'sound/blank.ogg'
- meteordrop = list(/obj/item/stack/ore/plasma)
- threat = 50
-
-/obj/effect/meteor/tunguska/Move()
- . = ..()
- if(.)
- new /obj/effect/temp_visual/revenant(get_turf(src))
-
-/obj/effect/meteor/tunguska/meteor_effect()
- ..()
- explosion(src.loc, 5, 10, 15, 20, 0)
-
-/obj/effect/meteor/tunguska/Bump()
- ..()
- if(prob(20))
- explosion(src.loc,2,4,6,8)
-
-//////////////////////////
-//Spookoween meteors
-/////////////////////////
-
-GLOBAL_LIST_INIT(meteorsSPOOKY, list(/obj/effect/meteor/pumpkin))
-
-/obj/effect/meteor/pumpkin
- name = "PUMPKING"
- desc = ""
- icon = 'icons/obj/meteor_spooky.dmi'
- icon_state = "pumpkin"
- hits = 10
- heavy = 1
- dropamt = 1
-// meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/reagent_containers/food/snacks/grown/pumpkin)
- threat = 100
-
-/obj/effect/meteor/pumpkin/Initialize()
- . = ..()
- meteorsound = pick('sound/blank.ogg')
-//////////////////////////
-#undef DEFAULT_METEOR_LIFETIME
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
deleted file mode 100644
index c6aecc1e32..0000000000
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ /dev/null
@@ -1,174 +0,0 @@
-/datum/game_mode/nuclear
- name = "nuclear emergency"
- config_tag = "nuclear"
- report_type = "nuclear"
- false_report_weight = 10
- required_players = 30 // 30 players - 3 players to be the nuke ops = 27 players remaining
- required_enemies = 2
- recommended_enemies = 5
- antag_flag = ROLE_OPERATIVE
- enemy_minimum_age = 14
-
- announce_span = "danger"
- announce_text = "Syndicate forces are approaching the station in an attempt to destroy it!\n\
- Operatives: Secure the nuclear authentication disk and use your nuke to destroy the station.\n\
- Crew: Defend the nuclear authentication disk and ensure that it leaves with you on the emergency shuttle."
-
- var/const/agents_possible = 5 //If we ever need more syndicate agents.
- var/nukes_left = 1 // Call 3714-PRAY right now and order more nukes! Limited offer!
- var/list/pre_nukeops = list()
-
- var/datum/team/nuclear/nuke_team
-
- var/operative_antag_datum_type = /datum/antagonist/nukeop
- var/leader_antag_datum_type = /datum/antagonist/nukeop/leader
-
-/datum/game_mode/nuclear/pre_setup()
- var/n_agents = min(round(num_players() / 10), antag_candidates.len, agents_possible)
- if(n_agents >= required_enemies)
- for(var/i = 0, i < n_agents, ++i)
- var/datum/mind/new_op = pick_n_take(antag_candidates)
- pre_nukeops += new_op
- new_op.assigned_role = "Nuclear Operative"
- new_op.special_role = "Nuclear Operative"
- log_game("[key_name(new_op)] has been selected as a nuclear operative")
- return TRUE
- else
- setup_error = "Not enough nuke op candidates"
- return FALSE
-////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////
-
-/datum/game_mode/nuclear/post_setup()
- //Assign leader
- var/datum/mind/leader_mind = pre_nukeops[1]
- var/datum/antagonist/nukeop/L = leader_mind.add_antag_datum(leader_antag_datum_type)
- nuke_team = L.nuke_team
- //Assign the remaining operatives
- for(var/i = 2 to pre_nukeops.len)
- var/datum/mind/nuke_mind = pre_nukeops[i]
- nuke_mind.add_antag_datum(operative_antag_datum_type)
- return ..()
-
-/datum/game_mode/nuclear/OnNukeExplosion(off_station)
- ..()
- nukes_left--
-
-/datum/game_mode/nuclear/check_win()
- if (nukes_left == 0)
- return TRUE
- return ..()
-
-/datum/game_mode/nuclear/check_finished()
- //Keep the round going if ops are dead but bomb is ticking.
- if(nuke_team.operatives_dead())
- for(var/obj/machinery/nuclearbomb/N in GLOB.nuke_list)
- if(N.proper_bomb && (N.timing || N.exploding))
- return FALSE
- return ..()
-
-/datum/game_mode/nuclear/set_round_result()
- ..()
- var result = nuke_team.get_result()
- switch(result)
- if(NUKE_RESULT_FLUKE)
- SSticker.mode_result = "loss - syndicate nuked - disk secured"
- SSticker.news_report = NUKE_SYNDICATE_BASE
- if(NUKE_RESULT_NUKE_WIN)
- SSticker.mode_result = "win - syndicate nuke"
- SSticker.news_report = STATION_NUKED
- if(NUKE_RESULT_NOSURVIVORS)
- SSticker.mode_result = "halfwin - syndicate nuke - did not evacuate in time"
- SSticker.news_report = STATION_NUKED
- if(NUKE_RESULT_WRONG_STATION)
- SSticker.mode_result = "halfwin - blew wrong station"
- SSticker.news_report = NUKE_MISS
- if(NUKE_RESULT_WRONG_STATION_DEAD)
- SSticker.mode_result = "halfwin - blew wrong station - did not evacuate in time"
- SSticker.news_report = NUKE_MISS
- if(NUKE_RESULT_CREW_WIN_SYNDIES_DEAD)
- SSticker.mode_result = "loss - evacuation - disk secured - syndi team dead"
- SSticker.news_report = OPERATIVES_KILLED
- if(NUKE_RESULT_CREW_WIN)
- SSticker.mode_result = "loss - evacuation - disk secured"
- SSticker.news_report = OPERATIVES_KILLED
- if(NUKE_RESULT_DISK_LOST)
- SSticker.mode_result = "halfwin - evacuation - disk not secured"
- SSticker.news_report = OPERATIVE_SKIRMISH
- if(NUKE_RESULT_DISK_STOLEN)
- SSticker.mode_result = "halfwin - detonation averted"
- SSticker.news_report = OPERATIVE_SKIRMISH
- else
- SSticker.mode_result = "halfwin - interrupted"
- SSticker.news_report = OPERATIVE_SKIRMISH
-
-/datum/game_mode/nuclear/generate_report()
- return "One of Central Command's trading routes was recently disrupted by a raid carried out by the Gorlex Marauders. They seemed to only be after one ship - a highly-sensitive \
- transport containing a nuclear fission explosive, although it is useless without the proper code and authorization disk. While the code was likely found in minutes, the only disk that \
- can activate this explosive is on your station. Ensure that it is protected at all times, and remain alert for possible intruders."
-
-/proc/is_nuclear_operative(mob/M)
- return M && istype(M) && M.mind && M.mind.has_antag_datum(/datum/antagonist/nukeop)
-
-/datum/outfit/syndicate
- name = "Syndicate Operative - Basic"
-
- uniform = /obj/item/clothing/under/syndicate
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
- back = /obj/item/storage/backpack/fireproof
- ears = /obj/item/radio/headset/syndicate/alt
- l_pocket = /obj/item/pinpointer/nuke/syndicate
- id = /obj/item/card/id/syndicate
- belt = /obj/item/gun/ballistic/automatic/pistol
- backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
- /obj/item/kitchen/knife/combat/survival)
-
- var/tc = 25
- var/command_radio = FALSE
- var/uplink_type = /obj/item/uplink/nuclear
-
-
-/datum/outfit/syndicate/leader
- name = "Syndicate Leader - Basic"
- id = /obj/item/card/id/syndicate/nuke_leader
- gloves = /obj/item/clothing/gloves/krav_maga/combatglovesplus
- r_hand = /obj/item/nuclear_challenge
- command_radio = TRUE
-
-/datum/outfit/syndicate/no_crystals
- name = "Syndicate Operative - Reinforcement"
- tc = 0
-
-/datum/outfit/syndicate/post_equip(mob/living/carbon/human/H)
- var/obj/item/radio/R = H.ears
- R.set_frequency(FREQ_SYNDICATE)
- R.freqlock = TRUE
- if(command_radio)
- R.command = TRUE
-
- if(ispath(uplink_type, /obj/item/uplink/nuclear) || tc) // /obj/item/uplink/nuclear understands 0 tc
- var/obj/item/U = new uplink_type(H, H.key, tc)
- H.equip_to_slot_or_del(U, SLOT_IN_BACKPACK)
-
- var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(H)
- W.implant(H)
- var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(H)
- E.implant(H)
- H.faction |= ROLE_SYNDICATE
- H.update_icons()
-
-/datum/outfit/syndicate/full
- name = "Syndicate Operative - Full Kit"
-
- glasses = /obj/item/clothing/glasses/night
- mask = /obj/item/clothing/mask/gas/syndicate
- suit = /obj/item/clothing/suit/space/hardsuit/syndi
- r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
- internals_slot = SLOT_R_STORE
- belt = /obj/item/storage/belt/military
- r_hand = /obj/item/gun/ballistic/shotgun/bulldog
- backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
- /obj/item/tank/jetpack/oxygen/harness=1,\
- /obj/item/gun/ballistic/automatic/pistol=1,\
- /obj/item/kitchen/knife/combat/survival)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index c0bd092a5f..381680f105 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -302,71 +302,6 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list
name = "protect nonhuman"
human_check = FALSE
-/datum/objective/hijack
- name = "hijack"
- explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody."
- team_explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody. Leave no team member behind."
- martyr_compatible = 0 //Technically you won't get both anyway.
-
-/datum/objective/hijack/check_completion() // Requires all owners to escape.
- if(!SSshuttle.emergency)
- return FALSE
- if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
- return FALSE
- var/list/datum/mind/owners = get_owners()
- for(var/datum/mind/M in owners)
- if(!considered_alive(M) || !SSshuttle.emergency.shuttle_areas[get_area(M.current)])
- return FALSE
- return SSshuttle.emergency.is_hijacked()
-
-/datum/objective/block
- name = "no organics on shuttle"
- explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive."
- martyr_compatible = 1
-
-/datum/objective/block/check_completion()
- if(!SSshuttle.emergency)
- return FALSE
- if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
- return TRUE
- for(var/mob/living/player in GLOB.player_list)
- if(player.mind && player.stat != DEAD && !issilicon(player))
- if(get_area(player) in SSshuttle.emergency.shuttle_areas)
- return FALSE
- return TRUE
-
-/datum/objective/purge
- name = "no mutants on shuttle"
- explanation_text = "Ensure no mutant humanoid species are present aboard the escape shuttle."
- martyr_compatible = 1
-
-/datum/objective/purge/check_completion()
- if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
- return TRUE
- for(var/mob/living/player in GLOB.player_list)
- if((get_area(player) in SSshuttle.emergency.shuttle_areas) && player.mind && player.stat != DEAD && ishuman(player))
- var/mob/living/carbon/human/H = player
- if(H.dna.species.id != "human")
- return FALSE
- return TRUE
-
-/datum/objective/robot_army
- name = "robot army"
- explanation_text = "Have at least eight active cyborgs synced to you."
- martyr_compatible = 0
-
-/datum/objective/robot_army/check_completion()
- var/counter = 0
- var/list/datum/mind/owners = get_owners()
- for(var/datum/mind/M in owners)
- if(!M.current || !isAI(M.current))
- continue
- var/mob/living/silicon/ai/A = M.current
- for(var/mob/living/silicon/robot/R in A.connected_robots)
- if(R.stat != DEAD)
- counter++
- return counter >= 8
-
/datum/objective/escape/prisoner
name = "survive"
explanation_text = "Escape the prison."
@@ -632,34 +567,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
steal_target = targetinfo.targetitem
-/datum/objective/download
- name = "download"
-
-/datum/objective/download/proc/gen_amount_goal()
- target_amount = rand(20,40)
- update_explanation_text()
- return target_amount
-
-/datum/objective/download/update_explanation_text()
- ..()
- explanation_text = "Download [target_amount] research node\s."
-
-/datum/objective/download/check_completion()
- var/datum/techweb/checking = new
- var/list/datum/mind/owners = get_owners()
- for(var/datum/mind/owner in owners)
- if(ismob(owner.current))
- var/mob/M = owner.current //Yeah if you get morphed and you eat a quantum tech disk with the RD's latest backup good on you soldier.
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H && (H.stat != DEAD) && istype(H.wear_armor, /obj/item/clothing/suit/space/space_ninja))
- var/obj/item/clothing/suit/space/space_ninja/S = H.wear_armor
- S.stored_research.copy_research_to(checking)
- var/list/otherwise = M.GetAllContents()
- for(var/obj/item/disk/tech_disk/TD in otherwise)
- TD.stored_research.copy_research_to(checking)
- return checking.researched_nodes.len >= target_amount
-
/datum/objective/download/admin_edit(mob/admin)
var/count = input(admin,"How many nodes ?","Nodes",target_amount) as num|null
if(count)
@@ -688,22 +595,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
captured_amount+=1
for(var/mob/living/carbon/monkey/M in A)//Monkeys are almost worthless, you failure.
captured_amount+=0.1
- for(var/mob/living/carbon/alien/larva/M in A)//Larva are important for research.
- if(M.stat == DEAD)
- captured_amount+=0.5
- continue
- captured_amount+=1
- for(var/mob/living/carbon/alien/humanoid/M in A)//Aliens are worth twice as much as humans.
- if(istype(M, /mob/living/carbon/alien/humanoid/royal/queen))//Queens are worth three times as much as humans.
- if(M.stat == DEAD)
- captured_amount+=1.5
- else
- captured_amount+=3
- continue
- if(M.stat == DEAD)
- captured_amount+=1
- continue
- captured_amount+=2
+
return captured_amount >= target_amount
/datum/objective/capture/admin_edit(mob/admin)
@@ -730,126 +622,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/protect_object/check_completion()
return !QDELETED(protect_target)
-//Changeling Objectives
-
-/datum/objective/absorb
- name = "absorb"
-
-/datum/objective/absorb/proc/gen_amount_goal(lowbound = 4, highbound = 6)
- target_amount = rand (lowbound,highbound)
- var/n_p = 1 //autowin
- var/list/datum/mind/owners = get_owners()
- if (SSticker.current_state == GAME_STATE_SETTING_UP)
- for(var/i in GLOB.new_player_list)
- var/mob/dead/new_player/P = i
- if(P.ready == PLAYER_READY_TO_PLAY && !(P.mind in owners))
- n_p ++
- else if (SSticker.IsRoundInProgress())
- for(var/mob/living/carbon/human/P in GLOB.player_list)
- if(!(P.mind.has_antag_datum(/datum/antagonist/changeling)) && !(P.mind in owners))
- n_p ++
- target_amount = min(target_amount, n_p)
-
- update_explanation_text()
- return target_amount
-
-/datum/objective/absorb/update_explanation_text()
- . = ..()
- explanation_text = "Extract [target_amount] compatible genome\s."
-
-/datum/objective/absorb/admin_edit(mob/admin)
- var/count = input(admin,"How many people to absorb?","absorb",target_amount) as num|null
- if(count)
- target_amount = count
- update_explanation_text()
-
-/datum/objective/absorb/check_completion()
- var/list/datum/mind/owners = get_owners()
- var/absorbedcount = 0
- for(var/datum/mind/M in owners)
- if(!M)
- continue
- var/datum/antagonist/changeling/changeling = M.has_antag_datum(/datum/antagonist/changeling)
- if(!changeling || !changeling.stored_profiles)
- continue
- absorbedcount += changeling.absorbedcount
- return absorbedcount >= target_amount
-
-/datum/objective/absorb_most
- name = "absorb most"
- explanation_text = "Extract more compatible genomes than any other Changeling."
-
-/datum/objective/absorb_most/check_completion()
- var/list/datum/mind/owners = get_owners()
- var/absorbedcount = 0
- for(var/datum/mind/M in owners)
- if(!M)
- continue
- var/datum/antagonist/changeling/changeling = M.has_antag_datum(/datum/antagonist/changeling)
- if(!changeling || !changeling.stored_profiles)
- continue
- absorbedcount += changeling.absorbedcount
-
- for(var/datum/antagonist/changeling/changeling2 in GLOB.antagonists)
- if(!changeling2.owner || changeling2.owner == owner || !changeling2.stored_profiles || changeling2.absorbedcount < absorbedcount)
- continue
- return FALSE
- return TRUE
-
-/datum/objective/absorb_changeling
- name = "absorb changeling"
- explanation_text = "Absorb another Changeling."
-
-/datum/objective/absorb_changeling/check_completion()
- var/list/datum/mind/owners = get_owners()
- for(var/datum/mind/M in owners)
- if(!M)
- continue
- var/datum/antagonist/changeling/changeling = M.has_antag_datum(/datum/antagonist/changeling)
- if(!changeling)
- continue
- var/total_genetic_points = changeling.geneticpoints
-
- for(var/datum/action/changeling/p in changeling.purchasedpowers)
- total_genetic_points += p.dna_cost
-
- if(total_genetic_points > initial(changeling.geneticpoints))
- return TRUE
- return FALSE
-
-//End Changeling Objectives
-
-/datum/objective/destroy
- name = "destroy AI"
- martyr_compatible = 1
-
-/datum/objective/destroy/find_target(dupe_search_range)
- var/list/possible_targets = active_ais(1)
- var/mob/living/silicon/ai/target_ai = pick(possible_targets)
- target = target_ai.mind
- update_explanation_text()
- return target
-
-/datum/objective/destroy/check_completion()
- if(target && target.current)
- return target.current.stat == DEAD || target.current.z > 6 || !target.current.ckey //Borgs/brains/AIs count as dead for traitor objectives.
- return TRUE
-
-/datum/objective/destroy/update_explanation_text()
- ..()
- if(target && target.current)
- explanation_text = "Destroy [target.name], the experimental AI."
- else
- explanation_text = "Free Objective"
-
-/datum/objective/destroy/admin_edit(mob/admin)
- var/list/possible_targets = active_ais(1)
- if(possible_targets.len)
- var/mob/new_target = input(admin,"Select target:", "Objective target") as null|anything in sortNames(possible_targets)
- target = new_target.mind
- else
- to_chat(admin, "No active AIs with minds.")
- update_explanation_text()
/datum/objective/destroy/internal
var/stolen = FALSE //Have we already eliminated this target?
@@ -927,163 +699,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/changeling_team_objective/proc/prepare()
return FALSE
-//Impersonate department
-//Picks as many people as it can from a department (Security,Engineer,Medical,Science)
-//and tasks the lings with killing and replacing them
-/datum/objective/changeling_team_objective/impersonate_department
- explanation_text = "Ensure X department are killed, impersonated, and replaced by Changelings"
- var/command_staff_only = FALSE //if this is true, it picks command staff instead
- var/list/department_minds = list()
- var/list/department_real_names = list()
- var/department_string = ""
-
-
-/datum/objective/changeling_team_objective/impersonate_department/prepare()
- var/result = FALSE
- if(command_staff_only)
- result = get_heads()
- else
- result = get_department_staff()
- if(result)
- update_explanation_text()
- return TRUE
- else
- return FALSE
-
-
-/datum/objective/changeling_team_objective/impersonate_department/proc/get_department_staff()
- department_minds = list()
- department_real_names = list()
-
- var/list/departments = list("Head of Security","Research Director","Chief Engineer","Chief Medical Officer")
- var/department_head = pick(departments)
- switch(department_head)
- if("Head of Security")
- department_string = "security"
- if("Research Director")
- department_string = "science"
- if("Chief Engineer")
- department_string = "engineering"
- if("Chief Medical Officer")
- department_string = "medical"
-
- var/list/lings = get_antag_minds(/datum/antagonist/changeling,TRUE)
- var/ling_count = lings.len
-
- for(var/datum/mind/M in SSticker.minds)
- if(M in lings)
- continue
- if(department_head in get_department_heads(M.assigned_role))
- if(ling_count)
- ling_count--
- department_minds += M
- department_real_names += M.current.real_name
- else
- break
-
- if(!department_minds.len)
- log_game("[type] has failed to find department staff, and has removed itself. the round will continue normally")
- return FALSE
- return TRUE
-
-
-/datum/objective/changeling_team_objective/impersonate_department/proc/get_heads()
- department_minds = list()
- department_real_names = list()
-
- //Needed heads is between min_lings and the maximum possible amount of command roles
- //So at the time of writing, rand(3,6), it's also capped by the amount of lings there are
- //Because you can't fill 6 head roles with 3 lings
- var/list/lings = get_antag_minds(/datum/antagonist/changeling,TRUE)
- var/needed_heads = rand(min_lings,GLOB.command_positions.len)
- needed_heads = min(lings.len,needed_heads)
-
- var/list/heads = SSjob.get_living_heads()
- for(var/datum/mind/head in heads)
- if(head in lings) //Looking at you HoP.
- continue
- if(needed_heads)
- department_minds += head
- department_real_names += head.current.real_name
- needed_heads--
- else
- break
-
- if(!department_minds.len)
- log_game("[type] has failed to find department heads, and has removed itself. the round will continue normally")
- return FALSE
- return TRUE
-
-
-/datum/objective/changeling_team_objective/impersonate_department/update_explanation_text()
- ..()
- if(!department_real_names.len || !department_minds.len)
- explanation_text = "Free Objective"
- return //Something fucked up, give them a win
-
- if(command_staff_only)
- explanation_text = "Ensure changelings impersonate and escape as the following heads of staff: "
- else
- explanation_text = "Ensure changelings impersonate and escape as the following members of \the [department_string] department: "
-
- var/first = 1
- for(var/datum/mind/M in department_minds)
- var/string = "[M.name] the [M.assigned_role]"
- if(!first)
- string = ", [M.name] the [M.assigned_role]"
- else
- first--
- explanation_text += string
-
- if(command_staff_only)
- explanation_text += ", while the real heads are dead. This is a team objective."
- else
- explanation_text += ", while the real members are dead. This is a team objective."
-
-
-/datum/objective/changeling_team_objective/impersonate_department/check_completion()
- if(!department_real_names.len || !department_minds.len)
- return TRUE //Something fucked up, give them a win
-
- var/list/check_names = department_real_names.Copy()
-
- //Check each department member's mind to see if any of them made it to centcom alive, if they did it's an automatic fail
- for(var/datum/mind/M in department_minds)
- if(M.has_antag_datum(/datum/antagonist/changeling)) //Lings aren't picked for this, but let's be safe
- continue
-
- if(M.current)
- var/turf/mloc = get_turf(M.current)
- if(mloc.onCentCom() && (M.current.stat != DEAD))
- return FALSE //A Non-ling living target got to centcom, fail
-
- //Check each staff member has been replaced, by cross referencing changeling minds, changeling current dna, the staff minds and their original DNA names
- var/success = 0
- changelings:
- for(var/datum/mind/changeling in get_antag_minds(/datum/antagonist/changeling,TRUE))
- if(success >= department_minds.len) //We did it, stop here!
- return TRUE
- if(ishuman(changeling.current))
- var/mob/living/carbon/human/H = changeling.current
- var/turf/cloc = get_turf(changeling.current)
- if(cloc && cloc.onCentCom() && (changeling.current.stat != DEAD)) //Living changeling on centcom....
- for(var/name in check_names) //Is he (disguised as) one of the staff?
- if(H.dna.real_name == name)
- check_names -= name //This staff member is accounted for, remove them, so the team don't succeed by escape as 7 of the same engineer
- success++ //A living changeling staff member made it to centcom
- continue changelings
-
- if(success >= department_minds.len)
- return TRUE
- return FALSE
-
-//A subtype of impersonate_department
-//This subtype always picks as many command staff as it can (HoS,HoP,Cap,CE,CMO,RD)
-//and tasks the lings with killing and replacing them
-/datum/objective/changeling_team_objective/impersonate_department/impersonate_heads
- explanation_text = "Have X or more heads of staff escape on the shuttle disguised as heads, while the real heads are dead"
- command_staff_only = TRUE
-
//Ideally this would be all of them but laziness and unusual subtypes
/proc/generate_admin_objective_list()
GLOB.admin_objective_list = list()
@@ -1093,16 +708,12 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/maroon,
/datum/objective/debrain,
/datum/objective/protect,
- /datum/objective/destroy,
- /datum/objective/hijack,
/datum/objective/escape,
/datum/objective/survive,
/datum/objective/martyr,
/datum/objective/steal,
/datum/objective/download,
- /datum/objective/nuclear,
/datum/objective/capture,
- /datum/objective/absorb,
/datum/objective/custom
),/proc/cmp_typepaths_asc)
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index 0d94b693c4..1b56c8daf5 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -52,30 +52,6 @@
////////////////////////////////////////////////////////////
-/datum/objective_item/steal/caplaser
- name = "the captain's antique laser gun."
- targetitem = /obj/item/gun/energy/laser/captain
- difficulty = 5
- excludefromjob = list("Captain")
-
-/datum/objective_item/steal/hoslaser
- name = "the head of security's personal laser gun."
- targetitem = /obj/item/gun/energy/e_gun/hos
- difficulty = 10
- excludefromjob = list("Head Of Security")
-
-/datum/objective_item/steal/handtele
- name = "a hand teleporter."
- targetitem = /obj/item/hand_tele
- difficulty = 5
- excludefromjob = list("Captain", "Research Director")
-
-/datum/objective_item/steal/jetpack
- name = "the Captain's jetpack."
- targetitem = /obj/item/tank/jetpack/oxygen/captain
- difficulty = 5
- excludefromjob = list("Captain")
-
/datum/objective_item/steal/magboots
name = "the chief engineer's advanced magnetic boots."
targetitem = /obj/item/clothing/shoes/magboots/advance
@@ -94,53 +70,17 @@
difficulty = 5
excludefromjob = list("Chief Medical Officer")
-/datum/objective_item/steal/nukedisc
- name = "the nuclear authentication disk."
- targetitem = /obj/item/disk/nuclear
- difficulty = 5
- excludefromjob = list("Captain")
-
-/datum/objective_item/steal/nukedisc/check_special_completion(obj/item/disk/nuclear/N)
- return !N.fake
-
/datum/objective_item/steal/reflector
name = "a reflector trenchcoat."
targetitem = /obj/item/clothing/suit/hooded/ablative
difficulty = 3
excludefromjob = list("Head of Security", "Warden")
-/datum/objective_item/steal/reactive
- name = "the reactive teleport armor."
- targetitem = /obj/item/clothing/suit/armor/reactive/teleport
- difficulty = 5
- excludefromjob = list("Research Director")
-
/datum/objective_item/steal/documents
name = "any set of secret documents of any organization."
targetitem = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's
difficulty = 5
-/datum/objective_item/steal/nuke_core
- name = "the heavily radioactive plutonium core from the onboard self-destruct. Take care to wear the proper safety equipment when extracting the core!"
- targetitem = /obj/item/nuke_core
- difficulty = 15
-
-/datum/objective_item/steal/nuke_core/New()
- special_equipment += /obj/item/storage/box/syndie_kit/nuke
- ..()
-
-/datum/objective_item/steal/supermatter
- name = "a sliver of a supermatter crystal. Be sure to use the proper safety equipment when extracting the sliver!"
- targetitem = /obj/item/nuke_core/supermatter_sliver
- difficulty = 15
-
-/datum/objective_item/steal/supermatter/New()
- special_equipment += /obj/item/storage/box/syndie_kit/supermatter
- ..()
-
-/datum/objective_item/steal/supermatter/TargetExists()
- return GLOB.main_supermatter_engine != null
-
//Items with special checks!
/datum/objective_item/steal/plasma
name = "28 moles of plasma (full tank)."
@@ -154,18 +94,6 @@
found_amount += T.air_contents.gases[/datum/gas/plasma] ? T.air_contents.gases[/datum/gas/plasma][MOLES] : 0
return found_amount>=target_amount
-
-/datum/objective_item/steal/functionalai
- name = "a functional AI."
- targetitem = /obj/item/aicard
- difficulty = 20 //beyond the impossible
-
-/datum/objective_item/steal/functionalai/check_special_completion(obj/item/aicard/C)
- for(var/mob/living/silicon/ai/A in C)
- if(isAI(A) && A.stat != DEAD) //See if any AI's are alive inside that card.
- return 1
- return 0
-
/datum/objective_item/steal/blueprints
name = "the station blueprints."
targetitem = /obj/item/areaeditor/blueprints
@@ -221,11 +149,6 @@
targetitem = /obj/item/pinpointer
difficulty = 10
-/datum/objective_item/special/aegun
- name = "an advanced energy gun."
- targetitem = /obj/item/gun/energy/e_gun/nuclear
- difficulty = 10
-
/datum/objective_item/special/ddrill
name = "a diamond drill."
targetitem = /obj/item/pickaxe/drill/diamonddrill
@@ -236,16 +159,6 @@
targetitem = /obj/item/storage/backpack/holding
difficulty = 10
-/datum/objective_item/special/hypercell
- name = "a hyper-capacity power cell."
- targetitem = /obj/item/stock_parts/cell/hyper
- difficulty = 5
-
-/datum/objective_item/special/laserpointer
- name = "a laser pointer."
- targetitem = /obj/item/laser_pointer
- difficulty = 5
-
/datum/objective_item/special/corgimeat
name = "a piece of corgi meat."
targetitem = /obj/item/reagent_containers/food/snacks/meat/slab/corgi
diff --git a/code/game/gamemodes/objectives_rogue.dm b/code/game/gamemodes/objectives_rogue.dm
index cb3ae84474..30f505aeea 100644
--- a/code/game/gamemodes/objectives_rogue.dm
+++ b/code/game/gamemodes/objectives_rogue.dm
@@ -15,12 +15,12 @@
if(C)
explanation_text = "Feed [C.banditgoal] mammon to an idol of greed."
else
- explanation_text = "Pray to ZIZO."
+ explanation_text = "Pray to Matthios."
/datum/objective/delf
name = "delf"
- explanation_text = "Feed honeys to the mother."
+ explanation_text = "Feed honeys to the silkseed bearer."
/datum/objective/delf/check_completion()
if(SSticker.mode)
@@ -33,9 +33,9 @@
if(SSticker.mode)
var/datum/game_mode/chaosmode/C = SSticker.mode
if(C)
- explanation_text = "Feed [C.delfgoal] honeys to the mother."
+ explanation_text = "Feed [C.delfgoal] honeys to the silkseed bearer."
else
- explanation_text = "Pray to ZIZO."
+ explanation_text = "Pray to Ananshor."
/datum/objective/rt_maniac
name = "slaying"
@@ -50,7 +50,7 @@
/datum/objective/werewolf
name = "conquer"
- explanation_text = "Destroy all elder vampires in ROGUETOWN. I can sniff them in my true form."
+ explanation_text = "The hubric arrogant rot of Noc stains the town of Rockhill, I must slay the elder vampires. I can smell their decay in my true form."
team_explanation_text = ""
triumph_count = 5
@@ -62,7 +62,7 @@
/datum/objective/vampire
name = "conquer"
- explanation_text = "Destroy all alpha werewolves in ROGUETOWN. I can detect them in my true form."
+ explanation_text = "The savage maddening stink of Dendorian perversion fluxes within Rockhill. Destroying the werbeast is imperative, I can sense them in my true form."
team_explanation_text = ""
triumph_count = 5
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
deleted file mode 100644
index cca64be11d..0000000000
--- a/code/game/gamemodes/revolution/revolution.dm
+++ /dev/null
@@ -1,218 +0,0 @@
-// To add a rev to the list of revolutionaries, make sure it's rev (with if(SSticker.mode.name == "revolution)),
-// then call SSticker.mode:add_revolutionary(_THE_PLAYERS_MIND_)
-// nothing else needs to be done, as that proc will check if they are a valid target.
-// Just make sure the converter is a head before you call it!
-// To remove a rev (from brainwashing or w/e), call SSticker.mode:remove_revolutionary(_THE_PLAYERS_MIND_),
-// this will also check they're not a head, so it can just be called freely
-// If the game somtimes isn't registering a win properly, then SSticker.mode.check_win() isn't being called somewhere.
-
-
-/datum/game_mode/revolution
- name = "revolution"
- config_tag = "revolution"
- report_type = "revolution"
- antag_flag = ROLE_REV
- false_report_weight = 10
- restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
- required_jobs = list(list("Captain"=1),list("Head of Personnel"=1),list("Head of Security"=1),list("Chief Engineer"=1),list("Research Director"=1),list("Chief Medical Officer"=1)) //Any head present
- required_players = 30
- required_enemies = 2
- recommended_enemies = 3
- enemy_minimum_age = 14
-
- announce_span = "Revolution"
- announce_text = "Some crewmembers are attempting a coup!\n\
- Revolutionaries: Expand your cause and overthrow the heads of staff by execution or otherwise.\n\
- Crew: Prevent the revolutionaries from taking over the station."
-
- var/finished = 0
- var/check_counter = 0
- var/max_headrevs = 3
- var/datum/team/revolution/revolution
- var/list/datum/mind/headrev_candidates = list()
- var/end_when_heads_dead = TRUE
-
-///////////////////////////////////////////////////////////////////////////////
-//Gets the round setup, cancelling if there's not enough players at the start//
-///////////////////////////////////////////////////////////////////////////////
-/datum/game_mode/revolution/pre_setup()
-
- if(CONFIG_GET(flag/protect_roles_from_antagonist))
- restricted_jobs += protected_jobs
-
- if(CONFIG_GET(flag/protect_assistant_from_antagonist))
- restricted_jobs += "Assistant"
-
- for (var/i=1 to max_headrevs)
- if (antag_candidates.len==0)
- break
- var/datum/mind/lenin = antag_pick(antag_candidates)
- antag_candidates -= lenin
- headrev_candidates += lenin
- lenin.restricted_roles = restricted_jobs
-
- if(headrev_candidates.len < required_enemies)
- setup_error = "Not enough headrev candidates"
- return FALSE
-
- for(var/antag in headrev_candidates)
- GLOB.pre_setup_antags += antag
- return TRUE
-
-/datum/game_mode/revolution/post_setup()
- var/list/heads = SSjob.get_living_heads()
- var/list/sec = SSjob.get_living_sec()
- var/weighted_score = min(max(round(heads.len - ((8 - sec.len) / 3)),1),max_headrevs)
-
- for(var/datum/mind/rev_mind in headrev_candidates) //People with return to lobby may still be in the lobby. Let's pick someone else in that case.
- if(isnewplayer(rev_mind.current))
- headrev_candidates -= rev_mind
- var/list/newcandidates = shuffle(antag_candidates)
- if(newcandidates.len == 0)
- continue
- for(var/M in newcandidates)
- var/datum/mind/lenin = M
- antag_candidates -= lenin
- newcandidates -= lenin
- if(isnewplayer(lenin.current)) //We don't want to make the same mistake again
- continue
- else
- var/mob/Nm = lenin.current
- if(Nm.job in restricted_jobs) //Don't make the HOS a replacement revhead
- antag_candidates += lenin //Let's let them keep antag chance for other antags
- continue
-
- headrev_candidates += lenin
- break
-
- while(weighted_score < headrev_candidates.len) //das vi danya
- var/datum/mind/trotsky = pick(headrev_candidates)
- antag_candidates += trotsky
- headrev_candidates -= trotsky
-
- revolution = new()
-
- for(var/datum/mind/rev_mind in headrev_candidates)
- log_game("[key_name(rev_mind)] has been selected as a head rev")
- var/datum/antagonist/rev/head/new_head = new()
- new_head.give_flash = TRUE
- new_head.give_hud = TRUE
- new_head.remove_clumsy = TRUE
- rev_mind.add_antag_datum(new_head,revolution)
- GLOB.pre_setup_antags -= rev_mind
-
- revolution.update_objectives()
- revolution.update_heads()
-
- SSshuttle.registerHostileEnvironment(src)
- ..()
-
-
-/datum/game_mode/revolution/process()
- check_counter++
- if(check_counter >= 5)
- if(!finished)
- SSticker.mode.check_win()
- check_counter = 0
- return FALSE
-
-//////////////////////////////////////
-//Checks if the revs have won or not//
-//////////////////////////////////////
-/datum/game_mode/revolution/check_win()
- if(check_rev_victory())
- finished = 1
- else if(check_heads_victory())
- finished = 2
- return
-
-///////////////////////////////
-//Checks if the round is over//
-///////////////////////////////
-/datum/game_mode/revolution/check_finished()
- if(CONFIG_GET(keyed_list/continuous)["revolution"])
- if(finished)
- SSshuttle.clearHostileEnvironment(src)
- return ..()
- if(finished != 0 && end_when_heads_dead)
- return TRUE
- else
- return ..()
-
-///////////////////////////////////////////////////
-//Deals with converting players to the revolution//
-///////////////////////////////////////////////////
-/proc/is_revolutionary(mob/M)
- return M && istype(M) && M.mind && M.mind.has_antag_datum(/datum/antagonist/rev)
-
-/proc/is_head_revolutionary(mob/M)
- return M && istype(M) && M.mind && M.mind.has_antag_datum(/datum/antagonist/rev/head)
-
-//////////////////////////
-//Checks for rev victory//
-//////////////////////////
-/datum/game_mode/revolution/proc/check_rev_victory()
- for(var/datum/objective/mutiny/objective in revolution.objectives)
- if(!(objective.check_completion()))
- return FALSE
- return TRUE
-
-/////////////////////////////
-//Checks for a head victory//
-/////////////////////////////
-/datum/game_mode/revolution/proc/check_heads_victory()
- for(var/datum/mind/rev_mind in revolution.head_revolutionaries())
- var/turf/T = get_turf(rev_mind.current)
- if(!considered_afk(rev_mind) && considered_alive(rev_mind) && is_station_level(T.z))
- if(ishuman(rev_mind.current) || ismonkey(rev_mind.current))
- return FALSE
- return TRUE
-
-
-/datum/game_mode/revolution/set_round_result()
- ..()
- if(finished == 1)
- SSticker.mode_result = "win - heads killed"
- SSticker.news_report = REVS_WIN
- else if(finished == 2)
- SSticker.mode_result = "loss - rev heads killed"
- SSticker.news_report = REVS_LOSE
-
-//TODO What should be displayed for revs in non-rev rounds
-/datum/game_mode/revolution/special_report()
- if(finished == 1)
- return "
The heads of staff were killed or exiled! The revolutionaries win!
"
- else if(finished == 2)
- return "
The heads of staff managed to stop the revolution!
"
-
-/datum/game_mode/revolution/generate_report()
- return "Employee unrest has spiked in recent weeks, with several attempted mutinies on heads of staff. Some crew have been observed using flashbulb devices to blind their colleagues, \
- who then follow their orders without question and work towards dethroning departmental leaders. Watch for behavior such as this with caution. If the crew attempts a mutiny, you and \
- your heads of staff are fully authorized to execute them using lethal weaponry - they will be later cloned and interrogated at Central Command."
-
-/datum/game_mode/revolution/extended
- name = "extended_revolution"
- config_tag = "extended_revolution"
- end_when_heads_dead = FALSE
-
-/datum/game_mode/revolution/speedy
- name = "speedy_revolution"
- config_tag = "speedy_revolution"
- end_when_heads_dead = FALSE
- var/endtime = null
- var/fuckingdone = FALSE
-
-/datum/game_mode/revolution/speedy/pre_setup()
- endtime = world.time + 20 MINUTES
- return ..()
-
-/datum/game_mode/revolution/speedy/process()
- . = ..()
- if(check_counter == 0)
- if (world.time > endtime && !fuckingdone)
- fuckingdone = TRUE
- for (var/obj/machinery/nuclearbomb/N in GLOB.nuke_list)
- if (!N.timing)
- N.timer_set = 200
- N.set_safety()
- N.set_active()
diff --git a/code/game/gamemodes/roguetown/chaosmode.dm b/code/game/gamemodes/roguetown/chaosmode.dm
index a9f90a6d33..b73b8dec21 100644
--- a/code/game/gamemodes/roguetown/chaosmode.dm
+++ b/code/game/gamemodes/roguetown/chaosmode.dm
@@ -214,13 +214,13 @@
blockme = TRUE
if(rebelguy.assigned_role in GLOB.garrison_positions)
blockme = TRUE
- if(rebelguy.assigned_role in GLOB.noble_positions)
+ if(rebelguy.assigned_role in GLOB.court_positions)
blockme = TRUE
if(rebelguy.assigned_role in GLOB.apprentices_positions)
blockme = TRUE
if(rebelguy.assigned_role in GLOB.church_positions)
blockme = TRUE
- if(rebelguy.assigned_role in GLOB.serf_positions)
+ if(rebelguy.assigned_role in GLOB.towner_positions)
blockme = TRUE
if(blockme)
continue
@@ -235,7 +235,7 @@
/datum/game_mode/chaosmode/proc/pick_maniac()
restricted_jobs = list("King",
- "Queen",
+ "Consort",
"Prisoner",
"Dungeoneer",
"Witch Hunter",
diff --git a/code/game/gamemodes/roguetown/roguetown.dm b/code/game/gamemodes/roguetown/roguetown.dm
index 215dc5dcab..6fadd92495 100644
--- a/code/game/gamemodes/roguetown/roguetown.dm
+++ b/code/game/gamemodes/roguetown/roguetown.dm
@@ -77,12 +77,12 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
if(headrebdecree)
return TRUE
- check_for_lord()
+// check_for_lord()
if(ttime > 280 MINUTES) //3 hour cutoff
return TRUE
-/datum/game_mode/chaosmode/proc/check_for_lord()
+/* /datum/game_mode/chaosmode/proc/check_for_lord()
if(world.time < next_check_lord)
return
next_check_lord = world.time + 1 MINUTES
@@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
addomen("nolord")
return FALSE
else
- return TRUE
+ return TRUE */
/datum/game_mode/chaosmode/pre_setup()
if(allmig || roguefight)
@@ -212,11 +212,11 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
break
if(!(bandaids in allantags)) // We don't want to double dip... I guess? Two birds one stone tho, A already bandit check would check pre_bandits
continue
- if(bandaids.assigned_role in GLOB.noble_positions) // Job cat string stoppers
+ if(bandaids.assigned_role in GLOB.court_positions) // Job cat string stoppers
continue
if(bandaids.assigned_role in GLOB.church_positions) // Many of these guys vanishing would suck
continue
- if(bandaids.assigned_role in GLOB.serf_positions) // Many of these guys vanishing would suck
+ if(bandaids.assigned_role in GLOB.towner_positions) // Many of these guys vanishing would suck
continue
allantags -= bandaids
@@ -249,13 +249,13 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
blockme = TRUE
if(rebelguy.assigned_role in GLOB.garrison_positions)
blockme = TRUE
- if(rebelguy.assigned_role in GLOB.noble_positions)
+ if(rebelguy.assigned_role in GLOB.court_positions)
blockme = TRUE
if(rebelguy.assigned_role in GLOB.apprentices_positions)
blockme = TRUE
if(rebelguy.assigned_role in GLOB.church_positions)
blockme = TRUE
- if(rebelguy.assigned_role in GLOB.serf_positions)
+ if(rebelguy.assigned_role in GLOB.towner_positions)
blockme = TRUE
if(blockme)
continue
@@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
/datum/game_mode/chaosmode/proc/pick_maniac()
restricted_jobs = list("King",
- "Queen",
+ "Consort",
"Merchant",
"Priest")
antag_candidates = get_players_for_role(ROLE_NBEAST)
@@ -299,7 +299,7 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
/datum/game_mode/chaosmode/proc/pick_cultist()
var/remaining = 3 // 1 leader, 2 lackeys :)
restricted_jobs = list("King",
- "Queen",
+ "Consort",
"Merchant",
"Priest")
antag_candidates = get_players_for_role(ROLE_ZIZOIDCULTIST)
@@ -340,7 +340,7 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
var/blockme = FALSE
if(!(vampire in allantags))
blockme = TRUE
- if(vampire.assigned_role in GLOB.noble_positions)
+ if(vampire.assigned_role in GLOB.court_positions)
continue
if(vampire.assigned_role in GLOB.apprentices_positions)
blockme = TRUE
@@ -372,7 +372,7 @@ GLOBAL_LIST_INIT(roguegamemodes, list("Rebellion", "Vampire Lord", "Extended", "
var/blockme = FALSE
if(!(werewolf in allantags))
blockme = TRUE
- if(werewolf.assigned_role in GLOB.noble_positions)
+ if(werewolf.assigned_role in GLOB.court_positions)
blockme = TRUE
if(werewolf.assigned_role in GLOB.apprentices_positions)
blockme = TRUE
diff --git a/code/game/gamemodes/roguetown/roguewar.dm b/code/game/gamemodes/roguetown/roguewar.dm
index 5015c36cf8..d8985e18b8 100644
--- a/code/game/gamemodes/roguetown/roguewar.dm
+++ b/code/game/gamemodes/roguetown/roguewar.dm
@@ -210,13 +210,13 @@
break
if(rebelguy.assigned_role in GLOB.garrison_positions)
found = FALSE
- if(rebelguy.assigned_role in GLOB.noble_positions)
+ if(rebelguy.assigned_role in GLOB.court_positions)
found = FALSE
if(rebelguy.assigned_role in GLOB.apprentices_positions)
found = FALSE
if(rebelguy.assigned_role in GLOB.church_positions)
found = FALSE
- if(rebelguy.assigned_role in GLOB.serf_positions)
+ if(rebelguy.assigned_role in GLOB.towner_positions)
found = FALSE
if(!found)
continue
diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm
deleted file mode 100644
index 76d9f150a8..0000000000
--- a/code/game/gamemodes/sandbox/airlock_maker.dm
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- This is for the sandbox for now,
- maybe useful later for an actual thing?
- -Sayu
-*/
-
-/obj/structure/door_assembly
- var/datum/airlock_maker/maker = null
-
-/obj/structure/door_assembly/attack_hand()
- . = ..()
- if(.)
- return
- if(maker)
- maker.interact()
-
-/datum/airlock_maker
- var/obj/structure/door_assembly/linked = null
-
- var/list/access_used = null
- var/require_all = 1
-
- var/paintjob = "none"
- var/glassdoor = 0
-
- var/doorname = "airlock"
-
-/datum/airlock_maker/New(atom/target_loc)
- linked = new(target_loc)
- linked.maker = src
- linked.anchored = FALSE
- access_used = list()
-
- interact()
-
-/datum/airlock_maker/proc/linkpretty(href,desc,active)
- if(!desc)
- var/static/list/defaults = list("No","Yes")
- desc = defaults[active+1]
- if(active)
- return "[desc]"
- return "[desc]"
-
-/datum/airlock_maker/proc/interact()
- var/list/leftcolumn = list()
- var/list/rightcolumn = list()
- leftcolumn += "Required Access"
- for(var/access in get_all_accesses())
- leftcolumn += linkpretty("access=[access]",get_access_desc(access),access in access_used)
- leftcolumn += "Require all listed accesses: [linkpretty("reqall",null,require_all)]"
-
- rightcolumn += "Paintjob"
- for(var/option in list("none","engineering","atmos","security","command","medical","research","mining","maintenance","external","highsecurity"))
- rightcolumn += linkpretty("paint=[option]",option,option == paintjob)
- rightcolumn += "Glass door: " + linkpretty("glass",null,glassdoor) + "
"
- var/length = max(leftcolumn.len,rightcolumn.len)
-
- var/dat = "You may move the model airlock around. A new airlock will be built in its space when you click done, below. "
- dat += "Door name: \"[doorname]\""
- dat += "
"
- for(var/i=1; i<=length; i++)
- dat += "
"
- if(i<=leftcolumn.len)
- dat += leftcolumn[i]
- dat += "
"
- if(i<=rightcolumn.len)
- dat += rightcolumn[i]
- dat += "
")
- popup.set_title_image(usr.browse_rsc_icon(src.icon, src.icon_state))
- popup.open()
-
-/obj/machinery/computer/bank_machine/Topic(href, href_list)
- if(..())
- return
- if(href_list["siphon"])
- say("Siphon of station credits has begun!")
- siphoning = TRUE
- if(href_list["halt"])
- say("Station credit withdrawal halted.")
- end_syphon()
-
-/obj/machinery/computer/bank_machine/proc/end_syphon()
- siphoning = FALSE
- new /obj/item/holochip(drop_location(), syphoning_credits) //get the loot
- syphoning_credits = 0
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
deleted file mode 100644
index f85d9ef8c1..0000000000
--- a/code/game/machinery/buttons.dm
+++ /dev/null
@@ -1,289 +0,0 @@
-/obj/machinery/button
- name = "button"
- desc = ""
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "doorctrl"
- var/skin = "doorctrl"
- power_channel = ENVIRON
- var/obj/item/assembly/device
- var/obj/item/electronics/airlock/board
- var/device_type = null
- var/id = null
- var/initialized_button = 0
- armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 70)
- use_power = IDLE_POWER_USE
- idle_power_usage = 2
- resistance_flags = LAVA_PROOF | FIRE_PROOF
-
-/obj/machinery/button/indestructible
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-
-/obj/machinery/button/Initialize(mapload, ndir = 0, built = 0)
- . = ..()
- if(built)
- setDir(ndir)
- pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
- pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
- panel_open = TRUE
- update_icon()
-
-
- if(!built && !device && device_type)
- device = new device_type(src)
-
- src.check_access(null)
-
- if(req_access.len || req_one_access.len)
- board = new(src)
- if(req_access.len)
- board.accesses = req_access
- else
- board.one_access = 1
- board.accesses = req_one_access
-
- setup_device()
-
-/obj/machinery/button/update_icon_state()
- if(panel_open)
- icon_state = "button-open"
- else if(stat & (NOPOWER|BROKEN))
- icon_state = "[skin]-p"
- else
- icon_state = skin
-
-/obj/machinery/button/update_overlays()
- . = ..()
- if(!panel_open)
- return
- if(device)
- . += "button-device"
- if(board)
- . += "button-board"
-
-/obj/machinery/button/attackby(obj/item/W, mob/user, params)
- if(W.tool_behaviour == TOOL_SCREWDRIVER)
- if(panel_open || allowed(user))
- default_deconstruction_screwdriver(user, "button-open", "[skin]",W)
- update_icon()
- else
- to_chat(user, "Maintenance Access Denied.")
- flick("[skin]-denied", src)
- return
-
- if(panel_open)
- if(!device && istype(W, /obj/item/assembly))
- if(!user.transferItemToLoc(W, src))
- to_chat(user, "\The [W] is stuck to you!")
- return
- device = W
- to_chat(user, "I add [W] to the button.")
-
- if(!board && istype(W, /obj/item/electronics/airlock))
- if(!user.transferItemToLoc(W, src))
- to_chat(user, "\The [W] is stuck to you!")
- return
- board = W
- if(board.one_access)
- req_one_access = board.accesses
- else
- req_access = board.accesses
- to_chat(user, "I add [W] to the button.")
-
- if(!device && !board && W.tool_behaviour == TOOL_WRENCH)
- to_chat(user, "I start unsecuring the button frame...")
- W.play_tool_sound(src)
- if(W.use_tool(src, user, 40))
- to_chat(user, "I unsecure the button frame.")
- transfer_fingerprints_to(new /obj/item/wallframe/button(get_turf(src)))
- playsound(loc, 'sound/blank.ogg', 50, TRUE)
- qdel(src)
-
- update_icon()
- return
-
- if(user.used_intent.type != INTENT_HARM && !(W.item_flags & NOBLUDGEON))
- return attack_hand(user)
- else
- return ..()
-
-/obj/machinery/button/emag_act(mob/user)
- if(obj_flags & EMAGGED)
- return
- req_access = list()
- req_one_access = list()
- playsound(src, "sparks", 100, TRUE)
- obj_flags |= EMAGGED
-
-/obj/machinery/button/attack_ai(mob/user)
- if(!panel_open)
- return attack_hand(user)
-
-/obj/machinery/button/attack_robot(mob/user)
- return attack_ai(user)
-
-/obj/machinery/button/proc/setup_device()
- if(id && istype(device, /obj/item/assembly/control))
- var/obj/item/assembly/control/A = device
- A.id = id
- initialized_button = 1
-
-/obj/machinery/button/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE)
- if(id && istype(device, /obj/item/assembly/control))
- var/obj/item/assembly/control/A = device
- A.id = "[idnum][id]"
-
-/obj/machinery/button/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- if(!initialized_button)
- setup_device()
- add_fingerprint(user)
- if(panel_open)
- if(device || board)
- if(device)
- device.forceMove(drop_location())
- device = null
- if(board)
- board.forceMove(drop_location())
- req_access = list()
- req_one_access = list()
- board = null
- update_icon()
- to_chat(user, "I remove electronics from the button frame.")
-
- else
- if(skin == "doorctrl")
- skin = "launcher"
- else
- skin = "doorctrl"
- to_chat(user, "I change the button frame's front panel.")
- return
-
- if((stat & (NOPOWER|BROKEN)))
- return
-
- if(device && device.next_activate > world.time)
- return
-
- if(!allowed(user))
- to_chat(user, "Access Denied.")
- flick("[skin]-denied", src)
- return
-
- use_power(5)
- icon_state = "[skin]1"
-
- if(device)
- device.pulsed()
-
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 15)
-
-/obj/machinery/button/door
- name = "door button"
- desc = ""
- var/normaldoorcontrol = FALSE
- var/specialfunctions = OPEN // Bitflag, see assembly file
- var/sync_doors = TRUE
-
-/obj/machinery/button/door/indestructible
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-
-/obj/machinery/button/door/setup_device()
- if(!device)
- if(normaldoorcontrol)
- var/obj/item/assembly/control/airlock/A = new(src)
- A.specialfunctions = specialfunctions
- device = A
- else
- var/obj/item/assembly/control/C = new(src)
- C.sync_doors = sync_doors
- device = C
- ..()
-
-/obj/machinery/button/door/incinerator_vent_toxmix
- name = "combustion chamber vent control"
- id = INCINERATOR_TOXMIX_VENT
- req_access = list(ACCESS_TOX)
-
-/obj/machinery/button/door/incinerator_vent_atmos_main
- name = "turbine vent control"
- id = INCINERATOR_ATMOS_MAINVENT
- req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS)
-
-/obj/machinery/button/door/incinerator_vent_atmos_aux
- name = "combustion chamber vent control"
- id = INCINERATOR_ATMOS_AUXVENT
- req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS)
-
-/obj/machinery/button/door/incinerator_vent_syndicatelava_main
- name = "turbine vent control"
- id = INCINERATOR_SYNDICATELAVA_MAINVENT
- req_access = list(ACCESS_SYNDICATE)
-
-/obj/machinery/button/door/incinerator_vent_syndicatelava_aux
- name = "combustion chamber vent control"
- id = INCINERATOR_SYNDICATELAVA_AUXVENT
- req_access = list(ACCESS_SYNDICATE)
-
-/obj/machinery/button/massdriver
- name = "mass driver button"
- desc = ""
- icon_state = "launcher"
- skin = "launcher"
- device_type = /obj/item/assembly/control/massdriver
-
-/obj/machinery/button/massdriver/indestructible
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-
-/obj/machinery/button/ignition
- name = "ignition switch"
- desc = ""
- icon_state = "launcher"
- skin = "launcher"
- device_type = /obj/item/assembly/control/igniter
-
-/obj/machinery/button/ignition/indestructible
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-
-/obj/machinery/button/ignition/incinerator
- name = "combustion chamber ignition switch"
- desc = ""
-
-/obj/machinery/button/ignition/incinerator/toxmix
- id = INCINERATOR_TOXMIX_IGNITER
-
-/obj/machinery/button/ignition/incinerator/atmos
- id = INCINERATOR_ATMOS_IGNITER
-
-/obj/machinery/button/ignition/incinerator/syndicatelava
- id = INCINERATOR_SYNDICATELAVA_IGNITER
-
-/obj/machinery/button/flasher
- name = "flasher button"
- desc = ""
- icon_state = "launcher"
- skin = "launcher"
- device_type = /obj/item/assembly/control/flasher
-
-/obj/machinery/button/flasher/indestructible
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-
-/obj/machinery/button/crematorium
- name = "crematorium igniter"
- desc = ""
- icon_state = "launcher"
- skin = "launcher"
- device_type = /obj/item/assembly/control/crematorium
- req_access = list()
- id = 1
-
-/obj/machinery/button/crematorium/indestructible
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-
-/obj/item/wallframe/button
- name = "button frame"
- desc = ""
- icon_state = "button"
- result_path = /obj/machinery/button
- custom_materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT)
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
deleted file mode 100644
index dc1ab93afe..0000000000
--- a/code/game/machinery/camera/camera.dm
+++ /dev/null
@@ -1,500 +0,0 @@
-#define CAMERA_UPGRADE_XRAY 1
-#define CAMERA_UPGRADE_EMP_PROOF 2
-#define CAMERA_UPGRADE_MOTION 4
-
-/obj/machinery/camera
- name = "security camera"
- desc = ""
- icon = 'icons/obj/machines/camera.dmi'
- icon_state = "camera" //mapping icon to represent upgrade states. if you want a different base icon, update default_camera_icon as well as this.
- use_power = ACTIVE_POWER_USE
- idle_power_usage = 5
- active_power_usage = 10
- layer = WALL_OBJ_LAYER
- resistance_flags = FIRE_PROOF
- damage_deflection = 12
- armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 50)
- max_integrity = 100
- integrity_failure = 0.5
- var/default_camera_icon = "camera" //the camera's base icon used by update_icon - icon_state is primarily used for mapping display purposes.
- var/list/network = list("ss13")
- var/c_tag = null
- var/status = TRUE
- var/start_active = FALSE //If it ignores the random chance to start broken on round start
- var/invuln = null
- var/obj/item/camera_bug/bug = null
- var/obj/structure/camera_assembly/assembly = null
- var/area/myarea = null
-
- //OTHER
-
- var/view_range = 7
- var/short_range = 2
-
- var/alarm_on = FALSE
- var/busy = FALSE
- var/emped = FALSE //Number of consecutive EMP's on this camera
- var/in_use_lights = 0
-
- // Upgrades bitflag
- var/upgrades = 0
- var/datum/component/empprotection/emp_component
-
- var/internal_light = TRUE //Whether it can light up when an AI views it
-
-/obj/machinery/camera/preset/toxins //Bomb test site in space
- name = "Hardened Bomb-Test Camera"
- desc = ""
- c_tag = "Bomb Testing Site"
- network = list("rd","toxins")
- use_power = NO_POWER_USE //Test site is an unpowered area
- invuln = TRUE
- light_range = 10
- start_active = TRUE
-
-/obj/machinery/camera/Initialize(mapload, obj/structure/camera_assembly/CA)
- . = ..()
- for(var/i in network)
- network -= i
- network += lowertext(i)
- if(CA)
- assembly = CA
- if(assembly.xray_module)
- upgradeXRay()
- else if(assembly.malf_xray_firmware_present) //if it was secretly upgraded via the MALF AI Upgrade Camera Network ability
- upgradeXRay(TRUE)
-
- if(assembly.emp_module)
- upgradeEmpProof()
- else if(assembly.malf_xray_firmware_present) //if it was secretly upgraded via the MALF AI Upgrade Camera Network ability
- upgradeEmpProof(TRUE)
-
- if(assembly.proxy_module)
- upgradeMotion()
- else
- assembly = new(src)
- assembly.state = 4 //STATE_FINISHED
- GLOB.cameranet.cameras += src
- GLOB.cameranet.addCamera(src)
- if (isturf(loc))
- myarea = get_area(src)
- LAZYADD(myarea.cameras, src)
- proximity_monitor = new(src, 1)
-
- if(mapload && is_station_level(z) && prob(3) && !start_active)
- toggle_cam()
- else //this is handled by toggle_camera, so no need to update it twice.
- update_icon()
-
-/obj/machinery/camera/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE)
- for(var/i in network)
- network -= i
- network += "[idnum][i]"
-
-/obj/machinery/camera/Destroy()
- if(can_use())
- toggle_cam(null, 0) //kick anyone viewing out and remove from the camera chunks
- GLOB.cameranet.cameras -= src
- if(isarea(myarea))
- LAZYREMOVE(myarea.cameras, src)
- QDEL_NULL(assembly)
- QDEL_NULL(emp_component)
- if(bug)
- bug.bugged_cameras -= src.c_tag
- if(bug.current == src)
- bug.current = null
- bug = null
- cancelCameraAlarm()
- return ..()
-
-/obj/machinery/camera/examine(mob/user)
- . += ..()
- if(isEmpProof(TRUE)) //don't reveal it's upgraded if was done via MALF AI Upgrade Camera Network ability
- . += "It has electromagnetic interference shielding installed."
- else
- . += "It can be shielded against electromagnetic interference with some plasma."
- if(isXRay(TRUE)) //don't reveal it's upgraded if was done via MALF AI Upgrade Camera Network ability
- . += "It has an X-ray photodiode installed."
- else
- . += "It can be upgraded with an X-ray photodiode with an analyzer."
- if(isMotion())
- . += "It has a proximity sensor installed."
- else
- . += "It can be upgraded with a proximity sensor."
-
- if(!status)
- . += "It's currently deactivated."
- if(!panel_open && powered())
- . += "You'll need to open its maintenance panel with a screwdriver to turn it back on."
- if(panel_open)
- . += "Its maintenance panel is currently open."
- if(!status && powered())
- . += "It can reactivated with wirecutters."
-
-/obj/machinery/camera/emp_act(severity)
- . = ..()
- if(!status)
- return
- if(!(. & EMP_PROTECT_SELF))
- if(prob(150/severity))
- update_icon()
- network = list()
- GLOB.cameranet.removeCamera(src)
- stat |= EMPED
- set_light(0)
- emped = emped+1 //Increase the number of consecutive EMP's
- update_icon()
- addtimer(CALLBACK(src, PROC_REF(post_emp_reset), emped, network), 90 SECONDS)
- for(var/i in GLOB.player_list)
- var/mob/M = i
- if (M.client.eye == src)
- M.unset_machine()
- M.reset_perspective(null)
- to_chat(M, "The screen bursts into static!")
-
-/obj/machinery/camera/proc/post_emp_reset(thisemp, previous_network)
- if(QDELETED(src))
- return
- triggerCameraAlarm() //camera alarm triggers even if multiple EMPs are in effect.
- if(emped != thisemp) //Only fix it if the camera hasn't been EMP'd again
- return
- network = previous_network
- stat &= ~EMPED
- update_icon()
- if(can_use())
- GLOB.cameranet.addCamera(src)
- emped = 0 //Resets the consecutive EMP count
- addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100)
-
-/obj/machinery/camera/ex_act(severity, target)
- if(invuln)
- return
- ..()
-
-/obj/machinery/camera/proc/setViewRange(num = 7)
- src.view_range = num
- GLOB.cameranet.updateVisibility(src, 0)
-
-/obj/machinery/camera/proc/shock(mob/living/user)
- if(!istype(user))
- return
- user.electrocute_act(10, src)
-
-/obj/machinery/camera/singularity_pull(S, current_size)
- if (status && current_size >= STAGE_FIVE) // If the singulo is strong enough to pull anchored objects and the camera is still active, turn off the camera as it gets ripped off the wall.
- toggle_cam(null, 0)
- ..()
-
-// Construction/Deconstruction
-/obj/machinery/camera/screwdriver_act(mob/living/user, obj/item/I)
- if(..())
- return TRUE
- panel_open = !panel_open
- to_chat(user, "I screw the camera's panel [panel_open ? "open" : "closed"].")
- I.play_tool_sound(src)
- update_icon()
- return TRUE
-
-/obj/machinery/camera/crowbar_act(mob/living/user, obj/item/I)
- . = ..()
- if(!panel_open)
- return
- var/list/droppable_parts = list()
- if(assembly.xray_module)
- droppable_parts += assembly.xray_module
- if(assembly.emp_module)
- droppable_parts += assembly.emp_module
- if(assembly.proxy_module)
- droppable_parts += assembly.proxy_module
- if(!droppable_parts.len)
- return
- var/obj/item/choice = input(user, "Select a part to remove:", src) as null|obj in sortNames(droppable_parts)
- if(!choice || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
- return
- to_chat(user, "I remove [choice] from [src].")
- if(choice == assembly.xray_module)
- assembly.drop_upgrade(assembly.xray_module)
- removeXRay()
- if(choice == assembly.emp_module)
- assembly.drop_upgrade(assembly.emp_module)
- removeEmpProof()
- if(choice == assembly.proxy_module)
- assembly.drop_upgrade(assembly.proxy_module)
- removeMotion()
- I.play_tool_sound(src)
- return TRUE
-
-/obj/machinery/camera/wirecutter_act(mob/living/user, obj/item/I)
- . = ..()
- if(!panel_open)
- return
- toggle_cam(user, 1)
- obj_integrity = max_integrity //this is a pretty simplistic way to heal the camera, but there's no reason for this to be complex.
- stat &= ~BROKEN
- I.play_tool_sound(src)
- return TRUE
-
-/obj/machinery/camera/multitool_act(mob/living/user, obj/item/I)
- . = ..()
- if(!panel_open)
- return
-
- setViewRange((view_range == initial(view_range)) ? short_range : initial(view_range))
- to_chat(user, "I [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus.")
- return TRUE
-
-/obj/machinery/camera/welder_act(mob/living/user, obj/item/I)
- . = ..()
- if(!panel_open)
- return
-
- if(!I.tool_start_check(user, amount=0))
- return TRUE
-
- to_chat(user, "I start to weld [src]...")
- if(I.use_tool(src, user, 100, volume=50))
- user.visible_message("[user] unwelds [src], leaving it as just a frame bolted to the wall.",
- "I unweld [src], leaving it as just a frame bolted to the wall")
- deconstruct(TRUE)
-
- return TRUE
-
-/obj/machinery/camera/attackby(obj/item/I, mob/living/user, params)
- // UPGRADES
- if(panel_open)
- if(I.tool_behaviour == TOOL_ANALYZER)
- if(!isXRay(TRUE)) //don't reveal it was already upgraded if was done via MALF AI Upgrade Camera Network ability
- if(!user.temporarilyRemoveItemFromInventory(I))
- return
- upgradeXRay(FALSE, TRUE)
- to_chat(user, "I attach [I] into [assembly]'s inner circuits.")
- qdel(I)
- else
- to_chat(user, "[src] already has that upgrade!")
- return
-
- else if(istype(I, /obj/item/stack/sheet/mineral/plasma))
- if(!isEmpProof(TRUE)) //don't reveal it was already upgraded if was done via MALF AI Upgrade Camera Network ability
- if(I.use_tool(src, user, 0, amount=1))
- upgradeEmpProof(FALSE, TRUE)
- to_chat(user, "I attach [I] into [assembly]'s inner circuits.")
- else
- to_chat(user, "[src] already has that upgrade!")
- return
-
- else if(istype(I, /obj/item/assembly/prox_sensor))
- if(!isMotion())
- if(!user.temporarilyRemoveItemFromInventory(I))
- return
- upgradeMotion()
- to_chat(user, "I attach [I] into [assembly]'s inner circuits.")
- qdel(I)
- else
- to_chat(user, "[src] already has that upgrade!")
- return
-
- // OTHER
- if((istype(I, /obj/item/paper) || istype(I, /obj/item/pda)) && isliving(user))
- var/mob/living/U = user
- var/obj/item/paper/X = null
- var/obj/item/pda/P = null
-
- var/itemname = ""
- var/info = ""
- if(istype(I, /obj/item/paper))
- X = I
- itemname = X.name
- info = X.info
- else
- P = I
- itemname = P.name
- info = P.notehtml
- to_chat(U, "I hold \the [itemname] up to the camera...")
- U.changeNext_move(CLICK_CD_MELEE)
- for(var/mob/O in GLOB.player_list)
- if(isAI(O))
- var/mob/living/silicon/ai/AI = O
- if(AI.control_disabled || (AI.stat == DEAD))
- return
- if(U.name == "Unknown")
- to_chat(AI, "[U] holds \a [itemname] up to one of your cameras ...")
- else
- to_chat(AI, "[U] holds \a [itemname] up to one of your cameras ...")
- AI.last_paper_seen = "[itemname][info]"
- else if (O.client.eye == src)
- to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...")
- O << browse(text("[][]", itemname, info), text("window=[]", itemname))
- return
-
- else if(istype(I, /obj/item/camera_bug))
- if(!can_use())
- to_chat(user, "Camera non-functional.")
- return
- if(bug)
- to_chat(user, "Camera bug removed.")
- bug.bugged_cameras -= src.c_tag
- bug = null
- else
- to_chat(user, "Camera bugged.")
- bug = I
- bug.bugged_cameras[src.c_tag] = src
- return
-
- else if(istype(I, /obj/item/pai_cable))
- var/obj/item/pai_cable/cable = I
- cable.plugin(src, user)
- return
-
- return ..()
-
-
-/obj/machinery/camera/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
- if(stat & BROKEN)
- return damage_amount
- . = ..()
-
-/obj/machinery/camera/obj_break(damage_flag)
- if(!status)
- return
- . = ..()
- if(.)
- triggerCameraAlarm()
- toggle_cam(null, 0)
-
-/obj/machinery/camera/deconstruct(disassembled = TRUE)
- if(!(flags_1 & NODECONSTRUCT_1))
- if(disassembled)
- if(!assembly)
- assembly = new()
- assembly.forceMove(drop_location())
- assembly.state = 1
- assembly.setDir(dir)
- assembly = null
- else
- var/obj/item/I = new /obj/item/wallframe/camera (loc)
- I.obj_integrity = I.max_integrity * 0.5
- new /obj/item/stack/cable_coil(loc, 2)
- qdel(src)
-
-/obj/machinery/camera/update_icon_state() //TO-DO: Make panel open states, xray camera, and indicator lights overlays instead.
- var/xray_module
- if(isXRay(TRUE))
- xray_module = "xray"
- if(!status)
- icon_state = "[xray_module][default_camera_icon]_off"
- else if (stat & EMPED)
- icon_state = "[xray_module][default_camera_icon]_emp"
- else
- icon_state = "[xray_module][default_camera_icon][in_use_lights ? "_in_use" : ""]"
-
-/obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = 1)
- status = !status
- if(can_use())
- GLOB.cameranet.addCamera(src)
- if (isturf(loc))
- myarea = get_area(src)
- LAZYADD(myarea.cameras, src)
- else
- myarea = null
- else
- set_light(0)
- GLOB.cameranet.removeCamera(src)
- if (isarea(myarea))
- LAZYREMOVE(myarea.cameras, src)
- GLOB.cameranet.updateChunk(x, y, z)
- var/change_msg = "deactivates"
- if(status)
- change_msg = "reactivates"
- triggerCameraAlarm()
- addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100)
- if(displaymessage)
- if(user)
- visible_message("[user] [change_msg] [src]!")
- add_hiddenprint(user)
- else
- visible_message("\The [src] [change_msg]!")
-
- playsound(src, 'sound/blank.ogg', 100, TRUE)
- update_icon() //update Initialize() if you remove this.
-
- // now disconnect anyone using the camera
- //Apparently, this will disconnect anyone even if the camera was re-activated.
- //I guess that doesn't matter since they can't use it anyway?
- for(var/mob/O in GLOB.player_list)
- if (O.client.eye == src)
- O.unset_machine()
- O.reset_perspective(null)
- to_chat(O, "The screen bursts into static!")
-
-/obj/machinery/camera/proc/triggerCameraAlarm()
- alarm_on = TRUE
- for(var/mob/living/silicon/S in GLOB.silicon_mobs)
- S.triggerAlarm("Camera", get_area(src), list(src), src)
-
-/obj/machinery/camera/proc/cancelCameraAlarm()
- alarm_on = FALSE
- for(var/mob/living/silicon/S in GLOB.silicon_mobs)
- S.cancelAlarm("Camera", get_area(src), src)
-
-/obj/machinery/camera/proc/can_use()
- if(!status)
- return FALSE
- if(stat & EMPED)
- return FALSE
- return TRUE
-
-/obj/machinery/camera/proc/can_see()
- var/list/see = null
- var/turf/pos = get_turf(src)
- if(isXRay())
- see = range(view_range, pos)
- else
- see = get_hear(view_range, pos)
- return see
-
-/atom/proc/auto_turn()
- //Automatically turns based on nearby walls.
- var/turf/closed/wall/T = null
- for(var/i in GLOB.cardinals)
- T = get_ranged_target_turf(src, i, 1)
- if(istype(T))
- setDir(turn(i, 180))
- break
-
-//Return a working camera that can see a given mob
-//or null if none
-/proc/seen_by_camera(mob/M)
- for(var/obj/machinery/camera/C in view(4, M))
- if(C.can_use()) // check if camera disabled
- return C
- return null
-
-/proc/near_range_camera(mob/M)
- for(var/obj/machinery/camera/C in range(4, M))
- if(C.can_use()) // check if camera disabled
- return C
- return null
-
-/obj/machinery/camera/proc/Togglelight(on=0)
- for(var/mob/living/silicon/ai/A in GLOB.ai_list)
- for(var/obj/machinery/camera/cam in A.lit_cameras)
- if(cam == src)
- return
- if(on)
- set_light(AI_CAMERA_LUMINOSITY)
- else
- set_light(0)
-
-/obj/machinery/camera/get_remote_view_fullscreens(mob/user)
- if(view_range == short_range) //unfocused
- user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2)
-
-/obj/machinery/camera/update_remote_sight(mob/living/user)
- user.see_invisible = SEE_INVISIBLE_LIVING //can't see ghosts through cameras
- if(isXRay())
- user.sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
- user.see_in_dark = max(user.see_in_dark, 8)
- else
- user.sight = 0
- user.see_in_dark = 2
- return 1
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
deleted file mode 100644
index bff95188a8..0000000000
--- a/code/game/machinery/camera/camera_assembly.dm
+++ /dev/null
@@ -1,287 +0,0 @@
-#define STATE_WRENCHED 1
-#define STATE_WELDED 2
-#define STATE_WIRED 3
-#define STATE_FINISHED 4
-
-/obj/item/wallframe/camera
- name = "camera assembly"
- desc = ""
- icon = 'icons/obj/machines/camera.dmi'
- icon_state = "cameracase"
- custom_materials = list(/datum/material/iron=400, /datum/material/glass=250)
- result_path = /obj/structure/camera_assembly
-
-/obj/structure/camera_assembly
- name = "camera assembly"
- desc = ""
- icon = 'icons/obj/machines/camera.dmi'
- icon_state = "camera_assembly"
- max_integrity = 150
- // Motion, EMP-Proof, X-ray
- var/obj/item/analyzer/xray_module
- var/malf_xray_firmware_active //used to keep from revealing malf AI upgrades for user facing isXRay() checks when they use Upgrade Camera Network ability
- //will be false if the camera is upgraded with the proper parts.
- var/malf_xray_firmware_present //so the malf upgrade is restored when the normal upgrade part is removed.
- var/obj/item/stack/sheet/mineral/plasma/emp_module
- var/malf_emp_firmware_active //used to keep from revealing malf AI upgrades for user facing isEmp() checks after they use Upgrade Camera Network ability
- //will be false if the camera is upgraded with the proper parts.
- var/malf_emp_firmware_present //so the malf upgrade is restored when the normal upgrade part is removed.
- var/obj/item/assembly/prox_sensor/proxy_module
- var/state = STATE_WRENCHED
-
-/obj/structure/camera_assembly/examine(mob/user)
- . = ..()
- //upgrade messages
- var/has_upgrades
- if(emp_module)
- . += "It has electromagnetic interference shielding installed."
- has_upgrades = TRUE
- else if(state == STATE_WIRED)
- . += "It can be shielded against electromagnetic interference with some plasma."
- if(xray_module)
- . += "It has an X-ray photodiode installed."
- has_upgrades = TRUE
- else if(state == STATE_WIRED)
- . += "It can be upgraded with an X-ray photodiode with an analyzer."
- if(proxy_module)
- . += "It has a proximity sensor installed."
- has_upgrades = TRUE
- else if(state == STATE_WIRED)
- . += "It can be upgraded with a proximity sensor."
-
- //construction states
- switch(state)
- if(STATE_WRENCHED)
- . += "I can secure it in place with a welder, or removed with a wrench."
- if(STATE_WELDED)
- . += "I can add wires to it, or unweld it from the wall."
- if(STATE_WIRED)
- if(has_upgrades)
- . += "I can remove the contained upgrades with a crowbar."
- . += "I can complete it with a screwdriver, or unwire it to start removal."
- if(STATE_FINISHED)
- . += "I shouldn't be seeing this, tell a coder!"
-
-/obj/structure/camera_assembly/Initialize(mapload, ndir, building)
- . = ..()
- if(building)
- setDir(ndir)
-
-/obj/structure/camera_assembly/update_icon_state()
- icon_state = "[xray_module ? "xray" : null][initial(icon_state)]"
-
-/obj/structure/camera_assembly/handle_atom_del(atom/A)
- if(A == xray_module)
- xray_module = null
- update_icon()
- if(malf_xray_firmware_present)
- malf_xray_firmware_active = malf_xray_firmware_present //re-enable firmware based upgrades after the part is removed.
- if(istype(loc, /obj/machinery/camera))
- var/obj/machinery/camera/contained_camera = loc
- contained_camera.removeXRay(malf_xray_firmware_present) //make sure we don't remove MALF upgrades.
-
- else if(A == emp_module)
- emp_module = null
- if(malf_emp_firmware_present)
- malf_emp_firmware_active = malf_emp_firmware_present //re-enable firmware based upgrades after the part is removed.
- if(istype(loc, /obj/machinery/camera))
- var/obj/machinery/camera/contained_camera = loc
- contained_camera.removeEmpProof(malf_emp_firmware_present) //make sure we don't remove MALF upgrades
-
- else if(A == proxy_module)
- emp_module = null
- if(istype(loc, /obj/machinery/camera))
- var/obj/machinery/camera/contained_camera = loc
- contained_camera.removeMotion()
-
- return ..()
-
-
-/obj/structure/camera_assembly/Destroy()
- QDEL_NULL(xray_module)
- QDEL_NULL(emp_module)
- QDEL_NULL(proxy_module)
- return ..()
-
-/obj/structure/camera_assembly/proc/drop_upgrade(obj/item/I)
- I.forceMove(drop_location())
- if(I == xray_module)
- xray_module = null
- if(malf_xray_firmware_present)
- malf_xray_firmware_active = malf_xray_firmware_present //re-enable firmware based upgrades after the part is removed.
- update_icon()
-
- else if(I == emp_module)
- emp_module = null
- if(malf_emp_firmware_present)
- malf_emp_firmware_active = malf_emp_firmware_present //re-enable firmware based upgrades after the part is removed.
-
- else if(I == proxy_module)
- proxy_module = null
-
-
-/obj/structure/camera_assembly/attackby(obj/item/W, mob/living/user, params)
- switch(state)
- if(STATE_WRENCHED)
- if(W.tool_behaviour == TOOL_WELDER)
- if(weld(W, user))
- to_chat(user, "I weld [src] securely into place.")
- setAnchored(TRUE)
- state = STATE_WELDED
- return
-
- if(STATE_WELDED)
- if(istype(W, /obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/C = W
- if(C.use(2))
- to_chat(user, "I add wires to [src].")
- state = STATE_WIRED
- else
- to_chat(user, "I need two lengths of cable to wire a camera!")
- return
- return
-
- else if(W.tool_behaviour == TOOL_WELDER)
-
- if(weld(W, user))
- to_chat(user, "I unweld [src] from its place.")
- state = STATE_WRENCHED
- setAnchored(TRUE)
- return
-
- if(STATE_WIRED) // Upgrades!
- if(istype(W, /obj/item/stack/sheet/mineral/plasma)) //emp upgrade
- if(emp_module)
- to_chat(user, "[src] already contains a [emp_module]!")
- return
- if(!W.use_tool(src, user, 0, amount=1)) //only use one sheet, otherwise the whole stack will be consumed.
- return
- emp_module = new(src)
- if(malf_xray_firmware_active)
- malf_xray_firmware_active = FALSE //flavor reason: MALF AI Upgrade Camera Network ability's firmware is incompatible with the new part
- //real reason: make it a normal upgrade so the finished camera's icons and examine texts are restored.
- to_chat(user, "I attach [W] into [src]'s inner circuits.")
- return
-
- else if(istype(W, /obj/item/analyzer)) //xray upgrade
- if(xray_module)
- to_chat(user, "[src] already contains a [xray_module]!")
- return
- if(!user.transferItemToLoc(W, src))
- return
- to_chat(user, "I attach [W] into [src]'s inner circuits.")
- xray_module = W
- if(malf_xray_firmware_active)
- malf_xray_firmware_active = FALSE //flavor reason: MALF AI Upgrade Camera Network ability's firmware is incompatible with the new part
- //real reason: make it a normal upgrade so the finished camera's icons and examine texts are restored.
- update_icon()
- return
-
- else if(istype(W, /obj/item/assembly/prox_sensor)) //motion sensing upgrade
- if(proxy_module)
- to_chat(user, "[src] already contains a [proxy_module]!")
- return
- if(!user.transferItemToLoc(W, src))
- return
- to_chat(user, "I attach [W] into [src]'s inner circuits.")
- proxy_module = W
- return
-
- return ..()
-
-/obj/structure/camera_assembly/crowbar_act(mob/user, obj/item/tool)
- if(state != STATE_WIRED)
- return FALSE
- var/list/droppable_parts = list()
- if(xray_module)
- droppable_parts += xray_module
- if(emp_module)
- droppable_parts += emp_module
- if(proxy_module)
- droppable_parts += proxy_module
- if(!droppable_parts.len)
- return
- var/obj/item/choice = input(user, "Select a part to remove:", src) as null|obj in sortNames(droppable_parts)
- if(!choice || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
- return
- to_chat(user, "I remove [choice] from [src].")
- drop_upgrade(choice)
- tool.play_tool_sound(src)
- return TRUE
-
-/obj/structure/camera_assembly/screwdriver_act(mob/user, obj/item/tool)
- . = ..()
- if(.)
- return TRUE
- if(state != STATE_WIRED)
- return FALSE
-
- tool.play_tool_sound(src)
- var/input = stripped_input(user, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13")
- if(!input)
- to_chat(user, "No input found, please hang up and try your call again!")
- return
- var/list/tempnetwork = splittext(input, ",")
- if(tempnetwork.len < 1)
- to_chat(user, "No network found, please hang up and try your call again!")
- return
- for(var/i in tempnetwork)
- tempnetwork -= i
- tempnetwork += lowertext(i)
- state = STATE_FINISHED
- var/obj/machinery/camera/C = new(loc, src)
- forceMove(C)
- C.setDir(src.dir)
-
- C.network = tempnetwork
- var/area/A = get_area(src)
- C.c_tag = "[A.name] ([rand(1, 999)])"
- return TRUE
-
-/obj/structure/camera_assembly/wirecutter_act(mob/user, obj/item/I)
- . = ..()
- if(state != STATE_WIRED)
- return
-
- new /obj/item/stack/cable_coil(drop_location(), 2)
- I.play_tool_sound(src)
- to_chat(user, "I cut the wires from the circuits.")
- state = STATE_WELDED
- return TRUE
-
-/obj/structure/camera_assembly/wrench_act(mob/user, obj/item/I)
- . = ..()
- if(state != STATE_WRENCHED)
- return
- I.play_tool_sound(src)
- to_chat(user, "I detach [src] from its place.")
- new /obj/item/wallframe/camera(drop_location())
- //drop upgrades
- if(xray_module)
- drop_upgrade(xray_module)
- if(emp_module)
- drop_upgrade(emp_module)
- if(proxy_module)
- drop_upgrade(proxy_module)
-
- qdel(src)
- return TRUE
-
-/obj/structure/camera_assembly/proc/weld(obj/item/weldingtool/W, mob/living/user)
- if(!W.tool_start_check(user, amount=3))
- return FALSE
- to_chat(user, "I start to weld [src]...")
- if(W.use_tool(src, user, 20, amount=3, volume = 50))
- return TRUE
- return FALSE
-
-/obj/structure/camera_assembly/deconstruct(disassembled = TRUE)
- if(!(flags_1 & NODECONSTRUCT_1))
- new /obj/item/stack/sheet/metal(loc)
- qdel(src)
-
-
-#undef STATE_WRENCHED
-#undef STATE_WELDED
-#undef STATE_WIRED
-#undef STATE_FINISHED
diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm
deleted file mode 100644
index af5093d6ca..0000000000
--- a/code/game/machinery/camera/motion.dm
+++ /dev/null
@@ -1,112 +0,0 @@
-/obj/machinery/camera
-
- var/list/datum/weakref/localMotionTargets = list()
- var/detectTime = 0
- var/area/ai_monitored/area_motion = null
- var/alarm_delay = 30 // Don't forget, there's another 3 seconds in queueAlarm()
-
-/obj/machinery/camera/process()
- // motion camera event loop
- if(!isMotion())
- . = PROCESS_KILL
- return
- if(stat & EMPED)
- return
- if (detectTime > 0)
- var/elapsed = world.time - detectTime
- if (elapsed > alarm_delay)
- triggerAlarm()
- else if (detectTime == -1)
- for (var/datum/weakref/targetref in getTargetList())
- var/mob/target = targetref.resolve()
- if(QDELETED(target) || target.stat == DEAD || (!area_motion && !in_range(src, target)))
- //If not part of a monitored area and the camera is not in range or the target is dead
- lostTargetRef(targetref)
-
-/obj/machinery/camera/proc/getTargetList()
- if(area_motion)
- return area_motion.motionTargets
- return localMotionTargets
-
-/obj/machinery/camera/proc/newTarget(mob/target)
- if(isAI(target))
- return FALSE
- if (detectTime == 0)
- detectTime = world.time // start the clock
- var/list/targets = getTargetList()
- targets |= WEAKREF(target)
- return TRUE
-
-/obj/machinery/camera/Destroy()
- var/area/ai_monitored/A = get_area(src)
- localMotionTargets = null
- if(istype(A))
- A.motioncameras -= src
- cancelAlarm()
- return ..()
-
-/obj/machinery/camera/proc/lostTargetRef(datum/weakref/R)
- var/list/targets = getTargetList()
- targets -= R
- if (targets.len == 0)
- cancelAlarm()
-
-/obj/machinery/camera/proc/cancelAlarm()
- if (detectTime == -1)
- for (var/i in GLOB.silicon_mobs)
- var/mob/living/silicon/aiPlayer = i
- if (status)
- aiPlayer.cancelAlarm("Motion", get_area(src), src)
- detectTime = 0
- return TRUE
-
-/obj/machinery/camera/proc/triggerAlarm()
- if (!detectTime)
- return FALSE
- for (var/mob/living/silicon/aiPlayer in GLOB.player_list)
- if (status)
- aiPlayer.triggerAlarm("Motion", get_area(src), list(src), src)
- visible_message("A red light flashes on the [src]!")
- detectTime = -1
- return TRUE
-
-/obj/machinery/camera/HasProximity(atom/movable/AM as mob|obj)
- // Motion cameras outside of an "ai monitored" area will use this to detect stuff.
- if (!area_motion)
- if(isliving(AM))
- newTarget(AM)
-
-/obj/machinery/camera/motion/thunderdome
- name = "entertainment camera"
- network = list("thunder")
- c_tag = "Arena"
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF | FREEZE_PROOF
-
-/obj/machinery/camera/motion/thunderdome/Initialize()
- . = ..()
- proximity_monitor.SetRange(7)
-
-/obj/machinery/camera/motion/thunderdome/HasProximity(atom/movable/AM as mob|obj)
- if (!isliving(AM) || get_area(AM) != get_area(src))
- return
- localMotionTargets |= WEAKREF(AM)
- if (!detectTime)
- for(var/obj/machinery/computer/security/telescreen/entertainment/TV in GLOB.machines)
- TV.notify(TRUE)
- detectTime = world.time + 30 SECONDS
-
-/obj/machinery/camera/motion/thunderdome/process()
- if (!detectTime)
- return
-
- for (var/datum/weakref/targetref in localMotionTargets)
- var/mob/target = targetref.resolve()
- if(QDELETED(target) || target.stat == DEAD || get_dist(src, target) > 7 || get_area(src) != get_area(target))
- localMotionTargets -= targetref
-
- if (localMotionTargets.len)
- detectTime = world.time + 30 SECONDS
- else if (world.time > detectTime)
- detectTime = 0
- for(var/obj/machinery/computer/security/telescreen/entertainment/TV in GLOB.machines)
- TV.notify(FALSE)
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
deleted file mode 100644
index dcbff23b21..0000000000
--- a/code/game/machinery/camera/presets.dm
+++ /dev/null
@@ -1,140 +0,0 @@
-// PRESETS
-
-// EMP
-/obj/machinery/camera/emp_proof
- start_active = TRUE
-
-/obj/machinery/camera/emp_proof/Initialize()
- . = ..()
- upgradeEmpProof()
-
-// EMP + Motion
-
-/obj/machinery/camera/emp_proof/motion/Initialize()
- . = ..()
- upgradeMotion()
-
-// X-ray
-
-/obj/machinery/camera/xray
- start_active = TRUE
- icon_state = "xraycamera" //mapping icon - Thanks to Krutchen for the icons.
-
-/obj/machinery/camera/xray/Initialize()
- . = ..()
- upgradeXRay()
-
-// MOTION
-/obj/machinery/camera/motion
- start_active = TRUE
- name = "motion-sensitive security camera"
-
-/obj/machinery/camera/motion/Initialize()
- . = ..()
- upgradeMotion()
-
-// ALL UPGRADES
-/obj/machinery/camera/all
- start_active = TRUE
- icon_state = "xraycamera" //mapping icon.
-
-/obj/machinery/camera/all/Initialize()
- . = ..()
- upgradeEmpProof()
- upgradeXRay()
- upgradeMotion()
-
-// AUTONAME
-
-/obj/machinery/camera/autoname
- var/number = 0 //camera number in area
-
-//This camera type automatically sets it's name to whatever the area that it's in is called.
-/obj/machinery/camera/autoname/Initialize()
- ..()
- return INITIALIZE_HINT_LATELOAD
-
-/obj/machinery/camera/autoname/LateInitialize()
- . = ..()
- number = 1
- var/area/A = get_area(src)
- if(A)
- for(var/obj/machinery/camera/autoname/C in GLOB.machines)
- if(C == src)
- continue
- var/area/CA = get_area(C)
- if(CA.type == A.type)
- if(C.number)
- number = max(number, C.number+1)
- c_tag = "[A.name] #[number]"
-
-
-// UPGRADE PROCS
-
-/obj/machinery/camera/proc/isEmpProof(ignore_malf_upgrades)
- return (upgrades & CAMERA_UPGRADE_EMP_PROOF) && (!(ignore_malf_upgrades && assembly.malf_emp_firmware_active))
-
-/obj/machinery/camera/proc/upgradeEmpProof(malf_upgrade, ignore_malf_upgrades)
- if(isEmpProof(ignore_malf_upgrades)) //pass a malf upgrade to ignore_malf_upgrades so we can replace the malf module with the normal one
- return //that way if someone tries to upgrade an already malf-upgraded camera, it'll just upgrade it to a normal version.
- emp_component = AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES | EMP_PROTECT_CONTENTS)
- if(malf_upgrade)
- assembly.malf_emp_firmware_active = TRUE //don't add parts to drop, update icon, ect. reconstructing it will also retain the upgrade.
- assembly.malf_emp_firmware_present = TRUE //so the upgrade is retained after incompatible parts are removed.
-
- else if(!assembly.emp_module) //only happens via upgrading in camera/attackby()
- assembly.emp_module = new(assembly)
- if(assembly.malf_emp_firmware_active)
- assembly.malf_emp_firmware_active = FALSE //make it appear like it's just normally upgraded so the icons and examine texts are restored.
-
- upgrades |= CAMERA_UPGRADE_EMP_PROOF
-
-/obj/machinery/camera/proc/removeEmpProof(ignore_malf_upgrades)
- if(ignore_malf_upgrades) //don't downgrade it if malf software is forced onto it.
- return
- emp_component.RemoveComponent()
- upgrades &= ~CAMERA_UPGRADE_EMP_PROOF
-
-
-
-/obj/machinery/camera/proc/isXRay(ignore_malf_upgrades)
- return (upgrades & CAMERA_UPGRADE_XRAY) && (!(ignore_malf_upgrades && assembly.malf_xray_firmware_active))
-
-/obj/machinery/camera/proc/upgradeXRay(malf_upgrade, ignore_malf_upgrades)
- if(isXRay(ignore_malf_upgrades)) //pass a malf upgrade to ignore_malf_upgrades so we can replace the malf upgrade with the normal one
- return //that way if someone tries to upgrade an already malf-upgraded camera, it'll just upgrade it to a normal version.
- if(malf_upgrade)
- assembly.malf_xray_firmware_active = TRUE //don't add parts to drop, update icon, ect. reconstructing it will also retain the upgrade.
- assembly.malf_xray_firmware_present = TRUE //so the upgrade is retained after incompatible parts are removed.
-
- else if(!assembly.xray_module) //only happens via upgrading in camera/attackby()
- assembly.xray_module = new(assembly)
- if(assembly.malf_xray_firmware_active)
- assembly.malf_xray_firmware_active = FALSE //make it appear like it's just normally upgraded so the icons and examine texts are restored.
-
- upgrades |= CAMERA_UPGRADE_XRAY
- update_icon()
-
-/obj/machinery/camera/proc/removeXRay(ignore_malf_upgrades)
- if(!ignore_malf_upgrades) //don't downgrade it if malf software is forced onto it.
- upgrades &= ~CAMERA_UPGRADE_XRAY
- update_icon()
-
-
-
-/obj/machinery/camera/proc/isMotion()
- return upgrades & CAMERA_UPGRADE_MOTION
-
-/obj/machinery/camera/proc/upgradeMotion()
- if(isMotion())
- return
- if(name == initial(name))
- name = "motion-sensitive security camera"
- if(!assembly.proxy_module)
- assembly.proxy_module = new(assembly)
- upgrades |= CAMERA_UPGRADE_MOTION
-
-/obj/machinery/camera/proc/removeMotion()
- if(name == "motion-sensitive security camera")
- name = "security camera"
- upgrades &= ~CAMERA_UPGRADE_MOTION
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
deleted file mode 100644
index 04a4b18894..0000000000
--- a/code/game/machinery/camera/tracking.dm
+++ /dev/null
@@ -1,154 +0,0 @@
-/mob/living/silicon/ai/proc/get_camera_list()
- var/list/L = list()
- for (var/obj/machinery/camera/C in GLOB.cameranet.cameras)
- L.Add(C)
-
- camera_sort(L)
-
- var/list/T = list()
-
- for (var/obj/machinery/camera/C in L)
- var/list/tempnetwork = C.network&src.network
- if (tempnetwork.len)
- T[text("[][]", C.c_tag, (C.can_use() ? null : " (Deactivated)"))] = C
-
- return T
-
-/mob/living/silicon/ai/proc/show_camera_list()
- var/list/cameras = get_camera_list()
- var/camera = input(src, "Choose which camera you want to view", "Cameras") as null|anything in cameras
- switchCamera(cameras[camera])
-
-/datum/trackable
- var/initialized = FALSE
- var/list/names = list()
- var/list/namecounts = list()
- var/list/humans = list()
- var/list/others = list()
-
-/mob/living/silicon/ai/proc/trackable_mobs()
- track.initialized = TRUE
- track.names.Cut()
- track.namecounts.Cut()
- track.humans.Cut()
- track.others.Cut()
-
- if(usr.stat == DEAD)
- return list()
-
- for(var/i in GLOB.mob_living_list)
- var/mob/living/L = i
- if(!L.can_track(usr))
- continue
-
- var/name = L.name
- while(name in track.names)
- track.namecounts[name]++
- name = text("[] ([])", name, track.namecounts[name])
- track.names.Add(name)
- track.namecounts[name] = 1
-
- if(ishuman(L))
- track.humans[name] = L
- else
- track.others[name] = L
-
- var/list/targets = sortList(track.humans) + sortList(track.others)
-
- return targets
-
-/mob/living/silicon/ai/verb/ai_camera_track(target_name in trackable_mobs())
- set name = "track"
- set hidden = 1 //Don't display it on the verb lists. This verb exists purely so you can type "track Oldman Robustin" and follow his ass
-
- if(!target_name)
- return
-
- if(!track.initialized)
- trackable_mobs()
-
- var/mob/target = (isnull(track.humans[target_name]) ? track.others[target_name] : track.humans[target_name])
-
- ai_actual_track(target)
-
-/mob/living/silicon/ai/proc/ai_actual_track(mob/living/target)
- if(!istype(target))
- return
- var/mob/living/silicon/ai/U = usr
-
- U.cameraFollow = target
- U.tracking = 1
-
- if(!target || !target.can_track(usr))
- to_chat(U, "Target is not near any active cameras.")
- U.cameraFollow = null
- return
-
- to_chat(U, "Now tracking [target.get_visible_name()] on camera.")
-
- INVOKE_ASYNC(src, PROC_REF(do_track), target, U)
-
-/mob/living/silicon/ai/proc/do_track(mob/living/target, mob/living/silicon/ai/U)
- var/cameraticks = 0
-
- while(U.cameraFollow == target)
- if(U.cameraFollow == null)
- return
-
- if(!target.can_track(usr))
- U.tracking = 1
- if(!cameraticks)
- to_chat(U, "Target is not near any active cameras. Attempting to reacquire...")
- cameraticks++
- if(cameraticks > 9)
- U.cameraFollow = null
- to_chat(U, "Unable to reacquire, cancelling track...")
- tracking = 0
- return
- else
- sleep(10)
- continue
-
- else
- cameraticks = 0
- U.tracking = 0
-
- if(U.eyeobj)
- U.eyeobj.setLoc(get_turf(target))
-
- else
- view_core()
- U.cameraFollow = null
- return
-
- sleep(10)
-
-/proc/near_camera(mob/living/M)
- if (!isturf(M.loc))
- return FALSE
- if(issilicon(M))
- var/mob/living/silicon/S = M
- if((QDELETED(S.builtInCamera) || !S.builtInCamera.can_use()) && !GLOB.cameranet.checkCameraVis(M))
- return FALSE
- else if(!GLOB.cameranet.checkCameraVis(M))
- return FALSE
- return TRUE
-
-/obj/machinery/camera/attack_ai(mob/living/silicon/ai/user)
- if (!istype(user))
- return
- if (!can_use())
- return
- user.switchCamera(src)
-
-/proc/camera_sort(list/L)
- var/obj/machinery/camera/a
- var/obj/machinery/camera/b
-
- for (var/i = L.len, i > 0, i--)
- for (var/j = 1 to i - 1)
- a = L[j]
- b = L[j + 1]
- if (sorttext(a.c_tag, b.c_tag) < 0)
- L.Swap(j, j + 1)
- return L
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
deleted file mode 100644
index bb8239adde..0000000000
--- a/code/game/machinery/cell_charger.dm
+++ /dev/null
@@ -1,131 +0,0 @@
-/obj/machinery/cell_charger
- name = "cell charger"
- desc = ""
- icon = 'icons/obj/power.dmi'
- icon_state = "ccharger"
- use_power = IDLE_POWER_USE
- idle_power_usage = 5
- active_power_usage = 60
- power_channel = EQUIP
- circuit = /obj/item/circuitboard/machine/cell_charger
- pass_flags = PASSTABLE
- var/obj/item/stock_parts/cell/charging = null
- var/charge_rate = 500
-
-/obj/machinery/cell_charger/update_overlays()
- . = ..()
-
- if(!charging)
- return
-
- . += image(charging.icon, charging.icon_state)
- . += "ccharger-on"
- if(!(stat & (BROKEN|NOPOWER)))
- var/newlevel = round(charging.percent() * 4 / 100)
- . += "ccharger-o[newlevel]"
-
-/obj/machinery/cell_charger/examine(mob/user)
- . = ..()
- . += "There's [charging ? "a" : "no"] cell in the charger."
- if(charging)
- . += "Current charge: [round(charging.percent(), 1)]%."
- if(in_range(user, src) || isobserver(user))
- . += "The status display reads: Charge rate at [charge_rate]J per cycle."
-
-/obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/stock_parts/cell) && !panel_open)
- if(stat & BROKEN)
- to_chat(user, "[src] is broken!")
- return
- if(!anchored)
- to_chat(user, "[src] isn't attached to the ground!")
- return
- if(charging)
- to_chat(user, "There is already a cell in the charger!")
- return
- else
- var/area/a = loc.loc // Gets our locations location, like a dream within a dream
- if(!isarea(a))
- return
- if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power!
- to_chat(user, "[src] blinks red as you try to insert the cell!")
- return
- if(!user.transferItemToLoc(W,src))
- return
-
- charging = W
- user.visible_message("[user] inserts a cell into [src].", "I insert a cell into [src].")
- update_icon()
- else
- if(!charging && default_deconstruction_screwdriver(user, icon_state, icon_state, W))
- return
- if(default_deconstruction_crowbar(W))
- return
- if(!charging && default_unfasten_wrench(user, W))
- return
- return ..()
-
-/obj/machinery/cell_charger/deconstruct()
- if(charging)
- charging.forceMove(drop_location())
- return ..()
-
-/obj/machinery/cell_charger/Destroy()
- QDEL_NULL(charging)
- return ..()
-
-/obj/machinery/cell_charger/proc/removecell()
- charging.update_icon()
- charging = null
- update_icon()
-
-/obj/machinery/cell_charger/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- if(!charging)
- return
-
- user.put_in_hands(charging)
- charging.add_fingerprint(user)
-
- user.visible_message("[user] removes [charging] from [src].", "I remove [charging] from [src].")
-
- removecell()
-
-/obj/machinery/cell_charger/attack_tk(mob/user)
- if(!charging)
- return
-
- charging.forceMove(loc)
- to_chat(user, "I telekinetically remove [charging] from [src].")
-
- removecell()
-
-/obj/machinery/cell_charger/attack_ai(mob/user)
- return
-
-/obj/machinery/cell_charger/emp_act(severity)
- . = ..()
-
- if(stat & (BROKEN|NOPOWER) || . & EMP_PROTECT_CONTENTS)
- return
-
- if(charging)
- charging.emp_act(severity)
-
-/obj/machinery/cell_charger/RefreshParts()
- charge_rate = 500
- for(var/obj/item/stock_parts/capacitor/C in component_parts)
- charge_rate *= C.rating
-
-/obj/machinery/cell_charger/process()
- if(!charging || !anchored || (stat & (BROKEN|NOPOWER)))
- return
-
- if(charging.percent() >= 100)
- return
- use_power(charge_rate)
- charging.give(charge_rate) //this is 2558, efficient batteries exist
-
- update_icon()
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
deleted file mode 100644
index 36c68e690f..0000000000
--- a/code/game/machinery/cloning.dm
+++ /dev/null
@@ -1,571 +0,0 @@
-//Cloning revival method.
-//The pod handles the actual cloning while the computer manages the clone profiles
-
-//Potential replacement for genetics revives or something I dunno (?)
-
-#define CLONE_INITIAL_DAMAGE 150 //Clones in clonepods start with 150 cloneloss damage and 150 brainloss damage, thats just logical
-#define MINIMUM_HEAL_LEVEL 40
-
-#define SPEAK(message) radio.talk_into(src, message, radio_channel)
-
-/obj/machinery/clonepod
- name = "cloning pod"
- desc = ""
- density = TRUE
- icon = 'icons/obj/machines/cloning.dmi'
- icon_state = "pod_0"
- req_access = list(ACCESS_CLONING) //FOR PREMATURE UNLOCKING.
- verb_say = "states"
- circuit = /obj/item/circuitboard/machine/clonepod
-
- var/heal_level //The clone is released once its health reaches this level.
- var/obj/machinery/computer/cloning/connected //So we remember the connected clone machine.
- var/mess = FALSE //Need to clean out it if it's full of exploded clone.
- var/attempting = FALSE //One clone attempt at a time thanks
- var/speed_coeff
- var/efficiency
-
- var/datum/mind/clonemind
- var/grab_ghost_when = CLONER_MATURE_CLONE
-
- var/internal_radio = TRUE
- var/obj/item/radio/radio
- var/radio_key = /obj/item/encryptionkey/headset_med
- var/radio_channel = RADIO_CHANNEL_MEDICAL
-
- var/obj/effect/countdown/clonepod/countdown
-
- var/list/unattached_flesh
- var/flesh_number = 0
- var/datum/bank_account/current_insurance
- fair_market_price = 5 // He nodded, because he knew I was right. Then he swiped his credit card to pay me for arresting him.
- payment_department = ACCOUNT_MED
-/obj/machinery/clonepod/Initialize()
- . = ..()
-
- countdown = new(src)
-
- if(internal_radio)
- radio = new(src)
- radio.keyslot = new radio_key
- radio.subspace_transmission = TRUE
- radio.canhear_range = 0
- radio.recalculateChannels()
-
-/obj/machinery/clonepod/Destroy()
- var/mob/living/mob_occupant = occupant
- go_out()
- if(mob_occupant)
- log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to Destroy().")
- QDEL_NULL(radio)
- QDEL_NULL(countdown)
- if(connected)
- connected.DetachCloner(src)
- QDEL_LIST(unattached_flesh)
- . = ..()
-
-/obj/machinery/clonepod/RefreshParts()
- speed_coeff = 0
- efficiency = 0
- for(var/obj/item/stock_parts/scanning_module/S in component_parts)
- efficiency += S.rating
- for(var/obj/item/stock_parts/manipulator/P in component_parts)
- speed_coeff += P.rating
- heal_level = (efficiency * 15) + 10
- if(heal_level < MINIMUM_HEAL_LEVEL)
- heal_level = MINIMUM_HEAL_LEVEL
- if(heal_level > 100)
- heal_level = 100
-
-/obj/machinery/clonepod/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- user.examinate(src)
-
-/obj/machinery/clonepod/attack_ai(mob/user)
- return attack_hand(user)
-
-/obj/machinery/clonepod/examine(mob/user)
- . = ..()
- . += "The linking device can be scanned with a multitool."
- if(in_range(user, src) || isobserver(user))
- . += "The status display reads: Cloning speed at [speed_coeff*50]%. Predicted amount of cellular damage: [100-heal_level]%."
- if(efficiency > 5)
- . += "Pod has been upgraded to support autoprocessing and apply beneficial mutations."
-
-//The return of data disks?? Just for transferring between genetics machine/cloning machine.
-//TO-DO: Make the genetics machine accept them.
-/obj/item/disk/data
- name = "cloning data disk"
- icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
- var/list/fields = list()
- var/list/mutations = list()
- var/max_mutations = 6
- var/read_only = FALSE //Well,it's still a floppy disk
-
-//Disk stuff.
-/obj/item/disk/data/Initialize()
- . = ..()
- icon_state = "datadisk[rand(0,6)]"
- add_overlay("datadisk_gene")
-
-/obj/item/disk/data/attack_self(mob/user)
- read_only = !read_only
- to_chat(user, "I flip the write-protect tab to [read_only ? "protected" : "unprotected"].")
-
-/obj/item/disk/data/examine(mob/user)
- . = ..()
- . += "The write-protect tab is set to [read_only ? "protected" : "unprotected"]."
-
-
-//Clonepod
-
-/obj/machinery/clonepod/examine(mob/user)
- . = ..()
- var/mob/living/mob_occupant = occupant
- if(mess)
- . += "It's filled with blood and viscera. You swear you can see it moving..."
- if(is_operational() && istype(mob_occupant))
- if(mob_occupant.stat != DEAD)
- . += "Current clone cycle is [round(get_completion())]% complete."
-
-/obj/machinery/clonepod/return_air()
- // We want to simulate the clone not being in contact with
- // the atmosphere, so we'll put them in a constant pressure
- // nitrogen. They don't need to breathe while cloning anyway.
- var/static/datum/gas_mixture/immutable/cloner/GM //global so that there's only one instance made for all cloning pods
- if(!GM)
- GM = new
- return GM
-
-/obj/machinery/clonepod/proc/get_completion()
- . = FALSE
- var/mob/living/mob_occupant = occupant
- if(mob_occupant)
- . = (100 * ((mob_occupant.health + 100) / (heal_level + 100)))
-
-/obj/machinery/clonepod/attack_ai(mob/user)
- return examine(user)
-
-//Start growing a human clone in the pod!
-/obj/machinery/clonepod/proc/growclone(clonename, ui, mutation_index, mindref, last_death, blood_type, datum/species/mrace, list/features, factions, list/quirks, datum/bank_account/insurance, list/traumas, empty)
- if(panel_open)
- return NONE
- if(mess || attempting)
- return NONE
-
- if(!empty) //Doesn't matter if we're just making a copy
- clonemind = locate(mindref) in SSticker.minds
- if(!istype(clonemind)) //not a mind
- return NONE
- if(clonemind.last_death != last_death) //The soul has advanced, the record has not.
- return NONE
- if(!QDELETED(clonemind.current))
- if(clonemind.current.stat != DEAD) //mind is associated with a non-dead body
- return NONE
- if(clonemind.current.suiciding) // Mind is associated with a body that is suiciding.
- return NONE
- if(!clonemind.active)
- // get_ghost() will fail if they're unable to reenter their body
- var/mob/dead/observer/G = clonemind.get_ghost()
- if(!G)
- return NONE
- if(G.suiciding) // The ghost came from a body that is suiciding.
- return NONE
- if(clonemind.damnation_type) //Can't clone the damned.
- INVOKE_ASYNC(src, PROC_REF(horrifyingsound))
- mess = TRUE
- icon_state = "pod_g"
- update_icon()
- return NONE
- current_insurance = insurance
- attempting = TRUE //One at a time!!
- countdown.start()
-
- var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)
-
- H.hardset_dna(ui, mutation_index, H.real_name, blood_type, mrace, features)
-
- if(!HAS_TRAIT(H, TRAIT_RADIMMUNE))//dont apply mutations if the species is Mutation proof.
- if(efficiency > 2)
- var/list/unclean_mutations = (GLOB.not_good_mutations|GLOB.bad_mutations)
- H.dna.remove_mutation_group(unclean_mutations)
- if(efficiency > 5 && prob(20))
- H.easy_randmut(POSITIVE)
- if(efficiency < 3 && prob(50))
- var/mob/M = H.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
- if(ismob(M))
- H = M
-
- H.silent = 20 //Prevents an extreme edge case where clones could speak if they said something at exactly the right moment.
- occupant = H
-
- if(!clonename) //to prevent null names
- clonename = "clone ([rand(1,999)])"
- H.real_name = clonename
-
- icon_state = "pod_1"
- //Get the clone body ready
- maim_clone(H)
- ADD_TRAIT(H, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
- ADD_TRAIT(H, TRAIT_STABLELIVER, CLONING_POD_TRAIT)
- ADD_TRAIT(H, TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
- ADD_TRAIT(H, TRAIT_MUTE, CLONING_POD_TRAIT)
- ADD_TRAIT(H, TRAIT_NOBREATH, CLONING_POD_TRAIT)
- ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
- H.Unconscious(80)
-
- if(!empty)
- clonemind.transfer_to(H)
-
- if(grab_ghost_when == CLONER_FRESH_CLONE)
- H.grab_ghost()
- to_chat(H, "Consciousness slowly creeps over you as my body regenerates. So this is what cloning feels like?")
-
- if(grab_ghost_when == CLONER_MATURE_CLONE)
- H.ghostize(TRUE) //Only does anything if they were still in their old body and not already a ghost
- to_chat(H.get_ghost(TRUE), "My body is beginning to regenerate in a cloning pod. You will become conscious when it is complete.")
-
- if(H)
- H.faction |= factions
-
- for(var/V in quirks)
- var/datum/quirk/Q = new V(H)
- Q.on_clone(quirks[V])
-
- for(var/t in traumas)
- var/datum/brain_trauma/BT = t
- var/datum/brain_trauma/cloned_trauma = BT.on_clone()
- if(cloned_trauma)
- H.gain_trauma(cloned_trauma, BT.resilience)
-
- H.set_cloned_appearance()
-
- H.set_suicide(FALSE)
- attempting = FALSE
- return CLONING_SUCCESS
-
-//Grow clones to maturity then kick them out. FREELOADERS
-/obj/machinery/clonepod/process()
- var/mob/living/mob_occupant = occupant
-
- if(!is_operational()) //Autoeject if power is lost
- if(mob_occupant)
- go_out()
- log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to power loss.")
-
- connected_message("Clone Ejected: Loss of power.")
-
- else if(mob_occupant && (mob_occupant.loc == src))
- if(SSeconomy.full_ancap)
- if(!current_insurance)
- go_out()
- log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to invalid bank account.")
- connected_message("Clone Ejected: No bank account.")
- if(internal_radio)
- SPEAK("The cloning of [mob_occupant.real_name] has been terminated due to no bank account to draw payment from.")
- else if(!current_insurance.adjust_money(-fair_market_price))
- go_out()
- log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to insufficient funds.")
- connected_message("Clone Ejected: Out of Money.")
- if(internal_radio)
- SPEAK("The cloning of [mob_occupant.real_name] has been ended prematurely due to being unable to pay.")
- else
- var/datum/bank_account/D = SSeconomy.get_dep_account(payment_department)
- if(D)
- D.adjust_money(fair_market_price)
- if(mob_occupant && (mob_occupant.stat == DEAD) || (mob_occupant.suiciding) || mob_occupant.hellbound) //Autoeject corpses and suiciding dudes.
- connected_message("Clone Rejected: Deceased.")
- if(internal_radio)
- SPEAK("The cloning of [mob_occupant.real_name] has been \
- aborted due to unrecoverable tissue failure.")
- go_out()
- log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] after suiciding.")
-
- else if(mob_occupant && mob_occupant.cloneloss > (100 - heal_level))
- mob_occupant.Unconscious(80)
- var/dmg_mult = CONFIG_GET(number/damage_multiplier)
- //Slowly get that clone healed and finished.
- mob_occupant.adjustCloneLoss(-((speed_coeff / 2) * dmg_mult))
- var/progress = CLONE_INITIAL_DAMAGE - mob_occupant.getCloneLoss()
- // To avoid the default cloner making incomplete clones
- progress += (100 - MINIMUM_HEAL_LEVEL)
- var/milestone = CLONE_INITIAL_DAMAGE / flesh_number
- var/installed = flesh_number - unattached_flesh.len
-
- if((progress / milestone) >= installed)
- // attach some flesh
- var/obj/item/I = pick_n_take(unattached_flesh)
- if(isorgan(I))
- var/obj/item/organ/O = I
- O.organ_flags &= ~ORGAN_FROZEN
- O.Insert(mob_occupant)
- else if(isbodypart(I))
- var/obj/item/bodypart/BP = I
- BP.attach_limb(mob_occupant)
-
- use_power(7500) //This might need tweaking.
-
- else if(mob_occupant && (mob_occupant.cloneloss <= (100 - heal_level)))
- connected_message("Cloning Process Complete.")
- if(internal_radio)
- SPEAK("The cloning cycle of [mob_occupant.real_name] is complete.")
-
- // If the cloner is upgraded to debugging high levels, sometimes
- // organs and limbs can be missing.
- for(var/i in unattached_flesh)
- if(isorgan(i))
- var/obj/item/organ/O = i
- O.organ_flags &= ~ORGAN_FROZEN
- O.Insert(mob_occupant)
- else if(isbodypart(i))
- var/obj/item/bodypart/BP = i
- BP.attach_limb(mob_occupant)
-
- go_out()
- log_cloning("[key_name(mob_occupant)] completed cloning cycle in [src] at [AREACOORD(src)].")
-
- else if (!mob_occupant || mob_occupant.loc != src)
- occupant = null
- if (!mess && !panel_open)
- icon_state = "pod_0"
- use_power(200)
-
-//Let's unlock this early I guess. Might be too early, needs tweaking.
-/obj/machinery/clonepod/attackby(obj/item/W, mob/user, params)
- if(!(occupant || mess))
- if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]",W))
- return
-
- if(default_deconstruction_crowbar(W))
- return
-
- if(W.tool_behaviour == TOOL_MULTITOOL)
- if(!multitool_check_buffer(user, W))
- return
- var/obj/item/multitool/P = W
-
- if(istype(P.buffer, /obj/machinery/computer/cloning))
- if(get_area(P.buffer) != get_area(src))
- to_chat(user, "-% Cannot link machines across power zones. Buffer cleared %-")
- P.buffer = null
- return
- to_chat(user, "-% Successfully linked [P.buffer] with [src] %-")
- var/obj/machinery/computer/cloning/comp = P.buffer
- if(connected)
- connected.DetachCloner(src)
- comp.AttachCloner(src)
- else
- P.buffer = src
- to_chat(user, "-% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-")
- return
-
- var/mob/living/mob_occupant = occupant
- if(W.GetID())
- if(!check_access(W))
- to_chat(user, "Access Denied.")
- return
- if(!(mob_occupant || mess))
- to_chat(user, "Error: Pod has no occupant.")
- return
- else
- add_fingerprint(user)
- connected_message("Emergency Ejection")
- SPEAK("An emergency ejection of [clonemind.name] has occurred. Survival not guaranteed.")
- to_chat(user, "I force an emergency ejection. ")
- go_out()
- log_cloning("[key_name(user)] manually ejected [key_name(mob_occupant)] from [src] at [AREACOORD(src)].")
- log_combat(user, mob_occupant, "ejected", W, "from [src]")
- else
- return ..()
-
-/obj/machinery/clonepod/emag_act(mob/user)
- if(!occupant)
- return
- to_chat(user, "I corrupt the genetic compiler.")
- malfunction()
- add_fingerprint(user)
- log_cloning("[key_name(user)] emagged [src] at [AREACOORD(src)], causing it to malfunction.")
- log_combat(user, src, "emagged", null, occupant ? "[occupant] inside, killing them via malfunction." : null)
-
-//Put messages in the connected computer's temp var for display.
-/obj/machinery/clonepod/proc/connected_message(message)
- if ((isnull(connected)) || (!istype(connected, /obj/machinery/computer/cloning)))
- return FALSE
- if (!message)
- return FALSE
-
- connected.temp = message
- connected.updateUsrDialog()
- return TRUE
-
-/obj/machinery/clonepod/proc/go_out()
- countdown.stop()
- var/mob/living/mob_occupant = occupant
- var/turf/T = get_turf(src)
-
- if(mess) //Clean that mess and dump those gibs!
- for(var/obj/fl in unattached_flesh)
- fl.forceMove(T)
- if(istype(fl, /obj/item/organ))
- var/obj/item/organ/O = fl
- O.organ_flags &= ~ORGAN_FROZEN
- unattached_flesh.Cut()
- mess = FALSE
- new /obj/effect/gibspawner/generic(get_turf(src), mob_occupant)
- audible_message("I hear a splat.")
- icon_state = "pod_0"
- return
-
- if(!mob_occupant)
- return
- current_insurance = null
- REMOVE_TRAIT(mob_occupant, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
- REMOVE_TRAIT(mob_occupant, TRAIT_STABLELIVER, CLONING_POD_TRAIT)
- REMOVE_TRAIT(mob_occupant, TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
- REMOVE_TRAIT(mob_occupant, TRAIT_MUTE, CLONING_POD_TRAIT)
- REMOVE_TRAIT(mob_occupant, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
- REMOVE_TRAIT(mob_occupant, TRAIT_NOBREATH, CLONING_POD_TRAIT)
-
- if(grab_ghost_when == CLONER_MATURE_CLONE)
- mob_occupant.grab_ghost()
- to_chat(occupant, "There is a bright flash! I feel like a new being.")
- mob_occupant.flash_act()
-
- occupant.forceMove(T)
- icon_state = "pod_0"
- mob_occupant.domutcheck(1) //Waiting until they're out before possible monkeyizing. The 1 argument forces powers to manifest.
- for(var/fl in unattached_flesh)
- qdel(fl)
- unattached_flesh.Cut()
-
- occupant = null
- clonemind = null
-
-/obj/machinery/clonepod/proc/malfunction()
- var/mob/living/mob_occupant = occupant
- if(mob_occupant)
- connected_message("Critical Error!")
- SPEAK("Critical error! Please contact a Thinktronic Systems \
- technician, as my warranty may be affected.")
- mess = TRUE
- maim_clone(mob_occupant) //Remove every bit that's grown back so far to drop later, also destroys bits that haven't grown yet
- icon_state = "pod_g"
- if(clonemind && mob_occupant.mind != clonemind)
- clonemind.transfer_to(mob_occupant)
- mob_occupant.grab_ghost() // We really just want to make you suffer.
- flash_color(mob_occupant, flash_color="#960000", flash_time=100)
- to_chat(mob_occupant, "Agony blazes across my consciousness as my body is torn apart. Is this what dying is like? Yes it is.")
- playsound(src, 'sound/blank.ogg', 50)
- SEND_SOUND(mob_occupant, sound('sound/blank.ogg',0,1,50))
- log_cloning("[key_name(mob_occupant)] destroyed within [src] at [AREACOORD(src)] due to malfunction.")
- QDEL_IN(mob_occupant, 40)
-
-/obj/machinery/clonepod/relaymove(mob/user)
- container_resist(user)
-
-/obj/machinery/clonepod/container_resist(mob/living/user)
- if(user.stat == CONSCIOUS)
- go_out()
-
-/obj/machinery/clonepod/emp_act(severity)
- . = ..()
- if (!(. & EMP_PROTECT_SELF))
- var/mob/living/mob_occupant = occupant
- if(mob_occupant && prob(100/(severity*efficiency)))
- connected_message(Gibberish("EMP-caused Accidental Ejection"))
- SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [mob_occupant.real_name] prematurely."))
- go_out()
- log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to EMP pulse.")
-
-/obj/machinery/clonepod/ex_act(severity, target)
- ..()
- if(!QDELETED(src) && occupant)
- var/mob/living/mob_occupant = occupant
- go_out()
- log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to explosion.")
-
-/obj/machinery/clonepod/handle_atom_del(atom/A)
- if(A == occupant)
- occupant = null
- countdown.stop()
-
-/obj/machinery/clonepod/proc/horrifyingsound()
- for(var/i in 1 to 5)
- playsound(src,pick('sound/blank.ogg'), 100, rand(0.95,1.05))
- sleep(1)
- sleep(10)
- playsound(src,'sound/blank.ogg', 100, TRUE)
-
-/obj/machinery/clonepod/deconstruct(disassembled = TRUE)
- if(occupant)
- var/mob/living/mob_occupant = occupant
- go_out()
- log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to deconstruction.")
- ..()
-
-/obj/machinery/clonepod/proc/maim_clone(mob/living/carbon/human/H)
- if(!unattached_flesh)
- unattached_flesh = list()
- else
- for(var/fl in unattached_flesh)
- qdel(fl)
- unattached_flesh.Cut()
-
- H.setCloneLoss(CLONE_INITIAL_DAMAGE) //Yeah, clones start with very low health, not with random, because why would they start with random health
- // In addition to being cellularly damaged, they also have no limbs or internal organs.
- // Applying brainloss is done when the clone leaves the pod, so application of traumas can happen
- // based on the level of damage sustained.
-
- if(!HAS_TRAIT(H, TRAIT_NODISMEMBER))
- var/static/list/zones = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG)
- for(var/zone in zones)
- var/obj/item/bodypart/BP = H.get_bodypart(zone)
- if(BP)
- BP.drop_limb()
- BP.forceMove(src)
- unattached_flesh += BP
-
- for(var/o in H.internal_organs)
- var/obj/item/organ/organ = o
- if(!istype(organ) || (organ.organ_flags & ORGAN_VITAL))
- continue
- organ.organ_flags |= ORGAN_FROZEN
- organ.Remove(H, special=TRUE)
- organ.forceMove(src)
- unattached_flesh += organ
-
- flesh_number = unattached_flesh.len
-
-/*
- * Manual -- A big ol' manual.
- */
-
-/obj/item/paper/guides/jobs/medical/cloning
- name = "paper - 'H-87 Cloning Apparatus Manual"
- info = {"
Getting Started
- Congratulations, my station has purchased the H-87 industrial cloning device!
- Using the H-87 is almost as simple as brain surgery! Simply insert the target humanoid into the scanning chamber and select the scan option to create a new profile!
- That's all there is to it!
- Notice, cloning system cannot scan inorganic life or small primates. Scan may fail if subject has suffered extreme brain damage.
-
Clone profiles may be viewed through the profiles menu. Scanning implants a complementary HEALTH MONITOR IMPLANT into the subject, which may be viewed from each profile.
- Profile Deletion has been restricted to \[Station Head\] level access.
-
Cloning from a profile
- Cloning is as simple as pressing the CLONE option at the bottom of the desired profile.
- Per my company's EMPLOYEE PRIVACY RIGHTS agreement, the H-87 has been blocked from cloning crewmembers while they are still alive.
-
-
The provided CLONEPOD SYSTEM will produce the desired clone. Standard clone maturation times (With SPEEDCLONE technology) are roughly 90 seconds.
- The cloning pod may be unlocked early with any \[Medical Researcher\] ID after initial maturation is complete.
- Please note that resulting clones may have a small DEVELOPMENTAL DEFECT as a result of genetic drift.
-
Profile Management
-
The H-87 (as well as my station's standard genetics machine) can accept STANDARD DATA DISKETTES.
- These diskettes are used to transfer genetic information between machines and profiles.
- A load/save dialog will become available in each profile if a disk is inserted.
"
- var/datum/browser/popup = new(user, "arcade", "Space Villain 2000")
- popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
- popup.open()
-
-/obj/machinery/computer/arcade/battle/Topic(href, href_list)
- if(..())
- return
-
- if (!blocked && !gameover)
- if (href_list["attack"])
- blocked = TRUE
- var/attackamt = rand(2,6)
- var/weapon = pick(weapons)
- temp = "You attack with a [weapon] for [attackamt] damage!"
- playsound(loc, 'sound/blank.ogg', 50, TRUE, extrarange = -3, falloff = 10)
- updateUsrDialog()
- if(turtle > 0)
- turtle--
-
- sleep(10)
- enemy_hp -= attackamt
- arcade_action(usr)
-
- else if (href_list["heal"])
- blocked = TRUE
- var/pointamt = rand(1,3)
- var/healamt = rand(6,8)
- temp = "You use [pointamt] magic to heal for [healamt] damage!"
- playsound(loc, 'sound/blank.ogg', 50, TRUE, extrarange = -3, falloff = 10)
- updateUsrDialog()
- turtle++
-
- sleep(10)
- player_mp -= pointamt
- player_hp += healamt
- blocked = TRUE
- updateUsrDialog()
- arcade_action(usr)
-
- else if (href_list["charge"])
- blocked = TRUE
- var/chargeamt = rand(4,7)
- temp = "You regain [chargeamt] points."
- playsound(loc, 'sound/blank.ogg', 50, TRUE, extrarange = -3, falloff = 10)
- player_mp += chargeamt
- if(turtle > 0)
- turtle--
-
- updateUsrDialog()
- sleep(10)
- arcade_action(usr)
-
- if (href_list["close"])
- usr.unset_machine()
- usr << browse(null, "window=arcade")
-
- else if (href_list["newgame"]) //Reset everything
- temp = "New Round"
- player_hp = 30
- player_mp = 10
- enemy_hp = 45
- enemy_mp = 20
- gameover = FALSE
- turtle = 0
-
- if(obj_flags & EMAGGED)
- Reset()
- obj_flags &= ~EMAGGED
-
- add_fingerprint(usr)
- updateUsrDialog()
- return
-
-/obj/machinery/computer/arcade/battle/proc/arcade_action(mob/user)
- if ((enemy_mp <= 0) || (enemy_hp <= 0))
- if(!gameover)
- gameover = TRUE
- temp = "[enemy_name] has fallen! Rejoice!"
- playsound(loc, 'sound/blank.ogg', 50, TRUE, extrarange = -3, falloff = 10)
-
- if(obj_flags & EMAGGED)
- new /obj/effect/spawner/newbomb/timer/syndicate(loc)
- new /obj/item/clothing/head/collectable/petehat(loc)
- message_admins("[ADMIN_LOOKUPFLW(usr)] has outbombed Cuban Pete and been awarded a bomb.")
- log_game("[key_name(usr)] has outbombed Cuban Pete and been awarded a bomb.")
- Reset()
- obj_flags &= ~EMAGGED
- else
- prizevend(user)
- SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("win", (obj_flags & EMAGGED ? "emagged":"normal")))
-
-
- else if ((obj_flags & EMAGGED) && (turtle >= 4))
- var/boomamt = rand(5,10)
- temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!"
- playsound(loc, 'sound/blank.ogg', 50, TRUE, extrarange = -3, falloff = 10)
- player_hp -= boomamt
-
- else if ((enemy_mp <= 5) && (prob(70)))
- var/stealamt = rand(2,3)
- temp = "[enemy_name] steals [stealamt] of my power!"
- playsound(loc, 'sound/blank.ogg', 50, TRUE, extrarange = -3, falloff = 10)
- player_mp -= stealamt
- updateUsrDialog()
-
- if (player_mp <= 0)
- gameover = TRUE
- sleep(10)
- temp = "You have been drained! GAME OVER"
- playsound(loc, 'sound/blank.ogg', 50, TRUE, extrarange = -3, falloff = 10)
- if(obj_flags & EMAGGED)
- usr.gib()
- SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "mana", (obj_flags & EMAGGED ? "emagged":"normal")))
-
- else if ((enemy_hp <= 10) && (enemy_mp > 4))
- temp = "[enemy_name] heals for 4 health!"
- playsound(loc, 'sound/blank.ogg', 50, TRUE, extrarange = -3, falloff = 10)
- enemy_hp += 4
- enemy_mp -= 4
-
- else
- var/attackamt = rand(3,6)
- temp = "[enemy_name] attacks for [attackamt] damage!"
- playsound(loc, 'sound/blank.ogg', 50, TRUE, extrarange = -3, falloff = 10)
- player_hp -= attackamt
-
- if ((player_mp <= 0) || (player_hp <= 0))
- gameover = TRUE
- temp = "You have been crushed! GAME OVER"
- playsound(loc, 'sound/blank.ogg', 50, TRUE, extrarange = -3, falloff = 10)
- if(obj_flags & EMAGGED)
- usr.gib()
- SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "hp", (obj_flags & EMAGGED ? "emagged":"normal")))
-
- blocked = FALSE
- return
-
-
-/obj/machinery/computer/arcade/battle/emag_act(mob/user)
- if(obj_flags & EMAGGED)
- return
- to_chat(user, "A mesmerizing Rhumba beat starts playing from the arcade machine's speakers!")
- temp = "If you die in the game, you die for real!"
- player_hp = 30
- player_mp = 10
- enemy_hp = 45
- enemy_mp = 20
- gameover = FALSE
- blocked = FALSE
-
- obj_flags |= EMAGGED
-
- enemy_name = "Cuban Pete"
- name = "Outbomb Cuban Pete"
-
-
- updateUsrDialog()
-
-
-
-// *** THE ORION TRAIL ** //
-
-/obj/item/gamer_pamphlet
- name = "pamphlet - \'Violent Video Games and You\'"
- desc = ""
- icon = 'icons/obj/bureaucracy.dmi'
- icon_state = "pamphlet"
- item_state = "paper"
- w_class = WEIGHT_CLASS_TINY
-
-
-#define ORION_TRAIL_WINTURN 9
-
-//Orion Trail Events
-#define ORION_TRAIL_RAIDERS "Raiders"
-#define ORION_TRAIL_FLUX "Interstellar Flux"
-#define ORION_TRAIL_ILLNESS "Illness"
-#define ORION_TRAIL_BREAKDOWN "Breakdown"
-#define ORION_TRAIL_LING "Changelings?"
-#define ORION_TRAIL_LING_ATTACK "Changeling Ambush"
-#define ORION_TRAIL_MALFUNCTION "Malfunction"
-#define ORION_TRAIL_COLLISION "Collision"
-#define ORION_TRAIL_SPACEPORT "Spaceport"
-#define ORION_TRAIL_BLACKHOLE "BlackHole"
-#define ORION_TRAIL_OLDSHIP "Old Ship"
-#define ORION_TRAIL_SEARCH "Old Ship Search"
-
-#define ORION_STATUS_START 1
-#define ORION_STATUS_NORMAL 2
-#define ORION_STATUS_GAMEOVER 3
-#define ORION_STATUS_MARKET 4
-
-/obj/machinery/computer/arcade/orion_trail
- name = "The Orion Trail"
- desc = ""
- icon_state = "arcade"
- circuit = /obj/item/circuitboard/computer/arcade/orion_trail
- var/busy = FALSE //prevent clickspam that allowed people to ~speedrun~ the game.
- var/engine = 0
- var/hull = 0
- var/electronics = 0
- var/food = 80
- var/fuel = 60
- var/turns = 4
- var/alive = 4
- var/eventdat = null
- var/event = null
- var/list/settlers = list("Harry","Larry","Bob")
- var/list/events = list(
- ORION_TRAIL_RAIDERS = 3,
- ORION_TRAIL_FLUX = 1,
- ORION_TRAIL_ILLNESS = 3,
- ORION_TRAIL_BREAKDOWN = 2,
- ORION_TRAIL_LING = 3,
- ORION_TRAIL_MALFUNCTION = 2,
- ORION_TRAIL_COLLISION = 1,
- ORION_TRAIL_SPACEPORT = 2,
- ORION_TRAIL_OLDSHIP = 2
- )
- var/list/stops = list()
- var/list/stopblurbs = list()
- var/lings_aboard = 0
- var/spaceport_raided = 0
- var/spaceport_freebie = 0
- var/last_spaceport_action = ""
- var/gameStatus = ORION_STATUS_START
- var/canContinueEvent = 0
-
- var/obj/item/radio/Radio
- var/list/gamers = list()
- var/killed_crew = 0
-
-
-/obj/machinery/computer/arcade/orion_trail/Initialize()
- . = ..()
- Radio = new /obj/item/radio(src)
- Radio.listening = 0
-
-/obj/machinery/computer/arcade/orion_trail/Destroy()
- QDEL_NULL(Radio)
- return ..()
-
-/obj/machinery/computer/arcade/orion_trail/kobayashi
- name = "Kobayashi Maru control computer"
- desc = ""
- icon = 'icons/obj/machines/particle_accelerator.dmi'
- icon_state = "control_boxp"
- events = list("Raiders" = 3, "Interstellar Flux" = 1, "Illness" = 3, "Breakdown" = 2, "Malfunction" = 2, "Collision" = 1, "Spaceport" = 2)
- prize_override = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1)
- settlers = list("Kirk","Worf","Gene")
-
-/obj/machinery/computer/arcade/orion_trail/Reset()
- // Sets up the main trail
- stops = list("Pluto","Asteroid Belt","Proxima Centauri","Dead Space","Rigel Prime","Tau Ceti Beta","Black Hole","Space Outpost Beta-9","Orion Prime")
- stopblurbs = list(
- "Pluto, long since occupied with long-range sensors and scanners, stands ready to, and indeed continues to probe the far reaches of the galaxy.",
- "At the edge of the Sol system lies a treacherous asteroid belt. Many have been crushed by stray asteroids and misguided judgement.",
- "The nearest star system to Sol, in ages past it stood as a reminder of the boundaries of sub-light travel, now a low-population sanctuary for adventurers and traders.",
- "This region of space is particularly devoid of matter. Such low-density pockets are known to exist, but the vastness of it is astounding.",
- "Rigel Prime, the center of the Rigel system, burns hot, basking its planetary bodies in warmth and radiation.",
- "Tau Ceti Beta has recently become a waypoint for colonists headed towards Orion. There are many ships and makeshift stations in the vicinity.",
- "Sensors indicate that a black hole's gravitational field is affecting the region of space we were headed through. We could stay of course, but risk of being overcome by its gravity, or we could change course to go around, which will take longer.",
- "You have come into range of the first man-made structure in this region of space. It has been constructed not by travellers from Sol, but by colonists from Orion. It stands as a monument to the colonists' success.",
- "You have made it to Orion! Congratulations! Your crew is one of the few to start a new foothold for mankind!"
- )
-
-/obj/machinery/computer/arcade/orion_trail/proc/newgame()
- // Set names of settlers in crew
- settlers = list()
- for(var/i = 1; i <= 3; i++)
- add_crewmember()
- add_crewmember("[usr]")
- // Re-set items to defaults
- engine = 1
- hull = 1
- electronics = 1
- food = 80
- fuel = 60
- alive = 4
- turns = 1
- event = null
- gameStatus = ORION_STATUS_NORMAL
- lings_aboard = 0
- killed_crew = 0
-
- //spaceport junk
- spaceport_raided = 0
- spaceport_freebie = 0
- last_spaceport_action = ""
-
-/obj/machinery/computer/arcade/orion_trail/proc/report_player(mob/gamer)
- if(gamers[gamer] == -2)
- return // enough harassing them
-
- if(gamers[gamer] == -1)
- say("WARNING: Continued antisocial behavior detected: Dispensing self-help literature.")
- new /obj/item/gamer_pamphlet(get_turf(src))
- gamers[gamer]--
- return
-
- if(!(gamer in gamers))
- gamers[gamer] = 0
-
- gamers[gamer]++ // How many times the player has 'prestiged' (massacred their crew)
-
- if(gamers[gamer] > 2 && prob(20 * gamers[gamer]))
-
- Radio.set_frequency(FREQ_SECURITY)
- Radio.talk_into(src, "SECURITY ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please watch for violent behavior.", FREQ_SECURITY)
-
- Radio.set_frequency(FREQ_MEDICAL)
- Radio.talk_into(src, "PSYCH ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please schedule psych evaluation.", FREQ_MEDICAL)
-
- gamers[gamer] = -1
-
- if(!isnull(GLOB.data_core.general))
- for(var/datum/data/record/R in GLOB.data_core.general)
- if(R.fields["name"] == gamer.name)
- R.fields["m_stat"] = "*Unstable*"
- return
-
-/obj/machinery/computer/arcade/orion_trail/ui_interact(mob/user)
- . = ..()
- if(fuel <= 0 || food <=0 || settlers.len == 0)
- gameStatus = ORION_STATUS_GAMEOVER
- event = null
- var/dat = ""
- if(gameStatus == ORION_STATUS_GAMEOVER)
- dat = "
Game Over
"
- dat += "Like many before you, my crew never made it to Orion, lost to space... Forever."
- if(!settlers.len)
- dat += " My entire crew died, and my ship joins the fleet of ghost-ships littering the galaxy."
- else
- if(food <= 0)
- dat += " I ran out of food and starved."
- if(obj_flags & EMAGGED)
- user.set_nutrition(0) //yeah you pretty hongry
- to_chat(user, "My body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.")
- if(fuel <= 0)
- dat += " I ran out of fuel, and drift, slowly, into a star."
- if(obj_flags & EMAGGED)
- var/mob/living/M = user
- M.adjust_fire_stacks(5)
- M.IgniteMob() //flew into a star, so you're on fire
- to_chat(user, "I feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.")
-
- if(obj_flags & EMAGGED)
- to_chat(user, "You're never going to make it to Orion...")
- user.death()
- obj_flags &= ~EMAGGED //removes the emagged status after you lose
- gameStatus = ORION_STATUS_START
- name = "The Orion Trail"
- desc = ""
-
- dat += "
"
- canContinueEvent = 1
-
- if(ORION_TRAIL_FLUX)
- eventdat += "This region of space is highly turbulent. If we go slowly we may avoid more damage, but if we keep our speed we won't waste supplies."
- eventdat += " What will you do?"
- eventdat += "
"
-
- if(ORION_TRAIL_OLDSHIP)
- eventdat += " My crew spots an old ship floating through space. It might have some supplies, but then again it looks rather unsafe."
- eventdat += "
"
- canContinueEvent = 1
-
- if(ORION_TRAIL_SEARCH)
- switch(rand(100))
- if(0 to 15)
- var/rescued = add_crewmember()
- var/oldfood = rand(1,7)
- var/oldfuel = rand(4,10)
- food += oldfood
- fuel += oldfuel
- eventdat += " As you look through it you find some supplies and a living person!"
- eventdat += " [rescued] was rescued from the abandoned ship!"
- eventdat += " I found [oldfood] Food and [oldfuel] Fuel."
- if(15 to 35)
- var/lfuel = rand(4,7)
- var/deadname = remove_crewmember()
- fuel -= lfuel
- eventdat += " [deadname] was lost deep in the wreckage, and my own vessel lost [lfuel] Fuel maneuvering to the the abandoned ship."
- if(35 to 65)
- var/oldfood = rand(5,11)
- food += oldfood
- engine++
- eventdat += " I found [oldfood] Food and some parts amongst the wreck."
- else
- eventdat += " As you look through the wreck you cannot find much of use."
- eventdat += "
"
- canContinueEvent = 1
-
- if(ORION_TRAIL_BREAKDOWN)
- eventdat += "Oh no! The engine has broken down!"
- eventdat += " I can repair it with an engine part, or you can make repairs for 3 days."
- if(engine >= 1)
- eventdat += "
"
-
- if(ORION_TRAIL_MALFUNCTION)
- eventdat += "The ship's systems are malfunctioning!"
- eventdat += " I can replace the broken electronics with spares, or you can spend 3 days troubleshooting the AI."
- if(electronics >= 1)
- eventdat += "
"
-
- if(ORION_TRAIL_COLLISION)
- eventdat += "Something hit us! Looks like there's some hull damage."
- if(prob(25))
- var/sfood = rand(5,15)
- var/sfuel = rand(5,15)
- food -= sfood
- fuel -= sfuel
- eventdat += " [sfood] Food and [sfuel] Fuel was vented out into space."
- if(prob(10))
- var/deadname = remove_crewmember()
- eventdat += " [deadname] was killed by rapid depressurization."
- eventdat += " I can repair the damage with hull plates, or you can spend the next 3 days welding scrap together."
- if(hull >= 1)
- eventdat += "
"
- canContinueEvent = 1
-
-
- if(ORION_TRAIL_SPACEPORT)
- gameStatus = ORION_STATUS_MARKET
- if(spaceport_raided)
- eventdat += "The spaceport is on high alert! You've been barred from docking by the local authorities after my failed raid."
- if(last_spaceport_action)
- eventdat += " Last Spaceport Action: [last_spaceport_action]"
- eventdat += "
"
- else
- eventdat += "Your jump into the sector yields a spaceport - a lucky find!"
- eventdat += " This spaceport is home to travellers who failed to reach Orion, but managed to find a different home..."
- eventdat += " Trading terms: FU = Fuel, FO = Food"
- if(last_spaceport_action)
- eventdat += " Last action: [last_spaceport_action]"
- eventdat += "
Crew:
"
- eventdat += english_list(settlers)
- eventdat += " Food: [food] | Fuel: [fuel]"
- eventdat += " Engine Parts: [engine] | Hull Panels: [hull] | Electronics: [electronics]"
-
-
- //If my crew is pathetic you can get freebies (provided you haven't already gotten one from this port)
- if(!spaceport_freebie && (fuel < 20 || food < 20))
- spaceport_freebie++
- var/FU = 10
- var/FO = 10
- var/freecrew = 0
- if(prob(30))
- FU = 25
- FO = 25
-
- if(prob(10))
- add_crewmember()
- freecrew++
-
- eventdat += " The traders of the spaceport take pity on you, and generously give you some free supplies! (+[FU]FU, +[FO]FO)"
- if(freecrew)
- eventdat += " I also gain a new crewmember!"
-
- fuel += FU
- food += FO
-
- //CREW INTERACTIONS
- eventdat += "
"
- for(var/ckey in team_keys[team])
- var/player_status = "Not Present"
- var/mob/M = get_mob_by_key(ckey)
- if(M)
- //Should define waiting room upper/lower corner and check if they're there instead of generic live/dead check
- if(isobserver(M))
- player_status = "Ghosted"
- else
- player_status = M.stat == DEAD ? "Dead" : "Alive"
- dat += "
[ckey] - [player_status] - "
- dat += "FLW"
- dat += "Remove"
- //Add more per player features here
- dat += "
"
- dat += "
"
- dat += "
Team Outfit : [outfits[team] ? outfits[team] : default_outfit]
"
- dat += "Load team"
- dat += "Add member"
- dat += "Change Outfit"
- //Add more per team features here
-
- dat += "Current arena: [current_arena_template]"
- dat += "
Arena List:
"
- for(var/A in arena_templates)
- dat += "[A] "
- dat += ""
- dat += "Upload new arena "
- dat += ""
- //Special actions
- dat += "Reset Arena. "
- dat += "Load random arena. "
- dat += "Spawn trophies for survivors. "
-
- var/datum/browser/popup = new(user, "arena controller", "Arena Controller", 500, 600)
- popup.set_content(dat.Join())
- popup.open()
-
-/// Arena spawnpoint
-/obj/machinery/arena_spawn
- name = "Arena Spawnpoint"
- icon = 'icons/obj/device.dmi'
- icon_state = "syndbeacon"
- resistance_flags = INDESTRUCTIBLE
- /// In case we have multiple arena controllers at once.
- var/arena_id = ARENA_DEFAULT_ID
- /// Team ID
- var/team = "default"
- /// only exist to cut down on glob.machines lookups, do not modify
- var/obj/machinery/computer/arena/_controller
-
-/obj/machinery/arena_spawn/red
- name = "Red Team Spawnpoint"
- color = "red"
- team = ARENA_RED_TEAM
-
-/obj/machinery/arena_spawn/green
- name = "Green Team Spawnpoint"
- color = "green"
- team = ARENA_GREEN_TEAM
-
-/obj/machinery/arena_spawn/proc/get_controller()
- if(_controller && !QDELETED(_controller) && _controller.arena_id == arena_id)
- return _controller
- for(var/obj/machinery/computer/arena/A in GLOB.machines)
- if(A.arena_id == arena_id)
- _controller = A
- return _controller
-
-/obj/machinery/arena_spawn/attack_ghost(mob/user)
- var/obj/machinery/computer/arena/C = get_controller()
- if(!C) //Unlinked spawn
- return
- if(C.ready_to_spawn)
- var/list/allowed_keys = C.team_keys[team]
- if(!(user.ckey in allowed_keys))
- to_chat(user,"You're not on the team list.")
- return
- C.spawn_member(src,user.ckey,team)
-
-#undef ARENA_GREEN_TEAM
-#undef ARENA_RED_TEAM
-#undef ARENA_DEFAULT_ID
-#undef ARENA_CORNER_A
-#undef ARENA_CORNER_B
diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm
deleted file mode 100644
index 2fe04f7050..0000000000
--- a/code/game/machinery/computer/atmos_alert.dm
+++ /dev/null
@@ -1,90 +0,0 @@
-/obj/machinery/computer/atmos_alert
- name = "atmospheric alert console"
- desc = ""
- circuit = /obj/item/circuitboard/computer/atmos_alert
- ui_x = 350
- ui_y = 300
- icon_screen = "alert:0"
- icon_keyboard = "atmos_key"
- var/list/priority_alarms = list()
- var/list/minor_alarms = list()
- var/receive_frequency = FREQ_ATMOS_ALARMS
- var/datum/radio_frequency/radio_connection
-
- light_color = LIGHT_COLOR_CYAN
-
-/obj/machinery/computer/atmos_alert/Initialize()
- . = ..()
- set_frequency(receive_frequency)
-
-/obj/machinery/computer/atmos_alert/Destroy()
- SSradio.remove_object(src, receive_frequency)
- return ..()
-
-/obj/machinery/computer/atmos_alert/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "atmos_alert", name, ui_x, ui_y, master_ui, state)
- ui.open()
-
-/obj/machinery/computer/atmos_alert/ui_data(mob/user)
- var/list/data = list()
-
- data["priority"] = list()
- for(var/zone in priority_alarms)
- data["priority"] += zone
- data["minor"] = list()
- for(var/zone in minor_alarms)
- data["minor"] += zone
-
- return data
-
-/obj/machinery/computer/atmos_alert/ui_act(action, params)
- if(..())
- return
- switch(action)
- if("clear")
- var/zone = params["zone"]
- if(zone in priority_alarms)
- to_chat(usr, "Priority alarm for [zone] cleared.")
- priority_alarms -= zone
- . = TRUE
- if(zone in minor_alarms)
- to_chat(usr, "Minor alarm for [zone] cleared.")
- minor_alarms -= zone
- . = TRUE
- update_icon()
-
-/obj/machinery/computer/atmos_alert/proc/set_frequency(new_frequency)
- SSradio.remove_object(src, receive_frequency)
- receive_frequency = new_frequency
- radio_connection = SSradio.add_object(src, receive_frequency, RADIO_ATMOSIA)
-
-/obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal)
- if(!signal)
- return
-
- var/zone = signal.data["zone"]
- var/severity = signal.data["alert"]
-
- if(!zone || !severity)
- return
-
- minor_alarms -= zone
- priority_alarms -= zone
- if(severity == "severe")
- priority_alarms += zone
- else if (severity == "minor")
- minor_alarms += zone
- update_icon()
- return
-
-/obj/machinery/computer/atmos_alert/update_overlays()
- . = ..()
- if(stat & (NOPOWER|BROKEN))
- return
- if(priority_alarms.len)
- . += "alert:2"
- else if(minor_alarms.len)
- . += "alert:1"
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
deleted file mode 100644
index 12a61a040f..0000000000
--- a/code/game/machinery/computer/atmos_control.dm
+++ /dev/null
@@ -1,335 +0,0 @@
-/////////////////////////////////////////////////////////////
-// AIR SENSOR (found in gas tanks)
-/////////////////////////////////////////////////////////////
-
-/obj/machinery/air_sensor
- name = "gas sensor"
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "gsensor1"
- resistance_flags = FIRE_PROOF
-
- var/on = TRUE
-
- var/id_tag
- var/frequency = FREQ_ATMOS_STORAGE
- var/datum/radio_frequency/radio_connection
-
-/obj/machinery/air_sensor/atmos/toxin_tank
- name = "plasma tank gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_TOX
-/obj/machinery/air_sensor/atmos/toxins_mixing_tank
- name = "toxins mixing gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB
-/obj/machinery/air_sensor/atmos/oxygen_tank
- name = "oxygen tank gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_O2
-/obj/machinery/air_sensor/atmos/nitrogen_tank
- name = "nitrogen tank gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_N2
-/obj/machinery/air_sensor/atmos/mix_tank
- name = "mix tank gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_MIX
-/obj/machinery/air_sensor/atmos/nitrous_tank
- name = "nitrous oxide tank gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_N2O
-/obj/machinery/air_sensor/atmos/air_tank
- name = "air mix tank gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_AIR
-/obj/machinery/air_sensor/atmos/carbon_tank
- name = "carbon dioxide tank gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_CO2
-/obj/machinery/air_sensor/atmos/incinerator_tank
- name = "incinerator chamber gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_INCINERATOR
-
-/obj/machinery/air_sensor/update_icon_state()
- icon_state = "gsensor[on]"
-
-/obj/machinery/air_sensor/process_atmos()
- if(on)
- var/datum/gas_mixture/air_sample = return_air()
-
- var/datum/signal/signal = new(list(
- "sigtype" = "status",
- "id_tag" = id_tag,
- "timestamp" = world.time,
- "pressure" = air_sample.return_pressure(),
- "temperature" = air_sample.temperature,
- "gases" = list()
- ))
- var/total_moles = air_sample.total_moles()
- if(total_moles)
- for(var/gas_id in air_sample.gases)
- var/gas_name = air_sample.gases[gas_id][GAS_META][META_GAS_NAME]
- signal.data["gases"][gas_name] = air_sample.gases[gas_id][MOLES] / total_moles * 100
-
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
-
-
-/obj/machinery/air_sensor/proc/set_frequency(new_frequency)
- SSradio.remove_object(src, frequency)
- frequency = new_frequency
- radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA)
-
-/obj/machinery/air_sensor/Initialize()
- . = ..()
- SSair.atmos_machinery += src
- set_frequency(frequency)
-
-/obj/machinery/air_sensor/Destroy()
- SSair.atmos_machinery -= src
- SSradio.remove_object(src, frequency)
- return ..()
-
-/////////////////////////////////////////////////////////////
-// GENERAL AIR CONTROL (a.k.a atmos computer)
-/////////////////////////////////////////////////////////////
-GLOBAL_LIST_EMPTY(atmos_air_controllers)
-
-/obj/machinery/computer/atmos_control
- name = "atmospherics monitoring"
- desc = ""
- icon_screen = "tank"
- icon_keyboard = "atmos_key"
- circuit = /obj/item/circuitboard/computer/atmos_control
- ui_x = 400
- ui_y = 925
-
- var/frequency = FREQ_ATMOS_STORAGE
- var/list/sensors = list(
- ATMOS_GAS_MONITOR_SENSOR_N2 = "Nitrogen Tank",
- ATMOS_GAS_MONITOR_SENSOR_O2 = "Oxygen Tank",
- ATMOS_GAS_MONITOR_SENSOR_CO2 = "Carbon Dioxide Tank",
- ATMOS_GAS_MONITOR_SENSOR_TOX = "Plasma Tank",
- ATMOS_GAS_MONITOR_SENSOR_N2O = "Nitrous Oxide Tank",
- ATMOS_GAS_MONITOR_SENSOR_AIR = "Mixed Air Tank",
- ATMOS_GAS_MONITOR_SENSOR_MIX = "Mix Tank",
- ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION = "Distribution Loop",
- ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE = "Atmos Waste Loop",
- ATMOS_GAS_MONITOR_SENSOR_INCINERATOR = "Incinerator Chamber",
- ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB = "Toxins Mixing Chamber"
- )
- var/list/sensor_information = list()
- var/datum/radio_frequency/radio_connection
-
- light_color = LIGHT_COLOR_CYAN
-
-/obj/machinery/computer/atmos_control/Initialize()
- . = ..()
- GLOB.atmos_air_controllers += src
- set_frequency(frequency)
-
-/obj/machinery/computer/atmos_control/Destroy()
- GLOB.atmos_air_controllers -= src
- SSradio.remove_object(src, frequency)
- return ..()
-
-/obj/machinery/computer/atmos_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "atmos_control", name, ui_x, ui_y, master_ui, state)
- ui.open()
-
-/obj/machinery/computer/atmos_control/ui_data(mob/user)
- var/data = list()
-
- data["sensors"] = list()
- for(var/id_tag in sensors)
- var/long_name = sensors[id_tag]
- var/list/info = sensor_information[id_tag]
- if(!info)
- continue
- data["sensors"] += list(list(
- "id_tag" = id_tag,
- "long_name" = sanitize(long_name),
- "pressure" = info["pressure"],
- "temperature" = info["temperature"],
- "gases" = info["gases"]
- ))
- return data
-
-/obj/machinery/computer/atmos_control/receive_signal(datum/signal/signal)
- if(!signal)
- return
-
- var/id_tag = signal.data["id_tag"]
- if(!id_tag || !sensors.Find(id_tag))
- return
-
- sensor_information[id_tag] = signal.data
-
-/obj/machinery/computer/atmos_control/proc/set_frequency(new_frequency)
- SSradio.remove_object(src, frequency)
- frequency = new_frequency
- radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA)
-
-//Incinerator sensor only
-/obj/machinery/computer/atmos_control/incinerator
- name = "Incinerator Air Control"
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_INCINERATOR = "Incinerator Chamber")
- circuit = /obj/item/circuitboard/computer/atmos_control/incinerator
- ui_x = 400
- ui_y = 300
-
-//Toxins mix sensor only
-/obj/machinery/computer/atmos_control/toxinsmix
- name = "Toxins Mixing Air Control"
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB = "Toxins Mixing Chamber")
- circuit = /obj/item/circuitboard/computer/atmos_control/toxinsmix
- ui_x = 400
- ui_y = 300
-
-/////////////////////////////////////////////////////////////
-// LARGE TANK CONTROL
-/////////////////////////////////////////////////////////////
-
-/obj/machinery/computer/atmos_control/tank
- var/input_tag
- var/output_tag
- frequency = FREQ_ATMOS_STORAGE
- circuit = /obj/item/circuitboard/computer/atmos_control/tank
-
- var/list/input_info
- var/list/output_info
-
- ui_x = 500
- ui_y = 315
-
-/obj/machinery/computer/atmos_control/tank/oxygen_tank
- name = "Oxygen Supply Control"
- input_tag = ATMOS_GAS_MONITOR_INPUT_O2
- output_tag = ATMOS_GAS_MONITOR_OUTPUT_O2
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_O2 = "Oxygen Tank")
- circuit = /obj/item/circuitboard/computer/atmos_control/tank/oxygen_tank
-
-/obj/machinery/computer/atmos_control/tank/toxin_tank
- name = "Plasma Supply Control"
- input_tag = ATMOS_GAS_MONITOR_INPUT_TOX
- output_tag = ATMOS_GAS_MONITOR_OUTPUT_TOX
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_TOX = "Plasma Tank")
- circuit = /obj/item/circuitboard/computer/atmos_control/tank/toxin_tank
-
-/obj/machinery/computer/atmos_control/tank/air_tank
- name = "Mixed Air Supply Control"
- input_tag = ATMOS_GAS_MONITOR_INPUT_AIR
- output_tag = ATMOS_GAS_MONITOR_OUTPUT_AIR
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_AIR = "Air Mix Tank")
- circuit = /obj/item/circuitboard/computer/atmos_control/tank/air_tank
-
-/obj/machinery/computer/atmos_control/tank/mix_tank
- name = "Gas Mix Tank Control"
- input_tag = ATMOS_GAS_MONITOR_INPUT_MIX
- output_tag = ATMOS_GAS_MONITOR_OUTPUT_MIX
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_MIX = "Gas Mix Tank")
- circuit = /obj/item/circuitboard/computer/atmos_control/tank/mix_tank
-
-/obj/machinery/computer/atmos_control/tank/nitrous_tank
- name = "Nitrous Oxide Supply Control"
- input_tag = ATMOS_GAS_MONITOR_INPUT_N2O
- output_tag = ATMOS_GAS_MONITOR_OUTPUT_N2O
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_N2O = "Nitrous Oxide Tank")
- circuit = /obj/item/circuitboard/computer/atmos_control/tank/nitrous_tank
-
-/obj/machinery/computer/atmos_control/tank/nitrogen_tank
- name = "Nitrogen Supply Control"
- input_tag = ATMOS_GAS_MONITOR_INPUT_N2
- output_tag = ATMOS_GAS_MONITOR_OUTPUT_N2
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_N2 = "Nitrogen Tank")
- circuit = /obj/item/circuitboard/computer/atmos_control/tank/nitrogen_tank
-
-/obj/machinery/computer/atmos_control/tank/carbon_tank
- name = "Carbon Dioxide Supply Control"
- input_tag = ATMOS_GAS_MONITOR_INPUT_CO2
- output_tag = ATMOS_GAS_MONITOR_OUTPUT_CO2
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_CO2 = "Carbon Dioxide Tank")
- circuit = /obj/item/circuitboard/computer/atmos_control/tank/carbon_tank
-
-// This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this
-/obj/machinery/computer/atmos_control/tank/proc/reconnect(mob/user)
- var/list/IO = list()
- var/datum/radio_frequency/freq = SSradio.return_frequency(frequency)
- var/list/devices = freq.devices["_default"]
- for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices)
- var/list/text = splittext(U.id_tag, "_")
- IO |= text[1]
- for(var/obj/machinery/atmospherics/components/unary/outlet_injector/U in devices)
- var/list/text = splittext(U.id, "_")
- IO |= text[1]
- if(!IO.len)
- to_chat(user, "No machinery detected.")
- var/S = input("Select the device set: ", "Selection", IO[1]) as anything in sortList(IO)
- if(src)
- src.input_tag = "[S]_in"
- src.output_tag = "[S]_out"
- name = "[uppertext(S)] Supply Control"
- var/list/new_devices = freq.devices["atmosia"]
- sensors.Cut()
- for(var/obj/machinery/air_sensor/U in new_devices)
- var/list/text = splittext(U.id_tag, "_")
- if(text[1] == S)
- sensors = list("[S]_sensor" = "[S] Tank")
- break
-
- for(var/obj/machinery/atmospherics/components/unary/outlet_injector/U in devices)
- U.broadcast_status()
- for(var/obj/machinery/atmospherics/components/unary/vent_pump/U in devices)
- U.broadcast_status()
-
-/obj/machinery/computer/atmos_control/tank/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "atmos_control", name, ui_x, ui_y, master_ui, state)
- ui.open()
-
-/obj/machinery/computer/atmos_control/tank/ui_data(mob/user)
- var/list/data = ..()
- data["tank"] = TRUE
- data["inputting"] = input_info ? input_info["power"] : FALSE
- data["inputRate"] = input_info ? input_info["volume_rate"] : 0
- data["outputting"] = output_info ? output_info["power"] : FALSE
- data["outputPressure"] = output_info ? output_info["internal"] : 0
-
- return data
-
-/obj/machinery/computer/atmos_control/tank/ui_act(action, params)
- if(..() || !radio_connection)
- return
- var/datum/signal/signal = new(list("sigtype" = "command", "user" = usr))
- switch(action)
- if("reconnect")
- reconnect(usr)
- . = TRUE
- if("input")
- signal.data += list("tag" = input_tag, "power_toggle" = TRUE)
- . = TRUE
- if("rate")
- var/target = text2num(params["rate"])
- if(!isnull(target))
- target = CLAMP(target, 0, MAX_TRANSFER_RATE)
- signal.data += list("tag" = input_tag, "set_volume_rate" = target)
- . = TRUE
- if("output")
- signal.data += list("tag" = output_tag, "power_toggle" = TRUE)
- . = TRUE
- if("pressure")
- var/target = text2num(params["pressure"])
- if(!isnull(target))
- target = CLAMP(target, 0, 4500)
- signal.data += list("tag" = output_tag, "set_internal_pressure" = target)
- . = TRUE
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
-
-/obj/machinery/computer/atmos_control/tank/receive_signal(datum/signal/signal)
- if(!signal)
- return
-
- var/id_tag = signal.data["tag"]
-
- if(input_tag == id_tag)
- input_info = signal.data
- else if(output_tag == id_tag)
- output_info = signal.data
- else
- ..(signal)
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
deleted file mode 100644
index 452eef980d..0000000000
--- a/code/game/machinery/computer/buildandrepair.dm
+++ /dev/null
@@ -1,143 +0,0 @@
-/obj/structure/frame/computer
- name = "computer frame"
- icon_state = "0"
- state = 0
-
-/obj/structure/frame/computer/attackby(obj/item/P, mob/user, params)
- add_fingerprint(user)
- switch(state)
- if(0)
- if(P.tool_behaviour == TOOL_WRENCH)
- to_chat(user, "I start wrenching the frame into place...")
- if(P.use_tool(src, user, 20, volume=50))
- to_chat(user, "I wrench the frame into place.")
- setAnchored(TRUE)
- state = 1
- return
- if(P.tool_behaviour == TOOL_WELDER)
- if(!P.tool_start_check(user, amount=0))
- return
-
- to_chat(user, "I start deconstructing the frame...")
- if(P.use_tool(src, user, 20, volume=50))
- to_chat(user, "I deconstruct the frame.")
- var/obj/item/stack/sheet/metal/M = new (drop_location(), 5)
- M.add_fingerprint(user)
- qdel(src)
- return
- if(1)
- if(P.tool_behaviour == TOOL_WRENCH)
- to_chat(user, "I start to unfasten the frame...")
- if(P.use_tool(src, user, 20, volume=50))
- to_chat(user, "I unfasten the frame.")
- setAnchored(FALSE)
- state = 0
- return
- if(istype(P, /obj/item/circuitboard/computer) && !circuit)
- if(!user.transferItemToLoc(P, src))
- return
- playsound(src, 'sound/blank.ogg', 50, TRUE)
- to_chat(user, "I place [P] inside the frame.")
- icon_state = "1"
- circuit = P
- circuit.add_fingerprint(user)
- return
-
- else if(istype(P, /obj/item/circuitboard) && !circuit)
- to_chat(user, "This frame does not accept circuit boards of this type!")
- return
- if(P.tool_behaviour == TOOL_SCREWDRIVER && circuit)
- P.play_tool_sound(src)
- to_chat(user, "I screw [circuit] into place.")
- state = 2
- icon_state = "2"
- return
- if(P.tool_behaviour == TOOL_CROWBAR && circuit)
- P.play_tool_sound(src)
- to_chat(user, "I remove [circuit].")
- state = 1
- icon_state = "0"
- circuit.forceMove(drop_location())
- circuit.add_fingerprint(user)
- circuit = null
- return
- if(2)
- if(P.tool_behaviour == TOOL_SCREWDRIVER && circuit)
- P.play_tool_sound(src)
- to_chat(user, "I unfasten the circuit board.")
- state = 1
- icon_state = "1"
- return
- if(istype(P, /obj/item/stack/cable_coil))
- if(!P.tool_start_check(user, amount=5))
- return
- to_chat(user, "I start adding cables to the frame...")
- if(P.use_tool(src, user, 20, volume=50, amount=5))
- if(state != 2)
- return
- to_chat(user, "I add cables to the frame.")
- state = 3
- icon_state = "3"
- return
- if(3)
- if(P.tool_behaviour == TOOL_WIRECUTTER)
- P.play_tool_sound(src)
- to_chat(user, "I remove the cables.")
- state = 2
- icon_state = "2"
- var/obj/item/stack/cable_coil/A = new (drop_location(), 5)
- A.add_fingerprint(user)
- return
-
- if(istype(P, /obj/item/stack/sheet/glass))
- if(!P.tool_start_check(user, amount=2))
- return
- playsound(src, 'sound/blank.ogg', 50, TRUE)
- to_chat(user, "I start to put in the glass panel...")
- if(P.use_tool(src, user, 20, amount=2))
- if(state != 3)
- return
- to_chat(user, "I put in the glass panel.")
- state = 4
- src.icon_state = "4"
- return
- if(4)
- if(P.tool_behaviour == TOOL_CROWBAR)
- P.play_tool_sound(src)
- to_chat(user, "I remove the glass panel.")
- state = 3
- icon_state = "3"
- var/obj/item/stack/sheet/glass/G = new(drop_location(), 2)
- G.add_fingerprint(user)
- return
- if(P.tool_behaviour == TOOL_SCREWDRIVER)
- P.play_tool_sound(src)
- to_chat(user, "I connect the monitor.")
- var/obj/B = new circuit.build_path (loc, circuit)
- B.setDir(dir)
- transfer_fingerprints_to(B)
- qdel(src)
- return
- if(user.used_intent.type == INTENT_HARM)
- return ..()
-
-
-/obj/structure/frame/computer/deconstruct(disassembled = TRUE)
- if(!(flags_1 & NODECONSTRUCT_1))
- if(state == 4)
- new /obj/item/shard(drop_location())
- new /obj/item/shard(drop_location())
- if(state >= 3)
- new /obj/item/stack/cable_coil(drop_location(), 5)
- ..()
-
-/obj/structure/frame/computer/AltClick(mob/user)
- ..()
- if(!isliving(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
- return
-
- if(anchored)
- to_chat(usr, "I must unwrench [src] before rotating it!")
- return
-
- setDir(turn(dir, -90))
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
deleted file mode 100644
index a2d379128d..0000000000
--- a/code/game/machinery/computer/camera.dm
+++ /dev/null
@@ -1,312 +0,0 @@
-/obj/machinery/computer/security
- name = "security camera console"
- desc = ""
- icon_screen = "cameras"
- icon_keyboard = "security_key"
- circuit = /obj/item/circuitboard/computer/security
- light_color = LIGHT_COLOR_RED
-
- var/last_pic = 1
- var/list/network = list("ss13")
- var/list/watchers = list() //who's using the console, associated with the camera they're on.
- var/long_ranged = FALSE
-
-/obj/machinery/computer/security/Initialize()
- . = ..()
- for(var/i in network)
- network -= i
- network += lowertext(i)
-
-/obj/machinery/computer/security/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE)
- for(var/i in network)
- network -= i
- network += "[idnum][i]"
-
-/obj/machinery/computer/security/check_eye(mob/user)
- if( (stat & (NOPOWER|BROKEN)) || user.incapacitated() || user.eye_blind )
- user.unset_machine()
- return
- if(!(user in watchers))
- user.unset_machine()
- return
- if(!watchers[user])
- user.unset_machine()
- return
- var/obj/machinery/camera/C = watchers[user]
- if(!C.can_use())
- user.unset_machine()
- return
- if(iscyborg(user) || long_ranged)
- var/list/viewing = viewers(src)
- if(!viewing.Find(user))
- user.unset_machine()
- return
- if(!issilicon(user) && !Adjacent(user))
- user.unset_machine()
- return
-
-/obj/machinery/computer/security/on_unset_machine(mob/user)
- watchers.Remove(user)
- user.reset_perspective(null)
-
-/obj/machinery/computer/security/Destroy()
- if(watchers.len)
- for(var/mob/M in watchers)
- M.unset_machine() //to properly reset the view of the users if the console is deleted.
- return ..()
-
-/obj/machinery/computer/security/interact(mob/user)
- if (stat)
- return
- if (ismob(user) && !isliving(user)) // ghosts don't need cameras
- return
- if (!network)
- user.unset_machine()
- CRASH("No camera network")
- if (!(islist(network)))
- user.unset_machine()
- CRASH("Camera network is not a list")
- if(..())
- user.unset_machine()
- return
-
- var/list/camera_list = get_available_cameras()
- if(!(user in watchers))
- for(var/Num in camera_list)
- var/obj/machinery/camera/CAM = camera_list[Num]
- if(istype(CAM))
- if(CAM.can_use())
- watchers[user] = CAM //let's give the user the first usable camera, and then let him change to the camera he wants.
- break
- if(!(user in watchers))
- user.unset_machine() // no usable camera on the network, we disconnect the user from the computer.
- return
- playsound(src, 'sound/blank.ogg', 25, FALSE)
- use_camera_console(user)
-
-/obj/machinery/computer/security/proc/use_camera_console(mob/user)
- var/list/camera_list = get_available_cameras()
- var/t = input(user, "Which camera should you change to?") as null|anything in camera_list
- if(user.machine != src) //while we were choosing we got disconnected from our computer or are using another machine.
- return
- if(!t)
- user.unset_machine()
- playsound(src, 'sound/blank.ogg', 25, FALSE)
- return
-
- var/obj/machinery/camera/C = camera_list[t]
-
- if(t == "Cancel")
- user.unset_machine()
- playsound(src, 'sound/blank.ogg', 25, FALSE)
- return
- if(C)
- var/camera_fail = 0
- if(!C.can_use() || user.machine != src || user.eye_blind || user.incapacitated())
- camera_fail = 1
- else if(iscyborg(user) || long_ranged)
- var/list/viewing = viewers(src)
- if(!viewing.Find(user))
- camera_fail = 1
- else if(!issilicon(user) && !Adjacent(user))
- camera_fail = 1
-
- if(camera_fail)
- user.unset_machine()
- return 0
-
- playsound(src, 'sound/blank.ogg', 25, FALSE)
- if(isAI(user))
- var/mob/living/silicon/ai/A = user
- A.eyeobj.setLoc(get_turf(C))
- A.client.eye = A.eyeobj
- else
- user.reset_perspective(C)
- user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static)
- user.clear_fullscreen("flash", 5)
- watchers[user] = C
- use_power(50)
- addtimer(CALLBACK(src, PROC_REF(use_camera_console), user), 5)
- else
- user.unset_machine()
-
-//returns the list of cameras accessible from this computer
-/obj/machinery/computer/security/proc/get_available_cameras()
- var/list/L = list()
- for (var/obj/machinery/camera/C in GLOB.cameranet.cameras)
- if((is_away_level(z) || is_away_level(C.z)) && (C.z != z))//if on away mission, can only receive feed from same z_level cameras
- continue
- L.Add(C)
-
- camera_sort(L)
-
- var/list/D = list()
- D["Cancel"] = "Cancel"
- for(var/obj/machinery/camera/C in L)
- if(!C.network)
- stack_trace("Camera in a cameranet has no camera network")
- continue
- if(!(islist(C.network)))
- stack_trace("Camera in a cameranet has a non-list camera network")
- continue
- var/list/tempnetwork = C.network&network
- if(tempnetwork.len)
- D["[C.c_tag][(C.status ? null : " (Deactivated)")]"] = C
- return D
-
-// SECURITY MONITORS
-
-/obj/machinery/computer/security/wooden_tv
- name = "security camera monitor"
- desc = ""
- icon_state = "television"
- icon_keyboard = null
- icon_screen = "detective_tv"
- pass_flags = PASSTABLE
-
-/obj/machinery/computer/security/mining
- name = "outpost camera console"
- desc = ""
- icon_screen = "mining"
- icon_keyboard = "mining_key"
- network = list("mine", "auxbase")
- circuit = /obj/item/circuitboard/computer/mining
-
-/obj/machinery/computer/security/research
- name = "research camera console"
- desc = ""
- network = list("rd")
- circuit = /obj/item/circuitboard/computer/research
-
-/obj/machinery/computer/security/hos
- name = "\improper Head of Security's camera console"
- desc = ""
- network = list("ss13", "labor")
- circuit = null
-
-/obj/machinery/computer/security/labor
- name = "labor camp monitoring"
- desc = ""
- network = list("labor")
- circuit = null
-
-/obj/machinery/computer/security/qm
- name = "\improper Quartermaster's camera console"
- desc = ""
- network = list("mine", "auxbase", "vault")
- circuit = null
-
-// TELESCREENS
-
-/obj/machinery/computer/security/telescreen
- name = "\improper Telescreen"
- desc = ""
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "telescreen"
- layer = SIGN_LAYER
- network = list("thunder")
- density = FALSE
- circuit = null
- light_power = 0
-
-/obj/machinery/computer/security/telescreen/update_icon_state()
- icon_state = initial(icon_state)
- if(stat & BROKEN)
- icon_state += "b"
-
-/obj/machinery/computer/security/telescreen/entertainment
- name = "entertainment monitor"
- desc = ""
- icon = 'icons/obj/status_display.dmi'
- icon_state = "entertainment_blank"
- network = list("thunder")
- density = FALSE
- circuit = null
- long_ranged = TRUE
- interaction_flags_atom = NONE // interact() is called by BigClick()
- var/icon_state_off = "entertainment_blank"
- var/icon_state_on = "entertainment"
-
-/obj/machinery/computer/security/telescreen/entertainment/Initialize()
- . = ..()
- RegisterSignal(src, COMSIG_CLICK, PROC_REF(BigClick))
-
-// Bypass clickchain to allow humans to use the telescreen from a distance
-/obj/machinery/computer/security/telescreen/entertainment/proc/BigClick()
- interact(usr)
-
-/obj/machinery/computer/security/telescreen/entertainment/proc/notify(on)
- if(on && icon_state == icon_state_off)
- say(pick(
- "Feats of bravery live now at the thunderdome!",
- "Two enter, one leaves! Tune in now!",
- "Violence like you've never seen it before!",
- "Spears! Camera! Action! LIVE NOW!"))
- icon_state = icon_state_on
- else
- icon_state = icon_state_off
-
-/obj/machinery/computer/security/telescreen/rd
- name = "\improper Research Director's telescreen"
- desc = ""
- network = list("rd", "aicore", "aiupload", "minisat", "xeno", "test")
-
-/obj/machinery/computer/security/telescreen/research
- name = "research telescreen"
- desc = ""
- network = list("rd")
-
-/obj/machinery/computer/security/telescreen/ce
- name = "\improper Chief Engineer's telescreen"
- desc = ""
- network = list("engine", "singularity", "tcomms", "minisat")
-
-/obj/machinery/computer/security/telescreen/cmo
- name = "\improper Chief Medical Officer's telescreen"
- desc = ""
- network = list("medbay")
-
-/obj/machinery/computer/security/telescreen/vault
- name = "vault monitor"
- desc = ""
- network = list("vault")
-
-/obj/machinery/computer/security/telescreen/toxins
- name = "bomb test site monitor"
- desc = ""
- network = list("toxins")
-
-/obj/machinery/computer/security/telescreen/engine
- name = "engine monitor"
- desc = ""
- network = list("engine")
-
-/obj/machinery/computer/security/telescreen/turbine
- name = "turbine monitor"
- desc = ""
- network = list("turbine")
-
-/obj/machinery/computer/security/telescreen/interrogation
- name = "interrogation room monitor"
- desc = ""
- network = list("interrogation")
-
-/obj/machinery/computer/security/telescreen/prison
- name = "prison monitor"
- desc = ""
- network = list("prison")
-
-/obj/machinery/computer/security/telescreen/auxbase
- name = "auxillary base monitor"
- desc = ""
- network = list("auxbase")
-
-/obj/machinery/computer/security/telescreen/minisat
- name = "minisat monitor"
- desc = ""
- network = list("minisat")
-
-/obj/machinery/computer/security/telescreen/aiupload
- name = "\improper AI upload monitor"
- desc = ""
- network = list("aiupload")
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
deleted file mode 100644
index aa6d6cae8d..0000000000
--- a/code/game/machinery/computer/camera_advanced.dm
+++ /dev/null
@@ -1,281 +0,0 @@
-/obj/machinery/computer/camera_advanced
- name = "advanced camera console"
- desc = ""
- icon_screen = "cameras"
- icon_keyboard = "security_key"
- var/list/z_lock = list() // Lock use to these z levels
- var/lock_override = NONE
- var/mob/camera/aiEye/remote/eyeobj
- var/mob/living/current_user = null
- var/list/networks = list("ss13")
- var/datum/action/innate/camera_off/off_action = new
- var/datum/action/innate/camera_jump/jump_action = new
- var/list/actions = list()
-
- light_color = LIGHT_COLOR_RED
-
-/obj/machinery/computer/camera_advanced/Initialize()
- . = ..()
- for(var/i in networks)
- networks -= i
- networks += lowertext(i)
- if(lock_override)
- if(lock_override & CAMERA_LOCK_STATION)
- z_lock |= SSmapping.levels_by_trait(ZTRAIT_STATION)
- if(lock_override & CAMERA_LOCK_MINING)
- z_lock |= SSmapping.levels_by_trait(ZTRAIT_MINING)
- if(lock_override & CAMERA_LOCK_CENTCOM)
- z_lock |= SSmapping.levels_by_trait(ZTRAIT_CENTCOM)
-
-/obj/machinery/computer/camera_advanced/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE)
- for(var/i in networks)
- networks -= i
- networks += "[idnum][i]"
-
-/obj/machinery/computer/camera_advanced/syndie
- icon_keyboard = "syndie_key"
- circuit = /obj/item/circuitboard/computer/advanced_camera
-
-/obj/machinery/computer/camera_advanced/syndie/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE)
- return //For syndie nuke shuttle, to spy for station.
-
-/obj/machinery/computer/camera_advanced/proc/CreateEye()
- eyeobj = new()
- eyeobj.origin = src
-
-/obj/machinery/computer/camera_advanced/proc/GrantActions(mob/living/user)
- if(off_action)
- off_action.target = user
- off_action.Grant(user)
- actions += off_action
-
- if(jump_action)
- jump_action.target = user
- jump_action.Grant(user)
- actions += jump_action
-
-/obj/machinery/proc/remove_eye_control(mob/living/user)
- CRASH("[type] does not implement ai eye handling")
-
-/obj/machinery/computer/camera_advanced/remove_eye_control(mob/living/user)
- if(!user)
- return
- for(var/V in actions)
- var/datum/action/A = V
- A.Remove(user)
- actions.Cut()
- for(var/V in eyeobj.visibleCameraChunks)
- var/datum/camerachunk/C = V
- C.remove(eyeobj)
- if(user.client)
- user.reset_perspective(null)
- if(eyeobj.visible_icon && user.client)
- user.client.images -= eyeobj.user_image
- eyeobj.eye_user = null
- user.remote_control = null
-
- current_user = null
- user.unset_machine()
- playsound(src, 'sound/blank.ogg', 25, FALSE)
-
-/obj/machinery/computer/camera_advanced/check_eye(mob/user)
- if( (stat & (NOPOWER|BROKEN)) || (!Adjacent(user) && !user.has_unlimited_silicon_privilege) || user.eye_blind || user.incapacitated() )
- user.unset_machine()
-
-/obj/machinery/computer/camera_advanced/Destroy()
- if(current_user)
- current_user.unset_machine()
- if(eyeobj)
- qdel(eyeobj)
- QDEL_LIST(actions)
- return ..()
-
-/obj/machinery/computer/camera_advanced/on_unset_machine(mob/M)
- if(M == current_user)
- remove_eye_control(M)
-
-/obj/machinery/computer/camera_advanced/proc/can_use(mob/living/user)
- return TRUE
-
-/obj/machinery/computer/camera_advanced/abductor/can_use(mob/user)
- if(!isabductor(user))
- return FALSE
- return ..()
-
-/obj/machinery/computer/camera_advanced/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- if(!is_operational()) //you cant use broken machine you chumbis
- return
- if(current_user)
- to_chat(user, "The console is already in use!")
- return
- var/mob/living/L = user
-
- if(!can_use(user))
- return
- if(!eyeobj)
- CreateEye()
-
- if(!eyeobj.eye_initialized)
- var/camera_location
- var/turf/myturf = get_turf(src)
- if(eyeobj.use_static != USE_STATIC_NONE)
- if((!z_lock.len || (myturf.z in z_lock)) && GLOB.cameranet.checkTurfVis(myturf))
- camera_location = myturf
- else
- for(var/obj/machinery/camera/C in GLOB.cameranet.cameras)
- if(!C.can_use() || z_lock.len && !(C.z in z_lock))
- continue
- var/list/network_overlap = networks & C.network
- if(network_overlap.len)
- camera_location = get_turf(C)
- break
- else
- camera_location = myturf
- if(z_lock.len && !(myturf.z in z_lock))
- camera_location = locate(round(world.maxx/2), round(world.maxy/2), z_lock[1])
-
- if(camera_location)
- eyeobj.eye_initialized = TRUE
- give_eye_control(L)
- eyeobj.setLoc(camera_location)
- else
- user.unset_machine()
- else
- give_eye_control(L)
- eyeobj.setLoc(eyeobj.loc)
-
-/obj/machinery/computer/camera_advanced/attack_robot(mob/user)
- return attack_hand(user)
-
-/obj/machinery/computer/camera_advanced/attack_ai(mob/user)
- return //AIs would need to disable their own camera procs to use the console safely. Bugs happen otherwise.
-
-/obj/machinery/computer/camera_advanced/proc/give_eye_control(mob/user)
- GrantActions(user)
- current_user = user
- eyeobj.eye_user = user
- eyeobj.name = "Camera Eye ([user.name])"
- user.remote_control = eyeobj
- user.reset_perspective(eyeobj)
- eyeobj.setLoc(eyeobj.loc)
-
-/mob/camera/aiEye/remote
- name = "Inactive Camera Eye"
- ai_detector_visible = FALSE
- var/sprint = 10
- var/cooldown = 0
- var/acceleration = 1
- var/mob/living/eye_user = null
- var/obj/machinery/origin
- var/eye_initialized = 0
- var/visible_icon = 0
- var/image/user_image = null
-
-/mob/camera/aiEye/remote/update_remote_sight(mob/living/user)
- user.see_invisible = SEE_INVISIBLE_LIVING //can't see ghosts through cameras
- user.sight = SEE_TURFS | SEE_BLACKNESS
- user.see_in_dark = 2
- return 1
-
-/mob/camera/aiEye/remote/Destroy()
- if(origin && eye_user)
- origin.remove_eye_control(eye_user,src)
- origin = null
- . = ..()
- eye_user = null
-
-/mob/camera/aiEye/remote/GetViewerClient()
- if(eye_user)
- return eye_user.client
- return null
-
-/mob/camera/aiEye/remote/setLoc(T)
- if(eye_user)
- T = get_turf(T)
- if (T)
- forceMove(T)
- else
- moveToNullspace()
- update_ai_detect_hud()
- if(use_static != USE_STATIC_NONE)
- GLOB.cameranet.visibility(src, GetViewerClient(), null, use_static)
- if(visible_icon)
- if(eye_user.client)
- eye_user.client.images -= user_image
- user_image = image(icon,loc,icon_state,FLY_LAYER)
- eye_user.client.images += user_image
-
-/mob/camera/aiEye/remote/relaymove(mob/user,direct)
- var/initial = initial(sprint)
- var/max_sprint = 50
-
- if(cooldown && cooldown < world.timeofday) // 3 seconds
- sprint = initial
-
- for(var/i = 0; i < max(sprint, initial); i += 20)
- var/turf/step = get_turf(get_step(src, direct))
- if(step)
- setLoc(step)
-
- cooldown = world.timeofday + 5
- if(acceleration)
- sprint = min(sprint + 0.5, max_sprint)
- else
- sprint = initial
-
-/datum/action/innate/camera_off
- name = "End Camera View"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "camera_off"
-
-/datum/action/innate/camera_off/Activate()
- if(!target || !isliving(target))
- return
- var/mob/living/C = target
- var/mob/camera/aiEye/remote/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/console = remote_eye.origin
- console.remove_eye_control(target)
-
-/datum/action/innate/camera_jump
- name = "Jump To Camera"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "camera_jump"
-
-/datum/action/innate/camera_jump/Activate()
- if(!target || !isliving(target))
- return
- var/mob/living/C = target
- var/mob/camera/aiEye/remote/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/origin = remote_eye.origin
-
- var/list/L = list()
-
- for (var/obj/machinery/camera/cam in GLOB.cameranet.cameras)
- if(origin.z_lock.len && !(cam.z in origin.z_lock))
- continue
- L.Add(cam)
-
- camera_sort(L)
-
- var/list/T = list()
-
- for (var/obj/machinery/camera/netcam in L)
- var/list/tempnetwork = netcam.network & origin.networks
- if (tempnetwork.len)
- T["[netcam.c_tag][netcam.can_use() ? null : " (Deactivated)"]"] = netcam
-
- playsound(origin,'sound/blank.ogg', 25, FALSE)
- var/camera = input("Choose which camera you want to view", "Cameras") as null|anything in T
- var/obj/machinery/camera/final = T[camera]
- playsound(src, "terminal_type", 25, FALSE)
- if(final)
- playsound(origin,'sound/blank.ogg', 25, FALSE)
- remote_eye.setLoc(get_turf(final))
- C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static)
- C.clear_fullscreen("flash", 3) //Shorter flash than normal since it's an ~~advanced~~ console!
- else
- playsound(origin,'sound/blank.ogg', 25, FALSE)
-
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
deleted file mode 100644
index 915c6203f0..0000000000
--- a/code/game/machinery/computer/card.dm
+++ /dev/null
@@ -1,623 +0,0 @@
-
-
-//Keeps track of the time for the ID console. Having it as a global variable prevents people from dismantling/reassembling it to
-//increase the slots of many jobs.
-GLOBAL_VAR_INIT(time_last_changed_position, 0)
-
-#define JOB_ALLOWED 1
-#define JOB_COOLDOWN -2
-#define JOB_MAX_POSITIONS -1 // Trying to reduce the number of slots below that of current holders of that job, or trying to open more slots than allowed
-#define JOB_DENIED 0
-
-/obj/machinery/computer/card
- name = "identification console"
- desc = ""
- icon_screen = "id"
- icon_keyboard = "id_key"
- req_one_access = list(ACCESS_HEADS, ACCESS_CHANGE_IDS)
- circuit = /obj/item/circuitboard/computer/card
- var/mode = 0
- var/printing = null
- var/target_dept = 0 //Which department this computer has access to. 0=all departments
-
- //Cooldown for closing positions in seconds
- //if set to -1: No cooldown... probably a bad idea
- //if set to 0: Not able to close "original" positions. You can only close positions that you have opened before
- var/change_position_cooldown = 30
- //Jobs you cannot open new positions for
- var/list/blacklisted = list(
- "AI",
- "Assistant",
- "Cyborg",
- "Captain",
- "Head of Personnel",
- "Head of Security",
- "Chief Engineer",
- "Research Director",
- "Chief Medical Officer")
-
- //The scaling factor of max total positions in relation to the total amount of people on board the station in %
- var/max_relative_positions = 30 //30%: Seems reasonable, limit of 6 @ 20 players
-
- //This is used to keep track of opened positions for jobs to allow instant closing
- //Assoc array: "JobName" = (int)
- var/list/opened_positions = list()
- var/obj/item/card/id/inserted_scan_id
- var/obj/item/card/id/inserted_modify_id
- var/list/region_access = null
- var/list/head_subordinates = null
-
- light_color = LIGHT_COLOR_BLUE
-
-/obj/machinery/computer/card/proc/get_jobs()
- return get_all_jobs()
-
-/obj/machinery/computer/card/centcom/get_jobs()
- return get_all_centcom_jobs()
-
-/obj/machinery/computer/card/Initialize()
- . = ..()
- change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay)
-
-/obj/machinery/computer/card/examine(mob/user)
- . = ..()
- if(inserted_scan_id || inserted_modify_id)
- . += "Alt-click to eject the ID card."
-
-/obj/machinery/computer/card/attackby(obj/I, mob/user, params)
- if(isidcard(I))
- if(check_access(I) && !inserted_scan_id)
- if(id_insert(user, I, inserted_scan_id))
- inserted_scan_id = I
- updateUsrDialog()
- else if(id_insert(user, I, inserted_modify_id))
- inserted_modify_id = I
- updateUsrDialog()
- else
- return ..()
-
-/obj/machinery/computer/card/Destroy()
- if(inserted_scan_id)
- qdel(inserted_scan_id)
- inserted_scan_id = null
- if(inserted_modify_id)
- qdel(inserted_modify_id)
- inserted_modify_id = null
- return ..()
-
-/obj/machinery/computer/card/handle_atom_del(atom/A)
- ..()
- if(A == inserted_scan_id)
- inserted_scan_id = null
- updateUsrDialog()
- if(A == inserted_modify_id)
- inserted_modify_id = null
- updateUsrDialog()
-
-/obj/machinery/computer/card/on_deconstruction()
- if(inserted_scan_id)
- inserted_scan_id.forceMove(drop_location())
- inserted_scan_id = null
- if(inserted_modify_id)
- inserted_modify_id.forceMove(drop_location())
- inserted_modify_id = null
-
-//Check if you can't open a new position for a certain job
-/obj/machinery/computer/card/proc/job_blacklisted(jobtitle)
- return (jobtitle in blacklisted)
-
-//Logic check for Topic() if you can open the job
-/obj/machinery/computer/card/proc/can_open_job(datum/job/job)
- if(job)
- if(!job_blacklisted(job.title))
- if((job.total_positions <= GLOB.player_list.len * (max_relative_positions / 100)))
- var/delta = (world.time / 10) - GLOB.time_last_changed_position
- if((change_position_cooldown < delta) || (opened_positions[job.title] < 0))
- return JOB_ALLOWED
- return JOB_COOLDOWN
- return JOB_MAX_POSITIONS
- return JOB_DENIED
-
-//Logic check for Topic() if you can close the job
-/obj/machinery/computer/card/proc/can_close_job(datum/job/job)
- if(job)
- if(!job_blacklisted(job.title))
- if(job.total_positions > job.current_positions)
- var/delta = (world.time / 10) - GLOB.time_last_changed_position
- if((change_position_cooldown < delta) || (opened_positions[job.title] > 0))
- return JOB_ALLOWED
- return JOB_COOLDOWN
- return JOB_MAX_POSITIONS
- return JOB_DENIED
-
-
-/obj/machinery/computer/card/proc/id_insert(mob/user, obj/item/inserting_item, obj/item/target)
- var/obj/item/card/id/card_to_insert = inserting_item
- var/holder_item = FALSE
-
- if(!isidcard(card_to_insert))
- card_to_insert = inserting_item.RemoveID()
- holder_item = TRUE
-
- if(!card_to_insert || !user.transferItemToLoc(card_to_insert, src))
- return FALSE
-
- if(target)
- if(holder_item && inserting_item.InsertID(target))
- playsound(src, 'sound/blank.ogg', 50, FALSE)
- else
- id_eject(user, target)
-
- user.visible_message("[user] inserts \the [card_to_insert] into \the [src].",
- "I insert \the [card_to_insert] into \the [src].")
- playsound(src, 'sound/blank.ogg', 50, FALSE)
- updateUsrDialog()
- return TRUE
-
-/obj/machinery/computer/card/proc/id_eject(mob/user, obj/target)
- if(!target)
- to_chat(user, "That slot is empty!")
- return FALSE
- else
- target.forceMove(drop_location())
- if(!issilicon(user) && Adjacent(user))
- user.put_in_hands(target)
- user.visible_message("[user] gets \the [target] from \the [src].", \
- "I get \the [target] from \the [src].")
- playsound(src, 'sound/blank.ogg', 50, FALSE)
- updateUsrDialog()
- return TRUE
-
-/obj/machinery/computer/card/AltClick(mob/user)
- ..()
- if(!user.canUseTopic(src, !issilicon(user)) || !is_operational())
- return
- if(inserted_modify_id)
- if(id_eject(user, inserted_modify_id))
- inserted_modify_id = null
- updateUsrDialog()
- return
- if(inserted_scan_id)
- if(id_eject(user, inserted_scan_id))
- inserted_scan_id = null
- updateUsrDialog()
- return
-
-/obj/machinery/computer/card/ui_interact(mob/user)
- . = ..()
- var/list/dat = list()
- if (mode == 1) // accessing crew manifest
- dat += "Crew Manifest: Please use security record computer to modify entries.
"
- for(var/datum/data/record/t in sortRecord(GLOB.data_core.general))
- dat += {"[t.fields["name"]] - [t.fields["rank"]] "}
- dat += "Print
[accesses.Join()]" //CHECK THIS
-
- else if (!authenticated)
- body = {"Log In
- Access Crew Manifest "}
- if(!target_dept)
- body += "Job Management"
-
- dat = list("", header.Join(), body, " ")
- var/datum/browser/popup = new(user, "id_com", src.name, 900, 620)
- popup.set_content(dat.Join())
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
- popup.open()
-
-/obj/machinery/computer/card/Topic(href, href_list)
- if(..())
- return
-
- if(!usr.canUseTopic(src, !issilicon(usr)) || !is_operational())
- usr.unset_machine()
- usr << browse(null, "window=id_com")
- return
-
- usr.set_machine(src)
- switch(href_list["choice"])
- if ("inserted_modify_id")
- if(inserted_modify_id && !usr.get_active_held_item())
- if(id_eject(usr, inserted_modify_id))
- inserted_modify_id = null
- updateUsrDialog()
- return
- if(usr.get_id_in_hand())
- var/obj/item/held_item = usr.get_active_held_item()
- var/obj/item/card/id/id_to_insert = held_item.GetID()
- if(id_insert(usr, held_item, inserted_modify_id))
- inserted_modify_id = id_to_insert
- updateUsrDialog()
- if ("inserted_scan_id")
- if(inserted_scan_id && !usr.get_active_held_item())
- if(id_eject(usr, inserted_scan_id))
- inserted_scan_id = null
- updateUsrDialog()
- return
- if(usr.get_id_in_hand())
- var/obj/item/held_item = usr.get_active_held_item()
- var/obj/item/card/id/id_to_insert = held_item.GetID()
- if(id_insert(usr, held_item, inserted_scan_id))
- inserted_scan_id = id_to_insert
- updateUsrDialog()
- if ("auth")
- if ((!( authenticated ) && (inserted_scan_id || issilicon(usr)) || mode))
- if (check_access(inserted_scan_id))
- region_access = list()
- head_subordinates = list()
- if(ACCESS_CHANGE_IDS in inserted_scan_id.access)
- if(target_dept)
- head_subordinates = get_all_jobs()
- region_access |= target_dept
- authenticated = 1
- else
- authenticated = 2
- playsound(src, 'sound/blank.ogg', 50, FALSE)
-
- else
- if((ACCESS_HOP in inserted_scan_id.access) && ((target_dept==1) || !target_dept))
- region_access |= 1
- region_access |= 6
- get_subordinates("Head of Personnel")
- if((ACCESS_HOS in inserted_scan_id.access) && ((target_dept==2) || !target_dept))
- region_access |= 2
- get_subordinates("Head of Security")
- if((ACCESS_CMO in inserted_scan_id.access) && ((target_dept==3) || !target_dept))
- region_access |= 3
- get_subordinates("Chief Medical Officer")
- if((ACCESS_RD in inserted_scan_id.access) && ((target_dept==4) || !target_dept))
- region_access |= 4
- get_subordinates("Research Director")
- if((ACCESS_CE in inserted_scan_id.access) && ((target_dept==5) || !target_dept))
- region_access |= 5
- get_subordinates("Chief Engineer")
- if(region_access)
- authenticated = 1
- else if ((!( authenticated ) && issilicon(usr)) && (!inserted_modify_id))
- to_chat(usr, "I can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in.")
- if ("logout")
- region_access = null
- head_subordinates = null
- authenticated = 0
- playsound(src, 'sound/blank.ogg', 50, FALSE)
-
- if("access")
- if(href_list["allowed"])
- if(authenticated)
- var/access_type = text2num(href_list["access_target"])
- var/access_allowed = text2num(href_list["allowed"])
- if(access_type in (istype(src, /obj/machinery/computer/card/centcom)?get_all_centcom_access() : get_all_accesses()))
- inserted_modify_id.access -= access_type
- if(access_allowed == 1)
- inserted_modify_id.access += access_type
- playsound(src, "terminal_type", 50, FALSE)
- if ("assign")
- if (authenticated == 2)
- var/t1 = href_list["assign_target"]
- if(t1 == "Custom")
- var/newJob = reject_bad_text(input("Enter a custom job assignment.", "Assignment", inserted_modify_id ? inserted_modify_id.assignment : "Unassigned"), MAX_NAME_LEN)
- if(newJob)
- t1 = newJob
-
- else if(t1 == "Unassigned")
- inserted_modify_id.access -= get_all_accesses()
-
- else
- var/datum/job/jobdatum
- for(var/jobtype in typesof(/datum/job))
- var/datum/job/J = new jobtype
- if(ckey(J.title) == ckey(t1))
- jobdatum = J
- updateUsrDialog()
- break
- if(!jobdatum)
- to_chat(usr, "No log exists for this job.")
- updateUsrDialog()
- return
- if(inserted_modify_id.registered_account)
- inserted_modify_id.registered_account.account_job = jobdatum // this is a terrible idea and people will grief but sure whatever
-
- inserted_modify_id.access = ( istype(src, /obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access() )
- if (inserted_modify_id)
- inserted_modify_id.assignment = t1
- playsound(src, 'sound/blank.ogg', 50, FALSE)
- if ("demote")
- if((inserted_modify_id.assignment in head_subordinates) || inserted_modify_id.assignment == "Assistant")
- inserted_modify_id.assignment = "Unassigned"
- playsound(src, 'sound/blank.ogg', 50, FALSE)
- else
- to_chat(usr, "I are not authorized to demote this position.")
- if ("reg")
- if (authenticated)
- var/t2 = inserted_modify_id
- if ((authenticated && inserted_modify_id == t2 && (in_range(src, usr) || issilicon(usr)) && isturf(loc)))
- var/newName = reject_bad_name(href_list["reg"])
- if(newName)
- inserted_modify_id.registered_name = newName
- playsound(src, 'sound/blank.ogg', 50, FALSE)
- else
- to_chat(usr, "Invalid name entered.")
- updateUsrDialog()
- return
- if ("mode")
- mode = text2num(href_list["mode_target"])
-
- if("return")
- //DISPLAY MAIN MENU
- mode = 3;
- playsound(src, "terminal_type", 25, FALSE)
-
- if("make_job_available")
- // MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS
- if(authenticated && !target_dept)
- var/edit_job_target = href_list["job"]
- var/datum/job/j = SSjob.GetJob(edit_job_target)
- if(!j)
- updateUsrDialog()
- return 0
- if(can_open_job(j) != 1)
- updateUsrDialog()
- return 0
- if(opened_positions[edit_job_target] >= 0)
- GLOB.time_last_changed_position = world.time / 10
- j.total_positions++
- opened_positions[edit_job_target]++
- playsound(src, 'sound/blank.ogg', 50, FALSE)
-
- if("make_job_unavailable")
- // MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS
- if(authenticated && !target_dept)
- var/edit_job_target = href_list["job"]
- var/datum/job/j = SSjob.GetJob(edit_job_target)
- if(!j)
- updateUsrDialog()
- return 0
- if(can_close_job(j) != 1)
- updateUsrDialog()
- return 0
- //Allow instant closing without cooldown if a position has been opened before
- if(opened_positions[edit_job_target] <= 0)
- GLOB.time_last_changed_position = world.time / 10
- j.total_positions--
- opened_positions[edit_job_target]--
- playsound(src, 'sound/blank.ogg', 50, FALSE)
-
- if ("prioritize_job")
- // TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY
- if(authenticated && !target_dept)
- var/priority_target = href_list["job"]
- var/datum/job/j = SSjob.GetJob(priority_target)
- if(!j)
- updateUsrDialog()
- return 0
- var/priority = TRUE
- if(j in SSjob.prioritized_jobs)
- SSjob.prioritized_jobs -= j
- priority = FALSE
- else if(j.total_positions <= j.current_positions)
- to_chat(usr, "[j.title] has had all positions filled. Open up more slots before prioritizing it.")
- updateUsrDialog()
- return
- else
- SSjob.prioritized_jobs += j
- to_chat(usr, "[j.title] has been successfully [priority ? "prioritized" : "unprioritized"]. Potential employees will notice your request.")
- playsound(src, 'sound/blank.ogg', 50, FALSE)
-
- if ("print")
- if (!( printing ))
- printing = 1
- sleep(50)
- var/obj/item/paper/P = new /obj/item/paper( loc )
- var/t1 = "Crew Manifest: "
- for(var/datum/data/record/t in sortRecord(GLOB.data_core.general))
- t1 += t.fields["name"] + " - " + t.fields["rank"] + " "
- P.info = t1
- P.name = "paper- 'Crew Manifest'"
- printing = null
- playsound(src, 'sound/blank.ogg', 50, FALSE)
- if (inserted_modify_id)
- inserted_modify_id.update_label()
- updateUsrDialog()
-
-/obj/machinery/computer/card/proc/get_subordinates(rank)
- for(var/datum/job/job in SSjob.occupations)
- if(rank in job.department_head)
- head_subordinates += job.title
-
-/obj/machinery/computer/card/centcom
- name = "\improper CentCom identification console"
- circuit = /obj/item/circuitboard/computer/card/centcom
- req_access = list(ACCESS_CENT_CAPTAIN)
-
-/obj/machinery/computer/card/minor
- name = "department management console"
- desc = ""
- icon_screen = "idminor"
- circuit = /obj/item/circuitboard/computer/card/minor
-
-/obj/machinery/computer/card/minor/Initialize()
- . = ..()
- var/obj/item/circuitboard/computer/card/minor/typed_circuit = circuit
- if(target_dept)
- typed_circuit.target_dept = target_dept
- else
- target_dept = typed_circuit.target_dept
- var/list/dept_list = list("general","security","medical","science","engineering")
- name = "[dept_list[target_dept]] department console"
-
-/obj/machinery/computer/card/minor/hos
- target_dept = 2
- icon_screen = "idhos"
-
- light_color = LIGHT_COLOR_RED
-
-/obj/machinery/computer/card/minor/cmo
- target_dept = 3
- icon_screen = "idcmo"
-
-/obj/machinery/computer/card/minor/rd
- target_dept = 4
- icon_screen = "idrd"
-
- light_color = LIGHT_COLOR_PINK
-
-/obj/machinery/computer/card/minor/ce
- target_dept = 5
- icon_screen = "idce"
-
- light_color = LIGHT_COLOR_YELLOW
-
-#undef JOB_ALLOWED
-#undef JOB_COOLDOWN
-#undef JOB_MAX_POSITIONS
-#undef JOB_DENIED
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
deleted file mode 100644
index a11f4afe5e..0000000000
--- a/code/game/machinery/computer/cloning.dm
+++ /dev/null
@@ -1,627 +0,0 @@
-#define AUTOCLONING_MINIMAL_LEVEL 3
-
-/obj/machinery/computer/cloning
- name = "cloning console"
- desc = ""
- icon_screen = "dna"
- icon_keyboard = "med_key"
- circuit = /obj/item/circuitboard/computer/cloning
- req_access = list(ACCESS_GENETICS) //for modifying records
- var/obj/machinery/dna_scannernew/scanner //Linked scanner. For scanning.
- var/list/pods //Linked cloning pods
- var/temp = "Inactive"
- var/scantemp_ckey
- var/scantemp = "Ready to Scan"
- var/menu = 1 //Which menu screen to display
- var/list/records = list()
- var/datum/data/record/active_record
- var/obj/item/disk/data/diskette //Incompatible format to genetics machine
- //select which parts of the diskette to load
- var/include_se = FALSE //mutations
- var/include_ui = FALSE //appearance
- var/include_ue = FALSE //blood type, UE, and name
-
- var/loading = FALSE // Nice loading text
- var/autoprocess = FALSE
-
- light_color = LIGHT_COLOR_BLUE
-
-/obj/machinery/computer/cloning/Initialize()
- . = ..()
- updatemodules(TRUE)
-
-/obj/machinery/computer/cloning/Destroy()
- if(pods)
- for(var/P in pods)
- DetachCloner(P)
- pods = null
- return ..()
-
-/obj/machinery/computer/cloning/proc/GetAvailablePod(mind = null)
- if(pods)
- for(var/P in pods)
- var/obj/machinery/clonepod/pod = P
- if(pod.occupant && mind && pod.clonemind == mind)
- return null
- if(pod.is_operational() && !(pod.occupant || pod.mess))
- return pod
-
-/obj/machinery/computer/cloning/proc/HasEfficientPod()
- if(pods)
- for(var/P in pods)
- var/obj/machinery/clonepod/pod = P
- if(pod.is_operational() && pod.efficiency > 5)
- return TRUE
-
-/obj/machinery/computer/cloning/proc/GetAvailableEfficientPod(mind = null)
- if(pods)
- for(var/P in pods)
- var/obj/machinery/clonepod/pod = P
- if(pod.occupant && pod.clonemind == mind)
- return pod
- else if(!. && pod.is_operational() && !(pod.occupant || pod.mess) && pod.efficiency > 5)
- . = pod
-
-/proc/grow_clone_from_record(obj/machinery/clonepod/pod, datum/data/record/R, empty)
- return pod.growclone(R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mindref"], R.fields["last_death"], R.fields["blood_type"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], R.fields["bank_account"], R.fields["traumas"], empty)
-
-/obj/machinery/computer/cloning/process()
- if(!(scanner && LAZYLEN(pods) && autoprocess))
- return
-
- if(scanner.occupant && scanner.scan_level > 2)
- scan_occupant(scanner.occupant)
-
- for(var/datum/data/record/R in records)
- var/obj/machinery/clonepod/pod = GetAvailableEfficientPod(R.fields["mindref"])
-
- if(!pod)
- return
-
- if(pod.occupant)
- break
-
- var/result = grow_clone_from_record(pod, R)
- if(result & CLONING_SUCCESS)
- temp = "[R.fields["name"]] => Cloning cycle in progress..."
- log_cloning("Cloning of [key_name(R.fields["mindref"])] automatically started via autoprocess - [src] at [AREACOORD(src)]. Pod: [pod] at [AREACOORD(pod)].")
- if(result & CLONING_DELETE_RECORD)
- records -= R
-
-
-/obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner)
- scanner = findscanner()
- if(findfirstcloner && !LAZYLEN(pods))
- findcloner()
- if(!autoprocess)
- STOP_PROCESSING(SSmachines, src)
- else
- START_PROCESSING(SSmachines, src)
-
-/obj/machinery/computer/cloning/proc/findscanner()
- var/obj/machinery/dna_scannernew/scannerf = null
-
- // Loop through every direction
- for(var/direction in GLOB.cardinals)
-
- // Try to find a scanner in that direction
- scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, direction))
-
- // If found and operational, return the scanner
- if (!isnull(scannerf) && scannerf.is_operational())
- return scannerf
-
- // If no scanner was found, it will return null
- return null
-
-/obj/machinery/computer/cloning/proc/findcloner()
- var/obj/machinery/clonepod/podf = null
-
- for(var/direction in GLOB.cardinals)
-
- podf = locate(/obj/machinery/clonepod, get_step(src, direction))
- if (!isnull(podf) && podf.is_operational())
- AttachCloner(podf)
-
-/obj/machinery/computer/cloning/proc/AttachCloner(obj/machinery/clonepod/pod)
- if(!pod.connected)
- pod.connected = src
- LAZYADD(pods, pod)
-
-/obj/machinery/computer/cloning/proc/DetachCloner(obj/machinery/clonepod/pod)
- pod.connected = null
- LAZYREMOVE(pods, pod)
-
-/obj/machinery/computer/cloning/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/disk/data)) //INSERT SOME DISKETTES
- if (!diskette)
- if (!user.transferItemToLoc(W,src))
- return
- diskette = W
- to_chat(user, "I insert [W].")
- playsound(src, 'sound/blank.ogg', 50, FALSE)
- updateUsrDialog()
- else if(W.tool_behaviour == TOOL_MULTITOOL)
- if(!multitool_check_buffer(user, W))
- return
- var/obj/item/multitool/P = W
-
- if(istype(P.buffer, /obj/machinery/clonepod))
- if(get_area(P.buffer) != get_area(src))
- to_chat(user, "-% Cannot link machines across power zones. Buffer cleared %-")
- P.buffer = null
- return
- to_chat(user, "-% Successfully linked [P.buffer] with [src] %-")
- var/obj/machinery/clonepod/pod = P.buffer
- if(pod.connected)
- pod.connected.DetachCloner(pod)
- AttachCloner(pod)
- else
- P.buffer = src
- to_chat(user, "-% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-")
- return
- else
- return ..()
-
-/obj/machinery/computer/cloning/ui_interact(mob/user)
- . = ..()
-
- updatemodules(TRUE)
-
- var/dat = ""
- dat += "Refresh"
-
- if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL)
- if(!autoprocess)
- dat += "Autoprocess"
- else
- dat += "Stop autoprocess"
- else
- dat += "Autoprocess"
- dat += "
Cloning Pod Status
"
- dat += "
[temp]
"
- switch(menu)
- if(1)
- // Modules
- if (isnull(scanner) || !LAZYLEN(pods))
- dat += "
Modules
"
- //dat += "Reload Modules"
- if (isnull(scanner))
- dat += "ERROR: No Scanner detected! "
- if (!LAZYLEN(pods))
- dat += "ERROR: No Pod detected "
-
- // Scanner
- if (!isnull(scanner))
- var/mob/living/scanner_occupant = get_mob_or_brainmob(scanner.occupant)
-
- dat += "
Scanner Functions
"
-
- dat += "
"
- if(!scanner_occupant)
- dat += "Scanner Unoccupied"
- else if(loading)
- dat += "[scanner_occupant] => Scanning..."
- else
- if(scanner_occupant.ckey != scantemp_ckey)
- scantemp = "Ready to Scan"
- scantemp_ckey = scanner_occupant.ckey
- dat += "[scanner_occupant] => [scantemp]"
- dat += "
"
- if (records.len && records.len > 0)
- dat += "View Records ([records.len]) "
- else
- dat += "View Records (0) "
- if (diskette)
- dat += "Eject Disk "
-
-
-
- if(2)
- dat += "