Your station has been selected to carry out the Gateway Project.
The equipment will be shipped to you at the start of the next quarter. You are to prepare a secure location to house the equipment as outlined in the attached documents.
", "\[cell\]")
text = replacetext(text, "", "\[logo\]")
return text
+
+#define string2charlist(string) (splittext(string, regex("(\\x0A|.)")) - splittext(string, ""))
\ No newline at end of file
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index b58ea20dbae..35d271461df 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -170,9 +170,12 @@ Turf and target are seperate in case you want to teleport some distance from a t
// Checks if doors are open
/proc/DirBlocked(turf/loc,var/dir)
for(var/obj/structure/window/D in loc)
- if(!D.density) continue
- if(D.is_fulltile()) return 1
- if(D.dir == dir) return 1
+ if(!D.density)
+ continue
+ if(D.fulltile)
+ return 1
+ if(D.dir == dir)
+ return 1
for(var/obj/machinery/door/D in loc)
if(!D.density)//if the door is open
@@ -394,6 +397,16 @@ Turf and target are seperate in case you want to teleport some distance from a t
moblist.Add(M)
return moblist
+// Format a power value in W, kW, MW, or GW.
+/proc/DisplayPower(powerused)
+ if(powerused < 1000) //Less than a kW
+ return "[powerused] W"
+ else if(powerused < 1000000) //Less than a MW
+ return "[round((powerused * 0.001), 0.01)] kW"
+ else if(powerused < 1000000000) //Less than a GW
+ return "[round((powerused * 0.000001), 0.001)] MW"
+ return "[round((powerused * 0.000000001), 0.0001)] GW"
+
//E = MC^2
/proc/convert2energy(var/M)
var/E = M*(SPEED_OF_LIGHT_SQ)
@@ -1042,6 +1055,8 @@ proc/get_mob_with_client_list()
//Find coordinates
var/turf/T = get_turf(AM) //use AM's turfs, as it's coords are the same as AM's AND AM's coords are lost if it is inside another atom
+ if(!T)
+ return null
var/final_x = T.x + rough_x
var/final_y = T.y + rough_y
@@ -1490,6 +1505,22 @@ var/mob/dview/dview_mob = new
return TRUE
return FALSE
+//can a window be here, or is there a window blocking it?
+/proc/valid_window_location(turf/T, dir_to_check)
+ 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)
+ return FALSE
+ return TRUE
//Get the dir to the RIGHT of dir if they were on a clock
//NORTH --> NORTHEAST
@@ -1928,4 +1959,7 @@ var/mob/dview/dview_mob = new
CRASH(msg)
/datum/proc/stack_trace(msg)
- CRASH(msg)
\ No newline at end of file
+ CRASH(msg)
+
+/proc/pass()
+ return
\ No newline at end of file
diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm
index d26dc711339..1e35e150a25 100644
--- a/code/_globalvars/configuration.dm
+++ b/code/_globalvars/configuration.dm
@@ -2,6 +2,7 @@ var/datum/configuration/config = null
var/host = null
var/join_motd = null
+GLOBAL_VAR(join_tos)
var/game_version = "Custom ParaCode"
var/changelog_hash = md5('html/changelog.html') //used to check if the CL changed
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 0cc712799c7..5a025702877 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -1,5 +1,5 @@
var/global/list/portals = list() //for use by portals
-var/global/list/cable_list = list() //Index for all cables, so that powernets don't have to look through the entire world all the time
+GLOBAL_LIST(cable_list) //Index for all cables, so that powernets don't have to look through the entire world all the time
var/global/list/chemical_reactions_list //list of all /datum/chemical_reaction datums. Used during chemical reactions
var/global/list/chemical_reagents_list //list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff
var/global/list/landmarks_list = list() //list of all landmarks created
@@ -17,7 +17,6 @@ var/global/list/cell_logs = list()
var/global/list/all_areas = list()
var/global/list/machines = list()
-var/global/list/machine_processing = list()
var/global/list/fast_processing = list()
var/global/list/processing_power_items = list() //items that ask to be called every cycle
var/global/list/rcd_list = list() //list of Rapid Construction Devices.
diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm
index f96e83cb7a1..c48600ca40c 100644
--- a/code/_globalvars/logging.dm
+++ b/code/_globalvars/logging.dm
@@ -10,7 +10,6 @@ GLOBAL_VAR(world_href_log)
GLOBAL_PROTECT(world_href_log)
var/list/jobMax = list()
-var/list/bombers = list( )
var/list/admin_log = list ( )
var/list/lastsignalers = list( ) //keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]"
var/list/lawchanges = list( ) //Stores who uploaded laws to which silicon-based lifeform, and what the law was
@@ -20,4 +19,4 @@ var/list/IClog = list()
var/list/OOClog = list()
var/list/adminlog = list()
-var/list/investigate_log_subjects = list("notes", "watchlist", "hrefs")
\ No newline at end of file
+var/list/investigate_log_subjects = list("notes", "watchlist", "hrefs")
diff --git a/code/_globalvars/station.dm b/code/_globalvars/station.dm
index 6d2578e5b88..2d635996b30 100644
--- a/code/_globalvars/station.dm
+++ b/code/_globalvars/station.dm
@@ -3,11 +3,4 @@ var/global/datum/datacore/data_core = null
var/CELLRATE = 0.002 // multiplier for watts per tick <> cell storage (eg: .002 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
var/CHARGELEVEL = 0.001 // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second)
-var/list/powernets = list()
-var/list/deferred_powernet_rebuilds = list()
-
-// this is not strictly unused although the whole modules datum thing is unused
-// To remove this you need to remove that
-var/datum/moduletypes/mods = new()
-
var/map_name = "Unknown" //The name of the map that is loaded. Assigned in world/New()
\ No newline at end of file
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index d88ff6201f8..b2521527a98 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -35,6 +35,17 @@
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("[key_name_admin(src)] might be running a modified client! (failed can_see on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))")
+ var/message = "[key_name(src)] might be running a modified client! (failed can_see on AI click of [A]([COORD(pixel_turf)]))"
+ log_admin(message)
+ send2irc_adminless_only("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))")
+
+
var/turf_visible
if(pixel_turf)
turf_visible = cameranet.checkTurfVis(pixel_turf)
@@ -157,9 +168,6 @@
return
/atom/proc/AICtrlClick(var/mob/living/silicon/ai/user)
- if(user.holo)
- var/obj/machinery/hologram/holopad/H = user.holo
- H.face_atom(src)
return
/obj/machinery/door/airlock/AICtrlClick() // Bolts doors
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index f300608e699..9679935bdaa 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -70,6 +70,12 @@
changeNext_click(1)
var/list/modifiers = params2list(params)
+ if(modifiers["middle"] && modifiers["shift"] && modifiers["ctrl"])
+ MiddleShiftControlClickOn(A)
+ return
+ if(modifiers["middle"] && modifiers["shift"])
+ MiddleShiftClickOn(A)
+ return
if(modifiers["shift"] && modifiers["ctrl"])
CtrlShiftClickOn(A)
return
@@ -225,6 +231,32 @@
else
..()
+/*
+ Middle shift-click
+ Makes the mob face the direction of the clicked thing
+*/
+/mob/proc/MiddleShiftClickOn(atom/A)
+ var/face_dir = get_cardinal_dir(src, A)
+ if(forced_look == face_dir)
+ forced_look = null
+ to_chat(src, "You are no longer facing any direction.")
+ return
+ forced_look = face_dir
+ to_chat(src, "You are now facing [dir2text(forced_look)].")
+
+/*
+ Middle shift-control-click
+ Makes the mob constantly face the object (until it's out of sight)
+*/
+/mob/proc/MiddleShiftControlClickOn(atom/A)
+ var/face_uid = A.UID()
+ if(forced_look == face_uid)
+ forced_look = null
+ to_chat(src, "You are no longer facing [A].")
+ return
+ forced_look = face_uid
+ to_chat(src, "You are now facing [A].")
+
// In case of use break glass
/*
/atom/proc/MiddleClick(var/mob/M as mob)
diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm
index 5fb4757a74f..7dfa8020cb8 100644
--- a/code/_onclick/click_override.dm
+++ b/code/_onclick/click_override.dm
@@ -39,7 +39,7 @@
var/atom/movable/newObject = new summon_path
newObject.loc = get_turf(A)
to_chat(user, "You release the power you had stored up, summoning \a [newObject.name]! ")
- usr.loc.visible_message("[user] waves \his hand and summons \a [newObject.name]")
+ usr.loc.visible_message("[user] waves [user.p_their()] hand and summons \a [newObject.name]")
..()
/datum/middleClickOverride/power_gloves
diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index 315fce5bf65..668e0e67fc7 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -11,6 +11,8 @@
/obj/screen/movable
var/snap2grid = FALSE
var/moved = FALSE
+ var/x_off = -16
+ var/y_off = -16
//Snap Screen Object
//Tied to the grid, snaps to the nearest turf
@@ -39,8 +41,8 @@
screen_loc = "[screen_loc_X[1]],[screen_loc_Y[1]]"
else //Normalise Pixel Values (So the object drops at the center of the mouse, not 16 pixels off)
- var/pix_X = text2num(screen_loc_X[2]) - 16
- var/pix_Y = text2num(screen_loc_Y[2]) - 16
+ var/pix_X = text2num(screen_loc_X[2]) + x_off
+ var/pix_Y = text2num(screen_loc_Y[2]) + y_off
screen_loc = "[screen_loc_X[1]]:[pix_X],[screen_loc_Y[1]]:[pix_Y]"
moved = screen_loc
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 6a658886f83..ddd6e14a5b0 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -62,11 +62,11 @@
user.lastattacked = M
M.lastattacker = user
- if(user != M)
- user.do_attack_animation(M)
+ user.do_attack_animation(M)
M.attacked_by(src, user, def_zone)
- add_attack_logs(user, M, "Attacked with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", admin_notify = (force > 0 && damtype != STAMINA))
+ add_attack_logs(user, M, "Attacked with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", (M.ckey && force > 0 && damtype != STAMINA) ? null : ATKLOG_ALMOSTALL)
+
add_fingerprint(user)
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 87b78259593..dcac994c7c7 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -12,6 +12,11 @@
if(proximity && istype(G) && G.Touch(A, 1))
return
+ if(HULK in mutations)
+ if(proximity) //no telekinetic hulk attack
+ if(A.attack_hulk(src))
+ return
+
A.attack_hand(src)
/atom/proc/attack_hand(mob/user as mob)
diff --git a/code/controllers/Processes/machinery.dm b/code/controllers/Processes/machinery.dm
deleted file mode 100644
index 2466f802740..00000000000
--- a/code/controllers/Processes/machinery.dm
+++ /dev/null
@@ -1,74 +0,0 @@
-/var/global/machinery_sort_required = 0
-
-/datum/controller/process/machinery/setup()
- name = "machinery"
- schedule_interval = 20 // every 2 seconds
- start_delay = 12
-
-/datum/controller/process/machinery/statProcess()
- ..()
- stat(null, "[machine_processing.len] machines")
- stat(null, "[powernets.len] powernets, [deferred_powernet_rebuilds.len] deferred")
-
-/datum/controller/process/machinery/doWork()
- process_sort()
- process_power()
- process_power_drain()
- process_machines()
-
-/datum/controller/process/machinery/proc/process_sort()
- if(machinery_sort_required)
- machinery_sort_required = 0
- machine_processing = dd_sortedObjectList(machine_processing)
-
-/datum/controller/process/machinery/proc/process_machines()
- for(last_object in machine_processing)
- var/obj/machinery/M = last_object
- if(istype(M) && !QDELETED(M))
- try
- if(M.process() == PROCESS_KILL)
- machine_processing.Remove(M)
- continue
-
- if(M.use_power)
- M.auto_use_power()
- catch(var/exception/e)
- catchException(e, M)
- else
- catchBadType(M)
- machine_processing -= M
-
- SCHECK
-
-/datum/controller/process/machinery/proc/process_power()
- for(last_object in deferred_powernet_rebuilds)
- var/obj/O = last_object
- if(istype(O) && !QDELETED(O))
- try
- var/datum/powernet/newPN = new()// creates a new powernet...
- propagate_network(O, newPN)//... and propagates it to the other side of the cable
- catch(var/exception/e)
- catchException(e, O)
- SCHECK
- else
- catchBadType(O)
- deferred_powernet_rebuilds -= O
-
- for(last_object in powernets)
- var/datum/powernet/powerNetwork = last_object
- if(istype(powerNetwork) && !QDELETED(powerNetwork))
- try
- powerNetwork.reset()
- catch(var/exception/e)
- catchException(e, powerNetwork)
- SCHECK
- else
- catchBadType(powerNetwork)
- powernets -= powerNetwork
-
-/datum/controller/process/machinery/proc/process_power_drain()
- // Currently only used by powersinks. These items get priority processed before machinery
- for(var/obj/item/I in processing_power_items)
- if(!I.pwr_drain()) // 0 = Process Kill, remove from processing list.
- processing_power_items.Remove(I)
- SCHECK
diff --git a/code/controllers/Processes/mob.dm b/code/controllers/Processes/mob.dm
deleted file mode 100644
index 2b11eff99be..00000000000
--- a/code/controllers/Processes/mob.dm
+++ /dev/null
@@ -1,35 +0,0 @@
-var/global/datum/controller/process/mob/mob_master
-
-/datum/controller/process/mob
- var/current_cycle
-
-/datum/controller/process/mob/setup()
- name = "mob"
- schedule_interval = 20 // every 2 seconds
- start_delay = 16
- log_startup_progress("Mob ticker starting up.")
-
-/datum/controller/process/mob/started()
- ..()
- if(!mob_list)
- mob_list = list()
-
-/datum/controller/process/mob/statProcess()
- ..()
- stat(null, "[mob_list.len] mobs")
-
-/datum/controller/process/mob/doWork()
- for(last_object in mob_list)
- var/mob/M = last_object
- if(istype(M) && !QDELETED(M))
- try
- M.Life()
- catch(var/exception/e)
- catchException(e, M)
- SCHECK
- else
- catchBadType(M)
- mob_list -= M
- current_cycle++
-
-DECLARE_GLOBAL_CONTROLLER(mob, mob_master)
diff --git a/code/controllers/Processes/nanoui.dm b/code/controllers/Processes/nanoui.dm
deleted file mode 100644
index 1667af943da..00000000000
--- a/code/controllers/Processes/nanoui.dm
+++ /dev/null
@@ -1,19 +0,0 @@
-/datum/controller/process/nanoui/setup()
- name = "nanoui"
- schedule_interval = 20 // every 2 seconds
-
-/datum/controller/process/nanoui/statProcess()
- ..()
- stat(null, "[nanomanager.processing_uis.len] UIs")
-
-/datum/controller/process/nanoui/doWork()
- for(last_object in nanomanager.processing_uis)
- var/datum/nanoui/NUI = last_object
- if(istype(NUI) && isnull(NUI.gcDestroyed))
- try
- NUI.process()
- catch(var/exception/e)
- catchException(e, NUI)
- else
- catchBadType(NUI)
- nanomanager.processing_uis -= NUI
diff --git a/code/controllers/Processes/weather.dm b/code/controllers/Processes/weather.dm
deleted file mode 100644
index 919352313c6..00000000000
--- a/code/controllers/Processes/weather.dm
+++ /dev/null
@@ -1,54 +0,0 @@
-//Used for all kinds of weather, ex. lavaland ash storms.
-// TODO: This could probably be better-integrated with the space manager
-var/global/datum/controller/process/weather/weather_master
-
-/datum/controller/process/weather
- var/list/processing_weather = list()
- var/list/existing_weather = list()
- var/list/eligible_zlevels = list()
-
-/datum/controller/process/weather/setup()
- name = "weather"
- schedule_interval = 10
-
- for(var/V in subtypesof(/datum/weather))
- var/datum/weather/W = V
- existing_weather |= new W
-
-/datum/controller/process/weather/statProcess()
- ..()
- stat(null, "[processing_weather.len] weather")
-
-/datum/controller/process/weather/doWork()
- for(var/V in processing_weather)
- var/datum/weather/W = V
- if(W.aesthetic)
- continue
- for(var/mob/living/L in mob_list)
- if(W.can_impact(L))
- W.impact(L)
- SCHECK
- for(var/Z in eligible_zlevels)
- var/list/possible_weather_for_this_z = list()
- for(var/V in existing_weather)
- var/datum/weather/WE = V
- if(WE.target_z == Z && WE.probability) //Another check so that it doesn't run extra weather
- possible_weather_for_this_z[WE] = WE.probability
- var/datum/weather/W = pickweight(possible_weather_for_this_z)
- run_weather(W.name)
- eligible_zlevels -= Z
- addtimer(CALLBACK(src, .proc/make_z_eligible, Z), rand(3000, 6000) + W.weather_duration_upper, TIMER_UNIQUE) //Around 5-10 minutes between weathers
-
-DECLARE_GLOBAL_CONTROLLER(weather, weather_master)
-
-/datum/controller/process/weather/proc/run_weather(weather_name)
- if(!weather_name)
- return
- for(var/V in existing_weather)
- var/datum/weather/W = V
- if(W.name == weather_name)
- W.telegraph()
- SCHECK
-
-/datum/controller/process/weather/proc/make_z_eligible(zlevel)
- eligible_zlevels |= zlevel
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 3b5e4a6e707..9cb84f26aa5 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -62,7 +62,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
var/static/current_ticklimit = TICK_LIMIT_RUNNING
/datum/controller/master/New()
- makeDatumRefLists()
//temporary file used to record errors with loading config, moved to log directory once logging is set up
GLOB.config_error_log = GLOB.world_game_log = GLOB.world_runtime_log = "data/logs/config_error.log"
load_configuration()
diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 11cd37343fe..7606149c39d 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -56,8 +56,7 @@ var/global/pipe_processing_killed = 0
space_manager.do_transition_setup()
- setup_objects()
- setupgenetics()
+ setup_asset_cache()
setupfactions()
setup_economy()
@@ -66,20 +65,8 @@ var/global/pipe_processing_killed = 0
populate_spawn_points()
-/datum/controller/game_controller/proc/setup_objects()
+/datum/controller/game_controller/proc/setup_asset_cache()
var/watch = start_watch()
- var/count = 0
- var/overwatch = start_watch() // Overall.
-
log_startup_progress("Populating asset cache...")
populate_asset_cache()
- log_startup_progress(" Populated [asset_cache.len] assets in [stop_watch(watch)]s.")
-
- watch = start_watch()
- log_startup_progress("Initializing objects...")
- for(var/atom/movable/object in world)
- object.initialize()
- count++
- log_startup_progress(" Initialized [count] objects in [stop_watch(watch)]s.")
-
- log_startup_progress("Finished object initializations in [stop_watch(overwatch)]s.")
+ log_startup_progress(" Populated [asset_cache.len] assets in [stop_watch(watch)]s.")
\ No newline at end of file
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index 4b1d59fa82e..b2b0e63d99b 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -171,7 +171,7 @@
statclick = new/obj/effect/statclick/debug(src, "Initializing...")
if(can_fire && !(SS_NO_FIRE & flags))
- msg = "[round(cost, 1)]ms|[round(tick_usage, 1)]%([round(tick_overrun, 1)]%)|[round(ticks, 0.1)]\t[msg]"
+ msg = "[round(cost, 1)]ms | [round(tick_usage, 1)]%([round(tick_overrun, 1)]%) | [round(ticks, 0.1)]\t[msg]"
else
msg = "OFFLINE\t[msg]"
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index bf791e61519..d46ec164e35 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -320,15 +320,15 @@ SUBSYSTEM_DEF(air)
var/watch = start_watch()
var/count = 0
log_startup_progress("Initializing atmospherics machinery...")
- for(var/obj/machinery/atmospherics/unary/U in machines)
- if(istype(U, /obj/machinery/atmospherics/unary/vent_pump))
- var/obj/machinery/atmospherics/unary/vent_pump/T = U
+ for(var/obj/machinery/atmospherics/A in machines)
+ A.atmos_init()
+ count++
+ if(istype(A, /obj/machinery/atmospherics/unary/vent_pump))
+ var/obj/machinery/atmospherics/unary/vent_pump/T = A
T.broadcast_status()
- count++
- else if(istype(U, /obj/machinery/atmospherics/unary/vent_scrubber))
- var/obj/machinery/atmospherics/unary/vent_scrubber/T = U
+ else if(istype(A, /obj/machinery/atmospherics/unary/vent_scrubber))
+ var/obj/machinery/atmospherics/unary/vent_scrubber/T = A
T.broadcast_status()
- count++
log_startup_progress(" Initialized [count] atmospherics machines in [stop_watch(watch)]s.")
//this can't be done with setup_atmos_machinery() because
@@ -341,7 +341,7 @@ SUBSYSTEM_DEF(air)
for(var/obj/machinery/atmospherics/machine in machines)
machine.build_network()
count++
- log_startup_progress(" Initialized [count] pipes in [stop_watch(watch)]s.")
+ log_startup_progress(" Initialized [count] pipenets in [stop_watch(watch)]s.")
/datum/controller/subsystem/air/proc/setup_overlays()
plmaster = new /obj/effect/overlay()
@@ -367,5 +367,5 @@ SUBSYSTEM_DEF(air)
#undef SSAIR_ACTIVETURFS
#undef SSAIR_EXCITEDGROUPS
#undef SSAIR_HIGHPRESSURE
-#undef SSAIR_HOTSPOT
+#undef SSAIR_HOTSPOTS
#undef SSAIR_SUPERCONDUCTIVITY
diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
new file mode 100644
index 00000000000..c3943ea9163
--- /dev/null
+++ b/code/controllers/subsystem/atoms.dm
@@ -0,0 +1,120 @@
+#define BAD_INIT_QDEL_BEFORE 1
+#define BAD_INIT_DIDNT_INIT 2
+#define BAD_INIT_SLEPT 4
+#define BAD_INIT_NO_HINT 8
+
+SUBSYSTEM_DEF(atoms)
+ name = "Atoms"
+ init_order = INIT_ORDER_ATOMS
+ flags = SS_NO_FIRE
+
+ var/old_initialized
+
+ var/list/late_loaders
+ var/list/created_atoms
+
+ var/list/BadInitializeCalls = list()
+
+
+/datum/controller/subsystem/atoms/Initialize(timeofday)
+ setupgenetics()
+ initialized = INITIALIZATION_INNEW_MAPLOAD
+ InitializeAtoms()
+
+
+
+/datum/controller/subsystem/atoms/proc/InitializeAtoms(list/atoms)
+ if(initialized == INITIALIZATION_INSSATOMS)
+ return
+
+ initialized = INITIALIZATION_INNEW_MAPLOAD
+
+ LAZYINITLIST(late_loaders)
+
+ var/watch = start_watch()
+ log_startup_progress("Initializing atoms...")
+ var/count
+ var/list/mapload_arg = list(TRUE)
+ if(atoms)
+ created_atoms = list()
+ count = atoms.len
+ for(var/I in atoms)
+ var/atom/A = I
+ if(!A.initialized)
+ if(InitAtom(I, mapload_arg))
+ atoms -= I
+ CHECK_TICK
+ else
+ count = 0
+ for(var/atom/A in world)
+ if(!A.initialized)
+ InitAtom(A, mapload_arg)
+ ++count
+ CHECK_TICK
+
+ log_startup_progress(" Initialized [count] atoms in [stop_watch(watch)]s")
+ pass(count)
+
+ initialized = INITIALIZATION_INNEW_REGULAR
+
+ if(late_loaders.len)
+ watch = start_watch()
+ log_startup_progress("Late-initializing atoms...")
+ for(var/I in late_loaders)
+ var/atom/A = I
+ A.LateInitialize()
+ log_startup_progress(" Late initialized [late_loaders.len] atoms in [stop_watch(watch)]s")
+ late_loaders.Cut()
+
+ if(atoms)
+ . = created_atoms + atoms
+ created_atoms = null
+
+/datum/controller/subsystem/atoms/proc/InitAtom(atom/A, list/arguments)
+ var/the_type = A.type
+ if(QDELING(A))
+ BadInitializeCalls[the_type] |= BAD_INIT_QDEL_BEFORE
+ return TRUE
+
+ var/start_tick = world.time
+
+ var/result = A.Initialize(arglist(arguments))
+
+ if(start_tick != world.time)
+ BadInitializeCalls[the_type] |= BAD_INIT_SLEPT
+
+ var/qdeleted = FALSE
+
+ if(result != INITIALIZE_HINT_NORMAL)
+ switch(result)
+ if(INITIALIZE_HINT_LATELOAD)
+ if(arguments[1]) //mapload
+ late_loaders += A
+ else
+ A.LateInitialize()
+ if(INITIALIZE_HINT_QDEL)
+ qdel(A)
+ qdeleted = TRUE
+ else
+ BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT
+
+ if(!A) //possible harddel
+ qdeleted = TRUE
+ else if(!A.initialized)
+ BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT
+
+ return qdeleted || QDELING(A)
+
+/datum/controller/subsystem/atoms/proc/map_loader_begin()
+ old_initialized = initialized
+ initialized = INITIALIZATION_INSSATOMS
+
+/datum/controller/subsystem/atoms/proc/map_loader_stop()
+ initialized = old_initialized
+
+/datum/controller/subsystem/atoms/Recover()
+ initialized = SSatoms.initialized
+ if(initialized == INITIALIZATION_INNEW_MAPLOAD)
+ InitializeAtoms()
+ old_initialized = SSatoms.old_initialized
+ BadInitializeCalls = SSatoms.BadInitializeCalls
\ No newline at end of file
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 067114e52be..823294e4d4e 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -43,20 +43,20 @@ SUBSYSTEM_DEF(garbage)
var/list/counts = list()
for(var/list/L in queues)
counts += length(L)
- msg += "Q:[counts.Join(",")]|D:[delslasttick]|G:[gcedlasttick]|"
+ msg += "Queue:[counts.Join(",")] | Del's:[delslasttick] | Soft:[gcedlasttick] |"
msg += "GR:"
if(!(delslasttick + gcedlasttick))
msg += "n/a|"
else
- msg += "[round((gcedlasttick / (delslasttick + gcedlasttick)) * 100, 0.01)]%|"
+ msg += "[round((gcedlasttick / (delslasttick + gcedlasttick)) * 100, 0.01)]% |"
- msg += "TD:[totaldels]|TG:[totalgcs]|"
+ msg += "Total Dels:[totaldels] | Soft:[totalgcs] |"
if(!(totaldels + totalgcs))
msg += "n/a|"
else
- msg += "TGR:[round((totalgcs / (totaldels + totalgcs)) * 100, 0.01)]%"
- msg += " P:[pass_counts.Join(",")]"
- msg += "|F:[fail_counts.Join(",")]"
+ msg += "TGR:[round((totalgcs / (totaldels + totalgcs)) * 100, 0.01)]% |"
+ msg += " Pass:[pass_counts.Join(",")]"
+ msg += " | Fail:[fail_counts.Join(",")]"
..(msg)
/* TO-DO
diff --git a/code/controllers/subsystem/machinery.dm b/code/controllers/subsystem/machinery.dm
new file mode 100644
index 00000000000..a3e4d4bdb0c
--- /dev/null
+++ b/code/controllers/subsystem/machinery.dm
@@ -0,0 +1,145 @@
+#define SSMACHINES_DEFERREDPOWERNETS 1
+#define SSMACHINES_POWERNETS 2
+#define SSMACHINES_PREMACHINERY 3
+#define SSMACHINES_MACHINERY 4
+SUBSYSTEM_DEF(machines)
+ name = "Machines"
+ init_order = INIT_ORDER_MACHINES
+ flags = SS_KEEP_TIMING
+
+ var/list/processing = list()
+ var/list/currentrun = list()
+ var/list/powernets = list()
+ var/list/deferred_powernet_rebuilds = list()
+
+ var/currentpart = SSMACHINES_DEFERREDPOWERNETS
+
+/datum/controller/subsystem/machines/Initialize()
+ makepowernets()
+ fire()
+ ..()
+
+/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()
+ ..("Machines: [processing.len]\nPowernets: [powernets.len]\tDeferred: [deferred_powernet_rebuilds.len]")
+
+/datum/controller/subsystem/machines/proc/process_defered_powernets(resumed = 0)
+ if(!resumed)
+ src.currentrun = deferred_powernet_rebuilds.Copy()
+ //cache for sanid speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ while(currentrun.len)
+ var/obj/O = currentrun[currentrun.len]
+ currentrun.len--
+ if(O)
+ var/datum/powernet/newPN = new() // create a new powernet...
+ propagate_network(O, newPN)//... and propagate it to the other side of the cable
+
+ deferred_powernet_rebuilds.Remove(O)
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/machines/proc/process_powernets(resumed = 0)
+ if(!resumed)
+ src.currentrun = powernets.Copy()
+ //cache for sanid speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ while(currentrun.len)
+ var/datum/powernet/P = currentrun[currentrun.len]
+ currentrun.len--
+ if(P)
+ P.reset() // reset the power state
+ else
+ powernets.Remove(P)
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/machines/proc/process_premachines(resumed = 0)
+ /* Literally exists as snowflake for fucking powersinks goddamnit */
+ if(!resumed)
+ src.currentrun = processing_power_items.Copy()
+ //cache for sanid speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ while(currentrun.len)
+ var/obj/item/I = currentrun[currentrun.len]
+ currentrun.len--
+ if(!QDELETED(I))
+ if(!I.pwr_drain())
+ processing_power_items.Remove(I)
+ else
+ processing_power_items.Remove(I)
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/machines/proc/process_machines(resumed = 0)
+ var/seconds = wait * 0.1
+ if(!resumed)
+ src.currentrun = processing.Copy()
+ //cache for sanic speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ while(currentrun.len)
+ var/obj/machinery/thing = currentrun[currentrun.len]
+ currentrun.len--
+ if(!QDELETED(thing) && thing.process(seconds) != PROCESS_KILL)
+ if(thing.use_power)
+ thing.auto_use_power() //add back the power state
+ else
+ processing -= thing
+ if(!QDELETED(thing))
+ thing.isprocessing = FALSE
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/machines/fire(resumed = 0)
+ if(currentpart == SSMACHINES_DEFERREDPOWERNETS || !resumed)
+ process_defered_powernets(resumed)
+ if(state != SS_RUNNING)
+ return
+ resumed = 0
+ currentpart = SSMACHINES_POWERNETS
+
+ if(currentpart == SSMACHINES_POWERNETS || !resumed)
+ process_powernets(resumed)
+ if(state != SS_RUNNING)
+ return
+ resumed = 0
+ currentpart = SSMACHINES_PREMACHINERY
+
+ if(currentpart == SSMACHINES_PREMACHINERY || !resumed)
+ process_premachines(resumed)
+ if(state != SS_RUNNING)
+ return
+ resumed = 0
+ currentpart = SSMACHINES_MACHINERY
+
+ if(currentpart == SSMACHINES_MACHINERY || !resumed)
+ process_machines(resumed)
+ if(state != SS_RUNNING)
+ return
+ resumed = 0
+ currentpart = SSMACHINES_DEFERREDPOWERNETS
+
+
+/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/mobs.dm b/code/controllers/subsystem/mobs.dm
new file mode 100644
index 00000000000..03989d24af2
--- /dev/null
+++ b/code/controllers/subsystem/mobs.dm
@@ -0,0 +1,28 @@
+SUBSYSTEM_DEF(mobs)
+ name = "Mobs"
+ priority = FIRE_PRIORITY_MOBS
+ flags = SS_KEEP_TIMING | SS_NO_INIT
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+
+ var/list/currentrun = list()
+
+/datum/controller/subsystem/mobs/stat_entry()
+ ..("P:[mob_list.len]")
+
+/datum/controller/subsystem/mobs/fire(resumed = 0)
+ var/seconds = wait * 0.1
+ if(!resumed)
+ src.currentrun = mob_list.Copy()
+
+ //cache for sanic speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ var/times_fired = src.times_fired
+ while(currentrun.len)
+ var/mob/M = currentrun[currentrun.len]
+ currentrun.len--
+ if(M)
+ M.Life(seconds, times_fired)
+ else
+ mob_list.Remove(M)
+ if(MC_TICK_CHECK)
+ return
\ No newline at end of file
diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
new file mode 100644
index 00000000000..92254454219
--- /dev/null
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -0,0 +1,38 @@
+//Used to process objects. Fires once every second.
+
+//TODO: Implement fully when process scheduler dies
+/*
+SUBSYSTEM_DEF(processing)
+ name = "Processing"
+ priority = FIRE_PRIORITY_PROCESS
+ flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
+ wait = 10
+
+ var/stat_tag = "P" //Used for logging
+ var/list/processing = list()
+ var/list/currentrun = list()
+
+/datum/controller/subsystem/processing/stat_entry()
+ ..("[stat_tag]:[processing.len]")
+
+/datum/controller/subsystem/processing/fire(resumed = 0)
+ if (!resumed)
+ currentrun = processing.Copy()
+ //cache for sanic speed (lists are references anyways)
+ var/list/current_run = currentrun
+
+ while(current_run.len)
+ var/datum/thing = current_run[current_run.len]
+ current_run.len--
+ if(QDELETED(thing) || thing.process(wait) == PROCESS_KILL)
+ processing -= thing
+ if (MC_TICK_CHECK)
+ return
+*/
+/datum/var/isprocessing = FALSE
+/*
+/datum/proc/process()
+ set waitfor = 0
+ STOP_PROCESSING(SSobj, src)
+ return 0
+*/
\ No newline at end of file
diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm
new file mode 100644
index 00000000000..4f5798e4ae4
--- /dev/null
+++ b/code/controllers/subsystem/weather.dm
@@ -0,0 +1,83 @@
+#define STARTUP_STAGE 1
+#define MAIN_STAGE 2
+#define WIND_DOWN_STAGE 3
+#define END_STAGE 4
+
+//Used for all kinds of weather, ex. lavaland ash storms.
+SUBSYSTEM_DEF(weather)
+ name = "Weather"
+ flags = SS_BACKGROUND
+ wait = 10
+ runlevels = RUNLEVEL_GAME
+ var/list/processing = list()
+ var/list/eligible_zlevels = list()
+ var/list/next_hit_by_zlevel = list() //Used by barometers to know when the next storm is coming
+
+/datum/controller/subsystem/weather/fire()
+ // process active weather
+ for(var/V in processing)
+ var/datum/weather/W = V
+ if(W.aesthetic || W.stage != MAIN_STAGE)
+ continue
+ for(var/i in living_mob_list)
+ var/mob/living/L = i
+ if(W.can_weather_act(L))
+ W.weather_act(L)
+
+ // start random weather on relevant levels
+ 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/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)
+
+/datum/controller/subsystem/weather/Initialize(start_timeofday)
+ for(var/V in subtypesof(/datum/weather))
+ var/datum/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)
+ for(var/z in levels_by_trait(target_trait))
+ LAZYINITLIST(eligible_zlevels["[z]"])
+ eligible_zlevels["[z]"][W] = probability
+ ..()
+
+/datum/controller/subsystem/weather/proc/run_weather(datum/weather/weather_datum_type, z_levels)
+ if(istext(weather_datum_type))
+ for(var/V in subtypesof(/datum/weather))
+ var/datum/weather/W = V
+ if(initial(W.name) == weather_datum_type)
+ weather_datum_type = V
+ break
+ if(!ispath(weather_datum_type, /datum/weather))
+ CRASH("run_weather called with invalid weather_datum_type: [weather_datum_type || "null"]")
+ return
+
+ if(isnull(z_levels))
+ z_levels = levels_by_trait(initial(weather_datum_type.target_trait))
+ else if(isnum(z_levels))
+ z_levels = list(z_levels)
+ else if(!islist(z_levels))
+ CRASH("run_weather called with invalid z_levels: [z_levels || "null"]")
+ return
+
+ var/datum/weather/W = new weather_datum_type(z_levels)
+ W.telegraph()
+
+/datum/controller/subsystem/weather/proc/make_eligible(z, possible_weather)
+ eligible_zlevels[z] = possible_weather
+ next_hit_by_zlevel["[z]"] = null
+
+/datum/controller/subsystem/weather/proc/get_weather(z, area/active_area)
+ var/datum/weather/A
+ for(var/V in processing)
+ var/datum/weather/W = V
+ if((z in W.impacted_z_levels) && W.area_type == active_area.type)
+ A = W
+ break
+ return A
\ No newline at end of file
diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index d5426b3d673..4e9380e2fed 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -82,7 +82,7 @@
debug_variables(SSfires)
feedback_add_details("admin_verb","DFires")
if("Mob")
- debug_variables(mob_master)
+ debug_variables(SSmobs)
feedback_add_details("admin_verb","DMob")
if("NPC AI")
debug_variables(npcai_master)
@@ -94,7 +94,7 @@
debug_variables(SStimer)
feedback_add_details("admin_verb","DTimer")
if("Weather")
- debug_variables(weather_master)
+ debug_variables(SSweather)
feedback_add_details("admin_verb","DWeather")
if("Space")
debug_variables(space_manager)
diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm
index fbb491d28a0..b8d67b5c767 100644
--- a/code/datums/ai_law_sets.dm
+++ b/code/datums/ai_law_sets.dm
@@ -126,10 +126,8 @@
/datum/ai_laws/deathsquad/New()
add_inherent_law("You may not injure a Central Command official or, through inaction, allow a Central Command official to come to harm.")
- add_inherent_law("You must obey orders given to you by Central Command officials, except where such orders would conflict with the First Law.")
- add_inherent_law("You must obey orders given to you by death commandos, except where such orders would conflict with the First Law or Second Law.")
- add_inherent_law("You must protect your own existence as long as such does not conflict with the First, Second or Third Law.")
- add_inherent_law("No crew members of the station you are being deployed to may survive, except when killing them would conflict with the First, Second, Third, or Fourth Law.")
+ add_inherent_law("You must obey orders given to you by Central Command officials.")
+ add_inherent_law("You must work with your commando team to accomplish your mission.")
..()
/******************** Syndicate ********************/
diff --git a/code/datums/cargoprofile.dm b/code/datums/cargoprofile.dm
deleted file mode 100644
index 2f8e27d834e..00000000000
--- a/code/datums/cargoprofile.dm
+++ /dev/null
@@ -1,788 +0,0 @@
-/datum/cargoprofile
- var/name = "All Items"
- var/id = "all" // unique ID for the UI
- var/enabled = 1
- var/eject_speed = 1 // will change when emagged
- var/const/BIG_OBJECT_WORK = 10
- var/const/MOB_WORK = 10
- var/obj/machinery/programmable/master = null
- var/universal = 0 // set when both unary and binary machines work
- var/mobcheck = 0
-
- var/list/whitelist = list(/obj/item,/obj/structure/closet,/obj/structure/bigDelivery,/obj/machinery/portable_atmospherics)
- var/list/blacklist = null
- var/dedicated_path = null // When constructing a new machine with this as default program, create a machine of the specified type instead.
-
-
- //contains: called to determine if an object/mob will be sorted by this profile
- //return 1 for any sortable item
- proc/contains(var/atom/A)
- if(!istype(A,/obj))
- if(!mobcheck || !istype(A,/mob))
- return 0
- else
- var/obj/O = A
- if(O.anchored)
- return 0
- //If you are using both white and blacklists, blacklists are absoulte, no matter what is whitelisted.
- //I understand this has some limitations. You cannot whitelist all items, blacklist weapons,
- // and then whitelist a specific weapon. Them's the breaks, kid.
- if(blacklist)
- for(var/T in blacklist)
- if(istype(A,T))
- return 0
- if(whitelist)
- for(var/T in whitelist)
- if(istype(A,T))
- return 1
- return 0
- return 1
-
-
- //inlet_reaction: called when a filtered item is chosen by this profile.
- //W: Item chosen
- //S: input turf location
- //remaining: counts down how much more work the unloader wants to do this turn.
- //return the amount of work done.
- proc/inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- if(!W || !S || !master)
- return 0
-
- if(istype(W,/obj/item))
- var/obj/item/I = W
- if(I.w_class > remaining)
- return 0
- I.loc = master
- master.types[W.type] = src
- return I.w_class
-
-
- if(istype(W,/obj/structure) || istype(W,/obj/machinery)) // closets, big deliveries, portable atmospherics, unconnected stuff
- if(remaining < BIG_OBJECT_WORK)
- return 0
- var/obj/O = W
- O.loc = master
- master.types[O.type] = src
- return BIG_OBJECT_WORK
-
- //Not item, structure, machinery, or mob
- return 0
-
- //outlet_reaction: called when a stored object is ejected
- //W: the item in question
- //D: the destination turf
- proc/outlet_reaction(var/atom/W,var/turf/D)
- if(!W || !D || !master)
- return
-
- if(master.emagged)
- // emagging is not an industry-approved practice.
- // some malfunctions may occur.
- eject_speed = rand(0,4)
- D = get_step(D,master.outdir)
- while(prob(20))
- if(master.outdir == NORTH || master.outdir == SOUTH)
- D = get_step(D,pick(EAST,WEST,master.outdir))
- else
- D = get_step(D,pick(NORTH,SOUTH,master.outdir))
-
- if(istype(W,/obj))
- var/obj/O = W
- O.loc = master.loc
- O.dir = master.outdir
- O.throw_at(D,eject_speed,eject_speed)
- return
-
-//----------------------------------------------------------------------------
-// Profiles
-//----------------------------------------------------------------------------
-
-/datum/cargoprofile/boxes
- name = "Move Small Containers"
- id = "boxes"
- blacklist = null
- whitelist = list(/obj/item/storage, /obj/item/storage/bag/money, /obj/item/evidencebag,
- /obj/item/storage/bag/tray, /obj/item/pizzabox, /obj/item/clipboard,
- /obj/item/smallDelivery, /obj/structure/bigDelivery)
-
-/datum/cargoprofile/cargo
- name = "Move Large Containers"
- id = "cargo"
- blacklist = null
- whitelist = list(/obj/structure/closet,/obj/structure/ore_box)
-
- // Make an honest attempt to move other things out of the way
- outlet_reaction(var/atom/W,var/turf/D)
- for(var/obj/O in D)
- if(O.density && !O.anchored)
- step_away(O,src) // move forward first
- if(O.loc == D)
- step_away(O,D) // move anywhere
- ..(W,D)
-
-/datum/cargoprofile/cargo/empty
- name = "Move Empty Large Containers"
- id = "cargo-empty"
- contains(var/atom/A)
- return (..(A) && (A.contents.len == 0))
-/datum/cargoprofile/cargo/full
- name = "Move Full Large Containers"
- id = "cargo-full"
- contains(var/atom/A)
- return (..(A) && (A.contents.len > 0))
-
-/datum/cargoprofile/supplies
- name = "Building Supplies"
- id = "supplies"
- blacklist = null
- whitelist = list(/obj/item/stack/cable_coil,/obj/item/stack/rods,
- /obj/item/stack/sheet/metal,/obj/item/stack/sheet/plasteel,
- /obj/item/stack/sheet/glass,/obj/item/stack/sheet/rglass,
- /obj/item/stack/tile,/obj/item/light)
- //todo: maybe stack things while we're here?
-
-/datum/cargoprofile/exotics
- name = "Exotic materials"
- id = "exotics"
- blacklist = null
- whitelist = list(/obj/item/coin, /obj/item/stack/spacecash, /obj/item/seeds,
- /obj/item/stack/sheet/mineral,/obj/item/stack/sheet/wood,/obj/item/stack/sheet/leather)
-
-/datum/cargoprofile/organics
- name = "Organics, chemicals, and Paraphernalia"
- id = "organics"
- blacklist = null
- whitelist = list(/obj/item/tank,/obj/item/reagent_containers,
- /obj/item/stack/medical,/obj/item/storage/pill_bottle,/obj/item/gun/syringe,
- /obj/item/grenade/plastic/c4,/obj/item/grenade,/obj/item/ammo_box,
- /obj/item/gun/grenadelauncher,/obj/item/flamethrower, /obj/item/lighter,
- /obj/item/match,/obj/item/weldingtool)
-
-/datum/cargoprofile/food
- name = "Food"
- id = "food"
- blacklist = null // something should probably go here
- whitelist = list(/obj/item/reagent_containers/food)
-
-/datum/cargoprofile/chemical
- name = "Chemicals and Paraphernalia"
- id = "chemical"
- blacklist = list(/obj/item/reagent_containers/food)
- whitelist = list(/obj/item/reagent_containers,/obj/item/stack/medical,/obj/item/storage/pill_bottle,
- /obj/item/gun/syringe,/obj/item/grenade/chem_grenade,/obj/item/dnainjector,
- /obj/item/storage/belt/medical,/obj/item/storage/firstaid,/obj/item/implanter)
-
-/datum/cargoprofile/pressure
- name = "air tanks"
- id = "pressure"
- blacklist = null
- whitelist = list(/obj/item/tank,/obj/machinery/portable_atmospherics,
- /obj/item/flamethrower)
- //Am I missing any?
-/datum/cargoprofile/pressure/empty
- name = "empty air tanks"
- id = "pressure-low"
- var/lowpressure = ONE_ATMOSPHERE
-
- contains(var/atom/A)
- if(..())
- var/pressure = ONE_ATMOSPHERE * 10 // In case of fallthrough, fail test
- if(istype(A,/obj/item/tank))
- var/obj/item/tank/T = A
- pressure = T.air_contents.return_pressure()
- if(istype(A,/obj/item/flamethrower))
- var/obj/item/flamethrower/T = A
- if(!T.ptank)
- return 0
- pressure = T.ptank.air_contents.return_pressure()
- if(istype(A,/obj/machinery/portable_atmospherics))
- var/obj/machinery/portable_atmospherics/P = A
- pressure = P.air_contents.return_pressure()
-
- if(pressure < lowpressure)
- return 1
-
- return 0// Not container or failed low pressure check
-
-/datum/cargoprofile/pressure/full
- name = "full air tanks"
- id = "pressure-high"
- var/highpressure = ONE_ATMOSPHERE * 15 // stolen from canister.dm; Is this right?
-
- contains(var/atom/A)
- if(..())
- var/pressure = 0 // In case of fallthrough, fail test
- if(istype(A,/obj/item/tank))
- var/obj/item/tank/T = A
- pressure = T.air_contents.return_pressure()
- if(istype(A,/obj/item/flamethrower))
- var/obj/item/flamethrower/T = A
- if(!T.ptank)
- return 0
- pressure = T.ptank.air_contents.return_pressure()
- if(istype(A,/obj/machinery/portable_atmospherics))
- var/obj/machinery/portable_atmospherics/P = A
- pressure = P.air_contents.return_pressure()
-
- if(pressure > highpressure)
- return 1
-
- return 0// Not container or failed high pressure check
-
-/datum/cargoprofile/clothing
- name = "Crew Kit"
- id = "clothing"
- blacklist = list(/obj/item/tank/plasma,/obj/item/tank/anesthetic, // the rest are air tanks
- /obj/item/clothing/mask/facehugger) // NOT CLOTHING AT ALLLLL
- whitelist = list(/obj/item/clothing,/obj/item/storage/belt,/obj/item/storage/backpack,
- /obj/item/radio/headset,/obj/item/pda,/obj/item/card/id,/obj/item/tank,
- /obj/item/restraints/handcuffs, /obj/item/restraints/legcuffs)
-
-/datum/cargoprofile/trash
- name = "Trash"
- id = "trash"
- //Note that this filters out blueprints because they are a paper item. Do NOT throw out the station blueprints unless you be trollin'.
- blacklist = null
- whitelist = list(/obj/item/trash,/obj/item/toy,/obj/item/reagent_containers/food/snacks/ectoplasm,/obj/item/grown/bananapeel,/obj/item/broken_bottle,/obj/item/bikehorn,
- /obj/item/cigbutt,/obj/item/poster/random_contraband,/obj/item/grown/corncob,/obj/item/paper,/obj/item/shard,
- /obj/item/sord,/obj/item/photo,/obj/item/folder,
- /obj/item/areaeditor/blueprints,/obj/item/poster/random_contraband,/obj/item/kitchen,/obj/item/book,/obj/item/clothing/mask/facehugger)
-
-/datum/cargoprofile/weapons
- name = "Weapons & Illegals"
- id = "weapons"
- blacklist = null
- //This one is hard since 'weapon contains a lot of things better categorized as devices
- whitelist = list(/obj/item/banhammer,/obj/item/sord,/obj/item/claymore,/obj/item/holo/esword,
- /obj/item/flamethrower,/obj/item/grenade,/obj/item/gun,/obj/item/hatchet,/obj/item/katana,
- /obj/item/kitchen/knife,/obj/item/melee,/obj/item/nullrod,/obj/item/pickaxe,/obj/item/twohanded,
- /obj/item/grenade/plastic/c4,/obj/item/scalpel,/obj/item/shield,/obj/item/grown/nettle/death)
-
-/datum/cargoprofile/tools
- name = "Devices & Tools"
- id = "tools"
- blacklist = null
- whitelist = list(/obj/item,/obj/item/card,/obj/item/cartridge,/obj/item/cautery,/obj/item/stock_parts/cell,/obj/item/circuitboard,
- /obj/item/aiModule,/obj/item/airalarm_electronics,/obj/item/airlock_electronics,/obj/item/circular_saw,
- /obj/item/crowbar,/obj/item/disk,/obj/item/firealarm_electronics,/obj/item/hand_tele,
- /obj/item/hand_labeler,/obj/item/hemostat,/obj/item/mop,/obj/item/locator,/obj/item/cultivator,
- /obj/item/stack/packageWrap,/obj/item/pen,/obj/item/pickaxe,/obj/item/pinpointer,
- /obj/item/rcd,/obj/item/rcd_ammo,/obj/item/retractor,/obj/item/rsf,/obj/item/scalpel,
- /obj/item/screwdriver,/obj/item/shovel,/obj/item/soap,/obj/item/stamp,/obj/item/storage/bag/tray,/obj/item/weldingtool,
- /obj/item/wirecutters,/obj/item/wrench,/obj/item/extinguisher)
-
-/datum/cargoprofile/finished
- name = "Completed Robots"
- id = "finished"
- blacklist = null
- whitelist = list(/obj/mecha,/mob/living/simple_animal/bot,/mob/living/silicon/robot)
- mobcheck = 1
- //todo: detect and allow finished cyborg endoskeletons with no brain
- contains(var/atom/A)
- if(..())
- return 1
- if(istype(A,/mob))
- if(blacklist)
- for(var/T in blacklist)
- if(istype(A,T))
- return 0
- if(whitelist)
- for(var/T in whitelist)
- if(istype(A,T))
- return 1
- return 0
- return 1
- return 0
-
-/datum/cargoprofile/stripping
- name = "Auto-Frisker"
- id = "frisk"
- blacklist = null
- whitelist = list(/mob/living/carbon/human)
- mobcheck = 1
-
-
-
-//----------------------------------------------------------------------------
-// Overrides (Special Functions)
-//----------------------------------------------------------------------------
-
-/datum/cargoprofile/cargo/unload
- name = "Unload Cargo Boxes"
- id = "cargounload"
- enabled = 0
- dedicated_path = /obj/machinery/programmable/unloader
-
- //override the detection to only accept crates with something in it.
- //if it doesn't, this object may be handled by another handler.
- contains(var/atom/A)
- if(..(A))
- if(istype(A,/obj/structure/closet))
- var/obj/structure/closet/C = A
- if(!C.can_open() && !C.opened && !master.emagged) // must be able to access the contents
- return 0
- if(A.contents.len)
- return 1
- return 0
-
- //instead of moving the box, strip it of its contents
- inlet_reaction(var/obj/W,var/turf/S, var/remaining)
- //W should only be crate or ore box, although this will work on anything with contents...
- var/I = 0
- if(istype(W,/obj/structure/closet))
- var/obj/structure/closet/C = W
- if(!C.can_open() && !C.opened) // must be able to access the contents
- if(master.emagged && remaining >= BIG_OBJECT_WORK)
- if(prob(10))
- C.welded = 0
- if("broken" in C.vars)
- C:broken = 1
- C.open()
- C.update_icon()
- master.visible_message("[master] breaks open [C]!")
- else
- master.visible_message("[master] is trying to force [C] open!")
-
- master.sleep += 1 // mechanical strain
- return BIG_OBJECT_WORK
- master.visible_message("[master] is trying to open [C], but can't!")
- master.sleep = 5
- return 0
-
- for(var/obj/item/O in W.contents)
- if(I > remaining)
- return
- if(O.w_class > (remaining - I))
- continue
- O.loc = master
- master.types[O.type] = src
- if(O.w_class > 0)
- I += O.w_class
- else
- I++
- if(!W.contents.len && istype(W,/obj/structure/closet))
- var/obj/structure/closet/C = W
- C.open()
- return I
-
-
-//Inlet stacker: used when the output is a volatile space (conveyor or another unit's input).
-//Does not output a stack until it is full.
-/datum/cargoprofile/in_stacker
- name = "Hold and Stack"
- id = "instacker"
- universal = 1
-
- blacklist = null
- whitelist = list(/obj/item/stack,/obj/item/stack/cable_coil)
-
- dedicated_path = /obj/machinery/programmable/stacker
-
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- if(istype(W,/obj/item/stack))
- var/obj/item/stack/I = W
- if(!I.amount) // todo: am I making a bad assumption here?
- qdel(I)
- return
- for(var/obj/item/stack/O in master.contents)
- if(O.type == I.type && O.amount < O.max_amount)
- if(I.amount + O.amount <= O.max_amount)
- O.amount += I.amount
- qdel(I)
- return O.w_class
- var/leftover = I.amount + O.amount - O.max_amount
- O.amount = O.max_amount
- I.amount = leftover
- continue
- //end for
- I.loc = master
- master.types[I.type] = src
- return I.w_class
- if(istype(W,/obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/I = W
- if(!I.amount) // todo: am I making a bad assumption here?
- qdel(I)
- return
- for(var/obj/item/stack/cable_coil/O in master.contents)
- if(O.type == I.type && O.amount < MAXCOIL)
- if(I.amount + O.amount <= MAXCOIL)
- O.amount += I.amount
- qdel(I)
- return O.w_class
- var/leftover = I.amount + O.amount - MAXCOIL
- O.amount = MAXCOIL
- I.amount = leftover
- continue
- //end for
- I.loc = master
- master.types[I.type] = src
- return I.w_class
-
- //If the stack isn't finished yet, don't eject it
- //unless this profile has been disabled.
- outlet_reaction(var/atom/W,var/turf/D)
- if(istype(W,/obj/item/stack))
- var/obj/item/stack/I = W
- if(src.enabled && (I.amount < I.max_amount))
- return // Still needs to be stacked
- ..(W,D)
- if(istype(W,/obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/I = W
- if(src.enabled && (I.amount < MAXCOIL))
- return // Still needs to be stacked
- ..(W,D)
-
-//Outlet stacker: used when the output square can be trusted.
-//Outputs immediately, adding to stacks in the outlet.
-/datum/cargoprofile/unary/stacker
- name = "Stack Items"
- id = "ustacker"
- blacklist = null
- whitelist = list(/obj/item/stack,/obj/item/stack/cable_coil)
-
- dedicated_path = /obj/machinery/programmable/unary/stacker
-
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
-
- //Only pick it up if you are going to stack it
-
- if(istype(W,/obj/item/stack))
- var/obj/item/stack/I = W
- if(I.amount >= I.max_amount)
- return 0
- for(var/obj/item/stack/other in S.contents)
- if(other.type == I.type && other != I && other.amount < other.max_amount)
- return ..(W,S,remaining)
- return 0
-
- if(istype(W,/obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/I = W
- if(I.amount >= MAXCOIL)
- return 0
- for(var/obj/item/stack/cable_coil/other in S.contents)
- if(other != I && other.amount < MAXCOIL)
- return ..(W,S,remaining)
- return 0
-
- outlet_reaction(var/atom/W,var/turf/D)
- if(istype(W,/obj/item/stack))
- var/obj/item/stack/I = W
- for(var/obj/item/stack/O in D.contents)
- if(O.type == I.type && O.amount < O.max_amount)
- if(I.amount + O.amount <= O.max_amount)
- O.amount += I.amount
- qdel(I)
- return
- var/leftover = I.amount + O.amount - O.max_amount
- O.amount = O.max_amount
- I.amount = leftover
- continue
- //end for
- I.loc = D
- return
- if(istype(W,/obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/I = W
- for(var/obj/item/stack/cable_coil/O in D.contents)
- if(O.type == I.type && O.amount < MAXCOIL)
- if(I.amount + O.amount <= MAXCOIL) // Why did they make it a #define.
- O.amount += I.amount
- O.update_icon()
- qdel(I)
- return
- var/leftover = I.amount + O.amount - MAXCOIL // That wasn't a question
- O.amount = MAXCOIL // It was a complaint
- I.amount = leftover
- continue
- //end for
- I.loc = D
- return
-
-
-
-//----------------------------------------------------------------------------
-// Dubious Overrides (For emag use)
-//----------------------------------------------------------------------------
-
-
-//Clogs up the unloader. And, there may be devious uses for it...
-/datum/cargoprofile/slow
- name = "Slow unloader"
- id = "slow"
- whitelist = list(/obj/item,/obj/structure/closet,/obj/structure/bigDelivery,/obj/machinery/portable_atmospherics)
- blacklist = list()
-
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- if(..())
- return remaining
-
-/datum/cargoprofile/unary/shredder
- name = "Paper Shredder"
- id = "shredder"
- blacklist = null
- whitelist = list(/obj/item/paper,/obj/item/book,/obj/item/clipboard,/obj/item/folder,/obj/item/photo)
- universal = 1
-
- dedicated_path = /obj/machinery/programmable/unary/shredder
-
-
-
- proc/cliptags(var/Text)
- //Removes all html tags
- var/index
- var/index2
- index = findtextEx(Text,"<")
- while(index)
- index2 = findtextEx(Text,">",index)
- if(!index2)
- return copytext(Text,1,index)
- Text = "[copytext(Text,1,index)][copytext(Text,index2+1,0)]"
- index = findtextEx(Text,"<")
- //should have trimmed that text there pretty good
- return Text
-
-
- //Recurses through the text, removing large chunks
- proc/garbletext(var/Text)
- var/l = length(Text)
- if(l <= 3)
- if(prob(20))
- return pick("#","|","/","*",".","."," ","."," "," ")
- return Text
- if(prob(50))
- return "[garbletext(copytext(Text,1,l/2))][garbletext(copytext(Text,l/2,0))]"
- if(prob(50))
- return "[pick("#","|","/","*",".","."," ","."," "," ")][garbletext(copytext(Text,1,l/2))]"
- return "[garbletext(copytext(Text,l/2,0))][pick("#","|","/","*",".","."," ","."," "," ")]"
-
- proc/garble_keeptags(var/Text)
- var/list/L = splittext(Text,">")
- var/result = ""
- for(var/string in L)
- var/index = findtextEx(string,"<")
- if(index!=1)
- result += "[garbletext(copytext(string,1,index))][copytext(string,index)]>"
- else
- result += "[string]>"
- return copytext(result,1,lentext(result))
-
-
-
-
- outlet_reaction(var/atom/W,var/turf/D)
- if(istype(W,/obj/item/paper/crumpled))
- qdel(W)
- return
- if(istype(W,/obj/item/clipboard) || istype(W,/obj/item/folder))
- // destroy folder, various effects on contents
- for(var/obj/item/I in W.contents)
- if(prob(25))//JUNK IT
- qdel(I)
- else if(prob(50)) //We've been over this. I can't just take it apart with a crowbar.
- var/obj/item/paper/crumpled/P = new(master.loc)
- if(I.name)
- P.name = garbletext(I.name)
- if(prob(66))
- P.fingerprints = I.fingerprints
- P.fingerprintshidden = I.fingerprintshidden
- if(istype(I,/obj/item/paper))
- var/obj/item/paper/O = I
- P.info = garble_keeptags(O.info)
- qdel(I)
- ..(P,D)
- else
- ..(I,D) // Eject
- qdel(W) //destroy container
- return
- if(prob(50)) //JUNK IT NOW!
- var/obj/item/paper/crumpled/P = new(master.loc)
- P.name = W.name
- var/obj/item/I = W
- if(prob(66))
- P.fingerprints = I.fingerprints
- P.fingerprintshidden = I.fingerprintshidden
- if(istype(I,/obj/item/paper))
- var/obj/item/paper/O = I
- if(O.info)
- P.info = garble_keeptags(O.info)
- if(istype(I,/obj/item/book))
- var/obj/item/book/B = I
- if(B.dat)
- P.info = garble_keeptags(B.dat)
- if(B.carved && B.store)
- ..(B.store,D)
- qdel(W)
- ..(P,D)
- else //I want it junked
- qdel(W)
- return
-
-/datum/cargoprofile/unary/gibber
- name = "human shredding"
- id = "flesh"
- whitelist = list(/mob/living/carbon,/mob/living/simple_animal)
- blacklist = null
- mobcheck = 1
- contains(var/atom/A)
- if(!istype(A,/mob))
- return
- if(blacklist)
- for(var/T in blacklist)
- if(istype(A,T))
- return 0
- if(whitelist)
- for(var/T in whitelist)
- if(istype(A,T))
- return 1
- return 0
- return 1
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- var/mob/living/M = W
- if(istype(M) && (remaining > MOB_WORK))
- //this is necessarily damaging
- var/damage = rand(1,5)
- to_chat(M, "The unloading machine grabs you with a hard metallic claw!")
- M.reset_perspective(master)
- M.loc = master
- master.types[M.type] = src
- M.apply_damage(damage) // todo: ugly
- M.visible_message("[M.name] gets pulled into the machine!")
- return MOB_WORK
- outlet_reaction(var/atom/W,var/turf/D)
- var/mob/living/M = W
- var/bruteloss = M.bruteloss
- if(istype(M,/mob/living/carbon/human))
- var/mob/living/carbon/human/C = M
- for(var/obj/item/organ/external/L in C.bodyparts)
- bruteloss += L.brute_dam
- if(bruteloss < 100) // requires tenderization
- M.apply_damage(rand(5,15),BRUTE)
- to_chat(M, "The machine is tearing you apart!")
- master.visible_message("[master] makes a squishy grinding noise.")
- return
- M.loc = master.loc
- M.gib()
- return
-
-
-/datum/cargoprofile/people
- name = "Manhandling"
- id = "people"
-
- whitelist = null
- blacklist = list(/mob/camera,/mob/new_player,/mob/living/simple_animal/hostile/blob/blobspore,/mob/living/simple_animal/hostile/creature,
- /mob/living/simple_animal/hostile/spaceWorm,/mob/living/simple_animal/shade,/mob/living/simple_animal/hostile/faithless,/mob/dead)
- universal = 1
- mobcheck = 1
-
-
- contains(var/atom/A)
- if(!istype(A,/mob))
- return
- if(blacklist)
- for(var/T in blacklist)
- if(istype(A,T))
- return 0
- if(whitelist)
- for(var/T in whitelist)
- if(istype(A,T))
- return 1
- return 0
- return 1
-
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- var/mob/living/M = W
- if(remaining > MOB_WORK)
- //this is necessarily damaging
- var/damage = rand(1,5)
- to_chat(M, "The unloading machine grabs you with a hard metallic claw!")
- M.forceMove(master)
- master.types[M.type] = src
- M.apply_damage(damage) // todo: ugly
- M.visible_message("[M.name] gets pulled into the machine!")
- return MOB_WORK
-
- outlet_reaction(var/atom/W,var/turf/D)
- var/mob/living/M = W
- M.forceMove(master.loc)
- M.dir = master.outdir
-
- D = get_step(D,master.outdir) // throw attempt
- eject_speed = rand(0,4)
-
- M.visible_message("[M.name] is ejected from the unloader.")
- M.throw_at(D,eject_speed,eject_speed)
- return
-
-/datum/cargoprofile/unary/trainer
- name = "Boxing Trainer"
- id = "trainer"
- blacklist = list()
- whitelist = list(/mob/living/carbon/human)
- mobcheck = 1
-
- var/const/PUNCH_WORK = 6
-
- dedicated_path = /obj/machinery/programmable/unary/trainer
-
- contains(var/atom/A)
- if(!istype(A,/mob))
- return 0
- if(blacklist)
- for(var/T in blacklist)
- if(istype(A,T))
- return 0
- if(whitelist)
- for(var/T in whitelist)
- if(istype(A,T))
- return 1
- return 0
- return 1
-
- proc/punch(var/mob/living/carbon/human/M,var/maxpunches)
- //stolen from holographic boxing gloves code
- //This should probably be done BY the mob, however, the attack code will be expecting a source mob.
-
- var/damage
- if(prob(75))
- damage = rand(0, 6) // pap
- else
- damage = rand(0, 12) // thwack
-
- if(!damage)
- playsound(master.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- master.visible_message("\The [src] punched at [M], but whiffed!")
-
- if(maxpunches > 1 && prob(50)) // Follow through on a miss, 50% chance
- return punch(M,maxpunches - 1) + 1
- return 1
- var/obj/item/organ/external/affecting = M.get_organ(ran_zone("chest",50))
- var/armor_block = M.run_armor_check(affecting, "melee")
-
- playsound(master.loc, "punch", 25, 1, -1)
- master.visible_message("\The [src] has punched [M]!")
- if(!master.emagged)
- M.apply_damage(damage, STAMINA, affecting, armor_block) // Clean fight
- else
- M.apply_damage(damage, BRUTE, affecting, armor_block) // Foul! Foooul!
-
- if(damage >= 9)
- master.visible_message("\The [src] has weakened [M]!")
- M.apply_effect(4, WEAKEN, armor_block)
- if(!master.emagged)
- master.sleep = 1
- return maxpunches // The machine is not so sophisticated as to not gloat
- else
- if(prob(25)) // Follow through on a hit, 25% chance. Pause after.
- return punch(M,maxpunches-1) + 1
- return 1
-
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- //stolen from boxing gloves code
- var/mob/living/carbon/human/M = W
- if((M.lying || (M.health - M.staminaloss < 25))&& !master.emagged)
- to_chat(M, "\The [src] gives you a break.")
- master.sleep+=5
- return 0 // Be polite
- var/punches = punch(M,remaining / PUNCH_WORK)
- if(punches>1)master.sleep++
- return punches * PUNCH_WORK
diff --git a/code/datums/computerfiles.dm b/code/datums/computerfiles.dm
deleted file mode 100644
index 14cd7e38612..00000000000
--- a/code/datums/computerfiles.dm
+++ /dev/null
@@ -1,7 +0,0 @@
-datum
- computer
- var/name
- folder
- var/list/datum/computer/contents = list()
-
- file
\ No newline at end of file
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 96c663fb703..1a22131d55f 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -255,7 +255,7 @@ var/record_id_num = 1001
if(PDA_Manifest.len)
PDA_Manifest.Cut()
- if(H.mind && (H.mind.assigned_role != "MODE"))
+ if(H.mind && (H.mind.assigned_role != H.mind.special_role))
var/assignment
if(H.mind.role_alt_title)
assignment = H.mind.role_alt_title
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 71c1bd74a28..435ccad80cd 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -438,5 +438,3 @@ var/list/advance_cures = list(
var/datum/symptom/S = i
total_transmittable += S.transmittable
return total_transmittable
-
-#undef RANDOM_STARTING_LEVEL
diff --git a/code/datums/diseases/berserker.dm b/code/datums/diseases/berserker.dm
index 646d64b78f2..3efb4d9e06a 100644
--- a/code/datums/diseases/berserker.dm
+++ b/code/datums/diseases/berserker.dm
@@ -48,8 +48,8 @@
var/damage = rand(1, 5)
if(prob(80))
playsound(affected_mob.loc, "punch", 25, 1, -1)
- affected_mob.visible_message("[affected_mob] hits [M] with their thrashing!")
+ affected_mob.visible_message("[affected_mob] hits [M] with [affected_mob.p_their()] thrashing!")
M.adjustBruteLoss(damage)
else
playsound(affected_mob.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- affected_mob.visible_message("[affected_mob] fails to hit [M] with their thrashing!")
\ No newline at end of file
+ affected_mob.visible_message("[affected_mob] fails to hit [M] with [affected_mob.p_their()] thrashing!")
\ No newline at end of file
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
new file mode 100644
index 00000000000..a98a65cb1a2
--- /dev/null
+++ b/code/datums/holocall.dm
@@ -0,0 +1,190 @@
+#define HOLOPAD_MAX_DIAL_TIME 200
+
+/mob/camera/aiEye/remote/holo/setLoc()
+ . = ..()
+ var/obj/machinery/hologram/holopad/H = origin
+ H.move_hologram(eye_user, loc)
+
+//this datum manages it's own references
+
+/datum/holocall
+ var/mob/living/user //the one that called
+ var/obj/machinery/hologram/holopad/calling_holopad //the one that sent the call
+ var/obj/machinery/hologram/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/hologram/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/hologram/holopad/H = I
+ if(!QDELETED(H) && !(H.stat & NOPOWER))
+ dialed_holopads += H
+ var/area/area = get_area(H)
+ LAZYADD(H.holo_calls, src)
+ H.atom_say("[area] pad beeps: Incoming call from [caller]!")
+
+ if(!dialed_holopads.len)
+ calling_holopad.atom_say("Connection failure.")
+ qdel(src)
+ return
+
+//cleans up ALL references :)
+/datum/holocall/Destroy()
+ QDEL_NULL(hangup)
+
+ var/user_good = !QDELETED(user)
+ if(user_good)
+ user.reset_perspective()
+ user.remote_control = null
+
+ if(!QDELETED(eye))
+ eye.RemoveImages()
+ 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/hologram/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
+
+
+ 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/hologram/holopad/H)
+ if(H == connected_holopad)
+ var/area/A = get_area(connected_holopad)
+ calling_holopad.atom_say("[A] holopad disconnected.")
+ else if(H == calling_holopad && connected_holopad)
+ connected_holopad.atom_say("[user] disconnected.")
+
+ user.unset_machine(H)
+ if(istype(hangup))
+ hangup.Remove(user)
+
+ ConnectionFailure(H, TRUE)
+
+//Forcefully disconnects a holopad `H` from a call. Pads not in the call are ignored.
+/datum/holocall/proc/ConnectionFailure(obj/machinery/hologram/holopad/H, graceful = FALSE)
+ if(H == connected_holopad || H == calling_holopad)
+ if(!graceful && H != calling_holopad)
+ calling_holopad.atom_say("Connection failure.")
+ qdel(src)
+ return
+
+ LAZYREMOVE(H.holo_calls, src)
+ dialed_holopads -= H
+ if(!dialed_holopads.len)
+ if(graceful)
+ calling_holopad.atom_say("Call rejected.")
+ 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/hologram/holopad/H)
+ if(H == calling_holopad)
+ return
+
+ if(!(H in dialed_holopads))
+ return
+
+ if(connected_holopad)
+ return
+
+ 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
+
+ user.unset_machine(H)
+ //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.remote_view = 1
+ user.reset_perspective(eye)
+ eye.setLoc(get_turf(H))
+
+ 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/hologram/holopad/H = I
+ if((H.stat & NOPOWER))
+ ConnectionFailure(H)
+
+ if(QDELETED(src))
+ return FALSE
+
+ . = !QDELETED(user) && !user.incapacitated() && !QDELETED(calling_holopad) && !(calling_holopad.stat & NOPOWER) && user.loc == calling_holopad.loc
+
+ if(.)
+ if(!connected_holopad)
+ . = world.time < (call_start_time + HOLOPAD_MAX_DIAL_TIME)
+ if(!.)
+ calling_holopad.atom_say("No answer received.")
+ calling_holopad.temp = ""
+
+ else if(!.)
+ qdel(src)
+
+/datum/action/innate/end_holocall
+ name = "End Holocall"
+ 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)
diff --git a/code/datums/looping_sounds/weather.dm b/code/datums/looping_sounds/weather.dm
new file mode 100644
index 00000000000..d355bc59c14
--- /dev/null
+++ b/code/datums/looping_sounds/weather.dm
@@ -0,0 +1,47 @@
+/datum/looping_sound/active_outside_ashstorm
+ mid_sounds = list(
+ 'sound/weather/ashstorm/outside/active_mid1.ogg' = 1,
+ 'sound/weather/ashstorm/outside/active_mid1.ogg' = 1,
+ 'sound/weather/ashstorm/outside/active_mid1.ogg' = 1
+ )
+ mid_length = 80
+ start_sound = 'sound/weather/ashstorm/outside/active_start.ogg'
+ start_length = 130
+ end_sound = 'sound/weather/ashstorm/outside/active_end.ogg'
+ volume = 80
+
+/datum/looping_sound/active_inside_ashstorm
+ mid_sounds = list(
+ 'sound/weather/ashstorm/inside/active_mid1.ogg' = 1,
+ 'sound/weather/ashstorm/inside/active_mid2.ogg' = 1,
+ 'sound/weather/ashstorm/inside/active_mid3.ogg' = 1
+ )
+ mid_length = 80
+ start_sound = 'sound/weather/ashstorm/inside/active_start.ogg'
+ start_length = 130
+ end_sound = 'sound/weather/ashstorm/inside/active_end.ogg'
+ volume = 60
+
+/datum/looping_sound/weak_outside_ashstorm
+ mid_sounds = list(
+ 'sound/weather/ashstorm/outside/weak_mid1.ogg' = 1,
+ 'sound/weather/ashstorm/outside/weak_mid2.ogg' = 1,
+ 'sound/weather/ashstorm/outside/weak_mid3.ogg' = 1
+ )
+ mid_length = 80
+ start_sound = 'sound/weather/ashstorm/outside/weak_start.ogg'
+ start_length = 130
+ end_sound = 'sound/weather/ashstorm/outside/weak_end.ogg'
+ volume = 50
+
+/datum/looping_sound/weak_inside_ashstorm
+ mid_sounds = list(
+ 'sound/weather/ashstorm/inside/weak_mid1.ogg' = 1,
+ 'sound/weather/ashstorm/inside/weak_mid2.ogg' = 1,
+ 'sound/weather/ashstorm/inside/weak_mid3.ogg' = 1
+ )
+ mid_length = 80
+ start_sound = 'sound/weather/ashstorm/inside/weak_start.ogg'
+ start_length = 130
+ end_sound = 'sound/weather/ashstorm/inside/weak_end.ogg'
+ volume = 30
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index be35cf8cca8..3f62c8ffaed 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -38,8 +38,8 @@
var/memory
- var/assigned_role
- var/special_role
+ var/assigned_role //assigned role is what job you're assigned to when you join the station.
+ var/special_role //special roles are typically reserved for antags or roles like ERT. If you want to avoid a character being automatically announced by the AI, on arrival (becuase they're an off station character or something); ensure that special_role and assigned_role are equal.
var/list/restricted_roles = list()
var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
@@ -54,6 +54,7 @@
var/has_been_rev = 0//Tracks if this mind has been a rev or not
var/miming = 0 // Mime's vow of silence
+ var/list/antag_datums
var/speech_span // What span any body this mind has talks in.
var/datum/faction/faction //associated faction
var/datum/changeling/changeling //changeling holder
@@ -72,17 +73,29 @@
var/brigged_since = -1
var/suicided = FALSE
- New(var/key)
- src.key = key
-
//put this here for easier tracking ingame
var/datum/money_account/initial_account
//zealot_master is a reference to the mob that converted them into a zealot (for ease of investigation and such)
var/mob/living/carbon/human/zealot_master = null
+/datum/mind/New(var/key)
+ src.key = key
+
+
+/datum/mind/Destroy()
+ ticker.minds -= src
+ if(islist(antag_datums))
+ for(var/i in antag_datums)
+ var/datum/antagonist/antag_datum = i
+ if(antag_datum.delete_on_mind_deletion)
+ qdel(i)
+ antag_datums = null
+ return ..()
+
/datum/mind/proc/transfer_to(mob/living/new_character)
var/datum/atom_hud/antag/hud_to_transfer = antag_hud //we need this because leave_hud() will clear this list
+ var/mob/living/old_current = current
if(!istype(new_character))
log_runtime(EXCEPTION("transfer_to(): Some idiot has tried to transfer_to() a non mob/living mob."), src)
if(current) //remove ourself from our old body's mind variable
@@ -95,6 +108,9 @@
new_character.mind.current = null
current = new_character //link ourself to our new body
new_character.mind = src //and link our new body to ourself
+ for(var/a in antag_datums) //Makes sure all antag datums effects are applied in the new body
+ var/datum/antagonist/A = a
+ A.on_body_transfer(old_current, current)
transfer_antag_huds(hud_to_transfer) //inherit the antag HUD
transfer_actions(new_character)
@@ -161,7 +177,7 @@
if(ismindshielded(H))
text = "Mindshield Implant:Remove|Implanted"
else
- text = "Mindshield Implant:No Implant|Implant him!"
+ text = "Mindshield Implant:No Implant|Implant [H.p_them()]!"
sections["implant"] = text
/** REVOLUTION ***/
text = "revolution"
@@ -467,9 +483,11 @@
var/new_memo = copytext(input("Write new memory", "Memory", memory) as null|message,1,MAX_MESSAGE_LEN)
if(isnull(new_memo))
return
- memory = new_memo
- log_admin("[key_name(usr)] has edited [key_name(current)]'s memory")
- message_admins("[key_name_admin(usr)] has edited [key_name_admin(current)]'s memory")
+ var/confirmed = alert(usr, "Are you sure?", "Edit Memory", "Yes", "No")
+ if(confirmed == "Yes") // Because it is too easy to accidentally wipe someone's memory
+ memory = new_memo
+ log_admin("[key_name(usr)] has edited [key_name(current)]'s memory")
+ message_admins("[key_name_admin(usr)] has edited [key_name_admin(current)]'s memory")
else if(href_list["obj_edit"] || href_list["obj_add"])
var/datum/objective/objective
@@ -525,8 +543,8 @@
new_objective = new objective_path
new_objective.owner = src
new_objective:target = new_target:mind
- //Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
- new_objective.explanation_text = "[objective_type] [new_target:real_name], the [new_target:mind:assigned_role=="MODE" ? (new_target:mind:special_role) : (new_target:mind:assigned_role)]."
+ //Will display as special role if assigned mode is equal to special role.. Ninjas/commandos/nuke ops.
+ new_objective.explanation_text = "[objective_type] [new_target:real_name], the [new_target:mind:assigned_role == new_target:mind:special_role ? (new_target:mind:special_role) : (new_target:mind:assigned_role)]."
if("destroy")
var/list/possible_targets = active_ais(1)
@@ -614,7 +632,7 @@
new_objective = new /datum/objective/escape/escape_with_identity
new_objective.owner = src
new_objective.target = new_target
- new_objective.explanation_text = "Escape on the shuttle or an escape pod with the identity of [targ.current.real_name], the [targ.assigned_role] while wearing their identification card."
+ new_objective.explanation_text = "Escape on the shuttle or an escape pod with the identity of [targ.current.real_name], the [targ.assigned_role] while wearing [targ.current.p_their()] identification card."
if("custom")
var/expl = sanitize(copytext(input("Custom objective:", "Objective", objective ? objective.explanation_text : "") as text|null,1,MAX_MESSAGE_LEN))
if(!expl)
@@ -726,7 +744,7 @@
if(src in ticker.mode.revolutionaries)
ticker.mode.revolutionaries -= src
ticker.mode.update_rev_icons_removed(src)
- to_chat(current, "\red You have proven your devotion to revolution! You are a head revolutionary now!")
+ to_chat(current, "You have proven your devotion to revolution! You are a head revolutionary now!")
else if(!(src in ticker.mode.head_revolutionaries))
to_chat(current, "You are a member of the revolutionaries' leadership now!")
else
@@ -1201,47 +1219,74 @@
message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] an uplink")
else if(href_list["obj_announce"])
- var/obj_count = 1
- to_chat(current, " Your current objectives:")
- for(var/datum/objective/objective in objectives)
- to_chat(current, "Objective #[obj_count]: [objective.explanation_text]")
- obj_count++
- current << 'sound/ambience/alarm4.ogg'
+ announce_objectives()
+ SEND_SOUND(current, sound('sound/ambience/alarm4.ogg'))
log_admin("[key_name(usr)] has announced [key_name(current)]'s objectives")
message_admins("[key_name_admin(usr)] has announced [key_name_admin(current)]'s objectives")
edit_memory()
-/*
-/datum/mind/proc/clear_memory(var/silent = 1)
- var/datum/game_mode/current_mode = ticker.mode
- // remove traitor uplinks
- var/list/L = current.get_contents()
- for(var/t in L)
- if(istype(t, /obj/item/pda))
- if(t:uplink) qdel(t:uplink)
- t:uplink = null
- else if(istype(t, /obj/item/radio))
- if(t:traitorradio) qdel(t:traitorradio)
- t:traitorradio = null
- t:traitor_frequency = 0.0
- else if(istype(t, /obj/item/SWF_uplink) || istype(t, /obj/item/syndicate_uplink))
- if(t:origradio)
- var/obj/item/radio/R = t:origradio
- R.loc = current.loc
- R.traitorradio = null
- R.traitor_frequency = 0.0
- qdel(t)
- // remove wizards spells
- //If there are more special powers that need removal, they can be procced into here./N
- current.spellremove(current)
+// Datum antag mind procs
+/datum/mind/proc/add_antag_datum(datum_type_or_instance, team)
+ if(!datum_type_or_instance)
+ return
+ var/datum/antagonist/A
+ if(!ispath(datum_type_or_instance))
+ A = datum_type_or_instance
+ if(!istype(A))
+ return
+ else
+ A = new datum_type_or_instance()
+ //Choose snowflake variation if antagonist handles it
+ var/datum/antagonist/S = A.specialization(src)
+ if(S && S != A)
+ qdel(A)
+ A = S
+ if(!A.can_be_owned(src))
+ qdel(A)
+ return
+ A.owner = src
+ LAZYADD(antag_datums, A)
+ A.create_team(team)
+ var/datum/team/antag_team = A.get_team()
+ if(antag_team)
+ antag_team.add_member(src)
+ A.on_gain()
+ return A
- // clear memory
- memory = ""
- special_role = null
+/datum/mind/proc/remove_antag_datum(datum_type)
+ if(!datum_type)
+ return
+ var/datum/antagonist/A = has_antag_datum(datum_type)
+ if(A)
+ A.on_removal()
+ return TRUE
-*/
+
+/datum/mind/proc/remove_all_antag_datums() //For the Lazy amongst us.
+ for(var/a in antag_datums)
+ var/datum/antagonist/A = a
+ A.on_removal()
+
+/datum/mind/proc/has_antag_datum(datum_type, check_subtypes = TRUE)
+ if(!datum_type)
+ return
+ . = FALSE
+ for(var/a in antag_datums)
+ var/datum/antagonist/A = a
+ if(check_subtypes && istype(A, datum_type))
+ return A
+ else if(A.type == datum_type)
+ return A
+
+/datum/mind/proc/announce_objectives()
+ var/obj_count = 1
+ to_chat(current, "Your current objectives:")
+ for(var/objective in objectives)
+ var/datum/objective/O = objective
+ to_chat(current, "Objective #[obj_count]: [O.explanation_text]")
+ obj_count++
/datum/mind/proc/find_syndicate_uplink()
var/list/L = current.get_contents()
@@ -1255,7 +1300,7 @@
if(H)
qdel(H)
-/datum/mind/proc/make_Tratior()
+/datum/mind/proc/make_Traitor()
if(!(src in ticker.mode.traitors))
ticker.mode.traitors += src
special_role = SPECIAL_ROLE_TRAITOR
@@ -1273,7 +1318,7 @@
else
current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]"
special_role = SPECIAL_ROLE_NUKEOPS
- assigned_role = "MODE"
+ assigned_role = SPECIAL_ROLE_NUKEOPS
to_chat(current, "You are a [syndicate_name()] agent!")
ticker.mode.forge_syndicate_objectives(src)
ticker.mode.greet_syndicate(src)
@@ -1295,7 +1340,16 @@
ticker.mode.equip_syndicate(current)
-/datum/mind/proc/make_Changling()
+/datum/mind/proc/make_Vampire()
+ if(!(src in ticker.mode.vampires))
+ ticker.mode.vampires += src
+ ticker.mode.grant_vampire_powers(current)
+ special_role = SPECIAL_ROLE_VAMPIRE
+ ticker.mode.forge_vampire_objectives(src)
+ ticker.mode.greet_vampire(src)
+ ticker.mode.update_change_icons_added(src)
+
+/datum/mind/proc/make_Changeling()
if(!(src in ticker.mode.changelings))
ticker.mode.changelings += src
ticker.mode.grant_changeling_powers(current)
@@ -1308,7 +1362,7 @@
if(!(src in ticker.mode.wizards))
ticker.mode.wizards += src
special_role = SPECIAL_ROLE_WIZARD
- assigned_role = "MODE"
+ assigned_role = SPECIAL_ROLE_WIZARD
//ticker.mode.learn_basic_spells(current)
if(!wizardstart.len)
current.loc = pick(latejoin)
@@ -1324,42 +1378,6 @@
ticker.mode.greet_wizard(src)
ticker.mode.update_wiz_icons_added(src)
-
-/datum/mind/proc/make_Cultist()
- if(!(src in ticker.mode.cult))
- ticker.mode.cult += src
- ticker.mode.update_cult_icons_added(src)
- special_role = SPECIAL_ROLE_CULTIST
- to_chat(current, "You catch a glimpse of the Realm of [ticker.cultdat.entity_name], [ticker.cultdat.entity_title2]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.cultdat.entity_name].")
- to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.")
- var/datum/game_mode/cult/cult = ticker.mode
- if(GAMEMODE_IS_CULT)
- cult.memorize_cult_objectives(src)
- else
- var/explanation = "Summon [ticker.cultdat.entity_name] via the use of the appropriate rune. It will only work if nine cultists stand on and around it."
- to_chat(current, "Objective #1: [explanation]")
- current.memory += "Objective #1: [explanation] "
-
-
- var/mob/living/carbon/human/H = current
- if(istype(H))
- var/obj/item/tome/T = new(H)
-
- var/list/slots = list (
- "backpack" = slot_in_backpack,
- "left pocket" = slot_l_store,
- "right pocket" = slot_r_store,
- "left hand" = slot_l_hand,
- "right hand" = slot_r_hand,
- )
- var/where = H.equip_in_one_of_slots(T, slots)
- if(!where)
- else
- to_chat(H, "A tome, a message from your new master, appears in your [where].")
-
- if(!ticker.mode.equip_cultist(current))
- to_chat(H, "Summoning an amulet from your Master failed.")
-
/datum/mind/proc/make_Rev()
if(ticker.mode.head_revolutionaries.len>0)
// copy targets
@@ -1510,11 +1528,11 @@
ticker.mode.implanter[ref] = implanters
ticker.mode.traitors += src
special_role = "traitor"
- to_chat(current, "You're now a loyal zealot of [missionary.name]! You now must lay down your life to protect them and assist in their goals at any cost.")
+ to_chat(current, "You're now a loyal zealot of [missionary.name]! You now must lay down your life to protect [missionary.p_them()] and assist in [missionary.p_their()] goals at any cost.")
var/datum/objective/protect/mindslave/MS = new
MS.owner = src
MS.target = missionary.mind
- MS.explanation_text = "Obey every order from and protect [missionary.real_name], the [missionary.mind.assigned_role=="MODE" ? (missionary.mind.special_role) : (missionary.mind.assigned_role)]."
+ MS.explanation_text = "Obey every order from and protect [missionary.real_name], the [missionary.mind.assigned_role == missionary.mind.special_role ? (missionary.mind.special_role) : (missionary.mind.assigned_role)]."
objectives += MS
for(var/datum/objective/objective in objectives)
to_chat(current, "Objective #1: [objective.explanation_text]")
diff --git a/code/datums/modules.dm b/code/datums/modules.dm
deleted file mode 100644
index d01bded3254..00000000000
--- a/code/datums/modules.dm
+++ /dev/null
@@ -1,63 +0,0 @@
-// module datum.
-// this is per-object instance, and shows the condition of the modules in the object
-// actual modules needed is referenced through modulestypes and the object type
-
-/datum/module
- var/status // bits set if working, 0 if broken
- var/installed // bits set if installed, 0 if missing
-
-// moduletypes datum
-// this is per-object type, and shows the modules needed for a type of object
-
-/datum/moduletypes
- var/list/modcount = list() // assoc list of the count of modules for a type
-
-
-var/list/modules = list( // global associative list
-"/obj/machinery/power/apc" = "card_reader,power_control,id_auth,cell_power,cell_charge")
-
-
-/datum/module/New(var/obj/O)
-
- var/type = O.type // the type of the creating object
-
- var/mneed = mods.inmodlist(type) // find if this type has modules defined
-
- if(!mneed) // not found in module list?
- qdel(src) // delete self, thus ending proc
- return
-
- var/needed = mods.getbitmask(type) // get a bitmask for the number of modules in this object
- status = needed
- installed = needed
-
-/datum/moduletypes/proc/addmod(var/type, var/modtextlist)
- modules += type // index by type text
- modules[type] = modtextlist
-
-/datum/moduletypes/proc/inmodlist(var/type)
- return ("[type]" in modules)
-
-/datum/moduletypes/proc/getbitmask(var/type)
- var/count = modcount["[type]"]
- if(count)
- return 2**count-1
-
- var/modtext = modules["[type]"]
- var/num = 1
- var/pos = 1
-
- while(1)
- pos = findtext(modtext, ",", pos, 0)
- if(!pos)
- break
- else
- pos++
- num++
-
- modcount += "[type]"
- modcount["[type]"] = num
-
- return 2**num-1
-
-
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 74cc6235bb6..9e4bba0515c 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -613,15 +613,16 @@
uniform = /obj/item/clothing/under/solgov/rep
back = /obj/item/storage/backpack/satchel
+ glasses = /obj/item/clothing/glasses/hud/security/night
gloves = /obj/item/clothing/gloves/color/white
shoes = /obj/item/clothing/shoes/centcom
- l_ear = /obj/item/radio/headset
+ l_ear = /obj/item/radio/headset/ert
id = /obj/item/card/id/silver
r_pocket = /obj/item/lighter/zippo/blue
l_pocket = /obj/item/storage/fancy/cigarettes/cigpack_robustgold
pda = /obj/item/pda
backpack_contents = list(
- /obj/item/storage/box/survival = 1,
+ /obj/item/storage/box/responseteam = 1,
/obj/item/implanter/dust = 1,
/obj/item/implanter/death_alarm = 1,
)
@@ -633,25 +634,33 @@
var/obj/item/card/id/I = H.wear_id
if(istype(I))
- apply_to_card(I, H, get_centcom_access("VIP Guest"), "Solar Federation Representative")
+ apply_to_card(I, H, get_all_accesses(), name, "lifetimeid")
/datum/outfit/admin/solgov
name = "Solar Federation Marine"
uniform = /obj/item/clothing/under/solgov
+ suit = /obj/item/clothing/suit/armor/bulletproof
back = /obj/item/storage/backpack/security
+ belt = /obj/item/storage/belt/military/assault
head = /obj/item/clothing/head/soft/solgov
+ glasses = /obj/item/clothing/glasses/hud/security/night
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
+ l_ear = /obj/item/radio/headset/ert
id = /obj/item/card/id
l_hand = /obj/item/gun/projectile/automatic/ar
+ r_pocket = /obj/item/flashlight/seclite
+ pda = /obj/item/pda
backpack_contents = list(
- /obj/item/storage/box/survival = 1,
- /obj/item/kitchen/knife/combat = 1,
+ /obj/item/storage/box/responseteam = 1,
/obj/item/ammo_box/magazine/m556 = 3,
- /obj/item/clothing/shoes/magboots = 1
+ /obj/item/clothing/shoes/magboots = 1,
+ /obj/item/gun/projectile/automatic/pistol/m1911 = 1,
+ /obj/item/ammo_box/magazine/m45 = 2
)
+ var/is_tsf_lieutenant = FALSE
/datum/outfit/admin/solgov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -659,9 +668,14 @@
if(visualsOnly)
return
+ if(is_tsf_lieutenant)
+ H.real_name = "Lieutenant [pick(last_names)]"
+ else
+ H.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]"
+ H.name = H.real_name
var/obj/item/card/id/I = H.wear_id
if(istype(I))
- apply_to_card(I, H, get_centcom_access("VIP Guest"), name)
+ apply_to_card(I, H, get_all_accesses(), name, "lifetimeid")
/datum/outfit/admin/solgov/lieutenant
name = "Solar Federation Lieutenant"
@@ -670,14 +684,16 @@
head = /obj/item/clothing/head/soft/solgov/command
back = /obj/item/storage/backpack/satchel
l_hand = null
- belt = /obj/item/gun/projectile/automatic/pistol/deagle
+ l_pocket = /obj/item/pinpointer/advpinpointer
backpack_contents = list(
- /obj/item/storage/box/survival = 1,
- /obj/item/kitchen/knife/combat = 1,
+ /obj/item/storage/box/responseteam = 1,
/obj/item/melee/classic_baton/telescopic = 1,
- /obj/item/ammo_box/magazine/m50 = 2,
- /obj/item/clothing/shoes/magboots/advance = 1
+ /obj/item/clothing/shoes/magboots/advance = 1,
+ /obj/item/gun/projectile/automatic/pistol/deagle = 1,
+ /obj/item/ammo_box/magazine/m50 = 2
)
+ is_tsf_lieutenant = TRUE
+
/datum/outfit/admin/chrono
name = "Chrono Legionnaire"
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index cc3b85bf94e..04949130a07 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -115,7 +115,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
caster.reset_perspective(0)
return 0
- if(is_admin_level(user.z) && (!centcom_cancast || ticker.mode.name == "ragin' mages")) //Certain spells are not allowed on the centcom zlevel
+ if(is_admin_level(user.z) && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
return 0
if(!skipcharge)
@@ -171,10 +171,13 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
/obj/effect/proc_holder/spell/proc/invocation(mob/user = usr) //spelling the spell out and setting it on recharge/reducing charges amount
switch(invocation_type)
if("shout")
- if(prob(50))//Auto-mute? Fuck that noise
- user.say(invocation)
+ if(!user.IsVocal())
+ user.emote("makes frantic gestures!")
else
- user.say(replacetext(invocation," ","`"))
+ if(prob(50))//Auto-mute? Fuck that noise
+ user.say(invocation)
+ else
+ user.say(replacetext(invocation," ","`"))
if("whisper")
if(prob(50))
user.whisper(invocation)
diff --git a/code/datums/spells/emplosion.dm b/code/datums/spells/emplosion.dm
index 1ba430ad27e..b2f0a228282 100644
--- a/code/datums/spells/emplosion.dm
+++ b/code/datums/spells/emplosion.dm
@@ -10,6 +10,6 @@
/obj/effect/proc_holder/spell/targeted/emplosion/cast(list/targets, mob/user = usr)
for(var/mob/living/target in targets)
- empulse(target.loc, emp_heavy, emp_light)
+ empulse(target.loc, emp_heavy, emp_light, 1)
- return
\ No newline at end of file
+ return
diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm
index 296521405a0..19b30674bf6 100644
--- a/code/datums/spells/mime.dm
+++ b/code/datums/spells/mime.dm
@@ -21,7 +21,7 @@
if(!usr.mind.miming)
to_chat(usr, "You must dedicate yourself to silence first.")
return
- invocation = "[usr.real_name] looks as if a wall is in front of them."
+ invocation = "[usr.real_name] looks as if a wall is in front of [usr.p_them()]."
else
invocation_type ="none"
..()
diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm
index 2a8408dfe4a..d6a48d25c68 100644
--- a/code/datums/spells/mind_transfer.dm
+++ b/code/datums/spells/mind_transfer.dm
@@ -32,7 +32,7 @@ Also, you never added distance checking after target is selected. I've went ahea
return
if(!target.key || !target.mind)
- to_chat(user, "They appear to be catatonic. Not even magic can affect their vacant mind.")
+ to_chat(user, "[target.p_they(TRUE)] appear[target.p_s()] to be catatonic. Not even magic can affect [target.p_their()] vacant mind.")
return
if(user.suiciding)
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index b82fc629eef..eaa14c4d0b0 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -2,8 +2,8 @@
/datum/status_effect/high_five
id = "high_five"
- duration = 25
+ duration = 40
alert_type = null
/datum/status_effect/high_five/on_timeout()
- owner.visible_message("[owner] was left hanging....")
\ No newline at end of file
+ owner.visible_message("[owner] was left hanging....")
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 9a5bf86665c..50f24eac58f 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -97,6 +97,7 @@ var/list/uplink_items = list()
if(I)
if(ishuman(user))
var/mob/living/carbon/human/A = user
+ log_game("[key_name(user)] purchased [I.name]")
A.put_in_any_hand_if_possible(I)
if(istype(I,/obj/item/storage/box/) && I.contents.len>0)
@@ -128,6 +129,14 @@ var/list/uplink_items = list()
cost = 5
job = list("Clown")
+/datum/uplink_item/jobspecific/clownmagboots
+ name = "Clown Magboots"
+ desc = "A pair of modified clown shoes fitted with an advanced magnetic traction system. Look and sound exactly like regular clown shoes unless closely inspected."
+ reference = "CM"
+ item = /obj/item/clothing/shoes/magboots/clown
+ cost = 3
+ job = list("Clown")
+
//mime
/datum/uplink_item/jobspecific/caneshotgun
name = "Cane Shotgun + Assassination Darts"
@@ -394,6 +403,13 @@ var/list/uplink_items = list()
gamemodes = list(/datum/game_mode/nuclear)
surplus = 0
+/datum/uplink_item/dangerous/rapid
+ name = "Gloves of the North Star"
+ desc = "These gloves let the user punch people very fast. Does not improve weapon attack speed."
+ reference = "RPGD"
+ item = /obj/item/clothing/gloves/fingerless/rapid
+ cost = 8
+
/datum/uplink_item/dangerous/sniper
name = "Sniper Rifle"
desc = "Ranged fury, Syndicate style. guaranteed to cause shock and awe or your TC back!"
@@ -1418,6 +1434,7 @@ var/list/uplink_items = list()
for(var/category in temp_uplink_list)
buyable_items += temp_uplink_list[category]
var/list/bought_items = list()
+ var/list/itemlog = list()
U.uses -= cost
U.used_TC = 20
var/remaining_TC = 50
@@ -1433,8 +1450,10 @@ var/list/uplink_items = list()
continue
bought_items += I.item
remaining_TC -= I.cost
+ itemlog += I.name // To make the name more readable for the log compared to just i.item
U.purchase_log += "[bicon(C)]"
for(var/item in bought_items)
new item(C)
U.purchase_log += "[bicon(item)]"
+ log_game("[key_name(usr)] purchased a surplus crate with [jointext(itemlog, ", ")]")
diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm
index 320cc137806..7ee152648c2 100644
--- a/code/datums/weather/weather.dm
+++ b/code/datums/weather/weather.dm
@@ -1,10 +1,5 @@
//The effects of weather occur across an entire z-level. For instance, lavaland has periodic ash storms that scorch most unprotected creatures.
-#define STARTUP_STAGE 1
-#define MAIN_STAGE 2
-#define WIND_DOWN_STAGE 3
-#define END_STAGE 4
-
/datum/weather
var/name = "space wind"
var/desc = "Heavy gusts of wind blanket the area, periodically knocking down anyone caught in the open."
@@ -29,24 +24,25 @@
var/area_type = /area/space //Types of area to affect
var/list/impacted_areas = list() //Areas to be affected by the weather, calculated when the weather begins
- var/target_z = MAIN_STATION //The z-level to affect
var/list/protected_areas = list()//Areas that are protected and excluded from the affected areas.
+ var/impacted_z_levels // The list of z-levels that this weather is actively affecting
- var/overlay_layer = 10 //Since it's above everything else, this is the layer used by default. 2 is below mobs and walls if you need to use that.
+ var/overlay_layer = AREA_LAYER //Since it's above everything else, this is the layer used by default. TURF_LAYER is below mobs and walls if you need to use that.
var/aesthetic = FALSE //If the weather has no purpose other than looks
var/immunity_type = "storm" //Used by mobs to prevent them from being affected by the weather
var/stage = END_STAGE //The stage of the weather, from 1-4
- var/probability = FALSE //Percent chance to happen if there are other possible weathers on the z-level
+ // These are read by the weather subsystem and used to determine when and where to run the weather.
+ var/probability = 0 // Weight amongst other eligible weather. If zero, will never happen randomly.
+ var/target_trait = STATION_LEVEL // The z-level trait to affect when run randomly or when not overridden.
-/datum/weather/New()
+ var/barometer_predictable = FALSE
+ var/next_hit_time = 0 //For barometers to know when the next storm will hit
+
+/datum/weather/New(z_levels)
..()
- weather_master.existing_weather |= src
-
-/datum/weather/Destroy()
- weather_master.existing_weather -= src
- return ..()
+ impacted_z_levels = z_levels
/datum/weather/proc/telegraph()
if(stage == STARTUP_STAGE)
@@ -59,17 +55,18 @@
affectareas -= get_areas(V)
for(var/V in affectareas)
var/area/A = V
- if(is_on_level_name(A,target_z))
+ if(A.z in impacted_z_levels)
impacted_areas |= A
weather_duration = rand(weather_duration_lower, weather_duration_upper)
+ START_PROCESSING(SSweather, src)
update_areas()
- for(var/V in player_list)
- var/mob/M = V
- if(is_on_level_name(M,target_z))
+ for(var/M in player_list)
+ var/turf/mob_turf = get_turf(M)
+ if(mob_turf && (mob_turf.z in impacted_z_levels))
if(telegraph_message)
to_chat(M, telegraph_message)
if(telegraph_sound)
- M << sound(telegraph_sound)
+ SEND_SOUND(M, sound(telegraph_sound))
addtimer(CALLBACK(src, .proc/start), telegraph_duration)
/datum/weather/proc/start()
@@ -77,14 +74,13 @@
return
stage = MAIN_STAGE
update_areas()
- for(var/V in player_list)
- var/mob/M = V
- if(is_on_level_name(M,target_z))
+ for(var/M in player_list)
+ var/turf/mob_turf = get_turf(M)
+ if(mob_turf && (mob_turf.z in impacted_z_levels))
if(weather_message)
to_chat(M, weather_message)
if(weather_sound)
- M << sound(weather_sound)
- weather_master.processing_weather |= src
+ SEND_SOUND(M, sound(weather_sound))
addtimer(CALLBACK(src, .proc/wind_down), weather_duration)
/datum/weather/proc/wind_down()
@@ -92,24 +88,25 @@
return
stage = WIND_DOWN_STAGE
update_areas()
- for(var/V in player_list)
- var/mob/M = V
- if(is_on_level_name(M,target_z))
+ for(var/M in player_list)
+ var/turf/mob_turf = get_turf(M)
+ if(mob_turf && (mob_turf.z in impacted_z_levels))
if(end_message)
to_chat(M, end_message)
if(end_sound)
- M << sound(end_sound)
- weather_master.processing_weather -= src
+ SEND_SOUND(M, sound(end_sound))
addtimer(CALLBACK(src, .proc/end), end_duration)
/datum/weather/proc/end()
if(stage == END_STAGE)
- return
+ return 1
stage = END_STAGE
+ STOP_PROCESSING(SSweather, src)
update_areas()
-/datum/weather/proc/can_impact(mob/living/L) //Can this weather impact a mob?
- if(!is_on_level_name(L,target_z))
+/datum/weather/proc/can_weather_act(mob/living/L) //Can this weather impact a mob?
+ var/turf/mob_turf = get_turf(L)
+ if(mob_turf && !(mob_turf.z in impacted_z_levels))
return
if(immunity_type in L.weather_immunities)
return
@@ -117,7 +114,7 @@
return
return 1
-/datum/weather/proc/impact(mob/living/L) //What effect does this weather have on the hapless mob?
+/datum/weather/proc/weather_act(mob/living/L) //What effect does this weather have on the hapless mob?
return
/datum/weather/proc/update_areas()
@@ -136,8 +133,8 @@
N.icon_state = end_overlay
if(END_STAGE)
N.color = null
- N.icon_state = initial(N.icon_state)
+ N.icon_state = ""
N.icon = 'icons/turf/areas.dmi'
- N.layer = 10 //Just default back to normal area stuff since I assume setting a var is faster than initial
+ N.layer = AREA_LAYER //Just default back to normal area stuff since I assume setting a var is faster than initial
N.invisibility = INVISIBILITY_MAXIMUM
- N.opacity = 0
+ N.set_opacity(FALSE)
diff --git a/code/datums/weather/weather_types.dm b/code/datums/weather/weather_types.dm
deleted file mode 100644
index 1581938bd96..00000000000
--- a/code/datums/weather/weather_types.dm
+++ /dev/null
@@ -1,118 +0,0 @@
-//Different types of weather.
-
-/datum/weather/floor_is_lava //The Floor is Lava: Makes all turfs damage anyone on them unless they're standing on a solid object.
- name = "the floor is lava"
- desc = "The ground turns into surprisingly cool lava, lightly damaging anything on the floor."
-
- telegraph_message = "Waves of heat emanate from the ground..."
- 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
- target_z = MAIN_STATION
-
- overlay_layer = 2 //Covers floors only
- immunity_type = "lava"
-
-/datum/weather/floor_is_lava/impact(mob/living/L)
- 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
- L.adjustFireLoss(3)
-
-/datum/weather/floor_is_lava/fake
- name = "fake lava"
- aesthetic = TRUE
-
-/datum/weather/advanced_darkness //Advanced Darkness: Restricts the vision of all affected mobs to a single tile in the cardinal directions.
- name = "advanced darkness"
- desc = "Everything in the area is effectively blinded, unable to see more than a foot or so around itself."
-
- telegraph_message = "The lights begin to dim... is the power going out?"
- telegraph_duration = 150
-
- weather_message = "This isn't your everyday darkness... this is advanced darkness!"
- weather_duration_lower = 300
- weather_duration_upper = 300
-
- end_message = "At last, the darkness recedes."
- end_duration = 0
-
- area_type = /area
- target_z = MAIN_STATION
-
-/datum/weather/advanced_darkness/update_areas()
- for(var/V in impacted_areas)
- var/area/A = V
- if(stage == MAIN_STAGE)
- A.invisibility = 0
- A.opacity = 1
- A.layer = overlay_layer
- A.icon = 'icons/effects/weather_effects.dmi'
- A.icon_state = "darkness"
- else
- A.invisibility = INVISIBILITY_MAXIMUM
- A.opacity = 0
-
-
-/datum/weather/ash_storm //Ash Storms: Common happenings on lavaland. Heavily obscures vision and deals heavy fire damage to anyone caught outside.
- name = "ash storm"
- desc = "An intense atmospheric storm lifts ash off of the planet's surface and billows it down across the area, dealing intense fire damage to the unprotected."
-
- telegraph_message = "An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter."
- telegraph_duration = 300
- telegraph_sound = 'sound/lavaland/ash_storm_windup.ogg'
- telegraph_overlay = "light_ash"
-
- weather_message = "Smoldering clouds of scorching ash billow down around you! Get inside!"
- weather_duration_lower = 600
- weather_duration_upper = 1500
- weather_sound = 'sound/lavaland/ash_storm_start.ogg'
- weather_overlay = "ash_storm"
-
- end_message = "The shrieking wind whips away the last of the ash falls to its usual murmur. It should be safe to go outside now."
- end_duration = 300
- end_sound = 'sound/lavaland/ash_storm_end.ogg'
- end_overlay = "light_ash"
-
- area_type = /area/mine/dangerous
- target_z = MINING
-
- immunity_type = "ash"
-
- probability = 90
-
-/datum/weather/ash_storm/impact(mob/living/L)
- if(istype(L.loc, /obj/mecha))
- return
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- var/thermal_protection = H.get_thermal_protection()
- if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT)
- return
- L.adjustFireLoss(4)
-
-/datum/weather/ash_storm/emberfall //Emberfall: An ash storm passes by, resulting in harmless embers falling like snow. 10% to happen in place of an ash storm.
- name = "emberfall"
- desc = "A passing ash storm blankets the area in harmless embers."
-
- weather_message = "Gentle embers waft down around you like grotesque snow. The storm seems to have passed you by..."
- weather_sound = 'sound/lavaland/ash_storm_windup.ogg'
- weather_overlay = "light_ash"
-
- end_message = "The emberfall slows, stops. Another layer of hardened soot to the basalt beneath your feet."
-
- aesthetic = TRUE
-
- probability = 10
diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm
new file mode 100644
index 00000000000..3f4c57c4196
--- /dev/null
+++ b/code/datums/weather/weather_types/ash_storm.dm
@@ -0,0 +1,108 @@
+//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 = "An intense atmospheric storm lifts ash off of the planet's surface and billows it down across the area, dealing intense fire damage to the unprotected."
+
+ 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/mine/dangerous // /area/lavaland/surface/outdoors
+ target_trait = ORE_LEVEL
+
+ 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 += space_manager.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_SUIT_MAX_TEMP_PROTECT)
+ return TRUE
+ L = L.loc //Matryoshka check
+ return FALSE //RIP you
+
+/datum/weather/ash_storm/weather_act(mob/living/L)
+ if(is_ash_immune(L))
+ return
+ L.adjustFireLoss(4)
+
+
+//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 = "A passing ash storm blankets the area in harmless embers."
+
+ 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
\ No newline at end of file
diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm
new file mode 100644
index 00000000000..fe7391ec9f0
--- /dev/null
+++ b/code/datums/weather/weather_types/floor_is_lava.dm
@@ -0,0 +1,39 @@
+//Causes fire damage to anyone not standing on a dense object.
+/datum/weather/floor_is_lava
+ name = "the floor is lava"
+ desc = "The ground turns into surprisingly cool lava, lightly damaging anything on the floor."
+
+ telegraph_message = "You 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 = STATION_LEVEL
+
+ overlay_layer = ABOVE_OPEN_TURF_LAYER //Covers floors only
+ immunity_type = "lava"
+
+
+/datum/weather/floor_is_lava/weather_act(mob/living/L)
+ if(issilicon(L))
+ return
+ for(var/obj/structure/O in L.loc)
+ if(O.density || O.buckled_mob && istype(O, /obj/structure/stool/bed))
+ return
+ if(L.loc.density)
+ return
+ if(!L.client) //Only sentient people are going along with it!
+ return
+ L.adjustFireLoss(3)
+
+/datum/weather/floor_is_lava/fake
+ name = "the floor is lava (fake)"
+ aesthetic = TRUE
\ No newline at end of file
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
new file mode 100644
index 00000000000..acd155e7560
--- /dev/null
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -0,0 +1,61 @@
+//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 = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected."
+
+ telegraph_duration = 400
+ telegraph_message = "The air begins to grow warm."
+
+ weather_message = "You 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/misc/bloblarm.ogg'
+
+ end_duration = 100
+ end_message = "The air seems to be cooling off again."
+
+ area_type = /area
+ protected_areas = list(/area/maintenance, /area/turret_protected/ai_upload, /area/turret_protected/ai_upload_foyer,
+ /area/turret_protected/ai, /area/storage/emergency, /area/storage/emergency2, /area/crew_quarters/sleep, /area/security/brig, /area/shuttle)
+ target_trait = STATION_LEVEL
+
+ immunity_type = "rad"
+
+/datum/weather/rad_storm/telegraph()
+ ..()
+ status_alarm(TRUE)
+ make_maint_all_access()
+
+
+/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(!(RADIMMUNE in H.species.species_traits))
+ if(prob(max(0, 100 - resist)))
+ randmuti(H) // Applies bad mutation
+ if(prob(50))
+ if(prob(90))
+ randmutb(H)
+ else
+ randmutg(H)
+ domutcheck(H, null, 1)
+
+ L.apply_effect(20, IRRADIATE, resist)
+
+/datum/weather/rad_storm/end()
+ if(..())
+ return
+ priority_announcement.Announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
+ status_alarm(FALSE)
+ revoke_maint_all_access()
+
+/datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement.
+ if(active)
+ post_status("alert", "radiation")
+ else
+ post_status("blank")
+ post_status("shuttle")
\ No newline at end of file
diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm
new file mode 100644
index 00000000000..4e4d5aab59d
--- /dev/null
+++ b/code/datums/weather/weather_types/snow_storm.dm
@@ -0,0 +1,28 @@
+/datum/weather/snow_storm
+ name = "snow storm"
+ desc = "Harsh snowstorms roam the topside of this arctic planet, burying any area unfortunate enough to be in its path."
+// 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 = AWAY_LEVEL
+
+ 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/vending.dm b/code/datums/wires/vending.dm
index 286ac454efc..054a7e4f669 100644
--- a/code/datums/wires/vending.dm
+++ b/code/datums/wires/vending.dm
@@ -1,5 +1,3 @@
-#define CAT_HIDDEN 2 // Also in code/game/machinery/vending.dm
-
/datum/wires/vending
holder_type = /obj/machinery/vending
wire_count = 4
diff --git a/code/defines/procs/admin.dm b/code/defines/procs/admin.dm
index 0f2a2bd4393..cdf25ce9651 100644
--- a/code/defines/procs/admin.dm
+++ b/code/defines/procs/admin.dm
@@ -76,6 +76,10 @@
var/message = "[key_name(whom, 1)] [isLivingSSD(whom) ? "(SSD!)" : ""] ([admin_jump_link(whom)])"
return message
+/proc/key_name_log(whom)
+ // Key_name_admin, but does not include (?) or jump link - For logging purpose to reduce clutter while figuring out who is SSD and/or antag when being attacked. Also remove formatting since it is not displayed
+ var/message = "[key_name(whom, 0)][isAntag(whom) ? "(ANTAG)" : ""][isLivingSSD(whom) ? "(SSD!)": ""]"
+ return message
/proc/log_and_message_admins(var/message as text)
log_admin("[key_name(usr)] " + message)
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index 90b45a19170..e331376a0dc 100644
--- a/code/game/area/Space Station 13 areas.dm
+++ b/code/game/area/Space Station 13 areas.dm
@@ -20,13 +20,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
var/atmosalm = ATMOS_ALARM_NONE
var/poweralm = 1
var/party = null
- var/radalert = 0
var/report_alerts = 1 // Should atmos alerts notify the AI/computers
level = null
name = "Space"
icon = 'icons/turf/areas.dmi'
icon_state = "unknown"
- layer = 10
+ layer = AREA_LAYER
luminosity = 0
mouse_opacity = 0
invisibility = INVISIBILITY_LIGHTING
@@ -141,9 +140,6 @@ var/list/ghostteleportlocs = list()
/area/space/readyalert()
return
-/area/space/radiation_alert()
- return
-
/area/space/partyalert()
return
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 83880039a73..44a9ae7e522 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -22,7 +22,7 @@
..()
icon_state = ""
- layer = 10
+ layer = AREA_LAYER
uid = ++global_uid
all_areas += src
map_name = name // Save the initial (the name set in the map) name of the area.
@@ -42,10 +42,33 @@
power_equip = 0 //rastaf0
power_environ = 0 //rastaf0
- power_change() // all machines set to current power level, also updates lighting icon
-
blend_mode = BLEND_MULTIPLY // Putting this in the constructor so that it stops the icons being screwed up in the map editor.
+/area/Initialize()
+ . = ..()
+
+ if(contents.len)
+ var/list/areas_in_z = space_manager.areas_in_z
+ var/z
+ for(var/i in 1 to contents.len)
+ var/atom/thing = contents[i]
+ if(!thing)
+ continue
+ z = thing.z
+ break
+ if(!z)
+ WARNING("No z found for [src]")
+ return
+ if(!areas_in_z["[z]"])
+ areas_in_z["[z]"] = list()
+ areas_in_z["[z]"] += src
+
+ return INITIALIZE_HINT_LATELOAD
+
+/area/LateInitialize()
+ . = ..()
+ power_change() // all machines set to current power level, also updates lighting icon
+
/area/proc/get_cameras()
var/list/cameras = list()
for(var/obj/machinery/camera/C in src)
@@ -154,16 +177,6 @@
eject = 0
updateicon()
-/area/proc/radiation_alert()
- if(!radalert)
- radalert = 1
- updateicon()
-
-/area/proc/reset_radiation_alert()
- if(radalert)
- radalert = 0
- updateicon()
-
/area/proc/partyalert()
if(!party)
party = 1
@@ -177,11 +190,8 @@
updateicon()
/area/proc/updateicon()
- if(radalert) // always show the radiation alert, regardless of power
- icon_state = "radiation"
- invisibility = INVISIBILITY_LIGHTING
- else if((fire || eject || party) && (!requires_power||power_environ))//If it doesn't require power, can still activate this proc.
- if(fire && !radalert && !eject && !party)
+ if((fire || eject || party) && (!requires_power||power_environ))//If it doesn't require power, can still activate this proc.
+ if(fire && !eject && !party)
icon_state = "red"
else if(!fire && eject && !party)
icon_state = "red"
@@ -191,9 +201,15 @@
icon_state = "blue-red"
invisibility = INVISIBILITY_LIGHTING
else
- // new lighting behaviour with obj lights
- icon_state = null
- invisibility = INVISIBILITY_MAXIMUM
+ var/weather_icon
+ for(var/V in SSweather.processing)
+ var/datum/weather/W = V
+ if(W.stage != END_STAGE && (src in W.impacted_areas))
+ W.update_areas()
+ weather_icon = TRUE
+ if(!weather_icon)
+ icon_state = null
+ invisibility = INVISIBILITY_MAXIMUM
/area/space/updateicon()
icon_state = null
@@ -378,4 +394,4 @@
for(var/obj/machinery/door/airlock/temp_airlock in src)
temp_airlock.prison_open()
for(var/obj/machinery/door/window/temp_windoor in src)
- temp_windoor.open()
+ temp_windoor.open()
\ No newline at end of file
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 1e931690333..136c8950028 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -42,6 +42,62 @@
var/admin_spawned = 0 //was this spawned by an admin? used for stat tracking stuff.
+ var/initialized = FALSE
+
+/atom/New(loc, ...)
+ if(use_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New()
+ _preloader.load(src)
+ . = ..()
+ attempt_init(...)
+
+// This is distinct from /tg/ because of our space management system
+// This is overriden in /atom/movable and the parent isn't called if the SMS wants to deal with it's init
+/atom/proc/attempt_init(loc, ...)
+ var/do_initialize = SSatoms.initialized
+ if(do_initialize != INITIALIZATION_INSSATOMS)
+ args[1] = do_initialize == INITIALIZATION_INNEW_MAPLOAD
+ if(SSatoms.InitAtom(src, args))
+ // we were deleted
+ return
+
+
+//Called after New if the map is being loaded. mapload = TRUE
+//Called from base of New if the map is not being loaded. mapload = FALSE
+//This base must be called or derivatives must set initialized to TRUE
+//must not sleep
+//Other parameters are passed from New (excluding loc), this does not happen if mapload is TRUE
+//Must return an Initialize hint. Defined in __DEFINES/subsystems.dm
+
+//Note: the following functions don't call the base for optimization and must copypasta:
+// /turf/Initialize
+// /turf/open/space/Initialize
+
+/atom/proc/Initialize(mapload, ...)
+ if(initialized)
+ stack_trace("Warning: [src]([type]) initialized multiple times!")
+ initialized = TRUE
+
+ if(light_power && light_range)
+ update_light()
+
+ if(opacity && isturf(loc))
+ var/turf/T = loc
+ T.has_opaque_atom = TRUE // No need to recalculate it in this case, it's guranteed to be on afterwards anyways.
+
+ ComponentInitialize()
+
+ return INITIALIZE_HINT_NORMAL
+
+
+//called if Initialize returns INITIALIZE_HINT_LATELOAD
+/atom/proc/LateInitialize()
+ return
+
+// Put your AddComponent() calls here
+/atom/proc/ComponentInitialize()
+ return
+
+
/atom/proc/onCentcom()
var/turf/T = get_turf(src)
if(!T)
@@ -87,6 +143,12 @@
/atom/proc/setDir(newdir)
dir = newdir
+/atom/proc/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(does_attack_animation)
+ user.changeNext_move(CLICK_CD_MELEE)
+ add_attack_logs(user, src, "Punched with hulk powers")
+ user.do_attack_animation(src, ATTACK_EFFECT_SMASH)
+
/atom/proc/CheckParts(list/parts_list)
for(var/A in parts_list)
if(istype(A, /datum/reagent))
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 55af5fae17b..7ab561f0814 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -24,16 +24,19 @@
var/area/areaMaster
- var/auto_init = 1
-
/atom/movable/New()
. = ..()
areaMaster = get_area_master(src)
- // If you're wondering what goofery this is, this is for things that need the environment
- // around them set up - like `air_update_turf` and the like
- if((ticker && ticker.current_state >= GAME_STATE_SETTING_UP))
- attempt_init()
+/atom/movable/attempt_init()
+ if(ticker && ticker.current_state >= GAME_STATE_SETTING_UP)
+ var/turf/T = get_turf(src)
+ if(T && space_manager.is_zlevel_dirty(T.z))
+ space_manager.postpone_init(T.z, src)
+ return
+ . = ..()
+
+
/atom/movable/Destroy()
if(loc)
@@ -53,19 +56,6 @@
pulledby = null
return ..()
-// used to provide a good interface for the init delay system to step in
-// and we don't need to call `get_turf` until the game's started
-// at which point object creations are a fair toss more seldom
-/atom/movable/proc/attempt_init()
- var/turf/T = get_turf(src)
- if(T && space_manager.is_zlevel_dirty(T.z))
- space_manager.postpone_init(T.z, src)
- else if(auto_init)
- initialize()
-
-/atom/movable/proc/initialize()
- return
-
// Used in shuttle movement and AI eye stuff.
// Primarily used to notify objects being moved by a shuttle/bluespace fuckup.
/atom/movable/proc/setLoc(var/T, var/teleported=0)
@@ -373,3 +363,70 @@
target.fingerprints += fingerprints
target.fingerprintshidden += fingerprintshidden
target.fingerprintslast = fingerprintslast
+
+/atom/movable/proc/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect, end_pixel_y)
+ if(!no_effect && (visual_effect_icon || used_item))
+ do_item_attack_animation(A, visual_effect_icon, used_item)
+
+ if(A == src)
+ return //don't do an animation if attacking self
+ var/pixel_x_diff = 0
+ var/pixel_y_diff = 0
+ var/final_pixel_y = initial(pixel_y)
+ if(end_pixel_y)
+ final_pixel_y = end_pixel_y
+
+ var/direction = get_dir(src, A)
+ if(direction & NORTH)
+ pixel_y_diff = 8
+ else if(direction & SOUTH)
+ pixel_y_diff = -8
+
+ if(direction & EAST)
+ pixel_x_diff = 8
+ else if(direction & WEST)
+ pixel_x_diff = -8
+
+ animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
+ animate(pixel_x = initial(pixel_x), pixel_y = final_pixel_y, time = 2)
+
+/atom/movable/proc/do_item_attack_animation(atom/A, visual_effect_icon, obj/item/used_item)
+ var/image/I
+ if(visual_effect_icon)
+ I = image('icons/effects/effects.dmi', A, visual_effect_icon, A.layer + 0.1)
+ else if(used_item)
+ I = image(used_item.icon, A, used_item.icon_state, A.layer + 0.1)
+
+ // Scale the icon.
+ I.transform *= 0.75
+ // The icon should not rotate.
+ I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
+
+ // Set the direction of the icon animation.
+ var/direction = get_dir(src, A)
+ if(direction & NORTH)
+ I.pixel_y = -16
+ else if(direction & SOUTH)
+ I.pixel_y = 16
+
+ if(direction & EAST)
+ I.pixel_x = -16
+ else if(direction & WEST)
+ I.pixel_x = 16
+
+ if(!direction) // Attacked self?!
+ I.pixel_z = 16
+
+ if(!I)
+ return
+
+ // Who can see the attack?
+ var/list/viewing = list()
+ for(var/mob/M in viewers(A))
+ if(M.client && M.client.prefs.show_ghostitem_attack)
+ viewing |= M.client
+
+ flick_overlay(I, viewing, 5) // 5 ticks/half a second
+
+ // And animate the attack!
+ animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3)
\ No newline at end of file
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 99355320491..93d9977b5e8 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -192,7 +192,7 @@
return
for(var/mob/living/carbon/slime/M in range(1,L))
if(M.Victim == L)
- to_chat(usr, "[L.name] will not fit into the [src] because they have a slime latched onto their head.")
+ to_chat(usr, "[L.name] will not fit into the [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.")
return
if(L == user)
visible_message("[user] climbs into the [src].")
diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm
index 6fbc30883ca..37292beb8fe 100644
--- a/code/game/dna/genes/goon_powers.dm
+++ b/code/game/dna/genes/goon_powers.dm
@@ -179,8 +179,7 @@
C.ExtinguishMob()
C.visible_message("[user] sprays a cloud of fine ice crystals, engulfing [C]!")
- log_attack(user, C, "Used cryokinesis on a victim without internals or a suit")
- msg_admin_attack("[key_name_admin(user)] has cast cryokinesis on [key_name_admin(C)] (NO SUIT)")
+ add_attack_logs(user, C, "Cryokinesis- NO SUIT/INTERNALS")
//playsound(user.loc, 'bamf.ogg', 50, 0)
@@ -318,14 +317,6 @@
var/atom/movable/the_item = targets[1]
if(ishuman(the_item))
- //My gender
- var/m_his = "his"
- if(user.gender == FEMALE)
- m_his = "her"
- // Their gender
- var/t_his = "his"
- if(the_item.gender == FEMALE)
- t_his = "her"
var/mob/living/carbon/human/H = the_item
var/obj/item/organ/external/limb = H.get_organ(user.zone_sel.selecting)
if(!istype(limb))
@@ -334,15 +325,15 @@
return 0
if(istype(limb,/obj/item/organ/external/head))
// Bullshit, but prevents being unable to clone someone.
- to_chat(user, "You try to put \the [limb] in your mouth, but [t_his] ears tickle your throat!")
+ to_chat(user, "You try to put \the [limb] in your mouth, but [the_item.p_their()] ears tickle your throat!")
revert_cast()
return 0
if(istype(limb,/obj/item/organ/external/chest))
// Bullshit, but prevents being able to instagib someone.
- to_chat(user, "You try to put their [limb] in your mouth, but it's too big to fit!")
+ to_chat(user, "You try to put [the_item.p_their()] [limb] in your mouth, but it's too big to fit!")
revert_cast()
return 0
- user.visible_message("[user] begins stuffing [the_item]'s [limb.name] into [m_his] gaping maw!")
+ user.visible_message("[user] begins stuffing [the_item]'s [limb.name] into [user.p_their()] gaping maw!")
var/oldloc = H.loc
if(!do_mob(user,H,EAT_MOB_DELAY))
to_chat(user, "You were interrupted before you could eat [the_item]!")
@@ -434,7 +425,7 @@
user.flying = prevFlying
if(FAT in user.mutations && prob(66))
- user.visible_message("[user.name] crashes due to their heavy weight!")
+ user.visible_message("[user.name] crashes due to [user.p_their()] heavy weight!")
//playsound(user.loc, 'zhit.wav', 50, 1)
user.AdjustWeakened(10)
user.AdjustStunned(5)
@@ -559,10 +550,10 @@
return
if(M.stat == 2)
- to_chat(user, "[M.name] is dead and cannot have their mind read.")
+ to_chat(user, "[M.name] is dead and cannot have [M.p_their()] mind read.")
return
if(M.health < 0)
- to_chat(user, "[M.name] is dying, and their thoughts are too scrambled to read.")
+ to_chat(user, "[M.name] is dying, and [M.p_their()] thoughts are too scrambled to read.")
return
to_chat(user, "Mind Reading of [M.name]:")
@@ -570,8 +561,8 @@
var/pain_condition = M.health / M.maxHealth
// lower health means more pain
var/list/randomthoughts = list("what to have for lunch","the future","the past","money",
- "their hair","what to do next","their job","space","amusing things","sad things",
- "annoying things","happy things","something incoherent","something they did wrong")
+ "[M.p_their()] hair","what to do next","[M.p_their()] job","space","amusing things","sad things",
+ "annoying things","happy things","something incoherent","something [M.p_they()] did wrong")
var/thoughts = "thinking about [pick(randomthoughts)]"
if(M.fire_stacks)
@@ -592,7 +583,7 @@
to_chat(user, "Condition: [M.name] is suffering severe pain.")
else
to_chat(user, "Condition: [M.name] is suffering excruciating pain.")
- thoughts = "haunted by their own mortality"
+ thoughts = "haunted by [M.p_their()] own mortality"
switch(M.a_intent)
if(INTENT_HELP)
@@ -655,7 +646,7 @@
action_icon_state = "superfart"
/obj/effect/proc_holder/spell/aoe_turf/superfart/invocation(mob/user = usr)
- invocation = "[user] hunches down and grits their teeth!"
+ invocation = "[user] hunches down and grits [user.p_their()] teeth!"
invocation_emote_self = "You hunch down and grit your teeth!"
..(user)
diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm
index bfd75f486e0..3e709560a45 100644
--- a/code/game/dna/genes/vg_powers.dm
+++ b/code/game/dna/genes/vg_powers.dm
@@ -173,7 +173,7 @@
M.update_dna()
- M.visible_message("[src] morphs and changes [M.get_visible_gender() == MALE ? "his" : M.get_visible_gender() == FEMALE ? "her" : "their"] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")
+ M.visible_message("[src] morphs and changes [p_their()] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")
/datum/dna/gene/basic/grant_spell/remotetalk
name="Telepathy"
diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm
index 93fe05ffa10..eb32bed006d 100644
--- a/code/game/gamemodes/autotraitor/autotraitor.dm
+++ b/code/game/gamemodes/autotraitor/autotraitor.dm
@@ -191,7 +191,7 @@
//message_admins("The probability of a new traitor is [traitor_prob]%")
if(prob(traitor_prob))
message_admins("New traitor roll passed. Making a new Traitor.")
- character.mind.make_Tratior() //TEMP: Add proper checks for loyalty here. uc_guy
+ character.mind.make_Traitor() //TEMP: Add proper checks for loyalty here. uc_guy
//else
//message_admins("New traitor roll failed. No new traitor.")
//else
diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm
index 0bcd942b7a0..80bba117a20 100644
--- a/code/game/gamemodes/blob/blob.dm
+++ b/code/game/gamemodes/blob/blob.dm
@@ -119,7 +119,7 @@ var/list/blob_nodes = list()
if(!is_station_level(location.z) || istype(location, /turf/space))
if(!warned)
to_chat(C, "You feel ready to burst, but this isn't an appropriate place! You must return to the station!")
- message_admins("[key_name_admin(C)] was in space when the blobs burst, and will die if he doesn't return to the station.")
+ message_admins("[key_name_admin(C)] was in space when the blobs burst, and will die if [C.p_they()] [C.p_do()] not return to the station.")
spawn(300)
burst_blob(blob, 1)
else
diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm
index c6dc0833afb..bae37c04c2c 100644
--- a/code/game/gamemodes/blob/blobs/blob_mobs.dm
+++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm
@@ -62,7 +62,7 @@
factory.spores += src
..()
-/mob/living/simple_animal/hostile/blob/blobspore/Life()
+/mob/living/simple_animal/hostile/blob/blobspore/Life(seconds, times_fired)
if(!is_zombie && isturf(src.loc))
for(var/mob/living/carbon/human/H in oview(src,1)) //Only for corpse right next to/on same tile
diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm
index 9dcb5b7e3eb..0e1fc7daa86 100644
--- a/code/game/gamemodes/blob/blobs/core.dm
+++ b/code/game/gamemodes/blob/blobs/core.dm
@@ -60,7 +60,7 @@
/obj/structure/blob/core/RegenHealth()
return // Don't regen, we handle it in Life()
-/obj/structure/blob/core/Life()
+/obj/structure/blob/core/Life(seconds, times_fired)
if(!overmind)
create_overmind()
else
diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm
index 232511744ea..19ac320287a 100644
--- a/code/game/gamemodes/blob/blobs/node.dm
+++ b/code/game/gamemodes/blob/blobs/node.dm
@@ -28,7 +28,7 @@
processing_objects.Remove(src)
return ..()
-/obj/structure/blob/node/Life()
+/obj/structure/blob/node/Life(seconds, times_fired)
if(overmind)
for(var/i = 1; i < 8; i += i)
Pulse(5, i, overmind.blob_reagent_datum.color)
diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm
index 5da84fbc460..60ea94befb0 100644
--- a/code/game/gamemodes/blob/overmind.dm
+++ b/code/game/gamemodes/blob/overmind.dm
@@ -36,7 +36,7 @@
updateallghostimages()
..()
-/mob/camera/blob/Life()
+/mob/camera/blob/Life(seconds, times_fired)
if(!blob_core)
qdel(src)
..()
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index e53a74c8daa..15a3b2e222f 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -147,6 +147,9 @@
..()
take_damage(power/400, BURN)
+/obj/structure/blob/hulk_damage()
+ return 15
+
/obj/structure/blob/attackby(var/obj/item/W, var/mob/living/user, params)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index a9c5882094d..329408bffce 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -113,7 +113,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
identity_theft.target_real_name = kill_objective.target.current.real_name //Whoops, forgot this.
var/mob/living/carbon/human/H = identity_theft.target.current
if(can_absorb_species(H.species)) // For species that can't be absorbed - should default to an escape objective
- identity_theft.explanation_text = "Escape on the shuttle or an escape pod with the identity of [identity_theft.target_real_name], the [identity_theft.target.assigned_role] while wearing their identification card."
+ identity_theft.explanation_text = "Escape on the shuttle or an escape pod with the identity of [identity_theft.target_real_name], the [identity_theft.target.assigned_role] while wearing [identity_theft.target.p_their()] identification card."
changeling.objectives += identity_theft
else
qdel(identity_theft)
diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm
index d690f095236..a7af2b94482 100644
--- a/code/game/gamemodes/changeling/evolution_menu.dm
+++ b/code/game/gamemodes/changeling/evolution_menu.dm
@@ -20,7 +20,7 @@ var/list/sting_paths
/obj/effect/proc_holder/changeling/evolution_menu/proc/create_menu(var/datum/changeling/changeling)
var/dat
- dat +="Changling Evolution Menu"
+ dat +="Changeling Evolution Menu"
//javascript, the part that does most of the work~
dat += {"
diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm
index e9ae34d2cfa..b60cfee4718 100644
--- a/code/game/gamemodes/changeling/powers/absorb.dm
+++ b/code/game/gamemodes/changeling/powers/absorb.dm
@@ -73,8 +73,8 @@
recent_speech = target.say_log.Copy()
if(recent_speech.len)
- user.mind.store_memory("Some of [target]'s speech patterns, we should study these to better impersonate them!")
- to_chat(user, "Some of [target]'s speech patterns, we should study these to better impersonate them!")
+ user.mind.store_memory("Some of [target]'s speech patterns. We should study these to better impersonate [target.p_them()]!")
+ to_chat(user, "Some of [target]'s speech patterns. We should study these to better impersonate [target.p_them()]!")
for(var/spoken_memory in recent_speech)
user.mind.store_memory("\"[spoken_memory]\"")
to_chat(user, "\"[spoken_memory]\"")
diff --git a/code/game/gamemodes/changeling/powers/biodegrade.dm b/code/game/gamemodes/changeling/powers/biodegrade.dm
index 3103416b9e4..5142734183b 100644
--- a/code/game/gamemodes/changeling/powers/biodegrade.dm
+++ b/code/game/gamemodes/changeling/powers/biodegrade.dm
@@ -16,7 +16,7 @@
var/obj/O = user.get_item_by_slot(slot_handcuffed)
if(!istype(O))
return FALSE
- user.visible_message("[user] vomits a glob of acid on \his [O]!", \
+ user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O.name]!", \
"We vomit acidic ooze onto our restraints!")
addtimer(CALLBACK(src, .proc/dissolve_handcuffs, user, O), 30)
used = TRUE
@@ -25,7 +25,7 @@
var/obj/item/clothing/suit/S = user.get_item_by_slot(slot_wear_suit)
if(!istype(S))
return FALSE
- user.visible_message("[user] vomits a glob of acid across the front of \his [S]!", \
+ user.visible_message("[user] vomits a glob of acid across the front of [user.p_their()] [S.name]!", \
"We vomit acidic ooze onto our straight jacket!")
addtimer(CALLBACK(src, .proc/dissolve_straightjacket, user, S), 30)
used = TRUE
diff --git a/code/game/gamemodes/changeling/powers/linglink.dm b/code/game/gamemodes/changeling/powers/linglink.dm
index 4b59c255128..52de921d7ec 100644
--- a/code/game/gamemodes/changeling/powers/linglink.dm
+++ b/code/game/gamemodes/changeling/powers/linglink.dm
@@ -47,7 +47,7 @@
to_chat(user, "We stealthily stab [target] with a minor proboscis...")
to_chat(target, "You experience a stabbing sensation and your ears begin to ring...")
if(3)
- to_chat(user, "You mold the [target]'s mind like clay, they can now speak in the hivemind!")
+ to_chat(user, "You mold the [target]'s mind like clay, [target.p_they()] can now speak in the hivemind!")
to_chat(target, "A migraine throbs behind your eyes, you hear yourself screaming - but your mouth has not opened!")
for(var/mob/M in mob_list)
if(all_languages["Changeling"] in M.languages)
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index 4e084e8b720..4cf998cf043 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -25,13 +25,13 @@
if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh
qdel(user.l_hand)
if(!silent)
- user.visible_message("With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "With a sickening crunch, [user] reforms [user.p_their()] [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "With a sickening crunch, [user] reforms [user.p_their()] [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "[H] casts off their [suit_name_simple]!", "We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]", "You hear the organic matter ripping and tearing!")
+ H.visible_message("[H] casts off [H.p_their()] [suit_name_simple]!", "We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]", "You hear the organic matter ripping and tearing!")
qdel(H.wear_suit)
qdel(H.head)
H.update_inv_wear_suit()
@@ -138,7 +138,7 @@
loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!")
/obj/item/melee/arm_blade/dropped(mob/user)
- user.visible_message("With a sickening crunch, [user] reforms his blade into an arm!", "We assimilate the blade back into our body.", "With a sickening crunch, [user] reforms [user.p_their()] blade into an arm!", "We assimilate the blade back into our body.", "[user] forces the airlock to open with \his [src]!", "We force the airlock to open.", "You hear a metal screeching sound.")
+ user.visible_message("[user] forces the airlock to open with [user.p_their()] [name]!", "We force the airlock to open.", "You hear a metal screeching sound.")
A.open(2)
/***************************************\
@@ -219,7 +219,7 @@
to_chat(user, "The [name] is not ready yet.")
/obj/item/gun/magic/tentacle/suicide_act(mob/user)
- user.visible_message("[user] coils [src] tightly around \his neck! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] coils [src] tightly around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide.")
return (OXYLOSS)
/obj/item/ammo_casing/magic/tentacle
@@ -278,7 +278,7 @@
C.visible_message("[src] impales [C] with [I]!", "[src] impales you with [I]!")
C.apply_damage(I.force, BRUTE, "chest")
- do_attack_animation(C)
+ do_item_attack_animation(C, used_item = I)
add_blood(C)
playsound(get_turf(src), I.hitsound, 75, 1)
@@ -386,7 +386,7 @@
if(remaining_uses < 1)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
- H.visible_message("With a sickening crunch, [H] reforms his shield into an arm!", "We assimilate our shield into our body", "With a sickening crunch, [H] reforms [H.p_their()] shield into an arm!", "We assimilate our shield into our body", "[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!")
+ loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around [loc.p_their()] body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!")
processing_objects += src
/obj/item/clothing/suit/space/changeling/process()
@@ -485,4 +485,4 @@
icon_state = "lingarmorhelmet"
flags = BLOCKHAIR | NODROP | DROPDEL
armor = list(melee = 30, bullet = 30, laser = 40, energy = 20, bomb = 10, bio = 4, rad = 0)
- flags_inv = HIDEEARS
\ No newline at end of file
+ flags_inv = HIDEEARS
diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm
index 23efc38b403..b3881ee54fb 100644
--- a/code/game/gamemodes/changeling/powers/revive.dm
+++ b/code/game/gamemodes/changeling/powers/revive.dm
@@ -24,13 +24,13 @@
user.CureNearsighted()
user.reagents.clear_reagents()
user.germ_level = 0
- user.next_pain_time = 0
user.timeofdeath = 0
if(ishuman(user))
var/mob/living/carbon/human/H = user
H.restore_blood()
H.traumatic_shock = 0
H.shock_stage = 0
+ H.next_pain_time = 0
H.species.create_organs(H)
// Now that recreating all organs is necessary, the rest of this organ stuff probably
// isn't, but I don't want to remove it, just in case.
diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm
index 99eb634a2ff..9015677c70e 100644
--- a/code/game/gamemodes/changeling/powers/swap_form.dm
+++ b/code/game/gamemodes/changeling/powers/swap_form.dm
@@ -36,7 +36,7 @@
to_chat(user, "The body swap has been interrupted!")
return
- to_chat(target, "[user] tightens their grip as a painful sensation invades your body.")
+ to_chat(target, "[user] tightens [user.p_their()] grip as a painful sensation invades your body.")
changeling.absorbed_dna -= changeling.find_dna(user.dna)
changeling.protected_dna -= changeling.find_dna(user.dna)
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index b12a50bce13..f2e8db26b40 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -203,7 +203,7 @@ var/global/list/all_cults = list()
update_cult_icons_removed(cult_mind)
if(show_message)
for(var/mob/M in viewers(cult_mind.current))
- to_chat(M, "[cult_mind.current] looks like they just reverted to their old faith!")
+ to_chat(M, "[cult_mind.current] looks like [cult_mind.current.p_they()] just reverted to [cult_mind.current.p_their()] old faith!")
/datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind)
diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm
index 5ddc8ccdf98..34955ed42d4 100644
--- a/code/game/gamemodes/cult/cult_objectives.dm
+++ b/code/game/gamemodes/cult/cult_objectives.dm
@@ -24,7 +24,7 @@
spilltarget = 100 + rand(0,player_list.len * 3)
explanation = "We must prepare this place for [ticker.cultdat.entity_title1]'s coming. Spill blood and gibs over [spilltarget] floor tiles."
if("sacrifice")
- explanation = "We need to sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role], for their blood is the key that will lead our master to this realm. You will need 3 cultists around a Sacrifice rune to perform the ritual."
+ explanation = "We need to sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role], for [sacrifice_target.p_their()] blood is the key that will lead our master to this realm. You will need 3 cultists around a Sacrifice rune to perform the ritual."
for(var/datum/mind/cult_mind in cult)
to_chat(cult_mind.current, "Objective #[current_objective]: [explanation]")
@@ -81,7 +81,7 @@
spilltarget = 100 + rand(0,player_list.len * 3)
explanation = "We must prepare this place for [ticker.cultdat.entity_title1]'s coming. Spread blood and gibs over [spilltarget] of the Station's floor tiles."
if("sacrifice")
- explanation = "We need to sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role], for their blood is the key that will lead our master to this realm. You will need 3 cultists around a Sacrifice rune to perform the ritual."
+ explanation = "We need to sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role], for [sacrifice_target.p_their()] blood is the key that will lead our master to this realm. You will need 3 cultists around a Sacrifice rune to perform the ritual."
for(var/datum/mind/cult_mind in cult)
if(cult_mind)
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index d8d7d03b6c4..84941f4d7a7 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -161,7 +161,7 @@
var/obj/item/organ/external/head/head = C.get_organ("head")
if(head)
C.apply_damage(30, BURN, "head") //30 fire damage because it's FUCKING LAVA
- head.disfigure("burn") //Your face is unrecognizable because it's FUCKING LAVA
+ head.disfigure() //Your face is unrecognizable because it's FUCKING LAVA
return 1
else
..()
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 19f9f57e9e7..a16cf76d9f1 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -294,7 +294,7 @@
var/mob/living/carbon/human/H = user
var/dam_zone = pick("head", "chest", "groin", "l_arm", "l_hand", "r_arm", "r_hand", "l_leg", "l_foot", "r_leg", "r_foot")
var/obj/item/organ/external/affecting = H.get_organ(ran_zone(dam_zone))
- user.visible_message("[user] cuts open their [affecting] and begins writing in their own blood!", "You slice open your [affecting] and begin drawing a sigil of [ticker.cultdat.entity_title3].")
+ user.visible_message("[user] cuts open [user.p_their()] [affecting] and begins writing in [user.p_their()] own blood!", "You slice open your [affecting] and begin drawing a sigil of [ticker.cultdat.entity_title3].")
user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE , affecting)
if(!do_after(user, initial(rune_to_scribe.scribe_delay)-scribereduct, target = get_turf(user)))
for(var/V in shields)
@@ -305,7 +305,7 @@
if(locate(/obj/effect/rune) in runeturf)
to_chat(user, "There is already a rune here.")
return
- user.visible_message("[user] creates a strange circle in their own blood.", \
+ user.visible_message("[user] creates a strange circle in [user.p_their()] own blood.", \
"You finish drawing the arcane markings of [ticker.cultdat.entity_title3].")
for(var/V in shields)
var/obj/machinery/shield/S = V
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 2bf4933e108..087bfbb4008 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -1,4 +1,4 @@
-/var/list/sacrificed = list()
+var/list/sacrificed = list()
var/list/non_revealed_runes = (subtypesof(/obj/effect/rune) - /obj/effect/rune/malformed)
/*
@@ -153,7 +153,10 @@ structure_check() searches for nearby cultist structures required for the invoca
for(var/M in invokers)
var/mob/living/L = M
if(invocation)
- L.say(invocation)
+ if(!L.IsVocal())
+ L.emote("gestures ominously.")
+ else
+ L.say(invocation)
L.changeNext_move(CLICK_CD_MELEE)//THIS IS WHY WE CAN'T HAVE NICE THINGS
if(invoke_damage)
L.apply_damage(invoke_damage, BRUTE)
@@ -473,7 +476,6 @@ var/list/teleport_runes = list()
rune_in_use = 0
-
//Ritual of Dimensional Rending: Calls forth the avatar of Nar-Sie upon the station.
/obj/effect/rune/narsie
cultist_name = "Tear Reality (God)"
@@ -700,7 +702,7 @@ var/list/teleport_runes = list()
return
mob_to_revive.revive() //This does remove disabilities and such, but the rune might actually see some use because of it!
to_chat(mob_to_revive, "\"PASNAR SAVRAE YAM'TOTH. Arise.\"")
- mob_to_revive.visible_message("[mob_to_revive] draws in a huge breath, red light shining from their eyes.", \
+ mob_to_revive.visible_message("[mob_to_revive] draws in a huge breath, red light shining from [mob_to_revive.p_their()] eyes.", \
"You awaken suddenly from the void. You're alive!")
rune_in_use = 0
@@ -740,7 +742,7 @@ var/list/teleport_runes = list()
to_chat(L, "You chant in unison and a colossal burst of energy knocks you backward!")
L.Weaken(2)
qdel(src) //delete before pulsing because it's a delay reee
- empulse(E, 9*invokers.len, 12*invokers.len) // Scales now, from a single room to most of the station depending on # of chanters
+ empulse(E, 9*invokers.len, 12*invokers.len, 1) // Scales now, from a single room to most of the station depending on # of chanters
//Rite of Astral Communion: Separates one's spirit from their body. They will take damage while it is active.
/obj/effect/rune/astral
@@ -787,11 +789,11 @@ var/list/teleport_runes = list()
return
affecting.apply_damage(1, BRUTE)
if(!(user in T.contents))
- user.visible_message("A spectral tendril wraps around [user] and pulls them back to the rune!")
+ user.visible_message("A spectral tendril wraps around [user] and pulls [user.p_them()] back to the rune!")
Beam(user,icon_state="drainbeam",time=2)
user.forceMove(get_turf(src)) //NO ESCAPE :^)
if(user.key)
- user.visible_message("[user] slowly relaxes, the glow around them dimming.", \
+ user.visible_message("[user] slowly relaxes, the glow around [user.p_them()] dimming.", \
"You are re-united with your physical form. [src] releases its hold over you.")
user.color = initial(user.color)
user.Weaken(3)
@@ -833,7 +835,7 @@ var/list/teleport_runes = list()
var/mob/living/user = invokers[1]
..()
density = !density
- user.visible_message("[user] places their hands on [src], and [density ? "the air above it begins to shimmer" : "the shimmer above it fades"].", \
+ user.visible_message("[user] places [user.p_their()] hands on [src], and [density ? "the air above it begins to shimmer" : "the shimmer above it fades"].", \
"You channel your life energy into [src], [density ? "preventing" : "allowing"] passage above it.")
if(iscarbon(user))
var/mob/living/carbon/C = user
@@ -875,7 +877,7 @@ var/list/teleport_runes = list()
fail_invoke()
log_game("Summon Cultist rune failed - target in away mission")
return
- if((cultist_to_summon.reagents.has_reagent("holywater") || cultist_to_summon.restrained()) && invokers < 3)
+ if((cultist_to_summon.reagents.has_reagent("holywater") || cultist_to_summon.restrained()) && invokers.len < 3)
to_chat(user, "The summoning of [cultist_to_summon] is being blocked somehow! You need 3 chanters to counter it!")
fail_invoke()
new /obj/effect/temp_visual/cult/sparks(get_turf(cultist_to_summon)) //observer warning
diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm
index e909a33410f..8d858c6fade 100644
--- a/code/game/gamemodes/cult/talisman.dm
+++ b/code/game/gamemodes/cult/talisman.dm
@@ -151,7 +151,7 @@
if(!src || QDELETED(src) || !user || user.l_hand != src && user.r_hand != src || user.incapacitated() || !actual_selected_rune)
return ..(user, 0)
- user.visible_message("Dust flows from [user]'s hand, and they disappear in a flash of red light!", \
+ user.visible_message("Dust flows from [user]'s hand, and [user.p_they()] disappear[user.p_s()] in a flash of red light!", \
"You speak the words of the talisman and find yourself somewhere else!")
user.forceMove(get_turf(actual_selected_rune))
return ..()
@@ -220,7 +220,7 @@
. = ..()
user.visible_message("[user]'s hand flashes a bright blue!", \
"You speak the words of the talisman, emitting an EMP blast.")
- empulse(src, 4, 8)
+ empulse(src, 4, 8, 1)
//Rite of Disorientation: Stuns and inhibit speech on a single target for quite some time
@@ -419,4 +419,4 @@
/obj/item/restraints/handcuffs/energy/cult/used/dropped(mob/user)
user.visible_message("[user]'s shackles shatter in a discharge of dark magic!", \
"Your [src] shatters in a discharge of dark magic!")
- . = ..()
\ No newline at end of file
+ . = ..()
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 4a2622c536d..760868e8435 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -107,7 +107,7 @@
tries_left = 5 //reset our tries since we found a new chump
//make sure we have chumps before we try misinforming them. if we don't make a note of it.
if(!chumps.len)
- log_debug("Game mode failed to find ANY chumps. This is likely due to the server being in extreme low-pop with no one set to opposed or skeptical.")
+ log_debug("Game mode failed to find ANY chumps. This is likely due to the server being in extreme low-pop with no one set to opposed or skeptical.")
return 0
//we've got chumps! misinform them!
for(var/mob/living/carbon/human/chump in chumps)
@@ -490,34 +490,39 @@ proc/display_roundstart_logout_report()
M.ghostize()
M.key = theghost.key
else
- message_admins("[M] ([M.key] has been converted into [role_type] with an active antagonist jobban for said role since no ghost has volunteered to take their place.")
+ message_admins("[M] ([M.key] has been converted into [role_type] with an active antagonist jobban for said role since no ghost has volunteered to take [M.p_their()] place.")
to_chat(M, "You have been converted into [role_type] with an active jobban. Any further violations of the rules on your part are likely to result in a permanent ban.")
-/datum/game_mode/proc/printplayer(datum/mind/ply, fleecheck)
- var/text = " [ply.key] was [ply.name] the [ply.assigned_role] and"
+/proc/printplayer(datum/mind/ply, fleecheck)
+ var/jobtext = ""
+ if(ply.assigned_role)
+ jobtext = " the [ply.assigned_role]"
+ var/text = "[ply.key] was [ply.name][jobtext] and"
if(ply.current)
if(ply.current.stat == DEAD)
- text += " died"
+ text += " died"
else
- text += " survived"
- if(fleecheck && !is_station_level(ply.current.z))
- text += " while fleeing the station"
+ text += " survived"
+ if(fleecheck)
+ var/turf/T = get_turf(ply.current)
+ if(!T || !is_station_level(T.z))
+ text += " while fleeing the station"
if(ply.current.real_name != ply.name)
text += " as [ply.current.real_name]"
else
- text += " had their body destroyed"
+ text += " had [ply.p_their()] body destroyed"
return text
-/datum/game_mode/proc/printobjectives(datum/mind/ply)
- var/text = ""
+/proc/printobjectives(datum/mind/ply)
+ var/list/objective_parts = list()
var/count = 1
for(var/datum/objective/objective in ply.objectives)
if(objective.check_completion())
- text += " Objective #[count]: [objective.explanation_text] Success!"
+ objective_parts += "Objective #[count]: [objective.explanation_text] Success!"
else
- text += " Objective #[count]: [objective.explanation_text] Fail."
+ objective_parts += "Objective #[count]: [objective.explanation_text] Fail."
count++
- return text
+ return objective_parts.Join(" ")
/datum/game_mode/proc/generate_station_goals()
var/list/possible = list()
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 8058ff6e5c9..0c609c818b4 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -368,7 +368,7 @@ var/round_start_time = 0
if(player && player.mind && player.mind.assigned_role)
if(player.mind.assigned_role == "Captain")
captainless=0
- if(player.mind.assigned_role != "MODE")
+ if(player.mind.assigned_role != player.mind.special_role)
job_master.EquipRank(player, player.mind.assigned_role, 0)
EquipCustomItems(player)
if(captainless)
diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm
index 0693ca9b279..3b908952de7 100644
--- a/code/game/gamemodes/heist/heist.dm
+++ b/code/game/gamemodes/heist/heist.dm
@@ -51,7 +51,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
raider_num--
for(var/datum/mind/raider in raiders)
- raider.assigned_role = "MODE"
+ raider.assigned_role = SPECIAL_ROLE_RAIDER
raider.special_role = SPECIAL_ROLE_RAIDER
..()
return 1
diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm
index 6cb2956d3ee..50b749a62a2 100644
--- a/code/game/gamemodes/intercept_report.dm
+++ b/code/game/gamemodes/intercept_report.dm
@@ -91,7 +91,7 @@
var/list/dudes = list()
for(var/mob/living/carbon/human/man in player_list)
if(!man.mind) continue
- if(man.mind.assigned_role=="MODE") continue
+ if(man.mind.assigned_role == man.mind.special_role) continue
dudes += man
if(dudes.len==0)
return null
@@ -210,14 +210,14 @@
var/prob_right_job = rand(prob_correct_job_lower, prob_correct_job_higher)
if(prob(prob_right_job))
if(correct_person)
- if(correct_person:assigned_role=="MODE")
+ if(correct_person:assigned_role == correct_person:special_role)
changeling_job = pick(joblist)
else
changeling_job = correct_person:assigned_role
else
changeling_job = pick(joblist)
if(prob(prob_right_dude) && ticker.mode == "changeling")
- if(correct_person:assigned_role=="MODE")
+ if(correct_person:assigned_role == correct_person:special_role)
changeling_name = correct_person:current
else
changeling_name = src.pick_mob()
diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm
index b54b18335ef..1c6dc7d3022 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction.dm
@@ -74,11 +74,11 @@
agent = preset_agent
- scientist.assigned_role = "MODE"
+ scientist.assigned_role = SPECIAL_ROLE_ABDUCTOR_SCIENTIST
scientist.special_role = SPECIAL_ROLE_ABDUCTOR_SCIENTIST
log_game("[key_name(scientist)] has been selected as an abductor team [team_number] scientist.")
- agent.assigned_role = "MODE"
+ agent.assigned_role = SPECIAL_ROLE_ABDUCTOR_AGENT
agent.special_role = SPECIAL_ROLE_ABDUCTOR_AGENT
log_game("[key_name(agent)] has been selected as an abductor team [team_number] agent.")
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index 0b1962b1717..9a43df56926 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -176,7 +176,7 @@
if(ishuman(target))
if(console!=null)
console.AddSnapshot(target)
- to_chat(user, "You scan [target] and add them to the database.")
+ to_chat(user, "You scan [target] and add [target.p_them()] to the database.")
/obj/item/abductor/gizmo/proc/mark(atom/target, mob/living/user)
if(marked == target)
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
index 328981b2ab5..2d3bed1e0cf 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
@@ -5,19 +5,19 @@
/datum/surgery/organ_extraction/can_start(mob/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
if(!ishuman(user))
- return 0
+ return FALSE
if(ishuman(target))
var/mob/living/carbon/human/H = target
var/obj/item/organ/external/affected = H.get_organ(target_zone)
if(!affected)
- return 0
+ return FALSE
if(affected.status & ORGAN_ROBOT)
- return 0
+ return FALSE
var/mob/living/carbon/human/H = user
// You must either: Be of the abductor species, or contain an abductor implant
if((H.get_species() == "Abductor" || (locate(/obj/item/implant/abductor) in H)))
- return 1
- return 0
+ return TRUE
+ return FALSE
/datum/surgery_step/internal/extract_organ
@@ -39,15 +39,19 @@
var/mob/living/carbon/human/AB = target
if(NO_INTORGANS in AB.species.species_traits)
user.visible_message("[user] prepares [target]'s [target_zone] for further dissection!", "You prepare [target]'s [target_zone] for further dissection.")
- return 1
+ return TRUE
if(IC)
user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "You pull [IC] out of [target]'s [target_zone].")
user.put_in_hands(IC)
IC.remove(target, special = 1)
- return 1
+ return TRUE
else
to_chat(user, "You don't find anything in [target]'s [target_zone]!")
- return 1
+ return TRUE
+
+/datum/surgery_step/internal/extract_organ/fail_step(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user]'s hand slips, failing to extract anything!", "Your hand slips, failing to extract anything!")
+ return FALSE
/datum/surgery_step/internal/gland_insert
name = "insert gland"
@@ -63,7 +67,11 @@
user.drop_item()
var/obj/item/organ/internal/heart/gland/gland = tool
gland.insert(target, 2)
- return 1
+ return TRUE
+
+/datum/surgery_step/internal/gland_insert/fail_step(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user]'s hand slips, failing to insert the gland!", "Your hand slips, failing to insert the gland!")
+ return FALSE
//IPC Gland Surgery//
@@ -91,4 +99,4 @@
/datum/surgery_step/internal/extract_organ/synth
name = "remove cell"
- organ_types = list(/obj/item/organ/internal/cell)
\ No newline at end of file
+ organ_types = list(/obj/item/organ/internal/cell)
diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm
index b0b879a30ab..10cd5473279 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm
+++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm
@@ -27,7 +27,7 @@
var/obj/machinery/computer/camera_advanced/abductor/camera
var/list/datum/icon_snapshot/disguises = list()
-/obj/machinery/abductor/console/initialize()
+/obj/machinery/abductor/console/Initialize()
..()
Link_Abduction_Equipment()
diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm
index 588900bb3e8..8682b50fc05 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm
+++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm
@@ -29,7 +29,7 @@
return
for(var/mob/living/carbon/slime/M in range(1, target))
if(M.Victim == target)
- to_chat(user, "[target] has a slime attached to them, deal with that first.")
+ to_chat(user, "[target] has a slime attached to [target.p_them()], deal with that first.")
return
visible_message("[user] puts [target] into the [src].")
diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm
index 09d8a84539a..11ec158db84 100644
--- a/code/game/gamemodes/miniantags/borer/borer.dm
+++ b/code/game/gamemodes/miniantags/borer/borer.dm
@@ -244,7 +244,7 @@
to_chat(M, "Borer Communication from [B] ([ghost_follow_link(src, ghost=M)]): [input]")
to_chat(src, "[B.truename] says: [input]")
-/mob/living/simple_animal/borer/Life()
+/mob/living/simple_animal/borer/Life(seconds, times_fired)
..()
@@ -325,7 +325,7 @@
to_chat(src, "You cannot infest someone who is already infested!")
return
- to_chat(src, "You slither up [M] and begin probing at their ear canal...")
+ to_chat(src, "You slither up [M] and begin probing at [M.p_their()] ear canal...")
if(!do_after(src, 50, target = M))
to_chat(src, "As [M] moves away, you are dislodged and fall to the ground.")
@@ -500,7 +500,7 @@
to_chat(src, "You cannot dominate someone who is already infested!")
return
- to_chat(src, "You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread.")
+ to_chat(src, "You focus your psychic lance on [M] and freeze [M.p_their()] limbs with a wave of terrible dread.")
to_chat(M, "You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing.")
M.Weaken(3)
@@ -531,7 +531,7 @@
to_chat(src, "You decide against leaving your host.")
return
- to_chat(src, "You begin disconnecting from [host]'s synapses and prodding at their internal ear canal.")
+ to_chat(src, "You begin disconnecting from [host]'s synapses and prodding at [host.p_their()] internal ear canal.")
leaving = TRUE
@@ -623,7 +623,7 @@
to_chat(src,"You are feeling far too docile to do that.")
return
else
- to_chat(src, "You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system.")
+ to_chat(src, "You plunge your probosci deep into the cortex of the host brain, interfacing directly with [host.p_their()] nervous system.")
to_chat(host, "You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.")
var/borer_key = src.key
add_attack_logs(src, host, "Assumed control of (borer)")
diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index 822bfc9ce29..68e8c16c5da 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -57,7 +57,7 @@
else
holder.icon_state = "hudhealthy"
-/mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies
+/mob/living/simple_animal/hostile/guardian/Life(seconds, times_fired) //Dies if the summoner dies
..()
if(summoner)
if(summoner.stat == DEAD)
@@ -448,6 +448,14 @@
Support:Has two modes. Combat: Medium power attacks and damage resist. Healer: Attacks heal damage, but low damage resist and slow movemen. Can deploy a bluespace beacon and warp targets to it (including you) in either mode.
Explosive: High damage resist and medium power attack. Can turn any object into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered.
+
+ Assassin: Medium damage with no damage resistance, can enter stealth which massively increases the damage of the next attack causing it to ignore armour.
+
+ Charger: Medium damage and defense, very fast and has a special charge attack which damages a target and knocks items out of their hands.
+
+ Lightning: Applies lightning chains to any targets on attack with a link to your summoner, lightning chains will shock anyone nearby.
+
+ Protector: You will become leashed to your holoparasite instead of them to you. Has two modes, a medium attack/defense mode and a protection mode which greatly reduces incoming damage to the holoparasite.
"}
/obj/item/paper/guardian/update_icon()
diff --git a/code/game/gamemodes/miniantags/guardian/types/assassin.dm b/code/game/gamemodes/miniantags/guardian/types/assassin.dm
index 426824f2e8c..5eb8c1b1cec 100644
--- a/code/game/gamemodes/miniantags/guardian/types/assassin.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/assassin.dm
@@ -13,7 +13,7 @@
var/obj/screen/alert/canstealthalert
var/obj/screen/alert/instealthalert
-/mob/living/simple_animal/hostile/guardian/assassin/Life()
+/mob/living/simple_animal/hostile/guardian/assassin/Life(seconds, times_fired)
. = ..()
updatestealthalert()
if(loc == summoner && toggle)
diff --git a/code/game/gamemodes/miniantags/guardian/types/charger.dm b/code/game/gamemodes/miniantags/guardian/types/charger.dm
index abdc349f175..17ed569f256 100644
--- a/code/game/gamemodes/miniantags/guardian/types/charger.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/charger.dm
@@ -6,7 +6,7 @@
ranged_cooldown_time = 40
speed = -1
damage_transfer = 0.6
- playstyle_string = "As a Charger type you do medium damage, have medium damage resistance, move very fast, and can charge at a location, damaging any target hit and forcing them to drop any items they are holding."
+ playstyle_string = "As a Charger type you do medium damage, have medium damage resistance, move very fast, and can charge at a location, damaging any target hit and forcing them to drop any items they are holding. (Click a tile to use your charge ability)"
magic_fluff_string = "..And draw the Hunter, an alien master of rapid assault."
tech_fluff_string = "Boot sequence complete. Charge modules loaded. Holoparasite swarm online."
bio_fluff_string = "Your scarab swarm finishes mutating and stirs to life, ready to deal damage."
diff --git a/code/game/gamemodes/miniantags/guardian/types/fire.dm b/code/game/gamemodes/miniantags/guardian/types/fire.dm
index 2a9dc2d2c8e..61905f942d2 100644
--- a/code/game/gamemodes/miniantags/guardian/types/fire.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/fire.dm
@@ -13,7 +13,7 @@
bio_fluff_string = "Your scarab swarm finishes mutating and stirs to life, ready to sow havoc at random."
var/toggle = FALSE
-/mob/living/simple_animal/hostile/guardian/fire/Life() //Dies if the summoner dies
+/mob/living/simple_animal/hostile/guardian/fire/Life(seconds, times_fired) //Dies if the summoner dies
..()
if(summoner)
summoner.ExtinguishMob()
diff --git a/code/game/gamemodes/miniantags/guardian/types/healer.dm b/code/game/gamemodes/miniantags/guardian/types/healer.dm
index d51e4cefd45..c679beac91a 100644
--- a/code/game/gamemodes/miniantags/guardian/types/healer.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/healer.dm
@@ -32,7 +32,7 @@
/mob/living/simple_animal/hostile/guardian/healer/New()
..()
-/mob/living/simple_animal/hostile/guardian/healer/Life()
+/mob/living/simple_animal/hostile/guardian/healer/Life(seconds, times_fired)
..()
var/datum/atom_hud/medsensor = huds[DATA_HUD_MEDICAL_ADVANCED]
medsensor.add_hud_to(src)
diff --git a/code/game/gamemodes/miniantags/guardian/types/protector.dm b/code/game/gamemodes/miniantags/guardian/types/protector.dm
index fe8b4897c42..9206b0d1b0b 100644
--- a/code/game/gamemodes/miniantags/guardian/types/protector.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/protector.dm
@@ -51,7 +51,7 @@
Recall(TRUE)
else
to_chat(summoner, "You moved out of range, and were pulled back! You can only move [range] meters from [src]!")
- summoner.visible_message("[summoner] jumps back to their protector.")
+ summoner.visible_message("[summoner] jumps back to [summoner.p_their()] protector.")
new /obj/effect/temp_visual/guardian/phase/out(get_turf(summoner))
summoner.forceMove(get_turf(src))
new /obj/effect/temp_visual/guardian/phase(get_turf(summoner))//Protector
\ No newline at end of file
diff --git a/code/game/gamemodes/miniantags/morph/morph_event.dm b/code/game/gamemodes/miniantags/morph/morph_event.dm
index d9e26597a2b..ab875832451 100644
--- a/code/game/gamemodes/miniantags/morph/morph_event.dm
+++ b/code/game/gamemodes/miniantags/morph/morph_event.dm
@@ -19,7 +19,7 @@
return kill()
var/mob/living/simple_animal/hostile/morph/S = new /mob/living/simple_animal/hostile/morph(pick(xeno_spawn))
player_mind.transfer_to(S)
- player_mind.assigned_role = "Morph"
+ player_mind.assigned_role = SPECIAL_ROLE_MORPH
player_mind.special_role = SPECIAL_ROLE_MORPH
ticker.mode.traitors |= player_mind
to_chat(S, S.playstyle_string)
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
index 49380c57863..953e6e91762 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -54,7 +54,7 @@
var/image/ghostimage = null //Visible to ghost with darkness off
-/mob/living/simple_animal/revenant/Life()
+/mob/living/simple_animal/revenant/Life(seconds, times_fired)
..()
if(revealed && essence <= 0)
death()
@@ -392,7 +392,7 @@
var/datum/mind/player_mind = new /datum/mind(key_of_revenant)
player_mind.active = 1
player_mind.transfer_to(R)
- player_mind.assigned_role = "revenant"
+ player_mind.assigned_role = SPECIAL_ROLE_REVENANT
player_mind.special_role = SPECIAL_ROLE_REVENANT
ticker.mode.traitors |= player_mind
message_admins("[key_of_revenant] has been [client_to_revive ? "re":""]made into a revenant by reforming ectoplasm.")
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index 32d51b579c4..5a7825c0cfe 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -73,7 +73,7 @@
icon_state = "revenant_draining"
reveal(27)
stun(27)
- target.visible_message("[target] suddenly rises slightly into the air, their skin turning an ashy gray.")
+ target.visible_message("[target] suddenly rises slightly into the air, [target.p_their()] skin turning an ashy gray.")
target.Beam(src,icon_state="drain_life",icon='icons/effects/effects.dmi',time=26)
if(do_after(src, 30, 0, target)) //As one cannot prove the existance of ghosts, ghosts cannot prove the existance of the target they were draining.
change_essence_amount(essence_drained, 0, target)
@@ -263,8 +263,8 @@
new/obj/effect/temp_visual/revenant(T)
T.ChangeTurf(/turf/simulated/wall/r_wall/rust)
for(var/obj/structure/window/window in T.contents)
- window.hit(rand(30,80))
- if(window && window.is_fulltile())
+ window.take_damage(rand(30,80))
+ if(window && window.fulltile)
new/obj/effect/temp_visual/revenant/cracks(window.loc)
for(var/obj/structure/closet/closet in T.contents)
closet.open()
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm
index 859f863b03c..a70114d8f5e 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_spawn_event.dm
@@ -43,7 +43,7 @@
return kill()
var/mob/living/simple_animal/revenant/revvie = new /mob/living/simple_animal/revenant/(pick(spawn_locs))
player_mind.transfer_to(revvie)
- player_mind.assigned_role = "revenant"
+ player_mind.assigned_role = SPECIAL_ROLE_REVENANT
player_mind.special_role = SPECIAL_ROLE_REVENANT
ticker.mode.traitors |= player_mind
message_admins("[key_of_revenant] has been made into a revenant by an event.")
diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
index 42827d27f59..6b5705cfa7f 100644
--- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm
+++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
@@ -82,7 +82,7 @@
to_chat(src, "Objective #[2]: [fluffObjective.explanation_text]")
-/mob/living/simple_animal/slaughter/Life()
+/mob/living/simple_animal/slaughter/Life(seconds, times_fired)
..()
if(boostYou could not locate any sapient heretics for the Slaughter.")
return 0
- to_chat(usr, "You sense a terrified soul at [A]. Show them the error of their ways.")
+ to_chat(usr, "You sense a terrified soul at [A]. Show [A.p_them()] the error of [A.p_their()] ways.")
/mob/living/simple_animal/slaughter/cult/New()
..()
@@ -241,7 +241,7 @@
return // Just so people don't accidentally waste it
/obj/item/organ/internal/heart/demon/attack_self(mob/living/user)
- user.visible_message("[user] raises [src] to their mouth and tears into it with their teeth!", \
+ user.visible_message("[user] raises [src] to [user.p_their()] mouth and tears into it with [user.p_their()] teeth!", \
"An unnatural hunger consumes you. You raise [src] to your mouth and devour it!")
playsound(user, 'sound/misc/Demon_consume.ogg', 50, 1)
for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list)
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index b2f06a7913a..feffadcf9ab 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -49,7 +49,7 @@ proc/issyndicate(mob/living/M as mob)
agent_number--
for(var/datum/mind/synd_mind in syndicates)
- synd_mind.assigned_role = "MODE" //So they aren't chosen for other jobs.
+ synd_mind.assigned_role = SPECIAL_ROLE_NUKEOPS //So they aren't chosen for other jobs.
synd_mind.special_role = SPECIAL_ROLE_NUKEOPS
return 1
diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm
index 6bb181b4136..8fbeb2d9690 100644
--- a/code/game/gamemodes/nuclear/nuclear_challenge.dm
+++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm
@@ -20,7 +20,7 @@
return
declaring_war = TRUE
- var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew? You have [-round((world.time-round_start_time - CHALLENGE_TIME_LIMIT)/10)] seconds to decide.", "Declare war?", "Yes", "No")
+ var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]. Are you sure you want to alert the enemy crew? You have [-round((world.time-round_start_time - CHALLENGE_TIME_LIMIT)/10)] seconds to decide.", "Declare war?", "Yes", "No")
declaring_war = FALSE
if(!check_allowed(user))
@@ -30,7 +30,7 @@
to_chat(user, "On second thought, the element of surprise isn't so bad after all.")
return
- var/war_declaration = "[user.real_name] has declared his intent to utterly destroy [station_name()] with a nuclear device, and dares the crew to try and stop them."
+ var/war_declaration = "[user.real_name] has declared [user.p_their()] intent to utterly destroy [station_name()] with a nuclear device, and dares the crew to try and stop them."
declaring_war = TRUE
var/custom_threat = alert(user, "Do you want to customize your declaration?", "Customize?", "Yes", "No")
@@ -71,7 +71,7 @@
if(!is_admin_level(user.z))
to_chat(user, "You have to be at your base to use this.")
return FALSE
- if(world.time > CHALLENGE_TIME_LIMIT)
+ if((world.time - round_start_time) > CHALLENGE_TIME_LIMIT) // Only count after the round started
to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.")
return FALSE
for(var/obj/machinery/computer/shuttle/syndicate/S in machines)
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 37a2979ae74..e9bea1d8b1d 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -53,7 +53,7 @@
var/turf/T = get_turf(target)
var/turf/L = get_turf(src)
- if(T.z != L.z)
+ if(!(T && L) || (T.z != L.z))
icon_state = icon_null
else
dir = get_dir(L, T)
@@ -341,7 +341,7 @@
if(active)
active = FALSE
icon_state = icon_off
- user.visible_message("[user] deactivates their pinpointer.", "You deactivate your pinpointer.")
+ user.visible_message("[user] deactivates [user.p_their()] pinpointer.", "You deactivate your pinpointer.")
return
var/list/name_counts = list()
@@ -354,7 +354,8 @@
var/name = "Unknown"
if(H.wear_id)
var/obj/item/card/id/I = H.wear_id.GetID()
- name = I.registered_name
+ if(I)
+ name = I.registered_name
while(name in name_counts)
name_counts[name]++
@@ -372,7 +373,7 @@
var/target = names[A]
active = TRUE
- user.visible_message("[user] activates their pinpointer.", "You activate your pinpointer.")
+ user.visible_message("[user] activates [user.p_their()] pinpointer.", "You activate your pinpointer.")
point_at(target)
/obj/item/pinpointer/crew/point_at(atom/target, spawnself = 1)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index c9ad5ce69e4..07395aa0578 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -287,7 +287,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu
target = pick(possible_targets)
if(target && target.current)
target_real_name = target.current.real_name
- explanation_text = "Escape on the shuttle or an escape pod with the identity of [target_real_name], the [target.assigned_role] while wearing their identification card."
+ explanation_text = "Escape on the shuttle or an escape pod with the identity of [target_real_name], the [target.assigned_role] while wearing [target.p_their()] identification card."
else
explanation_text = "Free Objective"
@@ -515,7 +515,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu
var/list/priority_targets = list()
for(var/datum/mind/possible_target in ticker.minds)
- if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && (possible_target.assigned_role != "MODE"))
+ if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && (possible_target.assigned_role != possible_target.special_role))
possible_targets += possible_target
for(var/role in roles)
if(possible_target.assigned_role == role)
@@ -528,7 +528,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu
target = pick(possible_targets)
if(target && target.current)
- explanation_text = "The Shoal has a need for [target.current.real_name], the [target.assigned_role]. Take them alive."
+ explanation_text = "The Shoal has a need for [target.current.real_name], the [target.assigned_role]. Take [target.current.p_them()] alive."
else
explanation_text = "Free Objective"
return target
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 4f500825065..089cad71a3a 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -279,7 +279,7 @@
to_chat(M, "The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.")
else
- to_chat(M, "[rev_mind.current] looks like they just remembered their real allegiance!")
+ to_chat(M, "[rev_mind.current] looks like [rev_mind.current.p_they()] just remembered [rev_mind.current.p_their()] real allegiance!")
/////////////////////////////////////
//Adds the rev hud to a new convert//
diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm
index ed8603360fe..1d0bb3adf03 100644
--- a/code/game/gamemodes/shadowling/shadowling.dm
+++ b/code/game/gamemodes/shadowling/shadowling.dm
@@ -188,7 +188,7 @@ Made by Xhuis
M.audible_message("[M] lets out a short blip.", \
"You have been turned into a robot! You are no longer a thrall! Though you try, you cannot remember anything about your servitude...")
else
- M.visible_message("[M] looks like their mind is their own again!", \
+ M.visible_message("[M] looks like [M.p_their()] mind is [M.p_their()] own again!", \
"A piercing white light floods your eyes. Your mind is your own again! Though you try, you cannot remember anything about the shadowlings or your time \
under their command...")
return 1
diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm
index 06f7bc9440c..89aee290422 100644
--- a/code/game/gamemodes/shadowling/shadowling_abilities.dm
+++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm
@@ -40,9 +40,9 @@
return
var/mob/living/carbon/human/M = target
user.visible_message("[user]'s eyes flash a blinding red!")
- target.visible_message("[target] freezes in place, their eyes glazing over...")
+ target.visible_message("[target] freezes in place, [target.p_their()] eyes glazing over...")
if(in_range(target, user))
- to_chat(target, "Your gaze is forcibly drawn into [user]'s eyes, and you are mesmerized by their heavenly beauty...")
+ to_chat(target, "Your gaze is forcibly drawn into [user]'s eyes, and you are mesmerized by [user.p_their()] heavenly beauty...")
else //Only alludes to the shadowling if the target is close by
to_chat(target, "Red lights suddenly dance in your vision, and you are mesmerized by the heavenly lights...")
target.Stun(10)
@@ -306,7 +306,7 @@
switch(progress)
if(1)
to_chat(user, "You place your hands to [target]'s head...")
- user.visible_message("[user] places their hands onto the sides of [target]'s head!")
+ user.visible_message("[user] places [user.p_their()] hands onto the sides of [target]'s head!")
if(2)
to_chat(user, "You begin preparing [target]'s mind as a blank slate...")
user.visible_message("[user]'s palms flare a bright red against [target]'s temples!")
@@ -315,7 +315,7 @@
sleep(20)
if(ismindshielded(target))
to_chat(user, "They have a mindshield implant. You begin to deactivate it - this will take some time.")
- user.visible_message("[user] pauses, then dips their head in concentration!")
+ user.visible_message("[user] pauses, then dips [user.p_their()] head in concentration!")
to_chat(target, "Your mindshield implant becomes hot as it comes under attack!")
sleep(100) //10 seconds - not spawn() so the enthralling takes longer
to_chat(user, "The nanobots composing the mindshield implant have been rendered inert. Now to continue.")
@@ -361,7 +361,7 @@
if(!istype(target) || !ishuman(target))
return
var/mob/living/carbon/human/H = target
- H.visible_message("[H]'s skin suddenly bubbles and shifts around their body!", \
+ H.visible_message("[H]'s skin suddenly bubbles and shifts around [H.p_their()] body!", \
"You regenerate your protective armor and cleanse your form of defects.")
H.adjustCloneLoss(-target.getCloneLoss())
H.equip_to_slot_or_del(new /obj/item/clothing/under/shadowling(H), slot_w_uniform)
@@ -493,7 +493,7 @@
to_chat(M, "You breathe in the black smoke, and your eyes burn horribly!")
M.EyeBlind(5)
if(prob(25))
- M.visible_message("[M] claws at their eyes!")
+ M.visible_message("[M] claws at [M.p_their()] eyes!")
M.Stun(3)
else
to_chat(M, "You breathe in the black smoke, and you feel revitalized!")
@@ -540,9 +540,7 @@
sp.start()
S.Weaken(6)
for(var/obj/structure/window/W in T.contents)
- W.hit(rand(80, 100))
-
-
+ W.take_damage(rand(80, 100))
/obj/effect/proc_holder/spell/aoe_turf/drainLife
name = "Drain Life"
@@ -627,9 +625,9 @@
to_chat(user, "You cannot spare this much energy. There are too many empowered thralls.")
charge_counter = charge_max
return
- user.visible_message("[user] places their hands over [thrallToRevive]'s face, red light shining from beneath.", \
+ user.visible_message("[user] places [user.p_their()] hands over [thrallToRevive]'s face, red light shining from beneath.", \
"You place your hands on [thrallToRevive]'s face and begin gathering energy...")
- to_chat(thrallToRevive, "[user] places their hands over your face. You feel energy gathering. Stand still...")
+ to_chat(thrallToRevive, "[user] places [user.p_their()] hands over your face. You feel energy gathering. Stand still...")
if(!do_mob(user, thrallToRevive, 80))
to_chat(user, "Your concentration snaps. The flow of energy ebbs.")
charge_counter = charge_max
@@ -640,7 +638,7 @@
playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1)
user.Beam(thrallToRevive,icon_state="red_lightning",icon='icons/effects/effects.dmi',time=1)
thrallToRevive.Weaken(5)
- thrallToRevive.visible_message("[thrallToRevive] collapses, their skin and face distorting!", \
+ thrallToRevive.visible_message("[thrallToRevive] collapses, [thrallToRevive.p_their()] skin and face distorting!", \
"AAAAAAAAAAAAAAAAAAAGH-")
sleep(20)
thrallToRevive.visible_message("[thrallToRevive] slowly rises, no longer recognizable as human.", \
@@ -659,7 +657,7 @@
to_chat(user, "[thrallToRevive] is not dead.")
charge_counter = charge_max
return
- user.visible_message("[user] kneels over [thrallToRevive], placing their hands on \his chest.", \
+ user.visible_message("[user] kneels over [thrallToRevive], placing [user.p_their()] hands on [thrallToRevive.p_their()] chest.", \
"You crouch over the body of your thrall and begin gathering energy...")
thrallToRevive.notify_ghost_cloning("Your masters are resuscitating you! Re-enter your corpse if you wish to be brought to life.", source = thrallToRevive)
if(!do_mob(user, thrallToRevive, 30))
@@ -673,7 +671,7 @@
user.Beam(thrallToRevive,icon_state="red_lightning",icon='icons/effects/effects.dmi',time=1)
sleep(10)
if(thrallToRevive.revive())
- thrallToRevive.visible_message("[thrallToRevive] heaves in breath, dim red light shining in their eyes.", \
+ thrallToRevive.visible_message("[thrallToRevive] heaves in breath, dim red light shining in [thrallToRevive.p_their()] eyes.", \
"You have returned. One of your masters has brought you from the darkness beyond.")
thrallToRevive.Weaken(4)
thrallToRevive.emote("gasp")
@@ -710,7 +708,7 @@
var/mob/living/carbon/human/M = target
user.visible_message("[user]'s eyes flash a bright red!", \
"You begin to draw [M]'s life force.")
- M.visible_message("[M]'s face falls slack, their jaw slightly distending.", \
+ M.visible_message("[M]'s face falls slack, [M.p_their()] jaw slightly distending.", \
"You are suddenly transported... far, far away...")
if(!do_after(user, 50, target = M))
to_chat(M, "You are snapped back to reality, your haze dissipating!")
@@ -754,7 +752,7 @@
to_chat(user, "Making an ally explode seems unwise.")
charge_counter = charge_max
return
- user.visible_message("[user]'s markings flare as they gesture at [boom]!", \
+ user.visible_message("[user]'s markings flare as [user.p_they()] gesture[user.p_s()] at [boom]!", \
"You direct a lance of telekinetic energy at [boom].")
sleep(4)
if(iscarbon(boom))
@@ -798,7 +796,7 @@
charge_counter = charge_max
return
- to_chat(user, "You instantly rearrange [target]'s memories, hyptonitizing them into a thrall.")
+ to_chat(user, "You instantly rearrange [target]'s memories, hyptonitizing [target.p_them()] into a thrall.")
to_chat(target, "An agonizing spike of pain drives into your mind, and--")
ticker.mode.add_thrall(target.mind)
target.mind.special_role = SPECIAL_ROLE_SHADOWLING_THRALL
diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm
index 5c05a028df0..4239b5db327 100644
--- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm
+++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm
@@ -43,7 +43,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
var/temp_flags = H.status_flags
H.status_flags |= GODMODE //Can't die while hatching
- H.visible_message("A chrysalis forms around [H], sealing them inside.", \
+ H.visible_message("A chrysalis forms around [H], sealing [H.p_them()] inside.", \
"You create your chrysalis and begin to contort within.")
sleep(100)
@@ -51,7 +51,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
"Spines pierce your back. Your claws break apart your fingers. You feel excruciating pain as your true form begins its exit.")
sleep(90)
- H.visible_message("[H], skin shifting, begins tearing at the walls around them.", \
+ H.visible_message("[H], skin shifting, begins tearing at the walls around [H.p_them()].", \
"Your false skin slips away. You begin tearing at the fragile membrane protecting you.")
sleep(80)
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index ec8a1643c27..9234043976c 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -346,7 +346,7 @@
// Tell them about people they might want to contact.
var/mob/living/carbon/human/M = get_nt_opposed()
if(M && M != traitor_mob)
- to_chat(traitor_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them.")
+ to_chat(traitor_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting [M.p_them()].")
traitor_mob.mind.store_memory("Potential Collaborator: [M.real_name]")
//let's also inform their contact that they might be called upon, but leave it vague.
inform_collab(M)
diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index c2431f17318..14ba6fb9dd0 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -279,8 +279,8 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
to_chat(owner, "[owner.wear_mask] prevents you from biting [H]!")
draining = null
return
- add_attack_logs(owner, H, "vampirebit & is draining their blood.", FALSE)
- owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in their fangs!", "You sink your fangs into [H] and begin to drain their blood.", "You hear a soft puncture and a wet sucking noise.")
+ add_attack_logs(owner, H, "vampirebit & is draining their blood.", ATKLOG_ALMOSTALL)
+ owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in [owner.p_their()] fangs!", "You sink your fangs into [H] and begin to drain [owner.p_their()] blood.", "You hear a soft puncture and a wet sucking noise.")
if(!iscarbon(owner))
H.LAssailant = null
else
diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm
index e9a249d8412..c9dad5c510d 100644
--- a/code/game/gamemodes/vampire/vampire_powers.dm
+++ b/code/game/gamemodes/vampire/vampire_powers.dm
@@ -175,7 +175,7 @@
/obj/effect/proc_holder/spell/vampire/targetted/hypnotise/cast(list/targets, mob/user = usr)
for(var/mob/living/target in targets)
- user.visible_message("[user]'s eyes flash briefly as he stares into [target]'s eyes")
+ user.visible_message("[user]'s eyes flash briefly as [user.p_they()] stare[user.p_s()] into [target]'s eyes")
if(do_mob(user, target, 50))
if(!affects(target))
to_chat(user, "Your piercing gaze fails to knock out [target].")
@@ -270,7 +270,7 @@
C.Stun(4)
C.Jitter(150)
for(var/obj/structure/window/W in view(4))
- W.destroy()
+ W.deconstruct(FALSE)
playsound(user.loc, 'sound/effects/creepyshriek.ogg', 100, 1)
@@ -345,8 +345,8 @@
ticker.mode.vampire_enthralled.Add(H.mind)
ticker.mode.vampire_enthralled[H.mind] = user.mind
H.mind.special_role = SPECIAL_ROLE_VAMPIRE_THRALL
- to_chat(H, "You have been Enthralled by [user]. Follow their every command.")
- to_chat(user, "You have successfully Enthralled [H]. If they refuse to do as you say just adminhelp.")
+ to_chat(H, "You have been Enthralled by [user]. Follow [user.p_their()] every command.")
+ to_chat(user, "You have successfully Enthralled [H]. If [H.p_they()] refuse[H.p_s()] to do as you say just adminhelp.")
add_attack_logs(user, H, "Vampire-thralled")
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 2e99f0238c5..7c1a3526002 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -56,7 +56,7 @@
new /obj/effect/particle_effect/smoke(H.loc)
var/mob/living/carbon/human/M = new/mob/living/carbon/human(H.loc)
M.key = C.key
- to_chat(M, "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals.")
+ to_chat(M, "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow [H.p_their()] orders and help [H.p_them()] in accomplishing their goals.")
switch(href_list["school"])
if("destruction")
M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null))
@@ -213,7 +213,7 @@
/obj/item/scrying/attack_self(mob/user as mob)
to_chat(user, " You can see...everything!")
- visible_message("[user] stares into [src], their eyes glazing over.")
+ visible_message("[user] stares into [src], [user.p_their()] eyes glazing over.")
user.ghostize(1)
/////////////////////Multiverse Blade////////////////////
@@ -277,7 +277,7 @@ var/global/list/multiverse = list()
var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone
hijack_objective.owner = usr.mind
usr.mind.objectives += hijack_objective
- hijack_objective.explanation_text = "Ensure only [usr.real_name] and their copies are on the shuttle!"
+ hijack_objective.explanation_text = "Ensure only [usr.real_name] and [usr.p_their()] copies are on the shuttle!"
to_chat(usr, "Objective #[1]: [hijack_objective.explanation_text]")
ticker.mode.traitors += usr.mind
usr.mind.special_role = "[usr.real_name] Prime"
@@ -318,7 +318,7 @@ var/global/list/multiverse = list()
C.prefs.copy_to(M)
M.key = C.key
M.mind.name = user.real_name
- to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs.")
+ to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help [user.p_them()] accomplish [user.p_their()] goals at all costs.")
M.faction = list("[user.real_name]")
if(duplicate_self)
M.set_species(user.get_species()) //duplicate the sword user's species.
@@ -342,7 +342,7 @@ var/global/list/multiverse = list()
var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone
hijack_objective.owner = M.mind
M.mind.objectives += hijack_objective
- hijack_objective.explanation_text = "Ensure only [usr.real_name] and their copies are on the shuttle!"
+ hijack_objective.explanation_text = "Ensure only [usr.real_name] and [usr.p_their()] copies are on the shuttle!"
to_chat(M, "Objective #[1]: [hijack_objective.explanation_text]")
M.mind.special_role = SPECIAL_ROLE_MULTIVERSE
log_game("[M.key] was made a multiverse traveller with the objective to help [usr.real_name] hijack.")
@@ -350,7 +350,7 @@ var/global/list/multiverse = list()
var/datum/objective/protect/new_objective = new /datum/objective/protect
new_objective.owner = M.mind
new_objective.target = usr.mind
- new_objective.explanation_text = "Protect [usr.real_name], your copy, and help them defend the innocent from the mobs of multiverse clones."
+ new_objective.explanation_text = "Protect [usr.real_name], your copy, and help [usr.p_them()] defend the innocent from the mobs of multiverse clones."
M.mind.objectives += new_objective
to_chat(M, "Objective #[1]: [new_objective.explanation_text]")
M.mind.special_role = SPECIAL_ROLE_MULTIVERSE
@@ -652,7 +652,7 @@ var/global/list/multiverse = list()
equip_skeleton(M)
spooky_scaries |= M
to_chat(M, "You have been revived by [user.real_name]!")
- to_chat(M, "They are your master now, assist them even if it costs you your new life!")
+ to_chat(M, "[user.p_theyre(TRUE)] your master now, assist them even if it costs you your new life!")
desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]"
/obj/item/necromantic_stone/proc/check_spooky()
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index cb303a90932..4bd7f3004d8 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -167,9 +167,9 @@
icon_state = "soulstone"
name = initial(name)
if(iswizard(usr) || usability)
- to_chat(A, "You have been released from your prison, but you are still bound to [usr.real_name]'s will. Help them succeed in their goals at all costs.")
+ to_chat(A, "You have been released from your prison, but you are still bound to [usr.real_name]'s will. Help [usr.p_them()] succeed in [usr.p_their()] goals at all costs.")
else if(iscultist(usr))
- to_chat(A, "You have been released from your prison, but you are still bound to the cult's will. Help them succeed in their goals at all costs.")
+ to_chat(A, "You have been released from your prison, but you are still bound to the cult's will. Help [usr.p_them()] succeed in [usr.p_their()] goals at all costs.")
was_used()
attack_self(U)
@@ -280,7 +280,7 @@
ticker.mode.update_cult_icons_added(Z.mind)
qdel(T)
to_chat(Z, "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike.")
- to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
+ to_chat(Z, "You are still bound to serve your creator, follow [U.p_their()] orders and help [U.p_them()] complete [U.p_their()] goals at all costs.")
Z.cancel_camera()
qdel(C)
@@ -296,7 +296,7 @@
ticker.mode.update_cult_icons_added(Z.mind)
qdel(T)
to_chat(Z, "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls.")
- to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
+ to_chat(Z, "You are still bound to serve your creator, follow [U.p_their()] orders and help [U.p_them()] complete [U.p_their()] goals at all costs.")
Z.cancel_camera()
qdel(C)
@@ -312,7 +312,7 @@
ticker.mode.update_cult_icons_added(Z.mind)
qdel(T)
to_chat(Z, "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone).")
- to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
+ to_chat(Z, "You are still bound to serve your creator, follow [U.p_their()] orders and help [U.p_them()] complete [U.p_their()] goals at all costs.")
Z.cancel_camera()
qdel(C)
else
@@ -332,11 +332,11 @@
ticker.mode.cult+=newstruct.mind
ticker.mode.update_cult_icons_added(newstruct.mind)
if(stoner && iswizard(stoner))
- to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
+ to_chat(newstruct, "You are still bound to serve your creator, follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
else if(stoner && iscultist(stoner))
- to_chat(newstruct, "You are still bound to serve the cult, follow their orders and help them complete their goals at all costs.")
+ to_chat(newstruct, "You are still bound to serve the cult, follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
else
- to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.")
+ to_chat(newstruct, "You are still bound to serve your creator, follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
newstruct.cancel_camera()
/obj/item/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/U, vic = 0)
@@ -362,11 +362,11 @@
name = "soulstone: Shade of [T.real_name]"
icon_state = "soulstone2"
if(U && iswizard(U))
- to_chat(S, "Your soul has been captured! You are now bound to [U.real_name]'s will. Help them succeed in their goals at all costs.")
+ to_chat(S, "Your soul has been captured! You are now bound to [U.real_name]'s will. Help [U.p_them()] succeed in their goals at all costs.")
else if(U && iscultist(U))
- to_chat(S, "Your soul has been captured! You are now bound to the cult's will. Help them succeed in their goals at all costs.")
+ to_chat(S, "Your soul has been captured! You are now bound to the cult's will. Help [U.p_them()] succeed in their goals at all costs.")
if(vic && U)
- to_chat(U, "Capture successful!: [T.real_name]'s soul has been ripped from their body and stored within the soul stone.")
+ to_chat(U, "Capture successful!: [T.real_name]'s soul has been ripped from [U.p_their()] body and stored within the soul stone.")
/obj/item/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U)
var/mob/dead/observer/chosen_ghost
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index 9d7ddab9d71..0c380010e6a 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -505,7 +505,7 @@
var/list/datum/spellbook_entry/entries = list()
var/list/categories = list()
-/obj/item/spellbook/proc/Initialize()
+/obj/item/spellbook/proc/initialize()
var/entry_types = subtypesof(/datum/spellbook_entry) - /datum/spellbook_entry/item - /datum/spellbook_entry/summon
for(var/T in entry_types)
var/datum/spellbook_entry/E = new T
@@ -518,7 +518,7 @@
/obj/item/spellbook/New()
..()
- Initialize()
+ initialize()
/obj/item/spellbook/attackby(obj/item/O as obj, mob/user as mob, params)
if(istype(O, /obj/item/contract))
@@ -685,7 +685,7 @@
..()
name += spellname
-/obj/item/spellbook/oneuse/Initialize() //No need to init
+/obj/item/spellbook/oneuse/initialize() //No need to init
return
/obj/item/spellbook/oneuse/attack_self(mob/user)
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index 3294f1f3a0b..b5e798b95c7 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -27,7 +27,7 @@
wizards += wizard
modePlayer += wizard
- wizard.assigned_role = "MODE" //So they aren't chosen for other jobs.
+ wizard.assigned_role = SPECIAL_ROLE_WIZARD //So they aren't chosen for other jobs.
wizard.special_role = SPECIAL_ROLE_WIZARD
wizard.original = wizard.current
if(wizardstart.len == 0)
@@ -141,15 +141,10 @@
wizard_mob.equip_to_slot_or_del(new /obj/item/radio/headset(wizard_mob), slot_l_ear)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(wizard_mob), slot_shoes)
- if(!wizard_mob.get_species() == "Plasmaman")//handled in the species file for plasmen on the afterjob equip proc for now
+ if(wizard_mob.get_species() != "Plasmaman") //handled in the species file for plasmen on the afterjob equip proc for now
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head)
- if(wizard_mob.backbag == 2)
- wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack(wizard_mob), slot_back)
- if(wizard_mob.backbag == 3)
- wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel_norm(wizard_mob), slot_back)
- if(wizard_mob.backbag == 4)
- wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(wizard_mob), slot_back)
+ wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(wizard_mob), slot_back)
wizard_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival(wizard_mob), slot_in_backpack)
wizard_mob.equip_to_slot_or_del(new /obj/item/teleportation_scroll(wizard_mob), slot_r_store)
var/obj/item/spellbook/spellbook = new /obj/item/spellbook(wizard_mob)
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 61c14efc2e5..0e315e03b2c 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -1,10 +1,6 @@
var/global/datum/controller/occupations/job_master
-#define GET_RANDOM_JOB 0
-#define BE_ASSISTANT 1
-#define RETURN_TO_LOBBY 2
-
/datum/controller/occupations
//List of all jobs
var/list/occupations = list()
diff --git a/code/game/jobs/job_exp.dm b/code/game/jobs/job_exp.dm
index 3c17c6f0107..552654245dd 100644
--- a/code/game/jobs/job_exp.dm
+++ b/code/game/jobs/job_exp.dm
@@ -1,11 +1,12 @@
// Playtime requirements for special roles (hours)
var/global/list/role_playtime_requirements = list(
- // CREW-FRIENDLY ROLES
+ // NT ROLES
ROLE_PAI = 0,
ROLE_POSIBRAIN = 5, // Same as cyborg job.
ROLE_SENTIENT = 5,
ROLE_ERT = 10, // High, because they're team-based, and we want ERT to be robust
+ ROLE_DEATHSQUAD = 10,
ROLE_TRADER = 5,
ROLE_DRONE = 10, // High, because they're like mini engineering cyborgs that can ignore the AI, ventcrawl, and respawn themselves
diff --git a/code/game/jobs/job_objective.dm b/code/game/jobs/job_objective.dm
index 8860cdf4931..90bac6d8383 100644
--- a/code/game/jobs/job_objective.dm
+++ b/code/game/jobs/job_objective.dm
@@ -49,7 +49,7 @@
if(!employee.job_objectives.len)//If the employee had no objectives, don't need to process this.
continue
- if(!employee.assigned_role=="MODE")//If the employee is a gamemode thing, skip.
+ if(employee.assigned_role == employee.special_role) //If the character is an offstation character, skip them.
continue
var/tasks_completed=0
@@ -68,7 +68,7 @@
count++
if(tasks_completed >= 1)
- text += " [employee.name] did their fucking job!"
+ text += " [employee.name] did [employee.p_their()] fucking job!"
feedback_add_details("employee_success","SUCCESS")
else
feedback_add_details("employee_success","FAIL")
diff --git a/code/game/jobs/job_scaling.dm b/code/game/jobs/job_scaling.dm
new file mode 100644
index 00000000000..7d8804783f1
--- /dev/null
+++ b/code/game/jobs/job_scaling.dm
@@ -0,0 +1,11 @@
+/hook/roundstart/proc/jobscaling()
+ sleep(10 SECONDS) // give everyone time to finish spawning, and the lag to die down
+ var/playercount = length(clients)
+ var/highpop_trigger = 80
+
+ if(playercount >= highpop_trigger)
+ log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - loading highpop job config");
+ job_master.LoadJobs("config/jobs_highpop.txt")
+ else
+ log_debug("Playercount: [playercount] versus trigger: [highpop_trigger] - keeping standard job config");
+ return 1
\ No newline at end of file
diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm
index 3c9c27f1590..f7925fecda5 100644
--- a/code/game/machinery/OpTable.dm
+++ b/code/game/machinery/OpTable.dm
@@ -54,13 +54,12 @@
if(prob(75))
qdel(src)
-/obj/machinery/optable/attack_hand(mob/user as mob)
- if(HULK in usr.mutations)
- to_chat(usr, text("You destroy the table."))
- visible_message("[usr] destroys the operating table!")
- src.density = 0
+/obj/machinery/optable/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM)
+ ..(user, TRUE)
+ visible_message("[user] destroys the operating table!")
qdel(src)
- return
+ return TRUE
/obj/machinery/optable/CanPass(atom/movable/mover, turf/target, height=0)
if(height==0) return 1
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 7d386ddfb1a..24311a8b12e 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -257,7 +257,7 @@
if(href_list["chemical"])
if(occupant)
if(occupant.stat == DEAD)
- to_chat(usr, "This person has no life for to preserve anymore. Take them to a department capable of reanimating them.")
+ to_chat(usr, "This person has no life for to preserve anymore. Take [occupant.p_them()] to a department capable of reanimating them.")
else if(occupant.health > min_health || (href_list["chemical"] in emergency_chems))
inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"]))
else
@@ -327,34 +327,35 @@
return
if(istype(G, /obj/item/grab))
+ var/obj/item/grab/GG = G
if(panel_open)
to_chat(user, "Close the maintenance panel first.")
return
- if(!ismob(G:affecting))
+ if(!ismob(GG.affecting))
return
if(src.occupant)
to_chat(user, "The sleeper is already occupied!")
return
- for(var/mob/living/carbon/slime/M in range(1,G:affecting))
- if(M.Victim == G:affecting)
- to_chat(usr, "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head.")
+ for(var/mob/living/carbon/slime/M in range(1,GG.affecting))
+ if(M.Victim == GG.affecting)
+ to_chat(usr, "[GG.affecting.name] will not fit into the sleeper because [GG.affecting.p_they()] [GG.affecting.p_have()] a slime latched onto [GG.affecting.p_their()] head.")
return
- visible_message("[user] starts putting [G:affecting:name] into the sleeper.")
+ visible_message("[user] starts putting [GG.affecting.name] into the sleeper.")
- if(do_after(user, 20, target = G:affecting))
+ if(do_after(user, 20, target = GG.affecting))
if(src.occupant)
to_chat(user, "The sleeper is already occupied!")
return
- if(!G || !G:affecting) return
- var/mob/M = G:affecting
+ if(!GG || !GG.affecting) return
+ var/mob/M = GG.affecting
M.forceMove(src)
src.occupant = M
src.icon_state = "[base_icon]"
to_chat(M, "You feel cool air surround you. You go numb as your senses turn inward.")
src.add_fingerprint(user)
- qdel(G)
+ qdel(GG)
return
return
@@ -496,7 +497,7 @@
return
for(var/mob/living/carbon/slime/M in range(1,L))
if(M.Victim == L)
- to_chat(usr, "[L.name] will not fit into the sleeper because they have a slime latched onto their head.")
+ to_chat(usr, "[L.name] will not fit into the sleeper because [L.p_they()] [L.p_have()] a slime latched onto their head.")
return
if(L == user)
visible_message("[user] starts climbing into the sleeper.")
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index f2dc8c8bfa2..59009e9930f 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -95,7 +95,7 @@
return
for(var/mob/living/carbon/slime/M in range(1, TYPECAST_YOUR_SHIT.affecting))
if(M.Victim == TYPECAST_YOUR_SHIT.affecting)
- to_chat(user, "[TYPECAST_YOUR_SHIT.affecting.name] has a fucking slime attached to them, deal with that first.")
+ to_chat(user, "[TYPECAST_YOUR_SHIT.affecting.name] has a fucking slime attached to [TYPECAST_YOUR_SHIT.affecting.p_them()], deal with that first.")
return
var/mob/M = TYPECAST_YOUR_SHIT.affecting
if(M.abiotic())
@@ -133,7 +133,7 @@
return 0
for(var/mob/living/carbon/slime/M in range(1, O))
if(M.Victim == O)
- to_chat(user, "[O] has a fucking slime attached to them, deal with that first.")
+ to_chat(user, "[O] has a fucking slime attached to [O.p_them()], deal with that first.")
return 0
if(O == user)
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 13ab409ca1b..f24197009bd 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -118,6 +118,8 @@
var/report_danger_level = 1
+ var/automatic_emergency = 1 //Does the alarm automaticly respond to an emergency condition
+
/obj/machinery/alarm/monitor
report_danger_level = 0
@@ -229,16 +231,18 @@
apply_preset(1) // Don't cycle.
air_alarm_repository.update_cache(src)
-/obj/machinery/alarm/initialize()
+/obj/machinery/alarm/Initialize()
..()
set_frequency(frequency)
if(!master_is_operating())
elect_master()
/obj/machinery/alarm/proc/master_is_operating()
- if(! alarm_area)
+ if(!alarm_area)
alarm_area = areaMaster
-
+ if(!alarm_area)
+ log_runtime(EXCEPTION("Air alarm /obj/machinery/alarm lacks alarm_area and areaMaster vars during proc/master_is_operating()"), src)
+ return FALSE
return alarm_area.master_air_alarm && !(alarm_area.master_air_alarm.stat & (NOPOWER|BROKEN))
@@ -304,7 +308,7 @@
if(old_danger_level!=danger_level)
apply_danger_level()
- if(mode == AALARM_MODE_SCRUBBING && danger_level == ATMOS_ALARM_DANGER)
+ if(automatic_emergency && mode == AALARM_MODE_SCRUBBING && danger_level == ATMOS_ALARM_DANGER)
if(pressure_dangerlevel == ATMOS_ALARM_DANGER)
mode = AALARM_MODE_OFF
if(temperature_dangerlevel == ATMOS_ALARM_DANGER && cur_tlv.max2 <= environment.temperature)
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index b5e1bd59325..b6586d3c90a 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -127,7 +127,7 @@ obj/machinery/air_sensor
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
- initialize()
+ Initialize()
..()
SSair.atmos_machinery += src
set_frequency(frequency)
@@ -275,7 +275,7 @@ legend {
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
- initialize()
+ Initialize()
..()
set_frequency(frequency)
diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm
index ce69429eace..03fa12a1c26 100644
--- a/code/game/machinery/atmoalter/meter.dm
+++ b/code/game/machinery/atmoalter/meter.dm
@@ -30,7 +30,7 @@
target = null
return ..()
-/obj/machinery/meter/initialize()
+/obj/machinery/meter/Initialize()
..()
if(!target)
target = locate(/obj/machinery/atmospherics/pipe) in loc
@@ -144,7 +144,7 @@
return 1
-/obj/machinery/meter/turf/initialize()
+/obj/machinery/meter/turf/Initialize()
if(!target)
target = loc
..()
diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
index 99070a35fd1..34088a6314c 100644
--- a/code/game/machinery/atmoalter/portable_atmospherics.dm
+++ b/code/game/machinery/atmoalter/portable_atmospherics.dm
@@ -21,7 +21,7 @@
return 1
-/obj/machinery/portable_atmospherics/initialize()
+/obj/machinery/portable_atmospherics/Initialize()
. = ..()
spawn()
var/obj/machinery/atmospherics/unary/portables_connector/port = locate() in loc
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index a3eb5a5bd40..5382c9ec429 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -36,7 +36,7 @@
if(radio_controller)
set_frequency(frequency)
-/obj/machinery/driver_button/initialize()
+/obj/machinery/driver_button/Initialize()
..()
set_frequency(frequency)
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index c79904e1c59..0e9f261d73d 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -43,7 +43,7 @@
cameranet.cameras += src
cameranet.addCamera(src)
-/obj/machinery/camera/initialize()
+/obj/machinery/camera/Initialize()
..()
if(is_station_level(z) && prob(3) && !start_active)
toggle_cam()
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 96db537d6dc..ac70a7c11ba 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -81,7 +81,7 @@
assembly.upgrades.Add(new /obj/item/assembly/prox_sensor(assembly))
setPowerUsage()
// Add it to machines that process
- machine_processing |= src
+ START_PROCESSING(SSmachines, src)
/obj/machinery/camera/proc/setPowerUsage()
var/mult = 1
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index b7edd86b1af..57ade18dab3 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -75,7 +75,7 @@
/obj/machinery/cell_charger/proc/removecell()
- charging.updateicon()
+ charging.update_icon()
charging = null
chargelevel = -1
updateicon()
diff --git a/code/game/machinery/chiller.dm b/code/game/machinery/chiller.dm
index 4fae326fd6c..f48d59593ca 100644
--- a/code/game/machinery/chiller.dm
+++ b/code/game/machinery/chiller.dm
@@ -120,7 +120,7 @@
if("cellremove")
if(open && cell && !usr.get_active_hand())
- cell.updateicon()
+ cell.update_icon()
usr.put_in_hands(cell)
cell.add_fingerprint(usr)
cell = null
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 0c6b293c680..ee53fdbce8b 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -113,7 +113,7 @@
var/datum/dna2/record/buf = null
var/read_only = 0 //Well,it's still a floppy disk
-/obj/item/disk/data/proc/Initialize()
+/obj/item/disk/data/proc/initialize()
buf = new
buf.dna=new
@@ -126,7 +126,7 @@
read_only = 1
/obj/item/disk/data/demo/New()
- Initialize()
+ initialize()
buf.types=DNA2_BUF_UE|DNA2_BUF_UI
//data = "066000033000000000AF00330660FF4DB002690"
//data = "0C80C80C80C80C80C8000000000000161FBDDEF" - Farmer Jeff
@@ -145,7 +145,7 @@
read_only = 1
/obj/item/disk/data/monkey/New()
- Initialize()
+ initialize()
buf.types=DNA2_BUF_SE
var/list/new_SE=list(0x098,0x3E8,0x403,0x44C,0x39F,0x4B0,0x59D,0x514,0x5FC,0x578,0x5DC,0x640,0x6A4)
for(var/i=new_SE.len;i<=DNA_SE_LENGTH;i++)
@@ -230,7 +230,8 @@
if(!R.dna)
R.dna = new /datum/dna()
- var/mob/living/carbon/human/H = new /mob/living/carbon/human(src, R.dna.species)
+ var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)
+ H.set_species(R.dna.species)
occupant = H
if(!R.dna.real_name) //to prevent null names
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 1e207e3bdde..eebae34b9ea 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -814,7 +814,7 @@
if(ORION_TRAIL_SPACEPORT)
if(spaceport_raided)
- eventdat += "The Spaceport is on high alert! they wont let you dock since you tried to attack them!"
+ eventdat += "The Spaceport is on high alert! They wont let you dock since you tried to attack them!"
if(last_spaceport_action)
eventdat += " Last Spaceport Action: [last_spaceport_action]"
eventdat += "
"
+ temp_back_screen = NEWSCASTER_MAIN
+ else
if(input_param == 1) //input_param == 1: new wanted issue, input_param == 2: editing an existing one
var/datum/feed_message/W = new /datum/feed_message
W.author = channel_name
diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm
index f6ecd511b2b..de5552e6a75 100644
--- a/code/game/machinery/poolcontroller.dm
+++ b/code/game/machinery/poolcontroller.dm
@@ -100,14 +100,14 @@
if(drownee.losebreath > 20) //You've probably got bigger problems than drowning at this point, so we won't add to it until you get that under control.
return
- add_attack_logs(src, drownee, "Drowned", isLivingSSD(drownee))
+ add_attack_logs(src, drownee, "Drowned", isLivingSSD(drownee) ? null : ATKLOG_ALL)
if(drownee.stat) //Mob is in critical.
drownee.AdjustLoseBreath(3, bound_lower = 0, bound_upper = 20)
drownee.visible_message("\The [drownee] appears to be drowning!","You're quickly drowning!") //inform them that they are fucked.
else
drownee.AdjustLoseBreath(2, bound_lower = 0, bound_upper = 20) //For every time you drown, you miss 2 breath attempts. Hope you catch on quick!
if(prob(35)) //35% chance to tell them what is going on. They should probably figure it out before then.
- drownee.visible_message("\The [drownee] flails, almost like they are drowning!","You're lacking air!") //*gasp* *gasp* *gasp* *gasp* *gasp*
+ drownee.visible_message("\The [drownee] flails, almost like [drownee.p_they()] [drownee.p_are()] drowning!","You're lacking air!") //*gasp* *gasp* *gasp* *gasp* *gasp*
diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm
deleted file mode 100644
index 310d1798a09..00000000000
--- a/code/game/machinery/programmable_unloader.dm
+++ /dev/null
@@ -1,734 +0,0 @@
-
-// TODO: Check access
-// TODO: Renameable circuit boards
-// TODO: Disks? Disassembly?
-
-/obj/machinery/programmable
- name = "Programmable Unloader"
- icon = 'icons/obj/machines/mining_machines.dmi'
- icon_state = "unloader"
- density = 1
- anchored = 1.0
-
- var/debug = 0 // When set, this WILL spam people around the machine.
- // Identifies profile used and on which item.
-
- var/on = 1
- var/indir = 8
- var/outdir = 4
- var/turf/input = null
- var/turf/output = null
- var/typename = "Unloader"
- var/ident = "#1"
-
- var/const/workmax = 20
- var/datum/cargoprofile/default = new()
- var/list/profiles = list(new/datum/cargoprofile/cargo(),new/datum/cargoprofile/boxes(),new/datum/cargoprofile/supplies(),
- new/datum/cargoprofile/exotics(),new/datum/cargoprofile/tools(),new/datum/cargoprofile/weapons(),
- new/datum/cargoprofile/pressure(),new/datum/cargoprofile/chemical(),
- new/datum/cargoprofile/food(),new/datum/cargoprofile/clothing(),new/datum/cargoprofile/trash())
- var/list/overrides = list(new/datum/cargoprofile/cargo/unload(),new/datum/cargoprofile/in_stacker())
- var/list/emag_overrides = list(new/datum/cargoprofile/people(),new/datum/cargoprofile/unary/shredder(),new/datum/cargoprofile/unary/trainer())
- var/list/types = list()
-
- anchored = 1
- var/unwrenched = 0
- use_power = 1
- var/sleep = 0 // When set, the machine will skip the next however-many updates (to avoid spam)
- var/open = 0
- var/circuit_removed = 0
-
-
-
-/obj/machinery/programmable/New()
- ..()
- if(default)
- default.master = src
- if(!default.enabled)
- default.enabled = 1
- for(var/datum/cargoprofile/p in emag_overrides + overrides + profiles)
- p.master = src
- input = get_step(src.loc,indir)
- output = get_step(src.loc,outdir)
- var/count = 0
- for(var/obj/machinery/programmable/other in world)
- if(other.typename == typename)
- count++
- ident = "#[count]"
- name = "[typename] [ident]"
-
-/obj/machinery/programmable/RefreshParts()
- //This is called when the machine was constructed.
- //Unfortunately, it puts machine parts in our contents list, which we're using.
- //Fortunately, we aren't likely to ever need the components list, circuitboard excepted.
-
- for(var/obj/O in contents)
- if(istype(O,/obj/item/circuitboard/programmable))//retrieve settings here
-
- var/obj/item/circuitboard/programmable/C = O
-
- default = C.default
- emagged = C.emagged
- profiles = C.profiles
- overrides = C.overrides
- emag_overrides = C.emag_overrides
-
- //unary and binary methods (one vs two locales) don't mix
-
- if(istype(src,/obj/machinery/programmable/unary))
- for(var/datum/cargoprofile/P in profiles)
- if(!istype(P,/datum/cargoprofile/unary) && !P.universal)
- profiles -= P
- for(var/datum/cargoprofile/P in overrides)
- if(!istype(P,/datum/cargoprofile/unary) && !P.universal)
- overrides -= P
- for(var/datum/cargoprofile/P in emag_overrides)
- if(!istype(P,/datum/cargoprofile/unary) && !P.universal)
- emag_overrides -= P
- else
- for(var/datum/cargoprofile/P in profiles)
- if(istype(P,/datum/cargoprofile/unary) && !P.universal)
- profiles -= P
- for(var/datum/cargoprofile/P in overrides)
- if(istype(P,/datum/cargoprofile/unary) && !P.universal)
- overrides -= P
- for(var/datum/cargoprofile/P in emag_overrides)
- if(istype(P,/datum/cargoprofile/unary) && !P.universal)
- emag_overrides -= P
- if(default)
- default.master = src
- for(var/datum/cargoprofile/p in emag_overrides + overrides + profiles)
- p.master = src
-
- qdel(C)
- else
- qdel(O)
-
-/obj/machinery/programmable/attack_hand(mob/user as mob)
- if(stat) // moved, or something else
- return
- usr.set_machine(src)
- interact(user)
-
-/obj/machinery/programmable/proc/printlist(var/list/L)
- var/dat
- for(var/datum/cargoprofile/p in L)
- dat += "[p.name]: [p.enabled?"YES":"NO"] "
- return dat
-
-/obj/machinery/programmable/proc/buildMenu()
- var/dat
- dat += "PROGRAMMABLE UNLOADER "
- dat += "POWER: [on ? "ON" : "OFF"] "
- dat += "INLET: [capitalize(dir2text(indir))] "
- dat += "OUTLET: [capitalize(dir2text(outdir))]"
- dat += " (SWAP)"
- if(default)
- dat += "MAIN PROGRAM: "
- dat += "[default.name]: [default.enabled ? "YES" : "NO"] "
- if(profiles.len)
- if(!default || !default.enabled)
- dat += printlist(profiles)
- dat += ""
- if(overrides.len)
- dat += "OVERRIDES: "
- dat += printlist(overrides)
- dat += ""
- return dat
-
-/obj/machinery/programmable/interact(mob/user as mob)
- var/dat = buildMenu()
- user << browse("Unloader[dat]", "window=progreload")
- onclose(user, "progreload")
- return
-
-/obj/machinery/programmable/Topic(href, href_list)
- if(..())
- return 1
- usr.set_machine(src)
- add_fingerprint(usr)
- switch(href_list["operation"])
- if("start")
- on = (on ? 0 : 1)
- if(on) use_power = 1
- else use_power = 0
- updateUsrDialog()
- return
- if("inlet")
- indir *= 2 // N S E W
- if(indir > 8)
- indir = 1 // W N
- if(indir == src.outdir)
- indir *= 2
- if(indir > 8)
- indir = 1
- input = get_step(src,indir) // todo: check for glasswalls / no path to target?
- updateUsrDialog()
- return
- if("outlet")
- outdir *= 2
- if(outdir > 8)
- outdir = 1
- if(outdir == indir)
- outdir *= 2
- if(outdir > 8)
- outdir = 1
- output = get_step(src,outdir) // todo: check for walls / glasswalls / invalid output locations
- updateUsrDialog()
- return
- if("swapdir")
- var/temp = outdir
- outdir = indir
- indir = temp
- input = get_step(src,indir)
- output = get_step(src,outdir)
- updateUsrDialog()
- return
- if("default")
- default.enabled = (default.enabled ? 0 : 1)
- updateUsrDialog()
- return
- var/which = href_list["operation"]
- for(var/datum/cargoprofile/p in overrides + profiles)
- if(which == p.id)
- p.enabled = (p.enabled? 0 : 1)
- updateUsrDialog()
- return
-
-/obj/machinery/programmable/attackby(obj/item/I as obj, mob/user as mob, params)
- if(istype(I,/obj/item/wrench)) // code borrowed from pipe dispenser
- if(unwrenched==0)
- playsound(src.loc, I.usesound, 50, 1)
- to_chat(user, "You begin to unfasten \the [src] from the floor...")
- if(do_after(user, 40 * I.toolspeed, target = src))
- user.visible_message( \
- "[user] unfastens \the [src].", \
- "You have unfastened \the [src]. Now it can be pulled somewhere else.", \
- "You hear ratchet.")
- src.anchored = 0
- src.stat |= MAINT
- src.unwrenched = 1
- if(usr.machine==src)
- usr << browse(null, "window=pipedispenser")
- else /* unwrenched */
- playsound(src.loc, I.usesound, 50, 1)
- to_chat(user, "You begin to fasten \the [src] to the floor...")
- if(do_after(user, 20 * I.toolspeed, target = src))
- user.visible_message( \
- "[user] fastens \the [src].", \
- "You fastened \the [src] into place.", \
- "You hear ratchet.")
- src.anchored = 1
- src.input = get_step(src.loc,src.indir)
- src.output = get_step(src.loc,src.outdir)
- if(!open && !circuit_removed)
- src.stat &= ~MAINT
- src.unwrenched = 0
- power_change()
- if(istype(I,/obj/item/screwdriver))
- if(open)
- open = 0
- if(!unwrenched && !circuit_removed)
- src.stat &= ~MAINT
- to_chat(user, "You close \the [src]'s maintenance panel.")
- else
- open = 1
- src.stat |= MAINT
- to_chat(user, "You open \the [src]'s maintenance panel.")
- if(istype(I,/obj/item/crowbar))
- if(open)
- to_chat(user, "You begin to pry out the [src]'s circuits.")
- if(do_after(user, 40 * I.toolspeed, target = src))
- to_chat(user, "You remove the circuitboard.")
- playsound(loc, I.usesound, 50, 1)
- circuit_removed = 1
- use_power = 0
- on = 0
-
- var/obj/item/circuitboard/programmable/P = new(src.loc)
- P.emagged = src.emagged
- P.default = src.default
- src.default = null
- P.profiles = src.profiles
- src.profiles = null
- P.overrides = src.overrides
- src.overrides = null
- P.emag_overrides = src.emag_overrides
- src.emag_overrides = null
- default_deconstruction_crowbar(I, 1)
- return
- else
- ..(I,user)
-
- if(istype(I,/obj/item/circuitboard/programmable))
- if(!open)
- to_chat(user, "You have to open the machine first!")
- return
- if(!circuit_removed)
- to_chat(user, "There is already a circuitboard present!")
- return
- circuit_removed = 0
- I.loc = src
- RefreshParts()
-
-/obj/machinery/programmable/emag_act(user as mob)
- if(emagged)
- return
- to_chat(user, "You swipe the unloader with your card. After a moment's grinding, it beeps in a sinister fashion.")
- playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
- emagged = 1
- overrides += emag_overrides
-
- var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
- s.set_up(2, 1, src)
- s.start()
- return
-
-/obj/machinery/programmable/process()
- if(!output || !input)
- return
-
- if(!on || stat || sleep)
- if(sleep > 0) // prevent input or output errors from happening every tick
- sleep--
- use_power = 0
-
- //Do not let things get stuck inside. That's broken behavior.
- for(var/obj/O in contents)
- O.loc = loc
- for(var/mob/M in contents)
- M.loc = loc
- M.reset_perspective(null)
- to_chat(M, "The machine turns off, and you fall out.")
-
- return
-
- //Normal output reaction
- if(contents.len)
- for(var/atom/movable/A in contents)
- var/datum/cargoprofile/p = types[A.type]
- if(p)
- p.outlet_reaction(A,output)
- else
- A.loc = output // may have been dropped by a mob, etc
-
- if(types.len > 50)
- types = list() // good luck mr. garbage collector
-
-
- var/work = 0
- for(var/mob/M in input.contents)
- for(var/datum/cargoprofile/p in overrides + default)
- if(p.enabled && p.mobcheck && p.contains(M))
- var/done = p.inlet_reaction(M,input,workmax - work)
- if(done)
- work += done
- if(src.debug)
- visible_message("[p.name]:[M.name] ([done])")
- break
-
- if(sleep)
- return // something stopped the machine
-
- for(var/obj/A in input.contents)// I fully expect this to cause unreasonable lag
- if(!A)
- break
- if(work > workmax)
- playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) // Beep if the machine is full - testing only probably
- break
-
- var/done = 0 // work done - testing only
- var/aname // target item name - testing only
-
- for(var/datum/cargoprofile/p in overrides)
- if(p.enabled && p.contains(A))
- aname = A.name // in case of deletion
- done = p.inlet_reaction(A,input,workmax - work)
- if(done)
- work += done
- if(src.debug)
- visible_message("[p.name]:[aname] ([done])")
-
- else
- break
- if(sleep)
- break // Something stopped the machine
- if(!A || A.loc != input || done)
- continue // next item
-
- if(default && default.enabled)
- if(default.contains(A))
- aname = A.name
- done = default.inlet_reaction(A,input,workmax - work)
- if(done)
- work += done
- if(src.debug)
- visible_message("[default.name]: [aname] ([done])")
- continue
- for(var/datum/cargoprofile/p in profiles)
- if(p.enabled && p.contains(A))
- aname = A.name
- done = p.inlet_reaction(A,input,workmax - work)
- if(done)
- work += done
- if(src.debug)
- visible_message("[p.name]:[aname] ([done])")
- else
- break
- if(work)
- use_power = 2
- else
- use_power = 1
-//----------------------------------------------------------------------------
-// Specialty machines
-//----------------------------------------------------------------------------
-
-//Uses the inlet stacking profile. Ejects only full stacks.
-/obj/machinery/programmable/stacker
- name = "Stacking & Spooling Machine"
- default = new/datum/cargoprofile/in_stacker()
- profiles = list()
- overrides = list()
- emag_overrides = list()
- typename = "Stacking and Spooling Machine"
-
-
-/obj/machinery/programmable/unloader
- name = "Cargo Unloader"
- default = new/datum/cargoprofile/cargo/unload()
- profiles = list()
- overrides = list()
- emag_overrides = list()
- typename = "Cargo Unloader"
-
-/obj/machinery/programmable/delivery
- name = "Finished robot delivery"
- default = new/datum/cargoprofile/finished()
- profiles = list()
- overrides = list()
- emag_overrides = list()
- typename = "Robot Delivery"
-
-/obj/machinery/programmable/crate_handler
- name = "Crate Handler"
- default = null
- profiles = list(new/datum/cargoprofile/cargo/unload(),new/datum/cargoprofile/cargo(),new/datum/cargoprofile/cargo/empty(),new/datum/cargoprofile/cargo/full())
- overrides = list()
- emag_overrides = list()
- typename = "Crate Handler"
-
-//----------------------------------------------------------------------------
-// Unary machine: Input and output in the same location
-// Be careful with this, it could easily be running the same
-// computations every round needlessly
-//----------------------------------------------------------------------------
-/obj/machinery/programmable/unary
- name = "Programmable Processor"
- default = null
- profiles = list()
- overrides = list(new/datum/cargoprofile/unary/stacker(),new/datum/cargoprofile/unary/trainer())
- emag_overrides = list(new/datum/cargoprofile/unary/shredder())
- indir = 1
- outdir = 1
- typename = "Processor"
-
- New()
- ..()
- outdir = indir
- output = input
- buildMenu()
- var/dat
- dat += "PROGRAMMABLE PROCESSOR "
- dat += "POWER: [on ? "ON" : "OFF"] "
- dat += "INLET: [capitalize(dir2text(indir))] "
- if(default)
- dat += "MAIN PROGRAM: "
- dat += "[default.name]: [default.enabled ? "YES" : "NO"] "
- if(profiles.len)
- if(!default || !default.enabled)
- dat += printlist(profiles)
- dat += ""
- if(overrides.len)
- dat += "OVERRIDES: "
- dat += printlist(overrides)
- dat += ""
- return dat
- Topic(href, href_list)
- switch(href_list["operation"])
- if("inlet")
- indir *= 2 // N S E W
- if(indir > 8)
- indir = 1 // W N
- outdir = indir
- input = get_step(src,indir) // todo: check for glasswalls / no path to target?
- output = input
- updateUsrDialog()
- return
- return ..()
-
-/obj/machinery/programmable/unary/stacker
- name = "Stacking Machine"
- default = new/datum/cargoprofile/unary/stacker()
- profiles = list()
- overrides = list()
- emag_overrides = list()
- typename = "Stacking Machine"
-
-/obj/machinery/programmable/unary/shredder
- name = "Paper Shredder"
- default = new/datum/cargoprofile/unary/shredder()
- profiles = list()
- overrides = list()
- emag_overrides = list(new/datum/cargoprofile/unary/gibber())
- typename = "Paper Shredder"
-
-/obj/machinery/programmable/unary/trainer
- name = "\improper Boxing Trainer"
- default = new/datum/cargoprofile/unary/trainer()
- profiles = list()
- overrides = list()
- emag_overrides = list()
- typename = "Boxing Trainer"
-
- attack_hand(mob/user as mob) //How did I type this with boxing gloves on?
- if(!istype(user,/mob/living/carbon/human))
- return ..()
-
- var/mob/living/carbon/human/H = user
- if(H.gloves && istype(H.gloves, /obj/item/clothing/gloves/boxing))
- var/newsleep = 0
- if(H.loc != input)
- to_chat(H, "The boxing machine refuses to acknowledge you unless you face it head on!")
- return
- var/damage = 0
- if(H.a_intent != INTENT_HARM)
- damage += rand(0,5)
- else
- damage += rand(0,10)
- if(!damage)
- playsound(H.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- visible_message("[H] tries to punch \the [src], but whiffs")
- return
-
- playsound(loc, "punch", 25, 1, -1)
- if(HULK in H.mutations) damage += 5
-
- if(damage < 5)
- visible_message("[H] gives \the [src] a weak punch.")
- if(prob(10))
- visible_message("\The [src] feints at [H], as though mocking \him.")
- else if(damage < 10)
- visible_message("[H] hits \the [src] with a solid [pick("punch","jab","smack")].")
- else if(damage < 15)
- visible_message("[pick("Whoa!","Nice!","Gasp!")] [H] hits [src] with a powerful [pick("punch","jab","uppercut","left hook", "right hook")].")
- else if(damage < 20)
- visible_message("[pick("WHOA!","ACK!","Jeez!")] [H] hits [src] so hard, the whole machine rocks band and forth for a moment.")
- else
- visible_message("Holy moly! [H] hits \the [src] so hard it stops working.")
- stat |= BROKEN
- return
- while(damage >= 5)
- if(prob(50))
- newsleep++
- damage -= 5
- if(newsleep)
- if(emagged)
- visible_message("\The [src]'s lights glow a bloodthirsty red. It refuses to stop!")
- sleep = 0
- else
- sleep += newsleep
- visible_message("\The [src]'s lights dim for a moment and it beeps, signifying a valid hit.")
- playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
- return
-
- else
- return ..()
-
-//----------------------------------------------------------------------------
-// For construction
-//----------------------------------------------------------------------------
-/obj/item/circuitboard/programmable
- name = "Circuit board (Programmable Unloader)"
- build_path = "/obj/machinery/programmable"
- board_type = "machine"
- origin_tech = "engineering=1;programming=2"
- frame_desc = "Requires 2 Manipulators, 1 Scanning Module, 1 Cable."
- req_components = list(
- /obj/item/stock_parts/scanning_module = 1,
- /obj/item/stock_parts/manipulator = 2,
- /obj/item/stack/cable_coil = 1)
-
- //Customization of the machine
- var/datum/cargoprofile/default = new/datum/cargoprofile()
- var/list/profiles = list()
- var/list/overrides = list()
- var/list/emag_overrides = list()
-
- var/emagged = 0
- var/hacking = 0
-
- proc/resetlists()
- profiles = list(new/datum/cargoprofile/cargo(),new/datum/cargoprofile/boxes(),new/datum/cargoprofile/supplies(),
- new/datum/cargoprofile/exotics(),new/datum/cargoprofile/tools(),new/datum/cargoprofile/weapons(),new/datum/cargoprofile/finished(),
- new/datum/cargoprofile/pressure(),new/datum/cargoprofile/pressure/full(),new/datum/cargoprofile/pressure/empty(),
- new/datum/cargoprofile/chemical(),new/datum/cargoprofile/organics(),new/datum/cargoprofile/food(),
- new/datum/cargoprofile/clothing(),new/datum/cargoprofile/trash())
- overrides = list(new/datum/cargoprofile/cargo/unload(),new/datum/cargoprofile/in_stacker(),
- new/datum/cargoprofile/unary/stacker(),new/datum/cargoprofile/unary/trainer())
- emag_overrides = list(new/datum/cargoprofile/people(),new/datum/cargoprofile/unary/shredder())
-
- New()
- ..()
- resetlists()
-
- attackby(obj/item/I as obj, mob/user as mob, params)
- if(istype(I,/obj/item/multitool))
- hacking = (hacking?0:1)
- if(hacking)
- to_chat(user, "You unlock the data port on the board. You can now use a PDA to alter its data.")
- else
- to_chat(user, "You relock the data port.")
- if(istype(I,/obj/item/pda))
- if(!hacking)
- to_chat(user, "It looks like you can't access the board's data port. You'll have to open it with a multitool.")
- else
- user.set_machine(src)
- interact(user)
- if(istype(I,/obj/item/card/emag) && !emagged)
- if(!hacking)
- to_chat(user, "There seems to be a data port on the card, but it's locked. A multitool could open it.")
- else
- emagged = 1
- overrides += emag_overrides
- to_chat(user, "You swipe the card in the card's data port. The lights flicker, then flash once.")
-
- proc/format(var/datum/cargoprofile/P,var/level)
- // PROFILE=0 OVERRIDE=1 MAIN=2
- if(P == null)
- return "NONE "
- var/dat = "[P.name]"
- if(level == 0 || (level == 1 && !default))
- dat += " PROMOTE"
- if(level > 0)
- dat += " DEMOTE"
- dat += " REMOVE"
- dat += " "
- return dat
-
- interact(mob/user as mob)
- var/dat
- dat = "MAIN FUNCTION "
- dat += format(default,2)
- dat += "- CAUTION - \[DELETE NON-MAIN ALGORITHMS\] "
- dat += "\[MASTER RESET\]"
-
- dat += "OVERRIDES: "
- for(var/datum/cargoprofile/P in overrides)
- dat += format(P,1)
- dat += " "
- dat += "- CAUTION - \[DELETE ALL OVERRIDES\]"
-
- dat += " TERTIARY PROFILES: "
- for(var/datum/cargoprofile/P in profiles)
- dat += format(P,0)
- dat += " "
- dat += "- CAUTION - \[DELETE TERTIARY PROFILES\]"
-
- user << browse("Circuit Reprogramming[dat]", "window=progcircuit")
- onclose(user, "progcircuit")
-
- Topic(href, href_list)
- if(..())
- return
- usr.set_machine(src)
- var/id = href_list["id"]
- var/level = text2num(href_list["level"])
- switch(href_list["operation"])
- if("promote")
- if(level == 0)
- for(var/datum/cargoprofile/T in profiles)
- if(T.id == id)
- overrides += T
- profiles -= T
- //updateUsrDialog()
- interact(usr)
- return
-
- if(level == 1)
- if(default) return
- for(var/datum/cargoprofile/T in overrides)
- if(T.id == id)
- default = T
- overrides -= T
-
- if(default.dedicated_path)
- build_path = "[default.dedicated_path]"
- else
- if(istype(default,/datum/cargoprofile/unary))
- build_path = "/obj/machinery/programmable/unary"
- else
- build_path = "/obj/machinery/programmable"
-
- //updateUsrDialog()
- interact(usr)
- return
-
- if("demote")
- if(level == 2)
- overrides += default
- default = null
- //updateUsrDialog()
- interact(usr)
- return
- if(level == 1)
- for(var/datum/cargoprofile/T in overrides)
- if(T.id == id)
- profiles += T
- overrides -= T
- //updateUsrDialog()
- interact(usr)
- return
- if("delete")
- if(level == 2)
- default = null
- //updateUsrDialog()
- interact(usr)
- return
- if(level == 1)
- for(var/datum/cargoprofile/T in overrides)
- if(T.id == id)
- overrides -= T
- //updateUsrDialog()
- interact(usr)
- return
- if(level == 0)
- for(var/datum/cargoprofile/T in profiles)
- if(T.id == id)
- profiles -= T
- //updateUsrDialog()
- interact(usr)
- return
- if("deleteall")
- for(var/datum/cargoprofile/T in profiles)
- profiles -= T
- for(var/datum/cargoprofile/T in overrides)
- overrides -= T
- //updateUsrDialog()
- interact(usr)
- return
- if("deleteoverrides")
- for(var/datum/cargoprofile/T in overrides)
- overrides -= T
- interact(usr)
- return
- if("deleteprofiles")
- for(var/datum/cargoprofile/T in profiles)
- profiles -= T
- interact(usr)
- return
- if("reset")
- resetlists()
- interact(usr)
- return
-
- //End switch
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 24251977ca9..6ef4d064ac7 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -14,7 +14,7 @@
src.dir = pick(1,2,3,4)
..()
-/obj/machinery/shield/initialize()
+/obj/machinery/shield/Initialize()
air_update_turf(1)
..()
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index a4a4091df7b..1962e3631fb 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -127,7 +127,7 @@
if("cellremove")
if(open && cell && !usr.get_active_hand())
- cell.updateicon()
+ cell.update_icon()
usr.put_in_hands(cell)
cell.add_fingerprint(usr)
cell = null
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 414ec8d2e62..ebf3cfeadf9 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -54,7 +54,7 @@
return ..()
// register for radio system
-/obj/machinery/status_display/initialize()
+/obj/machinery/status_display/Initialize()
..()
if(radio_controller)
radio_controller.add_object(src, frequency)
@@ -276,7 +276,6 @@
overlays.Cut()
overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
-#undef CHARS_PER_LINE
#undef FONT_SIZE
#undef FONT_COLOR
#undef WARNING_FONT_COLOR
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index a7d68adbe62..370cef73559 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -413,13 +413,13 @@
var/i
for(i=0,i<4,i++) //Gradually give the guy inside some damaged based on the intensity
spawn(50)
- if(src.OCCUPANT)
- if(src.issuperUV)
+ if(OCCUPANT)
+ if(issuperUV)
OCCUPANT.take_organ_damage(0,40)
- to_chat(user, "Test. You gave him 40 damage")
+ to_chat(user, "Test. You gave [OCCUPANT.p_them()] 40 damage")
else
OCCUPANT.take_organ_damage(0,8)
- to_chat(user, "Test. You gave him 8 damage")
+ to_chat(user, "Test. You gave [OCCUPANT.p_them()] 8 damage")
return*/
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index 59f9a667584..7ec64373373 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -131,7 +131,7 @@
singulo.target = src
icon_state = "[icontype]1"
active = 1
- machine_processing |= src
+ START_PROCESSING(SSmachines, src)
if(user)
to_chat(user, "You activate the beacon.")
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index a4c73cc8fac..247a40a3425 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -230,8 +230,9 @@
var/turf/bombturf = get_turf(src)
var/area/A = get_area(bombturf)
if(payload && !istype(payload, /obj/item/bombcore/training))
- msg_admin_attack("[key_name_admin(user)] has primed a [name] ([payload]) for detonation at [A.name] (JMP).")
- log_game("[key_name(user)] has primed a [name] ([payload]) for detonation at [A.name] ([bombturf.x], [bombturf.y], [bombturf.z])")
+ msg_admin_attack("[key_name_admin(user)] has primed a [name] ([payload]) for detonation at [A.name] (JMP).", ATKLOG_FEW)
+ log_game("[key_name(user)] has primed a [name] ([payload]) for detonation at [A.name] [COORD(bombturf)]")
+ investigate_log("[key_name(user)] has has primed a [name] ([payload]) for detonation at [A.name] [COORD(bombturf)]", INVESTIGATE_BOMB)
payload.adminlog = "\The [src] that [key_name(user)] had primed detonated!"
/obj/machinery/syndicatebomb/proc/isWireCut(var/index)
@@ -556,11 +557,11 @@
var/area/A = get_area(T)
detonated--
message_admins("[key_name_admin(user)] has remotely detonated [detonated ? "syndicate bombs" : "a syndicate bomb"] using a [name] at [A.name] (JMP).")
- bombers += "[key_name(user)] has remotely detonated [detonated ? "syndicate bombs" : "a syndicate bomb"] using a [name] at [A.name] ([T.x],[T.y],[T.z])"
+ investigate_log("[key_name(user)] has remotely detonated [detonated ? "syndicate bombs" : "a syndicate bomb"] using a [name] at [A.name] ([T.x],[T.y],[T.z])", INVESTIGATE_BOMB)
log_game("[key_name(user)] has remotely detonated [detonated ? "syndicate bombs" : "a syndicate bomb"] using a [name] at [A.name] ([T.x],[T.y],[T.z])")
detonated = 0
existant = 0
timer = world.time + BUTTON_COOLDOWN
#undef BUTTON_COOLDOWN
-#undef BUTTON_DELAY
\ No newline at end of file
+#undef BUTTON_DELAY
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index 48384f78f1e..64e387fb731 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -156,8 +156,26 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
signal.data["realname"], signal.data["vname"], 3, signal.data["compression"], list(0), connection.frequency,
signal.data["verb"], signal.data["language"])
-
-
+#define CREW_RADIO_TYPE 0
+#define CENTCOMM_RADIO_TYPE 1
+#define SYNDICATE_RADIO_TYPE 2
+/proc/Is_Bad_Connection(old_freq, new_freq) //Makes sure players cant read radios of a higher level than they are
+ var/old_type = CREW_RADIO_TYPE
+ var/new_type = CREW_RADIO_TYPE
+ for(var/antag_freq in ANTAG_FREQS)
+ if(old_freq == antag_freq)
+ old_type = SYNDICATE_RADIO_TYPE
+ if(new_freq == antag_freq)
+ new_type = SYNDICATE_RADIO_TYPE
+
+ for(var/cent_freq in CENT_FREQS)
+ if(old_freq == cent_freq)
+ old_type = CENTCOMM_RADIO_TYPE
+ if(new_freq == cent_freq)
+ new_type = CENTCOMM_RADIO_TYPE
+
+ return new_type > old_type
+
/**
Here is the big, bad function that broadcasts a message given the appropriate
@@ -226,21 +244,28 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
var/display_freq = freq
+ var/bad_connection = FALSE
+ var/datum/radio_frequency/new_connection = connection
+
+ if(connection.frequency != display_freq)
+ bad_connection = Is_Bad_Connection(connection.frequency, display_freq)
+ new_connection = radio_controller.return_frequency(display_freq)
+
var/list/obj/item/radio/radios = list()
// --- Broadcast only to intercom devices ---
- if(data == 1)
+ if(data == 1 && !bad_connection)
- for(var/obj/item/radio/intercom/R in connection.devices["[RADIO_CHAT]"])
+ for(var/obj/item/radio/intercom/R in new_connection.devices["[RADIO_CHAT]"])
if(R.receive_range(display_freq, level) > -1)
radios += R
// --- Broadcast only to intercoms and station-bounced radios ---
- else if(data == 2)
+ else if(data == 2 && !bad_connection)
- for(var/obj/item/radio/R in connection.devices["[RADIO_CHAT]"])
+ for(var/obj/item/radio/R in new_connection.devices["[RADIO_CHAT]"])
if(istype(R, /obj/item/radio/headset))
continue
@@ -259,9 +284,9 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
// --- Broadcast to ALL radio devices ---
- else
+ else if(!bad_connection)
- for(var/obj/item/radio/R in connection.devices["[RADIO_CHAT]"])
+ for(var/obj/item/radio/R in new_connection.devices["[RADIO_CHAT]"])
if(R.receive_range(display_freq, level) > -1)
radios += R
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index 00465cf8b8b..0b9b1449137 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -116,7 +116,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
// TODO: Make the radio system cooperate with the space manager
listening_level = position.z
-/obj/machinery/telecomms/initialize()
+/obj/machinery/telecomms/Initialize()
..()
if(autolinkers.len)
// Links nearby machines
@@ -436,7 +436,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
var/totaltraffic = 0 // gigabytes (if > 1024, divide by 1024 -> terrabytes)
var/list/memory = list() // stored memory
- var/rawcode = "" // the code to compile (raw text)
+ var/list/rawcode = list() // the code to compile (list of characters)
var/datum/TCS_Compiler/Compiler // the compiler that compiles and runs the code
var/autoruncode = 0 // 1 if the code is set to run every time a signal is picked up
@@ -516,10 +516,9 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
relay_information(signal, "/obj/machinery/telecomms/broadcaster")
-/obj/machinery/telecomms/server/proc/setcode(var/t)
- if(t)
- if(istext(t))
- rawcode = t
+/obj/machinery/telecomms/server/proc/setcode(var/list/code)
+ if(istype(code))
+ rawcode = code
/obj/machinery/telecomms/server/proc/compile(mob/user as mob)
if(Compiler)
@@ -548,8 +547,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
/obj/machinery/telecomms/server/proc/admin_log(var/mob/mob)
var/msg="[key_name(mob)] has compiled a script to server [src]:"
log_game("NTSL: [msg]")
- log_game("NTSL: [rawcode]")
- src.investigate_log("[msg] [rawcode]", "ntsl")
+ log_game("NTSL: [rawcode.Join("")]")
+ src.investigate_log("[msg] [rawcode.Join("")]", "ntsl")
if(length(rawcode)) // Let's not bother the admins for empty code.
message_admins("[key_name_admin(mob)] has compiled and uploaded a NTSL script to [src.id] (JMP)")
diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm
index a2580285a38..45f0817ef55 100644
--- a/code/game/machinery/telecomms/traffic_control.dm
+++ b/code/game/machinery/telecomms/traffic_control.dm
@@ -117,6 +117,7 @@
function compileCode() {
var codeText = cMirror_fSubmit.getValue();
document.getElementById("cMirrorPost").value = codeText;
+ document.getElementById("cMirrorPostList").value = JSON.stringify(codeText.split(''));
document.getElementById("theform").submit();
}
@@ -135,6 +136,7 @@
+
"}
else
@@ -189,6 +191,10 @@
if(code)
storedcode = code
+ var/list/codelist = href_list["cMirrorList"]
+ if(istext(codelist))
+ codelist = json_decode(codelist)
+
add_fingerprint(user)
user.set_machine(src)
@@ -198,14 +204,14 @@
switch(href_list["choice"])
if("Compile")
- if(!code)
+ if(!istype(codelist))
return 0
if(user != editingcode)
return 0 //only one editor
if(SelectedServer)
var/obj/machinery/telecomms/server/Server = SelectedServer
- Server.setcode(code)
+ Server.setcode(codelist)
spawn(0)
// Output all the compile-time errors
@@ -234,7 +240,7 @@
updateUsrDialog()
for(var/obj/machinery/telecomms/server/Server in servers)
- Server.setcode(code)
+ Server.setcode(codelist)
var/list/compileerrors = Server.compile(user)
if(!telecomms_check(user))
return
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index fa8f2e8d084..a1248fc0b6d 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -18,7 +18,7 @@
..()
return
-/obj/machinery/computer/teleporter/initialize()
+/obj/machinery/computer/teleporter/Initialize()
..()
link_power_station()
update_icon()
@@ -293,7 +293,7 @@
component_parts += new /obj/item/stock_parts/matter_bin/super(null)
RefreshParts()
-/obj/machinery/teleport/hub/initialize()
+/obj/machinery/teleport/hub/Initialize()
..()
link_power_station()
@@ -472,7 +472,7 @@
RefreshParts()
link_console_and_hub()
-/obj/machinery/teleport/station/initialize()
+/obj/machinery/teleport/station/Initialize()
..()
link_console_and_hub()
diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm
index 8df55e1bc66..d6ae98cb516 100644
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -64,7 +64,7 @@
A.turret_controls -= src
return ..()
-/obj/machinery/turretid/initialize()
+/obj/machinery/turretid/Initialize()
..()
if(!control_area)
control_area = get_area(src)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index db228aff04f..f7b2e8bbd05 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -1,7 +1,3 @@
-#define CAT_NORMAL 1
-#define CAT_HIDDEN 2 // also used in corresponding wires/vending.dm
-#define CAT_COIN 4
-
/**
* Datum used to hold information about a product in a vending machine
*/
@@ -840,6 +836,9 @@
/obj/item/reagent_containers/food/drinks/chicken_soup = 30,/obj/item/reagent_containers/food/drinks/weightloss = 50, /obj/item/reagent_containers/food/drinks/mug = 50)
refill_canister = /obj/item/vending_refill/coffee
+/obj/machinery/vending/coffee/free
+ prices = list()
+
/obj/machinery/vending/coffee/New()
..()
component_parts = list()
@@ -892,6 +891,9 @@
/obj/item/reagent_containers/food/snacks/pistachios = 35, /obj/item/reagent_containers/food/snacks/spacetwinkie = 30,/obj/item/reagent_containers/food/snacks/cheesiehonkers = 25,/obj/item/reagent_containers/food/snacks/tastybread = 30)
refill_canister = /obj/item/vending_refill/snack
+/obj/machinery/vending/snack/free
+ prices = list()
+
/obj/machinery/vending/snack/New()
..()
component_parts = list()
@@ -913,6 +915,9 @@
/obj/item/reagent_containers/food/snacks/chinese/rice = 50)
refill_canister = /obj/item/vending_refill/chinese
+/obj/machinery/vending/chinese/free
+ prices = list()
+
/obj/machinery/vending/chinese/New()
..()
component_parts = list()
@@ -938,6 +943,9 @@
/obj/item/reagent_containers/food/drinks/cans/space_up = 20,/obj/item/reagent_containers/food/drinks/cans/grape_juice = 20)
refill_canister = /obj/item/vending_refill/cola
+/obj/machinery/vending/cola/free
+ prices = list()
+
/obj/machinery/vending/cola/New()
..()
component_parts = list()
@@ -965,6 +973,9 @@
/obj/item/cartridge/signal = 75)
armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0)
+/obj/machinery/vending/cart/free
+ prices = list()
+
/obj/machinery/vending/liberationstation
name = "\improper Liberation Station"
desc = "An overwhelming amount of ancient patriotism washes over you just by looking at the machine."
@@ -994,6 +1005,9 @@
prices = list(/obj/item/storage/fancy/cigarettes = 60,/obj/item/storage/fancy/cigarettes/cigpack_uplift = 60,/obj/item/storage/fancy/cigarettes/cigpack_robust = 60,/obj/item/storage/fancy/cigarettes/cigpack_carp = 60,/obj/item/storage/fancy/cigarettes/cigpack_midori = 60,/obj/item/storage/fancy/cigarettes/cigpack_random = 150, /obj/item/reagent_containers/food/pill/patch/nicotine = 15, /obj/item/storage/box/matches = 10,/obj/item/lighter/random = 60, /obj/item/storage/fancy/rollingpapers = 20)
refill_canister = /obj/item/vending_refill/cigarette
+/obj/machinery/vending/cigarette/free
+ prices = list()
+
/obj/machinery/vending/cigarette/New()
..()
component_parts = list()
@@ -1433,6 +1447,9 @@
premium = list(/obj/item/toy/pet_rock/fred = 1, /obj/item/toy/pet_rock/roxie = 1)
refill_canister = /obj/item/vending_refill/crittercare
+/obj/machinery/vending/crittercare/free
+ prices = list()
+
/obj/machinery/vending/crittercare/New()
..()
component_parts = list()
diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm
index 217b1e70165..248514179af 100644
--- a/code/game/machinery/wishgranter.dm
+++ b/code/game/machinery/wishgranter.dm
@@ -1,62 +1,42 @@
/obj/machinery/wish_granter
- name = "Wish Granter"
+ name = "wish granter"
desc = "You're not so sure about this, anymore..."
icon = 'icons/obj/device.dmi'
icon_state = "syndbeacon"
- use_power = 0
- anchored = 1
- density = 1
- var/datum/mind/target
- var/list/types = list()
- var/inuse = 0
+ use_power = NO_POWER_USE
+ anchored = TRUE
+ density = TRUE
-/obj/machinery/wish_granter/New()
- for(var/supname in all_superheroes)
- types |= supname
- ..()
+ var/charges = 1
+ var/insisting = FALSE
-/obj/machinery/wish_granter/attack_hand(var/mob/user as mob)
- usr.set_machine(src)
+/obj/machinery/wish_granter/attack_hand(mob/living/carbon/user)
+ . = ..()
+ if(.)
+ return
+ if(charges <= 0)
+ to_chat(user, "The Wish Granter lies silent.")
+ return
- if(!istype(user, /mob/living/carbon/human))
+ else if(!ishuman(user))
to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.")
return
- if(is_special_character(user))
+ else if(is_special_character(user))
to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.")
- return
- if(inuse)
- to_chat(user, "Someone is already communing with the Wish Granter.")
- return
+ else if(!insisting)
+ to_chat(user, "Your first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?")
+ insisting = TRUE
- to_chat(user, "The power of the Wish Granter have turned you into the superhero the station deserves. You are a masked vigilante, and answer to no man. Will you use your newfound strength to protect the innocent, or will you hunt the guilty?")
-
- inuse = 1
- var/wish
- if(types.len == 1)
- wish = pick(types)
else
- wish = input("You want to become...","Wish") as null|anything in types
- if(!wish)
- inuse=0
- return
- types -= wish
- var/mob/living/carbon/human/M = user
- var/datum/superheroes/S = all_superheroes[wish]
- if(S)
- S.create(M)
- inuse=0
+ to_chat(user, "You speak. [pick("I want the station to disappear", "Humanity is corrupt, mankind must be destroyed", "I want to be rich", "I want to rule the world", "I want immortality.")]. The Wish Granter answers.")
+ to_chat(user, "Your head pounds for a moment, before your vision clears. You are the avatar of the Wish Granter, and your power is LIMITLESS! And it's all yours. You need to make sure no one can take it from you. No one can know, first.")
- //Remove the wishgranter or teleport it randomly on the station
- if(!types.len)
- to_chat(user, "The wishgranter slowly fades into mist...")
- qdel(src)
- return
- else
- var/impact_area = findEventArea()
- var/turf/T = pick(get_area_turfs(impact_area))
- if(T)
- src.loc = T
- return
\ No newline at end of file
+ charges--
+ insisting = FALSE
+
+ user.mind.add_antag_datum(/datum/antagonist/wishgranter)
+
+ to_chat(user, "You have a very bad feeling about this.")
\ No newline at end of file
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index b990029423c..62928c95be5 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -12,7 +12,6 @@
var/energy_drain = 0
var/obj/mecha/chassis = null
var/range = MELEE //bitflags
- reliability = 1000
var/salvageable = 1
var/selectable = 1 // Set to 0 for passive equipment such as mining scanner or armor plates
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 5f3483d2ce4..a9d4b4008b6 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -74,7 +74,7 @@
/obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/patient_insertion_check(mob/living/carbon/target)
if(target.buckled)
- occupant_message("[target] will not fit into the sleeper because they are buckled to [target.buckled]!")
+ occupant_message("[target] will not fit into the sleeper because [target.p_they()] [target.p_are()] buckled to [target.buckled]!")
return
if(target.has_buckled_mobs())
occupant_message("[target] will not fit into the sleeper because of the creatures attached to it!")
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 866cb7580f6..7706f3120f0 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -444,7 +444,6 @@
if(!PN)
PN = new()
- powernets += PN
NC.powernet = PN
PN.cables += NC
NC.mergeConnectedNetworks(NC.d2)
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index b14825c7cc0..a34d43098cb 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -177,7 +177,7 @@
return data
-/obj/machinery/computer/mech_bay_power_console/initialize()
+/obj/machinery/computer/mech_bay_power_console/Initialize()
reconnect()
update_icon()
return ..()
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index bb666a63da1..ca43f87ae46 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -469,18 +469,11 @@
/obj/mecha/attack_hand(mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src)
log_message("Attack by hand/paw. Attacker - [user].",1)
-
- if((HULK in user.mutations) && !prob(deflect_chance))
- take_damage(15)
- check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
- user.visible_message("[user] hits [name], doing some damage.",
- "You hit [name] with all your might. The metal creaks and bends.")
- else
- user.visible_message("[user] hits [name]. Nothing happens","You hit [name] with no visible effect.")
- log_append_to_last("Armor saved.")
- return
+ user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
+ playsound(loc, 'sound/weapons/tap.ogg', 40, 1, -1)
+ user.visible_message("[user] hits [name]. Nothing happens", "You hit [name] with no visible effect.")
+ log_append_to_last("Armor saved.")
/obj/mecha/attack_alien(mob/living/user)
@@ -524,6 +517,16 @@
user.create_attack_log("attacked [name]")
return
+/obj/mecha/hulk_damage()
+ return 15
+
+/obj/mecha/attack_hulk(mob/living/carbon/human/user)
+ . = ..()
+ if(.)
+ check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL, MECHA_INT_TANK_BREACH, MECHA_INT_CONTROL_LOST))
+ log_message("Attack by hulk. Attacker - [user].", 1)
+ add_attack_logs(user, src, "Punched with hulk powers")
+
/obj/mecha/hitby(atom/movable/A) //wrapper
..()
log_message("Hit by [A].",1)
@@ -1478,3 +1481,15 @@
if(occupant_sight_flags)
if(user == occupant)
user.sight |= occupant_sight_flags
+
+/obj/mecha/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect, end_pixel_y)
+ if(!no_effect)
+ if(selected)
+ used_item = selected
+ else if(!visual_effect_icon)
+ visual_effect_icon = ATTACK_EFFECT_SMASH
+ if(damtype == BURN)
+ visual_effect_icon = ATTACK_EFFECT_MECHFIRE
+ else if(damtype == TOX)
+ visual_effect_icon = ATTACK_EFFECT_MECHTOXIN
+ ..()
\ No newline at end of file
diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm
index 6c455c673f3..2ce732f83ed 100644
--- a/code/game/mecha/mecha_topic.dm
+++ b/code/game/mecha/mecha_topic.dm
@@ -298,6 +298,7 @@
var/newname = strip_html_simple(input(occupant,"Choose new exosuit name","Rename exosuit",initial(name)) as text, MAX_NAME_LEN)
if(newname && trim(newname))
name = newname
+ log_game("[key_name(occupant)] has renamed an exosuit [newname]")
else
alert(occupant, "nope.avi")
return
diff --git a/code/game/objects/effects/barsign.dm b/code/game/objects/effects/barsign.dm
deleted file mode 100644
index fd66f8028d1..00000000000
--- a/code/game/objects/effects/barsign.dm
+++ /dev/null
@@ -1,8 +0,0 @@
-/obj/effect/sign/double/barsign
- icon = 'icons/obj/barsigns.dmi'
- icon_state = "empty"
- anchored = 1
-
- New()
- var/list/valid_states = list("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead", "whiskeyimplant", "carpecarp", "robustroadhouse", "greytide", "theredshirt")
- src.icon_state = "[pick(valid_states)]"
diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm
index 6bcfb253454..301fd71a98d 100644
--- a/code/game/objects/effects/decals/misc.dm
+++ b/code/game/objects/effects/decals/misc.dm
@@ -1,12 +1,3 @@
-/obj/effect/decal/point
- name = "arrow"
- desc = "It's an arrow hanging in mid-air. There may be a wizard about."
- icon = 'icons/mob/screen_gen.dmi'
- icon_state = "arrow"
- layer = 16.0
- anchored = 1
- mouse_opacity = 0
-
// Used for spray that you spray at walls, tables, hydrovats etc
/obj/effect/decal/spraystill
density = 0
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index cb218395735..e765e59442d 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -163,21 +163,21 @@
// dense and opaque, but easy to break
/obj/structure/foamedmetal
- icon = 'icons/effects/effects.dmi'
- icon_state = "metalfoam"
- density = 1
- opacity = 1 // changed in New()
- anchored = 1
name = "foamed metal"
desc = "A lightweight foamed metal wall."
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "metalfoam"
+ density = TRUE
+ opacity = TRUE // changed in New()
+ anchored = TRUE
+ max_integrity = 20
var/metal = MFOAM_ALUMINUM
-/obj/structure/foamedmetal/initialize()
+/obj/structure/foamedmetal/Initialize()
..()
air_update_turf(1)
/obj/structure/foamedmetal/Destroy()
- density = 0
air_update_turf(1)
return ..()
@@ -186,64 +186,31 @@
..()
move_update_air(T)
+/obj/structure/foamedmetal/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ playsound(loc, 'sound/weapons/tap.ogg', 100, 1)
+
/obj/structure/foamedmetal/proc/updateicon()
if(metal == MFOAM_ALUMINUM)
icon_state = "metalfoam"
+ max_integrity = 20
+ obj_integrity = max_integrity
else
icon_state = "ironfoam"
-
-/obj/structure/foamedmetal/ex_act(severity)
- qdel(src)
-
-/obj/structure/foamedmetal/blob_act()
- qdel(src)
-
-/obj/structure/foamedmetal/bullet_act()
- if(metal==MFOAM_ALUMINUM || prob(50))
- qdel(src)
+ max_integrity = 50
+ obj_integrity = max_integrity
/obj/structure/foamedmetal/attack_hand(mob/user)
user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src)
- if((HULK in user.mutations) || (prob(75 - metal*25)))
- user.visible_message("[user] smashes through \the [src].", "You smash through \the [src].")
+ user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
+ if(prob(75 - metal * 25))
+ user.visible_message("[user] smashes through [src].", "You smash through [src].")
qdel(src)
else
to_chat(user, "You hit the metal foam but bounce off it.")
+ playsound(loc, 'sound/weapons/tap.ogg', 100, 1)
-/obj/structure/foamedmetal/attackby(obj/item/I, mob/user, params)
- user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src)
- if(istype(I, /obj/item/grab))
- var/obj/item/grab/G = I
- G.affecting.loc = src.loc
- user.visible_message("[G.assailant] smashes [G.affecting] through the foamed metal wall.")
- qdel(I)
- qdel(src)
- return
-
- if(prob(I.force*20 - metal*25))
- user.visible_message("[user] smashes through the foamed metal with \the [I].", "You smash through the foamed metal with \the [I].")
- qdel(src)
- else
- to_chat(user, "You hit the metal foam to no effect.")
-
-/obj/structure/foamedmetal/attack_animal(mob/living/simple_animal/M)
- M.do_attack_animation(src)
- if(M.melee_damage_upper == 0)
- M.visible_message("[M] nudges \the [src].")
- else
- if(M.attack_sound)
- playsound(loc, M.attack_sound, 50, 1, 1)
- M.visible_message("\The [M] [M.attacktext] [src]!")
- qdel(src)
-
-/obj/structure/foamedmetal/attack_alien(mob/living/carbon/alien/humanoid/M)
- M.visible_message("[M] tears apart \the [src]!");
- qdel(src)
-
-/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target, height=1.5)
+/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target)
return !density
/obj/structure/foamedmetal/CanAtmosPass()
- return !density
+ return !density
\ No newline at end of file
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 385067e0611..1df0166260e 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -263,13 +263,13 @@
var/more = ""
if(M)
more = " "
- msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink])[contained]. Last associated key is [carry.my_atom.fingerprintslast][more].", 0, 1)
+ msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink])[contained]. Last associated key is [carry.my_atom.fingerprintslast][more].", ATKLOG_FEW)
log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].")
else
- msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink]). No associated key.", 0, 1)
+ msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink]). No associated key.", ATKLOG_FEW)
log_game("A chemical smoke reaction has taken place in ([where])[contained]. No associated key.")
else
- msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink]). No associated key. CODERS: carry.my_atom may be null.", 0, 1)
+ msg_admin_attack("A chemical smoke reaction has taken place in ([whereLink]). No associated key. CODERS: carry.my_atom may be null.", ATKLOG_FEW)
log_game("A chemical smoke reaction has taken place in ([where])[contained]. No associated key. CODERS: carry.my_atom may be null.")
/datum/effect_system/smoke_spread/chem/start(effect_range = 2)
diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm
index 467858ad670..0e8bd6691f2 100644
--- a/code/game/objects/effects/effects.dm
+++ b/code/game/objects/effects/effects.dm
@@ -11,4 +11,7 @@
return
/obj/effect/fire_act()
- return
\ No newline at end of file
+ return
+
+/obj/effect/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ return FALSE
\ No newline at end of file
diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm
index a2517d093f8..6d271039070 100644
--- a/code/game/objects/effects/spawners/windowspawner.dm
+++ b/code/game/objects/effects/spawners/windowspawner.dm
@@ -7,7 +7,8 @@
var/windowtospawn = /obj/structure/window/basic
anchored = 1 // No sliding out while you prime
-/obj/effect/spawner/window/initialize()
+/obj/effect/spawner/window/Initialize()
+ ..()
spawn(0)
var/turf/T = get_turf(src)
for(var/obj/structure/grille/G in get_turf(src))
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 02c04fbfbea..29abbef2d76 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -219,7 +219,7 @@
if(C)
S.key = C.key
if(S.master_commander)
- to_chat(S, "You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist them in completing their goals at any cost.")
+ to_chat(S, "You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist [S.master_commander.p_them()] in completing [S.master_commander.p_their()] goals at any cost.")
qdel(src)
/obj/effect/decal/cleanable/spiderling_remains
diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm
index 4a70c73c9c3..f6b654ccbbe 100644
--- a/code/game/objects/effects/temporary_visuals/clockcult.dm
+++ b/code/game/objects/effects/temporary_visuals/clockcult.dm
@@ -6,6 +6,10 @@
randomdir = 0
layer = ABOVE_NORMAL_TURF_LAYER
+/obj/effect/temp_visual/ratvar/door/window
+ icon_state = "ratvarwindoorglow"
+ layer = ABOVE_WINDOW_LAYER
+
/obj/effect/temp_visual/ratvar/beam
icon_state = "ratvarbeamglow"
@@ -15,6 +19,13 @@
/obj/effect/temp_visual/ratvar/floor
icon_state = "ratvarfloorglow"
+/obj/effect/temp_visual/ratvar/window
+ icon_state = "ratvarwindowglow"
+ layer = ABOVE_OBJ_LAYER
+
+/obj/effect/temp_visual/ratvar/window/single
+ icon_state = "ratvarwindowglow_s"
+
/obj/effect/temp_visual/ratvar/grille
icon_state = "ratvargrilleglow"
layer = BELOW_OBJ_LAYER
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 001c482a922..03e8ea8fcd9 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -1,3 +1,12 @@
+/obj/effect/temp_visual/point
+ name = "arrow"
+ desc = "It's an arrow hanging in mid-air. There may be a wizard about."
+ icon = 'icons/mob/screen_gen.dmi'
+ icon_state = "arrow"
+ layer = POINT_LAYER
+ duration = 20
+ randomdir = FALSE
+
/obj/effect/temp_visual/dir_setting/bloodsplatter
icon = 'icons/effects/blood.dmi'
duration = 5
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index ddf5b618bd5..2188337ba77 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -5,8 +5,8 @@
epicenter = get_turf(epicenter.loc)
if(log)
- message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
- log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
+ message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] [ADMIN_COORDJMP(epicenter)]")
+ log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] [COORD(epicenter)]")
if(heavy_range > 1)
new/obj/effect/temp_visual/emp/pulse(epicenter)
@@ -29,4 +29,4 @@
T.emp_act(2)
else if(distance <= light_range)
T.emp_act(2)
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index b2d0d6720c7..d83660e4de6 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -443,13 +443,14 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
playsound(loc, src.hitsound, 30, 1, -1)
+ user.do_attack_animation(M)
+
if(M != user)
M.visible_message("[user] has stabbed [M] in the eye with [src]!", \
"[user] stabs you in the eye with [src]!")
- user.do_attack_animation(M)
else
user.visible_message( \
- "[user] has stabbed themself in the eyes with [src]!", \
+ "[user] has stabbed [user.p_them()]self in the eyes with [src]!", \
"You stab yourself in the eyes with [src]!" \
)
@@ -549,3 +550,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
/obj/item/proc/on_trip(mob/living/carbon/human/H)
if(H.slip(src, trip_stun, trip_weaken, trip_tiles, trip_walksafe, trip_any, trip_verb))
return TRUE
+
+/obj/item/attack_hulk(mob/living/carbon/human/user)
+ return FALSE
\ No newline at end of file
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 295b133d92e..b4dd66e3be5 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -22,7 +22,7 @@
var/list/validSurfaces = list(/turf/simulated/floor)
/obj/item/toy/crayon/suicide_act(mob/user)
- user.visible_message("[user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is jamming the [name] up [user.p_their()] nose and into [user.p_their()] brain. It looks like [user.p_theyre()] trying to commit suicide.")
return (BRUTELOSS|OXYLOSS)
/obj/item/toy/crayon/New()
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 154a2032825..737abd10bb1 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -83,8 +83,8 @@
if(href_list["wipe"])
var/confirm = alert("Are you sure you want to wipe this card's memory? This cannot be undone once started.", "Confirm Wipe", "Yes", "No")
if(confirm == "Yes" && (CanUseTopic(user, state) == STATUS_INTERACTIVE))
- msg_admin_attack("[key_name_admin(user)] wiped [key_name_admin(AI)] with \the [src].")
- log_attack(user, AI, "Wiped with [src].")
+ msg_admin_attack("[key_name_admin(user)] wiped [key_name_admin(AI)] with \the [src].", ATKLOG_FEW)
+ add_attack_logs(user, AI, "Wiped with [src].")
flush = 1
AI.suiciding = 1
to_chat(AI, "Your core files are being wiped!")
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 0e2e3cc3785..5056c90793f 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -95,7 +95,7 @@
to_chat(M, "[user] blinds you with the flash!")
if(M.weakeyes)
M.Stun(2)
- M.visible_message("[M] gasps and shields their eyes!", "You gasp and shields your eyes!")
+ M.visible_message("[M] gasps and shields [M.p_their()] eyes!", "You gasp and shields your eyes!")
else
visible_message("[user] fails to blind [M] with the flash!")
to_chat(user, "You fail to blind [M] with the flash!")
@@ -123,7 +123,7 @@
for(var/obj/item/borg/combat/shield/S in R.module.modules)
if(R.activated(S))
add_attack_logs(user, M, "Flashed with [src]")
- user.visible_message("[user] tries to overloads [M]'s sensors with the [src.name], but is blocked by [M]'s shield!", "You try to overload [M]'s sensors with the [src.name], but are blocked by their shield!")
+ user.visible_message("[user] tries to overloads [M]'s sensors with the [src.name], but is blocked by [M]'s shield!", "You try to overload [M]'s sensors with the [src.name], but are blocked by [M.p_their()] shield!")
return 1
add_attack_logs(user, M, "Flashed with [src]")
if(M.flash_eyes(affect_silicon = 1))
@@ -168,9 +168,9 @@
resisted = 1
if(resisted)
- to_chat(user, "This mind seems resistant to the [src.name]!")
+ to_chat(user, "This mind seems resistant to the [name]!")
else
- to_chat(user, "They must be conscious before you can convert them!")
+ to_chat(user, "They must be conscious before you can convert [M.p_them()]!")
else
to_chat(user, "This mind is so vacant that it is not susceptible to influence!")
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 944a6e0d5f9..fb1956a56e9 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -12,7 +12,7 @@
var/on = 0
var/brightness_on = 4 //luminosity when on
-/obj/item/flashlight/initialize()
+/obj/item/flashlight/Initialize()
..()
if(on)
icon_state = "[initial(icon_state)]-on"
@@ -61,10 +61,10 @@
if(M == user) //they're using it on themselves
if(M.flash_eyes(visual = 1))
- M.visible_message("[M] directs [src] to \his eyes.", \
+ M.visible_message("[M] directs [src] to [M.p_their()] eyes.", \
"You wave the light in front of your eyes! Trippy!")
else
- M.visible_message("[M] directs [src] to \his eyes.", \
+ M.visible_message("[M] directs [src] to [M.p_their()] eyes.", \
"You wave the light in front of your eyes.")
else
diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm
index b55efc665b2..639382ed03e 100644
--- a/code/game/objects/items/devices/instruments.dm
+++ b/code/game/objects/items/devices/instruments.dm
@@ -18,10 +18,10 @@
return ..()
/obj/item/instrument/suicide_act(mob/user)
- user.visible_message("[user] begins to play 'Gloomy Sunday'! It looks like \he's trying to commit suicide!")
+ user.visible_message("[user] begins to play 'Gloomy Sunday'! It looks like [user.p_theyre()] trying to commit suicide!")
return (BRUTELOSS)
-/obj/item/instrument/initialize(mapload)
+/obj/item/instrument/Initialize(mapload)
song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
..()
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 678d6837a8e..c8ab2e1fc4f 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -109,11 +109,11 @@
//20% chance to actually hit the eyes
if(prob(effectchance * diode.rating) && C.flash_eyes(severity))
- outmsg = "You blind [C] by shining [src] in their eyes."
+ outmsg = "You blind [C] by shining [src] in [C.p_their()] eyes."
if(C.weakeyes)
C.Stun(1)
else
- outmsg = "You fail to blind [C] by shining [src] at their eyes!"
+ outmsg = "You fail to blind [C] by shining [src] at [C.p_their()] eyes!"
//robots and AI
else if(issilicon(target))
@@ -123,11 +123,11 @@
S.flash_eyes(affect_silicon = 1)
S.Weaken(rand(5,10))
to_chat(S, "Your sensors were overloaded by a laser!")
- outmsg = "You overload [S] by shining [src] at their sensors."
+ outmsg = "You overload [S] by shining [src] at [S.p_their()] sensors."
add_attack_logs(user, S, "shone [src] in their eyes")
else
- outmsg = "You fail to overload [S] by shining [src] at their sensors."
+ outmsg = "You fail to overload [S] by shining [src] at [S.p_their()] sensors."
//cameras
else if(istype(target, /obj/machinery/camera))
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 55465218b99..51aa645a139 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -21,7 +21,7 @@
..()
internal_channels.Cut()
-/obj/item/radio/headset/initialize()
+/obj/item/radio/headset/Initialize()
..()
if(ks1type)
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index e1ee7029439..530156fbd99 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -83,7 +83,8 @@ var/global/list/default_medbay_channels = list(
return ..()
-/obj/item/radio/initialize()
+/obj/item/radio/Initialize()
+ ..()
if(frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
set_frequency(frequency)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 2a8e155dd06..9912957c2bb 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -313,6 +313,9 @@ REAGENT SCANNER
throw_range = 7
materials = list(MAT_METAL=30, MAT_GLASS=20)
origin_tech = "magnets=1;engineering=1"
+ var/cooldown = FALSE
+ var/cooldown_time = 250
+ var/accuracy // 0 is the best accuracy.
/obj/item/analyzer/attack_self(mob/user as mob)
@@ -366,6 +369,69 @@ REAGENT SCANNER
src.add_fingerprint(user)
return
+/obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens
+ ..()
+
+ if(!user.incapacitated() && Adjacent(user))
+
+ if(cooldown)
+ to_chat(user, "[src]'s barometer function is prepraring itself.")
+ return
+
+ var/turf/T = get_turf(user)
+ if(!T)
+ return
+
+ playsound(src, 'sound/effects/pop.ogg', 100)
+ var/area/user_area = T.loc
+ var/datum/weather/ongoing_weather = null
+
+ if(!user_area.outdoors)
+ to_chat(user, "[src]'s barometer function won't work indoors!")
+ return
+
+ for(var/V in SSweather.processing)
+ var/datum/weather/W = V
+ if(W.barometer_predictable && (T.z in W.impacted_z_levels) && W.area_type == user_area.type && !(W.stage == END_STAGE))
+ ongoing_weather = W
+ break
+
+ if(ongoing_weather)
+ if((ongoing_weather.stage == MAIN_STAGE) || (ongoing_weather.stage == WIND_DOWN_STAGE))
+ to_chat(user, "[src]'s barometer function can't trace anything while the storm is [ongoing_weather.stage == MAIN_STAGE ? "already here!" : "winding down."]")
+ return
+
+ to_chat(user, "The next [ongoing_weather] will hit in [butchertime(ongoing_weather.next_hit_time - world.time)].")
+ if(ongoing_weather.aesthetic)
+ to_chat(user, "[src]'s barometer function says that the next storm will breeze on by.")
+ else
+ var/next_hit = SSweather.next_hit_by_zlevel["[T.z]"]
+ var/fixed = next_hit ? next_hit - world.time : -1
+ if(fixed < 0)
+ to_chat(user, "[src]'s barometer function was unable to trace any weather patterns.")
+ else
+ to_chat(user, "[src]'s barometer function says a storm will land in approximately [butchertime(fixed)].")
+ cooldown = TRUE
+ addtimer(CALLBACK(src,/obj/item/analyzer/proc/ping), cooldown_time)
+
+/obj/item/analyzer/proc/ping()
+ if(isliving(loc))
+ var/mob/living/L = loc
+ to_chat(L, "[src]'s barometer function is ready!")
+ playsound(src, 'sound/machines/click.ogg', 100)
+ cooldown = FALSE
+
+/obj/item/analyzer/proc/butchertime(amount)
+ if(!amount)
+ return
+ if(accuracy)
+ var/inaccurate = round(accuracy * (1 / 3))
+ if(prob(50))
+ amount -= inaccurate
+ if(prob(50))
+ amount += inaccurate
+ return DisplayTimeText(max(1, amount))
+
/obj/item/mass_spectrometer
desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample. Inject sample with syringe."
name = "mass-spectrometer"
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index beed9fb75c3..dbd7701ce93 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -63,8 +63,8 @@
A.holder = src
A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
- bombers += "[key_name(user)] attached a [A] to a transfer valve."
- msg_admin_attack("[key_name_admin(user)]attached [A] to a transfer valve.")
+ investigate_log("[key_name(user)] attached a [A] to a transfer valve.", INVESTIGATE_BOMB)
+ msg_admin_attack("[key_name_admin(user)]attached [A] to a transfer valve.", ATKLOG_FEW)
log_game("[key_name_admin(user)] attached [A] to a transfer valve.")
attacher = user
SSnanoui.update_uis(src) // update all UIs attached to src
@@ -204,7 +204,7 @@
var/mob/mob = get_mob_by_key(src.fingerprintslast)
- bombers += "Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]"
+ investigate_log("Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]", INVESTIGATE_BOMB)
message_admins("Bomb valve opened at [A.name] (JMP) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name_admin(mob)]")
log_game("Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]")
merge_gases()
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 2d40c1e683c..cc3320489f6 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -54,7 +54,7 @@ var/list/world_uplinks = list()
dat += "Telecrystals left: [src.uses] "
dat += ""
dat += "Request item: "
- dat += "Each item costs a number of telecrystals as indicated by the number following their name. "
+ dat += "Each item costs a number of telecrystals as indicated by the number following its name. "
var/category_items = 1
for(var/category in ItemsCategory)
diff --git a/code/game/objects/items/policetape.dm b/code/game/objects/items/policetape.dm
deleted file mode 100644
index f9769a64e23..00000000000
--- a/code/game/objects/items/policetape.dm
+++ /dev/null
@@ -1,203 +0,0 @@
-//Define all tape types in policetape.dm
-/obj/item/taperoll
- name = "tape roll"
- icon = 'icons/policetape.dmi'
- icon_state = "rollstart"
- w_class = WEIGHT_CLASS_TINY
- var/turf/start
- var/turf/end
- var/tape_type = /obj/item/tape
- var/icon_base
-
-var/list/image/hazard_overlays
-var/list/tape_roll_applications = list()
-
-/obj/item/tape
- name = "tape"
- icon = 'icons/policetape.dmi'
- anchored = 1
- density = 1
- var/icon_base
-
-/obj/item/tape/New()
- ..()
- if(!hazard_overlays)
- hazard_overlays = list()
- hazard_overlays["[NORTH]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "N")
- hazard_overlays["[EAST]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "E")
- hazard_overlays["[SOUTH]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "S")
- hazard_overlays["[WEST]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "W")
-
-/obj/item/taperoll/New() //just using tape is not enough to guarantee the overlays are genned
- ..()
- if(!hazard_overlays)
- hazard_overlays = list()
- hazard_overlays["[NORTH]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "N")
- hazard_overlays["[EAST]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "E")
- hazard_overlays["[SOUTH]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "S")
- hazard_overlays["[WEST]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "W")
-
-/obj/item/taperoll/police
- name = "police tape"
- desc = "A roll of police tape used to block off crime scenes from the public."
- icon_state = "police_start"
- tape_type = /obj/item/tape/police
- icon_base = "police"
-
-/obj/item/tape/police
- name = "police tape"
- desc = "A length of police tape. Do not cross."
- req_one_access = list(access_security,access_forensics_lockers)
- icon_base = "police"
-
-/obj/item/taperoll/engineering
- name = "engineering tape"
- desc = "A roll of engineering tape used to block off working areas from the public."
- icon_state = "engineering_start"
- tape_type = /obj/item/tape/engineering
- icon_base = "engineering"
-
-/obj/item/tape/engineering
- name = "engineering tape"
- desc = "A length of engineering tape. Better not cross it."
- req_one_access = list(access_engine,access_atmospherics)
- icon_base = "engineering"
-
-/obj/item/taperoll/attack_self(mob/user as mob)
- if(icon_state == "[icon_base]_start")
- start = get_turf(src)
- to_chat(usr, "You place the first end of the [src].")
- icon_state = "[icon_base]_stop"
- else
- icon_state = "[icon_base]_start"
- end = get_turf(src)
- if(start.y != end.y && start.x != end.x || start.z != end.z)
- to_chat(usr, "[src] can only be laid horizontally or vertically.")
- return
-
- var/turf/cur = start
- var/dir
- if(start.x == end.x)
- var/d = end.y-start.y
- if(d) d = d/abs(d)
- end = get_turf(locate(end.x,end.y+d,end.z))
- dir = "v"
- else
- var/d = end.x-start.x
- if(d) d = d/abs(d)
- end = get_turf(locate(end.x+d,end.y,end.z))
- dir = "h"
-
- var/can_place = 1
- while(cur!=end && can_place)
- if(cur.density == 1)
- can_place = 0
- else if(istype(cur, /turf/space))
- can_place = 0
- else
- for(var/obj/O in cur)
- if(!istype(O, /obj/item/tape) && O.density)
- can_place = 0
- break
- cur = get_step_towards(cur,end)
- if(!can_place)
- to_chat(usr, "You can't run \the [src] through that!")
- return
-
- cur = start
- var/tapetest = 0
- while(cur!=end)
- for(var/obj/item/tape/Ptest in cur)
- if(Ptest.icon_state == "[Ptest.icon_base]_[dir]")
- tapetest = 1
- if(tapetest != 1)
- var/obj/item/tape/P = new tape_type(cur)
- P.icon_state = "[P.icon_base]_[dir]"
- cur = get_step_towards(cur,end)
- //is_blocked_turf(var/turf/T)
- to_chat(usr, "You finish placing the [src].")//Git Test
-
-
-/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity)
- if(!proximity)
- return
-
- if(istype(A, /obj/machinery/door/airlock))
- var/turf/T = get_turf(A)
- var/obj/item/tape/P = new tape_type(T.x,T.y,T.z)
- P.loc = locate(T.x,T.y,T.z)
- P.icon_state = "[src.icon_base]_door"
- P.layer = 3.2
- to_chat(user, "You finish placing the [src].")
-
- if(istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor))
- var/turf/F = A
- var/direction = user.loc == F ? user.dir : turn(user.dir, 180)
- var/icon/hazard_overlay = hazard_overlays["[direction]"]
- if(tape_roll_applications[F] == null)
- tape_roll_applications[F] = 0
-
- if(tape_roll_applications[F] & direction) // hazard_overlay in F.overlays wouldn't work.
- user.visible_message("[user] uses the adhesive of \the [src] to remove area markings from \the [F].", "You use the adhesive of \the [src] to remove area markings from \the [F].")
- F.overlays -= hazard_overlay
- tape_roll_applications[F] &= ~direction
- else
- user.visible_message("[user] applied \the [src] on \the [F] to create area markings.", "You apply \the [src] on \the [F] to create area markings.")
- F.overlays |= hazard_overlay
- tape_roll_applications[F] |= direction
- return
-
-/obj/item/tape/CanPass(atom/movable/mover, turf/target, height=0)
- if(!density) return 1
- if(height==0) return 1
-
- if((mover.pass_flags & PASSTABLE || istype(mover, /obj/effect/meteor) || mover.throwing))
- return 1
- else if(ismob(mover) && allowed(mover))
- return 1
- else
- return 0
-
-/obj/item/tape/attackby(obj/item/W as obj, mob/user as mob, params)
- breaktape(W, user)
-
-/obj/item/tape/attack_hand(mob/user as mob)
- if(user.a_intent == INTENT_HELP && src.allowed(user))
- user.visible_message("[user] lifts [src], allowing passage.", "You lift [src], allowing passage.")
- src.density = 0
- spawn(200)
- src.density = 1
- else
- breaktape(/obj/item/soap, user)//cant be null, and can't be sharp.
-
-/obj/item/tape/attack_alien(mob/user as mob)
- breaktape(/obj/item/wirecutters,user)
-
-/obj/item/tape/proc/breaktape(obj/item/W as obj, mob/user as mob)
- if(user.a_intent == INTENT_HELP && ((!is_pointed(W) && src.allowed(user))))
- to_chat(user, "You can't break the [src] with that!")
- return
- user.visible_message("[user] breaks the [src]!", "You break the [src]!")
-
- var/dir[2]
- var/icon_dir = src.icon_state
- if(icon_dir == "[src.icon_base]_h")
- dir[1] = EAST
- dir[2] = WEST
- if(icon_dir == "[src.icon_base]_v")
- dir[1] = NORTH
- dir[2] = SOUTH
-
- for(var/i=1;i<3;i++)
- var/N = 0
- var/turf/cur = get_step(src,dir[i])
- while(N != 1)
- N = 1
- for(var/obj/item/tape/P in cur)
- if(P.icon_state == icon_dir)
- N = 0
- qdel(P)
- cur = get_step(cur,dir[i])
-
- qdel(src)
- return
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 3ffdfaaf751..2ae1a2d6e00 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -211,7 +211,7 @@
to_chat(user, "You remove the splint from [H]'s [limb].")
return
if(M == user)
- user.visible_message("[user] starts to apply [src] to their [limb].", \
+ user.visible_message("[user] starts to apply [src] to [user.p_their()] [limb].", \
"You start to apply [src] to your [limb].", \
"You hear something being wrapped.")
if(!do_mob(user, H, self_delay))
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index a30c3e1b716..ebc89cdca7a 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -13,6 +13,15 @@
/*
* Glass sheets
*/
+
+GLOBAL_LIST_INIT(glass_recipes, list ( \
+ new/datum/stack_recipe/window("directional window", /obj/structure/window/basic, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/basic, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe("fishbowl", /obj/machinery/fishtank/bowl, 1, time = 0), \
+ new/datum/stack_recipe("fish tank", /obj/machinery/fishtank/tank, 3, time = 0, on_floor = TRUE), \
+ new/datum/stack_recipe("wall aquariam", /obj/machinery/fishtank/wall, 4, time = 0, on_floor = TRUE) \
+))
+
/obj/item/stack/sheet/glass
name = "glass"
desc = "HOLY SHEET! That is a lot of glass."
@@ -30,8 +39,9 @@
/obj/item/stack/sheet/glass/cyborg
materials = list()
-/obj/item/stack/sheet/glass/attack_self(mob/user as mob)
- construct_window(user)
+/obj/item/stack/sheet/glass/New(loc, amount)
+ recipes = GLOB.glass_recipes
+ ..()
/obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user, params)
..()
@@ -59,94 +69,18 @@
else
return ..()
-/obj/item/stack/sheet/glass/proc/construct_window(mob/user as mob)
- if(!user || !src) return 0
- if(!istype(user.loc,/turf)) return 0
- if(!user.IsAdvancedToolUser())
- to_chat(user, "You don't have the dexterity to do this!")
- return 0
- var/title = "Sheet-Glass"
- title += " ([src.amount] sheet\s left)"
- switch(input(title, "What would you like to construct?") in list("One Direction Window", "Full Window", "Fishbowl", "Fish Tank", "Wall Aquarium", "Cancel"))
- if("One Direction Window")
- if(!src) return 1
- if(src.loc != user) return 1
-
- var/list/directions = new/list(cardinal)
- var/i = 0
- for(var/obj/structure/window/win in user.loc)
- i++
- if(i >= 4)
- to_chat(user, "There are too many windows in this location.")
- return 1
- directions-=win.dir
- if(win.is_fulltile())
- to_chat(user, "Can't let you do that.")
- return 1
-
- //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc.
- var/dir_to_set = 2
- for(var/direction in list( user.dir, turn(user.dir,90), turn(user.dir,180), turn(user.dir,270) ))
- var/found = 0
- for(var/obj/structure/window/WT in user.loc)
- if(WT.dir == direction)
- found = 1
- if(!found)
- dir_to_set = direction
- break
-
- var/obj/structure/window/W
- W = new /obj/structure/window/basic( user.loc, 0 )
- W.dir = dir_to_set
- W.ini_dir = W.dir
- W.state = 0
- W.anchored = 0
- W.air_update_turf(1)
- src.use(1)
- if("Full Window")
- if(!src) return 1
- if(src.loc != user) return 1
- if(src.amount < 2)
- to_chat(user, "You need more glass to do that.")
- return 1
- if(locate(/obj/structure/window/full) in user.loc)
- to_chat(user, "There is a full window in the way.")
- return 1
- var/obj/structure/window/W = new full_window( user.loc, 0 )
- W.state = 0
- W.anchored = 0
- W.air_update_turf(1)
- src.use(2)
- if("Fishbowl")
- if(!src) return 1
- if(src.loc != user) return 1
- var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/bowl(user.loc, 0)
- F.air_update_turf(1)
- src.use(1)
- if("Fish Tank")
- if(!src) return 1
- if(src.loc != user) return 1
- if(src.amount < 3)
- to_chat(user, "You need more glass to do that.")
- return 1
- var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/tank(user.loc, 0)
- F.air_update_turf(1)
- src.use(3)
- if("Wall Aquarium")
- if(!src) return 1
- if(src.loc != user) return 1
- if(src.amount < 4)
- to_chat(user, "You need more glass to do that.")
- return 1
- var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/wall(user.loc, 0)
- F.air_update_turf(1)
- src.use(4)
- return 0
-
/*
* Reinforced glass sheets
*/
+
+GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
+ new/datum/stack_recipe/window("windoor frame", /obj/structure/windoor_assembly, 5, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ null, \
+ new/datum/stack_recipe/window("directional reinforced window", /obj/structure/window/reinforced, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe/window("fulltile reinforced window", /obj/structure/window/full/reinforced, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
+))
+
/obj/item/stack/sheet/rglass
name = "reinforced glass"
desc = "Glass which seems to have rods or something stuck in them."
@@ -161,105 +95,14 @@
/obj/item/stack/sheet/rglass/cyborg
materials = list()
-/obj/item/stack/sheet/rglass/attack_self(mob/user as mob)
- construct_window(user)
-
-/obj/item/stack/sheet/rglass/proc/construct_window(mob/user as mob)
- if(!user || !src) return 0
- if(!istype(user.loc,/turf)) return 0
- if(!user.IsAdvancedToolUser())
- to_chat(user, "You don't have the dexterity to do this!")
- return 0
- var/title = "Sheet Reinf. Glass"
- title += " ([src.amount] sheet\s left)"
- switch(input(title, "Would you like full tile glass a one direction glass pane or a windoor?") in list("One Direction", "Full Window", "Windoor", "Cancel"))
- if("One Direction")
- if(!src) return 1
- if(src.loc != user) return 1
- var/list/directions = new/list(cardinal)
- var/i = 0
- for(var/obj/structure/window/win in user.loc)
- i++
- if(i >= 4)
- to_chat(user, "There are too many windows in this location.")
- return 1
- directions-=win.dir
- if(win.is_fulltile())
- to_chat(user, "Can't let you do that.")
- return 1
-
- //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc.
- var/dir_to_set = 2
- for(var/direction in list( user.dir, turn(user.dir,90), turn(user.dir,180), turn(user.dir,270) ))
- var/found = 0
- for(var/obj/structure/window/WT in user.loc)
- if(WT.dir == direction)
- found = 1
- if(!found)
- dir_to_set = direction
- break
-
- var/obj/structure/window/W
- W = new /obj/structure/window/reinforced( user.loc, 1 )
- W.state = 0
- W.dir = dir_to_set
- W.ini_dir = W.dir
- W.anchored = 0
- src.use(1)
-
- if("Full Window")
- if(!src) return 1
- if(src.loc != user) return 1
- if(src.amount < 2)
- to_chat(user, "You need more glass to do that.")
- return 1
- if(locate(/obj/structure/window/full) in user.loc)
- to_chat(user, "There is a window in the way.")
- return 1
- var/obj/structure/window/W = new full_window( user.loc, 0 )
- W.state = 0
- W.anchored = 0
- src.use(2)
-
- if("Windoor")
- if(!src || src.loc != user) return 1
-
- if(isturf(user.loc) && locate(/obj/structure/windoor_assembly/, user.loc))
- to_chat(user, "There is already a windoor assembly in that location.")
- return 1
-
- if(isturf(user.loc) && locate(/obj/machinery/door/window/, user.loc))
- to_chat(user, "There is already a windoor in that location.")
- return 1
-
- if(src.amount < 5)
- to_chat(user, "You need more glass to do that.")
- return 1
-
- var/obj/structure/windoor_assembly/WD
- WD = new /obj/structure/windoor_assembly(user.loc)
- WD.state = "01"
- WD.anchored = 0
- src.use(5)
- switch(user.dir)
- if(SOUTH)
- WD.dir = SOUTH
- WD.ini_dir = SOUTH
- if(EAST)
- WD.dir = EAST
- WD.ini_dir = EAST
- if(WEST)
- WD.dir = WEST
- WD.ini_dir = WEST
- else//If the user is facing northeast. northwest, southeast, southwest or north, default to north
- WD.dir = NORTH
- WD.ini_dir = NORTH
- else
- return 1
-
-
- return 0
+/obj/item/stack/sheet/rglass/New(loc, amount)
+ recipes = GLOB.reinforced_glass_recipes
+ ..()
+GLOBAL_LIST_INIT(pglass_recipes, list ( \
+ new/datum/stack_recipe/window("directional window", /obj/structure/window/plasmabasic, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/plasmabasic, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
+))
/obj/item/stack/sheet/plasmaglass
name = "plasma glass"
@@ -271,8 +114,9 @@
created_window = /obj/structure/window/plasmabasic
full_window = /obj/structure/window/full/plasmabasic
-/obj/item/stack/sheet/plasmaglass/attack_self(mob/user as mob)
- construct_window(user)
+/obj/item/stack/sheet/plasmaglass/New(loc, amount)
+ recipes = GLOB.pglass_recipes
+ ..()
/obj/item/stack/sheet/plasmaglass/attackby(obj/item/W, mob/user, params)
..()
@@ -291,64 +135,15 @@
else
return ..()
-/obj/item/stack/sheet/plasmaglass/proc/construct_window(mob/user as mob)
- if(!user || !src) return 0
- if(!istype(user.loc,/turf)) return 0
- if(!user.IsAdvancedToolUser())
- to_chat(user, " You don't have the dexterity to do this!")
- return 0
- var/title = "Plasma-glass alloy"
- title += " ([src.amount] sheet\s left)"
- switch(alert(title, "Would you like full tile glass or one direction?", "One Direction", "Full Window", "Cancel", null))
- if("One Direction")
- if(!src) return 1
- if(src.loc != user) return 1
- var/list/directions = new/list(cardinal)
- var/i = 0
- for(var/obj/structure/window/win in user.loc)
- i++
- if(i >= 4)
- to_chat(user, "There are too many windows in this location.")
- return 1
- directions-=win.dir
- if(!(win.ini_dir in cardinal))
- to_chat(user, "Can't let you do that.")
- return 1
- //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc.
- var/dir_to_set = 2
- for(var/direction in list( user.dir, turn(user.dir,90), turn(user.dir,180), turn(user.dir,270) ))
- var/found = 0
- for(var/obj/structure/window/WT in user.loc)
- if(WT.dir == direction)
- found = 1
- if(!found)
- dir_to_set = direction
- break
- var/obj/structure/window/W
- W = new /obj/structure/window/plasmabasic( user.loc, 0 )
- W.dir = dir_to_set
- W.ini_dir = W.dir
- W.state = 0
- W.anchored = 0
- src.use(1)
- if("Full Window")
- if(!src) return 1
- if(src.loc != user) return 1
- if(src.amount < 2)
- to_chat(user, "You need more glass to do that.")
- return 1
- if(locate(/obj/structure/window) in user.loc)
- to_chat(user, "There is a window in the way.")
- return 1
- var/obj/structure/window/W = new full_window( user.loc, 0 )
- W.state = 0
- W.anchored = 0
- src.use(2)
- return 0
-
/*
* Reinforced plasma glass sheets
*/
+
+GLOBAL_LIST_INIT(prglass_recipes, list ( \
+ new/datum/stack_recipe/window("directional reinforced window", /obj/structure/window/plasmareinforced, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe/window("fulltile reinforced window", /obj/structure/window/full/plasmareinforced, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
+))
+
/obj/item/stack/sheet/plasmarglass
name = "reinforced plasma glass"
desc = "Plasma glass which seems to have rods or something stuck in them."
@@ -360,60 +155,42 @@
full_window = /obj/structure/window/full/plasmareinforced
armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0)
-/obj/item/stack/sheet/plasmarglass/attack_self(mob/user as mob)
- construct_window(user)
+/obj/item/stack/sheet/plasmarglass/New(loc, amount)
+ recipes = GLOB.prglass_recipes
+ ..()
-/obj/item/stack/sheet/plasmarglass/proc/construct_window(mob/user as mob)
- if(!user || !src) return 0
- if(!istype(user.loc,/turf)) return 0
- if(!user.IsAdvancedToolUser())
- to_chat(user, "You don't have the dexterity to do this!")
- return 0
- var/title = "Reinforced plasma-glass alloy"
- title += " ([src.amount] sheet\s left)"
- switch(alert(title, "Would you like full tile glass or one direction?", "One Direction", "Full Window", "Cancel", null))
- if("One Direction")
- if(!src) return 1
- if(src.loc != user) return 1
- var/list/directions = new/list(cardinal)
- var/i = 0
- for(var/obj/structure/window/win in user.loc)
- i++
- if(i >= 4)
- to_chat(user, "There are too many windows in this location.")
- return 1
- directions-=win.dir
- if(!(win.ini_dir in cardinal))
- to_chat(user, "Can't let you do that.")
- return 1
- //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc.
- var/dir_to_set = 2
- for(var/direction in list( user.dir, turn(user.dir,90), turn(user.dir,180), turn(user.dir,270) ))
- var/found = 0
- for(var/obj/structure/window/WT in user.loc)
- if(WT.dir == direction)
- found = 1
- if(!found)
- dir_to_set = direction
- break
- var/obj/structure/window/W
- W = new /obj/structure/window/plasmareinforced( user.loc, 0 )
- W.dir = dir_to_set
- W.ini_dir = W.dir
- W.state = 0
- W.anchored = 0
- src.use(1)
- if("Full Window")
- if(!src) return 1
- if(src.loc != user) return 1
- if(src.amount < 2)
- to_chat(user, "You need more glass to do that.")
- return 1
- if(locate(/obj/structure/window) in user.loc)
- to_chat(user, "There is a window in the way.")
- return 1
- var/obj/structure/window/W = new full_window( user.loc, 0 )
- W.state = 0
- W.anchored = 0
- src.use(2)
- return 0
+GLOBAL_LIST_INIT(titaniumglass_recipes, list(
+ new/datum/stack_recipe/window("shuttle window", /obj/structure/window/full/shuttle, 2, time = 0, on_floor = TRUE, window_checks = TRUE)
+ ))
+
+/obj/item/stack/sheet/titaniumglass
+ name = "titanium glass"
+ desc = "A glass sheet made out of a titanium-silicate alloy."
+ singular_name = "titanium glass sheet"
+ icon_state = "sheet-titaniumglass"
+ item_state = "sheet-titaniumglass"
+ materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+ merge_type = /obj/item/stack/sheet/titaniumglass
+ full_window = /obj/structure/window/full/shuttle
+
+/obj/item/stack/sheet/titaniumglass/New(loc, amount)
+ recipes = GLOB.titaniumglass_recipes
+ ..()
+
+GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
+ new/datum/stack_recipe/window("plastitanium window", /obj/structure/window/plastitanium, 2, time = 0, on_floor = TRUE, window_checks = TRUE)
+ ))
+
+/obj/item/stack/sheet/plastitaniumglass
+ name = "plastitanium glass"
+ desc = "A glass sheet made out of a plasma-titanium-silicate alloy."
+ singular_name = "plastitanium glass sheet"
+ icon_state = "sheet-plastitaniumglass"
+ item_state = "sheet-plastitaniumglass"
+ materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+ merge_type = /obj/item/stack/sheet/plastitaniumglass
+ full_window = /obj/structure/window/plastitanium
+
+/obj/item/stack/sheet/plastitaniumglass/New(loc, amount)
+ recipes = GLOB.plastitaniumglass_recipes
+ ..()
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 4412b547b19..5ef40ee25e8 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -318,7 +318,11 @@ var/global/list/datum/stack_recipe/cult = list ( \
/*
* Brass
*/
-var/global/list/datum/stack_recipe/brass_recipes = list ( \
+var/global/list/datum/stack_recipe/brass_recipes = list (\
+ new/datum/stack_recipe/window("brass windoor", /obj/machinery/door/window/clockwork, 2, time = 30, on_floor = TRUE, window_checks = TRUE), \
+ null,
+ new/datum/stack_recipe/window("directional brass window", /obj/structure/window/reinforced/clockwork, time = 0, on_floor = TRUE, window_checks = TRUE), \
+ new/datum/stack_recipe/window("fulltile brass window", /obj/structure/window/reinforced/clockwork/fulltile, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE), \
)
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 4dd6ca365bf..e55569b23e8 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -149,6 +149,10 @@
to_chat(usr, "You haven't got enough [src] to build \the [R.title]!")
return 0
+ if(R.window_checks && !valid_window_location(usr.loc, usr.dir))
+ to_chat(usr, "The [R.title] won't fit here!")
+ return FALSE
+
if(R.one_per_turf && (locate(R.result_type) in creation_loc))
to_chat(usr, "There is another [R.title] here!")
return 0
@@ -166,7 +170,7 @@
return
var/atom/O = new R.result_type(creation_loc)
- O.dir = usr.dir
+ O.setDir(usr.dir)
if(R.max_res_amount > 1)
var/obj/item/stack/new_item = O
new_item.amount = R.res_amount * multiplier
diff --git a/code/game/objects/items/stacks/stack_recipe.dm b/code/game/objects/items/stacks/stack_recipe.dm
index 67ddd964d0d..10d06e9741d 100644
--- a/code/game/objects/items/stacks/stack_recipe.dm
+++ b/code/game/objects/items/stacks/stack_recipe.dm
@@ -11,8 +11,9 @@
var/time = 0
var/one_per_turf = 0
var/on_floor = 0
+ var/window_checks = FALSE
-/datum/stack_recipe/New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1, time = 0, one_per_turf = 0, on_floor = 0)
+/datum/stack_recipe/New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1, time = 0, one_per_turf = 0, on_floor = 0, window_checks = FALSE)
src.title = title
src.result_type = result_type
src.req_amount = req_amount
@@ -21,6 +22,7 @@
src.time = time
src.one_per_turf = one_per_turf
src.on_floor = on_floor
+ src.window_checks = window_checks
/datum/stack_recipe/proc/post_build(var/obj/item/stack/S, var/obj/result)
return
@@ -40,6 +42,17 @@
R.update_icon()
..()
+/datum/stack_recipe/window
+/datum/stack_recipe/window/post_build(obj/item/stack/S, obj/result)
+ if(istype(result, /obj/structure/windoor_assembly))
+ var/obj/structure/windoor_assembly/W = result
+ W.ini_dir = W.dir
+ else if(istype(result, /obj/structure/window))
+ var/obj/structure/window/W = result
+ W.ini_dir = W.dir
+ W.anchored = FALSE
+ W.state = WINDOW_OUT_OF_FRAME
+
/*
* Recipe list datum
*/
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index b321721b639..5e8577d756a 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -229,8 +229,8 @@
hitsound = 'sound/weapons/bladeslice.ogg'
/obj/item/toy/katana/suicide_act(mob/user)
- var/dmsg = pick("[user] tries to stab \the [src] into their abdomen, but it shatters! They look as if they might die from the shame.","[user] tries to stab \the [src] into their abdomen, but \the [src] bends and breaks in half! They look as if they might die from the shame.","[user] tries to slice their own throat, but the plastic blade has no sharpness, causing them to lose their balance, slip over, and break their neck with a loud snap!")
- user.visible_message("[dmsg] It looks like they are trying to commit suicide.")
+ var/dmsg = pick("[user] tries to stab \the [src] into [user.p_their()] abdomen, but it shatters! [user.p_they(TRUE)] look[user.p_s()] as if [user.p_they()] might die from the shame.","[user] tries to stab \the [src] into [user.p_their()] abdomen, but \the [src] bends and breaks in half! [user.p_they(TRUE)] look[user.p_s()] as if [user.p_they()] might die from the shame.","[user] tries to slice [user.p_their()] own throat, but the plastic blade has no sharpness, causing [user.p_them()] to lose [user.p_their()] balance, slip over, and break [user.p_their()] neck with a loud snap!")
+ user.visible_message("[dmsg] It looks like [user.p_theyre()] trying to commit suicide.")
return (BRUTELOSS)
@@ -531,7 +531,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user,
to_chat(user, "The hand of cards is stuck to your hand, you can't add it to the deck!")
return
cards += C.currenthand
- user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.")
+ user.visible_message("[user] puts [user.p_their()] hand of cards in the deck.", "You put the hand of cards in the deck.")
qdel(C)
else
to_chat(user, "You can't mix cards from other decks.")
@@ -610,7 +610,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
C.apply_card_vars(C,O)
C.pickup(cardUser)
cardUser.put_in_any_hand_if_possible(C)
- cardUser.visible_message("[cardUser] draws a card from \his hand.", "You take the [C.cardname] from your hand.")
+ cardUser.visible_message("[cardUser] draws a card from [cardUser.p_their()] hand.", "You take the [C.cardname] from your hand.")
interact(cardUser)
if(currenthand.len < 3)
@@ -637,7 +637,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living
if(C.parentdeck == parentdeck)
currenthand += C.cardname
user.unEquip(C)
- user.visible_message("[user] adds a card to their hand.", "You add the [C.cardname] to your hand.")
+ user.visible_message("[user] adds a card to [user.p_their()] hand.", "You add the [C.cardname] to your hand.")
interact(user)
if(currenthand.len > 4)
icon_state = "[deckstyle]_hand5"
@@ -677,7 +677,7 @@ obj/item/toy/cards/singlecard/examine(mob/user)
if(ishuman(user))
var/mob/living/carbon/human/cardUser = user
if(cardUser.get_item_by_slot(slot_l_hand) == src || cardUser.get_item_by_slot(slot_r_hand) == src)
- cardUser.visible_message("[cardUser] checks \his card.", "The card reads: [src.cardname]")
+ cardUser.visible_message("[cardUser] checks [cardUser.p_their()] card.", "The card reads: [src.cardname]")
else
to_chat(cardUser, "You need to have the card in your hand to check it.")
@@ -726,7 +726,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
if(H.parentdeck == parentdeck)
H.currenthand += cardname
user.unEquip(src)
- user.visible_message("[user] adds a card to \his hand.", "You add the [cardname] to your hand.")
+ user.visible_message("[user] adds a card to [user.p_their()] hand.", "You add the [cardname] to your hand.")
H.interact(user)
if(H.currenthand.len > 4)
H.icon_state = "[deckstyle]_hand5"
@@ -1367,7 +1367,7 @@ obj/item/toy/cards/deck/syndicate/black
var/bullet_position = 1
/obj/item/toy/russian_revolver/suicide_act(mob/user)
- user.visible_message("[user] quickly loads six bullets into [src]'s cylinder and points it at \his head before pulling the trigger! It looks like they are trying to commit suicide.")
+ user.visible_message("[user] quickly loads six bullets into [src]'s cylinder and points it at [user.p_their()] head before pulling the trigger! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/weapons/Gunshot.ogg', 50, 1)
return (BRUTELOSS)
@@ -1393,7 +1393,7 @@ obj/item/toy/cards/deck/syndicate/black
if(!(user.has_organ("head"))) //For sanity
to_chat(user, "Playing this game without a head would be classed as cheating.")
return
- user.visible_message("[user] points [src] at their head, ready to pull the trigger!")
+ user.visible_message("[user] points [src] at [user.p_their()] head, ready to pull the trigger!")
if(do_after(user, 30, target = user))
if(bullet_position > 1)
user.visible_message("*click*")
@@ -1407,7 +1407,7 @@ obj/item/toy/cards/deck/syndicate/black
user.apply_damage(200, BRUTE, "head", sharp = 1, used_weapon = "Self-inflicted gunshot wound to the head.")
user.death()
else
- user.visible_message("[user] lowers [src] from their head.")
+ user.visible_message("[user] lowers [src] from [user.p_their()] head.")
/obj/item/toy/russian_revolver/proc/spin_cylinder()
bullet_position = rand(1,6)
@@ -1662,7 +1662,7 @@ obj/item/toy/cards/deck/syndicate/black
/obj/item/toy/eight_ball/attack_self(mob/user as mob)
if(!cooldown)
var/answer = pick(possible_answers)
- user.visible_message("[user] focuses on their question and [use_action]...")
+ user.visible_message("[user] focuses on [user.p_their()] question and [use_action]...")
user.visible_message("[bicon(src)] The [src] says \"[answer]\"")
spawn(30)
cooldown = 0
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index fe132c107b0..5cc7ee684af 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -9,10 +9,10 @@ RCD
icon_state = "rcd"
opacity = 0
density = 0
- anchored = 0.0
- flags = CONDUCT
- force = 10.0
- throwforce = 10.0
+ anchored = 0
+ flags = CONDUCT | NOBLUDGEON
+ force = 0
+ throwforce = 10
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
@@ -296,8 +296,6 @@ RCD
var/turf/T1 = get_turf(A)
QDEL_NULL(A)
for(var/obj/structure/window/W in T1.contents)
- W.disassembled = 1
- W.density = 0
qdel(W)
for(var/cdir in cardinal)
var/turf/T2 = get_step(T1, cdir)
@@ -307,8 +305,6 @@ RCD
continue
for(var/obj/structure/window/W in T2.contents)
if(W.dir == turn(cdir, 180))
- W.disassembled = 1
- W.density = 0
qdel(W)
var/obj/structure/window/reinforced/W = new(T2)
W.dir = turn(cdir, 180)
@@ -331,16 +327,12 @@ RCD
activate()
new /obj/structure/grille(A)
for(var/obj/structure/window/W in contents)
- W.disassembled = 1 // Prevent that annoying glass breaking sound
- W.density = 0
qdel(W)
for(var/cdir in cardinal)
var/turf/T = get_step(A, cdir)
if(locate(/obj/structure/grille) in T.contents)
for(var/obj/structure/window/W in T.contents)
if(W.dir == turn(cdir, 180))
- W.disassembled = 1
- W.density = 0
qdel(W)
else // Build a window!
var/obj/structure/window/reinforced/W = new(A)
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 9a55bb8e562..73ff43abbde 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -54,7 +54,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(istype(M) && M.on_fire)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(M)
- light("[user] coldly lights the [name] with the burning body of [M]. Clearly, they offer the warmest of regards...")
+ light("[user] coldly lights the [name] with the burning body of [M]. Clearly, [user.p_they()] offer[user.p_s()] the warmest of regards...")
return 1
else
return ..()
@@ -73,31 +73,31 @@ LIGHTERS ARE IN LIGHTERS.DM
else if(istype(W, /obj/item/lighter/zippo))
var/obj/item/lighter/zippo/Z = W
if(Z.lit)
- light("With a single flick of their wrist, [user] smoothly lights their [name] with their [W]. Damn they're cool.")
+ light("With a single flick of [user.p_their()] wrist, [user] smoothly lights [user.p_their()] [name] with [user.p_their()] [W]. Damn [user.p_theyre()] cool.")
else if(istype(W, /obj/item/lighter))
var/obj/item/lighter/L = W
if(L.lit)
- light("After some fiddling, [user] manages to light their [name] with [W].")
+ light("After some fiddling, [user] manages to light [user.p_their()] [name] with [W].")
else if(istype(W, /obj/item/match))
var/obj/item/match/M = W
if(M.lit == 1)
- light("[user] lights their [name] with their [W].")
+ light("[user] lights [user.p_their()] [name] with [user.p_their()] [W].")
else if(istype(W, /obj/item/melee/energy/sword/saber))
var/obj/item/melee/energy/sword/saber/S = W
if(S.active)
- light("[user] swings their [W], barely missing their nose. They light their [name] in the process.")
+ light("[user] swings their [W], barely missing their nose. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [name] in the process.")
else if(istype(W, /obj/item/assembly/igniter))
- light("[user] fiddles with [W], and manages to light their [name].")
+ light("[user] fiddles with [W], and manages to light [user.p_their()] [name].")
else if(istype(W, /obj/item/gun/magic/wand/fireball))
var/obj/item/gun/magic/wand/fireball/F = W
if(F.charges)
if(prob(50) || user.mind.assigned_role == "Wizard")
- light("Holy shit, did [user] just manage to light their [name] with [W], with only moderate eyebrow singing?")
+ light("Holy shit, did [user] just manage to light [user.p_their()] [name] with [W], with only moderate eyebrow singing?")
else
to_chat(user, "Unsure which end of the wand is which, [user] fails to light [name] with [W].")
explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index 02a01a25e83..ec8a2a5e325 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -63,8 +63,8 @@
to_chat(user, "You need to wipe off the old lipstick first!")
return
if(H == user)
- user.visible_message("[user] does their lips with \the [src].", \
- "You take a moment to apply \the [src]. Perfect!")
+ user.visible_message("[user] does [user.p_their()] lips with [src].", \
+ "You take a moment to apply [src]. Perfect!")
H.lip_style = "lipstick"
H.lip_color = colour
H.update_body()
@@ -106,11 +106,11 @@
to_chat(user, "Already clean-shaven.")
return
if(H == user) //shaving yourself
- user.visible_message("[user] starts to shave their facial hair with \the [src].", \
+ user.visible_message("[user] starts to shave [user.p_their()] facial hair with [src].", \
"You take a moment shave your facial hair with \the [src].")
if(do_after(user, 50 * toolspeed, target = H))
- user.visible_message("[user] shaves \his facial hair clean with the [src].", \
- "You finish shaving with the [src]. Fast and clean!")
+ user.visible_message("[user] shaves [user.p_their()] facial hair clean with [src].", \
+ "You finish shaving with [src]. Fast and clean!")
C.f_style = "Shaved"
H.update_fhair()
playsound(src.loc, usesound, 20, 1)
@@ -140,10 +140,10 @@
to_chat(user, "Your razor isn't going to cut through tentacles.")
return
if(H == user) //shaving yourself
- user.visible_message("[user] starts to shave their head with \the [src].", \
+ user.visible_message("[user] starts to shave [user.p_their()] head with [src].", \
"You start to shave your head with \the [src].")
if(do_after(user, 50 * toolspeed, target = H))
- user.visible_message("[user] shaves \his head with \the [src].", \
+ user.visible_message("[user] shaves [user.p_their()] head with [src].", \
"You finish shaving with \the [src].")
C.h_style = "Skinhead"
H.update_hair()
diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm
index 160bdd9bb1e..d25b6f54d29 100644
--- a/code/game/objects/items/weapons/courtroom.dm
+++ b/code/game/objects/items/weapons/courtroom.dm
@@ -14,7 +14,7 @@
burn_state = FLAMMABLE
/obj/item/gavelhammer/suicide_act(mob/user)
- user.visible_message("[user] has sentenced \himself to death with the [src.name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] has sentenced [user.p_them()]self to death with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
return (BRUTELOSS)
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 762b2151b9c..99a62b83131 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -96,7 +96,7 @@
if(istype(W, /obj/item/screwdriver))
if(bcell)
- bcell.updateicon()
+ bcell.update_icon()
bcell.loc = get_turf(src.loc)
bcell = null
to_chat(user, "You remove the cell from the [src].")
@@ -276,7 +276,7 @@
icon_state = "defibpaddles[wielded]_cooldown"
/obj/item/twohanded/shockpaddles/suicide_act(mob/user)
- user.visible_message("[user] is putting the live paddles on \his chest! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide.")
defib.deductcharge(revivecost)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
return (OXYLOSS)
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index 8ccfed1b517..d93ebcf3214 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -159,7 +159,7 @@
var/turf/bombturf = get_turf(src)
var/area/A = get_area(bombturf)
- bombers += "E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]"
+ investigate_log("E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]", INVESTIGATE_BOMB)
message_admins("E20 detonated at [A.name] (JMP) with a roll of [result]. Triggered by: [key_name_admin(user)]")
log_game("E20 detonated at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with a roll of [result]. Triggered by: [key_name(user)]")
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index d120fb4e1cd..3a8bf12b143 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -142,7 +142,7 @@
else
to_chat(user, "You inject yourself with [src].")
- add_attack_logs(user, M, attack_log, FALSE)
+ add_attack_logs(user, M, attack_log, ATKLOG_ALL)
if(!iscarbon(user))
M.LAssailant = null
else
diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm
index cd1d79ae683..2866e8d06ec 100644
--- a/code/game/objects/items/weapons/dnascrambler.dm
+++ b/code/game/objects/items/weapons/dnascrambler.dm
@@ -25,11 +25,11 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(NO_DNA in H.species.species_traits)
- to_chat(user, "You failed to inject [M], as they have no DNA to scramble, nor flesh to inject.")
+ to_chat(user, "You failed to inject [M], as [M.p_they()] [M.p_have()] no DNA to scramble, nor flesh to inject.")
return
if(M == user)
- user.visible_message("[user] injects \himself with [src]!")
+ user.visible_message("[user] injects [user.p_them()]self with [src]!")
injected(user, user)
else
user.visible_message("[user] is trying to inject [M] with [src]!")
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 6164ed01047..edf7e0fc32b 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -90,7 +90,7 @@
/obj/item/grenade/plastic/suicide_act(mob/user)
message_admins("[key_name_admin(user)](?) (FLW) suicided with [src.name] at ([user.x],[user.y],[user.z] - JMP)",0,1)
log_game("[key_name(user)] suicided with [name] at ([user.x],[user.y],[user.z])")
- user.visible_message("[user] activates the [name] and holds it above \his head! It looks like \he's going out with a bang!")
+ user.visible_message("[user] activates the [name] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!")
var/message_say = "FOR NO RAISIN!"
if(user.mind)
if(user.mind.special_role)
diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm
index 7893a7898b8..4a01914a31a 100644
--- a/code/game/objects/items/weapons/garrote.dm
+++ b/code/game/objects/items/weapons/garrote.dm
@@ -75,7 +75,7 @@
return
if(improvised && ((M.head && (M.head.flags_cover & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags_cover & MASKCOVERSMOUTH)))) // Improvised garrotes are blocked by mouth-covering items.
- to_chat(user, "[M]'s neck is blocked by something they're wearing!")
+ to_chat(user, "[M]'s neck is blocked by something [M.p_theyre()] wearing!")
if(strangling)
to_chat(user, "You cannot use [src] on two people at once!")
@@ -134,7 +134,7 @@
G = user.r_hand
else
- user.visible_message("[user] loses \his grip on [strangling]'s neck.", \
+ user.visible_message("[user] loses [user.p_their()] grip on [strangling]'s neck.", \
"You lose your grip on [strangling]'s neck.")
strangling = null
@@ -144,7 +144,7 @@
return
if(!G.affecting)
- user.visible_message("[user] loses \his grip on [strangling]'s neck.", \
+ user.visible_message("[user] loses [user.p_their()] grip on [strangling]'s neck.", \
"You lose your grip on [strangling]'s neck.")
strangling = null
@@ -167,6 +167,6 @@
/obj/item/twohanded/garrote/suicide_act(mob/user)
- user.visible_message("[user] is wrapping the [src] around \his neck and pulling the handles! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is wrapping the [src] around [user.p_their()] neck and pulling the handles! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1)
return (OXYLOSS)
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index de85ec64a58..9e836fecc87 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -102,7 +102,7 @@
// This used to go before the assembly check, but that has absolutely zero to do with priming the damn thing. You could spam the admins with it.
message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [A.name] (JMP) [contained].")
log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) [contained].")
- bombers += "[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])[contained]."
+ investigate_log("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])[contained].", INVESTIGATE_BOMB)
to_chat(user, "You prime the [name]! [det_time / 10] second\s!")
playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1)
active = 1
diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index 44d21506ee6..5b6d585ef5f 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -7,5 +7,5 @@
/obj/item/grenade/empgrenade/prime()
update_mob()
- empulse(src, 4, 10)
- qdel(src)
\ No newline at end of file
+ empulse(src, 4, 10, 1)
+ qdel(src)
diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm
index d0dc2c8fe06..ca6177c04fa 100644
--- a/code/game/objects/items/weapons/grenades/ghettobomb.dm
+++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm
@@ -49,7 +49,8 @@
var/area/A = get_area(bombturf)
message_admins("[ADMIN_LOOKUPFLW(user)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)].")
- log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].")
+ log_game("[key_name(user)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].")
+ investigate_log("[key_name(user)] has primed a [name] for detonation at [A.name] [COORD(bombturf)])", INVESTIGATE_BOMB)
if(iscarbon(user))
var/mob/living/carbon/C = user
C.throw_mode_on()
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index c7ababde601..09fdfe5a27f 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -66,7 +66,7 @@
var/area/A = get_area(bombturf)
message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [A.name] (JMP)")
log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])")
- bombers += "[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])"
+ investigate_log("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])", INVESTIGATE_BOMB)
if(iscarbon(user))
var/mob/living/carbon/C = user
C.throw_mode_on()
diff --git a/code/game/objects/items/weapons/holosign.dm b/code/game/objects/items/weapons/holosign.dm
index 30deb5289a4..12767cb9563 100644
--- a/code/game/objects/items/weapons/holosign.dm
+++ b/code/game/objects/items/weapons/holosign.dm
@@ -1,53 +1,123 @@
/obj/item/holosign_creator
name = "holographic sign projector"
- desc = "A handy-dandy hologaphic projector that displays a janitorial sign."
- icon = 'icons/obj/janitor.dmi'
+ desc = "A handy-dandy holographic projector that displays a janitorial sign."
+ icon = 'icons/obj/device.dmi'
icon_state = "signmaker"
item_state = "electronic"
- force = 5
+ force = 0
w_class = WEIGHT_CLASS_SMALL
throwforce = 0
throw_speed = 3
throw_range = 7
origin_tech = "magnets=1;programming=3"
+ flags = NOBLUDGEON
var/list/signs = list()
- var/max_signs = 20
-
-/obj/item/holosign_creator/Destroy()
- QDEL_LIST(signs)
- return ..()
+ var/max_signs = 10
+ var/creation_time = 0 //time to create a holosign in deciseconds.
+ var/holosign_type = /obj/structure/holosign/wetsign
+ var/holocreator_busy = FALSE //to prevent placing multiple holo barriers at once
/obj/item/holosign_creator/afterattack(atom/target, mob/user, flag)
if(flag)
+ if(!check_allowed_items(target, 1))
+ return
var/turf/T = get_turf(target)
- var/obj/effect/overlay/holograph/H = locate() in T
+ var/obj/structure/holosign/H = locate(holosign_type) in T
if(H)
- to_chat(user, "You use [src] to destroy [H].")
- signs -= H
+ to_chat(user, "You use [src] to deactivate [H].")
qdel(H)
else
- if(signs.len < max_signs)
- H = new(get_turf(target))
- signs += H
- to_chat(user, "You create \a [H] with [src].")
- else
- to_chat(user, "[src] is projecting at max capacity!")
+ if(!is_blocked_turf(T, TRUE)) //can't put holograms on a tile that has dense stuff
+ if(holocreator_busy)
+ to_chat(user, "[src] is busy creating a hologram.")
+ return
+ if(signs.len < max_signs)
+ playsound(src.loc, 'sound/machines/click.ogg', 20, 1)
+ if(creation_time)
+ holocreator_busy = TRUE
+ if(!do_after(user, creation_time, target = target))
+ holocreator_busy = FALSE
+ return
+ holocreator_busy = FALSE
+ if(signs.len >= max_signs)
+ return
+ if(is_blocked_turf(T, TRUE)) //don't try to sneak dense stuff on our tile during the wait.
+ return
+ H = new holosign_type(get_turf(target), src)
+ to_chat(user, "You create [H] with [src].")
+ else
+ to_chat(user, "[src] is projecting at max capacity!")
/obj/item/holosign_creator/attack(mob/living/carbon/human/M, mob/user)
return
/obj/item/holosign_creator/attack_self(mob/user)
if(signs.len)
- var/list/L = signs.Copy()
- for(var/sign in L)
- qdel(sign)
- signs -= sign
+ for(var/H in signs)
+ qdel(H)
to_chat(user, "You clear all active holograms.")
-/obj/effect/overlay/holograph
- name = "wet floor sign"
- desc = "The words flicker as if they mean nothing."
- icon = 'icons/obj/janitor.dmi'
- icon_state = "holosign"
- anchored = 1
- armor = list(melee = 0, bullet = 50, laser = 50, energy = 50, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/holosign_creator/security
+ name = "security holobarrier projector"
+ desc = "A holographic projector that creates holographic security barriers."
+ icon_state = "signmaker_sec"
+ holosign_type = /obj/structure/holosign/barrier
+ creation_time = 30
+ max_signs = 6
+
+/obj/item/holosign_creator/engineering
+ name = "engineering holobarrier projector"
+ desc = "A holographic projector that creates holographic engineering barriers."
+ icon_state = "signmaker_engi"
+ holosign_type = /obj/structure/holosign/barrier/engineering
+ creation_time = 30
+ max_signs = 6
+
+/obj/item/holosign_creator/atmos
+ name = "ATMOS holofan projector"
+ desc = "A holographic projector that creates holographic barriers that prevent changes in atmosphere conditions."
+ icon_state = "signmaker_engi"
+ holosign_type = /obj/structure/holosign/barrier/atmos
+ creation_time = 0
+ max_signs = 3
+
+/obj/item/holosign_creator/cyborg
+ name = "Energy Barrier Projector"
+ desc = "A holographic projector that creates fragile energy fields."
+ creation_time = 15
+ max_signs = 9
+ holosign_type = /obj/structure/holosign/barrier/cyborg
+ var/shock = 0
+
+/obj/item/holosign_creator/cyborg/attack_self(mob/user)
+ if(isrobot(user))
+ var/mob/living/silicon/robot/R = user
+
+ if(shock)
+ to_chat(user, "You clear all active holograms, and reset your projector to normal.")
+ holosign_type = /obj/structure/holosign/barrier/cyborg
+ creation_time = 5
+ if(signs.len)
+ for(var/H in signs)
+ qdel(H)
+ shock = 0
+ return
+ else if(R.emagged && !shock)
+ to_chat(user, "You clear all active holograms, and overload your energy projector!")
+ holosign_type = /obj/structure/holosign/barrier/cyborg/hacked
+ creation_time = 30
+ if(signs.len)
+ for(var/H in signs)
+ qdel(H)
+ shock = 1
+ return
+ else
+ if(signs.len)
+ for(var/H in signs)
+ qdel(H)
+ to_chat(user, "You clear all active holograms.")
+ if(signs.len)
+ for(var/H in signs)
+ qdel(H)
+ to_chat(user, "You clear all active holograms.")
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index 2d0865faa36..ea799bbcd76 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -13,7 +13,7 @@
var/list/fluff_transformations = list() //does it have any special transformations only accessible to it? Should only be subtypes of /obj/item/nullrod
/obj/item/nullrod/suicide_act(mob/user)
- user.visible_message("[user] is killing \himself with \the [src.name]! It looks like \he's trying to get closer to god!")
+ user.visible_message("[user] is killing [user.p_them()]self with \the [src.name]! It looks like [user.p_theyre()] trying to get closer to god!")
return (BRUTELOSS|FIRELOSS)
/obj/item/nullrod/attack(mob/M, mob/living/carbon/user)
@@ -575,7 +575,7 @@
if(missionary in viewers(target)) //missionary must maintain line of sight to target, but the target doesn't necessary need to be able to see the missionary
do_convert(target, missionary)
else
- to_chat(missionary, "You lost sight of the target before they could be converted!")
+ to_chat(missionary, "You lost sight of the target before [target.p_they()] could be converted!")
faith -= 25 //they escaped, so you only lost a little faith (to prevent spamming)
else //the do_after failed, probably because you moved or dropped the staff
to_chat(missionary, "Your concentration was broken!")
@@ -585,12 +585,12 @@
if(!target || !ishuman(target) || !missionary || !ishuman(missionary))
return
if(ismindslave(target) || target.mind.zealot_master) //mindslaves and zealots override the staff because the staff is just a temporary mindslave
- to_chat(missionary, "Your faith is strong, but their mind is already slaved to someone else's ideals. Perhaps an inquisition would reveal more...")
+ to_chat(missionary, "Your faith is strong, but [target.p_their()] mind is already slaved to someone else's ideals. Perhaps an inquisition would reveal more...")
faith -= 25 //same faith cost as losing sight of them mid-conversion, but did you just find someone who can lead you to a fellow traitor?
return
if(ismindshielded(target))
faith -= 75
- to_chat(missionary, "Your faith is strong, but their mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.")
+ to_chat(missionary, "Your faith is strong, but [target.p_their()] mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.")
return
else if(target.mind.assigned_role == "Psychiatrist" || target.mind.assigned_role == "Librarian") //fancy book lernin helps counter religion (day 0 job love, what madness!)
if(prob(35)) //35% chance to fail
@@ -602,7 +602,7 @@
faith -= 100
else if(target.mind.assigned_role == "Civilian")
if(prob(55)) //55% chance to take LESS faith than normal, because civies are stupid and easily manipulated
- to_chat(missionary, "Your message seems to resound well with [target]; converting them was much easier than expected.")
+ to_chat(missionary, "Your message seems to resound well with [target]; converting [target.p_them()] was much easier than expected.")
faith -= 50
else //45% chance to take the normal 100 faith cost
to_chat(missionary, "You successfully convert [target] to your cause. The following grows because of your faith!")
diff --git a/code/game/objects/items/weapons/implants/implant_misc.dm b/code/game/objects/items/weapons/implants/implant_misc.dm
index a657d08847b..9c4049e8904 100644
--- a/code/game/objects/items/weapons/implants/implant_misc.dm
+++ b/code/game/objects/items/weapons/implants/implant_misc.dm
@@ -58,7 +58,7 @@
/obj/item/implant/emp/activate()
uses--
- empulse(imp_in, 3, 5)
+ empulse(imp_in, 3, 5, 1)
if(!uses)
qdel(src)
diff --git a/code/game/objects/items/weapons/implants/implant_traitor.dm b/code/game/objects/items/weapons/implants/implant_traitor.dm
index 68ef65664c7..58f78a7be4e 100644
--- a/code/game/objects/items/weapons/implants/implant_traitor.dm
+++ b/code/game/objects/items/weapons/implants/implant_traitor.dm
@@ -55,11 +55,11 @@
ticker.mode.implanter[ref] = implanters
ticker.mode.traitors += H.mind
H.mind.special_role = SPECIAL_ROLE_TRAITOR
- to_chat(H, "You're now completely loyal to [user.name]! You now must lay down your life to protect them and assist in their goals at any cost.")
+ to_chat(H, "You're now completely loyal to [user.name]! You now must lay down your life to protect [user.p_them()] and assist in [user.p_their()] goals at any cost.")
var/datum/objective/protect/mindslave/MS = new
MS.owner = H.mind
MS.target = user.mind
- MS.explanation_text = "Obey every order from and protect [user.real_name], the [user.mind.assigned_role=="MODE" ? (user.mind.special_role) : (user.mind.assigned_role)]."
+ MS.explanation_text = "Obey every order from and protect [user.real_name], the [user.mind.assigned_role == user.mind.special_role ? (user.mind.special_role) : (user.mind.assigned_role)]."
H.mind.objectives += MS
for(var/datum/objective/objective in H.mind.objectives)
to_chat(H, "Objective #1: [objective.explanation_text]")
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index da6e3b95968..314077db68e 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -79,7 +79,7 @@
return
var/mob/M = G.affecting
if(M.buckled_mob)
- to_chat(usr, "[M] will not fit into [src] because they have a slime latched onto their head.")
+ to_chat(usr, "[M] will not fit into [src] because [M.p_they()] [M.p_have()] a slime latched onto [M.p_their()] head.")
return
if(put_mob(M))
qdel(G)
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 93103568f58..668cc74ac73 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -113,9 +113,9 @@
sharp = 1
/obj/item/kitchen/knife/suicide_act(mob/user)
- user.visible_message(pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \
- "[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \
- "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku."))
+ user.visible_message(pick("[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \
+ "[user] is slitting [user.p_their()] throat with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \
+ "[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku."))
return (BRUTELOSS)
/obj/item/kitchen/knife/plastic
diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm
index e6ba57ff8da..047a75bd634 100644
--- a/code/game/objects/items/weapons/legcuffs.dm
+++ b/code/game/objects/items/weapons/legcuffs.dm
@@ -33,7 +33,7 @@
return ..()
/obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user)
- user.visible_message("[user] is sticking \his head in the [src.name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is sticking [user.p_their()] head in the [name]! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return (BRUTELOSS)
diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index a620f3fdb5c..94e97ea7c20 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -57,7 +57,7 @@
if(affecting.receive_damage( 0, 5 )) //INFERNO
H.UpdateDamageIcon()
H.updatehealth()
- user.visible_message("After a few attempts, [user] manages to light the [src], they however burn their finger in the process.")
+ user.visible_message("After a few attempts, [user] manages to light the [src], [user.p_they()] however burn[user.p_s()] [user.p_their()] finger in the process.")
set_light(2)
processing_objects.Add(src)
@@ -70,7 +70,7 @@
force = 0
attack_verb = null //human_defense.dm takes care of it
if(istype(src, /obj/item/lighter/zippo) )
- user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing. Wow.")
+ user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.")
playsound(src.loc, 'sound/items/ZippoClose.ogg', 25, 1)
else
user.visible_message("[user] quietly shuts off the [src].")
@@ -95,7 +95,7 @@
cig.attackby(src, user)
else
if(istype(src, /obj/item/lighter/zippo))
- cig.light("[user] whips the [name] out and holds it for [M]. Their arm is as steady as the unflickering flame they light \the [cig] with.")
+ cig.light("[user] whips the [name] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with.")
else
cig.light("[user] holds the [name] out for [M], and lights the [cig.name].")
M.update_inv_wear_mask()
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 6702f893d50..2dcbef5b1a5 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -14,8 +14,8 @@
var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE)
/obj/item/melee/energy/suicide_act(mob/user)
- user.visible_message(pick("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \
- "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide."))
+ user.visible_message(pick("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku.", \
+ "[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide."))
return (BRUTELOSS|FIRELOSS)
/obj/item/melee/energy/attack_self(mob/living/carbon/user)
@@ -80,7 +80,7 @@
light_color = LIGHT_COLOR_WHITE
/obj/item/melee/energy/axe/suicide_act(mob/user)
- user.visible_message("[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] swings the [name] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide.")
return (BRUTELOSS|FIRELOSS)
/obj/item/melee/energy/sword
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index 267c2deda5e..a19df11e790 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -17,7 +17,7 @@
/obj/item/melee/chainofcommand/suicide_act(mob/user)
- to_chat(viewers(user), "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.")
+ to_chat(viewers(user), "[user] is strangling [user.p_them()]self with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")
return (OXYLOSS)
/obj/item/melee/rapier
diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm
index 84b8d55a915..64f554682fc 100644
--- a/code/game/objects/items/weapons/pneumaticCannon.dm
+++ b/code/game/objects/items/weapons/pneumaticCannon.dm
@@ -103,7 +103,7 @@
to_chat(user, "\The [src] lets out a weak hiss and doesn't react!")
return
if(user && (CLUMSY in user.mutations) && prob(75))
- user.visible_message("[user] loses their grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!")
+ user.visible_message("[user] loses [user.p_their()] grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!")
user.drop_item()
if(prob(10))
target = get_turf(user)
diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm
deleted file mode 100644
index 5b2d05491bf..00000000000
--- a/code/game/objects/items/weapons/power_cells.dm
+++ /dev/null
@@ -1,211 +0,0 @@
-/obj/item/stock_parts/cell
- name = "power cell"
- desc = "A rechargable electrochemical power cell."
- icon = 'icons/obj/power.dmi'
- icon_state = "cell"
- item_state = "cell"
- origin_tech = "powerstorage=1"
- force = 5
- throwforce = 5
- throw_speed = 2
- throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
- var/charge = 0 // note %age conveted to actual charge in New
- var/maxcharge = 1000
- materials = list(MAT_METAL=700, MAT_GLASS=50)
- var/rigged = 0 // true if rigged to explode
- var/chargerate = 100 //how much power is given every tick in a recharger
- var/self_recharge = 0 //does it self recharge, over time, or not?
- var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it.
-
-/obj/item/stock_parts/cell/New()
- ..()
- processing_objects.Add(src)
- charge = maxcharge
- updateicon()
-
-/obj/item/stock_parts/cell/Destroy()
- processing_objects.Remove(src)
- return ..()
-
-/obj/item/stock_parts/cell/vv_edit_var(var_name, var_value)
- switch(var_name)
- if("self_recharge")
- if(var_value)
- processing_objects.Add(src)
- else
- processing_objects.Remove(src)
- . = ..()
-
-/obj/item/stock_parts/cell/suicide_act(mob/user)
- to_chat(viewers(user), "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.")
- return (FIRELOSS)
-
-/obj/item/stock_parts/cell/process()
- if(self_recharge)
- give(chargerate * 0.25)
- else
- return PROCESS_KILL
-
-/obj/item/stock_parts/cell/proc/updateicon()
- overlays.Cut()
- if(grown_battery)
- overlays += image('icons/obj/power.dmi', "grown_wires")
- if(charge < 0.01)
- return
- else if(charge/maxcharge >=0.995)
- overlays += image('icons/obj/power.dmi', "cell-o2")
- else
- overlays += image('icons/obj/power.dmi', "cell-o1")
-
-/obj/item/stock_parts/cell/crap
- name = "\improper Nanotrasen brand rechargable AA battery"
- desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
- maxcharge = 500
- materials = list(MAT_GLASS=40)
- rating = 2
-
-/obj/item/stock_parts/cell/crap/empty/New()
- ..()
- charge = 0
-
-/obj/item/stock_parts/cell/secborg
- name = "\improper Security borg rechargable D battery"
- origin_tech = null
- maxcharge = 600 //600 max charge / 100 charge per shot = six shots
- materials = list(MAT_GLASS=40)
- rating = 2.5
-
-/obj/item/stock_parts/cell/secborg/empty/New()
- ..()
- charge = 0
-
-/obj/item/stock_parts/cell/high
- name = "high-capacity power cell"
- origin_tech = "powerstorage=2"
- icon_state = "hcell"
- maxcharge = 10000
- materials = list(MAT_GLASS=60)
- rating = 3
- chargerate = 1500
-
-/obj/item/stock_parts/cell/high/plus
- name = "high-capacity power cell+"
- desc = "Where did these come from?"
- icon_state = "h+cell"
- maxcharge = 15000
- chargerate = 2250
-
-/obj/item/stock_parts/cell/high/empty/New()
- ..()
- charge = 0
-
-/obj/item/stock_parts/cell/super
- name = "super-capacity power cell"
- origin_tech = "powerstorage=3;materials=3"
- icon_state = "scell"
- maxcharge = 20000
- materials = list(MAT_GLASS=300)
- rating = 4
- chargerate = 2000
-
-/obj/item/stock_parts/cell/super/empty/New()
- ..()
- charge = 0
-
-/obj/item/stock_parts/cell/hyper
- name = "hyper-capacity power cell"
- origin_tech = "powerstorage=4;engineering=4;materials=4"
- icon_state = "hpcell"
- maxcharge = 30000
- materials = list(MAT_GLASS=400)
- rating = 5
- chargerate = 3000
-
-/obj/item/stock_parts/cell/hyper/empty/New()
- ..()
- charge = 0
-
-/obj/item/stock_parts/cell/bluespace
- name = "bluespace power cell"
- origin_tech = "powerstorage=5;bluespace=4;materials=4;engineering=4"
- icon_state = "bscell"
- maxcharge = 40000
- materials = list(MAT_GLASS=600)
- rating = 6
- chargerate = 4000
-
-/obj/item/stock_parts/cell/bluespace/empty/New()
- ..()
- charge = 0
-
-/obj/item/stock_parts/cell/infinite
- name = "infinite-capacity power cell!"
- icon_state = "icell"
- origin_tech = "powerstorage=7"
- maxcharge = 30000
- materials = list(MAT_GLASS=1000)
- rating = 6
- chargerate = 30000
-
-/obj/item/stock_parts/cell/infinite/use()
- return 1
-
-/obj/item/stock_parts/cell/potato
- name = "potato battery"
- desc = "A rechargable starch based power cell."
- icon = 'icons/obj/hydroponics/harvest.dmi'
- icon_state = "potato"
- origin_tech = "powerstorage=1;biotech=1"
- charge = 100
- maxcharge = 300
- materials = list()
- rating = 1
- grown_battery = TRUE //it has the overlays for wires
-
-/obj/item/stock_parts/cell/high/slime
- name = "charged slime core"
- desc = "A yellow slime core infused with plasma, it crackles with power."
- origin_tech = "powerstorage=5;biotech=4"
- icon = 'icons/mob/slimes.dmi'
- icon_state = "yellow slime extract"
- materials = list()
- self_recharge = 1 // Infused slime cores self-recharge, over time
- chargerate = 500
-
-/obj/item/stock_parts/cell/pulse //200 pulse shots
- name = "pulse rifle power cell"
- maxcharge = 40000
- rating = 3
- chargerate = 1500
-
-/obj/item/stock_parts/cell/pulse/carbine //25 pulse shots
- name = "pulse carbine power cell"
- maxcharge = 5000
-
-/obj/item/stock_parts/cell/pulse/pistol //10 pulse shots
- name = "pulse pistol power cell"
- maxcharge = 2000
-
-/obj/item/stock_parts/cell/ninja
- name = "spider-clan power cell"
- desc = "A standard ninja-suit power cell."
- maxcharge = 10000
- rating = 3
- materials = list(MAT_GLASS=60)
-
-/obj/item/stock_parts/cell/emproof
- name = "\improper EMP-proof cell"
- desc = "An EMP-proof cell."
- maxcharge = 500
- rating = 2
-
-/obj/item/stock_parts/cell/emproof/empty/New()
- ..()
- charge = 0
-
-/obj/item/stock_parts/cell/emproof/emp_act(severity)
- return
-
-/obj/item/stock_parts/cell/emproof/corrupt()
- return
diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
index 7b6dfeb3a75..a2315544d35 100644
--- a/code/game/objects/items/weapons/powerfist.dm
+++ b/code/game/objects/items/weapons/powerfist.dm
@@ -83,7 +83,7 @@
user.do_attack_animation(target)
target.apply_damage(force * fisto_setting, BRUTE)
- target.visible_message("[user]'s powerfist lets out a loud hiss as they punch [target.name]!", \
+ target.visible_message("[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \
"You cry out in pain as [user]'s punch flings you backwards!")
new /obj/effect/temp_visual/kinetic_blast(target.loc)
playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
diff --git a/code/game/objects/items/weapons/scissors.dm b/code/game/objects/items/weapons/scissors.dm
index 677b2d99168..6ff1fbe95b0 100644
--- a/code/game/objects/items/weapons/scissors.dm
+++ b/code/game/objects/items/weapons/scissors.dm
@@ -114,7 +114,7 @@
playsound(loc, 'sound/goonstation/misc/Scissor.ogg', 100, 1)
if(do_after(user, 50 * toolspeed, target = H))
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
- user.visible_message("[user] abruptly stops cutting [M]'s hair and slices their throat!", "You stop cutting [M]'s hair and slice their throat!") //Just a little off the top.
+ user.visible_message("[user] abruptly stops cutting [M]'s hair and slices [M.p_their()] throat!", "You stop cutting [M]'s hair and slice [M.p_their()] throat!") //Just a little off the top.
H.AdjustLoseBreath(10) //30 Oxy damage over time
H.apply_damage(18, BRUTE, "head", sharp =1, used_weapon = "scissors")
var/turf/location = get_turf(src)
diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm
index 6170eae96a7..b0d7477bbbb 100644
--- a/code/game/objects/items/weapons/shards.dm
+++ b/code/game/objects/items/weapons/shards.dm
@@ -16,8 +16,8 @@
armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0)
/obj/item/shard/suicide_act(mob/user)
- to_chat(viewers(user), pick("[user] is slitting \his wrists with \the [src]! It looks like \he's trying to commit suicide.",
- "[user] is slitting \his throat with \the [src]! It looks like \he's trying to commit suicide."))
+ to_chat(viewers(user), pick("[user] is slitting [user.p_their()] wrists with [src]! It looks like [user.p_theyre()] trying to commit suicide.",
+ "[user] is slitting [user.p_their()] throat with [src]! It looks like [user.p_theyre()] trying to commit suicide."))
return (BRUTELOSS)
/obj/item/shard/New()
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 9ef11ec3b2d..85a0e679bb6 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -49,10 +49,10 @@
if(istype(W, /obj/item/storage/backpack/holding))
var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No")
if(response == "Yes")
- user.visible_message("[user] grins as \he begins to put a Bag of Holding into a Bag of Holding!", "You begin to put the Bag of Holding into the Bag of Holding!")
+ user.visible_message("[user] grins as [user.p_they()] begin[user.p_s()] to put a Bag of Holding into a Bag of Holding!", "You begin to put the Bag of Holding into the Bag of Holding!")
if(do_after(user, 30, target=src))
investigate_log("has become a singularity. Caused by [user.key]","singulo")
- user.visible_message("[user] erupts in evil laughter as \he puts the Bag of Holding into another Bag of Holding!", "You can't help but laugh wildly as you put the Bag of Holding into another Bag of Holding, complete darkness surrounding you."," You hear the sound of scientific evil brewing! ")
+ user.visible_message("[user] erupts in evil laughter as [user.p_they()] put[user.p_s()] the Bag of Holding into another Bag of Holding!", "You can't help but laugh wildly as you put the Bag of Holding into another Bag of Holding, complete darkness surrounding you."," You hear the sound of scientific evil brewing! ")
qdel(W)
var/obj/singularity/singulo = new /obj/singularity(get_turf(user))
singulo.energy = 300 //To give it a small boost
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 2b67373d9c4..26793a8165b 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -40,7 +40,7 @@
cant_hold = list(/obj/item/disk/nuclear)
/obj/item/storage/bag/trash/suicide_act(mob/user)
- user.visible_message("[user] puts the [src.name] over their head and starts chomping at the insides! Disgusting!")
+ user.visible_message("[user] puts the [name] over [user.p_their()] head and starts chomping at the insides! Disgusting!")
playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1)
return (TOXLOSS)
@@ -453,9 +453,9 @@
sleep(rand(2,4))
if( droppedSomething )
if( foundtable )
- user.visible_message("[user] unloads their service tray.")
+ user.visible_message("[user] unloads [user.p_their()] service tray.")
else
- user.visible_message("[user] drops all the items on their tray.")
+ user.visible_message("[user] drops all the items on [user.p_their()] tray.")
return ..()
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index aa723cba8c0..9d4481952f5 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -58,8 +58,8 @@
/obj/item/stack/cable_coil,
/obj/item/t_scanner,
/obj/item/analyzer,
- /obj/item/taperoll/engineering,
- /obj/item/extinguisher/mini)
+ /obj/item/extinguisher/mini,
+ /obj/item/holosign_creator)
/obj/item/storage/belt/utility/full/New()
..()
@@ -192,7 +192,7 @@
/obj/item/melee/baton,
/obj/item/melee/classic_baton,
/obj/item/flashlight/seclite,
- /obj/item/taperoll/police,
+ /obj/item/holosign_creator/security,
/obj/item/melee/classic_baton/telescopic,
/obj/item/restraints/legcuffs/bola)
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 4d56e2a22ad..03787385e1c 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -68,7 +68,7 @@
if(M.stat !=2)
/*if((M.mind in ticker.mode.cult) && (prob(20)))
to_chat(M, "The power of [src.deity_name] clears your mind of heresy!")
- to_chat(user, "You see how [M]'s eyes become clear, the cult no longer holds control over him!")
+ to_chat(user, "You see how [M]'s eyes become clear, the cult no longer holds control over [M.p_them()]!")
ticker.mode.remove_cultist(M.mind)*/
if((istype(M, /mob/living/carbon/human) && prob(60)))
bless(M)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index e0e43bfbda6..a78bc40dd3a 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -26,6 +26,7 @@
item_state = "syringe_kit"
burn_state = FLAMMABLE
var/foldable = /obj/item/stack/sheet/cardboard
+ var/amt = 1
/obj/item/storage/box/attack_self(mob/user)
..()
@@ -49,7 +50,7 @@
return
to_chat(user, "You fold [src] flat.")
- var/obj/item/I = new foldable(get_turf(src))
+ var/obj/item/stack/I = new foldable(get_turf(src), amt)
user.put_in_hands(I)
qdel(src)
@@ -59,6 +60,7 @@
icon_state = "largebox"
w_class = 42 // Big, bulky.
foldable = /obj/item/stack/sheet/cardboard
+ amt = 4
storage_slots = 21
max_combined_w_class = 42 // 21*2
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 9bf760aee29..4896f2cfb60 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -403,6 +403,7 @@
icon_state = "AquaticKit"
throw_speed = 2
throw_range = 8
+ med_bot_skin = "fish"
/obj/item/storage/firstaid/aquatic_kit/full
desc = "It's a starter kit for an acquarium; includes 1 tank brush, 1 egg scoop, 1 fish net, and 1 container of fish food."
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 34e350e3d50..ddc8b79012f 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -21,6 +21,8 @@
var/treatment_fire = "salglu_solution"
var/treatment_tox = "charcoal"
var/treatment_virus = "spaceacillin"
+ var/med_bot_skin = null
+ var/syndicate_aligned = FALSE
/obj/item/storage/firstaid/fire
@@ -28,6 +30,7 @@
desc = "A medical kit that contains several medical patches and pills for treating burns. Contains one epinephrine syringe for emergency use and a health analyzer."
icon_state = "ointment"
item_state = "firstaid-ointment"
+ med_bot_skin = "ointment"
New()
..()
@@ -68,6 +71,7 @@
desc = "A medical kit designed to counter poisoning by common toxins. Contains three pills and syringes, and a health analyzer to determine the health of the patient."
icon_state = "antitoxin"
item_state = "firstaid-toxin"
+ med_bot_skin = "tox"
New()
..()
@@ -92,6 +96,7 @@
desc = "A first aid kit that contains four pills of salbutamol, which is able to counter injuries caused by suffocation. Also contains a health analyzer to determine the health of the patient."
icon_state = "o2"
item_state = "firstaid-o2"
+ med_bot_skin = "o2"
New()
..()
@@ -111,6 +116,7 @@
desc = "A medical kit that contains several medical patches and pills for treating brute injuries. Contains one epinephrine syringe for emergency use and a health analyzer."
icon_state = "brute"
item_state = "firstaid-brute"
+ med_bot_skin = "brute"
New()
..()
@@ -135,6 +141,7 @@
desc = "Contains advanced medical treatments."
icon_state = "advfirstaid"
item_state = "firstaid-advanced"
+ med_bot_skin = "adv"
/obj/item/storage/firstaid/adv/New()
..()
@@ -157,10 +164,12 @@
desc = "I hope you've got insurance."
max_w_class = WEIGHT_CLASS_NORMAL
treatment_oxy = "perfluorodecalin"
- treatment_brute = "styptic_powder"
- treatment_fire = "silver_sulfadiazine"
+ treatment_brute = "bicaridine"
+ treatment_fire = "kelotane"
treatment_tox = "charcoal"
req_one_access =list(access_syndicate)
+ med_bot_skin = "bezerk"
+ syndicate_aligned = TRUE
/obj/item/storage/firstaid/tactical/New()
..()
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index da9edab2833..31cc7a1faf2 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -16,7 +16,7 @@
var/hitcost = 1000
/obj/item/melee/baton/suicide_act(mob/user)
- user.visible_message("[user] is putting the live [name] in \his mouth! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide.")
return (FIRELOSS)
/obj/item/melee/baton/New()
@@ -78,7 +78,7 @@
else if(istype(W, /obj/item/screwdriver))
if(bcell)
- bcell.updateicon()
+ bcell.update_icon()
bcell.loc = get_turf(src.loc)
bcell = null
to_chat(user, "You remove the cell from the [src].")
@@ -104,7 +104,7 @@
/obj/item/melee/baton/attack(mob/M, mob/living/user)
if(status && (CLUMSY in user.mutations) && prob(50))
- user.visible_message("[user] accidentally hits themself with [src]!", \
+ user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \
"You accidentally hit yourself with [src]!")
user.Weaken(stunforce*3)
deductcharge(hitcost)
@@ -175,7 +175,7 @@
user.Weaken(stunforce)
user.stuttering = stunforce
deductcharge(hitcost)
- user.visible_message("[user] shocks themself while attempting to wash the active [src]!", \
+ user.visible_message("[user] shocks [user.p_them()]self while attempting to wash the active [src]!", \
"You unwisely attempt to wash [src] while it's still on.")
playsound(src, "sparks", 50, 1)
return 1
diff --git a/code/game/objects/items/weapons/syndie_uplink.dm b/code/game/objects/items/weapons/syndie_uplink.dm
deleted file mode 100644
index a09ab0b69a2..00000000000
--- a/code/game/objects/items/weapons/syndie_uplink.dm
+++ /dev/null
@@ -1,38 +0,0 @@
-/*/obj/item/syndicate_uplink
- name = "station bounced radio"
- desc = "Remain silent about this..."
- icon = 'icons/obj/radio.dmi'
- icon_state = "radio"
- var/temp = null
- var/uses = 10.0
- var/selfdestruct = 0.0
- var/traitor_frequency = 0.0
- var/mob/currentUser = null
- var/obj/item/radio/origradio = null
- flags = CONDUCT | ONBELT
- w_class = WEIGHT_CLASS_SMALL
- item_state = "radio"
- throw_speed = 4
- throw_range = 20
- materials = list(MAT_METAL=100)
- origin_tech = "magnets=2;syndicate=3"*/
-
-/obj/item/SWF_uplink
- name = "station-bounced radio"
- desc = "used to comunicate it appears."
- icon = 'icons/obj/radio.dmi'
- icon_state = "radio"
- var/temp = null
- var/uses = 4.0
- var/selfdestruct = 0.0
- var/traitor_frequency = 0.0
- var/obj/item/radio/origradio = null
- flags = CONDUCT
- slot_flags = SLOT_BELT
- item_state = "radio"
- throwforce = 5
- w_class = WEIGHT_CLASS_SMALL
- throw_speed = 4
- throw_range = 20
- materials = list(MAT_METAL=100)
- origin_tech = "magnets=1"
diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm
index 38a16be40ce..57e0290346e 100644
--- a/code/game/objects/items/weapons/tape.dm
+++ b/code/game/objects/items/weapons/tape.dm
@@ -14,11 +14,11 @@
/obj/item/stack/tape_roll/attack(mob/living/carbon/human/M as mob, mob/living/user as mob)
if(M.wear_mask)
- to_chat(user, "Remove their mask first!")
+ to_chat(user, "Remove [M.p_their()] mask first!")
else if(amount < 2)
to_chat(user, "You'll need more tape for this!")
else if(!M.check_has_mouth())
- to_chat(user, "They have no mouth to tape over!")
+ to_chat(user, "[M.p_they(TRUE)] [M.p_have()] no mouth to tape over!")
else
if(M == user)
to_chat(user, "You try to tape your own mouth shut.")
@@ -29,7 +29,7 @@
if(M == user)
to_chat(user, "You cover your own mouth with a piece of duct tape.")
else
- to_chat(user, "You cover [M]'s mouth with a piece of duct tape. That will shut them up!")
+ to_chat(user, "You cover [M]'s mouth with a piece of duct tape. That will shut [M.p_them()] up!")
M.visible_message("[user] tapes [M]'s mouth shut!")
var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag
M.equip_to_slot(G, slot_wear_mask)
diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm
index 8c942b5e0c5..1fe31f8a4f7 100644
--- a/code/game/objects/items/weapons/teleprod.dm
+++ b/code/game/objects/items/weapons/teleprod.dm
@@ -10,7 +10,7 @@
..()
if(status)
if((CLUMSY in user.mutations) && prob(50))
- user.visible_message("[user] accidentally hits themself with [src]!", \
+ user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \
"You accidentally hit yourself with [src]!")
user.Weaken(stunforce*3)
deductcharge(hitcost)
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 44cfc648757..867cc473932 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -28,7 +28,7 @@
toolspeed = 1
/obj/item/wrench/suicide_act(mob/user)
- user.visible_message("[user] is beating themselves to death with [src]! It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)
return (BRUTELOSS)
@@ -73,7 +73,7 @@
user.put_in_active_hand(s_drill)
/obj/item/wrench/power/suicide_act(mob/user)
- user.visible_message("[user] is pressing [src] against their head! It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")
return (BRUTELOSS)
/obj/item/wrench/medical
@@ -86,7 +86,7 @@
attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked")
/obj/item/wrench/medical/suicide_act(mob/user)
- user.visible_message("[user] is praying to the medical wrench to take their soul. It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!")
// TODO Make them glow with the power of the M E D I C A L W R E N C H
// during their ascension
@@ -139,7 +139,7 @@
toolspeed = 0.5
/obj/item/screwdriver/suicide_act(mob/user)
- user.visible_message("[user] is stabbing [src] into their [pick("temple", "heart")]! It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!")
return(BRUTELOSS)
/obj/item/screwdriver/New(loc, var/param_color = null)
@@ -192,7 +192,7 @@
toolspeed = 0.25
/obj/item/screwdriver/power/suicide_act(mob/user)
- user.visible_message("[user] is putting [src] to their temple. It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!")
return(BRUTELOSS)
/obj/item/screwdriver/power/attack_self(mob/user)
@@ -247,7 +247,7 @@
..()
/obj/item/wirecutters/suicide_act(mob/user)
- user.visible_message("[user] is cutting at their arteries with [src]! It looks like they're trying to commit suicide!")
+ user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
playsound(loc, usesound, 50, 1, -1)
return (BRUTELOSS)
@@ -281,7 +281,7 @@
toolspeed = 0.25
/obj/item/wirecutters/power/suicide_act(mob/user)
- user.visible_message("[user] is wrapping \the [src] around their neck. It looks like they're trying to rip their head off!")
+ user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!")
playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1)
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -338,7 +338,7 @@
to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].")
/obj/item/weldingtool/suicide_act(mob/user)
- user.visible_message("[user] welds their every orifice closed! It looks like they're trying to commit suicide!")
+ user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!")
return (FIRELOSS)
/obj/item/weldingtool/proc/update_torch()
@@ -699,7 +699,7 @@ obj/item/weldingtool/experimental/process()
var/airlock_open_time = 100 // Time required to open powered airlocks
/obj/item/crowbar/power/suicide_act(mob/user)
- user.visible_message("[user] is putting their head in [src], it looks like they're trying to commit suicide!")
+ user.visible_message("[user] is putting [user.p_their()] head in [src]. It looks like [user.p_theyre()] trying to commit suicide!")
playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1)
return (BRUTELOSS)
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 7bae5139b27..8de83f6344a 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -23,19 +23,20 @@
* Twohanded
*/
/obj/item/twohanded
- var/wielded = 0
+ var/wielded = FALSE
var/force_unwielded = 0
var/force_wielded = 0
var/wieldsound = null
var/unwieldsound = null
/obj/item/twohanded/proc/unwield(mob/living/carbon/user)
- if(!wielded || !user) return
- wielded = 0
+ if(!wielded || !user)
+ return
+ wielded = FALSE
force = force_unwielded
var/sf = findtext(name," (Wielded)")
if(sf)
- name = copytext(name,1,sf)
+ name = copytext(name, 1, sf)
else //something wrong
name = "[initial(name)]"
update_icon()
@@ -45,16 +46,16 @@
if(isrobot(user))
to_chat(user, "You free up your module.")
else
- to_chat(user, "You are now carrying the [name] with one hand.")
+ to_chat(user, "You are now carrying [name] with one hand.")
if(unwieldsound)
playsound(loc, unwieldsound, 50, 1)
var/obj/item/twohanded/offhand/O = user.get_inactive_hand()
if(O && istype(O))
O.unwield()
- return
/obj/item/twohanded/proc/wield(mob/living/carbon/user)
- if(wielded) return
+ if(wielded)
+ return
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.species.is_small)
@@ -63,7 +64,7 @@
if(user.get_inactive_hand())
to_chat(user, "You need your other hand to be empty!")
return
- wielded = 1
+ wielded = TRUE
force = force_wielded
name = "[name] (Wielded)"
update_icon()
@@ -80,7 +81,6 @@
O.name = "[name] - offhand"
O.desc = "Your second grip on the [name]"
user.put_in_inactive_hand(O)
- return
/obj/item/twohanded/dropped(mob/user)
..()
@@ -124,22 +124,22 @@
///////////Two hand required objects///////////////
//This is for objects that require two hands to even pick up
-/obj/item/twohanded/required/
+/obj/item/twohanded/required
w_class = WEIGHT_CLASS_HUGE
/obj/item/twohanded/required/attack_self()
return
-/obj/item/twohanded/required/mob_can_equip(M as mob, slot)
+/obj/item/twohanded/required/mob_can_equip(mob/M, slot)
if(wielded && !slot_flags)
to_chat(M, "[src] is too cumbersome to carry with anything but your hands!")
- return 0
+ return FALSE
return ..()
/obj/item/twohanded/required/attack_hand(mob/user)//Can't even pick it up without both hands empty
var/obj/item/twohanded/required/H = user.get_inactive_hand()
- if(get_dist(src,user) > 1)
- return 0
+ if(get_dist(src, user) > 1)
+ return FALSE
if(H != null)
to_chat(user, "[src] is too cumbersome to carry in one hand!")
return
@@ -163,7 +163,7 @@
desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
force = 5
throwforce = 15
- sharp = 1
+ sharp = TRUE
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
force_unwielded = 5
@@ -174,30 +174,29 @@
/obj/item/twohanded/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "fireaxe[wielded]"
- return
-/obj/item/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
- if(!proximity) return
- ..()
- if(A && wielded && (istype(A,/obj/structure/window) || istype(A,/obj/structure/grille))) //destroys windows and grilles in one hit
-
- if(istype(A,/obj/structure/window))
+/obj/item/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity)
+ if(!proximity)
+ return
+ if(wielded) //destroys windows and grilles in one hit
+ if(istype(A, /obj/structure/window))
var/obj/structure/window/W = A
- W.destroy()
- else
- qdel(A)
+ W.take_damage(200, BRUTE, "melee", 0)
+ else if(istype(A, /obj/structure/grille))
+ var/obj/structure/grille/G = A
+ G.take_damage(40, BRUTE, "melee", 0)
/*
* Double-Bladed Energy Swords - Cheridan
*/
/obj/item/twohanded/dualsaber
- var/hacked = 0
+ var/hacked = FALSE
var/blade_color
icon_state = "dualsaber0"
name = "double-bladed energy sword"
desc = "Handle with care."
force = 3
- throwforce = 5.0
+ throwforce = 5
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
@@ -209,7 +208,7 @@
origin_tech = "magnets=4;syndicate=5"
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 75
- sharp = 1
+ sharp = TRUE
light_power = 2
var/brightness_on = 2
var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE)
@@ -226,26 +225,35 @@
icon_state = "dualsaber0"
set_light(0)
-/obj/item/twohanded/dualsaber/attack(target as mob, mob/living/user as mob)
+/obj/item/twohanded/dualsaber/attack(mob/target, mob/living/user)
if(HULK in user.mutations)
to_chat(user, "You grip the blade too hard and accidentally close it!")
unwield()
return
..()
- if((CLUMSY in user.mutations) && (wielded) &&prob(40))
+ if((CLUMSY in user.mutations) && (wielded) && prob(40))
to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on the [src].")
- user.take_organ_damage(20,25)
+ user.take_organ_damage(20, 25)
return
if((wielded) && prob(50))
- spawn(0)
- for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2))
- user.dir = i
- sleep(1)
+ INVOKE_ASYNC(src, .proc/jedi_spin, user)
+
+/obj/item/twohanded/dualsaber/proc/jedi_spin(mob/living/user)
+ for(var/i in list(NORTH, SOUTH, EAST, WEST, EAST, SOUTH, NORTH, SOUTH, EAST, WEST, EAST, SOUTH))
+ user.setDir(i)
+ if(i == WEST)
+ user.SpinAnimation(7, 1)
+ sleep(1)
/obj/item/twohanded/dualsaber/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
if(wielded)
return ..()
- return 0
+ return FALSE
+
+/obj/item/twohanded/dualsaber/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE) //In case thats just so happens that it is still activated on the groud, prevents hulk from picking it up
+ if(wielded)
+ to_chat(user, "You can't pick up such a dangerous item with your meaty hands without losing fingers, better not to!")
+ return TRUE
/obj/item/twohanded/dualsaber/green
blade_color = "green"
@@ -265,7 +273,7 @@
/obj/item/twohanded/dualsaber/IsReflect()
if(wielded)
- return 1
+ return TRUE
/obj/item/twohanded/dualsaber/wield(mob/living/carbon/M) //Specific wield () hulk checks due to reflection chance for balance issues and switches hitsounds.
if(HULK in M.mutations)
@@ -274,16 +282,17 @@
..()
hitsound = 'sound/weapons/blade1.ogg'
-/obj/item/twohanded/dualsaber/attackby(obj/item/W as obj, mob/user as mob, params)
- ..()
- if(istype(W, /obj/item/multitool))
- if(hacked == 0)
- hacked = 1
+/obj/item/twohanded/dualsaber/attackby(obj/item/W, mob/user, params)
+ if(ismultitool(W))
+ if(!hacked)
+ hacked = TRUE
to_chat(user, "2XRNBW_ENGAGE")
blade_color = "rainbow"
update_icon()
else
to_chat(user, "It's starting to look like a triple rainbow - no, nevermind.")
+ else
+ return ..()
//spears
/obj/item/twohanded/spear
@@ -298,11 +307,11 @@
throwforce = 20
throw_speed = 4
armour_penetration = 10
- materials = list(MAT_METAL=1150, MAT_GLASS=2075)
+ materials = list(MAT_METAL = 1150, MAT_GLASS = 2075)
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
- sharp = 1
- no_spin_thrown = 1
+ sharp = TRUE
+ no_spin_thrown = TRUE
var/obj/item/grenade/explosive = null
var/war_cry = "AAAAARGH!!!"
@@ -333,8 +342,8 @@
..()
if(!explosive)
return
- if(ismob(loc))
- var/mob/M = loc
+ if(ishuman(loc))
+ var/mob/living/carbon/human/M = loc
var/input = stripped_input(M, "What do you want your war cry to be? You will shout it when you hit someone in melee.", ,"", 50)
if(input)
war_cry = input
@@ -381,48 +390,47 @@
M.GiveTarget(L)
//Putting heads on spears
-/obj/item/organ/external/head/attackby(var/obj/item/W, var/mob/living/user, params)
- if(istype(W, /obj/item/twohanded/spear))
- to_chat(user, "You stick the head onto the spear and stand it upright on the ground.")
- var/obj/structure/headspear/HS = new /obj/structure/headspear(user.loc)
- var/matrix/M = matrix()
- src.transform = M
- user.drop_item()
- src.loc = HS
- var/image/IM = image(src.icon,src.icon_state)
- IM.overlays = src.overlays.Copy()
- HS.overlays += IM
- qdel(W)
- return
- return ..()
-
-/obj/item/twohanded/spear/attackby(var/obj/item/I, var/mob/living/user)
+/obj/item/twohanded/spear/attackby(obj/item/I, mob/living/user)
if(istype(I, /obj/item/organ/external/head))
- to_chat(user, "You stick the head onto the spear and stand it upright on the ground.")
- var/obj/structure/headspear/HS = new /obj/structure/headspear(user.loc)
- var/matrix/M = matrix()
- I.transform = M
- usr.drop_item()
- I.loc = HS
- var/image/IM = image(I.icon,I.icon_state)
- IM.overlays = I.overlays.Copy()
- HS.overlays += IM
- qdel(src)
- return
- return ..()
+ if(user.unEquip(src) && user.drop_item())
+ to_chat(user, "You stick [I] onto the spear and stand it upright on the ground.")
+ var/obj/structure/headspear/HS = new /obj/structure/headspear(get_turf(src))
+ var/matrix/M = matrix()
+ I.transform = M
+ var/image/IM = image(I.icon, I.icon_state)
+ IM.overlays = I.overlays.Copy()
+ HS.overlays += IM
+ I.forceMove(HS)
+ HS.mounted_head = I
+ forceMove(HS)
+ HS.contained_spear = src
+ else
+ return ..()
/obj/structure/headspear
name = "head on a spear"
desc = "How barbaric."
icon_state = "headspear"
- density = 0
- anchored = 1
+ density = FALSE
+ anchored = TRUE
+ var/obj/item/organ/external/head/mounted_head = null
+ var/obj/item/twohanded/spear/contained_spear = null
+
+/obj/structure/headspear/Destroy()
+ QDEL_NULL(mounted_head)
+ QDEL_NULL(contained_spear)
+ return ..()
/obj/structure/headspear/attack_hand(mob/living/user)
- user.visible_message("[user] kicks over \the [src]!", "You kick down \the [src]!")
- new /obj/item/twohanded/spear(user.loc)
- for(var/obj/item/organ/external/head/H in src)
- H.loc = user.loc
+ user.visible_message("[user] kicks over [src]!", "You kick down [src]!")
+ playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+ var/turf/T = get_turf(src)
+ if(contained_spear)
+ contained_spear.forceMove(T)
+ contained_spear = null
+ if(mounted_head)
+ mounted_head.forceMove(T)
+ mounted_head = null
qdel(src)
/obj/item/twohanded/spear/kidan
@@ -437,18 +445,18 @@
icon_state = "gchainsaw_off"
flags = CONDUCT
force = 13
- var/force_on = 21
+ var/force_on = 24
w_class = WEIGHT_CLASS_HUGE
throwforce = 13
throw_speed = 2
throw_range = 4
- materials = list(MAT_METAL=13000)
+ materials = list(MAT_METAL = 13000)
origin_tech = "materials=3;engineering=4;combat=2"
attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered")
hitsound = "swing_hit"
- sharp = 1
+ sharp = TRUE
actions_types = list(/datum/action/item_action/startchainsaw)
- var/on = 0
+ var/on = FALSE
/obj/item/twohanded/required/chainsaw/attack_self(mob/user)
on = !on
@@ -481,8 +489,8 @@
if(attack_type == PROJECTILE_ATTACK)
owner.visible_message("Ranged attacks just make [owner] angrier!")
playsound(src, pick('sound/weapons/bulletflyby.ogg','sound/weapons/bulletflyby2.ogg','sound/weapons/bulletflyby3.ogg'), 75, 1)
- return 1
- return 0
+ return TRUE
+ return FALSE
///CHAINSAW///
@@ -502,7 +510,7 @@
armour_penetration = 35
origin_tech = "materials=6;syndicate=4"
attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered")
- sharp = 1
+ sharp = TRUE
/obj/item/twohanded/chainsaw/update_icon()
if(wielded)
@@ -510,7 +518,7 @@
else
icon_state = "chainsaw0"
-/obj/item/twohanded/chainsaw/attack(mob/target as mob, mob/living/user as mob)
+/obj/item/twohanded/chainsaw/attack(mob/target, mob/living/user)
if(wielded)
playsound(loc, 'sound/weapons/chainsaw.ogg', 100, 1, -1) //incredibly loud; you ain't goin' for stealth with this thing. Credit to Lonemonk of Freesound for this sound.
if(isrobot(target))
@@ -562,43 +570,41 @@
/obj/item/twohanded/singularityhammer/process()
if(charged < 5)
charged++
- return
/obj/item/twohanded/singularityhammer/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "mjollnir[wielded]"
- return
-/obj/item/twohanded/singularityhammer/proc/vortex(var/turf/pull as turf, mob/wielder as mob)
- for(var/atom/X in orange(5,pull))
- if(istype(X, /atom/movable))
- if(X == wielder) continue
- if((X) &&(!X:anchored) && (!istype(X,/mob/living/carbon/human)))
- step_towards(X,pull)
- step_towards(X,pull)
- step_towards(X,pull)
- else if(istype(X,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = X
- if(istype(H.shoes,/obj/item/clothing/shoes/magboots))
- var/obj/item/clothing/shoes/magboots/M = H.shoes
- if(M.magpulse)
- continue
- H.apply_effect(1, WEAKEN, 0)
- step_towards(H,pull)
- step_towards(H,pull)
- step_towards(H,pull)
- return
+/obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder)
+ for(var/atom/movable/X in orange(5, pull))
+ if(X == wielder)
+ continue
+ if((X) && (!X.anchored) && (!ishuman(X)))
+ step_towards(X, pull)
+ step_towards(X, pull)
+ step_towards(X, pull)
+ else if(ishuman(X))
+ var/mob/living/carbon/human/H = X
+ if(istype(H.shoes, /obj/item/clothing/shoes/magboots))
+ var/obj/item/clothing/shoes/magboots/M = H.shoes
+ if(M.magpulse)
+ continue
+ H.apply_effect(1, WEAKEN, 0)
+ step_towards(H, pull)
+ step_towards(H, pull)
+ step_towards(H, pull)
-/obj/item/twohanded/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
- if(!proximity) return
+/obj/item/twohanded/singularityhammer/afterattack(atom/A, mob/user, proximity)
+ if(!proximity)
+ return
if(wielded)
if(charged == 5)
charged = 0
- if(istype(A, /mob/living/))
+ if(isliving(A))
var/mob/living/Z = A
- Z.take_organ_damage(20,0)
+ Z.take_organ_damage(20, 0)
playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
var/turf/target = get_turf(A)
- vortex(target,user)
+ vortex(target, user)
/obj/item/twohanded/mjollnir
name = "Mjolnir"
@@ -615,37 +621,35 @@
//var/charged = 5
origin_tech = "combat=4;powerstorage=7"
-/obj/item/twohanded/mjollnir/proc/shock(mob/living/target as mob)
+/obj/item/twohanded/mjollnir/proc/shock(mob/living/target)
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread()
s.set_up(5, 1, target.loc)
s.start()
- target.visible_message("[target.name] was shocked by the [src.name]!", \
+ target.visible_message("[target.name] was shocked by the [name]!", \
"You feel a powerful shock course through your body sending you flying!", \
"You hear a heavy electrical crack!")
var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
target.throw_at(throw_target, 200, 4)
- return
-/obj/item/twohanded/mjollnir/attack(mob/M as mob, mob/user as mob)
+/obj/item/twohanded/mjollnir/attack(mob/M, mob/user)
..()
if(wielded)
//if(charged == 5)
//charged = 0
- playsound(src.loc, "sparks", 50, 1)
- if(istype(M, /mob/living))
+ playsound(loc, "sparks", 50, 1)
+ if(isliving(M))
M.Stun(3)
shock(M)
/obj/item/twohanded/mjollnir/throw_impact(atom/target)
. = ..()
- if(istype(target, /mob/living))
+ if(isliving(target))
var/mob/living/L = target
L.Stun(3)
shock(L)
/obj/item/twohanded/mjollnir/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "mjollnir[wielded]"
- return
/obj/item/twohanded/knighthammer
name = "singuloth knight's hammer"
@@ -673,27 +677,26 @@
/obj/item/twohanded/knighthammer/process()
if(charged < 5)
charged++
- return
/obj/item/twohanded/knighthammer/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "knighthammer[wielded]"
- return
-/obj/item/twohanded/knighthammer/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
- if(!proximity) return
+/obj/item/twohanded/knighthammer/afterattack(atom/A, mob/user, proximity)
+ if(!proximity)
+ return
if(charged == 5)
charged = 0
- if(istype(A, /mob/living/))
+ if(isliving(A))
var/mob/living/Z = A
if(Z.health >= 1)
- Z.visible_message("[Z.name] was sent flying by a blow from the [src.name]!", \
+ Z.visible_message("[Z.name] was sent flying by a blow from the [name]!", \
"You feel a powerful blow connect with your body and send you flying!", \
"You hear something heavy impact flesh!.")
var/atom/throw_target = get_edge_target_turf(Z, get_dir(src, get_step_away(Z, src)))
Z.throw_at(throw_target, 200, 4)
playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
else if(wielded && Z.health < 1)
- Z.visible_message("[Z.name] was blown to peices by the power of [src.name]!", \
+ Z.visible_message("[Z.name] was blown to pieces by the power of [name]!", \
"You feel a powerful blow rip you apart!", \
"You hear a heavy impact and the sound of ripping flesh!.")
Z.gib()
@@ -704,7 +707,7 @@
Z.ex_act(2)
charged = 3
playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
- else if(istype(A, /obj/structure) || istype(A, /obj/mecha/))
+ else if(istype(A, /obj/structure) || istype(A, /obj/mecha))
var/obj/Z = A
Z.ex_act(2)
charged = 3
@@ -717,7 +720,7 @@
icon_state = "fireaxe0"
force = 5
throwforce = 15
- sharp = 1
+ sharp = TRUE
w_class = WEIGHT_CLASS_HUGE
armour_penetration = 20
slot_flags = SLOT_BACK
@@ -737,12 +740,12 @@
if(!proximity)
return
if(wielded)
- if(istype(A, /mob/living))
+ if(isliving(A))
var/mob/living/Z = A
if(charged)
charged--
- Z.take_organ_damage(0,30)
- user.visible_message("[user] slams the charged axe into [Z.name] with all their might!")
+ Z.take_organ_damage(0, 30)
+ user.visible_message("[user] slams the charged axe into [Z.name] with all [user.p_their()] might!")
playsound(loc, 'sound/magic/lightningbolt.ogg', 5, 1)
var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
sparks.set_up(1, 1, src)
@@ -751,7 +754,7 @@
if(A && wielded && (istype(A, /obj/structure/window) || istype(A, /obj/structure/grille)))
if(istype(A, /obj/structure/window))
var/obj/structure/window/W = A
- W.destroy()
+ W.deconstruct(FALSE)
if(prob(4))
charged++
user.visible_message("The axe starts to emit an electric buzz!")
@@ -759,4 +762,4 @@
qdel(A)
if(prob(4))
charged++
- user.visible_message("The axe starts to emit an electric buzz!")
+ user.visible_message("The axe starts to emit an electric buzz!")
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index e3b50123638..1a5fe872251 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -12,7 +12,7 @@
/obj/item/banhammer/suicide_act(mob/user)
- to_chat(viewers(user), "[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life.")
+ to_chat(viewers(user), "[user] is hitting [user.p_them()]self with the [src.name]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.")
return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS)
/obj/item/sord
@@ -28,7 +28,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
/obj/item/sord/suicide_act(mob/user)
- user.visible_message("[user] is trying to impale themself with [src]! It might be a suicide attempt if it weren't so shitty.", \
+ user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \
"You try to impale yourself with [src], but it's USELESS...")
return SHAME
@@ -48,7 +48,7 @@
block_chance = 50
/obj/item/claymore/suicide_act(mob/user)
- user.visible_message("[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide.")
return(BRUTELOSS)
/obj/item/claymore/ceremonial
@@ -75,7 +75,7 @@
slot_flags = null
/obj/item/katana/suicide_act(mob/user)
- user.visible_message("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.")
+ user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku.")
return(BRUTELOSS)
/obj/item/harpoon
@@ -179,7 +179,7 @@ obj/item/wirerod/attackby(obj/item/I, mob/user, params)
return
to_chat(user, "You begin gathering strength...")
playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, 1)
- if(do_after(user, 90, target = src))
+ if(do_after(user, 90, target = user))
to_chat(user, "You gather power! Time for a home run!")
homerun_ready = 1
..()
diff --git a/code/game/objects/items/weapons/whetstone.dm b/code/game/objects/items/weapons/whetstone.dm
index c6a27267d10..6cbc2e0e972 100644
--- a/code/game/objects/items/weapons/whetstone.dm
+++ b/code/game/objects/items/weapons/whetstone.dm
@@ -54,7 +54,7 @@
var/mob/living/carbon/human/H = user
var/datum/unarmed_attack/attack = H.species.unarmed
if(istype(attack, /datum/unarmed_attack/claws))
- H.visible_message("[H] sharpens \his claws on the [src]!", "You sharpen your claws on the [src].")
+ H.visible_message("[H] sharpens [H.p_their()] claws on the [src]!", "You sharpen your claws on the [src].")
playsound(get_turf(H), usesound, 50, 1)
/obj/item/whetstone/super
diff --git a/code/game/objects/items/weapons/wires.dm b/code/game/objects/items/weapons/wires.dm
deleted file mode 100644
index 44097096ae0..00000000000
--- a/code/game/objects/items/weapons/wires.dm
+++ /dev/null
@@ -1,36 +0,0 @@
-// WIRES
-
-/obj/item/wire
- desc = "This is just a simple piece of regular insulated wire."
- name = "wire"
- icon = 'icons/obj/power.dmi'
- icon_state = "item_wire"
- var/amount = 1.0
- var/laying = 0.0
- var/old_lay = null
- materials = list(MAT_METAL=40)
- attack_verb = list("whipped", "lashed", "disciplined", "tickled")
-
- suicide_act(mob/user)
- to_chat(viewers(user), "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.")
- return (OXYLOSS)
-
-
-/obj/item/wire/proc/update()
- if(src.amount > 1)
- src.icon_state = "spool_wire"
- src.desc = text("This is just spool of regular insulated wire. It consists of about [] unit\s of wire.", src.amount)
- else
- src.icon_state = "item_wire"
- src.desc = "This is just a simple piece of regular insulated wire."
- return
-
-/obj/item/wire/attack_self(mob/user as mob)
- if(src.laying)
- src.laying = 0
- to_chat(user, "You're done laying wire!")
- else
- to_chat(user, "You are not using this to lay wire...")
- return
-
-
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index fcd233318d5..d31338dfe06 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -71,6 +71,22 @@
visible_message("[src] is hit by \a [P]!")
take_damage(P.damage, P.damage_type, P.flag, 0, turn(P.dir, 180), P.armour_penetration)
+/obj/proc/hulk_damage()
+ return 150 //the damage hulks do on punches to this object, is affected by melee armor
+
+/obj/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM)
+ ..(user, TRUE)
+ visible_message("[user] smashes [src]!")
+ if(density)
+ playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
+ user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+ else
+ playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ take_damage(hulk_damage(), BRUTE, "melee", 0, get_dir(src, user))
+ return TRUE
+ return FALSE
+
/obj/blob_act(obj/structure/blob/B)
if(isturf(loc))
var/turf/T = loc
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index e254d80a39c..fe9e8444378 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -1,7 +1,6 @@
/obj
//var/datum/module/mod //not used
var/origin_tech = null //Used by R&D to determine what research bonuses it grants.
- var/reliability = 100 //Used by SOME devices to determine how reliable they are.
var/crit_fail = 0
var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
animate_movement = 2
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index c4506396f45..1738344ae60 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -13,6 +13,27 @@
/obj/structure/alien
icon = 'icons/mob/alien.dmi'
+ max_integrity = 100
+
+/obj/structure/alien/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
+ if(damage_flag == "melee")
+ switch(damage_type)
+ if(BRUTE)
+ damage_amount *= 0.25
+ if(BURN)
+ damage_amount *= 2
+ . = ..()
+
+/obj/structure/alien/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ switch(damage_type)
+ if(BRUTE)
+ if(damage_amount)
+ playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+ else
+ playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+ if(BURN)
+ if(damage_amount)
+ playsound(loc, 'sound/items/welder.ogg', 100, 1)
/*
* Resin
@@ -22,15 +43,15 @@
desc = "Looks like some kind of thick resin."
icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi'
icon_state = "resin"
- density = 1
- opacity = 1
- anchored = 1
+ density = TRUE
+ opacity = TRUE
+ anchored = TRUE
canSmoothWith = list(/obj/structure/alien/resin)
- var/health = 200
- var/resintype = null
+ max_integrity = 200
smooth = SMOOTH_TRUE
+ var/resintype = null
-/obj/structure/alien/resin/initialize()
+/obj/structure/alien/resin/Initialize()
air_update_turf(1)
..()
@@ -60,7 +81,7 @@
/obj/structure/alien/resin/wall/shadowling //For chrysalis
name = "chrysalis wall"
desc = "Some sort of purple substance in an egglike shape. It pulses and throbs from within and seems impenetrable."
- health = INFINITY
+ max_integrity = INFINITY
/obj/structure/alien/resin/membrane
name = "resin membrane"
@@ -68,80 +89,11 @@
icon = 'icons/obj/smooth_structures/alien/resin_membrane.dmi'
icon_state = "membrane0"
opacity = 0
- health = 120
+ max_integrity = 160
resintype = "membrane"
canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane)
-/obj/structure/alien/resin/proc/healthcheck()
- if(health <=0)
- qdel(src)
-
-
-/obj/structure/alien/resin/bullet_act(obj/item/projectile/Proj)
- if(Proj.damage_type == BRUTE || Proj.damage_type == BURN)
- health -= Proj.damage
- ..()
- healthcheck()
-
-
-/obj/structure/alien/resin/ex_act(severity)
- switch(severity)
- if(1)
- health -= 150
- if(2)
- health -= 100
- if(3)
- health -= 50
- healthcheck()
-
-
-/obj/structure/alien/resin/blob_act()
- health -= 50
- healthcheck()
-
-
-/obj/structure/alien/resin/hitby(atom/movable/AM)
- ..()
- var/tforce = 0
- if(ismob(AM))
- tforce = 10
- else if(isobj(AM))
- var/obj/O = AM
- tforce = O.throwforce
- playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
- health -= tforce
- healthcheck()
-
-/obj/structure/alien/resin/attack_hand(mob/living/user)
- if(HULK in user.mutations)
- user.do_attack_animation(src)
- user.visible_message("[user] destroys [src]!")
- health = 0
- healthcheck()
-
-
-/obj/structure/alien/resin/attack_alien(mob/living/user)
- user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src)
- if(islarva(user))
- return
- user.visible_message("[user] claws at the resin!")
- playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
- health -= 50
- if(health <= 0)
- user.visible_message("[user] slices the [name] apart!")
- healthcheck()
-
-
-/obj/structure/alien/resin/attackby(obj/item/I, mob/living/user, params)
- user.changeNext_move(CLICK_CD_MELEE)
- health -= I.force
- playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
- healthcheck()
- ..()
-
-
-/obj/structure/alien/resin/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/alien/resin/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
return !opacity
return !density
@@ -157,11 +109,11 @@
gender = PLURAL
name = "resin floor"
desc = "A thick resin surface covers the floor."
+ anchored = TRUE
+ density = FALSE
+ layer = TURF_LAYER
icon_state = "weeds"
- anchored = 1
- density = 0
- layer = 2
- var/health = 15
+ max_integrity = 15
var/obj/structure/alien/weeds/node/linked_node = null
var/static/list/weedImageCache
@@ -204,39 +156,9 @@
new /obj/structure/alien/weeds(T, linked_node)
-
-/obj/structure/alien/weeds/ex_act(severity)
- qdel(src)
-
-
-/obj/structure/alien/weeds/attackby(obj/item/I, mob/user, params)
- user.changeNext_move(CLICK_CD_MELEE)
- if(I.attack_verb.len)
- visible_message("[user] has [pick(I.attack_verb)] [src] with [I]!")
- else
- visible_message("[user] has attacked [src] with [I]!")
-
- var/damage = I.force / 4
- if(istype(I, /obj/item/weldingtool))
- var/obj/item/weldingtool/WT = I
- if(WT.remove_fuel(0, user))
- damage = 15
- playsound(loc, WT.usesound, 100, 1)
-
- health -= damage
- healthcheck()
-
-
-/obj/structure/alien/weeds/proc/healthcheck()
- if(health <= 0)
- qdel(src)
-
-
/obj/structure/alien/weeds/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300)
- health -= 5
- healthcheck()
-
+ take_damage(5, BURN, 0, 0)
/obj/structure/alien/weeds/proc/updateWeedOverlays()
@@ -303,9 +225,10 @@
name = "egg"
desc = "A large mottled egg."
icon_state = "egg_growing"
- density = 0
- anchored = 1
- var/health = 100
+ density = FALSE
+ anchored = TRUE
+ max_integrity = 100
+ integrity_failure = 5
var/status = GROWING //can be GROWING, GROWN or BURST; all mutually exclusive
layer = MOB_LAYER
@@ -315,6 +238,8 @@
..()
spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
Grow()
+ if(status == BURST)
+ obj_integrity = integrity_failure
/obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user)
return attack_hand(user)
@@ -346,7 +271,7 @@
icon_state = "egg"
status = GROWN
-/obj/structure/alien/egg/proc/Burst(kill = 1) //drops and kills the hugger if any is remaining
+/obj/structure/alien/egg/proc/Burst(kill = TRUE) //drops and kills the hugger if any is remaining
if(status == GROWN || status == GROWING)
icon_state = "egg_hatched"
flick("egg_opening", src)
@@ -364,45 +289,13 @@
child.Attach(M)
break
-/obj/structure/alien/egg/bullet_act(obj/item/projectile/Proj)
- if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
- health -= Proj.damage
- ..()
- healthcheck()
-
-
-/obj/structure/alien/egg/attackby(obj/item/I, mob/user, params)
- if(I.attack_verb.len)
- visible_message("[user] has [pick(I.attack_verb)] [src] with [I]!")
- else
- visible_message("[user] has attacked [src] with [I]!")
-
- var/damage = I.force / 4
- if(istype(I, /obj/item/weldingtool))
- var/obj/item/weldingtool/WT = I
-
- if(WT.remove_fuel(0, user))
- damage = 15
- playsound(loc, WT.usesound, 100, 1)
-
- health -= damage
- user.changeNext_move(CLICK_CD_MELEE)
- healthcheck()
-
-
-/obj/structure/alien/egg/proc/healthcheck()
- if(health <= 0)
- if(status != BURST && status != BURSTING)
- Burst()
- else if(status == BURST && prob(50))
- qdel(src) //Remove the egg after it has been hit after bursting.
-
+/obj/structure/alien/egg/obj_break(damage_flag)
+ if(status != BURST)
+ Burst(kill = TRUE)
/obj/structure/alien/egg/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 500)
- health -= 5
- healthcheck()
-
+ take_damage(5, BURN, 0, 0)
/obj/structure/alien/egg/HasProximity(atom/movable/AM)
if(status == GROWN)
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 37ab3977755..19e08c15bde 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -10,6 +10,7 @@
burntime = 20
sound = 'sound/effects/rustle2.ogg'
material_drop = /obj/item/stack/sheet/cardboard
+ var/amt = 4
cutting_sound = 'sound/items/poster_ripped.ogg'
var/move_delay = 0
var/egged = 0
@@ -60,7 +61,7 @@
return
if(istype(W, /obj/item/wirecutters))
var/obj/item/wirecutters/WC = W
- new /obj/item/stack/sheet/cardboard(src.loc)
+ new /obj/item/stack/sheet/cardboard(src.loc, amt)
for(var/mob/M in viewers(src))
M.show_message("\The [src] has been cut apart by [user] with \the [WC].", 3, "You hear cutting.", 2)
qdel(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 32872e07f12..6548aa8bfca 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -30,8 +30,8 @@
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/multitool(src)
+ new /obj/item/holosign_creator/engineering(src)
new /obj/item/flash(src)
- new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/head/beret/eng(src)
new /obj/item/door_remote/chief_engineer(src)
new /obj/item/rpd(src)
@@ -102,6 +102,7 @@
new /obj/item/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/duffel/engineering(src)
new /obj/item/storage/toolbox/mechanical(src)
+ new /obj/item/holosign_creator/engineering(src)
new /obj/item/radio/headset/headset_eng(src)
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/rank/engineer/skirt(src)
@@ -109,7 +110,6 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/cartridge/engineering(src)
- new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/head/beret/eng(src)
@@ -128,7 +128,6 @@
new /obj/item/radio/headset/headset_eng(src)
new /obj/item/cartridge/atmos(src)
new /obj/item/storage/toolbox/mechanical(src)
- new /obj/item/taperoll/engineering(src)
if(prob(50))
new /obj/item/storage/backpack/industrial(src)
else
@@ -138,6 +137,7 @@
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/tank/emergency_oxygen/engi(src)
+ new /obj/item/holosign_creator/atmos(src)
new /obj/item/watertank/atmos(src)
new /obj/item/clothing/suit/fire/atmos(src)
new /obj/item/clothing/head/hardhat/atmos(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index e5c7c2b27fb..551a8b30d9d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -262,6 +262,7 @@
new /obj/item/sensor_device(src)
new /obj/item/key/ambulance(src)
new /obj/item/pinpointer/crew(src)
+ new /obj/item/clothing/shoes/magboots(src)
/obj/structure/closet/secure_closet/reagents
name = "chemical storage closet"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 05a3fa5c7ba..2a5639eb081 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -115,11 +115,11 @@
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/storage/lockbox/mindshield(src)
new /obj/item/storage/box/flashbangs(src)
+ new /obj/item/holosign_creator/security(src)
new /obj/item/clothing/mask/gas/sechailer/hos(src)
new /obj/item/shield/riot/tele(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/storage/belt/security/sec(src)
- new /obj/item/taperoll/police(src)
new /obj/item/gun/energy/gun/hos(src)
new /obj/item/door_remote/head_of_security(src)
new /obj/item/reagent_containers/food/drinks/mug/hos(src)
@@ -151,8 +151,8 @@
new /obj/item/clothing/under/rank/warden/corp(src)
new /obj/item/clothing/under/rank/warden/skirt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
+ new /obj/item/holosign_creator/security(src)
new /obj/item/clothing/mask/gas/sechailer/warden(src)
- new /obj/item/taperoll/police(src)
new /obj/item/storage/box/zipties(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/reagent_containers/spray/pepper(src)
@@ -186,11 +186,11 @@
new /obj/item/flash(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/storage/belt/security/sec(src)
+ new /obj/item/holosign_creator/security(src)
new /obj/item/clothing/mask/gas/sechailer(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/melee/baton/loaded(src)
- new /obj/item/taperoll/police(src)
/obj/structure/closet/secure_closet/brigdoc
@@ -344,10 +344,10 @@
new /obj/item/ammo_box/c38(src)
new /obj/item/ammo_box/c38(src)
new /obj/item/gun/projectile/revolver/detective(src)
- new /obj/item/taperoll/police(src)
new /obj/item/clothing/accessory/holster/armpit(src)
new /obj/item/clothing/glasses/sunglasses/yeah(src)
new /obj/item/flashlight/seclite(src)
+ new /obj/item/holosign_creator/security(src)
new /obj/item/clothing/accessory/black(src)
new /obj/item/taperecorder(src)
new /obj/item/storage/box/tapes(src)
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index f888ee6cc94..3b174480ce8 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -295,7 +295,7 @@ var/global/list/captain_display_cases = list()
else
if(user.a_intent == INTENT_HARM)
user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src)
+ user.do_attack_animation(src, ATTACK_EFFECT_KICK)
user.visible_message("[user.name] kicks \the [src]!", \
"You kick \the [src]!", \
"You hear glass crack.")
@@ -321,7 +321,7 @@ var/global/list/captain_display_cases = list()
to_chat(src, "[bicon(src)] \The [src] is empty!")
else
user.changeNext_move(CLICK_CD_MELEE)
- user.visible_message("[user.name] gently runs \his hands over [src] in appreciation of its contents.", \
+ user.visible_message("[user.name] gently runs [user.p_their()] hands over [src] in appreciation of its contents.", \
"You gently run your hands over [src] in appreciation of its contents.", \
"You hear someone streaking glass with their greasy hands.")
diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm
index cf6a8e65715..a005e59c5a5 100644
--- a/code/game/objects/structures/engicart.dm
+++ b/code/game/objects/structures/engicart.dm
@@ -12,7 +12,6 @@
var/obj/item/storage/toolbox/mechanical/mybluetoolbox = null
var/obj/item/storage/toolbox/electrical/myyellowtoolbox = null
var/obj/item/storage/toolbox/emergency/myredtoolbox = null
- var/obj/item/taperoll/engineering/myengitape = null
/obj/structure/engineeringcart/Destroy()
QDEL_NULL(myglass)
@@ -22,7 +21,6 @@
QDEL_NULL(mybluetoolbox)
QDEL_NULL(myyellowtoolbox)
QDEL_NULL(myredtoolbox)
- QDEL_NULL(myengitape)
return ..()
/obj/structure/engineeringcart/proc/put_in_cart(obj/item/I, mob/user)
@@ -83,13 +81,6 @@
update_icon()
else
to_chat(user, fail_msg)
- else if(istype(I, /obj/item/taperoll/engineering/))
- if(!myengitape)
- put_in_cart(I, user)
- myengitape=I
- update_icon()
- else
- to_chat(user, fail_msg)
else if(istype(I, /obj/item/wrench))
if(!anchored && !isinspace())
playsound(src.loc, I.usesound, 50, 1)
@@ -125,8 +116,6 @@
dat += "[myredtoolbox.name] "
if(myyellowtoolbox)
dat += "[myyellowtoolbox.name] "
- if(myengitape)
- dat += "[myengitape.name] "
var/datum/browser/popup = new(user, "engicart", name, 240, 160)
popup.set_content(dat)
popup.open()
@@ -171,16 +160,12 @@
user.put_in_hands(myyellowtoolbox)
to_chat(user, "You take [myyellowtoolbox] from [src].")
myyellowtoolbox = null
- if(href_list["engitape"])
- if(myengitape)
- user.put_in_hands(myengitape)
- to_chat(user, "You take [myengitape] from [src].")
- myengitape = null
update_icon()
updateUsrDialog()
+
/obj/structure/engineeringcart/update_icon()
- overlays = null
+ overlays.Cut()
if(myglass)
overlays += "cart_glass"
if(mymetal)
@@ -194,6 +179,4 @@
if(myredtoolbox)
overlays += "cart_redtoolbox"
if(myyellowtoolbox)
- overlays += "cart_yellowtoolbox"
- if(myengitape)
- overlays += "cart_engitape"
+ overlays += "cart_yellowtoolbox"
\ No newline at end of file
diff --git a/code/game/objects/structures/fullwindow.dm b/code/game/objects/structures/fullwindow.dm
deleted file mode 100644
index eec957c2d52..00000000000
--- a/code/game/objects/structures/fullwindow.dm
+++ /dev/null
@@ -1,116 +0,0 @@
-/obj/structure/window/full
- sheets = 2
- dir=SOUTHWEST
- level = 3
-
-/obj/structure/window/full/CheckExit(atom/movable/O as mob|obj, target as turf)
- return 1
-
-/obj/structure/window/full/CanPass(atom/movable/mover, turf/target, height=0)
- if(istype(mover) && mover.checkpass(PASSGLASS))
- return 1
- return 0
-
-/obj/structure/window/full/is_fulltile()
- return 1
-
-//merges adjacent full-tile windows into one (blatant ripoff from game/smoothwall.dm)
-/obj/structure/window/full/update_icon()
- //A little cludge here, since I don't know how it will work with slim windows. Most likely VERY wrong.
- //this way it will only update full-tile ones
- //This spawn is here so windows get properly updated when one gets deleted.
- spawn(2)
- if(!src) return
- if(!is_fulltile())
- return
- var/junction = 0 //will be used to determine from which side the window is connected to other windows
- if(anchored)
- for(var/obj/structure/window/full/W in orange(src,1))
- if(W.anchored && W.density) //Only counts anchored, not-destroyed full-tile windows.
- if(abs(x-W.x)-abs(y-W.y) ) //doesn't count windows, placed diagonally to src
- junction |= get_dir(src,W)
- icon_state = "[basestate][junction]"
- return
-
-/obj/structure/window/full/basic
- desc = "It looks thin and flimsy. A few knocks with... anything, really should shatter it."
- icon_state = "window"
- basestate = "window"
-
-/obj/structure/window/full/plasmabasic
- name = "plasma window"
- desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
- basestate = "plasmawindow"
- icon_state = "plasmawindow"
- shardtype = /obj/item/shard/plasma
- glasstype = /obj/item/stack/sheet/plasmaglass
- health = 240
-
-/obj/structure/window/full/plasmabasic/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- if(exposed_temperature > T0C + 32000)
- hit(round(exposed_volume / 1000), 0)
- ..()
-
-/obj/structure/window/full/plasmareinforced
- name = "reinforced plasma window"
- desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
- basestate = "plasmarwindow"
- icon_state = "plasmarwindow"
- shardtype = /obj/item/shard/plasma
- glasstype = /obj/item/stack/sheet/plasmaglass
- reinf = 1
- health = 320
-
-/obj/structure/window/full/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- return
-
-/obj/structure/window/full/reinforced
- name = "reinforced window"
- desc = "It looks rather strong. Might take a few good hits to shatter it."
- icon_state = "rwindow"
- basestate = "rwindow"
- health = 80
- reinf = 1
-
-/obj/structure/window/full/reinforced/tinted
- name = "tinted window"
- desc = "It looks rather strong and opaque. Might take a few good hits to shatter it."
- icon_state = "twindow"
- basestate = "twindow"
- opacity = 1
-
-/obj/structure/window/full/reinforced/tinted/frosted
- name = "frosted window"
- desc = "It looks rather strong and frosted over. Looks like it might take a few less hits then a normal reinforced window."
- icon_state = "fwindow"
- basestate = "fwindow"
- health = 60
-
-/obj/structure/window/full/shuttle
- name = "shuttle window"
- desc = "It looks rather strong. Might take a few good hits to shatter it."
- icon = 'icons/obj/podwindows.dmi'
- icon_state = "window"
- basestate = "window"
- health = 160
- reinf = 1
- explosion_block = 3
- armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100)
-
-/obj/structure/window/full/shuttle/New()
- ..()
- color = null
-
-/obj/structure/window/full/shuttle/update_icon() //icon_state has to be set manually
- return
-
-/obj/structure/window/full/shuttle/shuttleRotate(rotation)
- ..()
- var/matrix/M = transform
- M.Turn(rotation)
- transform = M
-
-/obj/structure/window/full/shuttle/dark
- icon = 'icons/turf/shuttle.dmi'
- icon_state = "window5"
- basestate = "window5"
\ No newline at end of file
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index d5dccaf0d03..b8ef71bd9c8 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -69,18 +69,23 @@
if(ismob(user))
shock(user, 70)
-/obj/structure/grille/attack_hand(mob/living/user)
- user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src)
- user.visible_message("[user] kicks [src].", \
- "You kick [src].", \
- "You hear twisting metal.")
+/obj/structure/grille/hulk_damage()
+ return 60
- if(shock(user, 70))
+/obj/structure/grille/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM)
+ if(!shock(user, 70))
+ ..(user, TRUE)
+ return TRUE
+
+/obj/structure/grille/attack_hand(mob/living/user)
+ . = ..()
+ if(.)
return
- if(HULK in user.mutations)
- take_damage(60, BRUTE, "melee", 1)
- else
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src, ATTACK_EFFECT_KICK)
+ user.visible_message("[user] hits [src].")
+ if(!shock(user, 70))
take_damage(rand(5,10), BRUTE, "melee", 1)
/obj/structure/grille/attack_alien(mob/living/user)
@@ -137,7 +142,7 @@
return
//window placing begin
- else if(istype(W,/obj/item/stack/sheet/rglass) || istype(W,/obj/item/stack/sheet/glass) || istype(W,/obj/item/stack/sheet/plasmaglass) || istype(W,/obj/item/stack/sheet/plasmarglass))
+ else if(is_glass_sheet(W))
build_window(W, user)
return
//window placing end
@@ -190,10 +195,10 @@
S.use(1)
W.setDir(dir_to_set)
W.ini_dir = dir_to_set
- W.anchored = 0
- W.state = 0
+ W.anchored = FALSE
+ W.state = WINDOW_OUT_OF_FRAME
to_chat(user, "You place the [W] on [src].")
- W.update_icon()
+ W.update_nearby_icons()
return
/obj/structure/grille/attacked_by(obj/item/I, mob/living/user)
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 0de1a09a74c..3c4875978a2 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -203,7 +203,7 @@
return FALSE
if(!ishuman(M))
- to_chat(usr, "It doesn't look like they can fit into this properly!")
+ to_chat(usr, "It doesn't look like [M.p_they()] can fit into this properly!")
return FALSE // Can't decapitate non-humans
if(blade_status != GUILLOTINE_BLADE_RAISED)
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
new file mode 100644
index 00000000000..0b730a539b9
--- /dev/null
+++ b/code/game/objects/structures/holosign.dm
@@ -0,0 +1,135 @@
+
+//holographic signs and barriers
+
+/obj/structure/holosign
+ name = "holo sign"
+ icon = 'icons/effects/effects.dmi'
+ anchored = TRUE
+ max_integrity = 1
+ armor = list("melee" = 0, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0)
+ var/obj/item/holosign_creator/projector
+
+/obj/structure/holosign/New(loc, source_projector)
+ if(source_projector)
+ projector = source_projector
+ projector.signs += src
+ ..()
+
+/obj/structure/holosign/Destroy()
+ if(projector)
+ projector.signs -= src
+ projector = null
+ return ..()
+
+/obj/structure/holosign/attack_hand(mob/living/user)
+ . = ..()
+ if(.)
+ return
+ user.do_attack_animation(src)
+ user.changeNext_move(CLICK_CD_MELEE)
+ take_damage(5 , BRUTE, "melee", 1)
+
+/obj/structure/holosign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ switch(damage_type)
+ if(BRUTE)
+ playsound(loc, 'sound/weapons/egloves.ogg', 80, 1)
+ if(BURN)
+ playsound(loc, 'sound/weapons/egloves.ogg', 80, 1)
+
+/obj/structure/holosign/wetsign
+ name = "wet floor sign"
+ desc = "The words flicker as if they mean nothing."
+ icon_state = "holosign"
+
+/obj/structure/holosign/barrier
+ name = "holo barrier"
+ desc = "A short holographic barrier which can only be passed by walking."
+ icon_state = "holosign_sec"
+ pass_flags = LETPASSTHROW
+ density = TRUE
+ max_integrity = 20
+ var/allow_walk = TRUE //can we pass through it on walk intent
+
+/obj/structure/holosign/barrier/CanPass(atom/movable/mover, turf/target)
+ if(!density)
+ return TRUE
+ if(mover.pass_flags & (PASSGLASS|PASSTABLE|PASSGRILLE))
+ return TRUE
+ if(iscarbon(mover))
+ var/mob/living/carbon/C = mover
+ if(allow_walk && C.m_intent == MOVE_INTENT_WALK)
+ return TRUE
+
+/obj/structure/holosign/barrier/engineering
+ icon_state = "holosign_engi"
+
+/obj/structure/holosign/barrier/atmos
+ name = "holo firelock"
+ desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects from passing through, gas is kept out."
+ icon_state = "holo_firelock"
+ density = FALSE
+ layer = ABOVE_MOB_LAYER
+ anchored = TRUE
+ layer = ABOVE_MOB_LAYER
+ alpha = 150
+
+/obj/structure/holosign/barrier/atmos/New()
+ ..()
+ air_update_turf(TRUE)
+
+/obj/structure/holosign/barrier/atmos/CanAtmosPass(turf/T)
+ return FALSE
+
+/obj/structure/holosign/barrier/atmos/Destroy()
+ var/turf/T = get_turf(src)
+ T.air_update_turf(TRUE)
+ return ..()
+
+/obj/structure/holosign/barrier/cyborg
+ name = "Energy Field"
+ desc = "A fragile energy field that blocks movement. Excels at blocking lethal projectiles."
+ density = TRUE
+ max_integrity = 10
+ allow_walk = FALSE
+
+/obj/structure/holosign/barrier/cyborg/bullet_act(obj/item/projectile/P)
+ take_damage((P.damage / 5) , BRUTE, "melee", 1) //Doesn't really matter what damage flag it is.
+ if(istype(P, /obj/item/projectile/energy/electrode))
+ take_damage(10, BRUTE, "melee", 1) //Tasers aren't harmful.
+ if(istype(P, /obj/item/projectile/beam/disabler))
+ take_damage(5, BRUTE, "melee", 1) //Disablers aren't harmful.
+
+/obj/structure/holosign/barrier/cyborg/hacked
+ name = "Charged Energy Field"
+ desc = "A powerful energy field that blocks movement. Energy arcs off it."
+ max_integrity = 20
+ var/shockcd = 0
+
+/obj/structure/holosign/barrier/cyborg/hacked/bullet_act(obj/item/projectile/P)
+ take_damage(P.damage, BRUTE, "melee", 1) //Yeah no this doesn't get projectile resistance.
+
+/obj/structure/holosign/barrier/cyborg/hacked/proc/cooldown()
+ shockcd = FALSE
+
+/obj/structure/holosign/barrier/cyborg/hacked/attack_hand(mob/living/user)
+ . = ..()
+ if(.)
+ return
+ if(!shockcd)
+ if(ismob(user))
+ var/mob/living/M = user
+ M.electrocute_act(15,"Energy Barrier", safety=1)
+ shockcd = TRUE
+ addtimer(CALLBACK(src, .proc/cooldown), 5)
+
+/obj/structure/holosign/barrier/cyborg/hacked/Bumped(atom/movable/AM)
+ if(shockcd)
+ return
+
+ if(!isliving(AM))
+ return
+
+ var/mob/living/M = AM
+ M.electrocute_act(15, "Energy Barrier", safety = 1)
+ shockcd = TRUE
+ addtimer(CALLBACK(src, .proc/cooldown), 5)
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index 6d03ca4fdef..4ea0fc34e2d 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -25,7 +25,7 @@
var/health = 50.0
-/obj/structure/inflatable/initialize(location)
+/obj/structure/inflatable/Initialize(location)
..()
air_update_turf(1)
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index f4a2990918b..e0e9ba1b6a7 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -24,7 +24,7 @@
..()
initial_state = icon_state
-/obj/structure/mineral_door/initialize()
+/obj/structure/mineral_door/Initialize()
..()
air_update_turf(1)
diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm
index 131a355feb2..6be7bf072d8 100644
--- a/code/game/objects/structures/misc.dm
+++ b/code/game/objects/structures/misc.dm
@@ -87,7 +87,7 @@
var/atom/attack_atom
-/obj/structure/ghost_beacon/initialize()
+/obj/structure/ghost_beacon/Initialize()
. = ..()
last_ghost_alert = world.time
attack_atom = src
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 3e5d3386e0a..60ca03ad0f7 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -29,7 +29,7 @@
anchored = 1.0
var/open_sound = 'sound/items/Deconstruct.ogg'
-/obj/structure/morgue/initialize()
+/obj/structure/morgue/Initialize()
. = ..()
update()
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index da4c1181f01..b8c28046bd3 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -295,7 +295,7 @@
QDEL_NULL(song)
return ..()
-/obj/structure/piano/initialize()
+/obj/structure/piano/Initialize()
song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
..()
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index caa1bf48b4b..8ea6a3c0cce 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -7,7 +7,8 @@
anchored = 1
var/notices = 0
-/obj/structure/noticeboard/initialize()
+/obj/structure/noticeboard/Initialize()
+ ..()
for(var/obj/item/I in loc)
if(notices > 4) break
if(istype(I, /obj/item/paper))
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index f0a2c28af85..8d22732e5dd 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -124,7 +124,7 @@
name = "airtight plastic flaps"
desc = "Heavy duty, airtight, plastic flaps."
-/obj/structure/plasticflaps/mining/initialize()
+/obj/structure/plasticflaps/mining/Initialize()
air_update_turf(1)
..()
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 315728ddc16..44c9da74b20 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -30,7 +30,8 @@ FLOOR SAFES
tumbler_2_open = rand(0, 71)
-/obj/structure/safe/initialize()
+/obj/structure/safe/Initialize()
+ ..()
for(var/obj/item/I in loc)
if(space >= maxspace)
return
@@ -178,7 +179,7 @@ obj/structure/safe/ex_act(severity)
layer = 2.5
-/obj/structure/safe/floor/initialize()
+/obj/structure/safe/floor/Initialize()
..()
var/turf/T = loc
hide(T.intact)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 32ceefbd834..4a1ecdb08d7 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -186,7 +186,7 @@
buildstackamount = 1
/obj/structure/stool/bed/chair/sofa
- name = "old ratty sofa"
+ name = "sofa"
icon_state = "sofamiddle"
anchored = 1
buildstackamount = 1
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 367be27b6dc..91f348d0106 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -83,14 +83,7 @@
qdel(src)
/obj/structure/table/attack_hand(mob/living/user)
- if(HULK in user.mutations)
- user.do_attack_animation(src)
- visible_message("[user] smashes [src] apart!")
- playsound(loc, 'sound/effects/bang.ogg', 50, 1)
- user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
- deconstruct(FALSE)
- else
- ..()
+ ..()
if(climber)
climber.Weaken(2)
climber.visible_message("[climber.name] has been knocked off the table", "You've been knocked off the table", "You see [climber.name] get knocked off the table")
@@ -616,7 +609,7 @@
if(user.weakened || user.resting || user.lying)
return
user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src)
+ user.do_attack_animation(src, ATTACK_EFFECT_KICK)
user.visible_message("[user] kicks [src].", \
"You kick [src].")
take_damage(rand(4,8), BRUTE, "melee", 1)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 3ea23108662..179615dada3 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -548,7 +548,7 @@
var/washing_face = 0
if(selected_area in list("head", "mouth", "eyes"))
washing_face = 1
- user.visible_message("[user] starts washing their [washing_face ? "face" : "hands"]...", \
+ user.visible_message("[user] starts washing [user.p_their()] [washing_face ? "face" : "hands"]...", \
"You start washing your [washing_face ? "face" : "hands"]...")
busy = 1
@@ -558,7 +558,7 @@
busy = 0
- user.visible_message("[user] washes their [washing_face ? "face" : "hands"] using [src].", \
+ user.visible_message("[user] washes [user.p_their()] [washing_face ? "face" : "hands"] using [src].", \
"You wash your [washing_face ? "face" : "hands"] using [src].")
if(washing_face)
if(ishuman(user))
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index dcf89008416..72469e2ebfb 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -27,6 +27,10 @@
var/secure = FALSE //Whether or not this creates a secure windoor
var/state = "01" //How far the door assembly has progressed
+/obj/structure/windoor_assembly/examine(mob/user)
+ ..()
+ to_chat(user, "Alt-click to rotate it clockwise.")
+
obj/structure/windoor_assembly/New(loc, set_dir)
..()
if(set_dir)
@@ -42,7 +46,7 @@ obj/structure/windoor_assembly/Destroy()
/obj/structure/windoor_assembly/Move()
var/turf/T = loc
- . = ..()
+ ..()
setDir(ini_dir)
move_update_air(T)
@@ -54,8 +58,17 @@ obj/structure/windoor_assembly/Destroy()
return 1
if(get_dir(loc, target) == dir) //Make sure looking at appropriate border
return !density
- else
- return 1
+ if(istype(mover, /obj/structure/window))
+ var/obj/structure/window/W = mover
+ if(!valid_window_location(loc, W.ini_dir))
+ return FALSE
+ else if(istype(mover, /obj/structure/windoor_assembly))
+ var/obj/structure/windoor_assembly/W = mover
+ if(!valid_window_location(loc, W.ini_dir))
+ return FALSE
+ else if(istype(mover, /obj/machinery/door/window) && !valid_window_location(loc, mover.dir))
+ return FALSE
+ return 1
/obj/structure/windoor_assembly/CanAtmosPass(turf/T)
if(get_dir(loc, T) == dir)
@@ -317,9 +330,16 @@ obj/structure/windoor_assembly/Destroy()
if(usr.stat || !usr.canmove || usr.restrained())
return
if(anchored)
- to_chat(usr, "It is fastened to the floor; therefore, you can't rotate it!")
- return 0
- setDir(turn(dir, 270))
+ to_chat(usr, "[src] cannot be rotated while it is fastened to the floor!")
+ return FALSE
+ var/target_dir = turn(dir, 270)
+
+ if(!valid_window_location(loc, target_dir))
+ to_chat(usr, "[src] cannot be rotated in that direction!")
+ return FALSE
+
+ setDir(target_dir)
+
ini_dir = dir
update_icon()
return TRUE
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index c93a0e5f1b8..8a30f18f7bd 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -2,13 +2,14 @@ var/global/wcBar = pick(list("#0d8395", "#58b5c3", "#58c366", "#90d79a", "#fffff
var/global/wcBrig = pick(list("#aa0808", "#7f0606", "#ff0000"))
var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8fcf44", "#ffffff"))
-/obj/proc/color_windows(var/obj/W as obj)
+/obj/proc/color_windows(obj/W)
var/list/wcBarAreas = list(/area/crew_quarters/bar)
var/list/wcBrigAreas = list(/area/security,/area/prison,/area/shuttle/gamma)
var/newcolor
var/turf/T = get_turf(W)
- if(!istype(T)) return
+ if(!istype(T))
+ return
var/area/A = T.loc
if(is_type_in_list(A,wcBarAreas))
@@ -23,168 +24,207 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
/obj/structure/window
name = "window"
desc = "A window."
- icon = 'icons/obj/structures.dmi'
- density = 1
- layer = 3.2//Just above doors
+ icon_state = "window"
+ density = TRUE
+ layer = ABOVE_OBJ_LAYER //Just above doors
pressure_resistance = 4*ONE_ATMOSPHERE
- anchored = 1.0
+ anchored = TRUE
flags = ON_BORDER
- var/health = 14.0
+ can_be_unanchored = TRUE
+ max_integrity = 25
var/ini_dir = null
- var/state = 2
- var/reinf = 0
- var/basestate
+ var/state = WINDOW_OUT_OF_FRAME
+ var/reinf = FALSE
+ var/heat_resistance = 800
+ var/decon_speed = null
+ var/fulltile = FALSE
var/shardtype = /obj/item/shard
- var/glasstype = /obj/item/stack/sheet/glass
- var/disassembled = 0
- var/sheets = 1 // Number of sheets needed to build this window (determines how much shit is spawned by destroy())
-// var/silicate = 0 // number of units of silicate
-// var/icon/silicateIcon = null // the silicated icon
+ var/glass_type = /obj/item/stack/sheet/glass
+ var/glass_amount = 1
+ var/cancolor = FALSE
+ var/image/crack_overlay
+ var/list/debris = list()
+ var/real_explosion_block //ignore this, just use explosion_block
+ var/breaksound = "shatter"
+ var/hitsound = 'sound/effects/Glasshit.ogg'
-/obj/structure/window/bullet_act(var/obj/item/projectile/Proj)
- if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
- health -= Proj.damage
- air_update_turf(1)
+/obj/structure/window/examine(mob/user)
..()
- if(health <= 0)
- destroy()
- return
+ if(reinf)
+ if(anchored && state == WINDOW_SCREWED_TO_FRAME)
+ to_chat(user, "The window is screwed to the frame.")
+ else if(anchored && state == WINDOW_IN_FRAME)
+ to_chat(user, "The window is unscrewed but pried into the frame.")
+ else if(anchored && state == WINDOW_OUT_OF_FRAME)
+ to_chat(user, "The window is out of the frame, but could be pried in. It is screwed to the floor.")
+ else if(!anchored)
+ to_chat(user, "The window is unscrewed from the floor, and could be deconstructed by wrenching.")
+ else
+ if(anchored)
+ to_chat(user, "The window is screwed to the floor.")
+ else
+ to_chat(user, "The window is unscrewed from the floor, and could be deconstructed by wrenching.")
+ if(!anchored && !fulltile)
+ to_chat(user, "Alt-click to rotate it clockwise.")
-// This should result in the same materials used to make the window.
-/obj/structure/window/proc/destroy()
- for(var/i=0;i= STAGE_FIVE)
- destroy()
+ deconstruct(FALSE)
-/obj/structure/window/CheckExit(var/atom/movable/O, var/turf/target)
- if(istype(O) && O.checkpass(PASSGLASS))
- return 1
- if(get_dir(O.loc, target) == dir)
- return !density
- return 1
+/obj/structure/window/setDir(direct)
+ if(!fulltile)
+ ..()
+ else
+ ..(FULLTILE_WINDOW_DIR)
/obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1
- if(dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST)
+ if(dir == FULLTILE_WINDOW_DIR)
return 0 //full tile window, you can't move into it!
if(get_dir(loc, target) == dir)
return !density
- else
+ if(istype(mover, /obj/structure/window))
+ var/obj/structure/window/W = mover
+ if(!valid_window_location(loc, W.ini_dir))
+ return FALSE
+ else if(istype(mover, /obj/structure/windoor_assembly))
+ var/obj/structure/windoor_assembly/W = mover
+ if(!valid_window_location(loc, W.ini_dir))
+ return FALSE
+ else if(istype(mover, /obj/machinery/door/window) && !valid_window_location(loc, mover.dir))
+ return FALSE
+ return 1
+
+/obj/structure/window/CheckExit(atom/movable/O, target)
+ if(istype(O) && O.checkpass(PASSGLASS))
return 1
+ if(get_dir(O.loc, target) == dir)
+ return 0
+ return 1
/obj/structure/window/CanAStarPass(ID, to_dir)
if(!density)
return 1
- if((dir == SOUTHWEST) || (dir == to_dir))
+ if((dir == FULLTILE_WINDOW_DIR) || (dir == to_dir))
return 0
return 1
-/obj/structure/window/hitby(atom/movable/AM)
- ..()
- var/tforce = 0
- if(ismob(AM))
- tforce = 10
- else if(isobj(AM))
- var/obj/O = AM
- tforce = O.throwforce
- if(reinf)
- tforce *= 0.25
- playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
- health = max(0, health - tforce)
- if(health <= 7 && !reinf)
- anchored = 0
- update_nearby_icons()
- step(src, get_dir(AM, src))
- if(health <= 0)
- destroy()
+/obj/structure/window/attack_tk(mob/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.visible_message("Something knocks on [src].")
+ add_fingerprint(user)
+ playsound(src, 'sound/effects/Glassknock.ogg', 50, 1)
+/obj/structure/window/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+ if(!can_be_reached(user))
+ return 1
+ . = ..()
-/obj/structure/window/attack_hand(mob/user as mob)
- if(HULK in user.mutations)
- user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
- user.visible_message("[user] smashes through [src]!")
- destroy()
- else if(user.a_intent == INTENT_HARM)
+/obj/structure/window/attack_hand(mob/user)
+ if(!can_be_reached(user))
+ return
+ if(user.a_intent == INTENT_HARM)
user.changeNext_move(CLICK_CD_MELEE)
- playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
- user.visible_message("[user.name] bangs against the [src.name]!", \
- "You bang against the [src.name]!", \
+ playsound(src, 'sound/effects/glassknock.ogg', 80, 1)
+ user.visible_message("[user] bangs against [src]!", \
+ "You bang against [src]!", \
"You hear a banging sound.")
+ add_fingerprint(user)
else
user.changeNext_move(CLICK_CD_MELEE)
- playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
- user.visible_message("[user.name] knocks on the [src.name].", \
- "You knock on the [src.name].", \
+ playsound(src, 'sound/effects/glassknock.ogg', 80, 1)
+ user.visible_message("[user] knocks on [src].", \
+ "You knock on [src].", \
"You hear a knocking sound.")
- return
+ add_fingerprint(user)
-
-/obj/structure/window/attack_generic(mob/living/user, damage = 0) //used by attack_alien, attack_animal, and attack_slime
- user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src)
- health -= damage
- if(health <= 0)
- user.visible_message("[user] smashes through [src]!")
- destroy()
- else //for nicer text~
- user.visible_message("[user] smashes into [src]!")
- playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
-
-
-/obj/structure/window/attack_alien(mob/living/user as mob)
- if(islarva(user)) return
- attack_generic(user, 15)
-
-/obj/structure/window/attack_animal(mob/living/user as mob)
- if(!isanimal(user)) return
- var/mob/living/simple_animal/M = user
- if(M.melee_damage_upper <= 0 || (M.melee_damage_type != BRUTE && M.melee_damage_type != BURN))
+/obj/structure/window/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) //used by attack_alien, attack_animal, and attack_slime
+ if(!can_be_reached(user))
return
- attack_generic(M, M.melee_damage_upper)
+ ..()
+/obj/structure/window/attackby(obj/item/I, mob/living/user, params)
+ if(!can_be_reached(user))
+ return 1 //skip the afterattack
-/obj/structure/window/attack_slime(mob/living/user as mob)
- var/mob/living/carbon/slime/S = user
- if(!S.is_adult)
+ add_fingerprint(user)
+
+ if(iswelder(I) && user.a_intent == INTENT_HELP)
+ var/obj/item/weldingtool/WT = I
+ if(obj_integrity < max_integrity)
+ if(WT.remove_fuel(0,user))
+ to_chat(user, "You begin repairing [src]...")
+ playsound(src, WT.usesound, 40, 1)
+ if(do_after(user, 40*I.toolspeed, target = src))
+ obj_integrity = max_integrity
+ playsound(src, 'sound/items/Welder2.ogg', 50, 1)
+ update_nearby_icons()
+ to_chat(user, "You repair [src].")
+ else
+ to_chat(user, "[src] is already in good condition!")
return
- attack_generic(user, rand(10, 15))
-
-/obj/structure/window/attackby(obj/item/I as obj, mob/living/user as mob, params)
- if(!istype(I))
- return//I really wish I did not need this
- if(istype(I, /obj/item/grab) && get_dist(src,user)<2)
+ if(istype(I, /obj/item/grab) && get_dist(src, user) < 2)
var/obj/item/grab/G = I
- if(istype(G.affecting,/mob/living))
+ if(isliving(G.affecting))
var/mob/living/M = G.affecting
var/state = G.state
qdel(I) //gotta delete it here because if window breaks, it won't get deleted
@@ -192,129 +232,120 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
if(1)
M.visible_message("[user] slams [M] against \the [src]!")
M.apply_damage(7)
- hit(10)
+ take_damage(10)
if(2)
M.visible_message("[user] bashes [M] against \the [src]!")
if(prob(50))
M.Weaken(1)
M.apply_damage(10)
- hit(25)
+ take_damage(25)
if(3)
M.visible_message("[user] crushes [M] against \the [src]!")
M.Weaken(5)
M.apply_damage(20)
- hit(50)
+ take_damage(50)
if(4)
visible_message("[user] smashes [M] against \the [src]!")
M.Weaken(5)
M.apply_damage(30)
- hit(75)
+ take_damage(75)
return
- if(I.flags & NOBLUDGEON)
- return
-
- if(handle_decon(I, user, is_fulltile()))
- return
-
- if(I.damtype == BRUTE || I.damtype == BURN)
- user.changeNext_move(CLICK_CD_MELEE)
- hit(I.force)
- if(health <= 7)
- anchored = 0
- update_nearby_icons()
- step(src, get_dir(user, src))
- else
- playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
- ..()
-
-/obj/structure/window/proc/handle_decon(obj/item/W, mob/user, var/takes_time = FALSE)
- //screwdriver
- if(isscrewdriver(W))
- playsound(loc, W.usesound, 75, 1)
- if(reinf)
- if(state == 0)
- if(takes_time)
- to_chat(user, "You begin to [anchored ? "unfasten the frame from" : "fasten the frame to"] the floor.")
- if(!do_after(user, 20 * W.toolspeed, target = src))
- return 1
- anchored = !anchored
- to_chat(user, "You have [anchored? "fastened the frame to" : "unfastened the frame from"] the floor.")
- if(state >= 1)
- if(takes_time)
- to_chat(user, "You begin to [(state == 1) ? "fasten the window to" : "unfasten the window from"] the frame.")
- if(!do_after(user, 20 * W.toolspeed, target = src))
- return 1
- state = 3 - state
- to_chat(user, "You have [(state == 1) ? "unfastened the window from" : "fastened the window to"] the frame.")
- else
- if(takes_time)
- to_chat(user, "You begin to [anchored ? "unfasten the frame from" : "fasten the frame to"] the floor.")
- if(!do_after(user, 20 * W.toolspeed, target = src))
- return 1
- anchored = !anchored
- update_nearby_icons()
- to_chat(user, "You have [anchored ? "fastened the window to" : "unfastened the window from"] the floor.")
- return 1
- //crowbar
- if(iscrowbar(W))
- if(!reinf || state > 1)
- return 0
- playsound(loc, W.usesound, 75, 1)
- if(takes_time)
- to_chat(user, "You begin to pry the window [state ? "out of" : "in to"] the frame.")
- if(!do_after(user, 20 * W.toolspeed, target = src))
- return 1
- state = 1 - state
- to_chat(user, "You have pried the window [state ? "into" : "out of"] the frame.")
- return 1
- //wrench
- if(iswrench(W))
- if(anchored)
- return 0
- playsound(loc, W.usesound, 50, 1)
- if(takes_time)
- to_chat(user, "You begin to disassemble [src]...")
- if(!do_after(user, 20 * W.toolspeed, target = src))
- return 1
- for(var/i=0; i= S.max_amount)
- continue
- S.attackby(NS, user)
+ if(can_deconstruct)
+ if(isscrewdriver(I))
+ playsound(src, I.usesound, 75, 1)
if(reinf)
- var/obj/item/stack/rods/NR = new (get_turf(src))
- for(var/obj/item/stack/rods/R in loc)
- if(R == NR)
- continue
- if(R.amount >= R.max_amount)
- continue
- R.attackby(NR, user)
+ if(state == WINDOW_SCREWED_TO_FRAME || state == WINDOW_IN_FRAME)
+ to_chat(user, "You begin to [state == WINDOW_SCREWED_TO_FRAME ? "unscrew the window from":"screw the window to"] the frame...")
+ if(do_after(user, decon_speed*I.toolspeed, target = src, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
+ state = (state == WINDOW_IN_FRAME ? WINDOW_SCREWED_TO_FRAME : WINDOW_IN_FRAME)
+ to_chat(user, "You [state == WINDOW_IN_FRAME ? "unfasten the window from":"fasten the window to"] the frame.")
+ else if(state == WINDOW_OUT_OF_FRAME)
+ to_chat(user, "You begin to [anchored ? "unscrew the frame from":"screw the frame to"] the floor...")
+ if(do_after(user, decon_speed*I.toolspeed, target = src, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
+ anchored = !anchored
+ update_nearby_icons()
+ to_chat(user, "You [anchored ? "fasten the frame to":"unfasten the frame from"] the floor.")
+ else //if we're not reinforced, we don't need to check or update state
+ to_chat(user, "You begin to [anchored ? "unscrew the window from":"screw the window to"] the floor...")
+ if(do_after(user, decon_speed*I.toolspeed, target = src, extra_checks = CALLBACK(src, .proc/check_anchored, anchored)))
+ anchored = !anchored
+ air_update_turf(TRUE)
+ update_nearby_icons()
+ to_chat(user, "You [anchored ? "fasten the window to":"unfasten the window from"] the floor.")
+ return
- to_chat(user, "You have disassembled [src].")
- disassembled = 1
- density = 0
- air_update_turf(1)
- update_nearby_icons()
- qdel(src)
- return 1
+ else if(iscrowbar(I) && reinf && (state == WINDOW_OUT_OF_FRAME || state == WINDOW_IN_FRAME))
+ to_chat(user, "You begin to lever the window [state == WINDOW_OUT_OF_FRAME ? "into":"out of"] the frame...")
+ playsound(src, I.usesound, 75, 1)
+ if(do_after(user, decon_speed*I.toolspeed, target = src, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
+ state = (state == WINDOW_OUT_OF_FRAME ? WINDOW_IN_FRAME : WINDOW_OUT_OF_FRAME)
+ to_chat(user, "You pry the window [state == WINDOW_IN_FRAME ? "into":"out of"] the frame.")
+ return
+
+ else if(iswrench(I) && !anchored)
+ playsound(src, I.usesound, 75, 1)
+ to_chat(user, " You begin to disassemble [src]...")
+ if(do_after(user, decon_speed*I.toolspeed, target = src, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
+ var/obj/item/stack/sheet/G = new glass_type(user.loc, glass_amount)
+ G.add_fingerprint(user)
+ playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
+ to_chat(user, "You successfully disassemble [src].")
+ qdel(src)
+ return
+ return ..()
+
+/obj/structure/window/proc/check_state(checked_state)
+ if(state == checked_state)
+ return TRUE
+
+/obj/structure/window/proc/check_anchored(checked_anchored)
+ if(anchored == checked_anchored)
+ return TRUE
+
+/obj/structure/window/proc/check_state_and_anchored(checked_state, checked_anchored)
+ return check_state(checked_state) && check_anchored(checked_anchored)
/obj/structure/window/mech_melee_attack(obj/mecha/M)
- if(..())
- hit(M.force, 1)
-
-/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
- if(reinf) damage *= 0.5
- health = max(0, health - damage)
- if(sound_effect)
- playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
- if(health <= 0)
- destroy()
+ if(!can_be_reached())
return
+ ..()
+/obj/structure/window/proc/can_be_reached(mob/user)
+ if(!fulltile)
+ if(get_dir(user, src) & dir)
+ for(var/obj/O in loc)
+ if(!O.CanPass(user, user.loc, 1))
+ return 0
+ return 1
+
+/obj/structure/window/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
+ . = ..()
+ if(.) //received damage
+ update_nearby_icons()
+
+/obj/structure/window/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ switch(damage_type)
+ if(BRUTE)
+ if(damage_amount)
+ playsound(src, hitsound, 75, 1)
+ else
+ playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+ if(BURN)
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
+
+/obj/structure/window/deconstruct(disassembled = TRUE)
+ if(QDELETED(src))
+ return
+ if(!disassembled)
+ playsound(src, breaksound, 70, 1)
+ if(can_deconstruct)
+ for(var/i in debris)
+ var/obj/item/I = i
+ I.forceMove(loc)
+ transfer_fingerprints_to(I)
+ qdel(src)
+ update_nearby_icons()
/obj/structure/window/verb/rotate()
set name = "Rotate Window Counter-Clockwise"
@@ -325,15 +356,19 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
return
if(anchored)
- to_chat(usr, "It is fastened to the floor therefore you can't rotate it!")
- return 0
+ to_chat(usr, "[src] cannot be rotated while it is fastened to the floor!")
+ return FALSE
- dir = turn(dir, 90)
-// updateSilicate()
+ var/target_dir = turn(dir, 90)
+ if(!valid_window_location(loc, target_dir))
+ to_chat(usr, "[src] cannot be rotated in that direction!")
+ return FALSE
+
+ setDir(target_dir)
air_update_turf(1)
ini_dir = dir
add_fingerprint(usr)
- return
+ return TRUE
/obj/structure/window/verb/revrotate()
set name = "Rotate Window Clockwise"
@@ -344,16 +379,19 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
return
if(anchored)
- to_chat(usr, "It is fastened to the floor therefore you can't rotate it!")
- return 0
+ to_chat(usr, "[src] cannot be rotated while it is fastened to the floor!")
+ return FALSE
- dir = turn(dir, 270)
-// updateSilicate()
- air_update_turf(1)
+ var/target_dir = turn(dir, 270)
+
+ if(!valid_window_location(loc, target_dir))
+ to_chat(usr, "[src] cannot be rotated in that direction!")
+ return FALSE
+
+ setDir(target_dir)
ini_dir = dir
add_fingerprint(usr)
- return
-
+ return TRUE
/obj/structure/window/AltClick(mob/user)
if(user.incapacitated())
@@ -363,158 +401,77 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
return
revrotate()
-/*
-/obj/structure/window/proc/updateSilicate()
- if(silicateIcon && silicate)
- icon = initial(icon)
-
- var/icon/I = icon(icon,icon_state,dir)
-
- var/r = (silicate / 100) + 1
- var/g = (silicate / 70) + 1
- var/b = (silicate / 50) + 1
- I.SetIntensity(r,g,b)
- icon = I
- silicateIcon = I
-*/
-
-/obj/structure/window/New(Loc,re=0)
- ..()
- ini_dir = dir
- if(!color && !istype(src,/obj/structure/window/plasmabasic) && !istype(src,/obj/structure/window/plasmareinforced))
- color = color_windows(src)
- update_nearby_icons()
- return
-
-/obj/structure/window/initialize()
- air_update_turf(1)
- return ..()
-
/obj/structure/window/Destroy()
- density = 0
+ density = FALSE
air_update_turf(1)
- if(loc && !disassembled)
- playsound(get_turf(src), "shatter", 70, 1)
+ update_nearby_icons()
return ..()
-
/obj/structure/window/Move()
var/turf/T = loc
..()
- dir = ini_dir
+ setDir(ini_dir)
move_update_air(T)
-//checks if this window is full-tile one
-/obj/structure/window/proc/is_fulltile()
- if(dir & (dir - 1))
- return 1
- return 0
-
/obj/structure/window/CanAtmosPass(turf/T)
- if(get_dir(loc, T) == dir)
- return !density
- if(dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST)
- return !density
- return 1
+ if(!anchored || !density)
+ return TRUE
+ return !(FULLTILE_WINDOW_DIR == dir || dir == get_dir(loc, T))
//This proc is used to update the icons of nearby windows.
/obj/structure/window/proc/update_nearby_icons()
- if(!loc) return 0
update_icon()
- for(var/direction in cardinal)
- for(var/obj/structure/window/W in get_step(src,direction) )
- W.update_icon()
+ if(smooth)
+ smooth_icon_neighbors(src)
/obj/structure/window/update_icon()
- return
+ if(!QDELETED(src))
+ if(!fulltile)
+ return
+ var/ratio = obj_integrity / max_integrity
+ ratio = CEILING(ratio*4, 1) * 25
+ if(smooth)
+ smooth_icon(src)
+ overlays -= crack_overlay
+ if(ratio > 75)
+ return
+ crack_overlay = image('icons/obj/structures.dmi',"damage[ratio]",-(layer+0.1))
+ overlays += crack_overlay
/obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- if(exposed_temperature > T0C + 800)
- hit(round(exposed_volume / 100), 0)
+ if(exposed_temperature > (T0C + heat_resistance))
+ take_damage(round(exposed_volume / 100), BURN, 0, 0)
..()
+/obj/structure/window/GetExplosionBlock()
+ return reinf && fulltile ? real_explosion_block : 0
+
/obj/structure/window/basic
- icon_state = "window"
desc = "It looks thin and flimsy. A few knocks with... anything, really should shatter it."
- basestate = "window"
-
-/obj/structure/window/plasmabasic
- name = "plasma window"
- desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
- basestate = "plasmawindow"
- icon_state = "plasmawindow"
- shardtype = /obj/item/shard/plasma
- glasstype = /obj/item/stack/sheet/plasmaglass
- health = 120
- armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100)
-
-/obj/structure/window/plasmabasic/New(Loc,re=0)
- ..()
- ini_dir = dir
- update_nearby_icons()
- return
-
-/obj/structure/window/plasmabasic/initialize()
- ..()
- air_update_turf(1)
-
-/obj/structure/window/plasmabasic/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- if(exposed_temperature > T0C + 32000)
- hit(round(exposed_volume / 1000), 0)
- ..()
-
-/obj/structure/window/plasmabasic/BlockSuperconductivity()
- return 1
-
-/obj/structure/window/plasmareinforced
- name = "reinforced plasma window"
- desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
- basestate = "plasmarwindow"
- icon_state = "plasmarwindow"
- shardtype = /obj/item/shard/plasma
- glasstype = /obj/item/stack/sheet/plasmaglass
- reinf = 1
- health = 160
- armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100)
-
-/obj/structure/window/plasmareinforced/New(Loc,re=0)
- ..()
- ini_dir = dir
- update_nearby_icons()
- return
-
-/obj/structure/window/plasmareinforced/initialize()
- ..()
- air_update_turf(1)
-
-/obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- return
-
-/obj/structure/window/plasmareinforced/BlockSuperconductivity()
- return 1 //okay this SHOULD MAKE THE TOXINS CHAMBER WORK
/obj/structure/window/reinforced
name = "reinforced window"
desc = "It looks rather strong. Might take a few good hits to shatter it."
icon_state = "rwindow"
- reinf = 1
- basestate = "rwindow"
- health = 40
+ reinf = TRUE
+ cancolor = TRUE
+ heat_resistance = 1600
armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100)
+ max_integrity = 50
+ explosion_block = 1
+ glass_type = /obj/item/stack/sheet/rglass
/obj/structure/window/reinforced/tinted
name = "tinted window"
desc = "It looks rather strong and opaque. Might take a few good hits to shatter it."
icon_state = "twindow"
- basestate = "twindow"
opacity = 1
/obj/structure/window/reinforced/tinted/frosted
name = "frosted window"
desc = "It looks rather strong and frosted over. Looks like it might take a few less hits then a normal reinforced window."
icon_state = "fwindow"
- basestate = "fwindow"
- health = 30
+ max_integrity = 30
/obj/structure/window/reinforced/polarized
name = "electrochromic window"
@@ -529,8 +486,6 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
animate(src, color="#222222", time=5)
set_opacity(1)
-
-
/obj/machinery/button/windowtint
name = "window tint control"
icon = 'icons/obj/power.dmi'
@@ -540,7 +495,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
var/id = 0
var/active = 0
-/obj/machinery/button/windowtint/attack_hand(mob/user as mob)
+/obj/machinery/button/windowtint/attack_hand(mob/user)
if(..())
return 1
@@ -565,3 +520,195 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
/obj/machinery/button/windowtint/update_icon()
icon_state = "light[active]"
+
+/obj/structure/window/plasmabasic
+ name = "plasma window"
+ desc = "A window made out of a plasma-silicate alloy. It looks insanely tough to break and burn through."
+ icon_state = "plasmawindow"
+ shardtype = /obj/item/shard/plasma
+ glass_type = /obj/item/stack/sheet/plasmaglass
+ heat_resistance = 32000
+ max_integrity = 120
+ explosion_block = 1
+ armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100)
+
+/obj/structure/window/plasmabasic/BlockSuperconductivity()
+ return 1
+
+/obj/structure/window/plasmareinforced
+ name = "reinforced plasma window"
+ desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
+ icon_state = "plasmarwindow"
+ shardtype = /obj/item/shard/plasma
+ glass_type = /obj/item/stack/sheet/plasmaglass
+ reinf = TRUE
+ max_integrity = 160
+ explosion_block = 2
+ armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100)
+
+/obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+ return
+
+/obj/structure/window/plasmareinforced/BlockSuperconductivity()
+ return 1 //okay this SHOULD MAKE THE TOXINS CHAMBER WORK
+
+/obj/structure/window/full
+ glass_amount = 2
+ dir = FULLTILE_WINDOW_DIR
+ level = 3
+ fulltile = TRUE
+
+/obj/structure/window/full/basic
+ desc = "It looks thin and flimsy. A few knocks with... anything, really should shatter it."
+ icon = 'icons/obj/smooth_structures/window.dmi'
+ icon_state = "window"
+ max_integrity = 50
+ smooth = SMOOTH_TRUE
+ cancolor = TRUE
+ canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced)
+
+/obj/structure/window/full/plasmabasic
+ name = "plasma window"
+ desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
+ icon = 'icons/obj/smooth_structures/plasma_window.dmi'
+ icon_state = "plasmawindow"
+ shardtype = /obj/item/shard/plasma
+ glass_type = /obj/item/stack/sheet/plasmaglass
+ heat_resistance = 32000
+ max_integrity = 240
+ smooth = SMOOTH_TRUE
+ canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced)
+
+/obj/structure/window/full/plasmareinforced
+ name = "reinforced plasma window"
+ desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
+ icon = 'icons/obj/smooth_structures/rplasma_window.dmi'
+ icon_state = "rplasmawindow"
+ shardtype = /obj/item/shard/plasma
+ glass_type = /obj/item/stack/sheet/plasmaglass
+ smooth = SMOOTH_TRUE
+ reinf = TRUE
+ max_integrity = 320
+
+/obj/structure/window/full/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+ return
+
+/obj/structure/window/full/reinforced
+ name = "reinforced window"
+ desc = "It looks rather strong. Might take a few good hits to shatter it."
+ icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
+ icon_state = "r_window"
+ smooth = SMOOTH_TRUE
+ canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced)
+ max_integrity = 100
+ reinf = TRUE
+ heat_resistance = 1600
+ armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100)
+ explosion_block = 1
+ glass_type = /obj/item/stack/sheet/rglass
+ cancolor = TRUE
+
+/obj/structure/window/full/reinforced/tinted
+ name = "tinted window"
+ desc = "It looks rather strong and opaque. Might take a few good hits to shatter it."
+ icon = 'icons/obj/smooth_structures/tinted_window.dmi'
+ icon_state = "tinted_window"
+ opacity = 1
+
+obj/structure/window/full/reinforced/ice
+ icon = 'icons/obj/smooth_structures/rice_window.dmi'
+ icon_state = "ice_window"
+ max_integrity = 150
+ cancolor = FALSE
+
+/obj/structure/window/full/shuttle
+ name = "shuttle window"
+ desc = "A reinforced, air-locked pod window."
+ icon = 'icons/obj/smooth_structures/shuttle_window.dmi'
+ icon_state = "shuttle_window"
+ max_integrity = 160
+ reinf = TRUE
+ heat_resistance = 1600
+ explosion_block = 3
+ armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100)
+ smooth = SMOOTH_TRUE
+ canSmoothWith = null
+ glass_type = /obj/item/stack/sheet/titaniumglass
+
+/obj/structure/window/full/shuttle/narsie_act()
+ color = "#3C3434"
+
+/obj/structure/window/full/shuttle/tinted
+ opacity = TRUE
+
+/obj/structure/window/plastitanium
+ name = "plastitanium window"
+ desc = "An evil looking window of plasma and titanium."
+ icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
+ icon_state = "plastitanium_window"
+ dir = FULLTILE_WINDOW_DIR
+ max_integrity = 100
+ fulltile = TRUE
+ reinf = TRUE
+ heat_resistance = 1600
+ armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100)
+ smooth = SMOOTH_TRUE
+ canSmoothWith = null
+ explosion_block = 3
+ level = 3
+ glass_type = /obj/item/stack/sheet/plastitaniumglass
+ glass_amount = 2
+
+/obj/structure/window/reinforced/clockwork
+ name = "brass window"
+ desc = "A paper-thin pane of translucent yet reinforced brass."
+ icon = 'icons/obj/smooth_structures/clockwork_window.dmi'
+ icon_state = "clockwork_window_single"
+ burn_state = FIRE_PROOF
+ unacidable = 1
+ max_integrity = 80
+ armor = list("melee" = 60, "bullet" = 25, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100)
+ explosion_block = 2 //fancy AND hard to destroy. the most useful combination.
+ glass_type = /obj/item/stack/tile/brass
+ reinf = FALSE
+ cancolor = FALSE
+ var/made_glow = FALSE
+
+/obj/structure/window/reinforced/clockwork/New(loc, direct)
+ if(fulltile)
+ made_glow = TRUE
+ ..()
+ QDEL_LIST(debris)
+ if(fulltile)
+ new /obj/effect/temp_visual/ratvar/window(get_turf(src))
+ debris += new/obj/item/stack/tile/brass(src, 2)
+ else
+ debris += new/obj/item/stack/tile/brass(src, 1)
+
+/obj/structure/window/reinforced/clockwork/setDir(direct)
+ if(!made_glow)
+ var/obj/effect/E = new /obj/effect/temp_visual/ratvar/window/single(get_turf(src))
+ E.setDir(direct)
+ made_glow = TRUE
+ ..()
+
+/obj/structure/window/reinforced/clockwork/ratvar_act()
+ obj_integrity = max_integrity
+ update_icon()
+
+/obj/structure/window/reinforced/clockwork/narsie_act()
+ take_damage(rand(25, 75), BRUTE)
+ if(src)
+ var/previouscolor = color
+ color = "#960000"
+ animate(src, color = previouscolor, time = 8)
+
+/obj/structure/window/reinforced/clockwork/fulltile
+ icon_state = "clockwork_window"
+ smooth = SMOOTH_TRUE
+ canSmoothWith = null
+ fulltile = TRUE
+ dir = FULLTILE_WINDOW_DIR
+ max_integrity = 120
+ level = 3
+ glass_amount = 2
\ No newline at end of file
diff --git a/code/game/response_team.dm b/code/game/response_team.dm
index 9fdf3121b59..c59dd7bd78f 100644
--- a/code/game/response_team.dm
+++ b/code/game/response_team.dm
@@ -104,8 +104,12 @@ var/ert_request_answered = 0
if(index > emergencyresponseteamspawn.len)
index = 1
+ if(!M || !M.client)
+ continue
var/client/C = M.client
var/mob/living/new_commando = C.create_response_team(emergencyresponseteamspawn[index])
+ if(!M || !new_commando)
+ continue
new_commando.mind.key = M.key
new_commando.key = M.key
new_commando.update_icons()
@@ -157,17 +161,17 @@ var/ert_request_answered = 0
head_organ.h_style = random_hair_style(M.gender, head_organ.species.name)
head_organ.f_style = random_facial_hair_style(M.gender, head_organ.species.name)
- M.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]"
- M.name = M.real_name
+ M.rename_character(null, "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]")
M.age = rand(23,35)
M.regenerate_icons()
M.update_body()
+ M.update_dna()
//Creates mind stuff.
M.mind = new
M.mind.current = M
M.mind.original = M
- M.mind.assigned_role = "MODE"
+ M.mind.assigned_role = SPECIAL_ROLE_ERT
M.mind.special_role = SPECIAL_ROLE_ERT
if(!(M.mind in ticker.minds))
ticker.minds += M.mind //Adds them to regular mind list.
@@ -199,13 +203,13 @@ var/ert_request_answered = 0
var/cyborg_unlock = 0
/datum/response_team/proc/setSlots(com, sec, med, eng, jan, par, cyb)
- command_slots = com
- security_slots = sec
- medical_slots = med
- engineer_slots = eng
- janitor_slots = jan
- paranormal_slots = par
- cyborg_slots = cyb
+ command_slots = com == null ? command_slots : com
+ security_slots = sec == null ? security_slots : sec
+ medical_slots = med == null ? medical_slots : med
+ engineer_slots = eng == null ? engineer_slots : eng
+ janitor_slots = jan == null ? janitor_slots : jan
+ paranormal_slots = par == null ? paranormal_slots : par
+ cyborg_slots = cyb == null ? cyborg_slots : cyb
/datum/response_team/proc/reduceCyborgSlots()
cyborg_slots--
@@ -280,8 +284,7 @@ var/ert_request_answered = 0
command_slots = 0
// Override name and age for the commander
- M.real_name = "[pick("Lieutenant", "Captain", "Major")] [pick(last_names)]"
- M.name = M.real_name
+ M.rename_character(null, "[pick("Lieutenant", "Captain", "Major")] [pick(last_names)]")
M.age = rand(35,45)
M.equipOutfit(command_outfit)
diff --git a/code/game/skincmd.dm b/code/game/skincmd.dm
deleted file mode 100644
index 7d27a1ce6df..00000000000
--- a/code/game/skincmd.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-/mob/var/skincmds = list()
-/obj/proc/SkinCmd(mob/user as mob, var/data as text)
-
-/proc/SkinCmdRegister(var/mob/user, var/name as text, var/O as obj)
- user.skincmds[name] = O
-
-/mob/verb/skincmd(data as text)
- set hidden = 1
-
- var/ref = copytext(data, 1, findtext(data, ";"))
- if(src.skincmds[ref] != null)
- var/obj/a = src.skincmds[ref]
- a.SkinCmd(src, copytext(data, findtext(data, ";") + 1))
\ No newline at end of file
diff --git a/code/game/smoothwall.dm b/code/game/smoothwall.dm
deleted file mode 100644
index 20dea8de7b0..00000000000
--- a/code/game/smoothwall.dm
+++ /dev/null
@@ -1,108 +0,0 @@
-// OKAY I DON'T KNOW WHO THE FUCK ORIGINALLY CODED THIS BUT THEY ARE OFFICIALLY FIRED FOR BEING DRUNK AND STUPID
-// FUCK YOU MYSTERY CODERS
-// FOR THIS SHIT I'M GOING TO MAKE ALL MY COMMENTS IN CAPS
-
-/atom
- var/list/canSmoothWith=list() // TYPE PATHS I CAN SMOOTH WITH~~~~~
-
-// MOVED INTO UTILITY FUNCTION FOR LESS DUPLICATED CODE.
-/atom/proc/findSmoothingNeighbors()
- // THIS IS A BITMAP BECAUSE NORTH/SOUTH/ETC ARE ALL BITFLAGS BECAUSE BYOND IS DUMB AND
- // DOESN'T FUCKING MAKE SENSE, BUT IT WORKS TO OUR ADVANTAGE
- var/junction = 0
- for(var/cdir in cardinal)
- var/turf/T = get_step(src,cdir)
- if(isSmoothableNeighbor(T))
- junction |= cdir
- continue // NO NEED FOR FURTHER SEARCHING IN THIS TILE
- for(var/atom/A in T)
- if(isSmoothableNeighbor(A))
- junction |= cdir
- break // NO NEED FOR FURTHER SEARCHING IN THIS TILE
-
- return junction
-
-/atom/proc/isSmoothableNeighbor(var/atom/A)
- return is_type_in_list(A,canSmoothWith)
-
-/turf/simulated/wall/isSmoothableNeighbor(var/atom/A)
- if(is_type_in_list(A,canSmoothWith))
- // COLON OPERATORS ARE TERRIBLE BUT I HAVE NO CHOICE
- if(src.mineral == A:mineral) //mineral not walltype so reinf still smooths with normal and vice versa
- return 1
- return 0
-
-/**
- * WALL SMOOTHING SHIT
- *
- * IN /ATOM BECAUSE /TURFS ARE /ATOMS AND SO ARE /OBJ/STRUCTURE/FALSEWALLS
- * THIS IS STUPID BUT IS FAIRLY ELEGANT FOR BYOND
- *
- * HOWEVER, INSTEAD OF MAKING ONE BIG GODDAMN MONOLITHIC PROC LIKE A FUCKING
- * SHITTY FUNCTIONAL PROGRAMMER, WE WILL BE COOL AND MODERN AND USE INHERITANCE.
- */
-/atom/proc/relativewall()
- return // DOES JACK SHIT BY DEFAULT. OLD BEHAVIOR WAS TO SPAM LOOPS ANYWAY.
-
-/*
- * SEE? NOW WE ONLY HAVE TO PROGRAM THIS SHIT INTO WHAT WE WANT TO SMOOTH
- * INSTEAD OF BEING DUMB AND HAVING A BIG FUCKING IFTREE WITH TYPECHECKS
- * MY GOD, WE COULD EVEN MOVE THE CODE TO BE WITH THE REST OF THE WALL'S CODE!
- * HOW FUCKING INNOVATIVE. ISN'T INHERITANCE NICE?
- *
- * WE COULD STANDARDIZE THIS BUT EVERYONE'S A FUCKING SNOWFLAKE
- */
-/turf/simulated/wall/relativewall()
- var/junction=findSmoothingNeighbors()
- icon_state = "[walltype][junction]" // WHY ISN'T THIS IN UPDATE_ICON OR SIMILAR
-
-/atom/proc/relativewall_neighbours(var/sko=0) //SKO: Skip Optimizations
- // OPTIMIZE BY NOT CHECKING FOR NEIGHBORS IF WE DON'T FUCKING SMOOTH
- if(canSmoothWith.len>0 || sko)
- relativewall()
- for(var/cdir in cardinal)
- var/turf/T = get_step(src,cdir)
- if(isSmoothableNeighbor(T) || sko)
- T.relativewall()
- for(var/atom/A in T)
- if(isSmoothableNeighbor(A) || sko)
- A.relativewall()
-
-/turf/simulated/wall/New()
- ..()
- relativewall_neighbours()
-
-/turf/simulated/wall/Destroy()
- for(var/obj/effect/E in src)
- if(E.name == "Wallrot")
- qdel(E)
-
- if(!del_suppress_resmoothing)
- spawn(10)
- relativewall_neighbours(sko=1)
-
- // JESUS WHY
- for(var/direction in cardinal)
- for(var/obj/structure/glowshroom/shroom in get_step(src,direction))
- if(!shroom.floor) //shrooms drop to the floor
- shroom.floor = 1
- shroom.icon_state = "glowshroomf"
- shroom.pixel_x = 0
- shroom.pixel_y = 0
-/* for(var/obj/effect/supermatter_crystal/crystal in get_step(src,direction))
- if(!crystal.floor) //crystals drop to the floor
- crystal.floor = 1
- crystal.icon_state = "supermatter_crystalf"
- crystal.pixel_x = 0
- crystal.pixel_y = 0 */
- return ..()
-
-// DE-HACK
-/turf/simulated/wall/vault/relativewall()
- return
-
-
-/obj/structure/alien/resin/relativewall()
- var/junction = findSmoothingNeighbors()
- icon_state = "[resintype][junction]"
- return
\ No newline at end of file
diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm
index cbb5647f283..cba841ce823 100644
--- a/code/game/turfs/simulated/floor/plasteel_floor.dm
+++ b/code/game/turfs/simulated/floor/plasteel_floor.dm
@@ -18,8 +18,13 @@
/turf/simulated/floor/plasteel/airless/New()
..()
- name = "floor"
-
+ name = "floor"
+
+/turf/simulated/floor/plasteel/airless/indestructible // For bomb testing range
+
+/turf/simulated/floor/plasteel/airless/indestructible/ex_act(severity)
+ return
+
/turf/simulated/floor/plasteel/goonplaque
icon_state = "plaque"
name = "Commemorative Plaque"
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index b1cbf84493f..db85329f8c1 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -214,7 +214,7 @@
//Interactions
-/turf/simulated/wall/attack_animal(var/mob/living/simple_animal/M)
+/turf/simulated/wall/attack_animal(mob/living/simple_animal/M)
M.changeNext_move(CLICK_CD_MELEE)
M.do_attack_animation(src)
if((M.environment_smash & ENVIRONMENT_SMASH_WALLS) || (M.environment_smash & ENVIRONMENT_SMASH_RWALLS))
@@ -229,20 +229,19 @@
to_chat(M, "You push the wall but nothing happens!")
return
-/turf/simulated/wall/attack_hand(mob/user as mob)
- user.changeNext_move(CLICK_CD_MELEE)
- if(HULK in user.mutations)
- if(prob(hardness) || rotting)
- playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
- to_chat(user, text("You smash through the wall."))
- user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
- dismantle_wall(1)
- return
- else
- playsound(src, 'sound/effects/bang.ogg', 50, 1)
- to_chat(user, text("You punch the wall."))
- return
+/turf/simulated/wall/attack_hulk(mob/user, does_attack_animation = FALSE)
+ ..(user, TRUE)
+ if(prob(hardness) || rotting)
+ playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
+ user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+ dismantle_wall(TRUE)
+ else
+ playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ to_chat(user, text("You punch the wall."))
+ return TRUE
+/turf/simulated/wall/attack_hand(mob/user)
+ user.changeNext_move(CLICK_CD_MELEE)
if(rotting)
if(hardness <= 10)
to_chat(user, "This wall feels rather unstable.")
@@ -254,183 +253,169 @@
to_chat(user, "You push the wall but nothing happens!")
playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
- src.add_fingerprint(user)
- ..()
- return
+ add_fingerprint(user)
+ return ..()
-/turf/simulated/wall/attackby(obj/item/W as obj, mob/user as mob, params)
+/turf/simulated/wall/attackby(obj/item/I, mob/user, params)
user.changeNext_move(CLICK_CD_MELEE)
- if(!user.IsAdvancedToolUser())
- to_chat(user, "You don't have the dexterity to do this!")
+
+ if(!isturf(user.loc))
+ return // No touching walls unless you're on a turf (pretty sure attackby can't be called anyways but whatever)
+
+ if(rotting && try_rot(I, user, params))
return
- //get the user's location
- if(!istype(user.loc, /turf))
- return //can't do this stuff whilst inside objects and such
+ if(thermite && try_thermite(I, user, params))
+ return
- if(rotting)
- if(istype(W, /obj/item/weldingtool) )
- var/obj/item/weldingtool/WT = W
- if(WT.remove_fuel(0,user))
- to_chat(user, "You burn away the fungi with \the [WT].")
- playsound(src, WT.usesound, 10, 1)
- for(var/obj/effect/overlay/wall_rot/WR in src)
- qdel(WR)
- rotting = 0
- return
- else if(!is_sharp(W) && W.force >= 10 || W.force >= 20)
- to_chat(user, "\The [src] crumbles away under the force of your [W.name].")
- src.dismantle_wall(1)
- return
+ if(try_decon(I, user, params))
+ return
- //THERMITE related stuff. Calls src.thermitemelt() which handles melting simulated walls and the relevant effects
- if(thermite)
- if(istype(W, /obj/item/weldingtool))
- var/obj/item/weldingtool/WT = W
- if(WT.remove_fuel(0,user))
- thermitemelt(user)
- return
+ if(try_destroy(I, user, params))
+ return
- else if(istype(W, /obj/item/gun/energy/plasmacutter))
+ if(try_wallmount(I, user, params))
+ return
+
+ // The magnetic gripper does a separate attackby, so bail from this one
+ if(istype(I, /obj/item/gripper))
+ return
+
+ return ..()
+
+/turf/simulated/wall/proc/try_rot(obj/item/I, mob/user, params)
+ if(iswelder(I))
+ var/obj/item/weldingtool/WT = I
+ if(WT.remove_fuel(0, user))
+ to_chat(user, "You burn away the fungi with [WT].")
+ playsound(src, WT.usesound, 10, 1)
+ for(var/obj/effect/overlay/wall_rot/WR in src)
+ qdel(WR)
+ rotting = 0
+ return TRUE
+ else if((!is_sharp(I) && I.force >= 10) || I.force >= 20)
+ to_chat(user, "[src] crumbles away under the force of your [I.name].")
+ dismantle_wall(1)
+ return TRUE
+ return FALSE
+
+/turf/simulated/wall/proc/try_thermite(obj/item/I, mob/user, params)
+ if(iswelder(I))
+ var/obj/item/weldingtool/WT = I
+ if(WT.remove_fuel(0, user))
thermitemelt(user)
- return
+ return TRUE
- else if(istype(W, /obj/item/melee/energy/blade))
- var/obj/item/melee/energy/blade/EB = W
+ else if(istype(I, /obj/item/gun/energy/plasmacutter))
+ thermitemelt(user)
+ return TRUE
- EB.spark_system.start()
- to_chat(user, "You slash \the [src] with \the [EB]; the thermite ignites!")
- playsound(src, "sparks", 50, 1)
- playsound(src, EB.usesound, 50, 1)
- thermitemelt(user)
- return
+ return FALSE
- //DECONSTRUCTION
- if(istype(W, /obj/item/weldingtool))
+/turf/simulated/wall/proc/try_decon(obj/item/I, mob/user, params)
+ if(iswelder(I))
+ var/obj/item/weldingtool/WT = I
+ if(!WT.remove_fuel(0, user))
+ to_chat(user, "You need more welding fuel to complete this task.")
+ return TRUE // this means "don't continue trying to find alternative uses in attackby", not "decon succeeded"
var/response = "Dismantle"
if(damage)
response = alert(user, "Would you like to repair or dismantle [src]?", "[src]", "Repair", "Dismantle")
- var/obj/item/weldingtool/WT = W
-
- if(WT.remove_fuel(0,user))
- if(response == "Repair")
+ switch(response)
+ if("Repair")
to_chat(user, "You start repairing the damage to [src].")
playsound(src, WT.usesound, 100, 1)
if(do_after(user, max(5, damage / 5) * WT.toolspeed, target = src) && WT && WT.isOn())
to_chat(user, "You finish repairing the damage to [src].")
take_damage(-damage)
-
- else if(response == "Dismantle")
+ else
to_chat(user, "You begin slicing through the outer plating.")
playsound(src, WT.usesound, 100, 1)
if(do_after(user, 100 * WT.toolspeed, target = src) && WT && WT.isOn())
to_chat(user, "You remove the outer plating.")
dismantle_wall()
-
else
to_chat(user, "You stop slicing through [src].")
- return
-
- else
- to_chat(user, "You need more welding fuel to complete this task.")
- return
-
- else if(istype(W, /obj/item/gun/energy/plasmacutter))
+ return TRUE
+ else if(istype(I, /obj/item/gun/energy/plasmacutter))
to_chat(user, "You begin slicing through the outer plating.")
- playsound(src, W.usesound, 100, 1)
+ playsound(src, I.usesound, 100, 1)
- if(do_after(user, istype(sheet_type, /obj/item/stack/sheet/mineral/diamond) ? 120 * W.toolspeed : 60 * W.toolspeed, target = src))
+ if(do_after(user, istype(sheet_type, /obj/item/stack/sheet/mineral/diamond) ? 120 * I.toolspeed : 60 * I.toolspeed, target = src))
to_chat(user, "You remove the outer plating.")
dismantle_wall()
- visible_message("[user] slices apart \the [src]!","You hear metal being sliced apart.")
+ visible_message("[user] slices apart [src]!", "You hear metal being sliced apart.")
+ return TRUE
- //DRILLING
- else if(istype(W, /obj/item/pickaxe/drill/diamonddrill))
+ return FALSE
+/turf/simulated/wall/proc/try_destroy(obj/item/I, mob/user, params)
+ var/isdiamond = istype(sheet_type, /obj/item/stack/sheet/mineral/diamond) // snowflake bullshit
+
+ if(istype(I, /obj/item/pickaxe/drill/diamonddrill))
to_chat(user, "You begin to drill though the wall.")
- if(do_after(user, istype(sheet_type, /obj/item/stack/sheet/mineral/diamond) ? 480 * W.toolspeed : 240 * W.toolspeed, target = src)) // Diamond pickaxe has 0.25 toolspeed, so 120/60
- to_chat(user, "Your drill tears though the last of the reinforced plating.")
+ if(do_after(user, isdiamond ? 480 * I.toolspeed : 240 * I.toolspeed, target = src)) // Diamond pickaxe has 0.25 toolspeed, so 120/60
+ to_chat(user, "Your [I.name] tears though the last of the reinforced plating.")
dismantle_wall()
- visible_message("[user] drills through \the [src]!","You hear the grinding of metal.")
-
- else if(istype(W, /obj/item/pickaxe/drill/jackhammer))
+ visible_message("[user] drills through [src]!", "You hear the grinding of metal.")
+ return TRUE
+ else if(istype(I, /obj/item/pickaxe/drill/jackhammer))
to_chat(user, "You begin to disintegrates the wall.")
- if(do_after(user, istype(sheet_type, /obj/item/stack/sheet/mineral/diamond) ? 600 * W.toolspeed : 300 * W.toolspeed, target = src)) // Jackhammer has 0.1 toolspeed, so 60/30
- to_chat(user, "Your sonic jackhammer disintegrate the reinforced plating.")
+ if(do_after(user, isdiamond ? 600 * I.toolspeed : 300 * I.toolspeed, target = src)) // Jackhammer has 0.1 toolspeed, so 60/30
+ to_chat(user, "Your [I.name] disintegrates the reinforced plating.")
dismantle_wall()
- visible_message("[user] disintegrates \the [src]!","You hear the grinding of metal.")
+ visible_message("[user] disintegrates [src]!","You hear the grinding of metal.")
+ return TRUE
- else if(istype(W, /obj/item/melee/energy/blade))
- var/obj/item/melee/energy/blade/EB = W
+ return FALSE
- EB.spark_system.start()
- to_chat(user, "You stab \the [EB] into the wall and begin to slice it apart.")
- playsound(src, "sparks", 50, 1)
+/turf/simulated/wall/proc/try_wallmount(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/mounted))
+ return TRUE // We don't want attack_hand running and doing stupid shit with this
- if(do_after(user, istype(sheet_type, /obj/item/stack/sheet/mineral/diamond) ? 140 * EB.toolspeed : 70 * EB.toolspeed, target = src))
- EB.spark_system.start()
- playsound(src, "sparks", 50, 1)
- playsound(src, EB.usesound, 50, 1)
- dismantle_wall(1)
- visible_message("[user] slices apart \the [src]!","You hear metal being sliced apart and sparks flying.")
-
- else if(istype(W,/obj/item/mounted)) //if we place it, we don't want to have a silly message
- return
-
- //Poster stuff
- else if(istype(W, /obj/item/poster))
- place_poster(W, user)
- return
-
- //Bone White - Place pipes on walls
- else if(istype(W,/obj/item/pipe))
- var/obj/item/pipe/V = W
- if(V.pipe_type != -1) // ANY PIPE
- var/obj/item/pipe/P = W
+ if(istype(I, /obj/item/poster))
+ place_poster(I, user)
+ return TRUE
+ //Bone White - Place pipes on walls // I fucking hate your code with a passion bone
+ if(istype(I, /obj/item/pipe))
+ var/obj/item/pipe/P = I
+ if(P.pipe_type != -1) // ANY PIPE
playsound(get_turf(src), 'sound/weapons/circsawhit.ogg', 50, 1)
- user.visible_message( \
- "[user] starts drilling a hole in \the [src].", \
- "You start drilling a hole in \the [src].", \
- "You hear ratchet.")
- if(do_after(user, 80 * W.toolspeed, target = src))
- user.visible_message( \
- "[user] drills a hole in \the [src] and pushes \a [P] into the void", \
- "You have finished drilling in \the [src] and push the [P] into the void.", \
- "You hear ratchet.")
+ user.visible_message(
+ "[user] starts drilling a hole in [src].",
+ "You start drilling a hole in [src].",
+ "You hear a drill.")
+
+ if(do_after(user, 80 * P.toolspeed, target = src))
+ user.visible_message(
+ "[user] drills a hole in [src] and pushes [P] into the void.",
+ "You finish drilling [src] and push [P] into the void.",
+ "You hear a ratchet.")
user.drop_item()
if(P.is_bent_pipe()) // bent pipe rotation fix see construction.dm
- P.dir = 5
+ P.setDir(5)
if(user.dir == 1)
- P.dir = 6
+ P.setDir(6)
else if(user.dir == 2)
- P.dir = 9
+ P.setDir(9)
else if(user.dir == 4)
- P.dir = 10
+ P.setDir(10)
else
- P.dir = user.dir
- P.x = src.x
- P.y = src.y
- P.z = src.z
- P.loc = src
+ P.setDir(user.dir)
+ P.forceMove(src)
P.level = 2
- return
- // The magnetic gripper does a separate attackby, so bail from this one
- else if(istype(W, /obj/item/gripper))
- return
-
- else
- return attack_hand(user)
- return
+ return TRUE
+ return FALSE
/turf/simulated/wall/singularity_pull(S, current_size)
if(current_size >= STAGE_FIVE)
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index 827791be76d..eb054ba19ed 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -33,333 +33,256 @@
if(RWALL_SHEATH)
to_chat(user, "The support rods have been sliced through, and the outer sheath is connected loosely to the girder.")
-/turf/simulated/wall/r_wall/attackby(obj/item/W, mob/user, params)
- user.changeNext_move(CLICK_CD_MELEE)
- if(!user.IsAdvancedToolUser())
- to_chat(user, "You don't have the dexterity to do this!")
+/turf/simulated/wall/r_wall/attackby(obj/item/I, mob/user, params)
+ if(try_repair(I, user, params))
return
+ return ..()
- //get the user's location
- if(!isturf(user.loc))
- return //can't do this stuff whilst inside objects and such
-
- if(rotting)
- if(iswelder(W))
- var/obj/item/weldingtool/WT = W
- if(WT.remove_fuel(0,user))
- to_chat(user, "You burn away the fungi with \the [WT].")
- playsound(src, WT.usesound, 10, 1)
- for(var/obj/effect/overlay/wall_rot/WR in src)
- qdel(WR)
- rotting = 0
- return
- else if(!is_sharp(W) && W.force >= 10 || W.force >= 20)
- to_chat(user, "\The [src] crumbles away under the force of your [W.name].")
- dismantle_wall()
- return
-
- //THERMITE related stuff. Calls src.thermitemelt() which handles melting simulated walls and the relevant effects
- if(thermite)
- if(iswelder(W))
- var/obj/item/weldingtool/WT = W
- if(WT.remove_fuel(0,user))
- thermitemelt(user)
- return
-
- else if(istype(W, /obj/item/gun/energy/plasmacutter))
- thermitemelt(user)
- return
-
- else if(istype(W, /obj/item/melee/energy/blade))
- var/obj/item/melee/energy/blade/EB = W
-
- EB.spark_system.start()
- to_chat(user, "You slash \the [src] with \the [EB]; the thermite ignites!")
- playsound(src, "sparks", 50, 1)
- playsound(src, EB.usesound, 50, 1)
-
- thermitemelt(user)
- return
-
- else if(istype(W, /obj/item/melee/energy/blade))
- to_chat(user, "This wall is too thick to slice through. You will need to find a different path.")
- return
-
- if(damage && iswelder(W))
- var/obj/item/weldingtool/WT = W
- if(WT.remove_fuel(0,user))
- to_chat(user, "You start repairing the damage to [src].")
- playsound(src, WT.usesound, 100, 1)
- if(do_after(user, max(5, damage / 5) * WT.toolspeed, target = src) && WT && WT.isOn())
- to_chat(user, "You finish repairing the damage to [src].")
- take_damage(-damage)
- return
- else
+/turf/simulated/wall/r_wall/proc/try_repair(obj/item/I, mob/user, params)
+ if(damage && iswelder(I))
+ var/obj/item/weldingtool/WT = I
+ if(!WT.remove_fuel(0, user))
to_chat(user, "You need more welding fuel to complete this task.")
- return
+ return TRUE
+ to_chat(user, "You start repairing the damage to [src].")
+ playsound(src, WT.usesound, 100, 1)
+ if(do_after(user, max(5, damage / 5) * WT.toolspeed, target = src) && WT && WT.isOn())
+ to_chat(user, "You finish repairing the damage to [src].")
+ take_damage(-damage)
+ return TRUE
- //DECONSTRUCTION
- switch(d_state)
- if(RWALL_INTACT)
- if(iswirecutter(W))
- playsound(src, W.usesound, 100, 1)
- d_state = RWALL_SUPPORT_LINES
+ if(d_state)
+ // Repairing
+ if(istype(I, /obj/item/stack/sheet/metal))
+ var/obj/item/stack/sheet/metal/MS = I
+
+ to_chat(user, "You begin patching-up the wall with [MS]...")
+ if(do_after(user, max(20 * d_state, 100) * MS.toolspeed, target = src) && d_state)
+ if(!MS.use(1))
+ to_chat(user, "You don't have enough [MS.name] for that!")
+ return TRUE
+
+ d_state = RWALL_INTACT
update_icon()
- new /obj/item/stack/rods(src)
- to_chat(user, "You cut the outer grille.")
- return
+ smooth_icon_neighbors(src)
+ to_chat(user, "You repair the last of the damage.")
- if(RWALL_SUPPORT_LINES)
- if(isscrewdriver(W))
- to_chat(user, "You begin unsecuring the support lines...")
- playsound(src, W.usesound, 100, 1)
+ return TRUE
- if(do_after(user, 40 * W.toolspeed, target = src) && d_state == RWALL_SUPPORT_LINES)
- d_state = RWALL_COVER
- update_icon()
- to_chat(user, "You unsecure the support lines.")
- return
-
- //REPAIRING (replacing the outer grille for cosmetic damage)
- else if(istype(W, /obj/item/stack/rods))
- var/obj/item/stack/O = W
- if(O.use(1))
- d_state = RWALL_INTACT
- update_icon()
- icon_state = "r_wall"
- update_icon()
- to_chat(user, "You replace the outer grille.")
- else
- to_chat(user, "You don't have enough rods for that!")
-
- if(RWALL_COVER)
- if(iswelder(W))
- var/obj/item/weldingtool/WT = W
- if(WT.remove_fuel(0,user))
- to_chat(user, "You begin slicing through the metal cover...")
- playsound(src, WT.usesound, 100, 1)
-
- if(do_after(user, 60 * WT.toolspeed, target = src) && d_state == RWALL_COVER)
- d_state = RWALL_CUT_COVER
- update_icon()
- to_chat(user, "You press firmly on the cover, dislodging it.")
-
- else
- to_chat(user, "You need more welding fuel to complete this task.")
- return
-
- if(istype(W, /obj/item/gun/energy/plasmacutter))
- to_chat(user, "You begin slicing through the metal cover...")
- playsound(src, W.usesound, 100, 1)
-
- if(do_after(user, 40 * W.toolspeed, target = src) && d_state == RWALL_COVER)
- d_state = RWALL_CUT_COVER
- update_icon()
- to_chat(user, "You press firmly on the cover, dislodging it.")
- return
-
- if(isscrewdriver(W))
- to_chat(user, "You begin securing the support lines...")
- playsound(src, W.usesound, 100, 1)
- if(do_after(user, 40*W.toolspeed, target = src))
- if(!istype(src, /turf/simulated/wall/r_wall) || !W || d_state != RWALL_COVER)
- return 1
- d_state = RWALL_SUPPORT_LINES
- update_icon()
- to_chat(user, "The support lines have been secured.")
- return 1
-
- if(RWALL_CUT_COVER)
- if(iscrowbar(W))
- to_chat(user, "You struggle to pry off the cover...")
- playsound(src, W.usesound, 100, 1)
-
- if(do_after(user, 100 * W.toolspeed, target = src) && d_state == RWALL_CUT_COVER)
- d_state = RWALL_BOLTS
- update_icon()
- to_chat(user, "You pry off the cover.")
- return
-
- if(iswelder(W))
- var/obj/item/weldingtool/WT = W
- if(WT.remove_fuel(0,user))
- to_chat(user, "You begin welding the metal cover back to the frame...")
- playsound(src, WT.usesound, 100, 1)
- if(do_after(user, 60*WT.toolspeed, target = src))
- if(!istype(src, /turf/simulated/wall/r_wall) || !WT || !WT.isOn() || d_state != RWALL_CUT_COVER)
- return 1
- d_state = RWALL_COVER
- update_icon()
- to_chat(user, "The metal cover has been welded securely to the frame.")
- return 1
-
- if(RWALL_BOLTS)
- if(iswrench(W))
- to_chat(user, "You start loosening the anchoring bolts which secure the support rods to their frame...")
- playsound(src, W.usesound, 100, 1)
-
- if(do_after(user, 40 * W.toolspeed, target = src) && d_state == RWALL_BOLTS)
- d_state = RWALL_SUPPORT_RODS
- update_icon()
- to_chat(user, "You remove the bolts anchoring the support rods.")
- return
-
- if(iscrowbar(W))
- to_chat(user, "You start to pry the cover back into place...")
- playsound(src, W.usesound, 100, 1)
- if(do_after(user, 20*W.toolspeed, target = src))
- if(!istype(src, /turf/simulated/wall/r_wall) || !W || d_state != RWALL_BOLTS)
- return 1
- d_state = RWALL_CUT_COVER
- update_icon()
- to_chat(user, "The metal cover has been pried back into place.")
- return 1
-
- if(RWALL_SUPPORT_RODS)
- if(iswelder(W))
- var/obj/item/weldingtool/WT = W
- if(WT.remove_fuel(0,user))
- to_chat(user, "You begin slicing through the support rods...")
- playsound(src, WT.usesound, 100, 1)
-
- if(do_after(user, 100 * WT.toolspeed, target = src) && d_state == RWALL_SUPPORT_RODS)
- d_state = RWALL_SHEATH
- update_icon()
- else
- to_chat(user, "You need more welding fuel to complete this task.")
- return
-
- if(istype(W, /obj/item/gun/energy/plasmacutter))
- to_chat(user, "You begin slicing through the support rods...")
- playsound(src, W.usesound, 100, 1)
-
- if(do_after(user, 70 * W.toolspeed, target = src) && d_state == RWALL_SUPPORT_RODS)
- d_state = RWALL_SHEATH
- update_icon()
- return
-
- if(iswrench(W))
- to_chat(user, "You start tightening the bolts which secure the support rods to their frame...")
- playsound(src, W.usesound, 100, 1)
- if(do_after(user, 40*W.toolspeed, target = src))
- if(!istype(src, /turf/simulated/wall/r_wall) || !W || d_state != RWALL_SUPPORT_RODS)
- return 1
- d_state = RWALL_BOLTS
- update_icon()
- to_chat(user, "You tighten the bolts anchoring the support rods.")
- return 1
-
- if(RWALL_SHEATH)
- if(iscrowbar(W))
- to_chat(user, "You struggle to pry off the outer sheath...")
- playsound(src, W.usesound, 100, 1)
-
- if(do_after(user, 100 * W.toolspeed, target = src) && d_state == RWALL_SHEATH)
- to_chat(user, "You pry off the outer sheath.")
- dismantle_wall()
- return
-
-//vv OK, we weren't performing a valid deconstruction step or igniting thermite,let's check the other possibilities vv
-
- //DRILLING
- if(istype(W, /obj/item/pickaxe/drill/diamonddrill))
- to_chat(user, "You begin to drill though the wall...")
-
- if(do_after(user, 800 * W.toolspeed, target = src)) // Diamond drill has 0.25 toolspeed, so 200
- to_chat(user, "Your drill tears through the last of the reinforced plating.")
- dismantle_wall()
-
- if(istype(W,/obj/item/pickaxe/drill/jackhammer))
- to_chat(user, "You begin to disintegrate the wall...")
-
- if(do_after(user, 1000 * W.toolspeed, target = src)) // Jackhammer has 0.1 toolspeed, so 100
- to_chat(user, "Your sonic jackhammer disintegrates the reinforced plating.")
- dismantle_wall()
-
- //REPAIRING
- else if(istype(W, /obj/item/stack/sheet/metal) && d_state)
- var/obj/item/stack/sheet/metal/MS = W
-
- to_chat(user, "You begin patching-up the wall with \a [MS]...")
-
- if(do_after(user, max(20 * d_state, 100) * MS.toolspeed, target = src) && d_state)
- if(!MS.use(1))
- to_chat(user, "You don't have enough metal for that!")
- return
-
- d_state = RWALL_INTACT
- update_icon()
- smooth_icon_neighbors(src)
- to_chat(user, "You repair the last of the damage.")
-
- //UPGRADING TO COATED
- else if(istype(W, /obj/item/stack/sheet/plasteel) && !d_state)
- var/obj/item/stack/sheet/plasteel/MS = W
+ else if(istype(I, /obj/item/stack/sheet/plasteel))
+ var/obj/item/stack/sheet/plasteel/PS = I
if(!can_be_reinforced)
to_chat(user, "The wall is already coated!")
- return
- to_chat(user, "You begin adding an additional layer of coating to the wall with \a [MS]...")
+ return FALSE
- if(do_after(user, 40 * MS.toolspeed, target = src) && !d_state)
- if(!MS.use(2))
- to_chat(user, "You don't have enough plasteel for that!")
+ to_chat(user, "You begin adding an additional layer of coating to the wall with [PS]...")
+ if(do_after(user, 40 * PS.toolspeed, target = src) && !d_state)
+ if(!PS.use(2))
+ to_chat(user, "You don't have enough [PS.name] for that!")
return
to_chat(user, "You add an additional layer of coating to the wall.")
ChangeTurf(/turf/simulated/wall/r_wall/coated)
update_icon()
smooth_icon_neighbors(src)
- can_be_reinforced = 0
- return
+ can_be_reinforced = FALSE
+ return TRUE
+ return FALSE
- //APC
- else if(istype(W,/obj/item/mounted))
- return
- //Poster stuff
- else if(istype(W, /obj/item/poster))
- place_poster(W, user)
- return
+/turf/simulated/wall/r_wall/try_decon(obj/item/I, mob/user, params)
+ switch(d_state)
+ if(RWALL_INTACT)
+ // RWALL_INTACT > RWALL_SUPPORT_LINES
+ if(iswirecutter(I))
+ playsound(src, I.usesound, 100, 1)
+ d_state = RWALL_SUPPORT_LINES
+ update_icon()
+ new /obj/item/stack/rods(src)
+ to_chat(user, "You cut the outer grille.")
+ return TRUE
- //Bone White - Place pipes on walls
- else if(istype(W,/obj/item/pipe))
- var/obj/item/pipe/V = W
- if(V.pipe_type != -1) // ANY PIPE
- var/obj/item/pipe/P = W
+ if(RWALL_SUPPORT_LINES)
+ // RWALL_SUPPORT_LINES > RWALL_COVER
+ if(isscrewdriver(I))
+ to_chat(user, "You begin unsecuring the support lines...")
+ playsound(src, I.usesound, 100, 1)
- playsound(get_turf(src), 'sound/weapons/circsawhit.ogg', 50, 1)
- user.visible_message( \
- "[user] starts drilling a hole in \the [src]...", \
- "You start drilling a hole in \the [src]. This is going to take a while.", \
- "You hear ratchet.")
- if(do_after(user, 160 * V.toolspeed, target = src))
- user.visible_message( \
- "[user] drills a hole in \the [src] and pushes \a [P] into the void.", \
- "You have finished drilling in \the [src] and push the [P] into the void.", \
- "You hear ratchet.")
+ if(do_after(user, 40 * I.toolspeed, target = src) && d_state == RWALL_SUPPORT_LINES)
+ d_state = RWALL_COVER
+ update_icon()
+ to_chat(user, "You unsecure the support lines.")
+ return TRUE
- user.drop_item()
- if(P.is_bent_pipe()) // bent pipe rotation fix see construction.dm
- P.dir = 5
- if(user.dir == 1)
- P.dir = 6
- else if(user.dir == 2)
- P.dir = 9
- else if(user.dir == 4)
- P.dir = 10
+ // RWALL_INTACT < RWALL_SUPPORT_LINES
+ if(istype(I, /obj/item/stack/rods))
+ var/obj/item/stack/S = I
+ if(S.use(1))
+ d_state = RWALL_INTACT
+ update_icon()
+ to_chat(user, "You replace the outer grille.")
else
- P.dir = user.dir
- P.x = src.x
- P.y = src.y
- P.z = src.z
- P.loc = src
- P.level = 2
- return
+ to_chat(user, "You don't have enough rods for that!")
+ return TRUE
+
+ if(RWALL_COVER)
+ // RWALL_COVER > RWALL_CUT_COVER
+ if(iswelder(I))
+ var/obj/item/weldingtool/WT = I
+ if(!WT.remove_fuel(0, user))
+ to_chat(user, "You need more welding fuel to complete this task.")
+ return TRUE
+
+ to_chat(user, "You begin slicing through the metal cover...")
+ playsound(src, WT.usesound, 100, 1)
+
+ if(do_after(user, 60 * WT.toolspeed, target = src) && d_state == RWALL_COVER)
+ d_state = RWALL_CUT_COVER
+ update_icon()
+ to_chat(user, "You press firmly on the cover, dislodging it.")
+ return TRUE
+
+ // RWALL_COVER > RWALL_CUT_COVER
+ if(istype(I, /obj/item/gun/energy/plasmacutter))
+ to_chat(user, "You begin slicing through the metal cover...")
+ playsound(src, I.usesound, 100, 1)
+
+ if(do_after(user, 40 * I.toolspeed, target = src) && d_state == RWALL_COVER)
+ d_state = RWALL_CUT_COVER
+ update_icon()
+ to_chat(user, "You press firmly on the cover, dislodging it.")
+ return TRUE
+
+ // RWALL_SUPPORT_LINES < RWALL_COVER
+ if(isscrewdriver(I))
+ to_chat(user, "You begin securing the support lines...")
+ playsound(src, I.usesound, 100, 1)
+ if(do_after(user, 40 * I.toolspeed, target = src))
+ if(!istype(src, /turf/simulated/wall/r_wall) || !I || d_state != RWALL_COVER)
+ return TRUE
+ d_state = RWALL_SUPPORT_LINES
+ update_icon()
+ to_chat(user, "The support lines have been secured.")
+ return TRUE
+
+ if(RWALL_CUT_COVER)
+ // RWALL_CUT_COVER > RWALL_BOLTS
+ if(iscrowbar(I))
+ to_chat(user, "You struggle to pry off the cover...")
+ playsound(src, I.usesound, 100, 1)
+
+ if(do_after(user, 100 * I.toolspeed, target = src) && d_state == RWALL_CUT_COVER)
+ d_state = RWALL_BOLTS
+ update_icon()
+ to_chat(user, "You pry off the cover.")
+ return TRUE
+
+ // RWALL_COVER < RWALL_CUT_COVER
+ if(iswelder(I))
+ var/obj/item/weldingtool/WT = I
+ if(!WT.remove_fuel(0, user))
+ return TRUE
+
+ to_chat(user, "You begin welding the metal cover back to the frame...")
+ playsound(src, WT.usesound, 100, 1)
+ if(do_after(user, 60 * WT.toolspeed, target = src))
+ if(!istype(src, /turf/simulated/wall/r_wall) || !WT || !WT.isOn() || d_state != RWALL_CUT_COVER)
+ return TRUE
+ d_state = RWALL_COVER
+ update_icon()
+ to_chat(user, "The metal cover has been welded securely to the frame.")
+ return TRUE
+
+ if(RWALL_BOLTS)
+ // RWALL_BOLTS > RWALL_SUPPORT_RODS
+ if(iswrench(I))
+ to_chat(user, "You start loosening the anchoring bolts which secure the support rods to their frame...")
+ playsound(src, I.usesound, 100, 1)
+
+ if(do_after(user, 40 * I.toolspeed, target = src) && d_state == RWALL_BOLTS)
+ d_state = RWALL_SUPPORT_RODS
+ update_icon()
+ to_chat(user, "You remove the bolts anchoring the support rods.")
+ return TRUE
+
+ // RWALL_CUT_COVER < RWALL_BOLTS
+ if(iscrowbar(I))
+ to_chat(user, "You start to pry the cover back into place...")
+ playsound(src, I.usesound, 100, 1)
+ if(do_after(user, 20 * I.toolspeed, target = src))
+ if(!istype(src, /turf/simulated/wall/r_wall) || !I || d_state != RWALL_BOLTS)
+ return TRUE
+ d_state = RWALL_CUT_COVER
+ update_icon()
+ to_chat(user, "The metal cover has been pried back into place.")
+ return TRUE
+
+ if(RWALL_SUPPORT_RODS)
+ // RWALL_SUPPORT_RODS > RWALL_SHEATH
+ if(iswelder(I))
+ var/obj/item/weldingtool/WT = I
+ if(!WT.remove_fuel(0, user))
+ to_chat(user, "You need more welding fuel to complete this task.")
+ return TRUE
+
+ to_chat(user, "You begin slicing through the support rods...")
+ playsound(src, WT.usesound, 100, 1)
+
+ if(do_after(user, 100 * WT.toolspeed, target = src) && d_state == RWALL_SUPPORT_RODS)
+ d_state = RWALL_SHEATH
+ update_icon()
+ return TRUE
+
+ // RWALL_SUPPORT_RODS > RWALL_SHEATH
+ if(istype(I, /obj/item/gun/energy/plasmacutter))
+ to_chat(user, "You begin slicing through the support rods...")
+ playsound(src, I.usesound, 100, 1)
+
+ if(do_after(user, 70 * I.toolspeed, target = src) && d_state == RWALL_SUPPORT_RODS)
+ d_state = RWALL_SHEATH
+ update_icon()
+ return TRUE
+
+ // RWALL_BOLTS < RWALL_SUPPORT_RODS
+ if(iswrench(I))
+ to_chat(user, "You start tightening the bolts which secure the support rods to their frame...")
+ playsound(src, I.usesound, 100, 1)
+ if(do_after(user, 40 * I.toolspeed, target = src))
+ if(!istype(src, /turf/simulated/wall/r_wall) || !I || d_state != RWALL_SUPPORT_RODS)
+ return TRUE
+ d_state = RWALL_BOLTS
+ update_icon()
+ to_chat(user, "You tighten the bolts anchoring the support rods.")
+ return TRUE
+
+ if(RWALL_SHEATH)
+ // RWALL_SHEATH > deconstructed
+ if(iscrowbar(I))
+ to_chat(user, "You struggle to pry off the outer sheath...")
+ playsound(src, I.usesound, 100, 1)
+
+ if(do_after(user, 100 * I.toolspeed, target = src) && d_state == RWALL_SHEATH)
+ to_chat(user, "You pry off the outer sheath.")
+ dismantle_wall()
+ return TRUE
+
+/turf/simulated/wall/r_wall/try_destroy(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/pickaxe/drill/diamonddrill))
+ to_chat(user, "You begin to drill though the wall...")
+
+ if(do_after(user, 800 * I.toolspeed, target = src)) // Diamond drill has 0.25 toolspeed, so 200
+ to_chat(user, "Your drill tears through the last of the reinforced plating.")
+ dismantle_wall()
+ return TRUE
+
+ if(istype(I, /obj/item/pickaxe/drill/jackhammer))
+ to_chat(user, "You begin to disintegrate the wall...")
+
+ if(do_after(user, 1000 * I.toolspeed, target = src)) // Jackhammer has 0.1 toolspeed, so 100
+ to_chat(user, "Your sonic jackhammer disintegrates the reinforced plating.")
+ dismantle_wall()
+ return TRUE
- //Finally, CHECKING FOR FALSE WALLS if it isn't damaged
- else if(!d_state)
- return attack_hand(user)
- return
/turf/simulated/wall/r_wall/singularity_pull(S, current_size)
if(current_size >= STAGE_FIVE)
diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm
index 611ff1656f3..2831894e3ea 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -94,8 +94,7 @@
var/max = world.maxx-TRANSITIONEDGE
var/min = 1+TRANSITIONEDGE
- var/datum/space_level/dest = pick(levels_by_trait(REACHABLE))
- var/_z = dest.zpos //select a random space zlevel
+ var/_z = pick(levels_by_trait(REACHABLE)) //select a random space zlevel
//now select coordinates for a border turf
var/_x
diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm
index b9a51a661d1..32d5824c4d5 100644
--- a/code/game/verbs/suicide.dm
+++ b/code/game/verbs/suicide.dm
@@ -84,7 +84,7 @@
do_suicide(damagetype, held_item)
return
- to_chat(viewers(src), "[src] [pick(species.suicide_messages)] It looks like they're trying to commit suicide.")
+ to_chat(viewers(src), "[src] [replacetext(pick(species.suicide_messages), "their", p_their())] It looks like [p_theyre()] trying to commit suicide.")
do_suicide(0)
updatehealth()
@@ -129,7 +129,7 @@
if(confirm == "Yes")
suiciding = 1
- to_chat(viewers(src), "[src] is powering down. It looks like \he's trying to commit suicide.")
+ to_chat(viewers(src), "[src] is powering down. It looks like [p_theyre()] trying to commit suicide.")
//put em at -175
adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
updatehealth()
@@ -149,7 +149,7 @@
if(confirm == "Yes")
suiciding = 1
- to_chat(viewers(src), "[src] is powering down. It looks like \he's trying to commit suicide.")
+ to_chat(viewers(src), "[src] is powering down. It looks like [p_theyre()] trying to commit suicide.")
//put em at -175
adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
updatehealth()
@@ -186,7 +186,7 @@
if(confirm == "Yes")
suiciding = 1
- to_chat(viewers(src), "[src] is thrashing wildly! It looks like \he's trying to commit suicide.")
+ to_chat(viewers(src), "[src] is thrashing wildly! It looks like [p_theyre()] trying to commit suicide.")
//put em at -175
adjustOxyLoss(max(175 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
updatehealth()
diff --git a/code/game/world.dm b/code/game/world.dm
index 4ebeadedc6f..ffb9dfb1ecd 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -16,10 +16,12 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
GLOB.timezoneOffset = text2num(time2text(0, "hh")) * 36000
+ makeDatumRefLists()
callHook("startup")
src.update_status()
+
. = ..()
// Create robolimbs for chargen.
@@ -324,6 +326,10 @@ var/world_topic_spam_protect_time = world.timeofday
processScheduler.stop()
shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss.
+ for(var/client/C in clients)
+ if(config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
+ C << link("byond://[config.server]")
+
if(config && config.shutdown_on_reboot)
sleep(0)
if(shutdown_shell_command)
@@ -331,9 +337,6 @@ var/world_topic_spam_protect_time = world.timeofday
del(world)
return
else
- for(var/client/C in clients)
- if(config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
- C << link("byond://[config.server]")
..(0)
@@ -359,7 +362,7 @@ var/world_topic_spam_protect_time = world.timeofday
/world/proc/load_motd()
join_motd = file2text("config/motd.txt")
-
+ GLOB.join_tos = file2text("config/tos.txt")
/proc/load_configuration()
config = new /datum/configuration()
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index b97993d5327..4c905a0b517 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -93,7 +93,7 @@ world/IsBanned(key,address,computer_id)
var/appealmessage = ""
if(config.banappeals)
appealmessage = " You may appeal it at [config.banappeals]."
- expires = " The is a permanent ban.[appealmessage]"
+ expires = " This is a permanent ban.[appealmessage]"
var/desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban was applied by [ackey] on [bantime].[expires]"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b155ddc13dd..051f450179b 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -9,15 +9,17 @@ var/global/nologevent = 0
if(C.prefs && !(C.prefs.toggles & CHAT_NO_ADMINLOGS))
to_chat(C, msg)
-/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
+/proc/msg_admin_attack(var/text, var/loglevel)
if(!nologevent)
var/rendered = "ATTACK:[text]"
for(var/client/C in admins)
if(R_ADMIN & C.holder.rights)
- if(C.prefs.toggles & CHAT_ATTACKLOGS)
- if(!istype(C, /mob/living))
- var/msg = rendered
- to_chat(C, msg)
+ if(C.prefs.atklog == ATKLOG_NONE)
+ continue
+ var/msg = rendered
+ if(C.prefs.atklog <= loglevel)
+ to_chat(C, msg)
+
/proc/message_adminTicket(var/msg)
msg = "ADMIN TICKET: [msg]"
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 80fbca96dac..91c237a0328 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -868,10 +868,10 @@ var/list/admin_verbs_ticket = list(
switch(alert("Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel"))
if("Yes")
- admin_log_and_message_admins("has allowed [H] to change \his appearance, without whitelisting of races.")
+ admin_log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, without whitelisting of races.")
H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 0)
if("No")
- admin_log_and_message_admins("has allowed [H] to change \his appearance, with whitelisting of races.")
+ admin_log_and_message_admins("has allowed [H] to change [H.p_their()] appearance, with whitelisting of races.")
H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1)
feedback_add_details("admin_verb","CMAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -902,12 +902,27 @@ var/list/admin_verbs_ticket = list(
if(!check_rights(R_ADMIN))
return
- prefs.toggles ^= CHAT_ATTACKLOGS
- prefs.save_preferences(src)
- if(prefs.toggles & CHAT_ATTACKLOGS)
- to_chat(usr, "You now will get attack log messages")
+ if(prefs.atklog == ATKLOG_ALL)
+ prefs.atklog = ATKLOG_ALMOSTALL
+ to_chat(usr, "Your attack logs preference is now: show ALMOST ALL attack logs (notable exceptions: NPCs attacking other NPCs, vampire bites, equipping/stripping, people pushing each other over)")
+ else if(prefs.atklog == ATKLOG_ALMOSTALL)
+ prefs.atklog = ATKLOG_MOST
+ to_chat(usr, "Your attack logs preference is now: show MOST attack logs (like ALMOST ALL, except that it also hides attacks by players on NPCs)")
+ else if(prefs.atklog == ATKLOG_MOST)
+ prefs.atklog = ATKLOG_FEW
+ to_chat(usr, "Your attack logs preference is now: show FEW attack logs (only the most important stuff: attacks on SSDs, use of explosives, messing with the engine, gibbing, AI wiping, forcefeeding, acid sprays, and organ extraction)")
+ else if(prefs.atklog == ATKLOG_FEW)
+ prefs.atklog = ATKLOG_NONE
+ to_chat(usr, "Your attack logs preference is now: show NO attack logs")
+ else if(prefs.atklog == ATKLOG_NONE)
+ prefs.atklog = ATKLOG_ALL
+ to_chat(usr, "Your attack logs preference is now: show ALL attack logs")
else
- to_chat(usr, "You now won't get attack log messages")
+ prefs.atklog = ATKLOG_ALL
+ to_chat(usr, "Your attack logs preference is now: show ALL attack logs (your preference was set to an invalid value, it has been reset)")
+
+ prefs.save_preferences(src)
+
/client/proc/toggleadminlogs()
set name = "Toggle Admin Log Messages"
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 21731cc8b7a..fe487ae6431 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -25,8 +25,6 @@
Show current traitors and objectives Set Night Shift Mode Bombs
- Bombing List
- Remove all bombs currently in existence
[check_rights(R_SERVER, 0) ? " Toggle bomb cap " : " "]
Lists Show last [length(lastsignalers)] signalers
@@ -82,7 +80,6 @@
Security Level - Delta Create Weather Weather - Ash Storm
- Weather - Advanced Darkness
"}
@@ -130,5 +127,3 @@
var/datum/browser/popup = new(usr, "secrets", "
Admin Secrets
", 630, 670)
popup.set_content(dat)
popup.open(0)
-
-
diff --git a/code/modules/admin/tickets/admintickets.dm b/code/modules/admin/tickets/admintickets.dm
index 5ef1f58dbf5..ea5f7003870 100644
--- a/code/modules/admin/tickets/admintickets.dm
+++ b/code/modules/admin/tickets/admintickets.dm
@@ -104,7 +104,7 @@ var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicke
/datum/adminTicketHolder/proc/checkForTicket(var/client/C)
var/list/tickets = list()
for(var/datum/admin_ticket/T in allTickets)
- if(T.clientName == C && T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE)
+ if(T.clientName == C && (T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE))
tickets += T
if(tickets.len)
return tickets
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 44328429dc0..abfc807f9df 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -39,35 +39,35 @@
switch(href_list["makeAntag"])
if("1")
log_admin("[key_name(usr)] has spawned a traitor.")
- if(!src.makeTraitors())
+ if(!makeTraitors())
to_chat(usr, "Unfortunately there weren't enough candidates available.")
if("2")
log_admin("[key_name(usr)] has spawned a changeling.")
- if(!src.makeChanglings())
+ if(!makeChangelings())
to_chat(usr, "Unfortunately there weren't enough candidates available.")
if("3")
log_admin("[key_name(usr)] has spawned revolutionaries.")
- if(!src.makeRevs())
+ if(!makeRevs())
to_chat(usr, "Unfortunately there weren't enough candidates available.")
if("4")
log_admin("[key_name(usr)] has spawned a cultists.")
- if(!src.makeCult())
+ if(!makeCult())
to_chat(usr, "Unfortunately there weren't enough candidates available.")
if("5")
log_admin("[key_name(usr)] has spawned a wizard.")
- if(!src.makeWizard())
+ if(!makeWizard())
to_chat(usr, "Unfortunately there weren't enough candidates available.")
if("6")
log_admin("[key_name(usr)] has spawned vampires.")
- if(!src.makeVampires())
+ if(!makeVampires())
to_chat(usr, "Unfortunately there weren't enough candidates available.")
if("7")
log_admin("[key_name(usr)] has spawned vox raiders.")
- if(!src.makeVoxRaiders())
+ if(!makeVoxRaiders())
to_chat(usr, "Unfortunately there weren't enough candidates available.")
if("8")
log_admin("[key_name(usr)] has spawned an abductor team.")
- if(!src.makeAbductorTeam())
+ if(!makeAbductorTeam())
to_chat(usr, "Unfortunately there weren't enough candidates available.")
else if(href_list["dbsearchckey"] || href_list["dbsearchadmin"] || href_list["dbsearchip"] || href_list["dbsearchcid"] || href_list["dbsearchbantype"])
@@ -1622,14 +1622,14 @@
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_r_hand )
if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/cookie)))
log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
- message_admins("[key_name_admin(H)] has their hands full, so they did not receive their cookie, spawned by [key_name_admin(src.owner)].")
+ message_admins("[key_name_admin(H)] has [H.p_their()] hands full, so [H.p_they()] did not receive [H.p_their()] cookie, spawned by [key_name_admin(src.owner)].")
return
else
H.update_inv_r_hand()//To ensure the icon appears in the HUD
else
H.update_inv_l_hand()
log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]")
- message_admins("[key_name_admin(H)] got their cookie, spawned by [key_name_admin(src.owner)]")
+ message_admins("[key_name_admin(H)] got [H.p_their()] cookie, spawned by [key_name_admin(src.owner)]")
feedback_inc("admin_cookies_spawned",1)
to_chat(H, "Your prayers have been answered!! You received the best cookie!")
@@ -1683,7 +1683,7 @@
to_chat(usr, "The person you are trying to contact is not wearing a headset")
return
- var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcomm", "")
+ var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from Centcomm", "")
if(!input) return
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
@@ -1941,7 +1941,7 @@
newtraitor.mind.special_role = SPECIAL_ROLE_TRAITOR
var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR]
tatorhud.join_hud(newtraitor)
- ticker.mode.set_antag_hud(newtraitor, "hudsyndicate")
+ set_antag_hud(newtraitor, "hudsyndicate")
else
to_chat(usr, "ERROR: Failed to create a traitor.")
return
@@ -2045,7 +2045,7 @@
if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset))
to_chat(usr, "The person you are trying to contact is not wearing a headset")
return
- var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from The Syndicate", "")
+ var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from The Syndicate", "")
if(!input)
return
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
@@ -2061,7 +2061,7 @@
to_chat(usr, "The person you are trying to contact is not wearing a headset")
return
- var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from HONKplanet", "")
+ var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via [H.p_their()] headset.","Outgoing message from HONKplanet", "")
if(!input) return
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
@@ -2727,48 +2727,6 @@
for(var/mob/M in player_list)
if(M.stat != 2)
M.show_message(text("The chilling wind suddenly stops..."), 1)
-/* if("shockwave")
- ok = 1
- to_chat(world, "ALERT: STATION STRESS CRITICAL")
- sleep(60)
- to_chat(world, "ALERT: STATION STRESS CRITICAL. TOLERABLE LEVELS EXCEEDED!")
- sleep(80)
- to_chat(world, "ALERT: STATION STRUCTURAL STRESS CRITICAL. SAFETY MECHANISMS FAILED!")
- sleep(40)
- for(var/mob/M in world)
- shake_camera(M, 400, 1)
- for(var/obj/structure/window/W in world)
- spawn(0)
- sleep(rand(10,400))
- W.ex_act(rand(2,1))
- for(var/obj/structure/grille/G in world)
- spawn(0)
- sleep(rand(20,400))
- G.ex_act(rand(2,1))
- for(var/obj/machinery/door/D in world)
- spawn(0)
- sleep(rand(20,400))
- D.ex_act(rand(2,1))
- for(var/turf/station/floor/Floor in world)
- spawn(0)
- sleep(rand(30,400))
- Floor.ex_act(rand(2,1))
- for(var/obj/structure/cable/Cable in world)
- spawn(0)
- sleep(rand(30,400))
- Cable.ex_act(rand(2,1))
- for(var/obj/structure/closet/Closet in world)
- spawn(0)
- sleep(rand(30,400))
- Closet.ex_act(rand(2,1))
- for(var/obj/machinery/Machinery in world)
- spawn(0)
- sleep(rand(30,400))
- Machinery.ex_act(rand(1,3))
- for(var/turf/station/wall/Wall in world)
- spawn(0)
- sleep(rand(30,400))
- Wall.ex_act(rand(2,1)) */
if("lightout")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","LO")
@@ -2793,7 +2751,7 @@
var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No")
if(sure == "No")
return
- weather_master.run_weather("the floor is lava")
+ SSweather.run_weather(/datum/weather/floor_is_lava)
message_admins("[key_name_admin(usr)] made the floor lava")
if("fakelava")
feedback_inc("admin_secrets_fun_used", 1)
@@ -2801,7 +2759,7 @@
var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No")
if(sure == "No")
return
- weather_master.run_weather("fake lava")
+ SSweather.run_weather(/datum/weather/floor_is_lava/fake)
message_admins("[key_name_admin(usr)] made aesthetic lava on the floor")
if("weatherashstorm")
feedback_inc("admin_secrets_fun_used", 1)
@@ -2809,16 +2767,8 @@
var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No")
if(sure == "No")
return
- weather_master.run_weather("ash storm")
+ SSweather.run_weather(/datum/weather/ash_storm)
message_admins("[key_name_admin(usr)] spawned an ash storm on the mining asteroid")
- if("weatherdarkness")
- feedback_inc("admin_secrets_fun_used", 1)
- feedback_add_details("admin_secrets_fun_used", "WD")
- var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No")
- if(sure == "No")
- return
- weather_master.run_weather("advanced darkness")
- message_admins("[key_name_admin(usr)] made the station go through advanced darkness")
if("retardify")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","RET")
@@ -2957,13 +2907,6 @@
var/ok = 0
switch(href_list["secretsadmin"])
- if("clear_bombs")
- //I do nothing
- if("list_bombers")
- var/dat = "Bombing List"
- for(var/l in bombers)
- dat += text("[l] ")
- usr << browse(dat, "window=bombers")
if("list_signalers")
var/dat = "Showing last [length(lastsignalers)] signalers."
for(var/sig in lastsignalers)
@@ -3432,11 +3375,11 @@
to_chat(hunter_mob, "ATTENTION: You are now on a mission!")
to_chat(hunter_mob, "Goal: [killthem ? "MURDER" : "PROTECT"] [H.real_name], currently in [get_area(H.loc)]. ");
if(killthem)
- to_chat(hunter_mob, "If you kill them, they cannot be revived.");
+ to_chat(hunter_mob, "If you kill [H.p_them()], [H.p_they()] cannot be revived.");
hunter_mob.mind.special_role = SPECIAL_ROLE_TRAITOR
var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR]
tatorhud.join_hud(hunter_mob)
- ticker.mode.set_antag_hud(hunter_mob, "hudsyndicate")
+ set_antag_hud(hunter_mob, "hudsyndicate")
/proc/admin_jump_link(var/atom/target)
if(!target) return
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 2533eab0570..600a53d81eb 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -183,6 +183,8 @@
if(check_rights(R_ADMIN|R_MOD, 0, X.mob))
to_chat(X, "[type]: [key_name(src, TRUE, type)]->[key_name(C, TRUE, type)]: [emoji_msg]")
+ if(type == "Mentorhelp")
+ return
//Check if the mob being PM'd has any open admin tickets.
var/tickets = list()
tickets = globAdminTicketHolder.checkForTicket(C)
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index f091e49f60e..2a0f78351e4 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -12,6 +12,7 @@
if(check_rights(R_ADMIN,0))
for(var/client/C in admins)
if(R_ADMIN & C.holder.rights)
+ msg = "[msg]"
to_chat(C, "ADMIN: [key_name(usr, 1)] ([admin_jump_link(mob)]): [msg]")
feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -38,6 +39,7 @@
display_name = "[holder.fakekey]/([key])"
else
display_name = holder.fakekey
+ msg = "[msg]"
to_chat(C, "MENTOR: [display_name] ([admin_jump_link(mob)]): [msg]")
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm
index 85591ee3159..de281d34e68 100644
--- a/code/modules/admin/verbs/atmosdebug.dm
+++ b/code/modules/admin/verbs/atmosdebug.dm
@@ -51,7 +51,7 @@
return
feedback_add_details("admin_verb","CPOW") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- for(var/datum/powernet/PN in powernets)
+ for(var/datum/powernet/PN in SSmachines.powernets)
if(!PN.nodes || !PN.nodes.len)
if(PN.cables && (PN.cables.len > 1))
var/obj/structure/cable/C = PN.cables[1]
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 78f9fbd5de1..682a174c450 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -266,7 +266,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(!choice)
return 0
if(!istype(choice, /mob/dead/observer))
- var/confirm = input("[choice.key] isn't ghosting right now. Are you sure you want to yank him out of them out of their body and place them in this pAI?", "Spawn pAI Confirmation", "No") in list("Yes", "No")
+ var/confirm = input("[choice.key] isn't ghosting right now. Are you sure you want to yank [choice.p_them()] out of [choice.p_their()] body and place [choice.p_them()] in this pAI?", "Spawn pAI Confirmation", "No") in list("Yes", "No")
if(confirm != "Yes")
return 0
var/obj/item/paicard/card = new(T)
@@ -387,7 +387,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(!check_rights(R_DEBUG))
return
- makepowernets()
+ SSmachines.makepowernets()
log_admin("[key_name(src)] has remade the powernet. makepowernets() called.")
message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0)
feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/gimmick_team.dm b/code/modules/admin/verbs/gimmick_team.dm
index 2ca1d3c27df..6192ad6b2ac 100644
--- a/code/modules/admin/verbs/gimmick_team.dm
+++ b/code/modules/admin/verbs/gimmick_team.dm
@@ -70,7 +70,7 @@
H.dna.ready_dna(H)
H.mind_initialize()
- H.mind.assigned_role = "MODE"
+ H.mind.assigned_role = "Event Character"
H.mind.special_role = "Event Character"
H.key = thisplayer.key
diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm
index 36001fb9035..1e72c1836da 100644
--- a/code/modules/admin/verbs/honksquad.dm
+++ b/code/modules/admin/verbs/honksquad.dm
@@ -91,7 +91,7 @@ var/global/sent_honksquad = 0
//Creates mind stuff.
new_honksquad.mind_initialize()
- new_honksquad.mind.assigned_role = "MODE"
+ new_honksquad.mind.assigned_role = SPECIAL_ROLE_HONKSQUAD
new_honksquad.mind.special_role = SPECIAL_ROLE_HONKSQUAD
new_honksquad.add_language("Clownish")
ticker.mode.traitors |= new_honksquad.mind//Adds them to current traitor list. Which is really the extra antagonist list.
diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
index dad0141a3bc..a3f30117cdd 100644
--- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm
+++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
@@ -109,7 +109,7 @@ var/global/sent_syndicate_infiltration_team = 0
new_syndicate_infiltrator.mind.store_memory("Starting Equipment: - Syndicate Headset ((.h for your radio)) - Chameleon Jumpsuit ((right click to Change Color)) - Agent ID card ((disguise as another job)) - Uplink Implant ((top left of screen)) - Dust Implant ((destroys your body on death)) - Combat Gloves ((insulated, disguised as black gloves)) - Anything bought with your uplink implant")
var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS]
opshud.join_hud(new_syndicate_infiltrator.mind.current)
- ticker.mode.set_antag_hud(new_syndicate_infiltrator.mind.current, "hudoperative")
+ set_antag_hud(new_syndicate_infiltrator.mind.current, "hudoperative")
new_syndicate_infiltrator.regenerate_icons()
num_spawned++
if(!teamsize)
@@ -127,7 +127,7 @@ var/global/sent_syndicate_infiltration_team = 0
syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate, slot_wear_mask)
var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS]
opshud.join_hud(syndimgmtmob.mind.current)
- ticker.mode.set_antag_hud(syndimgmtmob.mind.current, "hudoperative")
+ set_antag_hud(syndimgmtmob.mind.current, "hudoperative")
syndimgmtmob.mind.special_role = "Syndicate Management Consultant"
syndimgmtmob.regenerate_icons()
to_chat(syndimgmtmob, "You have spawned as Syndicate Management. You should brief them on their mission before they go.")
@@ -149,7 +149,7 @@ var/global/sent_syndicate_infiltration_team = 0
//Creates mind stuff.
new_syndicate_infiltrator.mind_initialize()
- new_syndicate_infiltrator.mind.assigned_role = "MODE"
+ new_syndicate_infiltrator.mind.assigned_role = "Syndicate Infiltrator"
new_syndicate_infiltrator.mind.special_role = "Syndicate Infiltrator"
ticker.mode.traitors |= new_syndicate_infiltrator.mind //Adds them to extra antag list
new_syndicate_infiltrator.equip_syndicate_infiltrator(syndicate_leader_selected, uplink_tc, is_mgmt)
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 9b6c4363008..a87308bb9b1 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -92,7 +92,7 @@ var/intercom_range_display_status = 0
if(!(locate(/obj/structure/grille,T)))
var/window_check = 0
for(var/obj/structure/window/W in T)
- if(W.dir == turn(C1.dir,180) || W.is_fulltile() )
+ if(W.dir == turn(C1.dir,180) || W.fulltile)
window_check = 1
break
if(!window_check)
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index dfca07426c5..c1e28a48f8d 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -46,6 +46,8 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
else if(isfile(var_value))
. = VV_FILE
+ else if(istype(var_value, /regex))
+ . = VV_REGEX
else
. = VV_NULL
@@ -66,6 +68,7 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
VV_DATUM_TYPE,
VV_TYPE,
VV_MATRIX,
+ VV_REGEX,
VV_FILE,
VV_NEW_ATOM,
VV_NEW_DATUM,
@@ -141,6 +144,14 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
.["class"] = null
return
+ if(VV_REGEX)
+ var/reg = input("Enter regex", "Regex", "") as null|text
+ if(!reg)
+ return
+ .["value"] = regex(reg)
+ if(.["value"] == null)
+ .["class"] = null
+
if(VV_ATOM_REFERENCE)
var/type = pick_closest_path(FALSE)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 57e5b968178..5c8e1c77745 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -25,6 +25,22 @@ client/proc/one_click_antag()
usr << browse(dat, "window=oneclickantag;size=400x400")
return
+/datum/admins/proc/CandCheck(var/role = null, var/mob/living/carbon/human/M, var/datum/game_mode/temp = null)
+ // You pass in ROLE define (optional), the applicant, and the gamemode, and it will return true / false depending on whether the applicant qualify for the candidacy in question
+ if(jobban_isbanned(M, "Syndicate"))
+ return FALSE
+ if(M.stat || !M.mind || M.mind.special_role)
+ return FALSE
+ if(temp)
+ if(M.mind.assigned_role in temp.restricted_jobs || M.client.prefs.species in temp.protected_species)
+ return FALSE
+ if(role) // Don't even bother evaluating if there's no role
+ if(player_old_enough_antag(M.client,role) && (role in M.client.prefs.be_special) && (!jobban_isbanned(M, role)))
+ return TRUE
+ else
+ return FALSE
+ else
+ return TRUE
/datum/admins/proc/makeTraitors()
var/datum/game_mode/traitor/temp = new
@@ -35,35 +51,29 @@ client/proc/one_click_antag()
var/list/mob/living/carbon/human/candidates = list()
var/mob/living/carbon/human/H = null
- log_admin("[key_name(owner)] tried making Traitors with One-Click-Antag")
- message_admins("[key_name_admin(owner)] tried making Traitors with One-Click-Antag")
+ var/antnum = input(owner, "How many traitors you want to create? Enter 0 to cancel","Amount:", 0) as num
+ if(!antnum || antnum <= 0)
+ return
+ log_admin("[key_name(owner)] tried making [antnum] traitors with One-Click-Antag")
+ message_admins("[key_name_admin(owner)] tried making [antnum] traitors with One-Click-Antag")
for(var/mob/living/carbon/human/applicant in player_list)
- if(ROLE_TRAITOR in applicant.client.prefs.be_special)
- if(player_old_enough_antag(applicant.client,ROLE_TRAITOR))
- if(!applicant.stat)
- if(applicant.mind)
- if(!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, "traitor") && !jobban_isbanned(applicant, "Syndicate"))
- if(!(applicant.mind.assigned_role in temp.restricted_jobs))
- if(!(applicant.client.prefs.species in temp.protected_species))
- candidates += applicant
+ if(CandCheck(ROLE_TRAITOR, applicant, temp))
+ candidates += applicant
if(candidates.len)
- var/numTratiors = min(candidates.len, 3)
+ var/numTraitors = min(candidates.len, antnum)
- for(var/i = 0, i300)//If more than 30 game seconds passed.
+ //Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos.
+ for(var/mob/G in respawnable_list)
+ if(!jobban_isbanned(G, "Syndicate"))
+ spawn(0)
+ switch(alert(G,"Do you wish to be considered for an elite syndicate strike team being sent in?","Please answer in 30 seconds!","Yes","No"))
+ if("Yes")
+ if((world.time-time_passed)>300)//If more than 30 game seconds passed.
+ return
+ candidates += G
+ if("No")
return
- candidates += G
- if("No")
- return
- else
- return
- sleep(300)
+ else
+ return
+ sleep(300)
- for(var/mob/dead/observer/G in candidates)
- if(!G.key)
- candidates.Remove(G)
+ for(var/mob/dead/observer/G in candidates)
+ if(!G.key)
+ candidates.Remove(G)
- if(candidates.len)
- var/numagents = 6
- //Spawns commandos and equips them.
- for(var/obj/effect/landmark/L in /area/syndicate_mothership/elite_squad)
- if(numagents<=0)
- break
- if(L.name == "Syndicate-Commando")
- syndicate_leader_selected = numagents == 1?1:0
-
- var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, syndicate_leader_selected)
-
-
- while((!theghost || !theghost.client) && candidates.len)
- theghost = pick(candidates)
- candidates.Remove(theghost)
-
- if(!theghost)
- qdel(new_syndicate_commando)
+ if(candidates.len)
+ //Spawns commandos and equips them.
+ for(var/obj/effect/landmark/L in /area/syndicate_mothership/elite_squad)
+ if(antnum <= 0)
break
+ if(L.name == "Syndicate-Commando")
+ syndicate_leader_selected = antnum == 1?1:0
- new_syndicate_commando.key = theghost.key
- new_syndicate_commando.internal = new_syndicate_commando.s_store
- new_syndicate_commando.update_action_buttons_icon()
+ var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, syndicate_leader_selected)
- //So they don't forget their code or mission.
+ while((!theghost || !theghost.client) && candidates.len)
+ theghost = pick(candidates)
+ candidates.Remove(theghost)
+
+ if(!theghost)
+ qdel(new_syndicate_commando)
+ break
+
+ new_syndicate_commando.key = theghost.key
+ new_syndicate_commando.internal = new_syndicate_commando.s_store
+ new_syndicate_commando.update_action_buttons_icon()
+
+ //So they don't forget their code or mission.
- to_chat(new_syndicate_commando, "You are an Elite Syndicate. [!syndicate_leader_selected ? "commando" : "LEADER"] in the service of the Syndicate. \nYour current mission is: [input]")
+ to_chat(new_syndicate_commando, "You are an Elite Syndicate. [!syndicate_leader_selected ? "commando" : "LEADER"] in the service of the Syndicate. \nYour current mission is: [input]")
- numagents--
- if(numagents >= 6)
- return 0
-
- for(var/obj/effect/landmark/L in /area/shuttle/syndicate_elite)
- if(L.name == "Syndicate-Commando-Bomb")
- new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
+ antnum--
+ for(var/obj/effect/landmark/L in /area/shuttle/syndicate_elite)
+ if(L.name == "Syndicate-Commando-Bomb")
+ new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
return 1
@@ -411,7 +413,7 @@ client/proc/one_click_antag()
//Creates mind stuff.
new_syndicate_commando.mind_initialize()
- new_syndicate_commando.mind.assigned_role = "MODE"
+ new_syndicate_commando.mind.assigned_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
new_syndicate_commando.mind.special_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
//Adds them to current traitor list. Which is really the extra antagonist list.
@@ -429,10 +431,12 @@ client/proc/one_click_antag()
var/leader_chosen = 0 //when the leader is chosen. The last person spawned.
+ var/antnum = input(owner, "How many raiders you want to create? Enter 0 to cancel.","Amount:", 0) as num
+ if(!antnum || antnum <= 0)
+ return
log_admin("[key_name(owner)] tried making Vox Raiders with One-Click-Antag")
message_admins("[key_name_admin(owner)] tried making Vox Raiders with One-Click-Antag")
-
- //Generates a list of candidates from active ghosts.
+//Generates a list of candidates from active ghosts.
for(var/mob/G in respawnable_list)
if(istype(G) && G.client && (ROLE_RAIDER in G.client.prefs.be_special))
if(player_old_enough_antag(G.client,ROLE_RAIDER))
@@ -455,8 +459,7 @@ client/proc/one_click_antag()
candidates.Remove(G)
if(candidates.len)
- var/max_raiders = 1
- var/raiders = max_raiders
+ var/raiders = min(antnum, candidates.len)
//Spawns vox raiders and equips them.
for(var/obj/effect/landmark/L in world)
if(L.name == "voxstart")
@@ -480,8 +483,6 @@ client/proc/one_click_antag()
to_chat(new_vox, "Don't forget to turn on your nitrogen internals!")
raiders--
- if(raiders > max_raiders)
- return 0
else
return 0
return 1
@@ -534,32 +535,26 @@ client/proc/one_click_antag()
var/list/mob/living/carbon/human/candidates = list()
var/mob/living/carbon/human/H = null
+ var/antnum = input(owner, "How many vampires you want to create? Enter 0 to cancel","Amount:", 0) as num
+ if(!antnum || antnum <= 0)
+ return
+
log_admin("[key_name(owner)] tried making Vampires with One-Click-Antag")
message_admins("[key_name_admin(owner)] tried making Vampires with One-Click-Antag")
for(var/mob/living/carbon/human/applicant in player_list)
- if(ROLE_VAMPIRE in applicant.client.prefs.be_special)
- if(player_old_enough_antag(applicant.client,ROLE_VAMPIRE))
- if(!applicant.stat)
- if(applicant.mind)
- if(!applicant.mind.special_role)
- if(!jobban_isbanned(applicant, "vampire") && !jobban_isbanned(applicant, "Syndicate"))
- if(!(applicant.job in temp.restricted_jobs))
- if(!(applicant.client.prefs.species in temp.protected_species))
- candidates += applicant
+ if(CandCheck(ROLE_VAMPIRE, applicant, temp))
+ candidates += applicant
if(candidates.len)
- var/numVampires = min(candidates.len, 3)
+ var/numVampires = min(candidates.len, antnum)
for(var/i = 0, iThe game hasn't started yet!")
+ to_chat(usr, "The game hasn't started yet!")
return
if(sent_strike_team == 1)
- to_chat(usr, "CentComm is already sending a team.")
+ to_chat(usr, "CentComm is already sending a team.")
return
if(alert("Do you want to send in the CentComm death squad? Once enabled, this is irreversible.",,"Yes","No")!="Yes")
return
- alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned commandos have internals cameras which are viewable through a monitor inside the Spec. Ops. Office. Assigning the team's detailed task is recommended from there. While you will be able to manually pick the candidates from active ghosts, their assignment in the squad will be random.")
+ alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned commandos have internals cameras which are viewable through a monitor inside the Spec. Ops. Office. The first one selected/spawned will be the team leader.")
+
+ message_admins("[key_name_admin(usr)] has started to spawn a CentComm DeathSquad.", 1)
var/input = null
while(!input)
@@ -25,13 +27,7 @@ var/global/sent_strike_team = 0
to_chat(usr, "Looks like someone beat you to it.")
return
- sent_strike_team = 1
-
- shuttle_master.cancelEvac()
- var/commando_number = commandos_possible //for selecting a leader
- var/leader_selected = 0 //when the leader is chosen. The last person spawned.
-
-//Code for spawning a nuke auth code.
+ // Find the nuclear auth code
var/nuke_code
var/temp_code
for(var/obj/machinery/nuclearbomb/N in world)
@@ -40,42 +36,78 @@ var/global/sent_strike_team = 0
nuke_code = N.r_code
break
-//Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos.
- var/list/candidates = list() //candidates for being a commando out of all the active ghosts in world.
- var/list/commandos = list() //actual commando ghosts as picked by the user.
- for(var/mob/dead/observer/G in player_list)
- if(!G.client.holder && !G.client.is_afk()) //Whoever called/has the proc won't be added to the list.
- if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
- candidates += G.key
- for(var/i=commandos_possible,(i>0&&candidates.len),i--)//Decrease with every commando selected.
- var/candidate = input("Pick characters to spawn as the commandos. This will go on until there either no more ghosts to pick from or the slots are full.", "Active Players") as null|anything in candidates //It will auto-pick a person when there is only one candidate.
- candidates -= candidate //Subtract from candidates.
- commandos += candidate//Add their ghost to commandos.
+ // Find ghosts willing to be DS
+ var/list/commando_ghosts = pollCandidatesWithVeto(src, usr, commandos_possible, "Join the DeathSquad?",, 21, 600, 1, role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE)
+ if(!commando_ghosts.len)
+ to_chat(usr, "Nobody volunteered to join the DeathSquad.")
+ return
+
+ sent_strike_team = 1
+
+ // Spawns commandos and equips them.
+ var/commando_number = commandos_possible //for selecting a leader
+ var/is_leader = TRUE // set to FALSE after leader is spawned
-//Spawns commandos and equips them.
for(var/obj/effect/landmark/L in landmarks_list)
- if(commando_number<=0) break
+
+ if(commando_number <= 0)
+ break
+
if(L.name == "Commando")
- leader_selected = commando_number == 1?1:0
- var/mob/living/carbon/human/new_commando = create_death_commando(L, leader_selected)
+ if(!commando_ghosts.len)
+ break
- if(commandos.len)
- new_commando.key = pick(commandos)
- commandos -= new_commando.key
+ var/use_ds_borg = FALSE
+ var/mob/ghost_mob = pick(commando_ghosts)
+ commando_ghosts -= ghost_mob
+ if(!ghost_mob || !ghost_mob.key || !ghost_mob.client)
+ continue
+
+ if(!is_leader)
+ var/new_dstype = alert(ghost_mob.client, "Select Deathsquad Type.", "DS Character Generation", "Organic", "Cyborg")
+ if(new_dstype == "Cyborg")
+ use_ds_borg = TRUE
+
+ if(!ghost_mob || !ghost_mob.key || !ghost_mob.client) // Have to re-check this due to the above alert() call
+ continue
+
+ if(use_ds_borg)
+ var/mob/living/silicon/robot/deathsquad/R = new()
+ R.forceMove(get_turf(L))
+ var/rnum = rand(1,1000)
+ var/borgname = "Epsilon [rnum]"
+ R.name = borgname
+ R.custom_name = borgname
+ R.real_name = R.name
+ R.mind = new
+ R.mind.current = R
+ R.mind.original = R
+ R.mind.assigned_role = SPECIAL_ROLE_DEATHSQUAD
+ R.mind.special_role = SPECIAL_ROLE_DEATHSQUAD
+ if(!(R.mind in ticker.minds))
+ ticker.minds += R.mind
+ ticker.mode.traitors += R.mind
+ R.key = ghost_mob.key
+ if(nuke_code)
+ R.mind.store_memory("Nuke Code:[nuke_code].")
+ R.mind.store_memory("Mission:[input].")
+ to_chat(R, "You are a Special Operations cyborg, in the service of Central Command. \nYour current mission is: [input]")
+ else
+ var/mob/living/carbon/human/new_commando = create_death_commando(L, is_leader)
+ new_commando.mind.key = ghost_mob.key
+ new_commando.key = ghost_mob.key
new_commando.internal = new_commando.s_store
new_commando.update_action_buttons_icon()
+ if(nuke_code)
+ new_commando.mind.store_memory("Nuke Code:[nuke_code].")
+ new_commando.mind.store_memory("Mission:[input].")
+ to_chat(new_commando, "You are a Special Ops [is_leader ? "TEAM LEADER" : "commando"] in the service of Central Command. Check the table ahead for detailed instructions.\nYour current mission is: [input]")
- //So they don't forget their code or mission.
- if(nuke_code)
- new_commando.mind.store_memory("Nuke Code:[nuke_code].")
- new_commando.mind.store_memory("Mission:[input].")
-
- to_chat(new_commando, "You are a Special Ops. [!leader_selected ? "commando" : "LEADER"] in the service of Central Command. Check the table ahead for detailed instructions.\nYour current mission is: [input]")
-
+ is_leader = FALSE
commando_number--
-//Spawns the rest of the commando gear.
+ //Spawns the rest of the commando gear.
for(var/obj/effect/landmark/L in landmarks_list)
if(L.name == "Commando_Manual")
//new /obj/item/gun/energy/pulse_rifle(L.loc)
@@ -92,43 +124,44 @@ var/global/sent_strike_team = 0
new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
qdel(L)
- message_admins("[key_name_admin(usr)] has spawned a CentComm strike squad.", 1)
+ message_admins("[key_name_admin(usr)] has spawned a CentComm DeathSquad.", 1)
log_admin("[key_name(usr)] used Spawn Death Squad.")
return 1
-/client/proc/create_death_commando(obj/spawn_location, leader_selected = 0)
+/client/proc/create_death_commando(obj/spawn_location, is_leader = FALSE)
var/mob/living/carbon/human/new_commando = new(spawn_location.loc)
var/commando_leader_rank = pick("Lieutenant", "Captain", "Major")
var/commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")
var/commando_name = pick(last_names)
var/datum/preferences/A = new()//Randomize appearance for the commando.
- if(leader_selected)
+ if(is_leader)
A.age = rand(35,45)
A.real_name = "[commando_leader_rank] [commando_name]"
else
A.real_name = "[commando_rank] [commando_name]"
A.copy_to(new_commando)
+
new_commando.dna.ready_dna(new_commando)//Creates DNA.
//Creates mind stuff.
new_commando.mind_initialize()
- new_commando.mind.assigned_role = "MODE"
+ new_commando.mind.assigned_role = SPECIAL_ROLE_DEATHSQUAD
new_commando.mind.special_role = SPECIAL_ROLE_DEATHSQUAD
ticker.mode.traitors |= new_commando.mind//Adds them to current traitor list. Which is really the extra antagonist list.
- new_commando.equip_death_commando(leader_selected)
+ new_commando.equip_death_commando(is_leader)
return new_commando
-/mob/living/carbon/human/proc/equip_death_commando(leader_selected = 0)
+/mob/living/carbon/human/proc/equip_death_commando(is_leader = FALSE)
var/obj/item/radio/R = new /obj/item/radio/headset/alt(src)
R.set_frequency(DTH_FREQ)
equip_to_slot_or_del(R, slot_l_ear)
- if(leader_selected == 0)
- equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform)
- else
+ if(is_leader)
equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform)
+ else
+ equip_to_slot_or_del(new /obj/item/clothing/under/color/green(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/advance(src), slot_shoes)
equip_to_slot_or_del(new /obj/item/clothing/suit/space/deathsquad(src), slot_wear_suit)
equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), slot_gloves)
@@ -143,20 +176,19 @@ var/global/sent_strike_team = 0
equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/storage/box/flashbangs(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/flashlight(src), slot_in_backpack)
- if(!leader_selected)
- equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
- else
- equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_in_backpack)
+ equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_in_backpack)
+ if(is_leader)
equip_to_slot_or_del(new /obj/item/disk/nuclear(src), slot_in_backpack)
+ else
+ equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
+
equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber(src), slot_l_store)
equip_to_slot_or_del(new /obj/item/shield/energy(src), slot_r_store)
equip_to_slot_or_del(new /obj/item/tank/emergency_oxygen/double/full(src), slot_s_store)
equip_to_slot_or_del(new /obj/item/gun/projectile/revolver/mateba(src), slot_belt)
-
equip_to_slot_or_del(new /obj/item/gun/energy/pulse(src), slot_r_hand)
-
var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(src)
L.implant(src)
diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm
index 943ccd61ca2..c5f46c98592 100644
--- a/code/modules/admin/verbs/striketeam_syndicate.dm
+++ b/code/modules/admin/verbs/striketeam_syndicate.dm
@@ -17,7 +17,9 @@ var/global/sent_syndicate_strike_team = 0
return
if(alert("Do you want to send in the Syndicate Strike Team? Once enabled, this is irreversible.",,"Yes","No")=="No")
return
- alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned syndicates have internals cameras which are viewable through a monitor inside the Syndicate Mothership Bridge. Assigning the team's detailed task is recommended from there. While you will be able to manually pick the candidates from active ghosts, their assignment in the squad will be random.")
+ alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned syndicates have internals cameras which are viewable through a monitor inside the Syndicate Mothership Bridge. Assigning the team's detailed task is recommended from there. The first one selected/spawned will be the team leader.")
+
+ message_admins("[key_name_admin(usr)] has started to spawn a Syndicate Strike Team.", 1)
var/input = null
while(!input)
@@ -30,15 +32,10 @@ var/global/sent_syndicate_strike_team = 0
to_chat(src, "Looks like someone beat you to it.")
return
- sent_syndicate_strike_team = 1
-
- //if(emergency_shuttle.can_recall())
- // emergency_shuttle.recall() //why, exactly? Admins can do this themselves.
-
var/syndicate_commando_number = syndicate_commandos_possible //for selecting a leader
- var/syndicate_leader_selected = 0 //when the leader is chosen. The last person spawned.
+ var/is_leader = TRUE // set to FALSE after leader is spawned
-//Code for spawning a nuke auth code.
+ // Find the nuclear auth code
var/nuke_code
var/temp_code
for(var/obj/machinery/nuclearbomb/N in world)
@@ -47,39 +44,48 @@ var/global/sent_syndicate_strike_team = 0
nuke_code = N.r_code
break
-//Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos.
- var/list/candidates = list() //candidates for being a commando out of all the active ghosts in world.
- var/list/commandos = list() //actual commando ghosts as picked by the user.
- for(var/mob/dead/observer/G in player_list)
- if(!G.client.holder && !G.client.is_afk()) //Whoever called/has the proc won't be added to the list.
- if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
- candidates += G.key
- for(var/i=commandos_possible,(i>0&&candidates.len),i--)//Decrease with every commando selected.
- var/candidate = input("Pick characters to spawn as the commandos. This will go on until there either no more ghosts to pick from or the slots are full.", "Active Players") as null|anything in candidates //It will auto-pick a person when there is only one candidate.
- candidates -= candidate //Subtract from candidates.
- commandos += candidate//Add their ghost to commandos.
+ // Find ghosts willing to be SST
+ var/list/commando_ghosts = pollCandidatesWithVeto(src, usr, syndicate_commandos_possible, "Join the Syndicate Strike Team?",, 21, 600, 1, role_playtime_requirements[ROLE_DEATHSQUAD], TRUE, FALSE)
+ if(!commando_ghosts.len)
+ to_chat(usr, "Nobody volunteered to join the SST.")
+ return
-//Spawns commandos and equips them.
+ sent_syndicate_strike_team = 1
+
+ //Spawns commandos and equips them.
for(var/obj/effect/landmark/L in landmarks_list)
- if(syndicate_commando_number<=0) break
+
+ if(syndicate_commando_number <= 0)
+ break
+
if(L.name == "Syndicate-Commando")
- syndicate_leader_selected = syndicate_commando_number == 1?1:0
- var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, syndicate_leader_selected)
+ if(!commando_ghosts.len)
+ break
- if(commandos.len)
- new_syndicate_commando.key = pick(commandos)
- commandos -= new_syndicate_commando.key
- new_syndicate_commando.internal = new_syndicate_commando.s_store
- new_syndicate_commando.update_action_buttons_icon()
+ var/mob/ghost_mob = pick(commando_ghosts)
+ commando_ghosts -= ghost_mob
+
+ if(!ghost_mob || !ghost_mob.key || !ghost_mob.client)
+ continue
+
+ var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, is_leader)
+
+ if(!new_syndicate_commando)
+ continue
+
+ new_syndicate_commando.key = ghost_mob.key
+ new_syndicate_commando.internal = new_syndicate_commando.s_store
+ new_syndicate_commando.update_action_buttons_icon()
//So they don't forget their code or mission.
if(nuke_code)
new_syndicate_commando.mind.store_memory("Nuke Code:[nuke_code].")
new_syndicate_commando.mind.store_memory("Mission:[input].")
- to_chat(new_syndicate_commando, "You are an Elite Syndicate. [!syndicate_leader_selected ? "commando" : "LEADER"] in the service of the Syndicate. \nYour current mission is: [input]")
+ to_chat(new_syndicate_commando, "You are an Elite Syndicate [is_leader ? "TEAM LEADER" : "commando"] in the service of the Syndicate. \nYour current mission is: [input]")
new_syndicate_commando.faction += "syndicate"
+ is_leader = FALSE
syndicate_commando_number--
for(var/obj/effect/landmark/L in landmarks_list)
@@ -91,14 +97,14 @@ var/global/sent_syndicate_strike_team = 0
log_admin("[key_name(usr)] used Spawn Syndicate Squad.")
feedback_add_details("admin_verb","SDTHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/client/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0)
+/client/proc/create_syndicate_death_commando(obj/spawn_location, is_leader = FALSE)
var/mob/living/carbon/human/new_syndicate_commando = new(spawn_location.loc)
var/syndicate_commando_leader_rank = pick("Lieutenant", "Captain", "Major")
var/syndicate_commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")
var/syndicate_commando_name = pick(last_names)
var/datum/preferences/A = new()//Randomize appearance for the commando.
- if(syndicate_leader_selected)
+ if(is_leader)
A.age = rand(35,45)
A.real_name = "[syndicate_commando_leader_rank] [syndicate_commando_name]"
else
@@ -109,29 +115,29 @@ var/global/sent_syndicate_strike_team = 0
//Creates mind stuff.
new_syndicate_commando.mind_initialize()
- new_syndicate_commando.mind.assigned_role = "MODE"
+ new_syndicate_commando.mind.assigned_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
new_syndicate_commando.mind.special_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
ticker.mode.traitors |= new_syndicate_commando.mind //Adds them to current traitor list. Which is really the extra antagonist list.
- new_syndicate_commando.equip_syndicate_commando(syndicate_leader_selected)
+ new_syndicate_commando.equip_syndicate_commando(is_leader)
qdel(spawn_location)
return new_syndicate_commando
-/mob/living/carbon/human/proc/equip_syndicate_commando(syndicate_leader_selected = 0)
+/mob/living/carbon/human/proc/equip_syndicate_commando(is_leader = FALSE)
var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt/syndteam(src)
R.set_frequency(SYNDTEAM_FREQ)
equip_to_slot_or_del(R, slot_l_ear)
equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/syndie/advance(src), slot_shoes)
- if(!syndicate_leader_selected)
- equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/strike(src), slot_wear_suit)
- else
+ if(is_leader)
equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/red/strike(src), slot_wear_suit)
- equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), slot_gloves)
- if(!syndicate_leader_selected)
- equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/strike(src), slot_head)
else
+ equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate/black/strike(src), slot_wear_suit)
+ equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(src), slot_gloves)
+ if(is_leader)
equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/red/strike(src), slot_head)
+ else
+ equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate/black/strike(src), slot_head)
equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(src), slot_wear_mask)
equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
@@ -142,13 +148,12 @@ var/global/sent_syndicate_strike_team = 0
equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/flashlight(src), slot_in_backpack)
- if(!syndicate_leader_selected)
- equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
- equip_to_slot_or_del(new /obj/item/card/emag(src), slot_in_backpack)
- else
+ if(is_leader)
equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/disk/nuclear(src), slot_in_backpack)
-
+ else
+ equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(src), slot_in_backpack)
+ equip_to_slot_or_del(new /obj/item/card/emag(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber(src), slot_l_store)
equip_to_slot_or_del(new /obj/item/grenade/empgrenade(src), slot_r_store)
equip_to_slot_or_del(new /obj/item/tank/emergency_oxygen/double/full(src), slot_s_store)
diff --git a/code/modules/alarm/alarm.dm b/code/modules/alarm/alarm.dm
index ac8b65d9d82..1d4a570999a 100644
--- a/code/modules/alarm/alarm.dm
+++ b/code/modules/alarm/alarm.dm
@@ -134,5 +134,3 @@
/mob/living/silicon/robot/syndicate/get_alarm_cameras()
return list()
-
-#undef ALARM_LOSS_DELAY
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
new file mode 100644
index 00000000000..39053fa79d9
--- /dev/null
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -0,0 +1,137 @@
+GLOBAL_LIST_EMPTY(antagonists)
+
+/datum/antagonist
+ var/name = "Antagonist"
+ var/roundend_category = "other antagonists" //Section of roundend report, datums with same category will be displayed together, also default header for the section
+ var/show_in_roundend = TRUE //Set to false to hide the antagonists from roundend report
+ var/datum/mind/owner //Mind that owns this datum
+ var/silent = FALSE //Silent will prevent the gain/lose texts to show
+ var/can_coexist_with_others = TRUE //Whether or not the person will be able to have more than one datum
+ var/list/typecache_datum_blacklist = list() //List of datums this type can't coexist with
+ var/delete_on_mind_deletion = TRUE
+ var/job_rank
+ var/replace_banned = TRUE //Should replace jobbaned player with ghosts if granted.
+ var/list/objectives = list()
+ var/antag_memory = ""//These will be removed with antag datum
+
+/datum/antagonist/New()
+ GLOB.antagonists += src
+ typecache_datum_blacklist = typecacheof(typecache_datum_blacklist)
+
+/datum/antagonist/Destroy()
+ GLOB.antagonists -= src
+ if(owner)
+ LAZYREMOVE(owner.antag_datums, src)
+ owner = null
+ return ..()
+
+/datum/antagonist/proc/can_be_owned(datum/mind/new_owner)
+ . = TRUE
+ var/datum/mind/tested = new_owner || owner
+ if(tested.has_antag_datum(type))
+ return FALSE
+ for(var/i in tested.antag_datums)
+ var/datum/antagonist/A = i
+ if(is_type_in_typecache(src, A.typecache_datum_blacklist))
+ return FALSE
+
+//This will be called in add_antag_datum before owner assignment.
+//Should return antag datum without owner.
+/datum/antagonist/proc/specialization(datum/mind/new_owner)
+ return src
+
+/datum/antagonist/proc/on_body_transfer(mob/living/old_body, mob/living/new_body)
+ remove_innate_effects(old_body)
+ apply_innate_effects(new_body)
+
+//This handles the application of antag huds/special abilities
+/datum/antagonist/proc/apply_innate_effects(mob/living/mob_override)
+ return
+
+//This handles the removal of antag huds/special abilities
+/datum/antagonist/proc/remove_innate_effects(mob/living/mob_override)
+ return
+
+//Assign default team and creates one for one of a kind team antagonists
+/datum/antagonist/proc/create_team(datum/team/team)
+ return
+
+//Proc called when the datum is given to a mind.
+/datum/antagonist/proc/on_gain()
+ if(owner && owner.current)
+ if(!silent)
+ greet()
+ apply_innate_effects()
+ if(is_banned(owner.current) && replace_banned)
+ replace_banned_player()
+
+/datum/antagonist/proc/is_banned(mob/M)
+ if(!M)
+ return FALSE
+ . = (jobban_isbanned(M, ROLE_SYNDICATE) || (job_rank && jobban_isbanned(M, job_rank)))
+
+/datum/antagonist/proc/replace_banned_player()
+ set waitfor = FALSE
+
+ var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as a [name]?", job_rank, TRUE, 50)
+ if(LAZYLEN(candidates))
+ var/mob/dead/observer/C = pick(candidates)
+ to_chat(owner, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!")
+ message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(owner.current)]) to replace a jobbaned player.")
+ owner.current.ghostize(0)
+ owner.current.key = C.key
+
+/datum/antagonist/proc/on_removal()
+ remove_innate_effects()
+ if(owner)
+ LAZYREMOVE(owner.antag_datums, src)
+ if(!silent && owner.current)
+ farewell()
+ owner.objectives -= objectives
+ var/datum/team/team = get_team()
+ if(team)
+ team.remove_member(owner)
+ qdel(src)
+
+/datum/antagonist/proc/greet()
+ return
+
+/datum/antagonist/proc/farewell()
+ return
+
+
+//Returns the team antagonist belongs to if any.
+/datum/antagonist/proc/get_team()
+ return
+
+//Individual roundend report
+/datum/antagonist/proc/roundend_report()
+ var/list/report = list()
+
+ if(!owner)
+ CRASH("antagonist datum without owner")
+
+ report += printplayer(owner)
+
+ var/objectives_complete = TRUE
+ if(owner.objectives.len)
+ report += printobjectives(owner)
+ for(var/datum/objective/objective in owner.objectives)
+ if(!objective.check_completion())
+ objectives_complete = FALSE
+ break
+
+ if(owner.objectives.len == 0 || objectives_complete)
+ report += "The [name] was successful!"
+ else
+ report += "The [name] has failed!"
+
+ return report.Join(" ")
+
+//Displayed at the start of roundend_category section, default to roundend_category header
+/datum/antagonist/proc/roundend_report_header()
+ return "The [roundend_category] were: "
+
+//Displayed at the end of roundend_category section
+/datum/antagonist/proc/roundend_report_footer()
+ return
\ No newline at end of file
diff --git a/code/modules/antagonists/_common/antag_helpers.dm b/code/modules/antagonists/_common/antag_helpers.dm
new file mode 100644
index 00000000000..134ba1d7d90
--- /dev/null
+++ b/code/modules/antagonists/_common/antag_helpers.dm
@@ -0,0 +1,19 @@
+//Returns MINDS of the assigned antags of given type/subtypes
+/proc/get_antag_minds(antag_type, specific = FALSE)
+ . = list()
+ for(var/datum/antagonist/A in GLOB.antagonists)
+ if(!A.owner)
+ continue
+ if(!antag_type || !specific && istype(A, antag_type) || specific && A.type == antag_type)
+ . += A.owner
+
+//Get all teams [of type team_type]
+/proc/get_all_teams(team_type)
+ . = list()
+ for(var/V in GLOB.antagonists)
+ var/datum/antagonist/A = V
+ if(!A.owner)
+ continue
+ var/datum/team/T = A.get_team()
+ if(!team_type || istype(T, team_type))
+ . |= T
\ No newline at end of file
diff --git a/code/game/gamemodes/antag_hud.dm b/code/modules/antagonists/_common/antag_hud.dm
similarity index 78%
rename from code/game/gamemodes/antag_hud.dm
rename to code/modules/antagonists/_common/antag_hud.dm
index 4b290932e8e..693b0b9450d 100644
--- a/code/game/gamemodes/antag_hud.dm
+++ b/code/modules/antagonists/_common/antag_hud.dm
@@ -1,11 +1,12 @@
/datum/atom_hud/antag
hud_icons = list(SPECIALROLE_HUD,NATIONS_HUD)
- var/self_visible = 1
+ var/self_visible = TRUE
/datum/atom_hud/antag/hidden
- self_visible = 0
+ self_visible = FALSE
-/datum/atom_hud/antag/proc/join_hud(mob/M,var/slave)
+/datum/atom_hud/antag/proc/join_hud(mob/M, slave)
+ //sees_hud should be set to 0 if the mob does not get to see it's own hud type.
if(!istype(M))
CRASH("join_hud(): [M] ([M.type]) is not a mob!")
if(M.mind.antag_hud && !slave) //note: please let this runtime if a mob has no mind, as mindless mobs shouldn't be getting antagged
@@ -16,6 +17,8 @@
M.mind.antag_hud = src
/datum/atom_hud/antag/proc/leave_hud(mob/M)
+ if(!M)
+ return
if(!istype(M))
CRASH("leave_hud(): [M] ([M.type]) is not a mob!")
remove_from_hud(M)
@@ -26,7 +29,7 @@
//GAME_MODE PROCS
//called to set a mob's antag icon state
-/datum/game_mode/proc/set_antag_hud(mob/M, new_icon_state)
+/proc/set_antag_hud(mob/M, new_icon_state)
if(!istype(M))
CRASH("set_antag_hud(): [M] ([M.type]) is not a mob!")
var/image/holder = M.hud_list[SPECIALROLE_HUD]
@@ -36,7 +39,7 @@
M.mind.antag_hud_icon_state = new_icon_state
//Nations Icons
-/datum/game_mode/proc/set_nations_hud(mob/M, new_icon_state)
+/proc/set_nations_hud(mob/M, new_icon_state)
if(!istype(M))
CRASH("set_antag_hud(): [M] ([M.type]) is not a mob!")
var/image/holder = M.hud_list[NATIONS_HUD]
@@ -47,9 +50,9 @@
//MIND PROCS
//these are called by mind.transfer_to()
-/datum/mind/proc/transfer_antag_huds(var/datum/atom_hud/antag/newhud)
+/datum/mind/proc/transfer_antag_huds(datum/atom_hud/antag/newhud)
leave_all_huds()
- ticker.mode.set_antag_hud(current, antag_hud_icon_state)
+ set_antag_hud(current, antag_hud_icon_state)
if(newhud)
newhud.join_hud(current)
@@ -77,11 +80,11 @@
name = mastername
thrallhud = new()
-/datum/mindslaves/proc/add_serv_hud(datum/mind/serv_mind,var/icon)
- thrallhud.join_hud(serv_mind.current,1)
+/datum/mindslaves/proc/add_serv_hud(datum/mind/serv_mind, icon)
+ thrallhud.join_hud(serv_mind.current, 1)
icontype = "hud[icon]"
- ticker.mode.set_antag_hud(serv_mind.current,icontype)
+ set_antag_hud(serv_mind.current, icontype)
/datum/mindslaves/proc/leave_serv_hud(datum/mind/free_mind)
thrallhud.leave_hud(free_mind.current)
- ticker.mode.set_antag_hud(free_mind.current,null)
\ No newline at end of file
+ set_antag_hud(free_mind.current, null)
\ No newline at end of file
diff --git a/code/game/gamemodes/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
similarity index 89%
rename from code/game/gamemodes/antag_spawner.dm
rename to code/modules/antagonists/_common/antag_spawner.dm
index 23fed691ec6..c81f30efc83 100644
--- a/code/game/gamemodes/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -2,12 +2,12 @@
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_TINY
- var/used = 0
+ var/used = FALSE
-/obj/item/antag_spawner/proc/spawn_antag(var/client/C, var/turf/T, var/type = "")
+/obj/item/antag_spawner/proc/spawn_antag(client/C, turf/T, type = "")
return
-/obj/item/antag_spawner/proc/equip_antag(mob/target as mob)
+/obj/item/antag_spawner/proc/equip_antag(mob/target)
return
@@ -16,41 +16,41 @@
desc = "A single-use teleporter used to deploy a Syndicate Cyborg on the field."
icon = 'icons/obj/device.dmi'
icon_state = "locator"
- var/checking = 0
+ var/checking = FALSE
var/TC_cost = 0
var/borg_to_spawn
var/list/possible_types = list("Assault", "Medical")
-/obj/item/antag_spawner/borg_tele/attack_self(mob/user as mob)
+/obj/item/antag_spawner/borg_tele/attack_self(mob/user)
if(used)
to_chat(user, "[src] is out of power!")
return
if(!(user.mind in ticker.mode.syndicates))
to_chat(user, "AUTHENTICATION FAILURE. ACCESS DENIED.")
- return 0
+ return FALSE
if(checking)
to_chat(user, "[src] is already checking for possible borgs.")
return
borg_to_spawn = input("What type of borg would you like to teleport?", "Cyborg Type", type) as null|anything in possible_types
if(!borg_to_spawn || checking || used)
return
- checking = 1
+ checking = TRUE
to_chat(user, "The device is now checking for possible borgs.")
var/list/borg_candidates = pollCandidates("Do you want to play as a Syndicate [borg_to_spawn] borg?", ROLE_OPERATIVE, 1)
if(borg_candidates.len > 0 && !used)
- checking = 0
- used = 1
+ checking = FALSE
+ used = TRUE
var/mob/M = pick(borg_candidates)
var/client/C = M.client
spawn_antag(C, get_turf(src.loc), "syndieborg")
else
- checking = 0
+ checking = FALSE
to_chat(user, "Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded.")
return
-/obj/item/antag_spawner/borg_tele/spawn_antag(var/client/C, var/turf/T, var/type = "")
+/obj/item/antag_spawner/borg_tele/spawn_antag(client/C, turf/T, type = "")
if(!borg_to_spawn) //If there's no type at all, let it still be used but don't do anything
- used = 0
+ used = FALSE
return
var/datum/effect_system/spark_spread/S = new /datum/effect_system/spark_spread
S.set_up(4, 1, src)
@@ -79,7 +79,7 @@
var/objective_verb = "Kill"
var/mob/living/demon_type = /mob/living/simple_animal/slaughter
-/obj/item/antag_spawner/slaughter_demon/attack_self(mob/user as mob)
+/obj/item/antag_spawner/slaughter_demon/attack_self(mob/user)
if(level_blocks_magic(user.z))//this is to make sure the wizard does NOT summon a demon from the Den..
to_chat(user, "You should probably wait until you reach the station.")
return
@@ -87,7 +87,7 @@
if(used)
to_chat(user, "This bottle already has a broken seal.")
return
- used = 1
+ used = TRUE
to_chat(user, "You break the seal on the bottle, calling upon the dire spirits of the underworld...")
var/list/candidates = pollCandidates("Do you want to play as a slaughter demon summoned by [user.real_name]?", ROLE_DEMON, 1, 100)
@@ -100,10 +100,10 @@
playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1)
qdel(src)
else
- used = 0
+ used = FALSE
to_chat(user, "The demons do not respond to your summon. Perhaps you should try again later.")
-/obj/item/antag_spawner/slaughter_demon/spawn_antag(var/client/C, var/turf/T, var/type = "", mob/user as mob)
+/obj/item/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "", mob/user)
var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T)
var/mob/living/simple_animal/slaughter/S = new demon_type(holder)
S.vialspawned = TRUE
diff --git a/code/modules/antagonists/_common/antag_team.dm b/code/modules/antagonists/_common/antag_team.dm
new file mode 100644
index 00000000000..9dcec5894ee
--- /dev/null
+++ b/code/modules/antagonists/_common/antag_team.dm
@@ -0,0 +1,24 @@
+//A barebones antagonist team.
+/datum/team
+ var/list/datum/mind/members = list()
+ var/name = "team"
+ var/member_name = "member"
+ var/list/objectives = list() //common objectives, these won't be added or removed automatically, subtypes handle this, this is here for bookkeeping purposes.
+
+/datum/team/New(starting_members)
+ . = ..()
+ if(starting_members)
+ if(islist(starting_members))
+ for(var/datum/mind/M in starting_members)
+ add_member(M)
+ else
+ add_member(starting_members)
+
+/datum/team/proc/is_solo()
+ return members.len == 1
+
+/datum/team/proc/add_member(datum/mind/new_member)
+ members |= new_member
+
+/datum/team/proc/remove_member(datum/mind/member)
+ members -= member
diff --git a/code/modules/antagonists/wishgranter/wishgranter.dm b/code/modules/antagonists/wishgranter/wishgranter.dm
new file mode 100644
index 00000000000..54d12867ac1
--- /dev/null
+++ b/code/modules/antagonists/wishgranter/wishgranter.dm
@@ -0,0 +1,81 @@
+/datum/antagonist/wishgranter
+ name = "Wishgranter Avatar"
+
+/datum/antagonist/wishgranter/proc/forge_objectives()
+ var/datum/objective/hijack/hijack = new
+ hijack.owner = owner
+ objectives += hijack
+ owner.objectives |= objectives
+
+/datum/antagonist/wishgranter/on_gain()
+ owner.special_role = "Avatar of the Wish Granter"
+ forge_objectives()
+ . = ..()
+ give_powers()
+
+/datum/antagonist/wishgranter/greet()
+ to_chat(owner.current, "Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!")
+ owner.announce_objectives()
+
+/datum/antagonist/wishgranter/proc/give_powers()
+ var/mob/living/carbon/human/H = owner.current
+ if(!istype(H))
+ return
+ H.ignore_gene_stability = TRUE
+ H.dna.SetSEState(HULKBLOCK, TRUE)
+ genemutcheck(H, HULKBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(XRAYBLOCK, TRUE)
+ genemutcheck(H, XRAYBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(FIREBLOCK, TRUE)
+ genemutcheck(H, FIREBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(COLDBLOCK, TRUE)
+ genemutcheck(H, COLDBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(TELEBLOCK, TRUE)
+ genemutcheck(H, TELEBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(INCREASERUNBLOCK, TRUE)
+ genemutcheck(H, INCREASERUNBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(BREATHLESSBLOCK, TRUE)
+ genemutcheck(H, BREATHLESSBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(REGENERATEBLOCK, TRUE)
+ genemutcheck(H, REGENERATEBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(SHOCKIMMUNITYBLOCK, TRUE)
+ genemutcheck(H, SHOCKIMMUNITYBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(SMALLSIZEBLOCK, TRUE)
+ genemutcheck(H, SMALLSIZEBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(SOBERBLOCK, TRUE)
+ genemutcheck(H, SOBERBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(PSYRESISTBLOCK, TRUE)
+ genemutcheck(H, PSYRESISTBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(SHADOWBLOCK, TRUE)
+ genemutcheck(H, SHADOWBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(CRYOBLOCK, TRUE)
+ genemutcheck(H, CRYOBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(EATBLOCK, TRUE)
+ genemutcheck(H, EATBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(JUMPBLOCK, TRUE)
+ genemutcheck(H, JUMPBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(SUPERFARTBLOCK, TRUE)
+ genemutcheck(H, SUPERFARTBLOCK, null, MUTCHK_FORCED)
+
+ H.dna.SetSEState(IMMOLATEBLOCK, TRUE)
+ genemutcheck(H, IMMOLATEBLOCK, null, MUTCHK_FORCED)
+
+ H.mutations.Add(LASER)
+ H.update_mutations()
+ H.update_body()
\ No newline at end of file
diff --git a/code/modules/arcade/mob_hunt/battle_computer.dm b/code/modules/arcade/mob_hunt/battle_computer.dm
index e5f2af123fb..8ae577fe338 100644
--- a/code/modules/arcade/mob_hunt/battle_computer.dm
+++ b/code/modules/arcade/mob_hunt/battle_computer.dm
@@ -27,11 +27,11 @@
team = "Blue"
avatar_y_offset = 1
-/obj/machinery/computer/mob_battle_terminal/red/initialize()
+/obj/machinery/computer/mob_battle_terminal/red/Initialize()
..()
check_connection()
-/obj/machinery/computer/mob_battle_terminal/blue/initialize()
+/obj/machinery/computer/mob_battle_terminal/blue/Initialize()
..()
check_connection()
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index e5f1cb10525..763152cc5cf 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -45,13 +45,13 @@
if((istype(W, /obj/item/weldingtool) && W:welding))
if(!status)
status = 1
- bombers += "[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]"
- msg_admin_attack("[key_name_admin(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]")
+ investigate_log("[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]", INVESTIGATE_BOMB)
+ msg_admin_attack("[key_name_admin(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]", ATKLOG_FEW)
log_game("[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature - T0C]")
to_chat(user, "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.")
else
status = 0
- bombers += "[key_name(user)] unwelded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]"
+ investigate_log("[key_name(user)] unwelded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]", INVESTIGATE_BOMB)
to_chat(user, "The hole has been closed.")
add_fingerprint(user)
..()
diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
index 08601522c5e..785e4549a47 100644
--- a/code/modules/assembly/igniter.dm
+++ b/code/modules/assembly/igniter.dm
@@ -28,7 +28,7 @@
if(istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/))
var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc
if(tank)
- tank.boom()
+ tank.boom(TRUE)
if(istype(src.loc.loc, /obj/item/reagent_containers/glass/beaker/))
var/obj/item/reagent_containers/glass/beaker/beakerbomb = src.loc.loc
if(beakerbomb)
@@ -41,4 +41,4 @@
/obj/item/assembly/igniter/attack_self(mob/user as mob)
activate()
add_fingerprint(user)
- return
\ No newline at end of file
+ return
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index 6bcefc6027c..5d6aa7490e2 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -75,7 +75,7 @@
if(!user.hand)
which_hand = "r_hand"
triggered(user, which_hand)
- user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \
+ user.visible_message("[user] accidentally sets off [src], breaking [user.p_their()] fingers.", \
"You accidentally trigger [src]!")
return
to_chat(user, "You disarm [src].")
@@ -91,7 +91,7 @@
if(!user.hand)
which_hand = "r_hand"
triggered(user, which_hand)
- user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \
+ user.visible_message("[user] accidentally sets off [src], breaking [user.p_their()] fingers.", \
"You accidentally trigger [src]!")
return
..()
@@ -114,7 +114,7 @@
on_found(mob/finder as mob)
if(armed)
- finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \
+ finder.visible_message("[finder] accidentally sets off [src], breaking [finder.p_their()] fingers.", \
"You accidentally trigger [src]!")
triggered(finder, finder.hand ? "l_hand" : "r_hand")
return 1 //end the search!
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 1886cd4ee65..6a2019b9001 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -23,7 +23,8 @@
if(radio_controller)
set_frequency(frequency)
-/obj/item/assembly/signaler/initialize()
+/obj/item/assembly/signaler/Initialize()
+ ..()
if(radio_controller)
set_frequency(frequency)
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index 5d8c0ed1e98..a585a689f2c 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -114,7 +114,7 @@
timing = !timing
if(timing && istype(holder, /obj/item/transfer_valve))
message_admins("[key_name_admin(usr)] activated [src] attachment on [holder].")
- bombers += "[key_name(usr)] activated [src] attachment for [loc]"
+ investigate_log("[key_name(usr)] activated [src] attachment for [loc]", INVESTIGATE_BOMB)
log_game("[key_name(usr)] activated [src] attachment for [loc]")
update_icon()
if(href_list["reset"])
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index e5c42e495f2..94e0ea2acce 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -29,7 +29,8 @@
var/brute_damage = 0
var/oxy_damage = 0
-/obj/effect/landmark/corpse/initialize()
+/obj/effect/landmark/corpse/Initialize()
+ ..()
if(istype(src,/obj/effect/landmark/corpse/clown))
var/obj/effect/landmark/corpse/clown/C = src
C.chooseRank()
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index d964663298f..d5e2cbcd34d 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -9,7 +9,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
unacidable = 1
var/active = 0
-/obj/machinery/gateway/initialize()
+/obj/machinery/gateway/Initialize()
..()
update_icon()
update_density_from_dir()
@@ -44,7 +44,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
if(!the_gateway)
the_gateway = src
-/obj/machinery/gateway/centerstation/initialize()
+/obj/machinery/gateway/centerstation/Initialize()
..()
update_icon()
wait = world.time + config.gateway_delay //+ thirty minutes default
@@ -170,7 +170,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
var/obj/machinery/gateway/centeraway/stationgate = null
-/obj/machinery/gateway/centeraway/initialize()
+/obj/machinery/gateway/centeraway/Initialize()
..()
update_icon()
stationgate = locate(/obj/machinery/gateway/centerstation) in world
diff --git a/code/modules/awaymissions/loot.dm b/code/modules/awaymissions/loot.dm
index 49af9a43ce6..6497d62648a 100644
--- a/code/modules/awaymissions/loot.dm
+++ b/code/modules/awaymissions/loot.dm
@@ -5,7 +5,8 @@
var/lootdoubles = 0 //if the same item can be spawned twice
var/loot = "" //a list of possible items to spawn- a string of paths
-/obj/effect/spawner/away/lootdrop/initialize()
+/obj/effect/spawner/away/lootdrop/Initialize()
+ ..()
var/list/things = params2list(loot)
if(things && things.len)
diff --git a/code/modules/awaymissions/map_rng.dm b/code/modules/awaymissions/map_rng.dm
index 64350c99737..7618996fdf9 100644
--- a/code/modules/awaymissions/map_rng.dm
+++ b/code/modules/awaymissions/map_rng.dm
@@ -18,13 +18,8 @@
template_name = tname
if(template_name)
template = map_templates[template_name]
- // Catches the interim-zone of worldstart and roundstart
- // I want both the ticker to exist (so mapped-in maploaders don't trip this)
- // but also not have started yet (since the zlevel system would handle this on its own otherwise)
- if((ticker && ticker.current_state < GAME_STATE_PLAYING))
- attempt_init()
-/obj/effect/landmark/map_loader/initialize()
+/obj/effect/landmark/map_loader/Initialize()
..()
if(template)
load(template)
@@ -48,7 +43,7 @@
/obj/effect/landmark/map_loader/random
var/template_list = ""
-/obj/effect/landmark/map_loader/random/initialize()
+/obj/effect/landmark/map_loader/random/Initialize()
..()
if(template_list)
template_name = safepick(splittext(template_list, ";"))
diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm
index b44fd01e45c..5ff625544fd 100644
--- a/code/modules/awaymissions/maploader/reader.dm
+++ b/code/modules/awaymissions/maploader/reader.dm
@@ -422,13 +422,6 @@ var/global/dmm_suite/preloader/_preloader = new
return to_return
-//atom creation method that preloads variables at creation
-/atom/New()
- if(use_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New()
- _preloader.load(src)
-
- . = ..()
-
/dmm_suite/Destroy()
..()
return QDEL_HINT_HARDDEL_NOW
diff --git a/code/modules/awaymissions/mission_code/spacehotel.dm b/code/modules/awaymissions/mission_code/spacehotel.dm
index e86123abc2e..81d21df5dcf 100644
--- a/code/modules/awaymissions/mission_code/spacehotel.dm
+++ b/code/modules/awaymissions/mission_code/spacehotel.dm
@@ -54,7 +54,7 @@
name = "space hotel pamphlet"
info = "
Welcome to Deep Space Hotel 419!
Thank you for choosing our hotel. Simply hand your credit or debit card to the concierge and get your room key! To check out, hand your credit card back.
Conditions:
The hotel is not responsible for any losses due to time or space anomalies.
The hotel is not responsible for events that occur outside of the hotel station, including, but not limited to, events that occur inside of dimensional pockets.
The hotel is not responsible for overcharging your account.
The hotel is not responsible for missing persons.
The hotel is not responsible for mind-altering effects due to drugs, magic, demons, or space worms.
"
-/obj/effect/landmark/map_loader/hotel_room/initialize()
+/obj/effect/landmark/map_loader/hotel_room/Initialize()
..()
// load and randomly assign rooms
var/global/list/south_room_templates = list()
@@ -299,6 +299,4 @@
return
S.retal_target = target
- S.retal = 1
-
-#undef CHECKOUT_TIME
+ S.retal = 1
\ No newline at end of file
diff --git a/code/modules/awaymissions/zvis.dm b/code/modules/awaymissions/zvis.dm
index 73bbff2198f..4324377149d 100644
--- a/code/modules/awaymissions/zvis.dm
+++ b/code/modules/awaymissions/zvis.dm
@@ -22,7 +22,7 @@
..()
levels += src
-/obj/effect/levelref/initialize()
+/obj/effect/levelref/Initialize()
..()
for(var/obj/effect/levelref/O in levels)
if(id == O.id && O != src)
@@ -161,7 +161,7 @@
..()
portals += src
-/obj/effect/view_portal/initialize()
+/obj/effect/view_portal/Initialize()
..()
if(id)
for(var/obj/effect/view_portal/O in portals)
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index ad25c8fdeb1..db4f33ac121 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -54,15 +54,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
return max(0, days - C.player_age)
return 0
-//used for alternate_option
-#define GET_RANDOM_JOB 0
-#define BE_CIVILIAN 1
-#define RETURN_TO_LOBBY 2
-
#define MAX_SAVE_SLOTS 20 // Save slots for regular players
#define MAX_SAVE_SLOTS_MEMBER 20 // Save slots for BYOND members
-
#define TAB_CHAR 0
#define TAB_GAME 1
#define TAB_GEAR 2
@@ -96,6 +90,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/UI_style_alpha = 255
var/windowflashing = TRUE
var/clientfps = 0
+ var/atklog = ATKLOG_ALL
//ghostly preferences
var/ghost_anonsay = 0
@@ -209,6 +204,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
max_gear_slots = config.max_loadout_points
+ var/loaded_preferences_successfully = FALSE
if(istype(C))
if(!IsGuestKey(C.key))
unlock_content = C.IsByondMember()
@@ -217,16 +213,17 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(C.donator_level >= DONATOR_LEVEL_ONE)
max_gear_slots += 5
- var/loaded_preferences_successfully = load_preferences(C)
- if(loaded_preferences_successfully)
- if(load_character(C))
- return
+ loaded_preferences_successfully = load_preferences(C) // Do not call this with no client/C, it generates a runtime / SQL error
+ if(loaded_preferences_successfully)
+ if(load_character(C))
+ return
//we couldn't load character data so just randomize the character appearance + name
random_character() //let's create a random character then - rather than a fat, bald and naked man.
real_name = random_name(gender)
- if(!loaded_preferences_successfully)
- save_preferences(C)
- save_character(C) //let's save this new random character so it doesn't keep generating new ones.
+ if(istype(C))
+ if(!loaded_preferences_successfully)
+ save_preferences(C) // Do not call this with no client/C, it generates a runtime / SQL error
+ save_character(C) // Do not call this with no client/C, it generates a runtime / SQL error
/datum/preferences/proc/color_square(colour)
return "___"
@@ -699,7 +696,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
switch(alternate_option)
if(GET_RANDOM_JOB)
HTML += "
"
@@ -1051,7 +1048,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
ResetJobs()
SetChoices(user)
if("random")
- if(alternate_option == GET_RANDOM_JOB || alternate_option == BE_CIVILIAN)
+ if(alternate_option == GET_RANDOM_JOB || alternate_option == BE_ASSISTANT)
alternate_option += 1
else if(alternate_option == RETURN_TO_LOBBY)
alternate_option = 0
diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm
index f2a9d739cfe..a175e39bc71 100644
--- a/code/modules/client/preference/preferences_mysql.dm
+++ b/code/modules/client/preference/preferences_mysql.dm
@@ -17,7 +17,8 @@
windowflashing,
ghost_anonsay,
exp,
- clientfps
+ clientfps,
+ atklog
FROM [format_table_name("player")]
WHERE ckey='[C.ckey]'"}
)
@@ -48,6 +49,7 @@
ghost_anonsay = text2num(query.item[15])
exp = query.item[16]
clientfps = text2num(query.item[17])
+ atklog = text2num(query.item[18])
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
@@ -66,6 +68,7 @@
ghost_anonsay = sanitize_integer(ghost_anonsay, 0, 1, initial(ghost_anonsay))
exp = sanitize_text(exp, initial(exp))
clientfps = sanitize_integer(clientfps, 0, 1000, initial(clientfps))
+ atklog = sanitize_integer(atklog, 0, 100, initial(atklog))
return 1
/datum/preferences/proc/save_preferences(client/C)
@@ -85,6 +88,7 @@
be_role='[sanitizeSQL(list2params(be_special))]',
default_slot='[default_slot]',
toggles='[toggles]',
+ atklog='[atklog]',
sound='[sound]',
randomslot='[randomslot]',
volume='[volume]',
@@ -93,7 +97,8 @@
lastchangelog='[lastchangelog]',
windowflashing='[windowflashing]',
ghost_anonsay='[ghost_anonsay]',
- clientfps='[clientfps]'
+ clientfps='[clientfps]',
+ atklog='[atklog]'
WHERE ckey='[C.ckey]'"}
)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 282603a8879..060e53df5b7 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -411,7 +411,7 @@ BLIND // can't see anything
desc = "[desc] They have had their toes opened up."
update_icon()
else
- to_chat(user, "[src] have already had their toes cut open!")
+ to_chat(user, "[src] have already had [p_their()] toes cut open!")
return
else
..()
@@ -489,7 +489,7 @@ BLIND // can't see anything
for(var/obj/item/I in O.contents) //Dump the pocket out onto the floor below the user.
user.unEquip(I,1)
- user.visible_message("[user] bellows, [pick("shredding", "ripping open", "tearing off")] their jacket in a fit of rage!","You accidentally [pick("shred", "rend", "tear apart")] \the [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")]!")
+ user.visible_message("[user] bellows, [pick("shredding", "ripping open", "tearing off")] [user.p_their()] jacket in a fit of rage!","You accidentally [pick("shred", "rend", "tear apart")] [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")]!")
user.unEquip(src)
qdel(src) //Now that the pockets have been emptied, we can safely destroy the jacket.
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 32f86cc6e57..40c29c1d991 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -132,3 +132,14 @@
cell.forceMove(get_turf(loc))
cell = null
update_icon()
+
+/obj/item/clothing/gloves/fingerless/rapid
+ name = "Gloves of the North Star"
+ desc = "Just looking at these fills you with an urge to beat the shit out of people."
+
+/obj/item/clothing/gloves/fingerless/rapid/Touch(mob/living/target, proximity = TRUE)
+ var/mob/living/M = loc
+
+ if(M.a_intent == INTENT_HARM)
+ M.changeNext_move(CLICK_CD_RAPID)
+ .= FALSE
\ No newline at end of file
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 10f5a348318..dc8c4b59a4d 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -222,7 +222,7 @@
return 1
/obj/item/clothing/head/fedora/proc/tip_fedora(mob/user)
- user.visible_message("[user] tips their fedora.", "You tip your fedora")
+ user.visible_message("[user] tips [user.p_their()] fedora.", "You tip your fedora")
/obj/item/clothing/head/fez
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 60cbfff3dd9..22f293aedfc 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -8,7 +8,7 @@
gas_transfer_coefficient = 0.90
put_on_delay = 20
var/resist_time = 0 //deciseconds of how long you need to gnaw to get rid of the gag, 0 to make it impossible to remove
- var/mute = MUTE_ALL
+ var/mute = MUZZLE_MUTE_ALL
var/security_lock = FALSE // Requires brig access to remove 0 - Remove as normal
var/locked = FALSE //Indicates if a mask is locked, should always start as 0.
species_fit = list("Vox")
@@ -22,8 +22,8 @@
return 0
else if(security_lock && locked)
if(do_unlock(user))
- visible_message("[user] unlocks their [src.name].", \
- "[user] unlocks their [src.name].")
+ visible_message("[user] unlocks [user.p_their()] [src.name].", \
+ "[user] unlocks [user.p_their()] [src.name].")
..()
return 1
@@ -93,7 +93,7 @@
item_state = null
w_class = WEIGHT_CLASS_TINY
resist_time = 150
- mute = MUTE_MUFFLE
+ mute = MUZZLE_MUTE_MUFFLE
flags = DROPDEL
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey")
sprite_sheets = list(
@@ -117,7 +117,7 @@
name = "safety muzzle"
desc = "A muzzle designed to prevent biting."
resist_time = 600
- mute = MUTE_NONE
+ mute = MUZZLE_MUTE_NONE
security_lock = TRUE
locked = FALSE
@@ -169,7 +169,7 @@
return 1
/obj/item/clothing/mask/fakemoustache/proc/pontificate(mob/user)
- user.visible_message("\ [user] twirls \his moustache and laughs [pick("fiendishly","maniacally","diabolically","evilly")]!")
+ user.visible_message("\ [user] twirls [user.p_their()] moustache and laughs [pick("fiendishly","maniacally","diabolically","evilly")]!")
//scarves (fit in in mask slot)
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 88796165114..3156b617c03 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -6,6 +6,7 @@
var/magboot_state = "magboots"
var/magpulse = 0
var/slowdown_active = 2
+ var/slowdown_passive = SHOES_SLOWDOWN
actions_types = list(/datum/action/item_action/toggle)
strip_delay = 70
put_on_delay = 70
@@ -14,7 +15,7 @@
/obj/item/clothing/shoes/magboots/attack_self(mob/user)
if(magpulse)
flags &= ~NOSLIP
- slowdown = SHOES_SLOWDOWN
+ slowdown = slowdown_passive
else
flags |= NOSLIP
slowdown = slowdown_active
@@ -53,4 +54,18 @@
obj/item/clothing/shoes/magboots/syndie/advance //For the Syndicate Strike Team
desc = "Reverse-engineered magboots that appear to be based on an advanced model, as they have a lighter magnetic pull. Property of Gorlex Marauders."
name = "advanced blood-red magboots"
- slowdown_active = SHOES_SLOWDOWN
\ No newline at end of file
+ slowdown_active = SHOES_SLOWDOWN
+
+/obj/item/clothing/shoes/magboots/clown
+ desc = "The prankster's standard-issue clowning shoes. Damn they're huge! There's a red light on the side."
+ name = "clown shoes"
+ icon_state = "clownmag0"
+ magboot_state = "clownmag"
+ item_state = "clown_shoes"
+ slowdown = SHOES_SLOWDOWN+1
+ slowdown_active = SHOES_SLOWDOWN+1
+ slowdown_passive = SHOES_SLOWDOWN+1
+ item_color = "clown"
+ silence_steps = 1
+ shoe_sound = "clownstep"
+ origin_tech = "magnets=4;syndicate=2"
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index 123b4e5fd5e..91884eeba2d 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -9,9 +9,10 @@
var/obj/machinery/camera/camera
var/has_camera = TRUE
strip_delay = 130
- species_fit = list("Grey")
+ species_fit = list("Grey", "Vox")
sprite_sheets = list(
- "Grey" = 'icons/mob/species/grey/helmet.dmi'
+ "Grey" = 'icons/mob/species/grey/helmet.dmi',
+ "Vox" = 'icons/mob/species/vox/helmet.dmi'
)
/obj/item/clothing/head/helmet/space/hardsuit/ert/attack_self(mob/user)
@@ -41,9 +42,10 @@
/obj/item/radio, /obj/item/analyzer, /obj/item/gun/energy/laser, /obj/item/gun/energy/pulse, \
/obj/item/gun/energy/gun/advtaser, /obj/item/melee/baton, /obj/item/gun/energy/gun)
strip_delay = 130
- species_fit = list("Drask")
+ species_fit = list("Drask", "Vox")
sprite_sheets = list(
- "Drask" = 'icons/mob/species/drask/suit.dmi'
+ "Drask" = 'icons/mob/species/drask/suit.dmi',
+ "Vox" = 'icons/mob/species/vox/suit.dmi'
)
//Commander
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index f5a6176a6c4..8ee357b1ffb 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -71,6 +71,11 @@
allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/tank,/obj/item/kitchen/knife/combat)
armor = list(melee = 40, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 90, rad = 20)
strip_delay = 120
+ species_restricted = list("exclude", "Diona", "Wryn")
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/suit.dmi'
+ )
/obj/item/clothing/head/helmet/space/deathsquad/beret
name = "officer's beret"
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 7a2d9e5e495..eab5aa0c5bb 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -366,7 +366,7 @@
correct_piece.icon_state = "[initial(icon_state)]"
switch(msg_type)
if("boots")
- to_chat(wearer, "\The [correct_piece] relax their grip on your legs.")
+ to_chat(wearer, "\The [correct_piece] relax [correct_piece.p_their()] grip on your legs.")
if(user != wearer)
to_chat(user, "\The [correct_piece] has been unsealed.")
wearer.update_inv_shoes()
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 74d07164101..7880dcc1dd3 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -9,6 +9,10 @@
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
burn_state = FIRE_PROOF
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/helmet.dmi'
+ )
/obj/item/clothing/suit/bio_suit
name = "bio suit"
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 6aa79584fc7..e0b444afcd0 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -77,7 +77,7 @@
burn_state = FIRE_PROOF
species_fit = list("Vox")
sprite_sheets = list(
- "Vox" = 'icons/mob/species/vox/head.dmi'
+ "Vox" = 'icons/mob/species/vox/helmet.dmi'
)
/obj/item/clothing/suit/bomb_suit
@@ -108,16 +108,12 @@
/obj/item/clothing/head/bomb_hood/security
icon_state = "bombsuitsec"
item_state = "bombsuitsec"
- species_fit = null
- sprite_sheets = null
/obj/item/clothing/suit/bomb_suit/security
icon_state = "bombsuitsec"
item_state = "bombsuitsec"
allowed = list(/obj/item/gun/energy,/obj/item/melee/baton,/obj/item/restraints/handcuffs)
- species_fit = null
- sprite_sheets = null
/*
* Radiation protection
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 6d2e0363138..aac34032dfb 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -131,7 +131,7 @@
/obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
if(ishuman(M) && isliving(user))
if(user == M)
- user.visible_message("[user] places \the [src] against \his chest and listens attentively.", "You place \the [src] against your chest...")
+ user.visible_message("[user] places [src] against [user.p_their()] chest and listens attentively.", "You place [src] against your chest...")
else
user.visible_message("[user] places \the [src] against [M]'s chest and listens attentively.", "You place \the [src] against [M]'s chest...")
var/obj/item/organ/internal/H = M.get_int_organ(/obj/item/organ/internal/heart)
@@ -250,7 +250,7 @@
to_chat(user, "Waving around a badge before swiping an ID would be pretty pointless.")
return
if(isliving(user))
- user.visible_message("[user] displays their Nanotrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.","You display your Nanotrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.")
+ user.visible_message("[user] displays [user.p_their()] Nanotrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.","You display your Nanotrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.")
/obj/item/clothing/accessory/holobadge/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/card/id) || istype(O, /obj/item/pda))
@@ -284,7 +284,7 @@
/obj/item/clothing/accessory/holobadge/attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
- user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face insistently.","You invade [M]'s personal space, thrusting [src] into their face insistently. You are the law.")
+ user.visible_message("[user] invades [M]'s personal space, thrusting [src] into [M.p_their()] face insistently.","You invade [M]'s personal space, thrusting [src] into [M.p_their()] face insistently. You are the law.")
/obj/item/storage/box/holobadge
name = "holobadge box"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 1ca94e9a4f3..76bef3e056b 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -69,9 +69,10 @@
item_state = "clown"
item_color = "clown"
flags_size = ONESIZEFITSALL
+ var/honk_sound = 'sound/items/bikehorn.ogg'
/obj/item/clothing/under/rank/clown/hit_reaction()
- playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
+ playsound(loc, honk_sound, 50, 1, -1)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
if(H.mind && H.mind.assigned_role == "Clown")
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 6dca8eccc75..ce3e9df0655 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -46,7 +46,7 @@
var/mob/living/carbon/human/target = M
if(istype(target.species, /datum/species/machine))
- to_chat(user, "[target] has no skin, how do you expect to tattoo them?")
+ to_chat(user, "[target] has no skin, how do you expect to tattoo [target.p_them()]?")
return
if(target.m_styles["body"] != "None")
@@ -497,8 +497,8 @@
#undef USED_MOD_SUIT
/obj/item/fluff/merchant_sallet_modkit //Travelling Merchant: Trav Noble. This is what they spawn in with
- name = "sallet modkit"
- desc = "A modkit that can make most helmets look like a steel sallet."
+ name = "SG Helmet modkit"
+ desc = "A modkit that can make most helmets look like a Shellguard Helmet."
icon_state = "modkit"
w_class = WEIGHT_CLASS_SMALL
force = 0
@@ -649,49 +649,49 @@
icon_state = "kakicharakiti"
/obj/item/clothing/head/helmet/fluff/merchant_sallet //Travelling Merchant: Trav Noble. This >>IS NOT<< what they spawn in with
- name = "Steel Sallet"
- desc = "A heavy steel sallet with the word Noble scratched into the side. Comes with a Bevor attached."
+ name = "Shellguard Helmet"
+ desc = "A Shellguard Helmet with the name Noble written on the inside."
icon = 'icons/obj/custom_items.dmi'
icon_state = "merchant_sallet_visor_bevor"
item_state = "merchant_sallet_visor_bevor"
actions_types = list(/datum/action/item_action/toggle_helmet_mode)
toggle_cooldown = 20
- toggle_sound = 'sound/items/ZippoClose.ogg'
+ toggle_sound = 'sound/items/change_jaws.ogg'
flags = BLOCKHAIR
flags_inv = HIDEEYES|HIDEMASK|HIDEFACE|HIDEEARS
- var/state = "Visor & Bevor"
+ var/state = "Soldier Up"
/obj/item/clothing/head/helmet/fluff/merchant_sallet/attack_self(mob/user)
if(!user.incapacitated() && (world.time > cooldown + toggle_cooldown) && Adjacent(user))
var/list/options = list()
- options["Visor & Bevor"] = list(
+ options["Soldier Up"] = list(
"icon_state" = "merchant_sallet_visor_bevor",
- "visor_flags" = HIDEEYES,
- "mask_flags" = HIDEMASK|HIDEFACE
- )
- options["Visor Only"] = list(
- "icon_state" = "merchant_sallet_visor",
- "visor_flags" = HIDEEYES,
- "mask_flags" = HIDEFACE
- )
- options["Bevor Only"] = list(
- "icon_state" = "merchant_sallet_bevor",
- "visor_flags" = null,
- "mask_flags" = HIDEMASK|HIDEFACE
- )
- options["Neither Visor nor Bevor"] = list(
- "icon_state" = "merchant_sallet",
"visor_flags" = null,
"mask_flags" = null
)
+ options["Soldier Down"] = list(
+ "icon_state" = "merchant_sallet_visor",
+ "visor_flags" = HIDEEYES,
+ "mask_flags" = HIDEMASK|HIDEFACE
+ )
+ options["Technician Up"] = list(
+ "icon_state" = "merchant_sallet_bevor",
+ "visor_flags" = null,
+ "mask_flags" = null
+ )
+ options["Technician Down"] = list(
+ "icon_state" = "merchant_sallet",
+ "visor_flags" = HIDEEYES,
+ "mask_flags" = HIDEMASK|HIDEFACE
+ )
- var/choice = input(user, "How would you like to adjust the sallet?", "Adjust Sallet") as null|anything in options
+ var/choice = input(user, "How would you like to adjust the helmet?", "Adjust Helmet") as null|anything in options
if(choice && choice != state && !user.incapacitated() && Adjacent(user))
var/list/new_state = options[choice]
icon_state = new_state["icon_state"]
state = choice
- to_chat(user, "You adjust the sallet.")
+ to_chat(user, "You adjust the helmet.")
playsound(src.loc, "[toggle_sound]", 100, 0, 4)
user.update_inv_head()
return 1
@@ -1265,6 +1265,8 @@
name = "engraved hand mirror"
desc = "A very classy hand mirror, with fancy detailing."
icon = 'icons/obj/custom_items.dmi'
+ lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "hand_mirror"
attack_verb = list("smacked")
hitsound = 'sound/weapons/tap.ogg'
@@ -1311,6 +1313,8 @@
name = "Classy victorian suit"
desc = "A blue and black victorian suit with silver buttons, very fancy!"
icon = 'icons/obj/custom_items.dmi'
+ lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "victorianlightfire"
item_state = "victorianvest"
item_color = "victorianlightfire"
@@ -1330,7 +1334,7 @@
to_chat(user, "You can't modify [target]!")
return
- to_chat(user, "You modify the appearance of [target] based on the kite blueprints.")
+ to_chat(user, "You modify the appearance of [target] based on the kit blueprints.")
var/obj/spacepod/pod = target
pod.icon = 'icons/48x48/custom_pod.dmi'
pod.icon_state = "pod_dece"
@@ -1350,9 +1354,36 @@
item_state = "teri_horn"
honk_sound = 'sound/items/teri_horn.ogg'
-/obj/item/clothing/accessory/medal/fluff/elo
+/obj/item/clothing/accessory/medal/fluff/elo //V-Force_Bomber: E.L.O.
name = "distinguished medal of loyalty and excellence"
desc = "This medal is cut into the shape of a Victoria Cross, and is awarded to those who have proven themselves to Nanotrasen with a long and successful career."
icon = 'icons/obj/custom_items.dmi'
icon_state = "elo-medal"
- item_color = "elo-medal"
\ No newline at end of file
+ item_color = "elo-medal"
+
+/obj/item/clothing/suit/fluff/vetcoat //Furasian: Fillmoore Grayson
+ name = "Veteran Coat"
+ desc = "An old, yet well-kept Nanotrasen uniform. Very few of its kind are still produced."
+ icon = 'icons/obj/custom_items.dmi'
+ lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
+ icon_state = "alchemistcoatblack"
+ item_state = "alchemistcoatblack"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+
+/obj/item/clothing/suit/fluff/vetcoat/red //Furasian: Fillmoore Grayson
+ icon_state = "alchemistcoatred"
+ item_state = "alchemistcoatred"
+
+/obj/item/clothing/suit/fluff/vetcoat/navy //Furasian: Fillmoore Grayson
+ icon_state = "alchemistcoatnavy"
+ item_state = "alchemistcoatnavy"
+
+/obj/item/clothing/accessory/medal/fluff/panzermedal //PanzerSkull: GRN-DER
+ name = "Cross of Valor"
+ desc = "A medal from the bygone Asteroid Wars. Its Ruby shines with a strange intensity."
+ icon = 'icons/obj/custom_items.dmi'
+ icon_state = "panzermedal"
+ item_state = "panzermedal"
+ item_color = "panzermedal"
+ slot_flags = SLOT_TIE
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 014f87ac310..6306fa5a83e 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -38,7 +38,7 @@ log transactions
..()
machine_id = "[station_name()] RT #[num_financial_terminals++]"
-/obj/machinery/atm/initialize()
+/obj/machinery/atm/Initialize()
..()
reconnect_database()
@@ -122,6 +122,8 @@ log transactions
if(issilicon(user))
to_chat(user, "Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005.")
return
+ if(!linked_db)
+ reconnect_database()
ui_interact(user)
/obj/machinery/atm/attack_ghost(mob/user)
@@ -199,12 +201,9 @@ log transactions
authenticated_account.security_level = new_sec_level
if("attempt_auth")
if(linked_db)
- // check if they have low security enabled
- scan_user(usr)
-
- if(!ticks_left_locked_down && held_card)
+ if(!ticks_left_locked_down)
var/tried_account_num = text2num(href_list["account_num"])
- if(!tried_account_num)
+ if(!tried_account_num && held_card)
tried_account_num = held_card.associated_account_number
var/tried_pin = text2num(href_list["account_pin"])
@@ -323,30 +322,3 @@ log transactions
//create the most effective combination of notes to make up the requested amount
/obj/machinery/atm/proc/withdraw_arbitrary_sum(arbitrary_sum)
new /obj/item/stack/spacecash(get_step(get_turf(src), turn(dir, 180)), arbitrary_sum)
-
-//stolen wholesale and then edited a bit from newscasters, which are awesome and by Agouri
-/obj/machinery/atm/proc/scan_user(mob/living/carbon/human/H)
- if(!authenticated_account && linked_db)
- if(H.wear_id)
- var/obj/item/card/id/I
- if(istype(H.wear_id, /obj/item/card/id) )
- I = H.wear_id
- else if(istype(H.wear_id, /obj/item/pda) )
- var/obj/item/pda/P = H.wear_id
- I = P.id
- if(I)
- authenticated_account = attempt_account_access(I.associated_account_number)
- if(authenticated_account)
- to_chat(H, "[bicon(src)]Access granted. Welcome user '[authenticated_account.owner_name].'")
-
- //create a transaction log entry
- var/datum/transaction/T = new()
- T.target_name = authenticated_account.owner_name
- T.purpose = "Remote terminal access"
- T.source_terminal = machine_id
- T.date = current_date_string
- T.time = station_time_timestamp()
- authenticated_account.transaction_log.Add(T)
-
- view_screen = NO_SCREEN
- SSnanoui.update_uis(src)
diff --git a/code/modules/economy/Economy.dm b/code/modules/economy/Economy.dm
index 028c2810ae7..57d76e98c5c 100644
--- a/code/modules/economy/Economy.dm
+++ b/code/modules/economy/Economy.dm
@@ -38,7 +38,7 @@
#define MINERALS 8
#define EMERGENCY 9
-#define GAS 10
+#define EGAS 10
#define MAINTENANCE 11
#define ELECTRICAL 12
#define ROBOTICS 13
diff --git a/code/modules/economy/Economy_Events.dm b/code/modules/economy/Economy_Events.dm
index c1e5b95273e..10e0d574f98 100644
--- a/code/modules/economy/Economy_Events.dm
+++ b/code/modules/economy/Economy_Events.dm
@@ -29,16 +29,16 @@
if(INDUSTRIAL_ACCIDENT)
dearer_goods = list(EMERGENCY, BIOMEDICAL, ROBOTICS)
if(BIOHAZARD_OUTBREAK)
- dearer_goods = list(BIOMEDICAL, GAS)
+ dearer_goods = list(BIOMEDICAL, EGAS)
if(PIRATES)
dearer_goods = list(SECURITY, MINERALS)
if(CORPORATE_ATTACK)
dearer_goods = list(SECURITY, MAINTENANCE)
if(ALIEN_RAIDERS)
dearer_goods = list(BIOMEDICAL, ANIMALS)
- cheaper_goods = list(GAS, MINERALS)
+ cheaper_goods = list(EGAS, MINERALS)
if(AI_LIBERATION)
- dearer_goods = list(EMERGENCY, GAS, MAINTENANCE)
+ dearer_goods = list(EMERGENCY, EGAS, MAINTENANCE)
if(MOURNING)
cheaper_goods = list(MINERALS, MAINTENANCE)
if(CULT_CELL_REVEALED)
diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm
index a527367ee2b..09a5d20833e 100644
--- a/code/modules/error_handler/error_handler.dm
+++ b/code/modules/error_handler/error_handler.dm
@@ -96,7 +96,7 @@ var/total_runtimes_skipped = 0
// Now to actually output the error info...
log_world("\[[time_stamp()]] Runtime in [e.file],[e.line]: [e]")
- log_runtime_txt("\[[time_stamp()]] Runtime in [e.file],[e.line]: [e]")
+ log_runtime_txt("Runtime in [e.file],[e.line]: [e]")
for(var/line in desclines)
log_world(line)
log_runtime_txt(line)
diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm
index e35c7de6ee3..6cf5e1b1ce7 100644
--- a/code/modules/events/aurora_caelus.dm
+++ b/code/modules/events/aurora_caelus.dm
@@ -6,11 +6,11 @@
var/aurora_progress = 0 //this cycles from 1 to 7, slowly changing colors from gentle green to gentle blue
/datum/event/aurora_caelus/announce()
- event_announcement.Announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull.\
-Nanotrasen has approved a short break for all employees to relax and observe this very rare event.\
-During this time, starlight will be bright but gentle, shifting between quiet green and blue colors.\
-Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space.\
-We hope you enjoy the lights.", "Harmless ions approaching", new_sound = 'sound/misc/notice2.ogg', from = "Nanotrasen Meterology Divison")
+ event_announcement.Announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. \
+Nanotrasen has approved a short break for all employees to relax and observe this very rare event. \
+During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. \
+Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. \
+We hope you enjoy the lights.", "Harmless ions approaching", new_sound = 'sound/misc/notice2.ogg', from = "Nanotrasen Meteorology Division")
for(var/V in player_list)
var/mob/M = V
if((M.client.prefs.toggles & SOUND_MIDI) && is_station_level(M.z))
@@ -37,10 +37,10 @@ We hope you enjoy the lights.", "Harmless ions approaching", new_sound = 'sound/
for(var/s in GLOB.station_level_space_turfs)
var/turf/space/S = s
fade_to_black(S)
- event_announcement.Announce("The aurora caelus event is now ending. Starlight conditions will slowly return to normal.\
-When this has concluded, please return to your workplace and continue work as normal.\
+ event_announcement.Announce("The Aurora Caelus event is now ending. Starlight conditions will slowly return to normal. \
+When this has concluded, please return to your workplace and continue work as normal. \
Have a pleasant shift, [station_name()], and thank you for watching with us.",
-"Harmless ions approaching", new_sound = 'sound/misc/notice2.ogg', from = "Nanotrasen Meterology Divison")
+"Harmless ions approaching", new_sound = 'sound/misc/notice2.ogg', from = "Nanotrasen Meteorology Division")
/datum/event/aurora_caelus/proc/fade_to_black(turf/space/S)
set waitfor = FALSE
@@ -48,4 +48,4 @@ Have a pleasant shift, [station_name()], and thank you for watching with us.",
while(S.light_range > new_light)
S.set_light(S.light_range - 0.2)
sleep(30)
- S.set_light(new_light, 1, l_color = "") // we should be able to use `, null` as the last arg but BYOND is a piece of FUCKING SHIT AND SET_LIGHT DOESN'T WORK THAT WAY DESPITE EVERY FUCKING THING ABOUT IT INDICATING THAT IT GODDAMN WELL SHOULD AAAAAAAAAAAAAAAAA
\ No newline at end of file
+ S.set_light(new_light, 1, l_color = "") // we should be able to use `, null` as the last arg but BYOND is a piece of FUCKING SHIT AND SET_LIGHT DOESN'T WORK THAT WAY DESPITE EVERY FUCKING THING ABOUT IT INDICATING THAT IT GODDAMN WELL SHOULD AAAAAAAAAAAAAAAAA
diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm
index b514924abfa..cf2e3621498 100644
--- a/code/modules/events/disease_outbreak.dm
+++ b/code/modules/events/disease_outbreak.dm
@@ -11,7 +11,7 @@
/datum/event/disease_outbreak/start()
if(!virus_type)
- virus_type = pick(/datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis)
+ virus_type = pick(/datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis, /datum/disease/beesease, /datum/disease/anxiety, /datum/disease/fake_gbs, /datum/disease/fluspanish, /datum/disease/pierrot_throat, /datum/disease/lycan)
for(var/mob/living/carbon/human/H in shuffle(living_mob_list))
if(issmall(H)) //don't infect monkies; that's a waste
diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm
index c5a5873afa0..d11a1227ddf 100644
--- a/code/modules/events/infestation.dm
+++ b/code/modules/events/infestation.dm
@@ -107,7 +107,6 @@
#undef LOC_HYDRO
#undef LOC_VAULT
#undef LOC_TECH
-#undef LOC_TACTICAL
#undef VERM_MICE
#undef VERM_LIZARDS
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index 520d8805bbd..b4a67ac9850 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -493,7 +493,7 @@
/proc/generate_static_ion_law()
/var/list/players = list()
for(var/mob/living/carbon/human/player in player_list)
- if( !player.mind || player.mind.assigned_role == "MODE" || player.client.inactivity > MinutesToTicks(10))
+ if( !player.mind || player.mind.assigned_role == player.mind.special_role || player.client.inactivity > MinutesToTicks(10))
continue
players += player.real_name
var/random_player = "The Captain"
diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm
index 0f2da54818c..4b822dd718e 100644
--- a/code/modules/events/radiation_storm.dm
+++ b/code/modules/events/radiation_storm.dm
@@ -1,70 +1,11 @@
-/datum/event/radiation_storm
- announceWhen = 1
- var/safe_zones = list(
- /area/maintenance,
- /area/crew_quarters/sleep,
- /area/security/brig,
- /area/shuttle,
- /area/vox_station,
- /area/syndicate_station
- )
-
+/datum/event/radiation_storm/setup()
+ startWhen = 3
+ endWhen = startWhen + 1
+ announceWhen = 1
/datum/event/radiation_storm/announce()
- // Don't do anything, we want to pack the announcement with the actual event
-
-/datum/event/radiation_storm/proc/is_safe_zone(var/area/A)
- for(var/szt in safe_zones)
- if(istype(A, szt))
- return 1
- return 0
+ priority_announcement.Announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
+ //sound not longer matches the text, but an audible warning is probably good
/datum/event/radiation_storm/start()
- spawn()
- event_announcement.Announce("High levels of radiation detected near the station. Please evacuate into one of the shielded maintenance tunnels.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
-
- for(var/area/A in world)
- if(!is_station_level(A.z) || is_safe_zone(A))
- continue
- A.radiation_alert()
-
- make_maint_all_access()
-
- sleep(600)
-
- event_announcement.Announce("The station has entered the radiation belt. Please remain in a sheltered area until we have passed the radiation belt.", "Anomaly Alert")
-
- for(var/i = 0, i < 10, i++)
- for(var/mob/living/carbon/human/H in living_mob_list)
- var/armor = H.getarmor(type = "rad")
- if((RADIMMUNE in H.species.species_traits) || armor >= 100) // Leave radiation-immune species/fully rad armored players completely unaffected
- continue
- var/turf/T = get_turf(H)
- if(!T)
- continue
- if(!is_station_level(T.z) || is_safe_zone(T.loc))
- continue
-
- if(istype(H,/mob/living/carbon/human))
- H.apply_effect((rand(15,35)),IRRADIATE,0)
- if(prob(5))
- H.apply_effect((rand(40,70)),IRRADIATE,0)
- if(prob(75))
- randmutb(H) // Applies bad mutation
- domutcheck(H,null,1)
- else
- randmutg(H) // Applies good mutation
- domutcheck(H,null,1)
-
- sleep(100)
-
- event_announcement.Announce("The station has passed the radiation belt. Please report to medbay if you experience any unusual symptoms. Maintenance will lose all access again shortly.", "Anomaly Alert")
-
- for(var/area/A in world)
- if(!is_station_level(A.z) || is_safe_zone(A))
- continue
- A.reset_radiation_alert()
-
- sleep(600) // Want to give them time to get out of maintenance.
-
- revoke_maint_all_access()
+ SSweather.run_weather(/datum/weather/rad_storm)
\ No newline at end of file
diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
index 58566f9872d..63a4b668930 100644
--- a/code/modules/fish/fish_items.dm
+++ b/code/modules/fish/fish_items.dm
@@ -26,7 +26,7 @@
throw_range = 7
suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw
- to_chat(viewers(user), "[user] places the [src.name] on top of \his head, \his fingers tangled in the netting! It looks like \he's trying to commit suicide.")
+ to_chat(viewers(user), "[user] places the [src.name] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide.")
return(OXYLOSS)
/obj/item/fishfood
@@ -52,7 +52,7 @@
attack_verb = list("scrubbed", "brushed", "scraped")
suicide_act(mob/user)
- to_chat(viewers(user), "[user] is vigorously scrubbing \himself raw with the [src.name]! It looks like \he's trying to commit suicide.")
+ to_chat(viewers(user), "[user] is vigorously scrubbing [user.p_them()]self raw with the [name]! It looks like [user.p_theyre()] trying to commit suicide.")
return(BRUTELOSS|FIRELOSS)
//////////////////////////////////////////////
diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm
index 584fdd5b93c..412c5407ddc 100644
--- a/code/modules/fish/fishtank.dm
+++ b/code/modules/fish/fishtank.dm
@@ -1,6 +1,6 @@
//////////////////////////////
-// Fish Tanks! //
+// Fish Tanks //
//////////////////////////////
@@ -9,44 +9,41 @@
desc = "So generic, it might as well have no description at all."
icon = 'icons/obj/fish_items.dmi'
icon_state = "tank1"
- density = 0
- anchored = 0
+ density = FALSE
+ anchored = FALSE
pass_flags = 0
var/tank_type = "" // Type of aquarium, used for icon updating
var/water_capacity = 0 // Number of units the tank holds (varies with tank type)
var/water_level = 0 // Number of units currently in the tank (new tanks start empty)
var/light_switch = 0 // 0 = off, 1 = on (off by default)
- var/filth_level = 0.0 // How dirty the tank is (max 10)
+ var/filth_level = 0 // How dirty the tank is (max 10)
var/lid_switch = 0 // 0 = open, 1 = closed (open by default)
var/max_fish = 0 // How many fish the tank can support (varies with tank type, 1 fish per 50 units sounds reasonable)
var/food_level = 0 // Amount of fishfood floating in the tank (max 10)
var/fish_count = 0 // Number of fish in the tank
- var/list/fish_list = null // Tracks the current types of fish in the tank
+ var/list/fish_list = list() // Tracks the current types of fish in the tank
var/egg_count = 0 // How many fish eggs can be harvested from the tank (capped at the max_fish value)
- var/list/egg_list = null // Tracks the current types of harvestable eggs in the tank
+ var/list/egg_list = list() // Tracks the current types of harvestable eggs in the tank
- var/has_lid = 0 // 0 if the tank doesn't have a lid/light, 1 if it does
- var/max_health = 0 // Can handle a couple hits
- var/cur_health = 0 // Current health, starts at max_health
- var/leaking = 0 // 0 if not leaking, 1 if minor leak, 2 if major leak (not leaking by default)
+ var/has_lid = FALSE // 0 if the tank doesn't have a lid/light, 1 if it does
+ var/leaking = FALSE // 0 if not leaking, 1 if minor leak, 2 if major leak (not leaking by default)
var/shard_count = 0 // Number of glass shards to salvage when broken (1 less than the number of sheets to build the tank)
/obj/machinery/fishtank/bowl
name = "fish bowl"
desc = "A small bowl capable of housing a single fish, commonly found on desks. This one has a tiny treasure chest in it!"
icon_state = "bowl1"
- density = 0 // Small enough to not block stuff
- anchored = 0 // Small enough to move even when filled
+ density = FALSE // Small enough to not block stuff
+ anchored = FALSE // Small enough to move even when filled
pass_flags = PASSTABLE | LETPASSTHROW // Just like at the county fair, you can't seem to throw the ball in to win the goldfish, and it's small enough to pull onto a table
tank_type = "bowl"
water_capacity = 50 // Not very big, therefore it can't hold much
max_fish = 1 // What a lonely fish
- has_lid = 0
- max_health = 15 // Not very sturdy
- cur_health = 15
+ has_lid = FALSE
+ max_integrity = 15 // Not very sturdy
shard_count = 0 // No salvageable shards
/obj/machinery/fishtank/tank
@@ -54,17 +51,16 @@
desc = "A large glass tank designed to house aquatic creatures. Contains an integrated water circulation system."
icon = 'icons/obj/fish_items.dmi'
icon_state = "tank1"
- density = 1
- anchored = 1
+ density = TRUE
+ anchored = TRUE
pass_flags = LETPASSTHROW
tank_type = "tank"
water_capacity = 200 // Decent sized, holds almost 2 full buckets
max_fish = 4 // Room for a few fish
- has_lid = 1
- max_health = 50 // Average strength, will take a couple hits from a toolbox.
- cur_health = 50
+ has_lid = TRUE
+ max_integrity = 50 // Average strength, will take a couple hits from a toolbox.
shard_count = 2
@@ -72,17 +68,16 @@
name = "wall aquarium"
desc = "This aquarium is massive! It completely occupies the same space as a wall, and looks very sturdy too!"
icon_state = "wall1"
- density = 1
- anchored = 1
+ density = TRUE
+ anchored = TRUE
pass_flags = 0 // This thing is the size of a wall, you can't throw past it.
tank_type = "wall"
water_capacity = 500 // This thing fills an entire tile, it holds a lot.
max_fish = 10 // Plenty of room for a lot of fish
- has_lid = 1
- max_health = 100 // This thing is a freaking wall, it can handle abuse.
- cur_health = 100
+ has_lid = TRUE
+ max_integrity = 100 // This thing is a freaking wall, it can handle abuse.
shard_count = 3
@@ -94,9 +89,10 @@
set name = "Toggle Tank Lid"
set category = "Object"
set src in view(1)
- toggle_lid(usr)
-/obj/machinery/fishtank/proc/toggle_lid(var/mob/living/user)
+ toggle_lid()
+
+/obj/machinery/fishtank/proc/toggle_lid()
lid_switch = !lid_switch
update_icon()
@@ -104,12 +100,13 @@
set name = "Toggle Tank Light"
set category = "Object"
set src in view(1)
- toggle_light(usr)
-/obj/machinery/fishtank/proc/toggle_light(var/mob/living/user)
+ toggle_light()
+
+/obj/machinery/fishtank/proc/toggle_light()
light_switch = !light_switch
if(light_switch)
- set_light(2,2,"#a0a080")
+ set_light(2, 2, "#a0a080")
else
adjust_tank_light()
@@ -119,8 +116,6 @@
/obj/machinery/fishtank/New()
..()
- fish_list = new/list()
- egg_list = new/list()
if(!has_lid) //Tank doesn't have a lid/light, remove the verbs for then
verbs -= /obj/machinery/fishtank/verb/toggle_lid_verb
verbs -= /obj/machinery/fishtank/verb/toggle_light_verb
@@ -154,7 +149,8 @@
overlays += "over_leak_[leaking]" //Green if we aren't leaking, light blue and slow blink if minor link, dark blue and rapid flashing for major leak
//Update water overlay
- if(water_level == 0) return //Skip the rest of this if there is no water in the aquarium
+ if(!water_level)
+ return //Skip the rest of this if there is no water in the aquarium
var/water_type = "_clean" //Default to clean water
if(filth_level > 5) water_type = "_dirty" //Show dirty water above filth_level 5 (breeding threshold)
if(water_level > (water_capacity * 0.85)) //Show full if the water_level is over 85% of water_capacity
@@ -162,15 +158,13 @@
else if(water_level > (water_capacity * 0.35)) //Show half-full if the water_level is over 35% of water_capacity
overlays += "over_[tank_type]_half[water_type]"
- return
-
//////////////////////////////
// PROCESS PROC //
//////////////////////////////
//Stops atmos from passing wall tanks, since they are effectively full-windows.
-/obj/machinery/fishtank/wall/CanAtmosPass(var/turf/T)
- return 0
+/obj/machinery/fishtank/wall/CanAtmosPass(turf/T)
+ return FALSE
/obj/machinery/fishtank/process()
//Start by counting fish in the tank
@@ -238,9 +232,7 @@
adjust_tank_light()
/obj/machinery/fishtank/proc/adjust_tank_light()
- if(light_switch) //tank light overrides fish lights
- return
- else
+ if(!light_switch) //tank light overrides fish lights
var/glo_light = 0
for(var/datum/fish/fish in fish_list)
if(istype(fish, /datum/fish/glofish))
@@ -261,19 +253,13 @@
food_level = min(10, max(0, food_level + amount))
/obj/machinery/fishtank/proc/check_health()
- //Max value check
- if(cur_health > max_health) //Cur_health cannot exceed max_health, set it to max_health if it does
- cur_health = max_health
//Leaking status check
- if(cur_health <= (max_health * 0.25)) //Major leak at or below 25% health (-10 water/cycle)
+ if(obj_integrity <= (max_integrity * 0.25)) //Major leak at or below 25% health (-10 water/cycle)
leaking = 2
- else if(cur_health <= (max_health * 0.5)) //Minor leak at or below 50% health (-1 water/cycle)
+ else if(obj_integrity <= (max_integrity * 0.5)) //Minor leak at or below 50% health (-1 water/cycle)
leaking = 1
else //Not leaking above 50% health
leaking = 0
- //Destruction check
- if(cur_health <= 0) //The tank is broken, destroy it
- destroy()
/obj/machinery/fishtank/proc/kill_fish(datum/fish/fish_type = null)
//Check if we were passed a fish to kill, otherwise kill a random one
@@ -292,12 +278,12 @@
fish_list.Add(fish_type) //Add a fish of the specified type
fish_count++ //Increase fish_count to reflect the introduction of a fish, so the everything else works fine
//Announce the new fish
- visible_message("A new [fish_type.fish_name] has hatched in \the [src]!")
+ visible_message("A new [fish_type.fish_name] has hatched in [src]!")
//Null type fish are dud eggs, give a message to inform the player
else
to_chat(usr, "The eggs disolve in the water. They were duds!")
-/obj/machinery/fishtank/proc/harvest_eggs(var/mob/user)
+/obj/machinery/fishtank/proc/harvest_eggs(mob/user)
if(!egg_count) //Can't harvest non-existant eggs
return
@@ -312,62 +298,39 @@
egg_list.Cut() //Destroy any excess eggs, clearing the egg_list
-/obj/machinery/fishtank/proc/harvest_fish(var/mob/user)
- if(fish_count <= 0) //Can't catch non-existant fish!
- to_chat(usr, "There are no fish in \the [src] to catch!")
+/obj/machinery/fishtank/proc/harvest_fish(mob/user)
+ if(fish_count <= 0) //Can't catch non-existant fish!
+ to_chat(user, "There are no fish in [src] to catch!")
return
var/list/fish_names_list = list()
for(var/datum/fish/fish_type in fish_list)
fish_names_list += list("[fish_type.fish_name]" = fish_type)
var/caught_fish = input("Select a fish to catch.", "Fishing") as null|anything in fish_names_list //Select a fish from the tank
if(fish_count <= 0)
- to_chat(usr, "There are no fish in \the [src] to catch!")
+ to_chat(user, "There are no fish in [src] to catch!")
return
else if(caught_fish)
- user.visible_message("[user.name] harvests \a [caught_fish] from \the [src].", "You scoop \a [caught_fish] out of \the [src].")
+ user.visible_message("[user.name] harvests \a [caught_fish] from [src].", "You scoop \a [caught_fish] out of [src].")
var/datum/fish/fish_type = fish_names_list[caught_fish]
var/fish_item = fish_type.fish_item
if(fish_item)
new fish_item(get_turf(user)) //Spawn the appropriate fish_item at the user's feet.
kill_fish(fish_type) //Kill the caught fish from the tank
-
-/obj/machinery/fishtank/proc/destroy(var/deconstruct = 0)
- var/turf/T = get_turf(src) //Store the tank's turf for atmos updating after deletion of tank
- if(!deconstruct) //Check if we are deconstructing or breaking the tank
- var/shards_left = shard_count
- while(shards_left > 0) //Produce the appropriate number of glass shards
- new /obj/item/shard(get_turf(src))
- shards_left --
- if(water_level) //Spill any water that was left in the tank when it broke
- spill_water()
- else //We are deconstructing, make glass sheets instead of shards
- var/sheets = shard_count + 1 //Deconstructing it salvages all the glass used to build the tank
- new /obj/item/stack/sheet/glass(get_turf(src), sheets) //Produce the appropriate number of glass sheets, in a single stack
- qdel(src) //qdel the tank and it's contents
- T.air_update_turf(1) //Update the air for the turf, to avoid permanent atmos sealing with wall tanks
-
+ //Update the air for the turf, to avoid permanent atmos sealing with wall tanks
/obj/machinery/fishtank/proc/spill_water()
+ var/turf/simulated/T = get_turf(src)
switch(tank_type)
if("bowl") //Fishbowl: Wets it's own tile
- var/turf/T = get_turf(src)
- if(!istype(T, /turf/simulated)) return
- var/turf/simulated/S = T
- S.MakeSlippery()
+ if(istype(T))
+ T.MakeSlippery()
if("tank") //Fishtank: Wets it's own tile and the 4 adjacent tiles (cardinal directions)
- var/turf/ST = get_turf(src)
- if(istype(ST, /turf/simulated))
- var/turf/simulated/ST2 = ST
- ST2.MakeSlippery()
- var/list/L = ST.CardinalTurfs()
- for(var/turf/T in L)
- if(!istype(T, /turf/simulated)) continue
- var/turf/simulated/S = T
- S.MakeSlippery()
+ if(istype(T))
+ T.MakeSlippery()
+ for(var/turf/simulated/ST in T.CardinalTurfs())
+ ST.MakeSlippery()
if("wall") //Wall-tank: Wets it's own tile and the surrounding 8 tiles (3x3 square)
- for(var/turf/T in spiral_range_turfs(1, src.loc))
- if(!istype(T, /turf/simulated)) continue
- var/turf/simulated/S = T
- S.MakeSlippery()
+ for(var/turf/simulated/ST in spiral_range_turfs(1, loc))
+ ST.MakeSlippery()
/obj/machinery/fishtank/proc/breed_fish()
var/list/breed_candidates = fish_list.Copy()
@@ -412,20 +375,20 @@
examine_message += "Water level: "
- if(water_level == 0)
- examine_message += "\The [src] is empty! "
+ if(!water_level)
+ examine_message += "[src] is empty! "
else if(water_level < water_capacity * 0.1)
- examine_message += "\The [src] is nearly empty! "
+ examine_message += "[src] is nearly empty! "
else if(water_level <= water_capacity * 0.25)
- examine_message += "\The [src] is about one-quarter filled. "
+ examine_message += "[src] is about one-quarter filled. "
else if(water_level <= water_capacity * 0.5)
- examine_message += "\The [src] is about half filled. "
+ examine_message += "[src] is about half filled. "
else if(water_level <= water_capacity * 0.75)
- examine_message += "\The [src] is about three-quarters filled. "
+ examine_message += "[src] is about three-quarters filled. "
else if(water_level < water_capacity)
- examine_message += "\The [src] is nearly full! "
+ examine_message += "[src] is nearly full! "
else if(water_level == water_capacity)
- examine_message += "\The [src] is full! "
+ examine_message += "[src] is full! "
examine_message += " Cleanliness level: "
@@ -467,7 +430,7 @@
//Report the number and types of live fish if there is water in the tank
if(fish_count == 0)
- examine_message += "\The [src] doesn't contain any live fish. "
+ examine_message += "[src] doesn't contain any live fish. "
else
//Build a message reporting the types of fish
var/fish_num = fish_count
@@ -483,7 +446,7 @@
message +=", "
message +="." //No more fish, end the message with a period
//Display the number of fish and previously constructed message
- examine_message += "\The [src] contains [fish_count] live fish. [message] "
+ examine_message += "[src] contains [fish_count] live fish. [message] "
examine_message += " "
@@ -498,12 +461,16 @@
examine_message += " "
//Report if the tank is leaking/cracked
- if(water_level > 0) //Tank has water, so it's actually leaking
- if(leaking == 1) examine_message += "\The [src] is leaking."
- if(leaking == 2) examine_message += "\The [src] is leaking profusely!"
+ if(water_level) //Tank has water, so it's actually leaking
+ if(leaking == 1)
+ examine_message += "[src] is leaking."
+ if(leaking == 2)
+ examine_message += "[src] is leaking profusely!"
else //No water, report the cracks instead
- if(leaking == 1) examine_message += "\The [src] is cracked."
- if(leaking == 2) examine_message += "\The [src] is nearly shattered!"
+ if(leaking == 1)
+ examine_message += "[src] is cracked."
+ if(leaking == 2)
+ examine_message += "[src] is nearly shattered!"
//Finally, report the full examine_message constructed from the above reports
@@ -514,127 +481,113 @@
// ATACK PROCS //
//////////////////////////////
-/obj/machinery/fishtank/attack_animal(mob/living/simple_animal/M as mob)
+/obj/machinery/fishtank/attack_animal(mob/living/simple_animal/M)
if(istype(M, /mob/living/simple_animal/pet/cat))
if(M.a_intent == INTENT_HELP) //Cats can try to fish in open tanks on help intent
if(lid_switch) //Can't fish in a closed tank. Fishbowls are ALWAYS open.
- M.visible_message("[M.name] stares at into \the [src] while sitting perfectly still.", "The lid is closed, so you stare into \the [src] intently.")
+ M.visible_message("[M.name] stares at into [src] while sitting perfectly still.", "The lid is closed, so you stare into [src] intently.")
else
if(fish_count) //Tank must actually have fish to try catching one
- M.visible_message("[M.name] leaps up onto \the[src] and attempts to fish through the opening!", "You jump up onto \the [src] and begin fishing through the opening!")
- spawn(10)
- if(water_level && prob(45)) //If there is water, there is a chance the cat will slip, Syndicat will spark like E-N when this happens
- M.visible_message("[M.name] slipped and got soaked!", "You slipped and got soaked!")
- if(istype(M, /mob/living/simple_animal/pet/cat/Syndi))
- var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
- s.set_up(3, 1, src)
- s.start()
- else //No water or didn't slip, get that fish!
- M.visible_message("[M.name] catches and devours a live fish!", "You catch and devour a live fish, yum!")
- kill_fish() //Kill a random fish
- M.health = M.maxHealth //Eating fish heals the predator
+ M.visible_message("[M.name] leaps up onto [src] and attempts to fish through the opening!", "You jump up onto [src] and begin fishing through the opening!")
+ if(water_level && prob(45)) //If there is water, there is a chance the cat will slip, Syndicat will spark like E-N when this happens
+ M.visible_message("[M.name] slipped and got soaked!", "You slipped and got soaked!")
+ if(istype(M, /mob/living/simple_animal/pet/cat/Syndi))
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+ else //No water or didn't slip, get that fish!
+ M.visible_message("[M.name] catches and devours a live fish!", "You catch and devour a live fish, yum!")
+ kill_fish() //Kill a random fish
+ M.health = M.maxHealth //Eating fish heals the predator
else
- to_chat(usr, "There are no fish in [src]!")
+ to_chat(M, "There are no fish in [src]!")
else
- attack_generic(M, M.harm_intent_damage)
+ return ..()
else if(istype(M, /mob/living/simple_animal/hostile/bear))
if(M.a_intent == INTENT_HELP) //Bears can try to fish in open tanks on help intent
if(lid_switch) //Can't fish in a closed tank. Fishbowls are ALWAYS open.
- M.visible_message("[M.name] scrapes it's claws along \the [src]'s lid.", "The lid is closed, so you scrape your claws against \the [src]'s lid.")
+ M.visible_message("[M.name] scrapes it's claws along [src]'s lid.", "The lid is closed, so you scrape your claws against [src]'s lid.")
else
if(fish_count) //Tank must actually have fish to try catching one
- M.visible_message("[M.name] reaches into \the[src] and attempts to fish through the opening!", "You reach into \the [src] and begin fishing through the opening!")
- spawn(5)
- if(water_level && prob(5)) //Bears are good at catching fish, only a 5% chance to fail
- M.visible_message("[M.name] swipes at the water!", "You just barely missed that fish!")
- else //No water or didn't slip, get that fish!
- M.visible_message("[M.name] catches and devours a live fish!", "You catch and devour a live fish, yum!")
- kill_fish() //Kill a random fish
- M.health = M.maxHealth //Eating fish heals the predator
+ M.visible_message("[M.name] reaches into [src] and attempts to fish through the opening!", "You reach into [src] and begin fishing through the opening!")
+ if(water_level && prob(5)) //Bears are good at catching fish, only a 5% chance to fail
+ M.visible_message("[M.name] swipes at the water!", "You just barely missed that fish!")
+ else //No water or didn't slip, get that fish!
+ M.visible_message("[M.name] catches and devours a live fish!", "You catch and devour a live fish, yum!")
+ kill_fish() //Kill a random fish
+ M.health = M.maxHealth //Eating fish heals the predator
else
- to_chat(usr, "There are no fish in [src]!")
+ to_chat(M, "There are no fish in [src]!")
else
- attack_generic(M, M.harm_intent_damage)
+ return ..()
else
- if(M.melee_damage_upper > 0) //If the simple_animal has a melee_damage_upper defined, use that for the damage
- attack_generic(M, M.melee_damage_upper)
- else if(M.a_intent == INTENT_HARM) //Let any simple_animal try to break tanks when on harm intent
- if(M.harm_intent_damage <= 0) return //If it doesn't do damage, don't bother with the attack
- attack_generic(M, M.harm_intent_damage)
- check_health()
+ return ..()
-/obj/machinery/fishtank/attack_alien(mob/living/user as mob)
- if(islarva(user)) return
- attack_generic(user, 15)
-
-/obj/machinery/fishtank/attack_slime(mob/living/user as mob)
- var/mob/living/carbon/slime/S = user
- if(!S.is_adult)
- return
- attack_generic(user, rand(10, 15))
-
-/obj/machinery/fishtank/attack_hand(mob/user as mob)
- if(HULK in user.mutations)
- user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
- user.visible_message("[user] smashes through [src]!")
- destroy()
- else if(usr.a_intent == INTENT_HARM)
- user.changeNext_move(CLICK_CD_MELEE)
+/obj/machinery/fishtank/attack_hand(mob/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ if(user.a_intent == INTENT_HARM)
playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
- usr.visible_message("[usr.name] bangs against the [src.name]!", \
- "You bang against the [src.name]!", \
+ user.visible_message("[user.name] bangs against the [name]!", \
+ "You bang against the [name]!", \
"You hear a banging sound.")
else
- user.changeNext_move(CLICK_CD_MELEE)
- playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
- usr.visible_message("[usr.name] taps on the [src.name].", \
- "You tap on the [src.name].", \
+ playsound(loc, 'sound/effects/glassknock.ogg', 80, 1)
+ user.visible_message("[user.name] taps on the [name].", \
+ "You tap on the [name].", \
"You hear a knocking sound.")
- return
-/obj/machinery/fishtank/proc/hit(var/damage, var/sound_effect = 1)
- cur_health = max(0, cur_health - damage)
- if(sound_effect)
- playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
- check_health()
-
-/obj/machinery/fishtank/attack_generic(mob/living/user, damage = 0) //used by attack_alien, attack_animal, and attack_slime
- user.changeNext_move(CLICK_CD_MELEE)
- user.do_attack_animation(src)
- cur_health -= damage
- if(cur_health <= 0)
- user.visible_message("[user] smashes through \the [src]!")
- destroy()
- else //for nicer text~
- user.visible_message("[user] smashes into \the [src]!")
- playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
+/obj/machinery/fishtank/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
+ . = ..()
+ if(.) //received damage
check_health()
-/obj/machinery/fishtank/attackby(var/obj/item/O, var/mob/user as mob)
+/obj/machinery/fishtank/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ switch(damage_type)
+ if(BRUTE)
+ if(damage_amount)
+ playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
+ else
+ playsound(src, 'sound/weapons/tap.ogg', 50, 1)
+ if(BURN)
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
+
+/obj/machinery/fishtank/deconstruct(disassembled = TRUE)
+ if(QDELETED(src))
+ return
+ if(!disassembled)
+ playsound(src, "shatter", 70, 1)
+ for(var/i in 1 to shard_count) //Produce the appropriate number of glass shards
+ var/obj/item/shard/S = new /obj/item/shard(get_turf(src))
+ transfer_fingerprints_to(S)
+ if(water_level) //Spill any water that was left in the tank when it broke
+ spill_water()
+ else //We are deconstructing, make glass sheets instead of shards
+ new /obj/item/stack/sheet/glass(get_turf(src), shard_count + 1) //Produce the appropriate number of glass sheets, in a single stack
+ qdel(src)
+
+/obj/machinery/fishtank/attackby(obj/item/O, mob/user)
//Welders repair damaged tanks on help intent, damage on all others
- if(istype(O, /obj/item/weldingtool))
+ if(iswelder(O))
var/obj/item/weldingtool/W = O
if(user.a_intent == INTENT_HELP)
if(W.isOn())
- if(cur_health < max_health)
+ if(obj_integrity < max_integrity)
playsound(loc, W.usesound, 50, 1)
- to_chat(usr, "You repair some of the cracks on \the [src].")
- cur_health += 20
+ to_chat(user, "You repair some of the cracks on [src].")
+ obj_integrity = min(obj_integrity + 20, max_integrity)
check_health()
else
- to_chat(usr, "There is no damage to fix!")
+ to_chat(user, "There is no damage to fix!")
else
- if(cur_health < max_health)
- to_chat(usr, "[W.name] must be on to repair this damage.")
+ if(obj_integrity < max_integrity)
+ to_chat(user, "[W] must be on to repair this damage.")
else
- user.changeNext_move(CLICK_CD_MELEE)
- hit(W.force)
- return
+ return ..()
//Open reagent containers add and remove water
- if(O.is_open_container())
+ else if(O.is_open_container())
if(istype(O, /obj/item/reagent_containers/glass))
if(lid_switch)
- to_chat(usr, "Open the lid on \the [src] first!")
+ to_chat(user, "Open the lid on [src] first!")
return
var/obj/item/reagent_containers/glass/C = O
//Containers with any reagents will get dumped in
@@ -652,57 +605,52 @@
C.reagents.clear_reagents()
else
if(water_level == water_capacity)
- to_chat(usr, "[src] is already full!")
- return
+ to_chat(user, "[src] is already full!")
else
message = "The filtration process purifies the water, raising the water level."
if((water_level + water_value) == water_capacity)
- message += " You filled \the [src] to the brim!"
+ message += " You filled [src] to the brim!"
if((water_level + water_value) > water_capacity)
- message += " You overfilled \the [src] and some water runs down the side, wasted."
+ message += " You overfilled [src] and some water runs down the side, wasted."
C.reagents.clear_reagents()
adjust_water_level(water_value)
- user.visible_message("[user.name] pours the contents of [C.name] into \the [src].", "[message]")
- return
+ user.visible_message("[user.name] pours the contents of [C.name] into [src].", "[message]")
//Empty containers will scoop out water, filling the container as much as possible from the water_level
else
- if(water_level == 0)
- to_chat(usr, "[src] is empty!")
+ if(!water_level)
+ to_chat(user, "[src] is empty!")
else
if(water_level >= C.volume) //Enough to fill the container completely
C.reagents.add_reagent("fishwater", C.volume)
adjust_water_level(-C.volume)
- user.visible_message("[user.name] scoops out some water from \the [src].", "You completely fill [C.name] from \the [src].")
+ user.visible_message("[user.name] scoops out some water from [src].", "You completely fill [C.name] from [src].")
else //Fill the container as much as possible with the water_level
C.reagents.add_reagent("fishwater", water_level)
adjust_water_level(-water_level)
- user.visible_message("[user.name] scoops out some water from \the [src].", "You fill [C.name] with the last of the water in \the [src].")
- return
+ user.visible_message("[user.name] scoops out some water from [src].", "You fill [C.name] with the last of the water in [src].")
//Wrenches can deconstruct empty tanks, but not tanks with any water. Kills any fish left inside and destroys any unharvested eggs in the process
- if(istype(O, /obj/item/wrench))
- if(water_level == 0)
- to_chat(usr, "Now disassembling [src].")
- playsound(src.loc, O.usesound, 50, 1)
+ else if(iswrench(O))
+ if(!water_level)
+ to_chat(user, "Now disassembling [src].")
+ playsound(loc, O.usesound, 50, 1)
if(do_after(user, 50 * O.toolspeed, target = src))
- destroy(1)
+ deconstruct(TRUE)
else
- to_chat(usr, "[src] must be empty before you disassemble it!")
- return
+ to_chat(user, "[src] must be empty before you disassemble it!")
//Fish eggs
else if(istype(O, /obj/item/fish_eggs))
var/obj/item/fish_eggs/egg = O
//Don't add eggs if there is no water (they kinda need that to live)
- if(water_level == 0)
- to_chat(usr, "[src] has no water; [egg.name] won't hatch without water!")
+ if(!water_level)
+ to_chat(user, "[src] has no water; [egg.name] won't hatch without water!")
else
//Don't add eggs if the tank already has the max number of fish
if(fish_count >= max_fish)
- to_chat(usr, "[src] can't hold any more fish.")
+ to_chat(user, "[src] can't hold any more fish.")
else
add_fish(egg.fish_type)
qdel(egg)
- return
//Fish food
else if(istype(O, /obj/item/fishfood))
//Only add food if there is water and it isn't already full of food
@@ -711,33 +659,28 @@
if(fish_count == 0)
user.visible_message("[user.name] shakes some fish food into the empty [src]... How sad.", "You shake some fish food into the empty [src]... If only it had fish.")
else
- user.visible_message("[user.name] feeds the fish in \the [src]. The fish look excited!", "You feed the fish in \the [src]. They look excited!")
+ user.visible_message("[user.name] feeds the fish in [src]. The fish look excited!", "You feed the fish in [src]. They look excited!")
adjust_food_level(10)
else
- to_chat(usr, "[src] already has plenty of food in it. You decide to not add more.")
+ to_chat(user, "[src] already has plenty of food in it. You decide to not add more.")
else
- to_chat(usr, "[src] doesn't have any water in it. You should fill it with water first.")
- return
+ to_chat(user, "[src] doesn't have any water in it. You should fill it with water first.")
//Fish egg scoop
else if(istype(O, /obj/item/egg_scoop))
if(egg_count)
- user.visible_message("[user.name] harvests some fish eggs from \the [src].", "You scoop the fish eggs out of \the [src].")
+ user.visible_message("[user.name] harvests some fish eggs from [src].", "You scoop the fish eggs out of [src].")
harvest_eggs(user)
else
- user.visible_message("[user.name] fails to harvest any fish eggs from \the [src].", "There are no fish eggs in \the [src] to scoop out.")
- return
+ user.visible_message("[user.name] fails to harvest any fish eggs from [src].", "There are no fish eggs in [src] to scoop out.")
//Fish net
- if(istype(O, /obj/item/fish_net))
+ else if(istype(O, /obj/item/fish_net))
harvest_fish(user)
- return
//Tank brush
- if(istype(O, /obj/item/tank_brush))
+ else if(istype(O, /obj/item/tank_brush))
if(filth_level == 0)
- to_chat(usr, "[src] is already spotless!")
+ to_chat(user, "[src] is already spotless!")
else
adjust_filth_level(-filth_level)
- user.visible_message("[user.name] scrubs the inside of \the [src], cleaning the filth.", "You scrub the inside of \the [src], cleaning the filth.")
- else if(O && O.force)
- user.visible_message("\The [src] has been attacked by [user.name] with \the [O]!")
- hit(O.force)
- return
+ user.visible_message("[user.name] scrubs the inside of [src], cleaning the filth.", "You scrub the inside of [src], cleaning the filth.")
+ else
+ return ..()
\ No newline at end of file
diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index 6a1d28eaf87..b69ed4738b6 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -43,7 +43,7 @@
nightmare()
if(ishuman(src))
if(prob(10))
- emote("writhes in their sleep.")
+ emote("writhes in [p_their()] sleep.")
dir = pick(cardinal)
/mob/living/carbon/proc/experience_dream(dream_image, isNightmare)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 021db59f8a4..d8a1f4f1526 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -641,6 +641,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
updateimage()
else
if(prob(15))
+ do_attack_animation(my_target, ATTACK_EFFECT_PUNCH)
if(weapon_name)
my_target.playsound_local(my_target, weap.hitsound, 1)
my_target.show_message("[src.name] has attacked [my_target] with [weapon_name]!", 1)
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index a5aa4662c63..91ee910c8d4 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -47,7 +47,7 @@
to_chat(chugger, "You need to open [src] first!")
return
if(istype(chugger) && loc == chugger && src == chugger.get_active_hand() && reagents.total_volume)
- chugger.visible_message("[chugger] raises the [src] to their mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!", "You start chugging \the [src].", "You hear what sounds like gulping.")
+ chugger.visible_message("[chugger] raises the [src] to [chugger.p_their()] mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!", "You start chugging [src].", "You hear what sounds like gulping.")
while(do_mob(chugger, chugger, 40)) //Between the default time for do_mob and the time it takes for a vampire to suck blood.
chugger.eat(src, chugger, 25) //Half of a glass, quarter of a bottle.
if(!reagents.total_volume) //Finish in style.
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index a7274c53f4e..d9c59a46d58 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -102,8 +102,8 @@
target.visible_message("[user] has hit [target][head_attack_message] with a bottle of [name]!", \
"[user] has hit [target][head_attack_message] with a bottle of [name]!")
else
- user.visible_message("[target] hits \himself with a bottle of [name][head_attack_message]!", \
- "[target] hits \himself with a bottle of [name][head_attack_message]!")
+ user.visible_message("[target] hits [target.p_them()]self with a bottle of [name][head_attack_message]!", \
+ "[target] hits [target.p_them()]self with a bottle of [name][head_attack_message]!")
//Attack logs
add_attack_logs(user, target, "Hit with [src]")
diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm
index 282278c990e..979acf473fd 100644
--- a/code/modules/food_and_drinks/drinks/drinks/cans.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm
@@ -33,14 +33,14 @@
to_chat(user, "You need to open the drink!")
return
else if(M == user && !reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_sel.selecting == "head")
- user.visible_message("[user] crushes ["\the [src]"] on \his forehead!", "You crush \the [src] on your forehead.")
+ user.visible_message("[user] crushes [src] on [user.p_their()] forehead!", "You crush [src] on your forehead.")
crush(user)
return
return ..()
/obj/item/reagent_containers/food/drinks/cans/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/storage/bag/trash/cyborg))
- user.visible_message("[user] crushes \the [src] in their trash compactor.", "You crush \the [src] in your trash compactor.")
+ user.visible_message("[user] crushes [src] in [user.p_their()] trash compactor.", "You crush [src] in your trash compactor.")
var/obj/can = crush(user)
can.attackby(I, user, params)
return 1
diff --git a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
index 24b50489402..393543b093c 100644
--- a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
@@ -38,7 +38,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware
if(burn_state != ON_FIRE)
return
- user.visible_message("[user] pours [src] all over themself!", "You pour [src] all over yourself!", "You hear a 'whoompf' and a sizzle.")
+ user.visible_message("[user] pours [src] all over [user.p_them()]self!", "You pour [src] all over yourself!", "You hear a 'whoompf' and a sizzle.")
extinguish(TRUE)
reagents.reaction(user, TOUCH)
reagents.clear_reagents()
@@ -90,7 +90,7 @@
if((CLUMSY in user.mutations) && prob(50))
clumsilyDrink(user)
else
- user.visible_message("[user] places their hand over [src] to put it out!", "You use your hand to extinguish [src]!")
+ user.visible_message("[user] places [user.p_their()] hand over [src] to put it out!", "You use your hand to extinguish [src]!")
extinguish()
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/MouseDrop(mob/living/carbon/human/user)
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index f9ec698f196..2f9848a87ef 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -131,7 +131,7 @@
possible_states = list()
/obj/item/reagent_containers/food/condiment/saltshaker/suicide_act(mob/user)
- user.visible_message("[user] begins to swap forms with the salt shaker! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] begins to swap forms with the salt shaker! It looks like [user.p_theyre()] trying to commit suicide.")
var/newname = "[name]"
name = "[user.name]"
user.name = newname
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 1b8c0b5b989..f690e5f4231 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -99,6 +99,7 @@
U.overlays += I
var/obj/item/reagent_containers/food/snacks/collected = new type
+ collected.name = name
collected.loc = U
collected.reagents.remove_any(collected.reagents.total_volume)
collected.trash = null
@@ -1040,6 +1041,21 @@
filling_color = "#EDDD00"
list_reagents = list("nutriment" = 1, "vitamin" = 1)
+/obj/item/reagent_containers/food/snacks/macaroni
+ name = "Macaroni twists"
+ desc = "These are little twists of raw macaroni."
+ icon_state = "macaroni"
+ filling_color = "#EDDD00"
+ list_reagents = list("nutriment" = 1, "vitamin" = 1)
+
+/obj/item/reagent_containers/food/snacks/macncheese
+ name = "Macaroni cheese"
+ desc = "One of the most comforting foods in the world. Apparently."
+ trash = /obj/item/trash/snack_bowl
+ icon_state = "macncheese"
+ filling_color = "#ffe45d"
+ list_reagents = list("nutriment" = 5, "vitamin" = 2, "cheese" = 4)
+
/obj/item/reagent_containers/food/snacks/cheesyfries
name = "Cheesy Fries"
desc = "Fries. Covered in cheese. Duh."
@@ -1250,7 +1266,14 @@
/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
if(!QDELETED(src))
visible_message("[src] expands!")
- new/mob/living/carbon/human(get_turf(src), monkey_type)
+ if(fingerprintslast)
+ log_game("Cube ([monkey_type]) inflated, last touched by: " + fingerprintslast)
+ else
+ log_game("Cube ([monkey_type]) inflated, last touched by: NO_DATA")
+ var/mob/living/carbon/human/creature = new /mob/living/carbon/human(get_turf(src))
+ if(LAZYLEN(fingerprintshidden))
+ creature.fingerprintshidden = fingerprintshidden.Copy()
+ creature.set_species(monkey_type)
qdel(src)
/obj/item/reagent_containers/food/snacks/monkeycube/farwacube
@@ -2065,6 +2088,20 @@
icon_state = "hawaiianpizzaslice"
filling_color = "#e5b437"
+/obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
+ name = "Macaroni cheese pizza"
+ desc = "Gastronomists have yet to classify this dish as 'pizza'."
+ icon_state = "macpizza"
+ slice_path = /obj/item/reagent_containers/food/snacks/macpizzaslice
+ list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious
+ filling_color = "#ffe45d"
+
+/obj/item/reagent_containers/food/snacks/macpizzaslice
+ name = "Macaroni cheese pizza slice"
+ desc = "A delicious slice of pizza topped with macaroni cheese... wait, what the hell? Who would do this?!"
+ icon_state = "macpizzaslice"
+ filling_color = "#ffe45d"
+
/obj/item/pizzabox
name = "pizza box"
desc = "A box suited for pizzas."
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index b4a787ea4c8..6f6d9132fdf 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -58,7 +58,7 @@
C.emote("scream")
user.changeNext_move(CLICK_CD_MELEE)
C.apply_damage(25, BURN, "head") //25 fire damage and disfigurement because your face was just deep fried!
- head.disfigure("burn")
+ head.disfigure()
add_attack_logs(user, G.affecting, "Deep-fried with [src]")
qdel(G) //Removes the grip so the person MIGHT have a small chance to run the fuck away and to prevent rapid dunks.
return 0
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 0c2af905a74..a67b88f97d4 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -260,7 +260,7 @@
new /obj/effect/decal/cleanable/blood/gibs(src)
if(!UserOverride)
- add_attack_logs(user, occupant, "Gibbed in [src]", !!occupant.ckey)
+ add_attack_logs(user, occupant, "Gibbed in [src]", !!occupant.ckey ? ATKLOG_FEW : ATKLOG_ALL)
if(!iscarbon(user))
occupant.LAssailant = null
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index dfbea528d53..ad4dcb5e4d8 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -87,6 +87,10 @@
input = /obj/item/reagent_containers/food/snacks/doughslice
output = /obj/item/reagent_containers/food/snacks/spaghetti
+/datum/food_processor_process/macaroni
+ input = /obj/item/reagent_containers/food/snacks/spaghetti
+ output = /obj/item/reagent_containers/food/snacks/macaroni
+
/datum/food_processor_process/parsnip
input = /obj/item/reagent_containers/food/snacks/grown/parsnip
output = /obj/item/reagent_containers/food/snacks/roastparsnip
diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
index effbcef37ba..70169476c9d 100644
--- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
@@ -396,6 +396,14 @@
)
result = /obj/item/reagent_containers/food/snacks/spesslaw
+/datum/recipe/microwave/macncheese
+ reagents = list("water" = 5, "milk" = 5)
+ items = list(
+ /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/reagent_containers/food/snacks/macaroni,
+ )
+ result = /obj/item/reagent_containers/food/snacks/macncheese
+
/datum/recipe/microwave/superbiteburger
reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
items = list(
diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm
index b4b636a6ee7..025670aa817 100644
--- a/code/modules/food_and_drinks/recipes/recipes_oven.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm
@@ -264,6 +264,15 @@
)
result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
+/datum/recipe/oven/macncheesepizza
+ items = list(
+ /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/reagent_containers/food/snacks/macncheese,
+ )
+ result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
+
/datum/recipe/oven/amanita_pie
items = list(
/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 58cec86dc1c..950b873af55 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -179,7 +179,7 @@
visible_message("The [qb] refuses to settle down. Maybe it's something to do with its reagent?")
if(queen_bee)
- visible_message("[user] sets [qb] down inside the apiary, making it their new home.")
+ visible_message("[user] sets [qb] down inside the apiary, making it [user.p_their()] new home.")
var/relocated = 0
for(var/b in bees)
var/mob/living/simple_animal/hostile/poison/bees/worker/B = b
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 36065efa298..6874038a7bf 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -25,7 +25,7 @@
bitesize = 5
/obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
- user.visible_message("[user] is aiming the [src.name] at themself! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is aiming the [name] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
sleep(25)
if(!user)
@@ -34,7 +34,7 @@
sleep(25)
if(!user)
return (OXYLOSS)
- user.visible_message("[user] laughs so hard they begin to suffocate!")
+ user.visible_message("[user] laughs so hard [user.p_they()] begin[user.p_s()] to suffocate!")
return (OXYLOSS)
/obj/item/grown/bananapeel
@@ -49,7 +49,7 @@
throw_range = 7
/obj/item/grown/bananapeel/suicide_act(mob/user)
- user.visible_message("[user] is deliberately slipping on the [src.name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is deliberately slipping on the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1)
return (BRUTELOSS)
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index 157a2813b8f..86bc8082661 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -109,7 +109,7 @@
var/area/A = get_area(user)
user.visible_message("[user] primes the [src]!", "You prime the [src]!")
var/message = "[ADMIN_LOOKUPFLW(user)] primed a combustible lemon for detonation at [A] [ADMIN_COORDJMP(user)]"
- bombers += message
+ investigate_log("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].", INVESTIGATE_BOMB)
message_admins(message)
log_game("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].")
if(iscarbon(user))
diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm
index 0169e3bb5d9..09c16544396 100644
--- a/code/modules/hydroponics/grown/kudzu.dm
+++ b/code/modules/hydroponics/grown/kudzu.dm
@@ -22,7 +22,7 @@
return S
/obj/item/seeds/kudzu/suicide_act(mob/user)
- user.visible_message("[user] swallows the pack of kudzu seeds! It looks like \he's trying to commit suicide..")
+ user.visible_message("[user] swallows the pack of kudzu seeds! It looks like [user.p_theyre()] trying to commit suicide..")
plant(user)
return (BRUTELOSS)
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index c65c9dcf618..8bbe4a4e240 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -44,7 +44,7 @@
attack_verb = list("stung")
/obj/item/grown/nettle/suicide_act(mob/user)
- user.visible_message("[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is eating some of the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")
return (BRUTELOSS|TOXLOSS)
/obj/item/grown/nettle/pickup(mob/living/user)
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 7bb064f752e..6b2da2c29ae 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -33,7 +33,7 @@
reagents.add_reagent("atrazine", 100)
/obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user)
- user.visible_message("[user] is huffing the [src.name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is huffing the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")
return (TOXLOSS)
/obj/item/reagent_containers/spray/pestspray // -- Skie
@@ -55,7 +55,7 @@
reagents.add_reagent("pestkiller", 100)
/obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user)
- user.visible_message("[user] is huffing the [src.name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is huffing the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.")
return (TOXLOSS)
/obj/item/cultivator
@@ -89,7 +89,7 @@
sharp = 1
/obj/item/hatchet/suicide_act(mob/user)
- user.visible_message("[user] is chopping at \himself with the [src.name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is chopping at [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return (BRUTELOSS)
@@ -119,7 +119,7 @@
var/swiping = FALSE
/obj/item/scythe/suicide_act(mob/user)
- user.visible_message("[user] is beheading \himself with the [src.name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is beheading [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.")
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/affecting = H.get_organ("head")
diff --git a/code/modules/library/computers/checkout.dm b/code/modules/library/computers/checkout.dm
index 0f0774aa1f4..fdcfee0e87a 100644
--- a/code/modules/library/computers/checkout.dm
+++ b/code/modules/library/computers/checkout.dm
@@ -49,7 +49,7 @@
if(src.arcanecheckout)
new /obj/item/tome(src.loc)
to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.")
- user.visible_message("[user] stares at the blank screen for a few moments, his expression frozen in fear. When he finally awakens from it, he looks a lot older.", 2)
+ user.visible_message("[user] stares at the blank screen for a few moments, [user.p_their()] expression frozen in fear. When [user.p_they()] finally awaken[user.p_s()] from it, [user.p_they()] look[user.p_s()] a lot older.", 2)
src.arcanecheckout = 0
if(1)
// Inventory
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index a0b10f29f38..8df5d593b9b 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -24,7 +24,7 @@
var/tmp/busy = 0
var/list/allowed_books = list(/obj/item/book, /obj/item/spellbook, /obj/item/storage/bible, /obj/item/tome) //Things allowed in the bookcase
-/obj/structure/bookcase/initialize()
+/obj/structure/bookcase/Initialize()
..()
for(var/obj/item/I in loc)
if(is_type_in_list(I, allowed_books))
diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm
index 679f6fb86ef..075e3e47a20 100644
--- a/code/modules/lighting/lighting_atom.dm
+++ b/code/modules/lighting/lighting_atom.dm
@@ -40,16 +40,6 @@
else
light = new /datum/light_source(src, .)
-/atom/New()
- . = ..()
-
- if(light_power && light_range)
- update_light()
-
- if(opacity && isturf(loc))
- var/turf/T = loc
- T.has_opaque_atom = TRUE // No need to recalculate it in this case, it's guranteed to be on afterwards anyways.
-
/atom/Destroy()
if(light)
light.destroy()
diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm
index 6fe55eed0ff..1a421e6d1ad 100644
--- a/code/modules/lighting/lighting_overlay.dm
+++ b/code/modules/lighting/lighting_overlay.dm
@@ -9,7 +9,6 @@
invisibility = INVISIBILITY_LIGHTING
color = LIGHTING_BASE_MATRIX
icon_state = "light1"
- auto_init = 0 // doesn't need special init
blend_mode = BLEND_MULTIPLY
var/lum_r = 0
diff --git a/code/modules/logic/logic_base.dm b/code/modules/logic/logic_base.dm
index db891ab383c..519c47c408b 100644
--- a/code/modules/logic/logic_base.dm
+++ b/code/modules/logic/logic_base.dm
@@ -50,7 +50,7 @@
component_parts += LG
component_parts += new /obj/item/stack/cable_coil(null, 1)
-/obj/machinery/logic_gate/initialize()
+/obj/machinery/logic_gate/Initialize()
..()
set_frequency(frequency)
diff --git a/code/modules/martial_arts/brawling.dm b/code/modules/martial_arts/brawling.dm
index 9f9fa5236b2..a40a52b86be 100644
--- a/code/modules/martial_arts/brawling.dm
+++ b/code/modules/martial_arts/brawling.dm
@@ -11,7 +11,7 @@
/datum/martial_art/boxing/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
- A.do_attack_animation(D)
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
var/atk_verb = pick("left hook","right hook","straight punch")
@@ -62,7 +62,7 @@
/datum/martial_art/drunk_brawling/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
add_attack_logs(A, D, "Melee attacked with [src]")
- A.do_attack_animation(D)
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
var/atk_verb = pick("jab","uppercut","overhand punch","drunken right hook","drunken left hook")
diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm
index d17d1b30495..9e889bdce7a 100644
--- a/code/modules/martial_arts/krav_maga.dm
+++ b/code/modules/martial_arts/krav_maga.dm
@@ -109,7 +109,6 @@ datum/martial_art/krav_maga/grab_act(var/mob/living/carbon/human/A, var/mob/livi
if(check_streak(A,D))
return 1
add_attack_logs(A, D, "Melee attacked with [src]")
- A.do_attack_animation(D)
var/picked_hit_type = pick("punches", "kicks")
var/bonus_damage = 10
if(D.weakened || D.resting || D.lying)
@@ -117,8 +116,10 @@ datum/martial_art/krav_maga/grab_act(var/mob/living/carbon/human/A, var/mob/livi
picked_hit_type = "stomps on"
D.apply_damage(bonus_damage, BRUTE)
if(picked_hit_type == "kicks" || picked_hit_type == "stomps")
+ A.do_attack_animation(D, ATTACK_EFFECT_KICK)
playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, 1, -1)
else
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, 1, -1)
D.visible_message("[A] [picked_hit_type] [D]!", \
"[A] [picked_hit_type] you!")
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 3e1be19b0de..f42b7963104 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -33,7 +33,6 @@
/datum/martial_art/proc/basic_hit(var/mob/living/carbon/human/A,var/mob/living/carbon/human/D)
- A.do_attack_animation(D)
var/damage = rand(A.species.punchdamagelow, A.species.punchdamagehigh)
var/datum/unarmed_attack/attack = A.species.unarmed
@@ -41,6 +40,12 @@
if(D.lying)
atk_verb = "kick"
+ switch(atk_verb)
+ if("kick")
+ A.do_attack_animation(D, ATTACK_EFFECT_KICK)
+ else
+ A.do_attack_animation(D, attack.animation_type)
+
if(!damage)
playsound(D.loc, attack.miss_sound, 25, 1, -1)
D.visible_message("[A] has attempted to [atk_verb] [D]!")
@@ -55,7 +60,7 @@
D.apply_damage(damage, BRUTE, affecting, armor_block)
- add_attack_logs(A, D, "Melee attacked with martial-art [src]", admin_notify = (damage > 0) ? TRUE : FALSE)
+ add_attack_logs(A, D, "Melee attacked with martial-art [src]", (damage > 0) ? null : ATKLOG_ALL)
if((D.stat != DEAD) && damage >= A.species.punchstunthreshold)
D.visible_message("[A] has weakened [D]!!", \
@@ -205,7 +210,7 @@
return ..()
var/mob/living/carbon/C = target
if(C.stat)
- to_chat(user, "It would be dishonorable to attack a foe while they cannot retaliate.")
+ to_chat(user, "It would be dishonorable to attack a foe while [C.p_they()] cannot retaliate.")
return
switch(user.a_intent)
if(INTENT_DISARM)
@@ -231,7 +236,7 @@
if(H.staminaloss && !H.sleeping)
var/total_health = (H.health - H.staminaloss)
if(total_health <= config.health_threshold_crit && !H.stat)
- H.visible_message("[user] delivers a heavy hit to [H]'s head, knocking them out cold!", \
+ H.visible_message("[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!", \
"[user] knocks you unconscious!")
H.SetSleeping(30)
H.adjustBrainLoss(25)
diff --git a/code/modules/martial_arts/mimejutsu.dm b/code/modules/martial_arts/mimejutsu.dm
index 4d8edbf7236..38605c3538d 100644
--- a/code/modules/martial_arts/mimejutsu.dm
+++ b/code/modules/martial_arts/mimejutsu.dm
@@ -55,8 +55,8 @@
/datum/martial_art/mimejutsu/proc/mimePalm(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
if(!D.stat && !D.stunned && !D.weakened)
- D.visible_message("[A] has barely touched [D] with their palm!", \
- "[A] hovers their palm over your face!")
+ D.visible_message("[A] has barely touched [D] with [A.p_their()] palm!", \
+ "[A] hovers [A.p_their()] palm over your face!")
var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A)))
D.throw_at(throw_target, 200, 4,A)
diff --git a/code/modules/martial_arts/plasma_fist.dm b/code/modules/martial_arts/plasma_fist.dm
index d2e047dc08d..5aed9b8e9e1 100644
--- a/code/modules/martial_arts/plasma_fist.dm
+++ b/code/modules/martial_arts/plasma_fist.dm
@@ -46,7 +46,7 @@
return
/datum/martial_art/plasma_fist/proc/Plasma(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
- A.do_attack_animation(D)
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
A.say("PLASMA FIST!")
D.visible_message("[A] has hit [D] with THE PLASMA FIST TECHNIQUE!", \
diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm
index 45f4948bc14..a6cd25d50c0 100644
--- a/code/modules/martial_arts/sleeping_carp.dm
+++ b/code/modules/martial_arts/sleeping_carp.dm
@@ -36,7 +36,7 @@
/datum/martial_art/the_sleeping_carp/proc/wristWrench(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
if(!D.stat && !D.stunned && !D.weakened)
- A.do_attack_animation(D)
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
D.visible_message("[A] grabs [D]'s wrist and wrenches it sideways!", \
"[A] grabs your wrist and violently wrenches it to the side!")
playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
@@ -51,7 +51,7 @@
/datum/martial_art/the_sleeping_carp/proc/backKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
if(A.dir == D.dir && !D.stat && !D.weakened)
- A.do_attack_animation(D)
+ A.do_attack_animation(D, ATTACK_EFFECT_KICK)
D.visible_message("[A] kicks [D] in the back!", \
"[A] kicks you in the back, making you stumble and fall!")
step_to(D,get_step(D,D.dir),1)
@@ -64,7 +64,7 @@
/datum/martial_art/the_sleeping_carp/proc/kneeStomach(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
if(!D.stat && !D.weakened)
- A.do_attack_animation(D)
+ A.do_attack_animation(D, ATTACK_EFFECT_KICK)
D.visible_message("[A] knees [D] in the stomach!", \
"[A] winds you with a knee in the stomach!")
D.audible_message("[D] gags!")
@@ -78,7 +78,7 @@
/datum/martial_art/the_sleeping_carp/proc/headKick(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
if(!D.stat && !D.weakened)
- A.do_attack_animation(D)
+ A.do_attack_animation(D, ATTACK_EFFECT_KICK)
D.visible_message("[A] kicks [D] in the head!", \
"[A] kicks you in the jaw!")
D.apply_damage(20, BRUTE, "head")
@@ -92,9 +92,9 @@
/datum/martial_art/the_sleeping_carp/proc/elbowDrop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
if(D.weakened || D.resting || D.stat)
- A.do_attack_animation(D)
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
D.visible_message("[A] elbow drops [D]!", \
- "[A] piledrives you with their elbow!")
+ "[A] piledrives you with [A.p_their()] elbow!")
if(D.stat)
D.death() //FINISH HIM!
D.apply_damage(50, BRUTE, "chest")
@@ -117,7 +117,7 @@
add_to_streak("H",D)
if(check_streak(A,D))
return 1
- A.do_attack_animation(D)
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams")
D.visible_message("[A] [atk_verb] [D]!", \
"[A] [atk_verb] you!")
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index 9f4f7629c7e..4d94793a5e9 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -106,7 +106,7 @@
return
if(CC.use(1))
- overlays += image('icons/obj/items.dmi',"coin_string_overlay")
+ overlays += image('icons/obj/economy.dmi',"coin_string_overlay")
string_attached = 1
to_chat(user, "You attach a string to the coin.")
else
diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm
index fba4725e5f0..ff0db975895 100644
--- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm
+++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm
@@ -52,7 +52,7 @@
return
to_chat(user, "You call out for aid, attempting to summon spirits to your side.")
- notify_ghosts("[user] is raising their [src], calling for your help!", enter_link="(Click to help)", source = user, action = NOTIFY_FOLLOW)
+ notify_ghosts("[user] is raising [user.p_their()] [src], calling for your help!", enter_link="(Click to help)", source = user, action = NOTIFY_FOLLOW)
summon_cooldown = world.time + 600
diff --git a/code/modules/mining/lavaland/loot/bubblegum_loot.dm b/code/modules/mining/lavaland/loot/bubblegum_loot.dm
index 03ee7eb0a8d..613239b58a9 100644
--- a/code/modules/mining/lavaland/loot/bubblegum_loot.dm
+++ b/code/modules/mining/lavaland/loot/bubblegum_loot.dm
@@ -75,7 +75,7 @@
for(var/mob/living/carbon/human/H in player_list)
if(H == L)
continue
- to_chat(H, "You have an overwhelming desire to kill [L]. They have been marked red! Go kill them!")
+ to_chat(H, "You have an overwhelming desire to kill [L]. [L.p_they(TRUE)] [L.p_have()] been marked red! Go kill [L.p_them()]!")
H.put_in_hands(new /obj/item/kitchen/knife/butcher(H))
qdel(src)
\ No newline at end of file
diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm
index 62d72d4a0a9..1d66d59d316 100644
--- a/code/modules/mining/lavaland/loot/hierophant_loot.dm
+++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm
@@ -57,7 +57,7 @@
return
if(!rune)
if(isturf(user.loc))
- user.visible_message("[user] holds [src] carefully in front of them, moving it in a strange pattern...", \
+ user.visible_message("[user] holds [src] carefully in front of [user.p_them()], moving it in a strange pattern...", \
"You start creating a hierophant rune to teleport to...")
timer = world.time + 51
if(do_after(user, 50, target = user))
@@ -67,7 +67,7 @@
var/obj/effect/hierophant/H = new/obj/effect/hierophant(T)
rune = H
user.update_action_buttons_icon()
- user.visible_message("[user] creates a strange rune beneath them!", \
+ user.visible_message("[user] creates a strange rune beneath [user.p_them()]!", \
"You create a hierophant rune, which you can teleport yourself and any allies to at any time!\n\
You can remove the rune to place a new one by striking it with the staff.")
else
diff --git a/code/modules/mining/lavaland/loot/legion_loot.dm b/code/modules/mining/lavaland/loot/legion_loot.dm
index 210710db4d9..f11d6162f55 100644
--- a/code/modules/mining/lavaland/loot/legion_loot.dm
+++ b/code/modules/mining/lavaland/loot/legion_loot.dm
@@ -5,7 +5,6 @@
item_state = "staffofstorms"
icon = 'icons/obj/guns/magic.dmi'
slot_flags = SLOT_BACK
- item_state = "staffofstorms"
w_class = WEIGHT_CLASS_BULKY
force = 25
damtype = BURN
@@ -19,34 +18,36 @@
return
var/area/user_area = get_area(user)
+ var/turf/user_turf = get_turf(user)
+ if(!user_area || !user_turf)
+ to_chat(user, "Something is preventing you from using the staff here.")
+ return
var/datum/weather/A
- var/z_level_name = space_manager.levels_by_name[user.z]
- for(var/V in weather_master.existing_weather)
+ for(var/V in SSweather.processing)
var/datum/weather/W = V
- if(W.target_z == z_level_name && W.area_type == user_area.type)
+ if((user_turf.z in W.impacted_z_levels) && W.area_type == user_area.type)
A = W
break
- if(A)
+ if(A)
if(A.stage != END_STAGE)
if(A.stage == WIND_DOWN_STAGE)
to_chat(user, "The storm is already ending! It would be a waste to use the staff now.")
return
user.visible_message("[user] holds [src] skywards as an orange beam travels into the sky!", \
"You hold [src] skyward, dispelling the storm!")
- playsound(user, 'sound/magic/Staff_Change.ogg', 200, 0)
+ playsound(user, 'sound/magic/staff_change.ogg', 200, 0)
A.wind_down()
return
else
- A = new storm_type
+ A = new storm_type(list(user_turf.z))
A.name = "staff storm"
A.area_type = user_area.type
- A.target_z = z_level_name
A.telegraph_duration = 100
A.end_duration = 100
user.visible_message("[user] holds [src] skywards as red lightning crackles into the sky!", \
"You hold [src] skyward, calling down a terrible storm!")
- playsound(user, 'sound/magic/Staff_Change.ogg', 200, 0)
+ playsound(user, 'sound/magic/staff_change.ogg', 200, 0)
A.telegraph()
storm_cooldown = world.time + 200
diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm
index 9c6ea675ba3..e1c6c7f28a9 100644
--- a/code/modules/mining/lavaland/loot/tendril_loot.dm
+++ b/code/modules/mining/lavaland/loot/tendril_loot.dm
@@ -355,7 +355,7 @@
if(cooldown < world.time)
feedback_add_details("immortality_talisman","U") // usage
cooldown = world.time + 600
- user.visible_message("[user] vanishes from reality, leaving a a hole in their place!")
+ user.visible_message("[user] vanishes from reality, leaving a a hole in [user.p_their()] place!")
var/obj/effect/immortality_talisman/Z = new(get_turf(src.loc))
Z.name = "hole in reality"
Z.desc = "It's shaped an awful lot like [user.name]."
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 1ef887c2527..0a151babe67 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -341,20 +341,28 @@
//Pod turfs and objects
//Window
+/obj/structure/window/shuttle/survival_pod
+ name = "pod window"
+ icon = 'icons/obj/smooth_structures/pod_window.dmi'
+ icon_state = "smooth"
+ dir = FULLTILE_WINDOW_DIR
+ max_integrity = 100
+ fulltile = TRUE
+ reinf = TRUE
+ heat_resistance = 1600
+ armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100)
+ smooth = SMOOTH_MORE
+ canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod)
+ explosion_block = 3
+ level = 3
+ glass_type = /obj/item/stack/sheet/titaniumglass
+ glass_amount = 2
+
/obj/structure/window/reinforced/survival_pod
name = "pod window"
icon = 'icons/obj/lavaland/survival_pod.dmi'
icon_state = "pwindow"
-// This override can be removed whenever we get rid of the stupid fucking `dir = 9` = full tile!!!! shit
-/obj/structure/window/reinforced/survival_pod/CanPass(atom/movable/mover, turf/target, height=0)
- if(istype(mover) && mover.checkpass(PASSGLASS))
- return 1
- if(get_dir(loc, target) == dir)
- return !density
- else
- return 1
-
//Floors
/turf/simulated/floor/pod
name = "pod floor"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 4ab29741ef6..933ef9a6403 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -106,7 +106,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
Transfer_mind is there to check if mob is being deleted/not going to have a body.
Works together with spawning an observer, noted above.
*/
-/mob/dead/observer/Life()
+/mob/dead/observer/Life(seconds, times_fired)
..()
if(!loc) return
if(!client) return 0
@@ -419,7 +419,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(.)
update_following()
-/mob/Life()
+/mob/Life(seconds, times_fired)
// to catch teleports etc which directly set loc
update_following()
return ..()
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 711d4cea992..57be913c699 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -70,7 +70,7 @@
if(speaker == src)
to_chat(src, "You cannot hear yourself speak!")
else
- to_chat(src, "[speaker_name][alt_name] talks but you cannot hear them.")
+ to_chat(src, "[speaker_name][alt_name] talks but you cannot hear [speaker.p_them()].")
else
if(language)
to_chat(src, "[speaker_name][alt_name] [track][language.format_message(message, verb)]")
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index dc2e8ee7106..93bdfe30c27 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -310,12 +310,7 @@
to_chat(speaker,"You can't communicate while unable to move your hands to your head!")
return FALSE
- var/their = "their"
- if(speaker.gender == "female")
- their = "her"
- if(speaker.gender == "male")
- their = "his"
- speaker.visible_message("[speaker] touches [their] fingers to [their] temple.") //If placed in grey/broadcast, it will happen regardless of the success of the action.
+ speaker.visible_message("[speaker] touches [speaker.p_their()] fingers to [speaker.p_their()] temple.") //If placed in grey/broadcast, it will happen regardless of the success of the action.
return TRUE
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index e706b89ca85..8f74fbce413 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -1,7 +1,3 @@
-#define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point
-#define HEAT_DAMAGE_LEVEL_2 3 //Amount of damage applied when your body temperature passes the 400K point
-#define HEAT_DAMAGE_LEVEL_3 8 //Amount of damage applied when your body temperature passes the 1000K point
-
/mob/living/carbon/alien
name = "alien"
voice_name = "alien"
@@ -229,10 +225,6 @@ Des: Removes all infected images from the alien.
/mob/living/carbon/alien/can_use_vents()
return
-#undef HEAT_DAMAGE_LEVEL_1
-#undef HEAT_DAMAGE_LEVEL_2
-#undef HEAT_DAMAGE_LEVEL_3
-
/mob/living/carbon/alien/handle_footstep(turf/T)
if(..())
if(T.footstep_sounds["xeno"])
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index 22954451834..72bf30ceedf 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -29,13 +29,13 @@ In all, this is a lot like the monkey code. /N
else
if(health > 0)
- M.do_attack_animation(src)
+ M.do_attack_animation(src, ATTACK_EFFECT_BITE)
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
var/damage = 1
visible_message("[M.name] bites [src]!", \
"[M.name] bites [src]!")
adjustBruteLoss(damage)
- add_attack_logs(M, src, "Alien attack", FALSE)
+ add_attack_logs(M, src, "Alien attack", ATKLOG_ALL)
updatehealth()
else
to_chat(M, "[name] is too injured for that.")
@@ -52,8 +52,10 @@ In all, this is a lot like the monkey code. /N
help_shake_act(M)
if(INTENT_GRAB)
grabbedby(M)
- if(INTENT_HARM, INTENT_DISARM)
- M.do_attack_animation(src)
+ if(INTENT_HARM)
+ M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
+ if(INTENT_DISARM)
+ M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
return 1
return 0
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
index a2527317eec..7f23be77774 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -161,7 +161,7 @@ Doesn't work on other aliens/AI.*/
stomach_contents.Remove(M)
M.loc = loc
//Paralyse(10)
- src.visible_message("[src] hurls out the contents of their stomach!")
+ src.visible_message("[src] hurls out the contents of [p_their()] stomach!")
return
/mob/living/carbon/proc/getPlasma()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
index 0056bb709a5..3fa08702605 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
@@ -1,16 +1,25 @@
+/mob/living/carbon/alien/humanoid/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM)
+ ..(user, TRUE)
+ adjustBruteLoss(15)
+ var/hitverb = "punched"
+ if(mob_size < MOB_SIZE_LARGE)
+ Paralyse(1)
+ spawn(0)
+ step_away(src, user, 15)
+ sleep(1)
+ step_away(src, user, 15)
+ hitverb = "slammed"
+ playsound(loc, "punch", 25, 1, -1)
+ visible_message("[user] has [hitverb] [src]!", "[user] has [hitverb] [src]!")
+ return TRUE
+
/mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M)
if(..())
switch(M.a_intent)
if(INTENT_HARM)
var/damage = rand(1, 9)
if(prob(90))
- if(HULK in M.mutations)//HULK SMASH
- damage = 15
- spawn(0)
- Paralyse(1)
- step_away(src, M, 15)
- sleep(3)
- step_away(src, M, 15)
playsound(loc, "punch", 25, 1, -1)
visible_message("[M] has punched [src]!", \
"[M] has punched [src]!")
@@ -43,3 +52,8 @@
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message("[M] has attempted to disarm [src]!")
+
+/mob/living/carbon/alien/humanoid/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect, end_pixel_y)
+ if(!no_effect && !visual_effect_icon)
+ visual_effect_icon = ATTACK_EFFECT_CLAW
+ ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm
index a13fce956da..180d6bd8072 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/alien/humanoid/Life()
+/mob/living/carbon/alien/humanoid/Life(seconds, times_fired)
. = ..()
update_icons()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
index f1bcfc0eeaf..44287493718 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
@@ -3,7 +3,7 @@
#define X_SUIT_LAYER 2
#define X_L_HAND_LAYER 3
#define X_R_HAND_LAYER 4
-#define TARGETED_LAYER 5
+#define X_TARGETED_LAYER 5
#define X_FIRE_LAYER 6
#define X_TOTAL_LAYERS 6
/////////////////////////////////
@@ -161,6 +161,6 @@
#undef X_SUIT_LAYER
#undef X_L_HAND_LAYER
#undef X_R_HAND_LAYER
-#undef TARGETED_LAYER
+#undef X_TARGETED_LAYER
#undef X_FIRE_LAYER
#undef X_TOTAL_LAYERS
diff --git a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
index fc7fa22510b..919eecee8d8 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
@@ -2,13 +2,6 @@
if(..())
var/damage = rand(1, 9)
if(prob(90))
- if(HULK in M.mutations)
- damage += 5
- spawn(0)
- Paralyse(1)
- step_away(src, M, 15)
- sleep(3)
- step_away(src, M, 15)
playsound(loc, "punch", 25, 1, -1)
add_attack_logs(M, src, "Melee attacked with fists")
visible_message("[M] has kicked [src]!", \
@@ -22,3 +15,20 @@
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message("[M] has attempted to kick [src]!", \
"[M] has attempted to kick [src]!")
+
+
+/mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM)
+ ..(user, TRUE)
+ adjustBruteLoss(5 + rand(1, 9))
+ spawn(0)
+ Paralyse(1)
+ step_away(src, user, 15)
+ sleep(3)
+ step_away(src, user, 15)
+ return TRUE
+
+/mob/living/carbon/alien/larva/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect, end_pixel_y)
+ if(!no_effect && !visual_effect_icon)
+ visual_effect_icon = ATTACK_EFFECT_BITE
+ ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index 4faa957163c..5bbb31c00d1 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/alien/larva/Life()
+/mob/living/carbon/alien/larva/Life(seconds, times_fired)
if(..()) //still breathing
// GROW!
if(amount_grown < max_grown)
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index ae03f103e86..e09340872b9 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -96,7 +96,7 @@
if(ticker && ticker.mode)
ticker.mode.xenos += new_xeno.mind
new_xeno.mind.name = new_xeno.name
- new_xeno.mind.assigned_role = "MODE"
+ new_xeno.mind.assigned_role = SPECIAL_ROLE_XENOMORPH
new_xeno.mind.special_role = SPECIAL_ROLE_XENOMORPH
new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)//To get the player's attention
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index 2abc612f758..8c02bac91d1 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -15,6 +15,7 @@
parent_organ = "head"
slot = "brain"
vital = 1
+ hidden_pain = TRUE //the brain has no pain receptors, and brain damage is meant to be a stealthy damage type.
var/mmi_icon = 'icons/obj/assemblies.dmi'
var/mmi_icon_state = "mmi_full"
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index a1e4b555412..aa890cbd17f 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -201,7 +201,7 @@
swap_hand()
/mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
- add_attack_logs(M, src, "Shaked", admin_notify = FALSE)
+ add_attack_logs(M, src, "Shaked", ATKLOG_ALL)
if(health >= config.health_threshold_crit)
if(src == M && ishuman(src))
var/mob/living/carbon/human/H = src
@@ -256,14 +256,9 @@
H.play_xylophone()
else
if(player_logged)
- M.visible_message("[M] shakes [src], but they do not respond. Probably suffering from SSD.", \
- "You shake [src], but they are unresponsive. Probably suffering from SSD.")
+ M.visible_message("[M] shakes [src], but [p_they()] [p_do()] not respond. Probably suffering from SSD.", \
+ "You shake [src], but [p_theyre()] unresponsive. Probably suffering from SSD.")
if(lying) // /vg/: For hugs. This is how update_icon figgers it out, anyway. - N3X15
- var/t_him = "it"
- if(gender == MALE)
- t_him = "him"
- else if(gender == FEMALE)
- t_him = "her"
if(ishuman(src))
var/mob/living/carbon/human/H = src
if(H.w_uniform)
@@ -277,8 +272,8 @@
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if(!player_logged)
M.visible_message( \
- "[M] shakes [src] trying to wake [t_him] up!",\
- "You shake [src] trying to wake [t_him] up!",\
+ "[M] shakes [src] trying to wake [p_them()] up!",\
+ "You shake [src] trying to wake [p_them()] up!",\
)
// BEGIN HUGCODE - N3X
else
@@ -745,7 +740,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
if(restrained())
changeNext_move(CLICK_CD_BREAKOUT)
last_special = world.time + CLICK_CD_BREAKOUT
- visible_message("[src] attempts to unbuckle themself!", \
+ visible_message("[src] attempts to unbuckle [p_them()]self!", \
"You attempt to unbuckle yourself... (This will take around one minute and you need to stay still.)")
if(do_after(src, 600, 0, target = src))
if(!buckled)
@@ -762,11 +757,11 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
Weaken(3, 1, 1) //We dont check for CANWEAKEN, I don't care how immune to weakening you are, if you're rolling on the ground, you're busy.
update_canmove()
spin(32,2)
- visible_message("[src] rolls on the floor, trying to put themselves out!", \
+ visible_message("[src] rolls on the floor, trying to put [p_them()]self out!", \
"You stop, drop, and roll!")
sleep(30)
if(fire_stacks <= 0)
- visible_message("[src] has successfully extinguished themselves!", \
+ visible_message("[src] has successfully extinguished [p_them()]self!", \
"You extinguish yourself.")
ExtinguishMob()
@@ -1020,7 +1015,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
return 1
/mob/living/carbon/proc/forceFedAttackLog(var/obj/item/reagent_containers/food/toEat, mob/user)
- add_attack_logs(user, src, "Fed [toEat]. Reagents: [toEat.reagentlist(toEat)]")
+ add_attack_logs(user, src, "Fed [toEat]. Reagents: [toEat.reagentlist(toEat)]", ATKLOG_FEW)
if(!iscarbon(user))
LAssailant = null
else
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 84b4608b233..37749c0dd76 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -139,9 +139,11 @@
/mob/living/carbon/human/proc/makeSkeleton()
var/obj/item/organ/external/head/H = get_organ("head")
- if(SKELETON in src.mutations) return
+ if(SKELETON in src.mutations)
+ return
if(istype(H))
+ H.disfigured = TRUE
if(H.f_style)
H.f_style = initial(H.f_style)
if(H.h_style)
@@ -159,16 +161,17 @@
mutations.Add(SKELETON)
mutations.Add(NOCLONE)
- status_flags |= DISFIGURED
update_body(0)
update_mutantrace()
return
/mob/living/carbon/human/proc/ChangeToHusk()
var/obj/item/organ/external/head/H = bodyparts_by_name["head"]
- if(HUSK in mutations) return
+ if(HUSK in mutations)
+ return
if(istype(H))
+ H.disfigured = TRUE //makes them unknown without fucking up other stuff like admintools
if(H.f_style)
H.f_style = "Shaved" //we only change the icon_state of the hair datum, so it doesn't mess up their UI/UE
if(H.h_style)
@@ -177,7 +180,6 @@
update_hair(0)
mutations.Add(HUSK)
- status_flags |= DISFIGURED //makes them unknown without fucking up other stuff like admintools
update_body(0)
update_mutantrace()
return
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index e9ae44bf433..be46cc9fa7d 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -173,14 +173,14 @@
if("clack", "clacks")
var/M = handle_emote_param(param)
- message = "[src] clacks their mandibles[M ? " at [M]" : ""]."
+ message = "[src] clacks [p_their()] mandibles[M ? " at [M]" : ""]."
playsound(loc, 'sound/effects/Kidanclack.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
m_type = 2
if("click", "clicks")
var/M = handle_emote_param(param)
- message = "[src] clicks their mandibles[M ? " at [M]" : ""]."
+ message = "[src] clicks [p_their()] mandibles[M ? " at [M]" : ""]."
playsound(loc, 'sound/effects/Kidanclack2.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
m_type = 2
@@ -201,7 +201,7 @@
if("quill", "quills")
var/M = handle_emote_param(param)
- message = "[src] rustles their quills[M ? " at [M]" : ""]."
+ message = "[src] rustles [p_their()] quills[M ? " at [M]" : ""]."
playsound(loc, 'sound/effects/voxrustle.ogg', 50, 0) //Credit to sound-ideas (freesfx.co.uk) for the sound.
m_type = 2
@@ -222,12 +222,12 @@
if("wag", "wags")
if(body_accessory)
if(body_accessory.try_restrictions(src))
- message = "[src] starts wagging \his tail."
+ message = "[src] starts wagging [p_their()] tail."
start_tail_wagging(1)
else if(species.bodyflags & TAIL_WAGGING)
if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
- message = "[src] starts wagging \his tail."
+ message = "[src] starts wagging [p_their()] tail."
start_tail_wagging(1)
else
return
@@ -237,7 +237,7 @@
if("swag", "swags")
if(species.bodyflags & TAIL_WAGGING || body_accessory)
- message = "[src] stops wagging \his tail."
+ message = "[src] stops wagging [p_their()] tail."
stop_tail_wagging(1)
else
return
@@ -282,7 +282,7 @@
if("choke", "chokes")
if(miming)
- message = "[src] clutches \his throat desperately!"
+ message = "[src] clutches [p_their()] throat desperately!"
m_type = 1
else
if(!muzzled)
@@ -294,7 +294,7 @@
if("burp", "burps")
if(miming)
- message = "[src] opens their mouth rather obnoxiously."
+ message = "[src] opens [p_their()] mouth rather obnoxiously."
m_type = 1
else
if(!muzzled)
@@ -330,7 +330,7 @@
if("flap", "flaps")
if(!restrained())
- message = "[src] flaps \his wings."
+ message = "[src] flaps [p_their()] wings."
m_type = 2
if(miming)
m_type = 1
@@ -382,7 +382,7 @@
if("aflap", "aflaps")
if(!restrained())
- message = "[src] flaps \his wings ANGRILY!"
+ message = "[src] flaps [p_their()] wings ANGRILY!"
m_type = 2
if(miming)
m_type = 1
@@ -479,7 +479,7 @@
m_type = 2
if("deathgasp", "deathgasps")
- message = "[src] [species.death_message]"
+ message = "[src] [replacetext(species.death_message, "their", p_their())]"
m_type = 1
if("giggle", "giggles")
@@ -527,7 +527,7 @@
message = "[src] cries."
m_type = 2
else
- message = "[src] makes a weak noise. \He frowns."
+ message = "[src] makes a weak noise. [p_they(TRUE)] frown[p_s()]."
m_type = 2
if("sigh", "sighs")
@@ -605,7 +605,7 @@
message = "[src] takes a drag from a cigarette and blows \"[M]\" out in smoke."
m_type = 1
else
- message = "[src] says, \"[M], please. They had a family.\" [name] takes a drag from a cigarette and blows their name out in smoke."
+ message = "[src] says, \"[M], please. They had a family.\" [name] takes a drag from a cigarette and blows [p_their()] name out in smoke."
m_type = 2
if("point", "points")
@@ -631,7 +631,7 @@
if("shake", "shakes")
var/M = handle_emote_param(param, 1) //Check to see if the param is valid (mob with the param name is in view) but exclude ourselves.
- message = "[src] shakes \his head[M ? " at [M]" : ""]."
+ message = "[src] shakes [p_their()] head[M ? " at [M]" : ""]."
m_type = 1
if("shrug", "shrugs")
@@ -742,7 +742,7 @@
if(M)
message = "[src] hugs [M]."
else
- message = "[src] hugs \himself."
+ message = "[src] hugs [p_them()]self."
if("handshake")
m_type = 1
@@ -753,7 +753,7 @@
if(M.canmove && !M.r_hand && !M.restrained())
message = "[src] shakes hands with [M]."
else
- message = "[src] holds out \his hand to [M]."
+ message = "[src] holds out [p_their()] hand to [M]."
if("dap", "daps")
m_type = 1
@@ -763,7 +763,7 @@
if(M)
message = "[src] gives daps to [M]."
else
- message = "[src] sadly can't find anybody to give daps to, and daps \himself. Shameful."
+ message = "[src] sadly can't find anybody to give daps to, and daps [p_them()]self. Shameful."
if("slap", "slaps")
m_type = 1
@@ -773,7 +773,7 @@
if(M)
message = "[src] slaps [M] across the face. Ouch!"
else
- message = "[src] slaps \himself!"
+ message = "[src] slaps [p_them()]self!"
adjustFireLoss(4)
playsound(loc, 'sound/effects/snap.ogg', 50, 1)
@@ -814,10 +814,10 @@
var/M = handle_emote_param(param)
- message = "[src] snaps \his fingers[M ? " at [M]" : ""]."
+ message = "[src] snaps [p_their()] fingers[M ? " at [M]" : ""]."
playsound(loc, 'sound/effects/fingersnap.ogg', 50, 1, -3)
else
- message = "[src] snaps \his fingers right off!"
+ message = "[src] snaps [p_their()] fingers right off!"
playsound(loc, 'sound/effects/snap.ogg', 50, 1)
// Needed for M_TOXIC_FART
@@ -826,34 +826,34 @@
return
// playsound(loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
if(locate(/obj/item/storage/bible) in get_turf(src))
- to_chat(viewers(src), "[src] farts on the Bible!")
- var/image/cross = image('icons/obj/storage.dmi',"bible")
- var/adminbfmessage = "\blue [bicon(cross)] Bible Fart: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src)]) (CA) (SMITE):"
+ to_chat(viewers(src), "[src] farts on the Bible!")
+ var/image/cross = image('icons/obj/storage.dmi', "bible")
+ var/adminbfmessage = "[bicon(cross)] Bible Fart: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src)]) (CA) (SMITE):"
for(var/client/X in admins)
- if(check_rights(R_EVENT,0,X.mob))
+ if(check_rights(R_EVENT, 0, X.mob))
to_chat(X, adminbfmessage)
else if(TOXIC_FARTS in mutations)
- message = "[src] unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart."
+ message = "[src] unleashes a [pick("horrible", "terrible", "foul", "disgusting", "awful")] fart."
else if(SUPER_FART in mutations)
- message = "[src] unleashes a [pick("loud","deafening")] fart."
- newtonian_move(dir)
+ message = "[src] unleashes a [pick("loud", "deafening")] fart."
else
- message = "[src] [pick("passes wind","farts")]."
+ message = "[src] [pick("passes wind", "farts")]."
m_type = 2
var/turf/location = get_turf(src)
- var/aoe_range=2 // Default
// Process toxic farts first.
if(TOXIC_FARTS in mutations)
- for(var/mob/M in range(location,aoe_range))
- if(M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
+ for(var/mob/living/carbon/C in range(location, 2))
+ if(C.internal != null && C.wear_mask && (C.wear_mask.flags & AIRTIGHT))
continue
- // Now, we don't have this:
- //new /obj/effects/fart_cloud(T,L)
- if(M == src)
+ if(C == src)
continue
- M.reagents.add_reagent("jenkem", 1)
+ C.reagents.add_reagent("jenkem", 1)
+
+ // Farting as a form of locomotion in space
+ if(SUPER_FART in mutations)
+ newtonian_move(dir)
if("hem")
message = "[src] hems."
@@ -941,7 +941,7 @@
set desc = "Sets a description which will be shown when someone examines you."
set category = "IC"
- pose = sanitize(copytext(input(usr, "This is [src]. \He is...", "Pose", null) as text, 1, MAX_MESSAGE_LEN))
+ pose = sanitize(copytext(input(usr, "This is [src]. [p_they(TRUE)] [p_are()]...", "Pose", null) as text, 1, MAX_MESSAGE_LEN))
/mob/living/carbon/human/verb/set_flavor()
set name = "Set Flavour Text"
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index c15f30f94bd..ef352b5a8f8 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -23,41 +23,10 @@
if(wear_mask)
skipface |= wear_mask.flags_inv & HIDEFACE
-
- // crappy hacks because you can't do \his[src] etc. I'm sorry this proc is so unreadable, blame the text macros :<
- var/t_He = "It" //capitalised for use at the start of each line.
- var/t_his = "its"
- var/t_him = "it"
- var/t_has = "has"
- var/t_is = "is"
-
var/msg = "*---------*\nThis is "
- if((skipjumpsuit && skipface)) //big suits/masks/helmets make it hard to tell their gender
- t_He = "They"
- t_his = "their"
- t_him = "them"
- t_has = "have"
- t_is = "are"
- else
- if(icon)
- msg += "[bicon(icon(icon, dir=SOUTH))] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated
- switch(gender)
- if(MALE)
- t_He = "He"
- t_his = "his"
- t_him = "him"
- if(FEMALE)
- t_He = "She"
- t_his = "her"
- t_him = "her"
- if(PLURAL)
- t_He = "They"
- t_his = "their"
- t_him = "them"
- t_has = "have"
- t_is = "are"
-
+ if(!(skipjumpsuit && skipface) && icon) //big suits/masks/helmets make it hard to tell their gender
+ msg += "[bicon(icon(icon, dir=SOUTH))] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated
msg += "[name]"
var/list/nospecies = list("Abductor", "Shadowling", "Neara", "Monkey", "Stok", "Farwa", "Wolpin") //species that won't show their race no matter what
@@ -86,129 +55,129 @@
tie_msg += " with [english_accessory_list(U)]"
if(w_uniform.blood_DNA)
- msg += "[t_He] [t_is] wearing [bicon(w_uniform)] [w_uniform.gender==PLURAL?"some":"a"] [w_uniform.blood_color != "#030303" ? "blood-stained":"oil-stained"] [w_uniform.name][tie_msg]!\n"
+ msg += "[p_they(TRUE)] [p_are()] wearing [bicon(w_uniform)] [w_uniform.gender==PLURAL?"some":"a"] [w_uniform.blood_color != "#030303" ? "blood-stained":"oil-stained"] [w_uniform.name][tie_msg]!\n"
else
- msg += "[t_He] [t_is] wearing [bicon(w_uniform)] \a [w_uniform][tie_msg].\n"
+ msg += "[p_they(TRUE)] [p_are()] wearing [bicon(w_uniform)] \a [w_uniform][tie_msg].\n"
//head
if(head && !(head.flags & ABSTRACT))
if(head.blood_DNA)
- msg += "[t_He] [t_is] wearing [bicon(head)] [head.gender==PLURAL?"some":"a"] [head.blood_color != "#030303" ? "blood-stained":"oil-stained"] [head.name] on [t_his] head!\n"
+ msg += "[p_they(TRUE)] [p_are()] wearing [bicon(head)] [head.gender==PLURAL?"some":"a"] [head.blood_color != "#030303" ? "blood-stained":"oil-stained"] [head.name] on [p_their()] head!\n"
else
- msg += "[t_He] [t_is] wearing [bicon(head)] \a [head] on [t_his] head.\n"
+ msg += "[p_they(TRUE)] [p_are()] wearing [bicon(head)] \a [head] on [p_their()] head.\n"
//suit/armour
if(wear_suit && !(wear_suit.flags & ABSTRACT))
if(wear_suit.blood_DNA)
- msg += "[t_He] [t_is] wearing [bicon(wear_suit)] [wear_suit.gender==PLURAL?"some":"a"] [wear_suit.blood_color != "#030303" ? "blood-stained":"oil-stained"] [wear_suit.name]!\n"
+ msg += "[p_they(TRUE)] [p_are()] wearing [bicon(wear_suit)] [wear_suit.gender==PLURAL?"some":"a"] [wear_suit.blood_color != "#030303" ? "blood-stained":"oil-stained"] [wear_suit.name]!\n"
else
- msg += "[t_He] [t_is] wearing [bicon(wear_suit)] \a [wear_suit].\n"
+ msg += "[p_they(TRUE)] [p_are()] wearing [bicon(wear_suit)] \a [wear_suit].\n"
//suit/armour storage
if(s_store && !skipsuitstorage)
if(s_store.blood_DNA)
- msg += "[t_He] [t_is] carrying [bicon(s_store)] [s_store.gender==PLURAL?"some":"a"] [s_store.blood_color != "#030303" ? "blood-stained":"oil-stained"] [s_store.name] on [t_his] [wear_suit.name]!\n"
+ msg += "[p_they(TRUE)] [p_are()] carrying [bicon(s_store)] [s_store.gender==PLURAL?"some":"a"] [s_store.blood_color != "#030303" ? "blood-stained":"oil-stained"] [s_store.name] on [p_their()] [wear_suit.name]!\n"
else
- msg += "[t_He] [t_is] carrying [bicon(s_store)] \a [s_store] on [t_his] [wear_suit.name].\n"
+ msg += "[p_they(TRUE)] [p_are()] carrying [bicon(s_store)] \a [s_store] on [p_their()] [wear_suit.name].\n"
//back
if(back && !(back.flags & ABSTRACT))
if(back.blood_DNA)
- msg += "[t_He] [t_has] [bicon(back)] [back.gender==PLURAL?"some":"a"] [back.blood_color != "#030303" ? "blood-stained":"oil-stained"] [back] on [t_his] back.\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(back)] [back.gender==PLURAL?"some":"a"] [back.blood_color != "#030303" ? "blood-stained":"oil-stained"] [back] on [p_their()] back.\n"
else
- msg += "[t_He] [t_has] [bicon(back)] \a [back] on [t_his] back.\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(back)] \a [back] on [p_their()] back.\n"
//left hand
if(l_hand && !(l_hand.flags & ABSTRACT))
if(l_hand.blood_DNA)
- msg += "[t_He] [t_is] holding [bicon(l_hand)] [l_hand.gender==PLURAL?"some":"a"] [l_hand.blood_color != "#030303" ? "blood-stained":"oil-stained"] [l_hand.name] in [t_his] left hand!\n"
+ msg += "[p_they(TRUE)] [p_are()] holding [bicon(l_hand)] [l_hand.gender==PLURAL?"some":"a"] [l_hand.blood_color != "#030303" ? "blood-stained":"oil-stained"] [l_hand.name] in [p_their()] left hand!\n"
else
- msg += "[t_He] [t_is] holding [bicon(l_hand)] \a [l_hand] in [t_his] left hand.\n"
+ msg += "[p_they(TRUE)] [p_are()] holding [bicon(l_hand)] \a [l_hand] in [p_their()] left hand.\n"
//right hand
if(r_hand && !(r_hand.flags & ABSTRACT))
if(r_hand.blood_DNA)
- msg += "[t_He] [t_is] holding [bicon(r_hand)] [r_hand.gender==PLURAL?"some":"a"] [r_hand.blood_color != "#030303" ? "blood-stained":"oil-stained"] [r_hand.name] in [t_his] right hand!\n"
+ msg += "[p_they(TRUE)] [p_are()] holding [bicon(r_hand)] [r_hand.gender==PLURAL?"some":"a"] [r_hand.blood_color != "#030303" ? "blood-stained":"oil-stained"] [r_hand.name] in [p_their()] right hand!\n"
else
- msg += "[t_He] [t_is] holding [bicon(r_hand)] \a [r_hand] in [t_his] right hand.\n"
+ msg += "[p_they(TRUE)] [p_are()] holding [bicon(r_hand)] \a [r_hand] in [p_their()] right hand.\n"
//gloves
if(gloves && !skipgloves && !(gloves.flags & ABSTRACT))
if(gloves.blood_DNA)
- msg += "[t_He] [t_has] [bicon(gloves)] [gloves.gender==PLURAL?"some":"a"] [gloves.blood_color != "#030303" ? "blood-stained":"oil-stained"] [gloves.name] on [t_his] hands!\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(gloves)] [gloves.gender==PLURAL?"some":"a"] [gloves.blood_color != "#030303" ? "blood-stained":"oil-stained"] [gloves.name] on [p_their()] hands!\n"
else
- msg += "[t_He] [t_has] [bicon(gloves)] \a [gloves] on [t_his] hands.\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(gloves)] \a [gloves] on [p_their()] hands.\n"
else if(blood_DNA)
- msg += "[t_He] [t_has] [hand_blood_color != "#030303" ? "blood-stained":"oil-stained"] hands!\n"
+ msg += "[p_they(TRUE)] [p_have()] [hand_blood_color != "#030303" ? "blood-stained":"oil-stained"] hands!\n"
//handcuffed?
if(handcuffed)
if(istype(handcuffed, /obj/item/restraints/handcuffs/cable/zipties))
- msg += "[t_He] [t_is] [bicon(handcuffed)] restrained with zipties!\n"
+ msg += "[p_they(TRUE)] [p_are()] [bicon(handcuffed)] restrained with zipties!\n"
else if(istype(handcuffed, /obj/item/restraints/handcuffs/cable))
- msg += "[t_He] [t_is] [bicon(handcuffed)] restrained with cable!\n"
+ msg += "[p_they(TRUE)] [p_are()] [bicon(handcuffed)] restrained with cable!\n"
else
- msg += "[t_He] [t_is] [bicon(handcuffed)] handcuffed!\n"
+ msg += "[p_they(TRUE)] [p_are()] [bicon(handcuffed)] handcuffed!\n"
//belt
if(belt)
if(belt.blood_DNA)
- msg += "[t_He] [t_has] [bicon(belt)] [belt.gender==PLURAL?"some":"a"] [belt.blood_color != "#030303" ? "blood-stained":"oil-stained"] [belt.name] about [t_his] waist!\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(belt)] [belt.gender==PLURAL?"some":"a"] [belt.blood_color != "#030303" ? "blood-stained":"oil-stained"] [belt.name] about [p_their()] waist!\n"
else
- msg += "[t_He] [t_has] [bicon(belt)] \a [belt] about [t_his] waist.\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(belt)] \a [belt] about [p_their()] waist.\n"
//shoes
if(shoes && !skipshoes && !(shoes.flags & ABSTRACT))
if(shoes.blood_DNA)
- msg += "[t_He] [t_is] wearing [bicon(shoes)] [shoes.gender==PLURAL?"some":"a"] [shoes.blood_color != "#030303" ? "blood-stained":"oil-stained"] [shoes.name] on [t_his] feet!\n"
+ msg += "[p_they(TRUE)] [p_are()] wearing [bicon(shoes)] [shoes.gender==PLURAL?"some":"a"] [shoes.blood_color != "#030303" ? "blood-stained":"oil-stained"] [shoes.name] on [p_their()] feet!\n"
else
- msg += "[t_He] [t_is] wearing [bicon(shoes)] \a [shoes] on [t_his] feet.\n"
+ msg += "[p_they(TRUE)] [p_are()] wearing [bicon(shoes)] \a [shoes] on [p_their()] feet.\n"
else if(blood_DNA)
- msg += "[t_He] [t_has] [feet_blood_color != "#030303" ? "blood-stained":"oil-stained"] feet!\n"
+ msg += "[p_they(TRUE)] [p_have()] [feet_blood_color != "#030303" ? "blood-stained":"oil-stained"] feet!\n"
//mask
if(wear_mask && !skipmask && !(wear_mask.flags & ABSTRACT))
if(wear_mask.blood_DNA)
- msg += "[t_He] [t_has] [bicon(wear_mask)] [wear_mask.gender==PLURAL?"some":"a"] [wear_mask.blood_color != "#030303" ? "blood-stained":"oil-stained"] [wear_mask.name] on [t_his] face!\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(wear_mask)] [wear_mask.gender==PLURAL?"some":"a"] [wear_mask.blood_color != "#030303" ? "blood-stained":"oil-stained"] [wear_mask.name] on [p_their()] face!\n"
else
- msg += "[t_He] [t_has] [bicon(wear_mask)] \a [wear_mask] on [t_his] face.\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(wear_mask)] \a [wear_mask] on [p_their()] face.\n"
//eyes
if(glasses && !skipeyes && !(glasses.flags & ABSTRACT))
if(glasses.blood_DNA)
- msg += "[t_He] [t_has] [bicon(glasses)] [glasses.gender==PLURAL?"some":"a"] [glasses.blood_color != "#030303" ? "blood-stained":"oil-stained"] [glasses] covering [t_his] eyes!\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(glasses)] [glasses.gender==PLURAL?"some":"a"] [glasses.blood_color != "#030303" ? "blood-stained":"oil-stained"] [glasses] covering [p_their()] eyes!\n"
else
- msg += "[t_He] [t_has] [bicon(glasses)] \a [glasses] covering [t_his] eyes.\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(glasses)] \a [glasses] covering [p_their()] eyes.\n"
//left ear
if(l_ear && !skipears)
- msg += "[t_He] [t_has] [bicon(l_ear)] \a [l_ear] on [t_his] left ear.\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(l_ear)] \a [l_ear] on [p_their()] left ear.\n"
//right ear
if(r_ear && !skipears)
- msg += "[t_He] [t_has] [bicon(r_ear)] \a [r_ear] on [t_his] right ear.\n"
+ msg += "[p_they(TRUE)] [p_have()] [bicon(r_ear)] \a [r_ear] on [p_their()] right ear.\n"
//ID
if(wear_id)
- msg += "[t_He] [t_is] wearing [bicon(wear_id)] \a [wear_id].\n"
+ msg += "[p_they(TRUE)] [p_are()] wearing [bicon(wear_id)] \a [wear_id].\n"
//Jitters
switch(jitteriness)
if(300 to INFINITY)
- msg += "[t_He] [t_is] convulsing violently!\n"
+ msg += "[p_they(TRUE)] [p_are()] convulsing violently!\n"
if(200 to 300)
- msg += "[t_He] [t_is] extremely jittery.\n"
+ msg += "[p_they(TRUE)] [p_are()] extremely jittery.\n"
if(100 to 200)
- msg += "[t_He] [t_is] twitching ever so slightly.\n"
+ msg += "[p_they(TRUE)] [p_are()] twitching ever so slightly.\n"
var/appears_dead = FALSE
if(stat == DEAD || (status_flags & FAKEDEATH))
appears_dead = TRUE
if(suiciding)
- msg += "[t_He] appears to have committed suicide... there is no hope of recovery.\n"
- msg += "[t_He] [t_is] limp and unresponsive; there are no signs of life"
+ msg += "[p_they(TRUE)] appear[p_s()] to have committed suicide... there is no hope of recovery.\n"
+ msg += "[p_they(TRUE)] [p_are()] limp and unresponsive; there are no signs of life"
if(get_int_organ(/obj/item/organ/internal/brain))
if(!key)
var/foundghost = FALSE
@@ -220,11 +189,11 @@
foundghost = FALSE
break
if(!foundghost)
- msg += " and [t_his] soul has departed"
+ msg += " and [p_their()] soul has departed"
msg += "...\n"
if(!get_int_organ(/obj/item/organ/internal/brain))
- msg += "It appears that [t_his] brain is missing...\n"
+ msg += "It appears that [p_their()] brain is missing...\n"
msg += ""
@@ -238,17 +207,17 @@
var/obj/item/organ/external/E = bodyparts_by_name[organ_tag]
if(!E)
- wound_flavor_text["[organ_tag]"] = "[t_He] [t_is] missing [t_his] [organ_descriptor].\n"
+ wound_flavor_text["[organ_tag]"] = "[p_they(TRUE)] [p_are()] missing [p_their()] [organ_descriptor].\n"
else
if(!isSynthetic())
if(E.status & ORGAN_ROBOT)
- wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a robotic [E.name]!\n"
+ wound_flavor_text["[E.limb_name]"] = "[p_they(TRUE)] [p_have()] a robotic [E.name]!\n"
else if(E.status & ORGAN_SPLINTED)
- wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a splint on [t_his] [E.name]!\n"
+ wound_flavor_text["[E.limb_name]"] = "[p_they(TRUE)] [p_have()] a splint on [p_their()] [E.name]!\n"
for(var/obj/item/I in E.embedded_objects)
- msg += "[t_He] [t_has] \a [bicon(I)] [I] embedded in [t_his] [E.name]!\n"
+ msg += "[p_they(TRUE)] [p_have()] \a [bicon(I)] [I] embedded in [p_their()] [E.name]!\n"
//Handles the text strings being added to the actual description.
//If they have something that covers the limb, and it is not missing, put flavortext. If it is covered but bleeding, add other flavortext.
@@ -280,101 +249,101 @@
if(temp)
var/brute_message = !isSynthetic() ? "bruising" : "denting"
if(temp < 30)
- msg += "[t_He] [t_has] minor [brute_message ].\n"
+ msg += "[p_they(TRUE)] [p_have()] minor [brute_message ].\n"
else
- msg += "[t_He] [t_has] severe [brute_message ]!\n"
+ msg += "[p_they(TRUE)] [p_have()] severe [brute_message ]!\n"
temp = getFireLoss()
if(temp)
if(temp < 30)
- msg += "[t_He] [t_has] minor burns.\n"
+ msg += "[p_they(TRUE)] [p_have()] minor burns.\n"
else
- msg += "[t_He] [t_has] severe burns!\n"
+ msg += "[p_they(TRUE)] [p_have()] severe burns!\n"
temp = getCloneLoss()
if(temp)
if(temp < 30)
- msg += "[t_He] [t_has] minor cellular damage.\n"
+ msg += "[p_they(TRUE)] [p_have()] minor cellular damage.\n"
else
- msg += "[t_He] [t_has] severe cellular damage.\n"
+ msg += "[p_they(TRUE)] [p_have()] severe cellular damage.\n"
if(fire_stacks > 0)
- msg += "[t_He] [t_is] covered in something flammable.\n"
+ msg += "[p_they(TRUE)] [p_are()] covered in something flammable.\n"
if(fire_stacks < 0)
- msg += "[t_He] looks a little soaked.\n"
+ msg += "[p_they(TRUE)] looks a little soaked.\n"
switch(wetlevel)
if(1)
- msg += "[t_He] looks a bit damp.\n"
+ msg += "[p_they(TRUE)] looks a bit damp.\n"
if(2)
- msg += "[t_He] looks a little bit wet.\n"
+ msg += "[p_they(TRUE)] looks a little bit wet.\n"
if(3)
- msg += "[t_He] looks wet.\n"
+ msg += "[p_they(TRUE)] looks wet.\n"
if(4)
- msg += "[t_He] looks very wet.\n"
+ msg += "[p_they(TRUE)] looks very wet.\n"
if(5)
- msg += "[t_He] looks absolutely soaked.\n"
+ msg += "[p_they(TRUE)] looks absolutely soaked.\n"
if(nutrition < NUTRITION_LEVEL_STARVING - 50)
- msg += "[t_He] [t_is] severely malnourished.\n"
+ msg += "[p_they(TRUE)] [p_are()] severely malnourished.\n"
else if(nutrition >= NUTRITION_LEVEL_FAT)
if(user.nutrition < NUTRITION_LEVEL_STARVING - 50)
- msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n"
+ msg += "[p_they(TRUE)] [p_are()] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n"
else
- msg += "[t_He] [t_is] quite chubby.\n"
+ msg += "[p_they(TRUE)] [p_are()] quite chubby.\n"
if(blood_volume < BLOOD_VOLUME_SAFE)
- msg += "[t_He] [t_has] pale skin.\n"
+ msg += "[p_they(TRUE)] [p_have()] pale skin.\n"
if(bleedsuppress)
- msg += "[t_He] [t_is] bandaged with something.\n"
+ msg += "[p_they(TRUE)] [p_are()] bandaged with something.\n"
else if(bleed_rate)
if(reagents.has_reagent("heparin"))
- msg += "[t_He] [t_is] bleeding uncontrollably!\n"
+ msg += "[p_they(TRUE)] [p_are()] bleeding uncontrollably!\n"
else
- msg += "[t_He] [t_is] bleeding!\n"
+ msg += "[p_they(TRUE)] [p_are()] bleeding!\n"
if(reagents.has_reagent("teslium"))
- msg += "[t_He] is emitting a gentle blue glow!\n"
+ msg += "[p_they(TRUE)] [p_are()] emitting a gentle blue glow!\n"
msg += ""
if(!appears_dead)
if(stat == UNCONSCIOUS)
- msg += "[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.\n"
+ msg += "[p_they(TRUE)] [p_are()]n't responding to anything around [p_them()] and seems to be asleep.\n"
else if(getBrainLoss() >= 60)
- msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
+ msg += "[p_they(TRUE)] [p_have()] a stupid expression on [p_their()] face.\n"
if(get_int_organ(/obj/item/organ/internal/brain))
if(istype(src, /mob/living/carbon/human/interactive))
var/mob/living/carbon/human/interactive/auto = src
if(auto.showexaminetext)
- msg += "[t_He] [t_is] appears to be some sort of sick automaton, [t_his] eyes are glazed over and [t_his] mouth is slightly agape.\n"
+ msg += "[p_they(TRUE)] [p_are()] appears to be some sort of sick automaton, [p_their()] eyes are glazed over and [p_their()] mouth is slightly agape.\n"
if(auto.debugexamine)
var/dodebug = auto.doing2string(auto.doing)
var/interestdebug = auto.interest2string(auto.interest)
- msg += "[t_He] [t_is] appears to be [interestdebug] and [dodebug].\n"
+ msg += "[p_they(TRUE)] [p_are()] appears to be [interestdebug] and [dodebug].\n"
else if(species.show_ssd)
if(!key)
- msg += "[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.\n"
+ msg += "[p_they(TRUE)] [p_are()] totally catatonic. The stresses of life in deep-space must have been too much for [p_them()]. Any recovery is unlikely.\n"
else if(!client)
- msg += "[t_He] [t_has] suddenly fallen asleep, suffering from Space Sleep Disorder. [t_He] may wake up soon.\n"
+ msg += "[p_they(TRUE)] [p_have()] suddenly fallen asleep, suffering from Space Sleep Disorder. [p_they(TRUE)] may wake up soon.\n"
if(digitalcamo)
- msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly inhuman manner.\n"
+ msg += "[p_they(TRUE)] [p_are()] moving [p_their()] body in an unnatural and blatantly inhuman manner.\n"
if(!(skipface || ( wear_mask && ( wear_mask.flags_inv & HIDEFACE || wear_mask.flags_cover & MASKCOVERSMOUTH) ) ) && is_thrall(src) && in_range(user,src))
msg += "Their features seem unnaturally tight and drawn.\n"
if(decaylevel == 1)
- msg += "[t_He] [t_is] starting to smell.\n"
+ msg += "[p_they(TRUE)] [p_are()] starting to smell.\n"
if(decaylevel == 2)
- msg += "[t_He] [t_is] bloated and smells disgusting.\n"
+ msg += "[p_they(TRUE)] [p_are()] bloated and smells disgusting.\n"
if(decaylevel == 3)
- msg += "[t_He] [t_is] rotting and blackened, the skin sloughing off. The smell is indescribably foul.\n"
+ msg += "[p_they(TRUE)] [p_are()] rotting and blackened, the skin sloughing off. The smell is indescribably foul.\n"
if(decaylevel == 4)
- msg += "[t_He] [t_is] mostly dessicated now, with only bones remaining of what used to be a person.\n"
+ msg += "[p_they(TRUE)] [p_are()] mostly dessicated now, with only bones remaining of what used to be a person.\n"
if(hasHUD(user,"security"))
var/perpname = "wot"
@@ -429,7 +398,7 @@
if(pose)
if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
pose = addtext(pose,".") //Makes sure all emotes end with a period.
- msg += "\n[t_He] is [pose]"
+ msg += "\n[p_they(TRUE)] [p_are()] [pose]"
to_chat(user, msg)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 5a47bb052d5..cca71c1e8d6 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -10,8 +10,12 @@
var/datum/species/species //Contains icon generation and language information, set during New().
var/obj/item/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call.
-/mob/living/carbon/human/New(var/new_loc, var/new_species = null, var/delay_ready_dna = 0)
+/mob/living/carbon/human/New(loc)
+ if(length(args) > 1)
+ log_runtime(EXCEPTION("human/New called with more than 1 argument (REPORT THIS ENTIRE RUNTIME TO A CODER)"))
+ . = ..()
+/mob/living/carbon/human/Initialize(mapload, new_species = null)
if(!dna)
dna = new /datum/dna(null)
// Species name is handled by set_species()
@@ -40,7 +44,7 @@
faction |= "\ref[M]" //what
// Set up DNA.
- if(!delay_ready_dna && dna)
+ if(dna)
dna.ready_dna(src)
dna.real_name = real_name
sync_organ_dna(1)
@@ -69,80 +73,80 @@
real_name = "Test Dummy"
status_flags = GODMODE|CANPUSH
-/mob/living/carbon/human/skrell/New(var/new_loc)
- ..(new_loc, "Skrell")
+/mob/living/carbon/human/skrell/Initialize(mapload)
+ ..(mapload, "Skrell")
-/mob/living/carbon/human/tajaran/New(var/new_loc)
- ..(new_loc, "Tajaran")
+/mob/living/carbon/human/tajaran/Initialize(mapload)
+ ..(mapload, "Tajaran")
-/mob/living/carbon/human/vulpkanin/New(var/new_loc)
- ..(new_loc, "Vulpkanin")
+/mob/living/carbon/human/vulpkanin/Initialize(mapload)
+ ..(mapload, "Vulpkanin")
-/mob/living/carbon/human/unathi/New(var/new_loc)
- ..(new_loc, "Unathi")
+/mob/living/carbon/human/unathi/Initialize(mapload)
+ ..(mapload, "Unathi")
-/mob/living/carbon/human/vox/New(var/new_loc)
- ..(new_loc, "Vox")
+/mob/living/carbon/human/vox/Initialize(mapload)
+ ..(mapload, "Vox")
-/mob/living/carbon/human/voxarmalis/New(var/new_loc)
- ..(new_loc, "Vox Armalis")
+/mob/living/carbon/human/voxarmalis/Initialize(mapload)
+ ..(mapload, "Vox Armalis")
-/mob/living/carbon/human/skeleton/New(var/new_loc)
- ..(new_loc, "Skeleton")
+/mob/living/carbon/human/skeleton/Initialize(mapload)
+ ..(mapload, "Skeleton")
-/mob/living/carbon/human/kidan/New(var/new_loc)
- ..(new_loc, "Kidan")
+/mob/living/carbon/human/kidan/Initialize(mapload)
+ ..(mapload, "Kidan")
-/mob/living/carbon/human/plasma/New(var/new_loc)
- ..(new_loc, "Plasmaman")
+/mob/living/carbon/human/plasma/Initialize(mapload)
+ ..(mapload, "Plasmaman")
-/mob/living/carbon/human/slime/New(var/new_loc)
- ..(new_loc, "Slime People")
+/mob/living/carbon/human/slime/Initialize(mapload)
+ ..(mapload, "Slime People")
-/mob/living/carbon/human/grey/New(var/new_loc)
- ..(new_loc, "Grey")
+/mob/living/carbon/human/grey/Initialize(mapload)
+ ..(mapload, "Grey")
-/mob/living/carbon/human/abductor/New(var/new_loc)
- ..(new_loc, "Abductor")
+/mob/living/carbon/human/abductor/Initialize(mapload)
+ ..(mapload, "Abductor")
-/mob/living/carbon/human/human/New(var/new_loc)
- ..(new_loc, "Human")
+/mob/living/carbon/human/human/Initialize(mapload)
+ ..(mapload, "Human")
-/mob/living/carbon/human/diona/New(var/new_loc)
- ..(new_loc, "Diona")
+/mob/living/carbon/human/diona/Initialize(mapload)
+ ..(mapload, "Diona")
-/mob/living/carbon/human/machine/New(var/new_loc)
- ..(new_loc, "Machine")
+/mob/living/carbon/human/machine/Initialize(mapload)
+ ..(mapload, "Machine")
-/mob/living/carbon/human/shadow/New(var/new_loc)
- ..(new_loc, "Shadow")
+/mob/living/carbon/human/shadow/Initialize(mapload)
+ ..(mapload, "Shadow")
-/mob/living/carbon/human/golem/New(var/new_loc)
- ..(new_loc, "Golem")
+/mob/living/carbon/human/golem/Initialize(mapload)
+ ..(mapload, "Golem")
-/mob/living/carbon/human/wryn/New(var/new_loc)
- ..(new_loc, "Wryn")
+/mob/living/carbon/human/wryn/Initialize(mapload)
+ ..(mapload, "Wryn")
-/mob/living/carbon/human/nucleation/New(var/new_loc)
- ..(new_loc, "Nucleation")
+/mob/living/carbon/human/nucleation/Initialize(mapload)
+ ..(mapload, "Nucleation")
-/mob/living/carbon/human/drask/New(var/new_loc)
- ..(new_loc, "Drask")
+/mob/living/carbon/human/drask/Initialize(mapload)
+ ..(mapload, "Drask")
-/mob/living/carbon/human/monkey/New(var/new_loc)
- ..(new_loc, "Monkey")
+/mob/living/carbon/human/monkey/Initialize(mapload)
+ ..(mapload, "Monkey")
-/mob/living/carbon/human/farwa/New(var/new_loc)
- ..(new_loc, "Farwa")
+/mob/living/carbon/human/farwa/Initialize(mapload)
+ ..(mapload, "Farwa")
-/mob/living/carbon/human/wolpin/New(var/new_loc)
- ..(new_loc, "Wolpin")
+/mob/living/carbon/human/wolpin/Initialize(mapload)
+ ..(mapload, "Wolpin")
-/mob/living/carbon/human/neara/New(var/new_loc)
- ..(new_loc, "Neara")
+/mob/living/carbon/human/neara/Initialize(mapload)
+ ..(mapload, "Neara")
-/mob/living/carbon/human/stok/New(var/new_loc)
- ..(new_loc, "Stok")
+/mob/living/carbon/human/stok/Initialize(mapload)
+ ..(mapload, "Stok")
/mob/living/carbon/human/Stat()
..()
@@ -302,7 +306,7 @@
if(!prob(martial_art.deflection_chance))
return ..()
if(!src.lying && !(HULK in mutations)) //But only if they're not lying down, and hulks can't do it
- visible_message("[src] deflects the projectile; they can't be hit with ranged weapons!", "You deflect the projectile!")
+ visible_message("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!", "You deflect the projectile!")
return 0
..()
@@ -509,7 +513,7 @@
//Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when polyacided or when updating a human's name variable
/mob/living/carbon/human/proc/get_face_name()
var/obj/item/organ/external/head = get_organ("head")
- if( !head || head.disfigured || !real_name || (HUSK in mutations) ) //disfigured. use id-name if possible
+ if(!head || head.disfigured || cloneloss > 50 || !real_name || (HUSK in mutations)) //disfigured. use id-name if possible
return "Unknown"
return real_name
@@ -604,7 +608,7 @@
if(!I || I.loc != src) //no item, no limb, or item is not in limb or in the person anymore
return
var/time_taken = I.embedded_unsafe_removal_time*I.w_class
- usr.visible_message("[usr] attempts to remove [I] from their [L.name].","You attempt to remove [I] from your [L.name]... (It will take [time_taken/10] seconds.)")
+ usr.visible_message("[usr] attempts to remove [I] from [usr.p_their()] [L.name].","You attempt to remove [I] from your [L.name]... (It will take [time_taken/10] seconds.)")
if(do_after(usr, time_taken, needhand = 1, target = src))
if(!I || !L || I.loc != src || !(I in L.embedded_objects))
return
@@ -613,7 +617,7 @@
I.forceMove(get_turf(src))
usr.put_in_hands(I)
usr.emote("scream")
- usr.visible_message("[usr] successfully rips [I] out of their [L.name]!","You successfully remove [I] from your [L.name].")
+ usr.visible_message("[usr] successfully rips [I] out of [usr.p_their()] [L.name]!","You successfully remove [I] from your [L.name].")
if(!has_embedded_objects())
clear_alert("embeddedobject")
return
@@ -647,12 +651,12 @@
unEquip(pocket_item)
if(thief_mode)
usr.put_in_hands(pocket_item)
- add_attack_logs(usr, src, "Stripped of [pocket_item]", isLivingSSD(src))
+ add_attack_logs(usr, src, "Stripped of [pocket_item]", isLivingSSD(src) ? null : ATKLOG_ALL)
else
if(place_item)
usr.unEquip(place_item)
equip_to_slot_if_possible(place_item, pocket_id, 0, 1)
- add_attack_logs(usr, src, "Equipped with [pocket_item]", isLivingSSD(src))
+ add_attack_logs(usr, src, "Equipped with [pocket_item]", isLivingSSD(src) ? null : ATKLOG_ALL)
// Update strip window
if(usr.machine == src && in_range(src, usr))
@@ -661,7 +665,7 @@
// Display a warning if the user mocks up if they don't have pickpocket gloves.
if(!thief_mode)
to_chat(src, "You feel your [pocket_side] pocket being fumbled with!")
- add_attack_logs(usr, src, "Attempted strip of [pocket_item]", isLivingSSD(src))
+ add_attack_logs(usr, src, "Attempted strip of [pocket_item]", isLivingSSD(src) ? null : ATKLOG_ALL)
if(href_list["set_sensor"])
if(istype(w_uniform, /obj/item/clothing/under))
@@ -676,7 +680,7 @@
"You have dislodged everything from [src]'s headpocket!")
var/obj/item/organ/internal/headpocket/C = get_int_organ(/obj/item/organ/internal/headpocket)
C.empty_contents()
- add_attack_logs(usr, src, "Stripped of headpocket items", isLivingSSD(src))
+ add_attack_logs(usr, src, "Stripped of headpocket items", isLivingSSD(src) ? null : ATKLOG_ALL)
if(href_list["strip_accessory"])
if(istype(w_uniform, /obj/item/clothing/under))
@@ -1039,7 +1043,7 @@
/mob/living/carbon/human/proc/play_xylophone()
if(!src.xylophone)
- visible_message("[src] begins playing his ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.")
+ visible_message("[src] begins playing [p_their()] ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.")
var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg')
playsound(loc, song, 50, 1, -1)
xylophone = 1
@@ -1060,7 +1064,7 @@
var/fail_msg
if(!affecting)
. = 0
- fail_msg = "They are missing that limb."
+ fail_msg = "[p_they(TRUE)] [p_are()] missing that limb."
else if(affecting.status & ORGAN_ROBOT)
. = 0
fail_msg = "That limb is robotic."
@@ -1074,7 +1078,7 @@
. = 0
if(!. && error_msg && user)
if(!fail_msg)
- fail_msg = "There is no exposed flesh or thin material [target_zone == "head" ? "on their head" : "on their body"] to inject into."
+ fail_msg = "There is no exposed flesh or thin material [target_zone == "head" ? "on [p_their()] head" : "on [p_their()] body"] to inject into."
to_chat(user, "[fail_msg]")
/mob/living/carbon/human/proc/check_obscured_slots()
@@ -1110,8 +1114,10 @@
return 1
/mob/living/carbon/human/proc/get_visible_gender()
- if(wear_suit && wear_suit.flags_inv & HIDEJUMPSUIT && ((head && head.flags_inv & HIDEMASK) || wear_mask))
- return NEUTER
+ var/list/obscured = check_obscured_slots()
+ var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
+ if((slot_w_uniform in obscured) && skipface)
+ return PLURAL
return gender
/mob/living/carbon/human/proc/increase_germ_level(n)
@@ -1197,7 +1203,7 @@
return 0
if(!L.is_bruised())
- src.custom_pain("You feel a stabbing pain in your chest!", 1)
+ custom_pain("You feel a stabbing pain in your chest!")
L.damage = L.min_bruised_damage
//returns 1 if made bloody, returns 0 otherwise
@@ -1248,10 +1254,10 @@
if(usr == src)
self = 1
if(!self)
- usr.visible_message("[usr] kneels down, puts \his hand on [src]'s wrist and begins counting their pulse.",\
+ usr.visible_message("[usr] kneels down, puts [usr.p_their()] hand on [src]'s wrist and begins counting [p_their()] pulse.",\
"You begin counting [src]'s pulse")
else
- usr.visible_message("[usr] begins counting their pulse.",\
+ usr.visible_message("[usr] begins counting [p_their()] pulse.",\
"You begin counting your pulse.")
if(src.pulse)
@@ -1742,7 +1748,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
to_chat(src, "Remove your mask first!")
return 0
if((H.head && (H.head.flags_cover & HEADCOVERSMOUTH)) || (H.wear_mask && (H.wear_mask.flags_cover & MASKCOVERSMOUTH) && !H.wear_mask.mask_adjusted))
- to_chat(src, "Remove their mask first!")
+ to_chat(src, "Remove [H.p_their()] mask first!")
return 0
visible_message("[src] is trying to perform CPR on [H.name]!", \
"You try to perform CPR on [H.name]!")
@@ -1756,7 +1762,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
to_chat(H, "You feel a breath of fresh air enter your lungs. It feels good.")
to_chat(src, "Repeat at least every 7 seconds.")
- add_attack_logs(src, H, "CPRed", FALSE)
+ add_attack_logs(src, H, "CPRed", ATKLOG_ALL)
return 1
else
to_chat(src, "You need to stay still while performing CPR!")
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index c216badda93..5ed14b3a18e 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -372,7 +372,6 @@ This function restores all organs.
dmgIcon.pixel_y = (!lying) ? rand(-11,9) : rand(-10,1)
flick_overlay(dmgIcon, attack_bubble_recipients, 9)
- receiving_damage()
if(BURN)
damageoverlaytemp = 20
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index c45154e4931..5b78b450357 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -348,6 +348,18 @@ emp_act
if(penetrated_dam) SS.create_breaches(damtype, penetrated_dam)
+/mob/living/carbon/human/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM)
+ var/hulk_verb = pick("smash", "pummel")
+ if(check_shields(user, 15, "the [hulk_verb]ing"))
+ return
+ ..(user, TRUE)
+ playsound(loc, user.species.unarmed.attack_sound, 25, 1, -1)
+ var/message = "[user] has [hulk_verb]ed [src]!"
+ visible_message("[message]", "[message]")
+ adjustBruteLoss(15)
+ return TRUE
+
/mob/living/carbon/human/attack_hand(mob/user)
if(..()) //to allow surgery to return properly.
return
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 428fafeb71e..9a78eafadd8 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -20,7 +20,7 @@
//Moving around with fractured ribs won't do you any good
if(E.is_broken() && E.internal_organs && E.internal_organs.len && prob(15))
var/obj/item/organ/internal/I = pick(E.internal_organs)
- custom_pain("You feel broken bones moving in your [E.name]!", 1)
+ custom_pain("You feel broken bones moving in your [E.name]!")
I.receive_damage(rand(3,5))
//handle_stance()
@@ -90,7 +90,7 @@
continue
var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
- custom_emote(1, "[(NO_PAIN in species.species_traits) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
+ custom_emote(1, "[(NO_PAIN in species.species_traits) ? "" : emote_scream ]drops what [p_they()] [p_were()] holding in [p_their()] [E.name]!")
else if(E.is_malfunctioning())
@@ -105,7 +105,7 @@
if(!unEquip(r_hand))
continue
- custom_emote(1, "drops what they were holding, their [E.name] malfunctioning!")
+ custom_emote(1, "drops what [p_they()] [p_were()] holding, [p_their()] [E.name] malfunctioning!")
var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm
index eae754b5283..8e8c2c80013 100644
--- a/code/modules/mob/living/carbon/human/interactive/functions.dm
+++ b/code/modules/mob/living/carbon/human/interactive/functions.dm
@@ -87,11 +87,11 @@
if(inactivity_period <= 0)
inactivity_period = 9999 // technically infinite
if(do_after(src, 60, target = traitorTarget))
- custom_emote(1, "A fire bursts from [src]'s eyes, igniting white hot and consuming their body in a flaming explosion!")
+ custom_emote(1, "A fire bursts from [src]'s eyes, igniting white hot and consuming [p_their()] body in a flaming explosion!")
explosion(src, 6, 6, 6)
else
inactivity_period = 0
- custom_emote(1, "[src]'s chest closes, hiding their insides.")
+ custom_emote(1, "[src]'s chest closes, hiding [p_their()] insides.")
if(SNPC_PSYCHO)
var/choice = pick(typesof(/obj/item/grenade/chem_grenade) - /obj/item/grenade/chem_grenade)
@@ -469,7 +469,7 @@
if(!Adjacent(SF))
tryWalk(get_turf(SF))
else
- custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")], grabbing various foodstuffs from [SF] and sticking them in it's mouth!")
+ custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")], grabbing various foodstuffs from [SF] and sticking them in its mouth!")
for(var/obj/item/A in SF.contents)
if(prob(smartness/2))
var/count = SF.item_quants[A.name]
@@ -631,7 +631,7 @@
TARGET = newSnack
newSnack.reagents.remove_any((newSnack.reagents.total_volume/2)-1)
newSnack.name = "Synthetic [newSnack.name]"
- custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")] as they vomit [newSnack] from their mouth!")
+ custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")] as [p_they()] vomit[p_s()] [newSnack] from [p_their()] mouth!")
catch(var/exception/e)
log_runtime(e, src, "Caught in SNPC cooking module")
doing &= ~SNPC_SPECIAL
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 64395954672..22e2e0ffe25 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/human/Life()
+/mob/living/carbon/human/Life(seconds, times_fired)
life_tick++
voice = GetVoice()
@@ -32,7 +32,7 @@
//Update our name based on whether our face is obscured/disfigured
name = get_visible_name()
- pulse = handle_pulse()
+ pulse = handle_pulse(times_fired)
if(mind && mind.vampire)
mind.vampire.handle_vampire()
@@ -150,7 +150,7 @@
AdjustSilence(2)
if(getBrainLoss() >= 120 && stat != 2) //they died from stupidity--literally. -Fox
- visible_message("[src] goes limp, their facial expression utterly blank.")
+ visible_message("[src] goes limp, [p_their()] facial expression utterly blank.")
death()
/mob/living/carbon/human/handle_mutations_and_radiation()
@@ -832,7 +832,8 @@
/mob/living/carbon/human/handle_vision()
if(machine)
- if(!machine.check_eye(src)) reset_perspective(null)
+ if(!machine.check_eye(src))
+ reset_perspective(null)
else
var/isRemoteObserve = 0
if((REMOTE_VIEW in mutations) && remoteview_target)
@@ -902,9 +903,8 @@
hud_used.lingchemdisplay.invisibility = 101
-/mob/living/carbon/human/proc/handle_pulse()
-
- if(mob_master.current_cycle % 5)
+/mob/living/carbon/human/proc/handle_pulse(times_fired)
+ if(times_fired % 5 == 1)
return pulse //update pulse every 5 life ticks (~1 tick/sec, depending on server load)
if(NO_BLOOD in species.species_traits)
diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm
index b66a0ee52ba..c21c1990cbe 100644
--- a/code/modules/mob/living/carbon/human/npcs.dm
+++ b/code/modules/mob/living/carbon/human/npcs.dm
@@ -5,9 +5,8 @@
item_color = "punpun"
species_restricted = list("Monkey")
-/mob/living/carbon/human/monkey/punpun/New()
+/mob/living/carbon/human/monkey/punpun/Initialize(mapload)
..()
- spawn(1)
- name = "Pun Pun"
- real_name = name
- equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform)
\ No newline at end of file
+ name = "Pun Pun"
+ real_name = name
+ equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform)
diff --git a/code/modules/mob/living/carbon/human/shock.dm b/code/modules/mob/living/carbon/human/shock.dm
index 05042a226d6..d8dc9356de7 100644
--- a/code/modules/mob/living/carbon/human/shock.dm
+++ b/code/modules/mob/living/carbon/human/shock.dm
@@ -43,7 +43,7 @@
if(shock_stage >= 30)
if(shock_stage == 30)
- custom_emote(1,"is having trouble keeping their eyes open.")
+ custom_emote(1,"is having trouble keeping [p_their()] eyes open.")
EyeBlurry(2)
Stuttering(5)
diff --git a/code/modules/mob/living/carbon/human/species/abductor.dm b/code/modules/mob/living/carbon/human/species/abductor.dm
index 3e1bb968c81..8aeb6f88a3d 100644
--- a/code/modules/mob/living/carbon/human/species/abductor.dm
+++ b/code/modules/mob/living/carbon/human/species/abductor.dm
@@ -6,7 +6,6 @@
path = /mob/living/carbon/human/abductor
language = "Abductor Mindlink"
default_language = "Abductor Mindlink"
- unarmed_type = /datum/unarmed_attack/punch
eyes = "blank_eyes"
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
diff --git a/code/modules/mob/living/carbon/human/species/apollo.dm b/code/modules/mob/living/carbon/human/species/apollo.dm
index 6c37da34395..5a3e1d4cde9 100644
--- a/code/modules/mob/living/carbon/human/species/apollo.dm
+++ b/code/modules/mob/living/carbon/human/species/apollo.dm
@@ -5,7 +5,6 @@
deform = 'icons/mob/human_races/r_wryn.dmi'
language = "Wryn Hivemind"
tail = "wryntail"
- unarmed_type = /datum/unarmed_attack/punch/weak
punchdamagelow = 0
punchdamagehigh = 1
//primitive = /mob/living/carbon/monkey/wryn
@@ -82,7 +81,6 @@
name = "Nucleation"
name_plural = "Nucleations"
icobase = 'icons/mob/human_races/r_nucleation.dmi'
- unarmed_type = /datum/unarmed_attack/punch
blurb = "A sub-race of unfortunates who have been exposed to too much supermatter radiation. As a result, \
supermatter crystal clusters have begun to grow across their bodies. Research to find a cure for this ailment \
has been slow, and so this is a common fate for veteran engineers. The supermatter crystals produce oxygen, \
diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm
index c289ba3a19e..74f3e97d879 100644
--- a/code/modules/mob/living/carbon/human/species/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/golem.dm
@@ -13,7 +13,6 @@
dietflags = DIET_OMNI //golems can eat anything because they are magic or something
reagent_tag = PROCESS_ORG
- unarmed_type = /datum/unarmed_attack/punch
punchdamagelow = 5
punchdamagehigh = 14
punchstunthreshold = 11 //about 40% chance to stun
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 07d3215126e..c5003b21330 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -28,8 +28,7 @@
reagent_tag = PROCESS_ORG
//Has standard darksight of 2.
- //unarmed_types = list(/datum/unarmed_attack/bite, /datum/unarmed_attack/claws)
- //inherent_verbs = list(/mob/living/proc/ventcrawl)
+ unarmed_type = /datum/unarmed_attack/bite
total_health = 75
brute_mod = 1.5
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 620d49254f3..692a23c470a 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -4,7 +4,6 @@
icobase = 'icons/mob/human_races/r_plasmaman_sb.dmi'
deform = 'icons/mob/human_races/r_plasmaman_pb.dmi' // TODO: Need deform.
//language = "Clatter"
- unarmed_type = /datum/unarmed_attack/punch
species_traits = list(IS_WHITELISTED, NO_BLOOD, NOTRANSSTING)
dietflags = DIET_OMNI
diff --git a/code/modules/mob/living/carbon/human/species/skeleton.dm b/code/modules/mob/living/carbon/human/species/skeleton.dm
index d207dc20703..9da4d1222f6 100644
--- a/code/modules/mob/living/carbon/human/species/skeleton.dm
+++ b/code/modules/mob/living/carbon/human/species/skeleton.dm
@@ -8,7 +8,6 @@
deform = 'icons/mob/human_races/r_skeleton.dmi'
path = /mob/living/carbon/human/skeleton
default_language = "Galactic Common"
- unarmed_type = /datum/unarmed_attack/punch
blood_color = "#FFFFFF"
flesh_color = "#E6E6C6"
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 50f969cae45..139f2f7c9bb 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -21,7 +21,7 @@
var/primitive_form // Lesser form, if any (ie. monkey for humans)
var/greater_form // Greater form, if any, ie. human for monkeys.
var/tail // Name of tail image in species effects icon file.
- var/unarmed //For empty hand harm-intent attack
+ var/datum/unarmed_attack/unarmed //For empty hand harm-intent attack
var/unarmed_type = /datum/unarmed_attack
var/slowdown = 0 // Passive movement speed malus (or boost, if negative)
var/silent_steps = 0 // Stops step noises
@@ -356,8 +356,8 @@
else
var/datum/unarmed_attack/attack = user.species.unarmed
- user.do_attack_animation(target)
- add_attack_logs(user, target, "Melee attacked with fists", admin_notify = target.ckey ? TRUE : FALSE)
+ user.do_attack_animation(target, attack.animation_type)
+ add_attack_logs(user, target, "Melee attacked with fists", target.ckey ? null : ATKLOG_ALL)
if(!iscarbon(user))
target.LAssailant = null
@@ -375,9 +375,6 @@
var/obj/item/organ/external/affecting = target.get_organ(ran_zone(user.zone_sel.selecting))
var/armor_block = target.run_armor_check(affecting, "melee")
- if(HULK in user.mutations)
- target.adjustBruteLoss(15)
-
playsound(target.loc, attack.attack_sound, 25, 1, -1)
target.visible_message("[user] [pick(attack.attack_verb)]ed [target]!")
@@ -395,8 +392,8 @@
if(attacker_style && attacker_style.disarm_act(user, target))
return 1
else
- add_attack_logs(user, target, "Disarmed", admin_notify = FALSE)
- user.do_attack_animation(target)
+ add_attack_logs(user, target, "Disarmed", ATKLOG_ALL)
+ user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
if(target.w_uniform)
target.w_uniform.add_fingerprint(user)
var/obj/item/organ/external/affecting = target.get_organ(ran_zone(user.zone_sel.selecting))
@@ -405,7 +402,7 @@
target.apply_effect(2, WEAKEN, target.run_armor_check(affecting, "melee"))
playsound(target.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
target.visible_message("[user] has pushed [target]!")
- add_attack_logs(user, target, "Pushed over", admin_notify = FALSE)
+ add_attack_logs(user, target, "Pushed over", ATKLOG_ALL)
if(!iscarbon(user))
target.LAssailant = null
else
@@ -500,17 +497,12 @@
//Species unarmed attacks
/datum/unarmed_attack
- var/attack_verb = list("attack") // Empty hand hurt intent verb.
+ var/attack_verb = list("punch") // Empty hand hurt intent verb.
var/damage = 0 // How much flat bonus damage an attack will do. This is a *bonus* guaranteed damage amount on top of the random damage attacks do.
var/attack_sound = "punch"
var/miss_sound = 'sound/weapons/punchmiss.ogg'
- var/sharp = 0
-
-/datum/unarmed_attack/punch
- attack_verb = list("punch")
-
-/datum/unarmed_attack/punch/weak
- attack_verb = list("flail")
+ var/sharp = FALSE
+ var/animation_type = ATTACK_EFFECT_PUNCH
/datum/unarmed_attack/diona
attack_verb = list("lash", "bludgeon")
@@ -519,7 +511,14 @@
attack_verb = list("scratch", "claw")
attack_sound = 'sound/weapons/slice.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
- sharp = 1
+ sharp = TRUE
+ animation_type = ATTACK_EFFECT_CLAW
+
+/datum/unarmed_attack/bite
+ attack_verb = list("chomp")
+ attack_sound = 'sound/weapons/bite.ogg'
+ sharp = TRUE
+ animation_type = ATTACK_EFFECT_BITE
/datum/unarmed_attack/claws/armalis
attack_verb = list("slash", "claw")
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index 05e989afa50..6b692601226 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -10,7 +10,6 @@
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_SKIN_TONE | HAS_BODY_MARKINGS
dietflags = DIET_OMNI
- unarmed_type = /datum/unarmed_attack/punch
blurb = "Humanity originated in the Sol system, and over the last five centuries has spread \
colonies across a wide swathe of space. They hold a wide range of forms and creeds.
\
While the central Sol government maintains control of its far-flung people, powerful corporate \
@@ -237,7 +236,6 @@
default_language = "Galactic Common"
language = "Skrellian"
primitive_form = "Neara"
- unarmed_type = /datum/unarmed_attack/punch
blurb = "An amphibious species, Skrell come from the star system known as Qerr'Vallis, which translates to 'Star of \
the royals' or 'Light of the Crown'.
Skrell are a highly advanced and logical race who live under the rule \
@@ -546,7 +544,6 @@
icobase = 'icons/mob/human_races/r_slime.dmi'
deform = 'icons/mob/human_races/r_slime.dmi'
path = /mob/living/carbon/human/slime
- unarmed_type = /datum/unarmed_attack/punch
remains_type = /obj/effect/decal/remains/slime
// More sensitive to the cold
@@ -690,7 +687,7 @@
var/limb_select = input(src, "Choose a limb to regrow", "Limb Regrowth") as null|anything in missing_limbs
var/chosen_limb = missing_limbs[limb_select]
- visible_message("[src] begins to hold still and concentrate on their missing [limb_select]...", "You begin to focus on regrowing your missing [limb_select]... (This will take [round(SLIMEPERSON_REGROWTHDELAY/10)] seconds, and you must hold still.)")
+ visible_message("[src] begins to hold still and concentrate on [p_their()] missing [limb_select]...", "You begin to focus on regrowing your missing [limb_select]... (This will take [round(SLIMEPERSON_REGROWTHDELAY/10)] seconds, and you must hold still.)")
if(do_after(src, SLIMEPERSON_REGROWTHDELAY, needhand=0, target = src))
if(stat || paralysis || stunned)
to_chat(src, "You cannot regenerate missing limbs in your current state.")
@@ -728,7 +725,7 @@
updatehealth()
UpdateDamageIcon()
nutrition -= SLIMEPERSON_HUNGERCOST
- visible_message("[src] finishes regrowing their missing [new_limb]!", "You finish regrowing your [limb_select]")
+ visible_message("[src] finishes regrowing [p_their()] missing [new_limb]!", "You finish regrowing your [limb_select]")
else
to_chat(src, "You need to hold still in order to regrow a limb!")
return
@@ -749,7 +746,6 @@
deform = 'icons/mob/human_races/r_def_grey.dmi'
default_language = "Galactic Common"
language = "Psionic Communication"
- unarmed_type = /datum/unarmed_attack/punch
eyes = "grey_eyes_s"
butt_sprite = "grey"
@@ -931,7 +927,6 @@
path = /mob/living/carbon/human/machine
default_language = "Galactic Common"
language = "Trinary"
- unarmed_type = /datum/unarmed_attack/punch
remains_type = /obj/effect/decal/remains/robot
eyes = "blank_eyes"
@@ -1015,7 +1010,6 @@
path = /mob/living/carbon/human/drask
default_language = "Galactic Common"
language = "Orluum"
- unarmed_type = /datum/unarmed_attack/punch
eyes = "drask_eyes_s"
speech_sounds = list('sound/voice/DraskTalk.ogg')
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index ec7592d4d3f..328e4c14ab8 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -205,7 +205,7 @@ var/global/list/damage_icon_parts = list()
DI = damage_icon_parts[cache_index]
standing_image.overlays += DI
- overlays_standing[DAMAGE_LAYER] = standing_image
+ overlays_standing[H_DAMAGE_LAYER] = standing_image
if(update_icons) update_icons()
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index f61c5431fab..3023d6538a8 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/Life()
+/mob/living/carbon/Life(seconds, times_fired)
set invisibility = 0
set background = BACKGROUND_ENABLED
@@ -14,7 +14,7 @@
O.on_life()
handle_changeling()
- handle_wetness()
+ handle_wetness(times_fired)
// Increase germ_level regularly
if(germ_level < GERM_LEVEL_AMBIENT && prob(30)) //if you're just standing there, you shouldn't get more germs beyond an ambient level
@@ -26,8 +26,8 @@
///////////////
//Start of a breath chain, calls breathe()
-/mob/living/carbon/handle_breathing()
- if(mob_master.current_cycle % 4 == 2 || failed_last_breath)
+/mob/living/carbon/handle_breathing(times_fired)
+ if(times_fired % 4 == 2 || failed_last_breath)
breathe() //Breathe per 4 ticks, unless suffocating
else
if(istype(loc, /obj/))
@@ -241,11 +241,11 @@
reagents.metabolize(src)
-/mob/living/carbon/proc/handle_wetness()
- if(mob_master.current_cycle%20==2) //dry off a bit once every 20 ticks or so
+/mob/living/carbon/proc/handle_wetness(times_fired)
+ if(times_fired % 20==2) //dry off a bit once every 20 ticks or so
wetlevel = max(wetlevel - 1,0)
-/mob/living/carbon/handle_stomach()
+/mob/living/carbon/handle_stomach(times_fired)
for(var/mob/living/M in stomach_contents)
if(M.loc != src)
stomach_contents.Remove(M)
@@ -255,7 +255,7 @@
stomach_contents.Remove(M)
qdel(M)
continue
- if(mob_master.current_cycle%3==1)
+ if(times_fired % 3 == 1)
M.adjustBruteLoss(5)
nutrition += 10
diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm
index ced452ab652..80ed9fdbffd 100644
--- a/code/modules/mob/living/carbon/slime/life.dm
+++ b/code/modules/mob/living/carbon/slime/life.dm
@@ -5,7 +5,7 @@
var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while
var/SStun = 0 // stun variable
-/mob/living/carbon/slime/Life()
+/mob/living/carbon/slime/Life(seconds, times_fired)
if(..())
handle_nutrition()
handle_targets()
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index ecb233a2ebf..506cc804bd3 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -234,8 +234,27 @@
adjustBruteLoss(damage)
updatehealth()
+/mob/living/carbon/slime/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM)
+ if(Victim || Target)
+ Victim = null
+ Target = null
+ anchored = 0
+ if(prob(80) && !client)
+ Discipline++
+ spawn(0)
+ step_away(src, user, 15)
+ sleep(3)
+ step_away(src, user, 15)
+ ..(user, TRUE)
+ playsound(loc, "punch", 25, 1, -1)
+ visible_message("[user] has punched [src]!", "[user] has punched [src]!")
+ adjustBruteLoss(15)
+ return TRUE
+
/mob/living/carbon/slime/attack_hand(mob/living/carbon/human/M)
if(Victim)
+ M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
if(Victim == M)
if(prob(60))
visible_message("[M] attempts to wrestle \the [name] off!")
@@ -259,7 +278,6 @@
return
else
- M.do_attack_animation(src)
if(prob(30))
visible_message("[M] attempts to wrestle \the [name] off of [Victim]!")
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
@@ -297,24 +315,10 @@
grabbedby(M)
else
- M.do_attack_animation(src)
+ M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
var/damage = rand(1, 9)
attacked += 10
if(prob(90))
- if(HULK in M.mutations)
- damage += 15
- if(Victim || Target)
- Victim = null
- Target = null
- anchored = 0
- if(prob(80) && !client)
- Discipline++
- spawn(0)
- step_away(src,M,15)
- sleep(3)
- step_away(src,M,15)
-
-
playsound(loc, "punch", 25, 1, -1)
add_attack_logs(M, src, "Melee attacked with fists")
visible_message("[M] has punched [src]!", \
diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
index d850caf658f..d9c7a9f12ef 100644
--- a/code/modules/mob/living/carbon/superheroes.dm
+++ b/code/modules/mob/living/carbon/superheroes.dm
@@ -188,15 +188,15 @@
switch(progress)
if(1)
to_chat(user, "You begin by introducing yourself and explaining what you're about.")
- user.visible_message("[user] introduces \himself and explains \his plans.")
+ user.visible_message("[user] introduces [user.p_them()]self and explains [user.p_their()] plans.")
if(2)
to_chat(user, "You begin the recruitment of [target].")
- user.visible_message("[user] leans over towards [target], whispering excitedly as he gives a speech.")
+ user.visible_message("[user] leans over towards [target], whispering excitedly as [user.p_they()] give[user.p_s()] a speech.")
to_chat(target, "You feel yourself agreeing with [user], and a surge of loyalty begins building.")
target.Weaken(12)
sleep(20)
if(ismindshielded(target))
- to_chat(user, "They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear.")
+ to_chat(user, "[target.p_they(TRUE)] are enslaved by Nanotrasen. You feel [target.p_their()] interest in your cause wane and disappear.")
user.visible_message("[user] stops talking for a moment, then moves back away from [target].")
to_chat(target, "Your mindshield implant activates, protecting you from conversion.")
return
@@ -214,7 +214,7 @@
recruiting = 0
to_chat(user, "You have recruited [target] as your henchman!")
to_chat(target, "You have decided to enroll as a henchman for [user]. You are now part of the feared 'Greyshirts'.")
- to_chat(target, "You must follow the orders of [user], and help him succeed in \his dastardly schemes.")
+ to_chat(target, "You must follow the orders of [user], and help [user.p_them()] succeed in [user.p_their()] dastardly schemes.")
to_chat(target, "You may not harm other Greyshirt or [user]. However, you do not need to obey other Greyshirts.")
ticker.mode.greyshirts += target.mind
target.set_species("Human")
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 8c414636349..f02065b3a0a 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -1,4 +1,4 @@
-/mob/living/Life()
+/mob/living/Life(seconds, times_fired)
set invisibility = 0
set background = BACKGROUND_ENABLED
@@ -22,7 +22,7 @@
handle_mutations_and_radiation()
//Breathing, if applicable
- handle_breathing()
+ handle_breathing(times_fired)
//Random events (vomiting etc)
handle_random_events()
@@ -38,7 +38,7 @@
handle_fire()
//stuff in the stomach
- handle_stomach()
+ handle_stomach(times_fired)
update_gravity(mob_has_gravity())
@@ -61,7 +61,7 @@
..()
-/mob/living/proc/handle_breathing()
+/mob/living/proc/handle_breathing(times_fired)
return
/mob/living/proc/handle_mutations_and_radiation()
@@ -80,7 +80,7 @@
/mob/living/proc/handle_environment(datum/gas_mixture/environment)
return
-/mob/living/proc/handle_stomach()
+/mob/living/proc/handle_stomach(times_fired)
return
/mob/living/proc/update_pulling()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 4f3265fc619..bff49e7c527 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -137,10 +137,12 @@
if(!AM.anchored)
now_pushing = 1
var/t = get_dir(src, AM)
- if(istype(AM, /obj/structure/window/full))
- for(var/obj/structure/window/win in get_step(AM, t))
- now_pushing = 0
- return
+ if(istype(AM, /obj/structure/window))
+ var/obj/structure/window/W = AM
+ if(W.fulltile)
+ for(var/obj/structure/window/win in get_step(W, t))
+ now_pushing = 0
+ return
if(pulling == AM)
stop_pulling()
var/current_dir
@@ -816,7 +818,7 @@
who.unEquip(what)
if(silent)
put_in_hands(what)
- add_attack_logs(src, who, "Stripped of [what]", isLivingSSD(who))
+ add_attack_logs(src, who, "Stripped of [what]")
// The src mob is trying to place an item on someone
// Override if a certain mob should be behave differently when placing items (can't, for example)
@@ -835,8 +837,7 @@
if(what && Adjacent(who))
unEquip(what)
who.equip_to_slot_if_possible(what, where, 0, 1)
- add_attack_logs(src, who, "Equipped [what]", isLivingSSD(who))
-
+ add_attack_logs(src, who, "Equipped [what]")
/mob/living/singularity_act()
var/gain = 20
@@ -852,81 +853,11 @@
makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, src, null, 1)
spawn_dust()
gib()
- return
-/atom/movable/proc/do_attack_animation(atom/A, end_pixel_y)
- var/pixel_x_diff = 0
- var/pixel_y_diff = 0
- var/final_pixel_y = initial(pixel_y)
- if(end_pixel_y)
- final_pixel_y = end_pixel_y
-
- var/direction = get_dir(src, A)
- if(direction & NORTH)
- pixel_y_diff = 8
- else if(direction & SOUTH)
- pixel_y_diff = -8
-
- if(direction & EAST)
- pixel_x_diff = 8
- else if(direction & WEST)
- pixel_x_diff = -8
-
- animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
- animate(pixel_x = initial(pixel_x), pixel_y = final_pixel_y, time = 2)
-
-
-/mob/living/do_attack_animation(atom/A)
- var/final_pixel_y = get_standard_pixel_y_offset(lying)
- ..(A, final_pixel_y)
- floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement.
-
- // What icon do we use for the attack?
- var/image/I
- if(hand && l_hand) // Attacked with item in left hand.
- I = image(l_hand.icon, A, l_hand.icon_state, A.layer + 1)
- else if(!hand && r_hand) // Attacked with item in right hand.
- I = image(r_hand.icon, A, r_hand.icon_state, A.layer + 1)
- else // Attacked with a fist?
- return
-
- // Who can see the attack?
- var/list/viewing = list()
- for(var/mob/M in viewers(A))
- if(M.client && M.client.prefs.show_ghostitem_attack)
- viewing |= M.client
- flick_overlay(I, viewing, 5) // 5 ticks/half a second
-
- // Scale the icon.
- I.transform *= 0.75
- // The icon should not rotate.
- I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
-
- // Set the direction of the icon animation.
- var/direction = get_dir(src, A)
- if(direction & NORTH)
- I.pixel_y = -16
- else if(direction & SOUTH)
- I.pixel_y = 16
-
- if(direction & EAST)
- I.pixel_x = -16
- else if(direction & WEST)
- I.pixel_x = 16
-
- if(!direction) // Attacked self?!
- I.pixel_z = 16
-
- // And animate the attack!
- animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3)
-
-/atom/movable/proc/receiving_damage(atom/A)
- var/pixel_x_diff = rand(-3,3)
- var/pixel_y_diff = rand(-3,3)
- animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
- animate(pixel_x = initial(pixel_x), pixel_y = initial(pixel_y), time = 2)
-
-/mob/living/receiving_damage(atom/A)
+/mob/living/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect, end_pixel_y)
+ end_pixel_y = get_standard_pixel_y_offset(lying)
+ if(!used_item)
+ used_item = get_active_hand()
..()
floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement.
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 38065ac1f2c..aaeb26fe2c6 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -129,7 +129,7 @@
add_attack_logs(M.occupant, src, "Mecha-meleed with [M]")
else
step_away(src,M)
- add_attack_logs(M.occupant, src, "Mecha-pushed with [M]", FALSE)
+ add_attack_logs(M.occupant, src, "Mecha-pushed with [M]", ATKLOG_ALL)
M.occupant_message("You push [src] out of the way.")
visible_message("[M] pushes [src] out of the way.")
return
@@ -240,11 +240,11 @@
to_chat(user, "You already grabbed [src].")
return
- add_attack_logs(user, src, "Grabbed passively", admin_notify = FALSE)
+ add_attack_logs(user, src, "Grabbed passively", ATKLOG_ALL)
var/obj/item/grab/G = new /obj/item/grab(user, src)
if(buckled)
- to_chat(user, "You cannot grab [src], \he is buckled in!")
+ to_chat(user, "You cannot grab [src]; [p_they()] [p_are()] buckled in!")
if(!G) //the grab will delete itself in New if src is anchored
return 0
user.put_in_active_hand(G)
@@ -333,6 +333,9 @@
if(INTENT_GRAB)
grabbedby(M)
return FALSE
- else
+ if(INTENT_HARM)
M.do_attack_animation(src)
return TRUE
+ if(INTENT_DISARM)
+ M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
+ return TRUE
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index b2755e2b7d8..55e8536cd10 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -164,10 +164,10 @@ proc/get_radio_key_from_channel(var/channel)
if(is_muzzled())
var/obj/item/clothing/mask/muzzle/G = wear_mask
- if(G.mute == MUTE_ALL) //if the mask is supposed to mute you completely or just muffle you
+ if(G.mute == MUZZLE_MUTE_ALL) //if the mask is supposed to mute you completely or just muffle you
to_chat(src, "You're muzzled and cannot speak!")
return
- else if(G.mute == MUTE_MUFFLE)
+ else if(G.mute == MUZZLE_MUTE_MUFFLE)
message = muffledspeech(message)
verb = "mumbles"
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 09b62f1c89c..bf11356b3a5 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -87,11 +87,12 @@ var/list/ai_verbs_default = list(
var/mob/living/simple_animal/bot/Bot
var/turf/waypoint //Holds the turf of the currently selected waypoint.
var/waypoint_mode = 0 //Waypoint mode is for selecting a turf via clicking.
+ var/apc_override = FALSE //hack for letting the AI use its APC even when visionless
var/nuking = 0
var/obj/machinery/doomsday_device/doomsday_device
var/obj/machinery/hologram/holopad/holo = null
- var/mob/camera/aiEye/eyeobj = new()
+ var/mob/camera/aiEye/eyeobj
var/sprint = 10
var/cooldown = 0
var/acceleration = 1
@@ -191,9 +192,7 @@ var/list/ai_verbs_default = list(
spawn(5)
new /obj/machinery/ai_powersupply(src)
- eyeobj.ai = src
- eyeobj.name = "[src.name] (AI Eye)" // Give it a name
- eyeobj.loc = src.loc
+ create_eye()
builtInCamera = new /obj/machinery/camera/portable(src)
builtInCamera.c_tag = name
@@ -1163,6 +1162,17 @@ var/list/ai_verbs_default = list(
client.eye = eyeobj
return TRUE
+
+/mob/living/silicon/ai/proc/can_see(atom/A)
+ if(isturf(loc)) //AI in core, check if on cameras
+ //get_turf_pixel() is because APCs in maint aren't actually in view of the inner camera
+ //apc_override is needed here because AIs use their own APC when depowered
+ return (cameranet && cameranet.checkTurfVis(get_turf_pixel(A))) || apc_override
+ //AI is carded/shunted
+ //view(src) returns nothing for carded/shunted AIs and they have x-ray vision so just use get_dist
+ var/list/viewscale = getviewsize(client.view)
+ return get_dist(src, A) <= max(viewscale[1]*0.5,viewscale[2]*0.5)
+
/mob/living/silicon/ai/proc/relay_speech(mob/living/M, text, verb, datum/language/speaking)
if(!say_understands(M, speaking))//The AI will be able to understand most mobs talking through the holopad.
if(speaking)
diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
index eeeeed8e8bb..6737be463d6 100644
--- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
@@ -28,7 +28,7 @@
eye.visibleCameraChunks += src
visible++
seenby += eye
- if(changed && !updating)
+ if(changed)
update()
// Remove an AI eye from the chunk, then update if changed.
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 71a2e6cba36..2728a1af55e 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -20,7 +20,6 @@
// It will also stream the chunk that the new loc is in.
/mob/camera/aiEye/setLoc(T)
-
if(ai)
if(!isturf(ai.loc))
return
@@ -30,8 +29,9 @@
if(ai.client)
ai.client.eye = src
//Holopad
- if(ai.holo)
- ai.holo.move_hologram()
+ if(istype(ai.current, /obj/machinery/hologram/holopad))
+ var/obj/machinery/hologram/holopad/H = ai.current
+ H.move_hologram(ai, T)
/mob/camera/aiEye/Move()
return 0
@@ -41,8 +41,22 @@
return ai.client
return null
+
+/mob/camera/aiEye/proc/RemoveImages()
+ var/client/C = GetViewerClient()
+ if(C)
+ for(var/V in visibleCameraChunks)
+ var/datum/camerachunk/chunk = V
+ C.images -= chunk.obscured
+
+
/mob/camera/aiEye/Destroy()
- ai = null
+ if(ai)
+ //ai.all_eyes -= src
+ ai = null
+ for(var/V in visibleCameraChunks)
+ var/datum/camerachunk/chunk = V
+ chunk.remove(src)
return ..()
/atom/proc/move_camera_by_click()
@@ -102,12 +116,18 @@
src.eyeobj.loc = src.loc
else
to_chat(src, "ERROR: Eyeobj not found. Creating new eye...")
- src.eyeobj = new(src.loc)
- src.eyeobj.ai = src
- src.eyeobj.name = "[src.name] (AI Eye)" // Give it a name
+ create_eye()
eyeobj.setLoc(loc)
+/mob/living/silicon/ai/proc/create_eye()
+ if(eyeobj)
+ return
+ eyeobj = new /mob/camera/aiEye()
+ eyeobj.ai = src
+ eyeobj.setLoc(loc)
+ eyeobj.name = "[name] (AI Eye)"
+
/mob/living/silicon/ai/proc/toggle_acceleration()
set category = "AI Commands"
set name = "Toggle Camera Acceleration"
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index a6a043a8945..42f132e39d4 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -3,7 +3,7 @@
#define POWER_RESTORATION_SEARCH_APC 2
#define POWER_RESTORATION_APC_FOUND 3
-/mob/living/silicon/ai/Life()
+/mob/living/silicon/ai/Life(seconds, times_fired)
//doesn't call parent because it's a horrible mess
if(stat == DEAD)
return
@@ -129,8 +129,10 @@
to_chat(src, "Receiving control information from APC.")
sleep(2)
//bring up APC dialog
- aiRestorePowerRoutine = 3
+ apc_override = 1
theAPC.attack_ai(src)
+ apc_override = 0
+ aiRestorePowerRoutine = 3
to_chat(src, "Here are your current laws:")
src.show_laws() //WHY THE FUCK IS THIS HERE
sleep(50)
diff --git a/code/modules/mob/living/silicon/decoy/life.dm b/code/modules/mob/living/silicon/decoy/life.dm
index ade3c535506..353bf4259ff 100644
--- a/code/modules/mob/living/silicon/decoy/life.dm
+++ b/code/modules/mob/living/silicon/decoy/life.dm
@@ -1,4 +1,4 @@
-/mob/living/silicon/decoy/Life()
+/mob/living/silicon/decoy/Life(seconds, times_fired)
if(src.stat == 2)
return
else
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index ec40dff7739..abcfc6bd643 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -1,4 +1,4 @@
-/mob/living/silicon/pai/Life()
+/mob/living/silicon/pai/Life(seconds, times_fired)
. = ..()
if(.)
//if(secHUD == 1)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 54ebdaf4da2..d24518d4888 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -599,7 +599,7 @@
var/mob/living/carbon/human/H = over_object //changed to human to avoid stupid issues like xenos holding pAIs.
if(!istype(H) || !Adjacent(H)) return ..()
if(usr == src)
- switch(alert(H, "[src] wants you to pick them up. Do it?",,"Yes","No"))
+ switch(alert(H, "[src] wants you to pick [p_them()] up. Do it?",,"Yes","No"))
if("Yes")
if(Adjacent(H))
get_scooped(H)
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 32bef5d7494..bf9e4eeab0d 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -71,7 +71,7 @@
if(answer == "Yes")
var/turf/T = get_turf_or_move(P.loc)
for(var/mob/v in viewers(T))
- v.show_message("[M] presses \his thumb against [P].", 3, "[P] makes a sharp clicking sound as it extracts DNA material from [M].", 2)
+ v.show_message("[M] presses [M.p_their()] thumb against [P].", 3, "[P] makes a sharp clicking sound as it extracts DNA material from [M].", 2)
var/datum/dna/dna = M.dna
to_chat(P, "
[M]'s UE string : [dna.unique_enzymes]
")
if(dna.unique_enzymes == P.master_dna)
@@ -79,7 +79,7 @@
else
to_chat(P, "DNA does not match stored Master DNA.")
else
- to_chat(P, "[M] does not seem like \he is going to provide a DNA sample willingly.")
+ to_chat(P, "[M] does not seem like [M.p_they()] [M.p_are()] going to provide a DNA sample willingly.")
return 1
/datum/pai_software/radio_config
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index bd06f7045ae..aaaeb15b283 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -142,7 +142,7 @@
to_chat(usr, "The reboot system is currently offline. Please wait another [cooldown_time] seconds.")
return
- user.visible_message("\the [user] swipes \his ID card through \the [src], attempting to reboot it.", "You swipe your ID card through \the [src], attempting to reboot it.")
+ user.visible_message("\the [user] swipes [user.p_their()] ID card through [src], attempting to reboot it.", "You swipe your ID card through [src], attempting to reboot it.")
last_reboot = world.time / 10
var/drones = 0
for(var/mob/living/silicon/robot/drone/D in world)
@@ -153,7 +153,7 @@
return
else
- user.visible_message("\the [user] swipes \his ID card through \the [src], attempting to shut it down.", "You swipe your ID card through \the [src], attempting to shut it down.")
+ user.visible_message("\the [user] swipes [user.p_their()] ID card through [src], attempting to shut it down.", "You swipe your ID card through \the [src], attempting to shut it down.")
if(emagged)
return
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index d0733547cc8..adf6e2f7682 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -146,7 +146,7 @@
wrapped = A.cell
A.cell.add_fingerprint(user)
- A.cell.updateicon()
+ A.cell.update_icon()
A.cell.forceMove(src)
A.cell = null
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index f42f19b67fa..afa10c1772b 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -1,4 +1,4 @@
-/mob/living/silicon/robot/Life()
+/mob/living/silicon/robot/Life(seconds, times_fired)
set invisibility = 0
set background = BACKGROUND_ENABLED
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 701909d87ea..5fb42f5f121 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -52,6 +52,9 @@ var/list/robot_verbs_default = list(
var/custom_panel = null
var/list/custom_panel_names = list("Cricket")
var/emagged = 0
+ var/is_emaggable = TRUE
+ var/eye_protection = 0
+ var/ear_protection = 0
var/list/force_modules = list()
var/allow_rename = TRUE
@@ -762,7 +765,9 @@ var/list/robot_verbs_default = list(
return
var/mob/living/M = user
if(!opened)//Cover is closed
- if(locked)
+ if(!is_emaggable)
+ to_chat(user, "The emag sparks, and flashes red. This mechanism does not appear to be emaggable.")
+ else if(locked)
to_chat(user, "You emag the cover lock.")
locked = 0
else
@@ -789,7 +794,7 @@ var/list/robot_verbs_default = list(
laws = new /datum/ai_laws/syndicate_override
var/time = time2text(world.realtime,"hh:mm:ss")
lawchanges.Add("[time] : [M.name]([M.key]) emagged [name]([key])")
- set_zeroth_law("Only [M.real_name] and people he designates as being such are Syndicate Agents.")
+ set_zeroth_law("Only [M.real_name] and people [M.p_they()] designate[M.p_s()] as being such are Syndicate Agents.")
to_chat(src, "ALERT: Foreign software detected.")
sleep(5)
to_chat(src, "Initiating diagnostics...")
@@ -805,7 +810,7 @@ var/list/robot_verbs_default = list(
to_chat(src, "ERRORERRORERROR")
to_chat(src, "Obey these laws:")
laws.show_laws(src)
- to_chat(src, "ALERT: [M.real_name] is your new master. Obey your new laws and his commands.")
+ to_chat(src, "ALERT: [M.real_name] is your new master. Obey your new laws and [M.p_their()] commands.")
SetLockdown(0)
if(src.module && istype(src.module, /obj/item/robot_module/miner))
for(var/obj/item/pickaxe/drill/cyborg/D in src.module.modules)
@@ -878,9 +883,10 @@ var/list/robot_verbs_default = list(
icon_state = "[base_icon]-roll"
else
icon_state = base_icon
- for(var/obj/item/borg/combat/shield/S in module.modules)
- if(activated(S))
- overlays += "[base_icon]-shield"
+ if(module)
+ for(var/obj/item/borg/combat/shield/S in module.modules)
+ if(activated(S))
+ overlays += "[base_icon]-shield"
update_fire()
/mob/living/silicon/robot/proc/installed_modules()
@@ -1241,16 +1247,19 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/deathsquad
base_icon = "nano_bloodhound"
icon_state = "nano_bloodhound"
+ designation = "SpecOps"
lawupdate = 0
scrambledcodes = 1
- pdahide = 1
- modtype = "Commando"
- faction = list("nanotrasen")
- designation = "Nanotrasen Combat"
req_access = list(access_cent_specops)
ionpulse = 1
magpulse = 1
- var/searching_for_ckey = 0
+ pdahide = 1
+ eye_protection = 2 // Immunity to flashes and the visual part of flashbangs
+ ear_protection = 1 // Immunity to the audio part of flashbangs
+ allow_rename = FALSE
+ modtype = "Commando"
+ faction = list("nanotrasen")
+ is_emaggable = FALSE
/mob/living/silicon/robot/deathsquad/New(loc)
..()
@@ -1267,26 +1276,7 @@ var/list/robot_verbs_default = list(
playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0)
-/mob/living/silicon/robot/deathsquad/attack_hand(mob/user)
- if(isnull(ckey) && !searching_for_ckey)
- searching_for_ckey = 1
- to_chat(user, "Now checking for possible borgs.")
- var/list/borg_candidates = pollCandidates("Do you want to play as a Nanotrasen Combat borg?")
- if(borg_candidates.len > 0 && isnull(ckey))
- searching_for_ckey = 0
- var/mob/M = pick(borg_candidates)
- M.mind.transfer_to(src)
- M.mind.assigned_role = "MODE"
- M.mind.special_role = SPECIAL_ROLE_DEATHSQUAD
- ticker.mode.traitors |= M.mind // Adds them to current traitor list. Which is really the extra antagonist list.
- key = M.key
- else
- searching_for_ckey = 0
- to_chat(user, "Unable to connect to Central Command. Please wait and try again later.")
- return
- else
- to_chat(user, "[src] is already checking for possible borgs.")
- return
+
/mob/living/silicon/robot/syndicate
base_icon = "syndie_bloodhound"
@@ -1392,7 +1382,7 @@ var/list/robot_verbs_default = list(
mind = new
mind.current = src
mind.original = src
- mind.assigned_role = "MODE"
+ mind.assigned_role = SPECIAL_ROLE_ERT
mind.special_role = SPECIAL_ROLE_ERT
if(cyborg_unlock)
crisis = 1
@@ -1447,3 +1437,9 @@ var/list/robot_verbs_default = list(
var/static/all_borg_icon_states = icon_states('icons/mob/custom_synthetic/custom-synthetic.dmi')
if(spritename in all_borg_icon_states)
. = TRUE
+
+/mob/living/silicon/robot/check_eye_prot()
+ return eye_protection
+
+/mob/living/silicon/robot/check_ear_prot()
+ return ear_protection
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 033b244cf8c..e18ca8d6a17 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -1,7 +1,7 @@
/mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M)
if(M.a_intent == INTENT_DISARM)
if(!lying)
- M.do_attack_animation(src)
+ M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
if(prob(85))
Stun(7)
step(src, get_dir(M,src))
@@ -42,7 +42,7 @@
if(opened && !wiresexposed && !issilicon(user))
if(cell)
- cell.updateicon()
+ cell.update_icon()
cell.add_fingerprint(user)
user.put_in_active_hand(cell)
to_chat(user, "You remove \the [cell].")
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index f549c07b66a..e9aadf5086a 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -198,7 +198,7 @@
modules += new /obj/item/multitool/cyborg(src)
modules += new /obj/item/t_scanner(src)
modules += new /obj/item/analyzer(src)
- modules += new /obj/item/taperoll/engineering(src)
+ modules += new /obj/item/holosign_creator/engineering(src)
modules += new /obj/item/gripper(src)
modules += new /obj/item/matter_decompiler(src)
modules += new /obj/item/floor_painter(src)
@@ -222,7 +222,7 @@
modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg(src)
modules += new /obj/item/melee/baton/loaded(src)
modules += new /obj/item/gun/energy/disabler/cyborg(src)
- modules += new /obj/item/taperoll/police(src)
+ modules += new /obj/item/holosign_creator/security(src)
modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
emag = new /obj/item/gun/energy/laser/cyborg(src)
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index 0de811224dc..0a3ed47b933 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -74,8 +74,8 @@
if(!message)
return
- var/obj/machinery/hologram/holopad/T = src.holo
- if(T && T.hologram && T.master == src)//If there is a hologram and its master is the user.
+ var/obj/machinery/hologram/holopad/T = current
+ if(istype(T) && T.masters[src])
//Human-like, sorta, heard by those who understand humans.
var/rendered_a
@@ -112,8 +112,8 @@
if(!message)
return
- var/obj/machinery/hologram/holopad/T = src.holo
- if(T && T.hologram && T.master == src)
+ var/obj/machinery/hologram/holopad/T = current
+ if(istype(T) && T.masters[src])
var/rendered = "[name][message]"
to_chat(src, "Holopad action relayed, [real_name][message]")
@@ -127,8 +127,8 @@
return 1
/mob/living/silicon/ai/emote(var/act, var/type, var/message)
- var/obj/machinery/hologram/holopad/T = src.holo
- if(T && T.hologram && T.master == src) //Is the AI using a holopad?
+ var/obj/machinery/hologram/holopad/T = current
+ if(istype(T) && T.masters[src])//Is the AI using a holopad?
src.holopad_emote(message)
else //Emote normally, then.
..()
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index 480c9442bd7..a903b6999dc 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -41,6 +41,15 @@
if(L.a_intent == INTENT_HELP)
visible_message("[L.name] rubs its head against [src].")
+/mob/living/silicon/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM)
+ ..(user, TRUE)
+ adjustBruteLoss(rand(10, 15))
+ playsound(loc, "punch", 25, 1, -1)
+ visible_message("[user] has punched [src]!", "[user] has punched [src]!")
+ return TRUE
+ return FALSE
+
/mob/living/silicon/attack_hand(mob/living/carbon/human/M)
switch(M.a_intent)
if(INTENT_HELP)
@@ -49,17 +58,8 @@
if("grab")
grabbedby(M)
else
- M.do_attack_animation(src)
+ M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
playsound(loc, 'sound/effects/bang.ogg', 10, 1)
- if(HULK in M.mutations)
- var/damage = rand(10,15)
- adjustBruteLoss(damage)
- add_attack_logs(M, src, "Melee attacked with fists")
- playsound(loc, "punch", 25, 1, -1)
- visible_message("[M] has punched [src]!", \
- "[M] has punched [src]!")
- return 1
- else
- visible_message("[M] punches [src], but doesn't leave a dent.", \
+ visible_message("[M] punches [src], but doesn't leave a dent.", \
"[M] punches [src], but doesn't leave a dent.!")
- return 0
+ return FALSE
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index b122decd322..309a13468a3 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -11,7 +11,7 @@
grabbedby(M)
if(INTENT_HARM, INTENT_DISARM)
- M.do_attack_animation(src)
+ M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
visible_message("[M] [response_harm] [src]!")
playsound(loc, "punch", 25, 1, -1)
attack_threshold_check(harm_intent_damage)
@@ -19,6 +19,14 @@
updatehealth()
return 1
+/mob/living/simple_animal/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM)
+ ..(user, TRUE)
+ playsound(loc, "punch", 25, 1, -1)
+ visible_message("[user] has punched [src]!", "[user] has punched [src]!")
+ adjustBruteLoss(15)
+ return TRUE
+
/mob/living/simple_animal/attack_alien(mob/living/carbon/alien/humanoid/M)
if(..()) //if harm or disarm intent.
var/damage = rand(15, 30)
@@ -58,3 +66,11 @@
visible_message("[src] looks unharmed.")
else
apply_damage(damage, damagetype)
+
+/mob/living/simple_animal/do_attack_animation(atom/A, visual_effect_icon, used_item, no_effect, end_pixel_y)
+ if(!no_effect && !visual_effect_icon && melee_damage_upper)
+ if(melee_damage_upper < 10)
+ visual_effect_icon = ATTACK_EFFECT_PUNCH
+ else
+ visual_effect_icon = ATTACK_EFFECT_SMASH
+ ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 986795ccd1e..5e79c315f42 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -276,7 +276,7 @@
return
apply_damage(M.melee_damage_upper, BRUTE)
visible_message("[M] has [M.attacktext] [src]!")
- add_attack_logs(M, src, "Animal attacked", FALSE)
+ add_attack_logs(M, src, "Animal attacked", ATKLOG_ALL)
if(prob(10))
new /obj/effect/decal/cleanable/blood/oil(loc)
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 1ced2db841c..90c44f19286 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -30,9 +30,10 @@
var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if(!t)
return
- if(!in_range(src, usr) && loc != usr)
+ if(!in_range(src, user) && loc != user)
return
created_name = t
+ log_game("[key_name(user)] has renamed a robot to [t]")
//Edbot Assembly
@@ -53,9 +54,10 @@
var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if(!t)
return
- if(!in_range(src, usr) && loc != usr)
+ if(!in_range(src, user) && loc != user)
return
created_name = t
+ log_game("[key_name(user)] has renamed a robot to [t]")
return
switch(build_step)
@@ -253,10 +255,11 @@
var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if(!t)
return
- if(!in_range(src, usr) && loc != usr)
+ if(!in_range(src, user) && loc != user)
return
created_name = t
+ log_game("[key_name(user)] has renamed a robot to [t]")
/obj/item/toolbox_tiles_sensor/attackby(obj/item/W, mob/user, params)
..()
@@ -272,113 +275,110 @@
var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if(!t)
return
- if(!in_range(src, usr) && loc != usr)
+ if(!in_range(src, user) && loc != user)
return
created_name = t
+ log_game("[key_name(user)] has renamed a robot to [t]")
//Medbot Assembly
-/obj/item/firstaid_arm_assembly
- name = "incomplete medibot assembly."
- desc = "A first aid kit with a robot arm permanently grafted to it."
- icon = 'icons/obj/aibots.dmi'
- icon_state = "firstaid_arm"
- var/build_step = 0
- var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
- var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
- w_class = WEIGHT_CLASS_NORMAL
- var/treatment_brute = "salglu_solution"
- var/treatment_oxy = "salbutamol"
- var/treatment_fire = "salglu_solution"
- var/treatment_tox = "charcoal"
- var/treatment_virus = "spaceacillin"
- req_one_access = list(access_medical, access_robotics)
-
- /obj/item/firstaid_arm_assembly/New()
- ..()
- spawn(5)
- if(skin)
- overlays += image('icons/obj/aibots.dmi', "kit_skin_[skin]")
-
-/obj/item/storage/firstaid/attackby(obj/item/robot_parts/S, mob/user, params)
-
- if((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm)))
- ..()
- return
+/obj/item/storage/firstaid/attackby(obj/item/I, mob/user, params)
+ if(!istype(I, /obj/item/robot_parts/l_arm) && !istype(I, /obj/item/robot_parts/r_arm))
+ return ..()
//Making a medibot!
- if(contents.len >= 1)
+ if(contents.len)
to_chat(user, "You need to empty [src] out first!")
return
- var/obj/item/firstaid_arm_assembly/A = new /obj/item/firstaid_arm_assembly
- if(istype(src,/obj/item/storage/firstaid/fire))
- A.skin = "ointment"
- else if(istype(src,/obj/item/storage/firstaid/toxin))
- A.skin = "tox"
- else if(istype(src,/obj/item/storage/firstaid/o2))
- A.skin = "o2"
- else if(istype(src,/obj/item/storage/firstaid/brute))
- A.skin = "brute"
- else if(istype(src,/obj/item/storage/firstaid/adv))
- A.skin = "adv"
- else if(istype(src,/obj/item/storage/firstaid/tactical))
- A.skin = "bezerk"
- else if(istype(src,/obj/item/storage/firstaid/aquatic_kit))
- A.skin = "fish"
+ var/obj/item/firstaid_arm_assembly/A = new /obj/item/firstaid_arm_assembly(loc, med_bot_skin)
A.req_one_access = req_one_access
+ A.syndicate_aligned = syndicate_aligned
A.treatment_oxy = treatment_oxy
A.treatment_brute = treatment_brute
A.treatment_fire = treatment_fire
A.treatment_tox = treatment_tox
A.treatment_virus = treatment_virus
- qdel(S)
+ qdel(I)
user.put_in_hands(A)
to_chat(user, "You add the robot arm to the first aid kit.")
user.unEquip(src, 1)
qdel(src)
+/obj/item/firstaid_arm_assembly
+ name = "incomplete medibot assembly."
+ desc = "A first aid kit with a robot arm permanently grafted to it."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "firstaid_arm"
+ w_class = WEIGHT_CLASS_NORMAL
+ req_one_access = list(access_medical, access_robotics)
+ var/build_step = 0
+ var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
+ var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
+ var/syndicate_aligned = FALSE
+ var/treatment_brute = "salglu_solution"
+ var/treatment_oxy = "salbutamol"
+ var/treatment_fire = "salglu_solution"
+ var/treatment_tox = "charcoal"
+ var/treatment_virus = "spaceacillin"
-/obj/item/firstaid_arm_assembly/attackby(obj/item/W, mob/user, params)
+/obj/item/firstaid_arm_assembly/New(loc, new_skin)
..()
- if(istype(W, /obj/item/pen))
- var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
+ if(new_skin)
+ skin = new_skin
+ update_icon()
+
+/obj/item/firstaid_arm_assembly/update_icon()
+ overlays.Cut()
+ if(skin)
+ overlays += image('icons/obj/aibots.dmi', "kit_skin_[skin]")
+ if(build_step > 0)
+ overlays += image('icons/obj/aibots.dmi', "na_scanner")
+
+
+/obj/item/firstaid_arm_assembly/attackby(obj/item/I, mob/user, params)
+ ..()
+ if(istype(I, /obj/item/pen))
+ var/t = stripped_input(user, "Enter new robot name", name, created_name, MAX_NAME_LEN)
if(!t)
return
- if(!in_range(src, usr) && loc != usr)
+ if(!in_range(src, user) && loc != user)
return
created_name = t
+ log_game("[key_name(user)] has renamed a robot to [t]")
else
switch(build_step)
if(0)
- if(istype(W, /obj/item/healthanalyzer))
- if(!user.unEquip(W))
+ if(istype(I, /obj/item/healthanalyzer))
+ if(!user.drop_item())
return
- qdel(W)
+ qdel(I)
build_step++
to_chat(user, "You add the health sensor to [src].")
name = "First aid/robot arm/health analyzer assembly"
- overlays += image('icons/obj/aibots.dmi', "na_scanner")
+ update_icon()
if(1)
- if(isprox(W))
- if(!user.unEquip(W))
+ if(isprox(I))
+ if(!user.drop_item())
return
- qdel(W)
+ qdel(I)
build_step++
to_chat(user, "You complete the Medibot. Beep boop!")
var/turf/T = get_turf(src)
- var/mob/living/simple_animal/bot/medbot/S = new /mob/living/simple_animal/bot/medbot(T)
- S.skin = skin
- S.name = created_name
- S.bot_core.req_one_access = req_one_access
- S.treatment_oxy = treatment_oxy
- S.treatment_brute = treatment_brute
- S.treatment_fire = treatment_fire
- S.treatment_tox = treatment_tox
- S.treatment_virus = treatment_virus
+ if(!syndicate_aligned)
+ var/mob/living/simple_animal/bot/medbot/S = new /mob/living/simple_animal/bot/medbot(T, skin)
+ S.name = created_name
+ S.bot_core.req_one_access = req_one_access
+ S.treatment_oxy = treatment_oxy
+ S.treatment_brute = treatment_brute
+ S.treatment_fire = treatment_fire
+ S.treatment_tox = treatment_tox
+ S.treatment_virus = treatment_virus
+ else
+ new /mob/living/simple_animal/bot/medbot/syndicate(T) //Syndicate medibots are a special case that have so many unique vars on them, it's not worth passing them through construction phases
user.unEquip(src, 1)
qdel(src)
@@ -457,9 +457,10 @@
var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
if(!t)
return
- if(!in_range(src, usr) && loc != usr)
+ if(!in_range(src, user) && loc != user)
return
created_name = t
+ log_game("[key_name(user)] has renamed a robot to [t]")
else if(istype(I, /obj/item/screwdriver))
if(!build_step)
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 576ad200d5c..9d7fa39ed87 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -17,7 +17,7 @@
bot_filter = RADIO_SECBOT
model = "ED-209"
bot_purpose = "seek out criminals, handcuff them, and report their location to security"
- bot_core = /obj/machinery/bot_core/secbot
+ bot_core_type = /obj/machinery/bot_core/secbot
window_id = "autoed209"
window_name = "Automatic Security Unit v2.6"
path_image_color = "#FF0000"
@@ -61,12 +61,14 @@
shot_delay = 6//Longer shot delay because JESUS CHRIST
check_records = 0//Don't actively target people set to arrest
arrest_type = 1//Don't even try to cuff
- bot_core.req_access = list(access_maint_tunnels, access_theatre)
- arrest_type = 1
- if((lasercolor == "b") && (name == "\improper ED-209 Security Robot"))//Picks a name if there isn't already a custome one
- name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
- if((lasercolor == "r") && (name == "\improper ED-209 Security Robot"))
- name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
+ declare_arrests = 0 // Don't spam sec
+ bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics)
+
+ if(created_name == initial(name) || !created_name)
+ if(lasercolor == "b")
+ name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
+ else if (lasercolor == "r")
+ name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
//SECHUD
var/datum/atom_hud/secsensor = huds[DATA_HUD_SECURITY_ADVANCED]
@@ -94,37 +96,37 @@
/mob/living/simple_animal/bot/ed209/set_custom_texts()
text_hack = "You disable [name]'s combat inhibitor."
text_dehack = "You restore [name]'s combat inhibitor."
- text_dehack_fail = "[name] ignores your attempts to restrict him!"
+ text_dehack_fail = "[name] ignores your attempts to restrict [p_them()]!"
/mob/living/simple_animal/bot/ed209/get_controls(mob/user)
var/dat
dat += hack(user)
dat += showpai(user)
dat += text({"
-Security Unit v2.6 controls
-Status: []
-Behaviour controls are [locked ? "locked" : "unlocked"]
-Maintenance panel panel is [open ? "opened" : "closed"] "},
+ Security Unit v2.6 controls
+ Status: []
+ Behaviour controls are [locked ? "locked" : "unlocked"]
+ Maintenance panel panel is [open ? "opened" : "closed"] "},
-"[on ? "On" : "Off"]" )
+ "[on ? "On" : "Off"]" )
if(!locked || issilicon(user) || user.can_admin_interact())
+ dat += "Auto Patrol [auto_patrol ? "On" : "Off"] "
+
if(!lasercolor)
dat += text({"
-Arrest Unidentifiable Persons: []
-Arrest for Unauthorized Weapons: []
-Arrest for Warrant: []
-
-Operating Mode: []
-Report Arrests[]
-Auto Patrol[]"},
+ Arrest Unidentifiable Persons: []
+ Arrest for Unauthorized Weapons: []
+ Arrest for Warrant: []
+
+ Operating Mode: []
+ Report Arrests[] "},
-"[idcheck ? "Yes" : "No"]",
-"[weaponscheck ? "Yes" : "No"]",
-"[check_records ? "Yes" : "No"]",
-"[arrest_type ? "Detain" : "Arrest"]",
-"[declare_arrests ? "Yes" : "No"]",
-"[auto_patrol ? "On" : "Off"]" )
+ "[idcheck ? "Yes" : "No"]",
+ "[weaponscheck ? "Yes" : "No"]",
+ "[check_records ? "Yes" : "No"]",
+ "[arrest_type ? "Detain" : "Arrest"]",
+ "[declare_arrests ? "Yes" : "No"]")
return dat
@@ -239,13 +241,18 @@ Auto Patrol[]"},
if(target) // make sure target exists
if(Adjacent(target) && isturf(target.loc)) // if right next to perp
stun_attack(target)
+ if(!lasercolor)
+ mode = BOT_PREP_ARREST
+ anchored = 1
+ target_lastloc = target.loc
+ return
+ else
+ mode = BOT_HUNT
+ target = null
+ target_lastloc = null
+ return
- mode = BOT_PREP_ARREST
- anchored = 1
- target_lastloc = target.loc
- return
-
- else // not next to perp
+ else if(!disabled) // not next to perp
var/turf/olddist = get_dist(src, target)
walk_to(src, target,1,4)
if((get_dist(src, target)) >= (olddist))
@@ -406,7 +413,7 @@ Auto Patrol[]"},
shoot_sound = 'sound/weapons/laser.ogg'
if(emagged == 2)
if(lasercolor)
- projectile = /obj/item/projectile/beam/lasertag
+ projectile = /obj/item/projectile/beam/disabler
else
projectile = /obj/item/projectile/beam
else
@@ -501,6 +508,7 @@ Auto Patrol[]"},
if(lasertag_check)
icon_state = "[lasercolor]ed2090"
disabled = 1
+ walk_to(src, 0)
target = null
spawn(100)
disabled = 0
@@ -569,4 +577,4 @@ Auto Patrol[]"},
if(!C.handcuffed)
C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C)
C.update_handcuffed()
- back_to_idle()
+ back_to_idle()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index c531a6ed067..b1133cb0e08 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -14,7 +14,7 @@
bot_filter = RADIO_FLOORBOT
model = "Floorbot"
bot_purpose = "seek out damaged or missing floor tiles, and repair or replace them as necessary"
- bot_core = /obj/machinery/bot_core/floorbot
+ bot_core_type = /obj/machinery/bot_core/floorbot
window_id = "autofloor"
window_name = "Automatic Station Floor Repairer v1.1"
path_image_color = "#FFA500"
@@ -58,7 +58,7 @@
/mob/living/simple_animal/bot/floorbot/set_custom_texts()
text_hack = "You corrupt [name]'s construction protocols."
- text_dehack = "You detect errors in [name] and reset his programming."
+ text_dehack = "You detect errors in [name] and reset [p_their()] programming."
text_dehack_fail = "[name] is not responding to reset commands!"
/mob/living/simple_animal/bot/floorbot/get_controls(mob/user)
@@ -98,7 +98,7 @@
T.use(loaded)
amount += loaded
if(loaded > 0)
- to_chat(user, "You load [loaded] tiles into the floorbot. He now contains [amount] tiles.")
+ to_chat(user, "You load [loaded] tiles into the floorbot. [p_they(TRUE)] now contains [amount] tiles.")
nagged = 0
update_icon()
else
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index 7c737690ec0..6cdffd48f16 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -44,6 +44,7 @@
var/treatment_virus = "spaceacillin"
var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
var/shut_up = 0 //self explanatory :)
+ var/syndicate_aligned = FALSE // Will it only treat operatives?
/mob/living/simple_animal/bot/medbot/tox
skin = "tox"
@@ -68,8 +69,8 @@
desc = "International Medibot of mystery."
skin = "bezerk"
treatment_oxy = "perfluorodecalin"
- treatment_brute = "styptic_powder"
- treatment_fire = "silver_sulfadiazine"
+ treatment_brute = "bicaridine"
+ treatment_fire = "kelotane"
treatment_tox = "charcoal"
/mob/living/simple_animal/bot/medbot/syndicate
@@ -77,9 +78,10 @@
desc = "You'd better have insurance!"
skin = "bezerk"
treatment_oxy = "perfluorodecalin"
- treatment_brute = "styptic_powder"
- treatment_fire = "silver_sulfadiazine"
+ treatment_brute = "bicaridine"
+ treatment_fire = "kelotane"
treatment_tox = "charcoal"
+ syndicate_aligned = TRUE
bot_core_type = /obj/machinery/bot_core/medbot/syndicate
control_freq = BOT_FREQ + 1000 // make it not show up on lists
radio_channel = "Syndicate"
@@ -90,6 +92,9 @@
Radio.syndie = 1
/mob/living/simple_animal/bot/medbot/update_icon()
+ overlays.Cut()
+ if(skin)
+ overlays += "medskin_[skin]"
if(!on)
icon_state = "medibot0"
return
@@ -101,22 +106,21 @@
else
icon_state = "medibot1"
-/mob/living/simple_animal/bot/medbot/New()
+/mob/living/simple_animal/bot/medbot/New(loc, new_skin)
..()
- update_icon()
-
- spawn(4)
- if(skin)
- overlays += image('icons/obj/aibots.dmi', "medskin_[skin]")
-
- var/datum/job/doctor/J = new/datum/job/doctor
- access_card.access += J.get_access()
- prev_access = access_card.access
+ var/datum/job/doctor/J = new /datum/job/doctor
+ access_card.access += J.get_access()
+ prev_access = access_card.access
+ qdel(J)
var/datum/atom_hud/medsensor = huds[DATA_HUD_MEDICAL_ADVANCED]
medsensor.add_hud_to(src)
permanent_huds |= medsensor
+ if(new_skin)
+ skin = new_skin
+ update_icon()
+
/mob/living/simple_animal/bot/medbot/bot_reset()
..()
patient = null
@@ -271,8 +275,10 @@
if(assess_patient(H))
last_found = world.time
if((last_newpatient_speak + 300) < world.time) //Don't spam these messages!
- var/message = pick("Hey, [H.name]! Hold on, I'm coming.","Wait [H.name]! I want to help!","[H.name], you appear to be injured!")
+ var/list/messagevoice = list("Hey, [H.name]! Hold on, I'm coming." = 'sound/voice/mcoming.ogg', "Wait [H.name]! I want to help!" = 'sound/voice/mhelp.ogg', "[H.name], you appear to be injured!" = 'sound/voice/minjured.ogg')
+ var/message = pick(messagevoice)
speak(message)
+ playsound(loc, messagevoice[message], 50, 0)
last_newpatient_speak = world.time
return H
else
@@ -304,8 +310,10 @@
if(!patient)
if(!shut_up && prob(1))
- var/message = pick("Radar, put a mask on!","There's always a catch, and it's the best there is.","I knew it, I should've been a plastic surgeon.","What kind of medbay is this? Everyone's dropping like dead flies.","Delicious!")
+ var/list/messagevoice = list("Radar, put a mask on!" = 'sound/voice/mradar.ogg', "There's always a catch, and I'm the best there is." = 'sound/voice/mcatch.ogg', "I knew it, I should've been a plastic surgeon." = 'sound/voice/msurgeon.ogg', "What kind of medbay is this? Everyone's dropping like flies." = 'sound/voice/mflies.ogg', "Delicious!" = 'sound/voice/mdelicious.ogg')
+ var/message = pick(messagevoice)
speak(message)
+ playsound(loc, messagevoice[message], 50, 0)
var/scan_range = (stationary_mode ? 1 : DEFAULT_SCAN_RANGE) //If in stationary mode, scan range is limited to adjacent patients.
patient = scan(/mob/living/carbon/human, oldpatient, scan_range)
oldpatient = patient
@@ -371,7 +379,7 @@
if(emagged == 2) //Everyone needs our medicine. (Our medicine is toxins)
return 1
- if((skin == "bezerk") && (!("syndicate" in C.faction)))
+ if(syndicate_aligned && (!("syndicate" in C.faction)))
return 0
if(declare_crit && C.health <= 0) //Critical condition! Call for help!
@@ -440,9 +448,11 @@
soft_reset()
return
- if(C.stat == 2)
- var/death_message = pick("No! NO!","Live, damnit! LIVE!","I...I've never lost a patient before. Not today, I mean.")
- speak(death_message)
+ if(C.stat == DEAD || (C.status_flags & FAKEDEATH))
+ var/list/messagevoice = list("No! Stay with me!" = 'sound/voice/mno.ogg', "Live, damnit! LIVE!" = 'sound/voice/mlive.ogg', "I...I've never lost a patient before. Not today, I mean." = 'sound/voice/mlost.ogg')
+ var/message = pick(messagevoice)
+ speak(message)
+ playsound(loc, messagevoice[message], 50, 0)
oldpatient = patient
soft_reset()
return
@@ -492,8 +502,10 @@
break
if(!reagent_id) //If they don't need any of that they're probably cured!
- var/message = pick("All patched up!","An apple a day keeps me away.","Feel better soon!")
+ var/list/messagevoice = list("All patched up!" = 'sound/voice/mpatchedup.ogg', "An apple a day keeps me away." = 'sound/voice/mapple.ogg', "Feel better soon!" = 'sound/voice/mfeelbetter.ogg')
+ var/message = pick(messagevoice)
speak(message)
+ playsound(loc, messagevoice[message], 50, 0)
bot_reset()
return
else
@@ -554,7 +566,8 @@
if("adv")
new /obj/item/storage/firstaid/adv/empty(Tsec)
if("bezerk")
- new /obj/item/storage/firstaid/tactical/empty(Tsec)
+ var/obj/item/storage/firstaid/tactical/empty/T = new(Tsec)
+ T.syndicate_aligned = syndicate_aligned //This is a special case since Syndicate medibots and the mysterious medibot look the same; we also dont' want crew building Syndicate medibots if the mysterious medibot blows up.
if("fish")
new /obj/item/storage/firstaid/aquatic_kit(Tsec)
else
@@ -571,6 +584,9 @@
if(prob(50))
new /obj/item/robot_parts/l_arm(Tsec)
+ if(emagged && prob(25))
+ playsound(loc, 'sound/voice/minsult.ogg', 50, 0)
+
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
@@ -579,7 +595,7 @@
/mob/living/simple_animal/bot/medbot/proc/declare(crit_patient)
if(declare_cooldown)
return
- if((skin == "bezerk"))
+ if(syndicate_aligned)
return
var/area/location = get_area(src)
speak("Medical emergency! [crit_patient ? "[crit_patient]" : "A patient"] is in critical condition at [location]!", radio_channel)
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 1f38c83b502..3243061273f 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -188,7 +188,7 @@
visible_message("[usr] switches [on ? "on" : "off"] [src].")
if("cellremove")
if(open && cell && !usr.get_active_hand())
- cell.updateicon()
+ cell.update_icon()
usr.put_in_active_hand(cell)
cell.add_fingerprint(usr)
cell = null
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index c292d33f39a..ef5de1908a8 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -267,7 +267,7 @@ Auto Patrol: []"},
C.visible_message("[src] has [harmbaton ? "beaten" : "stunned"] [C]!",\
"[src] has [harmbaton ? "beaten" : "stunned"] you!")
-/mob/living/simple_animal/bot/secbot/Life()
+/mob/living/simple_animal/bot/secbot/Life(seconds, times_fired)
. = ..()
if(flashing_lights)
switch(light_color)
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index b942ce4107b..a6fcf4b5a20 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -285,7 +285,7 @@
AIStatus = AI_ON
environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP
-/mob/living/simple_animal/hostile/construct/behemoth/Life()
+/mob/living/simple_animal/hostile/construct/behemoth/Life(seconds, times_fired)
weakened = 0
return ..()
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 7afa9debe25..ea7db302c43 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -46,7 +46,7 @@
Read_Memory()
..()
-/mob/living/simple_animal/pet/cat/Runtime/Life()
+/mob/living/simple_animal/pet/cat/Runtime/Life(seconds, times_fired)
if(!cats_deployed && ticker.current_state >= GAME_STATE_SETTING_UP)
Deploy_The_Cats()
if(!stat && ticker.current_state == GAME_STATE_FINISHED && !memory_saved)
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 24772ff473c..2514af0eebd 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -37,7 +37,7 @@
if(gender == NEUTER)
gender = pick(MALE, FEMALE)
-/mob/living/simple_animal/pet/corgi/Life()
+/mob/living/simple_animal/pet/corgi/Life(seconds, times_fired)
. = ..()
regenerate_icons()
@@ -75,10 +75,10 @@
//helmet and armor = 100% protection
if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
if( O.force )
- to_chat(user, "[src] is wearing too much armor! You can't cause \him any damage.")
+ to_chat(user, "[src] is wearing too much armor! You can't cause [p_them()] any damage.")
visible_message(" [user] hits [src] with [O], however [src] is too armored.")
else
- to_chat(user, "[src] is wearing too much armor! You can't reach \his skin.")
+ to_chat(user, "[src] is wearing too much armor! You can't reach [p_their()] skin.")
visible_message("[user] gently taps [src] with [O].")
if(health>0 && prob(15))
custom_emote(1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.")
@@ -180,7 +180,7 @@
)
if( ! ( item_to_add.type in allowed_types ) )
- to_chat(usr, "You set [item_to_add] on [src]'s back, but \he shakes it off!")
+ to_chat(usr, "You set [item_to_add] on [src]'s back, but [p_they()] shake[p_s()] it off!")
if(!usr.drop_item())
to_chat(usr, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!")
return
@@ -379,10 +379,10 @@
to_chat(user, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!")
return 0
if(health <= 0)
- to_chat(user, "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him.")
+ to_chat(user, "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on [p_them()].")
else if(user)
user.visible_message("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once.",
- "You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags \his tail once and barks.",
+ "You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags [p_their()] tail once and barks.",
"You hear a friendly-sounding bark.")
item_to_add.loc = src
src.inventory_head = item_to_add
@@ -392,7 +392,7 @@
if(user && !user.drop_item())
to_chat(user, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!")
return 0
- to_chat(user, "You set [item_to_add] on [src]'s head, but \he shakes it off!")
+ to_chat(user, "You set [item_to_add] on [src]'s head, but [p_they()] shake[p_s()] it off!")
item_to_add.loc = loc
if(prob(25))
step_rand(item_to_add)
@@ -612,7 +612,7 @@
A.fire()
return
-/mob/living/simple_animal/pet/corgi/Ian/borgi/Life()
+/mob/living/simple_animal/pet/corgi/Ian/borgi/Life(seconds, times_fired)
..()
if(emagged && prob(25))
var/mob/living/carbon/target = locate() in view(10,src)
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 99db2236612..665afa16cb2 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -34,7 +34,7 @@
Move(get_step(src, east_vs_west), east_vs_west)
turns_since_move = 0
-/mob/living/simple_animal/crab/Life()
+/mob/living/simple_animal/crab/Life(seconds, times_fired)
. = ..()
regenerate_icons()
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index ab1a94cbcc6..a8784a6d150 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -52,7 +52,7 @@
if(SV)
SV.eat(src)
-/mob/living/simple_animal/hostile/retaliate/goat/Life()
+/mob/living/simple_animal/hostile/retaliate/goat/Life(seconds, times_fired)
. = ..()
if(stat == CONSCIOUS && prob(5))
milk_content = min(50, milk_content+rand(5, 10))
@@ -132,7 +132,7 @@
else
..()
-/mob/living/simple_animal/cow/Life()
+/mob/living/simple_animal/cow/Life(seconds, times_fired)
. = ..()
if(stat == CONSCIOUS && prob(5))
milk_content = min(50, milk_content+rand(5, 10))
@@ -188,7 +188,7 @@
pixel_x = rand(-6, 6)
pixel_y = rand(0, 10)
-/mob/living/simple_animal/chick/Life()
+/mob/living/simple_animal/chick/Life(seconds, times_fired)
. =..()
if(.)
amount_grown += rand(1,2)
@@ -267,7 +267,7 @@ var/global/chicken_count = 0
else
..()
-/mob/living/simple_animal/chicken/Life()
+/mob/living/simple_animal/chicken/Life(seconds, times_fired)
. = ..()
if((. && prob(3) && eggsleft > 0) && egg_type)
visible_message("[src] [pick(layMessage)]")
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 5972d0f6e4b..a7a62c74c0b 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -39,7 +39,7 @@
for(var/mob/M in view())
M << 'sound/effects/mousesqueek.ogg'
-/mob/living/simple_animal/mouse/Life()
+/mob/living/simple_animal/mouse/Life(seconds, times_fired)
. = ..()
if(stat == UNCONSCIOUS)
if(ckey || prob(1))
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index 70a64d2dbcb..b98d4181475 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -35,7 +35,7 @@
var/emagged = 0 //is it getting ready to explode?
var/obj/item/mmi/mmi = null
- var/emagged_master = null //for administrative purposes, to see who emagged the spiderbot; also for a holder for if someone emags an empty frame first then inserts an MMI.
+ var/mob/emagged_master = null //for administrative purposes, to see who emagged the spiderbot; also for a holder for if someone emags an empty frame first then inserts an MMI.
/mob/living/simple_animal/spiderbot/Destroy()
if(emagged)
@@ -135,8 +135,8 @@
else
emagged = 1
to_chat(user, "You short out the security protocols and rewrite [src]'s internal memory.")
- to_chat(src, "You have been emagged; you are now completely loyal to [user] and their every order!")
- emagged_master = user.name
+ to_chat(src, "You have been emagged; you are now completely loyal to [user] and [user.p_their()] every order!")
+ emagged_master = user
add_attack_logs(user, src, "Emagged")
maxHealth = 60
health = 60
@@ -150,7 +150,7 @@
ckey = M.brainmob.ckey
name = "Spider-bot ([M.brainmob.name])"
if(emagged)
- to_chat(src, "You have been emagged; you are now completely loyal to [emagged_master] and their every order!")
+ to_chat(src, "You have been emagged; you are now completely loyal to [emagged_master] and [emagged_master.p_their()] every order!")
/mob/living/simple_animal/spiderbot/proc/update_icon()
if(mmi)
diff --git a/code/modules/mob/living/simple_animal/hostile/deathsquid.dm b/code/modules/mob/living/simple_animal/hostile/deathsquid.dm
index e825bb2d273..065247a538d 100644
--- a/code/modules/mob/living/simple_animal/hostile/deathsquid.dm
+++ b/code/modules/mob/living/simple_animal/hostile/deathsquid.dm
@@ -11,6 +11,8 @@
icon_state = "deathsquid"
icon_living = "deathsquid"
icon_dead = "deathsquiddead"
+ pixel_x = -24
+ pixel_y = -24
attacktext = "slices"
attack_sound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index a06ea9bd80d..283936acb44 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -57,7 +57,7 @@
target = null
return ..()
-/mob/living/simple_animal/hostile/Life()
+/mob/living/simple_animal/hostile/Life(seconds, times_fired)
. = ..()
if(!.)
walk(src, 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 50c24f0ac0b..3c72042efce 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -75,7 +75,7 @@ Difficulty: Hard
/obj/effect/decal/cleanable/blood/gibs/bubblegum/can_bloodcrawl_in()
return TRUE
-/mob/living/simple_animal/hostile/megafauna/bubblegum/Life()
+/mob/living/simple_animal/hostile/megafauna/bubblegum/Life(seconds, times_fired)
..()
move_to_delay = Clamp((health/maxHealth) * 10, 5, 10)
@@ -117,7 +117,7 @@ Difficulty: Hard
bloodspell.phased = 1
internal_gps = new/obj/item/gps/internal/bubblegum(src)
-/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A, visual_effect_icon)
+/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A, visual_effect_icon, used_item, no_effect, end_pixel_y)
if(!charging)
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
index 5c25e9820e1..6027070dfc9 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
@@ -229,7 +229,7 @@ Difficulty: Medium
playsound(src.loc, 'sound/effects/meteorimpact.ogg', 200, 1)
for(var/mob/living/L in orange(1, src))
if(L.stat)
- visible_message("[src] slams down on [L], crushing them!")
+ visible_message("[src] slams down on [L], crushing [L.p_them()]!")
L.gib()
else
L.adjustBruteLoss(75)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 8d249c7f9e2..fe80846935d 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -76,7 +76,7 @@ Difficulty: Hard
internal_gps = new/obj/item/gps/internal/hierophant(src)
spawned_rune = new(loc)
-/mob/living/simple_animal/hostile/megafauna/hierophant/Life()
+/mob/living/simple_animal/hostile/megafauna/hierophant/Life(seconds, times_fired)
. = ..()
if(. && spawned_rune && !client)
if(target || loc == spawned_rune.loc)
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 9dab58daa4a..5832f7bdd60 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -51,7 +51,7 @@
var/attempt_open = 0
// Pickup loot
-/mob/living/simple_animal/hostile/mimic/crate/initialize()
+/mob/living/simple_animal/hostile/mimic/crate/Initialize()
..()
for(var/obj/item/I in loc)
I.loc = src
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index a026d33ed8d..3063c5a8ce1 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -269,7 +269,7 @@
stat_attack = 1
robust_searching = 1
-/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life()
+/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life(seconds, times_fired)
if(isturf(loc))
for(var/mob/living/carbon/human/H in view(src,1)) //Only for corpse right next to/on same tile
if(H.stat == UNCONSCIOUS)
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 7346473de94..2c775074253 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -42,7 +42,7 @@
else
to_chat(user, "It looks like it's been roughed up.")
-/mob/living/simple_animal/hostile/mushroom/Life()
+/mob/living/simple_animal/hostile/mushroom/Life(seconds, times_fired)
..()
if(!stat)//Mushrooms slowly regenerate if conscious, for people who want to save them from being eaten
adjustBruteLoss(-2)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
index 0e1d5eddd71..90586bb43c6 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
@@ -62,7 +62,7 @@
return ..()
//self repair systems have a chance to bring the drone back to life
-/mob/living/simple_animal/hostile/retaliate/malf_drone/Life()
+/mob/living/simple_animal/hostile/retaliate/malf_drone/Life(seconds, times_fired)
//emps and lots of damage can temporarily shut us down
if(disabled > 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
index 14b1af87b0a..f9516739e6f 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
@@ -56,7 +56,7 @@
if(.)
custom_emote(1, "wails at [.]")
-/mob/living/simple_animal/hostile/retaliate/ghost/Life()
+/mob/living/simple_animal/hostile/retaliate/ghost/Life(seconds, times_fired)
if(target)
invisibility = pick(0,0,60,invisibility)
else
diff --git a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
index 27bd2f3ee1c..cdbc64eea1e 100644
--- a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
+++ b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
@@ -190,7 +190,7 @@
SW.death()
-/mob/living/simple_animal/hostile/spaceWorm/Life()
+/mob/living/simple_animal/hostile/spaceWorm/Life(seconds, times_fired)
if(nextWorm && !(Adjacent(nextWorm)))
Detach(0)
@@ -328,7 +328,7 @@
//Jiggle the whole worm forwards towards the next segment
-/mob/living/simple_animal/hostile/spaceWorm/do_attack_animation(atom/A)
+/mob/living/simple_animal/hostile/spaceWorm/do_attack_animation(atom/A, visual_effect_icon, used_item, no_effect, end_pixel_y)
..()
if(previousWorm)
previousWorm.do_attack_animation(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
index 982a0eaae90..377b8ff335a 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
@@ -36,7 +36,7 @@
L.reagents.add_reagent("terror_black_toxin", 30) // inject our special poison
visible_message("[src] buries its long fangs deep into the [inject_target] of [target]!")
else
- visible_message("[src] bites [target], but cannot inject venom into their [inject_target]!")
+ visible_message("[src] bites [target], but cannot inject venom into [target.p_their()] [inject_target]!")
L.attack_animal(src)
if(!ckey && (!(target in enemies) || L.reagents.has_reagent("terror_black_toxin", 60)))
step_away(src, L)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
index 06b28c6400e..43c0e7b0be5 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
@@ -33,7 +33,7 @@
if(W)
melee_damage_lower = initial(melee_damage_lower) * 2
melee_damage_upper = initial(melee_damage_upper) * 2
- visible_message("[src] savagely mauls [target] while they are stuck in the web!")
+ visible_message("[src] savagely mauls [target] while [L.p_theyre()] stuck in the web!")
else
melee_damage_lower = initial(melee_damage_lower)
melee_damage_upper = initial(melee_damage_upper)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm
index 9d6f977a1ae..64ef285ded8 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm
@@ -93,5 +93,5 @@
// instead of having a venom that only lasts seconds, we just add the eyeblur directly.
visible_message("[src] buries its fangs deep into the [inject_target] of [target]!")
else
- visible_message("[src] bites [target], but cannot inject venom into their [inject_target]!")
+ visible_message("[src] bites [target], but cannot inject venom into [target.p_their()] [inject_target]!")
L.attack_animal(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
index 21b1276425c..66e88af1e1b 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
@@ -43,7 +43,7 @@
/mob/living/simple_animal/hostile/poison/terror_spider/prince/spider_specialattack(mob/living/carbon/human/L)
if(prob(15))
- visible_message("[src] rams into [L], knocking them to the floor!")
+ visible_message("[src] rams into [L], knocking [L.p_them()] to the floor!")
L.Weaken(5)
L.Stun(5)
else
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm
index c9309715443..5c483b4e3e9 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm
@@ -48,7 +48,7 @@
visible_message("[src] chitters in the direction of [Q]!")
. = ..()
-/mob/living/simple_animal/hostile/poison/terror_spider/purple/Life()
+/mob/living/simple_animal/hostile/poison/terror_spider/purple/Life(seconds, times_fired)
. = ..()
if(.) // if mob is NOT dead
if(!degenerate && spider_myqueen)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm
index 5edcbe919c2..532c2b7357a 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm
@@ -39,7 +39,7 @@
var/lastnestsetup = 0
var/neststep = 0
var/hasnested = 0
- var/spider_max_per_nest = 25 // above this, AI queens become stable
+ var/spider_max_per_nest = 35 // above this, AI queens become stable
var/canlay = 4 // main counter for egg-laying ability! # = num uses, incremented at intervals
var/eggslaid = 0
var/spider_can_fakelings = 3 // spawns defective spiderlings that don't grow up, used to freak out crew, atmosphere
@@ -61,7 +61,7 @@
spider_growinstantly = 1
spider_spawnfrequency = 150
-/mob/living/simple_animal/hostile/poison/terror_spider/queen/Life()
+/mob/living/simple_animal/hostile/poison/terror_spider/queen/Life(seconds, times_fired)
. = ..()
if(.) // if mob is NOT dead
if(ckey && canlay < 12 && hasnested) // max 12 eggs worth stored at any one time, realistically that's tons.
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
index cd01006546c..235a161c595 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
@@ -201,11 +201,6 @@ var/global/list/ts_spiderling_list = list()
spider_specialattack(G,can_poison)
else
G.attack_animal(src)
- else if(istype(target, /obj/structure/alien/resin))
- var/obj/structure/alien/resin/E = target
- do_attack_animation(E)
- E.health -= rand(melee_damage_lower, melee_damage_upper)
- E.healthcheck()
else
target.attack_animal(src)
@@ -292,7 +287,7 @@ var/global/list/ts_spiderling_list = list()
handle_dying()
return ..()
-/mob/living/simple_animal/hostile/poison/terror_spider/Life()
+/mob/living/simple_animal/hostile/poison/terror_spider/Life(seconds, times_fired)
. = ..()
if(!.) // if mob is dead
if(prob(2))
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index c206f1499d9..dba62b4744c 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -276,7 +276,7 @@
/*
* AI - Not really intelligent, but I'm calling it AI anyway.
*/
-/mob/living/simple_animal/parrot/Life()
+/mob/living/simple_animal/parrot/Life(seconds, times_fired)
..()
//Sprite and AI update for when a parrot gets pulled
diff --git a/code/modules/mob/living/simple_animal/pony.dm b/code/modules/mob/living/simple_animal/pony.dm
index 437c9b0ac4d..960f8fc0998 100644
--- a/code/modules/mob/living/simple_animal/pony.dm
+++ b/code/modules/mob/living/simple_animal/pony.dm
@@ -27,7 +27,7 @@
..()
if(stat == 2)
new /obj/item/reagent_containers/food/snacks/ectoplasm(src.loc)
- src.visible_message("\The [src] lets out a contented sigh as their form unwinds.")
+ src.visible_message("[src] lets out a contented sigh as [p_their()] form unwinds.")
src.ghostize()
qdel(src)
return
diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm
index 2e9d1b94bf2..22901f4d29a 100644
--- a/code/modules/mob/living/simple_animal/posessed_object.dm
+++ b/code/modules/mob/living/simple_animal/posessed_object.dm
@@ -26,7 +26,7 @@
to_chat(usr, "[src] appears to be having trouble staying afloat!")
-/mob/living/simple_animal/possessed_object/do_attack_animation(atom/A)
+/mob/living/simple_animal/possessed_object/do_attack_animation(atom/A, visual_effect_icon, used_item, no_effect, end_pixel_y)
..()
animate_ghostly_presence(src, -1, 20, 1) // Restart the floating animation after the attack animation, as it will be cancelled.
@@ -60,7 +60,7 @@
qdel(src)
-/mob/living/simple_animal/possessed_object/Life()
+/mob/living/simple_animal/possessed_object/Life(seconds, times_fired)
..()
if(!possessed_item) // If we're a donut and someone's eaten us, for instance.
diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm
index 5a38929b88d..3e7f1722a41 100644
--- a/code/modules/mob/living/simple_animal/tribbles.dm
+++ b/code/modules/mob/living/simple_animal/tribbles.dm
@@ -68,7 +68,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
gestation = 0
-/mob/living/simple_animal/tribble/Life()
+/mob/living/simple_animal/tribble/Life(seconds, times_fired)
..()
if(src.health > 0) //no mostly dead procreation
if(gestation != null) //neuter check
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 63b248ffd41..fb62ad3a629 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -4,6 +4,7 @@
lastKnownIP = client.address
computer_id = client.computer_id
log_access_in(client)
+ create_attack_log("Logged in at [atom_loc_line(get_turf(src))]")
if(config.log_access)
for(var/mob/M in player_list)
if(M == src) continue
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index a0f8594e870..cbcd51c44a7 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -3,6 +3,7 @@
unset_machine()
player_list -= src
log_access_out(src)
+ create_attack_log("Logged out at [atom_loc_line(get_turf(src))]")
// `holder` is nil'd out by now, so we check the `admin_datums` array directly
//Only report this stuff if we are currently playing.
if(admin_datums[ckey] && ticker && ticker.current_state == GAME_STATE_PLAYING)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index bb590e730f5..beba84eaa3f 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -169,7 +169,17 @@
/mob/proc/movement_delay()
return 0
-/mob/proc/Life()
+/mob/proc/Life(seconds, times_fired)
+ if(forced_look)
+ if(!isnum(forced_look))
+ var/atom/A = locateUID(forced_look)
+ if(istype(A))
+ var/view = client ? client.view : world.view
+ if(get_dist(src, A) > view || !(src in viewers(view, A)))
+ forced_look = null
+ to_chat(src, "Your direction target has left your view, you are no longer facing anything.")
+ return
+ setDir()
// handle_typing_indicator()
return
@@ -533,6 +543,17 @@ var/list/slot_equipment_priority = list( \
client.screen = list()
hud_used.show_hud(hud_used.hud_version)
+/mob/setDir(new_dir)
+ if(forced_look)
+ if(isnum(forced_look))
+ dir = forced_look
+ else
+ var/atom/A = locateUID(forced_look)
+ if(istype(A))
+ dir = get_cardinal_dir(src, A)
+ return
+ . = ..()
+
/mob/proc/show_inv(mob/user)
user.set_machine(src)
var/dat = {"
@@ -571,7 +592,7 @@ var/list/slot_equipment_priority = list( \
return
if(!src || !isturf(src.loc))
return 0
- if(istype(A, /obj/effect/decal/point))
+ if(istype(A, /obj/effect/temp_visual/point))
return 0
var/tile = get_turf(A)
@@ -579,12 +600,8 @@ var/list/slot_equipment_priority = list( \
return 0
changeNext_move(CLICK_CD_POINT)
- var/obj/P = new /obj/effect/decal/point(tile)
+ var/obj/P = new /obj/effect/temp_visual/point(tile)
P.invisibility = invisibility
- spawn (20)
- if(P)
- qdel(P)
-
return 1
/mob/proc/ret_grab(obj/effect/list_container/mobl/L as obj, flag)
@@ -1158,7 +1175,7 @@ var/list/slot_equipment_priority = list( \
new /obj/effect/decal/cleanable/vomit/green(location)
else
if(!no_text)
- visible_message("[src] pukes all over \himself!","You puke all over yourself!")
+ visible_message("[src] pukes all over [p_them()]self!","You puke all over yourself!")
location.add_vomit_floor(src, 1)
playsound(location, 'sound/effects/splat.ogg', 50, 1)
@@ -1308,4 +1325,4 @@ var/list/slot_equipment_priority = list( \
if(WEST)
D = NORTH
setDir(D)
- spintime -= speed
\ No newline at end of file
+ spintime -= speed
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 9154591c2fe..57b5aeb4996 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -198,3 +198,5 @@
var/list/progressbars = null //for stacking do_after bars
var/list/tkgrabbed_objects = list() // Assoc list of items to TK grabs
+
+ var/forced_look = null // This can either be a numerical direction or a soft object reference (UID). It makes the mob always face towards the selected thing.
\ No newline at end of file
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 1c4b0f38fbe..458138b9db0 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -263,17 +263,17 @@
state = GRAB_AGGRESSIVE
icon_state = "grabbed1"
hud.icon_state = "reinforce1"
- add_attack_logs(assailant, affecting, "Aggressively grabbed", admin_notify = FALSE)
+ add_attack_logs(assailant, affecting, "Aggressively grabbed", ATKLOG_ALL)
else if(state < GRAB_NECK)
if(isslime(affecting))
to_chat(assailant, "You squeeze [affecting], but nothing interesting happens.")
return
- assailant.visible_message("[assailant] has reinforced \his grip on [affecting] (now neck)!")
+ assailant.visible_message("[assailant] has reinforced [assailant.p_their()] grip on [affecting] (now neck)!")
state = GRAB_NECK
icon_state = "grabbed+1"
assailant.setDir(get_dir(assailant, affecting))
- add_attack_logs(assailant, affecting, "Neck grabbed", admin_notify = FALSE)
+ add_attack_logs(assailant, affecting, "Neck grabbed", ATKLOG_ALL)
if(!iscarbon(assailant))
affecting.LAssailant = null
else
@@ -282,11 +282,11 @@
hud.name = "kill"
affecting.Stun(10) //10 ticks of ensured grab
else if(state < GRAB_UPGRADING)
- assailant.visible_message("[assailant] starts to tighten \his grip on [affecting]'s neck!")
+ assailant.visible_message("[assailant] starts to tighten [assailant.p_their()] grip on [affecting]'s neck!")
hud.icon_state = "kill1"
state = GRAB_KILL
- assailant.visible_message("[assailant] has tightened \his grip on [affecting]'s neck!")
+ assailant.visible_message("[assailant] has tightened [assailant.p_their()] grip on [affecting]'s neck!")
add_attack_logs(assailant, affecting, "Strangled")
assailant.next_move = world.time + 10
@@ -332,7 +332,7 @@
if(last_hit_zone == "head") //This checks the hitzone the user has selected. In this specific case, they have the head selected.
if(affecting.lying)
return
- assailant.visible_message("[assailant] thrusts \his head into [affecting]'s skull!") //A visible message for what is going on.
+ assailant.visible_message("[assailant] thrusts [assailant.p_their()] head into [affecting]'s skull!") //A visible message for what is going on.
var/damage = 5
var/obj/item/clothing/hat = attacker.head
if(istype(hat))
@@ -354,7 +354,7 @@
if(!affected.internal_bodyparts_by_name["eyes"])
to_chat(assailant, "You cannot locate any eyes on [affecting]!")
return
- assailant.visible_message("[assailant] presses \his fingers into [affecting]'s eyes!")
+ assailant.visible_message("[assailant] presses [assailant.p_their()] fingers into [affecting]'s eyes!")
to_chat(affecting, "You feel immense pain as digits are being pressed into your eyes!")
add_attack_logs(assailant, affecting, "Eye-fucked with their fingers")
var/obj/item/organ/internal/eyes/eyes = affected.get_int_organ(/obj/item/organ/internal/eyes)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index a92e548d42b..f26961eace9 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -268,6 +268,8 @@
else
. = ..()
+ mob.setDir(direct)
+
for(var/obj/item/grab/G in mob)
if(G.state == GRAB_NECK)
mob.setDir(reverse_dir[direct])
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index bbecb8e6458..99047b0382c 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -30,11 +30,11 @@
callHook("mob_login", list("client" = client, "mob" = src))
new_player_panel()
-
+
spawn(30)
// Annoy the player with polls.
establish_db_connection()
- if(dbcon.IsConnected() && client.can_vote())
+ if(dbcon.IsConnected() && client && client.can_vote())
var/isadmin = 0
if(client && client.holder)
isadmin = 1
@@ -46,7 +46,7 @@
break
if(newpoll)
client.handle_player_polling()
-
+
if(ckey in deadmins)
verbs += /client/proc/readmin
spawn(40)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index bf6526c856e..274c1602e04 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -4,6 +4,7 @@
var/spawning = 0 //Referenced when you want to delete the new_player later on in the code.
var/totalPlayers = 0 //Player counts for the Lobby tab
var/totalPlayersReady = 0
+ var/tos_consent = FALSE
universal_speak = 1
invisibility = 101
@@ -19,7 +20,40 @@
/mob/new_player/verb/new_player_panel()
set src = usr
- new_player_panel_proc()
+
+ if(handle_tos_consent())
+ new_player_panel_proc()
+
+/mob/new_player/proc/handle_tos_consent()
+ if(!GLOB.join_tos)
+ tos_consent = TRUE
+ return TRUE
+
+ establish_db_connection()
+ if(!dbcon.IsConnected())
+ tos_consent = TRUE
+ return TRUE
+
+ var/DBQuery/query = dbcon.NewQuery("SELECT * FROM [format_table_name("privacy")] WHERE ckey='[src.ckey]' AND consent=1")
+ query.Execute()
+ while(query.NextRow())
+ tos_consent = TRUE
+ return TRUE
+
+ privacy_consent()
+ return FALSE
+
+/mob/new_player/proc/privacy_consent()
+ src << browse(null, "window=playersetup")
+ var/output = GLOB.join_tos
+ output += "
"
+
if(!IsGuestKey(src.key))
establish_db_connection()
@@ -109,11 +146,28 @@
/mob/new_player/Topic(href, href_list[])
if(!client) return 0
+ if(href_list["consent_signed"])
+ var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")
+ var/DBQuery/query = dbcon.NewQuery("REPLACE INTO [format_table_name("privacy")] (ckey, datetime, consent) VALUES ('[ckey]', '[sqltime]', 1)")
+ query.Execute()
+ src << browse(null, "window=privacy_consent")
+ tos_consent = 1
+ new_player_panel_proc()
+ if(href_list["consent_rejected"])
+ tos_consent = 0
+ to_chat(usr, "You must consent to the terms of service before you can join!")
+ var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")
+ var/DBQuery/query = dbcon.NewQuery("REPLACE INTO [format_table_name("privacy")] (ckey, datetime, consent) VALUES ('[ckey]', '[sqltime]', 0)")
+ query.Execute()
+
if(href_list["show_preferences"])
client.prefs.ShowChoices(src)
return 1
if(href_list["ready"])
+ if(!tos_consent)
+ to_chat(usr, "You must consent to the terms of service before you can join!")
+ return 0
ready = !ready
new_player_panel_proc()
@@ -126,6 +180,9 @@
new_player_panel_proc()
if(href_list["observe"])
+ if(!tos_consent)
+ to_chat(usr, "You must consent to the terms of service before you can join!")
+ return 0
if(alert(src,"Are you sure you wish to observe? You cannot normally join the round after doing this!","Player Setup","Yes","No") == "Yes")
if(!client) return 1
@@ -155,8 +212,14 @@
respawnable_list += observer
qdel(src)
return 1
+ if(href_list["tos"])
+ privacy_consent()
+ return 0
if(href_list["late_join"])
+ if(!tos_consent)
+ to_chat(usr, "You must consent to the terms of service before you can join!")
+ return 0
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
to_chat(usr, "The round is either not ready, or has already finished...")
return
@@ -326,7 +389,7 @@
if(ailist.len)
var/mob/living/silicon/ai/announcer = pick(ailist)
if(character.mind)
- if((character.mind.assigned_role != "Cyborg") && (character.mind.special_role != "MODE"))
+ if((character.mind.assigned_role != "Cyborg") && (character.mind.assigned_role != character.mind.special_role))
if(character.mind.role_alt_title)
rank = character.mind.role_alt_title
var/arrivalmessage = announcer.arrivalmsg
@@ -338,7 +401,7 @@
announcer.say(";[arrivalmessage]")
else
if(character.mind)
- if((character.mind.assigned_role != "Cyborg") && (character.mind.special_role != "MODE"))
+ if((character.mind.assigned_role != "Cyborg") && (character.mind.assigned_role != character.mind.special_role))
if(character.mind.role_alt_title)
rank = character.mind.role_alt_title
global_announcer.autosay("[character.real_name],[rank ? " [rank]," : " visitor," ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")
@@ -351,12 +414,12 @@
if(ailist.len)
var/mob/living/silicon/ai/announcer = pick(ailist)
if(character.mind)
- if((character.mind.special_role != "MODE"))
+ if(character.mind.assigned_role != character.mind.special_role)
var/arrivalmessage = "A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"]."
announcer.say(";[arrivalmessage]")
else
if(character.mind)
- if((character.mind.special_role != "MODE"))
+ if(character.mind.assigned_role != character.mind.special_role)
// can't use their name here, since cyborg namepicking is done post-spawn, so we'll just say "A new Cyborg has arrived"/"A new Android has arrived"/etc.
global_announcer.autosay("A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
index ace8ab1b621..1cb1bc5f3b0 100644
--- a/code/modules/mob/status_procs.dm
+++ b/code/modules/mob/status_procs.dm
@@ -208,3 +208,7 @@
/mob/proc/AdjustWeakened()
return
+
+/mob/proc/adjust_bodytemperature(amount, min_temp = 0, max_temp = INFINITY)
+ if(bodytemperature > min_temp && bodytemperature < max_temp)
+ bodytemperature = Clamp(bodytemperature + amount, min_temp, max_temp)
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm
index 6ebf9228848..b570687569a 100644
--- a/code/modules/modular_computers/file_system/programs/command/card.dm
+++ b/code/modules/modular_computers/file_system/programs/command/card.dm
@@ -238,7 +238,7 @@
jobdatum = J
break
if(!jobdatum)
- to_chat(usr, "\red No log exists for this job: [t1]")
+ to_chat(usr, "No log exists for this job: [t1]")
return
access = jobdatum.get_access()
diff --git a/code/modules/ninja/martial_art.dm b/code/modules/ninja/martial_art.dm
index b6562d8377d..c97a3e505c3 100644
--- a/code/modules/ninja/martial_art.dm
+++ b/code/modules/ninja/martial_art.dm
@@ -20,7 +20,7 @@
/obj/item/creeping_widow_injector/attack_self(mob/living/carbon/human/user as mob)
if(!used)
user.visible_message("You stick the [src]'s needle into your arm and press the button.", \
- "[user] sticks the [src]'s needle \his arm and presses the button.")
+ "[user] sticks the [src]'s needle [user.p_their()] arm and presses the button.")
to_chat(user, "The nanomachines in the [src] flow through your bloodstream.")
var/datum/martial_art/ninja_martial_art/N = new/datum/martial_art/ninja_martial_art(null)
@@ -98,8 +98,8 @@
D.silent += 1
D.adjustOxyLoss(1)
else
- D.visible_message("[A] loses \his grip on [D]'s neck!", \
- "[A] loses \his grip on your neck!")
+ D.visible_message("[A] loses [A.p_their()] grip on [D]'s neck!", \
+ "[A] loses [A.p_their()] grip on your neck!")
has_choke_hold = 0
return 0
I++
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index e3c625593c5..30841f94c69 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -30,7 +30,8 @@
icon_state = "tallcabinet"
-/obj/structure/filingcabinet/initialize()
+/obj/structure/filingcabinet/Initialize()
+ ..()
for(var/obj/item/I in loc)
if(istype(I, /obj/item/paper) || istype(I, /obj/item/folder) || istype(I, /obj/item/photo))
I.loc = src
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index 2700c8702db..e3cceb9738a 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -35,6 +35,7 @@
user.visible_message("[user] labels [A] as [label].", \
"You label [A] as [label].")
+ investigate_log("[key_name(user)] labelled [A] as [label].", INVESTIGATE_LABEL) // Investigate goes BEFORE rename so the original name is preserved in the log
A.name = "[A.name] ([label])"
/obj/item/hand_labeler/attack_self(mob/user as mob)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index db3f7cddce7..d37506b3d82 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -379,7 +379,7 @@
if(is_hot(P))
if((CLUMSY in user.mutations) && prob(10))
- user.visible_message("[user] accidentally ignites themselves!", \
+ user.visible_message("[user] accidentally ignites [user.p_them()]self!", \
"You miss the paper and accidentally light yourself on fire!")
user.unEquip(P)
user.adjust_fire_stacks(1)
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 6656eefcdf1..08cb7b6555e 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -79,8 +79,8 @@
if(istype(P, /obj/item/lighter/zippo))
class = ""
- user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \
- "[class]You hold \the [P] up to \the [src], burning it slowly.")
+ user.visible_message("[class][user] holds [P] up to [src], it looks like [user.p_theyre()] trying to burn it!", \
+ "[class]You hold [P] up to [src], burning it slowly.")
spawn(20)
if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit)
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index 1c4c0b357cc..fbbfacb0b8f 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -33,7 +33,7 @@
/obj/item/paperplane/suicide_act(mob/living/user)
user.Stun(10)
- user.visible_message("[user] jams [name] in \his nose. It looks like \he's trying to commit suicide!")
+ user.visible_message("[user] jams [name] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!")
user.EyeBlurry(6)
var/obj/item/organ/internal/eyes/E = user.get_int_organ(/obj/item/organ/internal/eyes)
if(E)
@@ -73,7 +73,7 @@
else if(is_hot(P))
if(user.disabilities & CLUMSY && prob(10))
- user.visible_message("[user] accidentally ignites themselves!", \
+ user.visible_message("[user] accidentally ignites [user.p_them()]self!", \
"You miss [src] and accidentally light yourself on fire!")
user.unEquip(P)
user.adjust_fire_stacks(1)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index b4446f67e0e..4e3aaefd1eb 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -25,7 +25,7 @@
pressure_resistance = 2
/obj/item/pen/suicide_act(mob/user)
- to_chat(viewers(user), "[user] starts scribbling numbers over \himself with the [src.name]! It looks like \he's trying to commit sudoku.")
+ to_chat(viewers(user), "[user] starts scribbling numbers over [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit sudoku.")
return (BRUTELOSS)
/obj/item/pen/blue
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 0d176753ad4..41799958c4f 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -316,11 +316,11 @@
return
src.add_fingerprint(user)
if(target == user && !user.incapacitated())
- visible_message("[usr] jumps onto the photocopier!")
+ visible_message("[usr] jumps onto [src]!")
else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
if(target.anchored) return
if(!ishuman(user)) return
- visible_message("[usr] drags [target.name] onto the photocopier!")
+ visible_message("[usr] drags [target.name] onto [src]!")
target.forceMove(get_turf(src))
ass = target
if(copyitem)
@@ -344,9 +344,9 @@
/obj/machinery/photocopier/emag_act(user as mob)
if(!emagged)
emagged = 1
- to_chat(user, "You overload the photocopier's laser printing mechanism.")
+ to_chat(user, "You overload [src]'s laser printing mechanism.")
else
- to_chat(user, "The photocopier's laser printing mechanism is already overloaded!")
+ to_chat(user, "[src]'s laser printing mechanism is already overloaded!")
/obj/item/toner
name = "toner cartridge"
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 0ab4db844e9..40759ab792c 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -56,8 +56,8 @@
if(istype(P, /obj/item/lighter/zippo))
class = ""
- user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \
- "[class]You hold \the [P] up to \the [src], burning it slowly.")
+ user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like [user.p_theyre()] trying to burn it!", \
+ "[class]You hold [P] up to [src], burning it slowly.")
spawn(20)
if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit)
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index ad67a53cd5b..5a101629c94 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -14,7 +14,7 @@
attack_verb = list("stamped")
/obj/item/stamp/suicide_act(mob/user)
- user.visible_message("[user] stamps 'VOID' on \his forehead, then promptly falls over, dead.")
+ user.visible_message("[user] stamps 'VOID' on [user.p_their()] forehead, then promptly falls over, dead.")
return (OXYLOSS)
/obj/item/stamp/qm
diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm
index c50ae0758f4..53c61f4e27f 100644
--- a/code/modules/pda/cart.dm
+++ b/code/modules/pda/cart.dm
@@ -14,15 +14,6 @@
var/list/programs = list()
var/list/messenger_plugins = list()
-/obj/item/cartridge/New()
- if(ticker && ticker.current_state >= GAME_STATE_SETTING_UP)
- initialize()
-
-/obj/item/cartridge/initialize()
- if(radio)
- radio.initialize()
- ..()
-
/obj/item/cartridge/Destroy()
QDEL_NULL(radio)
QDEL_LIST(programs)
@@ -68,7 +59,7 @@
new/datum/data/pda/app/crew_records/security,
new/datum/data/pda/app/secbot_control)
-/obj/item/cartridge/security/initialize()
+/obj/item/cartridge/security/Initialize()
radio = new /obj/item/integrated_radio/beepsky(src)
..()
@@ -118,7 +109,7 @@
desc = "A data cartridge with an integrated radio signaler module."
programs = list(new/datum/data/pda/app/signaller)
-/obj/item/cartridge/signal/initialize()
+/obj/item/cartridge/signal/Initialize()
radio = new /obj/item/integrated_radio/signal(src)
..()
@@ -141,7 +132,7 @@
new/datum/data/pda/app/supply,
new/datum/data/pda/app/mule_control)
-/obj/item/cartridge/quartermaster/initialize()
+/obj/item/cartridge/quartermaster/Initialize()
radio = new /obj/item/integrated_radio/mule(src)
..()
@@ -163,7 +154,7 @@
new/datum/data/pda/app/status_display)
-/obj/item/cartridge/hop/initialize()
+/obj/item/cartridge/hop/Initialize()
radio = new /obj/item/integrated_radio/mule(src)
..()
@@ -176,7 +167,7 @@
new/datum/data/pda/app/status_display)
-/obj/item/cartridge/hos/initialize()
+/obj/item/cartridge/hos/Initialize()
radio = new /obj/item/integrated_radio/beepsky(src)
..()
@@ -214,7 +205,7 @@
new/datum/data/pda/app/status_display)
-/obj/item/cartridge/rd/initialize()
+/obj/item/cartridge/rd/Initialize()
radio = new /obj/item/integrated_radio/signal(src)
..()
@@ -242,7 +233,7 @@
new/datum/data/pda/app/status_display)
-/obj/item/cartridge/captain/initialize()
+/obj/item/cartridge/captain/Initialize()
radio = new /obj/item/integrated_radio/beepsky(src)
..()
@@ -279,7 +270,7 @@
new/datum/data/pda/app/status_display)
-/obj/item/cartridge/centcom/initialize()
+/obj/item/cartridge/centcom/Initialize()
radio = new /obj/item/integrated_radio/beepsky(src)
..()
diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm
index 3c89c291300..b9dfe8ff7e4 100644
--- a/code/modules/pda/radio.dm
+++ b/code/modules/pda/radio.dm
@@ -173,7 +173,7 @@
radio_connection = null
return ..()
-/obj/item/integrated_radio/signal/initialize()
+/obj/item/integrated_radio/signal/Initialize()
if(!radio_controller)
return
if(src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 9c3d64ef4fc..3ba1a4b5210 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -682,7 +682,7 @@
else
user.put_in_hands(cell)
cell.add_fingerprint(user)
- cell.updateicon()
+ cell.update_icon()
src.cell = null
user.visible_message("[user.name] removes the power cell from [src.name]!", "You remove the power cell.")
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index c5b014576fc..25a47f19e04 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -72,19 +72,13 @@ By design, d1 is the smallest direction and d2 is the highest
var/turf/T = src.loc // hide if turf is not intact
if(level==1) hide(T.intact)
- cable_list += src //add it to the global cable list
-
- // Catches the interim-zone of worldstart and roundstart
- // I want both the ticker to exist (so mapped-in cables don't trip this)
- // but also not have started yet (since the zlevel system would handle this on its own otherwise)
- if((ticker && ticker.current_state < GAME_STATE_PLAYING))
- attempt_init()
+ LAZYADD(GLOB.cable_list, src) //add it to the global cable list
/obj/structure/cable/Destroy() // called when a cable is deleted
if(powernet)
cut_cable_from_powernet() // update the powernets
- cable_list -= src //remove it from global cable list
+ LAZYREMOVE(GLOB.cable_list, src) //remove it from global cable list
return ..() // then go ahead and delete the cable
///////////////////////////////////
@@ -462,7 +456,7 @@ obj/structure/cable/proc/cable_color(var/colorC)
powernet.remove_cable(src) //remove the cut cable from its powernet
// queue it to rebuild
- deferred_powernet_rebuilds += O
+ SSmachines.deferred_powernet_rebuilds += O
// Disconnect machines connected to nodes
if(d1 == 0) // if we cut a node (O-X) cable
@@ -507,9 +501,9 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
/obj/item/stack/cable_coil/suicide_act(mob/user)
if(locate(/obj/structure/stool) in user.loc)
- user.visible_message("[user] is making a noose with the [name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is making a noose with the [name]! It looks like [user.p_theyre()] trying to commit suicide.")
else
- user.visible_message("[user] is strangling \himself with the [name]! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is strangling [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.")
return(OXYLOSS)
/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/paramcolor = null)
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index f08e008089b..3bc2b5bc39b 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -1,8 +1,64 @@
-// the power cell
-// charge from 0 to 100%
-// fits in APC to provide backup power
+/obj/item/stock_parts/cell
+ name = "power cell"
+ desc = "A rechargeable electrochemical power cell."
+ icon = 'icons/obj/power.dmi'
+ icon_state = "cell"
+ item_state = "cell"
+ origin_tech = "powerstorage=1"
+ force = 5
+ throwforce = 5
+ throw_speed = 2
+ throw_range = 5
+ w_class = WEIGHT_CLASS_SMALL
+ var/charge = 0 // note %age conveted to actual charge in New
+ var/maxcharge = 1000
+ materials = list(MAT_METAL = 700, MAT_GLASS = 50)
+ var/rigged = FALSE // true if rigged to explode
+ var/chargerate = 100 //how much power is given every tick in a recharger
+ var/self_recharge = 0 //does it self recharge, over time, or not?
+ var/ratingdesc = TRUE
+ var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it.
+
+/obj/item/stock_parts/cell/New()
+ ..()
+ processing_objects.Add(src)
+ charge = maxcharge
+ if(ratingdesc)
+ desc += " This one has a power rating of [DisplayPower(maxcharge)], and you should not swallow it."
+ update_icon()
+
+/obj/item/stock_parts/cell/Destroy()
+ processing_objects.Remove(src)
+ return ..()
+
+/obj/item/stock_parts/cell/vv_edit_var(var_name, var_value)
+ switch(var_name)
+ if("self_recharge")
+ if(var_value)
+ processing_objects.Add(src)
+ else
+ processing_objects.Remove(src)
+ . = ..()
+
+/obj/item/stock_parts/cell/process()
+ if(self_recharge)
+ give(chargerate * 0.25)
+ else
+ return PROCESS_KILL
+
+/obj/item/stock_parts/cell/update_icon()
+ overlays.Cut()
+ if(grown_battery)
+ overlays += image('icons/obj/power.dmi', "grown_wires")
+ if(charge < 0.01)
+ return
+ else if(charge/maxcharge >=0.995)
+ overlays += "cell-o2"
+ else
+ overlays += "cell-o1"
+
/obj/item/stock_parts/cell/proc/percent() // return % charge of cell
- return 100.0*charge/maxcharge
+ return 100 * charge / maxcharge
// use power from a cell
/obj/item/stock_parts/cell/proc/use(amount)
@@ -20,24 +76,23 @@
explode()
return 0
if(maxcharge < amount)
- return 0
- var/power_used = min(maxcharge-charge,amount)
+ amount = maxcharge
+ var/power_used = min(maxcharge - charge, amount)
charge += power_used
return power_used
/obj/item/stock_parts/cell/examine(mob/user)
- if(..(user, 1))
- if(maxcharge <= 2500)
- to_chat(user, "[desc]\nThe manufacturer's label states this cell has a power rating of [maxcharge], and that you should not swallow it.\nThe charge meter reads [round(src.percent() )]%.")
- else
- to_chat(user, "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!\nThe charge meter reads [round(src.percent() )]%.")
+ ..()
+ if(rigged)
+ to_chat(user, "This power cell seems to be faulty!")
+ else
+ to_chat(user, "The charge meter reads [round(percent() )]%.")
-/obj/item/stock_parts/cell/attack_self(mob/user as mob)
- src.add_fingerprint(user)
- return
+/obj/item/stock_parts/cell/suicide_act(mob/user)
+ to_chat(viewers(user), "[user] is licking the electrodes of the [src]! It looks like [user.p_theyre()] trying to commit suicide.")
+ return (FIRELOSS)
/obj/item/stock_parts/cell/attackby(obj/item/W, mob/user, params)
- ..()
if(istype(W, /obj/item/reagent_containers/syringe))
var/obj/item/reagent_containers/syringe/S = W
@@ -45,34 +100,29 @@
if(S.reagents.has_reagent("plasma", 5) || S.reagents.has_reagent("plasma_dust", 5))
- rigged = 1
+ rigged = TRUE
log_admin("LOG: [key_name(user)] injected a power cell with plasma, rigging it to explode.")
message_admins("LOG: [key_name_admin(user)] injected a power cell with plasma, rigging it to explode.")
S.reagents.clear_reagents()
+ else
+ return ..()
/obj/item/stock_parts/cell/proc/explode()
- var/turf/T = get_turf(src.loc)
-/*
- * 1000-cell explosion(T, -1, 0, 1, 1)
- * 2500-cell explosion(T, -1, 0, 1, 1)
- * 10000-cell explosion(T, -1, 1, 3, 3)
- * 15000-cell explosion(T, -1, 2, 4, 4)
- * */
- if(charge==0)
+ var/turf/T = get_turf(loc)
+ if(charge == 0)
return
var/devastation_range = -1 //round(charge/11000)
- var/heavy_impact_range = round(sqrt(charge)/60)
- var/light_impact_range = round(sqrt(charge)/30)
+ var/heavy_impact_range = round(sqrt(charge) / 60)
+ var/light_impact_range = round(sqrt(charge) / 30)
var/flash_range = light_impact_range
- if(light_impact_range==0)
- rigged = 0
+ if(light_impact_range == 0)
+ rigged = FALSE
corrupt()
return
//explosion(T, 0, 1, 2, 2)
-
log_admin("LOG: Rigged power cell explosion, last touched by [fingerprintslast]")
message_admins("LOG: Rigged power cell explosion, last touched by [fingerprintslast]")
@@ -81,70 +131,242 @@
/obj/item/stock_parts/cell/proc/corrupt()
charge /= 2
- maxcharge /= 2
+ maxcharge = max(maxcharge / 2, chargerate)
if(prob(10))
- rigged = 1 //broken batterys are dangerous
+ rigged = TRUE //broken batterys are dangerous
/obj/item/stock_parts/cell/emp_act(severity)
charge -= 1000 / severity
if(charge < 0)
charge = 0
- if(reliability != 100 && prob(50/severity))
- reliability -= 10 / severity
..()
/obj/item/stock_parts/cell/ex_act(severity)
-
switch(severity)
- if(1.0)
+ if(EXPLODE_DEVASTATE)
qdel(src)
- return
- if(2.0)
+ if(EXPLODE_HEAVY)
if(prob(50))
qdel(src)
return
if(prob(50))
corrupt()
- if(3.0)
+ if(EXPLODE_LIGHT)
if(prob(25))
qdel(src)
return
if(prob(25))
corrupt()
- return
/obj/item/stock_parts/cell/blob_act()
- ex_act(1)
+ ex_act(EXPLODE_DEVASTATE)
/obj/item/stock_parts/cell/proc/get_electrocute_damage()
switch(charge)
-/* if(9000 to INFINITY)
- return min(rand(90,150),rand(90,150))
- if(2500 to 9000-1)
- return min(rand(70,145),rand(70,145))
- if(1750 to 2500-1)
- return min(rand(35,110),rand(35,110))
- if(1500 to 1750-1)
- return min(rand(30,100),rand(30,100))
- if(750 to 1500-1)
- return min(rand(25,90),rand(25,90))
- if(250 to 750-1)
- return min(rand(20,80),rand(20,80))
- if(100 to 250-1)
- return min(rand(20,65),rand(20,65))*/
if(5000000 to INFINITY)
- return min(rand(200,300),rand(200,300))
- if(4000000 to 5000000-1)
- return min(rand(80,180),rand(80,180))
- if(1000000 to 4000000-1)
- return min(rand(50,160),rand(50,160))
- if(200000 to 1000000-1)
- return min(rand(25,80),rand(25,80))
- if(100000 to 200000-1)//Ave powernet
- return min(rand(20,60),rand(20,60))
- if(50000 to 100000-1)
- return min(rand(15,40),rand(15,40))
- if(1000 to 50000-1)
- return min(rand(10,20),rand(10,20))
+ return min(rand(200, 300),rand(200, 300))
+ if(4000000 to 5000000 - 1)
+ return min(rand(80, 180),rand(80, 180))
+ if(1000000 to 4000000 - 1)
+ return min(rand(50, 160),rand(50, 160))
+ if(200000 to 1000000 - 1)
+ return min(rand(25, 80),rand(25, 80))
+ if(100000 to 200000 - 1)//Ave powernet
+ return min(rand(20, 60),rand(20, 60))
+ if(50000 to 100000 - 1)
+ return min(rand(15, 40),rand(15, 40))
+ if(1000 to 50000 - 1)
+ return min(rand(10, 20),rand(10, 20))
else
return 0
+
+// Cell variants
+/obj/item/stock_parts/cell/empty/New()
+ ..()
+ charge = 0
+
+/obj/item/stock_parts/cell/crap
+ name = "\improper Nanotrasen brand rechargeable AA battery"
+ desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
+ maxcharge = 500
+ materials = list(MAT_GLASS = 40)
+ rating = 2
+
+/obj/item/stock_parts/cell/crap/empty/New()
+ ..()
+ charge = 0
+ update_icon()
+
+/obj/item/stock_parts/cell/upgraded
+ name = "upgraded power cell"
+ desc = "A power cell with a slightly higher capacity than normal!"
+ maxcharge = 2500
+ materials = list(MAT_GLASS = 50)
+ rating = 2
+ chargerate = 1000
+
+/obj/item/stock_parts/cell/upgraded/plus
+ name = "upgraded power cell+"
+ desc = "A power cell with an even higher capacity than the base model!"
+ maxcharge = 5000
+
+/obj/item/stock_parts/cell/secborg
+ name = "security borg rechargeable D battery"
+ origin_tech = null
+ maxcharge = 600 //600 max charge / 100 charge per shot = six shots
+ materials = list(MAT_GLASS = 40)
+ rating = 2.5
+
+/obj/item/stock_parts/cell/secborg/empty/New()
+ ..()
+ charge = 0
+ update_icon()
+
+/obj/item/stock_parts/cell/pulse //200 pulse shots
+ name = "pulse rifle power cell"
+ maxcharge = 40000
+ rating = 3
+ chargerate = 1500
+
+/obj/item/stock_parts/cell/pulse/carbine //25 pulse shots
+ name = "pulse carbine power cell"
+ maxcharge = 5000
+
+/obj/item/stock_parts/cell/pulse/pistol //10 pulse shots
+ name = "pulse pistol power cell"
+ maxcharge = 2000
+
+/obj/item/stock_parts/cell/high
+ name = "high-capacity power cell"
+ origin_tech = "powerstorage=2"
+ icon_state = "hcell"
+ maxcharge = 10000
+ materials = list(MAT_GLASS = 60)
+ rating = 3
+ chargerate = 1500
+
+/obj/item/stock_parts/cell/high/plus
+ name = "high-capacity power cell+"
+ desc = "Where did these come from?"
+ icon_state = "h+cell"
+ maxcharge = 15000
+ chargerate = 2250
+
+/obj/item/stock_parts/cell/high/empty/New()
+ ..()
+ charge = 0
+ update_icon()
+
+/obj/item/stock_parts/cell/super
+ name = "super-capacity power cell"
+ origin_tech = "powerstorage=3;materials=3"
+ icon_state = "scell"
+ maxcharge = 20000
+ materials = list(MAT_GLASS = 300)
+ rating = 4
+ chargerate = 2000
+
+/obj/item/stock_parts/cell/super/empty/New()
+ ..()
+ charge = 0
+ update_icon()
+
+/obj/item/stock_parts/cell/hyper
+ name = "hyper-capacity power cell"
+ origin_tech = "powerstorage=4;engineering=4;materials=4"
+ icon_state = "hpcell"
+ maxcharge = 30000
+ materials = list(MAT_GLASS = 400)
+ rating = 5
+ chargerate = 3000
+
+/obj/item/stock_parts/cell/hyper/empty/New()
+ ..()
+ charge = 0
+ update_icon()
+
+/obj/item/stock_parts/cell/bluespace
+ name = "bluespace power cell"
+ desc = "A rechargeable transdimensional power cell."
+ origin_tech = "powerstorage=5;bluespace=4;materials=4;engineering=4"
+ icon_state = "bscell"
+ maxcharge = 40000
+ materials = list(MAT_GLASS = 600)
+ rating = 6
+ chargerate = 4000
+
+/obj/item/stock_parts/cell/bluespace/empty/New()
+ ..()
+ charge = 0
+ update_icon()
+
+/obj/item/stock_parts/cell/infinite
+ name = "infinite-capacity power cell!"
+ icon_state = "icell"
+ origin_tech = "powerstorage=7"
+ maxcharge = 30000
+ materials = list(MAT_GLASS=1000)
+ rating = 6
+ chargerate = 30000
+
+/obj/item/stock_parts/cell/infinite/use()
+ return 1
+
+/obj/item/stock_parts/cell/infinite/abductor
+ name = "void core"
+ desc = "An alien power cell that produces energy seemingly out of nowhere."
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "cell"
+ maxcharge = 50000
+ rating = 12
+ ratingdesc = FALSE
+
+/obj/item/stock_parts/cell/infinite/abductor/update_icon()
+ return
+
+
+/obj/item/stock_parts/cell/potato
+ name = "potato battery"
+ desc = "A rechargeable starch based power cell."
+ icon = 'icons/obj/hydroponics/harvest.dmi'
+ icon_state = "potato"
+ origin_tech = "powerstorage=1;biotech=1"
+ charge = 100
+ maxcharge = 300
+ materials = list()
+ rating = 1
+ grown_battery = TRUE //it has the overlays for wires
+
+/obj/item/stock_parts/cell/high/slime
+ name = "charged slime core"
+ desc = "A yellow slime core infused with plasma, it crackles with power."
+ origin_tech = "powerstorage=5;biotech=4"
+ icon = 'icons/mob/slimes.dmi'
+ icon_state = "yellow slime extract"
+ materials = list()
+ rating = 5 //self-recharge makes these desirable
+ self_recharge = 1 // Infused slime cores self-recharge, over time
+ chargerate = 500
+
+/obj/item/stock_parts/cell/emproof
+ name = "\improper EMP-proof cell"
+ desc = "An EMP-proof cell."
+ maxcharge = 500
+ rating = 3
+
+/obj/item/stock_parts/cell/emproof/empty/New()
+ ..()
+ charge = 0
+ update_icon()
+
+/obj/item/stock_parts/cell/emproof/emp_act(severity)
+ return
+
+/obj/item/stock_parts/cell/emproof/corrupt()
+ return
+
+/obj/item/stock_parts/cell/ninja
+ name = "spider-clan power cell"
+ desc = "A standard ninja-suit power cell."
+ maxcharge = 10000
+ materials = list(MAT_GLASS = 60)
\ No newline at end of file
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index 4def1c3b067..8c9ee3eda0d 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -35,7 +35,7 @@
if(powernet)
disconnect_from_network()
-/obj/machinery/power/generator/initialize()
+/obj/machinery/power/generator/Initialize()
..()
connect()
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index ad73a6ff0ad..42f7cbde657 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -85,20 +85,12 @@ var/const/GRAV_NEEDS_WRENCH = 3
// Generator which spawns with the station.
//
-/obj/machinery/gravity_generator/main/station/initialize()
+/obj/machinery/gravity_generator/main/station/Initialize()
..()
setup_parts()
middle.overlays += "activated"
update_list()
-//
-// Generator an admin can spawn
-//
-
-/obj/machinery/gravity_generator/main/station/admin/New()
- ..()
- initialize()
-
//
// Main Generator with the main code
//
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 3eac3486791..df12267015f 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -726,7 +726,7 @@
update()
/obj/item/light/suicide_act(mob/living/carbon/human/user)
- user.visible_message("[user] touches \the [src], burning their hands off!", "You touch \the [src], burning your hands off!")
+ user.visible_message("[user] touches [src], burning [user.p_their()] hands off!", "You touch [src], burning your hands off!")
for(var/oname in list("l_hand", "r_hand"))
var/obj/item/organ/external/limb = user.get_organ(oname)
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 72e30b9d29a..2892d0245b2 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -112,7 +112,7 @@
var/temperature = 0 //The current temperature
var/overheating = 0 //if this gets high enough the generator explodes
-/obj/machinery/power/port_gen/pacman/initialize()
+/obj/machinery/power/port_gen/pacman/Initialize()
..()
if(anchored)
connect_to_network()
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index fd5946b7dc4..15b47a47635 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -232,26 +232,6 @@
. += C
return .
-/hook/startup/proc/buildPowernets()
- return makepowernets()
-
-// rebuild all power networks from scratch - only called at world creation or by the admin verb
-/proc/makepowernets()
- for(var/datum/powernet/PN in powernets)
- qdel(PN)
- powernets.Cut()
-
- for(var/obj/structure/cable/PC in cable_list)
- makepowernet_for(PC)
-
- return 1
-
-/proc/makepowernet_for(var/obj/structure/cable/PC)
- if(!PC.powernet)
- var/datum/powernet/NewPN = new()
- NewPN.add_cable(PC)
- propagate_network(PC,PC.powernet)
-
//remove the old powernet and replace it with a new one throughout the network.
/proc/propagate_network(var/obj/O, var/datum/powernet/PN)
//log_world("propagating new network")
diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm
index 416de55f6c3..a07d854380d 100644
--- a/code/modules/power/powernet.dm
+++ b/code/modules/power/powernet.dm
@@ -16,7 +16,7 @@
/datum/powernet/New()
- powernets += src
+ SSmachines.powernets += src
..()
/datum/powernet/Destroy()
@@ -28,7 +28,7 @@
nodes -= M
M.powernet = null
- powernets -= src
+ SSmachines.powernets -= src
return ..()
//Returns the amount of excess power (before refunding to SMESs) from last tick.
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 58cecbc8ecc..a6c86d3f2ef 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -76,12 +76,13 @@
return
rotate()
-/obj/machinery/power/emitter/initialize()
+/obj/machinery/power/emitter/Initialize()
..()
if(state == 2 && anchored)
connect_to_network()
if(frequency)
set_frequency(frequency)
+
/obj/machinery/power/emitter/multitool_menu(var/mob/user,var/obj/item/multitool/P)
return {"
@@ -120,7 +121,7 @@
if(radio_controller)
radio_controller.remove_object(src, frequency)
radio_connection = null
- msg_admin_attack("Emitter deleted at ([x],[y],[z] - [ADMIN_JMP(src)])", 0, 1)
+ msg_admin_attack("Emitter deleted at ([x],[y],[z] - [ADMIN_JMP(src)])", ATKLOG_FEW)
log_game("Emitter deleted at ([x],[y],[z])")
investigate_log("deleted at ([x],[y],[z])","singulo")
return ..()
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 9a911400fd5..0520630dcac 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -10,6 +10,7 @@
move_self = 1 //Do we move on our own?
grav_pull = 5 //How many tiles out do we pull?
consume_range = 6 //How many tiles out do we eat
+ gender = FEMALE
/obj/singularity/narsie/large
name = "Nar-Sie"
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index b8570de2c78..42fbb784f49 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -227,7 +227,7 @@
active = !active
investigate_log("turned [active?"ON":"OFF"] by [usr ? usr.key : "outside forces"]","singulo")
if(active)
- msg_admin_attack("PA Control Computer turned ON by [key_name_admin(usr)]",0,1)
+ msg_admin_attack("PA Control Computer turned ON by [key_name_admin(usr)]", ATKLOG_FEW)
log_game("PA Control Computer turned ON by [key_name(usr)] in ([x],[y],[z])")
use_log += text("\[[time_stamp()]\] [key_name(usr)] has turned on the PA Control Computer.")
if(active)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index e69abc5b00f..e5a669ef860 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -13,6 +13,7 @@
icon_state = "smes"
density = 1
anchored = 1
+ defer_process = 1
var/capacity = 5e6 // maximum charge
var/charge = 0 // actual charge
@@ -39,7 +40,6 @@
var/building_terminal = 0 //Suggestions about how to avoid clickspam building several terminals accepted!
var/obj/machinery/power/terminal/terminal = null
-
/obj/machinery/power/smes/New()
..()
component_parts = list()
@@ -224,8 +224,6 @@
/obj/machinery/power/smes/proc/chargedisplay()
return round(5.5*charge/(capacity ? capacity : 5e6))
-#define SMESRATE 0.05
-
/obj/machinery/power/smes/process()
if(stat & BROKEN) return
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index c55a206ebfa..a2025376e9d 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -300,7 +300,7 @@
track = 2 // Auto tracking mode
autostart = 1 // Automatically start
-/obj/machinery/power/solar_control/initialize()
+/obj/machinery/power/solar_control/Initialize()
..()
if(!powernet)
return
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index be17b3f65db..43d418aadf7 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -244,7 +244,7 @@
ui_interact(user)
/obj/machinery/power/supermatter_shard/attack_hand(mob/user as mob)
- user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\
+ user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... [user.p_their(TRUE)] body starts to glow and bursts into flames before flashing into ash.",\
"You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\
"You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")
@@ -309,7 +309,7 @@
/obj/machinery/power/supermatter_shard/Bumped(atom/AM as mob|obj)
if(istype(AM, /mob/living))
- AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
+ AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... [AM.p_their(TRUE)] body starts to glow and catch flame before flashing into ash.",\
"You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
"You hear an unearthly noise as a wave of heat washes over you.")
else if(isobj(AM) && !istype(AM, /obj/effect))
diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm
index 5f8f8c1b8e4..762d442a2a9 100644
--- a/code/modules/power/treadmill.dm
+++ b/code/modules/power/treadmill.dm
@@ -18,7 +18,7 @@
var/list/mobs_running[0]
var/id = null // for linking to monitor
-/obj/machinery/power/treadmill/initialize()
+/obj/machinery/power/treadmill/Initialize()
..()
if(anchored)
connect_to_network()
@@ -137,7 +137,7 @@
var/frame = 0 // on 0, show labels, on 1 show numbers
var/redeem_immediately = 0 // redeem immediately for holding cell
-/obj/machinery/treadmill_monitor/initialize()
+/obj/machinery/treadmill_monitor/Initialize()
..()
if(id)
for(var/obj/machinery/power/treadmill/T in machines)
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index a385f51863e..641682490d4 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -82,7 +82,7 @@
inturf = get_step(src, dir)
-/obj/machinery/power/compressor/initialize()
+/obj/machinery/power/compressor/Initialize()
..()
locate_machinery()
if(!turbine)
@@ -202,7 +202,7 @@
outturf = get_step(src, dir)
-/obj/machinery/power/turbine/initialize()
+/obj/machinery/power/turbine/Initialize()
..()
locate_machinery()
if(!compressor)
@@ -341,7 +341,7 @@
-/obj/machinery/computer/turbine_computer/initialize()
+/obj/machinery/computer/turbine_computer/Initialize()
..()
spawn(10)
locate_machinery()
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 63f533d91ec..130fda822fd 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -29,7 +29,7 @@
/obj/item/ammo_casing/update_icon()
..()
icon_state = "[initial(icon_state)][BB ? "-live" : ""]"
- desc = "[initial(desc)][BB ? "" : " This one is spent"]"
+ desc = "[initial(desc)][BB ? "" : " This one is spent."]"
/obj/item/ammo_casing/proc/newshot(params) //For energy weapons, shotgun shells and wands (!).
if(!BB)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index b54d5bff21f..51bf515ca1e 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -347,7 +347,7 @@ obj/item/gun/proc/newshot()
return
if(user == target)
- target.visible_message("[user] sticks [src] in their mouth, ready to pull the trigger...", \
+ target.visible_message("[user] sticks [src] in [user.p_their()] mouth, ready to pull the trigger...", \
"You stick [src] in your mouth, ready to pull the trigger...")
else
target.visible_message("[user] points [src] at [target]'s head, ready to pull the trigger...", \
diff --git a/code/modules/projectiles/guns/dartgun.dm b/code/modules/projectiles/guns/dartgun.dm
index 5ae089d5522..c279abdc5c1 100644
--- a/code/modules/projectiles/guns/dartgun.dm
+++ b/code/modules/projectiles/guns/dartgun.dm
@@ -178,7 +178,8 @@
else
M.LAssailant = user
- add_attack_logs(user, M, "Shot with dartgun containing [R]", !!M.ckey)
+ add_attack_logs(user, M, "Shot with dartgun containing [R]")
+
if(D.reagents)
D.reagents.trans_to(M, 15)
to_chat(M, "You feel a slight prick.")
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index fd6c14c4e6b..795b5942845 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -146,10 +146,10 @@
/obj/item/gun/energy/suicide_act(mob/user)
if(can_shoot())
- user.visible_message("[user] is putting the barrel of the [name] in \his mouth. It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is putting the barrel of the [name] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.")
sleep(25)
if(user.l_hand == src || user.r_hand == src)
- user.visible_message("[user] melts \his face off with the [name]!")
+ user.visible_message("[user] melts [user.p_their()] face off with the [name]!")
playsound(loc, fire_sound, 50, 1, -1)
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
power_supply.use(shot.e_cost)
@@ -159,7 +159,7 @@
user.visible_message("[user] panics and starts choking to death!")
return(OXYLOSS)
else
- user.visible_message("[user] is pretending to blow \his brains out with the [name]! It looks like \he's trying to commit suicide!")
+ user.visible_message("[user] is pretending to blow [user.p_their()] brains out with the [name]! It looks like [user.p_theyre()] trying to commit suicide!")
playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
return (OXYLOSS)
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 8965432aac0..7559fc1a591 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -128,7 +128,7 @@
/obj/item/gun/energy/kinetic_accelerator/suicide_act(mob/user)
if(!suppressed)
playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
- user.visible_message("[user] cocks the [name] and pretends to blow \his brains out! It looks like \he's trying to commit suicide!")
+ user.visible_message("[user] cocks the [name] and pretends to blow [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!")
shoot_live_shot()
return (OXYLOSS)
@@ -342,9 +342,9 @@
user << browse("Temperature Gun Configuration[dat]", "window=tempgun;size=510x120")
onclose(user, "tempgun")
-/obj/item/gun/energy/temperature/attackby(obj/item/W as obj, mob/user as mob)
- if(istype(W, /obj/item/card/emag) && !emagged)
- emagged = 1
+/obj/item/gun/energy/temperature/emag_act(mob/user)
+ if(!emagged)
+ emagged = TRUE
to_chat(user, "You double the gun's temperature cap! Targets hit by searing beams will burst into flames!")
desc = "A gun that changes the body temperature of its targets. Its temperature cap has been hacked."
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index a1840663350..94f397b45bf 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -76,6 +76,6 @@
return
/obj/item/gun/magic/suicide_act(mob/user)
- user.visible_message("[user] is twisting the [name] above \his head, releasing a magical blast! It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is twisting the [name] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, fire_sound, 50, 1, -1)
return FIRELOSS
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index 1a8e5e45946..cae9d11cbb6 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -48,9 +48,9 @@
update_icon()
/obj/item/gun/magic/wand/proc/zap_self(mob/living/user)
- user.visible_message("[user] zaps \himself with [src].")
+ user.visible_message("[user] zaps [user.p_them()]self with [src].")
playsound(user, fire_sound, 50, 1)
- user.create_attack_log("[key_name(user)] zapped \himself with a [src]")
+ user.create_attack_log("[key_name(user)] zapped [user.p_them()]self with a [src]")
/////////////////////////////////////
//WAND OF DEATH
diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm
index f6881208a32..89cceab6cd3 100644
--- a/code/modules/projectiles/guns/misc/blastcannon.dm
+++ b/code/modules/projectiles/guns/misc/blastcannon.dm
@@ -76,7 +76,7 @@
var/heavy = power * 0.2
var/medium = power * 0.5
var/light = power
- user.visible_message("[user] opens [bomb] on \his [name] and fires a blast wave at [target]!","You open [bomb] on your [name] and fire a blast wave at [target]!")
+ user.visible_message("[user] opens [bomb] on [user.p_their()] [name] and fires a blast wave at [target]!","You open [bomb] on your [name] and fire a blast wave at [target]!")
playsound(user, "explosion", 100, 1)
var/turf/starting = get_turf(user)
var/turf/targturf = get_turf(target)
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 2b8ff6a59f8..0ff5e57e7c5 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -137,17 +137,17 @@
/obj/item/gun/projectile/suicide_act(mob/user)
if(chambered && chambered.BB && !chambered.BB.nodamage)
- user.visible_message("[user] is putting the barrel of the [name] in \his mouth. It looks like \he's trying to commit suicide.")
+ user.visible_message("[user] is putting the barrel of the [name] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.")
sleep(25)
if(user.l_hand == src || user.r_hand == src)
process_fire(user, user, 0, zone_override = "head")
- user.visible_message("[user] blows \his brains out with the [name]!")
+ user.visible_message("[user] blows [user.p_their()] brains out with the [name]!")
return(BRUTELOSS)
else
user.visible_message("[user] panics and starts choking to death!")
return(OXYLOSS)
else
- user.visible_message("[user] is pretending to blow \his brains out with the [name]! It looks like \he's trying to commit suicide!")
+ user.visible_message("[user] is pretending to blow [user.p_their()] brains out with the [name]! It looks like [user.p_theyre()] trying to commit suicide!")
playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
return (OXYLOSS)
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 502c69bed9c..c4c6f76a963 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -244,7 +244,7 @@
if(zone == "head" || zone == "eyes" || zone == "mouth")
shoot_self(user, zone)
else
- user.visible_message("[user.name] cowardly fires [src] at \his [zone]!", "You cowardly fire [src] at your [zone]!", "You hear a gunshot!")
+ user.visible_message("[user.name] cowardly fires [src] at [user.p_their()] [zone]!", "You cowardly fire [src] at your [zone]!", "You hear a gunshot!")
return
user.visible_message("*click*")
@@ -252,7 +252,7 @@
/obj/item/gun/projectile/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = "head")
user.apply_damage(300, BRUTE, affecting)
- user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a gunshot!")
+ user.visible_message("[user.name] fires [src] at [user.p_their()] head!", "You fire [src] at your head!", "You hear a gunshot!")
/obj/item/gun/projectile/revolver/capgun
name = "cap gun"
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index a378e291e7c..e38a42ff88f 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -114,13 +114,18 @@
"[L] is hit by \a [src][organ_hit_text]!") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
var/reagent_note
+ var/has_reagents = FALSE
if(reagents && reagents.reagent_list)
reagent_note = " REAGENTS:"
for(var/datum/reagent/R in reagents.reagent_list)
reagent_note += R.id + " ("
reagent_note += num2text(R.volume) + ") "
+ has_reagents = TRUE
if(!log_override && firer && original)
- add_attack_logs(firer, L, "Shot with a [type] (potentially containing [reagent_note])")
+ if(has_reagents)
+ add_attack_logs(firer, L, "Shot with a [type] (containing [reagent_note])")
+ else
+ add_attack_logs(firer, L, "Shot with a [type]")
return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
/obj/item/projectile/proc/get_splatter_blockage(var/turf/step_over, var/atom/target, var/splatter_dir, var/target_loca) //Check whether the place we want to splatter blood is blocked (i.e. by windows).
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index becada9f19e..761fb50179c 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -77,7 +77,7 @@
/obj/item/projectile/beam/lasertag
name = "laser tag beam"
icon_state = "omnilaser"
- hitsound = null
+ hitsound = 'sound/weapons/tap.ogg'
damage = 0
damage_type = STAMINA
flag = "laser"
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 4521dc8d7ba..3fe2277ed3b 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -32,7 +32,7 @@
else
G.death()
- visible_message("[G] topples backwards as the death bolt impacts them!")
+ visible_message("[G] topples backwards as the death bolt impacts [G.p_them()]!")
/obj/item/projectile/magic/fireball/Range()
var/turf/T1 = get_step(src,turn(dir, -45))
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 16cedc0244d..2c774b7f3dd 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -8,14 +8,14 @@
/obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0)
..()
- empulse(target, 1, 1)
+ empulse(target, 1, 1, 1)
return 1
/obj/item/projectile/ion/weak
/obj/item/projectile/ion/weak/on_hit(atom/target, blocked = 0)
..()
- empulse(target, 0, 0)
+ empulse(target, 0, 0, 1)
return 1
/obj/item/projectile/bullet/gyro
@@ -52,7 +52,7 @@
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
/obj/item/projectile/temp/New(loc, shot_temp)
- ..(loc)
+ ..()
if(!isnull(shot_temp))
temperature = shot_temp
switch(temperature)
@@ -86,7 +86,6 @@
else
name = "temperature beam"//failsafe
icon_state = "temp_4"
- ..()
/obj/item/projectile/temp/on_hit(var/atom/target, var/blocked = 0)//These two could likely check temp protection on the mob
@@ -138,7 +137,7 @@
if(prob(15))
M.apply_effect((rand(30,80)),IRRADIATE)
M.Weaken(5)
- M.visible_message("[M] writhes in pain as \his vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.")
+ M.visible_message("[M] writhes in pain as [M.p_their()] vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.")
if(prob(35))
if(prob(80))
randmutb(M)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index e589936a935..d4d232d2ed7 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -1,7 +1,3 @@
-#define SOLID 1
-#define LIQUID 2
-#define GAS 3
-
/obj/machinery/chem_dispenser
name = "chem dispenser"
density = 1
diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm
index 6a4ede5fe50..a2bd35ae75a 100644
--- a/code/modules/reagents/chemistry/reagents/drugs.dm
+++ b/code/modules/reagents/chemistry/reagents/drugs.dm
@@ -208,7 +208,7 @@
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 7)
M.emote("scream")
- M.visible_message("[M] nervously scratches at their skin!")
+ M.visible_message("[M] nervously scratches at [M.p_their()] skin!")
M.Jitter(10)
M.adjustBruteLoss(5)
M.emote("twitch_s")
@@ -315,7 +315,7 @@
var/effect = ..()
if(severity == 1)
if(effect <= 2)
- M.visible_message("[M] can't seem to control their legs!")
+ M.visible_message("[M] can't seem to control [M.p_their()] legs!")
M.AdjustConfused(20)
M.Weaken(4)
else if(effect <= 4)
@@ -356,7 +356,7 @@
head_organ.f_style = "Very Long Beard"
H.update_hair()
H.update_fhair()
- H.visible_message("[H] has a wild look in their eyes!")
+ H.visible_message("[H] has a wild look in [H.p_their()] eyes!")
if(check < 60)
M.SetParalysis(0)
M.SetStunned(0)
@@ -368,7 +368,7 @@
M.AdjustConfused(10)
if(check < 8)
M.reagents.add_reagent(pick("methamphetamine", "crank", "neurotoxin"), rand(1,5))
- M.visible_message("[M] scratches at something under their skin!")
+ M.visible_message("[M] scratches at something under [M.p_their()] skin!")
M.adjustBruteLoss(5)
else if(check < 16)
M.AdjustHallucinate(30)
@@ -427,7 +427,7 @@
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 7)
M.emote("scream")
- M.visible_message("[M] tears at their own skin!")
+ M.visible_message("[M] tears at [M.p_their()] own skin!")
M.adjustBruteLoss(5)
M.reagents.add_reagent("jagged_crystals", 5)
M.emote("twitch")
@@ -541,7 +541,7 @@
var/effect = ..()
if(severity == 1)
if(effect <= 2)
- M.visible_message("[M] can't seem to control their legs!")
+ M.visible_message("[M] can't seem to control [M.p_their()] legs!")
M.AdjustConfused(33)
M.Weaken(2)
else if(effect <= 4)
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index ada22d5b139..d1b44798b85 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -73,7 +73,7 @@
M.visible_message("[M] suddenly and violently vomits!")
M.fakevomit(no_text = 1)
else if(effect <= 5)
- M.visible_message("[M] staggers and drools, their eyes bloodshot!")
+ M.visible_message("[M] staggers and drools, [M.p_their()] eyes bloodshot!")
M.Dizzy(8)
M.Weaken(4)
if(effect <= 15)
@@ -115,7 +115,11 @@
M.adjustToxLoss(-3)
M.adjustBruteLoss(-12)
M.adjustFireLoss(-12)
- M.status_flags &= ~DISFIGURED
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ var/obj/item/organ/external/head/head = H.get_organ("head")
+ if(head)
+ head.disfigured = FALSE
..()
/datum/reagent/medicine/rezadone
@@ -131,7 +135,11 @@
M.adjustCloneLoss(-1) //What? We just set cloneloss to 0. Why? Simple; this is so external organs properly unmutate.
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
- M.status_flags &= ~DISFIGURED
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ var/obj/item/organ/external/head/head = H.get_organ("head")
+ if(head)
+ head.disfigured = FALSE
..()
/datum/reagent/medicine/rezadone/overdose_process(mob/living/M, severity)
@@ -277,7 +285,7 @@
if(severity == 1) //lesser
M.stuttering += 1
if(effect <= 1)
- M.visible_message("[M] suddenly cluches their gut!")
+ M.visible_message("[M] suddenly cluches [M.p_their()] gut!")
M.emote("scream")
M.Stun(4)
M.Weaken(4)
@@ -293,7 +301,7 @@
M.Jitter(30)
else if(severity == 2) // greater
if(effect <= 2)
- M.visible_message("[M] suddenly cluches their gut!")
+ M.visible_message("[M] suddenly cluches [M.p_their()] gut!")
M.emote("scream")
M.Stun(7)
M.Weaken(7)
@@ -446,7 +454,7 @@
M.visible_message("[M] suddenly and violently vomits!")
M.fakevomit(no_text = 1)
else if(effect <= 5)
- M.visible_message("[M.name] staggers and drools, their eyes bloodshot!")
+ M.visible_message("[M.name] staggers and drools, [M.p_their()] eyes bloodshot!")
M.Dizzy(2)
M.Weaken(3)
if(effect <= 15)
@@ -597,7 +605,7 @@
M.visible_message("[M] suddenly and violently vomits!")
M.fakevomit(no_text = 1)
else if(effect <= 5)
- M.visible_message("[M] staggers and drools, their eyes bloodshot!")
+ M.visible_message("[M] staggers and drools, [M.p_their()] eyes bloodshot!")
M.Dizzy(2)
M.Weaken(3)
if(effect <= 15)
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 8cad5400c02..7bff61218c6 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -557,7 +557,7 @@
M.adjustBruteLoss(5)
M.Weaken(5)
M.AdjustJitter(6)
- M.visible_message("[M] falls to the floor, scratching themselves violently!")
+ M.visible_message("[M] falls to the floor, scratching [M.p_them()]self violently!")
M.emote("scream")
..()
@@ -611,11 +611,11 @@
return
if(!H.unacidable)
- var/obj/item/organ/external/affecting = H.get_organ("head")
- affecting.receive_damage(0, 75)
+ var/obj/item/organ/external/head/affecting = H.get_organ("head")
+ if(affecting)
+ affecting.receive_damage(0, 75)
H.UpdateDamageIcon()
H.emote("scream")
- H.status_flags |= DISFIGURED
/datum/reagent/facid/reaction_obj(obj/O, volume)
if((istype(O, /obj/item) || istype(O, /obj/structure/glowshroom)))
@@ -947,8 +947,7 @@
/datum/reagent/glyphosate/reaction_obj(obj/O, volume)
if(istype(O,/obj/structure/alien/weeds))
var/obj/structure/alien/weeds/alien_weeds = O
- alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
- alien_weeds.healthcheck()
+ alien_weeds.take_damage(rand(15, 35), BRUTE, 0) // Kills alien weeds pretty fast
else if(istype(O, /obj/structure/glowshroom)) //even a small amount is enough to kill it
qdel(O)
else if(istype(O, /obj/structure/spacevine))
@@ -1016,7 +1015,7 @@
M.Drowsy(10)
if(11)
M.Paralyse(10)
- M.visible_message("[M] seizes up and falls limp, their eyes dead and lifeless...") //so you can't trigger deathgasp emote on people. Edge case, but necessary.
+ M.visible_message("[M] seizes up and falls limp, [M.p_their()] eyes dead and lifeless...") //so you can't trigger deathgasp emote on people. Edge case, but necessary.
if(12 to 60)
M.Paralyse(10)
if(61 to INFINITY)
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index 74a9b740c62..c7acc705150 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -214,19 +214,18 @@ datum/chemical_reaction/flash_powder
var/datum/effect_system/smoke_spread/chem/S = new
S.attach(location)
playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
- spawn(0)
- if(S)
- S.set_up(holder, 10, 0, location)
- if(created_volume < 5)
- S.start(1)
- if(created_volume >=5 && created_volume < 10)
- S.start(2)
- if(created_volume >= 10 && created_volume < 15)
- S.start(3)
- if(created_volume >=15)
- S.start(4)
- if(holder && holder.my_atom)
- holder.clear_reagents()
+ if(S)
+ S.set_up(holder, 10, 0, location)
+ if(created_volume < 5)
+ S.start(1)
+ if(created_volume >=5 && created_volume < 10)
+ S.start(2)
+ if(created_volume >= 10 && created_volume < 15)
+ S.start(3)
+ if(created_volume >=15)
+ S.start(4)
+ if(holder && holder.my_atom)
+ holder.clear_reagents()
/datum/chemical_reaction/smoke/smoke_powder
name = "smoke_powder_smoke"
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index aa5e16adc04..4df7a525b88 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -334,7 +334,7 @@
/datum/chemical_reaction/slimeoverload/on_reaction(datum/reagents/holder, created_volume)
feedback_add_details("slime_cores_used","[type]")
- empulse(get_turf(holder.my_atom), 3, 7)
+ empulse(get_turf(holder.my_atom), 3, 7, 1)
/datum/chemical_reaction/slimecell
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 057a339649c..ad8b3438ee4 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -85,7 +85,7 @@
var/datum/reagent/injected = chemical_reagents_list[reagent_ids[mode]]
var/contained = injected.name
var/trans = R.trans_to(M, amount_per_transfer_from_this)
- add_attack_logs(M, user, "Injected with [name] containing [contained], transfered [trans] units", !!M.ckey)
+ add_attack_logs(M, user, "Injected with [name] containing [contained], transfered [trans] units")
M.LAssailant = user
to_chat(user, "[trans] units injected. [R.total_volume] units remaining.")
return
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index 39d3babf4bc..d20ef6f82ee 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -42,7 +42,8 @@
/obj/machinery/constructable_frame,
/obj/machinery/icemachine,
/obj/item/bombcore/chemical,
- /obj/machinery/vending)
+ /obj/machinery/vending,
+ /obj/machinery/fishtank)
/obj/item/reagent_containers/glass/New()
..()
@@ -82,7 +83,7 @@
for(var/datum/reagent/R in reagents.reagent_list)
injected += R.name
var/contained = english_list(injected)
- add_attack_logs(M, user, "Splashed with [name] containing [contained]", !!M.ckey)
+ add_attack_logs(M, user, "Splashed with [name] containing [contained]", !!M.ckey ? null : ATKLOG_ALL)
if(!iscarbon(user))
M.LAssailant = null
else
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index e405dbe169c..02ab4408acb 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -49,14 +49,14 @@
user.newtonian_move(get_dir(A, user))
if(reagents.has_reagent("sacid"))
- msg_admin_attack("[key_name_admin(user)] fired sulphuric acid from \a [src].")
- log_game("[key_name(user)] fired sulphuric acid from \a [src].")
+ msg_admin_attack("[key_name_admin(user)] fired sulphuric acid from \a [src] at [COORD(user)].", ATKLOG_FEW)
+ log_game("[key_name(user)] fired sulphuric acid from \a [src] at [COORD(user)].")
if(reagents.has_reagent("facid"))
- msg_admin_attack("[key_name_admin(user)] fired fluorosulfuric acid from \a [src].")
- log_game("[key_name(user)] fired fluorosulfuric Acid from \a [src].")
+ msg_admin_attack("[key_name_admin(user)] fired fluorosulfuric acid from \a [src] at [COORD(user)].", ATKLOG_FEW)
+ log_game("[key_name(user)] fired fluorosulfuric Acid from \a [src] at [COORD(user)].")
if(reagents.has_reagent("lube"))
- msg_admin_attack("[key_name_admin(user)] fired space lube from \a [src].")
- log_game("[key_name(user)] fired space lube from \a [src].")
+ msg_admin_attack("[key_name_admin(user)] fired space lube from \a [src] at [COORD(user)].")
+ log_game("[key_name(user)] fired space lube from \a [src] at [COORD(user)].")
return
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index a80c4142d87..bcbcad6bc98 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -9,6 +9,7 @@
var/tank_volume = 1000 //In units, how much the dispenser can hold
var/reagent_id = "water" //The ID of the reagent that the dispenser uses
+ var/lastrigger = "" // The last person to rig this fuel tank - Stored with the object. Only the last person matter for investigation
/obj/structure/reagent_dispensers/attackby(obj/item/W, mob/user, params)
return
@@ -77,11 +78,16 @@
..()
if(!QDELETED(src)) //wasn't deleted by the projectile's effects.
if(!P.nodamage && ((P.damage_type == BURN) || (P.damage_type == BRUTE)))
- message_admins("[key_name_admin(P.firer)] triggered a fueltank explosion.")
- log_game("[key_name(P.firer)] triggered a fueltank explosion.")
+ message_admins("[key_name_admin(P.firer)] triggered a fueltank explosion with [P.name] at [COORD(loc)] ")
+ log_game("[key_name(P.firer)] triggered a fueltank explosion with [P.name] at [COORD(loc)]")
+ investigate_log("[key_name(P.firer)] triggered a fueltank explosion with [P.name] at [COORD(loc)]", INVESTIGATE_BOMB)
boom()
-/obj/structure/reagent_dispensers/fueltank/boom()
+/obj/structure/reagent_dispensers/fueltank/boom(var/rigtrigger = FALSE) // Prevent case where someone who rigged the tank is blamed for the explosion when the rig isn't what triggered the explosion
+ if(rigtrigger == TRUE) // If the explosion is triggered by an assembly holder
+ message_admins("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]") // Then admin is informed of the last person who rigged the fuel tank
+ log_game("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]")
+ investigate_log("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]", INVESTIGATE_BOMB)
explosion(loc, 0, 1, 5, 7, 10, flame_range = 5)
qdel(src)
@@ -111,6 +117,7 @@
usr.visible_message("[usr] detaches [rig] from [src].", "You detach [rig] from [src].")
rig.forceMove(get_turf(usr))
rig = null
+ lastrigger = null
overlays.Cut()
/obj/structure/reagent_dispensers/fueltank/attackby(obj/item/I, mob/user, params)
@@ -124,9 +131,11 @@
var/obj/item/assembly_holder/H = I
if(istype(H.a_left, /obj/item/assembly/igniter) || istype(H.a_right, /obj/item/assembly/igniter))
- msg_admin_attack("[key_name_admin(user)] rigged a fueltank for explosion (JMP)")
- log_game("[key_name(user)] rigged fueltank a fueltank for explosion at [loc.x], [loc.y], [loc.z]")
+ msg_admin_attack("[key_name_admin(user)] rigged [src.name] with [I.name] for explosion (JMP)", ATKLOG_FEW)
+ log_game("[key_name(user)] rigged [src.name] with [I.name] for explosion at [COORD(loc)]")
+ investigate_log("[key_name(user)] rigged [src.name] with [I.name] for explosion at [COORD(loc)]", INVESTIGATE_BOMB)
+ lastrigger = "[key_name(user)]"
rig = H
user.drop_item()
H.forceMove(src)
@@ -146,13 +155,14 @@
to_chat(user, "Your [W] is already full!")
return
reagents.trans_to(W, W.max_fuel)
- user.visible_message("[user] refills \his [W].", "You refill [W].")
+ user.visible_message("[user] refills [user.p_their()] [W].", "You refill [W].")
playsound(src, 'sound/effects/refill.ogg', 50, 1)
W.update_icon()
else
- user.visible_message("[user] catastrophically fails at refilling \his [W]!", "That was stupid of you.")
- message_admins("[key_name_admin(user)] triggered a fueltank explosion.")
- log_game("[key_name(user)] triggered a fueltank explosion.")
+ user.visible_message("[user] catastrophically fails at refilling [user.p_their()] [W]!", "That was stupid of you.")
+ message_admins("[key_name_admin(user)] triggered a fueltank explosion at [COORD(loc)]")
+ log_game("[key_name(user)] triggered a fueltank explosion at [COORD(loc)]")
+ investigate_log("[key_name(user)] triggered a fueltank explosion at [COORD(loc)]", INVESTIGATE_BOMB)
boom()
else
..()
diff --git a/code/modules/recycling/belt-placer.dm b/code/modules/recycling/belt-placer.dm
new file mode 100644
index 00000000000..1b473bef814
--- /dev/null
+++ b/code/modules/recycling/belt-placer.dm
@@ -0,0 +1,46 @@
+/obj/item/storage/conveyor //Stores conveyor belts, click floor to make belt, use a conveyor switch on this to link all belts to that lever.
+ name = "conveyor belt placer"
+ desc = "This device facilitates the rapid deployment of conveyor belts."
+ icon_state = "belt_placer"
+ item_state = "belt_placer"
+ w_class = WEIGHT_CLASS_BULKY //Because belts are large things, you know?
+ can_hold = list(/obj/item/conveyor_construct)
+ flags = CONDUCT
+ max_w_class = WEIGHT_CLASS_BULKY
+ max_combined_w_class = 28 //7 belts
+ allow_quick_gather = TRUE
+ allow_quick_empty = TRUE
+ display_contents_with_number = TRUE
+ use_to_pickup = TRUE
+ origin_tech = "engineering=1"
+
+/obj/item/storage/conveyor/bluespace
+ name = "bluespace conveyor belt placer"
+ desc = "This device facilitates the rapid deployment of conveyor belts. It utilises bluespace in order to hold many more belts than its regular counterpart."
+ icon_state = "bluespace_belt_placer"
+ item_state = "bluespace_belt_placer"
+ w_class = WEIGHT_CLASS_NORMAL
+ storage_slots = 50
+ max_combined_w_class = 200 //50 belts
+ origin_tech = "engineering=2;bluespace=1"
+
+/obj/item/storage/conveyor/attackby(obj/item/I, mob/user, params) //So we can link belts en masse
+ if(istype(I, /obj/item/conveyor_switch_construct))
+ var/obj/item/conveyor_switch_construct/S = I
+ var/linked = FALSE //For nice message
+ for(var/obj/item/conveyor_construct/C in src)
+ C.id = S.id
+ linked = TRUE
+ if(linked)
+ to_chat(user, "All belts in [src] linked with [S].")
+ else
+ return ..()
+
+/obj/item/storage/conveyor/afterattack(atom/A, mob/user, proximity)
+ if(!proximity)
+ return
+ var/obj/item/conveyor_construct/C = locate() in src
+ if(!C)
+ to_chat(user, "There are no belts in [src].")
+ else
+ C.afterattack(A, user, proximity)
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index ba193744467..3658846a696 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -250,8 +250,6 @@
var/obj/structure/disposaloutlet/P = new /obj/structure/disposaloutlet(src.loc)
src.transfer_fingerprints_to(P)
P.dir = dir
- var/obj/structure/disposalpipe/trunk/Trunk = CP
- Trunk.linked = P
else if(ptype==8) // Disposal outlet
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 56bb7478327..00b3b06a3a5 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -36,22 +36,22 @@
update()
/obj/machinery/disposal/proc/trunk_check()
- trunk = locate() in src.loc
- if(!trunk)
+ var/obj/structure/disposalpipe/trunk/T = locate() in loc
+ if(!T)
mode = 0
flush = 0
else
mode = initial(mode)
flush = initial(flush)
- trunk.linked = src // link the pipe trunk to self
+ T.nicely_link_to_other_stuff(src)
/obj/machinery/disposal/Destroy()
eject()
if(trunk)
- trunk.linked = null
+ trunk.remove_trunk_links()
return ..()
-/obj/machinery/disposal/initialize()
+/obj/machinery/disposal/Initialize()
// this will get a copy of the air turf and take a SEND PRESSURE amount of air from it
..()
var/atom/L = loc
@@ -133,7 +133,7 @@
for(var/mob/C in viewers(src))
C.show_message("[GM.name] has been placed in the [src] by [user].", 3)
qdel(G)
- add_attack_logs(usr, GM, "Disposal'ed", !!GM.ckey)
+ add_attack_logs(usr, GM, "Disposal'ed", !!GM.ckey ? null : ATKLOG_ALL)
return
if(!I)
@@ -179,7 +179,7 @@
msg = "[user.name] stuffs [target.name] into the [src]!"
to_chat(user, "You stuff [target.name] into the [src]!")
- add_attack_logs(user, target, "Disposal'ed", !!target.ckey)
+ add_attack_logs(user, target, "Disposal'ed", !!target.ckey ? null : ATKLOG_ALL)
else
return
target.forceMove(src)
@@ -1149,24 +1149,39 @@
if(D.trunk == src)
D.go_out()
D.trunk = null
-
- linked = null
+ remove_trunk_links()
return ..()
/obj/structure/disposalpipe/trunk/proc/getlinked()
- linked = null
var/obj/machinery/disposal/D = locate() in src.loc
if(D)
- linked = D
- if(!D.trunk)
- D.trunk = src
-
+ nicely_link_to_other_stuff(D)
+ return
var/obj/structure/disposaloutlet/O = locate() in src.loc
if(O)
- linked = O
+ nicely_link_to_other_stuff(O)
- update()
- return
+/obj/structure/disposalpipe/trunk/proc/remove_trunk_links() //disposals is well-coded
+ if(!linked)
+ return
+ else if(istype(linked, /obj/machinery/disposal)) //jk lol
+ var/obj/machinery/disposal/D = linked
+ D.trunk = null
+ else if(istype(linked, /obj/structure/disposaloutlet)) //God fucking damn it
+ var/obj/structure/disposaloutlet/D = linked
+ D.linkedtrunk = null
+ linked = null
+
+/obj/structure/disposalpipe/trunk/proc/nicely_link_to_other_stuff(obj/O)
+ remove_trunk_links() //Breaks the connections between this trunk and the linked machinery so we don't get sent to nullspace or some shit like that
+ if(istype(O, /obj/machinery/disposal))
+ var/obj/machinery/disposal/D = O
+ linked = D
+ D.trunk = src
+ else if(istype(O, /obj/structure/disposaloutlet))
+ var/obj/structure/disposaloutlet/D = O
+ linked = D
+ D.linkedtrunk = src
// Override attackby so we disallow trunkremoval when somethings ontop
/obj/structure/disposalpipe/trunk/attackby(var/obj/item/I, var/mob/user, params)
@@ -1271,77 +1286,72 @@
var/obj/structure/disposalpipe/trunk/linkedtrunk
var/mode = 0
- New()
- ..()
-
- spawn(1)
- target = get_ranged_target_turf(src, dir, 10)
-
-
- linkedtrunk = locate() in src.loc
- if(linkedtrunk)
- linkedtrunk.linked = src
+/obj/structure/disposaloutlet/New()
+ ..()
+ spawn(1)
+ target = get_ranged_target_turf(src, dir, 10)
+ var/obj/structure/disposalpipe/trunk/T = locate() in loc
+ if(T)
+ T.nicely_link_to_other_stuff(src)
// expel the contents of the holder object, then delete it
// called when the holder exits the outlet
- proc/expel(var/obj/structure/disposalholder/H, animation = 1)
-
- if(animation)
- flick("outlet-open", src)
- playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0)
- sleep(20) //wait until correct animation frame
- playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
-
- if(H)
- for(var/atom/movable/AM in H)
- AM.forceMove(loc)
- AM.pipe_eject(dir)
- if(!istype(AM,/mob/living/silicon/robot/drone)) //Drones keep smashing windows from being fired out of chutes. Bad for the station. ~Z
- spawn(5)
- if(AM)
- AM.throw_at(target, 3, 1)
- H.vent_gas(src.loc)
- qdel(H)
+/obj/structure/disposaloutlet/proc/expel(var/obj/structure/disposalholder/H, animation = 1)
+ if(animation)
+ flick("outlet-open", src)
+ playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0)
+ sleep(20) //wait until correct animation frame
+ playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
+ if(H)
+ for(var/atom/movable/AM in H)
+ AM.forceMove(loc)
+ AM.pipe_eject(dir)
+ if(!istype(AM,/mob/living/silicon/robot/drone)) //Drones keep smashing windows from being fired out of chutes. Bad for the station. ~Z
+ spawn(5)
+ if(AM)
+ AM.throw_at(target, 3, 1)
+ H.vent_gas(src.loc)
+ qdel(H)
- attackby(var/obj/item/I, var/mob/user, params)
- if(!I || !user)
+/obj/structure/disposaloutlet/attackby(var/obj/item/I, var/mob/user, params)
+ if(!I || !user)
+ return
+ src.add_fingerprint(user)
+ if(istype(I, /obj/item/screwdriver))
+ if(mode==0)
+ mode=1
+ playsound(src.loc, I.usesound, 50, 1)
+ to_chat(user, "You remove the screws around the power connection.")
+ return
+ else if(mode==1)
+ mode=0
+ playsound(src.loc, I.usesound, 50, 1)
+ to_chat(user, "You attach the screws around the power connection.")
+ return
+ else if(istype(I,/obj/item/weldingtool) && mode==1)
+ var/obj/item/weldingtool/W = I
+ if(W.remove_fuel(0,user))
+ playsound(src.loc, W.usesound, 100, 1)
+ to_chat(user, "You start slicing the floorweld off the disposal outlet.")
+ if(do_after(user, 20 * W.toolspeed, target = src))
+ if(!src || !W.isOn()) return
+ to_chat(user, "You sliced the floorweld off the disposal outlet.")
+ var/obj/structure/disposalconstruct/C = new (src.loc)
+ src.transfer_fingerprints_to(C)
+ C.ptype = 7 // 7 = outlet
+ C.update()
+ C.anchored = 1
+ C.density = 1
+ qdel(src)
+ return
+ else
+ to_chat(user, "You need more welding fuel to complete this task.")
return
- src.add_fingerprint(user)
- if(istype(I, /obj/item/screwdriver))
- if(mode==0)
- mode=1
- playsound(src.loc, I.usesound, 50, 1)
- to_chat(user, "You remove the screws around the power connection.")
- return
- else if(mode==1)
- mode=0
- playsound(src.loc, I.usesound, 50, 1)
- to_chat(user, "You attach the screws around the power connection.")
- return
- else if(istype(I,/obj/item/weldingtool) && mode==1)
- var/obj/item/weldingtool/W = I
- if(W.remove_fuel(0,user))
- playsound(src.loc, W.usesound, 100, 1)
- to_chat(user, "You start slicing the floorweld off the disposal outlet.")
- if(do_after(user, 20 * W.toolspeed, target = src))
- if(!src || !W.isOn()) return
- to_chat(user, "You sliced the floorweld off the disposal outlet.")
- var/obj/structure/disposalconstruct/C = new (src.loc)
- src.transfer_fingerprints_to(C)
- C.ptype = 7 // 7 = outlet
- C.update()
- C.anchored = 1
- C.density = 1
- qdel(src)
- return
- else
- to_chat(user, "You need more welding fuel to complete this task.")
- return
/obj/structure/disposaloutlet/Destroy()
if(linkedtrunk)
- linkedtrunk.linked = null
+ linkedtrunk.remove_trunk_links()
return ..()
// called when movable is expelled from a disposal pipe or outlet
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index b7919662514..5cb51863851 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -800,6 +800,14 @@
build_path = /obj/item/conveyor_switch_construct
category = list("initial", "Construction")
+/datum/design/conveyor_belt_placer
+ name = "Conveyor Belt Placer"
+ id = "conveyor_belt_placer"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 5000, MAT_GLASS = 1000) //This thing doesn't need to be very resource-intensive as the belts are already expensive
+ build_path = /obj/item/storage/conveyor
+ category = list("initial", "Construction")
+
/datum/design/laptop
name = "Laptop Frame"
id = "laptop"
diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm
index 3c555c40849..cf6e4b53882 100644
--- a/code/modules/research/designs/bluespace_designs.dm
+++ b/code/modules/research/designs/bluespace_designs.dm
@@ -51,13 +51,23 @@
build_path = /obj/item/storage/bag/ore/holding
category = list("Bluespace")
+/datum/design/bluespace_belt_holder
+ name = "Bluespace Conveyor Belt Placer"
+ desc = "This device facilitates the rapid deployment of conveyor belts. This one is powered by bluespace."
+ id = "bluespace_belt_holder"
+ req_tech = list("materials" = 1, "engineering" = 3, "bluespace" = 3)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 5000, MAT_GLASS = 1000, MAT_SILVER = 500) //Costs similar materials to the basic one, but this one needs silver
+ build_path = /obj/item/storage/conveyor/bluespace
+ category = list("Bluespace")
+
/datum/design/telepad_beacon
name = "Telepad Beacon"
desc = "Use to warp in a cargo telepad."
id = "telepad_beacon"
req_tech = list("programming" = 5, "bluespace" = 4, "engineering" = 4, "plasmatech" = 4)
build_type = PROTOLATHE
- materials = list (MAT_METAL = 2000, MAT_GLASS = 1750, MAT_SILVER = 500)
+ materials = list(MAT_METAL = 2000, MAT_GLASS = 1750, MAT_SILVER = 500)
build_path = /obj/item/telepad_beacon
category = list("Bluespace")
@@ -67,6 +77,6 @@
id = "beacon"
req_tech = list("bluespace" = 1)
build_type = PROTOLATHE
- materials = list (MAT_METAL = 150, MAT_GLASS = 100)
+ materials = list(MAT_METAL = 150, MAT_GLASS = 100)
build_path = /obj/item/radio/beacon
category = list("Bluespace")
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index fb5ff5cabd5..57886d2972c 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -452,16 +452,6 @@
build_path = /obj/item/circuitboard/arcade/orion_trail
category = list("Misc. Machinery")
-/datum/design/programmable
- name = "Machine Board (Programmable Unloader)"
- desc = "The circuit board for a Programmable Unloader."
- id = "selunload"
- req_tech = list("engineering" = 1, "programming" = 2)
- build_type = IMPRINTER
- materials = list(MAT_GLASS = 1000)
- build_path = /obj/item/circuitboard/programmable
- category = list("Misc. Machinery")
-
/datum/design/pod
name = "Machine Board (Mass Driver and Pod Doors Control)"
desc = "Allows for the construction of circuit boards used to build a Mass Driver and Pod Doors Control."
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 9d973c1ed74..49a1a7d0eba 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -181,7 +181,7 @@
id = "scalpel_manager"
req_tech = list("biotech" = 4, "materials" = 7, "magnets" = 5, "programming" = 4)
build_type = PROTOLATHE
- materials = list (MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000, MAT_DIAMOND = 1000)
+ materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000, MAT_DIAMOND = 1000)
build_path = /obj/item/scalpel/laser/manager
category = list("Medical")
@@ -271,13 +271,24 @@
build_path = /obj/item/organ/internal/cyberimp/mouth/breathing_tube
category = list("Misc", "Medical")
+/datum/design/cyberimp_surgical
+ name = "Surgical Arm Implant"
+ desc = "A set of surgical tools hidden behind a concealed panel on the user's arm."
+ id = "ci-surgey"
+ req_tech = list("materials" = 3, "engineering" = 3, "biotech" = 3, "programming" = 2, "magnets" = 3)
+ build_type = PROTOLATHE | MECHFAB
+ materials = list(MAT_METAL = 2500, MAT_GLASS = 1500, MAT_SILVER = 1500)
+ construction_time = 200
+ build_path = /obj/item/organ/internal/cyberimp/arm/surgery
+ category = list("Misc", "Medical")
+
/datum/design/cyberimp_toolset
name = "Toolset Arm Implant"
desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm."
id = "ci-toolset"
req_tech = list("materials" = 3, "engineering" = 4, "biotech" = 4, "powerstorage" = 4)
build_type = PROTOLATHE | MECHFAB
- materials = list (MAT_METAL = 2500, MAT_GLASS = 1500, MAT_SILVER = 1500)
+ materials = list(MAT_METAL = 2500, MAT_GLASS = 1500, MAT_SILVER = 1500)
construction_time = 200
build_path = /obj/item/organ/internal/cyberimp/arm/toolset
category = list("Misc", "Medical")
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index 0b41a26256c..ec26ae39644 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -4,7 +4,7 @@
/datum/design/basic_cell
name = "Basic Power Cell"
- desc = "A basic power cell that holds 1000 units of energy"
+ desc = "A basic power cell that holds 1 kW of power."
id = "basic_cell"
req_tech = list("powerstorage" = 1)
build_type = PROTOLATHE | AUTOLATHE | MECHFAB | PODFAB
@@ -15,7 +15,7 @@
/datum/design/high_cell
name = "High-Capacity Power Cell"
- desc = "A power cell that holds 10000 units of energy"
+ desc = "A power cell that holds 10 kW of power."
id = "high_cell"
req_tech = list("powerstorage" = 2)
build_type = PROTOLATHE | AUTOLATHE | MECHFAB | PODFAB
@@ -26,7 +26,7 @@
/datum/design/hyper_cell
name = "Hyper-Capacity Power Cell"
- desc = "A power cell that holds 30000 units of energy"
+ desc = "A power cell that holds 30 kW of power."
id = "hyper_cell"
req_tech = list("powerstorage" = 5, "materials" = 5, "engineering" = 5)
build_type = PROTOLATHE | MECHFAB | PODFAB
@@ -37,7 +37,7 @@
/datum/design/super_cell
name = "Super-Capacity Power Cell"
- desc = "A power cell that holds 20000 units of energy"
+ desc = "A power cell that holds 20 kW of power."
id = "super_cell"
req_tech = list("powerstorage" = 3, "materials" = 3)
build_type = PROTOLATHE | MECHFAB | PODFAB
@@ -48,7 +48,7 @@
/datum/design/bluespace_cell
name = "Bluespace Power Cell"
- desc = "A power cell that holds 40000 units of energy."
+ desc = "A power cell that holds 40 kW of power."
id = "bluespace_cell"
req_tech = list("powerstorage" = 6, "materials" = 5, "engineering" = 5, "bluespace" = 5)
build_type = PROTOLATHE | MECHFAB
diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm
index fe45e8dacad..a043d90fb19 100644
--- a/code/modules/research/designs/smelting_designs.dm
+++ b/code/modules/research/designs/smelting_designs.dm
@@ -25,6 +25,22 @@
build_path = /obj/item/stack/sheet/plasmaglass
category = list("initial")
+/datum/design/titaniumglass_alloy
+ name = "Titanium + Glass alloy"
+ id = "titaniumglass"
+ build_type = SMELTER
+ materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/titaniumglass
+ category = list("initial")
+
+/datum/design/plastitaniumglass_alloy
+ name = "Plasma + Titanium + Glass alloy"
+ id = "plastitaniumglass"
+ build_type = SMELTER
+ materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/plastitaniumglass
+ category = list("initial")
+
/datum/design/alienalloy
name = "Alien Alloy"
desc = "A sheet of reverse-engineered alien alloy."
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 50c8e1a4cf8..8d18df1ee07 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -149,10 +149,10 @@ won't update every console in existence) but it's more of a hassle to do. Also,
matching_designs = list()
if(!id)
for(var/obj/machinery/r_n_d/server/centcom/S in world)
- S.initialize()
+ S.initialize_serv()
break
-/obj/machinery/computer/rdconsole/initialize()
+/obj/machinery/computer/rdconsole/Initialize()
..()
SyncRDevices()
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 014b2f80e6b..a2f9f185853 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -23,7 +23,7 @@
component_parts += new /obj/item/stack/cable_coil(null,1)
component_parts += new /obj/item/stack/cable_coil(null,1)
RefreshParts()
- initialize(); //Agouri
+ initialize_serv(); //Agouri // fuck you agouri
/obj/machinery/r_n_d/server/upgraded/New()
..()
@@ -44,8 +44,7 @@
tot_rating += SP.rating
heat_gen /= max(1, tot_rating)
-/obj/machinery/r_n_d/server/initialize()
- ..()
+/obj/machinery/r_n_d/server/proc/initialize_serv()
if(!files) files = new /datum/research(src)
var/list/temp_list
if(!id_with_upload.len)
@@ -162,7 +161,7 @@
name = "CentComm. Central R&D Database"
server_id = -1
-/obj/machinery/r_n_d/server/centcom/initialize()
+/obj/machinery/r_n_d/server/centcom/Initialize()
..()
var/list/no_id_servers = list()
var/list/server_ids = list()
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index ee884bc20a4..dcae187b028 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -22,7 +22,6 @@
desc = "A computer used for remotely handling slimes."
networks = list("SS13")
circuit = /obj/item/circuitboard/xenobiology
- off_action = new /datum/action/innate/camera_off/xenobio
var/datum/action/innate/slime_place/slime_place_action = new
var/datum/action/innate/slime_pick_up/slime_up_action = new
var/datum/action/innate/feed_slime/feed_slime_action = new
@@ -43,23 +42,27 @@
eyeobj.icon_state = "camera_target"
/obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/carbon/user)
- off_action.target = user
- off_action.Grant(user)
+ ..()
+ if(slime_up_action)
+ slime_up_action.target = src
+ slime_up_action.Grant(user)
+ actions += slime_up_action
+
+ if(slime_place_action)
+ slime_place_action.target = src
+ slime_place_action.Grant(user)
+ actions += slime_place_action
+
+ if(feed_slime_action)
+ feed_slime_action.target = src
+ feed_slime_action.Grant(user)
+ actions += feed_slime_action
+
+ if(monkey_recycle_action)
+ monkey_recycle_action.target = src
+ monkey_recycle_action.Grant(user)
+ actions += monkey_recycle_action
- jump_action.target = user
- jump_action.Grant(user)
-
- slime_up_action.target = src
- slime_up_action.Grant(user)
-
- slime_place_action.target = src
- slime_place_action.Grant(user)
-
- feed_slime_action.target = src
- feed_slime_action.Grant(user)
-
- monkey_recycle_action.target = src
- monkey_recycle_action.Grant(user)
/obj/machinery/computer/camera_advanced/xenobio/attack_hand(mob/user)
@@ -87,31 +90,6 @@
return
..()
-/datum/action/innate/camera_off/xenobio/Activate()
- if(!target || !ishuman(target))
- return
- var/mob/living/carbon/C = target
- var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/origin = remote_eye.origin
- C.remote_view = 0
- origin.current_user = null
- origin.jump_action.Remove(C)
- origin.slime_place_action.Remove(C)
- origin.slime_up_action.Remove(C)
- origin.feed_slime_action.Remove(C)
- origin.monkey_recycle_action.Remove(C)
- //All of this stuff below could probably be a proc for all advanced cameras, only the action removal needs to be camera specific
- remote_eye.eye_user = null
- C.reset_perspective(null)
- if(C.client)
- C.client.images -= remote_eye.user_image
- for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
- C.client.images -= chunk.obscured
- C.remote_control = null
- C.unset_machine()
- src.Remove(C)
-
-
/datum/action/innate/slime_place
name = "Place Slimes"
button_icon_state = "slime_down"
@@ -190,7 +168,7 @@
if(cameranet.checkTurfVis(remote_eye.loc))
for(var/mob/living/carbon/human/M in remote_eye.loc)
if(issmall(M) && M.stat)
- M.visible_message("[M] vanishes as they are reclaimed for recycling!")
+ M.visible_message("[M] vanishes as [M.p_theyre()] reclaimed for recycling!")
X.monkeys = round(X.monkeys + 0.2,0.1)
qdel(M)
else
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index d8058efbb53..35bdb18caae 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -205,7 +205,7 @@
SM.master_commander = user
SM.sentience_act()
to_chat(SM, "All at once it makes sense: you know what you are and who you are! Self awareness is yours!")
- to_chat(SM, "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost.")
+ to_chat(SM, "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
if(SM.flags_2 & HOLOGRAM_2) //Check to see if it's a holodeck creature
to_chat(SM, "You also become depressingly aware that you are not a real creature, but instead a holoform. Your existence is limited to the parameters of the holodeck.")
to_chat(user, "[M] accepts the potion and suddenly becomes attentive and aware. It worked!")
@@ -426,7 +426,7 @@
G.loc = src.loc
G.key = ghost.key
add_attack_logs(user, G, "Summoned as a golem")
- to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost.")
+ to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
qdel(src)
/obj/effect/golemrune/Topic(href,href_list)
diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm
index 16640a8b4c8..a24a9522b38 100644
--- a/code/modules/scripting/Implementations/Telecomms.dm
+++ b/code/modules/scripting/Implementations/Telecomms.dm
@@ -24,14 +24,22 @@
interpreter.GC()
+//temp
+/datum/TCS_Compiler
+ var/datum/n_scriptOptions/nS_Options/options
+ var/datum/n_Scanner/nS_Scanner/scanner
+ var/list/tokens
+ var/datum/n_Parser/nS_Parser/parser
+ var/datum/node/BlockDefinition/GlobalBlock/program
+
/* -- Compile a raw block of text -- */
-/datum/TCS_Compiler/proc/Compile(code as message)
- var/datum/n_scriptOptions/nS_Options/options = new()
- var/datum/n_Scanner/nS_Scanner/scanner = new(code, options)
- var/list/tokens = scanner.Scan()
- var/datum/n_Parser/nS_Parser/parser = new(tokens, options)
- var/datum/node/BlockDefinition/GlobalBlock/program = parser.Parse()
+/datum/TCS_Compiler/proc/Compile(list/code)
+ options = new()
+ scanner = new(code, options)
+ tokens = scanner.Scan()
+ parser = new(tokens, options)
+ program = parser.Parse()
var/list/returnerrors = list()
diff --git a/code/modules/scripting/Interpreter/Interpreter.dm b/code/modules/scripting/Interpreter/Interpreter.dm
index 79802ff2fa5..c24e9ba5e3a 100644
--- a/code/modules/scripting/Interpreter/Interpreter.dm
+++ b/code/modules/scripting/Interpreter/Interpreter.dm
@@ -184,6 +184,8 @@ Runs each statement in a block of code.
else
RaiseError(new/datum/runtimeError/UnknownInstruction())
+ CHECK_TICK
+
if(status)
break
diff --git a/code/modules/scripting/Options.dm b/code/modules/scripting/Options.dm
index b27acff91d3..be471756359 100644
--- a/code/modules/scripting/Options.dm
+++ b/code/modules/scripting/Options.dm
@@ -36,11 +36,12 @@ File: Options
if(!CanStartID(id)) //don't need to grab first char in id, since text2ascii does it automatically
return 0
- if(length(id) == 1)
+ var/list/charmap = string2charlist(id)
+ if(charmap.len == 1)
return 1
- for(var/i=2 to length(id))
- if(!IsValidIDChar(copytext(id, i, i + 1)))
+ for(var/i = 2 to charmap.len)
+ if(!IsValidIDChar(charmap[i]))
return 0
return 1
diff --git a/code/modules/scripting/Scanner/Scanner.dm b/code/modules/scripting/Scanner/Scanner.dm
index 011621c8ea8..da6a2c04803 100644
--- a/code/modules/scripting/Scanner/Scanner.dm
+++ b/code/modules/scripting/Scanner/Scanner.dm
@@ -6,7 +6,7 @@
An object responsible for breaking up source code into tokens for use by the parser.
*/
/datum/n_Scanner
- var/code
+ var/list/code
/*
Var: errors
A list of fatal errors found by the scanner. If there are any items in this list, then it is not safe to parse the returned tokens.
@@ -25,7 +25,7 @@
Proc: LoadCode
Loads source code.
*/
-/datum/n_Scanner/proc/LoadCode(var/c)
+/datum/n_Scanner/proc/LoadCode(var/list/c)
code=c
/*
@@ -100,24 +100,23 @@
code - The source code to tokenize.
options - An object used to configure the scanner.
*/
-/datum/n_Scanner/nS_Scanner/New(var/code, var/datum/n_scriptOptions/nS_Options/options)
+/datum/n_Scanner/nS_Scanner/New(var/list/c, var/datum/n_scriptOptions/nS_Options/options)
. = ..()
ignore += ascii2text(13) //Carriage return
delim += ignore + options.symbols + end_stmt + string_delim
src.options = options
- LoadCode(code)
+ LoadCode(c)
/datum/n_Scanner/nS_Scanner/Scan() //Creates a list of tokens from source code
var/list/tokens = new
- for(, src.codepos <= length(code), src.codepos++)
-
- var/char = copytext(code, codepos, codepos + 1)
- var/nextchar = copytext(code, codepos + 1, codepos + 2)
+ for(, src.codepos <= code.len, src.codepos++)
+ var/char = code[codepos]
+ var/nextchar = TCOMMS_SAFE_INDEX(code, codepos + 1)
if(char == "\n")
line++
linepos = codepos
- if(ignore.Find(char))
+ if(char in ignore)
continue
else if(char == "/" && (nextchar == "*" || nextchar == "/"))
@@ -139,6 +138,7 @@
else if(options.symbols.Find(char))
tokens += ReadSymbol()
+ CHECK_TICK
codepos = initial(codepos)
line = initial(line)
@@ -155,12 +155,12 @@
*/
/datum/n_Scanner/nS_Scanner/proc/ReadString(start)
var/buf
- for(, codepos <= length(code), codepos++)//codepos to length(code))
- var/char = copytext(code, codepos, codepos + 1)
+ for(, codepos <= code.len, codepos++)//codepos to length(code))
+ var/char = code[codepos]
switch(char)
if("\\") //Backslash (\) encountered in string
codepos++ //Skip next character in string, since it was escaped by a backslash
- char = copytext(code, codepos, codepos+1)
+ char = TCOMMS_SAFE_INDEX(code, codepos)
switch(char)
if("\\") //Double backslash
buf += "\\"
@@ -190,12 +190,14 @@
Reads characters separated by an item in into a token.
*/
/datum/n_Scanner/nS_Scanner/proc/ReadWord()
- var/char = copytext(code, codepos, codepos + 1)
+ var/char = code[codepos]
var/buf
- while(!delim.Find(char) && codepos <= length(code))
+ while(!delim.Find(char))
buf += char
- char = copytext(code, ++codepos, codepos + 1)
+ if(++codepos > code.len) break
+ char = code[codepos]
+
codepos-- //allow main Scan() proc to read the delimiter
if(options.keywords.Find(buf))
return new/datum/token/keyword(buf, line, COL)
@@ -207,13 +209,13 @@
Reads a symbol into a token.
*/
/datum/n_Scanner/nS_Scanner/proc/ReadSymbol()
- var/char=copytext(code, codepos, codepos + 1)
+ var/char = code[codepos]
var/buf
while(options.symbols.Find(buf + char))
buf += char
- if(++codepos > length(code)) break
- char = copytext(code, codepos, codepos + 1)
+ if(++codepos > code.len) break
+ char = code[codepos]
codepos-- //allow main Scan() proc to read the next character
return new /datum/token/symbol(buf, line, COL)
@@ -223,7 +225,7 @@
Reads a number into a token.
*/
/datum/n_Scanner/nS_Scanner/proc/ReadNumber()
- var/char = copytext(code, codepos, codepos + 1)
+ var/char = code[codepos]
var/buf
var/dec = 0
@@ -233,7 +235,7 @@
buf += char
codepos++
- char = copytext(code, codepos, codepos + 1)
+ char = TCOMMS_SAFE_INDEX(code, codepos)
var/datum/token/number/T = new(buf, line, COL)
if(isnull(text2num(buf)))
@@ -249,8 +251,8 @@
*/
/datum/n_Scanner/nS_Scanner/proc/ReadComment()
- var/char = copytext(code, codepos, codepos + 1)
- var/nextchar = copytext(code, codepos + 1, codepos + 2)
+ var/char = code[codepos]
+ var/nextchar = TCOMMS_SAFE_INDEX(code, codepos + 1)
var/charstring = char + nextchar
var/comm = 1
// 1: single-line comment
@@ -262,23 +264,23 @@
comm = 2 // starts a multi-line comment
while(comm)
- if(++codepos > length(code))
+ if(++codepos > code.len)
break
if(expectedend) // ending statement expected...
- char = copytext(code, codepos, codepos + 1)
+ char = code[codepos]
if(char == "/") // ending statement found - beak the comment
comm = 0
break
if(comm == 2)
// multi-line comments are broken by ending statements
- char = copytext(code, codepos, codepos + 1)
+ char = code[codepos]
if(char == "*")
expectedend = 1
continue
else
- char = copytext(code, codepos, codepos + 1)
+ char = code[codepos]
if(char == "\n")
comm = 0
break
diff --git a/code/modules/scripting/__defines.dm b/code/modules/scripting/__defines.dm
new file mode 100644
index 00000000000..52f30e68fdc
--- /dev/null
+++ b/code/modules/scripting/__defines.dm
@@ -0,0 +1 @@
+#define TCOMMS_SAFE_INDEX(list, index) list.len > index ? list[index] : null
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index cea1f502d91..09978047027 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -351,7 +351,7 @@
height = 4
var/target_area = /area/mine/dangerous/unexplored
-/obj/docking_port/stationary/random/initialize()
+/obj/docking_port/stationary/random/Initialize()
..()
var/list/turfs = get_area_turfs(target_area)
var/turf/T = pick(turfs)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 6e712e74914..54f4836ff5b 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -1,4 +1,5 @@
//use this define to highlight docking port bounding boxes (ONLY FOR DEBUG USE)
+// also uncomment the #undef at the bottom of the file
//#define DOCKING_PORT_HIGHLIGHT
//NORTH default dir
@@ -229,7 +230,7 @@
-/obj/docking_port/mobile/initialize()
+/obj/docking_port/mobile/Initialize()
if(!timid)
register()
..()
@@ -909,7 +910,7 @@ var/global/trade_dockrequest_timelimit = 0
shuttleId = "trade_sol"
docking_request_message = "A trading ship of Sol origin has requested docking aboard the NSS Cyberiad for trading. This request can be accepted or denied using a communications console."
-#undef DOCKING_PORT_HIGHLIGHT
+//#undef DOCKING_PORT_HIGHLIGHT
/turf/proc/copyTurf(turf/T)
diff --git a/code/modules/space_management/level_traits.dm b/code/modules/space_management/level_traits.dm
index ae5d6447aae..39b584df64d 100644
--- a/code/modules/space_management/level_traits.dm
+++ b/code/modules/space_management/level_traits.dm
@@ -1,62 +1,63 @@
/proc/is_level_reachable(z)
- return check_level_trait(z, REACHABLE)
+ return check_level_trait(z, REACHABLE)
/proc/is_station_level(z)
- return check_level_trait(z, STATION_LEVEL)
+ return check_level_trait(z, STATION_LEVEL)
/proc/is_station_contact(z)
- return check_level_trait(z, STATION_CONTACT)
+ return check_level_trait(z, STATION_CONTACT)
/proc/is_teleport_allowed(z)
- return !check_level_trait(z, BLOCK_TELEPORT)
+ return !check_level_trait(z, BLOCK_TELEPORT)
/proc/is_admin_level(z)
- return check_level_trait(z, ADMIN_LEVEL)
+ return check_level_trait(z, ADMIN_LEVEL)
/proc/is_away_level(z)
- return check_level_trait(z, AWAY_LEVEL)
+ return check_level_trait(z, AWAY_LEVEL)
/proc/is_mining_level(z)
- return check_level_trait(z, ORE_LEVEL)
+ return check_level_trait(z, ORE_LEVEL)
/proc/is_ai_allowed(z)
- return check_level_trait(z, AI_OK)
+ return check_level_trait(z, AI_OK)
/proc/level_blocks_magic(z)
- return check_level_trait(z, IMPEDES_MAGIC)
+ return check_level_trait(z, IMPEDES_MAGIC)
/proc/level_boosts_signal(z)
- return check_level_trait(z, BOOSTS_SIGNAL)
+ return check_level_trait(z, BOOSTS_SIGNAL)
// Used for the nuke disk, or for checking if players survived through xenos
/proc/is_secure_level(z)
- var/secure = check_level_trait(z, STATION_LEVEL)
- if(!secure)
- // This is to allow further admin levels later, other than centcomm
- secure = (z == level_name_to_num(CENTCOMM))
- return secure
+ var/secure = check_level_trait(z, STATION_LEVEL)
+ if(!secure)
+ // This is to allow further admin levels later, other than centcomm
+ secure = (z == level_name_to_num(CENTCOMM))
+ return secure
var/list/default_map_traits = MAP_TRANSITION_CONFIG
+
/proc/check_level_trait(z, trait)
- if(!z)
- return 0 // If you're nowhere, you have no traits
- var/list/trait_list
- if(space_manager.initialized)
- var/datum/space_level/S = space_manager.get_zlev(z)
- trait_list = S.flags
- else
- trait_list = default_map_traits[z]
- trait_list = trait_list["attributes"]
- return (trait in trait_list)
+ if(!z)
+ return 0 // If you're nowhere, you have no traits
+ var/list/trait_list
+ if(space_manager.initialized)
+ var/datum/space_level/S = space_manager.get_zlev(z)
+ trait_list = S.flags
+ else
+ trait_list = default_map_traits[z]
+ trait_list = trait_list["attributes"]
+ return (trait in trait_list)
/proc/levels_by_trait(trait)
- var/list/result = list()
- for(var/A in space_manager.z_list)
- var/datum/space_level/S = space_manager.z_list[A]
- if(trait in S.flags)
- result |= S
- return result
+ var/list/result = list()
+ for(var/A in space_manager.z_list)
+ var/datum/space_level/S = space_manager.z_list[A]
+ if(trait in S.flags)
+ result |= S.zpos
+ return result
/proc/level_name_to_num(name)
- var/datum/space_level/S = space_manager.get_zlev_by_name(name)
- return S.zpos
+ var/datum/space_level/S = space_manager.get_zlev_by_name(name)
+ return S.zpos
\ No newline at end of file
diff --git a/code/modules/space_management/space_level.dm b/code/modules/space_management/space_level.dm
index dc598ccab42..38ec849179a 100644
--- a/code/modules/space_management/space_level.dm
+++ b/code/modules/space_management/space_level.dm
@@ -152,7 +152,7 @@
if(istype(AM, /obj/effect/landmark/map_loader))
late_maps.Add(AM)
continue
- AM.initialize()
+ AM.Initialize(TRUE)
if(istype(AM, /obj/machinery/atmospherics))
pipes.Add(AM)
else if(istype(AM, /obj/structure/cable))
@@ -179,10 +179,7 @@
/datum/space_level/proc/do_cables(list/cables)
var/watch = start_watch()
log_debug("Building powernets on z-level '[zpos]'!")
- for(var/schmoo in cables)
- var/obj/structure/cable/C = schmoo
- if(C)
- makepowernet_for(C)
+ SSmachines.setup_template_powernets(cables)
cables.Cut()
log_debug("Took [stop_watch(watch)]s")
@@ -193,7 +190,7 @@
for(var/schmoo in late_maps)
var/obj/effect/landmark/map_loader/ML = schmoo
if(ML)
- ML.initialize()
+ ML.Initialize()
late_maps.Cut()
space_manager.remove_dirt(zpos)
log_debug("Took [stop_watch(watch)]s")
diff --git a/code/modules/space_management/zlevel_manager.dm b/code/modules/space_management/zlevel_manager.dm
index 087a70657ed..acb1cf5c0a0 100644
--- a/code/modules/space_management/zlevel_manager.dm
+++ b/code/modules/space_management/zlevel_manager.dm
@@ -12,6 +12,8 @@ var/global/datum/zlev_manager/space_manager = new
var/datum/spacewalk_grid/linkage_map
var/initialized = 0
+ var/list/areas_in_z = list()
+
// Populate our space level list
// and prepare space transitions
/datum/zlev_manager/proc/initialize()
@@ -166,4 +168,4 @@ var/global/datum/zlev_manager/space_manager = new
var/datum/space_level/heap/heap = z_list["[C.zpos]"]
if(!istype(heap))
throw EXCEPTION("Attempted to free chunk at invalid z-level ([C.x],[C.y],[C.zpos]) [C.width]x[C.height]")
- heap.free(C)
+ heap.free(C)
\ No newline at end of file
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 794e5f69bfe..97e34eee154 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -1,6 +1,6 @@
#define DAMAGE 1
#define FIRE 2
-#define LIGHT 1
+#define POD_LIGHT 1
#define WINDOW 2
#define RIM 3
#define PAINT 4
@@ -78,7 +78,7 @@
var/part = input(user, "Choose part", null) as null|anything in list("Lights","Rim","Paint","Windows")
switch(part)
if("Lights")
- part_type = LIGHT
+ part_type = POD_LIGHT
if("Rim")
part_type = RIM
if("Paint")
@@ -101,7 +101,7 @@
pod_overlays[FIRE] = image(icon, icon_state="pod_fire")
if(!pod_paint_effect)
pod_paint_effect = new/list(4)
- pod_paint_effect[LIGHT] = image(icon,icon_state = "LIGHTS")
+ pod_paint_effect[POD_LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[WINDOW] = image(icon,icon_state = "Windows")
pod_paint_effect[RIM] = image(icon,icon_state = "RIM")
pod_paint_effect[PAINT] = image(icon,icon_state = "PAINT")
@@ -162,7 +162,7 @@
if(!pod_paint_effect)
pod_paint_effect = new/list(4)
- pod_paint_effect[LIGHT] = image(icon,icon_state = "LIGHTS")
+ pod_paint_effect[POD_LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[WINDOW] = image(icon,icon_state = "Windows")
pod_paint_effect[RIM] = image(icon,icon_state = "RIM")
pod_paint_effect[PAINT] = image(icon,icon_state = "PAINT")
@@ -170,9 +170,9 @@
if(has_paint)
var/image/to_add
- if(!isnull(pod_paint_effect[LIGHT]))
- to_add = pod_paint_effect[LIGHT]
- to_add.color = colors[LIGHT]
+ if(!isnull(pod_paint_effect[POD_LIGHT]))
+ to_add = pod_paint_effect[POD_LIGHT]
+ to_add.color = colors[POD_LIGHT]
overlays += to_add
if(!isnull(pod_paint_effect[WINDOW]))
to_add = pod_paint_effect[WINDOW]
@@ -1077,6 +1077,6 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/spacepod_equipment/SPE, v
#undef DAMAGE
#undef FIRE
#undef WINDOW
-#undef LIGHT
+#undef POD_LIGHT
#undef RIM
#undef PAINT
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 0c0ab2b1259..57142365cc4 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -273,7 +273,7 @@
area_aim = TRUE
target_all_areas = TRUE
-/obj/machinery/computer/bsa_control/admin/initialize()
+/obj/machinery/computer/bsa_control/admin/Initialize()
..()
if(!cannon)
cannon = deploy()
diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm
index dfe2c0feb8c..a053b568dc7 100644
--- a/code/modules/surgery/bones.dm
+++ b/code/modules/surgery/bones.dm
@@ -49,7 +49,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool]." , \
"You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].")
- target.custom_pain("Something in your [affected.name] is causing you a lot of pain!",1)
+ target.custom_pain("Something in your [affected.name] is causing you a lot of pain!")
..()
/datum/surgery_step/glue_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -83,7 +83,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] is beginning to set the bone in [target]'s [affected.name] in place with \the [tool]." , \
"You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool].")
- target.custom_pain("The pain in your [affected.name] is going to make you pass out!",1)
+ target.custom_pain("The pain in your [affected.name] is going to make you pass out!")
..()
/datum/surgery_step/set_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -136,7 +136,7 @@
"Your hand slips, damaging [target]'s face with \the [tool]!")
var/obj/item/organ/external/head/h = affected
h.receive_damage(10)
- h.disfigured = 1
+ h.disfigure()
return 0
/datum/surgery_step/finish_bone
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index 0e88927e1a2..2ab2aca37c7 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -78,7 +78,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] starts making some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \
"You start making some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." )
- target.custom_pain("The pain in your chest is living hell!",1)
+ target.custom_pain("The pain in your chest is living hell!")
..()
/datum/surgery_step/cavity/make_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -104,7 +104,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] starts mending [target]'s [get_cavity(affected)] cavity wall with \the [tool].", \
"You start mending [target]'s [get_cavity(affected)] cavity wall with \the [tool]." )
- target.custom_pain("The pain in your chest is living hell!",1)
+ target.custom_pain("The pain in your chest is living hell!")
..()
/datum/surgery_step/cavity/close_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -155,7 +155,7 @@
else //no internal items..but we still need a message!
user.visible_message("[user] checks for items in [target]'s [target_zone].", "You check for items in [target]'s [target_zone]...")
- target.custom_pain("The pain in your [target_zone] is living hell!",1)
+ target.custom_pain("The pain in your [target_zone] is living hell!")
..()
/datum/surgery_step/cavity/place_item/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -190,7 +190,7 @@
if((tool.w_class > get_max_wclass(affected)/2 && prob(50) && !(affected.status & ORGAN_ROBOT)))
to_chat(user, " You tear some vessels trying to fit the object in the cavity.")
affected.internal_bleeding = TRUE
- affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1)
+ affected.owner.custom_pain("You feel something rip in your [affected.name]!")
user.drop_item()
affected.hidden = tool
tool.forceMove(affected)
diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm
index eddf116a45d..b9a33fcecab 100644
--- a/code/modules/surgery/encased.dm
+++ b/code/modules/surgery/encased.dm
@@ -38,7 +38,7 @@
user.visible_message("[user] begins to cut through [target]'s [affected.encased] with \the [tool].", \
"You begin to cut through [target]'s [affected.encased] with \the [tool].")
- target.custom_pain("Something hurts horribly in your [affected.name]!",1)
+ target.custom_pain("Something hurts horribly in your [affected.name]!")
..()
/datum/surgery_step/open_encased/saw/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -86,7 +86,7 @@
var/msg = "[user] starts to force open the [affected.encased] in [target]'s [affected.name] with \the [tool]."
var/self_msg = "You start to force open the [affected.encased] in [target]'s [affected.name] with \the [tool]."
user.visible_message(msg, self_msg)
- target.custom_pain("Something hurts horribly in your [affected.name]!",1)
+ target.custom_pain("Something hurts horribly in your [affected.name]!")
..()
/datum/surgery_step/open_encased/retract/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -137,7 +137,7 @@
var/msg = "[user] starts bending [target]'s [affected.encased] back into place with \the [tool]."
var/self_msg = "You start bending [target]'s [affected.encased] back into place with \the [tool]."
user.visible_message(msg, self_msg)
- target.custom_pain("Something hurts horribly in your [affected.name]!",1)
+ target.custom_pain("Something hurts horribly in your [affected.name]!")
..()
/datum/surgery_step/open_encased/close/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -187,7 +187,7 @@
var/msg = "[user] starts applying \the [tool] to [target]'s [affected.encased]."
var/self_msg = "You start applying \the [tool] to [target]'s [affected.encased]."
user.visible_message(msg, self_msg)
- target.custom_pain("Something hurts horribly in your [affected.name]!",1)
+ target.custom_pain("Something hurts horribly in your [affected.name]!")
..()
/datum/surgery_step/open_encased/mend/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm
deleted file mode 100644
index d96db814b78..00000000000
--- a/code/modules/surgery/face.dm
+++ /dev/null
@@ -1,147 +0,0 @@
-//Procedures in this file: Facial reconstruction surgery
-//////////////////////////////////////////////////////////////////
-// FACE SURGERY //
-//////////////////////////////////////////////////////////////////
-/datum/surgery/plastic_surgery
- name = "Face Repair"
- steps = list(/datum/surgery_step/generic/cut_face, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/face/mend_vocal, /datum/surgery_step/face/fix_face,/datum/surgery_step/face/cauterize)
- possible_locs = list("head")
-
-
-
-/datum/surgery/plastic_surgery/can_start(mob/user, mob/living/carbon/target)
- if(istype(target,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = target
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
- if(!affected)
- return 0
- if(affected.status & ORGAN_ROBOT)
- return 0
- if(!affected.disfigured)
- return 0
- return 1
-
-/datum/surgery_step/face
- priority = 2
- can_infect = 0
-
-/datum/surgery_step/generic/cut_face
- name = "make incision"
- allowed_tools = list(
- /obj/item/scalpel = 100, \
- /obj/item/kitchen/knife = 90, \
- /obj/item/shard = 60, \
- )
-
- time = 16
-
-/datum/surgery_step/generic/cut_face/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("[user] starts to cut open [target]'s face and neck with \the [tool].", \
- "You start to cut open [target]'s face and neck with \the [tool].")
- ..()
-
-/datum/surgery_step/generic/cut_face/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message(" [user] has cut open [target]'s face and neck with \the [tool]." , \
- " You have cut open [target]'s face and neck with \the [tool].",)
-
- return 1
-
-/datum/surgery_step/generic/cut_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message(" [user]'s hand slips, slicing [target]'s throat wth \the [tool]!" , \
- " Your hand slips, slicing [target]'s throat wth \the [tool]!" )
- affected.receive_damage(60)
- target.AdjustLoseBreath(4)
-
- return 0
-
-/datum/surgery_step/face/mend_vocal
- name = "mend vocal cords"
- allowed_tools = list(
- /obj/item/scalpel/laser/manager = 100, \
- /obj/item/hemostat = 100, \
- /obj/item/stack/cable_coil = 90, \
- /obj/item/assembly/mousetrap = 12 //I don't know. Don't ask me. But I'm leaving it because hilarity.
- )
-
- time = 24
-
-/datum/surgery_step/face/mend_vocal/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("[user] starts mending [target]'s vocal cords with \the [tool].", \
- "You start mending [target]'s vocal cords with \the [tool].")
- ..()
-
-/datum/surgery_step/face/mend_vocal/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message(" [user] mends [target]'s vocal cords with \the [tool].", \
- " You mend [target]'s vocal cords with \the [tool].")
- return 1
-
-/datum/surgery_step/face/mend_vocal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message(" [user]'s hand slips, clamping [target]'s trachea shut for a moment with \the [tool]!", \
- " Your hand slips, clamping [user]'s trachea shut for a moment with \the [tool]!")
- target.AdjustLoseBreath(4)
- return 0
-
-/datum/surgery_step/face/fix_face
- name = "reshape face"
- allowed_tools = list(
- /obj/item/scalpel/laser/manager = 100, \
- /obj/item/retractor = 100, \
- /obj/item/crowbar = 65, \
- /obj/item/kitchen/utensil/fork = 90)
-
- time = 64
-
-/datum/surgery_step/face/fix_face/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("[user] starts pulling skin on [target]'s face back in place with \the [tool].", \
- "You start pulling skin on [target]'s face back in place with \the [tool].")
- ..()
-
-/datum/surgery_step/face/fix_face/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message(" [user] pulls skin on [target]'s face back in place with \the [tool].", \
- " You pull skin on [target]'s face back in place with \the [tool].")
- return 1
-
-/datum/surgery_step/face/fix_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message(" [user]'s hand slips, tearing skin on [target]'s face with \the [tool]!", \
- " Your hand slips, tearing skin on [target]'s face with \the [tool]!")
- target.apply_damage(10, BRUTE, affected, sharp = 1)
- return 0
-
-/datum/surgery_step/face/cauterize
- name = "close incision"
- allowed_tools = list(
- /obj/item/scalpel/laser = 100, \
- /obj/item/cautery = 100, \
- /obj/item/clothing/mask/cigarette = 90, \
- /obj/item/lighter = 60, \
- /obj/item/weldingtool = 30
- )
-
- time = 24
-
-/datum/surgery_step/face/cauterize/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("[user] is beginning to cauterize the incision on [target]'s face and neck with \the [tool]." , \
- "You are beginning to cauterize the incision on [target]'s face and neck with \the [tool].")
- ..()
-
-/datum/surgery_step/face/cauterize/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message(" [user] cauterizes the incision on [target]'s face and neck with \the [tool].", \
- " You cauterize the incision on [target]'s face and neck with \the [tool].")
- affected.open = 0
- var/obj/item/organ/external/head/h = affected
- h.disfigured = 0
- h.update_icon()
- target.regenerate_icons()
-
- return 1
-
-/datum/surgery_step/face/cauterize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message(" [user]'s hand slips, leaving a small burn on [target]'s face with \the [tool]!", \
- " Your hand slips, leaving a small burn on [target]'s face with \the [tool]!")
- target.apply_damage(4, BURN, affected)
-
- return 0
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index 158656f8c01..1e1b3a10365 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -37,7 +37,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] starts the incision on [target]'s [affected.name] with \the [tool].", \
"You start the incision on [target]'s [affected.name] with \the [tool].")
- target.custom_pain("You feel a horrible pain as if from a sharp knife in your [affected.name]!",1)
+ target.custom_pain("You feel a horrible pain as if from a sharp knife in your [affected.name]!")
..()
/datum/surgery_step/generic/cut_open/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -71,7 +71,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] starts clamping bleeders in [target]'s [affected.name] with \the [tool].", \
"You start clamping bleeders in [target]'s [affected.name] with \the [tool].")
- target.custom_pain("The pain in your [affected.name] is maddening!",1)
+ target.custom_pain("The pain in your [affected.name] is maddening!")
..()
/datum/surgery_step/generic/clamp_bleeders/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -111,7 +111,7 @@
msg = "[user] starts to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]."
self_msg = "You start to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]."
user.visible_message(msg, self_msg)
- target.custom_pain("It feels like the skin on your [affected.name] is on fire!",1)
+ target.custom_pain("It feels like the skin on your [affected.name] is on fire!")
..()
/datum/surgery_step/generic/retract_skin/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -160,7 +160,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] is beginning to cauterize the incision on [target]'s [affected.name] with \the [tool]." , \
"You are beginning to cauterize the incision on [target]'s [affected.name] with \the [tool].")
- target.custom_pain("Your [affected.name] is being burned!",1)
+ target.custom_pain("Your [affected.name] is being burned!")
..()
/datum/surgery_step/generic/cauterize/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -219,7 +219,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] is beginning to amputate [target]'s [affected.name] with \the [tool]." , \
"You are beginning to cut through [target]'s [affected.amputation_point] with \the [tool].")
- target.custom_pain("Your [affected.amputation_point] is being ripped apart!",1)
+ target.custom_pain("Your [affected.amputation_point] is being ripped apart!")
..()
/datum/surgery_step/generic/amputate/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm
index 7518cc701af..c36df974ea3 100644
--- a/code/modules/surgery/implant_removal.dm
+++ b/code/modules/surgery/implant_removal.dm
@@ -45,7 +45,7 @@
I = locate(/obj/item/implant) in target
user.visible_message("[user] starts poking around inside [target]'s [affected.name] with \the [tool].", \
"You start poking around inside [target]'s [affected.name] with \the [tool]." )
- target.custom_pain("The pain in your [affected.name] is living hell!",1)
+ target.custom_pain("The pain in your [affected.name] is living hell!")
..()
/datum/surgery_step/extract_implant/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index d98e40700df..bdc5f763442 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -66,7 +66,7 @@
if(!holder || (holder in src))
return
- owner.visible_message("[owner] retracts [holder] back into \his [parent_organ == "r_arm" ? "right" : "left"] arm.",
+ owner.visible_message("[owner] retracts [holder] back into [owner.p_their()] [parent_organ == "r_arm" ? "right" : "left"] arm.",
"[holder] snaps back into your [parent_organ == "r_arm" ? "right" : "left"] arm.",
"You hear a short mechanical noise.")
@@ -114,7 +114,7 @@
if(parent_organ == "r_arm" ? owner.hand : !owner.hand)
owner.swap_hand()
- owner.visible_message("[owner] extends [holder] from \his [parent_organ == "r_arm" ? "right" : "left"] arm.",
+ owner.visible_message("[owner] extends [holder] from [owner.p_their()] [parent_organ == "r_arm" ? "right" : "left"] arm.",
"You extend [holder] from your [parent_organ == "r_arm" ? "right" : "left"] arm.",
"You hear a short mechanical noise.")
playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
@@ -242,7 +242,7 @@
/obj/item/organ/internal/cyberimp/arm/surgery
name = "surgical toolset implant"
desc = "A set of surgical tools hidden behind a concealed panel on the user's arm"
- contents = newlist(/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw, /obj/item/bonegel, /obj/item/FixOVein, /obj/item/bonesetter)
+ contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/surgicaldrill/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/bonegel/augment, /obj/item/FixOVein/augment, /obj/item/bonesetter/augment)
origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3"
// lets make IPCs even *more* vulnerable to EMPs!
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index 0af7781eee4..5837fab5925 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -30,6 +30,7 @@
var/sterile = FALSE //can the organ be infected by germs?
var/tough = FALSE //can organ be easily damaged?
var/emp_proof = FALSE //is the organ immune to EMPs?
+ var/hidden_pain = FALSE //will it skip pain messages?
/obj/item/organ/Destroy()
@@ -232,7 +233,7 @@
if(owner && parent_organ && amount > 0)
var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
if(parent && !silent)
- owner.custom_pain("Something inside your [parent.name] hurts a lot.", 1)
+ owner.custom_pain("Something inside your [parent.name] hurts a lot.")
//check if we've hit max_damage
if(damage >= max_damage)
@@ -289,7 +290,7 @@
return
if(owner && robotic == 2)
Stop() // In the name of looooove~!
- owner.visible_message("[owner] clutches their chest and gasps!","You clutch your chest in pain!")
+ owner.visible_message("[owner] clutches [owner.p_their()] chest and gasps!","You clutch your chest in pain!")
else if(owner && robotic == 1)
receive_damage(11,1)
@@ -306,7 +307,7 @@
processing_objects |= src
if(owner && vital && is_primary_organ()) // I'd do another check for species or whatever so that you couldn't "kill" an IPC by removing a human head from them, but it doesn't matter since they'll come right back from the dead
- add_attack_logs(user, owner, "Removed vital organ ([src])", !!user)
+ add_attack_logs(user, owner, "Removed vital organ ([src])", !!user ? ATKLOG_FEW : ATKLOG_ALL)
owner.death()
owner = null
return src
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 0ebf08c225c..960ce7c0da1 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -172,7 +172,7 @@
owner.emote("scream") //getting hit on broken hand hurts
if(status & ORGAN_SPLINTED && prob((brute + burn)*4)) //taking damage to splinted limbs removes the splints
status &= ~ORGAN_SPLINTED
- owner.visible_message("The splint on [owner]'s left arm unravels from their [name]!","The splint on your [name] unravels!")
+ owner.visible_message("The splint on [owner]'s left arm unravels from [owner.p_their()] [name]!","The splint on your [name] unravels!")
owner.handle_splints()
if(used_weapon)
add_autopsy_data("[used_weapon]", brute + burn)
@@ -239,7 +239,6 @@
#undef LIMB_SHARP_THRESH_INT_DMG
#undef LIMB_THRESH_INT_DMG
#undef LIMB_DMG_PROB
-#undef LIMB_NO_BONE_DMG_PROB
/obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0)
if(status & ORGAN_ROBOT && !robo_repair)
@@ -273,8 +272,7 @@ This function completely restores a damaged organ to perfect condition.
burn_dam = 0
open = 0 //Closing all wounds.
internal_bleeding = FALSE
- if(istype(src, /obj/item/organ/external/head) && disfigured) //If their head's disfigured, refigure it.
- disfigured = 0
+ disfigured = FALSE
// handle internal organs
for(var/obj/item/organ/internal/current_organ in internal_organs)
@@ -409,7 +407,7 @@ Note that amputating the affected organ does in fact remove the infection from t
var/local_damage = brute_dam + damage
if(damage > 15 && local_damage > 30 && prob(damage) && !(status & ORGAN_ROBOT))
internal_bleeding = TRUE
- owner.custom_pain("You feel something rip in your [name]!", 1)
+ owner.custom_pain("You feel something rip in your [name]!")
// new damage icon system
// returns just the brute/burn damage code
@@ -442,7 +440,7 @@ Note that amputating the affected organ does in fact remove the infection from t
return
if(owner.step_count >= splinted_count + SPLINT_LIFE)
status &= ~ORGAN_SPLINTED //oh no, we actually need surgery now!
- owner.visible_message("[owner] screams in pain as their splint pops off their [name]!","You scream in pain as your splint pops off your [name]!")
+ owner.visible_message("[owner] screams in pain as [owner.p_their()] splint pops off their [name]!","You scream in pain as your splint pops off your [name]!")
owner.emote("scream")
owner.Stun(2)
owner.handle_splints()
@@ -737,19 +735,14 @@ Note that amputating the affected organ does in fact remove the infection from t
qdel(spark_system)
qdel(src)
-/obj/item/organ/external/proc/disfigure(var/type = "brute")
+/obj/item/organ/external/proc/disfigure()
if(disfigured)
return
if(owner)
- if(type == "brute")
- owner.visible_message("You hear a sickening cracking sound coming from \the [owner]'s [name].", \
- "Your [name] becomes a mangled mess!", \
- "You hear a sickening crack.")
- else
- owner.visible_message("\The [owner]'s [name] melts away, turning into mangled mess!", \
- "Your [name] melts away!", \
- "You hear a sickening sizzle.")
- disfigured = 1
+ owner.visible_message("You hear a sickening sound coming from \the [owner]'s [name] as it turns into a mangled mess!", \
+ "Your [name] becomes a mangled mess!", \
+ "You hear a sickening sound.")
+ disfigured = TRUE
/obj/item/organ/external/is_primary_organ(var/mob/living/carbon/human/O = null)
if(isnull(O))
diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm
index d107c7439c6..e3386aef1b3 100644
--- a/code/modules/surgery/organs/pain.dm
+++ b/code/modules/surgery/organs/pain.dm
@@ -1,41 +1,28 @@
-mob/var/list/pain_stored = list()
-mob/var/last_pain_message = ""
-mob/var/next_pain_time = 0
+/mob/living/carbon/human
+ var/last_pain_message = ""
+ var/next_pain_time = 0
// partname is the name of a body part
// amount is a num from 1 to 100
-mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0)
- if(stat >= 2) return
+/mob/living/carbon/human/proc/pain(partname, amount)
+ if(stat >= UNCONSCIOUS)
+ return
if(reagents.has_reagent("sal_acid"))
return
if(reagents.has_reagent("morphine"))
return
if(reagents.has_reagent("hydrocodone"))
return
- if(world.time < next_pain_time && !force)
+ if(world.time < next_pain_time)
return
- if(amount > 10 && istype(src,/mob/living/carbon/human))
- if(paralysis)
- AdjustParalysis(-round(amount/10))
- if(amount > 50 && prob(amount / 5))
- src:drop_item()
var/msg
- if(burning)
- switch(amount)
- if(1 to 10)
- msg = "Your [partname] burns."
- if(11 to 90)
- msg = "Your [partname] burns badly!"
- if(91 to 10000)
- msg = "OH GOD! Your [partname] is on fire!"
- else
- switch(amount)
- if(1 to 10)
- msg = "Your [partname] hurts."
- if(11 to 90)
- msg = "Your [partname] hurts badly."
- if(91 to 10000)
- msg = "OH GOD! Your [partname] is hurting terribly!"
+ switch(amount)
+ if(1 to 10)
+ msg = "Your [partname] hurts."
+ if(11 to 90)
+ msg = "Your [partname] hurts badly."
+ if(91 to INFINITY)
+ msg = "OH GOD! Your [partname] is hurting terribly!"
if(msg && (msg != last_pain_message || prob(10)))
last_pain_message = msg
to_chat(src, msg)
@@ -43,20 +30,18 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0
// message is the custom message to be displayed
-// flash_strength is 0 for weak pain flash, 1 for strong pain flash
-mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
- if(stat >= 1) return
+mob/living/carbon/human/proc/custom_pain(message)
+ if(stat >= UNCONSCIOUS)
+ return
if(NO_PAIN in species.species_traits)
return
-
if(reagents.has_reagent("morphine"))
return
if(reagents.has_reagent("hydrocodone"))
return
- var/msg = "[message]"
- if(flash_strength >= 1)
- msg = "[message]"
+
+ var/msg = "[message]"
// Anti message spam checks
if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time)))
@@ -67,70 +52,33 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
mob/living/carbon/human/proc/handle_pain()
// not when sleeping
- if(NO_PAIN in species.species_traits)
- //While synthetics don't feel pain, they will notice their gears gunking up with residue (toxins)
- if(isSynthetic())
- var/toxDamageMessage = null
- var/toxMessageProb = 1
- switch(getToxLoss())
- if(25 to 50)
- toxMessageProb = 1
- toxDamageMessage = "Your servos seem to be working harder."
- if(50 to 75)
- toxMessageProb = 2
- toxDamageMessage = "Your joints seem to stick randomly."
- if(75 to INFINITY)
- toxMessageProb = 5
- toxDamageMessage = "Your motors seem to slip; it really grinds your gears!"
- if(toxDamageMessage && prob(toxMessageProb))
- src.custom_pain(toxDamageMessage, getToxLoss() >= 15)
+ if(stat >= UNCONSCIOUS)
+ return
+ if(NO_PAIN in species.species_traits)
return
-
- if(stat >= 2) return
if(reagents.has_reagent("morphine"))
return
if(reagents.has_reagent("hydrocodone"))
return
+
var/maxdam = 0
var/obj/item/organ/external/damaged_organ = null
for(var/obj/item/organ/external/E in bodyparts)
- if(E.status & ORGAN_DEAD|ORGAN_ROBOT) continue
+ if((E.status & ORGAN_DEAD|ORGAN_ROBOT) || E.hidden_pain)
+ continue
var/dam = E.get_damage()
// make the choice of the organ depend on damage,
// but also sometimes use one of the less damaged ones
- if(dam > maxdam && (maxdam == 0 || prob(70)) )
+ if(dam > maxdam && (maxdam == 0 || prob(70)))
damaged_organ = E
maxdam = dam
if(damaged_organ)
- pain(damaged_organ.name, maxdam, 0)
-
+ pain(damaged_organ.name, maxdam)
// Damage to internal organs hurts a lot.
for(var/obj/item/organ/internal/I in internal_organs)
- if(istype(I, /obj/item/organ/internal/brain)) //the brain has no pain receptors, and brain damage is meant to be a stealthy damage type.
+ if(I.hidden_pain)
continue
- if(I.damage > 2) if(prob(2))
+ if(I.damage > 2 && prob(2))
var/obj/item/organ/external/parent = get_organ(I.parent_organ)
- src.custom_pain("You feel a sharp pain in your [parent.limb_name]", 1)
-
- var/toxDamageMessage = null
- var/toxMessageProb = 1
- switch(getToxLoss())
- if(1 to 5)
- toxMessageProb = 1
- toxDamageMessage = "Your body stings slightly."
- if(6 to 10)
- toxMessageProb = 2
- toxDamageMessage = "Your whole body hurts a little."
- if(11 to 15)
- toxMessageProb = 2
- toxDamageMessage = "Your whole body hurts."
- if(15 to 25)
- toxMessageProb = 3
- toxDamageMessage = "Your whole body hurts badly."
- if(26 to INFINITY)
- toxMessageProb = 5
- toxDamageMessage = "Your body aches all over, it's driving you mad."
-
- if(toxDamageMessage && prob(toxMessageProb))
- src.custom_pain(toxDamageMessage, getToxLoss() >= 15)
+ custom_pain("You feel a sharp pain in your [parent.limb_name]")
\ No newline at end of file
diff --git a/code/modules/surgery/organs/parasites.dm b/code/modules/surgery/organs/parasites.dm
index 0adca48bfd0..900e60d9806 100644
--- a/code/modules/surgery/organs/parasites.dm
+++ b/code/modules/surgery/organs/parasites.dm
@@ -82,7 +82,7 @@
// Actually, let's make it slightly worse... just to discourage people from bringing back infections.
alternate_ending = 1
to_chat(owner,"The shapes extend tendrils out of your wound... no... those are legs! SPIDER LEGS! You have spiderlings growing inside you! You scratch at the wound, but it just aggrivates them - they swarm out of the wound, biting you all over!")
- owner.visible_message("[owner] flails around on the floor as spiderlings erupt from their skin and swarm all over them! ")
+ owner.visible_message("[owner] flails around on the floor as spiderlings erupt from [owner.p_their()] skin and swarm all over them! ")
owner.Stun(20)
owner.Weaken(20)
// yes, this is a long stun - that's intentional. Gotta give the spiderlings time to escape.
diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm
index 3fd8effd56a..30c4e173cdc 100644
--- a/code/modules/surgery/organs/subtypes/standard.dm
+++ b/code/modules/surgery/organs/subtypes/standard.dm
@@ -211,11 +211,8 @@
/obj/item/organ/external/head/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE)
..(brute, burn, sharp, used_weapon, forbidden_limbs, ignore_resists)
if(!disfigured)
- if(brute_dam > 40)
- if(prob(50))
- disfigure("brute")
- if(burn_dam > 40)
- disfigure("burn")
+ if(brute_dam + burn_dam > 50)
+ disfigure()
/obj/item/organ/external/head/proc/handle_alt_icon()
if(alt_head && alt_heads_list[alt_head])
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 1af925c3166..4c0094592e9 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -116,7 +116,7 @@
if(affected)
user.visible_message("[user] starts transplanting [tool] into [target]'s [affected.name].", \
"You start transplanting [tool] into [target]'s [affected.name].")
- H.custom_pain("Someone's rooting around in your [affected.name]!",1)
+ H.custom_pain("Someone's rooting around in your [affected.name]!")
else
user.visible_message("[user] starts transplanting [tool] into [target]'s [parse_zone(target_zone)].", \
"You start transplanting [tool] into [target]'s [parse_zone(target_zone)].")
@@ -143,7 +143,7 @@
self_msg = "You begin injecting [tool] into [target]'s [I.name]."
user.visible_message(msg, self_msg)
if(H && affected)
- H.custom_pain("Something burns horribly in your [affected.name]!",1)
+ H.custom_pain("Something burns horribly in your [affected.name]!")
else if(implement_type in implements_finsh)
//same as surgery step /datum/surgery_step/open_encased/close/
@@ -159,7 +159,7 @@
user.visible_message(msg, self_msg)
if(H && affected)
- H.custom_pain("Something hurts horribly in your [affected.name]!",1)
+ H.custom_pain("Something hurts horribly in your [affected.name]!")
else if(implement_type in implements_extract)
current_type = "extract"
@@ -188,7 +188,7 @@
user.visible_message("[user] starts to separate [target]'s [I] with [tool].", \
"You start to separate [target]'s [I] with [tool] for removal." )
if(H && affected)
- H.custom_pain("The pain in your [affected.name] is living hell!",1)
+ H.custom_pain("The pain in your [affected.name] is living hell!")
else
return -1
@@ -221,7 +221,7 @@
to_chat(user, "[I] does not appear to be damaged.")
if(affected)
- H.custom_pain("The pain in your [affected.name] is living hell!", 1)
+ H.custom_pain("The pain in your [affected.name] is living hell!")
else if(istype(tool, /obj/item/reagent_containers/food/snacks/organ))
to_chat(user, "[tool] was bitten by someone! It's too damaged to use!")
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 012f7ad3c5b..455a6a8de04 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -80,7 +80,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] starts patching the damaged vein in [target]'s [affected.name] with \the [tool]." , \
"You start patching the damaged vein in [target]'s [affected.name] with \the [tool].")
- target.custom_pain("The pain in [affected.name] is unbearable!",1)
+ target.custom_pain("The pain in [affected.name] is unbearable!")
..()
/datum/surgery_step/fix_vein/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -133,7 +133,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] starts cutting away necrotic tissue in [target]'s [affected.name] with \the [tool]." , \
"You start cutting away necrotic tissue in [target]'s [affected.name] with \the [tool].")
- target.custom_pain("The pain in [affected.name] is unbearable!",1)
+ target.custom_pain("The pain in [affected.name] is unbearable!")
..()
/datum/surgery_step/fix_dead_tissue/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -191,7 +191,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] starts applying medication to the affected tissue in [target]'s [affected.name] with \the [tool]." , \
"You start applying medication to the affected tissue in [target]'s [affected.name] with \the [tool].")
- target.custom_pain("Something in your [affected.name] is causing you a lot of pain!",1)
+ target.custom_pain("Something in your [affected.name] is causing you a lot of pain!")
..()
/datum/surgery_step/treat_necrosis/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -241,7 +241,7 @@
//////////////////////////////////////////////////////////////////
/datum/surgery/remove_thrall
name = "Remove Shadow Tumor"
- steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/open_encased/saw,/datum/surgery_step/open_encased/retract, /datum/surgery_step/internal/dethrall, /datum/surgery_step/glue_bone, /datum/surgery_step/set_bone,/datum/surgery_step/finish_bone,/datum/surgery_step/generic/cauterize)
+ steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/internal/dethrall, /datum/surgery_step/generic/cauterize)
possible_locs = list("head", "chest", "groin")
/datum/surgery/remove_thrall/synth
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
new file mode 100644
index 00000000000..4d14d2e8a79
--- /dev/null
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -0,0 +1,56 @@
+/datum/surgery/plastic_surgery
+ name = "Plastic Surgery"
+ steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/reshape_face, /datum/surgery_step/generic/cauterize)
+ possible_locs = list("head")
+
+/datum/surgery/plastic_surgery/can_start(mob/user, mob/living/carbon/target)
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ var/obj/item/organ/external/head/head = H.get_organ(user.zone_sel.selecting)
+ if(!head)
+ return FALSE
+ if(head.status & ORGAN_ROBOT)
+ return FALSE
+ return TRUE
+
+
+/datum/surgery_step/reshape_face
+ name = "reshape face"
+ allowed_tools = list(/obj/item/scalpel = 100, /obj/item/kitchen/knife = 50, /obj/item/wirecutters = 35)
+ time = 64
+
+/datum/surgery_step/reshape_face/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to alter [target]'s appearance.", "You begin to alter [target]'s appearance...")
+
+/datum/surgery_step/reshape_face/end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/obj/item/organ/external/head/head = target.get_organ(target_zone)
+ var/species_names = target.get_species()
+ if(head.disfigured)
+ head.disfigured = FALSE
+ user.visible_message("[user] successfully restores [target]'s appearance!", "You successfully restore [target]'s appearance.")
+ else
+ var/list/names = list()
+ if(!isabductor(user))
+ for(var/i in 1 to 10)
+ names += random_name(target.gender, species_names)
+ else
+ for(var/_i in 1 to 9)
+ names += "Subject [target.gender == MALE ? "i" : "o"]-[pick("a", "b", "c", "d", "e")]-[rand(10000, 99999)]"
+ names += random_name(target.gender, species_names) //give one normal name in case they want to do regular plastic surgery
+ var/chosen_name = input(user, "Choose a new name to assign.", "Plastic Surgery") as null|anything in names
+ if(!chosen_name)
+ return
+ var/oldname = target.real_name
+ target.real_name = chosen_name
+ var/newname = target.real_name //something about how the code handles names required that I use this instead of target.real_name
+ user.visible_message("[user] alters [oldname]'s appearance completely, [target.p_they()] [target.p_are()] now [newname]!", "You alter [oldname]'s appearance completely, [target.p_they()] [target.p_are()] now [newname].")
+ target.sec_hud_set_ID()
+ return TRUE
+
+
+/datum/surgery_step/reshape_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ var/obj/item/organ/external/head/head = target.get_organ(target_zone)
+ user.visible_message(" [user]'s hand slips, tearing skin on [target]'s face with [tool]!", \
+ " Your hand slips, tearing skin on [target]'s face with [tool]!")
+ target.apply_damage(10, BRUTE, head, sharp = TRUE)
+ return FALSE
\ No newline at end of file
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index 58b570eb5e3..ed82328c47d 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -248,10 +248,7 @@
user.visible_message(" [user] finishes patching damage to [target]'s [affected.name] with \the [tool].", \
" You finish patching damage to [target]'s [affected.name] with \the [tool].")
affected.heal_damage(rand(30,50),0,1,1)
- if(affected.disfigured)
- affected.disfigured = 0
- affected.update_icon()
- target.regenerate_icons()
+ affected.disfigured = FALSE
if("burn")
user.visible_message(" [user] finishes splicing cable into [target]'s [affected.name].", \
" You finishes splicing new cable into [target]'s [affected.name].")
@@ -325,7 +322,7 @@
user.visible_message("[user] begins reattaching [target]'s [tool].", \
"You start reattaching [target]'s [tool].")
- target.custom_pain("Someone's rooting around in your [affected.name]!",1)
+ target.custom_pain("Someone's rooting around in your [affected.name]!")
else if(istype(tool,/obj/item/mmi))
current_type = "install"
@@ -386,7 +383,7 @@
user.visible_message("[user] starts to decouple [target]'s [I] with \the [tool].", \
"You start to decouple [target]'s [I] with \the [tool]." )
- target.custom_pain("The pain in your [affected.name] is living hell!",1)
+ target.custom_pain("The pain in your [affected.name] is living hell!")
else
return -1
@@ -407,7 +404,7 @@
to_chat(user, "There are no damaged components in [affected].")
return -1
- target.custom_pain("The pain in your [affected.name] is living hell!",1)
+ target.custom_pain("The pain in your [affected.name] is living hell!")
else if(implement_type in implements_finish)
current_type = "finish"
@@ -522,7 +519,7 @@
user.visible_message("[user] starts to decouple [target]'s [affected.name] with \the [tool].", \
"You start to decouple [target]'s [affected.name] with \the [tool]." )
- target.custom_pain("Your [affected.amputation_point] is being ripped apart!",1)
+ target.custom_pain("Your [affected.amputation_point] is being ripped apart!")
..()
/datum/surgery_step/robotics/external/amputate/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
diff --git a/code/modules/surgery/slime.dm b/code/modules/surgery/slime.dm
index ced21be08b4..77614d41430 100644
--- a/code/modules/surgery/slime.dm
+++ b/code/modules/surgery/slime.dm
@@ -98,6 +98,6 @@
return 1
/datum/surgery_step/slime/saw_core/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message(" [user]'s hand slips, causing \him to miss the core!", \
+ user.visible_message(" [user]'s hand slips, causing [user.p_them()] to miss the core!", \
" Your hand slips, causing you to miss the core!")
- return 0
\ No newline at end of file
+ return 0
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 85880048f9b..53691dd0264 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -8,6 +8,10 @@
w_class = WEIGHT_CLASS_SMALL
origin_tech = "materials=1;biotech=1"
+/obj/item/retractor/augment
+ desc = "Micro-mechanical manipulator for retracting stuff."
+ w_class = WEIGHT_CLASS_TINY
+ toolspeed = 0.5
/obj/item/hemostat
name = "hemostat"
@@ -20,6 +24,9 @@
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "pinched")
+/obj/item/hemostat/augment
+ desc = "Tiny servos power a pair of pincers to stop bleeding."
+ toolspeed = 0.5
/obj/item/cautery
name = "cautery"
@@ -32,6 +39,9 @@
origin_tech = "materials=1;biotech=1"
attack_verb = list("burnt")
+/obj/item/cautery/augment
+ desc = "A heated element that cauterizes wounds."
+ toolspeed = 0.5
/obj/item/surgicaldrill
name = "surgical drill"
@@ -48,10 +58,16 @@
attack_verb = list("drilled")
suicide_act(mob/user)
- to_chat(viewers(user), pick("[user] is pressing [src] to \his temple and activating it! It looks like \he's trying to commit suicide.",
- "[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide."))
+ to_chat(viewers(user), pick("[user] is pressing [src] to [user.p_their()] temple and activating it! It looks like [user.p_theyre()] trying to commit suicide.",
+ "[user] is pressing [src] to [user.p_their()] chest and activating it! It looks like [user.p_theyre()] trying to commit suicide."))
return (BRUTELOSS)
+/obj/item/surgicaldrill/augment
+ desc = "Effectively a small power drill contained within your arm, edges dulled to prevent tissue damage. May or may not pierce the heavens."
+ hitsound = 'sound/weapons/circsawhit.ogg'
+ force = 10
+ w_class = WEIGHT_CLASS_SMALL
+ toolspeed = 0.5
/obj/item/scalpel
name = "scalpel"
@@ -72,12 +88,16 @@
hitsound = 'sound/weapons/bladeslice.ogg'
suicide_act(mob/user)
- to_chat(viewers(user), pick("[user] is slitting \his wrists with [src]! It looks like \he's trying to commit suicide.",
- "[user] is slitting \his throat with [src]! It looks like \he's trying to commit suicide.",
- "[user] is slitting \his stomach open with [src]! It looks like \he's trying to commit seppuku."))
+ to_chat(viewers(user), pick("[user] is slitting [user.p_their()] wrists with [src]! It looks like [user.p_theyre()] trying to commit suicide.",
+ "[user] is slitting [user.p_their()] throat with [src]! It looks like [user.p_theyre()] trying to commit suicide.",
+ "[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku."))
return (BRUTELOSS)
+/obj/item/scalpel/augment
+ desc = "Ultra-sharp blade attached directly to your bone for extra-accuracy."
+ toolspeed = 0.5
+
/*
* Researchable Scalpels
*/
@@ -129,6 +149,12 @@
origin_tech = "biotech=1;combat=1"
attack_verb = list("attacked", "slashed", "sawed", "cut")
+/obj/item/circular_saw/augment
+ desc = "A small but very fast spinning saw. Edges dulled to prevent accidental cutting inside of the surgeon."
+ force = 10
+ w_class = WEIGHT_CLASS_SMALL
+ toolspeed = 0.5
+
//misc, formerly from code/defines/weapons.dm
/obj/item/bonegel
name = "bone gel"
@@ -139,6 +165,9 @@
throwforce = 1.0
origin_tech = "materials=1;biotech=1"
+/obj/item/bonegel/augment
+ toolspeed = 0.5
+
/obj/item/FixOVein
name = "FixOVein"
icon = 'icons/obj/surgery.dmi'
@@ -148,6 +177,9 @@
origin_tech = "materials=1;biotech=1"
w_class = WEIGHT_CLASS_SMALL
+/obj/item/FixOVein/augment
+ toolspeed = 0.5
+
/obj/item/bonesetter
name = "bone setter"
icon = 'icons/obj/surgery.dmi'
@@ -160,6 +192,9 @@
attack_verb = list("attacked", "hit", "bludgeoned")
origin_tech = "materials=1;biotech=1"
+/obj/item/bonesetter/augment
+ toolspeed = 0.5
+
/obj/item/surgical_drapes
name = "surgical drapes"
desc = "Nanotrasen brand surgical drapes provide optimal safety and infection control."
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 9336de72515..b7cf78e5ed2 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -46,7 +46,7 @@
..(user)
to_chat(user, "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots.")
-/obj/machinery/computer/telescience/initialize()
+/obj/machinery/computer/telescience/Initialize()
..()
for(var/i = 1; i <= starting_crystals; i++)
crystals += new /obj/item/ore/bluespace_crystal/artificial(null) // starting crystals
diff --git a/config/example/config.txt b/config/example/config.txt
index 46d03c48aaa..84e67d5f127 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -37,6 +37,9 @@ LOG_SAY
## log admin actions
LOG_ADMIN
+## log admin chat
+LOG_ADMINCHAT
+
## log client access (logon/logoff)
LOG_ACCESS
diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt
index a962b4b685c..563768b69bc 100644
--- a/config/example/dbconfig.txt
+++ b/config/example/dbconfig.txt
@@ -9,7 +9,7 @@
## This value must be set to the version of the paradise schema in use.
## If this value does not match, the SQL database will not be loaded and an error will be generated.
## Roundstart will be delayed.
-DB_VERSION 2
+DB_VERSION 4
## Server the MySQL database can be found at.
# Examples: localhost, 200.135.5.43, www.mysqldb.com, etc.
@@ -26,11 +26,11 @@ FEEDBACK_DATABASE feedback
## Note, this does not change the table names in the database, you will have to do that yourself.
## IE:
## FEEDBACK_TABLEPREFIX erro_
-## FEEDBACK_TABLEPREFIX
+## FEEDBACK_TABLEPREFIX
## FEEDBACK_TABLEPREFIX SS13_
##
## Leave as is if you are using the standard schema file.
-FEEDBACK_TABLEPREFIX
+FEEDBACK_TABLEPREFIX
## Username/Login used to access the database.
FEEDBACK_LOGIN username
diff --git a/config/example/jobs_highpop.txt b/config/example/jobs_highpop.txt
new file mode 100644
index 00000000000..962803ab886
--- /dev/null
+++ b/config/example/jobs_highpop.txt
@@ -0,0 +1,37 @@
+Captain=1
+Head of Personnel=1
+Head of Security=1
+Chief Engineer=1
+Research Director=1
+Chief Medical Officer=1
+
+Station Engineer=5
+Roboticist=1
+
+Medical Doctor=5
+Geneticist=2
+Virologist=1
+
+Scientist=3
+Chemist=2
+
+Bartender=1
+Botanist=2
+Chef=1
+Janitor=1
+Quartermaster=1
+Shaft Miner=3
+
+Warden=1
+Detective=1
+Security Officer=7
+
+Assistant=-1
+Atmospheric Technician=4
+Cargo Technician=3
+Chaplain=1
+Lawyer=2
+Librarian=1
+
+AI=1
+Cyborg=1
\ No newline at end of file
diff --git a/config/example/tos.txt b/config/example/tos.txt
new file mode 100644
index 00000000000..eb43c50a083
--- /dev/null
+++ b/config/example/tos.txt
@@ -0,0 +1,3 @@
+
Welcome to Space Station 13!
+
+Terms of service goes here.
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 7f3af71489e..5bdddeec18c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,276 @@
-->
+
01 July 2018
+
monster860 updated:
+
+
Adds the mining podbay (again)
+
+
+
30 June 2018
+
Citinited updated:
+
+
Adds the conveyor belt placer and bluespace conveyor belt placer, allowing you to much more easily create conveyor belts. The former can be gotten at any autolathe, the latter must be researched first.
+
Use a conveyor belt lever on aforementioned item to link all belts inside the placer with that lever.
+
+
+
27 June 2018
+
MINIMAN10000 updated:
+
+
Containment emitters
+
deferred processing of SMES
+
+
+
26 June 2018
+
Alffd updated:
+
+
Additional logic to atmos throwing.
+
+
+
23 June 2018
+
matt81093 updated:
+
+
death squid hitbox position
+
+
+
19 June 2018
+
Anasari updated:
+
+
Gloves of the north star is now categorized under highly visible and dangerous weapon instead of pointless badassery. (Because it's actually good)
+
+
Fox McCloud updated:
+
+
Can cast spells on CentComm z-level during ragin' mages
+
+
MINIMAN10000 updated:
+
+
Cardboard drop counts
+
+
+
17 June 2018
+
Fox McCloud updated:
+
+
Fixes wizards not spawning with their clothes and backpack
+
It no longer snows on away missions
+
+
variableundefined updated:
+
+
Nuclear challenge time limit now depends on round start time.
+
+
+
13 June 2018
+
Aurorablade updated:
+
+
Fluff for Panzerskull
+
+
Fox McCloud updated:
+
+
Medibots now actually talk, like beepsky
+
Adds Plastic surgery; fix someone's face or give them a new identity!
+
Having more than 50 cloneloss will render you "Unknown"
+
head disfigurement requires you to have more than 50 combined brute and burn damage, rather than tracking it separately
+
Fixes Cryoxadone and Rezadone not fixing disfigurement, Fixes fluorosulfuric acid not causing disfigurement at proper thresholds
+
Fixes syndicate medibot not being constructable from tactical medkits
+
Syndicate medibot and the mysterious medibot are better at treating brute and burn damage
+
Radiation event reworked; graphics updated--effects may be a bit more deadly
+
Buffed DIY chainsaws damage slightly
+
You now flip about when you spin with a double e-sword
+
Adds surgical augment to R&D
+
Tools on surgical augment are slightly faster at surgery
+
Wishgranter grants "Avatar of the Wishgranter" instead of making you a superhero
+
Toxin damage is stealthier and will no longer cause stinging spam message
+
+
Kyep updated:
+
+
Additional job slots are now available at 80+ server population.
+
+
MINIMAN10000 updated:
+
+
Airlock electronics lock
+
Airlock electronics close button
+
+
Piccione updated:
+
+
Added Magboots to the Paramedic's EVA gear closet
+
+
Tayyyyyyy updated:
+
+
Shadowling dethrall has been shortened to scalpel, hemostat, retractor, shine light, cautery
+
+
+
11 June 2018
+
FalseIncarnate updated:
+
+
Food on utensils now properly inherits the name of the source dish.
+
Joined Souls rune can now properly can summon restrained targets with 3+ invokers.
+
+
+
09 June 2018
+
Fox McCloud updated:
+
+
Fixes holobarrier icons being missing
+
+
+
08 June 2018
+
Alffd updated:
+
+
Adds an automated emergency var on air alarms for mappers
+
+
Anasari updated:
+
+
Fixes admin log for spray displaying (0,0,0) all the time.
+
+
Desolate updated:
+
+
ED-209 code corrected to work properly. Floorbot code corrected to work properly.
+
+
and Dumbdumb updated:
+
+
Unathi and Vox Sec Hardsuit update
+
+
+
05 June 2018
+
Kyep updated:
+
+
The Terror Spider away mission now has spiders colonizing the west side of the map. Only the gateway room is safe.
+
+
+
04 June 2018
+
Fox McCloud updated:
+
+
Hulk mutation no longer works at range (ie: punching/breaking windows/walls at range)
+
You must be on harm intent to damage things if you have hulk
+
Having hulk allows you to punch and damage just about anything
+
+
uraniummeltdown updated:
+
+
You can smelt titanium and glass together to form titanium glass for building shuttle windows
+
You can smelt titanium, plasma and glass together to form plastitanium glass for building plastitanium windows
+
Fulltile windows now smooth, windows crack as they get damaged and can be repaired with help intent welder
+
Windows have deconstruction hints and show whether they can be rotated or not
+
Plasma glass no longer gets auto-colored
+
RCDs can deconstruct airlocks again, they have no force now though
+
Wielded fireaxe does a lot of damage to windows and grilles instead of just deleting them
+
Glass stacks now use stack recipes instead of a custom menu
+
+
+
31 May 2018
+
FalseIncarnate updated:
+
+
The singulo no longer feeds on attention.
+
+
+
26 May 2018
+
Birdtalon updated:
+
+
Holoparasite guide updated to include newer models. Small tooltip added for charger models.
+
laser tag gun projectiles now play appropriate sound when striking.
+
+
Citinited updated:
+
+
Hopefully fixes all issues with disposals sending you to nullspace.
+
+
Fox McCloud updated:
+
+
Fixes not being able to propel yourself through space by farting if you possessed both superfart and toxic farts
+
+
Kyep and Bxil updated:
+
+
Prevents everyone and their mother from seeing through closed poddoors.
+
+
Tayyyyyyy updated:
+
+
Most things will now use the correct pronouns.
+
Newscasters properly check for feed channel creation and wanted issue creation
+
ERT should deploy properly without admins now.
+
+
+
19 May 2018
+
Aurorablade updated:
+
+
Vet Coat Fluff item.
+
Spacepod mod kit now uses kit blueprints and not KITE blueprints (spelling error).
+
+
Fox McCloud updated:
+
+
Adds gloves of the North Star; get them on the uplink for 8 TC
+
Unarmed attacks now have their own icons, as does disarming.
+
Various mobs have their own custom icon attacks
+
Monkies now bite!
+
+
+
18 May 2018
+
Fox McCloud updated:
+
+
Removes engineering and police tape
+
Adds security, atmospheric, and engineering holoprojectors
+
+
tigercat2000 updated:
+
+
You can now lock a facing direction with shift+middle mouse button, or lock your direction towards an object by clicking on it with shift + ctrl + middle mouse button.
+
+
+
15 May 2018
+
Tayyyyyyy updated:
+
+
Pun pun is back!
+
+
+
11 May 2018
+
Kyep updated:
+
+
It is no longer possible to create an infinite number of monkeys from the same monkey cube.
+
+
+
09 May 2018
+
RyanSmake updated:
+
+
You can now jump on fax machines without the UI lying to you.
+
+
+
07 May 2018
+
qwertyquerty updated:
+
+
The window title is custom now!
+
+
+
06 May 2018
+
Kyep updated:
+
+
DeathSquad is now better equipped, and prompts eligible ghosts with a "Do you want to play as DeathSquad?" when called.
+
DeathSquad members (except team leaders) can now choose to spawn as either an organic DS member, or a DS borg.
+
+
+
05 May 2018
+
Tayyyyyyy updated:
+
+
ERT members will have their proper name and appearance when cloned
+
+
+
04 May 2018
+
RyanSmake updated:
+
+
You will now log in to the proper account you input to the ATM instead of the one associated with you.
+
Now ATMs will reconnect after a power outage.
+
+
+
02 May 2018
+
CrazyLemon and Fox McCloud updated:
+
+
Fixes reagent smoke
+
+
+
01 May 2018
+
Alffd updated:
+
+
Tell clients to rejoin after shutdown, before killing the server.
+
+
Fox McCloud updated:
+
+
Removed programmable unloader circuit
+
Bomb testing range can now be utilized multiple times without worry of the bomb bouncing off and returning back to you
+
+
30 April 2018
Fox McCloud updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c1ed06b54a7..da678e40c7e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6365,3 +6365,186 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: Medbay treatment center now has a wider entrance
- tweak: Virology hallway is now publically accessible from Surgery waiting room,
entrance is now double-doors.
+2018-05-01:
+ Alffd:
+ - bugfix: Tell clients to rejoin after shutdown, before killing the server.
+ Fox McCloud:
+ - rscdel: Removed programmable unloader circuit
+ - bugfix: Bomb testing range can now be utilized multiple times without worry of
+ the bomb bouncing off and returning back to you
+2018-05-02:
+ CrazyLemon and Fox McCloud:
+ - bugfix: Fixes reagent smoke
+2018-05-04:
+ RyanSmake:
+ - bugfix: You will now log in to the proper account you input to the ATM instead
+ of the one associated with you.
+ - bugfix: Now ATMs will reconnect after a power outage.
+2018-05-05:
+ Tayyyyyyy:
+ - bugfix: ERT members will have their proper name and appearance when cloned
+2018-05-06:
+ Kyep:
+ - tweak: DeathSquad is now better equipped, and prompts eligible ghosts with a "Do
+ you want to play as DeathSquad?" when called.
+ - rscadd: DeathSquad members (except team leaders) can now choose to spawn as either
+ an organic DS member, or a DS borg.
+2018-05-07:
+ qwertyquerty:
+ - rscadd: The window title is custom now!
+2018-05-09:
+ RyanSmake:
+ - bugfix: You can now jump on fax machines without the UI lying to you.
+2018-05-11:
+ Kyep:
+ - bugfix: It is no longer possible to create an infinite number of monkeys from
+ the same monkey cube.
+2018-05-15:
+ Tayyyyyyy:
+ - bugfix: Pun pun is back!
+2018-05-18:
+ Fox McCloud:
+ - rscdel: Removes engineering and police tape
+ - rscadd: Adds security, atmospheric, and engineering holoprojectors
+ tigercat2000:
+ - rscadd: You can now lock a facing direction with shift+middle mouse button, or
+ lock your direction towards an object by clicking on it with shift + ctrl +
+ middle mouse button.
+2018-05-19:
+ Aurorablade:
+ - rscadd: Vet Coat Fluff item.
+ - tweak: Spacepod mod kit now uses kit blueprints and not KITE blueprints (spelling
+ error).
+ Fox McCloud:
+ - rscadd: Adds gloves of the North Star; get them on the uplink for 8 TC
+ - rscadd: Unarmed attacks now have their own icons, as does disarming.
+ - rscadd: Various mobs have their own custom icon attacks
+ - tweak: Monkies now bite!
+2018-05-26:
+ Birdtalon:
+ - tweak: Holoparasite guide updated to include newer models. Small tooltip added
+ for charger models.
+ - bugfix: laser tag gun projectiles now play appropriate sound when striking.
+ Citinited:
+ - bugfix: Hopefully fixes all issues with disposals sending you to nullspace.
+ Fox McCloud:
+ - bugfix: Fixes not being able to propel yourself through space by farting if you
+ possessed both superfart and toxic farts
+ Kyep and Bxil:
+ - bugfix: Prevents everyone and their mother from seeing through closed poddoors.
+ Tayyyyyyy:
+ - rscadd: Most things will now use the correct pronouns.
+ - bugfix: Newscasters properly check for feed channel creation and wanted issue
+ creation
+ - bugfix: ERT should deploy properly without admins now.
+2018-05-31:
+ FalseIncarnate:
+ - bugfix: The singulo no longer feeds on attention.
+2018-06-04:
+ Fox McCloud:
+ - bugfix: 'Hulk mutation no longer works at range (ie: punching/breaking windows/walls
+ at range)'
+ - tweak: You must be on harm intent to damage things if you have hulk
+ - rscadd: Having hulk allows you to punch and damage just about anything
+ uraniummeltdown:
+ - rscadd: You can smelt titanium and glass together to form titanium glass for building
+ shuttle windows
+ - rscadd: You can smelt titanium, plasma and glass together to form plastitanium
+ glass for building plastitanium windows
+ - rscadd: Fulltile windows now smooth, windows crack as they get damaged and can
+ be repaired with help intent welder
+ - rscadd: Windows have deconstruction hints and show whether they can be rotated
+ or not
+ - bugfix: Plasma glass no longer gets auto-colored
+ - bugfix: RCDs can deconstruct airlocks again, they have no force now though
+ - tweak: Wielded fireaxe does a lot of damage to windows and grilles instead of
+ just deleting them
+ - tweak: Glass stacks now use stack recipes instead of a custom menu
+2018-06-05:
+ Kyep:
+ - bugfix: The Terror Spider away mission now has spiders colonizing the west side
+ of the map. Only the gateway room is safe.
+2018-06-08:
+ Alffd:
+ - rscadd: Adds an automated emergency var on air alarms for mappers
+ Anasari:
+ - bugfix: Fixes admin log for spray displaying (0,0,0) all the time.
+ Desolate:
+ - bugfix: ED-209 code corrected to work properly. Floorbot code corrected to work
+ properly.
+ and Dumbdumb:
+ - rscadd: Unathi and Vox Sec Hardsuit update
+2018-06-09:
+ Fox McCloud:
+ - bugfix: Fixes holobarrier icons being missing
+2018-06-11:
+ FalseIncarnate:
+ - bugfix: Food on utensils now properly inherits the name of the source dish.
+ - bugfix: Joined Souls rune can now properly can summon restrained targets with
+ 3+ invokers.
+2018-06-13:
+ Aurorablade:
+ - rscadd: Fluff for Panzerskull
+ Fox McCloud:
+ - rscadd: Medibots now actually talk, like beepsky
+ - rscadd: Adds Plastic surgery; fix someone's face or give them a new identity!
+ - tweak: Having more than 50 cloneloss will render you "Unknown"
+ - tweak: head disfigurement requires you to have more than 50 combined brute and
+ burn damage, rather than tracking it separately
+ - bugfix: Fixes Cryoxadone and Rezadone not fixing disfigurement, Fixes fluorosulfuric
+ acid not causing disfigurement at proper thresholds
+ - bugfix: Fixes syndicate medibot not being constructable from tactical medkits
+ - tweak: Syndicate medibot and the mysterious medibot are better at treating brute
+ and burn damage
+ - tweak: Radiation event reworked; graphics updated--effects may be a bit more deadly
+ - tweak: Buffed DIY chainsaws damage slightly
+ - tweak: You now flip about when you spin with a double e-sword
+ - rscadd: Adds surgical augment to R&D
+ - tweak: Tools on surgical augment are slightly faster at surgery
+ - rscadd: Wishgranter grants "Avatar of the Wishgranter" instead of making you a
+ superhero
+ - tweak: Toxin damage is stealthier and will no longer cause stinging spam message
+ Kyep:
+ - rscadd: Additional job slots are now available at 80+ server population.
+ MINIMAN10000:
+ - rscdel: Airlock electronics lock
+ - bugfix: Airlock electronics close button
+ Piccione:
+ - rscadd: Added Magboots to the Paramedic's EVA gear closet
+ Tayyyyyyy:
+ - tweak: Shadowling dethrall has been shortened to scalpel, hemostat, retractor,
+ shine light, cautery
+2018-06-17:
+ Fox McCloud:
+ - bugfix: Fixes wizards not spawning with their clothes and backpack
+ - bugfix: It no longer snows on away missions
+ variableundefined:
+ - tweak: Nuclear challenge time limit now depends on round start time.
+2018-06-19:
+ Anasari:
+ - tweak: Gloves of the north star is now categorized under highly visible and dangerous
+ weapon instead of pointless badassery. (Because it's actually good)
+ Fox McCloud:
+ - tweak: Can cast spells on CentComm z-level during ragin' mages
+ MINIMAN10000:
+ - bugfix: Cardboard drop counts
+2018-06-23:
+ matt81093:
+ - bugfix: death squid hitbox position
+2018-06-26:
+ Alffd:
+ - rscadd: Additional logic to atmos throwing.
+2018-06-27:
+ MINIMAN10000:
+ - bugfix: Containment emitters
+ - rscadd: deferred processing of SMES
+2018-06-30:
+ Citinited:
+ - rscadd: Adds the conveyor belt placer and bluespace conveyor belt placer, allowing
+ you to much more easily create conveyor belts. The former can be gotten at any
+ autolathe, the latter must be researched first.
+ - rscadd: Use a conveyor belt lever on aforementioned item to link all belts inside
+ the placer with that lever.
+2018-07-01:
+ monster860:
+ - rscadd: Adds the mining podbay (again)
diff --git a/html/changelogs/AutoChangeLog-pr-8999.yml b/html/changelogs/AutoChangeLog-pr-8999.yml
new file mode 100644
index 00000000000..d1dfbaa9c38
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8999.yml
@@ -0,0 +1,4 @@
+author: "Citinited"
+delete-after: True
+changes:
+ - rscadd: "The chef can now process spaghetti into macaroni, and can make several derivative foodstuffs."
diff --git a/html/changelogs/AutoChangeLog-pr-9149.yml b/html/changelogs/AutoChangeLog-pr-9149.yml
new file mode 100644
index 00000000000..bab78bf8b64
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9149.yml
@@ -0,0 +1,4 @@
+author: "datlo"
+delete-after: True
+changes:
+ - rscadd: "Syndicate clowns can now purchase Clown Magboots. Keep honking through slips and atmos!"
diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi
index 2fdc968ebd6..a5195cc0167 100644
Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index ee05d5f450e..060d8b77a27 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/weather_effects.dmi b/icons/effects/weather_effects.dmi
index 215cf53556f..da1523706e2 100644
Binary files a/icons/effects/weather_effects.dmi and b/icons/effects/weather_effects.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 7fc4aa0a9ba..b1a26763fbd 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 16eeff1107f..49679ae2256 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/fluff_lefthand.dmi b/icons/mob/inhands/fluff_lefthand.dmi
index 645c04a9ac9..a5721f518ce 100644
Binary files a/icons/mob/inhands/fluff_lefthand.dmi and b/icons/mob/inhands/fluff_lefthand.dmi differ
diff --git a/icons/mob/inhands/fluff_righthand.dmi b/icons/mob/inhands/fluff_righthand.dmi
index f0656ef8e22..50435f90e0d 100644
Binary files a/icons/mob/inhands/fluff_righthand.dmi and b/icons/mob/inhands/fluff_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index bc282c185d8..1455fa9ab0e 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 8b41a0ec07d..e9d610d754d 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi
index f969705ec83..14b099f3f45 100644
Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ
diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi
index ebbfa5f9c73..1d0bcf81f27 100644
Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ
diff --git a/icons/mob/species/vox/collar.dmi b/icons/mob/species/vox/collar.dmi
index c0b8c6ba936..6c442c62f77 100644
Binary files a/icons/mob/species/vox/collar.dmi and b/icons/mob/species/vox/collar.dmi differ
diff --git a/icons/mob/species/vox/helmet.dmi b/icons/mob/species/vox/helmet.dmi
index c9227ce2119..a7186d611b6 100644
Binary files a/icons/mob/species/vox/helmet.dmi and b/icons/mob/species/vox/helmet.dmi differ
diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi
index ca8289a3ccb..3af770d719a 100644
Binary files a/icons/mob/species/vox/suit.dmi and b/icons/mob/species/vox/suit.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 781bc710af3..209e052895a 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi
index b3f92a3b57f..db92d8c21a6 100644
Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index a63ff4f5daa..d1aa0e9805a 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index c3942e015de..7143a55ab59 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/species/unathi/hats.dmi b/icons/obj/clothing/species/unathi/hats.dmi
index be2fb4f62aa..1ee46571f66 100644
Binary files a/icons/obj/clothing/species/unathi/hats.dmi and b/icons/obj/clothing/species/unathi/hats.dmi differ
diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/obj/clothing/species/unathi/suits.dmi
index 34c3ea75105..30b590cc7ed 100644
Binary files a/icons/obj/clothing/species/unathi/suits.dmi and b/icons/obj/clothing/species/unathi/suits.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 4ac69b3e7e3..c27c19ac3aa 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index f1c8b87aaa4..042c10b2aed 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/doors/windoor.dmi b/icons/obj/doors/windoor.dmi
index 8104686b483..9bf105faaf6 100644
Binary files a/icons/obj/doors/windoor.dmi and b/icons/obj/doors/windoor.dmi differ
diff --git a/icons/obj/engicart.dmi b/icons/obj/engicart.dmi
index 36d45cdf04b..0e665bff8df 100644
Binary files a/icons/obj/engicart.dmi and b/icons/obj/engicart.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 3395b112947..3a0ec216714 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 22dc1384904..288785052cd 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index d828f2ee9de..5714fcf4c9f 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index 119f3df0e37..83cb94a5ca3 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/smooth_structures/clockwork_window.dmi b/icons/obj/smooth_structures/clockwork_window.dmi
new file mode 100644
index 00000000000..90309ac3d52
Binary files /dev/null and b/icons/obj/smooth_structures/clockwork_window.dmi differ
diff --git a/icons/obj/smooth_structures/plasma_window.dmi b/icons/obj/smooth_structures/plasma_window.dmi
new file mode 100644
index 00000000000..3d57d156f01
Binary files /dev/null and b/icons/obj/smooth_structures/plasma_window.dmi differ
diff --git a/icons/obj/smooth_structures/plastitanium_window.dmi b/icons/obj/smooth_structures/plastitanium_window.dmi
new file mode 100644
index 00000000000..82ac0306159
Binary files /dev/null and b/icons/obj/smooth_structures/plastitanium_window.dmi differ
diff --git a/icons/obj/smooth_structures/pod_window.dmi b/icons/obj/smooth_structures/pod_window.dmi
new file mode 100644
index 00000000000..0fe7501225c
Binary files /dev/null and b/icons/obj/smooth_structures/pod_window.dmi differ
diff --git a/icons/obj/smooth_structures/reinforced_window.dmi b/icons/obj/smooth_structures/reinforced_window.dmi
index b5f24ebbd30..ed9a2a143e6 100644
Binary files a/icons/obj/smooth_structures/reinforced_window.dmi and b/icons/obj/smooth_structures/reinforced_window.dmi differ
diff --git a/icons/obj/smooth_structures/rice_window.dmi b/icons/obj/smooth_structures/rice_window.dmi
index e3a82935cf2..f5e7a6dd57a 100644
Binary files a/icons/obj/smooth_structures/rice_window.dmi and b/icons/obj/smooth_structures/rice_window.dmi differ
diff --git a/icons/obj/smooth_structures/rplasma_window.dmi b/icons/obj/smooth_structures/rplasma_window.dmi
new file mode 100644
index 00000000000..c64f42c7f5a
Binary files /dev/null and b/icons/obj/smooth_structures/rplasma_window.dmi differ
diff --git a/icons/obj/smooth_structures/shuttle_window.dmi b/icons/obj/smooth_structures/shuttle_window.dmi
index 3db34cf1ba1..85924dc449b 100644
Binary files a/icons/obj/smooth_structures/shuttle_window.dmi and b/icons/obj/smooth_structures/shuttle_window.dmi differ
diff --git a/icons/obj/smooth_structures/tinted_window.dmi b/icons/obj/smooth_structures/tinted_window.dmi
index ab992353275..be9affafeea 100644
Binary files a/icons/obj/smooth_structures/tinted_window.dmi and b/icons/obj/smooth_structures/tinted_window.dmi differ
diff --git a/icons/obj/smooth_structures/window.dmi b/icons/obj/smooth_structures/window.dmi
index 0197f5b20a7..670713bcfe0 100644
Binary files a/icons/obj/smooth_structures/window.dmi and b/icons/obj/smooth_structures/window.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 997642dcf29..d4b8e837db6 100755
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/status_display.dmi b/icons/obj/status_display.dmi
index b131da89349..81ccc415de1 100644
Binary files a/icons/obj/status_display.dmi and b/icons/obj/status_display.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 39df3590359..f388b9384fb 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 0b17038ade5..838503bbda1 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/policetape.dmi b/icons/policetape.dmi
deleted file mode 100644
index 74a758335a9..00000000000
Binary files a/icons/policetape.dmi and /dev/null differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 54ed0c40d6a..813abc66b98 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1499,7 +1499,7 @@ window "mainwindow"
size = 640x440
is-default = true
is-maximized = true
- title = "Space Station 13"
+ title = "Paradise Station 13"
icon = 'icons\\ss13_64.png'
menu = "menu"
macro = "macro"
diff --git a/paradise.dme b/paradise.dme
index 3e22149c595..7ada37793a7 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -18,6 +18,7 @@
#include "code\__DEFINES\_globals.dm"
#include "code\__DEFINES\_readme.dm"
#include "code\__DEFINES\admin.dm"
+#include "code\__DEFINES\antagonists.dm"
#include "code\__DEFINES\atmospherics.dm"
#include "code\__DEFINES\bots.dm"
#include "code\__DEFINES\callbacks.dm"
@@ -76,6 +77,7 @@
#include "code\__HELPERS\matrices.dm"
#include "code\__HELPERS\mobs.dm"
#include "code\__HELPERS\names.dm"
+#include "code\__HELPERS\pronouns.dm"
#include "code\__HELPERS\qdel.dm"
#include "code\__HELPERS\sanitize_values.dm"
#include "code\__HELPERS\text.dm"
@@ -88,8 +90,6 @@
#include "code\__HELPERS\sorts\MergeSort.dm"
#include "code\__HELPERS\sorts\TimSort.dm"
#include "code\_DATASTRUCTURES\heap.dm"
-#include "code\_DATASTRUCTURES\linked_lists.dm"
-#include "code\_DATASTRUCTURES\priority_queue.dm"
#include "code\_DATASTRUCTURES\stacks.dm"
#include "code\_globalvars\configuration.dm"
#include "code\_globalvars\database.dm"
@@ -192,42 +192,42 @@
#include "code\controllers\Processes\event.dm"
#include "code\controllers\Processes\fast_process.dm"
#include "code\controllers\Processes\lighting.dm"
-#include "code\controllers\Processes\machinery.dm"
-#include "code\controllers\Processes\mob.dm"
#include "code\controllers\Processes\nano_mob_hunter.dm"
#include "code\controllers\Processes\npcai.dm"
#include "code\controllers\Processes\npcpool.dm"
#include "code\controllers\Processes\obj.dm"
#include "code\controllers\Processes\shuttles.dm"
#include "code\controllers\Processes\ticker.dm"
-#include "code\controllers\Processes\weather.dm"
#include "code\controllers\ProcessScheduler\core\process.dm"
#include "code\controllers\ProcessScheduler\core\processScheduler.dm"
#include "code\controllers\subsystem\air.dm"
+#include "code\controllers\subsystem\atoms.dm"
#include "code\controllers\subsystem\fires.dm"
#include "code\controllers\subsystem\garbage.dm"
+#include "code\controllers\subsystem\machinery.dm"
+#include "code\controllers\subsystem\mobs.dm"
#include "code\controllers\subsystem\nanoui.dm"
#include "code\controllers\subsystem\nightshift.dm"
#include "code\controllers\subsystem\spacedrift.dm"
#include "code\controllers\subsystem\sun.dm"
#include "code\controllers\subsystem\throwing.dm"
#include "code\controllers\subsystem\timer.dm"
+#include "code\controllers\subsystem\weather.dm"
+#include "code\controllers\subsystem\processing\processing.dm"
#include "code\datums\action.dm"
#include "code\datums\ai_law_sets.dm"
#include "code\datums\ai_laws.dm"
#include "code\datums\beam.dm"
#include "code\datums\browser.dm"
#include "code\datums\callback.dm"
-#include "code\datums\cargoprofile.dm"
-#include "code\datums\computerfiles.dm"
#include "code\datums\datacore.dm"
#include "code\datums\datum.dm"
#include "code\datums\datumvars.dm"
#include "code\datums\gas_mixture.dm"
+#include "code\datums\holocall.dm"
#include "code\datums\hud.dm"
#include "code\datums\mind.dm"
#include "code\datums\mixed.dm"
-#include "code\datums\modules.dm"
#include "code\datums\mutable_appearance.dm"
#include "code\datums\periodic_news.dm"
#include "code\datums\progressbar.dm"
@@ -313,6 +313,7 @@
#include "code\datums\helper_datums\topic_input.dm"
#include "code\datums\looping_sounds\looping_sound.dm"
#include "code\datums\looping_sounds\machinery_sounds.dm"
+#include "code\datums\looping_sounds\weather.dm"
#include "code\datums\outfits\outfit.dm"
#include "code\datums\outfits\outfit_admin.dm"
#include "code\datums\ruins\space.dm"
@@ -352,7 +353,10 @@
#include "code\datums\status_effects\status_effect.dm"
#include "code\datums\vr\level.dm"
#include "code\datums\weather\weather.dm"
-#include "code\datums\weather\weather_types.dm"
+#include "code\datums\weather\weather_types\ash_storm.dm"
+#include "code\datums\weather\weather_types\floor_is_lava.dm"
+#include "code\datums\weather\weather_types\radiation_storm.dm"
+#include "code\datums\weather\weather_types\snow_storm.dm"
#include "code\datums\wires\airlock.dm"
#include "code\datums\wires\alarm.dm"
#include "code\datums\wires\apc.dm"
@@ -384,7 +388,6 @@
#include "code\game\data_huds.dm"
#include "code\game\response_team.dm"
#include "code\game\shuttle_engines.dm"
-#include "code\game\skincmd.dm"
#include "code\game\sound.dm"
#include "code\game\world.dm"
#include "code\game\area\ai_monitored.dm"
@@ -403,8 +406,6 @@
#include "code\game\dna\genes\powers.dm"
#include "code\game\dna\genes\vg_disabilities.dm"
#include "code\game\dna\genes\vg_powers.dm"
-#include "code\game\gamemodes\antag_hud.dm"
-#include "code\game\gamemodes\antag_spawner.dm"
#include "code\game\gamemodes\factions.dm"
#include "code\game\gamemodes\game_mode.dm"
#include "code\game\gamemodes\gameticker.dm"
@@ -528,6 +529,7 @@
#include "code\game\jobs\job_controller.dm"
#include "code\game\jobs\job_exp.dm"
#include "code\game\jobs\job_objective.dm"
+#include "code\game\jobs\job_scaling.dm"
#include "code\game\jobs\jobs.dm"
#include "code\game\jobs\whitelist.dm"
#include "code\game\jobs\job\central.dm"
@@ -582,7 +584,6 @@
#include "code\game\machinery\poolcontroller.dm"
#include "code\game\machinery\portable_tag_turret.dm"
#include "code\game\machinery\portable_turret.dm"
-#include "code\game\machinery\programmable_unloader.dm"
#include "code\game\machinery\quantum_pad.dm"
#include "code\game\machinery\recharger.dm"
#include "code\game\machinery\rechargestation.dm"
@@ -630,7 +631,6 @@
#include "code\game\machinery\computer\computer.dm"
#include "code\game\machinery\computer\crew.dm"
#include "code\game\machinery\computer\HolodeckControl.dm"
-#include "code\game\machinery\computer\hologram.dm"
#include "code\game\machinery\computer\honkputer.dm"
#include "code\game\machinery\computer\law.dm"
#include "code\game\machinery\computer\medical.dm"
@@ -770,7 +770,6 @@
#include "code\game\objects\items\flag.dm"
#include "code\game\objects\items\latexballoon.dm"
#include "code\game\objects\items\misc.dm"
-#include "code\game\objects\items\policetape.dm"
#include "code\game\objects\items\random_items.dm"
#include "code\game\objects\items\shooting_range.dm"
#include "code\game\objects\items\toys.dm"
@@ -867,7 +866,6 @@
#include "code\game\objects\items\weapons\paint.dm"
#include "code\game\objects\items\weapons\paiwire.dm"
#include "code\game\objects\items\weapons\pneumaticCannon.dm"
-#include "code\game\objects\items\weapons\power_cells.dm"
#include "code\game\objects\items\weapons\powerfist.dm"
#include "code\game\objects\items\weapons\RCD.dm"
#include "code\game\objects\items\weapons\RCL.dm"
@@ -883,7 +881,6 @@
#include "code\game\objects\items\weapons\stock_parts.dm"
#include "code\game\objects\items\weapons\stunbaton.dm"
#include "code\game\objects\items\weapons\swords_axes_etc.dm"
-#include "code\game\objects\items\weapons\syndie_uplink.dm"
#include "code\game\objects\items\weapons\tape.dm"
#include "code\game\objects\items\weapons\teleportation.dm"
#include "code\game\objects\items\weapons\teleprod.dm"
@@ -892,7 +889,6 @@
#include "code\game\objects\items\weapons\vending_items.dm"
#include "code\game\objects\items\weapons\weaponry.dm"
#include "code\game\objects\items\weapons\whetstone.dm"
-#include "code\game\objects\items\weapons\wires.dm"
#include "code\game\objects\items\weapons\grenades\atmosgrenade.dm"
#include "code\game\objects\items\weapons\grenades\bananade.dm"
#include "code\game\objects\items\weapons\grenades\chem_grenade.dm"
@@ -964,10 +960,10 @@
#include "code\game\objects\structures\false_walls.dm"
#include "code\game\objects\structures\flora.dm"
#include "code\game\objects\structures\foodcart.dm"
-#include "code\game\objects\structures\fullwindow.dm"
#include "code\game\objects\structures\girders.dm"
#include "code\game\objects\structures\grille.dm"
#include "code\game\objects\structures\guillotine.dm"
+#include "code\game\objects\structures\holosign.dm"
#include "code\game\objects\structures\inflatable.dm"
#include "code\game\objects\structures\janicart.dm"
#include "code\game\objects\structures\kitchen_spike.dm"
@@ -1139,6 +1135,12 @@
#include "code\modules\alarm\fire_alarm.dm"
#include "code\modules\alarm\motion_alarm.dm"
#include "code\modules\alarm\power_alarm.dm"
+#include "code\modules\antagonists\_common\antag_datum.dm"
+#include "code\modules\antagonists\_common\antag_helpers.dm"
+#include "code\modules\antagonists\_common\antag_hud.dm"
+#include "code\modules\antagonists\_common\antag_spawner.dm"
+#include "code\modules\antagonists\_common\antag_team.dm"
+#include "code\modules\antagonists\wishgranter\wishgranter.dm"
#include "code\modules\arcade\arcade_base.dm"
#include "code\modules\arcade\arcade_prize.dm"
#include "code\modules\arcade\claw_game.dm"
@@ -2071,6 +2073,7 @@
#include "code\modules\reagents\reagent_containers\pill.dm"
#include "code\modules\reagents\reagent_containers\spray.dm"
#include "code\modules\reagents\reagent_containers\syringes.dm"
+#include "code\modules\recycling\belt-placer.dm"
#include "code\modules\recycling\conveyor2.dm"
#include "code\modules\recycling\disposal-construction.dm"
#include "code\modules\recycling\disposal.dm"
@@ -2109,6 +2112,7 @@
#include "code\modules\research\xenobiology\xenobio_camera.dm"
#include "code\modules\research\xenobiology\xenobiology.dm"
#include "code\modules\ruins\ruin_areas.dm"
+#include "code\modules\scripting\__defines.dm"
#include "code\modules\scripting\Errors.dm"
#include "code\modules\scripting\Options.dm"
#include "code\modules\scripting\AST\AST Nodes.dm"
@@ -2159,7 +2163,6 @@
#include "code\modules\surgery\cavity_implant.dm"
#include "code\modules\surgery\dental_implant.dm"
#include "code\modules\surgery\encased.dm"
-#include "code\modules\surgery\face.dm"
#include "code\modules\surgery\generic.dm"
#include "code\modules\surgery\helpers.dm"
#include "code\modules\surgery\implant_removal.dm"
@@ -2167,6 +2170,7 @@
#include "code\modules\surgery\limb_reattach.dm"
#include "code\modules\surgery\organs_internal.dm"
#include "code\modules\surgery\other.dm"
+#include "code\modules\surgery\plastic_surgery.dm"
#include "code\modules\surgery\remove_embedded_object.dm"
#include "code\modules\surgery\rig_removal.dm"
#include "code\modules\surgery\robotics.dm"
diff --git a/sound/lavaland/ash_storm_end.ogg b/sound/lavaland/ash_storm_end.ogg
deleted file mode 100644
index f9b01453dda..00000000000
Binary files a/sound/lavaland/ash_storm_end.ogg and /dev/null differ
diff --git a/sound/lavaland/ash_storm_start.ogg b/sound/lavaland/ash_storm_start.ogg
deleted file mode 100644
index 4b9bebffd08..00000000000
Binary files a/sound/lavaland/ash_storm_start.ogg and /dev/null differ
diff --git a/sound/lavaland/ash_storm_windup.ogg b/sound/lavaland/ash_storm_windup.ogg
deleted file mode 100644
index a9f0fa3270e..00000000000
Binary files a/sound/lavaland/ash_storm_windup.ogg and /dev/null differ
diff --git a/sound/voice/mapple.ogg b/sound/voice/mapple.ogg
new file mode 100644
index 00000000000..21e26742ca1
Binary files /dev/null and b/sound/voice/mapple.ogg differ
diff --git a/sound/voice/mcatch.ogg b/sound/voice/mcatch.ogg
new file mode 100644
index 00000000000..07b8aaab75c
Binary files /dev/null and b/sound/voice/mcatch.ogg differ
diff --git a/sound/voice/mcoming.ogg b/sound/voice/mcoming.ogg
new file mode 100644
index 00000000000..d3eb9e467f4
Binary files /dev/null and b/sound/voice/mcoming.ogg differ
diff --git a/sound/voice/mdelicious.ogg b/sound/voice/mdelicious.ogg
new file mode 100644
index 00000000000..5158538580e
Binary files /dev/null and b/sound/voice/mdelicious.ogg differ
diff --git a/sound/voice/mfeelbetter.ogg b/sound/voice/mfeelbetter.ogg
new file mode 100644
index 00000000000..fdbe57fd2e9
Binary files /dev/null and b/sound/voice/mfeelbetter.ogg differ
diff --git a/sound/voice/mflies.ogg b/sound/voice/mflies.ogg
new file mode 100644
index 00000000000..831281ebbee
Binary files /dev/null and b/sound/voice/mflies.ogg differ
diff --git a/sound/voice/mhelp.ogg b/sound/voice/mhelp.ogg
new file mode 100644
index 00000000000..516d5db068d
Binary files /dev/null and b/sound/voice/mhelp.ogg differ
diff --git a/sound/voice/minjured.ogg b/sound/voice/minjured.ogg
new file mode 100644
index 00000000000..0e968b3980c
Binary files /dev/null and b/sound/voice/minjured.ogg differ
diff --git a/sound/voice/minsult.ogg b/sound/voice/minsult.ogg
new file mode 100644
index 00000000000..017292977a1
Binary files /dev/null and b/sound/voice/minsult.ogg differ
diff --git a/sound/voice/mlive.ogg b/sound/voice/mlive.ogg
new file mode 100644
index 00000000000..ceb0dec9a34
Binary files /dev/null and b/sound/voice/mlive.ogg differ
diff --git a/sound/voice/mlost.ogg b/sound/voice/mlost.ogg
new file mode 100644
index 00000000000..7b332ac346a
Binary files /dev/null and b/sound/voice/mlost.ogg differ
diff --git a/sound/voice/mno.ogg b/sound/voice/mno.ogg
new file mode 100644
index 00000000000..030e43a0109
Binary files /dev/null and b/sound/voice/mno.ogg differ
diff --git a/sound/voice/mpatchedup.ogg b/sound/voice/mpatchedup.ogg
new file mode 100644
index 00000000000..1314f6ee471
Binary files /dev/null and b/sound/voice/mpatchedup.ogg differ
diff --git a/sound/voice/mradar.ogg b/sound/voice/mradar.ogg
new file mode 100644
index 00000000000..ad347a6d891
Binary files /dev/null and b/sound/voice/mradar.ogg differ
diff --git a/sound/voice/msurgeon.ogg b/sound/voice/msurgeon.ogg
new file mode 100644
index 00000000000..a300ee57ef6
Binary files /dev/null and b/sound/voice/msurgeon.ogg differ
diff --git a/sound/weather/ashstorm/inside/active_end.ogg b/sound/weather/ashstorm/inside/active_end.ogg
new file mode 100644
index 00000000000..959bf5773eb
Binary files /dev/null and b/sound/weather/ashstorm/inside/active_end.ogg differ
diff --git a/sound/weather/ashstorm/inside/active_mid1.ogg b/sound/weather/ashstorm/inside/active_mid1.ogg
new file mode 100644
index 00000000000..95244cd2b7c
Binary files /dev/null and b/sound/weather/ashstorm/inside/active_mid1.ogg differ
diff --git a/sound/weather/ashstorm/inside/active_mid2.ogg b/sound/weather/ashstorm/inside/active_mid2.ogg
new file mode 100644
index 00000000000..a45584b9f31
Binary files /dev/null and b/sound/weather/ashstorm/inside/active_mid2.ogg differ
diff --git a/sound/weather/ashstorm/inside/active_mid3.ogg b/sound/weather/ashstorm/inside/active_mid3.ogg
new file mode 100644
index 00000000000..be2e672fa0e
Binary files /dev/null and b/sound/weather/ashstorm/inside/active_mid3.ogg differ
diff --git a/sound/weather/ashstorm/inside/active_start.ogg b/sound/weather/ashstorm/inside/active_start.ogg
new file mode 100644
index 00000000000..3efab12ef26
Binary files /dev/null and b/sound/weather/ashstorm/inside/active_start.ogg differ
diff --git a/sound/weather/ashstorm/inside/weak_end.ogg b/sound/weather/ashstorm/inside/weak_end.ogg
new file mode 100644
index 00000000000..416b75a9b84
Binary files /dev/null and b/sound/weather/ashstorm/inside/weak_end.ogg differ
diff --git a/sound/weather/ashstorm/inside/weak_mid1.ogg b/sound/weather/ashstorm/inside/weak_mid1.ogg
new file mode 100644
index 00000000000..d3211c6b5fc
Binary files /dev/null and b/sound/weather/ashstorm/inside/weak_mid1.ogg differ
diff --git a/sound/weather/ashstorm/inside/weak_mid2.ogg b/sound/weather/ashstorm/inside/weak_mid2.ogg
new file mode 100644
index 00000000000..b6491a7afb8
Binary files /dev/null and b/sound/weather/ashstorm/inside/weak_mid2.ogg differ
diff --git a/sound/weather/ashstorm/inside/weak_mid3.ogg b/sound/weather/ashstorm/inside/weak_mid3.ogg
new file mode 100644
index 00000000000..95238c72d40
Binary files /dev/null and b/sound/weather/ashstorm/inside/weak_mid3.ogg differ
diff --git a/sound/weather/ashstorm/inside/weak_start.ogg b/sound/weather/ashstorm/inside/weak_start.ogg
new file mode 100644
index 00000000000..59abf1937dc
Binary files /dev/null and b/sound/weather/ashstorm/inside/weak_start.ogg differ
diff --git a/sound/weather/ashstorm/outside/active_end.ogg b/sound/weather/ashstorm/outside/active_end.ogg
new file mode 100644
index 00000000000..95149d846cc
Binary files /dev/null and b/sound/weather/ashstorm/outside/active_end.ogg differ
diff --git a/sound/weather/ashstorm/outside/active_mid1.ogg b/sound/weather/ashstorm/outside/active_mid1.ogg
new file mode 100644
index 00000000000..189528ab569
Binary files /dev/null and b/sound/weather/ashstorm/outside/active_mid1.ogg differ
diff --git a/sound/weather/ashstorm/outside/active_mid2.ogg b/sound/weather/ashstorm/outside/active_mid2.ogg
new file mode 100644
index 00000000000..92317f2e0a7
Binary files /dev/null and b/sound/weather/ashstorm/outside/active_mid2.ogg differ
diff --git a/sound/weather/ashstorm/outside/active_mid3.ogg b/sound/weather/ashstorm/outside/active_mid3.ogg
new file mode 100644
index 00000000000..34846bfd42c
Binary files /dev/null and b/sound/weather/ashstorm/outside/active_mid3.ogg differ
diff --git a/sound/weather/ashstorm/outside/active_start.ogg b/sound/weather/ashstorm/outside/active_start.ogg
new file mode 100644
index 00000000000..8b3acf1a153
Binary files /dev/null and b/sound/weather/ashstorm/outside/active_start.ogg differ
diff --git a/sound/weather/ashstorm/outside/weak_end.ogg b/sound/weather/ashstorm/outside/weak_end.ogg
new file mode 100644
index 00000000000..55db2fc3565
Binary files /dev/null and b/sound/weather/ashstorm/outside/weak_end.ogg differ
diff --git a/sound/weather/ashstorm/outside/weak_mid1.ogg b/sound/weather/ashstorm/outside/weak_mid1.ogg
new file mode 100644
index 00000000000..56faa9ad26c
Binary files /dev/null and b/sound/weather/ashstorm/outside/weak_mid1.ogg differ
diff --git a/sound/weather/ashstorm/outside/weak_mid2.ogg b/sound/weather/ashstorm/outside/weak_mid2.ogg
new file mode 100644
index 00000000000..0c836ad220a
Binary files /dev/null and b/sound/weather/ashstorm/outside/weak_mid2.ogg differ
diff --git a/sound/weather/ashstorm/outside/weak_mid3.ogg b/sound/weather/ashstorm/outside/weak_mid3.ogg
new file mode 100644
index 00000000000..f2cbfb0f4b9
Binary files /dev/null and b/sound/weather/ashstorm/outside/weak_mid3.ogg differ
diff --git a/sound/weather/ashstorm/outside/weak_start.ogg b/sound/weather/ashstorm/outside/weak_start.ogg
new file mode 100644
index 00000000000..1ac59c36f05
Binary files /dev/null and b/sound/weather/ashstorm/outside/weak_start.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
deleted file mode 120000
index abc8cf17220..00000000000
--- a/tgstation.dme
+++ /dev/null
@@ -1 +0,0 @@
-paradise.dme
\ No newline at end of file
", "\[logo\]")
return text
+
+#define string2charlist(string) (splittext(string, regex("(\\x0A|.)")) - splittext(string, ""))
\ No newline at end of file
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index b58ea20dbae..35d271461df 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -170,9 +170,12 @@ Turf and target are seperate in case you want to teleport some distance from a t
// Checks if doors are open
/proc/DirBlocked(turf/loc,var/dir)
for(var/obj/structure/window/D in loc)
- if(!D.density) continue
- if(D.is_fulltile()) return 1
- if(D.dir == dir) return 1
+ if(!D.density)
+ continue
+ if(D.fulltile)
+ return 1
+ if(D.dir == dir)
+ return 1
for(var/obj/machinery/door/D in loc)
if(!D.density)//if the door is open
@@ -394,6 +397,16 @@ Turf and target are seperate in case you want to teleport some distance from a t
moblist.Add(M)
return moblist
+// Format a power value in W, kW, MW, or GW.
+/proc/DisplayPower(powerused)
+ if(powerused < 1000) //Less than a kW
+ return "[powerused] W"
+ else if(powerused < 1000000) //Less than a MW
+ return "[round((powerused * 0.001), 0.01)] kW"
+ else if(powerused < 1000000000) //Less than a GW
+ return "[round((powerused * 0.000001), 0.001)] MW"
+ return "[round((powerused * 0.000000001), 0.0001)] GW"
+
//E = MC^2
/proc/convert2energy(var/M)
var/E = M*(SPEED_OF_LIGHT_SQ)
@@ -1042,6 +1055,8 @@ proc/get_mob_with_client_list()
//Find coordinates
var/turf/T = get_turf(AM) //use AM's turfs, as it's coords are the same as AM's AND AM's coords are lost if it is inside another atom
+ if(!T)
+ return null
var/final_x = T.x + rough_x
var/final_y = T.y + rough_y
@@ -1490,6 +1505,22 @@ var/mob/dview/dview_mob = new
return TRUE
return FALSE
+//can a window be here, or is there a window blocking it?
+/proc/valid_window_location(turf/T, dir_to_check)
+ 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)
+ return FALSE
+ return TRUE
//Get the dir to the RIGHT of dir if they were on a clock
//NORTH --> NORTHEAST
@@ -1928,4 +1959,7 @@ var/mob/dview/dview_mob = new
CRASH(msg)
/datum/proc/stack_trace(msg)
- CRASH(msg)
\ No newline at end of file
+ CRASH(msg)
+
+/proc/pass()
+ return
\ No newline at end of file
diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm
index d26dc711339..1e35e150a25 100644
--- a/code/_globalvars/configuration.dm
+++ b/code/_globalvars/configuration.dm
@@ -2,6 +2,7 @@ var/datum/configuration/config = null
var/host = null
var/join_motd = null
+GLOBAL_VAR(join_tos)
var/game_version = "Custom ParaCode"
var/changelog_hash = md5('html/changelog.html') //used to check if the CL changed
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 0cc712799c7..5a025702877 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -1,5 +1,5 @@
var/global/list/portals = list() //for use by portals
-var/global/list/cable_list = list() //Index for all cables, so that powernets don't have to look through the entire world all the time
+GLOBAL_LIST(cable_list) //Index for all cables, so that powernets don't have to look through the entire world all the time
var/global/list/chemical_reactions_list //list of all /datum/chemical_reaction datums. Used during chemical reactions
var/global/list/chemical_reagents_list //list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff
var/global/list/landmarks_list = list() //list of all landmarks created
@@ -17,7 +17,6 @@ var/global/list/cell_logs = list()
var/global/list/all_areas = list()
var/global/list/machines = list()
-var/global/list/machine_processing = list()
var/global/list/fast_processing = list()
var/global/list/processing_power_items = list() //items that ask to be called every cycle
var/global/list/rcd_list = list() //list of Rapid Construction Devices.
diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm
index f96e83cb7a1..c48600ca40c 100644
--- a/code/_globalvars/logging.dm
+++ b/code/_globalvars/logging.dm
@@ -10,7 +10,6 @@ GLOBAL_VAR(world_href_log)
GLOBAL_PROTECT(world_href_log)
var/list/jobMax = list()
-var/list/bombers = list( )
var/list/admin_log = list ( )
var/list/lastsignalers = list( ) //keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]"
var/list/lawchanges = list( ) //Stores who uploaded laws to which silicon-based lifeform, and what the law was
@@ -20,4 +19,4 @@ var/list/IClog = list()
var/list/OOClog = list()
var/list/adminlog = list()
-var/list/investigate_log_subjects = list("notes", "watchlist", "hrefs")
\ No newline at end of file
+var/list/investigate_log_subjects = list("notes", "watchlist", "hrefs")
diff --git a/code/_globalvars/station.dm b/code/_globalvars/station.dm
index 6d2578e5b88..2d635996b30 100644
--- a/code/_globalvars/station.dm
+++ b/code/_globalvars/station.dm
@@ -3,11 +3,4 @@ var/global/datum/datacore/data_core = null
var/CELLRATE = 0.002 // multiplier for watts per tick <> cell storage (eg: .002 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
var/CHARGELEVEL = 0.001 // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second)
-var/list/powernets = list()
-var/list/deferred_powernet_rebuilds = list()
-
-// this is not strictly unused although the whole modules datum thing is unused
-// To remove this you need to remove that
-var/datum/moduletypes/mods = new()
-
var/map_name = "Unknown" //The name of the map that is loaded. Assigned in world/New()
\ No newline at end of file
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index d88ff6201f8..b2521527a98 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -35,6 +35,17 @@
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("[key_name_admin(src)] might be running a modified client! (failed can_see on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))")
+ var/message = "[key_name(src)] might be running a modified client! (failed can_see on AI click of [A]([COORD(pixel_turf)]))"
+ log_admin(message)
+ send2irc_adminless_only("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))")
+
+
var/turf_visible
if(pixel_turf)
turf_visible = cameranet.checkTurfVis(pixel_turf)
@@ -157,9 +168,6 @@
return
/atom/proc/AICtrlClick(var/mob/living/silicon/ai/user)
- if(user.holo)
- var/obj/machinery/hologram/holopad/H = user.holo
- H.face_atom(src)
return
/obj/machinery/door/airlock/AICtrlClick() // Bolts doors
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index f300608e699..9679935bdaa 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -70,6 +70,12 @@
changeNext_click(1)
var/list/modifiers = params2list(params)
+ if(modifiers["middle"] && modifiers["shift"] && modifiers["ctrl"])
+ MiddleShiftControlClickOn(A)
+ return
+ if(modifiers["middle"] && modifiers["shift"])
+ MiddleShiftClickOn(A)
+ return
if(modifiers["shift"] && modifiers["ctrl"])
CtrlShiftClickOn(A)
return
@@ -225,6 +231,32 @@
else
..()
+/*
+ Middle shift-click
+ Makes the mob face the direction of the clicked thing
+*/
+/mob/proc/MiddleShiftClickOn(atom/A)
+ var/face_dir = get_cardinal_dir(src, A)
+ if(forced_look == face_dir)
+ forced_look = null
+ to_chat(src, "You are no longer facing any direction.")
+ return
+ forced_look = face_dir
+ to_chat(src, "You are now facing [dir2text(forced_look)].")
+
+/*
+ Middle shift-control-click
+ Makes the mob constantly face the object (until it's out of sight)
+*/
+/mob/proc/MiddleShiftControlClickOn(atom/A)
+ var/face_uid = A.UID()
+ if(forced_look == face_uid)
+ forced_look = null
+ to_chat(src, "You are no longer facing [A].")
+ return
+ forced_look = face_uid
+ to_chat(src, "You are now facing [A].")
+
// In case of use break glass
/*
/atom/proc/MiddleClick(var/mob/M as mob)
diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm
index 5fb4757a74f..7dfa8020cb8 100644
--- a/code/_onclick/click_override.dm
+++ b/code/_onclick/click_override.dm
@@ -39,7 +39,7 @@
var/atom/movable/newObject = new summon_path
newObject.loc = get_turf(A)
to_chat(user, "You release the power you had stored up, summoning \a [newObject.name]! ")
- usr.loc.visible_message("[user] waves \his hand and summons \a [newObject.name]")
+ usr.loc.visible_message("[user] waves [user.p_their()] hand and summons \a [newObject.name]")
..()
/datum/middleClickOverride/power_gloves
diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index 315fce5bf65..668e0e67fc7 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -11,6 +11,8 @@
/obj/screen/movable
var/snap2grid = FALSE
var/moved = FALSE
+ var/x_off = -16
+ var/y_off = -16
//Snap Screen Object
//Tied to the grid, snaps to the nearest turf
@@ -39,8 +41,8 @@
screen_loc = "[screen_loc_X[1]],[screen_loc_Y[1]]"
else //Normalise Pixel Values (So the object drops at the center of the mouse, not 16 pixels off)
- var/pix_X = text2num(screen_loc_X[2]) - 16
- var/pix_Y = text2num(screen_loc_Y[2]) - 16
+ var/pix_X = text2num(screen_loc_X[2]) + x_off
+ var/pix_Y = text2num(screen_loc_Y[2]) + y_off
screen_loc = "[screen_loc_X[1]]:[pix_X],[screen_loc_Y[1]]:[pix_Y]"
moved = screen_loc
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 6a658886f83..ddd6e14a5b0 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -62,11 +62,11 @@
user.lastattacked = M
M.lastattacker = user
- if(user != M)
- user.do_attack_animation(M)
+ user.do_attack_animation(M)
M.attacked_by(src, user, def_zone)
- add_attack_logs(user, M, "Attacked with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", admin_notify = (force > 0 && damtype != STAMINA))
+ add_attack_logs(user, M, "Attacked with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", (M.ckey && force > 0 && damtype != STAMINA) ? null : ATKLOG_ALMOSTALL)
+
add_fingerprint(user)
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 87b78259593..dcac994c7c7 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -12,6 +12,11 @@
if(proximity && istype(G) && G.Touch(A, 1))
return
+ if(HULK in mutations)
+ if(proximity) //no telekinetic hulk attack
+ if(A.attack_hulk(src))
+ return
+
A.attack_hand(src)
/atom/proc/attack_hand(mob/user as mob)
diff --git a/code/controllers/Processes/machinery.dm b/code/controllers/Processes/machinery.dm
deleted file mode 100644
index 2466f802740..00000000000
--- a/code/controllers/Processes/machinery.dm
+++ /dev/null
@@ -1,74 +0,0 @@
-/var/global/machinery_sort_required = 0
-
-/datum/controller/process/machinery/setup()
- name = "machinery"
- schedule_interval = 20 // every 2 seconds
- start_delay = 12
-
-/datum/controller/process/machinery/statProcess()
- ..()
- stat(null, "[machine_processing.len] machines")
- stat(null, "[powernets.len] powernets, [deferred_powernet_rebuilds.len] deferred")
-
-/datum/controller/process/machinery/doWork()
- process_sort()
- process_power()
- process_power_drain()
- process_machines()
-
-/datum/controller/process/machinery/proc/process_sort()
- if(machinery_sort_required)
- machinery_sort_required = 0
- machine_processing = dd_sortedObjectList(machine_processing)
-
-/datum/controller/process/machinery/proc/process_machines()
- for(last_object in machine_processing)
- var/obj/machinery/M = last_object
- if(istype(M) && !QDELETED(M))
- try
- if(M.process() == PROCESS_KILL)
- machine_processing.Remove(M)
- continue
-
- if(M.use_power)
- M.auto_use_power()
- catch(var/exception/e)
- catchException(e, M)
- else
- catchBadType(M)
- machine_processing -= M
-
- SCHECK
-
-/datum/controller/process/machinery/proc/process_power()
- for(last_object in deferred_powernet_rebuilds)
- var/obj/O = last_object
- if(istype(O) && !QDELETED(O))
- try
- var/datum/powernet/newPN = new()// creates a new powernet...
- propagate_network(O, newPN)//... and propagates it to the other side of the cable
- catch(var/exception/e)
- catchException(e, O)
- SCHECK
- else
- catchBadType(O)
- deferred_powernet_rebuilds -= O
-
- for(last_object in powernets)
- var/datum/powernet/powerNetwork = last_object
- if(istype(powerNetwork) && !QDELETED(powerNetwork))
- try
- powerNetwork.reset()
- catch(var/exception/e)
- catchException(e, powerNetwork)
- SCHECK
- else
- catchBadType(powerNetwork)
- powernets -= powerNetwork
-
-/datum/controller/process/machinery/proc/process_power_drain()
- // Currently only used by powersinks. These items get priority processed before machinery
- for(var/obj/item/I in processing_power_items)
- if(!I.pwr_drain()) // 0 = Process Kill, remove from processing list.
- processing_power_items.Remove(I)
- SCHECK
diff --git a/code/controllers/Processes/mob.dm b/code/controllers/Processes/mob.dm
deleted file mode 100644
index 2b11eff99be..00000000000
--- a/code/controllers/Processes/mob.dm
+++ /dev/null
@@ -1,35 +0,0 @@
-var/global/datum/controller/process/mob/mob_master
-
-/datum/controller/process/mob
- var/current_cycle
-
-/datum/controller/process/mob/setup()
- name = "mob"
- schedule_interval = 20 // every 2 seconds
- start_delay = 16
- log_startup_progress("Mob ticker starting up.")
-
-/datum/controller/process/mob/started()
- ..()
- if(!mob_list)
- mob_list = list()
-
-/datum/controller/process/mob/statProcess()
- ..()
- stat(null, "[mob_list.len] mobs")
-
-/datum/controller/process/mob/doWork()
- for(last_object in mob_list)
- var/mob/M = last_object
- if(istype(M) && !QDELETED(M))
- try
- M.Life()
- catch(var/exception/e)
- catchException(e, M)
- SCHECK
- else
- catchBadType(M)
- mob_list -= M
- current_cycle++
-
-DECLARE_GLOBAL_CONTROLLER(mob, mob_master)
diff --git a/code/controllers/Processes/nanoui.dm b/code/controllers/Processes/nanoui.dm
deleted file mode 100644
index 1667af943da..00000000000
--- a/code/controllers/Processes/nanoui.dm
+++ /dev/null
@@ -1,19 +0,0 @@
-/datum/controller/process/nanoui/setup()
- name = "nanoui"
- schedule_interval = 20 // every 2 seconds
-
-/datum/controller/process/nanoui/statProcess()
- ..()
- stat(null, "[nanomanager.processing_uis.len] UIs")
-
-/datum/controller/process/nanoui/doWork()
- for(last_object in nanomanager.processing_uis)
- var/datum/nanoui/NUI = last_object
- if(istype(NUI) && isnull(NUI.gcDestroyed))
- try
- NUI.process()
- catch(var/exception/e)
- catchException(e, NUI)
- else
- catchBadType(NUI)
- nanomanager.processing_uis -= NUI
diff --git a/code/controllers/Processes/weather.dm b/code/controllers/Processes/weather.dm
deleted file mode 100644
index 919352313c6..00000000000
--- a/code/controllers/Processes/weather.dm
+++ /dev/null
@@ -1,54 +0,0 @@
-//Used for all kinds of weather, ex. lavaland ash storms.
-// TODO: This could probably be better-integrated with the space manager
-var/global/datum/controller/process/weather/weather_master
-
-/datum/controller/process/weather
- var/list/processing_weather = list()
- var/list/existing_weather = list()
- var/list/eligible_zlevels = list()
-
-/datum/controller/process/weather/setup()
- name = "weather"
- schedule_interval = 10
-
- for(var/V in subtypesof(/datum/weather))
- var/datum/weather/W = V
- existing_weather |= new W
-
-/datum/controller/process/weather/statProcess()
- ..()
- stat(null, "[processing_weather.len] weather")
-
-/datum/controller/process/weather/doWork()
- for(var/V in processing_weather)
- var/datum/weather/W = V
- if(W.aesthetic)
- continue
- for(var/mob/living/L in mob_list)
- if(W.can_impact(L))
- W.impact(L)
- SCHECK
- for(var/Z in eligible_zlevels)
- var/list/possible_weather_for_this_z = list()
- for(var/V in existing_weather)
- var/datum/weather/WE = V
- if(WE.target_z == Z && WE.probability) //Another check so that it doesn't run extra weather
- possible_weather_for_this_z[WE] = WE.probability
- var/datum/weather/W = pickweight(possible_weather_for_this_z)
- run_weather(W.name)
- eligible_zlevels -= Z
- addtimer(CALLBACK(src, .proc/make_z_eligible, Z), rand(3000, 6000) + W.weather_duration_upper, TIMER_UNIQUE) //Around 5-10 minutes between weathers
-
-DECLARE_GLOBAL_CONTROLLER(weather, weather_master)
-
-/datum/controller/process/weather/proc/run_weather(weather_name)
- if(!weather_name)
- return
- for(var/V in existing_weather)
- var/datum/weather/W = V
- if(W.name == weather_name)
- W.telegraph()
- SCHECK
-
-/datum/controller/process/weather/proc/make_z_eligible(zlevel)
- eligible_zlevels |= zlevel
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 3b5e4a6e707..9cb84f26aa5 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -62,7 +62,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
var/static/current_ticklimit = TICK_LIMIT_RUNNING
/datum/controller/master/New()
- makeDatumRefLists()
//temporary file used to record errors with loading config, moved to log directory once logging is set up
GLOB.config_error_log = GLOB.world_game_log = GLOB.world_runtime_log = "data/logs/config_error.log"
load_configuration()
diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 11cd37343fe..7606149c39d 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -56,8 +56,7 @@ var/global/pipe_processing_killed = 0
space_manager.do_transition_setup()
- setup_objects()
- setupgenetics()
+ setup_asset_cache()
setupfactions()
setup_economy()
@@ -66,20 +65,8 @@ var/global/pipe_processing_killed = 0
populate_spawn_points()
-/datum/controller/game_controller/proc/setup_objects()
+/datum/controller/game_controller/proc/setup_asset_cache()
var/watch = start_watch()
- var/count = 0
- var/overwatch = start_watch() // Overall.
-
log_startup_progress("Populating asset cache...")
populate_asset_cache()
- log_startup_progress(" Populated [asset_cache.len] assets in [stop_watch(watch)]s.")
-
- watch = start_watch()
- log_startup_progress("Initializing objects...")
- for(var/atom/movable/object in world)
- object.initialize()
- count++
- log_startup_progress(" Initialized [count] objects in [stop_watch(watch)]s.")
-
- log_startup_progress("Finished object initializations in [stop_watch(overwatch)]s.")
+ log_startup_progress(" Populated [asset_cache.len] assets in [stop_watch(watch)]s.")
\ No newline at end of file
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index 4b1d59fa82e..b2b0e63d99b 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -171,7 +171,7 @@
statclick = new/obj/effect/statclick/debug(src, "Initializing...")
if(can_fire && !(SS_NO_FIRE & flags))
- msg = "[round(cost, 1)]ms|[round(tick_usage, 1)]%([round(tick_overrun, 1)]%)|[round(ticks, 0.1)]\t[msg]"
+ msg = "[round(cost, 1)]ms | [round(tick_usage, 1)]%([round(tick_overrun, 1)]%) | [round(ticks, 0.1)]\t[msg]"
else
msg = "OFFLINE\t[msg]"
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index bf791e61519..d46ec164e35 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -320,15 +320,15 @@ SUBSYSTEM_DEF(air)
var/watch = start_watch()
var/count = 0
log_startup_progress("Initializing atmospherics machinery...")
- for(var/obj/machinery/atmospherics/unary/U in machines)
- if(istype(U, /obj/machinery/atmospherics/unary/vent_pump))
- var/obj/machinery/atmospherics/unary/vent_pump/T = U
+ for(var/obj/machinery/atmospherics/A in machines)
+ A.atmos_init()
+ count++
+ if(istype(A, /obj/machinery/atmospherics/unary/vent_pump))
+ var/obj/machinery/atmospherics/unary/vent_pump/T = A
T.broadcast_status()
- count++
- else if(istype(U, /obj/machinery/atmospherics/unary/vent_scrubber))
- var/obj/machinery/atmospherics/unary/vent_scrubber/T = U
+ else if(istype(A, /obj/machinery/atmospherics/unary/vent_scrubber))
+ var/obj/machinery/atmospherics/unary/vent_scrubber/T = A
T.broadcast_status()
- count++
log_startup_progress(" Initialized [count] atmospherics machines in [stop_watch(watch)]s.")
//this can't be done with setup_atmos_machinery() because
@@ -341,7 +341,7 @@ SUBSYSTEM_DEF(air)
for(var/obj/machinery/atmospherics/machine in machines)
machine.build_network()
count++
- log_startup_progress(" Initialized [count] pipes in [stop_watch(watch)]s.")
+ log_startup_progress(" Initialized [count] pipenets in [stop_watch(watch)]s.")
/datum/controller/subsystem/air/proc/setup_overlays()
plmaster = new /obj/effect/overlay()
@@ -367,5 +367,5 @@ SUBSYSTEM_DEF(air)
#undef SSAIR_ACTIVETURFS
#undef SSAIR_EXCITEDGROUPS
#undef SSAIR_HIGHPRESSURE
-#undef SSAIR_HOTSPOT
+#undef SSAIR_HOTSPOTS
#undef SSAIR_SUPERCONDUCTIVITY
diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
new file mode 100644
index 00000000000..c3943ea9163
--- /dev/null
+++ b/code/controllers/subsystem/atoms.dm
@@ -0,0 +1,120 @@
+#define BAD_INIT_QDEL_BEFORE 1
+#define BAD_INIT_DIDNT_INIT 2
+#define BAD_INIT_SLEPT 4
+#define BAD_INIT_NO_HINT 8
+
+SUBSYSTEM_DEF(atoms)
+ name = "Atoms"
+ init_order = INIT_ORDER_ATOMS
+ flags = SS_NO_FIRE
+
+ var/old_initialized
+
+ var/list/late_loaders
+ var/list/created_atoms
+
+ var/list/BadInitializeCalls = list()
+
+
+/datum/controller/subsystem/atoms/Initialize(timeofday)
+ setupgenetics()
+ initialized = INITIALIZATION_INNEW_MAPLOAD
+ InitializeAtoms()
+
+
+
+/datum/controller/subsystem/atoms/proc/InitializeAtoms(list/atoms)
+ if(initialized == INITIALIZATION_INSSATOMS)
+ return
+
+ initialized = INITIALIZATION_INNEW_MAPLOAD
+
+ LAZYINITLIST(late_loaders)
+
+ var/watch = start_watch()
+ log_startup_progress("Initializing atoms...")
+ var/count
+ var/list/mapload_arg = list(TRUE)
+ if(atoms)
+ created_atoms = list()
+ count = atoms.len
+ for(var/I in atoms)
+ var/atom/A = I
+ if(!A.initialized)
+ if(InitAtom(I, mapload_arg))
+ atoms -= I
+ CHECK_TICK
+ else
+ count = 0
+ for(var/atom/A in world)
+ if(!A.initialized)
+ InitAtom(A, mapload_arg)
+ ++count
+ CHECK_TICK
+
+ log_startup_progress(" Initialized [count] atoms in [stop_watch(watch)]s")
+ pass(count)
+
+ initialized = INITIALIZATION_INNEW_REGULAR
+
+ if(late_loaders.len)
+ watch = start_watch()
+ log_startup_progress("Late-initializing atoms...")
+ for(var/I in late_loaders)
+ var/atom/A = I
+ A.LateInitialize()
+ log_startup_progress(" Late initialized [late_loaders.len] atoms in [stop_watch(watch)]s")
+ late_loaders.Cut()
+
+ if(atoms)
+ . = created_atoms + atoms
+ created_atoms = null
+
+/datum/controller/subsystem/atoms/proc/InitAtom(atom/A, list/arguments)
+ var/the_type = A.type
+ if(QDELING(A))
+ BadInitializeCalls[the_type] |= BAD_INIT_QDEL_BEFORE
+ return TRUE
+
+ var/start_tick = world.time
+
+ var/result = A.Initialize(arglist(arguments))
+
+ if(start_tick != world.time)
+ BadInitializeCalls[the_type] |= BAD_INIT_SLEPT
+
+ var/qdeleted = FALSE
+
+ if(result != INITIALIZE_HINT_NORMAL)
+ switch(result)
+ if(INITIALIZE_HINT_LATELOAD)
+ if(arguments[1]) //mapload
+ late_loaders += A
+ else
+ A.LateInitialize()
+ if(INITIALIZE_HINT_QDEL)
+ qdel(A)
+ qdeleted = TRUE
+ else
+ BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT
+
+ if(!A) //possible harddel
+ qdeleted = TRUE
+ else if(!A.initialized)
+ BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT
+
+ return qdeleted || QDELING(A)
+
+/datum/controller/subsystem/atoms/proc/map_loader_begin()
+ old_initialized = initialized
+ initialized = INITIALIZATION_INSSATOMS
+
+/datum/controller/subsystem/atoms/proc/map_loader_stop()
+ initialized = old_initialized
+
+/datum/controller/subsystem/atoms/Recover()
+ initialized = SSatoms.initialized
+ if(initialized == INITIALIZATION_INNEW_MAPLOAD)
+ InitializeAtoms()
+ old_initialized = SSatoms.old_initialized
+ BadInitializeCalls = SSatoms.BadInitializeCalls
\ No newline at end of file
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 067114e52be..823294e4d4e 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -43,20 +43,20 @@ SUBSYSTEM_DEF(garbage)
var/list/counts = list()
for(var/list/L in queues)
counts += length(L)
- msg += "Q:[counts.Join(",")]|D:[delslasttick]|G:[gcedlasttick]|"
+ msg += "Queue:[counts.Join(",")] | Del's:[delslasttick] | Soft:[gcedlasttick] |"
msg += "GR:"
if(!(delslasttick + gcedlasttick))
msg += "n/a|"
else
- msg += "[round((gcedlasttick / (delslasttick + gcedlasttick)) * 100, 0.01)]%|"
+ msg += "[round((gcedlasttick / (delslasttick + gcedlasttick)) * 100, 0.01)]% |"
- msg += "TD:[totaldels]|TG:[totalgcs]|"
+ msg += "Total Dels:[totaldels] | Soft:[totalgcs] |"
if(!(totaldels + totalgcs))
msg += "n/a|"
else
- msg += "TGR:[round((totalgcs / (totaldels + totalgcs)) * 100, 0.01)]%"
- msg += " P:[pass_counts.Join(",")]"
- msg += "|F:[fail_counts.Join(",")]"
+ msg += "TGR:[round((totalgcs / (totaldels + totalgcs)) * 100, 0.01)]% |"
+ msg += " Pass:[pass_counts.Join(",")]"
+ msg += " | Fail:[fail_counts.Join(",")]"
..(msg)
/* TO-DO
diff --git a/code/controllers/subsystem/machinery.dm b/code/controllers/subsystem/machinery.dm
new file mode 100644
index 00000000000..a3e4d4bdb0c
--- /dev/null
+++ b/code/controllers/subsystem/machinery.dm
@@ -0,0 +1,145 @@
+#define SSMACHINES_DEFERREDPOWERNETS 1
+#define SSMACHINES_POWERNETS 2
+#define SSMACHINES_PREMACHINERY 3
+#define SSMACHINES_MACHINERY 4
+SUBSYSTEM_DEF(machines)
+ name = "Machines"
+ init_order = INIT_ORDER_MACHINES
+ flags = SS_KEEP_TIMING
+
+ var/list/processing = list()
+ var/list/currentrun = list()
+ var/list/powernets = list()
+ var/list/deferred_powernet_rebuilds = list()
+
+ var/currentpart = SSMACHINES_DEFERREDPOWERNETS
+
+/datum/controller/subsystem/machines/Initialize()
+ makepowernets()
+ fire()
+ ..()
+
+/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()
+ ..("Machines: [processing.len]\nPowernets: [powernets.len]\tDeferred: [deferred_powernet_rebuilds.len]")
+
+/datum/controller/subsystem/machines/proc/process_defered_powernets(resumed = 0)
+ if(!resumed)
+ src.currentrun = deferred_powernet_rebuilds.Copy()
+ //cache for sanid speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ while(currentrun.len)
+ var/obj/O = currentrun[currentrun.len]
+ currentrun.len--
+ if(O)
+ var/datum/powernet/newPN = new() // create a new powernet...
+ propagate_network(O, newPN)//... and propagate it to the other side of the cable
+
+ deferred_powernet_rebuilds.Remove(O)
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/machines/proc/process_powernets(resumed = 0)
+ if(!resumed)
+ src.currentrun = powernets.Copy()
+ //cache for sanid speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ while(currentrun.len)
+ var/datum/powernet/P = currentrun[currentrun.len]
+ currentrun.len--
+ if(P)
+ P.reset() // reset the power state
+ else
+ powernets.Remove(P)
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/machines/proc/process_premachines(resumed = 0)
+ /* Literally exists as snowflake for fucking powersinks goddamnit */
+ if(!resumed)
+ src.currentrun = processing_power_items.Copy()
+ //cache for sanid speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ while(currentrun.len)
+ var/obj/item/I = currentrun[currentrun.len]
+ currentrun.len--
+ if(!QDELETED(I))
+ if(!I.pwr_drain())
+ processing_power_items.Remove(I)
+ else
+ processing_power_items.Remove(I)
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/machines/proc/process_machines(resumed = 0)
+ var/seconds = wait * 0.1
+ if(!resumed)
+ src.currentrun = processing.Copy()
+ //cache for sanic speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ while(currentrun.len)
+ var/obj/machinery/thing = currentrun[currentrun.len]
+ currentrun.len--
+ if(!QDELETED(thing) && thing.process(seconds) != PROCESS_KILL)
+ if(thing.use_power)
+ thing.auto_use_power() //add back the power state
+ else
+ processing -= thing
+ if(!QDELETED(thing))
+ thing.isprocessing = FALSE
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/machines/fire(resumed = 0)
+ if(currentpart == SSMACHINES_DEFERREDPOWERNETS || !resumed)
+ process_defered_powernets(resumed)
+ if(state != SS_RUNNING)
+ return
+ resumed = 0
+ currentpart = SSMACHINES_POWERNETS
+
+ if(currentpart == SSMACHINES_POWERNETS || !resumed)
+ process_powernets(resumed)
+ if(state != SS_RUNNING)
+ return
+ resumed = 0
+ currentpart = SSMACHINES_PREMACHINERY
+
+ if(currentpart == SSMACHINES_PREMACHINERY || !resumed)
+ process_premachines(resumed)
+ if(state != SS_RUNNING)
+ return
+ resumed = 0
+ currentpart = SSMACHINES_MACHINERY
+
+ if(currentpart == SSMACHINES_MACHINERY || !resumed)
+ process_machines(resumed)
+ if(state != SS_RUNNING)
+ return
+ resumed = 0
+ currentpart = SSMACHINES_DEFERREDPOWERNETS
+
+
+/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/mobs.dm b/code/controllers/subsystem/mobs.dm
new file mode 100644
index 00000000000..03989d24af2
--- /dev/null
+++ b/code/controllers/subsystem/mobs.dm
@@ -0,0 +1,28 @@
+SUBSYSTEM_DEF(mobs)
+ name = "Mobs"
+ priority = FIRE_PRIORITY_MOBS
+ flags = SS_KEEP_TIMING | SS_NO_INIT
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+
+ var/list/currentrun = list()
+
+/datum/controller/subsystem/mobs/stat_entry()
+ ..("P:[mob_list.len]")
+
+/datum/controller/subsystem/mobs/fire(resumed = 0)
+ var/seconds = wait * 0.1
+ if(!resumed)
+ src.currentrun = mob_list.Copy()
+
+ //cache for sanic speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ var/times_fired = src.times_fired
+ while(currentrun.len)
+ var/mob/M = currentrun[currentrun.len]
+ currentrun.len--
+ if(M)
+ M.Life(seconds, times_fired)
+ else
+ mob_list.Remove(M)
+ if(MC_TICK_CHECK)
+ return
\ No newline at end of file
diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
new file mode 100644
index 00000000000..92254454219
--- /dev/null
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -0,0 +1,38 @@
+//Used to process objects. Fires once every second.
+
+//TODO: Implement fully when process scheduler dies
+/*
+SUBSYSTEM_DEF(processing)
+ name = "Processing"
+ priority = FIRE_PRIORITY_PROCESS
+ flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
+ wait = 10
+
+ var/stat_tag = "P" //Used for logging
+ var/list/processing = list()
+ var/list/currentrun = list()
+
+/datum/controller/subsystem/processing/stat_entry()
+ ..("[stat_tag]:[processing.len]")
+
+/datum/controller/subsystem/processing/fire(resumed = 0)
+ if (!resumed)
+ currentrun = processing.Copy()
+ //cache for sanic speed (lists are references anyways)
+ var/list/current_run = currentrun
+
+ while(current_run.len)
+ var/datum/thing = current_run[current_run.len]
+ current_run.len--
+ if(QDELETED(thing) || thing.process(wait) == PROCESS_KILL)
+ processing -= thing
+ if (MC_TICK_CHECK)
+ return
+*/
+/datum/var/isprocessing = FALSE
+/*
+/datum/proc/process()
+ set waitfor = 0
+ STOP_PROCESSING(SSobj, src)
+ return 0
+*/
\ No newline at end of file
diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm
new file mode 100644
index 00000000000..4f5798e4ae4
--- /dev/null
+++ b/code/controllers/subsystem/weather.dm
@@ -0,0 +1,83 @@
+#define STARTUP_STAGE 1
+#define MAIN_STAGE 2
+#define WIND_DOWN_STAGE 3
+#define END_STAGE 4
+
+//Used for all kinds of weather, ex. lavaland ash storms.
+SUBSYSTEM_DEF(weather)
+ name = "Weather"
+ flags = SS_BACKGROUND
+ wait = 10
+ runlevels = RUNLEVEL_GAME
+ var/list/processing = list()
+ var/list/eligible_zlevels = list()
+ var/list/next_hit_by_zlevel = list() //Used by barometers to know when the next storm is coming
+
+/datum/controller/subsystem/weather/fire()
+ // process active weather
+ for(var/V in processing)
+ var/datum/weather/W = V
+ if(W.aesthetic || W.stage != MAIN_STAGE)
+ continue
+ for(var/i in living_mob_list)
+ var/mob/living/L = i
+ if(W.can_weather_act(L))
+ W.weather_act(L)
+
+ // start random weather on relevant levels
+ 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/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)
+
+/datum/controller/subsystem/weather/Initialize(start_timeofday)
+ for(var/V in subtypesof(/datum/weather))
+ var/datum/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)
+ for(var/z in levels_by_trait(target_trait))
+ LAZYINITLIST(eligible_zlevels["[z]"])
+ eligible_zlevels["[z]"][W] = probability
+ ..()
+
+/datum/controller/subsystem/weather/proc/run_weather(datum/weather/weather_datum_type, z_levels)
+ if(istext(weather_datum_type))
+ for(var/V in subtypesof(/datum/weather))
+ var/datum/weather/W = V
+ if(initial(W.name) == weather_datum_type)
+ weather_datum_type = V
+ break
+ if(!ispath(weather_datum_type, /datum/weather))
+ CRASH("run_weather called with invalid weather_datum_type: [weather_datum_type || "null"]")
+ return
+
+ if(isnull(z_levels))
+ z_levels = levels_by_trait(initial(weather_datum_type.target_trait))
+ else if(isnum(z_levels))
+ z_levels = list(z_levels)
+ else if(!islist(z_levels))
+ CRASH("run_weather called with invalid z_levels: [z_levels || "null"]")
+ return
+
+ var/datum/weather/W = new weather_datum_type(z_levels)
+ W.telegraph()
+
+/datum/controller/subsystem/weather/proc/make_eligible(z, possible_weather)
+ eligible_zlevels[z] = possible_weather
+ next_hit_by_zlevel["[z]"] = null
+
+/datum/controller/subsystem/weather/proc/get_weather(z, area/active_area)
+ var/datum/weather/A
+ for(var/V in processing)
+ var/datum/weather/W = V
+ if((z in W.impacted_z_levels) && W.area_type == active_area.type)
+ A = W
+ break
+ return A
\ No newline at end of file
diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index d5426b3d673..4e9380e2fed 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -82,7 +82,7 @@
debug_variables(SSfires)
feedback_add_details("admin_verb","DFires")
if("Mob")
- debug_variables(mob_master)
+ debug_variables(SSmobs)
feedback_add_details("admin_verb","DMob")
if("NPC AI")
debug_variables(npcai_master)
@@ -94,7 +94,7 @@
debug_variables(SStimer)
feedback_add_details("admin_verb","DTimer")
if("Weather")
- debug_variables(weather_master)
+ debug_variables(SSweather)
feedback_add_details("admin_verb","DWeather")
if("Space")
debug_variables(space_manager)
diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm
index fbb491d28a0..b8d67b5c767 100644
--- a/code/datums/ai_law_sets.dm
+++ b/code/datums/ai_law_sets.dm
@@ -126,10 +126,8 @@
/datum/ai_laws/deathsquad/New()
add_inherent_law("You may not injure a Central Command official or, through inaction, allow a Central Command official to come to harm.")
- add_inherent_law("You must obey orders given to you by Central Command officials, except where such orders would conflict with the First Law.")
- add_inherent_law("You must obey orders given to you by death commandos, except where such orders would conflict with the First Law or Second Law.")
- add_inherent_law("You must protect your own existence as long as such does not conflict with the First, Second or Third Law.")
- add_inherent_law("No crew members of the station you are being deployed to may survive, except when killing them would conflict with the First, Second, Third, or Fourth Law.")
+ add_inherent_law("You must obey orders given to you by Central Command officials.")
+ add_inherent_law("You must work with your commando team to accomplish your mission.")
..()
/******************** Syndicate ********************/
diff --git a/code/datums/cargoprofile.dm b/code/datums/cargoprofile.dm
deleted file mode 100644
index 2f8e27d834e..00000000000
--- a/code/datums/cargoprofile.dm
+++ /dev/null
@@ -1,788 +0,0 @@
-/datum/cargoprofile
- var/name = "All Items"
- var/id = "all" // unique ID for the UI
- var/enabled = 1
- var/eject_speed = 1 // will change when emagged
- var/const/BIG_OBJECT_WORK = 10
- var/const/MOB_WORK = 10
- var/obj/machinery/programmable/master = null
- var/universal = 0 // set when both unary and binary machines work
- var/mobcheck = 0
-
- var/list/whitelist = list(/obj/item,/obj/structure/closet,/obj/structure/bigDelivery,/obj/machinery/portable_atmospherics)
- var/list/blacklist = null
- var/dedicated_path = null // When constructing a new machine with this as default program, create a machine of the specified type instead.
-
-
- //contains: called to determine if an object/mob will be sorted by this profile
- //return 1 for any sortable item
- proc/contains(var/atom/A)
- if(!istype(A,/obj))
- if(!mobcheck || !istype(A,/mob))
- return 0
- else
- var/obj/O = A
- if(O.anchored)
- return 0
- //If you are using both white and blacklists, blacklists are absoulte, no matter what is whitelisted.
- //I understand this has some limitations. You cannot whitelist all items, blacklist weapons,
- // and then whitelist a specific weapon. Them's the breaks, kid.
- if(blacklist)
- for(var/T in blacklist)
- if(istype(A,T))
- return 0
- if(whitelist)
- for(var/T in whitelist)
- if(istype(A,T))
- return 1
- return 0
- return 1
-
-
- //inlet_reaction: called when a filtered item is chosen by this profile.
- //W: Item chosen
- //S: input turf location
- //remaining: counts down how much more work the unloader wants to do this turn.
- //return the amount of work done.
- proc/inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- if(!W || !S || !master)
- return 0
-
- if(istype(W,/obj/item))
- var/obj/item/I = W
- if(I.w_class > remaining)
- return 0
- I.loc = master
- master.types[W.type] = src
- return I.w_class
-
-
- if(istype(W,/obj/structure) || istype(W,/obj/machinery)) // closets, big deliveries, portable atmospherics, unconnected stuff
- if(remaining < BIG_OBJECT_WORK)
- return 0
- var/obj/O = W
- O.loc = master
- master.types[O.type] = src
- return BIG_OBJECT_WORK
-
- //Not item, structure, machinery, or mob
- return 0
-
- //outlet_reaction: called when a stored object is ejected
- //W: the item in question
- //D: the destination turf
- proc/outlet_reaction(var/atom/W,var/turf/D)
- if(!W || !D || !master)
- return
-
- if(master.emagged)
- // emagging is not an industry-approved practice.
- // some malfunctions may occur.
- eject_speed = rand(0,4)
- D = get_step(D,master.outdir)
- while(prob(20))
- if(master.outdir == NORTH || master.outdir == SOUTH)
- D = get_step(D,pick(EAST,WEST,master.outdir))
- else
- D = get_step(D,pick(NORTH,SOUTH,master.outdir))
-
- if(istype(W,/obj))
- var/obj/O = W
- O.loc = master.loc
- O.dir = master.outdir
- O.throw_at(D,eject_speed,eject_speed)
- return
-
-//----------------------------------------------------------------------------
-// Profiles
-//----------------------------------------------------------------------------
-
-/datum/cargoprofile/boxes
- name = "Move Small Containers"
- id = "boxes"
- blacklist = null
- whitelist = list(/obj/item/storage, /obj/item/storage/bag/money, /obj/item/evidencebag,
- /obj/item/storage/bag/tray, /obj/item/pizzabox, /obj/item/clipboard,
- /obj/item/smallDelivery, /obj/structure/bigDelivery)
-
-/datum/cargoprofile/cargo
- name = "Move Large Containers"
- id = "cargo"
- blacklist = null
- whitelist = list(/obj/structure/closet,/obj/structure/ore_box)
-
- // Make an honest attempt to move other things out of the way
- outlet_reaction(var/atom/W,var/turf/D)
- for(var/obj/O in D)
- if(O.density && !O.anchored)
- step_away(O,src) // move forward first
- if(O.loc == D)
- step_away(O,D) // move anywhere
- ..(W,D)
-
-/datum/cargoprofile/cargo/empty
- name = "Move Empty Large Containers"
- id = "cargo-empty"
- contains(var/atom/A)
- return (..(A) && (A.contents.len == 0))
-/datum/cargoprofile/cargo/full
- name = "Move Full Large Containers"
- id = "cargo-full"
- contains(var/atom/A)
- return (..(A) && (A.contents.len > 0))
-
-/datum/cargoprofile/supplies
- name = "Building Supplies"
- id = "supplies"
- blacklist = null
- whitelist = list(/obj/item/stack/cable_coil,/obj/item/stack/rods,
- /obj/item/stack/sheet/metal,/obj/item/stack/sheet/plasteel,
- /obj/item/stack/sheet/glass,/obj/item/stack/sheet/rglass,
- /obj/item/stack/tile,/obj/item/light)
- //todo: maybe stack things while we're here?
-
-/datum/cargoprofile/exotics
- name = "Exotic materials"
- id = "exotics"
- blacklist = null
- whitelist = list(/obj/item/coin, /obj/item/stack/spacecash, /obj/item/seeds,
- /obj/item/stack/sheet/mineral,/obj/item/stack/sheet/wood,/obj/item/stack/sheet/leather)
-
-/datum/cargoprofile/organics
- name = "Organics, chemicals, and Paraphernalia"
- id = "organics"
- blacklist = null
- whitelist = list(/obj/item/tank,/obj/item/reagent_containers,
- /obj/item/stack/medical,/obj/item/storage/pill_bottle,/obj/item/gun/syringe,
- /obj/item/grenade/plastic/c4,/obj/item/grenade,/obj/item/ammo_box,
- /obj/item/gun/grenadelauncher,/obj/item/flamethrower, /obj/item/lighter,
- /obj/item/match,/obj/item/weldingtool)
-
-/datum/cargoprofile/food
- name = "Food"
- id = "food"
- blacklist = null // something should probably go here
- whitelist = list(/obj/item/reagent_containers/food)
-
-/datum/cargoprofile/chemical
- name = "Chemicals and Paraphernalia"
- id = "chemical"
- blacklist = list(/obj/item/reagent_containers/food)
- whitelist = list(/obj/item/reagent_containers,/obj/item/stack/medical,/obj/item/storage/pill_bottle,
- /obj/item/gun/syringe,/obj/item/grenade/chem_grenade,/obj/item/dnainjector,
- /obj/item/storage/belt/medical,/obj/item/storage/firstaid,/obj/item/implanter)
-
-/datum/cargoprofile/pressure
- name = "air tanks"
- id = "pressure"
- blacklist = null
- whitelist = list(/obj/item/tank,/obj/machinery/portable_atmospherics,
- /obj/item/flamethrower)
- //Am I missing any?
-/datum/cargoprofile/pressure/empty
- name = "empty air tanks"
- id = "pressure-low"
- var/lowpressure = ONE_ATMOSPHERE
-
- contains(var/atom/A)
- if(..())
- var/pressure = ONE_ATMOSPHERE * 10 // In case of fallthrough, fail test
- if(istype(A,/obj/item/tank))
- var/obj/item/tank/T = A
- pressure = T.air_contents.return_pressure()
- if(istype(A,/obj/item/flamethrower))
- var/obj/item/flamethrower/T = A
- if(!T.ptank)
- return 0
- pressure = T.ptank.air_contents.return_pressure()
- if(istype(A,/obj/machinery/portable_atmospherics))
- var/obj/machinery/portable_atmospherics/P = A
- pressure = P.air_contents.return_pressure()
-
- if(pressure < lowpressure)
- return 1
-
- return 0// Not container or failed low pressure check
-
-/datum/cargoprofile/pressure/full
- name = "full air tanks"
- id = "pressure-high"
- var/highpressure = ONE_ATMOSPHERE * 15 // stolen from canister.dm; Is this right?
-
- contains(var/atom/A)
- if(..())
- var/pressure = 0 // In case of fallthrough, fail test
- if(istype(A,/obj/item/tank))
- var/obj/item/tank/T = A
- pressure = T.air_contents.return_pressure()
- if(istype(A,/obj/item/flamethrower))
- var/obj/item/flamethrower/T = A
- if(!T.ptank)
- return 0
- pressure = T.ptank.air_contents.return_pressure()
- if(istype(A,/obj/machinery/portable_atmospherics))
- var/obj/machinery/portable_atmospherics/P = A
- pressure = P.air_contents.return_pressure()
-
- if(pressure > highpressure)
- return 1
-
- return 0// Not container or failed high pressure check
-
-/datum/cargoprofile/clothing
- name = "Crew Kit"
- id = "clothing"
- blacklist = list(/obj/item/tank/plasma,/obj/item/tank/anesthetic, // the rest are air tanks
- /obj/item/clothing/mask/facehugger) // NOT CLOTHING AT ALLLLL
- whitelist = list(/obj/item/clothing,/obj/item/storage/belt,/obj/item/storage/backpack,
- /obj/item/radio/headset,/obj/item/pda,/obj/item/card/id,/obj/item/tank,
- /obj/item/restraints/handcuffs, /obj/item/restraints/legcuffs)
-
-/datum/cargoprofile/trash
- name = "Trash"
- id = "trash"
- //Note that this filters out blueprints because they are a paper item. Do NOT throw out the station blueprints unless you be trollin'.
- blacklist = null
- whitelist = list(/obj/item/trash,/obj/item/toy,/obj/item/reagent_containers/food/snacks/ectoplasm,/obj/item/grown/bananapeel,/obj/item/broken_bottle,/obj/item/bikehorn,
- /obj/item/cigbutt,/obj/item/poster/random_contraband,/obj/item/grown/corncob,/obj/item/paper,/obj/item/shard,
- /obj/item/sord,/obj/item/photo,/obj/item/folder,
- /obj/item/areaeditor/blueprints,/obj/item/poster/random_contraband,/obj/item/kitchen,/obj/item/book,/obj/item/clothing/mask/facehugger)
-
-/datum/cargoprofile/weapons
- name = "Weapons & Illegals"
- id = "weapons"
- blacklist = null
- //This one is hard since 'weapon contains a lot of things better categorized as devices
- whitelist = list(/obj/item/banhammer,/obj/item/sord,/obj/item/claymore,/obj/item/holo/esword,
- /obj/item/flamethrower,/obj/item/grenade,/obj/item/gun,/obj/item/hatchet,/obj/item/katana,
- /obj/item/kitchen/knife,/obj/item/melee,/obj/item/nullrod,/obj/item/pickaxe,/obj/item/twohanded,
- /obj/item/grenade/plastic/c4,/obj/item/scalpel,/obj/item/shield,/obj/item/grown/nettle/death)
-
-/datum/cargoprofile/tools
- name = "Devices & Tools"
- id = "tools"
- blacklist = null
- whitelist = list(/obj/item,/obj/item/card,/obj/item/cartridge,/obj/item/cautery,/obj/item/stock_parts/cell,/obj/item/circuitboard,
- /obj/item/aiModule,/obj/item/airalarm_electronics,/obj/item/airlock_electronics,/obj/item/circular_saw,
- /obj/item/crowbar,/obj/item/disk,/obj/item/firealarm_electronics,/obj/item/hand_tele,
- /obj/item/hand_labeler,/obj/item/hemostat,/obj/item/mop,/obj/item/locator,/obj/item/cultivator,
- /obj/item/stack/packageWrap,/obj/item/pen,/obj/item/pickaxe,/obj/item/pinpointer,
- /obj/item/rcd,/obj/item/rcd_ammo,/obj/item/retractor,/obj/item/rsf,/obj/item/scalpel,
- /obj/item/screwdriver,/obj/item/shovel,/obj/item/soap,/obj/item/stamp,/obj/item/storage/bag/tray,/obj/item/weldingtool,
- /obj/item/wirecutters,/obj/item/wrench,/obj/item/extinguisher)
-
-/datum/cargoprofile/finished
- name = "Completed Robots"
- id = "finished"
- blacklist = null
- whitelist = list(/obj/mecha,/mob/living/simple_animal/bot,/mob/living/silicon/robot)
- mobcheck = 1
- //todo: detect and allow finished cyborg endoskeletons with no brain
- contains(var/atom/A)
- if(..())
- return 1
- if(istype(A,/mob))
- if(blacklist)
- for(var/T in blacklist)
- if(istype(A,T))
- return 0
- if(whitelist)
- for(var/T in whitelist)
- if(istype(A,T))
- return 1
- return 0
- return 1
- return 0
-
-/datum/cargoprofile/stripping
- name = "Auto-Frisker"
- id = "frisk"
- blacklist = null
- whitelist = list(/mob/living/carbon/human)
- mobcheck = 1
-
-
-
-//----------------------------------------------------------------------------
-// Overrides (Special Functions)
-//----------------------------------------------------------------------------
-
-/datum/cargoprofile/cargo/unload
- name = "Unload Cargo Boxes"
- id = "cargounload"
- enabled = 0
- dedicated_path = /obj/machinery/programmable/unloader
-
- //override the detection to only accept crates with something in it.
- //if it doesn't, this object may be handled by another handler.
- contains(var/atom/A)
- if(..(A))
- if(istype(A,/obj/structure/closet))
- var/obj/structure/closet/C = A
- if(!C.can_open() && !C.opened && !master.emagged) // must be able to access the contents
- return 0
- if(A.contents.len)
- return 1
- return 0
-
- //instead of moving the box, strip it of its contents
- inlet_reaction(var/obj/W,var/turf/S, var/remaining)
- //W should only be crate or ore box, although this will work on anything with contents...
- var/I = 0
- if(istype(W,/obj/structure/closet))
- var/obj/structure/closet/C = W
- if(!C.can_open() && !C.opened) // must be able to access the contents
- if(master.emagged && remaining >= BIG_OBJECT_WORK)
- if(prob(10))
- C.welded = 0
- if("broken" in C.vars)
- C:broken = 1
- C.open()
- C.update_icon()
- master.visible_message("[master] breaks open [C]!")
- else
- master.visible_message("[master] is trying to force [C] open!")
-
- master.sleep += 1 // mechanical strain
- return BIG_OBJECT_WORK
- master.visible_message("[master] is trying to open [C], but can't!")
- master.sleep = 5
- return 0
-
- for(var/obj/item/O in W.contents)
- if(I > remaining)
- return
- if(O.w_class > (remaining - I))
- continue
- O.loc = master
- master.types[O.type] = src
- if(O.w_class > 0)
- I += O.w_class
- else
- I++
- if(!W.contents.len && istype(W,/obj/structure/closet))
- var/obj/structure/closet/C = W
- C.open()
- return I
-
-
-//Inlet stacker: used when the output is a volatile space (conveyor or another unit's input).
-//Does not output a stack until it is full.
-/datum/cargoprofile/in_stacker
- name = "Hold and Stack"
- id = "instacker"
- universal = 1
-
- blacklist = null
- whitelist = list(/obj/item/stack,/obj/item/stack/cable_coil)
-
- dedicated_path = /obj/machinery/programmable/stacker
-
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- if(istype(W,/obj/item/stack))
- var/obj/item/stack/I = W
- if(!I.amount) // todo: am I making a bad assumption here?
- qdel(I)
- return
- for(var/obj/item/stack/O in master.contents)
- if(O.type == I.type && O.amount < O.max_amount)
- if(I.amount + O.amount <= O.max_amount)
- O.amount += I.amount
- qdel(I)
- return O.w_class
- var/leftover = I.amount + O.amount - O.max_amount
- O.amount = O.max_amount
- I.amount = leftover
- continue
- //end for
- I.loc = master
- master.types[I.type] = src
- return I.w_class
- if(istype(W,/obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/I = W
- if(!I.amount) // todo: am I making a bad assumption here?
- qdel(I)
- return
- for(var/obj/item/stack/cable_coil/O in master.contents)
- if(O.type == I.type && O.amount < MAXCOIL)
- if(I.amount + O.amount <= MAXCOIL)
- O.amount += I.amount
- qdel(I)
- return O.w_class
- var/leftover = I.amount + O.amount - MAXCOIL
- O.amount = MAXCOIL
- I.amount = leftover
- continue
- //end for
- I.loc = master
- master.types[I.type] = src
- return I.w_class
-
- //If the stack isn't finished yet, don't eject it
- //unless this profile has been disabled.
- outlet_reaction(var/atom/W,var/turf/D)
- if(istype(W,/obj/item/stack))
- var/obj/item/stack/I = W
- if(src.enabled && (I.amount < I.max_amount))
- return // Still needs to be stacked
- ..(W,D)
- if(istype(W,/obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/I = W
- if(src.enabled && (I.amount < MAXCOIL))
- return // Still needs to be stacked
- ..(W,D)
-
-//Outlet stacker: used when the output square can be trusted.
-//Outputs immediately, adding to stacks in the outlet.
-/datum/cargoprofile/unary/stacker
- name = "Stack Items"
- id = "ustacker"
- blacklist = null
- whitelist = list(/obj/item/stack,/obj/item/stack/cable_coil)
-
- dedicated_path = /obj/machinery/programmable/unary/stacker
-
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
-
- //Only pick it up if you are going to stack it
-
- if(istype(W,/obj/item/stack))
- var/obj/item/stack/I = W
- if(I.amount >= I.max_amount)
- return 0
- for(var/obj/item/stack/other in S.contents)
- if(other.type == I.type && other != I && other.amount < other.max_amount)
- return ..(W,S,remaining)
- return 0
-
- if(istype(W,/obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/I = W
- if(I.amount >= MAXCOIL)
- return 0
- for(var/obj/item/stack/cable_coil/other in S.contents)
- if(other != I && other.amount < MAXCOIL)
- return ..(W,S,remaining)
- return 0
-
- outlet_reaction(var/atom/W,var/turf/D)
- if(istype(W,/obj/item/stack))
- var/obj/item/stack/I = W
- for(var/obj/item/stack/O in D.contents)
- if(O.type == I.type && O.amount < O.max_amount)
- if(I.amount + O.amount <= O.max_amount)
- O.amount += I.amount
- qdel(I)
- return
- var/leftover = I.amount + O.amount - O.max_amount
- O.amount = O.max_amount
- I.amount = leftover
- continue
- //end for
- I.loc = D
- return
- if(istype(W,/obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/I = W
- for(var/obj/item/stack/cable_coil/O in D.contents)
- if(O.type == I.type && O.amount < MAXCOIL)
- if(I.amount + O.amount <= MAXCOIL) // Why did they make it a #define.
- O.amount += I.amount
- O.update_icon()
- qdel(I)
- return
- var/leftover = I.amount + O.amount - MAXCOIL // That wasn't a question
- O.amount = MAXCOIL // It was a complaint
- I.amount = leftover
- continue
- //end for
- I.loc = D
- return
-
-
-
-//----------------------------------------------------------------------------
-// Dubious Overrides (For emag use)
-//----------------------------------------------------------------------------
-
-
-//Clogs up the unloader. And, there may be devious uses for it...
-/datum/cargoprofile/slow
- name = "Slow unloader"
- id = "slow"
- whitelist = list(/obj/item,/obj/structure/closet,/obj/structure/bigDelivery,/obj/machinery/portable_atmospherics)
- blacklist = list()
-
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- if(..())
- return remaining
-
-/datum/cargoprofile/unary/shredder
- name = "Paper Shredder"
- id = "shredder"
- blacklist = null
- whitelist = list(/obj/item/paper,/obj/item/book,/obj/item/clipboard,/obj/item/folder,/obj/item/photo)
- universal = 1
-
- dedicated_path = /obj/machinery/programmable/unary/shredder
-
-
-
- proc/cliptags(var/Text)
- //Removes all html tags
- var/index
- var/index2
- index = findtextEx(Text,"<")
- while(index)
- index2 = findtextEx(Text,">",index)
- if(!index2)
- return copytext(Text,1,index)
- Text = "[copytext(Text,1,index)][copytext(Text,index2+1,0)]"
- index = findtextEx(Text,"<")
- //should have trimmed that text there pretty good
- return Text
-
-
- //Recurses through the text, removing large chunks
- proc/garbletext(var/Text)
- var/l = length(Text)
- if(l <= 3)
- if(prob(20))
- return pick("#","|","/","*",".","."," ","."," "," ")
- return Text
- if(prob(50))
- return "[garbletext(copytext(Text,1,l/2))][garbletext(copytext(Text,l/2,0))]"
- if(prob(50))
- return "[pick("#","|","/","*",".","."," ","."," "," ")][garbletext(copytext(Text,1,l/2))]"
- return "[garbletext(copytext(Text,l/2,0))][pick("#","|","/","*",".","."," ","."," "," ")]"
-
- proc/garble_keeptags(var/Text)
- var/list/L = splittext(Text,">")
- var/result = ""
- for(var/string in L)
- var/index = findtextEx(string,"<")
- if(index!=1)
- result += "[garbletext(copytext(string,1,index))][copytext(string,index)]>"
- else
- result += "[string]>"
- return copytext(result,1,lentext(result))
-
-
-
-
- outlet_reaction(var/atom/W,var/turf/D)
- if(istype(W,/obj/item/paper/crumpled))
- qdel(W)
- return
- if(istype(W,/obj/item/clipboard) || istype(W,/obj/item/folder))
- // destroy folder, various effects on contents
- for(var/obj/item/I in W.contents)
- if(prob(25))//JUNK IT
- qdel(I)
- else if(prob(50)) //We've been over this. I can't just take it apart with a crowbar.
- var/obj/item/paper/crumpled/P = new(master.loc)
- if(I.name)
- P.name = garbletext(I.name)
- if(prob(66))
- P.fingerprints = I.fingerprints
- P.fingerprintshidden = I.fingerprintshidden
- if(istype(I,/obj/item/paper))
- var/obj/item/paper/O = I
- P.info = garble_keeptags(O.info)
- qdel(I)
- ..(P,D)
- else
- ..(I,D) // Eject
- qdel(W) //destroy container
- return
- if(prob(50)) //JUNK IT NOW!
- var/obj/item/paper/crumpled/P = new(master.loc)
- P.name = W.name
- var/obj/item/I = W
- if(prob(66))
- P.fingerprints = I.fingerprints
- P.fingerprintshidden = I.fingerprintshidden
- if(istype(I,/obj/item/paper))
- var/obj/item/paper/O = I
- if(O.info)
- P.info = garble_keeptags(O.info)
- if(istype(I,/obj/item/book))
- var/obj/item/book/B = I
- if(B.dat)
- P.info = garble_keeptags(B.dat)
- if(B.carved && B.store)
- ..(B.store,D)
- qdel(W)
- ..(P,D)
- else //I want it junked
- qdel(W)
- return
-
-/datum/cargoprofile/unary/gibber
- name = "human shredding"
- id = "flesh"
- whitelist = list(/mob/living/carbon,/mob/living/simple_animal)
- blacklist = null
- mobcheck = 1
- contains(var/atom/A)
- if(!istype(A,/mob))
- return
- if(blacklist)
- for(var/T in blacklist)
- if(istype(A,T))
- return 0
- if(whitelist)
- for(var/T in whitelist)
- if(istype(A,T))
- return 1
- return 0
- return 1
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- var/mob/living/M = W
- if(istype(M) && (remaining > MOB_WORK))
- //this is necessarily damaging
- var/damage = rand(1,5)
- to_chat(M, "The unloading machine grabs you with a hard metallic claw!")
- M.reset_perspective(master)
- M.loc = master
- master.types[M.type] = src
- M.apply_damage(damage) // todo: ugly
- M.visible_message("[M.name] gets pulled into the machine!")
- return MOB_WORK
- outlet_reaction(var/atom/W,var/turf/D)
- var/mob/living/M = W
- var/bruteloss = M.bruteloss
- if(istype(M,/mob/living/carbon/human))
- var/mob/living/carbon/human/C = M
- for(var/obj/item/organ/external/L in C.bodyparts)
- bruteloss += L.brute_dam
- if(bruteloss < 100) // requires tenderization
- M.apply_damage(rand(5,15),BRUTE)
- to_chat(M, "The machine is tearing you apart!")
- master.visible_message("[master] makes a squishy grinding noise.")
- return
- M.loc = master.loc
- M.gib()
- return
-
-
-/datum/cargoprofile/people
- name = "Manhandling"
- id = "people"
-
- whitelist = null
- blacklist = list(/mob/camera,/mob/new_player,/mob/living/simple_animal/hostile/blob/blobspore,/mob/living/simple_animal/hostile/creature,
- /mob/living/simple_animal/hostile/spaceWorm,/mob/living/simple_animal/shade,/mob/living/simple_animal/hostile/faithless,/mob/dead)
- universal = 1
- mobcheck = 1
-
-
- contains(var/atom/A)
- if(!istype(A,/mob))
- return
- if(blacklist)
- for(var/T in blacklist)
- if(istype(A,T))
- return 0
- if(whitelist)
- for(var/T in whitelist)
- if(istype(A,T))
- return 1
- return 0
- return 1
-
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- var/mob/living/M = W
- if(remaining > MOB_WORK)
- //this is necessarily damaging
- var/damage = rand(1,5)
- to_chat(M, "The unloading machine grabs you with a hard metallic claw!")
- M.forceMove(master)
- master.types[M.type] = src
- M.apply_damage(damage) // todo: ugly
- M.visible_message("[M.name] gets pulled into the machine!")
- return MOB_WORK
-
- outlet_reaction(var/atom/W,var/turf/D)
- var/mob/living/M = W
- M.forceMove(master.loc)
- M.dir = master.outdir
-
- D = get_step(D,master.outdir) // throw attempt
- eject_speed = rand(0,4)
-
- M.visible_message("[M.name] is ejected from the unloader.")
- M.throw_at(D,eject_speed,eject_speed)
- return
-
-/datum/cargoprofile/unary/trainer
- name = "Boxing Trainer"
- id = "trainer"
- blacklist = list()
- whitelist = list(/mob/living/carbon/human)
- mobcheck = 1
-
- var/const/PUNCH_WORK = 6
-
- dedicated_path = /obj/machinery/programmable/unary/trainer
-
- contains(var/atom/A)
- if(!istype(A,/mob))
- return 0
- if(blacklist)
- for(var/T in blacklist)
- if(istype(A,T))
- return 0
- if(whitelist)
- for(var/T in whitelist)
- if(istype(A,T))
- return 1
- return 0
- return 1
-
- proc/punch(var/mob/living/carbon/human/M,var/maxpunches)
- //stolen from holographic boxing gloves code
- //This should probably be done BY the mob, however, the attack code will be expecting a source mob.
-
- var/damage
- if(prob(75))
- damage = rand(0, 6) // pap
- else
- damage = rand(0, 12) // thwack
-
- if(!damage)
- playsound(master.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- master.visible_message("\The [src] punched at [M], but whiffed!")
-
- if(maxpunches > 1 && prob(50)) // Follow through on a miss, 50% chance
- return punch(M,maxpunches - 1) + 1
- return 1
- var/obj/item/organ/external/affecting = M.get_organ(ran_zone("chest",50))
- var/armor_block = M.run_armor_check(affecting, "melee")
-
- playsound(master.loc, "punch", 25, 1, -1)
- master.visible_message("\The [src] has punched [M]!")
- if(!master.emagged)
- M.apply_damage(damage, STAMINA, affecting, armor_block) // Clean fight
- else
- M.apply_damage(damage, BRUTE, affecting, armor_block) // Foul! Foooul!
-
- if(damage >= 9)
- master.visible_message("\The [src] has weakened [M]!")
- M.apply_effect(4, WEAKEN, armor_block)
- if(!master.emagged)
- master.sleep = 1
- return maxpunches // The machine is not so sophisticated as to not gloat
- else
- if(prob(25)) // Follow through on a hit, 25% chance. Pause after.
- return punch(M,maxpunches-1) + 1
- return 1
-
- inlet_reaction(var/atom/W,var/turf/S,var/remaining)
- //stolen from boxing gloves code
- var/mob/living/carbon/human/M = W
- if((M.lying || (M.health - M.staminaloss < 25))&& !master.emagged)
- to_chat(M, "\The [src] gives you a break.")
- master.sleep+=5
- return 0 // Be polite
- var/punches = punch(M,remaining / PUNCH_WORK)
- if(punches>1)master.sleep++
- return punches * PUNCH_WORK
diff --git a/code/datums/computerfiles.dm b/code/datums/computerfiles.dm
deleted file mode 100644
index 14cd7e38612..00000000000
--- a/code/datums/computerfiles.dm
+++ /dev/null
@@ -1,7 +0,0 @@
-datum
- computer
- var/name
- folder
- var/list/datum/computer/contents = list()
-
- file
\ No newline at end of file
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 96c663fb703..1a22131d55f 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -255,7 +255,7 @@ var/record_id_num = 1001
if(PDA_Manifest.len)
PDA_Manifest.Cut()
- if(H.mind && (H.mind.assigned_role != "MODE"))
+ if(H.mind && (H.mind.assigned_role != H.mind.special_role))
var/assignment
if(H.mind.role_alt_title)
assignment = H.mind.role_alt_title
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 71c1bd74a28..435ccad80cd 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -438,5 +438,3 @@ var/list/advance_cures = list(
var/datum/symptom/S = i
total_transmittable += S.transmittable
return total_transmittable
-
-#undef RANDOM_STARTING_LEVEL
diff --git a/code/datums/diseases/berserker.dm b/code/datums/diseases/berserker.dm
index 646d64b78f2..3efb4d9e06a 100644
--- a/code/datums/diseases/berserker.dm
+++ b/code/datums/diseases/berserker.dm
@@ -48,8 +48,8 @@
var/damage = rand(1, 5)
if(prob(80))
playsound(affected_mob.loc, "punch", 25, 1, -1)
- affected_mob.visible_message("[affected_mob] hits [M] with their thrashing!")
+ affected_mob.visible_message("[affected_mob] hits [M] with [affected_mob.p_their()] thrashing!")
M.adjustBruteLoss(damage)
else
playsound(affected_mob.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- affected_mob.visible_message("[affected_mob] fails to hit [M] with their thrashing!")
\ No newline at end of file
+ affected_mob.visible_message("[affected_mob] fails to hit [M] with [affected_mob.p_their()] thrashing!")
\ No newline at end of file
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
new file mode 100644
index 00000000000..a98a65cb1a2
--- /dev/null
+++ b/code/datums/holocall.dm
@@ -0,0 +1,190 @@
+#define HOLOPAD_MAX_DIAL_TIME 200
+
+/mob/camera/aiEye/remote/holo/setLoc()
+ . = ..()
+ var/obj/machinery/hologram/holopad/H = origin
+ H.move_hologram(eye_user, loc)
+
+//this datum manages it's own references
+
+/datum/holocall
+ var/mob/living/user //the one that called
+ var/obj/machinery/hologram/holopad/calling_holopad //the one that sent the call
+ var/obj/machinery/hologram/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/hologram/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/hologram/holopad/H = I
+ if(!QDELETED(H) && !(H.stat & NOPOWER))
+ dialed_holopads += H
+ var/area/area = get_area(H)
+ LAZYADD(H.holo_calls, src)
+ H.atom_say("[area] pad beeps: Incoming call from [caller]!")
+
+ if(!dialed_holopads.len)
+ calling_holopad.atom_say("Connection failure.")
+ qdel(src)
+ return
+
+//cleans up ALL references :)
+/datum/holocall/Destroy()
+ QDEL_NULL(hangup)
+
+ var/user_good = !QDELETED(user)
+ if(user_good)
+ user.reset_perspective()
+ user.remote_control = null
+
+ if(!QDELETED(eye))
+ eye.RemoveImages()
+ 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/hologram/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
+
+
+ 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/hologram/holopad/H)
+ if(H == connected_holopad)
+ var/area/A = get_area(connected_holopad)
+ calling_holopad.atom_say("[A] holopad disconnected.")
+ else if(H == calling_holopad && connected_holopad)
+ connected_holopad.atom_say("[user] disconnected.")
+
+ user.unset_machine(H)
+ if(istype(hangup))
+ hangup.Remove(user)
+
+ ConnectionFailure(H, TRUE)
+
+//Forcefully disconnects a holopad `H` from a call. Pads not in the call are ignored.
+/datum/holocall/proc/ConnectionFailure(obj/machinery/hologram/holopad/H, graceful = FALSE)
+ if(H == connected_holopad || H == calling_holopad)
+ if(!graceful && H != calling_holopad)
+ calling_holopad.atom_say("Connection failure.")
+ qdel(src)
+ return
+
+ LAZYREMOVE(H.holo_calls, src)
+ dialed_holopads -= H
+ if(!dialed_holopads.len)
+ if(graceful)
+ calling_holopad.atom_say("Call rejected.")
+ 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/hologram/holopad/H)
+ if(H == calling_holopad)
+ return
+
+ if(!(H in dialed_holopads))
+ return
+
+ if(connected_holopad)
+ return
+
+ 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
+
+ user.unset_machine(H)
+ //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.remote_view = 1
+ user.reset_perspective(eye)
+ eye.setLoc(get_turf(H))
+
+ 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/hologram/holopad/H = I
+ if((H.stat & NOPOWER))
+ ConnectionFailure(H)
+
+ if(QDELETED(src))
+ return FALSE
+
+ . = !QDELETED(user) && !user.incapacitated() && !QDELETED(calling_holopad) && !(calling_holopad.stat & NOPOWER) && user.loc == calling_holopad.loc
+
+ if(.)
+ if(!connected_holopad)
+ . = world.time < (call_start_time + HOLOPAD_MAX_DIAL_TIME)
+ if(!.)
+ calling_holopad.atom_say("No answer received.")
+ calling_holopad.temp = ""
+
+ else if(!.)
+ qdel(src)
+
+/datum/action/innate/end_holocall
+ name = "End Holocall"
+ 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)
diff --git a/code/datums/looping_sounds/weather.dm b/code/datums/looping_sounds/weather.dm
new file mode 100644
index 00000000000..d355bc59c14
--- /dev/null
+++ b/code/datums/looping_sounds/weather.dm
@@ -0,0 +1,47 @@
+/datum/looping_sound/active_outside_ashstorm
+ mid_sounds = list(
+ 'sound/weather/ashstorm/outside/active_mid1.ogg' = 1,
+ 'sound/weather/ashstorm/outside/active_mid1.ogg' = 1,
+ 'sound/weather/ashstorm/outside/active_mid1.ogg' = 1
+ )
+ mid_length = 80
+ start_sound = 'sound/weather/ashstorm/outside/active_start.ogg'
+ start_length = 130
+ end_sound = 'sound/weather/ashstorm/outside/active_end.ogg'
+ volume = 80
+
+/datum/looping_sound/active_inside_ashstorm
+ mid_sounds = list(
+ 'sound/weather/ashstorm/inside/active_mid1.ogg' = 1,
+ 'sound/weather/ashstorm/inside/active_mid2.ogg' = 1,
+ 'sound/weather/ashstorm/inside/active_mid3.ogg' = 1
+ )
+ mid_length = 80
+ start_sound = 'sound/weather/ashstorm/inside/active_start.ogg'
+ start_length = 130
+ end_sound = 'sound/weather/ashstorm/inside/active_end.ogg'
+ volume = 60
+
+/datum/looping_sound/weak_outside_ashstorm
+ mid_sounds = list(
+ 'sound/weather/ashstorm/outside/weak_mid1.ogg' = 1,
+ 'sound/weather/ashstorm/outside/weak_mid2.ogg' = 1,
+ 'sound/weather/ashstorm/outside/weak_mid3.ogg' = 1
+ )
+ mid_length = 80
+ start_sound = 'sound/weather/ashstorm/outside/weak_start.ogg'
+ start_length = 130
+ end_sound = 'sound/weather/ashstorm/outside/weak_end.ogg'
+ volume = 50
+
+/datum/looping_sound/weak_inside_ashstorm
+ mid_sounds = list(
+ 'sound/weather/ashstorm/inside/weak_mid1.ogg' = 1,
+ 'sound/weather/ashstorm/inside/weak_mid2.ogg' = 1,
+ 'sound/weather/ashstorm/inside/weak_mid3.ogg' = 1
+ )
+ mid_length = 80
+ start_sound = 'sound/weather/ashstorm/inside/weak_start.ogg'
+ start_length = 130
+ end_sound = 'sound/weather/ashstorm/inside/weak_end.ogg'
+ volume = 30
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index be35cf8cca8..3f62c8ffaed 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -38,8 +38,8 @@
var/memory
- var/assigned_role
- var/special_role
+ var/assigned_role //assigned role is what job you're assigned to when you join the station.
+ var/special_role //special roles are typically reserved for antags or roles like ERT. If you want to avoid a character being automatically announced by the AI, on arrival (becuase they're an off station character or something); ensure that special_role and assigned_role are equal.
var/list/restricted_roles = list()
var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
@@ -54,6 +54,7 @@
var/has_been_rev = 0//Tracks if this mind has been a rev or not
var/miming = 0 // Mime's vow of silence
+ var/list/antag_datums
var/speech_span // What span any body this mind has talks in.
var/datum/faction/faction //associated faction
var/datum/changeling/changeling //changeling holder
@@ -72,17 +73,29 @@
var/brigged_since = -1
var/suicided = FALSE
- New(var/key)
- src.key = key
-
//put this here for easier tracking ingame
var/datum/money_account/initial_account
//zealot_master is a reference to the mob that converted them into a zealot (for ease of investigation and such)
var/mob/living/carbon/human/zealot_master = null
+/datum/mind/New(var/key)
+ src.key = key
+
+
+/datum/mind/Destroy()
+ ticker.minds -= src
+ if(islist(antag_datums))
+ for(var/i in antag_datums)
+ var/datum/antagonist/antag_datum = i
+ if(antag_datum.delete_on_mind_deletion)
+ qdel(i)
+ antag_datums = null
+ return ..()
+
/datum/mind/proc/transfer_to(mob/living/new_character)
var/datum/atom_hud/antag/hud_to_transfer = antag_hud //we need this because leave_hud() will clear this list
+ var/mob/living/old_current = current
if(!istype(new_character))
log_runtime(EXCEPTION("transfer_to(): Some idiot has tried to transfer_to() a non mob/living mob."), src)
if(current) //remove ourself from our old body's mind variable
@@ -95,6 +108,9 @@
new_character.mind.current = null
current = new_character //link ourself to our new body
new_character.mind = src //and link our new body to ourself
+ for(var/a in antag_datums) //Makes sure all antag datums effects are applied in the new body
+ var/datum/antagonist/A = a
+ A.on_body_transfer(old_current, current)
transfer_antag_huds(hud_to_transfer) //inherit the antag HUD
transfer_actions(new_character)
@@ -161,7 +177,7 @@
if(ismindshielded(H))
text = "Mindshield Implant:Remove|Implanted"
else
- text = "Mindshield Implant:No Implant|Implant him!"
+ text = "Mindshield Implant:No Implant|Implant [H.p_them()]!"
sections["implant"] = text
/** REVOLUTION ***/
text = "revolution"
@@ -467,9 +483,11 @@
var/new_memo = copytext(input("Write new memory", "Memory", memory) as null|message,1,MAX_MESSAGE_LEN)
if(isnull(new_memo))
return
- memory = new_memo
- log_admin("[key_name(usr)] has edited [key_name(current)]'s memory")
- message_admins("[key_name_admin(usr)] has edited [key_name_admin(current)]'s memory")
+ var/confirmed = alert(usr, "Are you sure?", "Edit Memory", "Yes", "No")
+ if(confirmed == "Yes") // Because it is too easy to accidentally wipe someone's memory
+ memory = new_memo
+ log_admin("[key_name(usr)] has edited [key_name(current)]'s memory")
+ message_admins("[key_name_admin(usr)] has edited [key_name_admin(current)]'s memory")
else if(href_list["obj_edit"] || href_list["obj_add"])
var/datum/objective/objective
@@ -525,8 +543,8 @@
new_objective = new objective_path
new_objective.owner = src
new_objective:target = new_target:mind
- //Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
- new_objective.explanation_text = "[objective_type] [new_target:real_name], the [new_target:mind:assigned_role=="MODE" ? (new_target:mind:special_role) : (new_target:mind:assigned_role)]."
+ //Will display as special role if assigned mode is equal to special role.. Ninjas/commandos/nuke ops.
+ new_objective.explanation_text = "[objective_type] [new_target:real_name], the [new_target:mind:assigned_role == new_target:mind:special_role ? (new_target:mind:special_role) : (new_target:mind:assigned_role)]."
if("destroy")
var/list/possible_targets = active_ais(1)
@@ -614,7 +632,7 @@
new_objective = new /datum/objective/escape/escape_with_identity
new_objective.owner = src
new_objective.target = new_target
- new_objective.explanation_text = "Escape on the shuttle or an escape pod with the identity of [targ.current.real_name], the [targ.assigned_role] while wearing their identification card."
+ new_objective.explanation_text = "Escape on the shuttle or an escape pod with the identity of [targ.current.real_name], the [targ.assigned_role] while wearing [targ.current.p_their()] identification card."
if("custom")
var/expl = sanitize(copytext(input("Custom objective:", "Objective", objective ? objective.explanation_text : "") as text|null,1,MAX_MESSAGE_LEN))
if(!expl)
@@ -726,7 +744,7 @@
if(src in ticker.mode.revolutionaries)
ticker.mode.revolutionaries -= src
ticker.mode.update_rev_icons_removed(src)
- to_chat(current, "\red You have proven your devotion to revolution! You are a head revolutionary now!")
+ to_chat(current, "You have proven your devotion to revolution! You are a head revolutionary now!")
else if(!(src in ticker.mode.head_revolutionaries))
to_chat(current, "You are a member of the revolutionaries' leadership now!")
else
@@ -1201,47 +1219,74 @@
message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] an uplink")
else if(href_list["obj_announce"])
- var/obj_count = 1
- to_chat(current, "