diff --git a/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm b/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm
index 3dfe677de53..e1e727317a7 100644
--- a/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm
@@ -26,8 +26,8 @@
density = 1
anchored = 0
- ul_Red = 5
- ul_Green = 6
+ LuminosityRed = 4
+ LuminosityGreen = 6
var/gasefficency = 0.25
diff --git a/code/WorkInProgress/Chinsky/ashtray.dm b/code/WorkInProgress/Chinsky/ashtray.dm
index 2313ef30016..26e5aef661d 100644
--- a/code/WorkInProgress/Chinsky/ashtray.dm
+++ b/code/WorkInProgress/Chinsky/ashtray.dm
@@ -33,8 +33,9 @@
else if (cig.lit == 0)
user << "You place a [cig] in [src] without even smoking it. Why would you do that?"
else if (cig.lit == -1)
- src.visible_message("[user] places a [cig] in the [src],.")
- user.update_clothing()
+ src.visible_message("[user] places a [cig] in the [src].")
+ user.update_inv_l_hand()
+ user.update_inv_r_hand()
add_fingerprint(user)
if (contents.len == max_butts)
icon_state = icon_full
diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm
index a34834f8c26..88ff6550e5f 100644
--- a/code/ZAS/Airflow.dm
+++ b/code/ZAS/Airflow.dm
@@ -410,4 +410,36 @@ zone/proc/movables()
//skytodo: add check for ai eye, tg seems to have done away with it
if(istype(A, /obj/effect))
continue
- . += A
\ No newline at end of file
+ . += A
+
+// MOVED HERE FROM ULTRALIGHT WHICH IS PROBABLY A BAD THING
+#define UL_I_FALLOFF_SQUARE 0
+#define UL_I_FALLOFF_ROUND 1
+#define ul_FalloffStyle UL_I_FALLOFF_ROUND // Sets the lighting falloff to be either squared or circular.
+var/list/ul_FastRoot = list(0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7)
+
+atom/proc/ul_FalloffAmount(var/atom/ref)
+ if (ul_FalloffStyle == UL_I_FALLOFF_ROUND)
+ var/delta_x = (ref.x - src.x)
+ var/delta_y = (ref.y - src.y)
+
+ #ifdef ul_LightingResolution
+ if (round((delta_x*delta_x + delta_y*delta_y)*ul_LightingResolutionSqrt,1) > ul_FastRoot.len)
+ for(var/i = ul_FastRoot.len, i <= round(delta_x*delta_x+delta_y*delta_y*ul_LightingResolutionSqrt,1), i++)
+ ul_FastRoot += round(sqrt(i))
+ return ul_FastRoot[round((delta_x*delta_x + delta_y*delta_y)*ul_LightingResolutionSqrt, 1) + 1]/ul_LightingResolution
+
+ #else
+ if ((delta_x*delta_x + delta_y*delta_y) > ul_FastRoot.len)
+ for(var/i = ul_FastRoot.len, i <= delta_x*delta_x+delta_y*delta_y, i++)
+ ul_FastRoot += round(sqrt(i))
+ return ul_FastRoot[delta_x*delta_x + delta_y*delta_y + 1]
+
+ #endif
+
+ else if (ul_FalloffStyle == UL_I_FALLOFF_SQUARE)
+ return get_dist(src, ref)
+
+ return 0
\ No newline at end of file
diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm
index 4acf7130a1e..5e9b93db0eb 100644
--- a/code/ZAS/Fire.dm
+++ b/code/ZAS/Fire.dm
@@ -126,16 +126,10 @@ obj
//Change icon depending on the fuel, and thus temperature.
if(firelevel > 6)
icon_state = "3"
- if(ul_Red != 11)
- ul_SetLuminosity(11,9,0)
else if(firelevel > 2.5)
icon_state = "2"
- if(ul_Red != 8)
- ul_SetLuminosity(8,7,0)
else
icon_state = "1"
- if(ul_Red != 5)
- ul_SetLuminosity(5,4,0)
//Ensure flow temperature is higher than minimum fire temperatures.
flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature)
@@ -168,7 +162,7 @@ obj
del src
dir = pick(cardinal)
- ul_SetLuminosity(3,2,0)
+ sd_SetLuminosity(3,2,0)
firelevel = fl
for(var/mob/living/carbon/human/M in loc)
M.FireBurn(min(max(0.1,firelevel / 20),10)) //Burn the humans!
@@ -176,7 +170,7 @@ obj
Del()
if (istype(loc, /turf/simulated))
- ul_SetLuminosity(0)
+ sd_SetLuminosity(0)
loc = null
air_master.active_hotspots.Remove(src)
diff --git a/code/access_defines.dm b/code/access_defines.dm
deleted file mode 100644
index ccab6629379..00000000000
--- a/code/access_defines.dm
+++ /dev/null
@@ -1,81 +0,0 @@
-#define ACCESS_SECURITY 1
-#define ACCESS_BRIG 2
-#define ACCESS_ARMORY 3
-#define ACCESS_FORENSICS_LOCKERS 4
-#define ACCESS_MEDICAL 5
-#define ACCESS_MORGUE 6
-#define ACCESS_TOX 7
-#define ACCESS_TOX_STORAGE 8
-#define ACCESS_GENETICS 9
-#define ACCESS_ENGINE 10
-#define ACCESS_ENGINE_EQUIP 11
-#define ACCESS_MAINT_TUNNELS 12
-#define ACCESS_EXTERNAL_AIRLOCKS 13
-#define ACCESS_EMERGENCY_STORAGE 14
-#define ACCESS_CHANGE_IDS 15
-#define ACCESS_AI_UPLOAD 16
-#define ACCESS_TELEPORTER 17
-#define ACCESS_EVA 18
-#define ACCESS_HEADS 19
-#define ACCESS_CAPTAIN 20
-#define ACCESS_ALL_PERSONAL_LOCKERS 21
-#define ACCESS_CHAPEL_OFFICE 22
-#define ACCESS_TECH_STORAGE 23
-#define ACCESS_ATMOSPHERICS 24
-#define ACCESS_BAR 25
-#define ACCESS_JANITOR 26
-#define ACCESS_CREMATORIUM 27
-#define ACCESS_KITCHEN 28
-#define ACCESS_ROBOTICS 29
-#define ACCESS_RD 30
-#define ACCESS_CARGO 31
-#define ACCESS_CONSTRUCTION 32
-#define ACCESS_CHEMISTRY 33
-#define ACCESS_CARGO_BOT 34
-#define ACCESS_HYDROPONICS 35
-#define ACCESS_MANUFACTURING 36
-#define ACCESS_LIBRARY 37
-#define ACCESS_LAWYER 38
-#define ACCESS_VIROLOGY 39
-#define ACCESS_CMO 40
-#define ACCESS_QM 41
-#define ACCESS_COURT 42
-#define ACCESS_CLOWN 43
-#define ACCESS_MIME 44
-#define ACCESS_SURGERY 45
-#define ACCESS_THEATRE 46
-#define ACCESS_RESEARCH 47
-#define ACCESS_MINING 48
-#define ACCESS_MINING_OFFICE 49 //not in use
-#define ACCESS_MAILSORTING 50
-#define ACCESS_MINT 51
-#define ACCESS_MINT_VAULT 52
-#define ACCESS_HEADS_VAULT 53
-#define ACCESS_MINING_STATION 54
-#define ACCESS_XENOBIOLOGY 55
-#define ACCESS_CE 56
-#define ACCESS_HOP 57
-#define ACCESS_HOS 58
-#define ACCESS_RC_ANNOUNCE 59 //Request console announcements
-#define ACCESS_KEYCARD_AUTH 60 //Used for events which require at least two people to confirm them
-#define ACCESS_TCOMSAT 61 // has access to the entire telecomms satellite / machinery
-#define ACCESS_ANOMALY 62 //in case of future job separation from scientist
-
- //BEGIN CENTCOM ACCESS
- /*Should leave plenty of room if we need to add more access levels.
- Mostly for admin fun times.*/
-#define ACCESS_CENT_GENERAL 101//General facilities.
-#define ACCESS_CENT_THUNDER 102//Thunderdome.
-#define ACCESS_CENT_SPECOPS 103//Special Ops.
-#define ACCESS_CENT_MEDICAL 104//Medical/Research
-#define ACCESS_CENT_LIVING 105//Living quarters.
-#define ACCESS_CENT_STORAGE 106//Generic storage areas.
-#define ACCESS_CENT_TELEPORTER 107//Teleporter.
-#define ACCESS_CENT_CREED 108//Creed's office.
-#define ACCESS_CENT_CAPTAIN 109//Captain's office/ID comp/AI.
-
- //The Syndicate
-#define ACCESS_SYNDICATE 150//General Syndicate Access
-
- //MONEY
-#define ACCESS_CRATE_CASH 200
\ No newline at end of file
diff --git a/code/defines/mob/living/carbon/monkey.dm b/code/defines/mob/living/carbon/monkey.dm
deleted file mode 100644
index c937afdac94..00000000000
--- a/code/defines/mob/living/carbon/monkey.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-/mob/living/carbon/monkey
- name = "monkey"
- voice_name = "monkey"
- voice_message = "chimpers"
- say_message = "chimpers"
- icon = 'icons/mob/monkey.dmi'
- icon_state = "monkey1"
- gender = NEUTER
- pass_flags = PASSTABLE
- update_icon = 0 ///no need to call regenerate_icon
-
- var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie
-
-/mob/living/carbon/monkey/rpbody // For admin RP
- update_icon = 0
- voice_message = "says"
- say_message = "says"
diff --git a/code/defines/obj/clothing.dm b/code/defines/obj/clothing.dm
deleted file mode 100644
index d41b065923c..00000000000
--- a/code/defines/obj/clothing.dm
+++ /dev/null
@@ -1,22 +0,0 @@
-// All currently in-game clothing. Gimmicks moved to obj\clothing\gimmick.dm for all of your gay fantasy roleplay dress-up shenanigans.
-
-/obj/item/clothing
- name = "clothing"
-// var/obj/item/clothing/master = null
-
-
-
-
-
-
-
-
-// Belt slot clothing (only suspenders for now, because utility belt is a storage item)
-/*
-/obj/item/clothing/belt
- name = "belt"
-
- flags = FPRINT | TABLEPASS
- slot_flags = SLOT_BELT
-*/
-
diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm
deleted file mode 100644
index 4a98af539f1..00000000000
--- a/code/defines/obj/computer.dm
+++ /dev/null
@@ -1,154 +0,0 @@
-/obj/machinery/computer
- name = "computer"
- icon = 'computer.dmi'
- density = 1
- anchored = 1.0
- var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassemble
-
-
-/obj/machinery/computer/station_alert
- name = "Station Alert Computer"
- desc = "Used to access the station's automated alert system."
- icon_state = "alert:0"
- circuit = "/obj/item/weapon/circuitboard/stationalert"
- var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list())
-
-
-/obj/machinery/computer/atmosphere
- name = "atmos"
- desc = "A computer for Atmospherics."
-
-
-/obj/machinery/computer/atmosphere/siphonswitch
- name = "Area Air Control"
- desc = "NanoTrasen provided this, barely."
- icon_state = "atmos"
- var/otherarea
- var/area/area
-
-
-/obj/machinery/computer/atmosphere/siphonswitch/mastersiphonswitch
- name = "Master Air Control"
- desc = "Emergancy global overrides for the entire atmospherics system."
-
-/obj/machinery/computer/dna
- name = "DNA operations computer"
- desc = "A computer used for advanced DNA operations."
- icon_state = "dna"
- var/obj/item/weapon/card/data/scan = null
- var/obj/item/weapon/card/data/modify = null
- var/obj/item/weapon/card/data/modify2 = null
- var/mode = null
- var/temp = null
-
-
-/obj/machinery/computer/security
- name = "Security Cameras"
- desc = "Used to access the various cameras on the station."
- icon_state = "cameras"
- circuit = "/obj/item/weapon/circuitboard/securitycam"
- var/department = "Security"
- var/network = ""
- var/obj/machinery/camera/current = null
- var/last_pic = 1.0
- var/list/networks
- var/maplevel = 1
-
-/obj/machinery/computer/security/mining
- name = "Outpost Cameras"
- desc = "Used to access the various cameras on the outpost."
- icon_state = "miningcameras"
- department = "Mining"
- circuit = "/obj/item/weapon/circuitboard/miningcam"
-
-/obj/machinery/computer/security/cargo
- name = "Cargo Cameras"
- desc = "Used to access the cargo department cameras."
- icon_state = "miningcameras"
- department = "Cargo"
- circuit = "/obj/item/weapon/circuitboard/cargocam"
-
-/obj/machinery/computer/security/engineering
- name = "Engineering Cameras"
- desc = "Used to access the various cameras in engineering."
- icon_state = "engineeringcameras"
- department = "Engineering"
- circuit = "/obj/item/weapon/circuitboard/engineeringcam"
-
-/obj/machinery/computer/security/research
- name = "Research Cameras"
- desc = "Used to access the various cameras in the research division."
- icon_state = "researchcameras"
- department = "Research"
- circuit = "/obj/item/weapon/circuitboard/researchcam"
-
-/obj/machinery/computer/security/medbay
- name = "Medbay Cameras"
- desc = "Used to access the various cameras in the research division."
- icon_state = "medbaycameras"
- department = "Medbay"
- circuit = "/obj/item/weapon/circuitboard/medbaycam"
-
-
-/obj/machinery/computer/security/telescreen
- name = "Telescreen"
- desc = "Used for watching an empty arena."
- icon = 'stationobjs.dmi'
- icon_state = "telescreen"
- department = ""
- network = "Thunderdome"
- density = 0
- circuit = null
-
-
-/obj/machinery/computer/security/wooden_tv
- name = "Security Cameras"
- desc = "An old TV hooked into the stations camera network."
- icon_state = "security_det"
-
-/obj/machinery/computer/lockdown
- name = "Lockdown Control"
- desc = "Used to control blast doors."
- icon_state = "lockdown"
- circuit = "/obj/item/weapon/circuitboard/lockdown"
- var/list/connected_doors
- var/department //each department has a hardcoded list of possible door networks
-
-
-/*/obj/machinery/computer/scan_consolenew //Coming Soon, I highly doubt this but Ill leave it here anyways
- name = "DNA Modifier Access Console"
- desc = "Scand DNA."
- icon = 'computer.dmi'
- icon_state = "scanner"
- density = 1
- var/uniblock = 1.0
- var/strucblock = 1.0
- var/subblock = 1.0
- var/status = null
- var/radduration = 2.0
- var/radstrength = 1.0
- var/radacc = 1.0
- var/buffer1 = null
- var/buffer2 = null
- var/buffer3 = null
- var/buffer1owner = null
- var/buffer2owner = null
- var/buffer3owner = null
- var/buffer1label = null
- var/buffer2label = null
- var/buffer3label = null
- var/buffer1type = null
- var/buffer2type = null
- var/buffer3type = null
- var/buffer1iue = 0
- var/buffer2iue = 0
- var/buffer3iue = 0
- var/delete = 0
- var/injectorready = 1
- var/temphtml = null
- var/obj/machinery/dna_scanner/connected = null
- var/obj/item/weapon/disk/data/diskette = null
- anchored = 1.0
- use_power = 1
- idle_power_usage = 10
- active_power_usage = 400 */
diff --git a/code/defines/obj/door.dm b/code/defines/obj/door.dm
index b7377488fbc..355cfeda644 100644
--- a/code/defines/obj/door.dm
+++ b/code/defines/obj/door.dm
@@ -52,8 +52,8 @@
f2 = new/obj/machinery/door/poddoor/filler_object (get_step(src,EAST))
f1.density = density
f2.density = density
- f1.ul_SetOpacity(opacity)
- f2.ul_SetOpacity(opacity)
+ f1.sd_SetOpacity(opacity)
+ f2.sd_SetOpacity(opacity)
Del()
del f1
@@ -71,8 +71,8 @@
f2 = new/obj/machinery/door/poddoor/filler_object (get_step(src,NORTH))
f1.density = density
f2.density = density
- f1.ul_SetOpacity(opacity)
- f2.ul_SetOpacity(opacity)
+ f1.sd_SetOpacity(opacity)
+ f2.sd_SetOpacity(opacity)
Del()
del f1
@@ -96,10 +96,10 @@
f2.density = density
f3.density = density
f4.density = density
- f1.ul_SetOpacity(opacity)
- f2.ul_SetOpacity(opacity)
- f4.ul_SetOpacity(opacity)
- f3.ul_SetOpacity(opacity)
+ f1.sd_SetOpacity(opacity)
+ f2.sd_SetOpacity(opacity)
+ f4.sd_SetOpacity(opacity)
+ f3.sd_SetOpacity(opacity)
Del()
del f1
@@ -125,10 +125,10 @@
f2.density = density
f3.density = density
f4.density = density
- f1.ul_SetOpacity(opacity)
- f2.ul_SetOpacity(opacity)
- f4.ul_SetOpacity(opacity)
- f3.ul_SetOpacity(opacity)
+ f1.sd_SetOpacity(opacity)
+ f2.sd_SetOpacity(opacity)
+ f4.sd_SetOpacity(opacity)
+ f3.sd_SetOpacity(opacity)
Del()
del f1
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 4f68d9a5ef5..8e5736541e1 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -293,6 +293,7 @@ Release Pressure: - - - - - -