"
- HDD.store_file(backup)
- if("PRG_printfile")
- . = 1
- if(!open_file)
- return 1
- if(!HDD)
- return 1
- var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
- if(!F || !istype(F))
- return 1
- if(!printer)
- error = "Missing Hardware: Your computer does not have required hardware to complete this operation."
- return 1
- if(!printer.print_text("" + prepare_printjob(F.stored_data) + "", open_file))
- error = "Hardware error: Printer was unable to print the file. It may be out of paper."
+ var/datum/computer_file/file = RHDD.find_file_by_name(params["name"])
+ if(!file || !istype(file))
return 1
+ var/newname = stripped_input(usr, "Enter new file name:", "File rename", file.filename, max_length=50)
+ if(file && newname)
+ file.filename = newname
if("PRG_copytousb")
. = 1
if(!HDD || !RHDD)
@@ -190,43 +127,29 @@
var/obj/item/computer_hardware/hard_drive/HDD = computer.all_components[MC_HDD]
var/obj/item/computer_hardware/hard_drive/portable/RHDD = computer.all_components[MC_SDD]
- if(error)
- data["error"] = error
- if(open_file)
- var/datum/computer_file/data/file
- if(!computer || !HDD)
- data["error"] = "I/O ERROR: Unable to access hard drive."
- else
- file = HDD.find_file_by_name(open_file)
- if(!istype(file))
- data["error"] = "I/O ERROR: Unable to open file."
- else
- data["filedata"] = parse_tags(file.stored_data)
- data["filename"] = "[file.filename].[file.filetype]"
+ if(!computer || !HDD)
+ data["error"] = "I/O ERROR: Unable to access hard drive."
else
- if(!computer || !HDD)
- data["error"] = "I/O ERROR: Unable to access hard drive."
- else
- var/list/files[0]
- for(var/datum/computer_file/F in HDD.stored_files)
- files.Add(list(list(
+ var/list/files[0]
+ for(var/datum/computer_file/F in HDD.stored_files)
+ files.Add(list(list(
+ "name" = F.filename,
+ "type" = F.filetype,
+ "size" = F.size,
+ "undeletable" = F.undeletable
+ )))
+ data["files"] = files
+ if(RHDD)
+ data["usbconnected"] = TRUE
+ var/list/usbfiles[0]
+ for(var/datum/computer_file/F in RHDD.stored_files)
+ usbfiles.Add(list(list(
"name" = F.filename,
"type" = F.filetype,
"size" = F.size,
"undeletable" = F.undeletable
)))
- data["files"] = files
- if(RHDD)
- data["usbconnected"] = 1
- var/list/usbfiles[0]
- for(var/datum/computer_file/F in RHDD.stored_files)
- usbfiles.Add(list(list(
- "name" = F.filename,
- "type" = F.filetype,
- "size" = F.size,
- "undeletable" = F.undeletable
- )))
- data["usbfiles"] = usbfiles
+ data["usbfiles"] = usbfiles
return data
diff --git a/code/modules/modular_computers/file_system/programs/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/ntdownloader.dm
index 92e1453dc..993e9a01e 100644
--- a/code/modules/modular_computers/file_system/programs/ntdownloader.dm
+++ b/code/modules/modular_computers/file_system/programs/ntdownloader.dm
@@ -10,7 +10,7 @@
requires_ntnet_feature = NTNET_SOFTWAREDOWNLOAD
available_on_ntnet = 0
ui_header = "downloader_finished.gif"
- tgui_id = "ntos_net_downloader"
+ tgui_id = "NtosNetDownloader"
var/datum/computer_file/program/downloaded_file = null
var/hacked_download = 0
diff --git a/code/modules/modular_computers/file_system/programs/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/ntmonitor.dm
index 2312db7b1..07ccaf8af 100644
--- a/code/modules/modular_computers/file_system/programs/ntmonitor.dm
+++ b/code/modules/modular_computers/file_system/programs/ntmonitor.dm
@@ -7,7 +7,7 @@
requires_ntnet = 1
required_access = ACCESS_NETWORK //NETWORK CONTROL IS A MORE SECURE PROGRAM.
available_on_ntnet = 1
- tgui_id = "ntos_net_monitor"
+ tgui_id = "NtosNetMonitor"
/datum/computer_file/program/ntnetmonitor/ui_act(action, params)
if(..())
diff --git a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm
index d8b3f96f4..4ae5bd326 100644
--- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm
+++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm
@@ -9,7 +9,7 @@
network_destination = "NTNRC server"
ui_header = "ntnrc_idle.gif"
available_on_ntnet = 1
- tgui_id = "ntos_net_chat"
+ tgui_id = "NtosNetChat"
ui_x = 900
ui_y = 675
diff --git a/code/modules/modular_computers/file_system/programs/nttransfer.dm b/code/modules/modular_computers/file_system/programs/nttransfer.dm
index 698e55794..ae5423a1a 100644
--- a/code/modules/modular_computers/file_system/programs/nttransfer.dm
+++ b/code/modules/modular_computers/file_system/programs/nttransfer.dm
@@ -8,7 +8,7 @@
requires_ntnet_feature = NTNET_PEERTOPEER
network_destination = "other device via P2P tunnel"
available_on_ntnet = 1
- tgui_id = "ntos_net_transfer"
+ tgui_id = "NtosNetTransfer"
var/error = "" // Error screen
var/server_password = "" // Optional password to download the file.
diff --git a/code/modules/modular_computers/file_system/programs/powermonitor.dm b/code/modules/modular_computers/file_system/programs/powermonitor.dm
index f7c734667..767047619 100644
--- a/code/modules/modular_computers/file_system/programs/powermonitor.dm
+++ b/code/modules/modular_computers/file_system/programs/powermonitor.dm
@@ -11,7 +11,7 @@
requires_ntnet = 0
network_destination = "power monitoring system"
size = 9
- tgui_id = "ntos_power_monitor"
+ tgui_id = "PowerMonitor"
ui_style = "ntos"
ui_x = 550
ui_y = 700
diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
index dbee59bb3..058b0b95b 100644
--- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
@@ -8,7 +8,7 @@
transfer_access = ACCESS_CONSTRUCTION
network_destination = "supermatter monitoring system"
size = 5
- tgui_id = "ntos_supermatter_monitor"
+ tgui_id = "NtosSupermatterMonitor"
ui_style = "ntos"
ui_x = 600
ui_y = 350
diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm
index 2bed456c4..c13b68028 100644
--- a/code/modules/modular_computers/laptop_vendor.dm
+++ b/code/modules/modular_computers/laptop_vendor.dm
@@ -224,7 +224,7 @@
return TRUE
return FALSE
-/obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
if(stat & (BROKEN | NOPOWER | MAINT))
if(ui)
ui.close()
@@ -232,7 +232,7 @@
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if (!ui)
- ui = new(user, src, ui_key, "computer_fabricator", "Personal Computer Vendor", ui_x, ui_y, state = state)
+ ui = new(user, src, ui_key, "ComputerFabricator", "Personal Computer Vendor", ui_x, ui_y, state = state)
ui.open()
/obj/machinery/lapvend/attackby(obj/item/I, mob/user)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 8c44b02e2..b291a295c 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -840,11 +840,11 @@
return
/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "apc", name, 450, 460, master_ui, state)
+ ui = new(user, src, ui_key, "Apc", name, 450, 460, master_ui, state)
ui.open()
/obj/machinery/power/apc/ui_data(mob/user)
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index d0d1e2b47..80e918d05 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -221,10 +221,10 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
return ..()
/obj/machinery/gravity_generator/main/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "gravity_generator", name, 400, 200, master_ui, state)
+ ui = new(user, src, ui_key, "GravityGenerator", name, 400, 200, master_ui, state)
ui.open()
/obj/machinery/gravity_generator/main/ui_data(mob/user)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index a8fa8a147..39072d5b4 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -197,7 +197,7 @@
var/static_power_used = 0
var/brightness = 8 // luminosity when on, also used in power calculation
var/bulb_power = 1 // basically the alpha of the emitted light source
- var/bulb_colour = "#FFFFFF" // befault colour of the light.
+ var/bulb_colour = "#ffefda" // befault colour of the light.
var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN
var/flickering = FALSE
var/light_type = /obj/item/light/tube // the type of light item
@@ -212,13 +212,13 @@
var/nightshift_enabled = FALSE //Currently in night shift mode?
var/nightshift_allowed = TRUE //Set to FALSE to never let this light get switched to night mode.
- var/nightshift_brightness = 8
+ var/nightshift_brightness = 7
var/nightshift_light_power = 0.45
- var/nightshift_light_color = "#FFDDCC"
+ var/nightshift_light_color = "#dafcff"
var/emergency_mode = FALSE // if true, the light is in emergency mode
var/no_emergency = FALSE // if true, this light cannot ever have an emergency mode
- var/bulb_emergency_brightness_mul = 0.25 // multiplier for this light's base brightness in emergency power mode
+ var/bulb_emergency_brightness_mul = 0.6 // multiplier for this light's base brightness in emergency power mode
var/bulb_emergency_colour = "#FF3232" // determines the colour of the light while it's in emergency mode
var/bulb_emergency_pow_mul = 0.75 // the multiplier for determining the light's power in emergency mode
var/bulb_emergency_pow_min = 0.5 // the minimum value for the light's power in emergency mode
diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm
index f4ee102cc..42ab00b36 100644
--- a/code/modules/power/monitor.dm
+++ b/code/modules/power/monitor.dm
@@ -19,7 +19,7 @@
var/record_interval = 50
var/next_record = 0
var/is_secret_monitor = FALSE
- tgui_id = "power_monitor"
+ tgui_id = "PowerMonitor"
ui_style = "ntos"
/obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming.
@@ -84,7 +84,7 @@
demand.Cut(1, 2)
/obj/machinery/computer/monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, tgui_id, name, 550, 700, master_ui, state)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 774f7ba14..ff1deb071 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -314,10 +314,10 @@
/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "smes", name, 340, 440, master_ui, state)
+ ui = new(user, src, ui_key, "Smes", name, 340, 440, master_ui, state)
ui.open()
/obj/machinery/power/smes/ui_data()
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index a0eeae1ea..a3a642f86 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -344,10 +344,10 @@
add_overlay(icon_screen)
/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "solar_control", name, 380, 230, master_ui, state)
+ ui = new(user, src, ui_key, "SolarControl", name, 380, 230, master_ui, state)
ui.open()
/obj/machinery/power/solar_control/ui_data()
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 13b68c404..dc7d7e2aa 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -306,10 +306,10 @@
compressor = locate(/obj/machinery/power/compressor) in range(7, src)
/obj/machinery/computer/turbine_computer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "turbine_computer", name, 300, 200, master_ui, state)
+ ui = new(user, src, ui_key, "TurbineComputer", name, 300, 200, master_ui, state)
ui.open()
/obj/machinery/computer/turbine_computer/ui_data(mob/user)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 9e6cef6e8..ff2643069 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -179,10 +179,10 @@
update_icon()
/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "chem_dispenser", name, 565, 550, master_ui, state)
+ ui = new(user, src, ui_key, "ChemDispenser", name, 565, 550, master_ui, state)
if(user.hallucinating())
ui.set_autoupdate(FALSE) //to not ruin the immersion by constantly changing the fake chemicals
ui.open()
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 0b61f6e45..6ea1b8140 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -104,10 +104,10 @@
return ..()
/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "chem_heater", name, 275, 400, master_ui, state)
+ ui = new(user, src, ui_key, "ChemHeater", name, 275, 400, master_ui, state)
ui.open()
/obj/machinery/chem_heater/ui_data()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index f602ee593..b2cd6d95a 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -153,12 +153,12 @@
return ..()
/obj/machinery/chem_master/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills)
assets.send(user)
- ui = new(user, src, ui_key, "chem_master", name, 500, 550, master_ui, state)
+ ui = new(user, src, ui_key, "ChemMaster", name, 500, 550, master_ui, state)
ui.open()
//Insert our custom spritesheet css link into the html
diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
index ed23e7c75..2425cb8ec 100644
--- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
@@ -13,10 +13,10 @@
)
/obj/machinery/chem_dispenser/chem_synthesizer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "chem_synthesizer", name, 390, 330, master_ui, state)
+ ui = new(user, src, ui_key, "ChemSynthesizer", name, 390, 330, master_ui, state)
ui.open()
/obj/machinery/chem_dispenser/chem_synthesizer/ui_act(action, params)
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 42426b46e..a07c94cae 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -120,10 +120,10 @@
else
cut_overlays()
-/obj/machinery/computer/pandemic/ui_interact(mob/user, ui_key = "main", datum/tgui/ui, force_open = FALSE, datum/tgui/master_ui, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/computer/pandemic/ui_interact(mob/user, ui_key = "main", datum/tgui/ui, force_open = FALSE, datum/tgui/master_ui, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "pandemic", name, 520, 550, master_ui, state)
+ ui = new(user, src, ui_key, "Pandemic", name, 520, 550, master_ui, state)
ui.open()
/obj/machinery/computer/pandemic/ui_data(mob/user)
diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
index 4f97321c3..3573a35ca 100644
--- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm
+++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
@@ -102,10 +102,10 @@
return ..()
/obj/machinery/smoke_machine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "smoke_machine", name, 350, 350, master_ui, state)
+ ui = new(user, src, ui_key, "SmokeMachine", name, 350, 350, master_ui, state)
ui.open()
/obj/machinery/smoke_machine/ui_data(mob/user)
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 4fefc0fd1..8547e5117 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -36,6 +36,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
*/
/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/C)
+ C.adjustPainLoss(-0.25*REM, 0) //alchol dulls pain
if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
var/booze_power = boozepwr
if(HAS_TRAIT(C, TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 6272d3773..f6c1b89c3 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -391,6 +391,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/C)
C.hal_screwyhud = SCREWYHUD_HEALTHY
C.adjustBruteLoss(-0.25*REM, 0)
+ C.adjustPainLoss(-1*REM, 0)
C.adjustFireLoss(-0.25*REM, 0)
C.adjustStaminaLoss(-0.5*REM, 0)
..()
@@ -698,7 +699,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
/datum/reagent/medicine/morphine
name = "Morphine"
- description = "A painkiller that allows the patient to move at full speed even in bulky objects. Causes drowsiness and eventually unconsciousness in high doses. Overdose will cause a variety of effects, ranging from minor to lethal."
+ description = "A painkiller. Causes drowsiness and eventually unconsciousness in high doses. Overdose will cause a variety of effects, ranging from minor to lethal."
reagent_state = LIQUID
color = "#A9FBFB"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -706,23 +707,8 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
addiction_threshold = 25
pH = 8.96
-/datum/reagent/medicine/morphine/on_mob_metabolize(mob/living/L)
- ..()
- L.ignore_slowdown(type)
-
-/datum/reagent/medicine/morphine/on_mob_end_metabolize(mob/living/L)
- L.unignore_slowdown(type)
- ..()
-
/datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/M)
- switch(current_cycle)
- if(11)
- to_chat(M, "You start to feel tired..." )
- if(12 to 24)
- M.drowsyness += 1
- if(24 to INFINITY)
- M.Sleeping(40, 0)
- . = 1
+ M.adjustPainLoss(-3*REM, 0)// very good pain killer.
..()
/datum/reagent/medicine/morphine/overdose_process(mob/living/M)
@@ -1022,6 +1008,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-2*REM, 0)
+ M.adjustPainLoss(-1*REM, 0) //stabilize pain at threshold. and bring it down faster if above.
..()
. = 1
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index cb38d8855..0a577dc44 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -1,371 +1,432 @@
-/obj/item/reagent_containers/glass
- name = "glass"
- amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
- volume = 50
- reagent_flags = OPENCONTAINER
- spillable = TRUE
- resistance_flags = ACID_PROOF
- container_HP = 2
-
-
-/obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target)
- if(!canconsume(M, user))
- return
-
- if(!spillable)
- return
-
- if(!reagents || !reagents.total_volume)
- to_chat(user, "[src] is empty!")
- return
-
- if(istype(M))
- if(user.a_intent == INTENT_HARM)
- M.visible_message("[user] splashes the contents of [src] onto [M]!", \
- "[user] splashes the contents of [src] onto [M]!")
- var/R = reagents?.log_list()
- if(isturf(target) && reagents.reagent_list.len && thrownby)
- log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
- message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
- reagents.reaction(M, TOUCH)
- log_combat(user, M, "splashed", R)
- reagents.clear_reagents()
- else
- if(M != user)
- M.visible_message("[user] attempts to feed something to [M].", \
- "[user] attempts to feed something to you.")
- if(!do_mob(user, M))
- return
- if(!reagents || !reagents.total_volume)
- return // The drink might be empty after the delay, such as by spam-feeding
- M.visible_message("[user] feeds something to [M].", "[user] feeds something to you.")
- log_combat(user, M, "fed", reagents.log_list())
- else
- to_chat(user, "You swallow a gulp of [src].")
- var/fraction = min(5/reagents.total_volume, 1)
- reagents.reaction(M, INGEST, fraction)
- addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5)
- playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
-
-/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
- . = ..()
- if((!proximity) || !check_allowed_items(target,target_self=1))
- return
-
- if(target.is_refillable()) //Something like a glass. Player probably wants to transfer TO it.
- if(!reagents.total_volume)
- to_chat(user, "[src] is empty!")
- return
-
- if(target.reagents.holder_full())
- to_chat(user, "[target] is full.")
- return
-
- var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
- to_chat(user, "You transfer [trans] unit\s of the solution to [target].")
-
- else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
- if(!target.reagents.total_volume)
- to_chat(user, "[target] is empty and can't be refilled!")
- return
-
- if(reagents.holder_full())
- to_chat(user, "[src] is full.")
- return
-
- var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
- to_chat(user, "You fill [src] with [trans] unit\s of the contents of [target].")
-
- else if(reagents.total_volume)
- if(user.a_intent == INTENT_HARM)
- user.visible_message("[user] splashes the contents of [src] onto [target]!", \
- "You splash the contents of [src] onto [target].")
- reagents.reaction(target, TOUCH)
- reagents.clear_reagents()
-
-/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
- var/hotness = I.is_hot()
- if(hotness && reagents)
- reagents.expose_temperature(hotness)
- to_chat(user, "You heat [name] with [I]!")
-
- if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs
- var/obj/item/reagent_containers/food/snacks/egg/E = I
- if(reagents)
- if(reagents.total_volume >= reagents.maximum_volume)
- to_chat(user, "[src] is full.")
- else
- to_chat(user, "You break [E] in [src].")
- E.reagents.trans_to(src, E.reagents.total_volume)
- qdel(E)
- return
- ..()
-
-
-/obj/item/reagent_containers/glass/beaker
- name = "beaker"
- desc = "A beaker. It can hold up to 50 units. Unable to withstand extreme pHes"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "beaker"
- item_state = "beaker"
- materials = list(MAT_GLASS=500)
- beaker_weakness_bitflag = PH_WEAK
-
-/obj/item/reagent_containers/glass/beaker/Initialize()
- . = ..()
- update_icon()
-
-/obj/item/reagent_containers/glass/beaker/get_part_rating()
- return reagents.maximum_volume
-
-/obj/item/reagent_containers/glass/beaker/on_reagent_change(changetype)
- update_icon()
-
-/obj/item/reagent_containers/glass/beaker/update_icon()
- if(!cached_icon)
- cached_icon = icon_state
- cut_overlays()
-
- if(reagents.total_volume)
- var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[cached_icon]10")
-
- var/percent = round((reagents.total_volume / volume) * 100)
- switch(percent)
- if(0 to 9)
- filling.icon_state = "[cached_icon]-10"
- if(10 to 24)
- filling.icon_state = "[cached_icon]10"
- if(25 to 49)
- filling.icon_state = "[cached_icon]25"
- if(50 to 74)
- filling.icon_state = "[cached_icon]50"
- if(75 to 79)
- filling.icon_state = "[cached_icon]75"
- if(80 to 90)
- filling.icon_state = "[cached_icon]80"
- if(91 to INFINITY)
- filling.icon_state = "[cached_icon]100"
-
- filling.color = mix_color_from_reagents(reagents.reagent_list)
- add_overlay(filling)
-
-/obj/item/reagent_containers/glass/beaker/jar
- name = "honey jar"
- desc = "A jar for honey. It can hold up to 50 units of sweet delight. Unable to withstand reagents of an extreme pH."
- icon = 'icons/obj/chemical.dmi'
- icon_state = "vapour"
-
-/obj/item/reagent_containers/glass/beaker/large
- name = "large beaker"
- desc = "A large beaker. Can hold up to 100 units. Unable to withstand reagents of an extreme pH."
- icon_state = "beakerlarge"
- materials = list(MAT_GLASS=2500)
- volume = 100
- amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
- container_HP = 3
-
-/obj/item/reagent_containers/glass/beaker/plastic
- name = "x-large beaker"
- desc = "An extra-large beaker. Can hold up to 150 units. Is able to resist acid and alkaline solutions, but melts at 444K"
- icon_state = "beakerwhite"
- materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000)
- volume = 150
- amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150)
-
-/obj/item/reagent_containers/glass/beaker/plastic/Initialize()
- beaker_weakness_bitflag &= ~PH_WEAK
- beaker_weakness_bitflag |= TEMP_WEAK
- . = ..()
-
-/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
- icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
- ..()
- icon_state = "beakerwhite"
-
-/obj/item/reagent_containers/glass/beaker/meta
- name = "metamaterial beaker"
- desc = "A large beaker. Can hold up to 200 units. Is able to withstand all chemical situations."
- icon_state = "beakergold"
- materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000, MAT_GOLD=1000, MAT_TITANIUM=1000)
- volume = 200
- amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5,10,15,20,25,30,50,100,200)
-
-/obj/item/reagent_containers/glass/beaker/meta/Initialize()
- beaker_weakness_bitflag &= ~PH_WEAK
- . = ..()
-
-/obj/item/reagent_containers/glass/beaker/noreact
- name = "cryostasis beaker"
- desc = "A cryostasis beaker that allows for chemical storage without \
- reactions. Can hold up to 50 units."
- icon_state = "beakernoreact"
- materials = list(MAT_METAL=3000)
- reagent_flags = OPENCONTAINER | NO_REACT
- volume = 50
- amount_per_transfer_from_this = 10
- container_HP = 10//shouldn't be needed
-
-/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
- beaker_weakness_bitflag &= ~PH_WEAK
- . = ..()
- //reagents.set_reacting(FALSE) was this removed in a recent pr?
-
-/obj/item/reagent_containers/glass/beaker/bluespace
- name = "bluespace beaker"
- desc = "A bluespace beaker, powered by experimental bluespace technology \
- and Element Cuban combined with the Compound Pete. Can hold up to \
- 300 units. Unable to withstand reagents of an extreme pH."
- icon_state = "beakerbluespace"
- materials = list(MAT_GLASS=3000)
- volume = 300
- amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
- container_HP = 4
-
-/obj/item/reagent_containers/glass/beaker/cryoxadone
- list_reagents = list(/datum/reagent/medicine/cryoxadone = 30)
-
-/obj/item/reagent_containers/glass/beaker/sulphuric
- list_reagents = list(/datum/reagent/toxin/acid = 50)
-
-/obj/item/reagent_containers/glass/beaker/slime
- list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/styptic
- name = "styptic reserve tank"
- list_reagents = list(/datum/reagent/medicine/styptic_powder = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine
- name = "silver sulfadiazine reserve tank"
- list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/charcoal
- name = "charcoal reserve tank"
- list_reagents = list(/datum/reagent/medicine/charcoal = 50)
-
-/obj/item/reagent_containers/glass/beaker/large/epinephrine
- name = "epinephrine reserve tank"
- list_reagents = list(/datum/reagent/medicine/epinephrine = 50)
-
-/obj/item/reagent_containers/glass/beaker/synthflesh
- list_reagents = list(/datum/reagent/medicine/synthflesh = 50)
-
-/obj/item/reagent_containers/glass/bucket
- name = "bucket"
- desc = "It's a bucket."
- icon = 'icons/obj/janitor.dmi'
- icon_state = "bucket"
- item_state = "bucket"
- lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
- materials = list(MAT_METAL=200)
- w_class = WEIGHT_CLASS_NORMAL
- amount_per_transfer_from_this = 20
- possible_transfer_amounts = list(5,10,15,20,25,30,50,70)
- volume = 70
- flags_inv = HIDEHAIR
- slot_flags = ITEM_SLOT_HEAD
- resistance_flags = NONE
- armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 50) //Weak melee protection, because you can wear it on your head
- slot_equipment_priority = list( \
- SLOT_BACK, SLOT_WEAR_ID,\
- SLOT_W_UNIFORM, SLOT_WEAR_SUIT,\
- SLOT_WEAR_MASK, SLOT_HEAD, SLOT_NECK,\
- SLOT_SHOES, SLOT_GLOVES,\
- SLOT_EARS, SLOT_GLASSES,\
- SLOT_BELT, SLOT_S_STORE,\
- SLOT_L_STORE, SLOT_R_STORE,\
- SLOT_GENERC_DEXTROUS_STORAGE
- )
- container_HP = 1
-
-/obj/item/reagent_containers/glass/bucket/Initialize()
- beaker_weakness_bitflag |= TEMP_WEAK
- . = ..()
-
-/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
- if(istype(O, /obj/item/mop))
- if(reagents.total_volume < 1)
- to_chat(user, "[src] is out of water!")
- else
- reagents.trans_to(O, 5)
- to_chat(user, "You wet [O] in [src].")
- playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
- else if(isprox(O))
- to_chat(user, "You add [O] to [src].")
- qdel(O)
- qdel(src)
- user.put_in_hands(new /obj/item/bot_assembly/cleanbot)
- else
- ..()
-
-/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
- ..()
- if (slot == SLOT_HEAD)
- if(reagents.total_volume)
- to_chat(user, "[src]'s contents spill all over you!")
- reagents.reaction(user, TOUCH)
- reagents.clear_reagents()
- reagent_flags = NONE
-
-/obj/item/reagent_containers/glass/bucket/dropped(mob/user)
- . = ..()
- reagent_flags = initial(reagent_flags)
-
-/obj/item/reagent_containers/glass/bucket/equip_to_best_slot(var/mob/M)
- if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head
- var/index = slot_equipment_priority.Find(SLOT_HEAD)
- slot_equipment_priority.Remove(SLOT_HEAD)
- . = ..()
- slot_equipment_priority.Insert(index, SLOT_HEAD)
- return
- return ..()
-
-/obj/item/reagent_containers/glass/beaker/waterbottle
- name = "bottle of water"
- desc = "A bottle of water filled at some factory in space."
- icon = 'icons/obj/drinks.dmi'
- icon_state = "smallbottle"
- item_state = "bottle"
- list_reagents = list(/datum/reagent/water = 50)//see desc, don't think about it too hard
- materials = list(MAT_GLASS=0)
- volume = 50
- amount_per_transfer_from_this = 10
- container_HP = 1
- price = 1
-
-/obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
- beaker_weakness_bitflag |= TEMP_WEAK
- . = ..()
-
-/obj/item/reagent_containers/glass/beaker/waterbottle/empty
- list_reagents = list()
-
-/obj/item/reagent_containers/glass/beaker/waterbottle/large
- desc = "A fresh commercial-sized bottle of water."
- icon_state = "largebottle"
- materials = list(MAT_GLASS=0)
- list_reagents = list(/datum/reagent/water = 100)
- volume = 100
- amount_per_transfer_from_this = 20
- container_HP = 1
-
-/obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
- list_reagents = list()
-
-/obj/item/reagent_containers/glass/beaker/waterbottle/wataur
- name = "Bottled Wataur"
- desc = "Finally, a bottle as proportionate as you. Incredible!"
- icon = 'icons/obj/drinks.dmi'
- icon_state = "wataur"
- list_reagents = list(/datum/reagent/water = 100) //robust ass wataur
- volume = 100
- amount_per_transfer_from_this = 20
- container_HP = 1
-
-/obj/item/reagent_containers/glass/get_belt_overlay()
- return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle")
+/obj/item/reagent_containers/glass
+ name = "glass"
+ amount_per_transfer_from_this = 10
+ possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
+ volume = 50
+ reagent_flags = OPENCONTAINER
+ spillable = TRUE
+ resistance_flags = ACID_PROOF
+ container_HP = 2
+
+
+/obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target)
+ if(!canconsume(M, user))
+ return
+
+ if(!spillable)
+ return
+
+ if(!reagents || !reagents.total_volume)
+ to_chat(user, "[src] is empty!")
+ return
+
+ if(istype(M))
+ if(user.a_intent == INTENT_HARM)
+ M.visible_message("[user] splashes the contents of [src] onto [M]!", \
+ "[user] splashes the contents of [src] onto [M]!")
+ var/R = reagents?.log_list()
+ if(isturf(target) && reagents.reagent_list.len && thrownby)
+ log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
+ message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
+ reagents.reaction(M, TOUCH)
+ log_combat(user, M, "splashed", R)
+ reagents.clear_reagents()
+ else
+ if(M != user)
+ M.visible_message("[user] attempts to feed something to [M].", \
+ "[user] attempts to feed something to you.")
+ if(!do_mob(user, M))
+ return
+ if(!reagents || !reagents.total_volume)
+ return // The drink might be empty after the delay, such as by spam-feeding
+ M.visible_message("[user] feeds something to [M].", "[user] feeds something to you.")
+ log_combat(user, M, "fed", reagents.log_list())
+ else
+ to_chat(user, "You swallow a gulp of [src].")
+ var/fraction = min(5/reagents.total_volume, 1)
+ reagents.reaction(M, INGEST, fraction)
+ addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5)
+ playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
+
+/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
+ . = ..()
+ if((!proximity) || !check_allowed_items(target,target_self=1))
+ return
+
+ if(target.is_refillable()) //Something like a glass. Player probably wants to transfer TO it.
+ if(!reagents.total_volume)
+ to_chat(user, "[src] is empty!")
+ return
+
+ if(target.reagents.holder_full())
+ to_chat(user, "[target] is full.")
+ return
+
+ var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
+ to_chat(user, "You transfer [trans] unit\s of the solution to [target].")
+
+ else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
+ if(!target.reagents.total_volume)
+ to_chat(user, "[target] is empty and can't be refilled!")
+ return
+
+ if(reagents.holder_full())
+ to_chat(user, "[src] is full.")
+ return
+
+ var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
+ to_chat(user, "You fill [src] with [trans] unit\s of the contents of [target].")
+
+ else if(reagents.total_volume)
+ if(user.a_intent == INTENT_HARM)
+ user.visible_message("[user] splashes the contents of [src] onto [target]!", \
+ "You splash the contents of [src] onto [target].")
+ reagents.reaction(target, TOUCH)
+ reagents.clear_reagents()
+
+/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
+ var/hotness = I.is_hot()
+ if(hotness && reagents)
+ reagents.expose_temperature(hotness)
+ to_chat(user, "You heat [name] with [I]!")
+
+ if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs
+ var/obj/item/reagent_containers/food/snacks/egg/E = I
+ if(reagents)
+ if(reagents.total_volume >= reagents.maximum_volume)
+ to_chat(user, "[src] is full.")
+ else
+ to_chat(user, "You break [E] in [src].")
+ E.reagents.trans_to(src, E.reagents.total_volume)
+ qdel(E)
+ return
+ ..()
+
+
+/obj/item/reagent_containers/glass/beaker
+ name = "beaker"
+ desc = "A beaker. It can hold up to 50 units. Unable to withstand extreme pHes"
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "beaker"
+ item_state = "beaker"
+ materials = list(MAT_GLASS=500)
+ beaker_weakness_bitflag = PH_WEAK
+
+/obj/item/reagent_containers/glass/beaker/Initialize()
+ . = ..()
+ update_icon()
+
+/obj/item/reagent_containers/glass/beaker/get_part_rating()
+ return reagents.maximum_volume
+
+/obj/item/reagent_containers/glass/beaker/on_reagent_change(changetype)
+ update_icon()
+
+/obj/item/reagent_containers/glass/beaker/update_icon()
+ if(!cached_icon)
+ cached_icon = icon_state
+ cut_overlays()
+
+ if(reagents.total_volume)
+ var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[cached_icon]10")
+
+ var/percent = round((reagents.total_volume / volume) * 100)
+ switch(percent)
+ if(0 to 9)
+ filling.icon_state = "[cached_icon]-10"
+ if(10 to 24)
+ filling.icon_state = "[cached_icon]10"
+ if(25 to 49)
+ filling.icon_state = "[cached_icon]25"
+ if(50 to 74)
+ filling.icon_state = "[cached_icon]50"
+ if(75 to 79)
+ filling.icon_state = "[cached_icon]75"
+ if(80 to 90)
+ filling.icon_state = "[cached_icon]80"
+ if(91 to INFINITY)
+ filling.icon_state = "[cached_icon]100"
+
+ filling.color = mix_color_from_reagents(reagents.reagent_list)
+ add_overlay(filling)
+
+/obj/item/reagent_containers/glass/beaker/jar
+ name = "honey jar"
+ desc = "A jar for honey. It can hold up to 50 units of sweet delight. Unable to withstand reagents of an extreme pH."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "vapour"
+
+/obj/item/reagent_containers/glass/beaker/large
+ name = "large beaker"
+ desc = "A large beaker. Can hold up to 100 units. Unable to withstand reagents of an extreme pH."
+ icon_state = "beakerlarge"
+ materials = list(MAT_GLASS=2500)
+ volume = 100
+ amount_per_transfer_from_this = 10
+ possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
+ container_HP = 3
+
+/obj/item/reagent_containers/glass/beaker/plastic
+ name = "x-large beaker"
+ desc = "An extra-large beaker. Can hold up to 150 units. Is able to resist acid and alkaline solutions, but melts at 444K"
+ icon_state = "beakerwhite"
+ materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000)
+ volume = 150
+ amount_per_transfer_from_this = 10
+ possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150)
+
+/obj/item/reagent_containers/glass/beaker/plastic/Initialize()
+ beaker_weakness_bitflag &= ~PH_WEAK
+ beaker_weakness_bitflag |= TEMP_WEAK
+ . = ..()
+
+/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
+ icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
+ ..()
+ icon_state = "beakerwhite"
+
+/obj/item/reagent_containers/glass/beaker/meta
+ name = "metamaterial beaker"
+ desc = "A large beaker. Can hold up to 200 units. Is able to withstand all chemical situations."
+ icon_state = "beakergold"
+ materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000, MAT_GOLD=1000, MAT_TITANIUM=1000)
+ volume = 200
+ amount_per_transfer_from_this = 10
+ possible_transfer_amounts = list(5,10,15,20,25,30,50,100,200)
+
+/obj/item/reagent_containers/glass/beaker/meta/Initialize()
+ beaker_weakness_bitflag &= ~PH_WEAK
+ . = ..()
+
+/obj/item/reagent_containers/glass/beaker/noreact
+ name = "cryostasis beaker"
+ desc = "A cryostasis beaker that allows for chemical storage without \
+ reactions. Can hold up to 50 units."
+ icon_state = "beakernoreact"
+ materials = list(MAT_METAL=3000)
+ reagent_flags = OPENCONTAINER | NO_REACT
+ volume = 50
+ amount_per_transfer_from_this = 10
+ container_HP = 10//shouldn't be needed
+
+/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
+ beaker_weakness_bitflag &= ~PH_WEAK
+ . = ..()
+ //reagents.set_reacting(FALSE) was this removed in a recent pr?
+
+/obj/item/reagent_containers/glass/beaker/bluespace
+ name = "bluespace beaker"
+ desc = "A bluespace beaker, powered by experimental bluespace technology \
+ and Element Cuban combined with the Compound Pete. Can hold up to \
+ 300 units. Unable to withstand reagents of an extreme pH."
+ icon_state = "beakerbluespace"
+ materials = list(MAT_GLASS=3000)
+ volume = 300
+ amount_per_transfer_from_this = 10
+ possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
+ container_HP = 4
+
+/obj/item/reagent_containers/glass/beaker/cryoxadone
+ list_reagents = list(/datum/reagent/medicine/cryoxadone = 30)
+
+/obj/item/reagent_containers/glass/beaker/sulphuric
+ list_reagents = list(/datum/reagent/toxin/acid = 50)
+
+/obj/item/reagent_containers/glass/beaker/slime
+ list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
+
+/obj/item/reagent_containers/glass/beaker/large/styptic
+ name = "styptic reserve tank"
+ list_reagents = list(/datum/reagent/medicine/styptic_powder = 50)
+
+/obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine
+ name = "silver sulfadiazine reserve tank"
+ list_reagents = list(/datum/reagent/medicine/silver_sulfadiazine = 50)
+
+/obj/item/reagent_containers/glass/beaker/large/charcoal
+ name = "charcoal reserve tank"
+ list_reagents = list(/datum/reagent/medicine/charcoal = 50)
+
+/obj/item/reagent_containers/glass/beaker/large/epinephrine
+ name = "epinephrine reserve tank"
+ list_reagents = list(/datum/reagent/medicine/epinephrine = 50)
+
+/obj/item/reagent_containers/glass/beaker/synthflesh
+ list_reagents = list(/datum/reagent/medicine/synthflesh = 50)
+
+/obj/item/reagent_containers/glass/bucket
+ name = "bucket"
+ desc = "It's a bucket."
+ icon = 'icons/obj/janitor.dmi'
+ icon_state = "bucket"
+ item_state = "bucket"
+ lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
+ materials = list(MAT_METAL=200)
+ w_class = WEIGHT_CLASS_NORMAL
+ amount_per_transfer_from_this = 20
+ possible_transfer_amounts = list(5,10,15,20,25,30,50,70)
+ volume = 70
+ flags_inv = HIDEHAIR
+ slot_flags = ITEM_SLOT_HEAD
+ resistance_flags = NONE
+ armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 50) //Weak melee protection, because you can wear it on your head
+ slot_equipment_priority = list( \
+ SLOT_BACK, SLOT_WEAR_ID,\
+ SLOT_W_UNIFORM, SLOT_WEAR_SUIT,\
+ SLOT_WEAR_MASK, SLOT_HEAD, SLOT_NECK,\
+ SLOT_SHOES, SLOT_GLOVES,\
+ SLOT_EARS, SLOT_GLASSES,\
+ SLOT_BELT, SLOT_S_STORE,\
+ SLOT_L_STORE, SLOT_R_STORE,\
+ SLOT_GENERC_DEXTROUS_STORAGE
+ )
+ container_HP = 1
+
+/obj/item/reagent_containers/glass/bucket/Initialize()
+ beaker_weakness_bitflag |= TEMP_WEAK
+ . = ..()
+
+/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
+ if(istype(O, /obj/item/mop))
+ if(reagents.total_volume < 1)
+ to_chat(user, "[src] is out of water!")
+ else
+ reagents.trans_to(O, 5)
+ to_chat(user, "You wet [O] in [src].")
+ playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+ else if(isprox(O))
+ to_chat(user, "You add [O] to [src].")
+ qdel(O)
+ qdel(src)
+ user.put_in_hands(new /obj/item/bot_assembly/cleanbot)
+ else
+ ..()
+
+/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
+ ..()
+ if (slot == SLOT_HEAD)
+ if(reagents.total_volume)
+ to_chat(user, "[src]'s contents spill all over you!")
+ reagents.reaction(user, TOUCH)
+ reagents.clear_reagents()
+ reagent_flags = NONE
+
+/obj/item/reagent_containers/glass/bucket/dropped(mob/user)
+ . = ..()
+ reagent_flags = initial(reagent_flags)
+
+/obj/item/reagent_containers/glass/bucket/equip_to_best_slot(var/mob/M)
+ if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head
+ var/index = slot_equipment_priority.Find(SLOT_HEAD)
+ slot_equipment_priority.Remove(SLOT_HEAD)
+ . = ..()
+ slot_equipment_priority.Insert(index, SLOT_HEAD)
+ return
+ return ..()
+
+/obj/item/reagent_containers/glass/beaker/waterbottle
+ name = "bottle of water"
+ desc = "A bottle of water filled at some factory in space."
+ icon = 'icons/obj/drinks.dmi'
+ icon_state = "smallbottle"
+ item_state = "bottle"
+ list_reagents = list(/datum/reagent/water = 50)//see desc, don't think about it too hard
+ materials = list(MAT_GLASS=0)
+ volume = 50
+ amount_per_transfer_from_this = 10
+ container_HP = 1
+ price = 1
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
+ beaker_weakness_bitflag |= TEMP_WEAK
+ . = ..()
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/empty
+ list_reagents = list()
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/large
+ desc = "A fresh commercial-sized bottle of water."
+ icon_state = "largebottle"
+ materials = list(MAT_GLASS=0)
+ list_reagents = list(/datum/reagent/water = 100)
+ volume = 100
+ amount_per_transfer_from_this = 20
+ container_HP = 1
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
+ list_reagents = list()
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/wataur
+ name = "Bottled Wataur"
+ desc = "Finally, a bottle as proportionate as you. Incredible!"
+ icon = 'icons/obj/drinks.dmi'
+ icon_state = "wataur"
+ list_reagents = list(/datum/reagent/water = 100) //robust ass wataur
+ volume = 100
+ amount_per_transfer_from_this = 20
+ container_HP = 1
+
+/obj/item/reagent_containers/glass/get_belt_overlay()
+ return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle")
+
+//Mortar & Pestle
+
+/obj/item/pestle
+ name = "pestle"
+ desc = "An ancient, simple tool used in conjunction with a mortar to grind or juice items."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "pestle"
+ force = 4
+
+/obj/item/reagent_containers/glass/mortar
+ name = "mortar"
+ desc = "A specially formed bowl of ancient design. It is possible to crush or juice items placed in it using a pestle; however the process, unlike modern methods, is slow and physically exhausting. Alt click to eject the item."
+ icon_state = "mortar"
+ amount_per_transfer_from_this = 10
+ possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
+ item_flags = NO_MAT_REDEMPTION
+ reagent_flags = OPENCONTAINER
+ spillable = TRUE
+ var/obj/item/grinded
+
+/obj/item/reagent_containers/glass/mortar/AltClick(mob/user)
+ . = ..()
+ if(grinded)
+ grinded.forceMove(drop_location())
+ grinded = null
+ to_chat(user, "You eject the item inside.")
+ return TRUE
+
+/obj/item/reagent_containers/glass/mortar/attackby(obj/item/I, mob/living/carbon/human/user)
+ ..()
+ if(istype(I,/obj/item/pestle))
+ if(grinded)
+ to_chat(user, "You start grinding...")
+ if((do_after(user, 25, target = src)) && grinded)
+ user.adjustStaminaLoss(20)
+ if(grinded.juice_results) //prioritize juicing
+ grinded.on_juice()
+ reagents.add_reagent_list(grinded.juice_results)
+ to_chat(user, "You juice [grinded] into a fine liquid.")
+ QDEL_NULL(grinded)
+ return
+ grinded.on_grind()
+ reagents.add_reagent_list(grinded.grind_results)
+ if(grinded.reagents) //food and pills
+ grinded.reagents.trans_to(src, grinded.reagents.total_volume)
+ to_chat(user, "You break [grinded] into powder.")
+ QDEL_NULL(grinded)
+ return
+ return
+ else
+ to_chat(user, "There is nothing to grind!")
+ return
+ if(grinded)
+ to_chat(user, "There is something inside already!")
+ return
+ if(I.juice_results || I.grind_results)
+ I.forceMove(src)
+ grinded = I
+ return
+ to_chat(user, "You can't grind this!")
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index 2e4f3e60f..eaa1be4c9 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -299,12 +299,12 @@
// handle machine interaction
/obj/machinery/disposal/bin/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_notcontained_state)
if(stat & BROKEN)
return
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "disposal_unit", name, ui_x, ui_y, master_ui, state)
+ ui = new(user, src, ui_key, "DisposalUnit", name, ui_x, ui_y, master_ui, state)
ui.open()
/obj/machinery/disposal/bin/ui_data(mob/user)
diff --git a/code/modules/research/nanites/nanite_chamber_computer.dm b/code/modules/research/nanites/nanite_chamber_computer.dm
index 33250c5e7..a4f2f29c9 100644
--- a/code/modules/research/nanites/nanite_chamber_computer.dm
+++ b/code/modules/research/nanites/nanite_chamber_computer.dm
@@ -25,10 +25,10 @@
find_chamber()
..()
-/obj/machinery/computer/nanite_chamber_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/computer/nanite_chamber_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "nanite_chamber_control", name, ui_x, ui_y, master_ui, state)
+ ui = new(user, src, ui_key, "NaniteChamberControl", name, ui_x, ui_y, master_ui, state)
ui.open()
/obj/machinery/computer/nanite_chamber_control/ui_data()
diff --git a/code/modules/research/nanites/nanite_cloud_controller.dm b/code/modules/research/nanites/nanite_cloud_controller.dm
index 0731d3067..e4b69a705 100644
--- a/code/modules/research/nanites/nanite_cloud_controller.dm
+++ b/code/modules/research/nanites/nanite_cloud_controller.dm
@@ -53,10 +53,10 @@
backup.nanites = cloud_copy
investigate_log("[key_name(user)] created a new nanite cloud backup with id #[cloud_id]", INVESTIGATE_NANITES)
-/obj/machinery/computer/nanite_cloud_controller/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/computer/nanite_cloud_controller/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "nanite_cloud_control", name, ui_x, ui_y, master_ui, state)
+ ui = new(user, src, ui_key, "NaniteCloudControl", name, ui_x, ui_y, master_ui, state)
ui.open()
/obj/machinery/computer/nanite_cloud_controller/ui_data()
diff --git a/code/modules/research/nanites/nanite_program_hub.dm b/code/modules/research/nanites/nanite_program_hub.dm
index ea4392f23..494553655 100644
--- a/code/modules/research/nanites/nanite_program_hub.dm
+++ b/code/modules/research/nanites/nanite_program_hub.dm
@@ -47,10 +47,10 @@
disk.forceMove(drop_location())
disk = null
-/obj/machinery/nanite_program_hub/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/nanite_program_hub/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "nanite_program_hub", name, ui_x, ui_y, master_ui, state)
+ ui = new(user, src, ui_key, "NaniteProgramHub", name, ui_x, ui_y, master_ui, state)
ui.open()
/obj/machinery/nanite_program_hub/ui_data()
diff --git a/code/modules/research/nanites/nanite_programmer.dm b/code/modules/research/nanites/nanite_programmer.dm
index d81880c6d..e6f4ed221 100644
--- a/code/modules/research/nanites/nanite_programmer.dm
+++ b/code/modules/research/nanites/nanite_programmer.dm
@@ -34,10 +34,10 @@
disk = null
program = null
-/obj/machinery/nanite_programmer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/nanite_programmer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "nanite_programmer", name, ui_x, ui_y, master_ui, state)
+ ui = new(user, src, ui_key, "NaniteProgrammer", name, ui_x, ui_y, master_ui, state)
ui.open()
/obj/machinery/nanite_programmer/ui_data()
diff --git a/code/modules/research/nanites/nanite_remote.dm b/code/modules/research/nanites/nanite_remote.dm
index 71aecc8f2..349936295 100644
--- a/code/modules/research/nanites/nanite_remote.dm
+++ b/code/modules/research/nanites/nanite_remote.dm
@@ -80,10 +80,10 @@
var/datum/nanite_program/relay/N = X
N.relay_signal(code, relay_code, source)
-/obj/item/nanite_remote/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
+/obj/item/nanite_remote/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_hands_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "nanite_remote", name, 420, 500, master_ui, state)
+ ui = new(user, src, ui_key, "NaniteRemote", name, 420, 500, master_ui, state)
ui.open()
/obj/item/nanite_remote/ui_data()
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index 8a5856340..a3dc822c7 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -31,10 +31,10 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
return ..()
/obj/machinery/keycard_auth/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_physical_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "keycard_auth", name, 375, 125, master_ui, state)
+ ui = new(user, src, ui_key, "KeycardAuth", name, 375, 125, master_ui, state)
ui.open()
/obj/machinery/keycard_auth/ui_data()
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index e2c1ddc1a..56ffb3450 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -16,11 +16,11 @@
say("Please equip your ID card into your ID slot to authenticate.")
. = ..()
-/obj/machinery/computer/emergency_shuttle/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.human_adjacent_state)
+/obj/machinery/computer/emergency_shuttle/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_human_adjacent_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "emergency_shuttle_console", name,
+ ui = new(user, src, ui_key, "EmergencyShuttleConsole", name,
400, 350, master_ui, state)
ui.open()
diff --git a/code/modules/shuttle/manipulator.dm b/code/modules/shuttle/manipulator.dm
index dcfb0793b..519f1c2d3 100644
--- a/code/modules/shuttle/manipulator.dm
+++ b/code/modules/shuttle/manipulator.dm
@@ -44,10 +44,10 @@
// Only admins can use this, but they can use it from anywhere
return user.client && check_rights_for(user.client, R_ADMIN)
-/obj/machinery/shuttle_manipulator/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
+/obj/machinery/shuttle_manipulator/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_admin_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "shuttle_manipulator", name, 800, 600, master_ui, state)
+ ui = new(user, src, ui_key, "ShuttleManipulator", name, 800, 600, master_ui, state)
ui.open()
/proc/shuttlemode2str(mode)
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 4600a1a0a..839582c8a 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -220,10 +220,10 @@
var/area_aim = FALSE //should also show areas for targeting
/obj/machinery/computer/bsa_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
- datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
+ datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_physical_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "bsa", name, 400, 220, master_ui, state)
+ ui = new(user, src, ui_key, "BluespaceArtillery", name, 400, 220, master_ui, state)
ui.open()
/obj/machinery/computer/bsa_control/ui_data()
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 3073a6fcc..242adf209 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -174,11 +174,11 @@
. = ..()
-/obj/machinery/dna_vault/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
+/obj/machinery/dna_vault/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_physical_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
roll_powers(user)
- ui = new(user, src, ui_key, "dna_vault", name, 350, 400, master_ui, state)
+ ui = new(user, src, ui_key, "DnaVault", name, 350, 400, master_ui, state)
ui.open()
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index be88d0ecd..682533dd4 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -42,10 +42,10 @@
circuit = /obj/item/circuitboard/computer/sat_control
var/notice
-/obj/machinery/computer/sat_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/computer/sat_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "sat_control", name, 400, 305, master_ui, state)
+ ui = new(user, src, ui_key, "SatelliteControl", name, 400, 305, master_ui, state)
ui.open()
/obj/machinery/computer/sat_control/ui_act(action, params)
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 061676899..7f3b477bc 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -31,6 +31,7 @@
var/burnstate = 0
var/brute_dam = 0
var/burn_dam = 0
+ var/pain_dam = 0
var/stamina_dam = 0
var/max_stamina_damage = 0
var/max_damage = 0
@@ -193,6 +194,9 @@
brute_dam += brute
burn_dam += burn
+ if(status == BODYPART_ORGANIC) //pain is only applied to organic organs, because nerves.
+ pain_dam += (brute+burn)*1.2 //add the total damage applied to the limb as pain damage, build pain quicker, because sudden pain is more.. painful.
+
//We've dealt the physical damages, if there's room lets apply the stamina damage.
var/current_damage = get_damage(TRUE) //This time around, count stamina loss too.
var/available_damage = max_damage - current_damage
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index da9ec462a..a71cc199c 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -172,9 +172,14 @@
// lipstick
if(lip_style)
- var/image/lips_overlay = image('icons/mob/human_face.dmi', "lips_[lip_style]", -BODY_LAYER, SOUTH)
- lips_overlay.color = lip_color
- . += lips_overlay
+ if (species_id == "human")
+ var/image/lips_overlay = image('icons/mob/human_face.dmi', "lips_[lip_style]", -BODY_LAYER, SOUTH)
+ lips_overlay.color = lip_color
+ . += lips_overlay
+ else //for animal species, because they have slightly bigger heads.
+ var/image/lips_overlay = image('icons/mob/human_face.dmi', "lips_[lip_style]_mam", -BODY_LAYER, SOUTH)
+ lips_overlay.color = lip_color
+ . += lips_overlay
// eyes
var/image/eyes_overlay = image('icons/mob/human_face.dmi', "eyes", -BODY_LAYER, SOUTH)
diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm
index 392244fb4..e6236b659 100644
--- a/code/modules/surgery/organic_steps.dm
+++ b/code/modules/surgery/organic_steps.dm
@@ -1,8 +1,8 @@
//make incision
/datum/surgery_step/incise
name = "make incision"
- implements = list(TOOL_SCALPEL = 100, /obj/item/melee/transforming/energy/sword = 75, /obj/item/kitchen/knife = 65,
- /obj/item/shard = 45, /obj/item = 30) // 30% success with any sharp item.
+ implements = list(TOOL_SCALPEL = 100, /obj/item/melee/transforming/energy/sword = 85, /obj/item/kitchen/knife = 75,
+ /obj/item/shard = 65, /obj/item = 40) // 40% success with any sharp item. (Hyper change, raised chances with basic items, because if user is awake it has a higher chance to fail)
time = 16
/datum/surgery_step/incise/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 309e554e0..b2d19c586 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -816,9 +816,8 @@
E.enthrallTally += (power_multiplier*(((length(message))/200) + 1)) //encourage players to say more than one word.
else
E.enthrallTally += power_multiplier*1.25 //thinking about it, I don't know how this can proc
- if(L.canbearoused)
- if(L.client?.prefs.lewdchem)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[E.enthrallGender] is so nice to listen to."), 5)
+ if(L.canbearoused && E.lewd)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[E.enthrallGender] is so nice to listen to."), 5)
E.cooldown += 1
//REWARD mixable works
@@ -829,7 +828,7 @@
power_multiplier *= distancelist[get_dist(user, V)+1]
if(L == user)
continue
- if (L.client?.prefs.lewdchem)
+ if (E.lewd)
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[E.enthrallGender] has praised me!!"), 5)
if(HAS_TRAIT(L, TRAIT_NYMPHO))
L.adjustArousalLoss(2*power_multiplier)
@@ -841,7 +840,7 @@
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "I've been praised for doing a good job!"), 5)
E.resistanceTally -= power_multiplier
E.enthrallTally += power_multiplier
- var/descmessage = "[(L.client?.prefs.lewdchem?"I feel so happy! I'm a good pet who [E.enthrallGender] loves!":"I did a good job!")]"
+ var/descmessage = "[(E.lewd?"I feel so happy! I'm a good pet who [E.enthrallGender] loves!":"I did a good job!")]"
SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "enthrallpraise", /datum/mood_event/enthrallpraise, descmessage)
E.cooldown += 1
@@ -850,10 +849,10 @@
for(var/V in listeners)
var/mob/living/L = V
var/datum/status_effect/chem/enthrall/E = L.has_status_effect(/datum/status_effect/chem/enthrall)
- var/descmessage = "[(L.client?.prefs.lewdchem?"I've failed [E.enthrallGender]... What a bad, bad pet!":"I did a bad job...")]"
+ var/descmessage = "[(E.lewd?"I've failed [E.enthrallGender]... What a bad, bad pet!":"I did a bad job...")]"
if(L == user)
continue
- if (L.client?.prefs.lewdchem)
+ if (E.lewd)
if(HAS_TRAIT(L, TRAIT_MASO))
L.adjustArousalLoss(3*power_multiplier)
descmessage += "And yet, it feels so good..!" //I don't really understand masco, is this the right sort of thing they like?
@@ -880,7 +879,7 @@
var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
REMOVE_TRAIT(C, TRAIT_MUTE, "enthrall")
C.silent = 0
- if(C.client?.prefs.lewdchem)
+ if(E.lewd)
addtimer(CALLBACK(C, /atom/movable/proc/say, "[E.enthrallGender]"), 5)
else
addtimer(CALLBACK(C, /atom/movable/proc/say, "[E.master]"), 5)
@@ -896,7 +895,7 @@
E.phase = 3
E.status = null
user.emote("snap")
- if(L.client?.prefs.lewdchem)
+ if(E.lewd)
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "The snapping of your [E.enthrallGender]'s fingers brings you back to your enthralled state, obedient and ready to serve."), 5)
else
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "The snapping of [E.master]'s fingers brings you back to being under their influence."), 5)
@@ -919,11 +918,11 @@
addtimer(CALLBACK(H, /atom/movable/proc/say, "I feel happy being with you."), 5)
continue
if(2)
- speaktrigger += "[(H.client?.prefs.lewdchem?"I think I'm in love with you... ":"I find you really inspirational, ")]" //'
+ speaktrigger += "[(E.lewd?"I think I'm in love with you... ":"I find you really inspirational, ")]" //'
if(3)
- speaktrigger += "[(H.client?.prefs.lewdchem?"I'm devoted to being your pet":"I'm commited to following your cause!")]! "
+ speaktrigger += "[(E.lewd?"I'm devoted to being your pet":"I'm commited to following your cause!")]! "
if(4)
- speaktrigger += "[(H.client?.prefs.lewdchem?"You are my whole world and all of my being belongs to you, ":"I cannot think of anything else but aiding your cause, ")] "//Redflags!!
+ speaktrigger += "[(E.lewd?"You are my whole world and all of my being belongs to you, ":"I cannot think of anything else but aiding your cause, ")] "//Redflags!!
//mood
var/datum/component/mood/mood = H.GetComponent(/datum/component/mood)
@@ -1012,7 +1011,7 @@
speaktrigger += "I feel like I'm on the brink of losing my mind, "
//horny
- if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && H.client?.prefs.lewdchem)
+ if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && E.lewd)
switch(H.getArousalLoss())
if(40 to 60)
speaktrigger += "I'm feeling a little horny, "
@@ -1022,10 +1021,10 @@
speaktrigger += "I'm really, really horny, "
//collar
- if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar) && H.client?.prefs.lewdchem)
+ if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar) && E.lewd)
speaktrigger += "I love the collar you gave me, "
//End
- if(H.client?.prefs.lewdchem)
+ if(E.lewd)
speaktrigger += "[E.enthrallGender]!"
else
speaktrigger += "[user.first_name()]!"
@@ -1053,7 +1052,7 @@
REMOVE_TRAIT(C, TRAIT_MUTE, "enthrall")
C.silent = 0
E.cooldown += 3
- to_chat(user, "You [(C.client?.prefs.lewdchem?"allow [C] to speak again":"encourage [C] to speak again")].")
+ to_chat(user, "You [(E.lewd?"allow [C] to speak again":"encourage [C] to speak again")].")
//Antiresist
@@ -1083,7 +1082,7 @@
for(var/mob/living/carbon/C in listeners)
var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
if(E.phase == 4)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You're unable to forget about [(C.client?.prefs.lewdchem?"the dominating presence of [E.enthrallGender]":"[E.master]")]!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You're unable to forget about [(E.lewd?"the dominating presence of [E.enthrallGender]":"[E.master]")]!"), 5)
continue
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You wake up, forgetting everything that just happened. You must've dozed off..? How embarassing!"), 5)
C.Sleeping(50)
@@ -1095,7 +1094,7 @@
if(3)
E.phase = 0
E.cooldown = 0
- if(C.client?.prefs.lewdchem)
+ if(E.lewd)
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You revert to yourself before being enthralled by your [E.enthrallGender], with no memory of what happened."), 5)
else
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You revert to who you were before, with no memory of what happened with [E.master]."), 5)
@@ -1122,7 +1121,7 @@
var/mob/living/carbon/human/H = V
var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall)
if(E.phase > 1)
- if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && H.client?.prefs.lewdchem) // probably a redundant check but for good measure
+ if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && E.lewd) // probably a redundant check but for good measure
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "Your [E.enthrallGender] pushes you over the limit, overwhelming your body with pleasure."), 5)
H.mob_climax(forced_climax=TRUE)
H.SetStun(20)
@@ -1178,7 +1177,7 @@
for(var/obj/item/W in items)
if(W == H.wear_suit)
H.dropItemToGround(W, TRUE)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "Before you can even think about it, you quickly remove your clothes in response to [(H.client?.prefs.lewdchem?"your [E.enthrallGender]'s command'":"[E.master]'s directive'")]."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "Before you can even think about it, you quickly remove your clothes in response to [(E.lewd?"your [E.enthrallGender]'s command'":"[E.master]'s directive'")]."), 5)
E.cooldown += 10
//WALK
@@ -1216,7 +1215,7 @@
if(2 to INFINITY)
L.lay_down()
E.cooldown += 10
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[(L.client?.prefs.lewdchem?"You eagerly lie down!":"You suddenly lie down!")]"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[(E.lewd?"You eagerly lie down!":"You suddenly lie down!")]"), 5)
to_chat(user, "You encourage [L] to lie down.")
//KNOCKDOWN
@@ -1247,7 +1246,7 @@
for (var/trigger in E.customTriggers)
speaktrigger += "[trigger], "
to_chat(user, "[C] whispers, \"[speaktrigger] are my triggers.\"")//So they don't trigger themselves!
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You whisper your triggers to [(C.client?.prefs.lewdchem?"Your [E.enthrallGender]":"[E.master]")]."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You whisper your triggers to [(E.lewd?"Your [E.enthrallGender]":"[E.master]")]."), 5)
//CUSTOM TRIGGERS
@@ -1259,7 +1258,7 @@
if (get_dist(user, H) > 1)//Requires user to be next to their pet.
to_chat(user, "You need to be next to your pet to give them a new trigger!")
continue
- if(!H.client?.prefs.lewdchem)
+ if(!E.lewd)
to_chat(user, "[H] seems incapable of being implanted with triggers.")
continue
else
@@ -1282,7 +1281,7 @@
E.customTriggers[trigger] = trigger2
log_game("FERMICHEM: [H] has been implanted by [user] with [trigger], triggering [trigger2].")
E.mental_capacity -= 5
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.client?.prefs.lewdchem?"your [E.enthrallGender]":"[E.master]")] whispers you a new trigger."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"your [E.enthrallGender]":"[E.master]")] whispers you a new trigger."), 5)
to_chat(user, "You sucessfully set the trigger word [trigger] in [H]")
else
to_chat(user, "Your pet looks at you confused, it seems they don't understand that effect!")
@@ -1300,7 +1299,7 @@
if (get_dist(user, H) > 1)//Requires user to be next to their pet.
to_chat(user, "You need to be next to your pet to give them a new echophrase!")
continue
- if(!H.client?.prefs.lewdchem)
+ if(!E.lewd)
to_chat(user, "[H] seems incapable of being implanted with an echoing phrase.")
continue
else
@@ -1344,7 +1343,7 @@
objective = replacetext(lowertext(objective), "suicide", "self-love")
message_admins("[H] has been implanted by [user] with the objective [objective].")
log_game("FERMICHEM: [H] has been implanted by [user] with the objective [objective] via MKUltra.")
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.client?.prefs.lewdchem?"Your [E.enthrallGender]":"[E.master]")] whispers you a new objective."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"Your [E.enthrallGender]":"[E.master]")] whispers you a new objective."), 5)
brainwash(H, objective)
E.mental_capacity -= 200
to_chat(user, "You sucessfully give an objective to [H]")
@@ -1358,7 +1357,7 @@
for(var/V in listeners)
var/mob/living/carbon/human/H = V
var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall)
- if(E.phase >= 3 && H.client?.prefs.lewdchem)
+ if(E.phase >= 3 && E.lewd)
var/instill = stripped_input(user, "Instill an emotion in [H].", MAX_MESSAGE_LEN)
to_chat(H, "[instill]")
to_chat(user, "You sucessfully instill a feeling in [H]")
@@ -1373,7 +1372,7 @@
if(E.phase > 1)
if(user.ckey == E.enthrallID && user.real_name == E.master.real_name)
E.master = user
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.client?.prefs.lewdchem?"You hear the words of your [E.enthrallGender] again!! They're back!!":"You recognise the voice of [E.master].")]"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"You hear the words of your [E.enthrallGender] again!! They're back!!":"You recognise the voice of [E.master].")]"), 5)
to_chat(user, "[H] looks at you with sparkling eyes, recognising you!")
//I dunno how to do state objectives without them revealing they're an antag
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 71f813a5b..671ec03b6 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -9,6 +9,7 @@
var/list/chems_needed = list() //list of chems needed to complete the step. Even on success, the step will have no effect if there aren't the chems required in the mob.
var/require_all_chems = TRUE //any on the list or all on the list?
var/silicons_obey_prob = FALSE
+ var/pain_failure = 10 //how painful it is if you fail.
/datum/surgery_step/proc/try_op(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE)
var/success = FALSE
@@ -62,14 +63,21 @@
var/prob_chance = 100
if(implement_type) //this means it isn't a require hand or any item step.
prob_chance = implements[implement_type]
+
prob_chance *= surgery.get_propability_multiplier()
+ //if human and awake
+ if (ishuman(target))
+ var/mob/living/carbon/human/H = target
+ if(H.stat == 0) //victorian surgery
+ prob_chance = prob_chance *0.65 //deminish your chances, they are awake!
+
if((prob(prob_chance) || (iscyborg(user) && !silicons_obey_prob)) && chem_check(target) && !try_to_fail)
if(success(user, target, target_zone, tool, surgery))
advance = TRUE
else
if(failure(user, target, target_zone, tool, surgery))
- advance = TRUE
+ advance = FALSE
if(advance && !repeatable)
surgery.status++
if(surgery.status > surgery.steps.len)
@@ -83,15 +91,18 @@
"[user] begins to perform surgery on [target].")
/datum/surgery_step/proc/success(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery)
- display_results(user, target, "You succeed.",
- "[user] succeeds!",
+ display_results(user, target, "You complete the procedure.",
+ "[user] completes the procedure!",
"[user] finishes.")
return TRUE
/datum/surgery_step/proc/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery)
- display_results(user, target, "You screw up!",
- "[user] screws up!",
+ display_results(user, target, "You failed the procedure!",
+ "[user] failed the procedure!",
"[user] finishes.", TRUE) //By default the patient will notice if the wrong thing has been cut
+ if (ishuman(target)) //pain on humans for messing up.
+ var/obj/item/bodypart/L = target.get_bodypart(target_zone)
+ L.pain_dam += pain_failure
return FALSE
/datum/surgery_step/proc/tool_check(mob/user, obj/item/tool)
diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm
index 38a5a27e0..d67c251ea 100644
--- a/code/modules/tgui/external.dm
+++ b/code/modules/tgui/external.dm
@@ -1,140 +1,151 @@
- /**
- * tgui external
- *
- * Contains all external tgui declarations.
- **/
+/**
+ * tgui external
+ *
+ * Contains all external tgui declarations.
+ */
- /**
- * public
- *
- * Used to open and update UIs.
- * If this proc is not implemented properly, the UI will not update correctly.
- *
- * required user mob The mob who opened/is using the UI.
- * optional ui_key string The ui_key of the UI.
- * optional ui datum/tgui The UI to be updated, if it exists.
- * optional force_open bool If the UI should be re-opened instead of updated.
- * optional master_ui datum/tgui The parent UI.
- * optional state datum/ui_state The state used to determine status.
- **/
-/datum/proc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/**
+ * public
+ *
+ * Used to open and update UIs.
+ * If this proc is not implemented properly, the UI will not update correctly.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * optional ui_key string The ui_key of the UI.
+ * optional ui datum/tgui The UI to be updated, if it exists.
+ * optional force_open bool If the UI should be re-opened instead of updated.
+ * optional master_ui datum/tgui The parent UI.
+ * optional state datum/tgui_state The state used to determine status.
+ */
+
+/datum/proc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
return FALSE // Not implemented.
- /**
- * public
- *
- * Data to be sent to the UI.
- * This must be implemented for a UI to work.
- *
- * required user mob The mob interacting with the UI.
- *
- * return list Data to be sent to the UI.
- **/
+/**
+ * public
+ *
+ * Data to be sent to the UI.
+ * This must be implemented for a UI to work.
+ *
+ * required user mob The mob interacting with the UI.
+ *
+ * return list Data to be sent to the UI.
+ */
/datum/proc/ui_data(mob/user)
return list() // Not implemented.
- /**
- * public
- *
- * Static Data to be sent to the UI.
- * Static data differs from normal data in that it's large data that should be sent infrequently
- * This is implemented optionally for heavy uis that would be sending a lot of redundant data
- * frequently.
- * Gets squished into one object on the frontend side, but the static part is cached.
- *
- * required user mob The mob interacting with the UI.
- *
- * return list Statuic Data to be sent to the UI.
- **/
+/**
+ * public
+ *
+ * Static Data to be sent to the UI.
+ * Static data differs from normal data in that it's large data that should be sent infrequently
+ * This is implemented optionally for heavy uis that would be sending a lot of redundant data
+ * frequently.
+ * Gets squished into one object on the frontend side, but the static part is cached.
+ *
+ * required user mob The mob interacting with the UI.
+ *
+ * return list Statuic Data to be sent to the UI.
+ */
/datum/proc/ui_static_data(mob/user)
return list()
/**
- * public
- *
- * Forces an update on static data. Should be done manually whenever something happens to change static data.
- *
- * required user the mob currently interacting with the ui
- * optional ui ui to be updated
- * optional ui_key ui key of ui to be updated
- *
-**/
+ * public
+ *
+ * Forces an update on static data. Should be done manually whenever something happens to change static data.
+ *
+ * required user the mob currently interacting with the ui
+ * optional ui ui to be updated
+ * optional ui_key ui key of ui to be updated
+ */
/datum/proc/update_static_data(mob/user, datum/tgui/ui, ui_key = "main")
ui = SStgui.try_update_ui(user, src, ui_key, ui)
+ // If there was no ui to update, there's no static data to update either.
if(!ui)
- return //If there was no ui to update, there's no static data to update either.
+ return
ui.push_data(null, ui_static_data(), TRUE)
- /**
- * public
- *
- * Called on a UI when the UI receieves a href.
- * Think of this as Topic().
- *
- * required action string The action/button that has been invoked by the user.
- * required params list A list of parameters attached to the button.
- *
- * return bool If the UI should be updated or not.
- **/
-/datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+/**
+ * public
+ *
+ * Called on a UI when the UI receieves a href.
+ * Think of this as Topic().
+ *
+ * required action string The action/button that has been invoked by the user.
+ * required params list A list of parameters attached to the button.
+ *
+ * return bool If the UI should be updated or not.
+ */
+/datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
+ // If UI is not interactive or usr calling Topic is not the UI user, bail.
if(!ui || ui.status != UI_INTERACTIVE)
- return 1 // If UI is not interactive or usr calling Topic is not the UI user, bail.
+ return TRUE
- /**
- * public
- *
- * Called on an object when a tgui object is being created, allowing you to customise the html
- * For example: inserting a custom stylesheet that you need in the head
- *
- * For this purpose, some tags are available in the html, to be parsed out with replacetext
- * (customheadhtml) - Additions to the head tag
- *
- * required html the html base text
- *
- **/
+/**
+ * public
+ *
+ * Called on an object when a tgui object is being created, allowing you to
+ * customise the html
+ * For example: inserting a custom stylesheet that you need in the head
+ *
+ * For this purpose, some tags are available in the html, to be parsed out
+ ^ with replacetext
+ * (customheadhtml) - Additions to the head tag
+ *
+ * required html the html base text
+ */
/datum/proc/ui_base_html(html)
return html
- /**
- * private
- *
- * The UI's host object (usually src_object).
- * This allows modules/datums to have the UI attached to them,
- * and be a part of another object.
- **/
+/**
+ * private
+ *
+ * The UI's host object (usually src_object).
+ * This allows modules/datums to have the UI attached to them,
+ * and be a part of another object.
+ */
/datum/proc/ui_host(mob/user)
return src // Default src.
- /**
- * global
- *
- * Used to track UIs for a mob.
- **/
-/mob/var/list/open_uis = list()
- /**
- * public
- *
- * Called on a UI's object when the UI is closed, not to be confused with client/verb/uiclose(), which closes the ui window
- *
- *
- **/
-/datum/proc/ui_close()
+/**
+ * global
+ *
+ * Associative list of JSON-encoded shared states that were set by
+ * tgui clients.
+ */
- /**
- * verb
- *
- * Called by UIs when they are closed.
- * Must be a verb so winset() can call it.
- *
- * required uiref ref The UI that was closed.
- **/
-/client/verb/uiclose(ref as text)
+/datum/var/list/tgui_shared_states
+
+/**
+ * global
+ *
+ * Used to track UIs for a mob.
+ */
+/mob/var/list/open_tguis = list()
+/**
+ * public
+ *
+ * Called on a UI's object when the UI is closed, not to be confused with
+ * client/verb/uiclose(), which closes the ui window
+ */
+/datum/proc/ui_close(mob/user)
+
+/**
+ * verb
+ *
+ * Called by UIs when they are closed.
+ * Must be a verb so winset() can call it.
+ *
+ * required uiref ref The UI that was closed.
+ */
+/client/verb/tguiclose(uid as text)
// Name the verb, and hide it from the user panel.
set name = "uiclose"
- set hidden = 1
+ set hidden = TRUE
// Get the UI based on the ref.
- var/datum/tgui/ui = locate(ref)
+ var/datum/tgui/ui = locateUID(uid)
// If we found the UI, close it.
if(istype(ui))
diff --git a/code/modules/tgui/modules/_base.dm b/code/modules/tgui/modules/_base.dm
new file mode 100644
index 000000000..ce12ac633
--- /dev/null
+++ b/code/modules/tgui/modules/_base.dm
@@ -0,0 +1,21 @@
+/*
+TGUI MODULES
+
+This allows for datum-based TGUIs that can be hooked into objects.
+This is useful for things such as the power monitor, which needs to exist on a physical console in the world, but also as a virtual device the AI can use
+
+Code is pretty much ripped verbatim from nano modules, but with un-needed stuff removed
+*/
+/datum/tgui_module
+ var/name
+ var/datum/host
+
+/datum/tgui_module/New(var/host)
+ src.host = host
+
+/datum/tgui_module/ui_host()
+ return host ? host : src
+
+/datum/tgui_module/ui_close(mob/user)
+ if(host)
+ host.ui_close(user)
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index fc30d171f..42abceb1c 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -1,20 +1,20 @@
- /**
- * tgui states
- *
- * Base state and helpers for states. Just does some sanity checks, implement a state for in-depth checks.
- **/
+/**
+ * tgui states
+ *
+ * Base state and helpers for states. Just does some sanity checks, implement a state for in-depth checks.
+ */
- /**
- * public
- *
- * Checks the UI state for a mob.
- *
- * required user mob The mob who opened/is using the UI.
- * required state datum/ui_state The state to check.
- *
- * return UI_state The state of the UI.
- **/
-/datum/proc/ui_status(mob/user, datum/ui_state/state)
+/**
+ * public
+ *
+ * Checks the UI state for a mob.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * required state datum/tgui_state The state to check.
+ *
+ * return UI_state The state of the UI.
+ */
+/datum/proc/ui_status(mob/user, datum/tgui_state/state)
var/src_object = ui_host(user)
. = UI_CLOSE
if(!state)
@@ -22,7 +22,7 @@
if(isobserver(user))
// If they turn on ghost AI control, admins can always interact.
- if(IsAdminGhost(user))
+ if(user.has_unlimited_silicon_privilege)
. = max(., UI_INTERACTIVE)
// Regular ghosts can always at least view if in range.
@@ -34,72 +34,72 @@
var/result = state.can_use_topic(src_object, user)
. = max(., result)
- /**
- * private
- *
- * Checks if a user can use src_object's UI, and returns the state.
- * Can call a mob proc, which allows overrides for each mob.
- *
- * required src_object datum The object/datum which owns the UI.
- * required user mob The mob who opened/is using the UI.
- *
- * return UI_state The state of the UI.
- **/
-/datum/ui_state/proc/can_use_topic(src_object, mob/user)
+/**
+ * private
+ *
+ * Checks if a user can use src_object's UI, and returns the state.
+ * Can call a mob proc, which allows overrides for each mob.
+ *
+ * required src_object datum The object/datum which owns the UI.
+ * required user mob The mob who opened/is using the UI.
+ *
+ * return UI_state The state of the UI.
+ */
+/datum/tgui_state/proc/can_use_topic(src_object, mob/user)
return UI_CLOSE // Don't allow interaction by default.
- /**
- * public
- *
- * Standard interaction/sanity checks. Different mob types may have overrides.
- *
- * return UI_state The state of the UI.
- **/
-/mob/proc/shared_ui_interaction(src_object)
+/**
+ * public
+ *
+ * Standard interaction/sanity checks. Different mob types may have overrides.
+ *
+ * return UI_state The state of the UI.
+ */
+/mob/proc/shared_tgui_interaction(src_object)
if(!client) // Close UIs if mindless.
return UI_CLOSE
else if(stat) // Disable UIs if unconcious.
return UI_DISABLED
- else if(incapacitated() || lying) // Update UIs if incapicitated but concious.
+ else if(incapacitated()) // Update UIs if incapicitated but concious.
return UI_UPDATE
return UI_INTERACTIVE
-/mob/living/silicon/ai/shared_ui_interaction(src_object)
+/mob/living/silicon/ai/shared_tgui_interaction(src_object)
if(lacks_power()) // Disable UIs if the AI is unpowered.
return UI_DISABLED
return ..()
-/mob/living/silicon/robot/shared_ui_interaction(src_object)
+/mob/living/silicon/robot/shared_tgui_interaction(src_object)
if(!cell || cell.charge <= 0 || lockcharge) // Disable UIs if the Borg is unpowered or locked.
return UI_DISABLED
return ..()
/**
- * public
- *
- * Check the distance for a living mob.
- * Really only used for checks outside the context of a mob.
- * Otherwise, use shared_living_ui_distance().
- *
- * required src_object The object which owns the UI.
- * required user mob The mob who opened/is using the UI.
- *
- * return UI_state The state of the UI.
- **/
-/atom/proc/contents_ui_distance(src_object, mob/living/user)
- return user.shared_living_ui_distance(src_object) // Just call this mob's check.
+ * public
+ *
+ * Check the distance for a living mob.
+ * Really only used for checks outside the context of a mob.
+ * Otherwise, use shared_living_ui_distance().
+ *
+ * required src_object The object which owns the UI.
+ * required user mob The mob who opened/is using the UI.
+ *
+ * return UI_state The state of the UI.
+ */
+/atom/proc/contents_tgui_distance(src_object, mob/living/user)
+ return user.shared_living_tgui_distance(src_object) // Just call this mob's check.
- /**
- * public
- *
- * Distance versus interaction check.
- *
- * required src_object atom/movable The object which owns the UI.
- *
- * return UI_state The state of the UI.
- **/
-/mob/living/proc/shared_living_ui_distance(atom/movable/src_object)
- if(!(src_object in view(src))) // If the object is obscured, close it.
+/**
+ * public
+ *
+ * Distance versus interaction check.
+ *
+ * required src_object atom/movable The object which owns the UI.
+ *
+ * return UI_state The state of the UI.
+ */
+/mob/living/proc/shared_living_tgui_distance(atom/movable/src_object, viewcheck = TRUE)
+ if(viewcheck && !(src_object in view(src))) // If the object is obscured, close it.
return UI_CLOSE
var/dist = get_dist(src_object, src)
@@ -111,7 +111,7 @@
return UI_DISABLED
return UI_CLOSE // Otherwise, we got nothing.
-/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object)
+/mob/living/carbon/human/shared_living_tgui_distance(atom/movable/src_object)
if(dna.check_mutation(TK) && tkMaxRangeCheck(src, src_object))
return UI_INTERACTIVE
return ..()
diff --git a/code/modules/tgui/states/admin.dm b/code/modules/tgui/states/admin.dm
index 945a86443..a634cc5cc 100644
--- a/code/modules/tgui/states/admin.dm
+++ b/code/modules/tgui/states/admin.dm
@@ -4,9 +4,9 @@
* Checks that the user is an admin, end-of-story.
**/
-GLOBAL_DATUM_INIT(admin_state, /datum/ui_state/admin_state, new)
+GLOBAL_DATUM_INIT(tgui_admin_state, /datum/tgui_state/admin_state, new)
-/datum/ui_state/admin_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/admin_state/can_use_topic(src_object, mob/user)
if(check_rights_for(user.client, R_ADMIN))
return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/tgui/states/always.dm b/code/modules/tgui/states/always.dm
index b6c689d5d..46d13dfe9 100644
--- a/code/modules/tgui/states/always.dm
+++ b/code/modules/tgui/states/always.dm
@@ -5,7 +5,7 @@
* Always grants the user UI_INTERACTIVE. Period.
**/
-GLOBAL_DATUM_INIT(always_state, /datum/ui_state/always_state, new)
+GLOBAL_DATUM_INIT(tgui_always_state, /datum/tgui_state/always_state, new)
-/datum/ui_state/always_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/always_state/can_use_topic(src_object, mob/user)
return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/conscious.dm b/code/modules/tgui/states/conscious.dm
index 4323c1391..82171c0a9 100644
--- a/code/modules/tgui/states/conscious.dm
+++ b/code/modules/tgui/states/conscious.dm
@@ -4,9 +4,9 @@
* Only checks if the user is conscious.
**/
-GLOBAL_DATUM_INIT(conscious_state, /datum/ui_state/conscious_state, new)
+GLOBAL_DATUM_INIT(tgui_conscious_state, /datum/tgui_state/conscious_state, new)
-/datum/ui_state/conscious_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/conscious_state/can_use_topic(src_object, mob/user)
if(user.stat == CONSCIOUS)
return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/tgui/states/contained.dm b/code/modules/tgui/states/contained.dm
index 7387f7e6c..af3cb9dfc 100644
--- a/code/modules/tgui/states/contained.dm
+++ b/code/modules/tgui/states/contained.dm
@@ -4,9 +4,9 @@
* Checks that the user is inside the src_object.
**/
-GLOBAL_DATUM_INIT(contained_state, /datum/ui_state/contained_state, new)
+GLOBAL_DATUM_INIT(tgui_contained_state, /datum/tgui_state/contained_state, new)
-/datum/ui_state/contained_state/can_use_topic(atom/src_object, mob/user)
+/datum/tgui_state/contained_state/can_use_topic(atom/src_object, mob/user)
if(!src_object.contains(user))
return UI_CLOSE
- return user.shared_ui_interaction(src_object)
+ return user.shared_tgui_interaction(src_object)
diff --git a/code/modules/tgui/states/deep_inventory.dm b/code/modules/tgui/states/deep_inventory.dm
index 06bdb92f3..27c6892a8 100644
--- a/code/modules/tgui/states/deep_inventory.dm
+++ b/code/modules/tgui/states/deep_inventory.dm
@@ -4,9 +4,9 @@
* Checks that the src_object is in the user's deep (backpack, box, toolbox, etc) inventory.
**/
-GLOBAL_DATUM_INIT(deep_inventory_state, /datum/ui_state/deep_inventory_state, new)
+GLOBAL_DATUM_INIT(tgui_deep_inventory_state, /datum/tgui_state/deep_inventory_state, new)
-/datum/ui_state/deep_inventory_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/deep_inventory_state/can_use_topic(src_object, mob/user)
if(!user.contains(src_object))
return UI_CLOSE
- return user.shared_ui_interaction(src_object)
+ return user.shared_tgui_interaction(src_object)
diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm
index c6741f20b..5fe29a862 100644
--- a/code/modules/tgui/states/default.dm
+++ b/code/modules/tgui/states/default.dm
@@ -4,39 +4,39 @@
* Checks a number of things -- mostly physical distance for humans and view for robots.
**/
-GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new)
+GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new)
-/datum/ui_state/default/can_use_topic(src_object, mob/user)
- return user.default_can_use_topic(src_object) // Call the individual mob-overridden procs.
+/datum/tgui_state/default/can_use_topic(src_object, mob/user)
+ return user.default_can_use_tgui_topic(src_object) // Call the individual mob-overridden procs.
-/mob/proc/default_can_use_topic(src_object)
+/mob/proc/default_can_use_tgui_topic(src_object)
return UI_CLOSE // Don't allow interaction by default.
-/mob/living/default_can_use_topic(src_object)
- . = shared_ui_interaction(src_object)
+/mob/living/default_can_use_tgui_topic(src_object)
+ . = shared_tgui_interaction(src_object)
if(. > UI_CLOSE && loc)
- . = min(., loc.contents_ui_distance(src_object, src)) // Check the distance...
+ . = min(., loc.contents_tgui_distance(src_object, src)) // Check the distance...
if(. == UI_INTERACTIVE) // Non-human living mobs can only look, not touch.
return UI_UPDATE
-/mob/living/carbon/human/default_can_use_topic(src_object)
- . = shared_ui_interaction(src_object)
+/mob/living/carbon/human/default_can_use_tgui_topic(src_object)
+ . = shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
- . = min(., shared_living_ui_distance(src_object)) // Check the distance...
+ . = min(., shared_living_tgui_distance(src_object)) // Check the distance...
-/mob/living/silicon/robot/default_can_use_topic(src_object)
- . = shared_ui_interaction(src_object)
+/mob/living/silicon/robot/default_can_use_tgui_topic(src_object)
+ . = shared_tgui_interaction(src_object)
if(. <= UI_DISABLED)
return
// Robots can interact with anything they can see.
var/list/clientviewlist = getviewsize(client.view)
- if(get_dist(src, src_object) <= min(clientviewlist[1],clientviewlist[2]))
+ if((src_object in view(src)) && (get_dist(src, src_object) <= min(clientviewlist[1],clientviewlist[2])))
return UI_INTERACTIVE
return UI_DISABLED // Otherwise they can keep the UI open.
-/mob/living/silicon/ai/default_can_use_topic(src_object)
- . = shared_ui_interaction(src_object)
+/mob/living/silicon/ai/default_can_use_tgui_topic(src_object)
+ . = shared_tgui_interaction(src_object)
if(. < UI_INTERACTIVE)
return
@@ -45,12 +45,12 @@ GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new)
return UI_INTERACTIVE
return UI_CLOSE
-/mob/living/simple_animal/default_can_use_topic(src_object)
- . = shared_ui_interaction(src_object)
+/mob/living/simple_animal/default_can_use_tgui_topic(src_object)
+ . = shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
- . = min(., shared_living_ui_distance(src_object)) //simple animals can only use things they're near.
+ . = min(., shared_living_tgui_distance(src_object)) //simple animals can only use things they're near.
-/mob/living/silicon/pai/default_can_use_topic(src_object)
+/mob/living/silicon/pai/default_can_use_tgui_topic(src_object)
// pAIs can only use themselves and the owner's radio.
if((src_object == src || src_object == radio) && !stat)
return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/hands.dm b/code/modules/tgui/states/hands.dm
index 5da0e5d50..f65462505 100644
--- a/code/modules/tgui/states/hands.dm
+++ b/code/modules/tgui/states/hands.dm
@@ -4,22 +4,22 @@
* Checks that the src_object is in the user's hands.
**/
-GLOBAL_DATUM_INIT(hands_state, /datum/ui_state/hands_state, new)
+GLOBAL_DATUM_INIT(tgui_hands_state, /datum/tgui_state/hands_state, new)
-/datum/ui_state/hands_state/can_use_topic(src_object, mob/user)
- . = user.shared_ui_interaction(src_object)
+/datum/tgui_state/hands_state/can_use_topic(src_object, mob/user)
+ . = user.shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
- return min(., user.hands_can_use_topic(src_object))
+ return min(., user.hands_can_use_tgui_topic(src_object))
-/mob/proc/hands_can_use_topic(src_object)
+/mob/proc/hands_can_use_tgui_topic(src_object)
return UI_CLOSE
-/mob/living/hands_can_use_topic(src_object)
+/mob/living/hands_can_use_tgui_topic(src_object)
if(is_holding(src_object))
return UI_INTERACTIVE
return UI_CLOSE
-/mob/living/silicon/robot/hands_can_use_topic(src_object)
+/mob/living/silicon/robot/hands_can_use_tgui_topic(src_object)
if(activated(src_object))
return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/tgui/states/human_adjacent.dm b/code/modules/tgui/states/human_adjacent.dm
index 0ab20b36f..3f8efa010 100644
--- a/code/modules/tgui/states/human_adjacent.dm
+++ b/code/modules/tgui/states/human_adjacent.dm
@@ -6,10 +6,10 @@
* human adjacent user.
**/
-GLOBAL_DATUM_INIT(human_adjacent_state, /datum/ui_state/human_adjacent_state, new)
+GLOBAL_DATUM_INIT(tgui_human_adjacent_state, /datum/tgui_state/human_adjacent_state, new)
-/datum/ui_state/human_adjacent_state/can_use_topic(src_object, mob/user)
- . = user.default_can_use_topic(src_object)
+/datum/tgui_state/human_adjacent_state/can_use_topic(src_object, mob/user)
+ . = user.default_can_use_tgui_topic(src_object)
var/dist = get_dist(src_object, user)
if((dist > 1) || (!ishuman(user)))
diff --git a/code/modules/tgui/states/inventory.dm b/code/modules/tgui/states/inventory.dm
index b8b1ad3b6..a89154537 100644
--- a/code/modules/tgui/states/inventory.dm
+++ b/code/modules/tgui/states/inventory.dm
@@ -4,9 +4,9 @@
* Checks that the src_object is in the user's top-level (hand, ear, pocket, belt, etc) inventory.
**/
-GLOBAL_DATUM_INIT(inventory_state, /datum/ui_state/inventory_state, new)
+GLOBAL_DATUM_INIT(tgui_inventory_state, /datum/tgui_state/inventory_state, new)
-/datum/ui_state/inventory_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/inventory_state/can_use_topic(src_object, mob/user)
if(!(src_object in user))
return UI_CLOSE
- return user.shared_ui_interaction(src_object)
+ return user.shared_tgui_interaction(src_object)
diff --git a/code/modules/tgui/states/language_menu.dm b/code/modules/tgui/states/language_menu.dm
index fedc4320e..736fef5c7 100644
--- a/code/modules/tgui/states/language_menu.dm
+++ b/code/modules/tgui/states/language_menu.dm
@@ -2,9 +2,9 @@
* tgui state: language_menu_state
*/
-GLOBAL_DATUM_INIT(language_menu_state, /datum/ui_state/language_menu, new)
+GLOBAL_DATUM_INIT(language_menu_state, /datum/tgui_state/language_menu, new)
-/datum/ui_state/language_menu/can_use_topic(src_object, mob/user)
+/datum/tgui_state/language_menu/can_use_topic(src_object, mob/user)
. = UI_CLOSE
if(check_rights_for(user.client, R_ADMIN))
. = UI_INTERACTIVE
diff --git a/code/modules/tgui/states/not_incapacitated.dm b/code/modules/tgui/states/not_incapacitated.dm
index 12fe266bc..3f87a47db 100644
--- a/code/modules/tgui/states/not_incapacitated.dm
+++ b/code/modules/tgui/states/not_incapacitated.dm
@@ -4,7 +4,7 @@
* Checks that the user isn't incapacitated
**/
-GLOBAL_DATUM_INIT(not_incapacitated_state, /datum/ui_state/not_incapacitated_state, new)
+GLOBAL_DATUM_INIT(tgui_not_incapacitated_state, /datum/tgui_state/not_incapacitated_state, new)
/**
* tgui state: not_incapacitated_turf_state
@@ -12,18 +12,18 @@ GLOBAL_DATUM_INIT(not_incapacitated_state, /datum/ui_state/not_incapacitated_sta
* Checks that the user isn't incapacitated and that their loc is a turf
**/
-GLOBAL_DATUM_INIT(not_incapacitated_turf_state, /datum/ui_state/not_incapacitated_state, new(no_turfs = TRUE))
+GLOBAL_DATUM_INIT(tgui_not_incapacitated_turf_state, /datum/tgui_state/not_incapacitated_state, new(no_turfs = TRUE))
-/datum/ui_state/not_incapacitated_state
+/datum/tgui_state/not_incapacitated_state
var/turf_check = FALSE
-/datum/ui_state/not_incapacitated_state/New(loc, no_turfs = FALSE)
+/datum/tgui_state/not_incapacitated_state/New(loc, no_turfs = FALSE)
..()
turf_check = no_turfs
-/datum/ui_state/not_incapacitated_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/not_incapacitated_state/can_use_topic(src_object, mob/user)
if(user.stat)
return UI_CLOSE
- if(user.incapacitated() || user.lying || (turf_check && !isturf(user.loc)))
+ if(user.incapacitated() || (turf_check && !isturf(user.loc)))
return UI_DISABLED
- return UI_INTERACTIVE
\ No newline at end of file
+ return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/notcontained.dm b/code/modules/tgui/states/notcontained.dm
index 77a7fe01b..456bfbeac 100644
--- a/code/modules/tgui/states/notcontained.dm
+++ b/code/modules/tgui/states/notcontained.dm
@@ -4,23 +4,23 @@
* Checks that the user is not inside src_object, and then makes the default checks.
**/
-GLOBAL_DATUM_INIT(notcontained_state, /datum/ui_state/notcontained_state, new)
+GLOBAL_DATUM_INIT(tgui_notcontained_state, /datum/tgui_state/notcontained_state, new)
-/datum/ui_state/notcontained_state/can_use_topic(atom/src_object, mob/user)
- . = user.shared_ui_interaction(src_object)
+/datum/tgui_state/notcontained_state/can_use_topic(atom/src_object, mob/user)
+ . = user.shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
- return min(., user.notcontained_can_use_topic(src_object))
+ return min(., user.notcontained_can_use_tgui_topic(src_object))
-/mob/proc/notcontained_can_use_topic(src_object)
+/mob/proc/notcontained_can_use_tgui_topic(src_object)
return UI_CLOSE
-/mob/living/notcontained_can_use_topic(atom/src_object)
+/mob/living/notcontained_can_use_tgui_topic(atom/src_object)
if(src_object.contains(src))
return UI_CLOSE // Close if we're inside it.
- return default_can_use_topic(src_object)
+ return default_can_use_tgui_topic(src_object)
-/mob/living/silicon/notcontained_can_use_topic(src_object)
- return default_can_use_topic(src_object) // Silicons use default bevhavior.
+/mob/living/silicon/notcontained_can_use_tgui_topic(src_object)
+ return default_can_use_tgui_topic(src_object) // Silicons use default bevhavior.
-/mob/living/simple_animal/drone/notcontained_can_use_topic(src_object)
- return default_can_use_topic(src_object) // Drones use default bevhavior.
+/mob/living/simple_animal/drone/notcontained_can_use_tgui_topic(src_object)
+ return default_can_use_tgui_topic(src_object) // Drones use default bevhavior.
diff --git a/code/modules/tgui/states/observer.dm b/code/modules/tgui/states/observer.dm
index ade0ce66b..b17c3260c 100644
--- a/code/modules/tgui/states/observer.dm
+++ b/code/modules/tgui/states/observer.dm
@@ -4,9 +4,9 @@
* Checks that the user is an observer/ghost.
**/
-GLOBAL_DATUM_INIT(observer_state, /datum/ui_state/observer_state, new)
+GLOBAL_DATUM_INIT(tgui_observer_state, /datum/tgui_state/observer_state, new)
-/datum/ui_state/observer_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/observer_state/can_use_topic(src_object, mob/user)
if(isobserver(user))
return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/tgui/states/physical.dm b/code/modules/tgui/states/physical.dm
index 3b13dc5b3..ef6faefeb 100644
--- a/code/modules/tgui/states/physical.dm
+++ b/code/modules/tgui/states/physical.dm
@@ -2,25 +2,25 @@
* tgui state: physical_state
*
* Short-circuits the default state to only check physical distance.
- */
+ **/
-GLOBAL_DATUM_INIT(physical_state, /datum/ui_state/physical, new)
+GLOBAL_DATUM_INIT(tgui_physical_state, /datum/tgui_state/physical, new)
-/datum/ui_state/physical/can_use_topic(src_object, mob/user)
- . = user.shared_ui_interaction(src_object)
+/datum/tgui_state/physical/can_use_topic(src_object, mob/user)
+ . = user.shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
- return min(., user.physical_can_use_topic(src_object))
+ return min(., user.physical_can_use_tgui_topic(src_object))
-/mob/proc/physical_can_use_topic(src_object)
+/mob/proc/physical_can_use_tgui_topic(src_object)
return UI_CLOSE
-/mob/living/physical_can_use_topic(src_object)
- return shared_living_ui_distance(src_object)
+/mob/living/physical_can_use_tgui_topic(src_object)
+ return shared_living_tgui_distance(src_object)
-/mob/living/silicon/physical_can_use_topic(src_object)
- return max(UI_UPDATE, shared_living_ui_distance(src_object)) // Silicons can always see.
+/mob/living/silicon/physical_can_use_tgui_topic(src_object)
+ return max(UI_UPDATE, shared_living_tgui_distance(src_object)) // Silicons can always see.
-/mob/living/silicon/ai/physical_can_use_topic(src_object)
+/mob/living/silicon/ai/physical_can_use_tgui_topic(src_object)
return UI_UPDATE // AIs are not physical.
/**
@@ -29,10 +29,10 @@ GLOBAL_DATUM_INIT(physical_state, /datum/ui_state/physical, new)
* Short-circuits the default state to only check physical distance, being in view doesn't matter
*/
-GLOBAL_DATUM_INIT(physical_obscured_state, /datum/ui_state/physical_obscured_state, new)
+GLOBAL_DATUM_INIT(tgui_physical_obscured_state, /datum/tgui_state/physical_obscured_state, new)
-/datum/ui_state/physical_obscured_state/can_use_topic(src_object, mob/user)
- . = user.shared_ui_interaction(src_object)
+/datum/tgui_state/physical_obscured_state/can_use_topic(src_object, mob/user)
+ . = user.shared_tgui_interaction(src_object)
if(. > UI_CLOSE)
return min(., user.physical_obscured_can_use_topic(src_object))
@@ -40,10 +40,10 @@ GLOBAL_DATUM_INIT(physical_obscured_state, /datum/ui_state/physical_obscured_sta
return UI_CLOSE
/mob/living/physical_obscured_can_use_topic(src_object)
- return shared_living_ui_distance(src_object)
+ return shared_living_tgui_distance(src_object)
/mob/living/silicon/physical_obscured_can_use_topic(src_object)
- return max(UI_UPDATE, shared_living_ui_distance(src_object)) // Silicons can always see.
+ return max(UI_UPDATE, shared_living_tgui_distance(src_object)) // Silicons can always see.
/mob/living/silicon/ai/physical_obscured_can_use_topic(src_object)
return UI_UPDATE // AIs are not physical.
\ No newline at end of file
diff --git a/code/modules/tgui/states/self.dm b/code/modules/tgui/states/self.dm
index 10849772c..fa7f6a2c3 100644
--- a/code/modules/tgui/states/self.dm
+++ b/code/modules/tgui/states/self.dm
@@ -4,9 +4,9 @@
* Only checks that the user and src_object are the same.
**/
-GLOBAL_DATUM_INIT(self_state, /datum/ui_state/self_state, new)
+GLOBAL_DATUM_INIT(tgui_self_state, /datum/tgui_state/self_state, new)
-/datum/ui_state/self_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/self_state/can_use_topic(src_object, mob/user)
if(src_object != user)
return UI_CLOSE
- return user.shared_ui_interaction(src_object)
+ return user.shared_tgui_interaction(src_object)
diff --git a/code/modules/tgui/states/zlevel.dm b/code/modules/tgui/states/zlevel.dm
index 6ccfd0fe7..5cff13ff3 100644
--- a/code/modules/tgui/states/zlevel.dm
+++ b/code/modules/tgui/states/zlevel.dm
@@ -4,9 +4,9 @@
* Only checks that the Z-level of the user and src_object are the same.
**/
-GLOBAL_DATUM_INIT(z_state, /datum/ui_state/z_state, new)
+GLOBAL_DATUM_INIT(tgui_z_state, /datum/tgui_state/z_state, new)
-/datum/ui_state/z_state/can_use_topic(src_object, mob/user)
+/datum/tgui_state/z_state/can_use_topic(src_object, mob/user)
var/turf/turf_obj = get_turf(src_object)
var/turf/turf_usr = get_turf(user)
if(turf_obj && turf_usr && turf_obj.z == turf_usr.z)
diff --git a/code/modules/tgui/subsystem.dm b/code/modules/tgui/subsystem.dm
index 90a00fb60..f91247b2f 100644
--- a/code/modules/tgui/subsystem.dm
+++ b/code/modules/tgui/subsystem.dm
@@ -128,11 +128,11 @@
* return int The number of UIs updated.
**/
/datum/controller/subsystem/tgui/proc/update_user_uis(mob/user, datum/src_object = null, ui_key = null)
- if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
+ if(isnull(user.open_tguis) || !istype(user.open_tguis, /list) || open_uis.len == 0)
return 0 // Couldn't find any UIs for this user.
var/update_count = 0
- for(var/datum/tgui/ui in user.open_uis)
+ for(var/datum/tgui/ui in user.open_tguis)
if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
ui.process(force = 1) // Update the UI.
update_count++ // Count each UI we upadte.
@@ -150,11 +150,11 @@
* return int The number of UIs closed.
**/
/datum/controller/subsystem/tgui/proc/close_user_uis(mob/user, datum/src_object = null, ui_key = null)
- if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
+ if(isnull(user.open_tguis) || !istype(user.open_tguis, /list) || open_uis.len == 0)
return 0 // Couldn't find any UIs for this user.
var/close_count = 0
- for(var/datum/tgui/ui in user.open_uis)
+ for(var/datum/tgui/ui in user.open_tguis)
if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
ui.close() // Close the UI.
close_count++ // Count each UI we close.
@@ -175,7 +175,7 @@
open_uis[src_object_key][ui.ui_key] = list() // Make a list for the ui_key.
// Append the UI to all the lists.
- ui.user.open_uis |= ui
+ ui.user.open_tguis |= ui
var/list/uis = open_uis[src_object_key][ui.ui_key]
uis |= ui
processing_uis |= ui
@@ -198,7 +198,7 @@
processing_uis.Remove(ui) // Remove it from the list of processing UIs.
if(ui.user) // If the user exists, remove it from them too.
- ui.user.open_uis.Remove(ui)
+ ui.user.open_tguis.Remove(ui)
var/Ukey = ui.ui_key
var/list/uis = open_uis[src_object_key][Ukey] // Remove it from the list of open UIs.
uis.Remove(ui)
@@ -233,15 +233,15 @@
* return bool If the UIs were transferred.
**/
/datum/controller/subsystem/tgui/proc/on_transfer(mob/source, mob/target)
- if(!source || isnull(source.open_uis) || !istype(source.open_uis, /list) || open_uis.len == 0)
+ if(!source || isnull(source.open_tguis) || !istype(source.open_tguis, /list) || open_uis.len == 0)
return 0 // The old mob had no open UIs.
- if(isnull(target.open_uis) || !istype(target.open_uis, /list))
- target.open_uis = list() // Create a list for the new mob if needed.
+ if(isnull(target.open_tguis) || !istype(target.open_tguis, /list))
+ target.open_tguis = list() // Create a list for the new mob if needed.
- for(var/datum/tgui/ui in source.open_uis)
+ for(var/datum/tgui/ui in source.open_tguis)
ui.user = target // Inform the UIs of their new owner.
- target.open_uis.Add(ui) // Transfer all the UIs.
+ target.open_tguis.Add(ui) // Transfer all the UIs.
- source.open_uis.Cut() // Clear the old list.
+ source.open_tguis.Cut() // Clear the old list.
return 1 // Let the caller know we did it.
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 55fe8f0bb..f564a8c0f 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -1,12 +1,12 @@
- /**
- * tgui
- *
- * /tg/station user interface library
- **/
+/**
+ * tgui
+ *
+ * /tg/station user interface library
+ */
- /**
- * tgui datum (represents a UI).
- **/
+/**
+ * tgui datum (represents a UI).
+ */
/datum/tgui
/// The mob who opened/is using the UI.
var/mob/user
@@ -22,8 +22,10 @@
var/width = 0
/// The window height
var/height = 0
- /// The style to be used for this UI.
- var/style = "nanotrasen"
+
+ // /// The style to be used for this UI.
+ // var/style = "nanotrasen"
+
/// The interface (template) to be used for this UI.
var/interface
/// Update the UI every MC tick.
@@ -34,42 +36,40 @@
var/list/initial_data
/// The static data used to initialize the UI.
var/list/initial_static_data
+ /// Holder for the json string, that is sent during the initial update
+ var/_initial_update
/// The status/visibility of the UI.
var/status = UI_INTERACTIVE
/// Topic state used to determine status/interactability.
- var/datum/ui_state/state = null
+ var/datum/tgui_state/state = null
/// The parent UI.
var/datum/tgui/master_ui
/// Children of this UI.
var/list/datum/tgui/children = list()
- var/custom_browser_id = FALSE
- var/ui_screen = "home"
- /**
- * public
- *
- * Create a new UI.
- *
- * required user mob The mob who opened/is using the UI.
- * required src_object datum The object or datum which owns the UI.
- * required ui_key string The ui_key of the UI.
- * required interface string The interface used to render the UI.
- * optional title string The title of the UI.
- * optional width int The window width.
- * optional height int The window height.
- * optional master_ui datum/tgui The parent UI.
- * optional state datum/ui_state The state used to determine status.
- *
- * return datum/tgui The requested UI.
- **/
-/datum/tgui/New(mob/user, datum/src_object, ui_key, interface, title, width = 0, height = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state, browser_id = null)
+/**
+ * public
+ *
+ * Create a new UI.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * required src_object datum The object or datum which owns the UI.
+ * required ui_key string The ui_key of the UI.
+ * required interface string The interface used to render the UI.
+ * optional title string The title of the UI.
+ * optional width int The window width.
+ * optional height int The window height.
+ * optional master_ui datum/tgui The parent UI.
+ * optional state datum/tgui_state The state used to determine status.
+ *
+ * return datum/tgui The requested UI.
+ */
+/datum/tgui/New(mob/user, datum/src_object, ui_key, interface, title, width = 0, height = 0, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
src.user = user
src.src_object = src_object
src.ui_key = ui_key
- src.window_id = browser_id ? browser_id : "[REF(src_object)]-[ui_key]" // DO NOT replace with \ref here. src_object could potentially be tagged
- src.custom_browser_id = browser_id ? TRUE : FALSE
-
- set_interface(interface)
+ src.window_id = "[src_object.UID()]-[ui_key]"
+ src.interface = interface
if(title)
src.title = sanitize(title)
@@ -83,14 +83,16 @@
master_ui.children += src
src.state = state
- var/datum/asset/assets = get_asset_datum(/datum/asset/group/tgui)
- assets.send(user)
+ var/datum/asset/tgui_assets = get_asset_datum(/datum/asset/simple/tgui)
+ var/datum/asset/fa = get_asset_datum(/datum/asset/simple/fontawesome)
+ tgui_assets.send(user)
+ fa.send(user)
- /**
- * public
- *
- * Open this UI (and initialize it with data).
- **/
+/**
+ * public
+ *
+ * Open this UI (and initialize it with data).
+ */
/datum/tgui/proc/open()
if(!user.client)
return // Bail if there is no client.
@@ -99,18 +101,19 @@
if(status < UI_UPDATE)
return // Bail if we're not supposed to open.
- var/window_size
- if(width && height) // If we have a width and height, use them.
- window_size = "size=[width]x[height];"
- else
- window_size = ""
+
+
+ // Build window options
+ var/window_options = "can_minimize=0;auto_format=0;"
+ // If we have a width and height, use them.
+ if(width && height)
+ window_options += "size=[width]x[height];"
// Remove titlebar and resize handles for a fancy window
- var/have_title_bar
if(user.client.prefs.tgui_fancy)
- have_title_bar = "titlebar=0;can_resize=0;"
+ window_options += "titlebar=0;can_resize=0;"
else
- have_title_bar = "titlebar=1;can_resize=1;"
+ window_options += "titlebar=1;can_resize=1;"
// Generate page html
var/html
@@ -118,52 +121,52 @@
// Allow the src object to override the html if needed
html = src_object.ui_base_html(html)
// Replace template tokens with important UI data
- // NOTE: Intentional \ref usage; tgui datums can't/shouldn't
- // be tagged, so this is an effective unwrap
- html = replacetextEx(html, "\[ref]", "\ref[src]")
- html = replacetextEx(html, "\[style]", style)
+ html = replacetextEx(html, "\[tgui:ref]", "[src.UID()]")
// Open the window.
- user << browse(html, "window=[window_id];can_minimize=0;auto_format=0;[window_size][have_title_bar]")
- if (!custom_browser_id)
- // Instruct the client to signal UI when the window is closed.
- // NOTE: Intentional \ref usage; tgui datums can't/shouldn't
- // be tagged, so this is an effective unwrap
- winset(user, window_id, "on-close=\"uiclose \ref[src]\"")
+ user << browse(html, "window=[window_id];[window_options]")
+ // Instruct the client to signal UI when the window is closed.
+ // NOTE: Intentional \ref usage; tgui datums can't/shouldn't
+ // be tagged, so this is an effective unwrap
+ winset(user, window_id, "on-close=\"uiclose [UID()]\"")
+
+ // Pre-fetch initial state while browser is still loading in
+ // another thread
if(!initial_data)
initial_data = src_object.ui_data(user)
if(!initial_static_data)
initial_static_data = src_object.ui_static_data(user)
+ _initial_update = url_encode(get_json(initial_data, initial_static_data))
SStgui.on_open(src)
- /**
- * public
- *
- * Reinitialize the UI.
- * (Possibly with a new interface and/or data).
- *
- * optional template string The name of the new interface.
- * optional data list The new initial data.
- **/
+/**
+ * public
+ *
+ * Reinitialize the UI.
+ * (Possibly with a new interface and/or data).
+ *
+ * optional template string The name of the new interface.
+ * optional data list The new initial data.
+ */
/datum/tgui/proc/reinitialize(interface, list/data, list/static_data)
if(interface)
- set_interface(interface) // Set a new interface.
+ src.interface = interface
if(data)
initial_data = data
if(static_data)
initial_static_data = static_data
open()
- /**
- * public
- *
- * Close the UI, and all its children.
- **/
+/**
+ * public
+ *
+ * Close the UI, and all its children.
+ */
/datum/tgui/proc/close()
user << browse(null, "window=[window_id]") // Close the window.
- src_object.ui_close()
+ src_object.ui_close(user)
SStgui.on_close(src)
for(var/datum/tgui/child in children) // Loop through and close all children.
child.close()
@@ -172,67 +175,68 @@
master_ui = null
qdel(src)
- /**
- * public
- *
- * Set the style for this UI.
- *
- * required style string The new UI style.
- **/
-/datum/tgui/proc/set_style(style)
- src.style = lowertext(style)
+// /**
+// * public
+// *
+// * Set the style for this UI.
+// *
+// * required style string The new UI style.
+// **/
+// /datum/tgui/proc/set_style(style)
+// src.style = lowertext(style)
- /**
- * public
- *
- * Set the interface (template) for this UI.
- *
- * required interface string The new UI interface.
- **/
-/datum/tgui/proc/set_interface(interface)
- src.interface = lowertext(interface)
+// /**
+// * public
+// *
+// * Set the interface (template) for this UI.
+// *
+// * required interface string The new UI interface.
+// **/
+// /datum/tgui/proc/set_interface(interface)
+// src.interface = lowertext(interface)
- /**
- * public
- *
- * Enable/disable auto-updating of the UI.
- *
- * required state bool Enable/disable auto-updating.
- **/
+/**
+ * public
+ *
+ * Enable/disable auto-updating of the UI.
+ *
+ * required state bool Enable/disable auto-updating.
+ */
/datum/tgui/proc/set_autoupdate(state = TRUE)
autoupdate = state
- /**
- * private
- *
- * Package the data to send to the UI, as JSON.
- * This includes the UI data and config_data.
- *
- * return string The packaged JSON.
- **/
+/**
+ * private
+ *
+ * Package the data to send to the UI, as JSON.
+ * This includes the UI data and config_data.
+ *
+ * return string The packaged JSON.
+ */
/datum/tgui/proc/get_json(list/data, list/static_data)
var/list/json_data = list()
json_data["config"] = list(
"title" = title,
"status" = status,
- "screen" = ui_screen,
- "style" = style,
+ // "style" = style,
"interface" = interface,
"fancy" = user.client.prefs.tgui_fancy,
- "locked" = user.client.prefs.tgui_lock && !custom_browser_id,
"observer" = isobserver(user),
"window" = window_id,
- // NOTE: Intentional \ref usage; tgui datums can't/shouldn't
- // be tagged, so this is an effective unwrap
- "ref" = "\ref[src]"
+ // "map" = (GLOB.using_map && GLOB.using_map.name) ? GLOB.using_map.name : "Unknown",
+ "ref" = "[src.UID()]"
)
-
+
if(!isnull(data))
json_data["data"] = data
if(!isnull(static_data))
json_data["static_data"] = static_data
+ // Send shared states
+ if(src_object.tgui_shared_states)
+ json_data["shared"] = src_object.tgui_shared_states
+
// Generate the JSON.
var/json = json_encode(json_data)
// Strip #255/improper.
@@ -240,13 +244,13 @@
json = replacetext(json, "\improper", "")
return json
- /**
- * private
- *
- * Handle clicks from the UI.
- * Call the src_object's ui_act() if status is UI_INTERACTIVE.
- * If the src_object's ui_act() returns 1, update all UIs attacked to it.
- **/
+/**
+ * private
+ *
+ * Handle clicks from the UI.
+ * Call the src_object's ui_act() if status is UI_INTERACTIVE.
+ * If the src_object's ui_act() returns 1, update all UIs attacked to it.
+ */
/datum/tgui/Topic(href, href_list)
if(user != usr)
return // Something is not right here.
@@ -256,35 +260,48 @@
switch(action)
if("tgui:initialize")
- user << output(url_encode(get_json(initial_data, initial_static_data)), "[custom_browser_id ? window_id : "[window_id].browser"]:initialize")
+ user << output(_initial_update, "[window_id].browser:update")
initialized = TRUE
- if("tgui:view")
- if(params["screen"])
- ui_screen = params["screen"]
+ if("tgui:setSharedState")
+ // Update the window state.
+ update_status(push = FALSE)
+ // Bail if UI is not interactive or usr calling Topic
+ // is not the UI user.
+ if(status != UI_INTERACTIVE)
+ return
+ var/key = params["key"]
+ var/value = params["value"]
+ if(!src_object.tgui_shared_states)
+ src_object.tgui_shared_states = list()
+ src_object.tgui_shared_states[key] = value
SStgui.update_uis(src_object)
+ if("tgui:setFancy")
+ var/value = text2num(params["value"])
+ user.client.prefs.tgui_fancy = value
if("tgui:log")
// Force window to show frills on fatal errors
if(params["fatal"])
winset(user, window_id, "titlebar=1;can-resize=1;size=600x600")
+ log_message(params["log"])
if("tgui:link")
user << link(params["url"])
- if("tgui:fancy")
- user.client.prefs.tgui_fancy = TRUE
- if("tgui:nofrills")
- user.client.prefs.tgui_fancy = FALSE
- else
- update_status(push = FALSE) // Update the window state.
- if(src_object.ui_act(action, params, src, state)) // Call ui_act() on the src_object.
- SStgui.update_uis(src_object) // Update if the object requested it.
- /**
- * private
- *
- * Update the UI.
- * Only updates the data if update is true, otherwise only updates the status.
- *
- * optional force bool If the UI should be forced to update.
- **/
+ else
+ // Update the window state.
+ update_status(push = FALSE)
+ // Call ui_act() on the src_object.
+ if(src_object.ui_act(action, params, src, state))
+ // Update if the object requested it.
+ SStgui.update_uis(src_object)
+
+/**
+ * private
+ *
+ * Update the UI.
+ * Only updates the data if update is true, otherwise only updates the status.
+ *
+ * optional force bool If the UI should be forced to update.
+ */
/datum/tgui/process(force = FALSE)
var/datum/host = src_object.ui_host(user)
if(!src_object || !host || !user) // If the object or user died (or something else), abort.
@@ -296,69 +313,75 @@
else
update_status(push = TRUE) // Otherwise only update status.
- /**
- * private
- *
- * Push data to an already open UI.
- *
- * required data list The data to send.
- * optional force bool If the update should be sent regardless of state.
- **/
+/**
+ * private
+ *
+ * Push data to an already open UI.
+ *
+ * required data list The data to send.
+ * optional force bool If the update should be sent regardless of state.
+ */
/datum/tgui/proc/push_data(data, static_data, force = FALSE)
- update_status(push = FALSE) // Update the window state.
+ // Update the window state.
+ update_status(push = FALSE)
+ // Cannot update UI if it is not set up yet.
if(!initialized)
- return // Cannot update UI if it is not set up yet.
+ return
+ // Cannot update UI, we have no visibility.
if(status <= UI_DISABLED && !force)
- return // Cannot update UI, we have no visibility.
-
+ return
// Send the new JSON to the update() Javascript function.
- user << output(url_encode(get_json(data, static_data)), "[custom_browser_id ? window_id : "[window_id].browser"]:update")
+ user << output(
+ url_encode(get_json(data, static_data)),
+ "[window_id].browser:update")
- /**
- * private
- *
- * Updates the UI by interacting with the src_object again, which will hopefully
- * call try_ui_update on it.
- *
- * optional force_open bool If force_open should be passed to ui_interact.
- **/
+/**
+ * private
+ *
+ * Updates the UI by interacting with the src_object again, which will hopefully
+ * call try_ui_update on it.
+ *
+ * optional force_open bool If force_open should be passed to ui_interact.
+ */
/datum/tgui/proc/update(force_open = FALSE)
src_object.ui_interact(user, ui_key, src, force_open, master_ui, state)
- /**
- * private
- *
- * Update the status/visibility of the UI for its user.
- *
- * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
- **/
+/**
+ * private
+ *
+ * Update the status/visibility of the UI for its user.
+ *
+ * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
+ */
/datum/tgui/proc/update_status(push = FALSE)
var/status = src_object.ui_status(user, state)
if(master_ui)
status = min(status, master_ui.status)
+
set_status(status, push)
if(status == UI_CLOSE)
close()
- /**
- * private
- *
- * Set the status/visibility of the UI.
- *
- * required status int The status to set (UI_CLOSE/UI_DISABLED/UI_UPDATE/UI_INTERACTIVE).
- * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
- **/
+/**
+ * private
+ *
+ * Set the status/visibility of the UI.
+ *
+ * required status int The status to set (UI_CLOSE/UI_DISABLED/UI_UPDATE/UI_INTERACTIVE).
+ * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
+ */
/datum/tgui/proc/set_status(status, push = FALSE)
- if(src.status != status) // Only update if status has changed.
+ // Only update if status has changed.
+ if(src.status != status)
if(src.status == UI_DISABLED)
src.status = status
if(push)
update()
else
src.status = status
- if(status == UI_DISABLED || push) // Update if the UI just because disabled, or a push is requested.
+ // Update if the UI just because disabled, or a push is requested.
+ if(status == UI_DISABLED || push)
push_data(null, force = TRUE)
/datum/tgui/proc/log_message(message)
log_tgui("[user] ([user.ckey]) using \"[title]\":\n[message]")
-
diff --git a/dependencies.sh b/dependencies.sh
index a75940088..5bfe5a738 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -16,5 +16,5 @@ export RUST_G_VERSION=0.4.2
#bsql git tag
export BSQL_VERSION=v1.4.0.0
-#node version
-export NODE_VERSION=8
+#node version (for tgui)
+export NODE_VERSION=12
diff --git a/hyperstation/code/mobs/crystal.dm b/hyperstation/code/mobs/crystal.dm
new file mode 100644
index 000000000..a949237a0
--- /dev/null
+++ b/hyperstation/code/mobs/crystal.dm
@@ -0,0 +1,65 @@
+#define REGENERATION_DELAY 60 // After taking damage, how long it takes for automatic regeneration to begin for megacarps (ty robustin!)
+
+/mob/living/simple_animal/hostile/crystal
+ name = "pellucyte"
+ desc = "A floating crystal with orbiting smaller crystals."
+ icon = 'hyperstation/icons/mob/crystal.dmi'
+ icon_state = "crystal"
+ icon_living = "crystal"
+ icon_dead = "crystal"
+ mob_biotypes = MOB_BEAST
+ speak_chance = 0
+ turns_per_move = 10
+ response_help = "touches"
+ response_disarm = "gently pushes aside"
+ response_harm = "hits"
+ emote_taunt = list("sings")
+ taunt_chance = 20
+ speed = 0
+ maxHealth = 40
+ health = 40
+ spacewalk = TRUE
+ harm_intent_damage = 8
+ obj_damage = 50
+ melee_damage_lower = 15
+ melee_damage_upper = 15
+ attacktext = "slams"
+ attack_sound = 'sound/creatures/crystal_hit.ogg'
+ speak_emote = list("sings")
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ maxbodytemp = 3500
+ faction = list("carp")
+ movement_type = FLYING
+ pressure_resistance = 500
+ gold_core_spawnable = HOSTILE_SPAWN
+ var/regen_cooldown = 0 //Used for how long it takes before a healing will take place default in 60 seconds
+ var/regen_amount = 1 //How much is healed pre regen cooldown
+ del_on_death = TRUE
+ pixel_x = -8
+
+/mob/living/simple_animal/hostile/crystal/Life()
+ . = ..()
+ if(regen_amount && regen_cooldown < world.time)
+ heal_overall_damage(regen_amount)
+ if(stat)
+ return
+ if(prob(15))
+ playsound(src, 'sound/creatures/crystal_idle.ogg', 100)
+
+/mob/living/simple_animal/hostile/crystal/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
+ . = ..()
+ if(regen_amount)
+ regen_cooldown = world.time + REGENERATION_DELAY
+
+
+/mob/living/simple_animal/hostile/crystal/AttackingTarget()
+ . = ..()
+ if(. && ishuman(target))
+ var/mob/living/carbon/human/H = target
+ H.adjustStaminaLoss(8)
+
+/mob/living/simple_animal/hostile/crystal/Destroy()
+ playsound(src, 'sound/creatures/crystal_death.ogg', 100)
+ new /obj/effect/decal/cleanable/glass(src.loc)
+ return ..()
diff --git a/hyperstation/code/modules/arousal/arousalhud.dm b/hyperstation/code/modules/arousal/arousalhud.dm
index 55d58183e..ff7725ddb 100644
--- a/hyperstation/code/modules/arousal/arousalhud.dm
+++ b/hyperstation/code/modules/arousal/arousalhud.dm
@@ -25,6 +25,9 @@
dat += "Fill container"
dat += "(Use a container in your hand to collect your seminal fluid.) "
+ dat += "Climax on self"
+ dat += "(Stimulate a sexual organ to climax onto yourself.) "
+
var/mob/living/carbon/human/C = usr
if(C && C.w_uniform || C.wear_suit) //if they are wearing cloths
dat += "Explode out of clothes"
@@ -160,6 +163,14 @@
to_chat(usr, "You aren't aroused enough for that! ")
return
+ if(href_list["climaxself"])
+ if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
+ H.climaxself()
+ return
+ else
+ to_chat(usr, "You aren't aroused enough for that! ")
+ return
+
if(href_list["climax"])
if (H.arousalloss >= (H.max_arousal / 100) * 33) //requires 33% arousal.
H.climaxalone(FALSE)
@@ -340,17 +351,14 @@ obj/screen/arousal/proc/kiss()
/mob/living/carbon/human/proc/kisstarget(mob/living/L)
src << browse(null, "window=arousal") //closes the arousal window, if its open, mainly to stop spam
- if(isliving(L)) //is your target living? Living people can resist your advances if they want to via moving.
- if(iscarbon(L))
- src.visible_message("[src] is about to kiss [L]!", \
- "You're attempting to kiss [L]!", \
- "You're attempting to kiss with something!")
- SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "kissed", /datum/mood_event/kiss) //how cute, affection is nice.
- //Well done you kissed it/them!
+
+ L.adjustPainLoss(-5, 0) //mommas kisses always stop alittle pain..
+ SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "kissed", /datum/mood_event/kiss) //how cute, affection is nice.
src.visible_message("[src] kisses [L]!", \
"You kiss [L]!", \
"You kiss something!")
+
/mob/living/carbon/human/proc/climaxalone()
//we dont need hands to climax alone, its hands free!
var/obj/item/organ/genital/picked_organ
@@ -503,4 +511,29 @@ obj/screen/arousal/proc/kiss()
cut_overlay(mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi', "cum_large"))
if(cum_splatter_icon)
cut_overlay(cum_splatter_icon)
- return TRUE
\ No newline at end of file
+ return TRUE
+
+/mob/living/carbon/human/proc/climaxself()
+ if(restrained(TRUE))
+ to_chat(src, "You can't do that while restrained!")
+ return
+ var/free_hands = get_num_arms()
+ if(!free_hands)
+ to_chat(src, "You need at least one free arm.")
+ return
+ for(var/helditem in held_items)
+ if(isobj(helditem))
+ free_hands--
+ if(free_hands <= 0)
+ to_chat(src, "You're holding too many things.")
+ return
+ //We got hands, let's pick an organ
+ var/obj/item/organ/genital/picked_organ
+ picked_organ = pick_masturbate_genitals()
+ if(picked_organ)
+ src << browse(null, "window=arousal") //closes the window
+ mob_masturbate(picked_organ, cover = TRUE)
+ return
+ else //They either lack organs that can masturbate, or they didn't pick one.
+ to_chat(src, "You cannot climax without choosing genitals.")
+ return
\ No newline at end of file
diff --git a/hyperstation/code/modules/busy_space/organisations.dm b/hyperstation/code/modules/busy_space/organisations.dm
index 935bba77f..11c5ad1ea 100644
--- a/hyperstation/code/modules/busy_space/organisations.dm
+++ b/hyperstation/code/modules/busy_space/organisations.dm
@@ -326,7 +326,7 @@
Most stable colonies, stations, civilizations, planets, or anywhere on the spectrum is often backed by the firm hand of Kinaris- underneath one rule: \
Be Radiant."
history = ""
- work = "Weave-research, conversion, and colony management"
+ work = "Weave-research, conversion, uplifting, and colony management"
headquarters = "Holy City of Radiant Hearth, Myril"
motto = "Be Radiant"
@@ -361,6 +361,7 @@
"Salis Major orbit",
"a megastructure at Kappa Andromedae",
"Radiant Hearth",
+ "a dockyard at Procella, Tremora",
"sector command at Vivida Laetus",
"a dissonant tear at RR Lyra",
"a city-station at Kappa Andromedae",
@@ -414,6 +415,7 @@
"a ringworld at Incandesce Seconda",
"Salis Major orbit",
"a megastructure at Kappa Andromedae",
+ "a dockyard at Procella, Tremora",
"the rings of Layenia",
"Dzar metalworking at Loto",
"a metalworking site at Salis Major",
@@ -454,4 +456,56 @@
ship_prefixes = list("ZCO" = "transportation", "ZC" = "patrol")
- autogenerate_destination_names = TRUE
\ No newline at end of file
+ autogenerate_destination_names = TRUE
+
+//Thanks Hellcelot for this one!
+/datum/lore/organization/titanceramics
+ name = "Titan Piezoelectrics and Ceramics"
+ short_name = "Titan Ceramics"
+ desc = "Titan Ceramics was the primary source of prominent electrical power on Tremora for it's lifespan, with extravagent materials and unique ceramic mixes that supported \
+ incredibly efficient production of energy in bulk. Not only did they provide energy for a once-struggling civilization, they brought upon artistic desire and talent for those \
+ who would seek their ceramics. Value in energy is equal to value in art in their eyes, with only the finest materials and expertly-tested conditions to meet the quality of \
+ their work. Despite the overwhelming size difference of the housing species, value is still sought from both sides, resulting in multi-size accomodations for their ceramics. \
+ When cheap yet efficient power is required without the Weave, Titan Ceramics is there."
+ history = ""
+ work = "Production of power-efficient piezoelectric ceramics and craft"
+ headquarters = "The Storm Capitol of Procella, Tremora"
+ motto = ""
+
+ ship_prefixes = list("TC" = "transportation", "TCF" = "freight", "TCR" = "research")
+ ship_names = list(
+ "Noki",
+ "Moyai",
+ "Megalodon",
+ "Mako",
+ "Minnow",
+ "Tsunami",
+ "North Star",
+ "Tempest",
+ "Eye of the Storm",
+ "Aquarius",
+ "Marinia",
+ "Thalassus",
+ "Stormwind"
+ )
+
+ autogenerate_destination_names = TRUE
+
+/datum/lore/organization/syntech
+ name = "Synergized Technology"
+ short_name = "SynTech"
+ desc = "Synergized Technology- commonly known as SynTech- is a company which leads the complex solutions in any galaxy's biggest problem: accomodating for the size of life. \
+ As civilization grew more welcoming to different ideals and lifestyles, it became more difficult and disasterous to deal with the extreme size difference from one alien \
+ species to the other. Not only did this spark an incredible amount of regulations from AzureGov, but Kinaris's interest was piqued to keep peace over all; and that included \
+ accomodating for any species, whether or not they stood above a mountain, or below an ant hill. The high demand of multi-size rights and technology was driven into SynTech's \
+ hands, where they would provide and assist in regulating consistent and meaningful products to ease interaction from one to the next. Not only do they supply incredibly \
+ advanced, highly-regulated technology, they also help in consistent planning and regulation in most cities to keep traffic from most differently-sized species without \
+ havoc. Without SynTech, galaxies would look like a fairly bland place, where one size rules above all."
+ history = ""
+ work = "Production and selling of size-altering technology, as well as accomodating the planning of infrastructure to support many sizes."
+ headquarters = "The City-Planet of Jovias, Nembus"
+ motto = "Modern solutions, big and small"
+
+ ship_prefixes = list("SYT" = "transportation", "SYTF" = "freight", "XSYT" = "scaler", "SYT-I" = "constructor")
+
+ autogenerate_destination_names = TRUE
diff --git a/hyperstation/code/modules/events/crystalloid_entities.dm b/hyperstation/code/modules/events/crystalloid_entities.dm
new file mode 100644
index 000000000..b13cf5f9d
--- /dev/null
+++ b/hyperstation/code/modules/events/crystalloid_entities.dm
@@ -0,0 +1,34 @@
+/datum/round_event_control/crystalloid_entities
+ name = "Crystal Invasion"
+ typepath = /datum/round_event/crystalloid_entities
+ weight = 10 //decreased weight from 15 to 10
+ min_players = 2 //increased min players from 2 to 5 to reduce chances of half the crew dying in a carp breach
+ earliest_start = 10 MINUTES
+ max_occurrences = 2
+
+
+/datum/round_event/crystalloid_entities
+ announceWhen = 3
+ startWhen = 50
+
+/datum/round_event/crystalloid_entities/setup()
+ startWhen = rand(40, 60)
+
+/datum/round_event/crystalloid_entities/announce(fake)
+ if(prob(70))
+ priority_announce("Unknown inorganic entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", 'sound/ai/crystal.ogg')
+ else
+ priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg') // CITADEL EDIT metabreak
+ for(var/obj/machinery/computer/communications/C in GLOB.machines)
+ if(!(C.stat & (BROKEN|NOPOWER)) && is_station_level(C.z))
+ var/obj/item/paper/P = new(C.loc)
+ P.name = "Crystalloid entities"
+ P.info = "Unknown inorganic entities have been detected near [station_name()], you may wish to break out arms."
+ P.update_icon()
+
+
+/datum/round_event/crystalloid_entities/start()
+ for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list)
+ if(prob(60)) //dont spawn them EVERYWHERE, they are tougher than carps.
+ new /mob/living/simple_animal/hostile/crystal(C.loc)
+
diff --git a/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm b/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm
new file mode 100644
index 000000000..af6f7fe04
--- /dev/null
+++ b/hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -0,0 +1,399 @@
+/*
+from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
+/datum/sprite_accessory
+ var/extra = FALSE
+ var/extra_color_src = MUTCOLORS2 //The color source for the extra overlay.
+ var/extra2 = FALSE
+ var/extra_icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+ var/extra2_icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+ var/extra2_color_src = MUTCOLORS3
+ var/list/ckeys_allowed
+
+we use the "citadel" versions of mutant/species parts, which usually (but not always)
+begins with "mam_" somewhere. stuff that's built for only humans/lizards in other parts
+of the code are from TG, don't use those.
+
+keep everything in alphabetical order, please!
+*/
+
+// TODO: code it so that we don't have to type in "icon = 'hyperstation/icons/mob/etc'"
+// manually for hyperstation parts
+
+
+/*
+SNOUTS
+==========================================================
+*/
+
+/datum/sprite_accessory/mam_snouts/bigmandible // sarcoph @ hyperstation, march 2022
+ name = "Big Mandibles (Hyper)"
+ icon_state = "bigmandible"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/proboscis // sarcoph @ hyperstation, march 2022
+ name = "Proboscis (Hyper)"
+ icon_state = "proboscis"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/rhinobeetle // sarcoph @ hyperstation, march 2022
+ name = "Rhino Beetle (Hyper)"
+ icon_state = "rhinobeetle"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/scarab // sarcoph @ hyperstation, march 2022
+ name = "Scarab Beetle (Hyper)"
+ icon_state = "scarab"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/smallmandible // sarcoph @ hyperstation, march 2022
+ name = "Small Mandibles (Hyper)"
+ icon_state = "smallmandible"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/spider // sarcoph @ hyperstation, march 2022
+ name = "Spider (Hyper)"
+ icon_state = "spider"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_snouts/tarantula // sarcoph @ hyperstation, march 2022
+ name = "Tarantula (Hyper)"
+ icon_state = "tarantula"
+ icon = 'hyperstation/icons/mob/char_snouts.dmi'
+ recommended_species = list("insect")
+
+
+/*
+EARS
+==========================================================
+*/
+
+/datum/sprite_accessory/mam_ears/faceant // sarcoph @ hyperstation, march 2022
+ name = "Face Antennae (Hyper)"
+ icon_state = "faceant"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/faceant2 // sarcoph @ hyperstation, march 2022
+ name = "Face Antennae 2 (Hyper)"
+ icon_state = "faceant2"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/moth
+ name = "Moth Antennae (Hyper)"
+ icon_state = "moth"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/plumeant // sarcoph @ hyperstation, march 2022
+ name = "Plume Antennae (Hyper)"
+ icon_state = "plumeant"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/roundant // sarcoph @ hyperstation, march 2022
+ name = "Round Antennae (Hyper)"
+ icon_state = "roundant"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_ears/thinant // sarcoph @ hyperstation, march 2022
+ name = "Thin Antennae (Hyper)"
+ icon_state = "thinant"
+ icon = 'hyperstation/icons/mob/char_ears.dmi'
+ recommended_species = list("insect")
+
+
+/*
+WINGS
+==========================================================
+*/
+
+/datum/sprite_accessory/deco_wings/beetle // sarcoph @ hyperstation, march 2022
+ name = "Beetle (Hyper)"
+ icon_state = "beetle"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/moth_wings/beetle
+ name = "Beetle (Hyper)"
+ icon_state = "beetle"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/deco_wings/beetle2 // sarcoph @ hyperstation, march 2022
+ name = "Beetle - 2-toned (Hyper)"
+ icon_state = "beetle2"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+ color_src = MATRIXED
+
+/datum/sprite_accessory/moth_wings/beetle2
+ name = "Beetle - 2-toned (Hyper)"
+ icon_state = "beetle2"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+ color_src = MATRIXED
+
+/datum/sprite_accessory/deco_wings/insect // sarcoph @ hyperstation, march 2022
+ name = "Insect (Hyper)"
+ icon_state = "insect"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/moth_wings/insect
+ name = "Insect (Hyper)"
+ icon_state = "insect"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/deco_wings/minibat // sarcoph @ hyperstation, march 2022
+ name = "Mini Bat (Hyper)"
+ icon_state = "minibat"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/deco_wings/minifeather // sarcoph @ hyperstation, march 2022
+ name = "Mini Feather (Hyper)"
+ icon_state = "minifeather"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/deco_wings/tinybat // sarcoph @ hyperstation, march 2022
+ name = "Tiny Bat (Hyper)"
+ icon_state = "tinybat"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+/datum/sprite_accessory/deco_wings/tinyfeather // sarcoph @ hyperstation, march 2022
+ name = "Tiny Feather (Hyper)"
+ icon_state = "tinyfeather"
+ icon = 'hyperstation/icons/mob/char_wings.dmi'
+
+
+/*
+TAILS + ANIMATED TAILS
+==========================================================
+*/
+
+/datum/sprite_accessory/mam_tails/bee // sarcoph @ hyperstation, march 2022
+ name = "Bee (Hyper)"
+ icon_state = "bee"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails_animated/bee
+ name = "Bee (Hyper)"
+ icon_state = "bee"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails/bee2 // sarcoph @ hyperstation, march 2022
+ name = "Bee w/ Stinger (Hyper)"
+ icon_state = "bee2"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails_animated/bee2
+ name = "Bee w/ Stinger (Hyper)"
+ icon_state = "bee2"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+// "fan" bird tail, short
+/datum/sprite_accessory/mam_tails/shorthawk // sarcoph @ hyperstation, jan 2022
+ name = "Hawk - Short (Hyper)"
+ icon_state = "shorthawk"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/shorthawk
+ name = "Hawk - Short (Hyper)"
+ icon_state = "shorthawk"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails/insect // sarcoph @ hyperstation, march 2022
+ name = "Insect (Hyper)"
+ icon_state = "insect"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails_animated/insect
+ name = "Insect (Hyper)"
+ icon_state = "insect"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails/bug2tone // sarcoph @ hyperstation, march 2022
+ name = "Insect - 2-tone (Hyper)"
+ icon_state = "bug2tone"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_tails_animated/bug2tone
+ name = "Insect - 2-tone (Hyper)"
+ icon_state = "bug2tone"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+ recommended_species = list("insect")
+
+// "narrow" bird tail, long
+/datum/sprite_accessory/mam_tails/longpigeon // sarcoph @ hyperstation, jan 2022
+ name = "Pigeon - Long (Hyper)"
+ icon_state = "longpigeon"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/longpigeon
+ name = "Pigeon - Long (Hyper)"
+ icon_state = "longpigeon"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+// "narrow" bird tail, short
+/datum/sprite_accessory/mam_tails/shortpigeon // sarcoph @ hyperstation, jan 2022
+ name = "Pigeon - Short (Hyper)"
+ icon_state = "shortpigeon"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/shortpigeon
+ name = "Pigeon - Short (Hyper)"
+ icon_state = "shortpigeon"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+// "forked" bird tail, long
+/datum/sprite_accessory/mam_tails/swallow // sarcoph @ hyperstation, jan 2022
+ name = "Swallow (Hyper)"
+ icon_state = "swallow"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/swallow
+ name = "Swallow (Hyper)"
+ icon_state = "swallow"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+// forked bird tail, long; special stripe markings
+/datum/sprite_accessory/mam_tails/swallowstriped // sarcoph @ hyperstation, jan 2022
+ name = "Swallow - Striped (Hyper)"
+ icon_state = "swallowstriped"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+/datum/sprite_accessory/mam_tails_animated/swallowstriped
+ name = "Swallow - Striped (Hyper)"
+ icon_state = "swallowstriped"
+ icon = 'hyperstation/icons/mob/char_tails.dmi'
+
+
+/*
+BODY MARKINGS
+==========================================================
+*/
+
+/*
+from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
+/datum/sprite_accessory/mam_body_markings
+ extra = FALSE
+ extra2 = FALSE
+ color_src = MATRIXED
+ gender_specific = 0
+ icon = 'modular_citadel/icons/mob/mam_markings.dmi'
+ recommended_species = list("mammal", "xeno", "slimeperson", "podweak", "avian", "aquatic")
+*/
+
+/datum/sprite_accessory/mam_body_markings/bee // sarcoph @ hyperstation, march 2022
+ name = "Bee (Hyper)"
+ icon_state = "bee"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_body_markings/bee_fluff // sarcoph @ hyperstation, march 2022
+ name = "Bee - Fluffy (Hyper)"
+ icon_state = "bee_fluff"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_body_markings/bug3tone // sarcoph @ hyperstation, march 2022
+ name = "Beetle - 3-tone (Hyper)"
+ icon_state = "bug3tone"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_body_markings/moth // sarcoph @ hyperstation, jan 2022
+ name = "Moth (Hyper)"
+ icon_state = "moth"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("insect")
+
+/datum/sprite_accessory/mam_body_markings/empty
+ name = "None (Hyper)"
+ icon_state = "empty"
+ recommended_species = list("podweak", /*"mammal",*/ "avian", "aquatic", "insect", "xeno", "synthliz", "slimeperson")
+ // mammals are cursed to no empty markings until they get their heads fixed.
+
+/datum/sprite_accessory/mam_body_markings/pigeon // sarcoph @ hyperstation, jan 2022
+ name = "Pigeon (Hyper)"
+ icon_state = "pigeon"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("avian")
+
+/datum/sprite_accessory/mam_body_markings/shrike // sarcoph @ hyperstation, jan 2022
+ name = "Shrike (Hyper)"
+ icon_state = "shrike"
+ icon = 'hyperstation/icons/mob/char_markings.dmi'
+ recommended_species = list("avian")
+
+
+/*
+TAUR BODIES
+==========================================================
+*/
+
+/*
+from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
+/datum/sprite_accessory/taur
+ icon = 'modular_citadel/icons/mob/mam_taur.dmi'
+ extra_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
+ extra = TRUE
+ extra2_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
+ extra2 = TRUE
+ center = TRUE
+ dimension_x = 64
+ var/taur_mode = NOT_TAURIC
+ color_src = MATRIXED
+ recommended_species = list("human", "lizard", "insect", "mammal", "xeno", "jelly", "slimeperson", "podweak", "avian", "aquatic")
+*/
+
+
+/*
+HAIRSTYLES
+==========================================================
+*/
+
+/*
+from code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm:
+/datum/sprite_accessory/hair
+ icon = 'icons/mob/human_face.dmi' // default icon for all hairs
+
+ // please make sure they're sorted alphabetically and, where needed, categorized
+ // try to capitalize the names please~
+ // try to spell
+ // you do not need to define _s or _l sub-states, game automatically does this for you
+*/
+
+/datum/sprite_accessory/hair/aviancrest
+ name = "Avian Crest (Hyper)"
+ icon_state = "hair_aviancrest"
+ icon = 'hyperstation/icons/mob/char_hair.dmi'
+
+/datum/sprite_accessory/hair/curtains
+ name = "Curtains (Hyper)"
+ icon_state = "hair_curtains"
+
+/datum/sprite_accessory/hair/mommy
+ name = "Hairfre (Hyper)"
+ icon_state = "hair_hairfre"
+
+/datum/sprite_accessory/hair/sidehair
+ name = "Side Hair (Hyper)"
+ icon_state = "hair_tailhair2"
+
+/datum/sprite_accessory/hair/hsglamour
+ name = "Glamour (Hyper)"
+ icon_state = "hair_glamourh"
+
+/datum/sprite_accessory/hair/emoh
+ name = "Emo (Hyper)"
+ icon_state = "hair_emoh"
\ No newline at end of file
diff --git a/hyperstation/code/modules/mob/living/carbon/carbon.dm b/hyperstation/code/modules/mob/living/carbon/carbon.dm
new file mode 100644
index 000000000..27d4e3283
--- /dev/null
+++ b/hyperstation/code/modules/mob/living/carbon/carbon.dm
@@ -0,0 +1,122 @@
+/mob/living/carbon
+ var/total_pain = 0
+ var/pain_effect = 0
+ var/pain_cooldown = 0 //for defibs/surgry!
+
+//pain
+/mob/living/carbon/adjustPainLoss(amount, updating_health = TRUE, forced = FALSE, affected_zone = BODY_ZONE_CHEST)
+ if(!forced && (status_flags & GODMODE))
+ return FALSE
+ apply_damage(amount > 0 ? amount : amount, PAIN, affected_zone)
+ return amount
+
+/mob/living/carbon/handle_status_effects()
+ ..()
+ handle_pain()
+
+/mob/living/carbon/proc/handle_pain()
+ var/pain_amount = 0
+
+ pain_effect += 1
+
+ if (pain_cooldown)
+ pain_cooldown -= 1
+ pain_effect = 0 //ignore pain for now, you got adrenaline running through your body.
+
+ //build up pain in the system from all your limbs and natrually heal pain if its attached to a live body.
+ for(var/obj/item/bodypart/BP in bodyparts)
+ pain_amount += BP.pain_dam
+
+ var/pain_target = (BP.brute_dam + BP.burn_dam)*0.8
+ //natural healing of pain, capped at current damage * 0.8, if the pain is lower, slowly bring up the pain. this will let people "get used, to it."
+ if (BP.pain_dam > (pain_target))
+ BP.pain_dam -= 1 //bring down to the pain_level.
+ else
+ BP.pain_dam += 1 //slowly bring pain back, from pain killers.
+
+ //just make sure its zero'd
+ if (BP.pain_dam < 0)
+ BP.pain_dam = 0
+ continue //dont need to do the rest, your fine.
+
+ if (BP.pain_dam && pain_effect > 5 && (stat == 0))
+ var pain_level = (round(BP.pain_dam / 10))
+ switch(pain_level) //for every 10 points of damage minor -> major
+ if(1)//start at 10 just so it doesnt get annoying with micro damage
+ to_chat(src, "You feel minor pain in your [BP.name].")
+ if(2)
+ to_chat(src, "You feel pain in your [BP.name].")
+ if(3)
+ to_chat(src, "You feel severe pain in your [BP.name].")
+ if(4 to 99)
+ to_chat(src, "You feel overwhelming pain in your [BP.name].")
+ jitteriness += 2
+ stuttering += 2
+
+
+ total_pain = pain_amount
+
+ //handle onscreen alert
+ if (pain_effect > 5)
+ switch(total_pain)
+ if(-100 to 25)
+ clear_alert("pain")
+ if(25 to 69)
+ throw_alert("pain", /obj/screen/alert/pain)
+ if(70 to 99)
+ throw_alert("pain", /obj/screen/alert/painmajor)
+ if(100 to 999)
+ throw_alert("pain", /obj/screen/alert/painshock)
+
+ if (pain_effect > 5)
+ pain_effect = 0 //reset the timer 5 seconds.
+ if(stat == 0) //awake, not dead or asleep
+ //status effects for pain..
+ var/mob/living/H = src
+ if (total_pain > 50 && total_pain < 80)
+ if(HAS_TRAIT(H, TRAIT_MASO)) //just because your into it doesnt give you a advantage..
+ to_chat(src, "You love this pain, it excites you...")
+ H.adjustArousalLoss(6)
+ else
+ to_chat(src, "You cant handle the pain...")
+ if(prob(20))
+ emote("scream")
+ do_jitter_animation() //basic shake.
+ stuttering += 3 //stutter words, your in pain bro.
+
+ if (total_pain > 80) //your in trouble. fainting..
+ if(HAS_TRAIT(H, TRAIT_MASO))
+ to_chat(src, "You love this intense pain, it excites you...")
+ H.adjustArousalLoss(12)
+ else
+ to_chat(src, "You cant handle the intense pain...")
+ if(prob(20)) //chance of fainting..
+ visible_message("[src] collapses!")
+ Unconscious(100)
+ jitteriness += 3 //shake
+ stuttering += 3 //stutter words
+
+ //if they are asleep, this wont trigger.
+ if (total_pain > 110 && stat == 0) //taking 77 all damage at once from full health, will put you into shock and kill you. This cant be achived with chip damage (or fist fights), because youll die before you reach this pain level.
+ if(prob(50))
+ emote("scream")//scream
+ to_chat(src, "You give into the pain...")
+ visible_message("[src] goes into neurogenic shock!")
+ Unconscious(200)
+ if (can_heartattack()) //check if they can
+ set_heartattack(1) //heart stopped!
+
+
+//HS Pain heal
+/mob/living/carbon/adjustPainLoss(amount, updating_health = TRUE, forced = FALSE)
+ if (!forced && amount < 0 && HAS_TRAIT(src,TRAIT_NONATURALHEAL))
+ return FALSE
+ if(!forced && (status_flags & GODMODE))
+ return FALSE
+
+ //all attached limbs get pain damage
+ for(var/X in bodyparts)
+ var/obj/item/bodypart/BP = X
+ BP.pain_dam += amount
+
+ return amount
\ No newline at end of file
diff --git a/hyperstation/code/modules/power/reactor/rbmk.dm b/hyperstation/code/modules/power/reactor/rbmk.dm
index 948a6598f..51f56b47a 100644
--- a/hyperstation/code/modules/power/reactor/rbmk.dm
+++ b/hyperstation/code/modules/power/reactor/rbmk.dm
@@ -607,10 +607,10 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
. = ..()
ui_interact(user)
-/obj/machinery/computer/reactor/control_rods/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state)
+/obj/machinery/computer/reactor/control_rods/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/tgui_state/state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "rbmkcontrolrods", name, 300, 300, master_ui, state)
+ ui = new(user, src, ui_key, "RbmkControlRods", name, 300, 300, master_ui, state)
ui.open()
/obj/machinery/computer/reactor/control_rods/ui_act(action, params)
@@ -648,7 +648,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
. = ..()
ui_interact(user)
-/obj/machinery/computer/reactor/stats/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state)
+/obj/machinery/computer/reactor/stats/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/tgui_state/state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "RbmkStats", name, 350, 500, master_ui, state)
@@ -803,7 +803,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
transfer_access = ACCESS_CONSTRUCTION
network_destination = "rbmk monitoring system"
size = 2
- tgui_id = "ntosrbmkstats"
+ tgui_id = "NtosRbmkStats"
ui_x = 350
ui_y = 550
var/active = TRUE //Easy process throttle
diff --git a/hyperstation/code/obj/SYSuit/main.dm b/hyperstation/code/obj/SYSuit/main.dm
index a4047d81f..9e40cb449 100644
--- a/hyperstation/code/obj/SYSuit/main.dm
+++ b/hyperstation/code/obj/SYSuit/main.dm
@@ -6,7 +6,7 @@
//The suit itself
/obj/item/clothing/under/syclothing
- name = "SYTech Nanoweave suit"
+ name = "SynTech Nanoweave suit"
desc = "A leading-grade suit developed by SYTech, with an internal dampening field to lessen accidents at micro scales. This one seems to be more skimpy and developed for bedroom-play, though."
icon = 'hyperstation/icons/obj/clothing/uniforms.dmi'
icon_state = "syclothing"
@@ -61,7 +61,7 @@
//The cap
/obj/item/clothing/head/sycap
- name = "SYTech Nanoweave cap"
+ name = "SynTech Nanoweave cap"
desc = "A piece of clothing for a SYTech suit, allowing for extended control and breathability at micro scales via amplified hardlight respiration. This one seems to be modeled like a dominatrix cap, however."
icon = 'hyperstation/icons/obj/clothing/head.dmi'
icon_state = "sycap"
@@ -112,7 +112,7 @@
//The visor
/obj/item/clothing/glasses/hud/toggle/syvisor
- name = "SYTech Analysis Visor"
+ name = "SynTech Analysis Visor"
desc = "A high-tech visor developed for SYTech suits, for helping internal processes lead augment decisions. This one looks like a pair of darkened sunglasses."
icon = 'hyperstation/icons/obj/clothing/glasses.dmi'
icon_state = "syvisor"
@@ -161,7 +161,7 @@
//Shoes
/obj/item/clothing/shoes/syshoes
- name = "SYTech Nanoweave platform heels"
+ name = "SynTech Nanoweave platform heels"
desc = "A complimentary piece of SYTech apparel for gravity-altering applications. It even allows you to walk up walls! This pair takes on the appearance of skimpy, thigh-high latex boots with stilletos."
icon_state = "syshoes"
item_state = "syshoes"
@@ -174,7 +174,7 @@
//Gloves
/obj/item/clothing/gloves/sygloves
- name = "SYTech Nanoweave sleeves"
+ name = "SynTech Nanoweave sleeves"
desc = "A pair of enhanced sleeves, developed by SYTech. These allow remote and psionic levels of manipulation to the electrical currents inside living beings, or objects. Use with caution!"
icon_state = "sygloves"
item_state = "sygloves"
@@ -186,4 +186,4 @@
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
strip_delay = 120
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- mutantrace_variation = NO_MUTANTRACE_VARIATION
\ No newline at end of file
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
diff --git a/hyperstation/icons/effects/medical.dmi b/hyperstation/icons/effects/medical.dmi
new file mode 100644
index 000000000..cf74d7379
Binary files /dev/null and b/hyperstation/icons/effects/medical.dmi differ
diff --git a/hyperstation/icons/mob/char_ears.dmi b/hyperstation/icons/mob/char_ears.dmi
new file mode 100644
index 000000000..26709be52
Binary files /dev/null and b/hyperstation/icons/mob/char_ears.dmi differ
diff --git a/hyperstation/icons/mob/char_hair.dmi b/hyperstation/icons/mob/char_hair.dmi
new file mode 100644
index 000000000..da5512b74
Binary files /dev/null and b/hyperstation/icons/mob/char_hair.dmi differ
diff --git a/hyperstation/icons/mob/char_markings.dmi b/hyperstation/icons/mob/char_markings.dmi
new file mode 100644
index 000000000..f38c1db49
Binary files /dev/null and b/hyperstation/icons/mob/char_markings.dmi differ
diff --git a/hyperstation/icons/mob/char_snouts.dmi b/hyperstation/icons/mob/char_snouts.dmi
new file mode 100644
index 000000000..c7ad9dca1
Binary files /dev/null and b/hyperstation/icons/mob/char_snouts.dmi differ
diff --git a/hyperstation/icons/mob/char_tails.dmi b/hyperstation/icons/mob/char_tails.dmi
new file mode 100644
index 000000000..c9faf1b2e
Binary files /dev/null and b/hyperstation/icons/mob/char_tails.dmi differ
diff --git a/hyperstation/icons/mob/char_wings.dmi b/hyperstation/icons/mob/char_wings.dmi
new file mode 100644
index 000000000..2a7b34cf1
Binary files /dev/null and b/hyperstation/icons/mob/char_wings.dmi differ
diff --git a/hyperstation/icons/mob/crystal.dmi b/hyperstation/icons/mob/crystal.dmi
new file mode 100644
index 000000000..cd4d755a8
Binary files /dev/null and b/hyperstation/icons/mob/crystal.dmi differ
diff --git a/hyperstation/icons/mobs/wendigo.dmi b/hyperstation/icons/mobs/wendigo.dmi
index 7c8de1d12..78edf11d2 100644
Binary files a/hyperstation/icons/mobs/wendigo.dmi and b/hyperstation/icons/mobs/wendigo.dmi differ
diff --git a/hyperstation/sound/voice/emotes/female_giggle1.ogg b/hyperstation/sound/voice/emotes/female_giggle1.ogg
deleted file mode 100644
index 87961f5cc..000000000
Binary files a/hyperstation/sound/voice/emotes/female_giggle1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_giggle2.ogg b/hyperstation/sound/voice/emotes/female_giggle2.ogg
deleted file mode 100644
index bd1e99de7..000000000
Binary files a/hyperstation/sound/voice/emotes/female_giggle2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_laugh1.ogg b/hyperstation/sound/voice/emotes/female_laugh1.ogg
deleted file mode 100644
index b4b464bb6..000000000
Binary files a/hyperstation/sound/voice/emotes/female_laugh1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_laugh2.ogg b/hyperstation/sound/voice/emotes/female_laugh2.ogg
deleted file mode 100644
index 3124eaf05..000000000
Binary files a/hyperstation/sound/voice/emotes/female_laugh2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_laugh3.ogg b/hyperstation/sound/voice/emotes/female_laugh3.ogg
deleted file mode 100644
index ed80538fa..000000000
Binary files a/hyperstation/sound/voice/emotes/female_laugh3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_laugh4.ogg b/hyperstation/sound/voice/emotes/female_laugh4.ogg
deleted file mode 100644
index 057a842ad..000000000
Binary files a/hyperstation/sound/voice/emotes/female_laugh4.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_yawn1.ogg b/hyperstation/sound/voice/emotes/female_yawn1.ogg
deleted file mode 100644
index 548be96b7..000000000
Binary files a/hyperstation/sound/voice/emotes/female_yawn1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_yawn2.ogg b/hyperstation/sound/voice/emotes/female_yawn2.ogg
deleted file mode 100644
index 67b150567..000000000
Binary files a/hyperstation/sound/voice/emotes/female_yawn2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_yawn3.ogg b/hyperstation/sound/voice/emotes/female_yawn3.ogg
deleted file mode 100644
index 12d42db24..000000000
Binary files a/hyperstation/sound/voice/emotes/female_yawn3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female1.ogg b/hyperstation/sound/voice/emotes/gasp_female1.ogg
deleted file mode 100644
index f74882f90..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_female1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female2.ogg b/hyperstation/sound/voice/emotes/gasp_female2.ogg
deleted file mode 100644
index 8bd7f74cf..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_female2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female3.ogg b/hyperstation/sound/voice/emotes/gasp_female3.ogg
deleted file mode 100644
index 6e05d1ea7..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_female3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female4.ogg b/hyperstation/sound/voice/emotes/gasp_female4.ogg
deleted file mode 100644
index f33b775fd..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_female4.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female5.ogg b/hyperstation/sound/voice/emotes/gasp_female5.ogg
deleted file mode 100644
index cbeeb63e1..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_female5.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female6.ogg b/hyperstation/sound/voice/emotes/gasp_female6.ogg
deleted file mode 100644
index 444b6688a..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_female6.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female7.ogg b/hyperstation/sound/voice/emotes/gasp_female7.ogg
deleted file mode 100644
index 096354f98..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_female7.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male1.ogg b/hyperstation/sound/voice/emotes/gasp_male1.ogg
deleted file mode 100644
index e0ddde118..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_male1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male2.ogg b/hyperstation/sound/voice/emotes/gasp_male2.ogg
deleted file mode 100644
index 2119daf88..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_male2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male3.ogg b/hyperstation/sound/voice/emotes/gasp_male3.ogg
deleted file mode 100644
index 6d5cb214f..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_male3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male4.ogg b/hyperstation/sound/voice/emotes/gasp_male4.ogg
deleted file mode 100644
index a9173a1a2..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_male4.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male5.ogg b/hyperstation/sound/voice/emotes/gasp_male5.ogg
deleted file mode 100644
index 8e7ef3734..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_male5.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male6.ogg b/hyperstation/sound/voice/emotes/gasp_male6.ogg
deleted file mode 100644
index 546ba45bf..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_male6.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male7.ogg b/hyperstation/sound/voice/emotes/gasp_male7.ogg
deleted file mode 100644
index f73854f6c..000000000
Binary files a/hyperstation/sound/voice/emotes/gasp_male7.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/sigh_female.ogg b/hyperstation/sound/voice/emotes/sigh_female.ogg
deleted file mode 100644
index d72c206cc..000000000
Binary files a/hyperstation/sound/voice/emotes/sigh_female.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/sigh_male.ogg b/hyperstation/sound/voice/emotes/sigh_male.ogg
deleted file mode 100644
index 1590bcdee..000000000
Binary files a/hyperstation/sound/voice/emotes/sigh_male.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/whimper_female1.ogg b/hyperstation/sound/voice/emotes/whimper_female1.ogg
deleted file mode 100644
index 4c8034d38..000000000
Binary files a/hyperstation/sound/voice/emotes/whimper_female1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/whimper_female2.ogg b/hyperstation/sound/voice/emotes/whimper_female2.ogg
deleted file mode 100644
index 48353c50b..000000000
Binary files a/hyperstation/sound/voice/emotes/whimper_female2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/whimper_female3.ogg b/hyperstation/sound/voice/emotes/whimper_female3.ogg
deleted file mode 100644
index 174a24f46..000000000
Binary files a/hyperstation/sound/voice/emotes/whimper_female3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/whimper_male1.ogg b/hyperstation/sound/voice/emotes/whimper_male1.ogg
deleted file mode 100644
index 7bd8ecabc..000000000
Binary files a/hyperstation/sound/voice/emotes/whimper_male1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/whimper_male2.ogg b/hyperstation/sound/voice/emotes/whimper_male2.ogg
deleted file mode 100644
index 44e8fb702..000000000
Binary files a/hyperstation/sound/voice/emotes/whimper_male2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/whimper_male3.ogg b/hyperstation/sound/voice/emotes/whimper_male3.ogg
deleted file mode 100644
index 42492e42e..000000000
Binary files a/hyperstation/sound/voice/emotes/whimper_male3.ogg and /dev/null differ
diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi
index 5b526ab99..e45add9f8 100644
Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 640c4c0c8..064442d15 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index 1d9d5a373..5b666a530 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/mob/wings.dmi b/icons/mob/wings.dmi
index bf820a8dc..087738363 100644
Binary files a/icons/mob/wings.dmi and b/icons/mob/wings.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 64e0ce04c..b47a5bbf0 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 70607d58f..fb931d0fe 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index 2e1811d01..3963e9254 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index b723785e0..b753093c3 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/smooth_structures/glass_table.dmi b/icons/obj/smooth_structures/glass_table.dmi
index 112499f38..84c837b98 100644
Binary files a/icons/obj/smooth_structures/glass_table.dmi and b/icons/obj/smooth_structures/glass_table.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 7d08a83fb..d492c2a6c 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/turf/floors/crystal_floor.dmi b/icons/turf/floors/crystal_floor.dmi
index 5c67bda57..8fba9a3da 100644
Binary files a/icons/turf/floors/crystal_floor.dmi and b/icons/turf/floors/crystal_floor.dmi differ
diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index a35a5f50d..92aa3b21b 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -176,12 +176,12 @@
var/lewd = TRUE
*/
-/mob/living/verb/toggle_lewd()
+/mob/living/verb/toggle_hypno()
set category = "IC"
- set name = "Toggle Lewdchem"
- set desc = "Allows you to toggle if you'd like lewd flavour messages."
- client.prefs.lewdchem = !(client.prefs.lewdchem)
- to_chat(usr, "You [(client.prefs.lewdchem?"will":"no longer")] receive lewdchem messages.")
+ set name = "Toggle Lewd MKUltra"
+ set desc = "Allows you to toggle if you'd like lewd flavour messages for MKUltra."
+ client.prefs.cit_toggles ^= HYPNO
+ to_chat(usr, "You [((client.prefs.cit_toggles & HYPNO) ?"will":"no longer")] receive lewd flavour messages for MKUltra.")
/datum/status_effect/chem/enthrall
id = "enthrall"
@@ -219,11 +219,13 @@
var/customEcho //Custom looping text in owner
var/customSpan //Custom spans for looping text
+ var/lewd = FALSE // Set on on_apply. Will only be true if both individuals involved have opted in.
+
/datum/status_effect/chem/enthrall/on_apply()
var/mob/living/carbon/M = owner
var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in M.reagents.reagent_list
if(!E)
- message_admins("WARNING: FermiChem: No master found in thrall, did you bus in the status? You need to set up the vars manually in the chem if it's not reacted/bussed. Someone set up the reaction/status proc incorrectly if not (Don't use donor blood). Console them with a chemcat plush maybe?")
+ message_admins("WARNING: FermiChem: No master found in thrall, did you bus in the status? You need to set up the vars manually in the chem if it's not reacted/bussed. Someone set up the reaction/status proc incorrectly if not (Don't use donor blood).")
owner.remove_status_effect(src)
enthrallID = E.creatorID
enthrallGender = E.creatorGender
@@ -237,10 +239,11 @@
var/mob/living/carbon/human/H = owner
if(H)//Prefs
if(!H.canbearoused)
- H.client?.prefs.lewdchem = FALSE
- var/message = "[(owner.client?.prefs.lewdchem?"I am a good pet for [enthrallGender].":"[master] is a really inspirational person!")]"
+ H.client?.prefs.cit_toggles &= ~HYPNO
+ lewd = (owner.client?.prefs.cit_toggles & HYPNO) && (master.client?.prefs.cit_toggles & HYPNO)
+ var/message = "[(lewd ? "I am a good pet for [enthrallGender]." : "[master] is a really inspirational person!")]"
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "enthrall", /datum/mood_event/enthrall, message)
- to_chat(owner, "You feel inexplicably drawn towards [master], their words having a demonstrable effect on you. It seems the closer you are to them, the stronger the effect is. However you aren't fully swayed yet and can resist their effects by repeatedly resisting as much as you can!")
+ to_chat(owner, "You feel inexplicably drawn towards [master], their words having a demonstrable effect on you. It seems the closer you are to them, the stronger the effect is. However you aren't fully swayed yet and can resist their effects by repeatedly resisting as much as you can!")
log_game("FERMICHEM: MKULTRA: Status applied on [owner] ckey: [owner.key] with a master of [master] ckey: [enthrallID].")
SSblackbox.record_feedback("tally", "fermi_chem", 1, "Enthrall attempts")
return ..()
@@ -286,7 +289,7 @@
resistanceTally /= 2
enthrallTally = 0
SSblackbox.record_feedback("tally", "fermi_chem", 1, "Enthralled to state 2")
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "Your conciousness slips, as you sink deeper into trance and servitude.")
else
to_chat(owner, "Your conciousness slips, as you feel more drawn to following [master].")
@@ -295,24 +298,23 @@
phase = -1
to_chat(owner, "You break free of the influence in your mind, your thoughts suddenly turning lucid!")
if(DistApart < 10)
- to_chat(master, "[(master.client?.prefs.lewdchem?"Your pet":"Your thrall")] seems to have broken free of your enthrallment!")
+ to_chat(master, "[(lewd?"Your pet":"Your thrall")] seems to have broken free of your enthrallment!")
SSblackbox.record_feedback("tally", "fermi_chem", 1, "Thralls broken free")
owner.remove_status_effect(src) //If resisted in phase 1, effect is removed.
- if(prob(10))
- if(owner.client?.prefs.lewdchem)
- to_chat(owner, "[pick("It feels so good to listen to [master].", "You can't keep your eyes off [master].", "[master]'s voice is making you feel so sleepy.", "You feel so comfortable with [master]", "[master] is so dominant, it feels right to obey them.")].")
+ if(lewd && prob(10))
+ to_chat(owner, "[pick("It feels so good to listen to [enthrallGender].", "You can't keep your eyes off [enthrallGender].", "[enthrallGender]'s voice is making you feel so sleepy.", "You feel so comfortable with [enthrallGender]", "[enthrallGender] is so dominant, it feels right to obey them.")].")
if (2) //partially enthralled
if(enthrallTally > 200)
phase += 1
mental_capacity -= resistanceTally//leftover resistance per step is taken away from mental_capacity.
enthrallTally = 0
resistanceTally /= 2
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "Your mind gives, eagerly obeying and serving [master].")
to_chat(owner, "You are now fully enthralled to [master], and eager to follow their commands. However you find that in your intoxicated state you are unable to resort to violence. Equally you are unable to commit suicide, even if ordered to, as you cannot serve your [enthrallGender] in death. ")//If people start using this as an excuse to be violent I'll just make them all pacifists so it's not OP.
else
to_chat(owner, "You are unable to put up a resistance any longer, and now are under the influence of [master]. However you find that in your intoxicated state you are unable to resort to violence. Equally you are unable to commit suicide, even if ordered to, as you cannot follow [master] in death. ")
- to_chat(master, "Your [(master.client?.prefs.lewdchem?"pet":"follower")] [owner] appears to have fully fallen under your sway.")
+ to_chat(master, "Your [(lewd?"pet":"follower")] [owner] appears to have fully fallen under your sway.")
log_game("FERMICHEM: MKULTRA: Status on [owner] ckey: [owner.key] has been fully entrhalled (state 3) with a master of [master] ckey: [enthrallID].")
SSblackbox.record_feedback("tally", "fermi_chem", 1, "thralls fully enthralled.")
else if (resistanceTally > 200)
@@ -322,7 +324,7 @@
resistGrowth = 0
to_chat(owner, "You manage to shake some of the effects from your addled mind, however you can still feel yourself drawn towards [master].")
if(prob(10))
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "[pick("It feels so good to listen to [enthrallGender].", "You can't keep your eyes off [enthrallGender].", "[enthrallGender]'s voice is making you feel so sleepy.", "You feel so comfortable with [enthrallGender]", "[enthrallGender] is so dominant, it feels right to obey them.")].")
if (3)//fully entranced
if ((resistanceTally >= 200 && withdrawalTick >= 150) || (HAS_TRAIT(M, TRAIT_MINDSHIELD) && (resistanceTally >= 100)))
@@ -330,11 +332,10 @@
phase -= 1
resistanceTally = 0
resistGrowth = 0
- to_chat(owner, "The separation from [(owner.client?.prefs.lewdchem?"your [enthrallGender]":"[master]")] sparks a small flame of resistance in yourself, as your mind slowly starts to return to normal.")
+ to_chat(owner, "The separation from [(lewd?"your [enthrallGender]":"[master]")] sparks a small flame of resistance in yourself, as your mind slowly starts to return to normal.")
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "MKUltra")
- if(prob(1))
- if(owner.client?.prefs.lewdchem && !customEcho)
- to_chat(owner, "[pick("I belong to [enthrallGender].", "[enthrallGender] knows whats best for me.", "Obedence is pleasure.", "I exist to serve [enthrallGender].", "[enthrallGender] is so dominant, it feels right to obey them.")].")
+ if(lewd && prob(1) && !customEcho)
+ to_chat(owner, "[pick("I belong to [enthrallGender].", "[enthrallGender] knows whats best for me.", "Obedence is pleasure.", "I exist to serve [enthrallGender].", "[enthrallGender] is so dominant, it feels right to obey them.")].")
if (4) //mindbroken
if (mental_capacity >= 499 && (owner.getOrganLoss(ORGAN_SLOT_BRAIN) <=0 || HAS_TRAIT(M, TRAIT_MINDSHIELD)) && !owner.reagents.has_reagent(/datum/reagent/fermi/enthrall))
phase = 2
@@ -350,7 +351,7 @@
cooldownMsg = FALSE
else if (cooldownMsg == FALSE)
if(DistApart < 10)
- if(master.client?.prefs.lewdchem)
+ if(lewd)
to_chat(master, "Your pet [owner] appears to have finished internalising your last command.")
cooldownMsg = TRUE
else
@@ -358,7 +359,7 @@
cooldownMsg = TRUE
if(get_dist(master, owner) > 10)
if(prob(10))
- to_chat(owner, "You feel [(owner.client?.prefs.lewdchem?"a deep NEED to return to your [enthrallGender]":"like you have to return to [master]")].")
+ to_chat(owner, "You feel [(lewd?"a deep NEED to return to your [enthrallGender]":"like you have to return to [master]")].")
M.throw_at(get_step_towards(master,owner), 5, 1)
return//If you break the mind of someone, you can't use status effects on them.
@@ -391,29 +392,29 @@
if (withdrawal == TRUE)//Your minions are really REALLY needy.
switch(withdrawalTick)//denial
if(5)//To reduce spam
- to_chat(owner, "You are unable to complete [(owner.client?.prefs.lewdchem?"your [enthrallGender]":"[master]")]'s orders without their presence, and any commands and objectives given to you prior are not in effect until you are back with them.")
+ to_chat(owner, "You are unable to complete [(lewd?"your [enthrallGender]":"[master]")]'s orders without their presence, and any commands and objectives given to you prior are not in effect until you are back with them.")
ADD_TRAIT(owner, TRAIT_PACIFISM, "MKUltra") //IMPORTANT
if(10 to 35)//Gives wiggle room, so you're not SUPER needy
if(prob(5))
- to_chat(owner, "You're starting to miss [(owner.client?.prefs.lewdchem?"your [enthrallGender]":"[master]")].")
+ to_chat(owner, "You're starting to miss [(lewd?"your [enthrallGender]":"[master]")].")
if(prob(5))
owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.1)
- to_chat(owner, "[(owner.client?.prefs.lewdchem?"[enthrallGender]":"[master]")] will surely be back soon") //denial
+ to_chat(owner, "[(lewd?"[enthrallGender]":"[master]")] will surely be back soon") //denial
if(36)
- var/message = "[(owner.client?.prefs.lewdchem?"I feel empty when [enthrallGender]'s not around..":"I miss [master]'s presence")]"
+ var/message = "[(lewd?"I feel empty when [enthrallGender]'s not around..":"I miss [master]'s presence")]"
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "EnthMissing1", /datum/mood_event/enthrallmissing1, message)
if(37 to 65)//barganing
if(prob(10))
to_chat(owner, "They are coming back, right...?")
owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5)
if(prob(10))
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "I just need to be a good pet for [enthrallGender], they'll surely return if I'm a good pet.")
owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1.5)
if(66)
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing1")
- var/message = "[(owner.client?.prefs.lewdchem?"I feel so lost in this complicated world without [enthrallGender]..":"I have to return to [master]!")]"
- to_chat(owner, "You start to feel really angry about how you're not with [(owner.client?.prefs.lewdchem?"your [enthrallGender]":"[master]")]!")
+ var/message = "[(lewd?"I feel so lost in this complicated world without [enthrallGender]..":"I have to return to [master]!")]"
+ to_chat(owner, "You start to feel really angry about how you're not with [(lewd?"your [enthrallGender]":"[master]")]!")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "EnthMissing2", /datum/mood_event/enthrallmissing2, message)
owner.stuttering += 50
owner.jitteriness += 250
@@ -421,15 +422,15 @@
if(prob(10))
addtimer(CALLBACK(M, /mob/verb/a_intent_change, INTENT_HARM), 2)
addtimer(CALLBACK(M, /mob/proc/click_random_mob), 2)
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "You are overwhelmed with anger at the lack of [enthrallGender]'s presence and suddenly lash out!")
else
to_chat(owner, "You are overwhelmed with anger and suddenly lash out!")
if(90)
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing2")
- var/message = "[(owner.client?.prefs.lewdchem?"Where are you [enthrallGender]??!":"I need to find [master]!")]"
+ var/message = "[(lewd?"Where are you [enthrallGender]??!":"I need to find [master]!")]"
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "EnthMissing3", /datum/mood_event/enthrallmissing3, message)
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "You need to find your [enthrallGender] at all costs, you can't hold yourself back anymore!")
else
to_chat(owner, "You need to find [master] at all costs, you can't hold yourself back anymore!")
@@ -442,15 +443,15 @@
M.hallucination += 10
if(101)
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "EnthMissing3")
- var/message = "[(owner.client?.prefs.lewdchem?"I'm all alone, It's so hard to continute without [enthrallGender]...":"I really need to find [master]!!!")]"
+ var/message = "[(lewd?"I'm all alone, It's so hard to continute without [enthrallGender]...":"I really need to find [master]!!!")]"
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "EnthMissing4", /datum/mood_event/enthrallmissing4, message)
- to_chat(owner, "You can hardly find the strength to continue without [(owner.client?.prefs.lewdchem?"your [enthrallGender]":"[master]")].")
+ to_chat(owner, "You can hardly find the strength to continue without [(lewd?"your [enthrallGender]":"[master]")].")
M.gain_trauma_type(BRAIN_TRAUMA_SEVERE)
if(102 to 140) //depression 2, revengeance
if(prob(20))
owner.Stun(50)
owner.emote("cry")//does this exist?
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "You're unable to hold back your tears, suddenly sobbing as the desire to see your [enthrallGender] oncemore overwhelms you.")
else
to_chat(owner, "You are overwheled with withdrawl from [master].")
@@ -472,7 +473,7 @@
deltaResist += 5
owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1)
if(prob(20))
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "Maybe you'll be okay without your [enthrallGender].")
else
to_chat(owner, "You feel your mental functions slowly begin to return.")
@@ -505,7 +506,7 @@
else if(status == "charge")
ADD_TRAIT(owner, TRAIT_GOTTAGOFAST, "MKUltra")
status = "charged"
- if(master.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "Your [enthrallGender]'s order fills you with a burst of speed!")
else
to_chat(owner, "[master]'s command fills you with a burst of speed!")
@@ -528,7 +529,7 @@
//adrenals?
//customEcho
- if(customEcho && withdrawal == FALSE && owner.client?.prefs.lewdchem)
+ if(customEcho && withdrawal == FALSE && lewd)
if(prob(2))
if(!customSpan) //just in case!
customSpan = "notice"
@@ -544,7 +545,7 @@
cooldownMsg = FALSE
else if (cooldownMsg == FALSE)
if(DistApart < 10)
- if(master.client?.prefs.lewdchem)
+ if(lewd)
to_chat(master, "Your pet [owner] appears to have finished internalising your last command.")
else
to_chat(master, "Your thrall [owner] appears to have finished internalising your last command.")
@@ -577,7 +578,7 @@
/datum/status_effect/chem/enthrall/proc/owner_hear(datum/source, list/hearing_args)
- if(owner.client?.prefs.lewdchem == FALSE)
+ if(lewd == FALSE)
return
if (cTriggered > 0)
return
@@ -607,7 +608,7 @@
//Shocking truth!
else if (lowertext(customTriggers[trigger]) == "shock")
- if (C.canbearoused && C.client?.prefs.lewdchem)
+ if (C.canbearoused && lewd)
C.adjustArousalLoss(5)
C.jitteriness += 100
C.stuttering += 25
@@ -617,7 +618,7 @@
//wah intensifies wah-rks
else if (lowertext(customTriggers[trigger]) == "cum")//aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- if (HAS_TRAIT(C, TRAIT_NYMPHO) && C.client?.prefs.lewdchem)
+ if (HAS_TRAIT(C, TRAIT_NYMPHO) && lewd)
if (C.getArousalLoss() > 80)
C.mob_climax(forced_climax=TRUE)
C.SetStun(10)//We got your stun effects in somewhere, Kev.
@@ -658,20 +659,20 @@
if (status == "Sleeper" || phase == 0)
return
else if (phase == 4)
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "Your mind is too far gone to even entertain the thought of resisting. Unless you can fix the brain damage, you won't be able to break free of your [enthrallGender]'s control.")
else
to_chat(owner, "Your brain is too overwhelmed with from the high volume of chemicals in your system, rendering you unable to resist, unless you can fix the brain damage.")
return
else if (phase == 3 && withdrawal == FALSE)
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "The presence of your [enthrallGender] fully captures the horizon of your mind, removing any thoughts of resistance. If you get split up from them, then you might be able to entertain the idea of resisting.")
else
to_chat(owner, "You are unable to resist [master] in your current state. If you get split up from them, then you might be able to resist.")
return
else if (status == "Antiresist")//If ordered to not resist; resisting while ordered to not makes it last longer, and increases the rate in which you are enthralled.
if (statusStrength > 0)
- if(owner.client?.prefs.lewdchem)
+ if(lewd)
to_chat(owner, "The order from your [enthrallGender] to give in is conflicting with your attempt to resist, drawing you deeper into trance! You'll have to wait a bit before attemping again, lest your attempts become frustrated again.")
else
to_chat(owner, "The order from your [master] to give in is conflicting with your attempt to resist. You'll have to wait a bit before attemping again, lest your attempts become frustrated again.")
@@ -711,7 +712,7 @@
deltaResist *= 1.25
if (owner.reagents.has_reagent(/datum/reagent/medicine/neurine))
deltaResist *= 1.5
- if (!HAS_TRAIT(owner, TRAIT_CROCRIN_IMMUNE) && M.canbearoused && owner.client?.prefs.lewdchem)
+ if (!(owner.client?.prefs.cit_toggles & NO_APHRO) && M.canbearoused && lewd)
if (owner.reagents.has_reagent(/datum/reagent/drug/anaphrodisiac))
deltaResist *= 1.5
if (owner.reagents.has_reagent(/datum/reagent/drug/anaphrodisiacplus))
diff --git a/modular_citadel/code/datums/traits/neutral.dm b/modular_citadel/code/datums/traits/neutral.dm
index 20530dcc5..9b8fe1917 100644
--- a/modular_citadel/code/datums/traits/neutral.dm
+++ b/modular_citadel/code/datums/traits/neutral.dm
@@ -41,7 +41,7 @@
mob_trait = TRAIT_CHOKE_SLUT
gain_text = "You feel like you want to feel fingers around your neck, choking you until you pass out or make a mess... Maybe both."
lose_text = "Seems you don't have a kink for suffocation anymore."
-
+/*
/datum/quirk/pharmacokinesis //Prevents unwanted organ additions.
name = "Acute hepatic pharmacokinesis"
desc = "You've a rare genetic disorder that causes Incubus draft and Sucubus milk to be absorbed by your liver instead."
@@ -52,7 +52,7 @@
var/active = FALSE
var/power = 0
var/cachedmoveCalc = 1
-/*
+
/datum/quirk/fluid_leak
name = "Leaky breasts"
desc = "You don't stop making milk, and you have a habit of leaking everywhere when your breasts are full"
diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm
index dbe342743..c8d4ea191 100644
--- a/modular_citadel/code/modules/arousal/arousal.dm
+++ b/modular_citadel/code/modules/arousal/arousal.dm
@@ -238,7 +238,7 @@
//These are various procs that we'll use later, split up for readability instead of having one, huge proc.
//For all of these, we assume the arguments given are proper and have been checked beforehand.
-/mob/living/carbon/human/proc/mob_masturbate(obj/item/organ/genital/G, mb_time = 30) //Masturbation, keep it gender-neutral
+/mob/living/carbon/human/proc/mob_masturbate(obj/item/organ/genital/G, cover = FALSE, mb_time = 30) //Masturbation, keep it gender-neutral
var/total_fluids = 0
var/datum/reagents/fluid_source = null
var/condomed = 0
@@ -267,10 +267,36 @@
if(total_fluids > 5 &&!condomed &&!sounded)
fluid_source.reaction(src.loc, TOUCH, 1, 0)
fluid_source.clear_reagents()
- if(!condomed &&!sounded)
+ if(!condomed && !sounded && !cover)
src.visible_message("[src] orgasms, cumming[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""]!", \
- "You cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""].", \
- "You have relieved yourself.")
+ "You cum[istype(src.loc, /turf/open/floor) ? " onto [src.loc]" : ""].", \
+ "You have relieved yourself.")
+
+ if(!condomed &&!sounded && cover)//For when you want to make a mess of yourself.
+ fluid_source.trans_to(src, total_fluids*G.fluid_transfer_factor)
+ total_fluids -= total_fluids*G.fluid_transfer_factor
+ if(total_fluids > 80) // now thats a big cum!
+ if(isliving(src))
+ var/mutable_appearance/cumoverlaylarge = mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi')
+ cumoverlaylarge.icon_state = "cum_large"
+ src.add_overlay(cumoverlaylarge)
+
+ if(total_fluids > 5)
+ fluid_source.reaction(src.loc, TOUCH, 1, 0)
+ var/mob/living/carbon/human/H = src
+ if(H && G.name == "penis")
+ H.cumdrip_rate += rand(5,10)
+ fluid_source.clear_reagents()
+ src.visible_message("[src] climaxes over [p_their()] self, using [p_their()] [G.name]!", \
+ "You orgasm over yourself, using your [G.name].", \
+ "You have climaxed over something, using your [G.name].")
+ if(isliving(src))
+ var/mutable_appearance/cumoverlay = mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi')
+ cumoverlay.icon_state = "cum_normal"
+ src.add_overlay(cumoverlay)
+ else
+ src.add_cum_overlay()
+
if(condomed) //condomed
src.visible_message("[src] orgasms, climaxing into [p_their()] condom ", \
"You cum into your condom.", \
@@ -611,6 +637,8 @@
//Here's the main proc itself
/mob/living/carbon/human/mob_climax(forced_climax=FALSE) //Forced is instead of the other proc, makes you cum if you have the tools for it, ignoring restraints
+ if(stat == DEAD) //corpses can't cum
+ return
if(mb_cd_timer > world.time)
if(!forced_climax) //Don't spam the message to the victim if forced to come too fast
to_chat(src, "You need to wait [DisplayTimeText((mb_cd_timer - world.time), TRUE)] before you can do that again!")
diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm
index dd5099cbd..ac28f594a 100644
--- a/modular_citadel/code/modules/arousal/organs/genitals.dm
+++ b/modular_citadel/code/modules/arousal/organs/genitals.dm
@@ -83,7 +83,7 @@
owner.exposed_genitals += src
if("Hidden by clothes")
through_clothes = FALSE
- hidden = TRUE
+ hidden = FALSE
mode = "clothes"
if(src in owner.exposed_genitals)
owner.exposed_genitals -= src
@@ -368,9 +368,11 @@
var/organCheck = FALSE
var/breastCheck = FALSE
var/willyCheck = FALSE
+ /* pharma trait deprecieated
if(!canbearoused)
ADD_TRAIT(src, TRAIT_PHARMA, "pharma")//Prefs prevent unwanted organs.
return
+ */
for(var/obj/item/organ/O in internal_organs)
if(istype(O, /obj/item/organ/genital))
organCheck = TRUE
diff --git a/modular_citadel/code/modules/client/preferences.dm b/modular_citadel/code/modules/client/preferences.dm
index db0727324..bd5c8ae33 100644
--- a/modular_citadel/code/modules/client/preferences.dm
+++ b/modular_citadel/code/modules/client/preferences.dm
@@ -16,7 +16,7 @@
var/widescreenpref = TRUE
var/autostand = TRUE
var/auto_ooc = FALSE
- var/lewdchem = TRUE
+ //var/lewdchem = TRUE replaced with new prefs
//vore prefs
var/toggleeatingnoise = TRUE
@@ -28,7 +28,7 @@
var/noncon = FALSE //Definitely want this off by default
// stuff that was in base
- max_save_slots = 20
+ max_save_slots = 30
/datum/preferences/New(client/C)
@@ -58,6 +58,6 @@ datum/preferences/copy_to(mob/living/carbon/human/character, icon_updates = 1)
character.give_genitals(TRUE)
character.ooc_text = features["ooc_text"] //Let's update their flavor_text at least initially
character.canbearoused = arousable
- character.client?.prefs.lewdchem = lewdchem
+ //character.client?.prefs.lewdchem = lewdchem
if(icon_updates)
character.update_genitals()
diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
index 270c9062a..cea9bd7f4 100644
--- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -832,6 +832,14 @@ datum/sprite_accessory/ears/human/gret
name = "Panda"
icon_state = "hpanda"
+/datum/sprite_accessory/mam_snouts/vulp
+ name = "Vulp"
+ icon_state = "vulp"
+
+/datum/sprite_accessory/mam_snouts/vulpalt
+ name = "Vulp Alt"
+ icon_state = "vulp2"
+
/datum/sprite_accessory/mam_snouts/skulldog
name = "Skulldog"
icon_state = "skulldog"
@@ -1326,14 +1334,6 @@ datum/sprite_accessory/ears/human/gret
name = "Axolotl"
icon_state = "axolotl"
-/datum/sprite_accessory/mam_tails/bee
- name = "Bee"
- icon_state = "bee"
-
-/datum/sprite_accessory/mam_tails_animated/bee
- name = "Bee"
- icon_state = "bee"
-
/datum/sprite_accessory/mam_tails/cat
name = "Cat"
icon_state = "cat"
@@ -1426,14 +1426,6 @@ datum/sprite_accessory/ears/human/gret
name = "Husky"
icon_state = "husky"
-datum/sprite_accessory/mam_tails/insect
- name = "Insect"
- icon_state = "insect"
-
-/datum/sprite_accessory/mam_tails_animated/insect
- name = "Insect"
- icon_state = "insect"
-
/datum/sprite_accessory/mam_tails/kangaroo
name = "kangaroo"
icon_state = "kangaroo"
@@ -1629,11 +1621,6 @@ datum/sprite_accessory/mam_tails/insect
name = "Abdominals Three-Tones"
icon_state = "absarms"
-/datum/sprite_accessory/mam_body_markings/bee
- name = "Bee"
- icon_state = "bee"
- icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
-
/datum/sprite_accessory/mam_body_markings/belly
name = "Belly"
icon_state = "belly"
@@ -1714,11 +1701,6 @@ datum/sprite_accessory/mam_tails/insect
name = "Lab"
icon_state = "lab"
-/datum/sprite_accessory/mam_body_markings/moth
- name = "Moth"
- icon_state = "moth"
- icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
-
/datum/sprite_accessory/mam_body_markings/otie
name = "Otie"
icon_state = "otie"
@@ -1812,6 +1794,8 @@ datum/sprite_accessory/mam_tails/insect
icon_state = "protogenlight"
icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+
/******************************************
************ Taur Bodies ******************
*******************************************/
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
index 69acb8886..2aa99b95a 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
@@ -102,7 +102,7 @@
icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,WINGCOLOR)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
- mutant_bodyparts = list("mam_tail", "mam_ears","mam_body_markings", "taur", "mam_snouts", "deco_wings")
+ mutant_bodyparts = list("mam_tail", "mam_ears","mam_body_markings", "taur", "mam_snouts", "deco_wings", "legs")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "Shark", "mam_ears" = "None", "mam_body_markings" = "Shark", "mam_snouts" = "Round", "taur" = "None", "legs" = "Normal Legs", "deco_wings" = "None")
attack_verb = "bite"
attack_sound = 'sound/weapons/bite.ogg'
@@ -149,8 +149,8 @@
icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
- mutant_bodyparts = list("mam_ears", "mam_body_markings", "mam_tail", "taur", "moth_wings","moth_markings", "mam_snouts", "moth_fluff")
- default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "Plain","moth_markings" = "None", "mam_snouts" = "Bug", "mam_body_markings" = "Moth", "taur" = "None", "moth_fluff" = "Plain")
+ mutant_bodyparts = list("mam_ears", "mam_body_markings", "mam_tail", "taur", "moth_wings","moth_markings", "mam_snouts", "moth_fluff", "legs")
+ default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "Plain","moth_markings" = "None", "mam_snouts" = "Bug", "mam_body_markings" = "Moth", "taur" = "None", "moth_fluff" = "Plain", "legs" = "Normal Legs")
attack_verb = "flutter" //wat?
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
index 65a407d01..e21502b4f 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
@@ -309,9 +309,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
var/leap_at
var/disabler
var/laser
- var/sleeper_g
- var/sleeper_r
- var/sleeper_nv
+ var/sleeper_state = BORGBELLY_NONE
#define MAX_K9_LEAP_DIST 4 //because something's definitely borked the pounce functioning from a distance.
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
index 1abea303c..cce251f72 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -615,7 +615,7 @@
if("Heavy")
cyborg_base_icon = "heavyeng"
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
- if("Pup Dozer")
+ if("Pupdozer")
cyborg_base_icon = "pupdozer"
can_be_pushed = FALSE
hat_offset = INFINITY
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
index e8f3b78f6..c18ccbc0a 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
@@ -167,6 +167,9 @@ Creating a chem with a low purity will make you permanently fall in love with so
/datum/reagent/fermi/enthrall/on_mob_add(mob/living/carbon/M)
. = ..()
+ if(M.client?.prefs.cit_toggles & NEVER_HYPNO) // Just in case people are opting out of this
+ holder.del_reagent(type)
+ return
if(!ishuman(M))//Just to make sure screwy stuff doesn't happen.
return
if(!creatorID)
@@ -180,7 +183,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
E.enthrallID = creatorID
E.enthrallGender = creatorGender
E.master = get_mob_by_key(creatorID)
- to_chat(M, to_chat(M, "Your aldled, plastic, mind bends under the chemical influence of a new [(M.client?.prefs.lewdchem?"master":"leader")]. Your highest priority is now to stay by [creatorName]'s side, following and aiding them at all costs.")) //THIS SHOULD ONLY EVER APPEAR IF YOU MINDBREAK YOURSELF AND THEN GET INJECTED FROM SOMEONE ELSE.
+ to_chat(M, "Your addled, plastic, mind bends under the chemical influence of a new [(E.lewd?"master":"leader")]. Your highest priority is now to stay by [creatorName]'s side, following and aiding them at all costs.") //THIS SHOULD ONLY EVER APPEAR IF YOU MINDBREAK YOURSELF AND THEN GET INJECTED FROM SOMEONE ELSE.
log_game("FERMICHEM: Narcissist [M] ckey: [M.key] been rebound to [creatorName], ID: [creatorID]")
return
if((M.ckey == creatorID) && (creatorName == M.real_name)) //same name AND same player - same instance of the player. (should work for clones?)
@@ -191,7 +194,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
Vc.Remove(M)
nVc.Insert(M)
qdel(Vc)
- to_chat(M, "You feel your vocal chords tingle you speak in a more charasmatic and sultry tone.)]")
+ to_chat(M, "You feel your vocal chords tingle you speak in a more charasmatic and sultry tone.")
else
log_game("FERMICHEM: MKUltra: [creatorName], [creatorID], is enthralling [M.name], [M.ckey]")
M.apply_status_effect(/datum/status_effect/chem/enthrall)
@@ -202,8 +205,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
if(purity < 0.5)//DO NOT SPLIT INTO DIFFERENT CHEM: This relies on DoNotSplit - has to be done this way.
if(volume < 0.5)//You don't get to escape that easily
//FallInLove(pick(GLOB.player_list), M) //goodbye
- M.reagents.remove_reagent(type, volume)
-
+ M.reagents.del_reagent(type)
if (M.ckey == creatorID && creatorName == M.real_name)//If the creator drinks it, they fall in love randomly. If someone else drinks it, the creator falls in love with them.
if(M.has_status_effect(STATUS_EFFECT_INLOVE))//Can't be enthralled when enthralled, so to speak.
return
@@ -230,7 +232,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
M.reagents.del_reagent(type)
FallInLove(C, M)
return
-
if (M.ckey == creatorID && creatorName == M.real_name)//If you yourself drink it, it supresses the vocal effects, for stealth. NEVERMIND ADD THIS LATER I CAN'T GET IT TO WORK
return
if(!M.client)
@@ -261,7 +262,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
E.master = creator
else
E = M.has_status_effect(/datum/status_effect/chem/enthrall)
- if(M.client?.prefs.lewdchem)
+ if(E.lewd)
to_chat(M, "Your mind shatters under the volume of the mild altering chem inside of you, breaking all will and thought completely. Instead the only force driving you now is the instinctual desire to obey and follow [creatorName]. Your highest priority is now to stay by their side and protect them at all costs.")
else
to_chat(M, "The might volume of chemicals in your system overwhelms your mind, and you suddenly agree with what [creatorName] has been saying. Your highest priority is now to stay by their side and protect them at all costs.")
@@ -287,6 +288,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
chemical_flags = REAGENT_DONOTSPLIT
can_synth = FALSE
var/mob/living/carbon/love
+ var/lewd = FALSE
/datum/reagent/fermi/enthrallExplo/on_mob_life(mob/living/carbon/M)//Love gas, only affects while it's in your system,Gives a positive moodlet if close, gives brain damagea and a negative moodlet if not close enough.
if(HAS_TRAIT(M, TRAIT_MINDSHIELD))
@@ -302,24 +304,25 @@ Creating a chem with a low purity will make you permanently fall in love with so
if(!love)
return
M.apply_status_effect(STATUS_EFFECT_INLOVE, love)
- to_chat(M, "[(M.client?.prefs.lewdchem?"":"")][(M.client?.prefs.lewdchem?"You develop a sudden crush on [love], your heart beginning to race as you look upon them with new eyes.":"You suddenly feel like making friends with [love].")] You feel strangely drawn towards them.")
+ lewd = (M.client?.prefs.cit_toggles & HYPNO) && (love.client?.prefs.cit_toggles & HYPNO)
+ to_chat(M, "[(lewd?"":"")][(lewd?"You develop a sudden crush on [love], your heart beginning to race as you look upon them with new eyes.":"You suddenly feel like making friends with [love].")] You feel strangely drawn towards them.")
log_game("FERMICHEM: [M] ckey: [M.key] has temporarily bonded with [love] ckey: [love.key]")
SSblackbox.record_feedback("tally", "fermi_chem", 1, "Times people have bonded")
else
if(get_dist(M, love) < 8)
if(HAS_TRAIT(M, TRAIT_NYMPHO)) //Add this back when merged/updated.
M.adjustArousalLoss(5)
- var/message = "[(M.client?.prefs.lewdchem?"I'm next to my crush..! Eee!":"I'm making friends with [love]!")]"
+ var/message = "[(lewd?"I'm next to my crush..! Eee!":"I'm making friends with [love]!")]"
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "InLove", /datum/mood_event/InLove, message)
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "MissingLove")
else
- var/message = "[(M.client?.prefs.lewdchem?"I can't keep my crush off my mind, I need to see them again!":"I really want to make friends with [love]!")]"
+ var/message = "[(lewd?"I can't keep my crush off my mind, I need to see them again!":"I really want to make friends with [love]!")]"
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "MissingLove", /datum/mood_event/MissingLove, message)
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "InLove")
if(prob(5))
M.Stun(10)
M.emote("whimper")//does this exist?
- to_chat(M, "[(M.client?.prefs.lewdchem?"":"")] You're overcome with a desire to see [love].")
+ to_chat(M, "[(lewd?"":"")] You're overcome with a desire to see [love].")
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5)//I found out why everyone was so damaged!
..()
@@ -329,7 +332,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
M.remove_status_effect(STATUS_EFFECT_INLOVE)
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "InLove")
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "MissingLove")
- to_chat(M, "[(M.client?.prefs.lewdchem?"":"")]Your feelings for [love] suddenly vanish!")
+ to_chat(M, "[(lewd?"":"")]Your feelings for [love] suddenly vanish!")
log_game("FERMICHEM: [M] ckey: [M.key] is no longer in temp bond")
..()
@@ -337,7 +340,8 @@ Creating a chem with a low purity will make you permanently fall in love with so
if(Lover.has_status_effect(STATUS_EFFECT_INLOVE))
to_chat(Lover, "You are already fully devoted to someone else!")
return
- to_chat(Lover, "[(Lover.client?.prefs.lewdchem?"":"")]You develop a deep and sudden bond with [Love][(Lover.client?.prefs.lewdchem?", your heart beginning to race as your mind filles with thoughts about them.":".")] You are determined to keep them safe and happy, and feel drawn towards them.")
+ var/lewd = (Lover.client?.prefs.cit_toggles & HYPNO) && (Love.client?.prefs.cit_toggles & HYPNO)
+ to_chat(Lover, "[(lewd?"":"")]You develop a deep and sudden bond with [Love][(lewd?", your heart beginning to race as your mind filles with thoughts about them.":".")] You are determined to keep them safe and happy, and feel drawn towards them.")
if(Lover.mind)
Lover.mind.store_memory("You are in love with [Love].")
Lover.faction |= "[REF(Love)]"
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index 147602004..e0d8e8417 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -25,7 +25,7 @@
taste_description = "a milky ice cream like flavour."
overdose_threshold = 17
metabolization_rate = 0.25
- impure_chem = /datum/reagent/fermi/BEsmaller //If you make an inpure chem, it stalls growth
+ impure_chem = /datum/reagent/fermi/BEsmaller //If you make an impure chem, it stalls growth
inverse_chem_val = 0.35
inverse_chem = /datum/reagent/fermi/BEsmaller //At really impure vols, it just becomes 100% inverse
can_synth = FALSE
@@ -49,7 +49,7 @@
B.throw_at(T2, 8, 1)
M.reagents.del_reagent(type)
return
- log_game("FERMICHEM: [M] ckey: [M.key] has ingested Sucubus milk")
+ log_game("FERMICHEM: [M] ckey: [M.key] has ingested Succubus milk")
var/mob/living/carbon/human/H = M
H.genital_override = TRUE
var/obj/item/organ/genital/breasts/B = H.getorganslot("breasts")
@@ -69,11 +69,11 @@
var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts")
if(!B) //If they don't have breasts, give them breasts.
- //If they have Acute hepatic pharmacokinesis, then route processing though liver.
- if(HAS_TRAIT(M, TRAIT_PHARMA))
+ //If they've opted out, then route processing though liver.
+ if(!(H.client?.prefs.cit_toggles & BREAST_ENLARGEMENT))
var/obj/item/organ/liver/L = M.getorganslot("liver")
if(L)
- L.swelling+= 0.05
+ //L.swelling+= 0.05 HYPER CHANGE: Liver swelling is the non-lewd equivalent of large genitals impeding movement. Feature is depreciated on Hyper.
return..()
else
M.adjustToxLoss(1)
@@ -95,17 +95,16 @@
to_chat(M, "Your chest feels warm, tingling with newfound sensitivity.")
M.reagents.remove_reagent(type, 5)
B = nB
- //If they have them, increase size. If size is comically big, limit movement and rip clothes.
- B.cached_size = B.cached_size + 0.05
- B.update()
+ //If they have them, and opted in, increase size.
+ if(H.client?.prefs.cit_toggles & BREAST_ENLARGEMENT)
+ B.cached_size = B.cached_size + 0.05
+ B.update()
..()
/datum/reagent/fermi/breast_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a female if male and ODing, doesn't touch nonbinary and object genders.
-
- //Acute hepatic pharmacokinesis.
- if(HAS_TRAIT(M, TRAIT_PHARMA))
- var/obj/item/organ/liver/L = M.getorganslot("liver")
- L.swelling+= 0.05
+ if(!(M.client?.prefs.cit_toggles & FORCED_FEM))
+ //var/obj/item/organ/liver/L = M.getorganslot("liver")
+ //L.swelling+= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life()
return ..()
var/obj/item/organ/genital/penis/P = M.getorganslot("penis")
@@ -142,17 +141,13 @@
/datum/reagent/fermi/BEsmaller/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts")
- if(!B)
- //Acute hepatic pharmacokinesis.
- if(HAS_TRAIT(M, TRAIT_PHARMA))
- var/obj/item/organ/liver/L = M.getorganslot("liver")
- L.swelling-= 0.05
- return ..()
-
- //otherwise proceed as normal
- return..()
- B.cached_size = B.cached_size - 0.05
- B.update()
+ if(!(M.client?.prefs.cit_toggles & BREAST_ENLARGEMENT) || !B)
+ //var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
+ //L.swelling-= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life()
+ return ..()
+ if(M.client?.prefs.cit_toggles & BREAST_ENLARGEMENT)
+ B.cached_size = B.cached_size - 0.05
+ B.update()
..()
/datum/reagent/fermi/BEsmaller_hypo
@@ -240,15 +235,15 @@
/datum/reagent/fermi/penis_enlarger/on_mob_life(mob/living/carbon/M) //Increases penis size, 5u = +1 inch.
if(!ishuman(M))
return
+
+ var/mob/living/carbon/human/H = M
var/obj/item/organ/genital/testicles/T = M.getorganslot("testicles") //Hyper Change, testicles come first so the dick isn't hidden behind the testicles layer
var/obj/item/organ/genital/penis/P = M.getorganslot("penis")
if(!T)//Hyper change// Adds testicles if there are none.
-
- //If they have Acute hepatic pharmacokinesis, then route processing though liver.
- if(HAS_TRAIT(M, TRAIT_PHARMA))
+ if(!(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT))
var/obj/item/organ/liver/L = M.getorganslot("liver")
if(L)
- L.swelling+= 0.05
+ //L.swelling+= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life()
return..()
else
M.adjustToxLoss(1)
@@ -263,14 +258,11 @@
nT.cached_size = 1
nT.sack_size = BALLS_SACK_SIZE_DEF
T = nT
-
- if(!P)//They do have a preponderance for escapism, or so I've heard.
-
- //If they have Acute hepatic pharmacokinesis, then route processing though liver.
- if(HAS_TRAIT(M, TRAIT_PHARMA))
+ if(!P)
+ if(!(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT))
var/obj/item/organ/liver/L = M.getorganslot("liver")
if(L)
- L.swelling+= 0.05
+ //L.swelling+= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life()
return..()
else
M.adjustToxLoss(1)
@@ -286,19 +278,18 @@
nP.prev_length = 1
M.reagents.remove_reagent(type, 5)
P = nP
-
- P.cached_length = P.cached_length + 0.1
- //Hyper change// Increase ball size too
- T.size = T.size + 0.1
- T.update() //Hyper change - Make the ball size update
- P.update()
+ if(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT)
+ P.cached_length = P.cached_length + 0.1
+ //Hyper change// Increase ball size too
+ T.size = T.size + 0.1
+ T.update() //Hyper change - Make the ball size update
+ P.update()
..()
/datum/reagent/fermi/penis_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a male if female and ODing, doesn't touch nonbinary and object genders.
- //Acute hepatic pharmacokinesis.
- if(HAS_TRAIT(M, TRAIT_PHARMA))
- var/obj/item/organ/liver/L = M.getorganslot("liver")
- L.swelling+= 0.05
+ if(!(M.client?.prefs.cit_toggles & FORCED_MASC))
+ //var/obj/item/organ/liver/L = M.getorganslot("liver")
+ //L.swelling+= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life()
return..()
var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts")
@@ -334,17 +325,13 @@
/datum/reagent/fermi/PEsmaller/on_mob_life(mob/living/carbon/M)
var/mob/living/carbon/human/H = M
var/obj/item/organ/genital/penis/P = H.getorganslot("penis")
- if(!P)
- //Acute hepatic pharmacokinesis.
- if(HAS_TRAIT(M, TRAIT_PHARMA))
- var/obj/item/organ/liver/L = M.getorganslot("liver")
- L.swelling-= 0.05
- return..()
-
- //otherwise proceed as normal
+ if(!(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT) || !P)
+ //var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
+ //L.swelling-= 0.05 //HYPER CHANGE: See comment in /breast_enlarger/on_mob_life()
return..()
- P.cached_length = P.cached_length - 0.1
- P.update()
+ if(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT)
+ P.cached_length = P.cached_length - 0.1
+ P.update()
..()
/datum/reagent/fermi/PEsmaller_hypo
@@ -408,22 +395,24 @@
var/mob/living/carbon/human/H = M
var/obj/item/organ/genital/anus/B = M.getorganslot("anus")
- if(!B) //If they don't have a butt. Give them one!
- var/obj/item/organ/genital/anus/nB = new
- nB.Insert(M)
- if(nB)
- if(M.dna.species.use_skintones && M.dna.features["genitals_use_skintone"])
- nB.color = skintone2hex(H.skin_tone)
- else if(M.dna.features["breasts_color"])
- nB.color = "#[M.dna.features["breasts_color"]]"
- else
- nB.color = skintone2hex(H.skin_tone)
- nB.size = 1
- to_chat(M, "Your ass cheeks bulge outwards and feel heavier.")
- M.reagents.remove_reagent(type, 5)
- B = nB
- //If they have, increase size.
- if(B.size < 5) //just make sure you dont break sprites
- B.size = B.size + 0.05
- B.update()
- ..()
\ No newline at end of file
+ if(!B) //If they don't have a butt and are opted in, give them one!
+ if(H.client?.prefs.cit_toggles & ASS_ENLARGEMENT)
+ var/obj/item/organ/genital/anus/nB = new
+ nB.Insert(M)
+ if(nB)
+ if(M.dna.species.use_skintones && M.dna.features["genitals_use_skintone"])
+ nB.color = skintone2hex(H.skin_tone)
+ else if(M.dna.features["breasts_color"])
+ nB.color = "#[M.dna.features["breasts_color"]]"
+ else
+ nB.color = skintone2hex(H.skin_tone)
+ nB.size = 1
+ to_chat(M, "Your ass cheeks bulge outwards and feel heavier.")
+ M.reagents.remove_reagent(type, 5)
+ B = nB
+ //If they have & opt in, increase size.
+ if(H.client?.prefs.cit_toggles & ASS_ENLARGEMENT)
+ if(B.size < 5) //just make sure you dont break sprites
+ B.size = B.size + 0.05
+ B.update()
+ ..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index b5324515d..067a32fe7 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -108,7 +108,9 @@
..()
/datum/reagent/fermi/furranium/on_mob_life(mob/living/carbon/M)
-
+ if(M.client?.prefs.cit_toggles & NO_UWU) //if opted out of uwuspeak
+ holder.del_reagent(type)
+ return
switch(current_cycle)
if(1 to 9)
if(prob(20))
diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
index e2420ebd5..324b44db3 100644
--- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
+++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
@@ -12,17 +12,18 @@
glass_name = "chalice of semen"
glass_desc = "In the Sumerian mythology, Enki - the God of water, was believed to have created the Tigris and Euphrates rivers by masturbating and ejaculating into their empty riverbeds."
-/datum/reagent/consumable/semen/reaction_turf(turf/T, reac_volume)
+/datum/reagent/consumable/semen/reaction_turf(turf/open/T, reac_volume)
if(!istype(T))
return
if(reac_volume < 3)
return
-
var/obj/effect/decal/cleanable/semen/S = locate() in T
if(!S)
S = new(T)
if(data["blood_DNA"])
S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
+ if(SSevents.holidays && SSevents.holidays[APRIL_FOOLS])
+ T.MakeSlippery(TURF_WET_LUBE, 15 SECONDS, min(reac_volume * 2 SECONDS, 120))
/obj/effect/decal/cleanable/semen
name = "semen"
@@ -87,17 +88,18 @@
blood_DNA |= F.blood_DNA
return ..()
-/datum/reagent/consumable/femcum/reaction_turf(turf/T, reac_volume)
+/datum/reagent/consumable/femcum/reaction_turf(turf/open/T, reac_volume)
if(!istype(T))
return
if(reac_volume < 3)
return
-
var/obj/effect/decal/cleanable/femcum/S = locate() in T
if(!S)
S = new(T)
if(data["blood_DNA"])
S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
+ if(SSevents.holidays && SSevents.holidays[APRIL_FOOLS])
+ T.MakeSlippery(TURF_WET_LUBE, 15 SECONDS, min(reac_volume * 2 SECONDS, 120))
/datum/reagent/consumable/milk/reaction_turf(turf/T, reac_volume)
if(!istype(T))
@@ -141,7 +143,7 @@
color = "#FFADFF"//PINK, rgb(255, 173, 255)
/datum/reagent/drug/aphrodisiac/on_mob_life(mob/living/M)
- if(M && M.canbearoused && !HAS_TRAIT(M, TRAIT_CROCRIN_IMMUNE))
+ if(M && M.canbearoused && !(M.client?.prefs.cit_toggles & NO_APHRO))
if(prob(33))
M.adjustArousalLoss(2)
if(prob(5))
@@ -162,7 +164,7 @@
overdose_threshold = 20
/datum/reagent/drug/aphrodisiacplus/on_mob_life(mob/living/M)
- if(M && M.canbearoused && !HAS_TRAIT(M, TRAIT_CROCRIN_IMMUNE))
+ if(M && M.canbearoused && !(M.client?.prefs.cit_toggles & NO_APHRO))
if(prob(33))
M.adjustArousalLoss(6)//not quite six times as powerful, but still considerably more powerful.
if(prob(5))
@@ -194,7 +196,7 @@
..()
/datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M)
- if(M && M.canbearoused && !HAS_TRAIT(M, TRAIT_CROCRIN_IMMUNE) && prob(33))
+ if(M && M.canbearoused && !(M.client?.prefs.cit_toggles & NO_APHRO) && prob(33))
if(prob(5) && M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
if(prob(5)) //Less spam
to_chat(M, "Your libido is going haywire!")
diff --git a/modular_citadel/icons/mob/mam_snouts.dmi b/modular_citadel/icons/mob/mam_snouts.dmi
index 582e23363..4b06a1f7e 100644
Binary files a/modular_citadel/icons/mob/mam_snouts.dmi and b/modular_citadel/icons/mob/mam_snouts.dmi differ
diff --git a/modular_citadel/icons/mob/markings_notmammals.dmi b/modular_citadel/icons/mob/markings_notmammals.dmi
index 157c02d65..98df59d2b 100644
Binary files a/modular_citadel/icons/mob/markings_notmammals.dmi and b/modular_citadel/icons/mob/markings_notmammals.dmi differ
diff --git a/modular_citadel/icons/mob/mutant_bodyparts.dmi b/modular_citadel/icons/mob/mutant_bodyparts.dmi
index 99f4f83d1..b4fad43ba 100644
Binary files a/modular_citadel/icons/mob/mutant_bodyparts.dmi and b/modular_citadel/icons/mob/mutant_bodyparts.dmi differ
diff --git a/sound/AI/burger.ogg b/sound/AI/burger.ogg
new file mode 100644
index 000000000..d75a77a45
Binary files /dev/null and b/sound/AI/burger.ogg differ
diff --git a/sound/AI/cleaning.ogg b/sound/AI/cleaning.ogg
deleted file mode 100644
index a97a91305..000000000
Binary files a/sound/AI/cleaning.ogg and /dev/null differ
diff --git a/sound/AI/commandreport.ogg b/sound/AI/commandreport.ogg
index 900666690..8b5e3f486 100644
Binary files a/sound/AI/commandreport.ogg and b/sound/AI/commandreport.ogg differ
diff --git a/sound/AI/crystal.ogg b/sound/AI/crystal.ogg
new file mode 100644
index 000000000..765568225
Binary files /dev/null and b/sound/AI/crystal.ogg differ
diff --git a/sound/AI/night.ogg b/sound/AI/night.ogg
new file mode 100644
index 000000000..1e869fdb1
Binary files /dev/null and b/sound/AI/night.ogg differ
diff --git a/sound/AI/night2.ogg b/sound/AI/night2.ogg
new file mode 100644
index 000000000..d906c8a0e
Binary files /dev/null and b/sound/AI/night2.ogg differ
diff --git a/sound/AI/personal/brute.ogg b/sound/AI/personal/brute.ogg
new file mode 100644
index 000000000..1ed0e3ce3
Binary files /dev/null and b/sound/AI/personal/brute.ogg differ
diff --git a/sound/AI/personal/cleaning.ogg b/sound/AI/personal/cleaning.ogg
new file mode 100644
index 000000000..774d0584c
Binary files /dev/null and b/sound/AI/personal/cleaning.ogg differ
diff --git a/sound/AI/personal/seekmedical.ogg b/sound/AI/personal/seekmedical.ogg
new file mode 100644
index 000000000..af1a27e2d
Binary files /dev/null and b/sound/AI/personal/seekmedical.ogg differ
diff --git a/sound/creatures/crystal_death.ogg b/sound/creatures/crystal_death.ogg
new file mode 100644
index 000000000..1dfbd314d
Binary files /dev/null and b/sound/creatures/crystal_death.ogg differ
diff --git a/sound/creatures/crystal_hit.ogg b/sound/creatures/crystal_hit.ogg
new file mode 100644
index 000000000..9a046cf0b
Binary files /dev/null and b/sound/creatures/crystal_hit.ogg differ
diff --git a/sound/creatures/crystal_idle.ogg b/sound/creatures/crystal_idle.ogg
new file mode 100644
index 000000000..186d42b4b
Binary files /dev/null and b/sound/creatures/crystal_idle.ogg differ
diff --git a/sound/music/goodbyespaceman.ogg b/sound/music/goodbyespaceman.ogg
deleted file mode 100644
index e57de8f8d..000000000
Binary files a/sound/music/goodbyespaceman.ogg and /dev/null differ
diff --git a/tgstation.dme b/tgstation.dme
index 60b9fb630..5e139a96b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -154,6 +154,7 @@
#include "code\__HELPERS\type2type_vr.dm"
#include "code\__HELPERS\type_processing.dm"
#include "code\__HELPERS\typelists.dm"
+#include "code\__HELPERS\unique_ids.dm"
#include "code\__HELPERS\unsorted.dm"
#include "code\__HELPERS\verbs.dm"
#include "code\__HELPERS\view.dm"
@@ -492,6 +493,7 @@
#include "code\datums\elements\mob_holder.dm"
#include "code\datums\elements\squish.dm"
#include "code\datums\elements\swimming.dm"
+#include "code\datums\elements\trash.dm"
#include "code\datums\elements\wuv.dm"
#include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm"
@@ -3009,6 +3011,7 @@
#include "code\modules\tgui\states.dm"
#include "code\modules\tgui\subsystem.dm"
#include "code\modules\tgui\tgui.dm"
+#include "code\modules\tgui\modules\_base.dm"
#include "code\modules\tgui\states\admin.dm"
#include "code\modules\tgui\states\always.dm"
#include "code\modules\tgui\states\conscious.dm"
@@ -3109,6 +3112,7 @@
#include "hyperstation\code\gamemode\werewolf\werewolf.dm"
#include "hyperstation\code\hyperbot\hyperbot.dm"
#include "hyperstation\code\mobs\carrion.dm"
+#include "hyperstation\code\mobs\crystal.dm"
#include "hyperstation\code\mobs\dancer.dm"
#include "hyperstation\code\mobs\emote.dm"
#include "hyperstation\code\mobs\hugbot.dm"
@@ -3151,17 +3155,19 @@
#include "hyperstation\code\modules\clothing\under\under.dm"
#include "hyperstation\code\modules\economy\account.dm"
#include "hyperstation\code\modules\events\crystalline_reentry.dm"
+#include "hyperstation\code\modules\events\crystalloid_entities.dm"
#include "hyperstation\code\modules\food_and_drinks\recipes\drinks_recipes.dm"
#include "hyperstation\code\modules\integrated_electronics\input.dm"
#include "hyperstation\code\modules\jobs\job_types\roleplay.dm"
#include "hyperstation\code\modules\mining\shelters.dm"
#include "hyperstation\code\modules\mining\equipment\survival_pod.dm"
#include "hyperstation\code\modules\mob\mob_helpers.dm"
+#include "hyperstation\code\modules\mob\dead\new_player\sprite_accessories.dm"
#include "hyperstation\code\modules\mob\living\status_indicators.dm"
+#include "hyperstation\code\modules\mob\living\carbon\carbon.dm"
#include "hyperstation\code\modules\mob\living\silicon\robot\robot.dm"
#include "hyperstation\code\modules\mob\living\silicon\robot\robot_modules.dm"
#include "hyperstation\code\modules\patreon\patreon.dm"
-#include "hyperstation\code\modules\power\lighting.dm"
#include "hyperstation\code\modules\power\reactor\fuel_rods.dm"
#include "hyperstation\code\modules\power\reactor\rbmk.dm"
#include "hyperstation\code\modules\power\reactor\reactor_cargo.dm"
@@ -3176,7 +3182,6 @@
#include "hyperstation\code\modules\resize\sizegun.dm"
#include "hyperstation\code\modules\surgery\organs\augments_arms.dm"
#include "hyperstation\code\modules\uplink\uplink_items.dm"
-#include "hyperstation\code\modules\vending\teavendomatic.dm"
#include "hyperstation\code\obj\ashtray.dm"
#include "hyperstation\code\obj\bluespace sewing kit.dm"
#include "hyperstation\code\obj\condom.dm"
@@ -3197,10 +3202,6 @@
#include "hyperstation\code\obj\sounding.dm"
#include "hyperstation\code\obj\stargate_clothing.dm"
#include "hyperstation\code\obj\vibrator.dm"
-#include "hyperstation\code\obj\Lambent\gloves.dm"
-#include "hyperstation\code\obj\Lambent\shoes.dm"
-#include "hyperstation\code\obj\Lambent\suit.dm"
-#include "hyperstation\code\obj\Lambent\uniform.dm"
#include "hyperstation\code\obj\SYSuit\abilities.dm"
#include "hyperstation\code\obj\SYSuit\main.dm"
#include "hyperstation\code\obj\SYSuit\suit_initialize.dm"
diff --git a/tgui-next/.gitattributes b/tgui-next/.gitattributes
deleted file mode 100644
index 0016cc3bf..000000000
--- a/tgui-next/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-* text=auto
-
-## Enforce text mode and LF line breaks
-*.js text eol=lf
-*.css text eol=lf
-*.html text eol=lf
-*.json text eol=lf
-
-## Treat bundles as binary and ignore them during conflicts
-*.bundle.* binary merge=tgui-merge-bundle
diff --git a/tgui-next/.gitignore b/tgui-next/.gitignore
deleted file mode 100644
index 416ca3768..000000000
--- a/tgui-next/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules
-*.log
-package-lock.json
-
-/packages/tgui/public/.tmp/**/*
-/packages/tgui/public/**/*.hot-update.*
-/packages/tgui/public/**/*.map
diff --git a/tgui-next/docs/tutorial-and-examples.md b/tgui-next/docs/tutorial-and-examples.md
deleted file mode 100644
index d038c1de6..000000000
--- a/tgui-next/docs/tutorial-and-examples.md
+++ /dev/null
@@ -1,245 +0,0 @@
-# Tutorial and Examples
-
-## Main concepts
-
-Basic tgui backend code consists of the following vars and procs:
-
-```
-ui_interact(mob/user, ui_key, datum/tgui/ui, force_open,
- datum/tgui/master_ui, datum/ui_state/state)
-ui_data(mob/user)
-ui_act(action, params)
-```
-
-- `src_object` - The atom, which UI corresponds to in the game world.
-- `ui_interact` - The proc where you will handle a request to open an
-interface. Typically, you would update an existing UI (if it exists),
-or set up a new instance of UI by calling the `SStgui` subsystem.
-- `ui_data` - In this proc you munges whatever complex data your `src_object`
-has into an associative list, which will then be sent to UI as a JSON string.
-- `ui_act` - This proc receives user actions and reacts to them by changing
-the state of the game.
-- `ui_state` (set in `ui_interact`) - This var dictates under what conditions
-a UI may be interacted with. This may be the standard checks that check if
-you are in range and conscious, or more.
-
-Once backend is complete, you create an new interface component on the
-frontend, which will receive this JSON data and render it on screen.
-
-States are easy to write and extend, and what make tgui interactions so
-powerful. Because states can be overridden from other procs, you can build
-powerful interactions for embedded objects or remote access.
-
-## Using It
-
-### Backend
-
-Let's start with a very basic hello world.
-
-```dm
-/obj/machinery/my_machine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "my_machine", name, 300, 300, master_ui, state)
- ui.open()
-```
-
-This is the proc that defines our interface. There's a bit going on here, so
-let's break it down. First, we override the ui_interact proc on our object. This
-will be called by `interact` for you, which is in turn called by `attack_hand`
-(or `attack_self` for items). `ui_interact` is also called to update a UI (hence
-the `try_update_ui`), so we accept an existing UI to update. The `state` is a
-default argument so that a caller can overload it with named arguments
-(`ui_interact(state = overloaded_state)`) if needed.
-
-Inside the `if(!ui)` block (which means we are creating a new UI), we choose our
-template, title, and size; we can also set various options like `style` (for
-themes), or autoupdate. These options will be elaborated on later (as will
-`ui_state`s).
-
-After `ui_interact`, we need to define `ui_data`. This just returns a list of
-data for our object to use. Let's imagine our object has a few vars:
-
-```dm
-/obj/machinery/my_machine/ui_data(mob/user)
- var/list/data = list()
- data["health"] = health
- data["color"] = color
-
- return data
-```
-
-The `ui_data` proc is what people often find the hardest about tgui, but its
-really quite simple! You just need to represent your object as numbers, strings,
-and lists, instead of atoms and datums.
-
-Finally, the `ui_act` proc is called by the interface whenever the user used an
-input. The input's `action` and `params` are passed to the proc.
-
-```dm
-/obj/machinery/my_machine/ui_act(action, params)
- if(..())
- return
- switch(action)
- if("change_color")
- var/new_color = params["color"]
- if(!(color in allowed_coors))
- return
- color = new_color
- . = TRUE
- update_icon()
-```
-
-The `..()` (parent call) is very important here, as it is how we check that the
-user is allowed to use this interface (to avoid so-called href exploits). It is
-also very important to clamp and sanitize all input here. Always assume the user
-is attempting to exploit the game.
-
-Also note the use of `. = TRUE` (or `FALSE`), which is used to notify the UI
-that this input caused an update. This is especially important for UIs that do
-not auto-update, as otherwise the user will never see their change.
-
-### Frontend
-
-Finally, you have to make a UI component. This is also a source of
-confusion for many new users. If you got some basic javascript and HTML
-knowledge, that should ease the learning process, although we recommend
-getting yourself introduced to
-[React and JSX](https://reactjs.org/docs/introducing-jsx.html).
-
-A component is not a regular HTML. A component is a pure function, which
-accepts a `props` object (it contains properties passed to a component),
-and outputs an HTML-like structure consisting of regular HTML elements and
-other UI components.
-
-Interface component will always receive 1 prop which is called `state`.
-This object contains a few special values:
-
-- `config` is always the same and is part of core tgui
-(it will be explained later),
-- `data` is the data returned from `ui_data`
-
-```jsx
-import { Section, LabeledList } from '../components';
-
-const SampleInterface = props => {
- const { state } = props;
- const { config, data } = state;
- const { ref } = config;
- return (
-
-
-
- {data.health}
-
-
- {data.color}
-
-
-
- );
-};
-```
-
-This syntax can be very confusing at first, but it is very important to
-realize that this is just a natural extension of javascript. Here's a few
-examples of this syntax:
-
-Return a different element based on a condition:
-
-```jsx
-if (condition) {
- return ;
-}
-return ;
-```
-
-Conditionally render a element inside of another element:
-
-```jsx
-
- {showProgress && (
-
- )}
-
-```
-
-Looping over the array to make an element for each item:
-
-```jsx
-
- {items.map(item => (
-
- {item.content}
-
- ))}
-
-```
-
-### Routing table
-
-Once you finished creating your interface, you need to add a route entry to
-the large `ROUTES` object, otherwise tgui won't know when and how to render
-your interface. Key of this `ROUTES` object corresponds to the interface
-name you use in DM code.
-
-```js
-import { SampleInterface } from './interfaces/SampleInterface';
-
-const ROUTES = {
- sample_interface: {
- component: () => SampleInterface,
- scrollable: true,
- },
-};
-```
-
-## Copypasta
-
-We all do it, even the best of us. If you just want to make a tgui **fast**,
-here's what you need (note that you'll probably be forced to clean your shit up
-upon code review):
-
-```dm
-/obj/copypasta/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = default_state) // Remember to use the appropriate state.
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "copypasta", name, 300, 300, master_ui, state)
- ui.open()
-
-/obj/copypasta/ui_data(mob/user)
- var/list/data = list()
- data["var"] = var
- return data
-
-/obj/copypasta/ui_act(action, params)
- if(..())
- return
- if(action == "copypasta")
- var/newvar = params["var"]
- // A demo of proper input sanitation.
- var = CLAMP(newvar, min_val, max_val)
- return TRUE
- update_icon() // Not applicable to all objects.
-```
-
-And the template:
-
-```jsx
-import { Section, LabeledList } from '../components';
-
-const SampleInterface = props => {
- const { state } = props;
- const { config, data } = state;
- const { ref } = config;
- return (
-
-
-
- {data.var}
-
-
-
- );
-};
-```
diff --git a/tgui-next/package.json b/tgui-next/package.json
deleted file mode 100644
index 9b7253e13..000000000
--- a/tgui-next/package.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "private": true,
- "name": "tgui-next",
- "version": "0.1.0",
- "workspaces": [
- "packages/*"
- ],
- "scripts": {
- "build": "eslint packages && cd packages/tgui && npx webpack --mode=production",
- "watch": "cd packages/tgui-dev-server && node --experimental-modules index.js",
- "analyze": "cd packages/tgui && npx webpack --mode=production --env.analyze=1",
- "lint": "eslint packages"
- },
- "dependencies": {
- "babel-eslint": "^10.0.3",
- "eslint": "^6.7.2",
- "eslint-plugin-react": "^7.17.0"
- }
-}
diff --git a/tgui-next/packages/common/math.js b/tgui-next/packages/common/math.js
deleted file mode 100644
index a33b9aa21..000000000
--- a/tgui-next/packages/common/math.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Limits a number to the range between 'min' and 'max'.
- */
-export const clamp = (value, min = 0, max = 1) => {
- return Math.max(min, Math.min(value, max));
-};
-
-/**
- * Returns a rounded number.
- * TODO: Replace this native rounding function with a more robust one.
- */
-export const round = value => Math.round(value);
-
-/**
- * Returns a string representing a number in fixed point notation.
- */
-export const toFixed = (value, fractionDigits = 0) => {
- return Number(value).toFixed(fractionDigits);
-};
diff --git a/tgui-next/packages/tgui/backend.js b/tgui-next/packages/tgui/backend.js
deleted file mode 100644
index cdaf89fc6..000000000
--- a/tgui-next/packages/tgui/backend.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import { UI_DISABLED, UI_INTERACTIVE } from './constants';
-import { tridentVersion, act as _act } from './byond';
-
-/**
- * This file provides a clear separation layer between backend updates
- * and what state our React app sees.
- *
- * Sometimes backend can response without a "data" field, but our final
- * state will still contain previous "data" because we are merging
- * the response with already existing state.
- */
-
-/**
- * Creates a backend update action.
- */
-export const backendUpdate = state => ({
- type: 'backendUpdate',
- payload: state,
-});
-
-/**
- * Precisely defines state changes.
- */
-export const backendReducer = (state, action) => {
- const { type, payload } = action;
-
- if (type === 'backendUpdate') {
- // Merge config
- const config = {
- ...state.config,
- ...payload.config,
- };
- // Merge data
- const data = {
- ...state.data,
- ...payload.static_data,
- ...payload.data,
- };
- // Calculate our own fields
- const visible = config.status !== UI_DISABLED;
- const interactive = config.status === UI_INTERACTIVE;
- // Return new state
- return {
- ...state,
- config,
- data,
- visible,
- interactive,
- };
- }
-
- return state;
-};
-
-/**
- * @typedef BackendState
- * @type {{
- * config: {
- * title: string,
- * status: number,
- * screen: string,
- * style: string,
- * interface: string,
- * fancy: number,
- * locked: number,
- * observer: number,
- * window: string,
- * ref: string,
- * },
- * data: any,
- * visible: boolean,
- * interactive: boolean,
- * }}
- */
-
-/**
- * A React hook (sort of) for getting tgui state and related functions.
- *
- * This is supposed to be replaced with a real React Hook, which can only
- * be used in functional components. DO NOT use it in class-based components!
- *
- * @return {BackendState & {
- * act: (action: string, params?: object) => void,
- * }}
- */
-export const useBackend = props => {
- // TODO: Dispatch "act" calls as Redux actions
- const { state, dispatch } = props;
- const ref = state.config.ref;
- const act = (action, params = {}) => _act(ref, action, params);
- return {
- ...state,
- act,
- };
-};
diff --git a/tgui-next/packages/tgui/byond.js b/tgui-next/packages/tgui/byond.js
deleted file mode 100644
index 2b7d3ff77..000000000
--- a/tgui-next/packages/tgui/byond.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import { buildQueryString } from 'common/string';
-
-/**
- * Version of Trident engine used in Internet Explorer.
- *
- * - IE 8 - Trident 4.0
- * - IE 11 - Trident 7.0
- *
- * @return An integer number or 'null' if this is not a trident engine.
- */
-export const tridentVersion = (() => {
- const { userAgent } = navigator;
- const groups = userAgent.match(/Trident\/(\d+).+?;/i);
- const majorVersion = groups[1];
- if (!majorVersion) {
- return null;
- }
- return parseInt(majorVersion, 10);
-})();
-
-/**
- * Helper to generate a BYOND href given 'params' as an object
- * (with an optional 'url' for eg winset).
- */
-const href = (url, params = {}) => {
- return 'byond://' + url + '?' + buildQueryString(params);
-};
-
-export const callByond = (url, params = {}) => {
- window.location.href = href(url, params);
-};
-
-/**
- * A high-level abstraction of BYJAX. Makes a call to BYOND and returns
- * a promise, which (if endpoint has a callback parameter) resolves
- * with the return value of that call.
- */
-export const callByondAsync = (url, params = {}) => {
- // Create a callback array if it doesn't exist yet
- window.__callbacks__ = window.__callbacks__ || [];
- // Create a Promise and push its resolve function into callback array
- const callbackIndex = window.__callbacks__.length;
- const promise = new Promise(resolve => {
- // TODO: Fix a potential memory leak
- window.__callbacks__.push(resolve);
- });
- // Call BYOND client
- window.location.href = href(url, {
- ...params,
- callback: `__callbacks__[${callbackIndex}]`,
- });
- return promise;
-};
-
-/**
- * Literally types a command on the client.
- */
-export const runCommand = command => callByond('winset', { command });
-
-/**
- * Helper to make a BYOND ui_act() call on the UI 'src' given an 'action'
- * and optional 'params'.
- */
-export const act = (src, action, params = {}) => {
- return callByond('', { src, action, ...params });
-};
-
-/**
- * Calls 'winget' on window, retrieving value by the 'key'.
- */
-export const winget = async (win, key) => {
- const obj = await callByondAsync('winget', {
- id: win,
- property: key,
- });
- return obj[key];
-};
-
-/**
- * Calls 'winset' on window, setting 'key' to 'value'.
- */
-export const winset = (win, key, value) => callByond('winset', {
- [`${win}.${key}`]: value,
-});
diff --git a/tgui-next/packages/tgui/components/ColorBox.js b/tgui-next/packages/tgui/components/ColorBox.js
deleted file mode 100644
index 0bfe368d8..000000000
--- a/tgui-next/packages/tgui/components/ColorBox.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { classes, pureComponentHooks } from 'common/react';
-import { Box } from './Box';
-
-export const ColorBox = props => {
- const { color, content, className, ...rest } = props;
- return (
-
- );
-};
-
-ColorBox.defaultHooks = pureComponentHooks;
diff --git a/tgui-next/packages/tgui/components/Dimmer.js b/tgui-next/packages/tgui/components/Dimmer.js
deleted file mode 100644
index 9d3ead054..000000000
--- a/tgui-next/packages/tgui/components/Dimmer.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Box } from './Box';
-
-export const Dimmer = props => {
- const { style, ...rest } = props;
- return (
-
- );
-};
diff --git a/tgui-next/packages/tgui/components/ProgressBar.js b/tgui-next/packages/tgui/components/ProgressBar.js
deleted file mode 100644
index e58bfa386..000000000
--- a/tgui-next/packages/tgui/components/ProgressBar.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import { classes, pureComponentHooks } from 'common/react';
-import { clamp, toFixed } from 'common/math';
-
-export const ProgressBar = props => {
- const {
- value,
- minValue = 0,
- maxValue = 1,
- ranges = {},
- content,
- children,
- } = props;
- const scaledValue = (value - minValue) / (maxValue - minValue);
- const hasContent = content !== undefined || children !== undefined;
- let { color } = props;
- // Cycle through ranges in key order to determine progressbar color.
- if (!color) {
- for (let rangeName of Object.keys(ranges)) {
- const range = ranges[rangeName];
- if (range && value >= range[0] && value <= range[1]) {
- color = rangeName;
- break;
- }
- }
- }
- // Default color
- if (!color) {
- color = 'default';
- }
- return (
-