| Name | Avg(s) | Last(s) | Highest(s) | Tickcount | Tickrate | State | Action |
| [data["name"]] | " - text += "[num2text(data["averageRunTime"]/10,3)] | " - text += "[num2text(data["lastRunTime"]/10,3)] | " - text += "[num2text(data["highestRunTime"]/10,3)] | " - text += "[num2text(data["ticks"],4)] | " - text += "[data["schedule"]] | " - text += "[data["status"]] | " - text += "" - if (data["disabled"]) - text += "" - else - text += "" - text += " | " - text += "
Process Scheduler
-
-
-
-
- The process scheduler controls [processScheduler.getProcessCount()] loops."}
-
- text += ""
- text += getProcessTable()
- text += ""
-
- usr << browse(text, "window=processSchedulerContext;size=800x600")
-
-/datum/processSchedulerView/proc/bootstrap_browse()
- usr << browse('bower_components/jquery/dist/jquery.min.js', "file=jquery.min.js;display=0")
- usr << browse('bower_components/bootstrap2.3.2/bootstrap/js/bootstrap.min.js', "file=bootstrap.min.js;display=0")
- usr << browse('bower_components/bootstrap2.3.2/bootstrap/css/bootstrap.min.css', "file=bootstrap.min.css;display=0")
- usr << browse('bower_components/bootstrap2.3.2/bootstrap/img/glyphicons-halflings-white.png', "file=glyphicons-halflings-white.png;display=0")
- usr << browse('bower_components/bootstrap2.3.2/bootstrap/img/glyphicons-halflings.png', "file=glyphicons-halflings.png;display=0")
- usr << browse('bower_components/json2/json2.js', "file=json2.js;display=0")
-
-/datum/processSchedulerView/proc/bootstrap_includes()
- return {"
-
-
-
-
- "}
diff --git a/code/controllers/ProcessScheduler/test/testDyingUpdateQueueProcess.dm b/code/controllers/ProcessScheduler/test/testDyingUpdateQueueProcess.dm
deleted file mode 100644
index d08ec46c7da..00000000000
--- a/code/controllers/ProcessScheduler/test/testDyingUpdateQueueProcess.dm
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * testDyingUpdateQueueProcess
- * This process is an example of a process using an updateQueue.
- * The datums updated by this process behave badly and block the update loop
- * by sleeping. If you #define UPDATE_QUEUE_DEBUG, you will see the updateQueue
- * killing off its worker processes and spawning new ones to work around slow
- * updates. This means that if you have a code path that sleeps for a long time
- * in mob.Life once in a blue moon, the mob update loop will not hang.
- */
-/datum/slowTestDatum/proc/wackyUpdateProcessName()
- sleep(rand(0,20)) // Randomly REALLY slow :|
-
-/datum/controller/process/testDyingUpdateQueueProcess
- var/tmp/datum/updateQueue/updateQueueInstance
- var/tmp/list/testDatums = list()
-
-/datum/controller/process/testDyingUpdateQueueProcess/setup()
- name = "Dying UpdateQueue Process"
- schedule_interval = 30 // every 3 seconds
- updateQueueInstance = new
- for(var/i = 1, i < 30, i++)
- testDatums.Add(new /datum/slowTestDatum)
-
-/datum/controller/process/testDyingUpdateQueueProcess/doWork()
- updateQueueInstance.init(testDatums, "wackyUpdateProcessName")
- updateQueueInstance.Run()
-
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/test/testHarness.dm b/code/controllers/ProcessScheduler/test/testHarness.dm
deleted file mode 100644
index 2b5f1dff813..00000000000
--- a/code/controllers/ProcessScheduler/test/testHarness.dm
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- These are simple defaults for your project.
- */
-#define DEBUG
-
-var/global/datum/processSchedulerView/processSchedulerView
-
-world
- loop_checks = 0
- New()
- ..()
- processScheduler = new
- processSchedulerView = new
-
-mob
- step_size = 8
-
- New()
- ..()
-
-
- verb
- startProcessScheduler()
- set name = "Start Process Scheduler"
- processScheduler.setup()
- processScheduler.start()
-
- getProcessSchedulerContext()
- set name = "Get Process Scheduler Status Panel"
- processSchedulerView.getContext()
-
- runUpdateQueueTests()
- set name = "Run Update Queue Testsuite"
- var/datum/updateQueueTests/t = new
- t.runTests()
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/test/testHungProcess.dm b/code/controllers/ProcessScheduler/test/testHungProcess.dm
deleted file mode 100644
index ced05dd4d70..00000000000
--- a/code/controllers/ProcessScheduler/test/testHungProcess.dm
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * testHungProcess
- * This process is an example of a simple update loop process that hangs.
- */
-
-/datum/controller/process/testHungProcess/setup()
- name = "Hung Process"
- schedule_interval = 30 // every 3 seconds
-
-/datum/controller/process/testHungProcess/doWork()
- sleep(1000) // FUCK
- // scheck is also responsible for handling hung processes. If a process
- // hangs, and later resumes, but has already been killed by the scheduler,
- // scheck will force the process to bail out.
- scheck()
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/test/testNiceProcess.dm b/code/controllers/ProcessScheduler/test/testNiceProcess.dm
deleted file mode 100644
index aa921bc62fa..00000000000
--- a/code/controllers/ProcessScheduler/test/testNiceProcess.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * testNiceProcess
- * This process is an example of a simple update loop process that is
- * relatively fast.
- */
-
-/datum/controller/process/testNiceProcess/setup()
- name = "Nice Process"
- schedule_interval = 10 // every second
-
-/datum/controller/process/testNiceProcess/doWork()
- sleep(rand(1,5)) // Just to pretend we're doing something
-
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/test/testSlowProcess.dm b/code/controllers/ProcessScheduler/test/testSlowProcess.dm
deleted file mode 100644
index b7c9e6e21e8..00000000000
--- a/code/controllers/ProcessScheduler/test/testSlowProcess.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * testSlowProcess
- * This process is an example of a simple update loop process that is slow.
- * The update loop here sleeps inside to provide an example, but if you had
- * a computationally intensive loop process that is simply slow, you can use
- * scheck() inside the loop to force it to yield periodically according to
- * the sleep_interval var. By default, scheck will cause a loop to sleep every
- * 2 ticks.
- */
-
-/datum/controller/process/testSlowProcess/setup()
- name = "Slow Process"
- schedule_interval = 30 // every 3 seconds
-
-/datum/controller/process/testSlowProcess/doWork()
- // set background = 1 will cause loop constructs to sleep periodically,
- // whenever the BYOND scheduler deems it productive to do so.
- // This behavior is not always sufficient, nor is it always consistent.
- // Rather than leaving it up to the BYOND scheduler, we can control it
- // ourselves and leave nothing to the black box.
- set background = 1
-
- for(var/i=1,i<30,i++)
- // Just to pretend we're doing something here
- sleep(rand(3, 5))
-
- // Forces this loop to yield(sleep) periodically.
- scheck()
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/test/testUpdateQueue.dm b/code/controllers/ProcessScheduler/test/testUpdateQueue.dm
deleted file mode 100644
index 07b64e927f3..00000000000
--- a/code/controllers/ProcessScheduler/test/testUpdateQueue.dm
+++ /dev/null
@@ -1,209 +0,0 @@
-var/global/list/updateQueueTestCount = list()
-
-/datum/updateQueueTests
- var/start
- proc
- runTests()
- world << "Running 9 tests..."
- testUpdateQueuePerformance()
- sleep(1)
- testInplace()
- sleep(1)
- testInplaceUpdateQueuePerformance()
- sleep(1)
- testUpdateQueueReinit()
- sleep(1)
- testCrashingQueue()
- sleep(1)
- testEmptyQueue()
- sleep(1)
- testManySlowItemsInQueue()
- sleep(1)
- testVariableWorkerTimeout()
- sleep(1)
- testReallySlowItemInQueue()
- sleep(1)
- world << "Finished!"
-
- beginTiming()
- start = world.time
-
- endTiming(text)
- var/time = (world.time - start) / world.tick_lag
- world << {"Performance - [text] - [time] ticks"}
-
- getCount()
- return updateQueueTestCount[updateQueueTestCount.len]
-
- incrementTestCount()
- updateQueueTestCount.len++
- updateQueueTestCount[updateQueueTestCount.len] = 0
-
- assertCountEquals(count, text)
- assertThat(getCount() == count, text)
-
- assertCountLessThan(count, text)
- assertThat(getCount() < count, text)
-
- assertCountGreaterThan(count, text)
- assertThat(getCount() > count, text)
-
- assertThat(condition, text)
- if (condition)
- world << {"PASS: [text]"}
- else
- world << {"FAIL: [text]"}
-
- testUpdateQueuePerformance()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=100000,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
-
- var/datum/updateQueue/uq = new(objs)
-
- beginTiming()
- uq.Run()
- endTiming("updating 100000 simple objects")
-
- assertCountEquals(100000, "test that update queue updates all objects expected")
- del(objs)
- del(uq)
-
- testUpdateQueueReinit()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=100,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
-
- var/datum/updateQueue/uq = new(objs)
- uq.Run()
- objs = new
-
- for(var/i=1,i<=100,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
- uq.init(objs)
- uq.Run()
- assertCountEquals(200, "test that update queue reinitializes properly and updates all objects as expected.")
- del(objs)
- del(uq)
-
- testInplace()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=100,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
- var/datum/updateQueue/uq = new(objects = objs, inplace = 1)
- uq.Run()
- assertThat(objs.len == 0, "test that update queue inplace option really works inplace")
- assertCountEquals(100, "test that inplace update queue updates the right number of objects")
- del(objs)
- del(uq)
-
- testInplaceUpdateQueuePerformance()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=100000,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
-
- var/datum/updateQueue/uq = new(objs)
-
- beginTiming()
- uq.Run()
- endTiming("updating 100000 simple objects in place")
- del(objs)
- del(uq)
-
- testCrashingQueue()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=10,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
- objs.Add(new /datum/uqTestDatum/crasher(updateQueueTestCount.len))
- for(var/i=1,i<=10,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
-
- var/datum/updateQueue/uq = new(objs)
- uq.Run()
- assertCountEquals(20, "test that update queue handles crashed update procs OK")
- del(objs)
- del(uq)
-
- testEmptyQueue()
- incrementTestCount()
- var/list/objs = new
- var/datum/updateQueue/uq = new(objs)
- uq.Run()
- assertCountEquals(0, "test that update queue doesn't barf on empty lists")
- del(objs)
- del(uq)
-
- testManySlowItemsInQueue()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=30,i++)
- objs.Add(new /datum/uqTestDatum/slow(updateQueueTestCount.len))
- var/datum/updateQueue/uq = new(objs)
- uq.Run()
- assertCountEquals(30, "test that update queue slows down execution if too many objects are slow to update")
- del(objs)
- del(uq)
-
- testVariableWorkerTimeout()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=20,i++)
- objs.Add(new /datum/uqTestDatum/slow(updateQueueTestCount.len))
- var/datum/updateQueue/uq = new(objs, workerTimeout=6)
- uq.Run()
- assertCountEquals(20, "test that variable worker timeout works properly")
- del(objs)
- del(uq)
-
- testReallySlowItemInQueue()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=10,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
- objs.Add(new /datum/uqTestDatum/reallySlow(updateQueueTestCount.len))
- for(var/i=1,i<=10,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
- var/datum/updateQueue/uq = new(objs)
- uq.Run()
- assertCountEquals(20, "test that update queue skips objects that are too slow to update")
- del(objs)
- del(uq)
-
-
-
-datum/uqTestDatum
- var/testNum
- New(testNum)
- ..()
- src.testNum = testNum
- proc/update()
- updateQueueTestCount[testNum]++
- proc/lag(cycles)
- set background = 1
- for(var/i=0,i= 0)
- if(dels >= maxDels)
+ if(remaining_force_dels <= 0)
#ifdef GC_DEBUG
testing("GC: Reached max force dels per tick [dels] vs [maxDels]")
#endif
@@ -88,13 +94,22 @@ world/loop_checks = 0
testing("GC: -- \ref[A] | [A.type] was unable to be GC'd and was deleted --")
logging["[A.type]"]++
del(A)
- ++dels
- ++hard_dels
- #ifdef GC_DEBUG
+
+ hard_dels++
+ remaining_force_dels--
else
+ #ifdef GC_DEBUG
testing("GC: [refID] properly GC'd at [world.time] with timeout [GCd_at_time]")
- #endif
+ #endif
+ soft_dels++
+ tick_dels++
+ total_dels++
destroyed.Cut(1, 2)
+ SCHECK
+
+#undef GC_FORCE_DEL_PER_TICK
+#undef GC_COLLECTION_TIMEOUT
+#undef GC_COLLECTIONS_PER_TICK
#ifdef GC_FINDREF
/datum/controller/process/garbage_collector/proc/LookForRefs(var/datum/D, var/list/targ)
@@ -132,8 +147,11 @@ world/loop_checks = 0
destroyed -= "\ref[A]" // Removing any previous references that were GC'd so that the current object will be at the end of the list.
destroyed["\ref[A]"] = world.time
-/datum/controller/process/garbage_collector/getStatName()
- return ..()+"([garbage_collector.destroyed.len]/[garbage_collector.dels]/[garbage_collector.hard_dels])"
+/datum/controller/process/garbage_collector/statProcess()
+ ..()
+ stat(null, "[garbage_collect ? "On" : "Off"], [destroyed.len] queued")
+ stat(null, "Dels: [total_dels], [soft_dels] soft, [hard_dels] hard, [tick_dels] last run")
+
// Tests if an atom has been deleted.
/proc/deleted(atom/A)
@@ -149,7 +167,7 @@ world/loop_checks = 0
crash_with("qdel() passed object of type [A.type]. qdel() can only handle /datum types.")
del(A)
if(garbage_collector)
- garbage_collector.dels++
+ garbage_collector.total_dels++
garbage_collector.hard_dels++
else if(isnull(A.gcDestroyed))
// Let our friend know they're about to get collected
@@ -263,4 +281,4 @@ world/loop_checks = 0
#ifdef GC_FINDREF
#undef GC_FINDREF
-#endif
+#endif
\ No newline at end of file
diff --git a/code/controllers/Processes/inactivity.dm b/code/controllers/Processes/inactivity.dm
index e61c2d4dc11..f12c0d4e3c7 100644
--- a/code/controllers/Processes/inactivity.dm
+++ b/code/controllers/Processes/inactivity.dm
@@ -10,4 +10,4 @@
log_access("AFK: [key_name(C)]")
C << "You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected."
del(C) // Don't qdel, cannot override finalize_qdel behaviour for clients.
- scheck()
+ SCHECK
diff --git a/code/controllers/Processes/machinery.dm b/code/controllers/Processes/machinery.dm
index 7959ee4fa7b..d0469744898 100644
--- a/code/controllers/Processes/machinery.dm
+++ b/code/controllers/Processes/machinery.dm
@@ -3,6 +3,7 @@
/datum/controller/process/machinery/setup()
name = "machinery"
schedule_interval = 20 // every 2 seconds
+ start_delay = 12
/datum/controller/process/machinery/doWork()
internal_sort()
@@ -19,10 +20,6 @@
/datum/controller/process/machinery/proc/internal_process_machinery()
for(var/obj/machinery/M in machines)
if(M && !M.gcDestroyed)
- #ifdef PROFILE_MACHINES
- var/time_start = world.timeofday
- #endif
-
if(M.process() == PROCESS_KILL)
//M.inMachineList = 0 We don't use this debugging function
machines.Remove(M)
@@ -31,22 +28,13 @@
if(M && M.use_power)
M.auto_use_power()
- #ifdef PROFILE_MACHINES
- var/time_end = world.timeofday
-
- if(!(M.type in machine_profiling))
- machine_profiling[M.type] = 0
-
- machine_profiling[M.type] += (time_end - time_start)
- #endif
-
- scheck()
+ SCHECK
/datum/controller/process/machinery/proc/internal_process_power()
for(var/datum/powernet/powerNetwork in powernets)
- if(istype(powerNetwork) && !powerNetwork.disposed)
+ if(istype(powerNetwork) && isnull(powerNetwork.gcDestroyed))
powerNetwork.reset()
- scheck()
+ SCHECK
continue
powernets.Remove(powerNetwork)
@@ -56,16 +44,20 @@
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()
+ SCHECK
/datum/controller/process/machinery/proc/internal_process_pipenets()
for(var/datum/pipe_network/pipeNetwork in pipe_networks)
- if(istype(pipeNetwork) && !pipeNetwork.disposed)
+ if(istype(pipeNetwork) && isnull(pipeNetwork.gcDestroyed))
pipeNetwork.process()
- scheck()
+ SCHECK
continue
pipe_networks.Remove(pipeNetwork)
-/datum/controller/process/machinery/getStatName()
- return ..()+"(MCH:[machines.len] PWR:[powernets.len] PIP:[pipe_networks.len])"
+/datum/controller/process/machinery/statProcess()
+ ..()
+ stat(null, "[machines.len] machines")
+ stat(null, "[powernets.len] powernets")
+ stat(null, "[pipe_networks.len] pipenets")
+ stat(null, "[processing_power_items.len] power item\s")
\ No newline at end of file
diff --git a/code/controllers/Processes/mob.dm b/code/controllers/Processes/mob.dm
index 39d4844a021..b44842036d9 100644
--- a/code/controllers/Processes/mob.dm
+++ b/code/controllers/Processes/mob.dm
@@ -4,20 +4,26 @@
/datum/controller/process/mob/setup()
name = "mob"
schedule_interval = 20 // every 2 seconds
- updateQueueInstance = new
+ start_delay = 16
/datum/controller/process/mob/started()
..()
- if(!updateQueueInstance)
- if(!mob_list)
- mob_list = list()
- else if(mob_list.len)
- updateQueueInstance = new
+ if(!mob_list)
+ mob_list = list()
/datum/controller/process/mob/doWork()
- if(updateQueueInstance)
- updateQueueInstance.init(mob_list, "Life")
- updateQueueInstance.Run()
+ for(last_object in mob_list)
+ var/mob/M = last_object
+ if(isnull(M.gcDestroyed))
+ try
+ M.Life()
+ catch(var/exception/e)
+ catchException(e, M)
+ SCHECK
+ else
+ catchBadType(M)
+ mob_list -= M
-/datum/controller/process/mob/getStatName()
- return ..()+"([mob_list.len])"
+/datum/controller/process/mob/statProcess()
+ ..()
+ stat(null, "[mob_list.len] mobs")
\ No newline at end of file
diff --git a/code/controllers/Processes/nanoui.dm b/code/controllers/Processes/nanoui.dm
index 654b1621be5..49b9048c078 100644
--- a/code/controllers/Processes/nanoui.dm
+++ b/code/controllers/Processes/nanoui.dm
@@ -1,14 +1,19 @@
-/datum/controller/process/nanoui
- var/tmp/datum/updateQueue/updateQueueInstance
-
/datum/controller/process/nanoui/setup()
name = "nanoui"
- schedule_interval = 10 // every 1 second
- updateQueueInstance = new
+ schedule_interval = 20 // every 2 seconds
+
+/datum/controller/process/nanoui/statProcess()
+ ..()
+ stat(null, "[nanomanager.processing_uis.len] UIs")
/datum/controller/process/nanoui/doWork()
- updateQueueInstance.init(nanomanager.processing_uis, "process")
- updateQueueInstance.Run()
-
-/datum/controller/process/nanoui/getStatName()
- return ..()+"([nanomanager.processing_uis.len])"
+ 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
\ No newline at end of file
diff --git a/code/controllers/Processes/obj.dm b/code/controllers/Processes/obj.dm
index 37766cf92d1..bd50edd1113 100644
--- a/code/controllers/Processes/obj.dm
+++ b/code/controllers/Processes/obj.dm
@@ -1,24 +1,26 @@
-var/global/list/object_profiling = list()
-/datum/controller/process/obj
- var/tmp/datum/updateQueue/updateQueueInstance
-
/datum/controller/process/obj/setup()
name = "obj"
schedule_interval = 20 // every 2 seconds
- updateQueueInstance = new
+ start_delay = 8
/datum/controller/process/obj/started()
..()
- if(!updateQueueInstance)
- if(!processing_objects)
- processing_objects = list()
- else if(processing_objects.len)
- updateQueueInstance = new
+ if(!processing_objects)
+ processing_objects = list()
/datum/controller/process/obj/doWork()
- if(updateQueueInstance)
- updateQueueInstance.init(processing_objects, "process")
- updateQueueInstance.Run()
+ for(last_object in processing_objects)
+ var/datum/O = last_object
+ if(isnull(O.gcDestroyed))
+ try
+ O:process()
+ catch(var/exception/e)
+ catchException(e, O)
+ SCHECK
+ else
+ catchBadType(O)
+ processing_objects -= O
-/datum/controller/process/obj/getStatName()
- return ..()+"([processing_objects.len])"
+/datum/controller/process/obj/statProcess()
+ ..()
+ stat(null, "[processing_objects.len] objects")
\ No newline at end of file
diff --git a/code/controllers/Processes/turf.dm b/code/controllers/Processes/turf.dm
index 2ac33f48ba7..33967744973 100644
--- a/code/controllers/Processes/turf.dm
+++ b/code/controllers/Processes/turf.dm
@@ -8,7 +8,8 @@ var/global/list/turf/processing_turfs = list()
for(var/turf/T in processing_turfs)
if(T.process() == PROCESS_KILL)
processing_turfs.Remove(T)
- scheck()
+ SCHECK
-/datum/controller/process/turf/getStatName()
- return ..()+"([processing_turfs.len])"
+/datum/controller/process/turf/statProcess()
+ ..()
+ stat(null, "[processing_turfs.len] turf\s")
\ No newline at end of file
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index d456c52e71e..b249db9a47e 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -21,6 +21,7 @@ var/list/gamemode_cache = list()
var/log_pda = 0 // log pda messages
var/log_hrefs = 0 // logs all links clicked in-game. Could be used for debugging and tracking down exploits
var/log_runtime = 0 // logs world.log to a file
+ var/log_world_output = 0 // log world.log << messages
var/sql_enabled = 0 // for sql switching
var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour
var/allow_vote_restart = 0 // allow votes to restart
@@ -327,6 +328,9 @@ var/list/gamemode_cache = list()
if ("log_pda")
config.log_pda = 1
+ if ("log_world_output")
+ config.log_world_output = 1
+
if ("log_hrefs")
config.log_hrefs = 1
diff --git a/code/controllers/subsystem/alarms.dm b/code/controllers/subsystem/alarms.dm
deleted file mode 100644
index b05be7ccbfb..00000000000
--- a/code/controllers/subsystem/alarms.dm
+++ /dev/null
@@ -1,30 +0,0 @@
-// We manually initialize the alarm handlers instead of looping over all existing types
-// to make it possible to write: camera.triggerAlarm() rather than alarm_manager.managers[datum/alarm_handler/camera].triggerAlarm() or a variant thereof.
-/var/global/datum/alarm_handler/atmosphere/atmosphere_alarm = new()
-/var/global/datum/alarm_handler/camera/camera_alarm = new()
-/var/global/datum/alarm_handler/fire/fire_alarm = new()
-/var/global/datum/alarm_handler/motion/motion_alarm = new()
-/var/global/datum/alarm_handler/power/power_alarm = new()
-
-/datum/subsystem/alarm
- name = "Alarm"
- var/list/datum/alarm/all_handlers
-
-/datum/subsystem/alarm/New()
- all_handlers = list(atmosphere_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm)
-
-/datum/subsystem/alarm/fire()
- for(var/datum/alarm_handler/AH in all_handlers)
- AH.process()
-
-/datum/subsystem/alarm/proc/active_alarms()
- var/list/all_alarms = new
- for(var/datum/alarm_handler/AH in all_handlers)
- var/list/alarms = AH.alarms
- all_alarms += alarms
-
- return all_alarms
-
-/datum/subsystem/alarm/proc/number_of_active_alarms()
- var/list/alarms = active_alarms()
- return alarms.len
diff --git a/code/datums/category.dm b/code/datums/category.dm
index 01cbc21386a..3bc9640b791 100644
--- a/code/datums/category.dm
+++ b/code/datums/category.dm
@@ -2,17 +2,20 @@
* Category Collection *
**********************/
/datum/category_collection
- var/category_group_type // The type of categories to initialize
- var/list/datum/category_group/categories // The list of initialized categories
+ var/category_group_type // Type of categories to initialize
+ var/list/datum/category_group/categories // List of initialized categories
+ var/list/datum/category_group/categories_by_name // Associative list of initialized categories, keyed by name
/datum/category_collection/New()
..()
categories = new()
+ categories_by_name = new()
for(var/category_type in typesof(category_group_type))
var/datum/category_group/category = category_type
if(initial(category.name))
category = new category(src)
categories += category
+ categories_by_name[category.name] = category
categories = dd_sortedObjectList(categories)
/datum/category_collection/Destroy()
@@ -26,20 +29,23 @@
******************/
/datum/category_group
var/name = ""
- var/category_item_type // The type of items to initialize
- var/list/datum/category_item/items // The list of initialized items
- var/datum/category_collection/collection // The collection this group belongs to
+ var/category_item_type // Type of items to initialize
+ var/list/datum/category_item/items // List of initialized items
+ var/list/datum/category_item/items_by_name // Associative list of initialized items, by name
+ var/datum/category_collection/collection // The collection this group belongs to
/datum/category_group/New(var/datum/category_collection/cc)
..()
collection = cc
items = new()
+ items_by_name = new()
for(var/item_type in typesof(category_item_type))
var/datum/category_item/item = item_type
if(initial(item.name))
item = new item(src)
items += item
+ items_by_name[item.name] = item
// For whatever reason dd_insertObjectList(items, item) doesn't insert in the correct order
// If you change this, confirm that character setup doesn't become completely unordered.
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index aec056f7f64..11c1fa87fcf 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -618,6 +618,35 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
access = access_robotics
group = "Engineering"
+/datum/supply_packs/robolimbs_basic
+ name = "Basic robolimb blueprints"
+ contains = list(
+ /obj/item/weapon/disk/limb/morpheus,
+ /obj/item/weapon/disk/limb/xion
+ )
+ cost = 15
+ containertype = /obj/structure/closet/crate/secure/gear
+ containername = "Robolimb blueprints (basic)"
+ access = access_robotics
+ group = "Engineering"
+
+/datum/supply_packs/robolimbs_adv
+ name = "All robolimb blueprints"
+ contains = list(
+ /obj/item/weapon/disk/limb/bishop,
+ /obj/item/weapon/disk/limb/hesphiastos,
+ /obj/item/weapon/disk/limb/morpheus,
+ /obj/item/weapon/disk/limb/veymed,
+ /obj/item/weapon/disk/limb/wardtakahashi,
+ /obj/item/weapon/disk/limb/xion,
+ /obj/item/weapon/disk/limb/zenghu,
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate/secure/gear
+ containername = "Robolimb blueprints (adv)"
+ access = access_robotics
+ group = "Engineering"
+
/datum/supply_packs/phoron
name = "Phoron assembly crate"
contains = list(
diff --git a/code/datums/underwear/bottom.dm b/code/datums/underwear/bottom.dm
new file mode 100644
index 00000000000..7f91a186081
--- /dev/null
+++ b/code/datums/underwear/bottom.dm
@@ -0,0 +1,56 @@
+/datum/category_item/underwear/bottom/none
+ name = "None"
+ always_last = TRUE
+
+/datum/category_item/underwear/bottom/briefs
+ name = "Briefs"
+ icon_state = "briefs"
+ has_color = TRUE
+
+/datum/category_item/underwear/bottom/briefs/is_default(var/gender)
+ return gender != FEMALE
+
+/datum/category_item/underwear/bottom/boxers_loveheart
+ name = "Boxers, Loveheart"
+ icon_state = "boxers_loveheart"
+
+/datum/category_item/underwear/bottom/boxers
+ name = "Boxers"
+ icon_state = "boxers"
+ has_color = TRUE
+
+/datum/category_item/underwear/bottom/boxers_green_and_blue
+ name = "Boxers, green & blue striped"
+ icon_state = "boxers_green_and_blue"
+
+/datum/category_item/underwear/bottom/panties
+ name = "Panties"
+ icon_state = "panties"
+ has_color = TRUE
+
+/datum/category_item/underwear/bottom/panties/is_default(var/gender)
+ return gender == FEMALE
+
+/datum/category_item/underwear/bottom/lacy_thong
+ name = "Lacy thong"
+ icon_state = "lacy_thong"
+
+/datum/category_item/underwear/bottom/lacy_thong_alt
+ name = "Lacy thong, alt"
+ icon_state = "lacy_thong_alt"
+ has_color = TRUE
+
+/datum/category_item/underwear/bottom/panties_alt
+ name = "Panties, alt"
+ icon_state = "panties_alt"
+ has_color = TRUE
+
+/datum/category_item/underwear/bottom/compression_shorts
+ name = "Compression shorts"
+ icon_state = "compression_shorts"
+ has_color = TRUE
+
+/datum/category_item/underwear/bottom/thong
+ name = "Thong"
+ icon_state = "thong"
+ has_color = TRUE
\ No newline at end of file
diff --git a/code/datums/underwear/socks.dm b/code/datums/underwear/socks.dm
new file mode 100644
index 00000000000..fc1c96ce538
--- /dev/null
+++ b/code/datums/underwear/socks.dm
@@ -0,0 +1,59 @@
+/datum/category_item/underwear/socks/none
+ always_last = TRUE
+ name = "None"
+
+/datum/category_item/underwear/socks/normal
+ name = "Normal"
+ icon_state = "socks_norm"
+ has_color = TRUE
+
+/datum/category_item/underwear/socks/short
+ name = "Short"
+ icon_state = "socks_short"
+ has_color = TRUE
+
+/datum/category_item/underwear/socks/thigh
+ name = "Thigh"
+ icon_state = "socks_thigh"
+ has_color = TRUE
+
+/datum/category_item/underwear/socks/knee
+ name = "Knee"
+ icon_state = "socks_knee"
+ has_color = TRUE
+
+/datum/category_item/underwear/socks/striped_knee
+ name = "Knee, striped"
+ icon_state = "striped_knee"
+ has_color = TRUE
+
+/datum/category_item/underwear/socks/striped_thigh
+ name = "Thigh, striped"
+ icon_state = "striped_thigh"
+ has_color = TRUE
+
+/datum/category_item/underwear/socks/pantyhose
+ name = "Pantyhose"
+ icon_state = "pantyhose"
+
+/datum/category_item/underwear/socks/thin_thigh
+ name = "Thigh, thin"
+ icon_state = "thin_thigh"
+ has_color = TRUE
+
+/datum/category_item/underwear/socks/thin_knee
+ name = "Knee, thin"
+ icon_state = "thin_knee"
+ has_color = TRUE
+
+/datum/category_item/underwear/socks/rainbow_thigh
+ name = "Thigh, rainbow"
+ icon_state = "rainbow_thigh"
+
+/datum/category_item/underwear/socks/rainbow_knee
+ name = "Knee, rainbow"
+ icon_state = "rainbow_knee"
+
+/datum/category_item/underwear/socks/fishnet
+ name = "Fishnet"
+ icon_state = "fishnet"
\ No newline at end of file
diff --git a/code/datums/underwear/top.dm b/code/datums/underwear/top.dm
new file mode 100644
index 00000000000..8640e77da90
--- /dev/null
+++ b/code/datums/underwear/top.dm
@@ -0,0 +1,43 @@
+/datum/category_item/underwear/top/none
+ name = "None"
+ always_last = TRUE
+
+/datum/category_item/underwear/top/none/is_default(var/gender)
+ return gender != FEMALE
+
+/datum/category_item/underwear/top/bra
+ is_default = TRUE
+ name = "Bra"
+ icon_state = "bra"
+ has_color = TRUE
+
+/datum/category_item/underwear/top/bra/is_default(var/gender)
+ return gender == FEMALE
+
+/datum/category_item/underwear/top/sports_bra
+ name = "Sports bra"
+ icon_state = "sports_bra"
+ has_color = TRUE
+
+/datum/category_item/underwear/top/sports_bra_alt
+ name = "Sports bra, alt"
+ icon_state = "sports_bra_alt"
+ has_color = TRUE
+
+/datum/category_item/underwear/top/lacy_bra
+ name = "Lacy bra"
+ icon_state = "lacy_bra"
+
+/datum/category_item/underwear/top/lacy_bra_alt
+ name = "Lacy bra, alt"
+ icon_state = "lacy_bra_alt"
+ has_color = TRUE
+
+/datum/category_item/underwear/top/lacy_bra_alt_stripe
+ name = "Lacy bra, alt, stripe"
+ icon_state = "lacy_bra_alt_stripe"
+
+/datum/category_item/underwear/top/halterneck_bra
+ name = "Halterneck bra"
+ icon_state = "halterneck_bra"
+ has_color = TRUE
\ No newline at end of file
diff --git a/code/datums/underwear/undershirts.dm b/code/datums/underwear/undershirts.dm
new file mode 100644
index 00000000000..33886f997d7
--- /dev/null
+++ b/code/datums/underwear/undershirts.dm
@@ -0,0 +1,65 @@
+/datum/category_item/underwear/undershirt/none
+ is_default = TRUE
+ name = "None"
+ always_last = TRUE
+
+/datum/category_item/underwear/undershirt/shirt
+ name = "Shirt"
+ icon_state = "undershirt"
+ has_color = TRUE
+
+/datum/category_item/underwear/undershirt/tank_top
+ name = "Tank top"
+ icon_state = "tanktop"
+ has_color = TRUE
+
+/datum/category_item/underwear/undershirt/tank_top_alt
+ name = "Tank top, alt"
+ icon_state = "tanktop_alt"
+ has_color = TRUE
+
+/datum/category_item/underwear/undershirt/tank_top_fire
+ name = "Tank top, fire"
+ icon_state = "tank_fire_s"
+
+/datum/category_item/underwear/undershirt/shirt_heart
+ name = "Shirt, heart"
+ icon_state = "lover_s"
+
+/datum/category_item/underwear/undershirt/shirt_nt
+ name = "Shirt, NT"
+ icon_state = "shirt_nano_s"
+
+/datum/category_item/underwear/undershirt/shirt_love_nt
+ name = "Shirt, I<3NT"
+ icon_state = "lover_s"
+
+/datum/category_item/underwear/undershirt/shortsleeve_shirt
+ name = "Shortsleeve shirt"
+ icon_state = "shortsleeve"
+ has_color = TRUE
+
+/datum/category_item/underwear/undershirt/polo_shirt
+ name = "Polo shirt"
+ icon_state = "polo"
+ has_color = TRUE
+
+/datum/category_item/underwear/undershirt/sport_shirt_green
+ name = "Sport shirt, green"
+ icon_state = "greenshirtsport_s"
+
+/datum/category_item/underwear/undershirt/sport_shirt_red
+ name = "Sport shirt, red"
+ icon_state = "redshirtsport_s"
+
+/datum/category_item/underwear/undershirt/sport_shirt_blue
+ name = "Sport shirt, blue"
+ icon_state = "blueshirtsport_s"
+
+/datum/category_item/underwear/undershirt/shirt_tiedye
+ name = "Shirt, tiedye"
+ icon_state = "shirt_tiedye_s"
+
+/datum/category_item/underwear/undershirt/shirt_blue_striped
+ name = "Shirt, blue stripes"
+ icon_state = "shirt_stripes_s"
\ No newline at end of file
diff --git a/code/datums/underwear/underwear.dm b/code/datums/underwear/underwear.dm
new file mode 100644
index 00000000000..d14ddea1339
--- /dev/null
+++ b/code/datums/underwear/underwear.dm
@@ -0,0 +1,66 @@
+/****************************
+* Category Collection Setup *
+****************************/
+/datum/category_collection/underwear
+ category_group_type = /datum/category_group/underwear
+
+/*************
+* Categories *
+*************/
+/datum/category_group/underwear
+ var/sort_order // Lower sort order is applied as icons first
+
+datum/category_group/underwear/dd_SortValue()
+ return sort_order
+
+/datum/category_group/underwear/top
+ name = "Underwear, top"
+ sort_order = 1
+ category_item_type = /datum/category_item/underwear/top
+
+/datum/category_group/underwear/bottom
+ name = "Underwear, bottom"
+ sort_order = 2
+ category_item_type = /datum/category_item/underwear/bottom
+
+/datum/category_group/underwear/socks
+ name = "Socks"
+ sort_order = 3
+ category_item_type = /datum/category_item/underwear/socks
+
+/datum/category_group/underwear/undershirt
+ name = "Undershirt"
+ sort_order = 4 // Undershirts currently have the highest sort order because they may cover both underwear and socks.
+ category_item_type = /datum/category_item/underwear/undershirt
+
+/*******************
+* Category entries *
+*******************/
+/datum/category_item/underwear
+ var/always_last = FALSE // Should this entry be sorte last?
+ var/is_default = FALSE // Should this entry be considered the default for its type?
+ var/icon = 'icons/mob/human.dmi' // Which icon to get the underwear from
+ var/icon_state // And the particular item state
+ var/list/tweaks = list() // Underwear customizations.
+ var/has_color = FALSE
+
+/datum/category_item/underwear/New()
+ if(has_color)
+ tweaks += gear_tweak_free_color_choice
+
+/datum/category_item/underwear/dd_SortValue()
+ if(always_last)
+ return "~"+name
+ return name
+
+/datum/category_item/underwear/proc/is_default(var/gender)
+ return is_default
+
+/datum/category_item/underwear/proc/generate_image(var/list/metadata)
+ if(!icon_state)
+ return
+
+ var/image/I = image(icon = 'icons/mob/human.dmi', icon_state = icon_state)
+ for(var/datum/gear_tweak/gt in tweaks)
+ gt.tweak_item(I, metadata && metadata["[gt]"] ? metadata["[gt]"] : gt.get_default())
+ return I
\ No newline at end of file
diff --git a/code/game/antagonist/outsider/deathsquad.dm b/code/game/antagonist/outsider/deathsquad.dm
index 3a61152ab2b..1234bdb1f60 100644
--- a/code/game/antagonist/outsider/deathsquad.dm
+++ b/code/game/antagonist/outsider/deathsquad.dm
@@ -70,7 +70,7 @@ var/datum/antagonist/deathsquad/deathsquad
var/syndicate_commando_name = pick(last_names)
var/datum/preferences/A = new() //Randomize appearance for the commando.
- A.randomize_appearance_for(player.current)
+ A.randomize_appearance_and_body_for(player.current)
player.name = "[syndicate_commando_rank] [syndicate_commando_name]"
player.current.name = player.name
diff --git a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm
index dd1489248fe..6dd22efab9c 100644
--- a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm
+++ b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm
@@ -6,10 +6,10 @@
Shocking someone costs ten chemicals per use."
enhancedtext = "Shocking biologicals without grabbing only requires five chemicals, and has more disabling power."
genomecost = 2
- verbpath = /mob/proc/changeling_bioelectrogenesis
+ verbpath = /mob/living/carbon/human/proc/changeling_bioelectrogenesis
//Recharge whatever's in our hand, or shock people.
-/mob/proc/changeling_bioelectrogenesis()
+/mob/living/carbon/human/proc/changeling_bioelectrogenesis()
set category = "Changeling"
set name = "Bioelectrogenesis (20 + 10/shock)"
set desc = "Recharges anything in your hand, or shocks people."
@@ -33,19 +33,28 @@
return 0
else
+ // Handle glove conductivity.
+ var/obj/item/clothing/gloves/gloves = src.gloves
+ var/siemens = 1
+ if(gloves)
+ siemens = gloves.siemens_coefficient
+
//If we're grabbing someone, electrocute them.
if(istype(held_item,/obj/item/weapon/grab))
var/obj/item/weapon/grab/G = held_item
if(G.affecting)
- G.affecting.electrocute_act(10,src,1.0,BP_TORSO)
- var/agony = 80 //Does more than if hit with an electric hand, since grabbing is slower.
+ G.affecting.electrocute_act(10 * siemens,src,1.0,BP_TORSO)
+ var/agony = 80 * siemens //Does more than if hit with an electric hand, since grabbing is slower.
G.affecting.stun_effect_act(0, agony, BP_TORSO, src)
msg_admin_attack("[key_name(src)] shocked [key_name(G.affecting)] with the [src].")
- visible_message("Arcs of electricity strike [G.affecting]!",
- "Our hand channels raw electricity into [G.affecting].",
- "You hear sparks!")
+ if(siemens)
+ visible_message("Arcs of electricity strike [G.affecting]!",
+ "Our hand channels raw electricity into [G.affecting].",
+ "You hear sparks!")
+ else
+ src << "Our gloves block us from shocking \the [G.affecting]."
src.mind.changeling.chem_charges -= 10
return 1
@@ -69,17 +78,19 @@
"Our hand channels raw electricity into \the [held_item].",
"You hear sparks!")
var/i = 10
- while(i)
- cell.charge += 100 //This should be a nice compromise between recharging guns and other batteries.
- if(cell.charge > cell.maxcharge)
- cell.charge = cell.maxcharge
- break
- var/T = get_turf(src)
- new /obj/effect/effect/sparks(T)
- held_item.update_icon()
- i--
- sleep(1 SECOND)
- success = 1
+ if(siemens)
+ while(i)
+ cell.charge += 100 * siemens //This should be a nice compromise between recharging guns and other batteries.
+ if(cell.charge > cell.maxcharge)
+ cell.charge = cell.maxcharge
+ break
+ if(siemens)
+ var/T = get_turf(src)
+ new /obj/effect/effect/sparks(T)
+ held_item.update_icon()
+ i--
+ sleep(1 SECOND)
+ success = 1
if(success == 0) //If we couldn't do anything with the ability, don't deduct the chemicals.
src << "We are unable to affect \the [held_item]."
else
@@ -113,11 +124,18 @@
if(src)
qdel(src)
-/obj/item/weapon/electric_hand/afterattack(var/atom/target, var/mob/living/user, proximity)
+/obj/item/weapon/electric_hand/afterattack(var/atom/target, var/mob/living/carbon/human/user, proximity)
if(!target)
return
if(!proximity)
return
+
+ // Handle glove conductivity.
+ var/obj/item/clothing/gloves/gloves = user.gloves
+ var/siemens = 1
+ if(gloves)
+ siemens = gloves.siemens_coefficient
+
//Excuse the copypasta.
if(istype(target,/mob/living/carbon))
var/mob/living/carbon/C = target
@@ -126,14 +144,17 @@
src << "We require more chemicals to electrocute [C]!"
return 0
- C.electrocute_act(electrocute_amount,src,1.0,BP_TORSO)
- C.stun_effect_act(0, agony_amount, BP_TORSO, src)
+ C.electrocute_act(electrocute_amount * siemens,src,1.0,BP_TORSO)
+ C.stun_effect_act(0, agony_amount * siemens, BP_TORSO, src)
msg_admin_attack("[key_name(user)] shocked [key_name(C)] with the [src].")
- visible_message("Arcs of electricity strike [C]!",
- "Our hand channels raw electricity into [C]",
- "You hear sparks!")
+ if(siemens)
+ visible_message("Arcs of electricity strike [C]!",
+ "Our hand channels raw electricity into [C]",
+ "You hear sparks!")
+ else
+ src << "Our gloves block us from shocking \the [C]."
//qdel(src) //Since we're no longer a one hit stun, we need to stick around.
user.mind.changeling.chem_charges -= shock_cost
return 1
@@ -145,11 +166,12 @@
src << "We require more chemicals to electrocute [S]!"
return 0
- S.electrocute_act(60,src,1.0) //If only they had surge protectors.
- visible_message("Arcs of electricity strike [S]!",
- "Our hand channels raw electricity into [S]",
- "You hear sparks!")
- S << "Warning: Electrical surge detected!"
+ S.electrocute_act(60 * siemens,src,1.0) //If only they had surge protectors.
+ if(siemens)
+ visible_message("Arcs of electricity strike [S]!",
+ "Our hand channels raw electricity into [S]",
+ "You hear sparks!")
+ S << "Warning: Electrical surge detected!"
//qdel(src)
user.mind.changeling.chem_charges -= 10
return 1
@@ -164,20 +186,22 @@
"Our hand channels raw electricity into \the [target].",
"You hear sparks!")
var/i = 10
- while(i)
- cell.charge += 100 //This should be a nice compromise between recharging guns and other batteries.
- if(cell.charge > cell.maxcharge)
- cell.charge = cell.maxcharge
- break //No point making sparks if the cell's full.
-// if(!Adjacent(T))
-// break
- var/Turf = get_turf(src)
- new /obj/effect/effect/sparks(Turf)
- T.update_icon()
- i--
- sleep(1 SECOND)
- success = 1
- break
+ if(siemens)
+ while(i)
+ cell.charge += 100 * siemens //This should be a nice compromise between recharging guns and other batteries.
+ if(cell.charge > cell.maxcharge)
+ cell.charge = cell.maxcharge
+ break //No point making sparks if the cell's full.
+ // if(!Adjacent(T))
+ // break
+ if(siemens)
+ var/Turf = get_turf(src)
+ new /obj/effect/effect/sparks(Turf)
+ T.update_icon()
+ i--
+ sleep(1 SECOND)
+ success = 1
+ break
if(success == 0)
src << "We are unable to affect \the [target]."
else
diff --git a/code/game/gamemodes/changeling/powers/fake_death.dm b/code/game/gamemodes/changeling/powers/fake_death.dm
index 0018eabad6c..ac7080301b0 100644
--- a/code/game/gamemodes/changeling/powers/fake_death.dm
+++ b/code/game/gamemodes/changeling/powers/fake_death.dm
@@ -18,14 +18,13 @@
var/mob/living/carbon/C = src
if(changeling.max_geneticpoints < 0) //Absorbed by another ling
- src << "You have no genomes, not even your own, and cannot regenerate."
+ src << "We have no genomes, not even our own, and cannot regenerate."
return 0
- if(!C.stat && alert("Are we sure we wish to fake our death?",,"Yes","No") == "No")//Confirmation for living changelings if they want to fake their death
+ if(!C.stat && alert("Are we sure we wish to regenerate? We will appear to be dead while doing so.","Revival","Yes","No") == "No")
return
C << "We will attempt to regenerate our form."
- C.status_flags |= FAKEDEATH //play dead
C.update_canmove()
C.remove_changeling_powers()
@@ -33,13 +32,12 @@
C.suiciding = 0
if(C.stat != DEAD)
- C.emote("deathgasp")
- C.tod = worldtime2text()
+ C.adjustOxyLoss(C.maxHealth * 2)
spawn(rand(800,2000))
//The ling will now be able to choose when to revive
src.verbs += /mob/proc/changeling_revive
- src << "We are ready to rise. Use the Revive verb when you are ready."
+ src << "We are ready to rise. Use the Revive verb when you are ready."
feedback_add_details("changeling_powers","FD")
return 1
\ No newline at end of file
diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm
index 4f53c95b464..79fd2dcf744 100644
--- a/code/game/gamemodes/changeling/powers/revive.dm
+++ b/code/game/gamemodes/changeling/powers/revive.dm
@@ -25,8 +25,6 @@
C.SetStunned(0)
C.SetWeakened(0)
C.radiation = 0
- C.halloss = 0
- C.shock_stage = 0 //Pain
C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss())
C.reagents.clear_reagents()
C.restore_all_organs(ignore_prosthetic_prefs=1) //Covers things like fractures and other things not covered by the above.
@@ -36,8 +34,13 @@
H.mutations.Remove(HUSK)
H.status_flags -= DISFIGURED
H.update_body(1)
+ for(var/limb in H.organs_by_name)
+ var/obj/item/organ/external/current_limb = H.organs_by_name[limb]
+ current_limb.undislocate()
+
+ C.halloss = 0
+ C.shock_stage = 0 //Pain
C << "We have regenerated."
- C.status_flags &= ~FAKEDEATH
C.update_canmove()
C.mind.changeling.purchased_powers -= C
feedback_add_details("changeling_powers","CR")
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 564fc4d004d..1a0aa9e1c53 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -6,23 +6,35 @@
w_class = 4
force = 30
throwforce = 10
+ hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
/obj/item/weapon/melee/cultblade/cultify()
return
-/obj/item/weapon/melee/cultblade/attack(mob/living/target as mob, mob/living/carbon/human/user as mob)
+/obj/item/weapon/melee/cultblade/attack(mob/living/M, mob/living/user, var/target_zone)
if(iscultist(user))
- playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return ..()
+
+ var/zone = (user.hand ? "l_arm":"r_arm")
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ var/obj/item/organ/external/affecting = H.get_organ(zone)
+ user << "An unexplicable force rips through your [affecting.name], tearing the sword from your grasp!"
else
- user.Paralyse(5)
- user << "An unexplicable force powerfully repels the sword from [target]!"
- var/organ = ((user.hand ? "l_":"r_") + "arm")
- var/obj/item/organ/external/affecting = user.get_organ(organ)
- if(affecting.take_damage(rand(force/2, force))) //random amount of damage between half of the blade's force and the full force of the blade.
- user.UpdateDamageIcon()
- return
+ user << "An unexplicable force rips through you, tearing the sword from your grasp!"
+
+ //random amount of damage between half of the blade's force and the full force of the blade.
+ user.apply_damage(rand(force/2, force), BRUTE, zone, 0, sharp=1, edge=1)
+ user.Weaken(5)
+
+ user.drop_from_inventory(src, src.loc)
+ throw_at(get_edge_target_turf(src, pick(alldirs)), rand(1,3), throw_speed)
+
+ var/spooky = pick('sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg', 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/wail.ogg')
+ playsound(loc, spooky, 50, 1)
+
+ return 1
/obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob)
if(!iscultist(user))
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 37445326cae..3cb41cc8725 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -470,8 +470,7 @@ var/list/sacrificed = list()
D.r_eyes = 200
D.g_eyes = 200
D.update_eyes()
- D.underwear_top = 0
- D.underwear_bottom = 0
+ D.all_underwear.Cut()
D.key = ghost.key
cult.add_antagonist(D.mind)
diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index ff87fb58e41..5e2b40d9526 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -13,21 +13,16 @@
minimal_access = list() //See /datum/job/assistant/get_access()
alt_titles = list("Technical Assistant","Medical Intern","Research Assistant","Visitor", "Resident")
-/datum/job/assistant/equip(var/mob/living/carbon/human/H)
+/datum/job/assistant/equip(var/mob/living/carbon/human/H, var/alt_title)
if(!H) return 0
switch(H.backbag)
if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
- if (H.mind.role_alt_title)
- switch(H.mind.role_alt_title)
- if("Visitor") //I doubt someone visiting the station would want to wear an ugly grey uniform
- H.equip_to_slot_or_del(new /obj/item/clothing/under/assistantformal(H), slot_w_uniform)
-
- if("Resident")
- H.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(H), slot_w_uniform)
- else
- H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
+ if(has_alt_title(H, alt_title,"Visitor")) //I doubt someone visiting the station would want to wear an ugly grey uniform
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/assistantformal(H), slot_w_uniform)
+ else if(has_alt_title(H, alt_title,"Resident"))
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(H), slot_w_uniform)
else
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm
index cf162c14949..61cba700238 100644
--- a/code/game/jobs/job/civilian_chaplain.dm
+++ b/code/game/jobs/job/civilian_chaplain.dm
@@ -14,7 +14,7 @@
alt_titles = list("Counselor")
- equip(var/mob/living/carbon/human/H)
+ equip(var/mob/living/carbon/human/H, var/alt_title, var/ask_questions = TRUE)
if(!H) return 0
var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(H) //BS12 EDIT
@@ -22,6 +22,10 @@
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/device/pda/chaplain(H), slot_belt)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+ if(!ask_questions)
+ return 1
+
+
spawn(0)
var/religion_name = "Christianity"
var/new_religion = sanitize(input(H, "You are the crew services officer. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name), MAX_NAME_LEN)
@@ -150,3 +154,6 @@
feedback_set_details("religion_deity","[new_deity]")
feedback_set_details("religion_book","[new_book_style]")
return 1
+
+/datum/job/chaplain/equip_preview(var/mob/living/carbon/human/H, var/alt_title)
+ return equip(H, alt_title, FALSE)
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index 2ae944adfda..6bdf3c1c4a1 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -71,8 +71,8 @@
H << "Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]"
// overrideable separately so AIs/borgs can have cardborg hats without unneccessary new()/del()
-/datum/job/proc/equip_preview(mob/living/carbon/human/H)
- return equip(H)
+/datum/job/proc/equip_preview(mob/living/carbon/human/H, var/alt_title)
+ . = equip(H, alt_title)
/datum/job/proc/get_access()
if(!config || config.jobs_have_minimal_access)
@@ -104,3 +104,6 @@
/datum/job/proc/is_position_available()
return (current_positions < total_positions) || (total_positions == -1)
+
+/datum/job/proc/has_alt_title(var/mob/H, var/supplied_title, var/desired_title)
+ return (supplied_title == desired_title) || (H.mind && H.mind.role_alt_title == desired_title)
\ No newline at end of file
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index 8a769df0b57..eeb0c8072a5 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -23,7 +23,7 @@
minimal_player_age = 10
ideal_character_age = 50
- equip(var/mob/living/carbon/human/H)
+ equip(var/mob/living/carbon/human/H, var/alt_title)
if(!H) return 0
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/cmo(H), slot_l_ear)
switch(H.backbag)
@@ -53,7 +53,7 @@
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_virology, access_eva)
alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist")
- equip(var/mob/living/carbon/human/H)
+ equip(var/mob/living/carbon/human/H, var/alt_title)
if(!H) return 0
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
@@ -62,35 +62,33 @@
if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
- if (H.mind.role_alt_title)
- switch(H.mind.role_alt_title)
- if("Emergency Physician")
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
- H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
- if("Surgeon")
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(H), slot_w_uniform)
- H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
- H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(H), slot_head)
- if("Virologist")
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform)
- H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(H), slot_wear_suit)
- H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
- switch(H.backbag)
- if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/virology(H), slot_back)
- if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/vir(H), slot_back)
- if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
- if("Medical Doctor")
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
- H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
- if("Nurse")
- if(H.gender == FEMALE)
- if(prob(50))
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
- else
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nurse(H), slot_w_uniform)
- H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head)
- else
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)
+ if(has_alt_title(H, alt_title,"Emergency Physician"))
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
+ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
+ else if(has_alt_title(H, alt_title,"Surgeon"))
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(H), slot_w_uniform)
+ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
+ H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(H), slot_head)
+ else if(has_alt_title(H, alt_title,"Virologist"))
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform)
+ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(H), slot_wear_suit)
+ H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
+ switch(H.backbag)
+ if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/virology(H), slot_back)
+ if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/vir(H), slot_back)
+ if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+ else if(has_alt_title(H, alt_title,"Medical Doctor"))
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
+ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
+ else if(has_alt_title(H, alt_title,"Nurse"))
+ if(H.gender == FEMALE)
+ if(prob(50))
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
+ else
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nurse(H), slot_w_uniform)
+ H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head)
+ else
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)
else
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
@@ -176,19 +174,17 @@
minimal_access = list(access_medical, access_medical_equip, access_psychiatrist)
alt_titles = list("Psychologist")
- equip(var/mob/living/carbon/human/H)
+ equip(var/mob/living/carbon/human/H, var/alt_title)
if(!H) return 0
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
- if (H.mind.role_alt_title)
- switch(H.mind.role_alt_title)
- if("Psychiatrist")
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/psych(H), slot_w_uniform)
- if("Psychologist")
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/psych/turtleneck(H), slot_w_uniform)
+ if(has_alt_title(H, alt_title,"Psychiatrist"))
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/psych(H), slot_w_uniform)
+ else if(has_alt_title(H, alt_title,"Psychologist"))
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/psych/turtleneck(H), slot_w_uniform)
else
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
@@ -211,7 +207,7 @@
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks)
alt_titles = list("Emergency Medical Technician")
- equip(var/mob/living/carbon/human/H)
+ equip(var/mob/living/carbon/human/H, var/alt_title)
if(!H) return 0
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
@@ -220,14 +216,12 @@
if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
- if (H.mind.role_alt_title)
- switch(H.mind.role_alt_title)
- if("Emergency Medical Technician")
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/paramedic(H), slot_w_uniform)
- H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
- if("Paramedic")
- H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/black(H), slot_w_uniform)
- H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
+ if(has_alt_title(H, alt_title,"Emergency Medical Technician"))
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/paramedic(H), slot_w_uniform)
+ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
+ else if(has_alt_title(H, alt_title,"Paramedic"))
+ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/black(H), slot_w_uniform)
+ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
else
H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/medical/emt(H), slot_belt)
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index dfb3659e0d6..6320a475ce3 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -98,7 +98,7 @@
minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks)
economic_modifier = 5
minimal_player_age = 3
- equip(var/mob/living/carbon/human/H)
+ equip(var/mob/living/carbon/human/H, var/alt_title)
if(!H) return 0
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
switch(H.backbag)
@@ -114,7 +114,7 @@
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand)
else
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack)
- if(H.mind.role_alt_title && H.mind.role_alt_title == "Forensic Technician")
+ if(has_alt_title(H, alt_title,"Forensic Technician"))
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase/crimekit, slot_r_hand)
else
diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm
index fb9aeb793fd..d9aa96f7101 100644
--- a/code/game/jobs/job/silicon.dm
+++ b/code/game/jobs/job/silicon.dm
@@ -29,6 +29,7 @@
/datum/job/ai/equip_preview(mob/living/carbon/human/H)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/straight_jacket(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/head/cardborg(H), slot_head)
+ return 1
/datum/job/cyborg
title = "Cyborg"
@@ -60,3 +61,4 @@
/datum/job/cyborg/equip_preview(mob/living/carbon/human/H)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/cardborg(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/head/cardborg(H), slot_head)
+ return 1
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 83b6f2ce861..bdab3bbbb14 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -360,7 +360,7 @@
return
if(subject.isSynthetic())
- scantemp = "Error: Subject is not organic."
+ scantemp = "Error: Majority of subject is non-organic."
return
if (subject.suiciding == 1)
scantemp = "Error: Subject's brain is not responding to scanning stimuli."
diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm
index 8790bb337f6..05de6b9ac69 100644
--- a/code/game/machinery/kitchen/smartfridge.dm
+++ b/code/game/machinery/kitchen/smartfridge.dm
@@ -67,9 +67,12 @@
return 0
/obj/machinery/smartfridge/secure/extract/New()
+ ..()
for(var/i=1 to 5)
var/obj/item/xenoproduct/slime/core/C = new(src)
C.traits = new()
+ C.nameVar = "grey"
+ item_quants[C.name]++
/obj/machinery/smartfridge/secure/medbay
name = "\improper Refrigerated Medicine Storage"
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index e28ebc64f9b..55c2e10eaa1 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -7,7 +7,7 @@ obj/machinery/recharger
anchored = 1
use_power = 1
idle_power_usage = 4
- active_power_usage = 15000 //15 kW
+ active_power_usage = 40000 //40 kW
var/obj/item/charging = null
var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/device/laptop, /obj/item/weapon/cell)
var/icon_state_charged = "recharger2"
@@ -171,4 +171,4 @@ obj/machinery/recharger/wallcharger
icon_state_idle = "wrecharger0"
portable = 0
circuit = /obj/item/weapon/circuitboard/recharger/wrecharger
- frame_type = "wrecharger"
\ No newline at end of file
+ frame_type = "wrecharger"
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index e0047a08bf5..36c8c628143 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -6,9 +6,9 @@
name = "space heater"
desc = "Made by Space Amish using traditional space techniques, this heater is guaranteed not to set the station on fire."
var/obj/item/weapon/cell/cell
- var/cell_type = /obj/item/weapon/cell/apc
+ var/cell_type = /obj/item/weapon/cell/high
var/on = 0
- var/set_temperature = T0C + 50 //K
+ var/set_temperature = T0C + 20 //K
var/heating_power = 40000
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index e257dc968d4..ee000d60bef 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -2,7 +2,7 @@
icon = 'icons/obj/robotics.dmi'
icon_state = "fab-idle"
name = "Exosuit Fabricator"
- desc = "A machine used for construction of robotcs and mechas."
+ desc = "A machine used for construction of mechas."
density = 1
anchored = 1
use_power = 1
@@ -23,7 +23,6 @@
var/list/categories = list()
var/category = null
- var/manufacturer = null
var/sync_message = ""
/obj/machinery/mecha_part_fabricator/New()
@@ -41,7 +40,6 @@
return
/obj/machinery/mecha_part_fabricator/initialize()
- manufacturer = basic_robolimb.company
update_categories()
/obj/machinery/mecha_part_fabricator/process()
@@ -99,13 +97,6 @@
data["buildable"] = get_build_options()
data["category"] = category
data["categories"] = categories
- if(all_robolimbs)
- var/list/T = list()
- for(var/A in all_robolimbs)
- var/datum/robolimb/R = all_robolimbs[A]
- T += list(list("id" = A, "company" = R.company))
- data["manufacturers"] = T
- data["manufacturer"] = manufacturer
data["materials"] = get_materials()
data["maxres"] = res_max_amount
data["sync"] = sync_message
@@ -133,10 +124,6 @@
if(href_list["category"] in categories)
category = href_list["category"]
- if(href_list["manufacturer"])
- if(href_list["manufacturer"] in all_robolimbs)
- manufacturer = href_list["manufacturer"]
-
if(href_list["eject"])
eject_materials(href_list["eject"], text2num(href_list["amount"]))
@@ -158,43 +145,32 @@
if(default_part_replacement(user, I))
return
- var/material
- switch(I.type)
- if(/obj/item/stack/material/gold)
- material = "gold"
- if(/obj/item/stack/material/silver)
- material = "silver"
- if(/obj/item/stack/material/diamond)
- material = "diamond"
- if(/obj/item/stack/material/phoron)
- material = "phoron"
- if(/obj/item/stack/material/steel)
- material = DEFAULT_WALL_MATERIAL
- if(/obj/item/stack/material/glass)
- material = "glass"
- if(/obj/item/stack/material/uranium)
- material = "uranium"
+ if(istype(I,/obj/item/stack/material))
+ var/obj/item/stack/material/S = I
+ if(!(S.material.name in materials))
+ user << "The [src] doesn't accept [S.material]!"
+ return
+
+ var/sname = "[S.name]"
+ var/amnt = S.perunit
+ if(materials[S.material.name] + amnt <= res_max_amount)
+ if(S && S.amount >= 1)
+ var/count = 0
+ overlays += "fab-load-metal"
+ spawn(10)
+ overlays -= "fab-load-metal"
+ while(materials[S.material.name] + amnt <= res_max_amount && S.amount >= 1)
+ materials[S.material.name] += amnt
+ S.use(1)
+ count++
+ user << "You insert [count] [sname] into the fabricator."
+ update_busy()
else
- return ..()
+ user << "The fabricator cannot hold more [sname]."
- var/obj/item/stack/material/stack = I
- var/sname = "[stack.name]"
- var/amnt = stack.perunit
+ return
- if(materials[material] + amnt <= res_max_amount)
- if(stack && stack.amount >= 1)
- var/count = 0
- overlays += "fab-load-metal"
- spawn(10)
- overlays -= "fab-load-metal"
- while(materials[material] + amnt <= res_max_amount && stack.amount >= 1)
- materials[material] += amnt
- stack.use(1)
- count++
- user << "You insert [count] [sname] into the fabricator."
- update_busy()
- else
- user << "The fabricator cannot hold more [sname]."
+ ..()
/obj/machinery/mecha_part_fabricator/emag_act(var/remaining_charges, var/mob/user)
switch(emagged)
@@ -254,7 +230,7 @@
for(var/M in D.materials)
materials[M] = max(0, materials[M] - D.materials[M] * mat_efficiency)
if(D.build_path)
- var/obj/new_item = D.Fabricate(loc, src)
+ var/obj/new_item = D.Fabricate(get_step(get_turf(src), src.dir), src)
visible_message("\The [src] pings, indicating that \the [D] is complete.", "You hear a ping.")
if(mat_efficiency != 1)
if(new_item.matter && new_item.matter.len > 0)
@@ -301,36 +277,20 @@
/obj/machinery/mecha_part_fabricator/proc/eject_materials(var/material, var/amount) // 0 amount = 0 means ejecting a full stack; -1 means eject everything
var/recursive = amount == -1 ? 1 : 0
- material = lowertext(material)
- var/mattype
- switch(material)
- if(DEFAULT_WALL_MATERIAL)
- mattype = /obj/item/stack/material/steel
- if("glass")
- mattype = /obj/item/stack/material/glass
- if("gold")
- mattype = /obj/item/stack/material/gold
- if("silver")
- mattype = /obj/item/stack/material/silver
- if("diamond")
- mattype = /obj/item/stack/material/diamond
- if("phoron")
- mattype = /obj/item/stack/material/phoron
- if("uranium")
- mattype = /obj/item/stack/material/uranium
- else
- return
- var/obj/item/stack/material/S = new mattype(loc)
+ var/matstring = lowertext(material)
+ var/material/M = get_material_by_name(matstring)
+
+ var/obj/item/stack/material/S = M.place_sheet(get_turf(src))
if(amount <= 0)
amount = S.max_amount
- var/ejected = min(round(materials[material] / S.perunit), amount)
+ var/ejected = min(round(materials[matstring] / S.perunit), amount)
S.amount = min(ejected, amount)
if(S.amount <= 0)
qdel(S)
return
- materials[material] -= ejected * S.perunit
- if(recursive && materials[material] >= S.perunit)
- eject_materials(material, -1)
+ materials[matstring] -= ejected * S.perunit
+ if(recursive && materials[matstring] >= S.perunit)
+ eject_materials(matstring, -1)
update_busy()
/obj/machinery/mecha_part_fabricator/proc/sync()
diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm
new file mode 100644
index 00000000000..561a5bb3d8e
--- /dev/null
+++ b/code/game/mecha/mech_prosthetics.dm
@@ -0,0 +1,333 @@
+/obj/machinery/pros_fabricator
+ icon = 'icons/obj/robotics.dmi'
+ icon_state = "pros-idle"
+ name = "Prosthetics Fabricator"
+ desc = "A machine used for construction of prosthetics."
+ density = 1
+ anchored = 1
+ use_power = 1
+ idle_power_usage = 20
+ active_power_usage = 5000
+ req_access = list(access_robotics)
+ circuit = /obj/item/weapon/circuitboard/prosthetics
+
+ var/speed = 1
+ var/mat_efficiency = 1
+ var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "diamond" = 0, "phoron" = 0, "uranium" = 0, "plasteel" = 0)
+ var/res_max_amount = 200000
+
+ var/datum/research/files
+ var/list/datum/design/queue = list()
+ var/progress = 0
+ var/busy = 0
+
+ var/list/categories = list()
+ var/category = null
+ var/manufacturer = null
+ var/sync_message = ""
+
+/obj/machinery/pros_fabricator/New()
+ ..()
+ circuit = new circuit(src)
+ component_parts = list()
+ component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
+ component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
+ component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
+ RefreshParts()
+
+ files = new /datum/research(src) //Setup the research data holder.
+ return
+
+/obj/machinery/pros_fabricator/initialize()
+ manufacturer = basic_robolimb.company
+ update_categories()
+
+/obj/machinery/pros_fabricator/process()
+ ..()
+ if(stat)
+ return
+ if(busy)
+ use_power = 2
+ progress += speed
+ check_build()
+ else
+ use_power = 1
+ update_icon()
+
+/obj/machinery/pros_fabricator/update_icon()
+ overlays.Cut()
+ if(panel_open)
+ icon_state = "pros-o"
+ else
+ icon_state = "pros-idle"
+ if(busy)
+ overlays += "pros-active"
+
+/obj/machinery/pros_fabricator/dismantle()
+ for(var/f in materials)
+ eject_materials(f, -1)
+ ..()
+
+/obj/machinery/pros_fabricator/RefreshParts()
+ res_max_amount = 0
+ for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
+ res_max_amount += M.rating * 100000 // 200k -> 600k
+ var/T = 0
+ for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+ T += M.rating
+ mat_efficiency = 1 - (T - 1) / 4 // 1 -> 0.5
+ for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts) // Not resetting T is intended; speed is affected by both
+ T += M.rating
+ speed = T / 2 // 1 -> 3
+
+/obj/machinery/pros_fabricator/attack_hand(var/mob/user)
+ if(..())
+ return
+ if(!allowed(user))
+ return
+ ui_interact(user)
+
+/obj/machinery/pros_fabricator/ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ var/data[0]
+
+ var/datum/design/current = queue.len ? queue[1] : null
+ if(current)
+ data["current"] = current.name
+ data["queue"] = get_queue_names()
+ data["buildable"] = get_build_options()
+ data["category"] = category
+ data["categories"] = categories
+ if(all_robolimbs)
+ var/list/T = list()
+ for(var/A in all_robolimbs)
+ var/datum/robolimb/R = all_robolimbs[A]
+ if(R.unavailable_to_build) continue
+ T += list(list("id" = A, "company" = R.company))
+ data["manufacturers"] = T
+ data["manufacturer"] = manufacturer
+ data["materials"] = get_materials()
+ data["maxres"] = res_max_amount
+ data["sync"] = sync_message
+ if(current)
+ data["builtperc"] = round((progress / current.time) * 100)
+
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "mechfab.tmpl", "Prosthetics Fab UI", 800, 600)
+ ui.set_initial_data(data)
+ ui.open()
+ ui.set_auto_update(1)
+
+/obj/machinery/pros_fabricator/Topic(href, href_list)
+ if(..())
+ return
+
+ if(href_list["build"])
+ add_to_queue(text2num(href_list["build"]))
+
+ if(href_list["remove"])
+ remove_from_queue(text2num(href_list["remove"]))
+
+ if(href_list["category"])
+ if(href_list["category"] in categories)
+ category = href_list["category"]
+
+ if(href_list["manufacturer"])
+ if(href_list["manufacturer"] in all_robolimbs)
+ manufacturer = href_list["manufacturer"]
+
+ if(href_list["eject"])
+ eject_materials(href_list["eject"], text2num(href_list["amount"]))
+
+ if(href_list["sync"])
+ sync()
+ else
+ sync_message = ""
+
+ return 1
+
+/obj/machinery/pros_fabricator/attackby(var/obj/item/I, var/mob/user)
+ if(busy)
+ user << "\The [src] is busy. Please wait for completion of previous operation."
+ return 1
+ if(default_deconstruction_screwdriver(user, I))
+ return
+ if(default_deconstruction_crowbar(user, I))
+ return
+ if(default_part_replacement(user, I))
+ return
+
+ if(istype(I,/obj/item/weapon/disk/limb))
+ var/obj/item/weapon/disk/limb/D = I
+ if(!D.company || !(D.company in all_robolimbs))
+ user << "This disk seems to be corrupted!"
+ else
+ user << "Installing blueprint files for [D.company]..."
+ if(do_after(user,50,src))
+ var/datum/robolimb/R = all_robolimbs[D.company]
+ R.unavailable_to_build = 0
+ user << "Installed [D.company] blueprints!"
+ qdel(I)
+ return
+
+ if(istype(I,/obj/item/stack/material))
+ var/obj/item/stack/material/S = I
+ if(!(S.material.name in materials))
+ user << "The [src] doesn't accept [S.material]!"
+ return
+
+ var/sname = "[S.name]"
+ var/amnt = S.perunit
+ if(materials[S.material.name] + amnt <= res_max_amount)
+ if(S && S.amount >= 1)
+ var/count = 0
+ overlays += "pros-load-metal"
+ spawn(10)
+ overlays -= "pros-load-metal"
+ while(materials[S.material.name] + amnt <= res_max_amount && S.amount >= 1)
+ materials[S.material.name] += amnt
+ S.use(1)
+ count++
+ user << "You insert [count] [sname] into the fabricator."
+ update_busy()
+ else
+ user << "The fabricator cannot hold more [sname]."
+
+ return
+
+ ..()
+
+/obj/machinery/pros_fabricator/emag_act(var/remaining_charges, var/mob/user)
+ switch(emagged)
+ if(0)
+ emagged = 0.5
+ visible_message("\icon[src] [src] beeps: \"DB error \[Code 0x00F1\]\"")
+ sleep(10)
+ visible_message("\icon[src] [src] beeps: \"Attempting auto-repair\"")
+ sleep(15)
+ visible_message("\icon[src] [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"")
+ sleep(30)
+ visible_message("\icon[src] [src] beeps: \"User DB truncated. Please contact your [company_name] system operator for future assistance.\"")
+ req_access = null
+ emagged = 1
+ return 1
+ if(0.5)
+ visible_message("\icon[src] [src] beeps: \"DB not responding \[Code 0x0003\]...\"")
+ if(1)
+ visible_message("\icon[src] [src] beeps: \"No records in User DB\"")
+
+/obj/machinery/pros_fabricator/proc/update_busy()
+ if(queue.len)
+ if(can_build(queue[1]))
+ busy = 1
+ else
+ busy = 0
+ else
+ busy = 0
+
+/obj/machinery/pros_fabricator/proc/add_to_queue(var/index)
+ var/datum/design/D = files.known_designs[index]
+ queue += D
+ update_busy()
+
+/obj/machinery/pros_fabricator/proc/remove_from_queue(var/index)
+ if(index == 1)
+ progress = 0
+ queue.Cut(index, index + 1)
+ update_busy()
+
+/obj/machinery/pros_fabricator/proc/can_build(var/datum/design/D)
+ for(var/M in D.materials)
+ if(materials[M] < D.materials[M])
+ return 0
+ return 1
+
+/obj/machinery/pros_fabricator/proc/check_build()
+ if(!queue.len)
+ progress = 0
+ return
+ var/datum/design/D = queue[1]
+ if(!can_build(D))
+ progress = 0
+ return
+ if(D.time > progress)
+ return
+ for(var/M in D.materials)
+ materials[M] = max(0, materials[M] - D.materials[M] * mat_efficiency)
+ if(D.build_path)
+ var/obj/new_item = D.Fabricate(get_step(get_turf(src), src.dir), src)
+ visible_message("\The [src] pings, indicating that \the [D] is complete.", "You hear a ping.")
+ if(mat_efficiency != 1)
+ if(new_item.matter && new_item.matter.len > 0)
+ for(var/i in new_item.matter)
+ new_item.matter[i] = new_item.matter[i] * mat_efficiency
+ remove_from_queue(1)
+
+/obj/machinery/pros_fabricator/proc/get_queue_names()
+ . = list()
+ for(var/i = 2 to queue.len)
+ var/datum/design/D = queue[i]
+ . += D.name
+
+/obj/machinery/pros_fabricator/proc/get_build_options()
+ . = list()
+ for(var/i = 1 to files.known_designs.len)
+ var/datum/design/D = files.known_designs[i]
+ if(D.build_path && (D.build_type & PROSFAB))
+ . += list(list("name" = D.name, "id" = i, "category" = D.category, "resourses" = get_design_resourses(D), "time" = get_design_time(D)))
+
+/obj/machinery/pros_fabricator/proc/get_design_resourses(var/datum/design/D)
+ var/list/F = list()
+ for(var/T in D.materials)
+ F += "[capitalize(T)]: [D.materials[T] * mat_efficiency]"
+ return english_list(F, and_text = ", ")
+
+/obj/machinery/pros_fabricator/proc/get_design_time(var/datum/design/D)
+ return time2text(round(10 * D.time / speed), "mm:ss")
+
+/obj/machinery/pros_fabricator/proc/update_categories()
+ categories = list()
+ for(var/datum/design/D in files.known_designs)
+ if(!D.build_path || !(D.build_type & PROSFAB))
+ continue
+ categories |= D.category
+ if(!category || !(category in categories))
+ category = categories[1]
+
+/obj/machinery/pros_fabricator/proc/get_materials()
+ . = list()
+ for(var/T in materials)
+ . += list(list("mat" = capitalize(T), "amt" = materials[T]))
+
+/obj/machinery/pros_fabricator/proc/eject_materials(var/material, var/amount) // 0 amount = 0 means ejecting a full stack; -1 means eject everything
+ var/recursive = amount == -1 ? 1 : 0
+ var/matstring = lowertext(material)
+ var/material/M = get_material_by_name(matstring)
+
+ var/obj/item/stack/material/S = M.place_sheet(get_turf(src))
+ if(amount <= 0)
+ amount = S.max_amount
+ var/ejected = min(round(materials[matstring] / S.perunit), amount)
+ S.amount = min(ejected, amount)
+ if(S.amount <= 0)
+ qdel(S)
+ return
+ materials[matstring] -= ejected * S.perunit
+ if(recursive && materials[matstring] >= S.perunit)
+ eject_materials(matstring, -1)
+ update_busy()
+
+/obj/machinery/pros_fabricator/proc/sync()
+ sync_message = "Error: no console found."
+ for(var/obj/machinery/computer/rdconsole/RDC in get_area_all_atoms(get_area(src)))
+ if(!RDC.sync)
+ continue
+ for(var/datum/tech/T in RDC.files.known_tech)
+ files.AddTech2Known(T)
+ for(var/datum/design/D in RDC.files.known_designs)
+ files.AddDesign2Known(D)
+ files.RefreshResearch()
+ sync_message = "Sync complete."
+ update_categories()
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 02d85234ed7..41ad047cc69 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -5,6 +5,7 @@
var/buckle_lying = -1 //bed-like behavior, forces mob.lying = buckle_lying if != -1
var/buckle_require_restraints = 0 //require people to be handcuffed before being able to buckle. eg: pipes
var/mob/living/buckled_mob = null
+ var/has_buckled
/obj/attack_hand(mob/living/user)
. = ..()
@@ -29,12 +30,17 @@
/obj/proc/buckle_mob(mob/living/M)
if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || M.pinned.len || (buckle_require_restraints && !M.restrained()))
return 0
+ if(has_buckled) //Handles trying to buckle yourself to the chair when someone is on it
+ M << "\The [src] already has someone buckled to it."
+ return 0
M.buckled = src
M.facing_dir = null
M.set_dir(buckle_dir ? buckle_dir : dir)
M.update_canmove()
buckled_mob = M
+ has_buckled = 1
+
post_buckle_mob(M)
return 1
@@ -45,6 +51,7 @@
buckled_mob.anchored = initial(buckled_mob.anchored)
buckled_mob.update_canmove()
buckled_mob = null
+ has_buckled = 0
post_buckle_mob(.)
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 036e4270780..fc764efd02d 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -17,6 +17,7 @@ var/global/list/image/splatter_cache=list()
var/base_icon = 'icons/effects/blood.dmi'
blood_DNA = list()
var/basecolor="#A10808" // Color when wet.
+ var/synthblood = 0
var/list/datum/disease2/disease/virus2 = list()
var/amount = 5
var/drytime
@@ -61,9 +62,9 @@ var/global/list/image/splatter_cache=list()
/obj/effect/decal/cleanable/blood/update_icon()
if(basecolor == "rainbow") basecolor = "#[get_random_colour(1)]"
color = basecolor
- if(basecolor == SYNTH_BLOOD_COLOUR)
- name = "oil"
- desc = "It's black and greasy."
+ if(synthblood)
+ name = "synthetic blood"
+ desc = "It's quite greasy."
else
name = initial(name)
desc = initial(desc)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index db08e9e083a..4d78f5aa9d8 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -453,6 +453,9 @@ var/list/global/slot_flags_enumeration = list(
M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])"
msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)") //BS12 EDIT ALG
+ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+ user.do_attack_animation(M)
+
src.add_fingerprint(user)
//if((CLUMSY in user.mutations) && prob(50))
// M = user
@@ -633,6 +636,3 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
/obj/item/proc/pwr_drain()
return 0 // Process Kill
-/obj/item/proc/resolve_attackby(atom/A, mob/source)
- return A.attackby(src,source)
-
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 0024a05c624..ae18aed86c5 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -31,14 +31,17 @@
last_used = world.time
times_used = max(0,round(times_used)) //sanity
-
-/obj/item/device/flash/attack(mob/living/M as mob, mob/user as mob)
+//attack_as_weapon
+/obj/item/device/flash/attack(mob/living/M, mob/living/user, var/target_zone)
if(!user || !M) return //sanity
M.attack_log += text("\[[time_stamp()]\] Has been flashed (attempt) with [src.name] by [user.name] ([user.ckey])")
user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to flash [M.name] ([M.ckey])")
msg_admin_attack("[user.name] ([user.ckey]) Used the [src.name] to flash [M.name] ([M.ckey]) (JMP)")
+ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+ user.do_attack_animation(M)
+
if(!clown_check(user)) return
if(broken)
user << "\The [src] is broken."
@@ -117,6 +120,8 @@
/obj/item/device/flash/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
if(!user || !clown_check(user)) return
+ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+
if(broken)
user.show_message("The [src.name] is broken", 2)
return
@@ -136,7 +141,6 @@
else //can only use it 5 times a minute
user.show_message("*click* *click*", 2)
return
- user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
flick("flash2", src)
if(user && isrobot(user))
@@ -184,7 +188,8 @@
icon_state = "sflash"
origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1)
-/obj/item/device/flash/synthetic/attack(mob/living/M as mob, mob/user as mob)
+//attack_as_weapon
+/obj/item/device/flash/synthetic/attack(mob/living/M, mob/living/user, var/target_zone)
..()
if(!broken)
broken = 1
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 83ac8851ddf..c3fcf893acf 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -79,6 +79,8 @@
user << "\The [M]'s pupils narrow slightly, but are still very dilated."
else
user << "\The [M]'s pupils narrow."
+
+ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) //can be used offensively
flick("flash", M.flash)
else
return ..()
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 3ccf1fb3a96..28f3a1def6a 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -10,11 +10,7 @@
icon = 'icons/obj/decals.dmi'
icon_state = "shock"
-/obj/item/borg/stun/attack(var/mob/living/M, var/mob/living/silicon/robot/user)
-
- if(!istype(M))
- return
-
+/obj/item/borg/stun/apply_hit_effect(mob/living/M, mob/living/silicon/robot/user, var/hit_zone)
// How the Hell.
if(!istype(user))
var/mob/living/temp = user
@@ -23,18 +19,16 @@
qdel(src)
return
- M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])")
- user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])")
- msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to attack [M.name] ([M.ckey]) (JMP)")
+ user.visible_message("\The [user] has prodded \the [M] with \a [src]!")
if(!user.cell || !user.cell.checked_use(1250)) //Slightly more than a baton.
- user.visible_message("\The [user] has prodded \the [M] with its arm!")
return
- if (M.stuttering < 5)
- M.stuttering = 5
- M.stun_effect_act(0, 70, check_zone(user.zone_sel.selecting), src)
- user.visible_message("\The [user] has prodded \the [M] with \a [src]!")
+ playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+
+ M.apply_effect(5, STUTTER)
+ M.stun_effect_act(0, 70, check_zone(hit_zone), src)
+
if(ishuman(M))
var/mob/living/carbon/human/H = M
H.forcesay(hit_appends)
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 11c312048db..ebdd95791de 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -15,47 +15,37 @@
/obj/item/robot_parts/New(var/newloc, var/model)
..(newloc)
- if(model_info && model)
- model_info = model
- var/datum/robolimb/R = all_robolimbs[model]
- if(R)
- name = "[R.company] [initial(name)]"
- desc = "[R.desc]"
- if(icon_state in icon_states(R.icon))
- icon = R.icon
- else
- name = "robot [initial(name)]"
/obj/item/robot_parts/l_arm
- name = "left arm"
+ name = "cyborg left arm"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
icon_state = "l_arm"
part = list(BP_L_ARM, BP_L_HAND)
model_info = 1
/obj/item/robot_parts/r_arm
- name = "right arm"
+ name = "cyborg right arm"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
icon_state = "r_arm"
part = list(BP_R_ARM, BP_R_HAND)
model_info = 1
/obj/item/robot_parts/l_leg
- name = "left leg"
+ name = "cyborg left leg"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
icon_state = "l_leg"
part = list(BP_L_LEG, BP_L_FOOT)
model_info = 1
/obj/item/robot_parts/r_leg
- name = "right leg"
+ name = "cyborg leg"
desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case."
icon_state = "r_leg"
part = list(BP_R_LEG, BP_R_FOOT)
model_info = 1
/obj/item/robot_parts/chest
- name = "chest"
+ name = "cyborg chest"
desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell."
icon_state = "chest"
part = list(BP_GROIN,BP_TORSO)
@@ -63,7 +53,7 @@
var/obj/item/weapon/cell/cell = null
/obj/item/robot_parts/head
- name = "head"
+ name = "cyborg head"
desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals."
icon_state = "head"
part = list(BP_HEAD)
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index d47df19f196..2ddbd4e330e 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -37,8 +37,13 @@
user << "You can't apply [src] through [H.wear_suit]!"
return 1
- if(affecting.robotic >= ORGAN_ROBOT)
- user << "This isn't useful at all on a robotic limb.."
+ if(affecting.robotic == ORGAN_ROBOT)
+ user << "This isn't useful at all on a robotic limb."
+ return 1
+
+ if(affecting.robotic >= ORGAN_LIFELIKE)
+ user << "You apply the [src], but it seems to have no effect..."
+ use(1)
return 1
H.UpdateDamageIcon()
diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm
index 5b85763b324..1ff55adf852 100644
--- a/code/game/objects/items/stacks/nanopaste.dm
+++ b/code/game/objects/items/stacks/nanopaste.dm
@@ -27,19 +27,12 @@
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting)
- if(S.open == 1)
- if (S && (S.robotic >= ORGAN_ROBOT))
- if(S.get_damage())
- S.heal_damage(15, 15, robo_repair = 1)
- H.updatehealth()
- use(1)
- user.visible_message("\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.name] with \the [src].",\
- "You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].")
- else
- user << "Nothing to fix here."
+ if (S && (S.robotic >= ORGAN_ROBOT))
+ if(S.robo_repair(15, "omni", 0, src, user))
+ use(1)
+ user.visible_message("\The [user] applies some nanite paste on [user != M ? "\the [M]'s" : "their"] [S.name].",\
+ "You apply some nanite paste on [user == M ? "your" : "[M]'s"] [S.name].")
else
if (can_operate(H))
if (do_surgery(H,user,src))
return
- else
- user << "Nothing to fix in here."
diff --git a/code/game/objects/items/weapons/circuitboards/machinery/research.dm b/code/game/objects/items/weapons/circuitboards/machinery/research.dm
index bf0eb357f43..c871bd3dc51 100644
--- a/code/game/objects/items/weapons/circuitboards/machinery/research.dm
+++ b/code/game/objects/items/weapons/circuitboards/machinery/research.dm
@@ -61,3 +61,14 @@ obj/item/weapon/circuitboard/rdserver
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/weapon/stock_parts/micro_laser = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
+
+/obj/item/weapon/circuitboard/prosthetics
+ name = "Circuit board (Prosthetics Fabricator)"
+ build_path = "/obj/machinery/pros_fabricator"
+ board_type = "machine"
+ origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
+ req_components = list(
+ /obj/item/weapon/stock_parts/matter_bin = 2,
+ /obj/item/weapon/stock_parts/manipulator = 1,
+ /obj/item/weapon/stock_parts/micro_laser = 1,
+ /obj/item/weapon/stock_parts/console_screen = 1)
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 7c8752c6d7d..d15b78963da 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -53,9 +53,11 @@
target.clean_blood()
return
-/obj/item/weapon/soap/attack(mob/target as mob, mob/user as mob)
- if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == O_MOUTH)
+//attack_as_weapon
+/obj/item/weapon/soap/attack(mob/living/target, mob/living/user, var/target_zone)
+ if(target && user && ishuman(target) && ishuman(user) && !user.incapacitated() && user.zone_sel &&user.zone_sel.selecting == "mouth" )
user.visible_message("\The [user] washes \the [target]'s mouth out with soap!")
+ user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //prevent spam
return
..()
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 484c185a14a..24f6ad53b39 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -114,6 +114,9 @@
if(!do_after(user,50))
return
+ user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
+ user.do_attack_animation(M)
+
M.visible_message("\The [M] has been injected with \the [src] by \the [user].")
var/mob/living/carbon/human/H = M
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 294812513c1..46e8e7ba267 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -46,6 +46,7 @@
if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/) || istype(target, /obj/item/clothing/accessory/storage/) || istype(target, /obj/item/clothing/under))
return
user << "Planting explosives..."
+ user.do_attack_animation(target)
if(do_after(user, 50) && in_range(user, target))
user.drop_item()
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 73c198c8ab6..94775ceb366 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -61,7 +61,7 @@
qdel(src)
/obj/item/weapon/a_gift/attack_self(mob/M as mob)
- var/gift_type = pick(/obj/item/weapon/sord,
+ var/gift_type = pick(
/obj/item/weapon/storage/wallet,
/obj/item/weapon/storage/photo_album,
/obj/item/weapon/storage/box/snappops,
@@ -80,7 +80,6 @@
/obj/item/weapon/bikehorn,
/obj/item/weapon/beach_ball,
/obj/item/weapon/beach_ball/holoball,
- /obj/item/weapon/banhammer,
/obj/item/toy/balloon,
/obj/item/toy/blink,
/obj/item/toy/crossbow,
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 1868827b5b9..c44c3e1688e 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -74,6 +74,9 @@
msg_admin_attack("[key_name(user)] attempted to handcuff [key_name(H)]")
feedback_add_details("handcuffs","H")
+ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+ user.do_attack_animation(H)
+
user.visible_message("\The [user] has put [cuff_type] on \the [H]!")
// Apply cuffs.
@@ -166,4 +169,4 @@ var/last_chew = 0
item_state = null
icon = 'icons/obj/bureaucracy.dmi'
breakouttime = 200
- cuff_type = "duct tape"
\ No newline at end of file
+ cuff_type = "duct tape"
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index 4f168556d28..655727a62ae 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -30,18 +30,18 @@
if (!istype(M, /mob/living/carbon))
return
if (user && src.imp)
- for (var/mob/O in viewers(M, null))
- O.show_message("[user] is attemping to implant [M].", 1)
+ M.visible_message("[user] is attemping to implant [M].")
+
+ user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
+ user.do_attack_animation(M)
var/turf/T1 = get_turf(M)
if (T1 && ((M == user) || do_after(user, 50)))
if(user && M && (get_turf(M) == T1) && src && src.imp)
- for (var/mob/O in viewers(M, null))
- O.show_message("[M] has been implanted by [user].", 1)
+ M.visible_message("[M] has been implanted by [user].")
admin_attack_log(user, M, "Implanted using \the [src.name] ([src.imp.name])", "Implanted with \the [src.name] ([src.imp.name])", "used an implanter, [src.name] ([src.imp.name]), on")
- user.show_message("You implanted the implant into [M].")
if(src.imp.implanted(M))
src.imp.loc = M
src.imp.imp_in = M
diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm
index ff1d347c745..6672d488ded 100644
--- a/code/game/objects/items/weapons/material/kitchen.dm
+++ b/code/game/objects/items/weapons/material/kitchen.dm
@@ -103,13 +103,6 @@
return
return ..()
-/obj/item/weapon/material/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
- if ((CLUMSY in user.mutations) && prob(50))
- user << "You somehow managed to cut yourself with \the [src]."
- user.take_organ_damage(20)
- return
- return ..()
-
/obj/item/weapon/material/kitchen/utensil/knife/plastic
default_material = "plastic"
diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm
index 18181df6b07..fc9ac7eb32d 100644
--- a/code/game/objects/items/weapons/material/material_weapons.dm
+++ b/code/game/objects/items/weapons/material/material_weapons.dm
@@ -64,9 +64,8 @@
processing_objects -= src
..()
-/obj/item/weapon/material/attack()
- if(!..())
- return
+/obj/item/weapon/material/apply_hit_effect()
+ ..()
if(!unbreakable)
if(material.is_brittle())
health = 0
diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm
index dcd33fa1725..91d97274f66 100644
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -65,7 +65,6 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "hoe"
item_state = "hoe"
- flags = CONDUCT | NOBLUDGEON
force_divisor = 0.25 // 5 with weight 20 (steel)
thrown_force_divisor = 0.25 // as above
w_class = 2
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index f8b21af1903..e9f784f4451 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -225,7 +225,7 @@
/obj/item/weapon/storage/box/emps/New()
..()
for(var/i = 1 to 5)
- new /obj/item/weapon/grenade/empgrenade(src)
+ new /obj/item/weapon/grenade/empgrenade(src)
/obj/item/weapon/storage/box/empslite
name = "box of low yield emp grenades"
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 5baf6c9ed37..b7e55cddb81 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -103,73 +103,52 @@
user << "[src] is out of charge."
add_fingerprint(user)
-
/obj/item/weapon/melee/baton/attack(mob/M, mob/user)
if(status && (CLUMSY in user.mutations) && prob(50))
user << "You accidentally hit yourself with the [src]!"
user.Weaken(30)
deductcharge(hitcost)
return
+ return ..()
- if(isrobot(M))
- ..()
- return
+/obj/item/weapon/melee/baton/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+ if(isrobot(target))
+ return ..()
var/agony = agonyforce
var/stun = stunforce
- var/mob/living/L = M
+ var/obj/item/organ/external/affecting = null
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ affecting = H.get_organ(hit_zone)
- var/target_zone = check_zone(user.zone_sel.selecting)
if(user.a_intent == I_HURT)
- if (!..()) //item/attack() does it's own messaging and logs
- return 0 // item/attack() will return 1 if they hit, 0 if they missed.
+ . = ..()
+ //whacking someone causes a much poorer electrical contact than deliberately prodding them.
+ agony *= 0.5
stun *= 0.5
- if(status) //Checks to see if the stunbaton is on.
- agony *= 0.5 //whacking someone causes a much poorer contact than prodding them.
+ else if(!status)
+ if(affecting)
+ target.visible_message("[target] has been prodded in the [affecting.name] with [src] by [user]. Luckily it was off.")
else
- agony = 0 //Shouldn't really stun if it's off, should it?
- //we can't really extract the actual hit zone from ..(), unfortunately. Just act like they attacked the area they intended to.
+ target.visible_message("[target] has been prodded with [src] by [user]. Luckily it was off.")
else
- //copied from human_defense.dm - human defence code should really be refactored some time.
- if (ishuman(L))
- user.lastattacked = L //are these used at all, if we have logs?
- L.lastattacker = user
-
- if (user != L) // Attacking yourself can't miss
- target_zone = get_zone_with_miss_chance(user.zone_sel.selecting, L)
-
- if(!target_zone)
- L.visible_message("\The [user] misses [L] with \the [src]!")
- return 0
-
- var/mob/living/carbon/human/H = L
- var/obj/item/organ/external/affecting = H.get_organ(target_zone)
- if (affecting)
- if(!status)
- L.visible_message("[L] has been prodded in the [affecting.name] with [src] by [user]. Luckily it was off.")
- return 1
- else
- H.visible_message("[L] has been prodded in the [affecting.name] with [src] by [user]!")
+ if(affecting)
+ target.visible_message("[target] has been prodded in the [affecting.name] with [src] by [user]!")
else
- if(!status)
- L.visible_message("[L] has been prodded with [src] by [user]. Luckily it was off.")
- return 1
- else
- L.visible_message("[L] has been prodded with [src] by [user]!")
+ target.visible_message("[target] has been prodded with [src] by [user]!")
+ playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
//stun effects
- L.stun_effect_act(stun, agony, target_zone, src)
+ if(status)
+ target.stun_effect_act(stun, agony, hit_zone, src)
+ msg_admin_attack("[key_name(user)] stunned [key_name(target)] with the [src].")
- playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
- msg_admin_attack("[key_name(user)] stunned [key_name(L)] with the [src].")
+ deductcharge(hitcost)
- deductcharge(hitcost)
-
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- H.forcesay(hit_appends)
-
- return 1
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ H.forcesay(hit_appends)
/obj/item/weapon/melee/baton/emp_act(severity)
if(bcell)
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index c773f3da383..b289e792572 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -1,18 +1,10 @@
/* Weapons
* Contains:
- * Banhammer
* Sword
* Classic Baton
*/
-/*
- * Banhammer
- */
-/obj/item/weapon/banhammer/attack(mob/M as mob, mob/user as mob)
- M << " You have been banned FOR NO REISIN by [user]"
- user << " You have BANNED [M]"
-
-/*
+/*
* Classic Baton
*/
/obj/item/weapon/melee/classic_baton
@@ -34,33 +26,7 @@
else
user.take_organ_damage(2*force)
return
-/*this is already called in ..()
- src.add_fingerprint(user)
- M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])")
- user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])")
-
- log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])")
-*/
- if (user.a_intent == I_HURT)
- if(!..()) return
- //playsound(src.loc, "swing_hit", 50, 1, -1)
- if (M.stuttering < 8 && (!(HULK in M.mutations)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
- M.stuttering = 8
- M.Stun(8)
- M.Weaken(8)
- for(var/mob/O in viewers(M))
- if (O.client) O.show_message("\The [M] has been beaten with \the [src] by [user]!", 1, "You hear someone fall", 2)
- else
- playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1, -1)
- M.Stun(5)
- M.Weaken(5)
- M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])")
- user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])")
- msg_admin_attack("[key_name(user)] attacked [key_name(user)] with [src.name] (INTENT: [uppertext(user.a_intent)])")
- src.add_fingerprint(user)
-
- for(var/mob/O in viewers(M))
- if (O.client) O.show_message("\The [M] has been stunned with \the [src] by [user]!", 1, "You hear someone fall", 2)
+ return ..()
//Telescopic baton
/obj/item/weapon/melee/telebaton
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index cf10ae43460..b39fc0dd27e 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -116,7 +116,7 @@
item_state = "cutters_yellow"
/obj/item/weapon/wirecutters/attack(mob/living/carbon/C as mob, mob/user as mob)
- if((C.handcuffed) && (istype(C.handcuffed, /obj/item/weapon/handcuffs/cable)))
+ if(user.a_intent == I_HELP && (C.handcuffed) && (istype(C.handcuffed, /obj/item/weapon/handcuffs/cable)))
usr.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\
"You cut \the [C]'s restraints with \the [src]!",\
"You hear cable being cut.")
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 35302dc5dcd..0f5cebc44da 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -1,18 +1,3 @@
-/obj/item/weapon/banhammer
- desc = "banhammer"
- name = "banhammer"
- icon = 'icons/obj/items.dmi'
- icon_state = "toyhammer"
- slot_flags = SLOT_BELT
- throwforce = 0
- w_class = 2.0
- throw_speed = 7
- throw_range = 15
- attack_verb = list("banned")
-
- suicide_act(mob/user)
- viewers(user) << "[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life."
- return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS)
/obj/item/weapon/nullrod
name = "null rod"
@@ -37,6 +22,9 @@
msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (JMP)")
+ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+ user.do_attack_animation(M)
+
if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
user << "You don't have the dexterity to do this!"
return
@@ -68,27 +56,6 @@
user << "You hit the floor with the [src]."
call(/obj/effect/rune/proc/revealrunes)(src)
-/obj/item/weapon/sord
- name = "\improper SORD"
- desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
- icon_state = "sord"
- item_state = "sord"
- slot_flags = SLOT_BELT
- force = 2
- throwforce = 1
- sharp = 1
- edge = 1
- w_class = 3
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-
- suicide_act(mob/user)
- viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide."
- return(BRUTELOSS)
-
-/obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
- playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
- return ..()
-
/obj/item/weapon/energy_net
name = "energy net"
desc = "It's a net made of green energy."
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index ad1797756ca..375c6727eab 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -101,6 +101,78 @@ LINEN BINS
icon_state = "sheetbrown"
item_state = "sheetbrown"
+/obj/item/weapon/bedsheet/ian
+ icon_state = "sheetian"
+ item_state = "bedsheet"
+
+/obj/item/weapon/bedsheet/double
+ icon_state = "doublesheet"
+ item_state = "bedsheet"
+
+/obj/item/weapon/bedsheet/bluedouble
+ icon_state = "doublesheetblue"
+ item_state = "sheetblue"
+
+/obj/item/weapon/bedsheet/greendouble
+ icon_state = "doublesheetgreen"
+ item_state = "sheetgreen"
+
+/obj/item/weapon/bedsheet/orangedouble
+ icon_state = "doublesheetorange"
+ item_state = "sheetorange"
+
+/obj/item/weapon/bedsheet/purpledouble
+ icon_state = "doublesheetpurple"
+ item_state = "sheetpurple"
+
+/obj/item/weapon/bedsheet/doublerainbow //all the way across the sky.
+ icon_state = "doublesheetrainbow"
+ item_state = "sheetrainbow"
+
+/obj/item/weapon/bedsheet/doublered
+ icon_state = "doublesheetred"
+ item_state = "sheetred"
+
+/obj/item/weapon/bedsheet/doubleyellow
+ icon_state = "doublesheetyellow"
+ item_state = "sheetyellow"
+
+/obj/item/weapon/bedsheet/doublemime
+ icon_state = "doublesheetmime"
+ item_state = "sheetmime"
+
+/obj/item/weapon/bedsheet/doubleclown
+ icon_state = "doublesheetclown"
+ item_state = "sheetclown"
+
+/obj/item/weapon/bedsheet/doublecaptain
+ icon_state = "doublesheetcaptain"
+ item_state = "sheetcaptain"
+
+/obj/item/weapon/bedsheet/doublerd
+ icon_state = "doublesheetrd"
+ item_state = "sheetrd"
+
+/obj/item/weapon/bedsheet/doublehos
+ icon_state = "doublesheethos"
+ item_state = "sheethos"
+
+/obj/item/weapon/bedsheet/doublehop
+ icon_state = "doublesheethop"
+ item_state = "sheethop"
+
+/obj/item/weapon/bedsheet/doublece
+ icon_state = "doublesheetce"
+ item_state = "sheetce"
+
+/obj/item/weapon/bedsheet/doublebrown
+ icon_state = "doublesheetbrown"
+ item_state = "sheetbrown"
+
+/obj/item/weapon/bedsheet/doubleian
+ icon_state = "doublesheetian"
+ item_state = "bedsheet"
+
/obj/structure/bedsheetbin
name = "linen bin"
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 73914e113cc..49ad2753335 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -129,6 +129,9 @@
else if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
var/mob/living/affecting = G.affecting
+ if(has_buckled) //Handles trying to buckle someone else to a chair when someone else is on it
+ user << "\The [src] already has someone buckled to it."
+ return
user.visible_message("[user] attempts to buckle [affecting] into \the [src]!")
if(do_after(user, 20))
affecting.loc = loc
@@ -176,6 +179,19 @@
/obj/structure/bed/alien/New(var/newloc)
..(newloc,"resin")
+/obj/structure/bed/double
+ name = "double bed"
+ icon_state = "doublebed"
+ base_icon = "doublebed"
+
+/obj/structure/bed/double/post_buckle_mob(mob/living/M as mob)
+ if(M == buckled_mob)
+ M.pixel_y = 13
+ M.old_y = 13
+ else
+ M.pixel_y = 0
+ M.old_y = 0
+
/*
* Roller beds
*/
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
index e4840bedc63..e4d54f48bae 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -72,6 +72,11 @@ var/global/list/stool_cache = list() //haha stool
/obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
if (prob(5) && istype(M,/mob/living))
user.visible_message("[user] breaks [src] over [M]'s back!")
+ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+ user.do_attack_animation(M)
+
+ user.drop_from_inventory(src)
+
user.remove_from_mob(src)
dismantle()
qdel(src)
diff --git a/code/game/objects/structures/under_wardrobe.dm b/code/game/objects/structures/under_wardrobe.dm
index a02c67c968b..6a06ef26fbc 100644
--- a/code/game/objects/structures/under_wardrobe.dm
+++ b/code/game/objects/structures/under_wardrobe.dm
@@ -5,39 +5,83 @@
icon_state = "cabinet_closed"
density = 1
-/obj/structure/undies_wardrobe/attack_hand(mob/user as mob)
- src.add_fingerprint(user)
- var/mob/living/carbon/human/H = user
- if(!ishuman(user) || (H.species && !(H.species.appearance_flags & HAS_UNDERWEAR)))
+/obj/structure/undies_wardrobe/attack_hand(var/mob/user)
+ if(!human_who_can_use_underwear(user))
user << "Sadly there's nothing in here for you to wear."
- return 0
+ return
+ interact(user)
- var/utype = alert("Which section do you want to pick from?",,"Underwear", "Undershirts", "Socks",)
- var/list/selection
- switch(utype)
- if("Underwear")
- utype = alert("Which section do you want to pick from?",, "Top", "Bottom",)
- switch(utype)
- if("Top")
- selection = underwear_top_t
- if("Bottom")
- selection = underwear_bottom_t
- if("Undershirts")
- selection = undershirt_t
- if("Socks")
- selection = socks_t
- var/pick = input("Select the style") as null|anything in selection
- if(pick)
- if(get_dist(src,user) > 1)
+/obj/structure/undies_wardrobe/interact(var/mob/living/carbon/human/H)
+ var/dat = list()
+ dat += "Underwear:
"
+ for(var/datum/category_group/underwear/UWC in global_underwear.categories)
+ var/datum/category_item/underwear/UWI = H.all_underwear[UWC.name]
+ var/item_name = UWI ? UWI.name : "None"
+ dat += "[UWC.name]: [item_name]"
+ if(UWI)
+ for(var/datum/gear_tweak/gt in UWI.tweaks)
+ dat += " [gt.get_contents(get_metadata(H, UWC.name, gt))]"
+ dat += " (Remove)
"
+
+ dat = jointext(dat,null)
+ H << browse(dat, "window=wardrobe;size=400x200")
+
+/obj/structure/undies_wardrobe/proc/get_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt)
+ var/metadata = H.all_underwear_metadata[underwear_category]
+ if(!metadata)
+ metadata = list()
+ H.all_underwear_metadata[underwear_category] = metadata
+
+ var/tweak_data = metadata["[gt]"]
+ if(!tweak_data)
+ tweak_data = gt.get_default()
+ metadata["[gt]"] = tweak_data
+ return tweak_data
+
+/obj/structure/undies_wardrobe/proc/set_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt, var/new_metadata)
+ var/list/metadata = H.all_underwear_metadata[underwear_category]
+ metadata["[gt]"] = new_metadata
+
+/obj/structure/undies_wardrobe/proc/human_who_can_use_underwear(var/mob/living/carbon/human/H)
+ if(!istype(H) || !H.species || !(H.species.appearance_flags & HAS_UNDERWEAR))
+ return FALSE
+ return TRUE
+
+/obj/structure/undies_wardrobe/CanUseTopic(var/user)
+ if(!human_who_can_use_underwear(user))
+ return STATUS_CLOSE
+
+ return ..()
+
+/obj/structure/undies_wardrobe/Topic(href, href_list, state)
+ if(..())
+ return TRUE
+
+ var/mob/living/carbon/human/H = usr
+ if(href_list["remove_underwear"])
+ if(href_list["remove_underwear"] in H.all_underwear)
+ H.all_underwear -= href_list["remove_underwear"]
+ . = TRUE
+ else if(href_list["change_underwear"])
+ var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[href_list["change_underwear"]]
+ if(!UWC)
return
- if(utype == "Undershirts")
- H.undershirt = selection[pick]
- else if(utype == "Socks")
- H.socks = selection[pick]
- else if(utype == "Top")
- H.underwear_top = selection[pick]
- else
- H.underwear_bottom = selection[pick]
- H.update_body(1)
+ var/datum/category_item/underwear/selected_underwear = input(H, "Choose underwear:", "Choose underwear", H.all_underwear[UWC.name]) as null|anything in UWC.items
+ if(selected_underwear && CanUseTopic(H, default_state))
+ H.all_underwear[UWC.name] = selected_underwear
+ . = TRUE
+ else if(href_list["underwear"] && href_list["tweak"])
+ var/underwear = href_list["underwear"]
+ if(!(underwear in H.all_underwear))
+ return
+ var/datum/gear_tweak/gt = locate(href_list["tweak"])
+ if(!gt)
+ return
+ var/new_metadata = gt.get_metadata(usr, get_metadata(H, underwear, gt), "Wardrobe Underwear Selection")
+ if(new_metadata)
+ set_metadata(H, underwear, gt, new_metadata)
+ . = TRUE
- return 1
\ No newline at end of file
+ if(.)
+ H.update_underwear()
+ interact(H)
\ No newline at end of file
diff --git a/code/game/turfs/initialization/maintenance.dm b/code/game/turfs/initialization/maintenance.dm
index 5a9574810b1..16b1d03d21e 100644
--- a/code/game/turfs/initialization/maintenance.dm
+++ b/code/game/turfs/initialization/maintenance.dm
@@ -26,7 +26,7 @@ var/global/list/random_junk
if(prob(25))
return /obj/effect/decal/cleanable/generic
if(!random_junk)
- random_junk = subtypes(/obj/item/trash)
+ random_junk = subtypesof(/obj/item/trash)
random_junk += typesof(/obj/item/weapon/cigbutt)
random_junk += /obj/effect/decal/cleanable/spiderling_remains
random_junk += /obj/effect/decal/remains/mouse
diff --git a/code/global.dm b/code/global.dm
index 625712336ca..15b17823f8a 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -118,7 +118,6 @@ var/join_motd = null
var/datum/nanomanager/nanomanager = new() // NanoManager, the manager for Nano UIs.
var/datum/event_manager/event_manager = new() // Event Manager, the manager for events.
-var/datum/subsystem/alarm/alarm_manager = new() // Alarm Manager, the manager for alarms.
var/list/awaydestinations = list() // Away missions. A list of landmarks that the warpgate can take you to.
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 5d8db9c0729..170f9302f9a 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -234,9 +234,9 @@ Ccomp's first proc.
var/list/mobs = list()
var/list/ghosts = list()
- var/list/sortmob = sortAtom(mob_list) // get the mob list.
+ var/list/sortmob = sortAtom(mob_list) // get the mob list.
var/any=0
- for(var/mob/observer/dead/M in sortmob)
+ for(var/mob/observer/dead/M in sortmob)
mobs.Add(M) //filter it where it's only ghosts
any = 1 //if no ghosts show up, any will just be 0
if(!any)
@@ -388,7 +388,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
else
new_character.gender = pick(MALE,FEMALE)
var/datum/preferences/A = new()
- A.randomize_appearance_for(new_character)
+ A.randomize_appearance_and_body_for(new_character)
new_character.real_name = G_found.real_name
if(!new_character.real_name)
diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm
index 2588836df56..656f54d4778 100644
--- a/code/modules/client/preference_setup/general/01_basic.dm
+++ b/code/modules/client/preference_setup/general/01_basic.dm
@@ -80,7 +80,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
var/new_gender = input(user, "Choose your character's biological gender:", "Character Preference", pref.biological_gender) as null|anything in get_genders()
if(new_gender && CanUseTopic(user))
pref.set_biological_gender(new_gender)
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["id_gender"])
var/new_gender = input(user, "Choose your character's identifying gender:", "Character Preference", pref.identifying_gender) as null|anything in all_genders_define_list
diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index ee93b2acf47..a092b859b31 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -1,5 +1,8 @@
var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-")
+/datum/preferences
+ var/dress_mob = TRUE
+
/datum/category_item/player_setup_item/general/body
name = "Body"
sort_order = 3
@@ -25,6 +28,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["disabilities"] >> pref.disabilities
S["organ_data"] >> pref.organ_data
S["rlimb_data"] >> pref.rlimb_data
+ pref.preview_icon = null
/datum/category_item/player_setup_item/general/body/save_character(var/savefile/S)
S["species"] << pref.species
@@ -74,10 +78,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
/datum/category_item/player_setup_item/general/body/content(var/mob/user)
. = list()
- pref.update_preview_icon()
- if(pref.preview_icon_front && pref.preview_icon_side)
- user << browse_rsc(pref.preview_icon_front, "preview_icon.png")
- user << browse_rsc(pref.preview_icon_side, "preview_icon2.png")
+ if(!pref.preview_icon)
+ pref.update_preview_icon()
+ user << browse_rsc(pref.preview_icon, "previewicon.png")
var/mob_species = all_species[pref.species]
. += "Body "
@@ -167,7 +170,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else
. += "
"
- . += " Preview
"
+ . += " Preview
"
+ . += "
[pref.dress_mob ? "Hide equipment" : "Show equipment"]"
+
. += "
"
. += "Hair
"
@@ -196,8 +202,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/datum/species/mob_species = all_species[pref.species]
if(href_list["random"])
- pref.randomize_appearance_for()
- return TOPIC_REFRESH
+ pref.randomize_appearance_and_body_for()
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["blood_type"])
var/new_b_type = input(user, "Choose your character's blood-type:", "Character Preference") as null|anything in valid_bloodtypes
@@ -274,7 +280,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/datum/species/S = all_species[pref.species]
pref.age = max(min(pref.age, S.max_age), S.min_age)
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["hair_color"])
if(!has_flag(mob_species, HAS_HAIR_COLOR))
@@ -284,7 +290,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.r_hair = hex2num(copytext(new_hair, 2, 4))
pref.g_hair = hex2num(copytext(new_hair, 4, 6))
pref.b_hair = hex2num(copytext(new_hair, 6, 8))
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["hair_style"])
var/list/valid_hairstyles = list()
@@ -298,7 +304,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/new_h_style = input(user, "Choose your character's hair style:", "Character Preference", pref.h_style) as null|anything in valid_hairstyles
if(new_h_style && CanUseTopic(user))
pref.h_style = new_h_style
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["facial_color"])
if(!has_flag(mob_species, HAS_HAIR_COLOR))
@@ -308,7 +314,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.r_facial = hex2num(copytext(new_facial, 2, 4))
pref.g_facial = hex2num(copytext(new_facial, 4, 6))
pref.b_facial = hex2num(copytext(new_facial, 6, 8))
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["eye_color"])
if(!has_flag(mob_species, HAS_EYE_COLOR))
@@ -318,7 +324,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.r_eyes = hex2num(copytext(new_eyes, 2, 4))
pref.g_eyes = hex2num(copytext(new_eyes, 4, 6))
pref.b_eyes = hex2num(copytext(new_eyes, 6, 8))
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["skin_tone"])
if(!has_flag(mob_species, HAS_SKIN_TONE))
@@ -326,7 +332,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/new_s_tone = input(user, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Character Preference", (-pref.s_tone) + 35) as num|null
if(new_s_tone && has_flag(mob_species, HAS_SKIN_TONE) && CanUseTopic(user))
pref.s_tone = 35 - max(min( round(new_s_tone), 220),1)
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["skin_color"])
if(!has_flag(mob_species, HAS_SKIN_COLOR))
@@ -336,7 +342,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.r_skin = hex2num(copytext(new_skin, 2, 4))
pref.g_skin = hex2num(copytext(new_skin, 4, 6))
pref.b_skin = hex2num(copytext(new_skin, 6, 8))
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["facial_style"])
var/list/valid_facialhairstyles = list()
@@ -354,11 +360,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference", pref.f_style) as null|anything in valid_facialhairstyles
if(new_f_style && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user))
pref.f_style = new_f_style
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["reset_limbs"])
reset_limbs()
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["limbs"])
@@ -419,7 +425,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
switch(new_state)
if("Normal")
-
if(limb == BP_TORSO)
for(var/other_limb in BP_ALL - BP_TORSO)
pref.organ_data[other_limb] = null
@@ -444,6 +449,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/list/usable_manufacturers = list()
for(var/company in chargen_robolimbs)
var/datum/robolimb/M = chargen_robolimbs[company]
+ if(!(limb in M.parts))
+ continue
if(tmp_species in M.species_cannot_use)
continue
usable_manufacturers[company] = M
@@ -473,7 +480,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
for(var/internal_organ in list(O_HEART,O_EYES))
pref.organ_data[internal_organ] = "mechanical"
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["organs"])
@@ -511,7 +518,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["disabilities"])
var/disability_flag = text2num(href_list["disabilities"])
pref.disabilities ^= disability_flag
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
+
+ else if(href_list["toggle_clothing"])
+ pref.dress_mob = !pref.dress_mob
+ return TOPIC_REFRESH_UPDATE_PREVIEW
return ..()
diff --git a/code/modules/client/preference_setup/general/04_equipment.dm b/code/modules/client/preference_setup/general/04_equipment.dm
index e3565515070..c455cef524a 100644
--- a/code/modules/client/preference_setup/general/04_equipment.dm
+++ b/code/modules/client/preference_setup/general/04_equipment.dm
@@ -1,90 +1,119 @@
+/datum/preferences
+ var/list/all_underwear
+ var/list/all_underwear_metadata
+
/datum/category_item/player_setup_item/general/equipment
name = "Clothing"
sort_order = 4
/datum/category_item/player_setup_item/general/equipment/load_character(var/savefile/S)
- S["underwear_top"] >> pref.underwear_top
- S["underwear_bottom"] >> pref.underwear_bottom
- S["undershirt"] >> pref.undershirt
- S["socks"] >> pref.socks
+ S["all_underwear"] >> pref.all_underwear
+ S["all_underwear_metadata"] >> pref.all_underwear_metadata
S["backbag"] >> pref.backbag
S["pdachoice"] >> pref.pdachoice
/datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
- S["underwear_top"] << pref.underwear_top
- S["underwear_bottom"] << pref.underwear_bottom
- S["undershirt"] << pref.undershirt
- S["socks"] << pref.socks
+ S["all_underwear"] << pref.all_underwear
+ S["all_underwear_metadata"] << pref.all_underwear_metadata
S["backbag"] << pref.backbag
S["pdachoice"] << pref.pdachoice
/datum/category_item/player_setup_item/general/equipment/sanitize_character()
+ if(!islist(pref.gear)) pref.gear = list()
+
+ if(!istype(pref.all_underwear))
+ pref.all_underwear = list()
+
+ for(var/datum/category_group/underwear/WRC in global_underwear.categories)
+ for(var/datum/category_item/underwear/WRI in WRC.items)
+ if(WRI.is_default(pref.identifying_gender ? pref.identifying_gender : MALE))
+ pref.all_underwear[WRC.name] = WRI.name
+ break
+
+ if(!istype(pref.all_underwear_metadata))
+ pref.all_underwear_metadata = list()
+
+ for(var/underwear_category in pref.all_underwear)
+ var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[underwear_category]
+ if(!UWC)
+ pref.all_underwear -= underwear_category
+ else
+ var/datum/category_item/underwear/UWI = UWC.items_by_name[pref.all_underwear[underwear_category]]
+ if(!UWI)
+ pref.all_underwear -= underwear_category
+
+ for(var/underwear_metadata in pref.all_underwear_metadata)
+ if(!(underwear_metadata in pref.all_underwear))
+ pref.all_underwear_metadata -= underwear_metadata
pref.backbag = sanitize_integer(pref.backbag, 1, backbaglist.len, initial(pref.backbag))
pref.pdachoice = sanitize_integer(pref.pdachoice, 1, pdachoicelist.len, initial(pref.pdachoice))
- if(!islist(pref.gear)) pref.gear = list()
-
- var/undies_top = get_undies_top()
- var/undies_bottom = get_undies_bottom()
- if(!get_key_by_value(undies_top, pref.underwear_top))
- pref.underwear_top = undies_top[1]
- if(!get_key_by_value(undies_bottom, pref.underwear_bottom))
- pref.underwear_bottom = undies_bottom[1]
- if(!get_key_by_value(undershirt_t, pref.undershirt))
- pref.undershirt = undershirt_t[1]
- if(!get_key_by_value(socks_t, pref.socks))
- pref.socks = socks_t[1]
-
/datum/category_item/player_setup_item/general/equipment/content()
+ . = list()
. += "Equipment:
"
- . += "Underwear Top: [get_key_by_value(get_undies_top(),pref.underwear_top)]
"
- . += "Underwear Bottom: [get_key_by_value(get_undies_bottom(),pref.underwear_bottom)]
"
- . += "Undershirt: [get_key_by_value(undershirt_t,pref.undershirt)]
"
- . += "Socks: [get_key_by_value(socks_t,pref.socks)]
"
+ for(var/datum/category_group/underwear/UWC in global_underwear.categories)
+ var/item_name = pref.all_underwear[UWC.name] ? pref.all_underwear[UWC.name] : "None"
+ . += "[UWC.name]: [item_name]"
+ var/datum/category_item/underwear/UWI = UWC.items_by_name[item_name]
+ if(UWI)
+ for(var/datum/gear_tweak/gt in UWI.tweaks)
+ . += " [gt.get_contents(get_metadata(UWC.name, gt))]"
+
+ . += "
"
. += "Backpack Type: [backbaglist[pref.backbag]]
"
. += "PDA Type: [pdachoicelist[pref.pdachoice]]
"
-/datum/category_item/player_setup_item/general/equipment/proc/get_undies_top()
- return underwear_top_t
-/datum/category_item/player_setup_item/general/equipment/proc/get_undies_bottom()
- return underwear_bottom_t
+ return jointext(.,null)
+
+/datum/category_item/player_setup_item/general/equipment/proc/get_metadata(var/underwear_category, var/datum/gear_tweak/gt)
+ var/metadata = pref.all_underwear_metadata[underwear_category]
+ if(!metadata)
+ metadata = list()
+ pref.all_underwear_metadata[underwear_category] = metadata
+
+ var/tweak_data = metadata["[gt]"]
+ if(!tweak_data)
+ tweak_data = gt.get_default()
+ metadata["[gt]"] = tweak_data
+ return tweak_data
+
+/datum/category_item/player_setup_item/general/equipment/proc/set_metadata(var/underwear_category, var/datum/gear_tweak/gt, var/new_metadata)
+ var/list/metadata = pref.all_underwear_metadata[underwear_category]
+ metadata["[gt]"] = new_metadata
+
/datum/category_item/player_setup_item/general/equipment/OnTopic(var/href,var/list/href_list, var/mob/user)
- if(href_list["change_underwear_top"])
- var/underwear_top_options = get_undies_top()
- var/new_underwear_top = input(user, "Choose your character's top underwear:", "Character Preference", get_key_by_value(get_undies_top(),pref.underwear_top)) as null|anything in underwear_top_options
- if(!isnull(new_underwear_top) && CanUseTopic(user))
- pref.underwear_top = underwear_top_options[new_underwear_top]
- return TOPIC_REFRESH
-
- else if(href_list["change_underwear_bottom"])
- var/underwear_bottom_options = get_undies_bottom()
- var/new_underwear_bottom = input(user, "Choose your character's bottom underwear:", "Character Preference", get_key_by_value(get_undies_bottom(),pref.underwear_bottom)) as null|anything in underwear_bottom_options
- if(!isnull(new_underwear_bottom) && CanUseTopic(user))
- pref.underwear_bottom = underwear_bottom_options[new_underwear_bottom]
- return TOPIC_REFRESH
-
- else if(href_list["change_undershirt"])
- var/new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference", get_key_by_value(undershirt_t,pref.undershirt)) as null|anything in undershirt_t
- if(!isnull(new_undershirt) && CanUseTopic(user))
- pref.undershirt = undershirt_t[new_undershirt]
- return TOPIC_REFRESH
-
- else if(href_list["change_socks"])
- var/new_socks = input(user, "Choose your character's socks:", "Character Preference", get_key_by_value(socks_t,pref.socks)) as null|anything in socks_t
- if(!isnull(new_socks) && CanUseTopic(user))
- pref.socks = socks_t[new_socks]
- return TOPIC_REFRESH
-
- else if(href_list["change_backpack"])
+ if(href_list["change_backpack"])
var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference", backbaglist[pref.backbag]) as null|anything in backbaglist
if(!isnull(new_backbag) && CanUseTopic(user))
pref.backbag = backbaglist.Find(new_backbag)
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["change_pda"])
var/new_pdachoice = input(user, "Choose your character's style of PDA:", "Character Preference", pdachoicelist[pref.pdachoice]) as null|anything in pdachoicelist
if(!isnull(new_pdachoice) && CanUseTopic(user))
pref.pdachoice = pdachoicelist.Find(new_pdachoice)
return TOPIC_REFRESH
- return ..()
+
+ else if(href_list["change_underwear"])
+ var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[href_list["change_underwear"]]
+ if(!UWC)
+ return
+ var/datum/category_item/underwear/selected_underwear = input(user, "Choose underwear:", "Character Preference", pref.all_underwear[UWC.name]) as null|anything in UWC.items
+ if(selected_underwear && CanUseTopic(user))
+ pref.all_underwear[UWC.name] = selected_underwear.name
+ return TOPIC_REFRESH_UPDATE_PREVIEW
+
+ else if(href_list["underwear"] && href_list["tweak"])
+ var/underwear = href_list["underwear"]
+ if(!(underwear in pref.all_underwear))
+ return TOPIC_NOACTION
+ var/datum/gear_tweak/gt = locate(href_list["tweak"])
+ if(!gt)
+ return TOPIC_NOACTION
+ var/new_metadata = gt.get_metadata(usr, get_metadata(underwear, gt))
+ if(new_metadata)
+ set_metadata(underwear, gt, new_metadata)
+ return TOPIC_REFRESH_UPDATE_PREVIEW
+
+ return ..()
\ No newline at end of file
diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm
index e0e0356a6cf..d446a8f9505 100644
--- a/code/modules/client/preference_setup/global/setting_datums.dm
+++ b/code/modules/client/preference_setup/global/setting_datums.dm
@@ -5,7 +5,7 @@ var/list/_client_preferences_by_type
/proc/get_client_preferences()
if(!_client_preferences)
_client_preferences = list()
- for(var/ct in subtypes(/datum/client_preference))
+ for(var/ct in subtypesof(/datum/client_preference))
var/datum/client_preference/client_type = ct
if(initial(client_type.description))
_client_preferences += new client_type()
diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks.dm b/code/modules/client/preference_setup/loadout/gear_tweaks.dm
index 820c95f3248..e8b1a56d621 100644
--- a/code/modules/client/preference_setup/loadout/gear_tweaks.dm
+++ b/code/modules/client/preference_setup/loadout/gear_tweaks.dm
@@ -17,8 +17,6 @@
* Color adjustment
*/
-var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
-
/datum/gear_tweak/color
var/list/valid_colors
@@ -32,10 +30,10 @@ var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
/datum/gear_tweak/color/get_default()
return valid_colors ? valid_colors[1] : COLOR_GRAY
-/datum/gear_tweak/color/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/color/get_metadata(var/user, var/metadata, var/title = "Character Preference")
if(valid_colors)
- return input(user, "Choose an item color.", "Character Preference", metadata) as null|anything in valid_colors
- return input(user, "Choose an item color.", "Global Preference", metadata) as color|null
+ return input(user, "Choose a color.", title, metadata) as null|anything in valid_colors
+ return input(user, "Choose a color.", title, metadata) as color|null
/datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata)
if(valid_colors && !(metadata in valid_colors))
diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm
index e2d73ff8b3f..dd494b03bcc 100644
--- a/code/modules/client/preference_setup/loadout/loadout.dm
+++ b/code/modules/client/preference_setup/loadout/loadout.dm
@@ -63,6 +63,8 @@ var/list/gear_datums = list()
return valid_gear_choices
/datum/category_item/player_setup_item/loadout/sanitize_character()
+ if(!islist(pref.gear))
+ pref.gear = list()
for(var/gear_name in pref.gear)
if(!(gear_name in gear_datums))
@@ -169,7 +171,7 @@ var/list/gear_datums = list()
if(istype(G)) total_cost += G.cost
if((total_cost+TG.cost) <= MAX_GEAR_COST)
pref.gear += TG.display_name
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
if(href_list["gear"] && href_list["tweak"])
var/datum/gear/gear = gear_datums[href_list["gear"]]
var/datum/gear_tweak/tweak = locate(href_list["tweak"])
@@ -179,13 +181,13 @@ var/list/gear_datums = list()
if(!metadata || !CanUseTopic(user))
return TOPIC_NOACTION
set_tweak_metadata(gear, tweak, metadata)
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["select_category"])
current_tab = href_list["select_category"]
return TOPIC_REFRESH
else if(href_list["clear_loadout"])
pref.gear.Cut()
- return TOPIC_REFRESH
+ return TOPIC_REFRESH_UPDATE_PREVIEW
return ..()
/datum/gear
diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
index a5c66d2e797..a90373d2195 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
@@ -53,10 +53,34 @@
display_name = "tie, blue"
path = /obj/item/clothing/accessory/blue
+/datum/gear/accessory/tie/blue_clip
+ display_name = "tie, blue with clip"
+ path = /obj/item/clothing/accessory/blue_clip
+
+/datum/gear/accessory/tie/blue_long
+ display_name = "tie, blue long"
+ path = /obj/item/clothing/accessory/blue_long
+
/datum/gear/accessory/tie/red
display_name = "tie, red"
path = /obj/item/clothing/accessory/red
+/datum/gear/accessory/tie/red_clip
+ display_name = "tie, red with clip"
+ path = /obj/item/clothing/accessory/red_clip
+
+/datum/gear/accessory/tie/red_long
+ display_name = "tie, red long"
+ path = /obj/item/clothing/accessory/red_long
+
+/datum/gear/accessory/tie/yellow
+ display_name = "tie, yellow"
+ path = /obj/item/clothing/accessory/yellow
+
+/datum/gear/accessory/tie/navy
+ display_name = "tie, navy blue"
+ path = /obj/item/clothing/accessory/navy
+
/datum/gear/accessory/tie/horrible
display_name = "tie, socially disgraceful"
path = /obj/item/clothing/accessory/horrible
@@ -121,6 +145,30 @@
display_name = "scarf, striped blue"
path = /obj/item/clothing/accessory/stripedbluescarf
+/datum/gear/accessory/suitjacket
+ display_name = "suit jacket, tan"
+ path = /obj/item/clothing/accessory/tan_jacket
+
+/datum/gear/accessory/suitjacket/charcoal
+ display_name = "suit jacket, charcoal"
+ path = /obj/item/clothing/accessory/charcoal_jacket
+
+/datum/gear/accessory/suitjacket/navy
+ display_name = "suit jacket, navy blue"
+ path = /obj/item/clothing/accessory/navy_jacket
+
+/datum/gear/accessory/suitjacket/burgundy
+ display_name = "suit jacket, burgundy"
+ path = /obj/item/clothing/accessory/burgundy_jacket
+
+/datum/gear/accessory/suitjacket/checkered
+ display_name = "suit jacket, checkered"
+ path = /obj/item/clothing/accessory/checkered_jacket
+
+/datum/gear/accessory/suitvest
+ display_name = "suit vest"
+ path = /obj/item/clothing/accessory/vest
+
/datum/gear/accessory/brown_vest
display_name = "webbing, engineering"
path = /obj/item/clothing/accessory/storage/brown_vest
diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm
index 09dd7f573e4..b3704bfb0c5 100644
--- a/code/modules/client/preference_setup/occupation/occupation.dm
+++ b/code/modules/client/preference_setup/occupation/occupation.dm
@@ -160,10 +160,10 @@
var/choice = input("Choose an title for [job.title].", "Choose Title", pref.GetPlayerAltTitle(job)) as anything in choices|null
if(choice && CanUseTopic(user))
SetPlayerAltTitle(job, choice)
- return TOPIC_REFRESH
+ return (pref.dress_mob ? TOPIC_REFRESH_UPDATE_PREVIEW : TOPIC_REFRESH)
else if(href_list["set_job"])
- if(SetJob(user, href_list["set_job"])) return TOPIC_REFRESH
+ if(SetJob(user, href_list["set_job"])) return (pref.dress_mob ? TOPIC_REFRESH_UPDATE_PREVIEW : TOPIC_REFRESH)
return ..()
diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm
index a890db16f51..7028894fda4 100644
--- a/code/modules/client/preference_setup/preference_setup.dm
+++ b/code/modules/client/preference_setup/preference_setup.dm
@@ -1,7 +1,8 @@
-// These are not flags, binary operations not intended
#define TOPIC_NOACTION 0
#define TOPIC_HANDLED 1
#define TOPIC_REFRESH 2
+#define TOPIC_UPDATE_PREVIEW 4
+#define TOPIC_REFRESH_UPDATE_PREVIEW (TOPIC_REFRESH|TOPIC_UPDATE_PREVIEW)
/datum/category_group/player_setup_category/general_preferences
name = "General"
@@ -217,7 +218,9 @@
return 1
. = OnTopic(href, href_list, usr)
- if(. == TOPIC_REFRESH)
+ if(. & TOPIC_UPDATE_PREVIEW)
+ pref_mob.client.prefs.preview_icon = null
+ if(. & TOPIC_REFRESH)
pref_mob.client.prefs.ShowChoices(usr)
/datum/category_item/player_setup_item/CanUseTopic(var/mob/user)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 0e9bf5323bd..665ea5836c1 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -28,10 +28,6 @@ datum/preferences
var/age = 30 //age of character
var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2).
var/b_type = "A+" //blood type (not-chooseable)
- var/underwear_top
- var/underwear_bottom
- var/undershirt //undershirt type
- var/socks //socks type
var/backbag = 2 //backpack type
var/pdachoice = 1 //PDA type
var/h_style = "Bald" //Hair type
@@ -63,8 +59,6 @@ datum/preferences
//Mob preview
var/icon/preview_icon = null
- var/icon/preview_icon_front = null
- var/icon/preview_icon_side = null
//Jobs, uses bitflags
var/job_civilian_high = 0
@@ -122,7 +116,7 @@ datum/preferences
player_setup = new(src)
set_biological_gender(pick(MALE, FEMALE))
real_name = random_name(identifying_gender,species)
- b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
+ b_type = RANDOM_BLOOD_TYPE
gear = list()
@@ -213,7 +207,7 @@ datum/preferences
dat += "
"
- text += getProcessTable()
- text += "
"
-
- usr << browse(text, "window=processSchedulerContext;size=800x600")
-
-/datum/processSchedulerView/proc/bootstrap_browse()
- usr << browse('bower_components/jquery/dist/jquery.min.js', "file=jquery.min.js;display=0")
- usr << browse('bower_components/bootstrap2.3.2/bootstrap/js/bootstrap.min.js', "file=bootstrap.min.js;display=0")
- usr << browse('bower_components/bootstrap2.3.2/bootstrap/css/bootstrap.min.css', "file=bootstrap.min.css;display=0")
- usr << browse('bower_components/bootstrap2.3.2/bootstrap/img/glyphicons-halflings-white.png', "file=glyphicons-halflings-white.png;display=0")
- usr << browse('bower_components/bootstrap2.3.2/bootstrap/img/glyphicons-halflings.png', "file=glyphicons-halflings.png;display=0")
- usr << browse('bower_components/json2/json2.js', "file=json2.js;display=0")
-
-/datum/processSchedulerView/proc/bootstrap_includes()
- return {"
-
-
-
-
- "}
diff --git a/code/controllers/ProcessScheduler/test/testDyingUpdateQueueProcess.dm b/code/controllers/ProcessScheduler/test/testDyingUpdateQueueProcess.dm
deleted file mode 100644
index d08ec46c7da..00000000000
--- a/code/controllers/ProcessScheduler/test/testDyingUpdateQueueProcess.dm
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * testDyingUpdateQueueProcess
- * This process is an example of a process using an updateQueue.
- * The datums updated by this process behave badly and block the update loop
- * by sleeping. If you #define UPDATE_QUEUE_DEBUG, you will see the updateQueue
- * killing off its worker processes and spawning new ones to work around slow
- * updates. This means that if you have a code path that sleeps for a long time
- * in mob.Life once in a blue moon, the mob update loop will not hang.
- */
-/datum/slowTestDatum/proc/wackyUpdateProcessName()
- sleep(rand(0,20)) // Randomly REALLY slow :|
-
-/datum/controller/process/testDyingUpdateQueueProcess
- var/tmp/datum/updateQueue/updateQueueInstance
- var/tmp/list/testDatums = list()
-
-/datum/controller/process/testDyingUpdateQueueProcess/setup()
- name = "Dying UpdateQueue Process"
- schedule_interval = 30 // every 3 seconds
- updateQueueInstance = new
- for(var/i = 1, i < 30, i++)
- testDatums.Add(new /datum/slowTestDatum)
-
-/datum/controller/process/testDyingUpdateQueueProcess/doWork()
- updateQueueInstance.init(testDatums, "wackyUpdateProcessName")
- updateQueueInstance.Run()
-
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/test/testHarness.dm b/code/controllers/ProcessScheduler/test/testHarness.dm
deleted file mode 100644
index 2b5f1dff813..00000000000
--- a/code/controllers/ProcessScheduler/test/testHarness.dm
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- These are simple defaults for your project.
- */
-#define DEBUG
-
-var/global/datum/processSchedulerView/processSchedulerView
-
-world
- loop_checks = 0
- New()
- ..()
- processScheduler = new
- processSchedulerView = new
-
-mob
- step_size = 8
-
- New()
- ..()
-
-
- verb
- startProcessScheduler()
- set name = "Start Process Scheduler"
- processScheduler.setup()
- processScheduler.start()
-
- getProcessSchedulerContext()
- set name = "Get Process Scheduler Status Panel"
- processSchedulerView.getContext()
-
- runUpdateQueueTests()
- set name = "Run Update Queue Testsuite"
- var/datum/updateQueueTests/t = new
- t.runTests()
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/test/testHungProcess.dm b/code/controllers/ProcessScheduler/test/testHungProcess.dm
deleted file mode 100644
index ced05dd4d70..00000000000
--- a/code/controllers/ProcessScheduler/test/testHungProcess.dm
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * testHungProcess
- * This process is an example of a simple update loop process that hangs.
- */
-
-/datum/controller/process/testHungProcess/setup()
- name = "Hung Process"
- schedule_interval = 30 // every 3 seconds
-
-/datum/controller/process/testHungProcess/doWork()
- sleep(1000) // FUCK
- // scheck is also responsible for handling hung processes. If a process
- // hangs, and later resumes, but has already been killed by the scheduler,
- // scheck will force the process to bail out.
- scheck()
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/test/testNiceProcess.dm b/code/controllers/ProcessScheduler/test/testNiceProcess.dm
deleted file mode 100644
index aa921bc62fa..00000000000
--- a/code/controllers/ProcessScheduler/test/testNiceProcess.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * testNiceProcess
- * This process is an example of a simple update loop process that is
- * relatively fast.
- */
-
-/datum/controller/process/testNiceProcess/setup()
- name = "Nice Process"
- schedule_interval = 10 // every second
-
-/datum/controller/process/testNiceProcess/doWork()
- sleep(rand(1,5)) // Just to pretend we're doing something
-
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/test/testSlowProcess.dm b/code/controllers/ProcessScheduler/test/testSlowProcess.dm
deleted file mode 100644
index b7c9e6e21e8..00000000000
--- a/code/controllers/ProcessScheduler/test/testSlowProcess.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * testSlowProcess
- * This process is an example of a simple update loop process that is slow.
- * The update loop here sleeps inside to provide an example, but if you had
- * a computationally intensive loop process that is simply slow, you can use
- * scheck() inside the loop to force it to yield periodically according to
- * the sleep_interval var. By default, scheck will cause a loop to sleep every
- * 2 ticks.
- */
-
-/datum/controller/process/testSlowProcess/setup()
- name = "Slow Process"
- schedule_interval = 30 // every 3 seconds
-
-/datum/controller/process/testSlowProcess/doWork()
- // set background = 1 will cause loop constructs to sleep periodically,
- // whenever the BYOND scheduler deems it productive to do so.
- // This behavior is not always sufficient, nor is it always consistent.
- // Rather than leaving it up to the BYOND scheduler, we can control it
- // ourselves and leave nothing to the black box.
- set background = 1
-
- for(var/i=1,i<30,i++)
- // Just to pretend we're doing something here
- sleep(rand(3, 5))
-
- // Forces this loop to yield(sleep) periodically.
- scheck()
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/test/testUpdateQueue.dm b/code/controllers/ProcessScheduler/test/testUpdateQueue.dm
deleted file mode 100644
index 07b64e927f3..00000000000
--- a/code/controllers/ProcessScheduler/test/testUpdateQueue.dm
+++ /dev/null
@@ -1,209 +0,0 @@
-var/global/list/updateQueueTestCount = list()
-
-/datum/updateQueueTests
- var/start
- proc
- runTests()
- world << "Running 9 tests..."
- testUpdateQueuePerformance()
- sleep(1)
- testInplace()
- sleep(1)
- testInplaceUpdateQueuePerformance()
- sleep(1)
- testUpdateQueueReinit()
- sleep(1)
- testCrashingQueue()
- sleep(1)
- testEmptyQueue()
- sleep(1)
- testManySlowItemsInQueue()
- sleep(1)
- testVariableWorkerTimeout()
- sleep(1)
- testReallySlowItemInQueue()
- sleep(1)
- world << "Finished!"
-
- beginTiming()
- start = world.time
-
- endTiming(text)
- var/time = (world.time - start) / world.tick_lag
- world << {"Performance - [text] - [time] ticks"}
-
- getCount()
- return updateQueueTestCount[updateQueueTestCount.len]
-
- incrementTestCount()
- updateQueueTestCount.len++
- updateQueueTestCount[updateQueueTestCount.len] = 0
-
- assertCountEquals(count, text)
- assertThat(getCount() == count, text)
-
- assertCountLessThan(count, text)
- assertThat(getCount() < count, text)
-
- assertCountGreaterThan(count, text)
- assertThat(getCount() > count, text)
-
- assertThat(condition, text)
- if (condition)
- world << {"PASS: [text]"}
- else
- world << {"FAIL: [text]"}
-
- testUpdateQueuePerformance()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=100000,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
-
- var/datum/updateQueue/uq = new(objs)
-
- beginTiming()
- uq.Run()
- endTiming("updating 100000 simple objects")
-
- assertCountEquals(100000, "test that update queue updates all objects expected")
- del(objs)
- del(uq)
-
- testUpdateQueueReinit()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=100,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
-
- var/datum/updateQueue/uq = new(objs)
- uq.Run()
- objs = new
-
- for(var/i=1,i<=100,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
- uq.init(objs)
- uq.Run()
- assertCountEquals(200, "test that update queue reinitializes properly and updates all objects as expected.")
- del(objs)
- del(uq)
-
- testInplace()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=100,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
- var/datum/updateQueue/uq = new(objects = objs, inplace = 1)
- uq.Run()
- assertThat(objs.len == 0, "test that update queue inplace option really works inplace")
- assertCountEquals(100, "test that inplace update queue updates the right number of objects")
- del(objs)
- del(uq)
-
- testInplaceUpdateQueuePerformance()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=100000,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
-
- var/datum/updateQueue/uq = new(objs)
-
- beginTiming()
- uq.Run()
- endTiming("updating 100000 simple objects in place")
- del(objs)
- del(uq)
-
- testCrashingQueue()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=10,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
- objs.Add(new /datum/uqTestDatum/crasher(updateQueueTestCount.len))
- for(var/i=1,i<=10,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
-
- var/datum/updateQueue/uq = new(objs)
- uq.Run()
- assertCountEquals(20, "test that update queue handles crashed update procs OK")
- del(objs)
- del(uq)
-
- testEmptyQueue()
- incrementTestCount()
- var/list/objs = new
- var/datum/updateQueue/uq = new(objs)
- uq.Run()
- assertCountEquals(0, "test that update queue doesn't barf on empty lists")
- del(objs)
- del(uq)
-
- testManySlowItemsInQueue()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=30,i++)
- objs.Add(new /datum/uqTestDatum/slow(updateQueueTestCount.len))
- var/datum/updateQueue/uq = new(objs)
- uq.Run()
- assertCountEquals(30, "test that update queue slows down execution if too many objects are slow to update")
- del(objs)
- del(uq)
-
- testVariableWorkerTimeout()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=20,i++)
- objs.Add(new /datum/uqTestDatum/slow(updateQueueTestCount.len))
- var/datum/updateQueue/uq = new(objs, workerTimeout=6)
- uq.Run()
- assertCountEquals(20, "test that variable worker timeout works properly")
- del(objs)
- del(uq)
-
- testReallySlowItemInQueue()
- incrementTestCount()
- var/list/objs = new
- for(var/i=1,i<=10,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
- objs.Add(new /datum/uqTestDatum/reallySlow(updateQueueTestCount.len))
- for(var/i=1,i<=10,i++)
- objs.Add(new /datum/uqTestDatum/fast(updateQueueTestCount.len))
- var/datum/updateQueue/uq = new(objs)
- uq.Run()
- assertCountEquals(20, "test that update queue skips objects that are too slow to update")
- del(objs)
- del(uq)
-
-
-
-datum/uqTestDatum
- var/testNum
- New(testNum)
- ..()
- src.testNum = testNum
- proc/update()
- updateQueueTestCount[testNum]++
- proc/lag(cycles)
- set background = 1
- for(var/i=0,i" + for(var/datum/category_group/underwear/UWC in global_underwear.categories) + var/datum/category_item/underwear/UWI = H.all_underwear[UWC.name] + var/item_name = UWI ? UWI.name : "None" + dat += "[UWC.name]: [item_name]" + if(UWI) + for(var/datum/gear_tweak/gt in UWI.tweaks) + dat += " [gt.get_contents(get_metadata(H, UWC.name, gt))]" + dat += " (Remove)
" + + dat = jointext(dat,null) + H << browse(dat, "window=wardrobe;size=400x200") + +/obj/structure/undies_wardrobe/proc/get_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt) + var/metadata = H.all_underwear_metadata[underwear_category] + if(!metadata) + metadata = list() + H.all_underwear_metadata[underwear_category] = metadata + + var/tweak_data = metadata["[gt]"] + if(!tweak_data) + tweak_data = gt.get_default() + metadata["[gt]"] = tweak_data + return tweak_data + +/obj/structure/undies_wardrobe/proc/set_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt, var/new_metadata) + var/list/metadata = H.all_underwear_metadata[underwear_category] + metadata["[gt]"] = new_metadata + +/obj/structure/undies_wardrobe/proc/human_who_can_use_underwear(var/mob/living/carbon/human/H) + if(!istype(H) || !H.species || !(H.species.appearance_flags & HAS_UNDERWEAR)) + return FALSE + return TRUE + +/obj/structure/undies_wardrobe/CanUseTopic(var/user) + if(!human_who_can_use_underwear(user)) + return STATUS_CLOSE + + return ..() + +/obj/structure/undies_wardrobe/Topic(href, href_list, state) + if(..()) + return TRUE + + var/mob/living/carbon/human/H = usr + if(href_list["remove_underwear"]) + if(href_list["remove_underwear"] in H.all_underwear) + H.all_underwear -= href_list["remove_underwear"] + . = TRUE + else if(href_list["change_underwear"]) + var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[href_list["change_underwear"]] + if(!UWC) return - if(utype == "Undershirts") - H.undershirt = selection[pick] - else if(utype == "Socks") - H.socks = selection[pick] - else if(utype == "Top") - H.underwear_top = selection[pick] - else - H.underwear_bottom = selection[pick] - H.update_body(1) + var/datum/category_item/underwear/selected_underwear = input(H, "Choose underwear:", "Choose underwear", H.all_underwear[UWC.name]) as null|anything in UWC.items + if(selected_underwear && CanUseTopic(H, default_state)) + H.all_underwear[UWC.name] = selected_underwear + . = TRUE + else if(href_list["underwear"] && href_list["tweak"]) + var/underwear = href_list["underwear"] + if(!(underwear in H.all_underwear)) + return + var/datum/gear_tweak/gt = locate(href_list["tweak"]) + if(!gt) + return + var/new_metadata = gt.get_metadata(usr, get_metadata(H, underwear, gt), "Wardrobe Underwear Selection") + if(new_metadata) + set_metadata(H, underwear, gt, new_metadata) + . = TRUE - return 1 \ No newline at end of file + if(.) + H.update_underwear() + interact(H) \ No newline at end of file diff --git a/code/game/turfs/initialization/maintenance.dm b/code/game/turfs/initialization/maintenance.dm index 5a9574810b1..16b1d03d21e 100644 --- a/code/game/turfs/initialization/maintenance.dm +++ b/code/game/turfs/initialization/maintenance.dm @@ -26,7 +26,7 @@ var/global/list/random_junk if(prob(25)) return /obj/effect/decal/cleanable/generic if(!random_junk) - random_junk = subtypes(/obj/item/trash) + random_junk = subtypesof(/obj/item/trash) random_junk += typesof(/obj/item/weapon/cigbutt) random_junk += /obj/effect/decal/cleanable/spiderling_remains random_junk += /obj/effect/decal/remains/mouse diff --git a/code/global.dm b/code/global.dm index 625712336ca..15b17823f8a 100644 --- a/code/global.dm +++ b/code/global.dm @@ -118,7 +118,6 @@ var/join_motd = null var/datum/nanomanager/nanomanager = new() // NanoManager, the manager for Nano UIs. var/datum/event_manager/event_manager = new() // Event Manager, the manager for events. -var/datum/subsystem/alarm/alarm_manager = new() // Alarm Manager, the manager for alarms. var/list/awaydestinations = list() // Away missions. A list of landmarks that the warpgate can take you to. diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 5d8db9c0729..170f9302f9a 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -234,9 +234,9 @@ Ccomp's first proc. var/list/mobs = list() var/list/ghosts = list() - var/list/sortmob = sortAtom(mob_list) // get the mob list. + var/list/sortmob = sortAtom(mob_list) // get the mob list. var/any=0 - for(var/mob/observer/dead/M in sortmob) + for(var/mob/observer/dead/M in sortmob) mobs.Add(M) //filter it where it's only ghosts any = 1 //if no ghosts show up, any will just be 0 if(!any) @@ -388,7 +388,7 @@ Traitors and the like can also be revived with the previous role mostly intact. else new_character.gender = pick(MALE,FEMALE) var/datum/preferences/A = new() - A.randomize_appearance_for(new_character) + A.randomize_appearance_and_body_for(new_character) new_character.real_name = G_found.real_name if(!new_character.real_name) diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm index 2588836df56..656f54d4778 100644 --- a/code/modules/client/preference_setup/general/01_basic.dm +++ b/code/modules/client/preference_setup/general/01_basic.dm @@ -80,7 +80,7 @@ datum/preferences/proc/set_biological_gender(var/gender) var/new_gender = input(user, "Choose your character's biological gender:", "Character Preference", pref.biological_gender) as null|anything in get_genders() if(new_gender && CanUseTopic(user)) pref.set_biological_gender(new_gender) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["id_gender"]) var/new_gender = input(user, "Choose your character's identifying gender:", "Character Preference", pref.identifying_gender) as null|anything in all_genders_define_list diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index ee93b2acf47..a092b859b31 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -1,5 +1,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-") +/datum/preferences + var/dress_mob = TRUE + /datum/category_item/player_setup_item/general/body name = "Body" sort_order = 3 @@ -25,6 +28,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O S["disabilities"] >> pref.disabilities S["organ_data"] >> pref.organ_data S["rlimb_data"] >> pref.rlimb_data + pref.preview_icon = null /datum/category_item/player_setup_item/general/body/save_character(var/savefile/S) S["species"] << pref.species @@ -74,10 +78,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O /datum/category_item/player_setup_item/general/body/content(var/mob/user) . = list() - pref.update_preview_icon() - if(pref.preview_icon_front && pref.preview_icon_side) - user << browse_rsc(pref.preview_icon_front, "preview_icon.png") - user << browse_rsc(pref.preview_icon_side, "preview_icon2.png") + if(!pref.preview_icon) + pref.update_preview_icon() + user << browse_rsc(pref.preview_icon, "previewicon.png") var/mob_species = all_species[pref.species] . += "
| Body "
@@ -167,7 +170,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else
. += " " - . += " | Preview"
+ . += " | Preview " + . += " [pref.dress_mob ? "Hide equipment" : "Show equipment"]" + . += " |
" @@ -196,8 +202,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/datum/species/mob_species = all_species[pref.species] if(href_list["random"]) - pref.randomize_appearance_for() - return TOPIC_REFRESH + pref.randomize_appearance_and_body_for() + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["blood_type"]) var/new_b_type = input(user, "Choose your character's blood-type:", "Character Preference") as null|anything in valid_bloodtypes @@ -274,7 +280,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/datum/species/S = all_species[pref.species] pref.age = max(min(pref.age, S.max_age), S.min_age) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["hair_color"]) if(!has_flag(mob_species, HAS_HAIR_COLOR)) @@ -284,7 +290,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.r_hair = hex2num(copytext(new_hair, 2, 4)) pref.g_hair = hex2num(copytext(new_hair, 4, 6)) pref.b_hair = hex2num(copytext(new_hair, 6, 8)) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["hair_style"]) var/list/valid_hairstyles = list() @@ -298,7 +304,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/new_h_style = input(user, "Choose your character's hair style:", "Character Preference", pref.h_style) as null|anything in valid_hairstyles if(new_h_style && CanUseTopic(user)) pref.h_style = new_h_style - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["facial_color"]) if(!has_flag(mob_species, HAS_HAIR_COLOR)) @@ -308,7 +314,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.r_facial = hex2num(copytext(new_facial, 2, 4)) pref.g_facial = hex2num(copytext(new_facial, 4, 6)) pref.b_facial = hex2num(copytext(new_facial, 6, 8)) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["eye_color"]) if(!has_flag(mob_species, HAS_EYE_COLOR)) @@ -318,7 +324,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.r_eyes = hex2num(copytext(new_eyes, 2, 4)) pref.g_eyes = hex2num(copytext(new_eyes, 4, 6)) pref.b_eyes = hex2num(copytext(new_eyes, 6, 8)) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["skin_tone"]) if(!has_flag(mob_species, HAS_SKIN_TONE)) @@ -326,7 +332,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/new_s_tone = input(user, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Character Preference", (-pref.s_tone) + 35) as num|null if(new_s_tone && has_flag(mob_species, HAS_SKIN_TONE) && CanUseTopic(user)) pref.s_tone = 35 - max(min( round(new_s_tone), 220),1) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["skin_color"]) if(!has_flag(mob_species, HAS_SKIN_COLOR)) @@ -336,7 +342,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.r_skin = hex2num(copytext(new_skin, 2, 4)) pref.g_skin = hex2num(copytext(new_skin, 4, 6)) pref.b_skin = hex2num(copytext(new_skin, 6, 8)) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["facial_style"]) var/list/valid_facialhairstyles = list() @@ -354,11 +360,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference", pref.f_style) as null|anything in valid_facialhairstyles if(new_f_style && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user)) pref.f_style = new_f_style - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["reset_limbs"]) reset_limbs() - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["limbs"]) @@ -419,7 +425,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O switch(new_state) if("Normal") - if(limb == BP_TORSO) for(var/other_limb in BP_ALL - BP_TORSO) pref.organ_data[other_limb] = null @@ -444,6 +449,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/list/usable_manufacturers = list() for(var/company in chargen_robolimbs) var/datum/robolimb/M = chargen_robolimbs[company] + if(!(limb in M.parts)) + continue if(tmp_species in M.species_cannot_use) continue usable_manufacturers[company] = M @@ -473,7 +480,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O for(var/internal_organ in list(O_HEART,O_EYES)) pref.organ_data[internal_organ] = "mechanical" - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["organs"]) @@ -511,7 +518,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O else if(href_list["disabilities"]) var/disability_flag = text2num(href_list["disabilities"]) pref.disabilities ^= disability_flag - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["toggle_clothing"]) + pref.dress_mob = !pref.dress_mob + return TOPIC_REFRESH_UPDATE_PREVIEW return ..() diff --git a/code/modules/client/preference_setup/general/04_equipment.dm b/code/modules/client/preference_setup/general/04_equipment.dm index e3565515070..c455cef524a 100644 --- a/code/modules/client/preference_setup/general/04_equipment.dm +++ b/code/modules/client/preference_setup/general/04_equipment.dm @@ -1,90 +1,119 @@ +/datum/preferences + var/list/all_underwear + var/list/all_underwear_metadata + /datum/category_item/player_setup_item/general/equipment name = "Clothing" sort_order = 4 /datum/category_item/player_setup_item/general/equipment/load_character(var/savefile/S) - S["underwear_top"] >> pref.underwear_top - S["underwear_bottom"] >> pref.underwear_bottom - S["undershirt"] >> pref.undershirt - S["socks"] >> pref.socks + S["all_underwear"] >> pref.all_underwear + S["all_underwear_metadata"] >> pref.all_underwear_metadata S["backbag"] >> pref.backbag S["pdachoice"] >> pref.pdachoice /datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S) - S["underwear_top"] << pref.underwear_top - S["underwear_bottom"] << pref.underwear_bottom - S["undershirt"] << pref.undershirt - S["socks"] << pref.socks + S["all_underwear"] << pref.all_underwear + S["all_underwear_metadata"] << pref.all_underwear_metadata S["backbag"] << pref.backbag S["pdachoice"] << pref.pdachoice /datum/category_item/player_setup_item/general/equipment/sanitize_character() + if(!islist(pref.gear)) pref.gear = list() + + if(!istype(pref.all_underwear)) + pref.all_underwear = list() + + for(var/datum/category_group/underwear/WRC in global_underwear.categories) + for(var/datum/category_item/underwear/WRI in WRC.items) + if(WRI.is_default(pref.identifying_gender ? pref.identifying_gender : MALE)) + pref.all_underwear[WRC.name] = WRI.name + break + + if(!istype(pref.all_underwear_metadata)) + pref.all_underwear_metadata = list() + + for(var/underwear_category in pref.all_underwear) + var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[underwear_category] + if(!UWC) + pref.all_underwear -= underwear_category + else + var/datum/category_item/underwear/UWI = UWC.items_by_name[pref.all_underwear[underwear_category]] + if(!UWI) + pref.all_underwear -= underwear_category + + for(var/underwear_metadata in pref.all_underwear_metadata) + if(!(underwear_metadata in pref.all_underwear)) + pref.all_underwear_metadata -= underwear_metadata pref.backbag = sanitize_integer(pref.backbag, 1, backbaglist.len, initial(pref.backbag)) pref.pdachoice = sanitize_integer(pref.pdachoice, 1, pdachoicelist.len, initial(pref.pdachoice)) - if(!islist(pref.gear)) pref.gear = list() - - var/undies_top = get_undies_top() - var/undies_bottom = get_undies_bottom() - if(!get_key_by_value(undies_top, pref.underwear_top)) - pref.underwear_top = undies_top[1] - if(!get_key_by_value(undies_bottom, pref.underwear_bottom)) - pref.underwear_bottom = undies_bottom[1] - if(!get_key_by_value(undershirt_t, pref.undershirt)) - pref.undershirt = undershirt_t[1] - if(!get_key_by_value(socks_t, pref.socks)) - pref.socks = socks_t[1] - /datum/category_item/player_setup_item/general/equipment/content() + . = list() . += "Equipment:
" - . += "Underwear Top: [get_key_by_value(get_undies_top(),pref.underwear_top)]
" - . += "Underwear Bottom: [get_key_by_value(get_undies_bottom(),pref.underwear_bottom)]
" - . += "Undershirt: [get_key_by_value(undershirt_t,pref.undershirt)]
" - . += "Socks: [get_key_by_value(socks_t,pref.socks)]
" + for(var/datum/category_group/underwear/UWC in global_underwear.categories) + var/item_name = pref.all_underwear[UWC.name] ? pref.all_underwear[UWC.name] : "None" + . += "[UWC.name]: [item_name]" + var/datum/category_item/underwear/UWI = UWC.items_by_name[item_name] + if(UWI) + for(var/datum/gear_tweak/gt in UWI.tweaks) + . += " [gt.get_contents(get_metadata(UWC.name, gt))]" + + . += "
" . += "Backpack Type: [backbaglist[pref.backbag]]
" . += "PDA Type: [pdachoicelist[pref.pdachoice]]
" -/datum/category_item/player_setup_item/general/equipment/proc/get_undies_top() - return underwear_top_t -/datum/category_item/player_setup_item/general/equipment/proc/get_undies_bottom() - return underwear_bottom_t + return jointext(.,null) + +/datum/category_item/player_setup_item/general/equipment/proc/get_metadata(var/underwear_category, var/datum/gear_tweak/gt) + var/metadata = pref.all_underwear_metadata[underwear_category] + if(!metadata) + metadata = list() + pref.all_underwear_metadata[underwear_category] = metadata + + var/tweak_data = metadata["[gt]"] + if(!tweak_data) + tweak_data = gt.get_default() + metadata["[gt]"] = tweak_data + return tweak_data + +/datum/category_item/player_setup_item/general/equipment/proc/set_metadata(var/underwear_category, var/datum/gear_tweak/gt, var/new_metadata) + var/list/metadata = pref.all_underwear_metadata[underwear_category] + metadata["[gt]"] = new_metadata + /datum/category_item/player_setup_item/general/equipment/OnTopic(var/href,var/list/href_list, var/mob/user) - if(href_list["change_underwear_top"]) - var/underwear_top_options = get_undies_top() - var/new_underwear_top = input(user, "Choose your character's top underwear:", "Character Preference", get_key_by_value(get_undies_top(),pref.underwear_top)) as null|anything in underwear_top_options - if(!isnull(new_underwear_top) && CanUseTopic(user)) - pref.underwear_top = underwear_top_options[new_underwear_top] - return TOPIC_REFRESH - - else if(href_list["change_underwear_bottom"]) - var/underwear_bottom_options = get_undies_bottom() - var/new_underwear_bottom = input(user, "Choose your character's bottom underwear:", "Character Preference", get_key_by_value(get_undies_bottom(),pref.underwear_bottom)) as null|anything in underwear_bottom_options - if(!isnull(new_underwear_bottom) && CanUseTopic(user)) - pref.underwear_bottom = underwear_bottom_options[new_underwear_bottom] - return TOPIC_REFRESH - - else if(href_list["change_undershirt"]) - var/new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference", get_key_by_value(undershirt_t,pref.undershirt)) as null|anything in undershirt_t - if(!isnull(new_undershirt) && CanUseTopic(user)) - pref.undershirt = undershirt_t[new_undershirt] - return TOPIC_REFRESH - - else if(href_list["change_socks"]) - var/new_socks = input(user, "Choose your character's socks:", "Character Preference", get_key_by_value(socks_t,pref.socks)) as null|anything in socks_t - if(!isnull(new_socks) && CanUseTopic(user)) - pref.socks = socks_t[new_socks] - return TOPIC_REFRESH - - else if(href_list["change_backpack"]) + if(href_list["change_backpack"]) var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference", backbaglist[pref.backbag]) as null|anything in backbaglist if(!isnull(new_backbag) && CanUseTopic(user)) pref.backbag = backbaglist.Find(new_backbag) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["change_pda"]) var/new_pdachoice = input(user, "Choose your character's style of PDA:", "Character Preference", pdachoicelist[pref.pdachoice]) as null|anything in pdachoicelist if(!isnull(new_pdachoice) && CanUseTopic(user)) pref.pdachoice = pdachoicelist.Find(new_pdachoice) return TOPIC_REFRESH - return ..() + + else if(href_list["change_underwear"]) + var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[href_list["change_underwear"]] + if(!UWC) + return + var/datum/category_item/underwear/selected_underwear = input(user, "Choose underwear:", "Character Preference", pref.all_underwear[UWC.name]) as null|anything in UWC.items + if(selected_underwear && CanUseTopic(user)) + pref.all_underwear[UWC.name] = selected_underwear.name + return TOPIC_REFRESH_UPDATE_PREVIEW + + else if(href_list["underwear"] && href_list["tweak"]) + var/underwear = href_list["underwear"] + if(!(underwear in pref.all_underwear)) + return TOPIC_NOACTION + var/datum/gear_tweak/gt = locate(href_list["tweak"]) + if(!gt) + return TOPIC_NOACTION + var/new_metadata = gt.get_metadata(usr, get_metadata(underwear, gt)) + if(new_metadata) + set_metadata(underwear, gt, new_metadata) + return TOPIC_REFRESH_UPDATE_PREVIEW + + return ..() \ No newline at end of file diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm index e0e0356a6cf..d446a8f9505 100644 --- a/code/modules/client/preference_setup/global/setting_datums.dm +++ b/code/modules/client/preference_setup/global/setting_datums.dm @@ -5,7 +5,7 @@ var/list/_client_preferences_by_type /proc/get_client_preferences() if(!_client_preferences) _client_preferences = list() - for(var/ct in subtypes(/datum/client_preference)) + for(var/ct in subtypesof(/datum/client_preference)) var/datum/client_preference/client_type = ct if(initial(client_type.description)) _client_preferences += new client_type() diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks.dm b/code/modules/client/preference_setup/loadout/gear_tweaks.dm index 820c95f3248..e8b1a56d621 100644 --- a/code/modules/client/preference_setup/loadout/gear_tweaks.dm +++ b/code/modules/client/preference_setup/loadout/gear_tweaks.dm @@ -17,8 +17,6 @@ * Color adjustment */ -var/datum/gear_tweak/color/gear_tweak_free_color_choice = new() - /datum/gear_tweak/color var/list/valid_colors @@ -32,10 +30,10 @@ var/datum/gear_tweak/color/gear_tweak_free_color_choice = new() /datum/gear_tweak/color/get_default() return valid_colors ? valid_colors[1] : COLOR_GRAY -/datum/gear_tweak/color/get_metadata(var/user, var/metadata) +/datum/gear_tweak/color/get_metadata(var/user, var/metadata, var/title = "Character Preference") if(valid_colors) - return input(user, "Choose an item color.", "Character Preference", metadata) as null|anything in valid_colors - return input(user, "Choose an item color.", "Global Preference", metadata) as color|null + return input(user, "Choose a color.", title, metadata) as null|anything in valid_colors + return input(user, "Choose a color.", title, metadata) as color|null /datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata) if(valid_colors && !(metadata in valid_colors)) diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index e2d73ff8b3f..dd494b03bcc 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -63,6 +63,8 @@ var/list/gear_datums = list() return valid_gear_choices /datum/category_item/player_setup_item/loadout/sanitize_character() + if(!islist(pref.gear)) + pref.gear = list() for(var/gear_name in pref.gear) if(!(gear_name in gear_datums)) @@ -169,7 +171,7 @@ var/list/gear_datums = list() if(istype(G)) total_cost += G.cost if((total_cost+TG.cost) <= MAX_GEAR_COST) pref.gear += TG.display_name - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW if(href_list["gear"] && href_list["tweak"]) var/datum/gear/gear = gear_datums[href_list["gear"]] var/datum/gear_tweak/tweak = locate(href_list["tweak"]) @@ -179,13 +181,13 @@ var/list/gear_datums = list() if(!metadata || !CanUseTopic(user)) return TOPIC_NOACTION set_tweak_metadata(gear, tweak, metadata) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["select_category"]) current_tab = href_list["select_category"] return TOPIC_REFRESH else if(href_list["clear_loadout"]) pref.gear.Cut() - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW return ..() /datum/gear diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index a5c66d2e797..a90373d2195 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -53,10 +53,34 @@ display_name = "tie, blue" path = /obj/item/clothing/accessory/blue +/datum/gear/accessory/tie/blue_clip + display_name = "tie, blue with clip" + path = /obj/item/clothing/accessory/blue_clip + +/datum/gear/accessory/tie/blue_long + display_name = "tie, blue long" + path = /obj/item/clothing/accessory/blue_long + /datum/gear/accessory/tie/red display_name = "tie, red" path = /obj/item/clothing/accessory/red +/datum/gear/accessory/tie/red_clip + display_name = "tie, red with clip" + path = /obj/item/clothing/accessory/red_clip + +/datum/gear/accessory/tie/red_long + display_name = "tie, red long" + path = /obj/item/clothing/accessory/red_long + +/datum/gear/accessory/tie/yellow + display_name = "tie, yellow" + path = /obj/item/clothing/accessory/yellow + +/datum/gear/accessory/tie/navy + display_name = "tie, navy blue" + path = /obj/item/clothing/accessory/navy + /datum/gear/accessory/tie/horrible display_name = "tie, socially disgraceful" path = /obj/item/clothing/accessory/horrible @@ -121,6 +145,30 @@ display_name = "scarf, striped blue" path = /obj/item/clothing/accessory/stripedbluescarf +/datum/gear/accessory/suitjacket + display_name = "suit jacket, tan" + path = /obj/item/clothing/accessory/tan_jacket + +/datum/gear/accessory/suitjacket/charcoal + display_name = "suit jacket, charcoal" + path = /obj/item/clothing/accessory/charcoal_jacket + +/datum/gear/accessory/suitjacket/navy + display_name = "suit jacket, navy blue" + path = /obj/item/clothing/accessory/navy_jacket + +/datum/gear/accessory/suitjacket/burgundy + display_name = "suit jacket, burgundy" + path = /obj/item/clothing/accessory/burgundy_jacket + +/datum/gear/accessory/suitjacket/checkered + display_name = "suit jacket, checkered" + path = /obj/item/clothing/accessory/checkered_jacket + +/datum/gear/accessory/suitvest + display_name = "suit vest" + path = /obj/item/clothing/accessory/vest + /datum/gear/accessory/brown_vest display_name = "webbing, engineering" path = /obj/item/clothing/accessory/storage/brown_vest diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 09dd7f573e4..b3704bfb0c5 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -160,10 +160,10 @@ var/choice = input("Choose an title for [job.title].", "Choose Title", pref.GetPlayerAltTitle(job)) as anything in choices|null if(choice && CanUseTopic(user)) SetPlayerAltTitle(job, choice) - return TOPIC_REFRESH + return (pref.dress_mob ? TOPIC_REFRESH_UPDATE_PREVIEW : TOPIC_REFRESH) else if(href_list["set_job"]) - if(SetJob(user, href_list["set_job"])) return TOPIC_REFRESH + if(SetJob(user, href_list["set_job"])) return (pref.dress_mob ? TOPIC_REFRESH_UPDATE_PREVIEW : TOPIC_REFRESH) return ..() diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm index a890db16f51..7028894fda4 100644 --- a/code/modules/client/preference_setup/preference_setup.dm +++ b/code/modules/client/preference_setup/preference_setup.dm @@ -1,7 +1,8 @@ -// These are not flags, binary operations not intended #define TOPIC_NOACTION 0 #define TOPIC_HANDLED 1 #define TOPIC_REFRESH 2 +#define TOPIC_UPDATE_PREVIEW 4 +#define TOPIC_REFRESH_UPDATE_PREVIEW (TOPIC_REFRESH|TOPIC_UPDATE_PREVIEW) /datum/category_group/player_setup_category/general_preferences name = "General" @@ -217,7 +218,9 @@ return 1 . = OnTopic(href, href_list, usr) - if(. == TOPIC_REFRESH) + if(. & TOPIC_UPDATE_PREVIEW) + pref_mob.client.prefs.preview_icon = null + if(. & TOPIC_REFRESH) pref_mob.client.prefs.ShowChoices(usr) /datum/category_item/player_setup_item/CanUseTopic(var/mob/user) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 0e9bf5323bd..665ea5836c1 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -28,10 +28,6 @@ datum/preferences var/age = 30 //age of character var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2). var/b_type = "A+" //blood type (not-chooseable) - var/underwear_top - var/underwear_bottom - var/undershirt //undershirt type - var/socks //socks type var/backbag = 2 //backpack type var/pdachoice = 1 //PDA type var/h_style = "Bald" //Hair type @@ -63,8 +59,6 @@ datum/preferences //Mob preview var/icon/preview_icon = null - var/icon/preview_icon_front = null - var/icon/preview_icon_side = null //Jobs, uses bitflags var/job_civilian_high = 0 @@ -122,7 +116,7 @@ datum/preferences player_setup = new(src) set_biological_gender(pick(MALE, FEMALE)) real_name = random_name(identifying_gender,species) - b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+") + b_type = RANDOM_BLOOD_TYPE gear = list() @@ -213,7 +207,7 @@ datum/preferences dat += "