")
+ text = replacetext(text, "\[time\]", "[gameTimestamp()]") // TO DO
if(P)
text = "[text]"
else
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 4b71a2c7162..e4d834a35a0 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -69,4 +69,100 @@ proc/isDay(var/month, var/day)
/proc/seconds_to_time(var/seconds as num)
var/numSeconds = seconds % 60
var/numMinutes = (seconds - numSeconds) / 60
- return "[numMinutes] [numMinutes > 1 ? "minutes" : "minute"] and [numSeconds] seconds."
\ No newline at end of file
+ return "[numMinutes] [numMinutes > 1 ? "minutes" : "minute"] and [numSeconds] seconds."
+
+//Takes a value of time in deciseconds.
+//Returns a text value of that number in hours, minutes, or seconds.
+/proc/DisplayTimeText(time_value)
+ var/second = time_value * 0.1
+ var/second_adjusted = null
+ var/second_rounded = FALSE
+ var/minute = null
+ var/hour = null
+ var/day = null
+
+ if(!second)
+ return "0 seconds"
+ if(second >= 60)
+ minute = round_down(second / 60)
+ second = round(second - (minute * 60), 0.1)
+ second_rounded = TRUE
+ if(second) //check if we still have seconds remaining to format, or if everything went into minute.
+ second_adjusted = round(second) //used to prevent '1 seconds' being shown
+ if(day || hour || minute)
+ if(second_adjusted == 1 && second >= 1)
+ second = " and 1 second"
+ else if(second > 1)
+ second = " and [second_adjusted] seconds"
+ else //shows a fraction if seconds is < 1
+ if(second_rounded) //no sense rounding again if it's already done
+ second = " and [second] seconds"
+ else
+ second = " and [round(second, 0.1)] seconds"
+ else
+ if(second_adjusted == 1 && second >= 1)
+ second = "1 second"
+ else if(second > 1)
+ second = "[second_adjusted] seconds"
+ else
+ if(second_rounded)
+ second = "[second] seconds"
+ else
+ second = "[round(second, 0.1)] seconds"
+ else
+ second = null
+
+ if(!minute)
+ return "[second]"
+ if(minute >= 60)
+ hour = round_down(minute / 60,1)
+ minute = (minute - (hour * 60))
+ if(minute) //alot simpler from here since you don't have to worry about fractions
+ if(minute != 1)
+ if((day || hour) && second)
+ minute = ", [minute] minutes"
+ else if((day || hour) && !second)
+ minute = " and [minute] minutes"
+ else
+ minute = "[minute] minutes"
+ else
+ if((day || hour) && second)
+ minute = ", 1 minute"
+ else if((day || hour) && !second)
+ minute = " and 1 minute"
+ else
+ minute = "1 minute"
+ else
+ minute = null
+
+ if(!hour)
+ return "[minute][second]"
+ if(hour >= 24)
+ day = round_down(hour / 24,1)
+ hour = (hour - (day * 24))
+ if(hour)
+ if(hour != 1)
+ if(day && (minute || second))
+ hour = ", [hour] hours"
+ else if(day && (!minute || !second))
+ hour = " and [hour] hours"
+ else
+ hour = "[hour] hours"
+ else
+ if(day && (minute || second))
+ hour = ", 1 hour"
+ else if(day && (!minute || !second))
+ hour = " and 1 hour"
+ else
+ hour = "1 hour"
+ else
+ hour = null
+
+ if(!day)
+ return "[hour][minute][second]"
+ if(day > 1)
+ day = "[day] days"
+ else
+ day = "1 day"
+
+ return "[day][hour][minute][second]"
\ No newline at end of file
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index c09a99c1d2a..f106d579e94 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1906,3 +1906,11 @@ var/mob/dview/dview_mob = new
shift = list("x" = -amount_x, "y" = -amount_y)
return shift
+
+//Return a list of atoms in a location of a given type. Can be refined to look for pixel-shift.
+/proc/get_atoms_of_type(var/atom/here, var/type, var/check_shift, var/shift_x = 0, var/shift_y = 0)
+ . = list()
+ if(here)
+ for(var/atom/thing in here)
+ if(istype(thing, type) && (check_shift && thing.pixel_x == shift_x && thing.pixel_y == shift_y))
+ . += thing
diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm
index 88d4594e740..d26dc711339 100644
--- a/code/_globalvars/configuration.dm
+++ b/code/_globalvars/configuration.dm
@@ -2,7 +2,6 @@ var/datum/configuration/config = null
var/host = null
var/join_motd = null
-var/station_name = "NSS Cyberiad"
var/game_version = "Custom ParaCode"
var/changelog_hash = md5('html/changelog.html') //used to check if the CL changed
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index 644740c9e20..28ebfca6b1b 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -25,6 +25,7 @@ var/global/list/respawnable_list = list() //List of all mobs, dead or in mindl
var/global/list/non_respawnable_keys = list() //List of ckeys that are excluded from respawning for remainder of round.
var/global/list/simple_animal_list = list() //List of all simple animals, including clientless
var/global/list/snpc_list = list() //List of all snpc's, including clientless
+var/global/list/bots_list = list() //List of all bots(beepsky, medibots,etc)
var/global/list/med_hud_users = list()
var/global/list/sec_hud_users = list()
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 7125eeec282..1e95c7b8977 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -68,6 +68,7 @@
var/assistantratio = 2 //how many assistants to security members
var/traitor_objectives_amount = 2
+ var/shadowling_max_age = 0
var/max_maint_drones = 5 //This many drones can spawn,
var/allow_drone_spawn = 1 //assuming the admin allow them to.
@@ -260,6 +261,9 @@
if("jobs_have_minimal_access")
config.jobs_have_minimal_access = 1
+ if("shadowling_max_age")
+ config.shadowling_max_age = text2num(value)
+
if("log_ooc")
config.log_ooc = 1
diff --git a/code/datums/cargoprofile.dm b/code/datums/cargoprofile.dm
index 4636495489f..310593d0d6b 100644
--- a/code/datums/cargoprofile.dm
+++ b/code/datums/cargoprofile.dm
@@ -1,4 +1,3 @@
-#define MAXCOIL 30
/datum/cargoprofile
var/name = "All Items"
var/id = "all" // unique ID for the UI
@@ -787,4 +786,3 @@
var/punches = punch(M,remaining / PUNCH_WORK)
if(punches>1)master.sleep++
return punches * PUNCH_WORK
-#undef MAXCOIL
diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index c29b5daf5b3..04ebcc68ed5 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -1,4 +1,5 @@
/* HUD DATUMS */
+var/global/list/all_huds = list()
///GLOBAL HUD LIST
var/datum/atom_hud/huds = list( \
@@ -7,6 +8,7 @@ var/datum/atom_hud/huds = list( \
DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(), \
DATA_HUD_MEDICAL_ADVANCED = new/datum/atom_hud/data/human/medical/advanced(), \
DATA_HUD_DIAGNOSTIC = new/datum/atom_hud/data/diagnostic(), \
+ DATA_HUD_DIAGNOSTIC_ADVANCED = new/datum/atom_hud/data/diagnostic/advanced(), \
DATA_HUD_HYDROPONIC = new/datum/atom_hud/data/hydroponic(), \
GAME_HUD_NATIONS = new/datum/atom_hud/antag(), \
ANTAG_HUD_CULT = new/datum/atom_hud/antag(), \
@@ -26,6 +28,18 @@ var/datum/atom_hud/huds = list( \
var/list/mob/hudusers = list() //list with all mobs who can see the hud
var/list/hud_icons = list() //these will be the indexes for the atom's hud_list
+
+/datum/atom_hud/New()
+ all_huds += src
+
+/datum/atom_hud/Destroy()
+ for(var/v in hudusers)
+ remove_hud_from(v)
+ for(var/v in hudatoms)
+ remove_from_hud(v)
+ all_huds -= src
+ return ..()
+
/datum/atom_hud/proc/remove_hud_from(mob/M)
if(!M)
return
@@ -82,7 +96,7 @@ var/datum/atom_hud/huds = list( \
serv_huds += serv.thrallhud
- for(var/datum/atom_hud/hud in (huds|serv_huds))//|gang_huds))
+ for(var/datum/atom_hud/hud in (all_huds|serv_huds))//|gang_huds))
if(src in hud.hudusers)
hud.add_hud_to(src)
diff --git a/code/datums/material_container.dm b/code/datums/material_container.dm
index 2ae6da75863..8e31e8ae033 100644
--- a/code/datums/material_container.dm
+++ b/code/datums/material_container.dm
@@ -40,6 +40,8 @@
materials[MAT_BANANIUM] = new /datum/material/bananium()
if(mat_list[MAT_TRANQUILLITE])
materials[MAT_TRANQUILLITE] = new /datum/material/tranquillite()
+ if(mat_list[MAT_TITANIUM])
+ materials[MAT_TITANIUM] = new /datum/material/titanium()
/datum/material_container/Destroy()
QDEL_LIST_ASSOC_VAL(materials)
@@ -276,6 +278,13 @@
material_type = MAT_TRANQUILLITE
sheet_type = /obj/item/stack/sheet/mineral/tranquillite
+/datum/material/titanium
+
+/datum/material/titanium/New()
+ ..()
+ material_type = MAT_TITANIUM
+ sheet_type = /obj/item/stack/sheet/mineral/titanium
+
/datum/material/biomass
/datum/material/biomass/New()
diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm
new file mode 100644
index 00000000000..ea94aa6407b
--- /dev/null
+++ b/code/datums/mutable_appearance.dm
@@ -0,0 +1,13 @@
+// Mutable appearances are an inbuilt byond datastructure. Read the documentation on them by hitting F1 in DM.
+// Basically use them instead of images for overlays/underlays and when changing an object's appearance if you're doing so with any regularity.
+// Unless you need the overlay/underlay to have a different direction than the base object. Then you have to use an image due to a bug.
+
+// Mutable appearances are children of images, just so you know.
+
+// Helper similar to image()
+/proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER)
+ var/mutable_appearance/MA = new()
+ MA.icon = icon
+ MA.icon_state = icon_state
+ MA.layer = layer
+ return MA
\ No newline at end of file
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
new file mode 100644
index 00000000000..26d8ec67ef0
--- /dev/null
+++ b/code/datums/status_effects/buffs.dm
@@ -0,0 +1,41 @@
+//Largely beneficial effects go here, even if they have drawbacks. An example is provided in Shadow Mend.
+
+/datum/status_effect/shadow_mend
+ id = "shadow_mend"
+ duration = 30
+ alert_type = /obj/screen/alert/status_effect/shadow_mend
+
+/obj/screen/alert/status_effect/shadow_mend
+ name = "Shadow Mend"
+ desc = "Shadowy energies wrap around your wounds, sealing them at a price. After healing, you will slowly lose health every three seconds for thirty seconds."
+ icon_state = "shadow_mend"
+
+/datum/status_effect/shadow_mend/on_apply()
+ owner.visible_message("Violet light wraps around [owner]'s body!", "Violet light wraps around your body!")
+ playsound(owner, 'sound/magic/teleport_app.ogg', 50, 1)
+ return ..()
+
+/datum/status_effect/shadow_mend/tick()
+ owner.adjustBruteLoss(-15)
+ owner.adjustFireLoss(-15)
+
+/datum/status_effect/shadow_mend/on_remove()
+ owner.visible_message("The violet light around [owner] glows black!", "The tendrils around you cinch tightly and reap their toll...")
+ playsound(owner, 'sound/magic/teleport_diss.ogg', 50, 1)
+ owner.apply_status_effect(STATUS_EFFECT_VOID_PRICE)
+
+
+/datum/status_effect/void_price
+ id = "void_price"
+ duration = 300
+ tick_interval = 30
+ alert_type = /obj/screen/alert/status_effect/void_price
+
+/obj/screen/alert/status_effect/void_price
+ name = "Void Price"
+ desc = "Black tendrils cinch tightly against you, digging wicked barbs into your flesh."
+ icon_state = "shadow_mend"
+
+/datum/status_effect/void_price/tick()
+ playsound(owner, 'sound/weapons/bite.ogg', 50, 1)
+ owner.adjustBruteLoss(3)
\ No newline at end of file
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
new file mode 100644
index 00000000000..cfafa912b64
--- /dev/null
+++ b/code/datums/status_effects/debuffs.dm
@@ -0,0 +1,10 @@
+//OTHER DEBUFFS
+
+/datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
+ id = "cult_ghost"
+ duration = -1
+ alert_type = null
+
+/datum/status_effect/cultghost/tick()
+ if(owner.reagents)
+ owner.reagents.del_reagent("holywater") //can't be deconverted
\ No newline at end of file
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
new file mode 100644
index 00000000000..b82fc629eef
--- /dev/null
+++ b/code/datums/status_effects/neutral.dm
@@ -0,0 +1,9 @@
+//entirely neutral or internal status effects go here
+
+/datum/status_effect/high_five
+ id = "high_five"
+ duration = 25
+ alert_type = null
+
+/datum/status_effect/high_five/on_timeout()
+ owner.visible_message("[owner] was left hanging....")
\ No newline at end of file
diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm
new file mode 100644
index 00000000000..86590c613d2
--- /dev/null
+++ b/code/datums/status_effects/status_effect.dm
@@ -0,0 +1,120 @@
+
+//Status effects are used to apply temporary or permanent effects to mobs. Mobs are aware of their status effects at all times.
+//This file contains their code, plus code for applying and removing them.
+//When making a new status effect, add a define to status_effects.dm in __DEFINES for ease of use!
+
+/datum/status_effect
+ var/id = "effect" //Used for screen alerts.
+ var/duration = -1 //How long the status effect lasts in DECISECONDS. Enter -1 for an effect that never ends unless removed through some means.
+ var/tick_interval = 10 //How many deciseconds between ticks, approximately. Leave at 10 for every second.
+ var/mob/living/owner //The mob affected by the status effect.
+ var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another
+ var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
+ var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves
+ var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description
+ var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists
+
+/datum/status_effect/New(list/arguments)
+ on_creation(arglist(arguments))
+
+/datum/status_effect/proc/on_creation(mob/living/new_owner, ...)
+ if(new_owner)
+ owner = new_owner
+ if(owner)
+ LAZYADD(owner.status_effects, src)
+ if(!owner || !on_apply())
+ qdel(src)
+ return
+ if(duration != -1)
+ duration = world.time + duration
+ tick_interval = world.time + tick_interval
+ if(alert_type)
+ var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
+ A.attached_effect = src //so the alert can reference us, if it needs to
+ linked_alert = A //so we can reference the alert, if we need to
+ fast_processing.Add(src)
+ return TRUE
+
+/datum/status_effect/Destroy()
+ fast_processing.Remove(src)
+ if(owner)
+ owner.clear_alert(id)
+ LAZYREMOVE(owner.status_effects, src)
+ on_remove()
+ owner = null
+ return ..()
+
+/datum/status_effect/proc/process()
+ if(!owner)
+ qdel(src)
+ return
+ if(tick_interval < world.time)
+ tick()
+ tick_interval = world.time + initial(tick_interval)
+ if(duration != -1 && duration < world.time)
+ on_timeout()
+ qdel(src)
+
+/datum/status_effect/proc/on_apply() //Called whenever the buff is applied; returning FALSE will cause it to autoremove itself.
+ return TRUE
+/datum/status_effect/proc/tick() //Called every tick.
+/datum/status_effect/proc/on_timeout()//called when a buff times out
+/datum/status_effect/proc/on_remove() //Called whenever the buff expires or is removed; do note that at the point this is called, it is out of the owner's status_effects but owner is not yet null
+/datum/status_effect/proc/be_replaced() //Called instead of on_remove when a status effect is replaced by itself or when a status effect with on_remove_on_mob_delete = FALSE has its mob deleted
+ owner.clear_alert(id)
+ LAZYREMOVE(owner.status_effects, src)
+ owner = null
+ qdel(src)
+
+////////////////
+// ALERT HOOK //
+////////////////
+
+/obj/screen/alert/status_effect
+ name = "Curse of Mundanity"
+ desc = "You don't feel any different..."
+ var/datum/status_effect/attached_effect
+
+//////////////////
+// HELPER PROCS //
+//////////////////
+
+/mob/living/proc/apply_status_effect(effect, ...) //applies a given status effect to this mob, returning the effect if it was successful
+ . = FALSE
+ var/datum/status_effect/S1 = effect
+ LAZYINITLIST(status_effects)
+ for(var/datum/status_effect/S in status_effects)
+ if(S.id == initial(S1.id) && S.status_type)
+ if(S.status_type == STATUS_EFFECT_REPLACE)
+ S.be_replaced()
+ else
+ return
+ var/list/arguments = args.Copy()
+ arguments[1] = src
+ S1 = new effect(arguments)
+ . = S1
+
+/mob/living/proc/remove_status_effect(effect) //removes all of a given status effect from this mob, returning TRUE if at least one was removed
+ . = FALSE
+ if(status_effects)
+ var/datum/status_effect/S1 = effect
+ for(var/datum/status_effect/S in status_effects)
+ if(initial(S1.id) == S.id)
+ qdel(S)
+ . = TRUE
+
+/mob/living/proc/has_status_effect(effect) //returns the effect if the mob calling the proc owns the given status effect
+ . = FALSE
+ if(status_effects)
+ var/datum/status_effect/S1 = effect
+ for(var/datum/status_effect/S in status_effects)
+ if(initial(S1.id) == S.id)
+ return S
+
+/mob/living/proc/has_status_effect_list(effect) //returns a list of effects with matching IDs that the mod owns; use for effects there can be multiple of
+ . = list()
+ if(status_effects)
+ var/datum/status_effect/S1 = effect
+ for(var/datum/status_effect/S in status_effects)
+ if(initial(S1.id) == S.id)
+ . += S
\ No newline at end of file
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index b1b3a2732a1..ece19c01e88 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -58,7 +58,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 512
if(A.isElectrified())
if(A.shock(L, 100))
return 0
- if(A.p_open)
+ if(A.panel_open)
return 1
return 0
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index 02f2221b721..c28b91f26fc 100644
--- a/code/game/area/Space Station 13 areas.dm
+++ b/code/game/area/Space Station 13 areas.dm
@@ -61,6 +61,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
var/no_teleportlocs = 0
var/outdoors = 0 //For space, the asteroid, lavaland, etc. Used with blueprints to determine if we are adding a new area (vs editing a station room)
+ var/xenobiology_compatible = FALSE //Can the Xenobio management console transverse this area by default?
/*Adding a wizard area teleport list because motherfucking lag -- Urist*/
/*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
@@ -2102,6 +2103,7 @@ area/security/podbay
/area/toxins/xenobiology
name = "\improper Xenobiology Lab"
icon_state = "toxmix"
+ xenobiology_compatible = TRUE
/area/toxins/xenobiology/xenoflora_storage
name = "\improper Xenoflora Storage"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index f38a741b114..bf02fa02ed8 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -613,6 +613,10 @@ var/list/blood_splatter_icons = list()
/atom/proc/ratvar_act()
return
+//This proc is called on the location of an atom when the atom is Destroy()'d
+/atom/proc/handle_atom_del(atom/A)
+ return
+
/atom/proc/atom_say(message)
if(!message)
return
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 1ce51657e85..0e982a27288 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -36,6 +36,8 @@
attempt_init()
/atom/movable/Destroy()
+ if(loc)
+ loc.handle_atom_del(src)
for(var/atom/movable/AM in contents)
qdel(AM)
var/turf/un_opaque
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 604e92a47e0..7b6ada9364b 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -46,6 +46,12 @@
/datum/atom_hud/data/diagnostic
hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD)
+/datum/atom_hud/data/diagnostic/advanced
+ hud_icons = list (DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_PATH_HUD)
+
+/datum/atom_hud/data/bot_path
+ hud_icons = list(DIAG_PATH_HUD)
+
/datum/atom_hud/data/hydroponic
hud_icons = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD)
@@ -70,8 +76,15 @@
return 0
//helper for getting the appropriate health status UPDATED BY PUCKABOO2 TO INCLUDE NEGATIVES.
-/proc/RoundHealth(health)
- switch(health)
+/proc/RoundHealth(mob/living/M)
+ if(M.stat == DEAD || (M.status_flags & FAKEDEATH))
+ return "health-100" //what's our health? it doesn't matter, we're dead, or faking
+ var/maxi_health = M.maxHealth
+ if(iscarbon(M) && M.health < 0)
+ maxi_health = 100 //so crit shows up right for aliens and other high-health carbon mobs; noncarbons don't have crit.
+ var/resulthealth = (M.health / maxi_health) * 100
+
+ switch(resulthealth)
if(100 to INFINITY)
return "health100"
if(95 to 100)
@@ -120,6 +133,7 @@
return "health-100" //doc u had 1 job
return "0"
+
///HOOKS
//called when a human changes suit sensors
@@ -128,22 +142,26 @@
B.update_suit_sensors(src)
-//called when a carbon changes health
-/mob/living/carbon/proc/med_hud_set_health()
+//called when a living mob changes health
+/mob/living/proc/med_hud_set_health()
var/image/holder = hud_list[HEALTH_HUD]
- if(stat == 2)
- holder.icon_state = "hudhealth-100"
- else
- holder.icon_state = "hud[RoundHealth(health)]"
+ holder.icon_state = "hud[RoundHealth(src)]"
+
//called when a carbon changes stat, virus or XENO_HOST
-/mob/living/carbon/proc/med_hud_set_status()
+/mob/living/proc/med_hud_set_status()
var/image/holder = hud_list[STATUS_HUD]
- //var/image/holder2 = hud_list[STATUS_HUD_OOC]
- var/mob/living/simple_animal/borer/B = has_brain_worms()
- if(stat == 2)
+ if(stat == DEAD)
+ holder.icon_state = "huddead"
+ else
+ holder.icon_state = "hudhealthy"
+
+//called when a carbon changes stat, virus or XENO_HOST
+/mob/living/carbon/med_hud_set_status()
+ var/image/holder = hud_list[STATUS_HUD]
+ var/mob/living/simple_animal/borer/B = has_brain_worms()
+ if(stat == DEAD)
holder.icon_state = "huddead"
- //holder2.icon_state = "huddead"
else if(status_flags & XENO_HOST)
holder.icon_state = "hudxeno"
else if(check_virus())
@@ -152,7 +170,6 @@
holder.icon_state = "hudbrainworm"
else
holder.icon_state = "hudhealthy"
- //holder2.icon_state = "hudhealthy"
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 13e14ab5c3a..3649a2fb88f 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -495,6 +495,7 @@ var/list/teleport_runes = list()
message_admins("[key_name_admin(user)] tried to summonn an eldritch horror when the objective was wrong")
burn_invokers(invokers)
log_game("Summon Nar-Sie rune failed - improper objective")
+ return
if(!is_station_level(user.z))
message_admins("[key_name_admin(user)] tried to summon an eldritch horror off station")
burn_invokers(invokers)
@@ -608,6 +609,7 @@ var/list/teleport_runes = list()
new /mob/living/simple_animal/slaughter/cult(T, pick(NORTHEAST, SOUTHEAST, NORTHWEST, SOUTHWEST))
cult_mode.demons_summoned = 1
shuttle_master.emergency.request(null, 0.5,null)
+ shuttle_master.emergency.canRecall = FALSE
cult_mode.third_phase()
qdel(src)
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index eac7a2a8500..c8bc0e1e15e 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -601,3 +601,12 @@ Congratulations! You are now trained for invasive xenobiology research!"}
icon_closed = "abductor"
icon_opened = "abductoropen"
material_drop = /obj/item/stack/sheet/mineral/abductor
+
+/obj/structure/door_assembly/door_assembly_abductor
+ name = "alien airlock assembly"
+ icon = 'icons/obj/doors/airlocks/abductor/abductor_airlock.dmi'
+ base_name = "alien airlock"
+ overlays_file = 'icons/obj/doors/airlocks/abductor/overlays.dmi'
+ airlock_type = /obj/machinery/door/airlock/abductor
+ material_type = /obj/item/stack/sheet/mineral/abductor
+ noglass = TRUE
diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm
index 54bdaf1b9cf..ba7f91e2c37 100644
--- a/code/game/gamemodes/miniantags/borer/borer.dm
+++ b/code/game/gamemodes/miniantags/borer/borer.dm
@@ -115,6 +115,7 @@
/mob/living/simple_animal/borer/New(atom/newloc, var/gen=1)
..(newloc)
+ remove_from_all_data_huds()
generation = gen
add_language("Cortical Link")
notify_ghosts("A cortical borer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK)
diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
index d052939cb14..e80ba05eccb 100644
--- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
+++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
@@ -112,6 +112,7 @@
loot = list(/obj/effect/decal/cleanable/blood/gibs/robot, /obj/item/weapon/ore/bluespace_crystal/artificial)
deathmessage = "The swarmer explodes with a sharp pop!"
del_on_death = 1
+ hud_possible = list(SPECIALROLE_HUD, DIAG_STAT_HUD, DIAG_HUD)
/mob/living/simple_animal/hostile/swarmer/Login()
..()
@@ -127,8 +128,22 @@
..()
add_language("Swarmer", 1)
verbs -= /mob/living/verb/pulled
+ for(var/datum/atom_hud/data/diagnostic/diag_hud in huds)
+ diag_hud.add_to_hud(src)
updatename()
+/mob/living/simple_animal/hostile/swarmer/med_hud_set_health()
+ var/image/holder = hud_list[DIAG_HUD]
+ var/icon/I = icon(icon, icon_state, dir)
+ holder.pixel_y = I.Height() - world.icon_size
+ holder.icon_state = "huddiag[RoundDiagBar(health / maxHealth)]"
+
+/mob/living/simple_animal/hostile/swarmer/med_hud_set_status()
+ var/image/holder = hud_list[DIAG_STAT_HUD]
+ var/icon/I = icon(icon, icon_state, dir)
+ holder.pixel_y = I.Height() - world.icon_size
+ holder.icon_state = "hudstat"
+
/mob/living/simple_animal/hostile/swarmer/Stat()
..()
if(statpanel("Status"))
diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index 42003013441..89be0391463 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -41,6 +41,21 @@
var/adminseal = FALSE
var/name_color = "white"//only used with protector shields for the time being
+/mob/living/simple_animal/hostile/guardian/med_hud_set_health()
+ if(summoner)
+ var/image/holder = hud_list[HEALTH_HUD]
+ holder.icon_state = "hud[RoundHealth(summoner)]"
+
+/mob/living/simple_animal/hostile/guardian/med_hud_set_status()
+ if(summoner)
+ var/image/holder = hud_list[STATUS_HUD]
+ var/icon/I = icon(icon, icon_state, dir)
+ holder.pixel_y = I.Height() - world.icon_size
+ if(summoner.stat == DEAD)
+ holder.icon_state = "huddead"
+ else
+ holder.icon_state = "hudhealthy"
+
/mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies
..()
if(summoner)
@@ -88,7 +103,8 @@
resulthealth = round((summoner.health / summoner.maxHealth) * 100)
if(hud_used)
hud_used.guardianhealthdisplay.maptext = "[resulthealth]%
"
-
+ med_hud_set_health()
+ med_hud_set_status()
/mob/living/simple_animal/hostile/guardian/adjustHealth(amount) //The spirit is invincible, but passes on damage to the summoner
var/damage = amount * damage_transfer
diff --git a/code/game/gamemodes/miniantags/guardian/types/healer.dm b/code/game/gamemodes/miniantags/guardian/types/healer.dm
index c8001050ad1..d51e4cefd45 100644
--- a/code/game/gamemodes/miniantags/guardian/types/healer.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/healer.dm
@@ -52,6 +52,9 @@
C.adjustOxyLoss(-5)
C.adjustToxLoss(-5)
heal_cooldown = world.time + 20
+ if(C == summoner)
+ med_hud_set_health()
+ med_hud_set_status()
/mob/living/simple_animal/hostile/guardian/healer/ToggleMode()
if(loc == summoner)
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
index 338484a5ebc..caec78f3594 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -53,6 +53,7 @@
var/perfectsouls = 0 //How many perfect, regen-cap increasing souls the revenant has.
var/image/ghostimage = null //Visible to ghost with darkness off
+
/mob/living/simple_animal/revenant/Life()
..()
if(revealed && essence <= 0)
@@ -117,6 +118,7 @@
ghostimage = image(src.icon,src,src.icon_state)
ghost_darkness_images |= ghostimage
updateallghostimages()
+ remove_from_all_data_huds()
spawn(5)
if(src.mind)
diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
index 25ebd7bc379..416610dd1c2 100644
--- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm
+++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
@@ -57,6 +57,7 @@
/mob/living/simple_animal/slaughter/New()
..()
+ remove_from_all_data_huds()
var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new
AddSpell(bloodspell)
whisper_action = new()
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 01d4e0ed3a7..ea796011e96 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -264,7 +264,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu
if(!location)
return 0
- if(istype(location, /turf/simulated/shuttle/floor4)) // Fails traitors if they are in the shuttle brig -- Polymorph
+ if(istype(location, /turf/simulated/shuttle/floor4) || istype(location, /turf/simulated/floor/mineral/plastitanium/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph
return 0
if(location.onCentcom() || location.onSyndieBase())
diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm
index f5fc513744a..439d3cb237d 100644
--- a/code/game/gamemodes/shadowling/shadowling.dm
+++ b/code/game/gamemodes/shadowling/shadowling.dm
@@ -201,11 +201,23 @@ Made by Xhuis
/datum/game_mode/shadowling/check_finished()
var/shadows_alive = 0 //and then shadowling was kill
for(var/datum/mind/shadow in shadows) //but what if shadowling was not kill?
- if(!istype(shadow.current,/mob/living/carbon/human) && !istype(shadow.current,/mob/living/simple_animal/ascendant_shadowling))
+ if(!ishuman(shadow.current) && !istype(shadow.current,/mob/living/simple_animal/ascendant_shadowling))
continue
if(shadow.current.stat == DEAD)
continue
shadows_alive++
+ if(shadow.special_role == SPECIAL_ROLE_SHADOWLING && config.shadowling_max_age)
+ if(ishuman(shadow.current))
+ var/mob/living/carbon/human/H = shadow.current
+ if(H.get_species() != "Shadow")
+ for(var/obj/effect/proc_holder/spell/targeted/shadowling_hatch/hatch_ability in shadow.spell_list)
+ hatch_ability.cycles_unused++
+ if(!H.stunned && prob(20) && hatch_ability.cycles_unused > config.shadowling_max_age)
+ var/shadow_nag_messages = list("You can barely hold yourself in this lesser form!", "The urge to become something greater is overwhelming!", "You feel a burning passion to hatch free of this shell and assume godhood!")
+ H.take_overall_damage(0, 3)
+ to_chat(H, "[pick(shadow_nag_messages)]")
+ H << 'sound/weapons/sear.ogg'
+
if(shadows_alive)
return ..()
else
diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm
index 353fd328f4c..5c05a028df0 100644
--- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm
+++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm
@@ -9,6 +9,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
range = -1
include_user = 1
action_icon_state = "hatch"
+ var/cycles_unused = 0
/obj/effect/proc_holder/spell/targeted/shadowling_hatch/cast(list/targets, mob/user = usr)
if(user.stat || !ishuman(user) || !user || !is_shadow(user || isinspace(user)))
@@ -178,6 +179,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
sleep(50)
if(!ticker.mode.shadowling_ascended)
shuttle_master.emergency.request(null, 0.3)
+ shuttle_master.emergency.canRecall = FALSE
ticker.mode.shadowling_ascended = 1
A.mind.RemoveSpell(src)
qdel(H)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index bfc13277e5f..e46182b735e 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -500,10 +500,13 @@
if(ticker.mode.name == "meteor")
return
- shuttle_master.cancelEvac(user)
- log_game("[key_name(user)] has recalled the shuttle.")
- message_admins("[key_name_admin(user)] has recalled the shuttle - [formatJumpTo(user)].", 1)
- return
+ if(shuttle_master.cancelEvac(user))
+ log_game("[key_name(user)] has recalled the shuttle.")
+ message_admins("[key_name_admin(user)] has recalled the shuttle - [ADMIN_FLW(user)].", 1)
+ else
+ to_chat(user, "Central Command has refused the recall request!")
+ log_game("[key_name(user)] has tried and failed to recall the shuttle.")
+ message_admins("[key_name_admin(user)] has tried and failed to recall the shuttle - [ADMIN_FLW(user)].", 1)
/proc/post_status(command, data1, data2, mob/user = null)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 464381f0fa5..8289e8714e3 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -369,6 +369,7 @@
P.name = "paper - 'Security Record'"
printing = 0
+/* Removed due to BYOND issue
else if(href_list["print_p"])
if(!printing)
printing = 1
@@ -377,6 +378,7 @@
if(istype(active1, /datum/data/record) && data_core.general.Find(active1))
create_record_photo(active1)
printing = 0
+*/
else if(href_list["printlogs"])
if(cell_logs.len && !printing)
@@ -510,6 +512,8 @@
/obj/machinery/computer/secure_data/proc/setTemp(text, list/buttons = list())
temp = list("text" = text, "buttons" = buttons, "has_buttons" = buttons.len > 0)
+/* Proc disabled due to BYOND Issue
+
/obj/machinery/computer/secure_data/proc/create_record_photo(datum/data/record/R)
// basically copy-pasted from the camera code but different enough that it has to be redone
var/icon/photoimage = get_record_photo(R)
@@ -536,6 +540,8 @@
var/obj/item/weapon/photo/PH = new/obj/item/weapon/photo(loc)
PH.construct(P)
+*/
+
/obj/machinery/computer/secure_data/proc/get_record_photo(datum/data/record/R)
// similar to the code to make a photo, but of course the actual rendering is completely different
var/icon/res = icon('icons/effects/96x96.dmi', "")
diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm
index d50d0355d5c..b29d79f40d8 100644
--- a/code/game/machinery/computer/specops_shuttle.dm
+++ b/code/game/machinery/computer/specops_shuttle.dm
@@ -231,7 +231,7 @@ var/specops_shuttle_timeleft = 0
for(var/turf/T in get_area_turfs(end_location) )
var/mob/M = locate(/mob) in T
- to_chat(M, "You have arrived to [station_name]. Commence operation!")
+ to_chat(M, "You have arrived to [station_name()]. Commence operation!")
for(var/obj/machinery/computer/specops_shuttle/S in world)
S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY
@@ -275,8 +275,8 @@ var/specops_shuttle_timeleft = 0
dat = temp
else
dat += {"Special Operations Shuttle
- \nLocation: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
- [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name]
\n
"] + \nLocation: [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "Departing for [station_name()] in ([specops_shuttle_timeleft] seconds.)":specops_shuttle_at_station ? "Station":"Dock"]
+ [specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom ? "\n*The Special Ops. shuttle is already leaving.*
\n
":specops_shuttle_at_station ? "\nShuttle standing by...
\n
":"\nDepart to [station_name()]
\n
"] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -318,7 +318,7 @@ var/specops_shuttle_timeleft = 0 to_chat(usr, "The Special Operations shuttle is unable to leave.") return - to_chat(usr, "The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.") + to_chat(usr, "The Special Operations shuttle will arrive on [station_name()] in [(SPECOPS_MOVETIME/10)] seconds.") temp += "Shuttle departing.
OK" updateUsrDialog() @@ -337,4 +337,4 @@ var/specops_shuttle_timeleft = 0 add_fingerprint(usr) updateUsrDialog() - return \ No newline at end of file + return diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 14a3fdb72ca..b1a278a8955 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -172,7 +172,7 @@ var/syndicate_elite_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - to_chat(M, "You have arrived to [station_name]. Commence operation!") + to_chat(M, "You have arrived to [station_name()]. Commence operation!") /proc/syndicate_elite_can_move() if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 @@ -209,8 +209,8 @@ var/syndicate_elite_shuttle_timeleft = 0 dat = temp else dat = {"
Special Operations Shuttle
- \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
- [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name]
\n
"] + \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name()] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
+ [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name()]
\n
"] \nClose"} user << browse(dat, "window=computer;size=575x450") @@ -237,7 +237,7 @@ var/syndicate_elite_shuttle_timeleft = 0 to_chat(usr, "The Syndicate Elite shuttle is unable to leave.") return - to_chat(usr, "The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") + to_chat(usr, "The Syndicate Elite shuttle will arrive on [station_name()] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") temp = "Shuttle departing.
OK" updateUsrDialog() @@ -257,4 +257,4 @@ var/syndicate_elite_shuttle_timeleft = 0 add_fingerprint(usr) updateUsrDialog() - return \ No newline at end of file + return diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm new file mode 100644 index 00000000000..a7ddc648df6 --- /dev/null +++ b/code/game/machinery/dance_machine.dm @@ -0,0 +1,479 @@ +/obj/machinery/disco + name = "radiant dance machine mark IV" + desc = "The first three prototypes were discontinued after mass casualty incidents." + icon = 'icons/obj/lighting.dmi' + icon_state = "disco0" + anchored = FALSE + atom_say_verb = "states" + density = TRUE + var/active = FALSE + var/list/rangers = list() + var/charge = 35 + var/stop = 0 + var/list/spotlights = list() + var/list/sparkles = list() + var/static/list/songs = list( + new /datum/track("Engineering's Basic Beat", 'sound/misc/disco.ogg', 600, 5), + new /datum/track("Engineering's Domination Dance", 'sound/misc/e1m1.ogg', 950, 6), + new /datum/track("Engineering's Superiority Shimmy", 'sound/misc/paradox.ogg', 2400, 4), + new /datum/track("Engineering's Ultimate High-Energy Hustle", 'sound/misc/boogie2.ogg', 1770, 5), + ) + var/datum/track/selection = null + +/datum/track + var/song_name = "generic" + var/song_path = null + var/song_length = 0 + var/song_beat = 0 + var/GBP_required = 0 + +/datum/track/New(name, path, length, beat) + song_name = name + song_path = path + song_length = length + song_beat = beat + +/obj/machinery/disco/proc/add_track(file, name, length, beat) + var/sound/S = file + if(!istype(S)) + return + if(!name) + name = "[file]" + if(!beat) + beat = 5 + if(!length) + length = 2400 //Unless there's a way to discern via BYOND. + var/datum/track/T = new /datum/track(name, file, length, beat) + songs += T + +/obj/machinery/disco/New() + . = ..() + selection = songs[1] + + +/obj/machinery/disco/Destroy() + dance_over() + selection = null + return ..() + +/obj/machinery/disco/attackby(obj/item/O, mob/user, params) + if(!active) + if(iswrench(O)) + if(!anchored && !isinspace()) + to_chat(user,"You secure [src] to the floor.") + anchored = TRUE + else if(anchored) + to_chat(user,"You unsecure and disconnect [src].") + anchored = FALSE + playsound(src, 'sound/items/deconstruct.ogg', 50, 1) + return + return ..() + +/obj/machinery/disco/update_icon() + if(active) + icon_state = "disco1" + else + icon_state = "disco0" + ..() + + +/obj/machinery/disco/attack_hand(mob/user) + if(..()) + return + + interact(user) + +/obj/machinery/disco/interact(mob/user) + if(!anchored) + to_chat(user,"This device must be anchored by a wrench!") + return + if(!Adjacent(user) && !isAI(user)) + return + user.set_machine(src) + var/list/dat = list() + dat +="
"
+ dat += "[!active ? "BREAK IT DOWN" : "SHUT IT DOWN"]
" + dat += "
" + dat += "
" + dat += " Select Track
" + dat += "Track Selected: [selection.song_name]
" + dat += "Track Length: [DisplayTimeText(selection.song_length)]
" + dat += "
DJ's Soundboard:
" + dat +="
"
+ dat += "Air Horn "
+ dat += "Station Alert "
+ dat += "Warning Siren "
+ dat += "Honk
" + dat += "Shotgun Pump" + dat += "Gunshot" + dat += "Esword" + dat += "Harm Alarm" + var/datum/browser/popup = new(user, "vending", "Radiance Dance Machine - Mark IV", 400, 350) + popup.set_content(dat.Join()) + popup.open() + + +/obj/machinery/disco/Topic(href, href_list) + if(..()) + return + add_fingerprint(usr) + switch(href_list["action"]) + if("toggle") + if(qdeleted(src)) + return + if(!active) + if(stop > world.time) + to_chat(usr, "Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].") + playsound(src, 'sound/misc/compiler-failure.ogg', 50, 1) + return + active = TRUE + update_icon() + dance_setup() + processing_objects.Add(src) + lights_spin() + updateUsrDialog() + else if(active) + stop = 0 + updateUsrDialog() + if("select") + if(active) + to_chat(usr, "Error: You cannot change the song until the current one is over.") + return + + var/list/available = list() + for(var/datum/track/S in songs) + available[S.song_name] = S + var/selected = input(usr, "Choose your song", "Track:") as null|anything in available + if(qdeleted(src) || !selected || !istype(available[selected], /datum/track)) + return + selection = available[selected] + updateUsrDialog() + if("horn") + deejay('sound/items/airhorn2.ogg') + if("alert") + deejay('sound/misc/notice1.ogg') + if("siren") + deejay('sound/machines/engine_alert1.ogg') + if("honk") + deejay('sound/items/bikehorn.ogg') + if("pump") + deejay('sound/weapons/shotgunpump.ogg') + if("pop") + deejay('sound/weapons/gunshot3.ogg') + if("saber") + deejay('sound/weapons/saberon.ogg') + if("harm") + deejay('sound/ai/harmalarm.ogg') + +/obj/machinery/disco/proc/deejay(S) + if(qdeleted(src) || !active || charge < 5) + to_chat(usr, "The device is not able to play more DJ sounds at this time.") + return + charge -= 5 + playsound(src, S, 300, 1) + +/obj/machinery/disco/proc/dance_setup() + stop = world.time + selection.song_length + var/turf/cen = get_turf(src) + FOR_DVIEW(var/turf/t, 3, get_turf(src),INVISIBILITY_LIGHTING) + if(t.x == cen.x && t.y > cen.y) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "red" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1+get_dist(src, L) + spotlights+=L + continue + if(t.x == cen.x && t.y < cen.y) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "purple" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1+get_dist(src, L) + spotlights+=L + continue + if(t.x > cen.x && t.y == cen.y) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "#ffff00" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1+get_dist(src, L) + spotlights+=L + continue + if(t.x < cen.x && t.y == cen.y) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "green" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1+get_dist(src, L) + spotlights+=L + continue + if((t.x+1 == cen.x && t.y+1 == cen.y) || (t.x+2==cen.x && t.y+2 == cen.y)) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "sw" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1.4+get_dist(src, L) + spotlights+=L + continue + if((t.x-1 == cen.x && t.y-1 == cen.y) || (t.x-2==cen.x && t.y-2 == cen.y)) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "ne" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1.4+get_dist(src, L) + spotlights+=L + continue + if((t.x-1 == cen.x && t.y+1 == cen.y) || (t.x-2==cen.x && t.y+2 == cen.y)) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "se" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1.4+get_dist(src, L) + spotlights+=L + continue + if((t.x+1 == cen.x && t.y-1 == cen.y) || (t.x+2==cen.x && t.y-2 == cen.y)) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "nw" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1.4+get_dist(src, L) + spotlights+=L + continue + continue + END_FOR_DVIEW + +/obj/machinery/disco/proc/hierofunk() + for(var/i in 1 to 10) + new /obj/effect/temp_visual/hierophant/telegraph/edge(get_turf(src)) + sleep(5) + +/obj/machinery/disco/proc/lights_spin() + for(var/i in 1 to 25) + if(qdeleted(src) || !active) + return + var/obj/effect/overlay/sparkles/S = new /obj/effect/overlay/sparkles(src) + S.alpha = 0 + sparkles += S + switch(i) + if(1 to 8) + spawn(0) + S.orbit(src, 30, TRUE, 60, 36, TRUE, FALSE) + if(9 to 16) + spawn(0) + S.orbit(src, 62, TRUE, 60, 36, TRUE, FALSE) + if(17 to 24) + spawn(0) + S.orbit(src, 95, TRUE, 60, 36, TRUE, FALSE) + if(25) + S.pixel_y = 7 + S.forceMove(get_turf(src)) + sleep(7) + if(selection.song_name == "Engineering's Ultimate High-Energy Hustle") + sleep(280) + for(var/obj/reveal in sparkles) + reveal.alpha = 255 + while(active) + for(var/obj/item/device/flashlight/spotlight/glow in spotlights) // The multiples reflects custom adjustments to each colors after dozens of tests + if(qdeleted(src) || !active || qdeleted(glow)) + return + if(glow.light_color == "red") + glow.light_color = "nw" + glow.light_power = glow.light_power * 1.48 + glow.light_range = 0 + glow.update_light() + continue + if(glow.light_color == "nw") + glow.light_color = "green" + glow.light_range = glow.range * 1.1 + glow.light_power = glow.light_power * 2 // Any changes to power must come in pairs to neutralize it for other colors + glow.update_light() + continue + if(glow.light_color == "green") + glow.light_color = "sw" + glow.light_power = glow.light_power * 0.5 + glow.light_range = 0 + glow.update_light() + continue + if(glow.light_color == "sw") + glow.light_color = "purple" + glow.light_power = glow.light_power * 2.27 + glow.light_range = glow.range * 1.15 + glow.update_light() + continue + if(glow.light_color == "purple") + glow.light_color = "se" + glow.light_power = glow.light_power * 0.44 + glow.light_range = 0 + glow.update_light() + continue + if(glow.light_color == "se") + glow.light_color = "#ffff00" + glow.light_range = glow.range * 0.9 + glow.update_light() + continue + if(glow.light_color == "#ffff00") + glow.light_color = "ne" + glow.light_range = 0 + glow.update_light() + continue + if(glow.light_color == "ne") + glow.light_color = "red" + glow.light_power = glow.light_power * 0.68 + glow.light_range = glow.range * 0.85 + glow.update_light() + continue + if(prob(2)) // Unique effects for the dance floor that show up randomly to mix things up + INVOKE_ASYNC(src, .proc/hierofunk) + sleep(selection.song_beat) + + +/obj/machinery/disco/proc/dance(mob/living/M) //Show your moves + set waitfor = FALSE + switch(rand(0,9)) + if(0 to 1) + dance2(M) + if(2 to 3) + dance3(M) + if(4 to 6) + dance4(M) + if(7 to 9) + dance5(M) + +/obj/machinery/disco/proc/dance2(mob/living/M) + for(var/i = 1, i < 10, i++) + for(var/d in list(NORTH, SOUTH, EAST, WEST, EAST, SOUTH, NORTH, SOUTH, EAST, WEST, EAST, SOUTH)) + M.setDir(d) + if(i == WEST && !M.incapacitated()) + M.SpinAnimation(7, 1) + sleep(1) + sleep(20) + +/obj/machinery/disco/proc/dance3(mob/living/M) + var/matrix/initial_matrix = matrix(M.transform) + for(var/i in 1 to 75) + if(!M) + return + switch(i) + if(1 to 15) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0, 1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(16 to 30) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(1, -1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(31 to 45) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(-1, -1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(46 to 60) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(-1, 1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(61 to 75) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(1, 0) + animate(M, transform = initial_matrix, time = 1, loop = 0) + M.setDir(turn(M.dir, 90)) + switch(M.dir) + if(NORTH) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,3) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(SOUTH) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,-3) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(EAST) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(3,0) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(WEST) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(-3,0) + animate(M, transform = initial_matrix, time = 1, loop = 0) + sleep(1) + M.lying_fix() + + +/obj/machinery/disco/proc/dance4(mob/living/M) + var/speed = rand(1, 3) + set waitfor = 0 + var/time = 30 + while(time) + sleep(speed) + for(var/i in 1 to speed) + M.setDir(pick(cardinal)) + M.resting = !M.resting + M.update_canmove() + time-- + +/obj/machinery/disco/proc/dance5(mob/living/M) + animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0) + var/matrix/initial_matrix = matrix(M.transform) + for(var/i in 1 to 60) + if(!M) + return + if(i<31) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(i>30) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,-1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + M.setDir(turn(M.dir, 90)) + switch(M.dir) + if(NORTH) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,3) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(SOUTH) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,-3) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(EAST) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(3,0) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(WEST) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(-3,0) + animate(M, transform = initial_matrix, time = 1, loop = 0) + sleep(1) + M.lying_fix() + + + +/mob/living/proc/lying_fix() + animate(src, transform = null, time = 1, loop = 0) + lying_prev = 0 + +/obj/machinery/disco/proc/dance_over() + QDEL_LIST(spotlights) + QDEL_LIST(sparkles) + for(var/mob/living/L in rangers) + if(!L || !L.client) + continue + L.stop_sound_channel(CHANNEL_JUKEBOX) + rangers = list() + + + +/obj/machinery/disco/process() + if(charge < 35) + charge += 1 + if(world.time < stop && active) + var/sound/song_played = sound(selection.song_path) + + for(var/mob/M in range(10,src)) + if(!(M in rangers)) + rangers[M] = TRUE + M.playsound_local(get_turf(M), null, 100, channel = CHANNEL_JUKEBOX, S = song_played) + if(prob(5+(allowed(M) * 4)) && M.canmove) + dance(M) + for(var/mob/L in rangers) + if(get_dist(src, L) > 10) + rangers -= L + if(!L || !L.client) + continue + L.stop_sound_channel(CHANNEL_JUKEBOX) + else if(active) + active = FALSE + processing_objects.Remove(src) + dance_over() + playsound(src,'sound/machines/terminal_off.ogg',50,1) + icon_state = "disco0" + stop = world.time + 100 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 15f0a73808c..5f12a4f0076 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -5,7 +5,7 @@ mend - mends a wire and makes any necessary state changes canAIControl - 1 if the AI can control the airlock, 0 if not (then check canAIHack to see if it can hack in) canAIHack - 1 if the AI can hack into the airlock to recover control, 0 if not. Also returns 0 if the AI does not *need* to hack it. - arePowerSystemsOn - 1 if the main or backup power are functioning, 0 if not. Does not check whether the power grid is charged or an APC has equipment on or anything like that. (Check (stat & NOPOWER) for that) + arePowerSystemsOn - 1 if the main or backup power are functioning, 0 if not. requiresIDs - 1 if the airlock is requiring IDs, 0 if not isAllPowerCut - 1 if the main and backup power both have cut wires. regainMainPower - handles the effect of main power coming back on. @@ -18,17 +18,24 @@ // Wires for the airlock are located in the datum folder, inside the wires datum folder. +#define AIRLOCK_CLOSED 1 +#define AIRLOCK_CLOSING 2 +#define AIRLOCK_OPEN 3 +#define AIRLOCK_OPENING 4 +#define AIRLOCK_DENY 5 +#define AIRLOCK_EMAG 6 +var/list/airlock_overlays = list() /obj/machinery/door/airlock name = "airlock" - icon = 'icons/obj/doors/doorint.dmi' - icon_state = "door_closed" + icon = 'icons/obj/doors/airlocks/station/public.dmi' + icon_state = "closed" autoclose = 1 explosion_block = 1 assemblytype = /obj/structure/door_assembly normalspeed = 1 - var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in. - var/hackProof = 0 // if 1, this door can't be hacked by the AI + var/aiControlDisabled = FALSE //If TRUE, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in. + var/hackProof = FALSE // if TRUE, this door can't be hacked by the AI var/electrified_until = 0 // World time when the door is no longer electrified. -1 if it is permanently electrified until someone fixes it. var/main_power_lost_until = 0 //World time when main power is restored. var/backup_power_lost_until = -1 //World time when backup power is restored. @@ -44,11 +51,24 @@ var/obj/machinery/door/airlock/closeOther = null var/closeOtherId = null var/lockdownbyai = 0 - var/mineral = null var/justzap = 0 var/safe = 1 var/obj/item/weapon/airlock_electronics/electronics = null var/hasShocked = 0 //Prevents multiple shocks from happening + var/obj/item/weapon/note //Any papers pinned to the airlock + var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to + var/airlock_material = null //material of inner filling; if its an airlock with glass, this should be set to "glass" + var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' + var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock + + var/image/old_frame_overlay //keep those in order to prevent unnecessary updating + var/image/old_filling_overlay + var/image/old_lights_overlay + var/image/old_panel_overlay + var/image/old_weld_overlay + var/image/old_sparks_overlay + var/image/old_note_overlay + var/doorOpen = 'sound/machines/airlock_open.ogg' var/doorClose = 'sound/machines/airlock_close.ogg' var/doorDeni = 'sound/machines/DeniedBeep.ogg' // i'm thinkin' Deni's @@ -84,8 +104,9 @@ About the new airlock wires panel: if(A.closeOtherId == closeOtherId && A != src) closeOther = A break - if(welded) - update_icon() + if(glass) + airlock_material = "glass" + update_icon() /obj/machinery/door/airlock/Destroy() QDEL_NULL(electronics) @@ -99,8 +120,14 @@ About the new airlock wires panel: if(electrified_timer) deltimer(electrified_timer) electrified_timer = null + qdel(note) return ..() +/obj/machinery/door/airlock/handle_atom_del(atom/A) + if(A == note) + note = null + update_icon() + /obj/machinery/door/airlock/bumpopen(mob/living/user) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite if(!issilicon(usr)) if(isElectrified()) @@ -250,65 +277,182 @@ About the new airlock wires panel: else return 0 -/obj/machinery/door/airlock/update_icon() - if(overlays) - overlays.Cut() - overlays = list() - if(emergency && arePowerSystemsOn()) - overlays += image('icons/obj/doors/doorint.dmi', "elights") - if(density) - if(locked && lights) - icon_state = "door_locked" - else - icon_state = "door_closed" - if(p_open || welded) - if(p_open) - overlays += image(icon, "panel_open") - if(welded) - overlays += image(icon, "welded") - else - icon_state = "door_open" +/obj/machinery/door/airlock/update_icon(state=0, override=0) + if(operating && !override) + return + switch(state) + if(0) + if(density) + state = AIRLOCK_CLOSED + else + state = AIRLOCK_OPEN + icon_state = "" + if(AIRLOCK_OPEN, AIRLOCK_CLOSED) + icon_state = "" + if(AIRLOCK_DENY, AIRLOCK_OPENING, AIRLOCK_CLOSING, AIRLOCK_EMAG) + icon_state = "nonexistenticonstate" //MADNESS + set_airlock_overlays(state) - return +/obj/machinery/door/airlock/proc/set_airlock_overlays(state) + var/image/frame_overlay + var/image/filling_overlay + var/image/lights_overlay + var/image/panel_overlay + var/image/weld_overlay + var/image/sparks_overlay + var/image/note_overlay + var/notetype = note_type() + + switch(state) + if(AIRLOCK_CLOSED) + frame_overlay = get_airlock_overlay("closed", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) + if(lights) + if(locked) + lights_overlay = get_airlock_overlay("lights_bolts", overlays_file) + else if(emergency) + lights_overlay = get_airlock_overlay("lights_emergency", overlays_file) + if(note) + note_overlay = get_airlock_overlay(notetype, note_overlay_file) + + if(AIRLOCK_DENY) + if(!arePowerSystemsOn()) + return + frame_overlay = get_airlock_overlay("closed", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) + lights_overlay = get_airlock_overlay("lights_denied", overlays_file) + if(note) + note_overlay = get_airlock_overlay(notetype, note_overlay_file) + + if(AIRLOCK_EMAG) + frame_overlay = get_airlock_overlay("closed", icon) + sparks_overlay = get_airlock_overlay("sparks", overlays_file) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) + if(note) + note_overlay = get_airlock_overlay(notetype, note_overlay_file) + + if(AIRLOCK_CLOSING) + frame_overlay = get_airlock_overlay("closing", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closing", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closing", icon) + if(lights && arePowerSystemsOn()) + lights_overlay = get_airlock_overlay("lights_closing", overlays_file) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_closing", overlays_file) + if(note) + note_overlay = get_airlock_overlay("[notetype]_closing", note_overlay_file) + + if(AIRLOCK_OPEN) + frame_overlay = get_airlock_overlay("open", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_open", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_open", icon) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_open", overlays_file) + if(note) + note_overlay = get_airlock_overlay("[notetype]_open", note_overlay_file) + + if(AIRLOCK_OPENING) + frame_overlay = get_airlock_overlay("opening", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_opening", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_opening", icon) + if(lights && arePowerSystemsOn()) + lights_overlay = get_airlock_overlay("lights_opening", overlays_file) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_opening", overlays_file) + if(note) + note_overlay = get_airlock_overlay("[notetype]_opening", note_overlay_file) + + //doesn't use overlays.Cut() for performance reasons + if(frame_overlay != old_frame_overlay) + overlays -= old_frame_overlay + overlays += frame_overlay + old_frame_overlay = frame_overlay + if(filling_overlay != old_filling_overlay) + overlays -= old_filling_overlay + overlays += filling_overlay + old_filling_overlay = filling_overlay + if(lights_overlay != old_lights_overlay) + overlays -= old_lights_overlay + overlays += lights_overlay + old_lights_overlay = lights_overlay + if(panel_overlay != old_panel_overlay) + overlays -= old_panel_overlay + overlays += panel_overlay + old_panel_overlay = panel_overlay + if(weld_overlay != old_weld_overlay) + overlays -= old_weld_overlay + overlays += weld_overlay + old_weld_overlay = weld_overlay + if(sparks_overlay != old_sparks_overlay) + overlays -= old_sparks_overlay + overlays += sparks_overlay + old_sparks_overlay = sparks_overlay + if(note_overlay != old_note_overlay) + overlays -= old_note_overlay + overlays += note_overlay + old_note_overlay = note_overlay + +/proc/get_airlock_overlay(icon_state, icon_file) + var/iconkey = "[icon_state][icon_file]" + if(airlock_overlays[iconkey]) + return airlock_overlays[iconkey] + airlock_overlays[iconkey] = image(icon_file, icon_state) + return airlock_overlays[iconkey] /obj/machinery/door/airlock/do_animate(animation) switch(animation) if("opening") - if(overlays) - overlays.Cut() - if(p_open) - spawn(2) // The only work around that works. Downside is that the door will be gone for a millisecond. - flick("o_door_opening", src) //can not use flick due to BYOND bug updating overlays right before flicking - update_icon() - else - flick("door_opening", src)//[stat ? "_stat":] - update_icon() + update_icon(AIRLOCK_OPENING) if("closing") - if(overlays) - overlays.Cut() - if(p_open) - spawn(2) - flick("o_door_closing", src) - update_icon() - else - flick("door_closing", src) - update_icon() - if("spark") - if(density) - flick("door_spark", src) + update_icon(AIRLOCK_CLOSING) if("deny") - if(density && arePowerSystemsOn()) - playsound(src, doorDeni, 50, 0, 3) - flick("door_deny", src) - return + if(!stat) + update_icon(AIRLOCK_DENY) + playsound(src,doorDeni,50,0,3) + sleep(6) + update_icon(AIRLOCK_CLOSED) + icon_state = "closed" /obj/machinery/door/airlock/examine(mob/user) ..() if(emagged) to_chat(user, "Its access panel is smoking slightly.") + if(note) + if(!in_range(user, src)) + to_chat(user, "There's a [note.name] pinned to the front. You can't [note_type() == "note" ? "read" : "see"] it from here.") + else + to_chat(user, "There's a [note.name] pinned to the front...") + note.examine(user) /obj/machinery/door/airlock/attack_ghost(mob/user) - if(p_open) + if(panel_open) wires.Interact(user) ui_interact(user) @@ -354,7 +498,7 @@ About the new airlock wires panel: aiHacking=0 return else if(!canAIHack(user)) - to_chat(user, "We've lost our connection! Unable to hack airlock.") + to_chat(user, "Connection lost! Unable to hack airlock.") aiHacking=0 return to_chat(user, "Fault confirmed: airlock control wire disabled or cut.") @@ -366,7 +510,7 @@ About the new airlock wires panel: aiHacking=0 return else if(!canAIHack(user)) - to_chat(user, "We've lost our connection! Unable to hack airlock.") + to_chat(user, "Connection lost! Unable to hack airlock.") aiHacking=0 return to_chat(user, "Upload access confirmed. Loading control program into airlock software.") @@ -376,7 +520,7 @@ About the new airlock wires panel: aiHacking=0 return else if(!canAIHack(user)) - to_chat(user, "We've lost our connection! Unable to hack airlock.") + to_chat(user, "Connection lost! Unable to hack airlock.") aiHacking=0 return to_chat(user, "Transfer complete. Forcing airlock to execute program.") @@ -407,7 +551,7 @@ About the new airlock wires panel: if(ishuman(user) && prob(40) && density) var/mob/living/carbon/human/H = user - if(H.getBrainLoss() >= 60) + if(H.getBrainLoss() >= 60 && Adjacent(user)) playsound(loc, 'sound/effects/bang.ogg', 25, 1) if(!istype(H.head, /obj/item/clothing/head/helmet)) visible_message("[user] headbutts the airlock.") @@ -420,7 +564,7 @@ About the new airlock wires panel: visible_message("[user] headbutts the airlock. Good thing they're wearing a helmet.") return - if(p_open) + if(panel_open) wires.Interact(user) else ..(user) @@ -463,9 +607,11 @@ About the new airlock wires panel: if("main_power") if(!main_power_lost_until) loseMainPower() + update_icon() if("backup_power") if(!backup_power_lost_until) loseBackupPower() + update_icon() if("bolts") if(isWireCut(AIRLOCK_WIRE_DOOR_BOLTS)) to_chat(usr, "The door bolt control wire has been cut - Door bolts permanently dropped.") @@ -530,6 +676,7 @@ About the new airlock wires panel: else if(activate && !lights) lights = 1 to_chat(usr, "The door bolt lights have been enabled.") + update_icon() if("emergency") // Emergency access if(emergency) @@ -538,12 +685,10 @@ About the new airlock wires panel: else emergency = 1 to_chat(usr, "Emergency access has been enabled.") - - update_icon() + update_icon() return 1 /obj/machinery/door/airlock/attackby(obj/item/C, mob/user, params) -// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) if(!issilicon(usr)) if(isElectrified()) if(shock(user, 75)) @@ -564,12 +709,19 @@ About the new airlock wires panel: else return else if(isscrewdriver(C)) - p_open = !p_open - to_chat(user, "You [p_open ? "open":"close"] the maintenance panel of the airlock.") + panel_open = !panel_open + to_chat(user, "You [panel_open ? "open":"close"] the maintenance panel of the airlock.") playsound(loc, C.usesound, 50, 1) update_icon() else if(iswirecutter(C)) - return attack_hand(user) + if(note) + user.visible_message("[user] cuts down [note] from [src].", "You remove [note] from [src].") + playsound(src, 'sound/items/Wirecutter.ogg', 50, 1) + note.forceMove(get_turf(user)) + note = null + update_icon() + else + return attack_hand(user) else if(ismultitool(C)) return attack_hand(user) else if(istype(C, /obj/item/device/assembly/signaler)) @@ -577,50 +729,30 @@ About the new airlock wires panel: else if(istype(C, /obj/item/weapon/pai_cable)) // -- TLE var/obj/item/weapon/pai_cable/cable = C cable.plugin(src, user) + else if(istype(C, /obj/item/weapon/paper) || istype(C, /obj/item/weapon/photo)) + if(note) + to_chat(user, "There's already something pinned to this airlock! Use wirecutters to remove it.") + return + if(!user.unEquip(C)) + to_chat(user, "For some reason, you can't attach [C]!") + return + C.forceMove(src) + user.visible_message("[user] pins [C] to [src].", "You pin [C] to [src].") + note = C + update_icon() else if(iscrowbar(C) || istype(C, /obj/item/weapon/twohanded/fireaxe)) var/beingcrowbarred = null if(iscrowbar(C)) beingcrowbarred = 1 //derp, Agouri else beingcrowbarred = 0 - if(beingcrowbarred && p_open && (emagged || (density && welded && (!operating || emagged) && !arePowerSystemsOn() && !locked))) + if(beingcrowbarred && panel_open && (emagged || (density && welded && !operating && !arePowerSystemsOn() && !locked))) playsound(loc, C.usesound, 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.") if(do_after(user, 40 * C.toolspeed, target = src)) - to_chat(user, "You removed the airlock electronics!") - - var/obj/structure/door_assembly/da = new assemblytype(loc) - da.heat_proof_finished = heat_proof //tracks whether there's rglass in - da.anchored = 1 - if(mineral) - da.glass = mineral - //else if(glass) - else if(glass && !da.glass) - da.glass = 1 - da.state = 1 - da.created_name = name - da.update_state() - - var/obj/item/weapon/airlock_electronics/ae - if(!electronics) - ae = new/obj/item/weapon/airlock_electronics(loc) - if(!req_access) - check_access() - if(req_access.len) - ae.conf_access = req_access - else if(req_one_access.len) - ae.conf_access = req_one_access - ae.one_access = 1 - else - ae = electronics - electronics = null - ae.loc = loc - if(emagged) - ae.icon_state = "door_electronics_smoked" - operating = 0 - - qdel(src) - return + if(loc) + deconstruct(TRUE, user) + return if(istype(C, /obj/item/weapon/crowbar/power) && density) if(isElectrified()) shock(user, 100)//it's like sticking a fork in a power socket @@ -677,66 +809,6 @@ About the new airlock wires panel: ..() return -/obj/machinery/door/airlock/plasma/attackby(obj/C, mob/user, params) - if(is_hot(C) > 300) - message_admins("Plasma airlock ignited by [key_name_admin(user)] in ([x],[y],[z] - JMP)") - log_game("Plasma wall ignited by [key_name(user)] in ([x],[y],[z])") - investigate_log("was ignited by [key_name(user)]","atmos") - ignite(is_hot(C)) - ..() - -/obj/machinery/door/airlock/hatch/gamma/attackby(obj/C, mob/user, params) -// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) - if(!issilicon(user)) - if(isElectrified()) - if(shock(user, 75)) - return - if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) - return - - if(istype(C, /obj/item/weapon/grenade/plastic/c4)) - to_chat(user, "The hatch is coated with a product that prevents the shaped charge from sticking!") - return - - if(istype(C, /obj/item/mecha_parts/mecha_equipment/rcd) || istype(C, /obj/item/weapon/rcd)) - to_chat(user, "The hatch is made of an advanced compound that cannot be deconstructed using an RCD.") - return - - add_fingerprint(user) - if((iswelder(C) && !operating && density)) - var/obj/item/weapon/weldingtool/W = C - if(W.remove_fuel(0,user)) - if(!welded) - welded = 1 - else - welded = null - update_icon() - return - else - return - -/obj/machinery/door/airlock/highsecurity/red/attackby(obj/C, mob/user, params) -// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) - if(!issilicon(user)) - if(isElectrified()) - if(shock(user, 75)) - return - if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) - return - - add_fingerprint(user) - if((iswelder(C) && !operating && density)) - var/obj/item/weapon/weldingtool/W = C - if(W.remove_fuel(0,user)) - if(!welded) - welded = 1 - else - welded = null - update_icon() - return - else - return - /obj/machinery/door/airlock/open(forced=0) if(operating || welded || locked || emagged) return 0 @@ -750,7 +822,30 @@ About the new airlock wires panel: playsound(loc, doorOpen, 30, 1) if(closeOther != null && istype(closeOther, /obj/machinery/door/airlock/) && !closeOther.density) closeOther.close() - return ..() + if(!density) + return TRUE + if(operating) + return + if(!ticker) + return 0 + operating = TRUE + update_icon(AIRLOCK_OPENING, 1) + sleep(1) + set_opacity(0) + update_freelook_sight() + sleep(4) + density = FALSE + air_update_turf(1) + sleep(1) + layer = open_layer + update_icon(AIRLOCK_OPEN, 1) + operating = FALSE + + // The `addtimer` system has the advantage of being cancelable + if(autoclose) + autoclose_timer = addtimer(src, "autoclose", normalspeed ? auto_close_time : auto_close_time_dangerous, unique = 1) + + return TRUE /obj/machinery/door/airlock/close(forced=0, override = 0) if((operating & !override) || welded || locked || emagged) @@ -778,28 +873,30 @@ About the new airlock wires panel: killthis.ex_act(2)//Smashin windows if(density) - return 1 - operating = 1 - do_animate("closing") - layer = 3.1 + return TRUE + operating = TRUE + update_icon(AIRLOCK_CLOSING, 1) + layer = closed_layer if(!override) - sleep(5) - density = 1 + sleep(1) + density = TRUE + air_update_turf(1) + if(!override) + sleep(4) if(!safe) crush() - if(!override) - sleep(5) - update_icon() if(visible && !glass) set_opacity(1) - operating = 0 - air_update_turf(1) update_freelook_sight() + sleep(1) + update_icon(AIRLOCK_CLOSED, 1) + operating = FALSE if(safe) if(locate(/mob/living) in get_turf(src)) + sleep(1) open() - return + return TRUE /obj/machinery/door/airlock/proc/lock(forced=0) if(locked) @@ -830,6 +927,19 @@ About the new airlock wires panel: //Airlock is passable if it is open (!density), bot has access, and is not bolted shut) return !density || (check_access(ID) && !locked && arePowerSystemsOn()) +/obj/machinery/door/airlock/emag_act(mob/user) + if(!operating && density && arePowerSystemsOn() && !emagged) + operating = TRUE + update_icon(AIRLOCK_EMAG, 1) + sleep(6) + if(qdeleted(src)) + return + operating = FALSE + if(!open()) + update_icon(AIRLOCK_CLOSED, 1) + emagged = TRUE + return 1 + /obj/machinery/door/airlock/emp_act(severity) if(prob(40/severity)) var/duration = world.time + SecondsToTicks(30 / severity) @@ -872,8 +982,71 @@ About the new airlock wires panel: open() safe = TRUE +/obj/machinery/door/airlock/deconstruct(disassembled = TRUE, mob/user) + if(can_deconstruct) + var/obj/structure/door_assembly/DA + if(assemblytype) + DA = new assemblytype(loc) + else + DA = new /obj/structure/door_assembly(loc) + //If you come across a null assemblytype, it will produce the default assembly instead of disintegrating. + DA.heat_proof_finished = heat_proof //tracks whether there's rglass in + DA.anchored = TRUE + DA.glass = src.glass + DA.state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS + DA.created_name = name + DA.previous_assembly = previous_airlock + DA.update_name() + DA.update_icon() + if(user) + to_chat(user, "You remove the airlock electronics.") + var/obj/item/weapon/airlock_electronics/ae + if(!electronics) + ae = new/obj/item/weapon/airlock_electronics(loc) + if(!req_access) + check_access() + if(req_access.len) + ae.conf_access = req_access + else if(req_one_access.len) + ae.conf_access = req_one_access + ae.one_access = 1 + else + ae = electronics + electronics = null + ae.forceMove(loc) + if(emagged) + ae.icon_state = "door_electronics_smoked" + operating = 0 + qdel(src) + +/obj/machinery/door/airlock/proc/note_type() //Returns a string representing the type of note pinned to this airlock + if(!note) + return + else if(istype(note, /obj/item/weapon/paper)) + return "note" + else if(istype(note, /obj/item/weapon/photo)) + return "photo" + /obj/machinery/door/airlock/narsie_act() var/turf/T = get_turf(src) - var/obj/machinery/door/airlock/cult/A = new(T) + var/runed = prob(20) + var/obj/machinery/door/airlock/cult/A + if(glass) + if(runed) + A = new/obj/machinery/door/airlock/cult/glass(T) + else + A = new/obj/machinery/door/airlock/cult/unruned/glass(T) + else + if(runed) + A = new/obj/machinery/door/airlock/cult(T) + else + A = new/obj/machinery/door/airlock/cult/unruned(T) A.name = name qdel(src) + +#undef AIRLOCK_CLOSED +#undef AIRLOCK_CLOSING +#undef AIRLOCK_OPEN +#undef AIRLOCK_OPENING +#undef AIRLOCK_DENY +#undef AIRLOCK_EMAG diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index d41b4ed49d3..17fa437b9eb 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -3,47 +3,52 @@ */ /obj/machinery/door/airlock/command - icon = 'icons/obj/doors/Doorcom.dmi' + icon = 'icons/obj/doors/airlocks/station/command.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_com /obj/machinery/door/airlock/security - icon = 'icons/obj/doors/Doorsec.dmi' + icon = 'icons/obj/doors/airlocks/station/security.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_sec /obj/machinery/door/airlock/engineering - icon = 'icons/obj/doors/Dooreng.dmi' + icon = 'icons/obj/doors/airlocks/station/engineering.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_eng /obj/machinery/door/airlock/medical - icon = 'icons/obj/doors/Doormed.dmi' + icon = 'icons/obj/doors/airlocks/station/medical.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_med /obj/machinery/door/airlock/maintenance name = "maintenance access" - icon = 'icons/obj/doors/Doormaint.dmi' + icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_mai +/obj/machinery/door/airlock/maintenance/external + name = "external airlock access" + icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_extmai + /obj/machinery/door/airlock/mining name = "mining airlock" - icon = 'icons/obj/doors/Doormining.dmi' + icon = 'icons/obj/doors/airlocks/station/mining.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_min /obj/machinery/door/airlock/atmos name = "atmospherics airlock" - icon = 'icons/obj/doors/Dooratmo.dmi' + icon = 'icons/obj/doors/airlocks/station/atmos.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_atmo /obj/machinery/door/airlock/research - icon = 'icons/obj/doors/Doorresearch.dmi' + icon = 'icons/obj/doors/airlocks/station/research.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_research /obj/machinery/door/airlock/freezer name = "freezer airlock" - icon = 'icons/obj/doors/Doorfreezer.dmi' + icon = 'icons/obj/doors/airlocks/station/freezer.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_fre /obj/machinery/door/airlock/science - icon = 'icons/obj/doors/Doorsci.dmi' + icon = 'icons/obj/doors/airlocks/station/science.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_science ////////////////////////////////// @@ -51,53 +56,49 @@ Station Airlocks Glass */ -/obj/machinery/door/airlock/glass_command - icon = 'icons/obj/doors/Doorcomglass.dmi' +/obj/machinery/door/airlock/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_com - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_engineering - icon = 'icons/obj/doors/Doorengglass.dmi' +/obj/machinery/door/airlock/command/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_eng - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_security - icon = 'icons/obj/doors/Doorsecglass.dmi' +/obj/machinery/door/airlock/engineering/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_sec - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_medical - icon = 'icons/obj/doors/Doormedglass.dmi' +/obj/machinery/door/airlock/security/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_med - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_research - icon = 'icons/obj/doors/Doorresearchglass.dmi' +/obj/machinery/door/airlock/medical/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_research - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_mining - icon = 'icons/obj/doors/Doorminingglass.dmi' +/obj/machinery/door/airlock/research/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_min - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_atmos - icon = 'icons/obj/doors/Dooratmoglass.dmi' +/obj/machinery/door/airlock/mining/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_atmo - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_science - icon = 'icons/obj/doors/Doorsciglass.dmi' +/obj/machinery/door/airlock/atmos/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_science - glass = 1 + glass = TRUE + +/obj/machinery/door/airlock/science/glass + opacity = 0 + glass = TRUE + +/obj/machinery/door/airlock/maintenance/glass + opacity = 0 + glass = TRUE + +/obj/machinery/door/airlock/maintenance/external/glass + opacity = 0 + glass = TRUE ////////////////////////////////// /* @@ -106,24 +107,37 @@ /obj/machinery/door/airlock/gold name = "gold airlock" - icon = 'icons/obj/doors/Doorgold.dmi' - mineral = "gold" + icon = 'icons/obj/doors/airlocks/station/gold.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_gold + +/obj/machinery/door/airlock/gold/glass + opacity = 0 + glass = TRUE /obj/machinery/door/airlock/silver name = "silver airlock" - icon = 'icons/obj/doors/Doorsilver.dmi' - mineral = "silver" + icon = 'icons/obj/doors/airlocks/station/silver.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_silver + +/obj/machinery/door/airlock/silver/glass + opacity = 0 + glass = TRUE /obj/machinery/door/airlock/diamond name = "diamond airlock" - icon = 'icons/obj/doors/Doordiamond.dmi' - mineral = "diamond" + icon = 'icons/obj/doors/airlocks/station/diamond.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_diamond + explosion_block = 2 + +/obj/machinery/door/airlock/diamond/glass + opacity = 0 + glass = TRUE /obj/machinery/door/airlock/uranium name = "uranium airlock" desc = "And they said I was crazy." - icon = 'icons/obj/doors/Dooruranium.dmi' - mineral = "uranium" + icon = 'icons/obj/doors/airlocks/station/uranium.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_uranium var/event_step = 20 /obj/machinery/door/airlock/uranium/New() @@ -136,11 +150,15 @@ L.apply_effect(15,IRRADIATE,0) addtimer(src, "radiate", event_step) +/obj/machinery/door/airlock/uranium/glass + opacity = 0 + glass = TRUE + /obj/machinery/door/airlock/plasma name = "plasma airlock" desc = "No way this can end badly." - icon = 'icons/obj/doors/Doorplasma.dmi' - mineral = "plasma" + icon = 'icons/obj/doors/airlocks/station/plasma.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_plasma /obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) @@ -152,23 +170,46 @@ /obj/machinery/door/airlock/plasma/proc/PlasmaBurn(temperature) atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 500) - new/obj/structure/door_assembly(loc) + var/obj/structure/door_assembly/DA + DA = new /obj/structure/door_assembly(loc) + if(glass) + DA.glass = TRUE + if(heat_proof) + DA.heat_proof_finished = TRUE + DA.update_icon() + DA.update_name() qdel(src) +/obj/machinery/door/airlock/plasma/attackby(obj/C, mob/user, params) + if(is_hot(C) > 300) + message_admins("Plasma airlock ignited by [key_name_admin(user)] in ([x],[y],[z] - JMP)") + log_game("Plasma airlock ignited by [key_name(user)] in ([x],[y],[z])") + investigate_log("was ignited by [key_name(user)]","atmos") + ignite(is_hot(C)) + ..() + /obj/machinery/door/airlock/plasma/BlockSuperconductivity() //we don't stop the heat~ return 0 +/obj/machinery/door/airlock/plasma/glass + opacity = 0 + glass = TRUE + /obj/machinery/door/airlock/bananium name = "bananium airlock" - icon = 'icons/obj/doors/Doorbananium.dmi' - mineral = "bananium" + desc = "Honkhonkhonk" + icon = 'icons/obj/doors/airlocks/station/bananium.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_bananium doorOpen = 'sound/items/bikehorn.ogg' doorClose = 'sound/items/bikehorn.ogg' +/obj/machinery/door/airlock/bananium/glass + opacity = 0 + glass = TRUE + /obj/machinery/door/airlock/tranquillite name = "tranquillite airlock" - icon = 'icons/obj/doors/Doorfreezer.dmi' - mineral = "tranquillite" + icon = 'icons/obj/doors/airlocks/station/freezer.dmi' doorOpen = null // it's silent! doorClose = null doorDeni = null @@ -177,21 +218,45 @@ /obj/machinery/door/airlock/sandstone name = "sandstone airlock" - icon = 'icons/obj/doors/Doorsand.dmi' - mineral = "sandstone" + icon = 'icons/obj/doors/airlocks/station/sandstone.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_sandstone + +/obj/machinery/door/airlock/sandstone/glass + opacity = 0 + glass = TRUE + +/obj/machinery/door/airlock/wood + name = "wooden airlock" + icon = 'icons/obj/doors/airlocks/station/wood.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_wood + +/obj/machinery/door/airlock/wood/glass + opacity = 0 + glass = TRUE + +/obj/machinery/door/airlock/titanium + name = "shuttle airlock" + assemblytype = /obj/structure/door_assembly/door_assembly_titanium + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + +/obj/machinery/door/airlock/titanium/glass + opacity = 0 + glass = TRUE ////////////////////////////////// /* Station2 Airlocks */ -/obj/machinery/door/airlock/glass - name = "glass airlock" - icon = 'icons/obj/doors/Doorglass.dmi' +/obj/machinery/door/airlock/public + icon = 'icons/obj/doors/airlocks/station2/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_public + +/obj/machinery/door/airlock/public/glass opacity = 0 - glass = 1 - doorOpen = 'sound/machines/windowdoor.ogg' - doorClose = 'sound/machines/windowdoor.ogg' + glass = TRUE ////////////////////////////////// /* @@ -200,19 +265,27 @@ /obj/machinery/door/airlock/external name = "external airlock" - icon = 'icons/obj/doors/Doorext.dmi' + icon = 'icons/obj/doors/airlocks/external/external.dmi' + overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_ext doorOpen = 'sound/machines/airlock_ext_open.ogg' doorClose = 'sound/machines/airlock_ext_close.ogg' +/obj/machinery/door/airlock/external/glass + opacity = 0 + glass = TRUE + ////////////////////////////////// /* CentCom Airlocks */ /obj/machinery/door/airlock/centcom - icon = 'icons/obj/doors/Doorele.dmi' + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' opacity = 0 + explosion_block = 2 assemblytype = /obj/structure/door_assembly/door_assembly_centcom ////////////////////////////////// @@ -222,7 +295,8 @@ /obj/machinery/door/airlock/vault name = "vault door" - icon = 'icons/obj/doors/vault.dmi' + icon = 'icons/obj/doors/airlocks/vault/vault.dmi' + overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_vault explosion_block = 2 @@ -233,7 +307,9 @@ /obj/machinery/door/airlock/hatch name = "airtight hatch" - icon = 'icons/obj/doors/Doorhatchele.dmi' + icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_hatch /obj/machinery/door/airlock/hatch/syndicate @@ -255,9 +331,37 @@ unacidable = 1 is_special = 1 +/obj/machinery/door/airlock/hatch/gamma/attackby(obj/C, mob/user, params) + if(!issilicon(user)) + if(isElectrified()) + if(shock(user, 75)) + return + if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) + return + + if(istype(C, /obj/item/weapon/grenade/plastic/c4)) + to_chat(user, "The hatch is coated with a product that prevents the shaped charge from sticking!") + return + + if(istype(C, /obj/item/mecha_parts/mecha_equipment/rcd) || istype(C, /obj/item/weapon/rcd)) + to_chat(user, "The hatch is made of an advanced compound that cannot be deconstructed using an RCD.") + return + + add_fingerprint(user) + if((iswelder(C) && !operating && density)) + var/obj/item/weapon/weldingtool/W = C + if(W.remove_fuel(0,user)) + welded = !welded + update_icon() + return + else + return + /obj/machinery/door/airlock/maintenance_hatch name = "maintenance hatch" - icon = 'icons/obj/doors/Doorhatchmaint2.dmi' + icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi' + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_mhatch ////////////////////////////////// @@ -267,7 +371,8 @@ /obj/machinery/door/airlock/highsecurity name = "high tech security airlock" - icon = 'icons/obj/doors/hightechsecurity.dmi' + icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi' + overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity explosion_block = 2 @@ -276,6 +381,27 @@ hackProof = 1 aiControlDisabled = 1 +/obj/machinery/door/airlock/highsecurity/red/attackby(obj/C, mob/user, params) + if(!issilicon(user)) + if(isElectrified()) + if(shock(user, 75)) + return + if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) + return + + add_fingerprint(user) + if((iswelder(C) && !operating && density)) + var/obj/item/weapon/weldingtool/W = C + if(W.remove_fuel(0,user)) + if(!welded) + welded = 1 + else + welded = null + update_icon() + return + else + return + ////////////////////////////////// /* Shuttle Airlocks @@ -283,9 +409,25 @@ /obj/machinery/door/airlock/shuttle name = "shuttle airlock" - icon = 'icons/obj/doors/doorshuttle.dmi' + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_shuttle +/obj/machinery/door/airlock/shuttle/glass + opacity = 0 + glass = TRUE + +/obj/machinery/door/airlock/abductor + name = "alien airlock" + desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?" + icon = 'icons/obj/doors/airlocks/abductor/abductor_airlock.dmi' + overlays_file = 'icons/obj/doors/airlocks/abductor/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_abductor + explosion_block = 3 + hackProof = TRUE + aiControlDisabled = 1 + ////////////////////////////////// /* Cult Airlocks @@ -293,33 +435,35 @@ /obj/machinery/door/airlock/cult name = "cult airlock" - icon = 'icons/obj/doors/doorcult.dmi' + icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi' + overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_cult - hackProof = 1 - aiControlDisabled = 1 + hackProof = TRUE + aiControlDisabled = TRUE + var/openingoverlaytype = /obj/effect/temp_visual/cult/door var/friendly = FALSE /obj/machinery/door/airlock/cult/New() ..() + new openingoverlaytype(loc) /obj/machinery/door/airlock/cult/canAIControl(mob/user) - return (iscultist(user)) + return (iscultist(user) && !isAllPowerLoss()) -/obj/machinery/door/airlock/cult/allowed(mob/M) +/obj/machinery/door/airlock/cult/allowed(mob/living/L) if(!density) return 1 - if(friendly || \ - iscultist(M) || \ - istype(M, /mob/living/simple_animal/shade) || \ - istype(M, /mob/living/simple_animal/construct)) + if(friendly || iscultist(L) || isshade(L)|| isconstruct(L)) + new openingoverlaytype(loc) return 1 else + new /obj/effect/temp_visual/cult/sac(loc) var/atom/throwtarget - throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(M, src))) - M << pick(sound('sound/hallucinations/turn_around1.ogg',0,1,50), sound('sound/hallucinations/turn_around2.ogg',0,1,50)) - M.Weaken(2) + throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src))) + L << pick(sound('sound/hallucinations/turn_around1.ogg',0,1,50), sound('sound/hallucinations/turn_around2.ogg',0,1,50)) + L.Weaken(2) spawn(0) - M.throw_at(throwtarget, 5, 1,src) + L.throw_at(throwtarget, 5, 1,src) return 0 /obj/machinery/door/airlock/cult/narsie_act() @@ -328,6 +472,29 @@ /obj/machinery/door/airlock/cult/friendly friendly = TRUE +/obj/machinery/door/airlock/cult/glass + glass = TRUE + opacity = 0 + +/obj/machinery/door/airlock/cult/glass/friendly + friendly = TRUE + +/obj/machinery/door/airlock/cult/unruned + icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' + overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned + openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned + +/obj/machinery/door/airlock/cult/unruned/friendly + friendly = TRUE + +/obj/machinery/door/airlock/cult/unruned/glass + glass = TRUE + opacity = 0 + +/obj/machinery/door/airlock/cult/unruned/glass/friendly + friendly = TRUE + ////////////////////////////////// /* Misc Airlocks @@ -335,11 +502,17 @@ //Terribly sorry for the code doubling, but things go derpy otherwise. /obj/machinery/door/airlock/multi_tile + name = "large airlock" + dir = EAST width = 2 + icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi' + overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' + assemblytype = "obj/structure/door_assembly/multi_tile" + +/obj/machinery/door/airlock/multi_tile/narsie_act() + return /obj/machinery/door/airlock/multi_tile/glass - name = "large glass airlock" - icon = 'icons/obj/doors/Door2x1glass.dmi' opacity = 0 - glass = 1 - assemblytype = "obj/structure/door_assembly/multi_tile" + glass = TRUE diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 839fb387ddb..cdada603a9b 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -1,6 +1,7 @@ /obj/machinery/door/airlock/alarmlock name = "glass alarm airlock" - icon = 'icons/obj/doors/Doorglass.dmi' + icon = 'icons/obj/doors/airlocks/station2/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' opacity = 0 glass = 1 autoclose = 0 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index db63d48935f..842b08b577c 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -1,6 +1,3 @@ -#define DOOR_OPEN_LAYER 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6 -#define DOOR_CLOSED_LAYER 3.1 //Above most items if closed - /obj/machinery/door name = "door" desc = "It opens and closes." @@ -9,12 +6,11 @@ anchored = 1 opacity = 1 density = 1 - layer = DOOR_OPEN_LAYER + layer = OPEN_DOOR_LAYER power_channel = ENVIRON - var/open_layer = DOOR_OPEN_LAYER - var/closed_layer = DOOR_CLOSED_LAYER + var/open_layer = OPEN_DOOR_LAYER + var/closed_layer = CLOSED_DOOR_LAYER var/visible = 1 - var/p_open = 0 var/operating = 0 var/autoclose = 0 var/autoclose_timer @@ -30,15 +26,14 @@ var/block_air_zones = 1 //If set, air zones cannot merge across the door even when it is opened. //Multi-tile doors - dir = EAST var/width = 1 /obj/machinery/door/New() . = ..() if(density) - layer = closed_layer + layer = closed_layer //Above most items if closed else - layer = open_layer + layer = open_layer //Under all objects if opened. 2.7 due to tables being at 2.6 update_dir() update_freelook_sight() @@ -72,7 +67,7 @@ return ..() /obj/machinery/door/Bumped(atom/AM) - if(p_open || operating || emagged) + if(panel_open || operating || emagged) return if(isliving(AM)) var/mob/living/M = AM @@ -218,12 +213,12 @@ /obj/machinery/door/proc/do_animate(animation) switch(animation) if("opening") - if(p_open) + if(panel_open) flick("o_doorc0", src) else flick("doorc0", src) if("closing") - if(p_open) + if(panel_open) flick("o_doorc1", src) else flick("doorc1", src) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 947bcf6059d..fc0fc16d9cf 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -27,7 +27,7 @@ var/active_alarm = FALSE /obj/machinery/door/firedoor/Bumped(atom/AM) - if(p_open || operating) + if(panel_open || operating) return if(!density) return ..() diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 7e483c3bfc5..d64b08efedf 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -101,6 +101,7 @@ /obj/machinery/door/poddoor/multi_tile // Whoever wrote the old code for multi-tile spesspod doors needs to burn in hell. name = "large pod door" + layer = CLOSED_DOOR_LAYER /obj/machinery/door/poddoor/multi_tile/four_tile_ver/ icon = 'icons/obj/doors/1x4blast_vert.dmi' @@ -130,4 +131,4 @@ /obj/machinery/door/poddoor/multi_tile/two_tile_hor/ icon = 'icons/obj/doors/1x2blast_hor.dmi' width = 2 - dir = EAST \ No newline at end of file + dir = EAST diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 059c6268005..270d3a064e4 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -3,6 +3,7 @@ desc = "Heavy duty metal shutters that opens mechanically." icon = 'icons/obj/doors/rapid_pdoor.dmi' icon_state = "shutter1" + dir = EAST /obj/machinery/door/poddoor/shutters/New() ..() diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 3e3ff6fc67b..b9910e00997 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -6,6 +6,7 @@ visible = 0.0 flags = ON_BORDER opacity = 0 + dir = EAST var/obj/item/weapon/airlock_electronics/electronics = null var/base_state = "left" var/health = 150.0 //If you change this, consider changing ../door/window/brigdoor/ health at the bottom of this .dm file @@ -262,17 +263,17 @@ to_chat(user, "You need to open the door to access the maintenance panel.") return playsound(loc, I.usesound, 50, 1) - p_open = !p_open - to_chat(user, "You [p_open ? "open":"close"] the maintenance panel of the [name].") + panel_open = !panel_open + to_chat(user, "You [panel_open ? "open":"close"] the maintenance panel of the [name].") return if(iscrowbar(I)) - if(p_open && !density && !operating) + if(panel_open && !density && !operating) playsound(loc, I.usesound, 100, 1) user.visible_message("[user] removes the electronics from the [name].", \ "You start to remove electronics from the [name].") if(do_after(user, 40 * I.toolspeed, target = src)) - if(p_open && !density && !operating && loc) + if(panel_open && !density && !operating && loc) var/obj/structure/windoor_assembly/WA = new /obj/structure/windoor_assembly(loc) switch(base_state) if("left") diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index f7272e8e29a..a67580d0ebb 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -4,6 +4,7 @@ /datum/feed_message var/author = "" + var/title = "" var/body = "" var/message_type = "Story" var/backup_body = "" @@ -42,8 +43,10 @@ is_admin_channel = 0 total_view_count = 0 -/datum/feed_channel/proc/announce_news() - return "Breaking news from [channel_name]!" +/datum/feed_channel/proc/announce_news(title="") + if(title) + return "Breaking news from [channel_name]: [title]" + return "Breaking news from [channel_name]" /datum/feed_channel/station/announce_news() return "New Station Announcement Available" @@ -87,6 +90,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co // 1 = there has var/scanned_user = "Unknown" //Will contain the name of the person who currently uses the newscaster var/msg = "" //Feed message + var/msg_title = "" // Feed message title var/obj/item/weapon/photo/photo = null var/channel_name = "" //the feed channel which will be receiving the feed, or being created var/c_locked = 0 //Will our new channel be locked to public submissions? @@ -213,6 +217,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(3) data["scanned_user"] = scanned_user data["channel_name"] = channel_name + data["title"] = msg_title data["msg"] = msg data["photo"] = photo ? 1 : 0 if(4) @@ -236,7 +241,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/list/messages = list() data["messages"] = messages for(var/datum/feed_message/M in viewing_channel.messages) - messages[++messages.len] = list("body" = M.body, "img" = M.img ? icon2base64(M.img) : null, "message_type" = M.message_type, "author" = M.author, "view_count" = M.view_count) + messages[++messages.len] = list("title" = M.title, "body" = M.body, "img" = M.img ? icon2base64(M.img) : null, "message_type" = M.message_type, "author" = M.author, "view_count" = M.view_count) if(8, 9) data["channel_name"] = viewing_channel.channel_name data["ref"] = "\ref[viewing_channel]" @@ -247,7 +252,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/list/messages = list() data["messages"] = messages for(var/datum/feed_message/M in viewing_channel.messages) - messages[++messages.len] = list("body" = M.body, "body_redacted" = (M.body == REDACTED ? 1 : 0) , "message_type" = M.message_type, "author" = M.author, "author_redacted" = (M.author == REDACTED ? 1 : 0), "ref" = "\ref[M]", "view_count" = M.view_count) + messages[++messages.len] = list("title" = M.title, "body" = M.body, "body_redacted" = (M.body == REDACTED ? 1 : 0) , "message_type" = M.message_type, "author" = M.author, "author_redacted" = (M.author == REDACTED ? 1 : 0), "ref" = "\ref[M]", "view_count" = M.view_count) if(10) var/wanted_already = 0 var/end_param = 1 @@ -283,9 +288,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co return 1 if(href_list["set_channel_name"]) - channel_name = sanitizeSQL(strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", ""))) - while(findtext(channel_name," ") == 1) - channel_name = copytext(channel_name, 2, lentext(channel_name) + 1) + channel_name = trim(sanitize(strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")))) else if(href_list["set_channel_lock"]) c_locked = !c_locked @@ -333,10 +336,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co available_channels += F.channel_name channel_name = strip_html_simple(input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels) + else if(href_list["set_message_title"]) + msg_title = trim(strip_html(input(usr, "Write a title for your feed story", "Network Channel Handler", ""))) + msg_title = dd_limittext(msg_title, 256) + else if(href_list["set_new_message"]) - msg = strip_html(input(usr, "Write your feed story", "Network Channel Handler", "")) - while(findtext(msg, " ") == 1) - msg = copytext(msg, 2, lentext(msg) + 1) + msg = trim(strip_html(input(usr, "Write your feed story", "Network Channel Handler", ""))) else if(href_list["set_attachment"]) AttachPhoto(usr) @@ -355,6 +360,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else var/datum/feed_message/newMsg = new /datum/feed_message newMsg.author = scanned_user + newMsg.title = msg_title newMsg.body = msg if(photo) newMsg.img = photo.img @@ -363,7 +369,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/feed_channel/FC in news_network.network_channels) if(FC.channel_name == channel_name) FC.messages += newMsg //Adding message to the network's appropriate feed_channel - announcement = FC.announce_news() + announcement = FC.announce_news(msg_title) break temp = "Feed story successfully submitted to [channel_name]." temp_back_screen = NEWSCASTER_MAIN @@ -408,14 +414,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co screen = NEWSCASTER_W_ISSUE_H else if(href_list["set_wanted_name"]) - channel_name = strip_html(input(usr, "Provide the name of the wanted person", "Network Security Handler", "")) - while(findtext(channel_name, " ") == 1) - channel_name = copytext(channel_name, 2, lentext(channel_name) + 1) + channel_name = trim(strip_html(input(usr, "Provide the name of the wanted person", "Network Security Handler", ""))) else if(href_list["set_wanted_desc"]) - msg = strip_html(input(usr, "Provide the a description of the wanted person and any other details you deem important", "Network Security Handler", "")) - while(findtext(msg, " ") == 1) - msg = copytext(msg, 2, lentext(msg) + 1) + msg = trim(strip_html(input(usr, "Provide the a description of the wanted person and any other details you deem important", "Network Security Handler", ""))) else if(href_list["submit_wanted"]) var/input_param = text2num(href_list["submit_wanted"]) @@ -534,6 +536,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(screen == NEWSCASTER_MAIN) scanned_user = "Unknown" msg = "" + msg_title = "" c_locked = 0 channel_name = "" viewing_channel = null @@ -687,7 +690,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/i = 0 for(var/datum/feed_message/MESSAGE in C.messages) i++ - dat+="-[MESSAGE.body]
" + dat+="[MESSAGE.title]
" + dat+="[MESSAGE.body]
" if(MESSAGE.img) user << browse_rsc(MESSAGE.img, "tmp_photo[i].png") dat+="
" diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 9cf58846feb..43fda1c6e00 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -24,7 +24,7 @@ var/const/SAFETY_COOLDOWN = 100 component_parts += new /obj/item/weapon/circuitboard/recycler(null) component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) component_parts += new /obj/item/weapon/stock_parts/manipulator(null) - materials = new /datum/material_container(src, list(MAT_METAL=1, MAT_GLASS=1, MAT_SILVER=1, MAT_GOLD=1, MAT_DIAMOND=1, MAT_PLASMA=1, MAT_URANIUM=1, MAT_BANANIUM=1, MAT_TRANQUILLITE=1)) + materials = new /datum/material_container(src, list(MAT_METAL=1, MAT_GLASS=1, MAT_SILVER=1, MAT_GOLD=1, MAT_DIAMOND=1, MAT_PLASMA=1, MAT_URANIUM=1, MAT_BANANIUM=1, MAT_TRANQUILLITE=1, MAT_TITANIUM=1)) RefreshParts() update_icon() diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 1cf769624e9..21f22866eb5 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -19,7 +19,8 @@ MAT_GOLD=0, MAT_PLASMA=0, MAT_SILVER=0, - MAT_URANIUM=0 + MAT_URANIUM=0, + MAT_TITANIUM=0 ) var/res_max_amount = 200000 var/datum/research/files @@ -435,6 +436,8 @@ type = /obj/item/stack/sheet/mineral/bananium if(MAT_TRANQUILLITE) type = /obj/item/stack/sheet/mineral/tranquillite + if(MAT_TITANIUM) + type = /obj/item/stack/sheet/mineral/titanium else return 0 var/result = 0 @@ -492,6 +495,8 @@ material = MAT_TRANQUILLITE if(/obj/item/stack/sheet/mineral/uranium) material = MAT_URANIUM + if(/obj/item/stack/sheet/mineral/titanium) + material = MAT_TITANIUM else return ..() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 3ab3d0e154b..63fc5a47168 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -98,8 +98,8 @@ log_message("[src] created.") mechas_list += src //global mech list prepare_huds() - var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC] - diag_hud.add_to_hud(src) + for(var/datum/atom_hud/data/diagnostic/diag_hud in huds) + diag_hud.add_to_hud(src) diag_hud_set_mechhealth() diag_hud_set_mechcell() diag_hud_set_mechstat() diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index a3c2bc2c649..8bc9b6c42d5 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -6,6 +6,10 @@ bloodiness = MAX_SHOE_BLOODINESS blood_state = BLOOD_STATE_XENO +/obj/effect/decal/cleanable/blood/xeno/splatter + random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5") + amount = 2 + /obj/effect/decal/cleanable/blood/gibs/xeno name = "xeno gibs" desc = "Gnarly..." diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index a3582ef0874..5bce827604c 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -58,4 +58,4 @@ /obj/effect/decal/cleanable/blood/oil/streak random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5") - amount = 2 \ No newline at end of file + amount = 2 diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index a0a4417de4e..830d12cfd12 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -40,6 +40,11 @@ icon = 'icons/misc/beach.dmi' icon_state = "coconuts" +/obj/effect/overlay/sparkles + name = "sparkles" + icon = 'icons/effects/effects.dmi' + icon_state = "shieldsparkles" + /obj/effect/overlay/adminoverlay name = "adminoverlay" icon = 'icons/effects/effects.dmi' diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 61f27730d77..8a82d3cd73a 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -284,3 +284,19 @@ obj/item/device/flashlight/lamp/bananalamp else to_chat(user, "\The [src] needs time to recharge!") return + +/obj/item/device/flashlight/spotlight //invisible lighting source + name = "disco light" + desc = "Groovy..." + icon_state = null + light_color = null + brightness_on = 0 + light_range = 0 + light_power = 10 + alpha = 0 + layer = 0 + on = TRUE + anchored = TRUE + var/range = null + unacidable = TRUE + burn_state = LAVA_PROOF \ No newline at end of file diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 75b2ad94d95..3c9be2c67de 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -1,4 +1,6 @@ /obj/item/flag + name = "flag" + desc = "It's a flag." icon = 'icons/obj/flag.dmi' icon_state = "ntflag" lefthand_file = 'icons/mob/inhands/flags_lefthand.dmi' @@ -6,13 +8,19 @@ w_class = WEIGHT_CLASS_BULKY burntime = 20 burn_state = FLAMMABLE + var/rolled = FALSE /obj/item/flag/attackby(obj/item/weapon/W, mob/user, params) ..() if(is_hot(W) && burn_state != ON_FIRE) - user.visible_message("[user] lights the [name] with [W].") + user.visible_message("[user] lights [src] with [W].", "You light [src] with [W].", "You hear a low whoosh.") fire_act() +/obj/item/flag/attack_self(mob/user) + rolled = !rolled + user.visible_message("[user] [rolled ? "rolls up" : "unfurls"] [src].", "You [rolled ? "roll up" : "unfurl"] [src].", "You hear fabric rustling.") + update_icon() + /obj/item/flag/fire_act(global_overlay = FALSE) ..() update_icon() @@ -23,16 +31,24 @@ /obj/item/flag/update_icon() overlays.Cut() + updateFlagIcon() + item_state = icon_state + if(rolled) + icon_state = "[icon_state]_rolled" if(burn_state == ON_FIRE) + item_state = "[item_state]_fire" + if(burn_state == ON_FIRE && rolled) + overlays += image('icons/obj/flag.dmi', src , "fire_rolled") + else if(burn_state == ON_FIRE && !rolled) overlays += image('icons/obj/flag.dmi', src , "fire") - item_state = "[icon_state]_fire" - else - item_state = initial(icon_state) if(ismob(loc)) var/mob/M = loc M.update_inv_r_hand() M.update_inv_l_hand() +/obj/item/flag/proc/updateFlagIcon() + icon_state = initial(icon_state) + /obj/item/flag/nt name = "Nanotrasen flag" desc = "A flag proudly boasting the logo of NT." @@ -187,11 +203,16 @@ desc = "A poor recreation of the official NT flag. It seems to shimmer a little." icon_state = "ntflag" origin_tech = "syndicate=4;magnets=4" - var/used = 0 + var/updated_icon_state = null + var/used = FALSE + +/obj/item/flag/chameleon/New() + updated_icon_state = icon_state + ..() /obj/item/flag/chameleon/attack_self(mob/user) if(used) - return + return ..() var/list/flag_types = typesof(/obj/item/flag) - list(src.type, /obj/item/flag) var/list/flag = list() @@ -208,12 +229,16 @@ var/obj/item/flag/chosen_flag = flag[input_flag] - if(chosen_flag) + if(chosen_flag && !used) name = chosen_flag.name icon_state = chosen_flag.icon_state + updated_icon_state = icon_state desc = chosen_flag.desc - used = 1 + used = TRUE /obj/item/flag/chameleon/burn() explosion(loc,1,2,4,4, flame_range = 4) qdel(src) + +/obj/item/flag/chameleon/updateFlagIcon() + icon_state = updated_icon_state diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 92426b17688..3757faffba9 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -97,14 +97,14 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \ new/datum/stack_recipe("alien bed", /obj/structure/stool/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("alien table frame", /obj/structure/table_frame/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("alien airlock assembly", /obj/structure/door_assembly/door_assembly_abductor, 4, time = 20, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \ ) /obj/item/stack/sheet/mineral - force = 5.0 + force = 5 throwforce = 5 - w_class = WEIGHT_CLASS_NORMAL throw_speed = 3 /obj/item/stack/sheet/mineral/New() @@ -225,6 +225,56 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \ ..() recipes = tranquillite_recipes +/* + * Titanium + */ +/obj/item/stack/sheet/mineral/titanium + name = "titanium" + icon_state = "sheet-titanium" + singular_name = "titanium sheet" + force = 5 + throwforce = 5 + w_class = WEIGHT_CLASS_NORMAL + throw_speed = 1 + throw_range = 3 + sheettype = "titanium" + materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT) + +var/global/list/datum/stack_recipe/titanium_recipes = list ( + new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20), + ) + +/obj/item/stack/sheet/mineral/titanium/New(loc, amount=null) + recipes = titanium_recipes + ..() + +/obj/item/stack/sheet/mineral/titanium/fifty + amount = 50 + + +/* + * Plastitanium + */ +/obj/item/stack/sheet/mineral/plastitanium + name = "plastitanium" + icon_state = "sheet-plastitanium" + singular_name = "plastitanium sheet" + force = 5 + throwforce = 5 + w_class = WEIGHT_CLASS_NORMAL + throw_speed = 1 + throw_range = 3 + sheettype = "plastitanium" + materials = list(MAT_TITANIUM=2000, MAT_PLASMA=2000) + +var/global/list/datum/stack_recipe/plastitanium_recipes = list ( + new/datum/stack_recipe("plas-titanium tile", /obj/item/stack/tile/mineral/plastitanium, 1, 4, 20), + ) + +/obj/item/stack/sheet/mineral/plastitanium/New(loc, amount=null) + recipes = plastitanium_recipes + ..() + /obj/item/stack/sheet/mineral/enruranium name = "enriched uranium" icon_state = "sheet-enruranium" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 52cf7e10c69..ccfe2a47c22 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -61,6 +61,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list( null, new /datum/stack_recipe_list("airlock assemblies", list( new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("public airlock assembly", /obj/structure/door_assembly/door_assembly_public, 4, time = 50, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1), @@ -70,11 +71,12 @@ var/global/list/datum/stack_recipe/metal_recipes = list( new /datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("external maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_extmai, 4, time = 50, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1), - new /datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 8, time = 50, one_per_turf = 1, on_floor = 1), )), null, new /datum/stack_recipe("mass driver button frame", /obj/item/mounted/frame/driver_button, 1, time = 50, one_per_turf = 0, on_floor = 1), @@ -131,8 +133,8 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list( new /datum/stack_recipe("Mass Driver frame", /obj/machinery/mass_driver_frame, 3, time = 50, one_per_turf = 1), null, new /datum/stack_recipe_list("airlock assemblies", list( - new /datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 4, time = 50, one_per_turf = 1, on_floor = 1), - new /datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 6, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 6, time = 50, one_per_turf = 1, on_floor = 1), ), 4), ) @@ -142,7 +144,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list( desc = "This sheet is an alloy of iron and plasma." icon_state = "sheet-plasteel" item_state = "sheet-metal" - materials = list(MAT_METAL=6000, MAT_PLASMA=6000) + materials = list(MAT_METAL=2000, MAT_PLASMA=2000) throwforce = 10.0 flags = CONDUCT origin_tech = "materials=2" @@ -368,6 +370,7 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \ new/datum/stack_recipe("plastic ashtray", /obj/item/ashtray/plastic, 2, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("plastic fork", /obj/item/weapon/kitchen/utensil/pfork, 1, on_floor = 1), \ new/datum/stack_recipe("plastic spoon", /obj/item/weapon/kitchen/utensil/pspoon, 1, on_floor = 1), \ + new/datum/stack_recipe("plastic spork", /obj/item/weapon/kitchen/utensil/pspork, 1, on_floor = 1), \ new/datum/stack_recipe("plastic knife", /obj/item/weapon/kitchen/knife/plastic, 1, on_floor = 1), \ new/datum/stack_recipe("plastic bag", /obj/item/weapon/storage/bag/plasticbag, 3, on_floor = 1), \ new/datum/stack_recipe("bear mould", /obj/item/weapon/kitchen/mould/bear, 1, on_floor = 1), \ diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index 8e830f27407..86590026f53 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -111,4 +111,22 @@ var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \ icon_state = "tile_abductor" origin_tech = "materials=6;abductor=1" turf_type = /turf/simulated/floor/mineral/abductor - mineralType = "abductor" \ No newline at end of file + mineralType = "abductor" + +/obj/item/stack/tile/mineral/titanium + name = "titanium tile" + singular_name = "titanium floor tile" + desc = "A tile made of titanium, used for shuttles." + icon_state = "tile_shuttle" + turf_type = /turf/simulated/floor/mineral/titanium + mineralType = "titanium" + materials = list(MAT_TITANIUM=500) + +/obj/item/stack/tile/mineral/plastitanium + name = "plas-titanium tile" + singular_name = "plas-titanium floor tile" + desc = "A tile made of plas-titanium, used for very evil shuttles." + icon_state = "tile_darkshuttle" + turf_type = /turf/simulated/floor/mineral/plastitanium + mineralType = "plastitanium" + materials = list(MAT_TITANIUM=250, MAT_PLASMA=250) \ No newline at end of file diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 2c23c6ae2b0..4979b94eb92 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -209,6 +209,7 @@ force_wielded = 0 origin_tech = null attack_verb = list("attacked", "struck", "hit") + brightness_on = 0 /obj/item/weapon/twohanded/dualsaber/toy/hit_reaction() return 0 diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index b053c48b893..cc905783223 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -34,18 +34,22 @@ RCD var/list/door_accesses_list = list() var/one_access var/locked = 1 - var/static/list/allowed_door_types = list(/obj/machinery/door/airlock = "Standard", - /obj/machinery/door/airlock/command = "Command", /obj/machinery/door/airlock/security = "Security", - /obj/machinery/door/airlock/engineering = "Engineering", /obj/machinery/door/airlock/medical = "Medical", - /obj/machinery/door/airlock/maintenance = "Maintenance", /obj/machinery/door/airlock/external = "External", - /obj/machinery/door/airlock/glass = "Standard (Glass)", /obj/machinery/door/airlock/freezer = "Freezer", - /obj/machinery/door/airlock/glass_command = "Command (Glass)", /obj/machinery/door/airlock/glass_engineering = "Engineering (Glass)", - /obj/machinery/door/airlock/glass_security = "Security (Glass)", /obj/machinery/door/airlock/glass_medical = "Medical (Glass)", - /obj/machinery/door/airlock/mining = "Mining", /obj/machinery/door/airlock/atmos = "Atmospherics", - /obj/machinery/door/airlock/research = "Research", /obj/machinery/door/airlock/glass_research = "Research (Glass)", - /obj/machinery/door/airlock/glass_mining = "Mining (Glass)", /obj/machinery/door/airlock/glass_atmos = "Atmospherics (Glass)", - /obj/machinery/door/airlock/science = "Science", /obj/machinery/door/airlock/glass_science = "Science (Glass)", - /obj/machinery/door/airlock/hatch = "Airtight Hatch", /obj/machinery/door/airlock/maintenance_hatch = "Maintenance Hatch") + var/static/list/allowed_door_types = list( + /obj/machinery/door/airlock = "Standard", /obj/machinery/door/airlock/glass = "Standard (Glass)", + /obj/machinery/door/airlock/command = "Command", /obj/machinery/door/airlock/command/glass = "Command (Glass)", + /obj/machinery/door/airlock/security = "Security", /obj/machinery/door/airlock/security/glass = "Security (Glass)", + /obj/machinery/door/airlock/engineering = "Engineering", /obj/machinery/door/airlock/engineering/glass = "Engineering (Glass)", + /obj/machinery/door/airlock/medical = "Medical", /obj/machinery/door/airlock/medical/glass = "Medical (Glass)", + /obj/machinery/door/airlock/maintenance = "Maintenance", /obj/machinery/door/airlock/maintenance/glass = "Maintenance (Glass)", + /obj/machinery/door/airlock/external = "External", /obj/machinery/door/airlock/external/glass = "External (Glass)", + /obj/machinery/door/airlock/maintenance/external = "External Maintenance", /obj/machinery/door/airlock/maintenance/external/glass = "External Maintenance (Glass)", + /obj/machinery/door/airlock/freezer = "Freezer", + /obj/machinery/door/airlock/mining = "Mining", /obj/machinery/door/airlock/mining/glass = "Mining (Glass)", + /obj/machinery/door/airlock/research = "Research", /obj/machinery/door/airlock/research/glass = "Research (Glass)", + /obj/machinery/door/airlock/atmos = "Atmospherics", /obj/machinery/door/airlock/atmos/glass = "Atmospherics (Glass)", + /obj/machinery/door/airlock/science = "Science", /obj/machinery/door/airlock/science/glass = "Science (Glass)", + /obj/machinery/door/airlock/hatch = "Airtight Hatch", + /obj/machinery/door/airlock/maintenance_hatch = "Maintenance Hatch") /obj/item/weapon/rcd/New() desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 650173d29eb..dbc0423da37 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -3,12 +3,18 @@ icon_state = "flashbang" item_state = "flashbang" origin_tech = "materials=2;combat=3" + light_power = 10 + light_color = LIGHT_COLOR_WHITE + var/light_time = 2 /obj/item/weapon/grenade/flashbang/prime() update_mob() var/flashbang_turf = get_turf(src) if(!flashbang_turf) return + + set_light(7) + for(var/mob/living/M in hearers(7, flashbang_turf)) bang(get_turf(M), M) @@ -16,7 +22,9 @@ var/damage = round(30/(get_dist(B,get_turf(src))+1)) B.health -= damage B.update_icon() - qdel(src) + + spawn(light_time) + qdel(src) /obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/M) M.show_message("BANG", 2) diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index 13b0f0b8140..fb10c7cedc2 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -1,70 +1,6 @@ //improvised explosives// -//iedcasing assembly crafting// -/obj/item/weapon/reagent_containers/food/drinks/cans/attackby(var/obj/item/I, mob/user as mob) - if(istype(I, /obj/item/device/assembly/igniter)) - var/obj/item/device/assembly/igniter/G = I - var/obj/item/weapon/grenade/iedcasing/W = new /obj/item/weapon/grenade/iedcasing - user.unEquip(G) - user.unEquip(src) - user.put_in_hands(W) - to_chat(user, "You stuff the [I] in the [src], emptying the contents beforehand.") - W.underlays += image(src.icon, icon_state = src.icon_state) - qdel(I) - qdel(src) - - /obj/item/weapon/grenade/iedcasing - name = "improvised explosive assembly" - desc = "An igniter stuffed into an aluminum shell." - w_class = WEIGHT_CLASS_SMALL - icon = 'icons/obj/grenade.dmi' - icon_state = "improvised_grenade" - item_state = "flashbang" - throw_speed = 3 - throw_range = 7 - flags = CONDUCT - slot_flags = SLOT_BELT - var/assembled = 0 - active = 1 - det_time = 50 - display_timer = 0 - var/range = 3 - var/times = list() - - - -/obj/item/weapon/grenade/iedcasing/afterattack(atom/target, mob/user , flag) //Filling up the can - if(assembled == 0) - if( istype(target, /obj/structure/reagent_dispensers/fueltank)) - if(target.reagents.total_volume < 50) - to_chat(user, "There's not enough fuel left to work with.") - return - var/obj/structure/reagent_dispensers/fueltank/F = target - F.reagents.remove_reagent("fuel", 50, 1)//Deleting 50 fuel from the welding fuel tank, - assembled = 1 - to_chat(user, "You've filled the makeshift explosive with welding fuel.") - playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) - desc = "An improvised explosive assembly. Filled to the brim with 'Explosive flavor'" - overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") - return - - -/obj/item/weapon/grenade/iedcasing/attackby(var/obj/item/I, mob/user as mob) //Wiring the can for ignition - if(istype(I, /obj/item/stack/cable_coil)) - if(assembled == 1) - var/obj/item/stack/cable_coil/C = I - C.use(1) - assembled = 2 - to_chat(user, "You wire the igniter to detonate the fuel.") - desc = "A weak, improvised explosive." - overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired") - name = "improvised explosive" - active = 0 - det_time = rand(30,80) - - -/obj/item/weapon/grenade/iedcasing/filled name = "improvised firebomb" desc = "A weak, improvised incendiary device." w_class = WEIGHT_CLASS_SMALL @@ -77,53 +13,53 @@ slot_flags = SLOT_BELT active = 0 det_time = 50 - assembled = 2 + display_timer = 0 + var/list/times - - -/obj/item/weapon/grenade/iedcasing/filled/New(loc) +/obj/item/weapon/grenade/iedcasing/New() ..() - overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") - overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired") - times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] + overlays += "improvised_grenade_filled" + overlays += "improvised_grenade_wired" + times = list("5" = 10, "-1" = 20, "[rand(30, 80)]" = 50, "[rand(65, 180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] det_time = text2num(pickweight(times)) if(det_time < 0) //checking for 'duds' - range = 1 det_time = rand(30,80) - else - range = pick(2,2,2,3,3,3,4) /obj/item/weapon/grenade/iedcasing/CheckParts(list/parts_list) ..() var/obj/item/weapon/reagent_containers/food/drinks/cans/can = locate() in contents if(can) - underlays += can + can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED + can.pixel_y = 0 + var/mutable_appearance/can_underlay = new(can) + can_underlay.layer = FLOAT_LAYER + can_underlay.plane = FLOAT_PLANE + underlays += can_underlay -/obj/item/weapon/grenade/iedcasing/attack_self(mob/user as mob) // +/obj/item/weapon/grenade/iedcasing/attack_self(mob/user) // if(!active) if(clown_check(user)) to_chat(user, "You light the [name]!") - active = 1 - overlays -= image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") + active = TRUE + overlays -= "improvised_grenade_filled" icon_state = initial(icon_state) + "_active" add_fingerprint(user) var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) - message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [A.name] (JMP)") - log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])") + message_admins("[ADMIN_LOOKUPFLW(user)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)].") + log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].") if(iscarbon(user)) var/mob/living/carbon/C = user C.throw_mode_on() - spawn(det_time) - prime() + addtimer(src, "prime", det_time) /obj/item/weapon/grenade/iedcasing/prime() //Blowing that can up update_mob() - explosion(src.loc,-1,-1,-1, flame_range = range) // no explosive damage, only a large fireball. + explosion(loc, -1, -1, 2, flame_range = 4) // small explosion, plus a very large fireball. qdel(src) /obj/item/weapon/grenade/iedcasing/examine(mob/user) - ..(user) + ..() to_chat(user, "You can't tell when it will explode!") diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 0b7850bba1f..24bcb7a8c2c 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -29,7 +29,7 @@ if(ishuman(C)) var/mob/living/carbon/human/H = C - if(!(H.get_organ("l_hand") || H.get_organ("r_hand"))) + if(!H.has_left_hand() || !H.has_right_hand()) to_chat(user, "How do you suggest handcuffing someone with no hands?") return diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 4bf40a3ae15..c2067935ee6 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -82,6 +82,18 @@ icon_state = "pspoon" attack_verb = list("attacked", "poked") +/obj/item/weapon/kitchen/utensil/spork + name = "spork" + desc = "It's a spork. Marvel at its innovative design." + icon_state = "spork" + attack_verb = list("attacked", "sporked") + +/obj/item/weapon/kitchen/utensil/pspork + name = "plastic spork" + desc = "It's a plastic spork. It's the fork side of the spoon!" + icon_state = "pspork" + attack_verb = list("attacked", "sporked") + /* * Knives */ diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 21845a47515..21d8828310f 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -52,23 +52,12 @@ if(sig) to_chat(user, "This beartrap already has a signaler hooked up to it!") return - IED = I - switch(IED.assembled) - if(0,1) //if it's not fueled/hooked up - to_chat(user, "You haven't prepared this IED yet!") - IED = null - return - if(2,3) - user.drop_item() - I.forceMove(src) - message_admins("[key_name_admin(user)] has rigged a beartrap with an IED.") - log_game("[key_name(user)] has rigged a beartrap with an IED.") - to_chat(user, "You sneak the [IED] underneath the pressure plate and connect the trigger wire.") - desc = "A trap used to catch bears and other legged creatures. There is an IED hooked up to it." - else - to_chat(user, "You shouldn't be reading this message! Contact a coder or someone, something broke!") - IED = null - return + user.drop_item() + I.forceMove(src) + message_admins("[key_name_admin(user)] has rigged a beartrap with an IED.") + log_game("[key_name(user)] has rigged a beartrap with an IED.") + to_chat(user, "You sneak [IED] underneath the pressure plate and connect the trigger wire.") + desc = "A trap used to catch bears and other legged creatures. There is an IED hooked up to it." if(istype(I, /obj/item/device/assembly/signaler)) if(IED) to_chat(user, "This beartrap already has an IED hooked up to it!") @@ -110,9 +99,6 @@ if(IED && isturf(src.loc)) IED.active = 1 - IED.overlays -= image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") - IED.icon_state = initial(icon_state) + "_active" - IED.assembled = 3 message_admins("[key_name_admin(usr)] has triggered an IED-rigged [name].") log_game("[key_name(usr)] has triggered an IED-rigged [name].") spawn(IED.det_time) @@ -127,7 +113,7 @@ H.apply_damage(trap_damage, BRUTE,"chest") else H.apply_damage(trap_damage, BRUTE,(pick("l_leg", "r_leg"))) - if(!H.legcuffed) //beartrap can't cuff you leg if there's already a beartrap or legcuffs. + if(!H.legcuffed && H.get_num_legs() >= 2) //beartrap can't cuff you leg if there's already a beartrap or legcuffs. H.legcuffed = src forceMove(H) H.update_inv_legcuffed() diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 1c4ff92708a..16b8d302c7f 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -9,7 +9,10 @@ hitsound = 'sound/weapons/blade1.ogg' // Probably more appropriate than the previous hitsound. -- Dave usesound = 'sound/weapons/blade1.ogg' toolspeed = 1 - + light_power = 2 + var/brightness_on = 2 + var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE) + /obj/item/weapon/melee/energy/suicide_act(mob/user) user.visible_message(pick("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \ "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.")) @@ -29,8 +32,10 @@ attack_verb = attack_verb_on if(!item_color) icon_state = icon_state_on + set_light(brightness_on) else icon_state = "sword[item_color]" + set_light(brightness_on, l_color=colormap[item_color]) w_class = w_class_on playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness to_chat(user, "[src] is now active.") @@ -44,6 +49,7 @@ icon_state = initial(icon_state) w_class = initial(w_class) playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness + set_light(0) to_chat(user, "[src] can now be concealed.") if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user @@ -71,6 +77,7 @@ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") attack_verb_on = list() sharp = 1 + light_color = LIGHT_COLOR_WHITE /obj/item/weapon/melee/energy/axe/suicide_act(mob/user) user.visible_message("[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.") @@ -92,7 +99,6 @@ block_chance = 50 sharp = 1 var/hacked = 0 - var/blade_color /obj/item/weapon/melee/energy/sword/New() if(item_color == null) @@ -129,6 +135,7 @@ hitcost = 75 //Costs more than a standard cyborg esword item_color = null w_class = WEIGHT_CLASS_NORMAL + light_color = LIGHT_COLOR_WHITE /obj/item/weapon/melee/energy/sword/cyborg/saw/New() ..() @@ -192,6 +199,7 @@ desc = "Arrrr matey." icon_state = "cutlass0" icon_state_on = "cutlass1" + light_color = LIGHT_COLOR_RED /obj/item/weapon/melee/energy/sword/pirate/New() return @@ -224,4 +232,4 @@ name = "hardlight blade" desc = "An extremely sharp blade made out of hard light. Packs quite a punch." icon_state = "lightblade" - item_state = "lightblade" \ No newline at end of file + item_state = "lightblade" diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 22c4acbf098..31ba83fc444 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -58,7 +58,7 @@ icon_state = "drill_bolt" item_state = "drill" usesound = 'sound/items/drill_use.ogg' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_GOLD=25) + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get force = 8 //might or might not be too high, subject to change throwforce = 8 @@ -180,7 +180,7 @@ desc = "A simple hand drill with a screwdriver bit attached." icon_state = "drill_screw" item_state = "drill" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_GOLD=25) + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get force = 8 //might or might not be too high, subject to change throwforce = 8 @@ -276,7 +276,7 @@ icon_state = "jaws_cutter" item_state = "jawsoflife" origin_tech = "materials=2;engineering=2" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_GOLD=25) + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) usesound = 'sound/items/jaws_cut.ogg' toolspeed = 0.25 @@ -691,7 +691,7 @@ obj/item/weapon/weldingtool/experimental/process() desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a prying head." icon_state = "jaws_pry" item_state = "jawsoflife" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_DIAMOND=25) + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) origin_tech = "materials=2;engineering=2" usesound = 'sound/items/jaws_pry.ogg' force = 15 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 5d1755dc9d3..96628da9a26 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -208,15 +208,21 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 75 sharp = 1 + light_power = 2 + var/brightness_on = 2 + var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE) /obj/item/weapon/twohanded/dualsaber/New() - blade_color = pick("red", "blue", "green", "purple") + if(!blade_color) + blade_color = pick("red", "blue", "green", "purple") /obj/item/weapon/twohanded/dualsaber/update_icon() if(wielded) icon_state = "dualsaber[blade_color][wielded]" + set_light(brightness_on, l_color=colormap[blade_color]) else icon_state = "dualsaber0" + set_light(0) /obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/user as mob) if(HULK in user.mutations) @@ -239,16 +245,16 @@ return ..() return 0 -/obj/item/weapon/twohanded/dualsaber/green/New() +/obj/item/weapon/twohanded/dualsaber/green blade_color = "green" -/obj/item/weapon/twohanded/dualsaber/red/New() +/obj/item/weapon/twohanded/dualsaber/red blade_color = "red" -/obj/item/weapon/twohanded/dualsaber/purple/New() +/obj/item/weapon/twohanded/dualsaber/purple blade_color = "purple" -/obj/item/weapon/twohanded/dualsaber/blue/New() +/obj/item/weapon/twohanded/dualsaber/blue blade_color = "blue" /obj/item/weapon/twohanded/dualsaber/unwield() diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 5b26b46eacd..b93ad13c98c 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -100,6 +100,14 @@ if(pickednum >= 40) new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max)) + //Titanium (rare ore) + if(pickednum >= 40) + new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max)) + + //Plastitanium (rare ore) + if(pickednum >= 40) + new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max)) + //Diamond (rare HONK) if(pickednum >= 45) new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max)) @@ -122,6 +130,8 @@ /obj/item/stack/sheet/mineral/uranium, /obj/item/stack/sheet/mineral/diamond, /obj/item/stack/sheet/mineral/bananium, + /obj/item/stack/sheet/mineral/titanium, + /obj/item/stack/sheet/mineral/plastitanium, /obj/item/stack/sheet/plasteel, /obj/item/stack/rods ) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 7292cc0b68c..60f5a4003c7 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -1,186 +1,56 @@ /obj/structure/door_assembly - icon = 'icons/obj/doors/door_assembly.dmi' name = "airlock assembly" - icon_state = "door_as_0" - anchored = 0 - density = 1 - var/state = 0 - var/base_icon_state = "" + icon = 'icons/obj/doors/airlocks/station/public.dmi' + icon_state = "construction" + anchored = FALSE + density = TRUE + var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' + var/state = AIRLOCK_ASSEMBLY_NEEDS_WIRES + var/mineral = null var/base_name = "airlock" var/obj/item/weapon/airlock_electronics/electronics = null - var/airlock_type = "" //the type path of the airlock once completed - var/glass_type = "/glass" - var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead. + var/airlock_type = /obj/machinery/door/airlock //the type path of the airlock once completed + var/glass_type = /obj/machinery/door/airlock/glass + var/glass = 0 // 0 = glass can be installed. 1 = glass is already installed. var/created_name = null var/heat_proof_finished = 0 //whether to heat-proof the finished airlock + var/previous_assembly = /obj/structure/door_assembly + var/noglass = FALSE //airlocks with no glass version, also cannot be modified with sheets var/material_type = /obj/item/stack/sheet/metal var/material_amt = 4 /obj/structure/door_assembly/New() - update_state() + update_icon() + update_name() + ..() /obj/structure/door_assembly/Destroy() QDEL_NULL(electronics) return ..() -/obj/structure/door_assembly/door_assembly_com - name = "command airlock assembly" - base_icon_state = "com" - base_name = "command airlock" - glass_type = "/glass_command" - airlock_type = "/command" - -/obj/structure/door_assembly/door_assembly_sec - name = "security airlock assembly" - base_icon_state = "sec" - base_name = "security airlock" - glass_type = "/glass_security" - airlock_type = "/security" - -/obj/structure/door_assembly/door_assembly_eng - name = "engineering airlock assembly" - base_icon_state = "eng" - base_name = "engineering airlock" - glass_type = "/glass_engineering" - airlock_type = "/engineering" - -/obj/structure/door_assembly/door_assembly_min - name = "mining airlock assembly" - base_icon_state = "min" - base_name = "mining airlock" - glass_type = "/glass_mining" - airlock_type = "/mining" - -/obj/structure/door_assembly/door_assembly_atmo - name = "atmospherics airlock assembly" - base_icon_state = "atmo" - base_name = "atmospherics airlock" - glass_type = "/glass_atmos" - airlock_type = "/atmos" - -/obj/structure/door_assembly/door_assembly_research - name = "research airlock assembly" - base_icon_state = "res" - base_name = "research airlock" - glass_type = "/glass_research" - airlock_type = "/research" - -/obj/structure/door_assembly/door_assembly_science - name = "science airlock assembly" - base_icon_state = "sci" - base_name = "science airlock" - glass_type = "/glass_science" - airlock_type = "/science" - -/obj/structure/door_assembly/door_assembly_med - name = "medical airlock assembly" - base_icon_state = "med" - base_name = "medical airlock" - glass_type = "/glass_medical" - airlock_type = "/medical" - -/obj/structure/door_assembly/door_assembly_mai - name = "maintenance airlock assembly" - base_icon_state = "mai" - base_name = "maintenance airlock" - airlock_type = "/maintenance" - glass = -1 - -/obj/structure/door_assembly/door_assembly_ext - name = "external airlock assembly" - base_icon_state = "ext" - base_name = "external airlock" - airlock_type = "/external" - glass = -1 - -/obj/structure/door_assembly/door_assembly_fre - name = "freezer airlock assembly" - base_icon_state = "fre" - base_name = "freezer airlock" - airlock_type = "/freezer" - glass = -1 - -/obj/structure/door_assembly/door_assembly_hatch - name = "airtight hatch assembly" - base_icon_state = "hatch" - base_name = "airtight hatch" - airlock_type = "/hatch" - glass = -1 - -/obj/structure/door_assembly/door_assembly_mhatch - name = "maintenance hatch assembly" - base_icon_state = "mhatch" - base_name = "maintenance hatch" - airlock_type = "/maintenance_hatch" - glass = -1 - -/obj/structure/door_assembly/door_assembly_highsecurity - name = "high security airlock assembly" - base_icon_state = "highsec" - base_name = "high security airlock" - airlock_type = "/highsecurity" - glass = -1 - material_type = /obj/item/stack/sheet/plasteel - -/obj/structure/door_assembly/door_assembly_vault - name = "vault door assembly" - base_icon_state = "vault" - base_name = "vault door" - airlock_type = "/vault" - glass = -1 - material_type = /obj/item/stack/sheet/plasteel - -/obj/structure/door_assembly/door_assembly_shuttle - name = "shuttle airlock assembly" - base_icon_state = "shuttle" - base_name = "shuttle airlock" - airlock_type = "/shuttle" - glass = -1 - -/obj/structure/door_assembly/multi_tile - icon = 'icons/obj/doors/door_assembly2x1.dmi' - dir = EAST - var/width = 1 - base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1. - airlock_type = "/multi_tile/glass" - glass = -1 //To prevent bugs in deconstruction process. - -/obj/structure/door_assembly/multi_tile/New() - if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size +/obj/structure/door_assembly/examine(mob/user) + ..() + var/doorname = "" + if(created_name) + doorname = ", written on it is '[created_name]'" + switch(state) + if(AIRLOCK_ASSEMBLY_NEEDS_WIRES) + if(anchored) + to_chat(user, "The anchoring bolts are wrenched in place, but the maintenance panel lacks wiring.") + else + to_chat(user, "The assembly is welded together, but the anchoring bolts are unwrenched.") + if(AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) + to_chat(user, "The maintenance panel is wired, but the circuit slot is empty.") + if(AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) + to_chat(user, "The circuit is connected loosely to its slot, but the maintenance panel is unscrewed and open.") + if(!mineral && !glass && !noglass) + to_chat(user, "There is a small paper placard on the assembly[doorname]. There are empty slots for glass windows and mineral covers.") + else if(!mineral && glass && !noglass) + to_chat(user, "There is a small paper placard on the assembly[doorname]. There are empty slots for mineral covers.") + else if(mineral && !glass && !noglass) + to_chat(user, "There is a small paper placard on the assembly[doorname]. There are empty slots for glass windows.") else - bound_width = world.icon_size - bound_height = width * world.icon_size - update_state() - -/obj/structure/door_assembly/multi_tile/Move() - . = ..() - if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size - else - bound_width = world.icon_size - bound_height = width * world.icon_size - -/obj/structure/door_assembly/door_assembly_cult - icon = 'icons/obj/doors/Doorcult.dmi' - base_icon_state = "construction" - base_name = "engraved airlock" - airlock_type = "/cult" - glass = -1 - -/obj/structure/door_assembly/door_assembly_cultruned - icon = 'icons/obj/doors/Doorcultruned.dmi' - base_icon_state = "construction" - base_name = "runed airlock" - airlock_type = "/cult/runed" - glass = -1 - -/obj/structure/door_assembly/door_assembly_centcom - base_icon_state = "ele" - airlock_type = "/centcom" - glass = -1 + to_chat(user, "There is a small paper placard on the assembly[doorname].") /obj/structure/door_assembly/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/pen)) @@ -192,20 +62,22 @@ created_name = t return - if(iswelder(W) && ((istext(glass)) || (glass == 1) || !anchored )) + else if(iswelder(W) && (mineral || glass || !anchored )) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) playsound(loc, WT.usesound, 50, 1) - if(istext(glass)) - user.visible_message("[user] welds the [glass] plating off the airlock assembly.", "You start to weld the [glass] plating off the airlock assembly...") + if(mineral) + var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]") + user.visible_message("[user] welds the [mineral] plating off the airlock assembly.", "You start to weld the [mineral] plating off the airlock assembly...") if(do_after(user, 40 * WT.toolspeed, target = src)) if(!src || !WT.isOn()) return - to_chat(user, "You weld the [glass] plating off.") - var/M = text2path("/obj/item/stack/sheet/mineral/[glass]") - new M(loc, 2) - glass = 0 - else if(glass == 1) + to_chat(user, "You weld the [mineral] plating off.") + new mineral_path(loc, 2) + var/obj/structure/door_assembly/PA = new previous_assembly(loc) + transfer_assembly_vars(src, PA) + + else if(glass) user.visible_message("[user] welds the glass panel out of the airlock assembly.", "You start to weld the glass panel out of the airlock assembly...") if(do_after(user, 40 * WT.toolspeed, target = src)) if(!src || !WT.isOn()) @@ -213,23 +85,23 @@ to_chat(user, "You weld the glass panel out.") if(heat_proof_finished) new /obj/item/stack/sheet/rglass(get_turf(src)) - heat_proof_finished = 0 + heat_proof_finished = FALSE else new /obj/item/stack/sheet/glass(get_turf(src)) - glass = 0 + glass = FALSE else if(!anchored) - user.visible_message("[user] disassembles the airlock assembly.", "You start to disassemble the airlock assembly...") + user.visible_message("[user] disassembles the airlock assembly.", \ + "You start to disassemble the airlock assembly...") if(do_after(user, 40 * WT.toolspeed, target = src)) if(!src || !WT.isOn()) return to_chat(user, "You disassemble the airlock assembly.") - new material_type(loc, material_amt) - qdel(src) + deconstruct(TRUE) else to_chat(user, "You need more welding fuel.") return - else if(iswrench(W) && state == 0) + else if(iswrench(W) && state == AIRLOCK_ASSEMBLY_NEEDS_WIRES) playsound(loc, W.usesound, 100, 1) if(anchored) user.visible_message("[user] unsecures the airlock assembly from the floor.", "You start to unsecure the airlock assembly from the floor...") @@ -242,51 +114,53 @@ to_chat(user, "You [anchored ? "un" : ""]secure the airlock assembly.") anchored = !anchored - else if(iscoil(W) && state == 0 && anchored) + else if(iscoil(W) && state == AIRLOCK_ASSEMBLY_NEEDS_WIRES && anchored) var/obj/item/stack/cable_coil/coil = W + if (coil.amount < 1) + to_chat(user, "You need one length of cable to wire the airlock assembly!") + return user.visible_message("[user] wires the airlock assembly.", "You start to wire the airlock assembly...") if(do_after(user, 40 * coil.toolspeed, target = src)) - if(!src) + if(coil.amount < 1 || state != AIRLOCK_ASSEMBLY_NEEDS_WIRES) return coil.use(1) - state = 1 + state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS to_chat(user, "You wire the airlock assembly.") - else if(iswirecutter(W) && state == 1) + else if(iswirecutter(W) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) playsound(loc, W.usesound, 100, 1) user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly...") if(do_after(user, 40 * W.toolspeed, target = src)) - if(!src) + if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) return to_chat(user, "You cut the wires from the airlock assembly.") - if(state == 1) - new/obj/item/stack/cable_coil(loc, 1) - state = 0 + new/obj/item/stack/cable_coil(get_turf(user), 1) + state = AIRLOCK_ASSEMBLY_NEEDS_WIRES - else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1 && W.icon_state != "door_electronics_smoked") + else if(istype(W, /obj/item/weapon/airlock_electronics) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS && W.icon_state != "door_electronics_smoked") playsound(loc, W.usesound, 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...") if(do_after(user, 40 * W.toolspeed, target = src)) - if(!src) + if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) return user.drop_item() - W.loc = src + W.forceMove(src) to_chat(user, "You install the airlock electronics.") - state = 2 + state = AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER name = "near finished airlock assembly" electronics = W - else if(iscrowbar(W) && state == 2 ) + else if(iscrowbar(W) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) playsound(loc, W.usesound, 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly...") if(do_after(user, 40 * W.toolspeed, target = src)) - if(!src) + if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) return to_chat(user, "You remove the airlock electronics.") - state = 1 + state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS name = "wired airlock assembly" var/obj/item/weapon/airlock_electronics/ae if(!electronics) @@ -294,78 +168,131 @@ else ae = electronics electronics = null - ae.loc = loc + ae.forceMove(loc) - else if(istype(W, /obj/item/stack/sheet) && !glass) + else if(istype(W, /obj/item/stack/sheet) && (!glass || !mineral)) var/obj/item/stack/sheet/S = W if(S) if(S.amount>=1) - if(istype(S, /obj/item/stack/sheet/rglass) || istype(S, /obj/item/stack/sheet/glass)) - playsound(loc, S.usesound, 100, 1) - user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly...") - if(do_after(user, 40 * S.toolspeed, target = src)) - if(S.type == /obj/item/stack/sheet/rglass) - to_chat(user, "You install reinforced glass windows into the airlock assembly.") - heat_proof_finished = 1 //reinforced glass makes the airlock heat-proof - else - to_chat(user, "You install regular glass windows into the airlock assembly.") - S.use(1) - glass = 1 - else if(istype(S, /obj/item/stack/sheet/mineral) && S.sheettype) - var/M = S.sheettype - if(S.amount>=2) - playsound(loc, S.usesound, 100, 1) - user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly...") - if(do_after(user, 40 * S.toolspeed, target = src)) - to_chat(user, "You install [M] plating into the airlock assembly.") - S.use(2) - glass = "[M]" + if(!noglass) + if(!glass) + if(istype(S, /obj/item/stack/sheet/rglass) || istype(S, /obj/item/stack/sheet/glass)) + playsound(loc, S.usesound, 100, 1) + user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly...") + if(do_after(user, 40 * S.toolspeed, target = src)) + if(S.amount < 1 || glass) + return + if(S.type == /obj/item/stack/sheet/rglass) + to_chat(user, "You install reinforced glass windows into the airlock assembly.") + heat_proof_finished = TRUE //reinforced glass makes the airlock heat-proof + else + to_chat(user, "You install regular glass windows into the airlock assembly.") + S.use(1) + glass = TRUE + if(!mineral) + if(istype(S, /obj/item/stack/sheet/mineral) && S.sheettype) + var/M = S.sheettype + if(S.amount>=2) + playsound(loc, S.usesound, 100, 1) + user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly...") + if(do_after(user, 40 * S.toolspeed, target = src)) + if(S.amount < 2 || mineral) + return + to_chat(user, "You install [M] plating into the airlock assembly.") + S.use(2) + var/mineralassembly = text2path("/obj/structure/door_assembly/door_assembly_[M]") + var/obj/structure/door_assembly/MA = new mineralassembly(loc) + transfer_assembly_vars(src, MA, TRUE) + else + to_chat(user, "You need at least two sheets add a mineral cover!") + else + to_chat(user, "You cannot add [S] to [src]!") + else + to_chat(user, "You cannot add [S] to [src]!") - else if(isscrewdriver(W) && state == 2 ) + else if(isscrewdriver(W) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) playsound(loc, W.usesound, 100, 1) user.visible_message("[user] finishes the airlock.", \ "You start finishing the airlock...") if(do_after(user, 40 * W.toolspeed, target = src)) - if(!src) - return - to_chat(user, "You finish the airlock.") - var/path - if(istext(glass)) - path = text2path("/obj/machinery/door/airlock/[glass]") - else if(glass == 1) - path = text2path("/obj/machinery/door/airlock[glass_type]") - else - path = text2path("/obj/machinery/door/airlock[airlock_type]") - var/obj/machinery/door/airlock/door = new path(loc) - door.setDir(dir) - door.assemblytype = type - door.electronics = electronics - door.heat_proof = heat_proof_finished - if(electronics.one_access) - door.req_access = null - door.req_one_access = electronics.conf_access - else - door.req_access = electronics.conf_access - if(created_name) - door.name = created_name - else - door.name = "[istext(glass) ? "[glass] airlock" : base_name]" - electronics.loc = door - qdel(src) + if(loc && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) + to_chat(user, "You finish the airlock.") + var/obj/machinery/door/airlock/door + if(glass) + door = new glass_type(loc) + else + door = new airlock_type(loc) + door.setDir(dir) + door.electronics = electronics + door.heat_proof = heat_proof_finished + if(electronics.one_access) + door.req_access = null + door.req_one_access = electronics.conf_access + else + door.req_access = electronics.conf_access + if(created_name) + door.name = created_name + else + door.name = base_name + door.previous_airlock = previous_assembly + electronics.forceMove(door) + qdel(src) else ..() - update_state() + update_name() + update_icon() -/obj/structure/door_assembly/proc/update_state() - icon_state = "door_as_[glass == 1 ? "g" : ""][istext(glass) ? glass : base_icon_state][state]" +/obj/structure/door_assembly/update_icon() + overlays.Cut() + if(!glass) + overlays += get_airlock_overlay("fill_construction", icon) + else if(glass) + overlays += get_airlock_overlay("glass_construction", overlays_file) + overlays += get_airlock_overlay("panel_c[state+1]", overlays_file) + +/obj/structure/door_assembly/proc/update_name() name = "" switch(state) - if(0) + if(AIRLOCK_ASSEMBLY_NEEDS_WIRES) if(anchored) name = "secured " - if(1) + if(AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) name = "wired " - if(2) + if(AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) name = "near finished " - name += "[heat_proof_finished ? "heat-proofed " : ""][glass == 1 ? "window " : ""][istext(glass) ? "[glass] airlock" : base_name] assembly" + name += "[heat_proof_finished ? "heat-proofed " : ""][glass ? "window " : ""][base_name] assembly" + +/obj/structure/door_assembly/proc/transfer_assembly_vars(obj/structure/door_assembly/source, obj/structure/door_assembly/target, previous = FALSE) + target.glass = source.glass + target.heat_proof_finished = source.heat_proof_finished + target.created_name = source.created_name + target.state = source.state + target.anchored = source.anchored + if(previous) + target.previous_assembly = source.type + if(electronics) + target.electronics = source.electronics + source.electronics.forceMove(target) + target.update_icon() + target.update_name() + qdel(source) + +/obj/structure/door_assembly/deconstruct(disassembled = TRUE) + if(can_deconstruct) + var/turf/T = get_turf(src) + if(!disassembled) + material_amt = rand(2,4) + new material_type(T, material_amt) + if(glass) + if(disassembled) + if(heat_proof_finished) + new /obj/item/stack/sheet/rglass(T) + else + new /obj/item/stack/sheet/glass(T) + else + new /obj/item/weapon/shard(T) + if(mineral) + var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]") + new mineral_path(T, 2) + qdel(src) diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm new file mode 100644 index 00000000000..2475e9e1b4d --- /dev/null +++ b/code/game/objects/structures/door_assembly_types.dm @@ -0,0 +1,264 @@ +/obj/structure/door_assembly/door_assembly_public + name = "public airlock assembly" + icon = 'icons/obj/doors/airlocks/station2/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' + glass_type = /obj/machinery/door/airlock/public/glass + airlock_type = /obj/machinery/door/airlock/public + +/obj/structure/door_assembly/door_assembly_com + name = "command airlock assembly" + icon = 'icons/obj/doors/airlocks/station/command.dmi' + base_name = "command airlock" + glass_type = /obj/machinery/door/airlock/command/glass + airlock_type = /obj/machinery/door/airlock/command + +/obj/structure/door_assembly/door_assembly_sec + name = "security airlock assembly" + icon = 'icons/obj/doors/airlocks/station/security.dmi' + base_name = "security airlock" + glass_type = /obj/machinery/door/airlock/security/glass + airlock_type = /obj/machinery/door/airlock/security + +/obj/structure/door_assembly/door_assembly_eng + name = "engineering airlock assembly" + icon = 'icons/obj/doors/airlocks/station/engineering.dmi' + base_name = "engineering airlock" + glass_type = /obj/machinery/door/airlock/engineering/glass + airlock_type = /obj/machinery/door/airlock/engineering + +/obj/structure/door_assembly/door_assembly_min + name = "mining airlock assembly" + icon = 'icons/obj/doors/airlocks/station/mining.dmi' + base_name = "mining airlock" + glass_type = /obj/machinery/door/airlock/mining/glass + airlock_type = /obj/machinery/door/airlock/mining + +/obj/structure/door_assembly/door_assembly_atmo + name = "atmospherics airlock assembly" + icon = 'icons/obj/doors/airlocks/station/atmos.dmi' + base_name = "atmospherics airlock" + glass_type = /obj/machinery/door/airlock/atmos/glass + airlock_type = /obj/machinery/door/airlock/atmos + +/obj/structure/door_assembly/door_assembly_research + name = "research airlock assembly" + icon = 'icons/obj/doors/airlocks/station/research.dmi' + base_name = "research airlock" + glass_type = /obj/machinery/door/airlock/research/glass + airlock_type = /obj/machinery/door/airlock/research + +/obj/structure/door_assembly/door_assembly_science + name = "science airlock assembly" + icon = 'icons/obj/doors/airlocks/station/science.dmi' + base_name = "science airlock" + glass_type = /obj/machinery/door/airlock/science/glass + airlock_type = /obj/machinery/door/airlock/science + +/obj/structure/door_assembly/door_assembly_med + name = "medical airlock assembly" + icon = 'icons/obj/doors/airlocks/station/medical.dmi' + base_name = "medical airlock" + glass_type = /obj/machinery/door/airlock/medical/glass + airlock_type = /obj/machinery/door/airlock/medical + +/obj/structure/door_assembly/door_assembly_mai + name = "maintenance airlock assembly" + icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' + base_name = "maintenance airlock" + glass_type = /obj/machinery/door/airlock/maintenance/glass + airlock_type = /obj/machinery/door/airlock/maintenance + +/obj/structure/door_assembly/door_assembly_extmai + name = "external maintenance airlock assembly" + icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' + base_name = "external maintenance airlock" + glass_type = /obj/machinery/door/airlock/maintenance/external/glass + airlock_type = /obj/machinery/door/airlock/maintenance/external + +/obj/structure/door_assembly/door_assembly_ext + name = "external airlock assembly" + icon = 'icons/obj/doors/airlocks/external/external.dmi' + base_name = "external airlock" + overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + glass_type = /obj/machinery/door/airlock/external/glass + airlock_type = /obj/machinery/door/airlock/external + +/obj/structure/door_assembly/door_assembly_fre + name = "freezer airlock assembly" + icon = 'icons/obj/doors/airlocks/station/freezer.dmi' + base_name = "freezer airlock" + airlock_type = /obj/machinery/door/airlock/freezer + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_hatch + name = "airtight hatch assembly" + icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi' + base_name = "airtight hatch" + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/hatch + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_mhatch + name = "maintenance hatch assembly" + icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi' + base_name = "maintenance hatch" + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/maintenance_hatch + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_highsecurity + name = "high security airlock assembly" + icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi' + base_name = "high security airlock" + overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/highsecurity + noglass = TRUE + material_type = /obj/item/stack/sheet/plasteel + +/obj/structure/door_assembly/door_assembly_vault + name = "vault door assembly" + icon = 'icons/obj/doors/airlocks/vault/vault.dmi' + base_name = "vault door" + overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/vault + noglass = TRUE + material_type = /obj/item/stack/sheet/plasteel + +/obj/structure/door_assembly/door_assembly_shuttle + name = "shuttle airlock assembly" + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + base_name = "shuttle airlock" + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/shuttle + glass_type = /obj/machinery/door/airlock/shuttle/glass + +/obj/structure/door_assembly/multi_tile + name = "large airlock assembly" + icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi' + base_name = "large airlock" + overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' + dir = EAST + var/width = 1 + airlock_type = /obj/machinery/door/airlock/multi_tile + glass_type = /obj/machinery/door/airlock/multi_tile/glass + material_amt = 8 + +/obj/structure/door_assembly/multi_tile/New() + if(dir in list(EAST, WEST)) + bound_width = width * world.icon_size + bound_height = world.icon_size + else + bound_width = world.icon_size + bound_height = width * world.icon_size + update_icon() + +/obj/structure/door_assembly/multi_tile/Move() + . = ..() + if(dir in list(EAST, WEST)) + bound_width = width * world.icon_size + bound_height = world.icon_size + else + bound_width = world.icon_size + bound_height = width * world.icon_size + +/obj/structure/door_assembly/door_assembly_cult + name = "cult airlock assembly" + icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi' + base_name = "cult airlock" + overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/cult + glass_type = /obj/machinery/door/airlock/cult/glass + +/obj/structure/door_assembly/door_assembly_cult/unruned + icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' + overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/cult/unruned + glass_type = /obj/machinery/door/airlock/cult/unruned/glass + +/obj/structure/door_assembly/door_assembly_centcom + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/centcom + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_gold + name = "gold airlock assembly" + icon = 'icons/obj/doors/airlocks/station/gold.dmi' + base_name = "gold airlock" + airlock_type = /obj/machinery/door/airlock/gold + mineral = "gold" + glass_type = /obj/machinery/door/airlock/gold/glass + +/obj/structure/door_assembly/door_assembly_silver + name = "silver airlock assembly" + icon = 'icons/obj/doors/airlocks/station/silver.dmi' + base_name = "silver airlock" + airlock_type = /obj/machinery/door/airlock/silver + mineral = "silver" + glass_type = /obj/machinery/door/airlock/silver/glass + +/obj/structure/door_assembly/door_assembly_diamond + name = "diamond airlock assembly" + icon = 'icons/obj/doors/airlocks/station/diamond.dmi' + base_name = "diamond airlock" + airlock_type = /obj/machinery/door/airlock/diamond + mineral = "diamond" + glass_type = /obj/machinery/door/airlock/diamond/glass + +/obj/structure/door_assembly/door_assembly_uranium + name = "uranium airlock assembly" + icon = 'icons/obj/doors/airlocks/station/uranium.dmi' + base_name = "uranium airlock" + airlock_type = /obj/machinery/door/airlock/uranium + mineral = "uranium" + glass_type = /obj/machinery/door/airlock/uranium/glass + +/obj/structure/door_assembly/door_assembly_plasma + name = "plasma airlock assembly" + icon = 'icons/obj/doors/airlocks/station/plasma.dmi' + base_name = "plasma airlock" + airlock_type = /obj/machinery/door/airlock/plasma + mineral = "plasma" + glass_type = /obj/machinery/door/airlock/plasma/glass + +/obj/structure/door_assembly/door_assembly_bananium + name = "bananium airlock assembly" + desc = "Honk." + icon = 'icons/obj/doors/airlocks/station/bananium.dmi' + base_name = "bananium airlock" + airlock_type = /obj/machinery/door/airlock/bananium + mineral = "bananium" + glass_type = /obj/machinery/door/airlock/bananium/glass + +/obj/structure/door_assembly/door_assembly_tranquillite + name = "tranquillite airlock assembly" + icon = 'icons/obj/doors/airlocks/station/freezer.dmi' + base_name = "tranquillite airlock" + airlock_type = /obj/machinery/door/airlock/tranquillite + mineral = "tranquillite" + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_sandstone + name = "sandstone airlock assembly" + icon = 'icons/obj/doors/airlocks/station/sandstone.dmi' + base_name = "sandstone airlock" + airlock_type = /obj/machinery/door/airlock/sandstone + mineral = "sandstone" + glass_type = /obj/machinery/door/airlock/sandstone/glass + +/obj/structure/door_assembly/door_assembly_titanium + name = "titanium airlock assembly" + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + base_name = "shuttle airlock" + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + glass_type = /obj/machinery/door/airlock/titanium/glass + airlock_type = /obj/machinery/door/airlock/titanium + mineral = "titanium" + +/obj/structure/door_assembly/door_assembly_wood + name = "wooden airlock assembly" + icon = 'icons/obj/doors/airlocks/station/wood.dmi' + base_name = "wooden airlock" + airlock_type = /obj/machinery/door/airlock/wood + mineral = "wood" + glass_type = /obj/machinery/door/airlock/wood/glass diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index aa661e57aa8..e318dd6f289 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -80,9 +80,9 @@ /obj/structure/falsewall/update_icon() if(density) + icon_state = initial(icon_state) smooth = SMOOTH_TRUE smooth_icon(src) - icon_state = "" else icon_state = "fwall_open" @@ -304,4 +304,22 @@ icon_state = "abductor" mineral = "abductor" walltype = "abductor" - canSmoothWith = list(/obj/structure/falsewall/abductor, /turf/simulated/wall/mineral/abductor) \ No newline at end of file + canSmoothWith = list(/obj/structure/falsewall/abductor, /turf/simulated/wall/mineral/abductor) + +/obj/structure/falsewall/titanium + desc = "A light-weight titanium wall used in shuttles." + icon = 'icons/turf/walls/shuttle_wall.dmi' + icon_state = "shuttle" + mineral = /obj/item/stack/sheet/mineral/titanium + walltype = /turf/simulated/wall/mineral/titanium + smooth = SMOOTH_MORE + canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater) + +/obj/structure/falsewall/plastitanium + desc = "An evil wall of plasma and titanium." + icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon_state = "shuttle" + mineral = /obj/item/stack/sheet/mineral/plastitanium + walltype = /turf/simulated/wall/mineral/plastitanium + smooth = SMOOTH_MORE + canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater) \ No newline at end of file diff --git a/code/game/objects/structures/fullwindow.dm b/code/game/objects/structures/fullwindow.dm index f9e8adbf9aa..f2663063dea 100644 --- a/code/game/objects/structures/fullwindow.dm +++ b/code/game/objects/structures/fullwindow.dm @@ -94,6 +94,7 @@ basestate = "window" health = 160 reinf = 1 + explosion_block = 3 /obj/structure/window/full/shuttle/New() ..() diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 8e148d75eb5..9c8624df444 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -39,9 +39,7 @@ if(ishuman(buckled_mob)) var/mob/living/carbon/human/driver = user - var/obj/item/organ/external/l_hand = driver.get_organ("l_hand") - var/obj/item/organ/external/r_hand = driver.get_organ("r_hand") - if(!l_hand && !r_hand) + if(!driver.has_left_hand() && !driver.has_right_hand()) return 0 // No hands to drive your chair? Tough luck! for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm")) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index e134ba8ed50..aa3bf4f7e9a 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -146,7 +146,7 @@ var/ert_request_answered = 0 var/hair_c = pick("#8B4513","#000000","#FF4500","#FFD700") // Brown, black, red, blonde var/eye_c = pick("#000000","#8B4513","1E90FF") // Black, brown, blue - var/skin_tone = pick(-50, -30, -10, 0, 0, 0, 10) // Caucasian/black + var/skin_tone = rand(-120, 20) // A range of skin colors head_organ.facial_colour = hair_c head_organ.sec_facial_colour = hair_c diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm index e66d4383407..218599f9e9d 100644 --- a/code/game/turfs/simulated/floor/mineral.dm +++ b/code/game/turfs/simulated/floor/mineral.dm @@ -6,6 +6,7 @@ * Bananium floor * Diamond floor * Uranium floor + * Shuttle floor (Titanium) */ /turf/simulated/floor/mineral @@ -76,6 +77,61 @@ floor_tile = /obj/item/stack/tile/mineral/silver/fancy icons = list("silverfancy","silverfancy_dam") +//TITANIUM (shuttle) + +/turf/simulated/floor/mineral/titanium/blue + icon_state = "shuttlefloor" + icons = list("shuttlefloor","shuttlefloor_dam") + +/turf/simulated/floor/mineral/titanium/blue/airless + oxygen = 0.01 + nitrogen = 0.01 + temperature = TCMB + +/turf/simulated/floor/mineral/titanium/yellow + icon_state = "shuttlefloor2" + icons = list("shuttlefloor2","shuttlefloor2_dam") + +/turf/simulated/floor/mineral/titanium/yellow/airless + oxygen = 0.01 + nitrogen = 0.01 + temperature = TCMB + +/turf/simulated/floor/mineral/titanium + name = "shuttle floor" + icon_state = "shuttlefloor3" + floor_tile = /obj/item/stack/tile/mineral/titanium + icons = list("shuttlefloor3","shuttlefloor3_dam") + +/turf/simulated/floor/mineral/titanium/airless + oxygen = 0.01 + nitrogen = 0.01 + temperature = TCMB + +/turf/simulated/floor/mineral/titanium/purple + icon_state = "shuttlefloor5" + icons = list("shuttlefloor5","shuttlefloor5_dam") + +/turf/simulated/floor/mineral/titanium/purple/airless + oxygen = 0.01 + nitrogen = 0.01 + temperature = TCMB + +//PLASTITANIUM (syndieshuttle) +/turf/simulated/floor/mineral/plastitanium + name = "shuttle floor" + icon_state = "shuttlefloor4" + floor_tile = /obj/item/stack/tile/mineral/plastitanium + icons = list("shuttlefloor4","shuttlefloor4_dam") + +/turf/simulated/floor/mineral/plastitanium/airless + oxygen = 0.01 + nitrogen = 0.01 + temperature = TCMB + +/turf/simulated/floor/mineral/plastitanium/brig + name = "brig floor" + //BANANIUM /turf/simulated/floor/mineral/bananium name = "bananium floor" diff --git a/code/game/turfs/simulated/shuttle.dm b/code/game/turfs/simulated/shuttle.dm index ac520ca8c0f..6ab60fffd99 100644 --- a/code/game/turfs/simulated/shuttle.dm +++ b/code/game/turfs/simulated/shuttle.dm @@ -13,6 +13,10 @@ blocks_air = 1 +/turf/simulated/shuttle/narsie_act() + if(prob(20)) + ChangeTurf(/turf/simulated/wall/cult) + //sub-type to be used for interior shuttle walls //won't get an underlay of the destination turf on shuttle move /turf/simulated/shuttle/wall/interior/copyTurf(turf/T) diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index d2db056e824..80ce5f842be 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -156,4 +156,111 @@ smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL sheet_type = /obj/item/stack/sheet/mineral/abductor explosion_block = 3 - canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor) \ No newline at end of file + canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor) + +/////////////////////Titanium walls///////////////////// + +/turf/simulated/wall/mineral/titanium //has to use this path due to how building walls works + name = "wall" + desc = "A light-weight titanium wall used in shuttles." + icon = 'icons/turf/walls/shuttle_wall.dmi' + icon_state = "map-shuttle" + explosion_block = 3 + sheet_type = /obj/item/stack/sheet/mineral/titanium + smooth = SMOOTH_MORE|SMOOTH_DIAGONAL + canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium) + +/turf/simulated/wall/mineral/titanium/nodiagonal + smooth = SMOOTH_MORE + icon_state = "map-shuttle_nd" + +/turf/simulated/wall/mineral/titanium/nosmooth + icon = 'icons/turf/shuttle.dmi' + icon_state = "wall" + smooth = SMOOTH_FALSE + +/turf/simulated/wall/mineral/titanium/overspace + icon_state = "map-overspace" + fixed_underlay = list("space"=1) + +//sub-type to be used for interior shuttle walls +//won't get an underlay of the destination turf on shuttle move +/turf/simulated/wall/mineral/titanium/interior/copyTurf(turf/T) + if(T.type != type) + T.ChangeTurf(type) + if(underlays.len) + T.underlays = underlays + if(T.icon_state != icon_state) + T.icon_state = icon_state + if(T.icon != icon) + T.icon = icon + if(T.color != color) + T.color = color + if(T.dir != dir) + T.dir = dir + T.transform = transform + return T + +/turf/simulated/wall/mineral/titanium/copyTurf(turf/T) + . = ..() + T.transform = transform + +/turf/simulated/wall/mineral/titanium/survival + name = "pod wall" + desc = "An easily-compressable wall used for temporary shelter." + icon = 'icons/turf/walls/survival_pod_walls.dmi' + icon_state = "smooth" + smooth = SMOOTH_MORE|SMOOTH_DIAGONAL + canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock, /obj/structure/window/full, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine) + +/turf/simulated/wall/mineral/titanium/survival/nodiagonal + smooth = SMOOTH_MORE + +/turf/simulated/wall/mineral/titanium/survival/pod + canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod) + +/////////////////////Plastitanium walls///////////////////// + +/turf/simulated/wall/mineral/plastitanium + name = "wall" + desc = "An evil wall of plasma and titanium." + icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon_state = "map-shuttle" + explosion_block = 4 + sheet_type = /obj/item/stack/sheet/mineral/plastitanium + smooth = SMOOTH_MORE|SMOOTH_DIAGONAL + canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium) + +/turf/simulated/wall/mineral/plastitanium/nodiagonal + smooth = SMOOTH_MORE + icon_state = "map-shuttle_nd" + +/turf/simulated/wall/mineral/plastitanium/nosmooth + icon = 'icons/turf/shuttle.dmi' + icon_state = "wall" + smooth = SMOOTH_FALSE + +/turf/simulated/wall/mineral/plastitanium/overspace + icon_state = "map-overspace" + fixed_underlay = list("space"=1) + +//have to copypaste this code +/turf/simulated/wall/mineral/plastitanium/interior/copyTurf(turf/T) + if(T.type != type) + T.ChangeTurf(type) + if(underlays.len) + T.underlays = underlays + if(T.icon_state != icon_state) + T.icon_state = icon_state + if(T.icon != icon) + T.icon = icon + if(T.color != color) + T.color = color + if(T.dir != dir) + T.dir = dir + T.transform = transform + return T + +/turf/simulated/wall/mineral/plastitanium/copyTurf(turf/T) + . = ..() + T.transform = transform \ No newline at end of file diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm index 82f8c1390b5..4bcc4e90b2f 100644 --- a/code/game/turfs/unsimulated/walls.dm +++ b/code/game/turfs/unsimulated/walls.dm @@ -13,8 +13,8 @@ /turf/unsimulated/wall/fakedoor name = "Centcom Access" - icon = 'icons/obj/doors/Doorele.dmi' - icon_state = "door_closed" + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + icon_state = "closed" /turf/unsimulated/wall/splashscreen name = "Space Station 13" diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index e3bb99d52fe..cd68b0ec3b0 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -60,7 +60,7 @@ var/global/admin_ooc_colour = "#b82e00" for(var/client/C in clients) if(C.prefs.toggles & CHAT_OOC) - var/display_name = src.key + var/display_name = key if(prefs.unlock_content) if(prefs.toggles & MEMBER_PUBLIC) @@ -74,8 +74,8 @@ var/global/admin_ooc_colour = "#b82e00" if(holder) if(holder.fakekey) - if(C.holder) - display_name = "[holder.fakekey]/([src.key])" + if(C.holder && C.holder.rights & R_ADMIN) + display_name = "[holder.fakekey]/([key])" else display_name = holder.fakekey diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 7c7569e5907..cbcacc43006 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -32,7 +32,13 @@ for(var/client/C in admins) if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, C.mob)) - to_chat(C, "MENTOR: [key_name(usr, 1)] ([admin_jump_link(mob)]): ") + var/display_name = key + if(holder.fakekey) + if(C.holder && C.holder.rights & R_ADMIN) + display_name = "[holder.fakekey]/([key])" + else + display_name = holder.fakekey + to_chat(C, "MENTOR: [display_name] ([admin_jump_link(mob)]): ") feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 0ad266ecaa1..55ce03d8988 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -1,7 +1,7 @@ var/list/VVlocked = list("vars", "var_edited", "client", "firemut", "ishulk", "telekinesis", "xray", "ka", "virus", "viruses", "cuffed", "last_eaten", "unlock_content") // R_DEBUG var/list/VVicon_edit_lock = list("icon", "icon_state", "overlays", "underlays", "resize") // R_EVENT | R_DEBUG var/list/VVckey_edit = list("key", "ckey") // R_EVENT | R_DEBUG -var/list/VVpixelmovement = list("step_x", "step_y", "bound_height", "bound_width", "bound_x", "bound_y") // R_DEBUG + warning +var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height", "bound_width", "bound_x", "bound_y") // R_DEBUG + warning /client/proc/vv_get_class(var/var_value) if(isnull(var_value)) . = VV_NULL @@ -615,4 +615,4 @@ var/list/VVpixelmovement = list("step_x", "step_y", "bound_height", "bound_width log_to_dd("### VarEdit by [src]: [O.type] [variable]=[html_encode("[var_new]")]") log_admin("[key_name(src)] modified [original_name]'s [variable] to [var_new]") var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] to [var_new]" - message_admins(msg) \ No newline at end of file + message_admins(msg) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 27b6c38a469..29c6111bc02 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -576,7 +576,7 @@ Traitors and the like can also be revived with the previous role mostly intact. command_announcement.Announce(input, customname, MsgSound[beepsound], , , type) print_command_report(input, "[command_name()] Update") - else if("No") + if("No") //same thing as the blob stuff - it's not public, so it's classified, dammit command_announcer.autosay("A classified message has been printed out at all communication consoles."); print_command_report(input, "Classified [command_name()] Update") @@ -763,6 +763,11 @@ Traitors and the like can also be revived with the previous role mostly intact. var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No") if(confirm != "Yes") return + if(alert("Set Shuttle Recallable (Select Yes unless you know what this does)", "Recallable?", "Yes", "No") == "Yes") + shuttle_master.emergency.canRecall = TRUE + else + shuttle_master.emergency.canRecall = FALSE + shuttle_master.emergency.request() feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -781,7 +786,18 @@ Traitors and the like can also be revived with the previous role mostly intact. if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED) return - shuttle_master.emergency.cancel() + if(shuttle_master.emergency.canRecall == FALSE) + if(alert("Shuttle is currently set to be nonrecallable. Recalling may break things. Respect Recall Status?", "Override Recall Status?", "Yes", "No") == "Yes") + return + else + var/keepStatus = alert("Maintain recall status on future shuttle calls?", "Maintain Status?", "Yes", "No") == "Yes" //Keeps or drops recallability + shuttle_master.emergency.canRecall = TRUE // must be true for cancel proc to work + shuttle_master.emergency.cancel() + if(keepStatus) + shuttle_master.emergency.canRecall = FALSE // restores original status + else + shuttle_master.emergency.cancel() + feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-recalled the emergency shuttle.") message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.") diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 2720f8086d0..9e731953ce5 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -418,6 +418,8 @@ preferences_datums[ckey] = prefs prefs.last_ip = address //these are gonna be used for banning prefs.last_id = computer_id //these are gonna be used for banning + if(world.byond_version >= 511 && byond_version >= 511 && prefs.clientfps) + fps = prefs.clientfps spawn() // Goonchat does some non-instant checks in start() chatOutput.start() diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index a351d3f5032..ad25c8fdeb1 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -68,6 +68,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts #define TAB_GEAR 2 /datum/preferences + var/client/parent //doohickeys for savefiles // var/path var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used @@ -94,6 +95,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts var/UI_style_color = "#ffffff" var/UI_style_alpha = 255 var/windowflashing = TRUE + var/clientfps = 0 //ghostly preferences var/ghost_anonsay = 0 @@ -203,6 +205,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts var/gear_tab = "General" /datum/preferences/New(client/C) + parent = C b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+") max_gear_slots = config.max_loadout_points @@ -444,11 +447,11 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts dat += "Donator Publicity: [(toggles & DONATOR_PUBLIC) ? "Public" : "Hidden"]
" dat += "Randomized character slot: [randomslot ? "Yes" : "No"]
" - dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]
" - dat += "Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]
" - dat += "Ghost radio: [(toggles & CHAT_GHOSTRADIO) ? "Nearest Speakers" : "All Chatter"]
" + dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]
" + dat += "Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"]
" + dat += "Ghost radio: [(toggles & CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]
" dat += "Deadchat anonymity: [ghost_anonsay ? "Anonymous" : "Not Anonymous"]
" - + dat += "FPS: [clientfps]
" dat += "
" + dat += "Shotgun Pump" + dat += "Gunshot" + dat += "Esword" + dat += "Harm Alarm" + var/datum/browser/popup = new(user, "vending", "Radiance Dance Machine - Mark IV", 400, 350) + popup.set_content(dat.Join()) + popup.open() + + +/obj/machinery/disco/Topic(href, href_list) + if(..()) + return + add_fingerprint(usr) + switch(href_list["action"]) + if("toggle") + if(qdeleted(src)) + return + if(!active) + if(stop > world.time) + to_chat(usr, "Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].") + playsound(src, 'sound/misc/compiler-failure.ogg', 50, 1) + return + active = TRUE + update_icon() + dance_setup() + processing_objects.Add(src) + lights_spin() + updateUsrDialog() + else if(active) + stop = 0 + updateUsrDialog() + if("select") + if(active) + to_chat(usr, "Error: You cannot change the song until the current one is over.") + return + + var/list/available = list() + for(var/datum/track/S in songs) + available[S.song_name] = S + var/selected = input(usr, "Choose your song", "Track:") as null|anything in available + if(qdeleted(src) || !selected || !istype(available[selected], /datum/track)) + return + selection = available[selected] + updateUsrDialog() + if("horn") + deejay('sound/items/airhorn2.ogg') + if("alert") + deejay('sound/misc/notice1.ogg') + if("siren") + deejay('sound/machines/engine_alert1.ogg') + if("honk") + deejay('sound/items/bikehorn.ogg') + if("pump") + deejay('sound/weapons/shotgunpump.ogg') + if("pop") + deejay('sound/weapons/gunshot3.ogg') + if("saber") + deejay('sound/weapons/saberon.ogg') + if("harm") + deejay('sound/ai/harmalarm.ogg') + +/obj/machinery/disco/proc/deejay(S) + if(qdeleted(src) || !active || charge < 5) + to_chat(usr, "The device is not able to play more DJ sounds at this time.") + return + charge -= 5 + playsound(src, S, 300, 1) + +/obj/machinery/disco/proc/dance_setup() + stop = world.time + selection.song_length + var/turf/cen = get_turf(src) + FOR_DVIEW(var/turf/t, 3, get_turf(src),INVISIBILITY_LIGHTING) + if(t.x == cen.x && t.y > cen.y) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "red" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1+get_dist(src, L) + spotlights+=L + continue + if(t.x == cen.x && t.y < cen.y) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "purple" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1+get_dist(src, L) + spotlights+=L + continue + if(t.x > cen.x && t.y == cen.y) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "#ffff00" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1+get_dist(src, L) + spotlights+=L + continue + if(t.x < cen.x && t.y == cen.y) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "green" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1+get_dist(src, L) + spotlights+=L + continue + if((t.x+1 == cen.x && t.y+1 == cen.y) || (t.x+2==cen.x && t.y+2 == cen.y)) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "sw" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1.4+get_dist(src, L) + spotlights+=L + continue + if((t.x-1 == cen.x && t.y-1 == cen.y) || (t.x-2==cen.x && t.y-2 == cen.y)) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "ne" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1.4+get_dist(src, L) + spotlights+=L + continue + if((t.x-1 == cen.x && t.y+1 == cen.y) || (t.x-2==cen.x && t.y+2 == cen.y)) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "se" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1.4+get_dist(src, L) + spotlights+=L + continue + if((t.x+1 == cen.x && t.y-1 == cen.y) || (t.x+2==cen.x && t.y-2 == cen.y)) + var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t) + L.light_color = "nw" + L.light_power = 30 - (get_dist(src, L) * 8) + L.range = 1.4+get_dist(src, L) + spotlights+=L + continue + continue + END_FOR_DVIEW + +/obj/machinery/disco/proc/hierofunk() + for(var/i in 1 to 10) + new /obj/effect/temp_visual/hierophant/telegraph/edge(get_turf(src)) + sleep(5) + +/obj/machinery/disco/proc/lights_spin() + for(var/i in 1 to 25) + if(qdeleted(src) || !active) + return + var/obj/effect/overlay/sparkles/S = new /obj/effect/overlay/sparkles(src) + S.alpha = 0 + sparkles += S + switch(i) + if(1 to 8) + spawn(0) + S.orbit(src, 30, TRUE, 60, 36, TRUE, FALSE) + if(9 to 16) + spawn(0) + S.orbit(src, 62, TRUE, 60, 36, TRUE, FALSE) + if(17 to 24) + spawn(0) + S.orbit(src, 95, TRUE, 60, 36, TRUE, FALSE) + if(25) + S.pixel_y = 7 + S.forceMove(get_turf(src)) + sleep(7) + if(selection.song_name == "Engineering's Ultimate High-Energy Hustle") + sleep(280) + for(var/obj/reveal in sparkles) + reveal.alpha = 255 + while(active) + for(var/obj/item/device/flashlight/spotlight/glow in spotlights) // The multiples reflects custom adjustments to each colors after dozens of tests + if(qdeleted(src) || !active || qdeleted(glow)) + return + if(glow.light_color == "red") + glow.light_color = "nw" + glow.light_power = glow.light_power * 1.48 + glow.light_range = 0 + glow.update_light() + continue + if(glow.light_color == "nw") + glow.light_color = "green" + glow.light_range = glow.range * 1.1 + glow.light_power = glow.light_power * 2 // Any changes to power must come in pairs to neutralize it for other colors + glow.update_light() + continue + if(glow.light_color == "green") + glow.light_color = "sw" + glow.light_power = glow.light_power * 0.5 + glow.light_range = 0 + glow.update_light() + continue + if(glow.light_color == "sw") + glow.light_color = "purple" + glow.light_power = glow.light_power * 2.27 + glow.light_range = glow.range * 1.15 + glow.update_light() + continue + if(glow.light_color == "purple") + glow.light_color = "se" + glow.light_power = glow.light_power * 0.44 + glow.light_range = 0 + glow.update_light() + continue + if(glow.light_color == "se") + glow.light_color = "#ffff00" + glow.light_range = glow.range * 0.9 + glow.update_light() + continue + if(glow.light_color == "#ffff00") + glow.light_color = "ne" + glow.light_range = 0 + glow.update_light() + continue + if(glow.light_color == "ne") + glow.light_color = "red" + glow.light_power = glow.light_power * 0.68 + glow.light_range = glow.range * 0.85 + glow.update_light() + continue + if(prob(2)) // Unique effects for the dance floor that show up randomly to mix things up + INVOKE_ASYNC(src, .proc/hierofunk) + sleep(selection.song_beat) + + +/obj/machinery/disco/proc/dance(mob/living/M) //Show your moves + set waitfor = FALSE + switch(rand(0,9)) + if(0 to 1) + dance2(M) + if(2 to 3) + dance3(M) + if(4 to 6) + dance4(M) + if(7 to 9) + dance5(M) + +/obj/machinery/disco/proc/dance2(mob/living/M) + for(var/i = 1, i < 10, i++) + for(var/d in list(NORTH, SOUTH, EAST, WEST, EAST, SOUTH, NORTH, SOUTH, EAST, WEST, EAST, SOUTH)) + M.setDir(d) + if(i == WEST && !M.incapacitated()) + M.SpinAnimation(7, 1) + sleep(1) + sleep(20) + +/obj/machinery/disco/proc/dance3(mob/living/M) + var/matrix/initial_matrix = matrix(M.transform) + for(var/i in 1 to 75) + if(!M) + return + switch(i) + if(1 to 15) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0, 1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(16 to 30) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(1, -1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(31 to 45) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(-1, -1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(46 to 60) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(-1, 1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(61 to 75) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(1, 0) + animate(M, transform = initial_matrix, time = 1, loop = 0) + M.setDir(turn(M.dir, 90)) + switch(M.dir) + if(NORTH) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,3) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(SOUTH) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,-3) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(EAST) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(3,0) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(WEST) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(-3,0) + animate(M, transform = initial_matrix, time = 1, loop = 0) + sleep(1) + M.lying_fix() + + +/obj/machinery/disco/proc/dance4(mob/living/M) + var/speed = rand(1, 3) + set waitfor = 0 + var/time = 30 + while(time) + sleep(speed) + for(var/i in 1 to speed) + M.setDir(pick(cardinal)) + M.resting = !M.resting + M.update_canmove() + time-- + +/obj/machinery/disco/proc/dance5(mob/living/M) + animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0) + var/matrix/initial_matrix = matrix(M.transform) + for(var/i in 1 to 60) + if(!M) + return + if(i<31) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(i>30) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,-1) + animate(M, transform = initial_matrix, time = 1, loop = 0) + M.setDir(turn(M.dir, 90)) + switch(M.dir) + if(NORTH) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,3) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(SOUTH) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(0,-3) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(EAST) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(3,0) + animate(M, transform = initial_matrix, time = 1, loop = 0) + if(WEST) + initial_matrix = matrix(M.transform) + initial_matrix.Translate(-3,0) + animate(M, transform = initial_matrix, time = 1, loop = 0) + sleep(1) + M.lying_fix() + + + +/mob/living/proc/lying_fix() + animate(src, transform = null, time = 1, loop = 0) + lying_prev = 0 + +/obj/machinery/disco/proc/dance_over() + QDEL_LIST(spotlights) + QDEL_LIST(sparkles) + for(var/mob/living/L in rangers) + if(!L || !L.client) + continue + L.stop_sound_channel(CHANNEL_JUKEBOX) + rangers = list() + + + +/obj/machinery/disco/process() + if(charge < 35) + charge += 1 + if(world.time < stop && active) + var/sound/song_played = sound(selection.song_path) + + for(var/mob/M in range(10,src)) + if(!(M in rangers)) + rangers[M] = TRUE + M.playsound_local(get_turf(M), null, 100, channel = CHANNEL_JUKEBOX, S = song_played) + if(prob(5+(allowed(M) * 4)) && M.canmove) + dance(M) + for(var/mob/L in rangers) + if(get_dist(src, L) > 10) + rangers -= L + if(!L || !L.client) + continue + L.stop_sound_channel(CHANNEL_JUKEBOX) + else if(active) + active = FALSE + processing_objects.Remove(src) + dance_over() + playsound(src,'sound/machines/terminal_off.ogg',50,1) + icon_state = "disco0" + stop = world.time + 100 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 15f0a73808c..5f12a4f0076 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -5,7 +5,7 @@ mend - mends a wire and makes any necessary state changes canAIControl - 1 if the AI can control the airlock, 0 if not (then check canAIHack to see if it can hack in) canAIHack - 1 if the AI can hack into the airlock to recover control, 0 if not. Also returns 0 if the AI does not *need* to hack it. - arePowerSystemsOn - 1 if the main or backup power are functioning, 0 if not. Does not check whether the power grid is charged or an APC has equipment on or anything like that. (Check (stat & NOPOWER) for that) + arePowerSystemsOn - 1 if the main or backup power are functioning, 0 if not. requiresIDs - 1 if the airlock is requiring IDs, 0 if not isAllPowerCut - 1 if the main and backup power both have cut wires. regainMainPower - handles the effect of main power coming back on. @@ -18,17 +18,24 @@ // Wires for the airlock are located in the datum folder, inside the wires datum folder. +#define AIRLOCK_CLOSED 1 +#define AIRLOCK_CLOSING 2 +#define AIRLOCK_OPEN 3 +#define AIRLOCK_OPENING 4 +#define AIRLOCK_DENY 5 +#define AIRLOCK_EMAG 6 +var/list/airlock_overlays = list() /obj/machinery/door/airlock name = "airlock" - icon = 'icons/obj/doors/doorint.dmi' - icon_state = "door_closed" + icon = 'icons/obj/doors/airlocks/station/public.dmi' + icon_state = "closed" autoclose = 1 explosion_block = 1 assemblytype = /obj/structure/door_assembly normalspeed = 1 - var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in. - var/hackProof = 0 // if 1, this door can't be hacked by the AI + var/aiControlDisabled = FALSE //If TRUE, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in. + var/hackProof = FALSE // if TRUE, this door can't be hacked by the AI var/electrified_until = 0 // World time when the door is no longer electrified. -1 if it is permanently electrified until someone fixes it. var/main_power_lost_until = 0 //World time when main power is restored. var/backup_power_lost_until = -1 //World time when backup power is restored. @@ -44,11 +51,24 @@ var/obj/machinery/door/airlock/closeOther = null var/closeOtherId = null var/lockdownbyai = 0 - var/mineral = null var/justzap = 0 var/safe = 1 var/obj/item/weapon/airlock_electronics/electronics = null var/hasShocked = 0 //Prevents multiple shocks from happening + var/obj/item/weapon/note //Any papers pinned to the airlock + var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to + var/airlock_material = null //material of inner filling; if its an airlock with glass, this should be set to "glass" + var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' + var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock + + var/image/old_frame_overlay //keep those in order to prevent unnecessary updating + var/image/old_filling_overlay + var/image/old_lights_overlay + var/image/old_panel_overlay + var/image/old_weld_overlay + var/image/old_sparks_overlay + var/image/old_note_overlay + var/doorOpen = 'sound/machines/airlock_open.ogg' var/doorClose = 'sound/machines/airlock_close.ogg' var/doorDeni = 'sound/machines/DeniedBeep.ogg' // i'm thinkin' Deni's @@ -84,8 +104,9 @@ About the new airlock wires panel: if(A.closeOtherId == closeOtherId && A != src) closeOther = A break - if(welded) - update_icon() + if(glass) + airlock_material = "glass" + update_icon() /obj/machinery/door/airlock/Destroy() QDEL_NULL(electronics) @@ -99,8 +120,14 @@ About the new airlock wires panel: if(electrified_timer) deltimer(electrified_timer) electrified_timer = null + qdel(note) return ..() +/obj/machinery/door/airlock/handle_atom_del(atom/A) + if(A == note) + note = null + update_icon() + /obj/machinery/door/airlock/bumpopen(mob/living/user) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite if(!issilicon(usr)) if(isElectrified()) @@ -250,65 +277,182 @@ About the new airlock wires panel: else return 0 -/obj/machinery/door/airlock/update_icon() - if(overlays) - overlays.Cut() - overlays = list() - if(emergency && arePowerSystemsOn()) - overlays += image('icons/obj/doors/doorint.dmi', "elights") - if(density) - if(locked && lights) - icon_state = "door_locked" - else - icon_state = "door_closed" - if(p_open || welded) - if(p_open) - overlays += image(icon, "panel_open") - if(welded) - overlays += image(icon, "welded") - else - icon_state = "door_open" +/obj/machinery/door/airlock/update_icon(state=0, override=0) + if(operating && !override) + return + switch(state) + if(0) + if(density) + state = AIRLOCK_CLOSED + else + state = AIRLOCK_OPEN + icon_state = "" + if(AIRLOCK_OPEN, AIRLOCK_CLOSED) + icon_state = "" + if(AIRLOCK_DENY, AIRLOCK_OPENING, AIRLOCK_CLOSING, AIRLOCK_EMAG) + icon_state = "nonexistenticonstate" //MADNESS + set_airlock_overlays(state) - return +/obj/machinery/door/airlock/proc/set_airlock_overlays(state) + var/image/frame_overlay + var/image/filling_overlay + var/image/lights_overlay + var/image/panel_overlay + var/image/weld_overlay + var/image/sparks_overlay + var/image/note_overlay + var/notetype = note_type() + + switch(state) + if(AIRLOCK_CLOSED) + frame_overlay = get_airlock_overlay("closed", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) + if(lights) + if(locked) + lights_overlay = get_airlock_overlay("lights_bolts", overlays_file) + else if(emergency) + lights_overlay = get_airlock_overlay("lights_emergency", overlays_file) + if(note) + note_overlay = get_airlock_overlay(notetype, note_overlay_file) + + if(AIRLOCK_DENY) + if(!arePowerSystemsOn()) + return + frame_overlay = get_airlock_overlay("closed", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) + lights_overlay = get_airlock_overlay("lights_denied", overlays_file) + if(note) + note_overlay = get_airlock_overlay(notetype, note_overlay_file) + + if(AIRLOCK_EMAG) + frame_overlay = get_airlock_overlay("closed", icon) + sparks_overlay = get_airlock_overlay("sparks", overlays_file) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closed", icon) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_closed", overlays_file) + if(welded) + weld_overlay = get_airlock_overlay("welded", overlays_file) + if(note) + note_overlay = get_airlock_overlay(notetype, note_overlay_file) + + if(AIRLOCK_CLOSING) + frame_overlay = get_airlock_overlay("closing", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_closing", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_closing", icon) + if(lights && arePowerSystemsOn()) + lights_overlay = get_airlock_overlay("lights_closing", overlays_file) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_closing", overlays_file) + if(note) + note_overlay = get_airlock_overlay("[notetype]_closing", note_overlay_file) + + if(AIRLOCK_OPEN) + frame_overlay = get_airlock_overlay("open", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_open", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_open", icon) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_open", overlays_file) + if(note) + note_overlay = get_airlock_overlay("[notetype]_open", note_overlay_file) + + if(AIRLOCK_OPENING) + frame_overlay = get_airlock_overlay("opening", icon) + if(airlock_material) + filling_overlay = get_airlock_overlay("[airlock_material]_opening", overlays_file) + else + filling_overlay = get_airlock_overlay("fill_opening", icon) + if(lights && arePowerSystemsOn()) + lights_overlay = get_airlock_overlay("lights_opening", overlays_file) + if(panel_open) + panel_overlay = get_airlock_overlay("panel_opening", overlays_file) + if(note) + note_overlay = get_airlock_overlay("[notetype]_opening", note_overlay_file) + + //doesn't use overlays.Cut() for performance reasons + if(frame_overlay != old_frame_overlay) + overlays -= old_frame_overlay + overlays += frame_overlay + old_frame_overlay = frame_overlay + if(filling_overlay != old_filling_overlay) + overlays -= old_filling_overlay + overlays += filling_overlay + old_filling_overlay = filling_overlay + if(lights_overlay != old_lights_overlay) + overlays -= old_lights_overlay + overlays += lights_overlay + old_lights_overlay = lights_overlay + if(panel_overlay != old_panel_overlay) + overlays -= old_panel_overlay + overlays += panel_overlay + old_panel_overlay = panel_overlay + if(weld_overlay != old_weld_overlay) + overlays -= old_weld_overlay + overlays += weld_overlay + old_weld_overlay = weld_overlay + if(sparks_overlay != old_sparks_overlay) + overlays -= old_sparks_overlay + overlays += sparks_overlay + old_sparks_overlay = sparks_overlay + if(note_overlay != old_note_overlay) + overlays -= old_note_overlay + overlays += note_overlay + old_note_overlay = note_overlay + +/proc/get_airlock_overlay(icon_state, icon_file) + var/iconkey = "[icon_state][icon_file]" + if(airlock_overlays[iconkey]) + return airlock_overlays[iconkey] + airlock_overlays[iconkey] = image(icon_file, icon_state) + return airlock_overlays[iconkey] /obj/machinery/door/airlock/do_animate(animation) switch(animation) if("opening") - if(overlays) - overlays.Cut() - if(p_open) - spawn(2) // The only work around that works. Downside is that the door will be gone for a millisecond. - flick("o_door_opening", src) //can not use flick due to BYOND bug updating overlays right before flicking - update_icon() - else - flick("door_opening", src)//[stat ? "_stat":] - update_icon() + update_icon(AIRLOCK_OPENING) if("closing") - if(overlays) - overlays.Cut() - if(p_open) - spawn(2) - flick("o_door_closing", src) - update_icon() - else - flick("door_closing", src) - update_icon() - if("spark") - if(density) - flick("door_spark", src) + update_icon(AIRLOCK_CLOSING) if("deny") - if(density && arePowerSystemsOn()) - playsound(src, doorDeni, 50, 0, 3) - flick("door_deny", src) - return + if(!stat) + update_icon(AIRLOCK_DENY) + playsound(src,doorDeni,50,0,3) + sleep(6) + update_icon(AIRLOCK_CLOSED) + icon_state = "closed" /obj/machinery/door/airlock/examine(mob/user) ..() if(emagged) to_chat(user, "Its access panel is smoking slightly.") + if(note) + if(!in_range(user, src)) + to_chat(user, "There's a [note.name] pinned to the front. You can't [note_type() == "note" ? "read" : "see"] it from here.") + else + to_chat(user, "There's a [note.name] pinned to the front...") + note.examine(user) /obj/machinery/door/airlock/attack_ghost(mob/user) - if(p_open) + if(panel_open) wires.Interact(user) ui_interact(user) @@ -354,7 +498,7 @@ About the new airlock wires panel: aiHacking=0 return else if(!canAIHack(user)) - to_chat(user, "We've lost our connection! Unable to hack airlock.") + to_chat(user, "Connection lost! Unable to hack airlock.") aiHacking=0 return to_chat(user, "Fault confirmed: airlock control wire disabled or cut.") @@ -366,7 +510,7 @@ About the new airlock wires panel: aiHacking=0 return else if(!canAIHack(user)) - to_chat(user, "We've lost our connection! Unable to hack airlock.") + to_chat(user, "Connection lost! Unable to hack airlock.") aiHacking=0 return to_chat(user, "Upload access confirmed. Loading control program into airlock software.") @@ -376,7 +520,7 @@ About the new airlock wires panel: aiHacking=0 return else if(!canAIHack(user)) - to_chat(user, "We've lost our connection! Unable to hack airlock.") + to_chat(user, "Connection lost! Unable to hack airlock.") aiHacking=0 return to_chat(user, "Transfer complete. Forcing airlock to execute program.") @@ -407,7 +551,7 @@ About the new airlock wires panel: if(ishuman(user) && prob(40) && density) var/mob/living/carbon/human/H = user - if(H.getBrainLoss() >= 60) + if(H.getBrainLoss() >= 60 && Adjacent(user)) playsound(loc, 'sound/effects/bang.ogg', 25, 1) if(!istype(H.head, /obj/item/clothing/head/helmet)) visible_message("[user] headbutts the airlock.") @@ -420,7 +564,7 @@ About the new airlock wires panel: visible_message("[user] headbutts the airlock. Good thing they're wearing a helmet.") return - if(p_open) + if(panel_open) wires.Interact(user) else ..(user) @@ -463,9 +607,11 @@ About the new airlock wires panel: if("main_power") if(!main_power_lost_until) loseMainPower() + update_icon() if("backup_power") if(!backup_power_lost_until) loseBackupPower() + update_icon() if("bolts") if(isWireCut(AIRLOCK_WIRE_DOOR_BOLTS)) to_chat(usr, "The door bolt control wire has been cut - Door bolts permanently dropped.") @@ -530,6 +676,7 @@ About the new airlock wires panel: else if(activate && !lights) lights = 1 to_chat(usr, "The door bolt lights have been enabled.") + update_icon() if("emergency") // Emergency access if(emergency) @@ -538,12 +685,10 @@ About the new airlock wires panel: else emergency = 1 to_chat(usr, "Emergency access has been enabled.") - - update_icon() + update_icon() return 1 /obj/machinery/door/airlock/attackby(obj/item/C, mob/user, params) -// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) if(!issilicon(usr)) if(isElectrified()) if(shock(user, 75)) @@ -564,12 +709,19 @@ About the new airlock wires panel: else return else if(isscrewdriver(C)) - p_open = !p_open - to_chat(user, "You [p_open ? "open":"close"] the maintenance panel of the airlock.") + panel_open = !panel_open + to_chat(user, "You [panel_open ? "open":"close"] the maintenance panel of the airlock.") playsound(loc, C.usesound, 50, 1) update_icon() else if(iswirecutter(C)) - return attack_hand(user) + if(note) + user.visible_message("[user] cuts down [note] from [src].", "You remove [note] from [src].") + playsound(src, 'sound/items/Wirecutter.ogg', 50, 1) + note.forceMove(get_turf(user)) + note = null + update_icon() + else + return attack_hand(user) else if(ismultitool(C)) return attack_hand(user) else if(istype(C, /obj/item/device/assembly/signaler)) @@ -577,50 +729,30 @@ About the new airlock wires panel: else if(istype(C, /obj/item/weapon/pai_cable)) // -- TLE var/obj/item/weapon/pai_cable/cable = C cable.plugin(src, user) + else if(istype(C, /obj/item/weapon/paper) || istype(C, /obj/item/weapon/photo)) + if(note) + to_chat(user, "There's already something pinned to this airlock! Use wirecutters to remove it.") + return + if(!user.unEquip(C)) + to_chat(user, "For some reason, you can't attach [C]!") + return + C.forceMove(src) + user.visible_message("[user] pins [C] to [src].", "You pin [C] to [src].") + note = C + update_icon() else if(iscrowbar(C) || istype(C, /obj/item/weapon/twohanded/fireaxe)) var/beingcrowbarred = null if(iscrowbar(C)) beingcrowbarred = 1 //derp, Agouri else beingcrowbarred = 0 - if(beingcrowbarred && p_open && (emagged || (density && welded && (!operating || emagged) && !arePowerSystemsOn() && !locked))) + if(beingcrowbarred && panel_open && (emagged || (density && welded && !operating && !arePowerSystemsOn() && !locked))) playsound(loc, C.usesound, 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.") if(do_after(user, 40 * C.toolspeed, target = src)) - to_chat(user, "You removed the airlock electronics!") - - var/obj/structure/door_assembly/da = new assemblytype(loc) - da.heat_proof_finished = heat_proof //tracks whether there's rglass in - da.anchored = 1 - if(mineral) - da.glass = mineral - //else if(glass) - else if(glass && !da.glass) - da.glass = 1 - da.state = 1 - da.created_name = name - da.update_state() - - var/obj/item/weapon/airlock_electronics/ae - if(!electronics) - ae = new/obj/item/weapon/airlock_electronics(loc) - if(!req_access) - check_access() - if(req_access.len) - ae.conf_access = req_access - else if(req_one_access.len) - ae.conf_access = req_one_access - ae.one_access = 1 - else - ae = electronics - electronics = null - ae.loc = loc - if(emagged) - ae.icon_state = "door_electronics_smoked" - operating = 0 - - qdel(src) - return + if(loc) + deconstruct(TRUE, user) + return if(istype(C, /obj/item/weapon/crowbar/power) && density) if(isElectrified()) shock(user, 100)//it's like sticking a fork in a power socket @@ -677,66 +809,6 @@ About the new airlock wires panel: ..() return -/obj/machinery/door/airlock/plasma/attackby(obj/C, mob/user, params) - if(is_hot(C) > 300) - message_admins("Plasma airlock ignited by [key_name_admin(user)] in ([x],[y],[z] - JMP)") - log_game("Plasma wall ignited by [key_name(user)] in ([x],[y],[z])") - investigate_log("was ignited by [key_name(user)]","atmos") - ignite(is_hot(C)) - ..() - -/obj/machinery/door/airlock/hatch/gamma/attackby(obj/C, mob/user, params) -// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) - if(!issilicon(user)) - if(isElectrified()) - if(shock(user, 75)) - return - if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) - return - - if(istype(C, /obj/item/weapon/grenade/plastic/c4)) - to_chat(user, "The hatch is coated with a product that prevents the shaped charge from sticking!") - return - - if(istype(C, /obj/item/mecha_parts/mecha_equipment/rcd) || istype(C, /obj/item/weapon/rcd)) - to_chat(user, "The hatch is made of an advanced compound that cannot be deconstructed using an RCD.") - return - - add_fingerprint(user) - if((iswelder(C) && !operating && density)) - var/obj/item/weapon/weldingtool/W = C - if(W.remove_fuel(0,user)) - if(!welded) - welded = 1 - else - welded = null - update_icon() - return - else - return - -/obj/machinery/door/airlock/highsecurity/red/attackby(obj/C, mob/user, params) -// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) - if(!issilicon(user)) - if(isElectrified()) - if(shock(user, 75)) - return - if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) - return - - add_fingerprint(user) - if((iswelder(C) && !operating && density)) - var/obj/item/weapon/weldingtool/W = C - if(W.remove_fuel(0,user)) - if(!welded) - welded = 1 - else - welded = null - update_icon() - return - else - return - /obj/machinery/door/airlock/open(forced=0) if(operating || welded || locked || emagged) return 0 @@ -750,7 +822,30 @@ About the new airlock wires panel: playsound(loc, doorOpen, 30, 1) if(closeOther != null && istype(closeOther, /obj/machinery/door/airlock/) && !closeOther.density) closeOther.close() - return ..() + if(!density) + return TRUE + if(operating) + return + if(!ticker) + return 0 + operating = TRUE + update_icon(AIRLOCK_OPENING, 1) + sleep(1) + set_opacity(0) + update_freelook_sight() + sleep(4) + density = FALSE + air_update_turf(1) + sleep(1) + layer = open_layer + update_icon(AIRLOCK_OPEN, 1) + operating = FALSE + + // The `addtimer` system has the advantage of being cancelable + if(autoclose) + autoclose_timer = addtimer(src, "autoclose", normalspeed ? auto_close_time : auto_close_time_dangerous, unique = 1) + + return TRUE /obj/machinery/door/airlock/close(forced=0, override = 0) if((operating & !override) || welded || locked || emagged) @@ -778,28 +873,30 @@ About the new airlock wires panel: killthis.ex_act(2)//Smashin windows if(density) - return 1 - operating = 1 - do_animate("closing") - layer = 3.1 + return TRUE + operating = TRUE + update_icon(AIRLOCK_CLOSING, 1) + layer = closed_layer if(!override) - sleep(5) - density = 1 + sleep(1) + density = TRUE + air_update_turf(1) + if(!override) + sleep(4) if(!safe) crush() - if(!override) - sleep(5) - update_icon() if(visible && !glass) set_opacity(1) - operating = 0 - air_update_turf(1) update_freelook_sight() + sleep(1) + update_icon(AIRLOCK_CLOSED, 1) + operating = FALSE if(safe) if(locate(/mob/living) in get_turf(src)) + sleep(1) open() - return + return TRUE /obj/machinery/door/airlock/proc/lock(forced=0) if(locked) @@ -830,6 +927,19 @@ About the new airlock wires panel: //Airlock is passable if it is open (!density), bot has access, and is not bolted shut) return !density || (check_access(ID) && !locked && arePowerSystemsOn()) +/obj/machinery/door/airlock/emag_act(mob/user) + if(!operating && density && arePowerSystemsOn() && !emagged) + operating = TRUE + update_icon(AIRLOCK_EMAG, 1) + sleep(6) + if(qdeleted(src)) + return + operating = FALSE + if(!open()) + update_icon(AIRLOCK_CLOSED, 1) + emagged = TRUE + return 1 + /obj/machinery/door/airlock/emp_act(severity) if(prob(40/severity)) var/duration = world.time + SecondsToTicks(30 / severity) @@ -872,8 +982,71 @@ About the new airlock wires panel: open() safe = TRUE +/obj/machinery/door/airlock/deconstruct(disassembled = TRUE, mob/user) + if(can_deconstruct) + var/obj/structure/door_assembly/DA + if(assemblytype) + DA = new assemblytype(loc) + else + DA = new /obj/structure/door_assembly(loc) + //If you come across a null assemblytype, it will produce the default assembly instead of disintegrating. + DA.heat_proof_finished = heat_proof //tracks whether there's rglass in + DA.anchored = TRUE + DA.glass = src.glass + DA.state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS + DA.created_name = name + DA.previous_assembly = previous_airlock + DA.update_name() + DA.update_icon() + if(user) + to_chat(user, "You remove the airlock electronics.") + var/obj/item/weapon/airlock_electronics/ae + if(!electronics) + ae = new/obj/item/weapon/airlock_electronics(loc) + if(!req_access) + check_access() + if(req_access.len) + ae.conf_access = req_access + else if(req_one_access.len) + ae.conf_access = req_one_access + ae.one_access = 1 + else + ae = electronics + electronics = null + ae.forceMove(loc) + if(emagged) + ae.icon_state = "door_electronics_smoked" + operating = 0 + qdel(src) + +/obj/machinery/door/airlock/proc/note_type() //Returns a string representing the type of note pinned to this airlock + if(!note) + return + else if(istype(note, /obj/item/weapon/paper)) + return "note" + else if(istype(note, /obj/item/weapon/photo)) + return "photo" + /obj/machinery/door/airlock/narsie_act() var/turf/T = get_turf(src) - var/obj/machinery/door/airlock/cult/A = new(T) + var/runed = prob(20) + var/obj/machinery/door/airlock/cult/A + if(glass) + if(runed) + A = new/obj/machinery/door/airlock/cult/glass(T) + else + A = new/obj/machinery/door/airlock/cult/unruned/glass(T) + else + if(runed) + A = new/obj/machinery/door/airlock/cult(T) + else + A = new/obj/machinery/door/airlock/cult/unruned(T) A.name = name qdel(src) + +#undef AIRLOCK_CLOSED +#undef AIRLOCK_CLOSING +#undef AIRLOCK_OPEN +#undef AIRLOCK_OPENING +#undef AIRLOCK_DENY +#undef AIRLOCK_EMAG diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index d41b4ed49d3..17fa437b9eb 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -3,47 +3,52 @@ */ /obj/machinery/door/airlock/command - icon = 'icons/obj/doors/Doorcom.dmi' + icon = 'icons/obj/doors/airlocks/station/command.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_com /obj/machinery/door/airlock/security - icon = 'icons/obj/doors/Doorsec.dmi' + icon = 'icons/obj/doors/airlocks/station/security.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_sec /obj/machinery/door/airlock/engineering - icon = 'icons/obj/doors/Dooreng.dmi' + icon = 'icons/obj/doors/airlocks/station/engineering.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_eng /obj/machinery/door/airlock/medical - icon = 'icons/obj/doors/Doormed.dmi' + icon = 'icons/obj/doors/airlocks/station/medical.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_med /obj/machinery/door/airlock/maintenance name = "maintenance access" - icon = 'icons/obj/doors/Doormaint.dmi' + icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_mai +/obj/machinery/door/airlock/maintenance/external + name = "external airlock access" + icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_extmai + /obj/machinery/door/airlock/mining name = "mining airlock" - icon = 'icons/obj/doors/Doormining.dmi' + icon = 'icons/obj/doors/airlocks/station/mining.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_min /obj/machinery/door/airlock/atmos name = "atmospherics airlock" - icon = 'icons/obj/doors/Dooratmo.dmi' + icon = 'icons/obj/doors/airlocks/station/atmos.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_atmo /obj/machinery/door/airlock/research - icon = 'icons/obj/doors/Doorresearch.dmi' + icon = 'icons/obj/doors/airlocks/station/research.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_research /obj/machinery/door/airlock/freezer name = "freezer airlock" - icon = 'icons/obj/doors/Doorfreezer.dmi' + icon = 'icons/obj/doors/airlocks/station/freezer.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_fre /obj/machinery/door/airlock/science - icon = 'icons/obj/doors/Doorsci.dmi' + icon = 'icons/obj/doors/airlocks/station/science.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_science ////////////////////////////////// @@ -51,53 +56,49 @@ Station Airlocks Glass */ -/obj/machinery/door/airlock/glass_command - icon = 'icons/obj/doors/Doorcomglass.dmi' +/obj/machinery/door/airlock/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_com - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_engineering - icon = 'icons/obj/doors/Doorengglass.dmi' +/obj/machinery/door/airlock/command/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_eng - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_security - icon = 'icons/obj/doors/Doorsecglass.dmi' +/obj/machinery/door/airlock/engineering/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_sec - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_medical - icon = 'icons/obj/doors/Doormedglass.dmi' +/obj/machinery/door/airlock/security/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_med - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_research - icon = 'icons/obj/doors/Doorresearchglass.dmi' +/obj/machinery/door/airlock/medical/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_research - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_mining - icon = 'icons/obj/doors/Doorminingglass.dmi' +/obj/machinery/door/airlock/research/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_min - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_atmos - icon = 'icons/obj/doors/Dooratmoglass.dmi' +/obj/machinery/door/airlock/mining/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_atmo - glass = 1 + glass = TRUE -/obj/machinery/door/airlock/glass_science - icon = 'icons/obj/doors/Doorsciglass.dmi' +/obj/machinery/door/airlock/atmos/glass opacity = 0 - assemblytype = /obj/structure/door_assembly/door_assembly_science - glass = 1 + glass = TRUE + +/obj/machinery/door/airlock/science/glass + opacity = 0 + glass = TRUE + +/obj/machinery/door/airlock/maintenance/glass + opacity = 0 + glass = TRUE + +/obj/machinery/door/airlock/maintenance/external/glass + opacity = 0 + glass = TRUE ////////////////////////////////// /* @@ -106,24 +107,37 @@ /obj/machinery/door/airlock/gold name = "gold airlock" - icon = 'icons/obj/doors/Doorgold.dmi' - mineral = "gold" + icon = 'icons/obj/doors/airlocks/station/gold.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_gold + +/obj/machinery/door/airlock/gold/glass + opacity = 0 + glass = TRUE /obj/machinery/door/airlock/silver name = "silver airlock" - icon = 'icons/obj/doors/Doorsilver.dmi' - mineral = "silver" + icon = 'icons/obj/doors/airlocks/station/silver.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_silver + +/obj/machinery/door/airlock/silver/glass + opacity = 0 + glass = TRUE /obj/machinery/door/airlock/diamond name = "diamond airlock" - icon = 'icons/obj/doors/Doordiamond.dmi' - mineral = "diamond" + icon = 'icons/obj/doors/airlocks/station/diamond.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_diamond + explosion_block = 2 + +/obj/machinery/door/airlock/diamond/glass + opacity = 0 + glass = TRUE /obj/machinery/door/airlock/uranium name = "uranium airlock" desc = "And they said I was crazy." - icon = 'icons/obj/doors/Dooruranium.dmi' - mineral = "uranium" + icon = 'icons/obj/doors/airlocks/station/uranium.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_uranium var/event_step = 20 /obj/machinery/door/airlock/uranium/New() @@ -136,11 +150,15 @@ L.apply_effect(15,IRRADIATE,0) addtimer(src, "radiate", event_step) +/obj/machinery/door/airlock/uranium/glass + opacity = 0 + glass = TRUE + /obj/machinery/door/airlock/plasma name = "plasma airlock" desc = "No way this can end badly." - icon = 'icons/obj/doors/Doorplasma.dmi' - mineral = "plasma" + icon = 'icons/obj/doors/airlocks/station/plasma.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_plasma /obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) @@ -152,23 +170,46 @@ /obj/machinery/door/airlock/plasma/proc/PlasmaBurn(temperature) atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 500) - new/obj/structure/door_assembly(loc) + var/obj/structure/door_assembly/DA + DA = new /obj/structure/door_assembly(loc) + if(glass) + DA.glass = TRUE + if(heat_proof) + DA.heat_proof_finished = TRUE + DA.update_icon() + DA.update_name() qdel(src) +/obj/machinery/door/airlock/plasma/attackby(obj/C, mob/user, params) + if(is_hot(C) > 300) + message_admins("Plasma airlock ignited by [key_name_admin(user)] in ([x],[y],[z] - JMP)") + log_game("Plasma airlock ignited by [key_name(user)] in ([x],[y],[z])") + investigate_log("was ignited by [key_name(user)]","atmos") + ignite(is_hot(C)) + ..() + /obj/machinery/door/airlock/plasma/BlockSuperconductivity() //we don't stop the heat~ return 0 +/obj/machinery/door/airlock/plasma/glass + opacity = 0 + glass = TRUE + /obj/machinery/door/airlock/bananium name = "bananium airlock" - icon = 'icons/obj/doors/Doorbananium.dmi' - mineral = "bananium" + desc = "Honkhonkhonk" + icon = 'icons/obj/doors/airlocks/station/bananium.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_bananium doorOpen = 'sound/items/bikehorn.ogg' doorClose = 'sound/items/bikehorn.ogg' +/obj/machinery/door/airlock/bananium/glass + opacity = 0 + glass = TRUE + /obj/machinery/door/airlock/tranquillite name = "tranquillite airlock" - icon = 'icons/obj/doors/Doorfreezer.dmi' - mineral = "tranquillite" + icon = 'icons/obj/doors/airlocks/station/freezer.dmi' doorOpen = null // it's silent! doorClose = null doorDeni = null @@ -177,21 +218,45 @@ /obj/machinery/door/airlock/sandstone name = "sandstone airlock" - icon = 'icons/obj/doors/Doorsand.dmi' - mineral = "sandstone" + icon = 'icons/obj/doors/airlocks/station/sandstone.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_sandstone + +/obj/machinery/door/airlock/sandstone/glass + opacity = 0 + glass = TRUE + +/obj/machinery/door/airlock/wood + name = "wooden airlock" + icon = 'icons/obj/doors/airlocks/station/wood.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_wood + +/obj/machinery/door/airlock/wood/glass + opacity = 0 + glass = TRUE + +/obj/machinery/door/airlock/titanium + name = "shuttle airlock" + assemblytype = /obj/structure/door_assembly/door_assembly_titanium + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + +/obj/machinery/door/airlock/titanium/glass + opacity = 0 + glass = TRUE ////////////////////////////////// /* Station2 Airlocks */ -/obj/machinery/door/airlock/glass - name = "glass airlock" - icon = 'icons/obj/doors/Doorglass.dmi' +/obj/machinery/door/airlock/public + icon = 'icons/obj/doors/airlocks/station2/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_public + +/obj/machinery/door/airlock/public/glass opacity = 0 - glass = 1 - doorOpen = 'sound/machines/windowdoor.ogg' - doorClose = 'sound/machines/windowdoor.ogg' + glass = TRUE ////////////////////////////////// /* @@ -200,19 +265,27 @@ /obj/machinery/door/airlock/external name = "external airlock" - icon = 'icons/obj/doors/Doorext.dmi' + icon = 'icons/obj/doors/airlocks/external/external.dmi' + overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_ext doorOpen = 'sound/machines/airlock_ext_open.ogg' doorClose = 'sound/machines/airlock_ext_close.ogg' +/obj/machinery/door/airlock/external/glass + opacity = 0 + glass = TRUE + ////////////////////////////////// /* CentCom Airlocks */ /obj/machinery/door/airlock/centcom - icon = 'icons/obj/doors/Doorele.dmi' + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' opacity = 0 + explosion_block = 2 assemblytype = /obj/structure/door_assembly/door_assembly_centcom ////////////////////////////////// @@ -222,7 +295,8 @@ /obj/machinery/door/airlock/vault name = "vault door" - icon = 'icons/obj/doors/vault.dmi' + icon = 'icons/obj/doors/airlocks/vault/vault.dmi' + overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_vault explosion_block = 2 @@ -233,7 +307,9 @@ /obj/machinery/door/airlock/hatch name = "airtight hatch" - icon = 'icons/obj/doors/Doorhatchele.dmi' + icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_hatch /obj/machinery/door/airlock/hatch/syndicate @@ -255,9 +331,37 @@ unacidable = 1 is_special = 1 +/obj/machinery/door/airlock/hatch/gamma/attackby(obj/C, mob/user, params) + if(!issilicon(user)) + if(isElectrified()) + if(shock(user, 75)) + return + if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) + return + + if(istype(C, /obj/item/weapon/grenade/plastic/c4)) + to_chat(user, "The hatch is coated with a product that prevents the shaped charge from sticking!") + return + + if(istype(C, /obj/item/mecha_parts/mecha_equipment/rcd) || istype(C, /obj/item/weapon/rcd)) + to_chat(user, "The hatch is made of an advanced compound that cannot be deconstructed using an RCD.") + return + + add_fingerprint(user) + if((iswelder(C) && !operating && density)) + var/obj/item/weapon/weldingtool/W = C + if(W.remove_fuel(0,user)) + welded = !welded + update_icon() + return + else + return + /obj/machinery/door/airlock/maintenance_hatch name = "maintenance hatch" - icon = 'icons/obj/doors/Doorhatchmaint2.dmi' + icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi' + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_mhatch ////////////////////////////////// @@ -267,7 +371,8 @@ /obj/machinery/door/airlock/highsecurity name = "high tech security airlock" - icon = 'icons/obj/doors/hightechsecurity.dmi' + icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi' + overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity explosion_block = 2 @@ -276,6 +381,27 @@ hackProof = 1 aiControlDisabled = 1 +/obj/machinery/door/airlock/highsecurity/red/attackby(obj/C, mob/user, params) + if(!issilicon(user)) + if(isElectrified()) + if(shock(user, 75)) + return + if(istype(C, /obj/item/device/detective_scanner) || istype(C, /obj/item/taperoll)) + return + + add_fingerprint(user) + if((iswelder(C) && !operating && density)) + var/obj/item/weapon/weldingtool/W = C + if(W.remove_fuel(0,user)) + if(!welded) + welded = 1 + else + welded = null + update_icon() + return + else + return + ////////////////////////////////// /* Shuttle Airlocks @@ -283,9 +409,25 @@ /obj/machinery/door/airlock/shuttle name = "shuttle airlock" - icon = 'icons/obj/doors/doorshuttle.dmi' + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_shuttle +/obj/machinery/door/airlock/shuttle/glass + opacity = 0 + glass = TRUE + +/obj/machinery/door/airlock/abductor + name = "alien airlock" + desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?" + icon = 'icons/obj/doors/airlocks/abductor/abductor_airlock.dmi' + overlays_file = 'icons/obj/doors/airlocks/abductor/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_abductor + explosion_block = 3 + hackProof = TRUE + aiControlDisabled = 1 + ////////////////////////////////// /* Cult Airlocks @@ -293,33 +435,35 @@ /obj/machinery/door/airlock/cult name = "cult airlock" - icon = 'icons/obj/doors/doorcult.dmi' + icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi' + overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_cult - hackProof = 1 - aiControlDisabled = 1 + hackProof = TRUE + aiControlDisabled = TRUE + var/openingoverlaytype = /obj/effect/temp_visual/cult/door var/friendly = FALSE /obj/machinery/door/airlock/cult/New() ..() + new openingoverlaytype(loc) /obj/machinery/door/airlock/cult/canAIControl(mob/user) - return (iscultist(user)) + return (iscultist(user) && !isAllPowerLoss()) -/obj/machinery/door/airlock/cult/allowed(mob/M) +/obj/machinery/door/airlock/cult/allowed(mob/living/L) if(!density) return 1 - if(friendly || \ - iscultist(M) || \ - istype(M, /mob/living/simple_animal/shade) || \ - istype(M, /mob/living/simple_animal/construct)) + if(friendly || iscultist(L) || isshade(L)|| isconstruct(L)) + new openingoverlaytype(loc) return 1 else + new /obj/effect/temp_visual/cult/sac(loc) var/atom/throwtarget - throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(M, src))) - M << pick(sound('sound/hallucinations/turn_around1.ogg',0,1,50), sound('sound/hallucinations/turn_around2.ogg',0,1,50)) - M.Weaken(2) + throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src))) + L << pick(sound('sound/hallucinations/turn_around1.ogg',0,1,50), sound('sound/hallucinations/turn_around2.ogg',0,1,50)) + L.Weaken(2) spawn(0) - M.throw_at(throwtarget, 5, 1,src) + L.throw_at(throwtarget, 5, 1,src) return 0 /obj/machinery/door/airlock/cult/narsie_act() @@ -328,6 +472,29 @@ /obj/machinery/door/airlock/cult/friendly friendly = TRUE +/obj/machinery/door/airlock/cult/glass + glass = TRUE + opacity = 0 + +/obj/machinery/door/airlock/cult/glass/friendly + friendly = TRUE + +/obj/machinery/door/airlock/cult/unruned + icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' + overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi' + assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned + openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned + +/obj/machinery/door/airlock/cult/unruned/friendly + friendly = TRUE + +/obj/machinery/door/airlock/cult/unruned/glass + glass = TRUE + opacity = 0 + +/obj/machinery/door/airlock/cult/unruned/glass/friendly + friendly = TRUE + ////////////////////////////////// /* Misc Airlocks @@ -335,11 +502,17 @@ //Terribly sorry for the code doubling, but things go derpy otherwise. /obj/machinery/door/airlock/multi_tile + name = "large airlock" + dir = EAST width = 2 + icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi' + overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' + note_overlay_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' + assemblytype = "obj/structure/door_assembly/multi_tile" + +/obj/machinery/door/airlock/multi_tile/narsie_act() + return /obj/machinery/door/airlock/multi_tile/glass - name = "large glass airlock" - icon = 'icons/obj/doors/Door2x1glass.dmi' opacity = 0 - glass = 1 - assemblytype = "obj/structure/door_assembly/multi_tile" + glass = TRUE diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 839fb387ddb..cdada603a9b 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -1,6 +1,7 @@ /obj/machinery/door/airlock/alarmlock name = "glass alarm airlock" - icon = 'icons/obj/doors/Doorglass.dmi' + icon = 'icons/obj/doors/airlocks/station2/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' opacity = 0 glass = 1 autoclose = 0 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index db63d48935f..842b08b577c 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -1,6 +1,3 @@ -#define DOOR_OPEN_LAYER 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6 -#define DOOR_CLOSED_LAYER 3.1 //Above most items if closed - /obj/machinery/door name = "door" desc = "It opens and closes." @@ -9,12 +6,11 @@ anchored = 1 opacity = 1 density = 1 - layer = DOOR_OPEN_LAYER + layer = OPEN_DOOR_LAYER power_channel = ENVIRON - var/open_layer = DOOR_OPEN_LAYER - var/closed_layer = DOOR_CLOSED_LAYER + var/open_layer = OPEN_DOOR_LAYER + var/closed_layer = CLOSED_DOOR_LAYER var/visible = 1 - var/p_open = 0 var/operating = 0 var/autoclose = 0 var/autoclose_timer @@ -30,15 +26,14 @@ var/block_air_zones = 1 //If set, air zones cannot merge across the door even when it is opened. //Multi-tile doors - dir = EAST var/width = 1 /obj/machinery/door/New() . = ..() if(density) - layer = closed_layer + layer = closed_layer //Above most items if closed else - layer = open_layer + layer = open_layer //Under all objects if opened. 2.7 due to tables being at 2.6 update_dir() update_freelook_sight() @@ -72,7 +67,7 @@ return ..() /obj/machinery/door/Bumped(atom/AM) - if(p_open || operating || emagged) + if(panel_open || operating || emagged) return if(isliving(AM)) var/mob/living/M = AM @@ -218,12 +213,12 @@ /obj/machinery/door/proc/do_animate(animation) switch(animation) if("opening") - if(p_open) + if(panel_open) flick("o_doorc0", src) else flick("doorc0", src) if("closing") - if(p_open) + if(panel_open) flick("o_doorc1", src) else flick("doorc1", src) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 947bcf6059d..fc0fc16d9cf 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -27,7 +27,7 @@ var/active_alarm = FALSE /obj/machinery/door/firedoor/Bumped(atom/AM) - if(p_open || operating) + if(panel_open || operating) return if(!density) return ..() diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 7e483c3bfc5..d64b08efedf 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -101,6 +101,7 @@ /obj/machinery/door/poddoor/multi_tile // Whoever wrote the old code for multi-tile spesspod doors needs to burn in hell. name = "large pod door" + layer = CLOSED_DOOR_LAYER /obj/machinery/door/poddoor/multi_tile/four_tile_ver/ icon = 'icons/obj/doors/1x4blast_vert.dmi' @@ -130,4 +131,4 @@ /obj/machinery/door/poddoor/multi_tile/two_tile_hor/ icon = 'icons/obj/doors/1x2blast_hor.dmi' width = 2 - dir = EAST \ No newline at end of file + dir = EAST diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 059c6268005..270d3a064e4 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -3,6 +3,7 @@ desc = "Heavy duty metal shutters that opens mechanically." icon = 'icons/obj/doors/rapid_pdoor.dmi' icon_state = "shutter1" + dir = EAST /obj/machinery/door/poddoor/shutters/New() ..() diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 3e3ff6fc67b..b9910e00997 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -6,6 +6,7 @@ visible = 0.0 flags = ON_BORDER opacity = 0 + dir = EAST var/obj/item/weapon/airlock_electronics/electronics = null var/base_state = "left" var/health = 150.0 //If you change this, consider changing ../door/window/brigdoor/ health at the bottom of this .dm file @@ -262,17 +263,17 @@ to_chat(user, "You need to open the door to access the maintenance panel.") return playsound(loc, I.usesound, 50, 1) - p_open = !p_open - to_chat(user, "You [p_open ? "open":"close"] the maintenance panel of the [name].") + panel_open = !panel_open + to_chat(user, "You [panel_open ? "open":"close"] the maintenance panel of the [name].") return if(iscrowbar(I)) - if(p_open && !density && !operating) + if(panel_open && !density && !operating) playsound(loc, I.usesound, 100, 1) user.visible_message("[user] removes the electronics from the [name].", \ "You start to remove electronics from the [name].") if(do_after(user, 40 * I.toolspeed, target = src)) - if(p_open && !density && !operating && loc) + if(panel_open && !density && !operating && loc) var/obj/structure/windoor_assembly/WA = new /obj/structure/windoor_assembly(loc) switch(base_state) if("left") diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index f7272e8e29a..a67580d0ebb 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -4,6 +4,7 @@ /datum/feed_message var/author = "" + var/title = "" var/body = "" var/message_type = "Story" var/backup_body = "" @@ -42,8 +43,10 @@ is_admin_channel = 0 total_view_count = 0 -/datum/feed_channel/proc/announce_news() - return "Breaking news from [channel_name]!" +/datum/feed_channel/proc/announce_news(title="") + if(title) + return "Breaking news from [channel_name]: [title]" + return "Breaking news from [channel_name]" /datum/feed_channel/station/announce_news() return "New Station Announcement Available" @@ -87,6 +90,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co // 1 = there has var/scanned_user = "Unknown" //Will contain the name of the person who currently uses the newscaster var/msg = "" //Feed message + var/msg_title = "" // Feed message title var/obj/item/weapon/photo/photo = null var/channel_name = "" //the feed channel which will be receiving the feed, or being created var/c_locked = 0 //Will our new channel be locked to public submissions? @@ -213,6 +217,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(3) data["scanned_user"] = scanned_user data["channel_name"] = channel_name + data["title"] = msg_title data["msg"] = msg data["photo"] = photo ? 1 : 0 if(4) @@ -236,7 +241,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/list/messages = list() data["messages"] = messages for(var/datum/feed_message/M in viewing_channel.messages) - messages[++messages.len] = list("body" = M.body, "img" = M.img ? icon2base64(M.img) : null, "message_type" = M.message_type, "author" = M.author, "view_count" = M.view_count) + messages[++messages.len] = list("title" = M.title, "body" = M.body, "img" = M.img ? icon2base64(M.img) : null, "message_type" = M.message_type, "author" = M.author, "view_count" = M.view_count) if(8, 9) data["channel_name"] = viewing_channel.channel_name data["ref"] = "\ref[viewing_channel]" @@ -247,7 +252,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/list/messages = list() data["messages"] = messages for(var/datum/feed_message/M in viewing_channel.messages) - messages[++messages.len] = list("body" = M.body, "body_redacted" = (M.body == REDACTED ? 1 : 0) , "message_type" = M.message_type, "author" = M.author, "author_redacted" = (M.author == REDACTED ? 1 : 0), "ref" = "\ref[M]", "view_count" = M.view_count) + messages[++messages.len] = list("title" = M.title, "body" = M.body, "body_redacted" = (M.body == REDACTED ? 1 : 0) , "message_type" = M.message_type, "author" = M.author, "author_redacted" = (M.author == REDACTED ? 1 : 0), "ref" = "\ref[M]", "view_count" = M.view_count) if(10) var/wanted_already = 0 var/end_param = 1 @@ -283,9 +288,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co return 1 if(href_list["set_channel_name"]) - channel_name = sanitizeSQL(strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", ""))) - while(findtext(channel_name," ") == 1) - channel_name = copytext(channel_name, 2, lentext(channel_name) + 1) + channel_name = trim(sanitize(strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")))) else if(href_list["set_channel_lock"]) c_locked = !c_locked @@ -333,10 +336,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co available_channels += F.channel_name channel_name = strip_html_simple(input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels) + else if(href_list["set_message_title"]) + msg_title = trim(strip_html(input(usr, "Write a title for your feed story", "Network Channel Handler", ""))) + msg_title = dd_limittext(msg_title, 256) + else if(href_list["set_new_message"]) - msg = strip_html(input(usr, "Write your feed story", "Network Channel Handler", "")) - while(findtext(msg, " ") == 1) - msg = copytext(msg, 2, lentext(msg) + 1) + msg = trim(strip_html(input(usr, "Write your feed story", "Network Channel Handler", ""))) else if(href_list["set_attachment"]) AttachPhoto(usr) @@ -355,6 +360,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else var/datum/feed_message/newMsg = new /datum/feed_message newMsg.author = scanned_user + newMsg.title = msg_title newMsg.body = msg if(photo) newMsg.img = photo.img @@ -363,7 +369,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/feed_channel/FC in news_network.network_channels) if(FC.channel_name == channel_name) FC.messages += newMsg //Adding message to the network's appropriate feed_channel - announcement = FC.announce_news() + announcement = FC.announce_news(msg_title) break temp = "Feed story successfully submitted to [channel_name]." temp_back_screen = NEWSCASTER_MAIN @@ -408,14 +414,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co screen = NEWSCASTER_W_ISSUE_H else if(href_list["set_wanted_name"]) - channel_name = strip_html(input(usr, "Provide the name of the wanted person", "Network Security Handler", "")) - while(findtext(channel_name, " ") == 1) - channel_name = copytext(channel_name, 2, lentext(channel_name) + 1) + channel_name = trim(strip_html(input(usr, "Provide the name of the wanted person", "Network Security Handler", ""))) else if(href_list["set_wanted_desc"]) - msg = strip_html(input(usr, "Provide the a description of the wanted person and any other details you deem important", "Network Security Handler", "")) - while(findtext(msg, " ") == 1) - msg = copytext(msg, 2, lentext(msg) + 1) + msg = trim(strip_html(input(usr, "Provide the a description of the wanted person and any other details you deem important", "Network Security Handler", ""))) else if(href_list["submit_wanted"]) var/input_param = text2num(href_list["submit_wanted"]) @@ -534,6 +536,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(screen == NEWSCASTER_MAIN) scanned_user = "Unknown" msg = "" + msg_title = "" c_locked = 0 channel_name = "" viewing_channel = null @@ -687,7 +690,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/i = 0 for(var/datum/feed_message/MESSAGE in C.messages) i++ - dat+="-[MESSAGE.body]
" + dat+="[MESSAGE.title]
" + dat+="[MESSAGE.body]
" if(MESSAGE.img) user << browse_rsc(MESSAGE.img, "tmp_photo[i].png") dat+="
" diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 9cf58846feb..43fda1c6e00 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -24,7 +24,7 @@ var/const/SAFETY_COOLDOWN = 100 component_parts += new /obj/item/weapon/circuitboard/recycler(null) component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) component_parts += new /obj/item/weapon/stock_parts/manipulator(null) - materials = new /datum/material_container(src, list(MAT_METAL=1, MAT_GLASS=1, MAT_SILVER=1, MAT_GOLD=1, MAT_DIAMOND=1, MAT_PLASMA=1, MAT_URANIUM=1, MAT_BANANIUM=1, MAT_TRANQUILLITE=1)) + materials = new /datum/material_container(src, list(MAT_METAL=1, MAT_GLASS=1, MAT_SILVER=1, MAT_GOLD=1, MAT_DIAMOND=1, MAT_PLASMA=1, MAT_URANIUM=1, MAT_BANANIUM=1, MAT_TRANQUILLITE=1, MAT_TITANIUM=1)) RefreshParts() update_icon() diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 1cf769624e9..21f22866eb5 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -19,7 +19,8 @@ MAT_GOLD=0, MAT_PLASMA=0, MAT_SILVER=0, - MAT_URANIUM=0 + MAT_URANIUM=0, + MAT_TITANIUM=0 ) var/res_max_amount = 200000 var/datum/research/files @@ -435,6 +436,8 @@ type = /obj/item/stack/sheet/mineral/bananium if(MAT_TRANQUILLITE) type = /obj/item/stack/sheet/mineral/tranquillite + if(MAT_TITANIUM) + type = /obj/item/stack/sheet/mineral/titanium else return 0 var/result = 0 @@ -492,6 +495,8 @@ material = MAT_TRANQUILLITE if(/obj/item/stack/sheet/mineral/uranium) material = MAT_URANIUM + if(/obj/item/stack/sheet/mineral/titanium) + material = MAT_TITANIUM else return ..() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 3ab3d0e154b..63fc5a47168 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -98,8 +98,8 @@ log_message("[src] created.") mechas_list += src //global mech list prepare_huds() - var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC] - diag_hud.add_to_hud(src) + for(var/datum/atom_hud/data/diagnostic/diag_hud in huds) + diag_hud.add_to_hud(src) diag_hud_set_mechhealth() diag_hud_set_mechcell() diag_hud_set_mechstat() diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm index a3c2bc2c649..8bc9b6c42d5 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -6,6 +6,10 @@ bloodiness = MAX_SHOE_BLOODINESS blood_state = BLOOD_STATE_XENO +/obj/effect/decal/cleanable/blood/xeno/splatter + random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5") + amount = 2 + /obj/effect/decal/cleanable/blood/gibs/xeno name = "xeno gibs" desc = "Gnarly..." diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index a3582ef0874..5bce827604c 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -58,4 +58,4 @@ /obj/effect/decal/cleanable/blood/oil/streak random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5") - amount = 2 \ No newline at end of file + amount = 2 diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index a0a4417de4e..830d12cfd12 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -40,6 +40,11 @@ icon = 'icons/misc/beach.dmi' icon_state = "coconuts" +/obj/effect/overlay/sparkles + name = "sparkles" + icon = 'icons/effects/effects.dmi' + icon_state = "shieldsparkles" + /obj/effect/overlay/adminoverlay name = "adminoverlay" icon = 'icons/effects/effects.dmi' diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 61f27730d77..8a82d3cd73a 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -284,3 +284,19 @@ obj/item/device/flashlight/lamp/bananalamp else to_chat(user, "\The [src] needs time to recharge!") return + +/obj/item/device/flashlight/spotlight //invisible lighting source + name = "disco light" + desc = "Groovy..." + icon_state = null + light_color = null + brightness_on = 0 + light_range = 0 + light_power = 10 + alpha = 0 + layer = 0 + on = TRUE + anchored = TRUE + var/range = null + unacidable = TRUE + burn_state = LAVA_PROOF \ No newline at end of file diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 75b2ad94d95..3c9be2c67de 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -1,4 +1,6 @@ /obj/item/flag + name = "flag" + desc = "It's a flag." icon = 'icons/obj/flag.dmi' icon_state = "ntflag" lefthand_file = 'icons/mob/inhands/flags_lefthand.dmi' @@ -6,13 +8,19 @@ w_class = WEIGHT_CLASS_BULKY burntime = 20 burn_state = FLAMMABLE + var/rolled = FALSE /obj/item/flag/attackby(obj/item/weapon/W, mob/user, params) ..() if(is_hot(W) && burn_state != ON_FIRE) - user.visible_message("[user] lights the [name] with [W].") + user.visible_message("[user] lights [src] with [W].", "You light [src] with [W].", "You hear a low whoosh.") fire_act() +/obj/item/flag/attack_self(mob/user) + rolled = !rolled + user.visible_message("[user] [rolled ? "rolls up" : "unfurls"] [src].", "You [rolled ? "roll up" : "unfurl"] [src].", "You hear fabric rustling.") + update_icon() + /obj/item/flag/fire_act(global_overlay = FALSE) ..() update_icon() @@ -23,16 +31,24 @@ /obj/item/flag/update_icon() overlays.Cut() + updateFlagIcon() + item_state = icon_state + if(rolled) + icon_state = "[icon_state]_rolled" if(burn_state == ON_FIRE) + item_state = "[item_state]_fire" + if(burn_state == ON_FIRE && rolled) + overlays += image('icons/obj/flag.dmi', src , "fire_rolled") + else if(burn_state == ON_FIRE && !rolled) overlays += image('icons/obj/flag.dmi', src , "fire") - item_state = "[icon_state]_fire" - else - item_state = initial(icon_state) if(ismob(loc)) var/mob/M = loc M.update_inv_r_hand() M.update_inv_l_hand() +/obj/item/flag/proc/updateFlagIcon() + icon_state = initial(icon_state) + /obj/item/flag/nt name = "Nanotrasen flag" desc = "A flag proudly boasting the logo of NT." @@ -187,11 +203,16 @@ desc = "A poor recreation of the official NT flag. It seems to shimmer a little." icon_state = "ntflag" origin_tech = "syndicate=4;magnets=4" - var/used = 0 + var/updated_icon_state = null + var/used = FALSE + +/obj/item/flag/chameleon/New() + updated_icon_state = icon_state + ..() /obj/item/flag/chameleon/attack_self(mob/user) if(used) - return + return ..() var/list/flag_types = typesof(/obj/item/flag) - list(src.type, /obj/item/flag) var/list/flag = list() @@ -208,12 +229,16 @@ var/obj/item/flag/chosen_flag = flag[input_flag] - if(chosen_flag) + if(chosen_flag && !used) name = chosen_flag.name icon_state = chosen_flag.icon_state + updated_icon_state = icon_state desc = chosen_flag.desc - used = 1 + used = TRUE /obj/item/flag/chameleon/burn() explosion(loc,1,2,4,4, flame_range = 4) qdel(src) + +/obj/item/flag/chameleon/updateFlagIcon() + icon_state = updated_icon_state diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 92426b17688..3757faffba9 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -97,14 +97,14 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \ new/datum/stack_recipe("alien bed", /obj/structure/stool/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("alien table frame", /obj/structure/table_frame/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("alien airlock assembly", /obj/structure/door_assembly/door_assembly_abductor, 4, time = 20, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \ ) /obj/item/stack/sheet/mineral - force = 5.0 + force = 5 throwforce = 5 - w_class = WEIGHT_CLASS_NORMAL throw_speed = 3 /obj/item/stack/sheet/mineral/New() @@ -225,6 +225,56 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \ ..() recipes = tranquillite_recipes +/* + * Titanium + */ +/obj/item/stack/sheet/mineral/titanium + name = "titanium" + icon_state = "sheet-titanium" + singular_name = "titanium sheet" + force = 5 + throwforce = 5 + w_class = WEIGHT_CLASS_NORMAL + throw_speed = 1 + throw_range = 3 + sheettype = "titanium" + materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT) + +var/global/list/datum/stack_recipe/titanium_recipes = list ( + new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20), + ) + +/obj/item/stack/sheet/mineral/titanium/New(loc, amount=null) + recipes = titanium_recipes + ..() + +/obj/item/stack/sheet/mineral/titanium/fifty + amount = 50 + + +/* + * Plastitanium + */ +/obj/item/stack/sheet/mineral/plastitanium + name = "plastitanium" + icon_state = "sheet-plastitanium" + singular_name = "plastitanium sheet" + force = 5 + throwforce = 5 + w_class = WEIGHT_CLASS_NORMAL + throw_speed = 1 + throw_range = 3 + sheettype = "plastitanium" + materials = list(MAT_TITANIUM=2000, MAT_PLASMA=2000) + +var/global/list/datum/stack_recipe/plastitanium_recipes = list ( + new/datum/stack_recipe("plas-titanium tile", /obj/item/stack/tile/mineral/plastitanium, 1, 4, 20), + ) + +/obj/item/stack/sheet/mineral/plastitanium/New(loc, amount=null) + recipes = plastitanium_recipes + ..() + /obj/item/stack/sheet/mineral/enruranium name = "enriched uranium" icon_state = "sheet-enruranium" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 52cf7e10c69..ccfe2a47c22 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -61,6 +61,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list( null, new /datum/stack_recipe_list("airlock assemblies", list( new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("public airlock assembly", /obj/structure/door_assembly/door_assembly_public, 4, time = 50, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1), @@ -70,11 +71,12 @@ var/global/list/datum/stack_recipe/metal_recipes = list( new /datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("external maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_extmai, 4, time = 50, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1), - new /datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 8, time = 50, one_per_turf = 1, on_floor = 1), )), null, new /datum/stack_recipe("mass driver button frame", /obj/item/mounted/frame/driver_button, 1, time = 50, one_per_turf = 0, on_floor = 1), @@ -131,8 +133,8 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list( new /datum/stack_recipe("Mass Driver frame", /obj/machinery/mass_driver_frame, 3, time = 50, one_per_turf = 1), null, new /datum/stack_recipe_list("airlock assemblies", list( - new /datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 4, time = 50, one_per_turf = 1, on_floor = 1), - new /datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 6, time = 50, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 6, time = 50, one_per_turf = 1, on_floor = 1), ), 4), ) @@ -142,7 +144,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list( desc = "This sheet is an alloy of iron and plasma." icon_state = "sheet-plasteel" item_state = "sheet-metal" - materials = list(MAT_METAL=6000, MAT_PLASMA=6000) + materials = list(MAT_METAL=2000, MAT_PLASMA=2000) throwforce = 10.0 flags = CONDUCT origin_tech = "materials=2" @@ -368,6 +370,7 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \ new/datum/stack_recipe("plastic ashtray", /obj/item/ashtray/plastic, 2, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("plastic fork", /obj/item/weapon/kitchen/utensil/pfork, 1, on_floor = 1), \ new/datum/stack_recipe("plastic spoon", /obj/item/weapon/kitchen/utensil/pspoon, 1, on_floor = 1), \ + new/datum/stack_recipe("plastic spork", /obj/item/weapon/kitchen/utensil/pspork, 1, on_floor = 1), \ new/datum/stack_recipe("plastic knife", /obj/item/weapon/kitchen/knife/plastic, 1, on_floor = 1), \ new/datum/stack_recipe("plastic bag", /obj/item/weapon/storage/bag/plasticbag, 3, on_floor = 1), \ new/datum/stack_recipe("bear mould", /obj/item/weapon/kitchen/mould/bear, 1, on_floor = 1), \ diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index 8e830f27407..86590026f53 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -111,4 +111,22 @@ var/global/list/datum/stack_recipe/silverfancy_tile_recipes = list ( \ icon_state = "tile_abductor" origin_tech = "materials=6;abductor=1" turf_type = /turf/simulated/floor/mineral/abductor - mineralType = "abductor" \ No newline at end of file + mineralType = "abductor" + +/obj/item/stack/tile/mineral/titanium + name = "titanium tile" + singular_name = "titanium floor tile" + desc = "A tile made of titanium, used for shuttles." + icon_state = "tile_shuttle" + turf_type = /turf/simulated/floor/mineral/titanium + mineralType = "titanium" + materials = list(MAT_TITANIUM=500) + +/obj/item/stack/tile/mineral/plastitanium + name = "plas-titanium tile" + singular_name = "plas-titanium floor tile" + desc = "A tile made of plas-titanium, used for very evil shuttles." + icon_state = "tile_darkshuttle" + turf_type = /turf/simulated/floor/mineral/plastitanium + mineralType = "plastitanium" + materials = list(MAT_TITANIUM=250, MAT_PLASMA=250) \ No newline at end of file diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 2c23c6ae2b0..4979b94eb92 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -209,6 +209,7 @@ force_wielded = 0 origin_tech = null attack_verb = list("attacked", "struck", "hit") + brightness_on = 0 /obj/item/weapon/twohanded/dualsaber/toy/hit_reaction() return 0 diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index b053c48b893..cc905783223 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -34,18 +34,22 @@ RCD var/list/door_accesses_list = list() var/one_access var/locked = 1 - var/static/list/allowed_door_types = list(/obj/machinery/door/airlock = "Standard", - /obj/machinery/door/airlock/command = "Command", /obj/machinery/door/airlock/security = "Security", - /obj/machinery/door/airlock/engineering = "Engineering", /obj/machinery/door/airlock/medical = "Medical", - /obj/machinery/door/airlock/maintenance = "Maintenance", /obj/machinery/door/airlock/external = "External", - /obj/machinery/door/airlock/glass = "Standard (Glass)", /obj/machinery/door/airlock/freezer = "Freezer", - /obj/machinery/door/airlock/glass_command = "Command (Glass)", /obj/machinery/door/airlock/glass_engineering = "Engineering (Glass)", - /obj/machinery/door/airlock/glass_security = "Security (Glass)", /obj/machinery/door/airlock/glass_medical = "Medical (Glass)", - /obj/machinery/door/airlock/mining = "Mining", /obj/machinery/door/airlock/atmos = "Atmospherics", - /obj/machinery/door/airlock/research = "Research", /obj/machinery/door/airlock/glass_research = "Research (Glass)", - /obj/machinery/door/airlock/glass_mining = "Mining (Glass)", /obj/machinery/door/airlock/glass_atmos = "Atmospherics (Glass)", - /obj/machinery/door/airlock/science = "Science", /obj/machinery/door/airlock/glass_science = "Science (Glass)", - /obj/machinery/door/airlock/hatch = "Airtight Hatch", /obj/machinery/door/airlock/maintenance_hatch = "Maintenance Hatch") + var/static/list/allowed_door_types = list( + /obj/machinery/door/airlock = "Standard", /obj/machinery/door/airlock/glass = "Standard (Glass)", + /obj/machinery/door/airlock/command = "Command", /obj/machinery/door/airlock/command/glass = "Command (Glass)", + /obj/machinery/door/airlock/security = "Security", /obj/machinery/door/airlock/security/glass = "Security (Glass)", + /obj/machinery/door/airlock/engineering = "Engineering", /obj/machinery/door/airlock/engineering/glass = "Engineering (Glass)", + /obj/machinery/door/airlock/medical = "Medical", /obj/machinery/door/airlock/medical/glass = "Medical (Glass)", + /obj/machinery/door/airlock/maintenance = "Maintenance", /obj/machinery/door/airlock/maintenance/glass = "Maintenance (Glass)", + /obj/machinery/door/airlock/external = "External", /obj/machinery/door/airlock/external/glass = "External (Glass)", + /obj/machinery/door/airlock/maintenance/external = "External Maintenance", /obj/machinery/door/airlock/maintenance/external/glass = "External Maintenance (Glass)", + /obj/machinery/door/airlock/freezer = "Freezer", + /obj/machinery/door/airlock/mining = "Mining", /obj/machinery/door/airlock/mining/glass = "Mining (Glass)", + /obj/machinery/door/airlock/research = "Research", /obj/machinery/door/airlock/research/glass = "Research (Glass)", + /obj/machinery/door/airlock/atmos = "Atmospherics", /obj/machinery/door/airlock/atmos/glass = "Atmospherics (Glass)", + /obj/machinery/door/airlock/science = "Science", /obj/machinery/door/airlock/science/glass = "Science (Glass)", + /obj/machinery/door/airlock/hatch = "Airtight Hatch", + /obj/machinery/door/airlock/maintenance_hatch = "Maintenance Hatch") /obj/item/weapon/rcd/New() desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 650173d29eb..dbc0423da37 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -3,12 +3,18 @@ icon_state = "flashbang" item_state = "flashbang" origin_tech = "materials=2;combat=3" + light_power = 10 + light_color = LIGHT_COLOR_WHITE + var/light_time = 2 /obj/item/weapon/grenade/flashbang/prime() update_mob() var/flashbang_turf = get_turf(src) if(!flashbang_turf) return + + set_light(7) + for(var/mob/living/M in hearers(7, flashbang_turf)) bang(get_turf(M), M) @@ -16,7 +22,9 @@ var/damage = round(30/(get_dist(B,get_turf(src))+1)) B.health -= damage B.update_icon() - qdel(src) + + spawn(light_time) + qdel(src) /obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/M) M.show_message("BANG", 2) diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index 13b0f0b8140..fb10c7cedc2 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -1,70 +1,6 @@ //improvised explosives// -//iedcasing assembly crafting// -/obj/item/weapon/reagent_containers/food/drinks/cans/attackby(var/obj/item/I, mob/user as mob) - if(istype(I, /obj/item/device/assembly/igniter)) - var/obj/item/device/assembly/igniter/G = I - var/obj/item/weapon/grenade/iedcasing/W = new /obj/item/weapon/grenade/iedcasing - user.unEquip(G) - user.unEquip(src) - user.put_in_hands(W) - to_chat(user, "You stuff the [I] in the [src], emptying the contents beforehand.") - W.underlays += image(src.icon, icon_state = src.icon_state) - qdel(I) - qdel(src) - - /obj/item/weapon/grenade/iedcasing - name = "improvised explosive assembly" - desc = "An igniter stuffed into an aluminum shell." - w_class = WEIGHT_CLASS_SMALL - icon = 'icons/obj/grenade.dmi' - icon_state = "improvised_grenade" - item_state = "flashbang" - throw_speed = 3 - throw_range = 7 - flags = CONDUCT - slot_flags = SLOT_BELT - var/assembled = 0 - active = 1 - det_time = 50 - display_timer = 0 - var/range = 3 - var/times = list() - - - -/obj/item/weapon/grenade/iedcasing/afterattack(atom/target, mob/user , flag) //Filling up the can - if(assembled == 0) - if( istype(target, /obj/structure/reagent_dispensers/fueltank)) - if(target.reagents.total_volume < 50) - to_chat(user, "There's not enough fuel left to work with.") - return - var/obj/structure/reagent_dispensers/fueltank/F = target - F.reagents.remove_reagent("fuel", 50, 1)//Deleting 50 fuel from the welding fuel tank, - assembled = 1 - to_chat(user, "You've filled the makeshift explosive with welding fuel.") - playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) - desc = "An improvised explosive assembly. Filled to the brim with 'Explosive flavor'" - overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") - return - - -/obj/item/weapon/grenade/iedcasing/attackby(var/obj/item/I, mob/user as mob) //Wiring the can for ignition - if(istype(I, /obj/item/stack/cable_coil)) - if(assembled == 1) - var/obj/item/stack/cable_coil/C = I - C.use(1) - assembled = 2 - to_chat(user, "You wire the igniter to detonate the fuel.") - desc = "A weak, improvised explosive." - overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired") - name = "improvised explosive" - active = 0 - det_time = rand(30,80) - - -/obj/item/weapon/grenade/iedcasing/filled name = "improvised firebomb" desc = "A weak, improvised incendiary device." w_class = WEIGHT_CLASS_SMALL @@ -77,53 +13,53 @@ slot_flags = SLOT_BELT active = 0 det_time = 50 - assembled = 2 + display_timer = 0 + var/list/times - - -/obj/item/weapon/grenade/iedcasing/filled/New(loc) +/obj/item/weapon/grenade/iedcasing/New() ..() - overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") - overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired") - times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] + overlays += "improvised_grenade_filled" + overlays += "improvised_grenade_wired" + times = list("5" = 10, "-1" = 20, "[rand(30, 80)]" = 50, "[rand(65, 180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value] det_time = text2num(pickweight(times)) if(det_time < 0) //checking for 'duds' - range = 1 det_time = rand(30,80) - else - range = pick(2,2,2,3,3,3,4) /obj/item/weapon/grenade/iedcasing/CheckParts(list/parts_list) ..() var/obj/item/weapon/reagent_containers/food/drinks/cans/can = locate() in contents if(can) - underlays += can + can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED + can.pixel_y = 0 + var/mutable_appearance/can_underlay = new(can) + can_underlay.layer = FLOAT_LAYER + can_underlay.plane = FLOAT_PLANE + underlays += can_underlay -/obj/item/weapon/grenade/iedcasing/attack_self(mob/user as mob) // +/obj/item/weapon/grenade/iedcasing/attack_self(mob/user) // if(!active) if(clown_check(user)) to_chat(user, "You light the [name]!") - active = 1 - overlays -= image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") + active = TRUE + overlays -= "improvised_grenade_filled" icon_state = initial(icon_state) + "_active" add_fingerprint(user) var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) - message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [A.name] (JMP)") - log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])") + message_admins("[ADMIN_LOOKUPFLW(user)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)].") + log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].") if(iscarbon(user)) var/mob/living/carbon/C = user C.throw_mode_on() - spawn(det_time) - prime() + addtimer(src, "prime", det_time) /obj/item/weapon/grenade/iedcasing/prime() //Blowing that can up update_mob() - explosion(src.loc,-1,-1,-1, flame_range = range) // no explosive damage, only a large fireball. + explosion(loc, -1, -1, 2, flame_range = 4) // small explosion, plus a very large fireball. qdel(src) /obj/item/weapon/grenade/iedcasing/examine(mob/user) - ..(user) + ..() to_chat(user, "You can't tell when it will explode!") diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 0b7850bba1f..24bcb7a8c2c 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -29,7 +29,7 @@ if(ishuman(C)) var/mob/living/carbon/human/H = C - if(!(H.get_organ("l_hand") || H.get_organ("r_hand"))) + if(!H.has_left_hand() || !H.has_right_hand()) to_chat(user, "How do you suggest handcuffing someone with no hands?") return diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 4bf40a3ae15..c2067935ee6 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -82,6 +82,18 @@ icon_state = "pspoon" attack_verb = list("attacked", "poked") +/obj/item/weapon/kitchen/utensil/spork + name = "spork" + desc = "It's a spork. Marvel at its innovative design." + icon_state = "spork" + attack_verb = list("attacked", "sporked") + +/obj/item/weapon/kitchen/utensil/pspork + name = "plastic spork" + desc = "It's a plastic spork. It's the fork side of the spoon!" + icon_state = "pspork" + attack_verb = list("attacked", "sporked") + /* * Knives */ diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 21845a47515..21d8828310f 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -52,23 +52,12 @@ if(sig) to_chat(user, "This beartrap already has a signaler hooked up to it!") return - IED = I - switch(IED.assembled) - if(0,1) //if it's not fueled/hooked up - to_chat(user, "You haven't prepared this IED yet!") - IED = null - return - if(2,3) - user.drop_item() - I.forceMove(src) - message_admins("[key_name_admin(user)] has rigged a beartrap with an IED.") - log_game("[key_name(user)] has rigged a beartrap with an IED.") - to_chat(user, "You sneak the [IED] underneath the pressure plate and connect the trigger wire.") - desc = "A trap used to catch bears and other legged creatures. There is an IED hooked up to it." - else - to_chat(user, "You shouldn't be reading this message! Contact a coder or someone, something broke!") - IED = null - return + user.drop_item() + I.forceMove(src) + message_admins("[key_name_admin(user)] has rigged a beartrap with an IED.") + log_game("[key_name(user)] has rigged a beartrap with an IED.") + to_chat(user, "You sneak [IED] underneath the pressure plate and connect the trigger wire.") + desc = "A trap used to catch bears and other legged creatures. There is an IED hooked up to it." if(istype(I, /obj/item/device/assembly/signaler)) if(IED) to_chat(user, "This beartrap already has an IED hooked up to it!") @@ -110,9 +99,6 @@ if(IED && isturf(src.loc)) IED.active = 1 - IED.overlays -= image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") - IED.icon_state = initial(icon_state) + "_active" - IED.assembled = 3 message_admins("[key_name_admin(usr)] has triggered an IED-rigged [name].") log_game("[key_name(usr)] has triggered an IED-rigged [name].") spawn(IED.det_time) @@ -127,7 +113,7 @@ H.apply_damage(trap_damage, BRUTE,"chest") else H.apply_damage(trap_damage, BRUTE,(pick("l_leg", "r_leg"))) - if(!H.legcuffed) //beartrap can't cuff you leg if there's already a beartrap or legcuffs. + if(!H.legcuffed && H.get_num_legs() >= 2) //beartrap can't cuff you leg if there's already a beartrap or legcuffs. H.legcuffed = src forceMove(H) H.update_inv_legcuffed() diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 1c4ff92708a..16b8d302c7f 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -9,7 +9,10 @@ hitsound = 'sound/weapons/blade1.ogg' // Probably more appropriate than the previous hitsound. -- Dave usesound = 'sound/weapons/blade1.ogg' toolspeed = 1 - + light_power = 2 + var/brightness_on = 2 + var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE) + /obj/item/weapon/melee/energy/suicide_act(mob/user) user.visible_message(pick("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \ "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.")) @@ -29,8 +32,10 @@ attack_verb = attack_verb_on if(!item_color) icon_state = icon_state_on + set_light(brightness_on) else icon_state = "sword[item_color]" + set_light(brightness_on, l_color=colormap[item_color]) w_class = w_class_on playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness to_chat(user, "[src] is now active.") @@ -44,6 +49,7 @@ icon_state = initial(icon_state) w_class = initial(w_class) playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness + set_light(0) to_chat(user, "[src] can now be concealed.") if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user @@ -71,6 +77,7 @@ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") attack_verb_on = list() sharp = 1 + light_color = LIGHT_COLOR_WHITE /obj/item/weapon/melee/energy/axe/suicide_act(mob/user) user.visible_message("[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.") @@ -92,7 +99,6 @@ block_chance = 50 sharp = 1 var/hacked = 0 - var/blade_color /obj/item/weapon/melee/energy/sword/New() if(item_color == null) @@ -129,6 +135,7 @@ hitcost = 75 //Costs more than a standard cyborg esword item_color = null w_class = WEIGHT_CLASS_NORMAL + light_color = LIGHT_COLOR_WHITE /obj/item/weapon/melee/energy/sword/cyborg/saw/New() ..() @@ -192,6 +199,7 @@ desc = "Arrrr matey." icon_state = "cutlass0" icon_state_on = "cutlass1" + light_color = LIGHT_COLOR_RED /obj/item/weapon/melee/energy/sword/pirate/New() return @@ -224,4 +232,4 @@ name = "hardlight blade" desc = "An extremely sharp blade made out of hard light. Packs quite a punch." icon_state = "lightblade" - item_state = "lightblade" \ No newline at end of file + item_state = "lightblade" diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 22c4acbf098..31ba83fc444 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -58,7 +58,7 @@ icon_state = "drill_bolt" item_state = "drill" usesound = 'sound/items/drill_use.ogg' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_GOLD=25) + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get force = 8 //might or might not be too high, subject to change throwforce = 8 @@ -180,7 +180,7 @@ desc = "A simple hand drill with a screwdriver bit attached." icon_state = "drill_screw" item_state = "drill" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_GOLD=25) + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get force = 8 //might or might not be too high, subject to change throwforce = 8 @@ -276,7 +276,7 @@ icon_state = "jaws_cutter" item_state = "jawsoflife" origin_tech = "materials=2;engineering=2" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_GOLD=25) + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) usesound = 'sound/items/jaws_cut.ogg' toolspeed = 0.25 @@ -691,7 +691,7 @@ obj/item/weapon/weldingtool/experimental/process() desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a prying head." icon_state = "jaws_pry" item_state = "jawsoflife" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_DIAMOND=25) + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) origin_tech = "materials=2;engineering=2" usesound = 'sound/items/jaws_pry.ogg' force = 15 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 5d1755dc9d3..96628da9a26 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -208,15 +208,21 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 75 sharp = 1 + light_power = 2 + var/brightness_on = 2 + var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE) /obj/item/weapon/twohanded/dualsaber/New() - blade_color = pick("red", "blue", "green", "purple") + if(!blade_color) + blade_color = pick("red", "blue", "green", "purple") /obj/item/weapon/twohanded/dualsaber/update_icon() if(wielded) icon_state = "dualsaber[blade_color][wielded]" + set_light(brightness_on, l_color=colormap[blade_color]) else icon_state = "dualsaber0" + set_light(0) /obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/user as mob) if(HULK in user.mutations) @@ -239,16 +245,16 @@ return ..() return 0 -/obj/item/weapon/twohanded/dualsaber/green/New() +/obj/item/weapon/twohanded/dualsaber/green blade_color = "green" -/obj/item/weapon/twohanded/dualsaber/red/New() +/obj/item/weapon/twohanded/dualsaber/red blade_color = "red" -/obj/item/weapon/twohanded/dualsaber/purple/New() +/obj/item/weapon/twohanded/dualsaber/purple blade_color = "purple" -/obj/item/weapon/twohanded/dualsaber/blue/New() +/obj/item/weapon/twohanded/dualsaber/blue blade_color = "blue" /obj/item/weapon/twohanded/dualsaber/unwield() diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 5b26b46eacd..b93ad13c98c 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -100,6 +100,14 @@ if(pickednum >= 40) new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max)) + //Titanium (rare ore) + if(pickednum >= 40) + new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max)) + + //Plastitanium (rare ore) + if(pickednum >= 40) + new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max)) + //Diamond (rare HONK) if(pickednum >= 45) new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max)) @@ -122,6 +130,8 @@ /obj/item/stack/sheet/mineral/uranium, /obj/item/stack/sheet/mineral/diamond, /obj/item/stack/sheet/mineral/bananium, + /obj/item/stack/sheet/mineral/titanium, + /obj/item/stack/sheet/mineral/plastitanium, /obj/item/stack/sheet/plasteel, /obj/item/stack/rods ) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 7292cc0b68c..60f5a4003c7 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -1,186 +1,56 @@ /obj/structure/door_assembly - icon = 'icons/obj/doors/door_assembly.dmi' name = "airlock assembly" - icon_state = "door_as_0" - anchored = 0 - density = 1 - var/state = 0 - var/base_icon_state = "" + icon = 'icons/obj/doors/airlocks/station/public.dmi' + icon_state = "construction" + anchored = FALSE + density = TRUE + var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' + var/state = AIRLOCK_ASSEMBLY_NEEDS_WIRES + var/mineral = null var/base_name = "airlock" var/obj/item/weapon/airlock_electronics/electronics = null - var/airlock_type = "" //the type path of the airlock once completed - var/glass_type = "/glass" - var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead. + var/airlock_type = /obj/machinery/door/airlock //the type path of the airlock once completed + var/glass_type = /obj/machinery/door/airlock/glass + var/glass = 0 // 0 = glass can be installed. 1 = glass is already installed. var/created_name = null var/heat_proof_finished = 0 //whether to heat-proof the finished airlock + var/previous_assembly = /obj/structure/door_assembly + var/noglass = FALSE //airlocks with no glass version, also cannot be modified with sheets var/material_type = /obj/item/stack/sheet/metal var/material_amt = 4 /obj/structure/door_assembly/New() - update_state() + update_icon() + update_name() + ..() /obj/structure/door_assembly/Destroy() QDEL_NULL(electronics) return ..() -/obj/structure/door_assembly/door_assembly_com - name = "command airlock assembly" - base_icon_state = "com" - base_name = "command airlock" - glass_type = "/glass_command" - airlock_type = "/command" - -/obj/structure/door_assembly/door_assembly_sec - name = "security airlock assembly" - base_icon_state = "sec" - base_name = "security airlock" - glass_type = "/glass_security" - airlock_type = "/security" - -/obj/structure/door_assembly/door_assembly_eng - name = "engineering airlock assembly" - base_icon_state = "eng" - base_name = "engineering airlock" - glass_type = "/glass_engineering" - airlock_type = "/engineering" - -/obj/structure/door_assembly/door_assembly_min - name = "mining airlock assembly" - base_icon_state = "min" - base_name = "mining airlock" - glass_type = "/glass_mining" - airlock_type = "/mining" - -/obj/structure/door_assembly/door_assembly_atmo - name = "atmospherics airlock assembly" - base_icon_state = "atmo" - base_name = "atmospherics airlock" - glass_type = "/glass_atmos" - airlock_type = "/atmos" - -/obj/structure/door_assembly/door_assembly_research - name = "research airlock assembly" - base_icon_state = "res" - base_name = "research airlock" - glass_type = "/glass_research" - airlock_type = "/research" - -/obj/structure/door_assembly/door_assembly_science - name = "science airlock assembly" - base_icon_state = "sci" - base_name = "science airlock" - glass_type = "/glass_science" - airlock_type = "/science" - -/obj/structure/door_assembly/door_assembly_med - name = "medical airlock assembly" - base_icon_state = "med" - base_name = "medical airlock" - glass_type = "/glass_medical" - airlock_type = "/medical" - -/obj/structure/door_assembly/door_assembly_mai - name = "maintenance airlock assembly" - base_icon_state = "mai" - base_name = "maintenance airlock" - airlock_type = "/maintenance" - glass = -1 - -/obj/structure/door_assembly/door_assembly_ext - name = "external airlock assembly" - base_icon_state = "ext" - base_name = "external airlock" - airlock_type = "/external" - glass = -1 - -/obj/structure/door_assembly/door_assembly_fre - name = "freezer airlock assembly" - base_icon_state = "fre" - base_name = "freezer airlock" - airlock_type = "/freezer" - glass = -1 - -/obj/structure/door_assembly/door_assembly_hatch - name = "airtight hatch assembly" - base_icon_state = "hatch" - base_name = "airtight hatch" - airlock_type = "/hatch" - glass = -1 - -/obj/structure/door_assembly/door_assembly_mhatch - name = "maintenance hatch assembly" - base_icon_state = "mhatch" - base_name = "maintenance hatch" - airlock_type = "/maintenance_hatch" - glass = -1 - -/obj/structure/door_assembly/door_assembly_highsecurity - name = "high security airlock assembly" - base_icon_state = "highsec" - base_name = "high security airlock" - airlock_type = "/highsecurity" - glass = -1 - material_type = /obj/item/stack/sheet/plasteel - -/obj/structure/door_assembly/door_assembly_vault - name = "vault door assembly" - base_icon_state = "vault" - base_name = "vault door" - airlock_type = "/vault" - glass = -1 - material_type = /obj/item/stack/sheet/plasteel - -/obj/structure/door_assembly/door_assembly_shuttle - name = "shuttle airlock assembly" - base_icon_state = "shuttle" - base_name = "shuttle airlock" - airlock_type = "/shuttle" - glass = -1 - -/obj/structure/door_assembly/multi_tile - icon = 'icons/obj/doors/door_assembly2x1.dmi' - dir = EAST - var/width = 1 - base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1. - airlock_type = "/multi_tile/glass" - glass = -1 //To prevent bugs in deconstruction process. - -/obj/structure/door_assembly/multi_tile/New() - if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size +/obj/structure/door_assembly/examine(mob/user) + ..() + var/doorname = "" + if(created_name) + doorname = ", written on it is '[created_name]'" + switch(state) + if(AIRLOCK_ASSEMBLY_NEEDS_WIRES) + if(anchored) + to_chat(user, "The anchoring bolts are wrenched in place, but the maintenance panel lacks wiring.") + else + to_chat(user, "The assembly is welded together, but the anchoring bolts are unwrenched.") + if(AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) + to_chat(user, "The maintenance panel is wired, but the circuit slot is empty.") + if(AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) + to_chat(user, "The circuit is connected loosely to its slot, but the maintenance panel is unscrewed and open.") + if(!mineral && !glass && !noglass) + to_chat(user, "There is a small paper placard on the assembly[doorname]. There are empty slots for glass windows and mineral covers.") + else if(!mineral && glass && !noglass) + to_chat(user, "There is a small paper placard on the assembly[doorname]. There are empty slots for mineral covers.") + else if(mineral && !glass && !noglass) + to_chat(user, "There is a small paper placard on the assembly[doorname]. There are empty slots for glass windows.") else - bound_width = world.icon_size - bound_height = width * world.icon_size - update_state() - -/obj/structure/door_assembly/multi_tile/Move() - . = ..() - if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size - else - bound_width = world.icon_size - bound_height = width * world.icon_size - -/obj/structure/door_assembly/door_assembly_cult - icon = 'icons/obj/doors/Doorcult.dmi' - base_icon_state = "construction" - base_name = "engraved airlock" - airlock_type = "/cult" - glass = -1 - -/obj/structure/door_assembly/door_assembly_cultruned - icon = 'icons/obj/doors/Doorcultruned.dmi' - base_icon_state = "construction" - base_name = "runed airlock" - airlock_type = "/cult/runed" - glass = -1 - -/obj/structure/door_assembly/door_assembly_centcom - base_icon_state = "ele" - airlock_type = "/centcom" - glass = -1 + to_chat(user, "There is a small paper placard on the assembly[doorname].") /obj/structure/door_assembly/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/pen)) @@ -192,20 +62,22 @@ created_name = t return - if(iswelder(W) && ((istext(glass)) || (glass == 1) || !anchored )) + else if(iswelder(W) && (mineral || glass || !anchored )) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) playsound(loc, WT.usesound, 50, 1) - if(istext(glass)) - user.visible_message("[user] welds the [glass] plating off the airlock assembly.", "You start to weld the [glass] plating off the airlock assembly...") + if(mineral) + var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]") + user.visible_message("[user] welds the [mineral] plating off the airlock assembly.", "You start to weld the [mineral] plating off the airlock assembly...") if(do_after(user, 40 * WT.toolspeed, target = src)) if(!src || !WT.isOn()) return - to_chat(user, "You weld the [glass] plating off.") - var/M = text2path("/obj/item/stack/sheet/mineral/[glass]") - new M(loc, 2) - glass = 0 - else if(glass == 1) + to_chat(user, "You weld the [mineral] plating off.") + new mineral_path(loc, 2) + var/obj/structure/door_assembly/PA = new previous_assembly(loc) + transfer_assembly_vars(src, PA) + + else if(glass) user.visible_message("[user] welds the glass panel out of the airlock assembly.", "You start to weld the glass panel out of the airlock assembly...") if(do_after(user, 40 * WT.toolspeed, target = src)) if(!src || !WT.isOn()) @@ -213,23 +85,23 @@ to_chat(user, "You weld the glass panel out.") if(heat_proof_finished) new /obj/item/stack/sheet/rglass(get_turf(src)) - heat_proof_finished = 0 + heat_proof_finished = FALSE else new /obj/item/stack/sheet/glass(get_turf(src)) - glass = 0 + glass = FALSE else if(!anchored) - user.visible_message("[user] disassembles the airlock assembly.", "You start to disassemble the airlock assembly...") + user.visible_message("[user] disassembles the airlock assembly.", \ + "You start to disassemble the airlock assembly...") if(do_after(user, 40 * WT.toolspeed, target = src)) if(!src || !WT.isOn()) return to_chat(user, "You disassemble the airlock assembly.") - new material_type(loc, material_amt) - qdel(src) + deconstruct(TRUE) else to_chat(user, "You need more welding fuel.") return - else if(iswrench(W) && state == 0) + else if(iswrench(W) && state == AIRLOCK_ASSEMBLY_NEEDS_WIRES) playsound(loc, W.usesound, 100, 1) if(anchored) user.visible_message("[user] unsecures the airlock assembly from the floor.", "You start to unsecure the airlock assembly from the floor...") @@ -242,51 +114,53 @@ to_chat(user, "You [anchored ? "un" : ""]secure the airlock assembly.") anchored = !anchored - else if(iscoil(W) && state == 0 && anchored) + else if(iscoil(W) && state == AIRLOCK_ASSEMBLY_NEEDS_WIRES && anchored) var/obj/item/stack/cable_coil/coil = W + if (coil.amount < 1) + to_chat(user, "You need one length of cable to wire the airlock assembly!") + return user.visible_message("[user] wires the airlock assembly.", "You start to wire the airlock assembly...") if(do_after(user, 40 * coil.toolspeed, target = src)) - if(!src) + if(coil.amount < 1 || state != AIRLOCK_ASSEMBLY_NEEDS_WIRES) return coil.use(1) - state = 1 + state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS to_chat(user, "You wire the airlock assembly.") - else if(iswirecutter(W) && state == 1) + else if(iswirecutter(W) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) playsound(loc, W.usesound, 100, 1) user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly...") if(do_after(user, 40 * W.toolspeed, target = src)) - if(!src) + if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) return to_chat(user, "You cut the wires from the airlock assembly.") - if(state == 1) - new/obj/item/stack/cable_coil(loc, 1) - state = 0 + new/obj/item/stack/cable_coil(get_turf(user), 1) + state = AIRLOCK_ASSEMBLY_NEEDS_WIRES - else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1 && W.icon_state != "door_electronics_smoked") + else if(istype(W, /obj/item/weapon/airlock_electronics) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS && W.icon_state != "door_electronics_smoked") playsound(loc, W.usesound, 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...") if(do_after(user, 40 * W.toolspeed, target = src)) - if(!src) + if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) return user.drop_item() - W.loc = src + W.forceMove(src) to_chat(user, "You install the airlock electronics.") - state = 2 + state = AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER name = "near finished airlock assembly" electronics = W - else if(iscrowbar(W) && state == 2 ) + else if(iscrowbar(W) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) playsound(loc, W.usesound, 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly...") if(do_after(user, 40 * W.toolspeed, target = src)) - if(!src) + if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) return to_chat(user, "You remove the airlock electronics.") - state = 1 + state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS name = "wired airlock assembly" var/obj/item/weapon/airlock_electronics/ae if(!electronics) @@ -294,78 +168,131 @@ else ae = electronics electronics = null - ae.loc = loc + ae.forceMove(loc) - else if(istype(W, /obj/item/stack/sheet) && !glass) + else if(istype(W, /obj/item/stack/sheet) && (!glass || !mineral)) var/obj/item/stack/sheet/S = W if(S) if(S.amount>=1) - if(istype(S, /obj/item/stack/sheet/rglass) || istype(S, /obj/item/stack/sheet/glass)) - playsound(loc, S.usesound, 100, 1) - user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly...") - if(do_after(user, 40 * S.toolspeed, target = src)) - if(S.type == /obj/item/stack/sheet/rglass) - to_chat(user, "You install reinforced glass windows into the airlock assembly.") - heat_proof_finished = 1 //reinforced glass makes the airlock heat-proof - else - to_chat(user, "You install regular glass windows into the airlock assembly.") - S.use(1) - glass = 1 - else if(istype(S, /obj/item/stack/sheet/mineral) && S.sheettype) - var/M = S.sheettype - if(S.amount>=2) - playsound(loc, S.usesound, 100, 1) - user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly...") - if(do_after(user, 40 * S.toolspeed, target = src)) - to_chat(user, "You install [M] plating into the airlock assembly.") - S.use(2) - glass = "[M]" + if(!noglass) + if(!glass) + if(istype(S, /obj/item/stack/sheet/rglass) || istype(S, /obj/item/stack/sheet/glass)) + playsound(loc, S.usesound, 100, 1) + user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly...") + if(do_after(user, 40 * S.toolspeed, target = src)) + if(S.amount < 1 || glass) + return + if(S.type == /obj/item/stack/sheet/rglass) + to_chat(user, "You install reinforced glass windows into the airlock assembly.") + heat_proof_finished = TRUE //reinforced glass makes the airlock heat-proof + else + to_chat(user, "You install regular glass windows into the airlock assembly.") + S.use(1) + glass = TRUE + if(!mineral) + if(istype(S, /obj/item/stack/sheet/mineral) && S.sheettype) + var/M = S.sheettype + if(S.amount>=2) + playsound(loc, S.usesound, 100, 1) + user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly...") + if(do_after(user, 40 * S.toolspeed, target = src)) + if(S.amount < 2 || mineral) + return + to_chat(user, "You install [M] plating into the airlock assembly.") + S.use(2) + var/mineralassembly = text2path("/obj/structure/door_assembly/door_assembly_[M]") + var/obj/structure/door_assembly/MA = new mineralassembly(loc) + transfer_assembly_vars(src, MA, TRUE) + else + to_chat(user, "You need at least two sheets add a mineral cover!") + else + to_chat(user, "You cannot add [S] to [src]!") + else + to_chat(user, "You cannot add [S] to [src]!") - else if(isscrewdriver(W) && state == 2 ) + else if(isscrewdriver(W) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER ) playsound(loc, W.usesound, 100, 1) user.visible_message("[user] finishes the airlock.", \ "You start finishing the airlock...") if(do_after(user, 40 * W.toolspeed, target = src)) - if(!src) - return - to_chat(user, "You finish the airlock.") - var/path - if(istext(glass)) - path = text2path("/obj/machinery/door/airlock/[glass]") - else if(glass == 1) - path = text2path("/obj/machinery/door/airlock[glass_type]") - else - path = text2path("/obj/machinery/door/airlock[airlock_type]") - var/obj/machinery/door/airlock/door = new path(loc) - door.setDir(dir) - door.assemblytype = type - door.electronics = electronics - door.heat_proof = heat_proof_finished - if(electronics.one_access) - door.req_access = null - door.req_one_access = electronics.conf_access - else - door.req_access = electronics.conf_access - if(created_name) - door.name = created_name - else - door.name = "[istext(glass) ? "[glass] airlock" : base_name]" - electronics.loc = door - qdel(src) + if(loc && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) + to_chat(user, "You finish the airlock.") + var/obj/machinery/door/airlock/door + if(glass) + door = new glass_type(loc) + else + door = new airlock_type(loc) + door.setDir(dir) + door.electronics = electronics + door.heat_proof = heat_proof_finished + if(electronics.one_access) + door.req_access = null + door.req_one_access = electronics.conf_access + else + door.req_access = electronics.conf_access + if(created_name) + door.name = created_name + else + door.name = base_name + door.previous_airlock = previous_assembly + electronics.forceMove(door) + qdel(src) else ..() - update_state() + update_name() + update_icon() -/obj/structure/door_assembly/proc/update_state() - icon_state = "door_as_[glass == 1 ? "g" : ""][istext(glass) ? glass : base_icon_state][state]" +/obj/structure/door_assembly/update_icon() + overlays.Cut() + if(!glass) + overlays += get_airlock_overlay("fill_construction", icon) + else if(glass) + overlays += get_airlock_overlay("glass_construction", overlays_file) + overlays += get_airlock_overlay("panel_c[state+1]", overlays_file) + +/obj/structure/door_assembly/proc/update_name() name = "" switch(state) - if(0) + if(AIRLOCK_ASSEMBLY_NEEDS_WIRES) if(anchored) name = "secured " - if(1) + if(AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS) name = "wired " - if(2) + if(AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER) name = "near finished " - name += "[heat_proof_finished ? "heat-proofed " : ""][glass == 1 ? "window " : ""][istext(glass) ? "[glass] airlock" : base_name] assembly" + name += "[heat_proof_finished ? "heat-proofed " : ""][glass ? "window " : ""][base_name] assembly" + +/obj/structure/door_assembly/proc/transfer_assembly_vars(obj/structure/door_assembly/source, obj/structure/door_assembly/target, previous = FALSE) + target.glass = source.glass + target.heat_proof_finished = source.heat_proof_finished + target.created_name = source.created_name + target.state = source.state + target.anchored = source.anchored + if(previous) + target.previous_assembly = source.type + if(electronics) + target.electronics = source.electronics + source.electronics.forceMove(target) + target.update_icon() + target.update_name() + qdel(source) + +/obj/structure/door_assembly/deconstruct(disassembled = TRUE) + if(can_deconstruct) + var/turf/T = get_turf(src) + if(!disassembled) + material_amt = rand(2,4) + new material_type(T, material_amt) + if(glass) + if(disassembled) + if(heat_proof_finished) + new /obj/item/stack/sheet/rglass(T) + else + new /obj/item/stack/sheet/glass(T) + else + new /obj/item/weapon/shard(T) + if(mineral) + var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]") + new mineral_path(T, 2) + qdel(src) diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm new file mode 100644 index 00000000000..2475e9e1b4d --- /dev/null +++ b/code/game/objects/structures/door_assembly_types.dm @@ -0,0 +1,264 @@ +/obj/structure/door_assembly/door_assembly_public + name = "public airlock assembly" + icon = 'icons/obj/doors/airlocks/station2/glass.dmi' + overlays_file = 'icons/obj/doors/airlocks/station2/overlays.dmi' + glass_type = /obj/machinery/door/airlock/public/glass + airlock_type = /obj/machinery/door/airlock/public + +/obj/structure/door_assembly/door_assembly_com + name = "command airlock assembly" + icon = 'icons/obj/doors/airlocks/station/command.dmi' + base_name = "command airlock" + glass_type = /obj/machinery/door/airlock/command/glass + airlock_type = /obj/machinery/door/airlock/command + +/obj/structure/door_assembly/door_assembly_sec + name = "security airlock assembly" + icon = 'icons/obj/doors/airlocks/station/security.dmi' + base_name = "security airlock" + glass_type = /obj/machinery/door/airlock/security/glass + airlock_type = /obj/machinery/door/airlock/security + +/obj/structure/door_assembly/door_assembly_eng + name = "engineering airlock assembly" + icon = 'icons/obj/doors/airlocks/station/engineering.dmi' + base_name = "engineering airlock" + glass_type = /obj/machinery/door/airlock/engineering/glass + airlock_type = /obj/machinery/door/airlock/engineering + +/obj/structure/door_assembly/door_assembly_min + name = "mining airlock assembly" + icon = 'icons/obj/doors/airlocks/station/mining.dmi' + base_name = "mining airlock" + glass_type = /obj/machinery/door/airlock/mining/glass + airlock_type = /obj/machinery/door/airlock/mining + +/obj/structure/door_assembly/door_assembly_atmo + name = "atmospherics airlock assembly" + icon = 'icons/obj/doors/airlocks/station/atmos.dmi' + base_name = "atmospherics airlock" + glass_type = /obj/machinery/door/airlock/atmos/glass + airlock_type = /obj/machinery/door/airlock/atmos + +/obj/structure/door_assembly/door_assembly_research + name = "research airlock assembly" + icon = 'icons/obj/doors/airlocks/station/research.dmi' + base_name = "research airlock" + glass_type = /obj/machinery/door/airlock/research/glass + airlock_type = /obj/machinery/door/airlock/research + +/obj/structure/door_assembly/door_assembly_science + name = "science airlock assembly" + icon = 'icons/obj/doors/airlocks/station/science.dmi' + base_name = "science airlock" + glass_type = /obj/machinery/door/airlock/science/glass + airlock_type = /obj/machinery/door/airlock/science + +/obj/structure/door_assembly/door_assembly_med + name = "medical airlock assembly" + icon = 'icons/obj/doors/airlocks/station/medical.dmi' + base_name = "medical airlock" + glass_type = /obj/machinery/door/airlock/medical/glass + airlock_type = /obj/machinery/door/airlock/medical + +/obj/structure/door_assembly/door_assembly_mai + name = "maintenance airlock assembly" + icon = 'icons/obj/doors/airlocks/station/maintenance.dmi' + base_name = "maintenance airlock" + glass_type = /obj/machinery/door/airlock/maintenance/glass + airlock_type = /obj/machinery/door/airlock/maintenance + +/obj/structure/door_assembly/door_assembly_extmai + name = "external maintenance airlock assembly" + icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' + base_name = "external maintenance airlock" + glass_type = /obj/machinery/door/airlock/maintenance/external/glass + airlock_type = /obj/machinery/door/airlock/maintenance/external + +/obj/structure/door_assembly/door_assembly_ext + name = "external airlock assembly" + icon = 'icons/obj/doors/airlocks/external/external.dmi' + base_name = "external airlock" + overlays_file = 'icons/obj/doors/airlocks/external/overlays.dmi' + glass_type = /obj/machinery/door/airlock/external/glass + airlock_type = /obj/machinery/door/airlock/external + +/obj/structure/door_assembly/door_assembly_fre + name = "freezer airlock assembly" + icon = 'icons/obj/doors/airlocks/station/freezer.dmi' + base_name = "freezer airlock" + airlock_type = /obj/machinery/door/airlock/freezer + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_hatch + name = "airtight hatch assembly" + icon = 'icons/obj/doors/airlocks/hatch/centcom.dmi' + base_name = "airtight hatch" + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/hatch + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_mhatch + name = "maintenance hatch assembly" + icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi' + base_name = "maintenance hatch" + overlays_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/maintenance_hatch + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_highsecurity + name = "high security airlock assembly" + icon = 'icons/obj/doors/airlocks/highsec/highsec.dmi' + base_name = "high security airlock" + overlays_file = 'icons/obj/doors/airlocks/highsec/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/highsecurity + noglass = TRUE + material_type = /obj/item/stack/sheet/plasteel + +/obj/structure/door_assembly/door_assembly_vault + name = "vault door assembly" + icon = 'icons/obj/doors/airlocks/vault/vault.dmi' + base_name = "vault door" + overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/vault + noglass = TRUE + material_type = /obj/item/stack/sheet/plasteel + +/obj/structure/door_assembly/door_assembly_shuttle + name = "shuttle airlock assembly" + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + base_name = "shuttle airlock" + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/shuttle + glass_type = /obj/machinery/door/airlock/shuttle/glass + +/obj/structure/door_assembly/multi_tile + name = "large airlock assembly" + icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi' + base_name = "large airlock" + overlays_file = 'icons/obj/doors/airlocks/glass_large/overlays.dmi' + dir = EAST + var/width = 1 + airlock_type = /obj/machinery/door/airlock/multi_tile + glass_type = /obj/machinery/door/airlock/multi_tile/glass + material_amt = 8 + +/obj/structure/door_assembly/multi_tile/New() + if(dir in list(EAST, WEST)) + bound_width = width * world.icon_size + bound_height = world.icon_size + else + bound_width = world.icon_size + bound_height = width * world.icon_size + update_icon() + +/obj/structure/door_assembly/multi_tile/Move() + . = ..() + if(dir in list(EAST, WEST)) + bound_width = width * world.icon_size + bound_height = world.icon_size + else + bound_width = world.icon_size + bound_height = width * world.icon_size + +/obj/structure/door_assembly/door_assembly_cult + name = "cult airlock assembly" + icon = 'icons/obj/doors/airlocks/cult/runed/cult.dmi' + base_name = "cult airlock" + overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/cult + glass_type = /obj/machinery/door/airlock/cult/glass + +/obj/structure/door_assembly/door_assembly_cult/unruned + icon = 'icons/obj/doors/airlocks/cult/unruned/cult.dmi' + overlays_file = 'icons/obj/doors/airlocks/cult/unruned/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/cult/unruned + glass_type = /obj/machinery/door/airlock/cult/unruned/glass + +/obj/structure/door_assembly/door_assembly_centcom + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' + airlock_type = /obj/machinery/door/airlock/centcom + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_gold + name = "gold airlock assembly" + icon = 'icons/obj/doors/airlocks/station/gold.dmi' + base_name = "gold airlock" + airlock_type = /obj/machinery/door/airlock/gold + mineral = "gold" + glass_type = /obj/machinery/door/airlock/gold/glass + +/obj/structure/door_assembly/door_assembly_silver + name = "silver airlock assembly" + icon = 'icons/obj/doors/airlocks/station/silver.dmi' + base_name = "silver airlock" + airlock_type = /obj/machinery/door/airlock/silver + mineral = "silver" + glass_type = /obj/machinery/door/airlock/silver/glass + +/obj/structure/door_assembly/door_assembly_diamond + name = "diamond airlock assembly" + icon = 'icons/obj/doors/airlocks/station/diamond.dmi' + base_name = "diamond airlock" + airlock_type = /obj/machinery/door/airlock/diamond + mineral = "diamond" + glass_type = /obj/machinery/door/airlock/diamond/glass + +/obj/structure/door_assembly/door_assembly_uranium + name = "uranium airlock assembly" + icon = 'icons/obj/doors/airlocks/station/uranium.dmi' + base_name = "uranium airlock" + airlock_type = /obj/machinery/door/airlock/uranium + mineral = "uranium" + glass_type = /obj/machinery/door/airlock/uranium/glass + +/obj/structure/door_assembly/door_assembly_plasma + name = "plasma airlock assembly" + icon = 'icons/obj/doors/airlocks/station/plasma.dmi' + base_name = "plasma airlock" + airlock_type = /obj/machinery/door/airlock/plasma + mineral = "plasma" + glass_type = /obj/machinery/door/airlock/plasma/glass + +/obj/structure/door_assembly/door_assembly_bananium + name = "bananium airlock assembly" + desc = "Honk." + icon = 'icons/obj/doors/airlocks/station/bananium.dmi' + base_name = "bananium airlock" + airlock_type = /obj/machinery/door/airlock/bananium + mineral = "bananium" + glass_type = /obj/machinery/door/airlock/bananium/glass + +/obj/structure/door_assembly/door_assembly_tranquillite + name = "tranquillite airlock assembly" + icon = 'icons/obj/doors/airlocks/station/freezer.dmi' + base_name = "tranquillite airlock" + airlock_type = /obj/machinery/door/airlock/tranquillite + mineral = "tranquillite" + noglass = TRUE + +/obj/structure/door_assembly/door_assembly_sandstone + name = "sandstone airlock assembly" + icon = 'icons/obj/doors/airlocks/station/sandstone.dmi' + base_name = "sandstone airlock" + airlock_type = /obj/machinery/door/airlock/sandstone + mineral = "sandstone" + glass_type = /obj/machinery/door/airlock/sandstone/glass + +/obj/structure/door_assembly/door_assembly_titanium + name = "titanium airlock assembly" + icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' + base_name = "shuttle airlock" + overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi' + glass_type = /obj/machinery/door/airlock/titanium/glass + airlock_type = /obj/machinery/door/airlock/titanium + mineral = "titanium" + +/obj/structure/door_assembly/door_assembly_wood + name = "wooden airlock assembly" + icon = 'icons/obj/doors/airlocks/station/wood.dmi' + base_name = "wooden airlock" + airlock_type = /obj/machinery/door/airlock/wood + mineral = "wood" + glass_type = /obj/machinery/door/airlock/wood/glass diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index aa661e57aa8..e318dd6f289 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -80,9 +80,9 @@ /obj/structure/falsewall/update_icon() if(density) + icon_state = initial(icon_state) smooth = SMOOTH_TRUE smooth_icon(src) - icon_state = "" else icon_state = "fwall_open" @@ -304,4 +304,22 @@ icon_state = "abductor" mineral = "abductor" walltype = "abductor" - canSmoothWith = list(/obj/structure/falsewall/abductor, /turf/simulated/wall/mineral/abductor) \ No newline at end of file + canSmoothWith = list(/obj/structure/falsewall/abductor, /turf/simulated/wall/mineral/abductor) + +/obj/structure/falsewall/titanium + desc = "A light-weight titanium wall used in shuttles." + icon = 'icons/turf/walls/shuttle_wall.dmi' + icon_state = "shuttle" + mineral = /obj/item/stack/sheet/mineral/titanium + walltype = /turf/simulated/wall/mineral/titanium + smooth = SMOOTH_MORE + canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater) + +/obj/structure/falsewall/plastitanium + desc = "An evil wall of plasma and titanium." + icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon_state = "shuttle" + mineral = /obj/item/stack/sheet/mineral/plastitanium + walltype = /turf/simulated/wall/mineral/plastitanium + smooth = SMOOTH_MORE + canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater) \ No newline at end of file diff --git a/code/game/objects/structures/fullwindow.dm b/code/game/objects/structures/fullwindow.dm index f9e8adbf9aa..f2663063dea 100644 --- a/code/game/objects/structures/fullwindow.dm +++ b/code/game/objects/structures/fullwindow.dm @@ -94,6 +94,7 @@ basestate = "window" health = 160 reinf = 1 + explosion_block = 3 /obj/structure/window/full/shuttle/New() ..() diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 8e148d75eb5..9c8624df444 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -39,9 +39,7 @@ if(ishuman(buckled_mob)) var/mob/living/carbon/human/driver = user - var/obj/item/organ/external/l_hand = driver.get_organ("l_hand") - var/obj/item/organ/external/r_hand = driver.get_organ("r_hand") - if(!l_hand && !r_hand) + if(!driver.has_left_hand() && !driver.has_right_hand()) return 0 // No hands to drive your chair? Tough luck! for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm")) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index e134ba8ed50..aa3bf4f7e9a 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -146,7 +146,7 @@ var/ert_request_answered = 0 var/hair_c = pick("#8B4513","#000000","#FF4500","#FFD700") // Brown, black, red, blonde var/eye_c = pick("#000000","#8B4513","1E90FF") // Black, brown, blue - var/skin_tone = pick(-50, -30, -10, 0, 0, 0, 10) // Caucasian/black + var/skin_tone = rand(-120, 20) // A range of skin colors head_organ.facial_colour = hair_c head_organ.sec_facial_colour = hair_c diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm index e66d4383407..218599f9e9d 100644 --- a/code/game/turfs/simulated/floor/mineral.dm +++ b/code/game/turfs/simulated/floor/mineral.dm @@ -6,6 +6,7 @@ * Bananium floor * Diamond floor * Uranium floor + * Shuttle floor (Titanium) */ /turf/simulated/floor/mineral @@ -76,6 +77,61 @@ floor_tile = /obj/item/stack/tile/mineral/silver/fancy icons = list("silverfancy","silverfancy_dam") +//TITANIUM (shuttle) + +/turf/simulated/floor/mineral/titanium/blue + icon_state = "shuttlefloor" + icons = list("shuttlefloor","shuttlefloor_dam") + +/turf/simulated/floor/mineral/titanium/blue/airless + oxygen = 0.01 + nitrogen = 0.01 + temperature = TCMB + +/turf/simulated/floor/mineral/titanium/yellow + icon_state = "shuttlefloor2" + icons = list("shuttlefloor2","shuttlefloor2_dam") + +/turf/simulated/floor/mineral/titanium/yellow/airless + oxygen = 0.01 + nitrogen = 0.01 + temperature = TCMB + +/turf/simulated/floor/mineral/titanium + name = "shuttle floor" + icon_state = "shuttlefloor3" + floor_tile = /obj/item/stack/tile/mineral/titanium + icons = list("shuttlefloor3","shuttlefloor3_dam") + +/turf/simulated/floor/mineral/titanium/airless + oxygen = 0.01 + nitrogen = 0.01 + temperature = TCMB + +/turf/simulated/floor/mineral/titanium/purple + icon_state = "shuttlefloor5" + icons = list("shuttlefloor5","shuttlefloor5_dam") + +/turf/simulated/floor/mineral/titanium/purple/airless + oxygen = 0.01 + nitrogen = 0.01 + temperature = TCMB + +//PLASTITANIUM (syndieshuttle) +/turf/simulated/floor/mineral/plastitanium + name = "shuttle floor" + icon_state = "shuttlefloor4" + floor_tile = /obj/item/stack/tile/mineral/plastitanium + icons = list("shuttlefloor4","shuttlefloor4_dam") + +/turf/simulated/floor/mineral/plastitanium/airless + oxygen = 0.01 + nitrogen = 0.01 + temperature = TCMB + +/turf/simulated/floor/mineral/plastitanium/brig + name = "brig floor" + //BANANIUM /turf/simulated/floor/mineral/bananium name = "bananium floor" diff --git a/code/game/turfs/simulated/shuttle.dm b/code/game/turfs/simulated/shuttle.dm index ac520ca8c0f..6ab60fffd99 100644 --- a/code/game/turfs/simulated/shuttle.dm +++ b/code/game/turfs/simulated/shuttle.dm @@ -13,6 +13,10 @@ blocks_air = 1 +/turf/simulated/shuttle/narsie_act() + if(prob(20)) + ChangeTurf(/turf/simulated/wall/cult) + //sub-type to be used for interior shuttle walls //won't get an underlay of the destination turf on shuttle move /turf/simulated/shuttle/wall/interior/copyTurf(turf/T) diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index d2db056e824..80ce5f842be 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -156,4 +156,111 @@ smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL sheet_type = /obj/item/stack/sheet/mineral/abductor explosion_block = 3 - canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor) \ No newline at end of file + canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor) + +/////////////////////Titanium walls///////////////////// + +/turf/simulated/wall/mineral/titanium //has to use this path due to how building walls works + name = "wall" + desc = "A light-weight titanium wall used in shuttles." + icon = 'icons/turf/walls/shuttle_wall.dmi' + icon_state = "map-shuttle" + explosion_block = 3 + sheet_type = /obj/item/stack/sheet/mineral/titanium + smooth = SMOOTH_MORE|SMOOTH_DIAGONAL + canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium) + +/turf/simulated/wall/mineral/titanium/nodiagonal + smooth = SMOOTH_MORE + icon_state = "map-shuttle_nd" + +/turf/simulated/wall/mineral/titanium/nosmooth + icon = 'icons/turf/shuttle.dmi' + icon_state = "wall" + smooth = SMOOTH_FALSE + +/turf/simulated/wall/mineral/titanium/overspace + icon_state = "map-overspace" + fixed_underlay = list("space"=1) + +//sub-type to be used for interior shuttle walls +//won't get an underlay of the destination turf on shuttle move +/turf/simulated/wall/mineral/titanium/interior/copyTurf(turf/T) + if(T.type != type) + T.ChangeTurf(type) + if(underlays.len) + T.underlays = underlays + if(T.icon_state != icon_state) + T.icon_state = icon_state + if(T.icon != icon) + T.icon = icon + if(T.color != color) + T.color = color + if(T.dir != dir) + T.dir = dir + T.transform = transform + return T + +/turf/simulated/wall/mineral/titanium/copyTurf(turf/T) + . = ..() + T.transform = transform + +/turf/simulated/wall/mineral/titanium/survival + name = "pod wall" + desc = "An easily-compressable wall used for temporary shelter." + icon = 'icons/turf/walls/survival_pod_walls.dmi' + icon_state = "smooth" + smooth = SMOOTH_MORE|SMOOTH_DIAGONAL + canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock, /obj/structure/window/full, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine) + +/turf/simulated/wall/mineral/titanium/survival/nodiagonal + smooth = SMOOTH_MORE + +/turf/simulated/wall/mineral/titanium/survival/pod + canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod) + +/////////////////////Plastitanium walls///////////////////// + +/turf/simulated/wall/mineral/plastitanium + name = "wall" + desc = "An evil wall of plasma and titanium." + icon = 'icons/turf/walls/plastitanium_wall.dmi' + icon_state = "map-shuttle" + explosion_block = 4 + sheet_type = /obj/item/stack/sheet/mineral/plastitanium + smooth = SMOOTH_MORE|SMOOTH_DIAGONAL + canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium) + +/turf/simulated/wall/mineral/plastitanium/nodiagonal + smooth = SMOOTH_MORE + icon_state = "map-shuttle_nd" + +/turf/simulated/wall/mineral/plastitanium/nosmooth + icon = 'icons/turf/shuttle.dmi' + icon_state = "wall" + smooth = SMOOTH_FALSE + +/turf/simulated/wall/mineral/plastitanium/overspace + icon_state = "map-overspace" + fixed_underlay = list("space"=1) + +//have to copypaste this code +/turf/simulated/wall/mineral/plastitanium/interior/copyTurf(turf/T) + if(T.type != type) + T.ChangeTurf(type) + if(underlays.len) + T.underlays = underlays + if(T.icon_state != icon_state) + T.icon_state = icon_state + if(T.icon != icon) + T.icon = icon + if(T.color != color) + T.color = color + if(T.dir != dir) + T.dir = dir + T.transform = transform + return T + +/turf/simulated/wall/mineral/plastitanium/copyTurf(turf/T) + . = ..() + T.transform = transform \ No newline at end of file diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm index 82f8c1390b5..4bcc4e90b2f 100644 --- a/code/game/turfs/unsimulated/walls.dm +++ b/code/game/turfs/unsimulated/walls.dm @@ -13,8 +13,8 @@ /turf/unsimulated/wall/fakedoor name = "Centcom Access" - icon = 'icons/obj/doors/Doorele.dmi' - icon_state = "door_closed" + icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi' + icon_state = "closed" /turf/unsimulated/wall/splashscreen name = "Space Station 13" diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index e3bb99d52fe..cd68b0ec3b0 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -60,7 +60,7 @@ var/global/admin_ooc_colour = "#b82e00" for(var/client/C in clients) if(C.prefs.toggles & CHAT_OOC) - var/display_name = src.key + var/display_name = key if(prefs.unlock_content) if(prefs.toggles & MEMBER_PUBLIC) @@ -74,8 +74,8 @@ var/global/admin_ooc_colour = "#b82e00" if(holder) if(holder.fakekey) - if(C.holder) - display_name = "[holder.fakekey]/([src.key])" + if(C.holder && C.holder.rights & R_ADMIN) + display_name = "[holder.fakekey]/([key])" else display_name = holder.fakekey diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 7c7569e5907..cbcacc43006 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -32,7 +32,13 @@ for(var/client/C in admins) if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, C.mob)) - to_chat(C, "MENTOR: [key_name(usr, 1)] ([admin_jump_link(mob)]): ") + var/display_name = key + if(holder.fakekey) + if(C.holder && C.holder.rights & R_ADMIN) + display_name = "[holder.fakekey]/([key])" + else + display_name = holder.fakekey + to_chat(C, "MENTOR: [display_name] ([admin_jump_link(mob)]): ") feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 0ad266ecaa1..55ce03d8988 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -1,7 +1,7 @@ var/list/VVlocked = list("vars", "var_edited", "client", "firemut", "ishulk", "telekinesis", "xray", "ka", "virus", "viruses", "cuffed", "last_eaten", "unlock_content") // R_DEBUG var/list/VVicon_edit_lock = list("icon", "icon_state", "overlays", "underlays", "resize") // R_EVENT | R_DEBUG var/list/VVckey_edit = list("key", "ckey") // R_EVENT | R_DEBUG -var/list/VVpixelmovement = list("step_x", "step_y", "bound_height", "bound_width", "bound_x", "bound_y") // R_DEBUG + warning +var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height", "bound_width", "bound_x", "bound_y") // R_DEBUG + warning /client/proc/vv_get_class(var/var_value) if(isnull(var_value)) . = VV_NULL @@ -615,4 +615,4 @@ var/list/VVpixelmovement = list("step_x", "step_y", "bound_height", "bound_width log_to_dd("### VarEdit by [src]: [O.type] [variable]=[html_encode("[var_new]")]") log_admin("[key_name(src)] modified [original_name]'s [variable] to [var_new]") var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] to [var_new]" - message_admins(msg) \ No newline at end of file + message_admins(msg) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 27b6c38a469..29c6111bc02 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -576,7 +576,7 @@ Traitors and the like can also be revived with the previous role mostly intact. command_announcement.Announce(input, customname, MsgSound[beepsound], , , type) print_command_report(input, "[command_name()] Update") - else if("No") + if("No") //same thing as the blob stuff - it's not public, so it's classified, dammit command_announcer.autosay("A classified message has been printed out at all communication consoles."); print_command_report(input, "Classified [command_name()] Update") @@ -763,6 +763,11 @@ Traitors and the like can also be revived with the previous role mostly intact. var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No") if(confirm != "Yes") return + if(alert("Set Shuttle Recallable (Select Yes unless you know what this does)", "Recallable?", "Yes", "No") == "Yes") + shuttle_master.emergency.canRecall = TRUE + else + shuttle_master.emergency.canRecall = FALSE + shuttle_master.emergency.request() feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -781,7 +786,18 @@ Traitors and the like can also be revived with the previous role mostly intact. if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED) return - shuttle_master.emergency.cancel() + if(shuttle_master.emergency.canRecall == FALSE) + if(alert("Shuttle is currently set to be nonrecallable. Recalling may break things. Respect Recall Status?", "Override Recall Status?", "Yes", "No") == "Yes") + return + else + var/keepStatus = alert("Maintain recall status on future shuttle calls?", "Maintain Status?", "Yes", "No") == "Yes" //Keeps or drops recallability + shuttle_master.emergency.canRecall = TRUE // must be true for cancel proc to work + shuttle_master.emergency.cancel() + if(keepStatus) + shuttle_master.emergency.canRecall = FALSE // restores original status + else + shuttle_master.emergency.cancel() + feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] admin-recalled the emergency shuttle.") message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.") diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 2720f8086d0..9e731953ce5 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -418,6 +418,8 @@ preferences_datums[ckey] = prefs prefs.last_ip = address //these are gonna be used for banning prefs.last_id = computer_id //these are gonna be used for banning + if(world.byond_version >= 511 && byond_version >= 511 && prefs.clientfps) + fps = prefs.clientfps spawn() // Goonchat does some non-instant checks in start() chatOutput.start() diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index a351d3f5032..ad25c8fdeb1 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -68,6 +68,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts #define TAB_GEAR 2 /datum/preferences + var/client/parent //doohickeys for savefiles // var/path var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used @@ -94,6 +95,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts var/UI_style_color = "#ffffff" var/UI_style_alpha = 255 var/windowflashing = TRUE + var/clientfps = 0 //ghostly preferences var/ghost_anonsay = 0 @@ -203,6 +205,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts var/gear_tab = "General" /datum/preferences/New(client/C) + parent = C b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+") max_gear_slots = config.max_loadout_points @@ -444,11 +447,11 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts dat += "Donator Publicity: [(toggles & DONATOR_PUBLIC) ? "Public" : "Hidden"]
" dat += "Randomized character slot: [randomslot ? "Yes" : "No"]
" - dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]
" - dat += "Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]
" - dat += "Ghost radio: [(toggles & CHAT_GHOSTRADIO) ? "Nearest Speakers" : "All Chatter"]
" + dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]
" + dat += "Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"]
" + dat += "Ghost radio: [(toggles & CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]
" dat += "Deadchat anonymity: [ghost_anonsay ? "Anonymous" : "Not Anonymous"]
" - + dat += "FPS: [clientfps]
" dat += "
Special Role Settings
" if(jobban_isbanned(user, "Syndicate")) @@ -1887,6 +1890,18 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if("Mechanical") organ_data[organ] = "mechanical" + if("clientfps") + var/version_message + if(user.client && user.client.byond_version < 511) + version_message = "\nYou need to be using byond version 511 or later to take advantage of this feature, your version of [user.client.byond_version] is too low" + if(world.byond_version < 511) + version_message += "\nThis server does not currently support client side fps. You can set now for when it does." + var/desiredfps = input(user, "Choose your desired fps.[version_message]\n(0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num + if(!isnull(desiredfps)) + clientfps = desiredfps + if(world.byond_version >= 511 && user.client && user.client.byond_version >= 511) + parent.fps = clientfps + /* if("skin_style") var/skin_style_name = input(user, "Select a new skin style") as null|anything in list("default1", "default2", "default3") @@ -1932,7 +1947,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if("hear_adminhelps") sound ^= SOUND_ADMINHELP - if("ui") switch(UI_style) if("Midnight") diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm index 5581d0a1844..f2a9d739cfe 100644 --- a/code/modules/client/preference/preferences_mysql.dm +++ b/code/modules/client/preference/preferences_mysql.dm @@ -16,7 +16,8 @@ lastchangelog, windowflashing, ghost_anonsay, - exp + exp, + clientfps FROM [format_table_name("player")] WHERE ckey='[C.ckey]'"} ) @@ -46,6 +47,7 @@ windowflashing = text2num(query.item[14]) ghost_anonsay = text2num(query.item[15]) exp = query.item[16] + clientfps = text2num(query.item[17]) //Sanitize ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor)) @@ -63,6 +65,7 @@ windowflashing = sanitize_integer(windowflashing, 0, 1, initial(windowflashing)) ghost_anonsay = sanitize_integer(ghost_anonsay, 0, 1, initial(ghost_anonsay)) exp = sanitize_text(exp, initial(exp)) + clientfps = sanitize_integer(clientfps, 0, 1000, initial(clientfps)) return 1 /datum/preferences/proc/save_preferences(client/C) @@ -89,7 +92,8 @@ show_ghostitem_attack='[show_ghostitem_attack]', lastchangelog='[lastchangelog]', windowflashing='[windowflashing]', - ghost_anonsay='[ghost_anonsay]' + ghost_anonsay='[ghost_anonsay]', + clientfps='[clientfps]' WHERE ckey='[C.ckey]'"} ) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 3fbcf39ed08..4e7093bf5cf 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -16,7 +16,7 @@ /datum/crafting_recipe/IED name = "IED" - result = /obj/item/weapon/grenade/iedcasing/filled + result = /obj/item/weapon/grenade/iedcasing reqs = list(/datum/reagent/fuel = 50, /obj/item/stack/cable_coil = 1, /obj/item/device/assembly/igniter = 1, diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 0b5b2171f86..f80a58f7fba 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -43,6 +43,9 @@ /obj/item/weapon/reagent_containers/food/drinks/MouseDrop(atom/over_object) //CHUG! CHUG! CHUG! var/mob/living/carbon/chugger = over_object + if (!(flags & OPENCONTAINER)) + to_chat(chugger, "You need to open [src] first!") + return if(istype(chugger) && loc == chugger && src == chugger.get_active_hand() && reagents.total_volume) chugger.visible_message("[chugger] raises the [src] to their mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!", "You start chugging \the [src].", "You hear what sounds like gulping.") while(do_mob(chugger, chugger, 40)) //Between the default time for do_mob and the time it takes for a vampire to suck blood. diff --git a/code/modules/holiday/holiday.dm b/code/modules/holiday/holiday.dm index 85162a75c2d..414df7f7589 100644 --- a/code/modules/holiday/holiday.dm +++ b/code/modules/holiday/holiday.dm @@ -349,10 +349,8 @@ holiday_master.holidays = list() holiday_master.holidays[H.name] = H - station_name = null - station_name() //update our hub status world.update_status() message_admins("ADMIN: Event: [key_name_admin(src)] force-set Holiday to \"[H]\"") - log_admin("[key_name(src)] force-set Holiday to \"[H]\"") \ No newline at end of file + log_admin("[key_name(src)] force-set Holiday to \"[H]\"") diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 4a51bb53351..8f95d7741ea 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -704,7 +704,7 @@ adjustPests(rand(2,4)) // FEED ME SEYMOUR - if(S.has_reagent("strangereagent", 1)) + if(S.has_reagent("strange_reagent", 1)) spawnplant() // The best stuff there is. For testing/debugging. diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 700803792e2..3d3ce0aa613 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -19,7 +19,7 @@ var/ore_pickup_rate = 15 var/sheet_per_ore = 1 var/point_upgrade = 1 - var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("plasma" = 15), ("silver" = 16), ("gold" = 18), ("uranium" = 30), ("diamond" = 50), ("bluespace crystal" = 50), ("bananium" = 60), ("tranquillite" = 60)) + var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("plasma" = 15), ("silver" = 16), ("gold" = 18), ("titanium" = 30), ("uranium" = 30), ("diamond" = 50), ("bluespace crystal" = 50), ("bananium" = 60), ("tranquillite" = 60)) var/list/supply_consoles = list("Science", "Robotics", "Research Director's Desk", "Mechanic", "Engineering" = list("metal", "glass", "plasma"), "Chief Engineer's Desk" = list("metal", "glass", "plasma"), "Atmospherics" = list("metal", "glass", "plasma"), "Bar" = list("uranium", "plasma"), "Virology" = list("plasma", "uranium", "gold")) speed_process = 1 @@ -175,17 +175,28 @@ dat += "" //just looks nicer dat += text("[capitalize(s.name)]: [s.amount] Release
") - if((/obj/item/stack/sheet/metal in stack_list) && (/obj/item/stack/sheet/mineral/plasma in stack_list)) - var/obj/item/stack/sheet/metalstack = stack_list[/obj/item/stack/sheet/metal] - var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma] - if(min(metalstack.amount, plasmastack.amount)) - dat += text("Plasteel Alloy (Metal + Plasma): Smelt
") - if((/obj/item/stack/sheet/glass in stack_list) && (/obj/item/stack/sheet/mineral/plasma in stack_list)) - var/obj/item/stack/sheet/glassstack = stack_list[/obj/item/stack/sheet/glass] - var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma] - if(min(glassstack.amount, plasmastack.amount)) - dat += "Plasma Glass (Glass + Plasma): Smelt
" + var/obj/item/stack/sheet/metalstack + if(/obj/item/stack/sheet/metal in stack_list) + metalstack = stack_list[/obj/item/stack/sheet/metal] + var/obj/item/stack/sheet/glass/glassstack + if(/obj/item/stack/sheet/glass in stack_list) + glassstack = stack_list[/obj/item/stack/sheet/glass] + + var/obj/item/stack/sheet/plasmastack + if((/obj/item/stack/sheet/mineral/plasma in stack_list)) + plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma] + + var/obj/item/stack/sheet/mineral/titaniumstack + if((/obj/item/stack/sheet/mineral/titanium in stack_list)) + titaniumstack = stack_list[/obj/item/stack/sheet/mineral/titanium] + + if(metalstack && plasmastack && min(metalstack.amount, plasmastack.amount)) + dat += text("Plasteel Alloy (Metal + Plasma): Smelt
") + if(titaniumstack && plasmastack && min(titaniumstack.amount, plasmastack.amount)) + dat += text("Plastitanium Alloy (Titanium + Plasma): Smelt
") + if(glassstack && plasmastack && min(glassstack.amount, plasmastack.amount)) + dat += text("Plasma Glass (Glass + Plasma): Smelt
") dat += text("
Mineral Value List:
[get_ore_values()]
")
var/datum/browser/popup = new(user, "console_stacking_machine", "Ore Redemption Machine", 400, 500)
@@ -242,37 +253,24 @@
else
to_chat(usr, "Required access not found.")
- if(href_list["plasteel"])
+ if(href_list["alloytype1"] && href_list["alloytype2"] && href_list["alloytypeout"])
+ var/alloytype1 = text2path(href_list["alloytype1"])
+ var/alloytype2 = text2path(href_list["alloytype2"])
+ var/alloytypeout = text2path(href_list["alloytypeout"])
if(check_access(inserted_id) || allowed(usr))
- if(!(/obj/item/stack/sheet/metal in stack_list)) return
- if(!(/obj/item/stack/sheet/mineral/plasma in stack_list)) return
- var/obj/item/stack/sheet/metalstack = stack_list[/obj/item/stack/sheet/metal]
- var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma]
-
+ if(!(alloytype1 in stack_list))
+ return
+ if(!(alloytype2 in stack_list))
+ return
+ var/obj/item/stack/sheet/stack1 = stack_list[alloytype1]
+ var/obj/item/stack/sheet/stack2 = stack_list[alloytype2]
var/desired = input("How much?", "How much would you like to smelt?", 1) as num
- var/obj/item/stack/sheet/plasteel/plasteelout = new
- plasteelout.amount = round(min(desired,50,metalstack.amount,plasmastack.amount))
- if(plasteelout.amount >= 1)
- metalstack.amount -= plasteelout.amount
- plasmastack.amount -= plasteelout.amount
- unload_mineral(plasteelout)
- else
- to_chat(usr, "Required access not found.")
-
- if(href_list["plasglass"])
- if(check_access(inserted_id) || allowed(usr))
- if(!(/obj/item/stack/sheet/glass in stack_list)) return
- if(!(/obj/item/stack/sheet/mineral/plasma in stack_list)) return
- var/obj/item/stack/sheet/glassstack = stack_list[/obj/item/stack/sheet/glass]
- var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma]
-
- var/desired = input("How much?", "How much would you like to smelt?", 1) as num
- var/obj/item/stack/sheet/plasmaglass/plasglassout = new
- plasglassout.amount = round(min(desired, 50, glassstack.amount, plasmastack.amount))
- if(plasglassout.amount >= 1)
- glassstack.amount -= plasglassout.amount
- plasmastack.amount -= plasglassout.amount
- unload_mineral(plasglassout)
+ var/obj/item/stack/sheet/alloyout = new alloytypeout
+ alloyout.amount = round(min(desired,50,stack1.amount,stack2.amount))
+ if(alloyout.amount >= 1)
+ stack1.amount -= alloyout.amount
+ stack2.amount -= alloyout.amount
+ unload_mineral(alloyout)
else
to_chat(usr, "Required access not found.")
updateUsrDialog()
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index 212e8488ac8..4fe8edbe7f6 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -25,93 +25,102 @@
if(machine.ore_iron || machine.ore_glass || machine.ore_plasma || machine.ore_uranium || machine.ore_gold || machine.ore_silver || machine.ore_diamond || machine.ore_clown || machine.ore_mime || machine.ore_adamantine)
if(machine.ore_iron)
if(machine.selected_iron==1)
- dat += text("Smelting ")
+ dat += "Smelting "
else
- dat += text("Not smelting ")
- dat += text("Iron: [machine.ore_iron][get_ore_values()]
") + dat += "Not smelting " + dat += "Iron: [machine.ore_iron]
" else machine.selected_iron = 0 //sand - glass if(machine.ore_glass) if(machine.selected_glass==1) - dat += text("Smelting ") + dat += "Smelting " else - dat += text("Not smelting ") - dat += text("Sand: [machine.ore_glass]
") + dat += "Not smelting " + dat += "Sand: [machine.ore_glass]
" else machine.selected_glass = 0 //plasma if(machine.ore_plasma) if(machine.selected_plasma==1) - dat += text("Smelting ") + dat += "Smelting " else - dat += text("Not smelting ") - dat += text("Plasma: [machine.ore_plasma]
") + dat += "Not smelting " + dat += "Plasma: [machine.ore_plasma]
" else machine.selected_plasma = 0 //uranium if(machine.ore_uranium) if(machine.selected_uranium==1) - dat += text("Smelting ") + dat += "Smelting " else - dat += text("Not smelting ") - dat += text("Uranium: [machine.ore_uranium]
") + dat += "Not smelting " + dat += "Uranium: [machine.ore_uranium]
" else machine.selected_uranium = 0 //gold if(machine.ore_gold) if(machine.selected_gold==1) - dat += text("Smelting ") + dat += "Smelting " else - dat += text("Not smelting ") - dat += text("Gold: [machine.ore_gold]
") + dat += "Not smelting " + dat += "Gold: [machine.ore_gold]
" else machine.selected_gold = 0 //silver if(machine.ore_silver) if(machine.selected_silver==1) - dat += text("Smelting ") + dat += "Smelting " else - dat += text("Not smelting ") - dat += text("Silver: [machine.ore_silver]
") + dat += "Not smelting " + dat += "Silver: [machine.ore_silver]
" else machine.selected_silver = 0 //diamond if(machine.ore_diamond) if(machine.selected_diamond==1) - dat += text("Smelting ") + dat += "Smelting " else - dat += text("Not smelting ") - dat += text("Diamond: [machine.ore_diamond]
") + dat += "Not smelting " + dat += "Diamond: [machine.ore_diamond]
" else machine.selected_diamond = 0 //bananium if(machine.ore_clown) if(machine.selected_clown==1) - dat += text("Smelting ") + dat += "Smelting " else - dat += text("Not smelting ") - dat += text("Bananium: [machine.ore_clown]
") + dat += "Not smelting " + dat += "Bananium: [machine.ore_clown]
" else machine.selected_clown = 0 //tranquillite if(machine.ore_mime) if(machine.selected_mime==1) - dat += text("Smelting ") + dat += "Smelting " else - dat += text("Not smelting ") - dat += text("Tranquillite: [machine.ore_mime]
") + dat += "Not smelting " + dat += "Tranquillite: [machine.ore_mime]
" else machine.selected_mime = 0 + //titanium + if(machine.ore_titanium) + if (machine.selected_titanium==1) + dat += "Smelting " + else + dat += "Not smelting " + dat += "Titanium: [machine.ore_titanium]
" + else + machine.selected_titanium = 0 //On or off dat += text("Machine is currently ") @@ -175,6 +184,11 @@ machine.selected_mime = 1 else machine.selected_mime = 0 + if(href_list["sel_titanium"]) + if (href_list["sel_titanium"] == "yes") + machine.selected_titanium = 1 + else + machine.selected_titanium = 0 if(href_list["set_on"]) if(href_list["set_on"] == "on") machine.on = 1 @@ -203,6 +217,7 @@ var/ore_clown = 0 var/ore_mime = 0 var/ore_adamantine = 0 + var/ore_titanium = 0 var/selected_gold = 0 var/selected_silver = 0 var/selected_diamond = 0 @@ -212,92 +227,106 @@ var/selected_iron = 0 var/selected_clown = 0 var/selected_mime = 0 + var/selected_titanium = 0 var/on = 0 //0 = off, 1 =... oh you know! /obj/machinery/mineral/processing_unit/process() - var/i - for(i = 0; i < 10; i++) + for(var/i in 1 to 10) if(on) - if(selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0) + if(selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_mime) if(ore_glass > 0) - ore_glass--; + ore_glass-- generate_mineral(/obj/item/stack/sheet/glass) else on = 0 continue - if(selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0) + if(selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && selected_iron && !selected_clown && !selected_mime) if(ore_glass > 0 && ore_iron > 0) - ore_glass--; - ore_iron--; + ore_glass-- + ore_iron-- generate_mineral(/obj/item/stack/sheet/rglass) else on = 0 continue - if(selected_glass == 0 && selected_gold == 1 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0) + if(!selected_glass && selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_mime) if(ore_gold > 0) - ore_gold--; + ore_gold-- generate_mineral(/obj/item/stack/sheet/mineral/gold) else on = 0 continue - if(selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0) + if(!selected_glass && !selected_gold && selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_mime) if(ore_silver > 0) - ore_silver--; + ore_silver-- generate_mineral(/obj/item/stack/sheet/mineral/silver) else on = 0 continue - if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0) + if(!selected_glass && !selected_gold && !selected_silver && selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_mime) if(ore_diamond > 0) - ore_diamond--; + ore_diamond-- generate_mineral(/obj/item/stack/sheet/mineral/diamond) else on = 0 continue - if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0) + if(!selected_glass && !selected_gold && !selected_silver && !selected_diamond && selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_mime) if(ore_plasma > 0) - ore_plasma--; + ore_plasma-- generate_mineral(/obj/item/stack/sheet/mineral/plasma) else on = 0 continue - if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0 && selected_mime == 0) + if(!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && selected_uranium && !selected_iron && !selected_clown && !selected_mime) if(ore_uranium > 0) - ore_uranium--; + ore_uranium-- generate_mineral(/obj/item/stack/sheet/mineral/uranium) else on = 0 continue - if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0) + if(!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && selected_iron && !selected_clown && !selected_mime) if(ore_iron > 0) - ore_iron--; + ore_iron-- generate_mineral(/obj/item/stack/sheet/metal) else on = 0 continue - if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_mime == 0) + if(!selected_glass && !selected_gold && !selected_silver && !selected_diamond && selected_plasma && !selected_uranium && selected_iron && !selected_clown && !selected_mime) if(ore_iron > 0 && ore_plasma > 0) - ore_iron--; - ore_plasma--; + ore_iron-- + ore_plasma-- generate_mineral(/obj/item/stack/sheet/plasteel) else on = 0 continue - if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 1 && selected_mime == 0) + if(!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && selected_clown && !selected_mime) if(ore_clown > 0) - ore_clown--; + ore_clown-- generate_mineral(/obj/item/stack/sheet/mineral/bananium) else on = 0 continue - if(selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_mime == 1) + if(!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && selected_mime) if(ore_mime > 0) - ore_mime--; + ore_mime-- generate_mineral(/obj/item/stack/sheet/mineral/tranquillite) else on = 0 continue - + if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && !selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_mime && selected_titanium) + if (ore_titanium > 0) + ore_titanium-- + generate_mineral(/obj/item/stack/sheet/mineral/titanium) + else + on = 0 + continue + if (!selected_glass && !selected_gold && !selected_silver && !selected_diamond && selected_plasma && !selected_uranium && !selected_iron && !selected_clown && !selected_mime && selected_titanium) + if (ore_titanium > 0) + ore_titanium-- + ore_plasma-- + generate_mineral(/obj/item/stack/sheet/mineral/plastitanium) + else + on = 0 + continue //if a non valid combination is selected @@ -333,6 +362,9 @@ if(selected_mime == 1) if(ore_mime <= 0) b = 0 + if(selected_titanium == 1) + if(ore_titanium <= 0) + b = 0 if(b) //if they are, deduct one from each, produce slag and shut the machine off if(selected_gold == 1) @@ -351,6 +383,8 @@ ore_clown-- if(selected_mime == 1) ore_mime-- + if(selected_titanium == 1) + ore_titanium-- generate_mineral(/obj/item/weapon/ore/slag) on = 0 else @@ -402,6 +436,10 @@ ore_mime++ O.loc = null continue + if(istype(O,/obj/item/weapon/ore/titanium)) + ore_titanium++ + O.loc = null + continue unload_mineral(O) /obj/machinery/mineral/processing_unit/proc/generate_mineral(var/P) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 80d575b9d1f..7b7f4a4fd48 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -362,25 +362,23 @@ icon_regular_floor = "podfloor" floor_tile = /obj/item/stack/tile/pod -//Walls -/turf/simulated/wall/survival - name = "pod wall" - desc = "An easily-compressable wall used for temporary shelter." - icon = 'icons/turf/walls/survival_pod_walls.dmi' - icon_state = "smooth" - smooth = SMOOTH_MORE|SMOOTH_DIAGONAL - canSmoothWith = list(/turf/simulated/wall/survival, /obj/machinery/door/airlock/survival_pod) - //Door /obj/machinery/door/airlock/survival_pod - icon = 'icons/obj/doors/survival.dmi' + icon = 'icons/obj/doors/airlocks/survival/survival.dmi' + overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_pod - opacity = 0 - glass = 1 + +/obj/machinery/door/airlock/survival_pod/glass + opacity = FALSE + glass = TRUE /obj/structure/door_assembly/door_assembly_pod - base_icon_state = "survival_pod" - glass_type = "/survival_pod" + name = "pod airlock assembly" + icon = 'icons/obj/doors/airlocks/survival/survival.dmi' + base_name = "pod airlock" + overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi' + airlock_type = /obj/machinery/door/airlock/survival_pod + glass_type = /obj/machinery/door/airlock/survival_pod/glass //Windoor /obj/machinery/door/window/survival_pod diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index d57f509e13e..d2f8e2c8bc1 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -110,8 +110,7 @@ var/global/list/rockTurfEdgeCache = list( "Uranium" = 5, "Diamond" = 1, "Gold" = 10, "Silver" = 12, "Plasma" = 20, "Iron" = 40, "Gibtonite" = 4, "Cave" = 2, "BScrystal" = 1, - /*, "Adamantine" =5*/) - //Currently, Adamantine won't spawn as it has no uses. -Durandan + "Titanium" = 11) var/mineralChance = 13 /turf/simulated/mineral/random/New() @@ -142,6 +141,8 @@ var/global/list/rockTurfEdgeCache = list( M = new/turf/simulated/mineral/clown(src) if("Tranquillite") M = new/turf/simulated/mineral/mime(src) + if("Titanium") + M = new/turf/simulated/mineral/titanium(src) if("BScrystal") M = new/turf/simulated/mineral/bscrystal(src) if(M) @@ -155,9 +156,9 @@ var/global/list/rockTurfEdgeCache = list( icon_state = "rock_highchance" mineralChance = 25 mineralSpawnChanceList = list( - "Uranium" = 35, "Diamond" = 30, - "Gold" = 45, "Silver" = 50, "Plasma" = 50, - "BScrystal" = 20) + "Uranium" = 35, "Diamond" = 30, "Gold" = 45, + "Silver" = 50, "Plasma" = 50, "BScrystal" = 20, + "Titanium" = 45) /turf/simulated/mineral/random/high_chance_clown @@ -177,7 +178,7 @@ var/global/list/rockTurfEdgeCache = list( mineralSpawnChanceList = list( "Uranium" = 2, "Diamond" = 1, "Gold" = 4, "Silver" = 6, "Plasma" = 15, "Iron" = 40, - "Gibtonite" = 2, "BScrystal" = 1) + "Gibtonite" = 2, "BScrystal" = 1, "Titanium" = 4) /turf/simulated/mineral/random/low_chance/New() icon_state = "rock" @@ -228,6 +229,14 @@ var/global/list/rockTurfEdgeCache = list( hidden = 1 scan_state = "rock_Silver" +/turf/simulated/mineral/titanium + name = "titanium deposit" + mineralType = /obj/item/weapon/ore/titanium + spreadChance = 5 + spread = 1 + hidden = 1 + scan_state = "rock_Titanium" + /turf/simulated/mineral/plasma name = "plasma deposit" icon_state = "rock_Plasma" diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index fbf14349a53..a9cdbffed7d 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -37,7 +37,8 @@ speak_emote = list("states") wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver, /obj/item/weapon/ore/plasma, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/iron, - /obj/item/weapon/ore/bananium, /obj/item/weapon/ore/tranquillite, /obj/item/weapon/ore/glass) + /obj/item/weapon/ore/bananium, /obj/item/weapon/ore/tranquillite, /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/titanium) healable = 0 var/mode = MINEDRONE_COLLECT var/light_on = 0 diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index cf987c654bc..3158b1b524a 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -142,6 +142,13 @@ refined_type = /obj/item/stack/sheet/mineral/tranquillite materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT) +/obj/item/weapon/ore/titanium + name = "titanium ore" + icon_state = "Titanium ore" + points = 50 + materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT) + refined_type = /obj/item/stack/sheet/mineral/titanium + /obj/item/weapon/ore/slag name = "slag" desc = "Completely useless" diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 5cf24a394ee..5f21412f3b8 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -33,6 +33,7 @@ var/amt_iron = 0 var/amt_plasma = 0 var/amt_uranium = 0 + var/amt_titanium = 0 var/amt_clown = 0 var/amt_mime = 0 var/amt_bluespace = 0 @@ -56,6 +57,8 @@ amt_clown++ if(istype(C,/obj/item/weapon/ore/tranquillite)) amt_mime++ + if(istype(C, /obj/item/weapon/ore/titanium)) + amt_titanium++ if(istype(C,/obj/item/weapon/ore/bluespace_crystal)) amt_bluespace++ @@ -74,6 +77,8 @@ dat += text("Plasma ore: [amt_plasma]
") if(amt_uranium) dat += text("Uranium ore: [amt_uranium]
") + if(amt_titanium) + dat += text("Titanium ore: [amt_titanium]
") if(amt_clown) dat += text("Bananium ore: [amt_clown]
") if(amt_mime) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a743e779687..1fa4b57356f 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -2,20 +2,6 @@ var/canEnterVentWith = "/obj/item/weapon/implant=0&/obj/item/clothing/mask/facehugger=0&/obj/item/device/radio/borg=0&/obj/machinery/camera=0" var/datum/middleClickOverride/middleClickOverride = null -/mob/living/carbon/prepare_huds() - ..() - prepare_data_huds() - -/mob/living/carbon/proc/prepare_data_huds() - ..() - med_hud_set_health() - med_hud_set_status() - -/mob/living/carbon/updatehealth() - ..() - med_hud_set_health() - med_hud_set_status() - /mob/living/carbon/Destroy() QDEL_LIST(internal_organs) QDEL_LIST(stomach_contents) @@ -23,7 +9,6 @@ if(B) B.leave_host() qdel(B) - remove_from_all_data_huds() return ..() /mob/living/carbon/blob_act() diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 7ed39d78382..9068c1f1b65 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -1,6 +1,5 @@ /mob/living/carbon gender = MALE - hud_possible = list(HEALTH_HUD,STATUS_HUD,SPECIALROLE_HUD) var/list/stomach_contents = list() var/list/internal_organs = list() var/list/internal_organs_slot = list() //Same as above, but stores "slot ID" - "organ" pairs for easy access. @@ -24,7 +23,6 @@ var/wetlevel = 0 //how wet the mob is var/failed_last_breath = FALSE //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks. - var/list/active_effect = list() var/co2overloadtime = null blood_volume = BLOOD_VOLUME_NORMAL diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index a9fde120c44..8910b43237b 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -840,31 +840,27 @@ if("highfive") if(restrained()) return - if(EFFECT_HIGHFIVE in active_effect) - to_chat(src, "You give up on the high-five.") - active_effect -= EFFECT_HIGHFIVE + if(has_status_effect(STATUS_EFFECT_HIGHFIVE)) + to_chat(src, "You give up on the highfive.") + remove_status_effect(STATUS_EFFECT_HIGHFIVE) return - active_effect |= EFFECT_HIGHFIVE - for(var/mob/living/carbon/C in orange(1)) - if(EFFECT_HIGHFIVE in C.active_effect) - if((C.mind.special_role == SPECIAL_ROLE_WIZARD) && (mind.special_role == SPECIAL_ROLE_WIZARD)) - visible_message("[name] and [C.name] high-five EPICALLY!") + visible_message("[name] requests a highfive.", "You request a high five.") + apply_status_effect(STATUS_EFFECT_HIGHFIVE) + for(var/mob/living/L in orange(1)) + if(L.has_status_effect(STATUS_EFFECT_HIGHFIVE)) + if((mind && mind.special_role == SPECIAL_ROLE_WIZARD) && (L.mind && L.mind.special_role == SPECIAL_ROLE_WIZARD)) + visible_message("[name] and [L.name] high-five EPICALLY!") status_flags |= GODMODE - C.status_flags |= GODMODE + L.status_flags |= GODMODE explosion(loc,5,2,1,3) status_flags &= ~GODMODE - C.status_flags &= ~GODMODE - break - visible_message("[name] and [C.name] high-five!") - C.active_effect -= EFFECT_HIGHFIVE - active_effect -= EFFECT_HIGHFIVE - playsound('sound/effects/snap.ogg', 50) - break - if(EFFECT_HIGHFIVE in active_effect) - visible_message("[name] requests a highfive.", "You request a highfive.") - if(do_after(src, 25, target = src)) - visible_message("[name] was left hanging. Embarrassing.", "You are left hanging. How embarrassing!") - active_effect -= EFFECT_HIGHFIVE + L.status_flags &= ~GODMODE + return + visible_message("[name] and [L.name] high-five!") + playsound('sound/effects/snap.ogg', 50) + remove_status_effect(STATUS_EFFECT_HIGHFIVE) + L.remove_status_effect(STATUS_EFFECT_HIGHFIVE) + return if("help") var/emotelist = "aflap(s), airguitar, blink(s), blink(s)_r, blush(es), bow(s)-(none)/mob, burp(s), choke(s), chuckle(s), clap(s), collapse(s), cough(s),cry, cries, custom, dance, dap(s)(none)/mob," \ diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index dad8fae62f7..27aa1d6b4da 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1800,7 +1800,10 @@ ..() /mob/living/carbon/human/canBeHandcuffed() - return 1 + if(get_num_arms() >= 2) + return TRUE + else + return FALSE /mob/living/carbon/human/InCritical() return (health <= config.health_threshold_crit && stat == UNCONSCIOUS) diff --git a/code/modules/mob/living/carbon/human/interactive/interactive.dm b/code/modules/mob/living/carbon/human/interactive/interactive.dm index 4efca3178cc..442bb19ca9a 100644 --- a/code/modules/mob/living/carbon/human/interactive/interactive.dm +++ b/code/modules/mob/living/carbon/human/interactive/interactive.dm @@ -618,7 +618,7 @@ if(istype(D,/obj/machinery/door/airlock)) var/obj/machinery/door/airlock/AL = D if(!AL.CanAStarPass(RPID)) // only crack open doors we can't get through - AL.p_open = 1 + AL.panel_open = 1 AL.update_icon() AL.shock(src, mistake_chance) sleep(5) @@ -638,7 +638,7 @@ if(prob(mistake_chance) && !AL.wires.IsIndexCut(AIRLOCK_WIRE_ELECTRIFY)) AL.wires.CutWireIndex(AIRLOCK_WIRE_ELECTRIFY) sleep(5) - AL.p_open = 0 + AL.panel_open = 0 AL.update_icon() D.open() diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index b7834d873f1..d8c80c8b3fe 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -287,6 +287,7 @@ // Do species-specific reagent handling here // Return 1 if it should do normal processing too +// Return the parent value if processing does not explicitly stop // Return 0 if it shouldn't deplete and do its normal effect // Other return values will cause weird badness /datum/species/proc/handle_reagents(mob/living/carbon/human/H, datum/reagent/R) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index b895ed0fdd4..96a3571f113 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -744,6 +744,12 @@ if(speech_pref) H.mind.speech_span = "wingdings" +/datum/species/grey/handle_reagents(mob/living/carbon/human/H, datum/reagent/R) + if(R.id == "sacid") + H.reagents.del_reagent(R.id) + return 0 + return ..() + /datum/species/diona name = "Diona" name_plural = "Dionaea" @@ -963,10 +969,10 @@ speech_chance = 20 male_scream_sound = 'sound/voice/DraskTalk2.ogg' female_scream_sound = 'sound/voice/DraskTalk2.ogg' - male_cough_sounds = null //whale cough when - female_cough_sounds = null - male_sneeze_sound = null - female_sneeze_sound = null + male_cough_sounds = 'sound/voice/DraskCough.ogg' + female_cough_sounds = 'sound/voice/DraskCough.ogg' + male_sneeze_sound = 'sound/voice/DraskSneeze.ogg' + female_sneeze_sound = 'sound/voice/DraskSneeze.ogg' burn_mod = 2 //exotic_blood = "cryoxadone" diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 2221455c5a5..9056a078791 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -14,4 +14,7 @@ var/datum/soullink/S = s S.sharerDies(gibbed, src) + med_hud_set_health() + med_hud_set_status() + ..(gibbed) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 42e461b6e03..e38b2e6fd4e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1,7 +1,30 @@ +/mob/living/New() + . = ..() + var/datum/atom_hud/data/human/medical/advanced/medhud = huds[DATA_HUD_MEDICAL_ADVANCED] + medhud.add_to_hud(src) + +/mob/living/prepare_huds() + ..() + prepare_data_huds() + +/mob/living/proc/prepare_data_huds() + ..() + med_hud_set_health() + med_hud_set_status() + /mob/living/Destroy() if(ranged_ability) ranged_ability.remove_ranged_ability(src) + remove_from_all_data_huds() + + if(LAZYLEN(status_effects)) + for(var/s in status_effects) + var/datum/status_effect/S = s + if(S.on_remove_on_mob_delete) //the status effect calls on_remove when its mob is deleted + qdel(S) + else + S.be_replaced() return ..() /mob/living/ghostize(can_reenter_corpse = 1) @@ -214,6 +237,7 @@ stat = CONSCIOUS return health = maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss() + med_hud_set_health() //This proc is used for mobs which are affected by pressure to calculate the amount of pressure that actually diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 5aaf02688d3..4afdd9281ce 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -64,3 +64,7 @@ var/list/recent_tastes = list() var/blood_volume = 0 //how much blood the mob has + hud_possible = list(HEALTH_HUD,STATUS_HUD,SPECIALROLE_HUD) + + var/list/status_effects //a list of all status effects the mob has + diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 2099b99f1b1..81a1958d22c 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -1,3 +1,4 @@ +#define EMAG_TIMER 3000 /mob/living/silicon/robot/drone name = "drone" real_name = "drone" @@ -30,6 +31,7 @@ var/mail_destination = 0 var/reboot_cooldown = 60 // one minute var/last_reboot + var/emagged_time holder_type = /obj/item/weapon/holder/drone // var/sprite[0] @@ -180,14 +182,21 @@ return to_chat(user, "You swipe the sequencer across [src]'s interface and watch its eyes flicker.") - to_chat(src, "You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script.") + + if(jobban_isbanned(src, ROLE_SYNDICATE)) + ticker.mode.replace_jobbanned_player(src, ROLE_SYNDICATE) + + to_chat(src, "You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script. You sense you have five minutes before the drone server detects this and automatically shuts you down.") message_admins("[key_name_admin(user)] emagged drone [key_name_admin(src)]. Laws overridden.") log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.") var/time = time2text(world.realtime,"hh:mm:ss") lawchanges.Add("[time] : [H.name]([H.key]) emagged [name]([key])") + emagged_time = world.time emagged = 1 + density = 1 + pass_flags = 0 icon_state = "repairbot-emagged" holder_type = /obj/item/weapon/holder/drone/emagged update_icons() @@ -196,11 +205,11 @@ clear_supplied_laws() clear_inherent_laws() laws = new /datum/ai_laws/syndicate_override - set_zeroth_law("Only [H.real_name] and people he designates as being such are Syndicate Agents.") + set_zeroth_law("Only [H.real_name] and people [H.real_name] designates as being such are Syndicate Agents.") to_chat(src, "Obey these laws:") laws.show_laws(src) - to_chat(src, "ALERT: [H.real_name] is your new master. Obey your new laws and his commands.") + to_chat(src, "ALERT: [H.real_name] is your new master. Obey your new laws and [H.real_name]'s commands.") return //DRONE LIFE/DEATH @@ -245,13 +254,16 @@ full_law_reset() show_laws() -/mob/living/silicon/robot/drone/proc/shut_down() - if(stat != 2) - if(emagged) - to_chat(src, "You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.") - else - to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") - death() +/mob/living/silicon/robot/drone/proc/shut_down(force=FALSE) + if(stat == 2) + return + + if(emagged && !force) + to_chat(src, "You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.") + return + + to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") + death() /mob/living/silicon/robot/drone/proc/full_law_reset() clear_supplied_laws() @@ -347,6 +359,11 @@ /mob/living/silicon/robot/drone/update_canmove(delay_action_updates = 0) . = ..() + if(emagged) + density = 1 + if(world.time - emagged_time > EMAG_TIMER) + shut_down(TRUE) + return density = 0 //this is reset every canmove update otherwise /mob/living/simple_animal/drone/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 3d95987bcf8..a1980b72fed 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -502,8 +502,6 @@ modules += new /obj/item/device/t_scanner(src) modules += new /obj/item/weapon/rpd(src) - emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src) - for(var/T in stacktypes) var/obj/item/stack/sheet/W = new T(src) W.amount = stacktypes[T] diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 74daf90fa4e..7469c2cca73 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -30,7 +30,7 @@ var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use - var/d_hud = DATA_HUD_DIAGNOSTIC //There is only one kind of diag hud + var/d_hud = DATA_HUD_DIAGNOSTIC_ADVANCED //There is only one kind of diag hud var/obj/item/device/radio/common_radio @@ -44,6 +44,12 @@ add_language("Galactic Common") init_subsystems() +/mob/living/silicon/med_hud_set_health() + return //we use a different hud + +/mob/living/silicon/med_hud_set_status() + return //we use a different hud + /mob/living/silicon/Destroy() silicon_mob_list -= src for(var/datum/alarm_handler/AH in alarm_handlers) @@ -232,8 +238,8 @@ medsensor.add_hud_to(src) /mob/living/silicon/proc/add_diag_hud() - var/datum/atom_hud/diagsensor = huds[d_hud] - diagsensor.add_hud_to(src) + for(var/datum/atom_hud/data/diagnostic/diagsensor in huds) + diagsensor.add_hud_to(src) /mob/living/silicon/proc/toggle_sensor_mode() diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 09a7a124783..bbf591ee453 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -47,7 +47,7 @@ var/frustration = 0 //Used by some bots for tracking failures to reach their target. var/base_speed = 2 //The speed at which the bot moves, or the number of times it moves per process() tick. var/turf/ai_waypoint //The end point of a bot's path, or the target location. - var/list/path = list() //List of turfs through which a bot 'steps' to reach the waypoint. + var/list/path = list() //List of turfs through which a bot 'steps' to reach the waypoint, associated with the path image, if there is one. var/pathset = 0 var/list/ignore_list = list() //List of unreachable targets for an ignore-list enabled bot to ignore. var/mode = BOT_IDLE //Standardizes the vars that indicate the bot is busy with its function. @@ -75,6 +75,7 @@ var/control_freq = BOT_FREQ // bot control frequency var/bot_filter // The radio filter the bot uses to identify itself on the network. var/bot_type = 0 //The type of bot it is, for radio control. + var/data_hud_type = DATA_HUD_DIAGNOSTIC //The type of data HUD the bot uses. Diagnostic by default. //This holds text for what the bot is mode doing, reported on the remote bot control interface. var/list/mode_name = list("In Pursuit","Preparing to Arrest", "Arresting", \ "Beginning Patrol", "Patrolling", "Summoned by PDA", \ @@ -82,7 +83,13 @@ "Responding", "Navigating to Delivery Location", "Navigating to Home", \ "Waiting for clear path", "Calculating navigation path", "Pinging beacon network", "Unable to reach destination") - hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD) //Diagnostic HUD views + var/datum/atom_hud/data/bot_path/path_hud = new /datum/atom_hud/data/bot_path() + var/path_image_icon = 'icons/obj/aibots.dmi' + var/path_image_icon_state = "path_indicator" + var/path_image_color = "#FFFFFF" + var/reset_access_timer_id + + hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD, DIAG_PATH_HUD = HUD_LIST_LIST)//Diagnostic HUD views /obj/item/device/radio/headset/bot subspace_transmission = 1 @@ -130,6 +137,7 @@ /mob/living/simple_animal/bot/New() ..() + bots_list += src icon_living = icon_state icon_dead = icon_state access_card = new /obj/item/weapon/card/id(src) @@ -151,14 +159,24 @@ radio_controller.add_object(bot_core, control_freq, bot_filter) prepare_huds() - var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC] - diag_hud.add_to_hud(src) + for(var/datum/atom_hud/data/diagnostic/diag_hud in huds) + diag_hud.add_to_hud(src) + diag_hud.add_hud_to(src) + permanent_huds |= diag_hud diag_hud_set_bothealth() diag_hud_set_botstat() diag_hud_set_botmode() // give us the hud too! - diag_hud.add_hud_to(src) - permanent_huds |= diag_hud + if(path_hud) + path_hud.add_to_hud(src) + path_hud.add_hud_to(src) + + +/mob/living/simple_animal/bot/med_hud_set_health() + return //we use a different hud + +/mob/living/simple_animal/bot/med_hud_set_status() + return //we use a different hud /mob/living/simple_animal/bot/update_canmove(delay_action_updates = 0) . = ..() @@ -169,6 +187,10 @@ /mob/living/simple_animal/bot/Destroy() if(paicard) ejectpai() + if(path_hud) + QDEL_NULL(path_hud) + path_hud = null + bots_list -= src QDEL_NULL(Radio) QDEL_NULL(access_card) if(radio_controller && bot_filter) @@ -446,14 +468,14 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/proc/bot_move(dest, move_speed) if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set. - path = list() + set_path(null) return 0 dest = get_turf(dest) //We must always compare turfs, so get the turf of the dest var if dest was originally something else. var/turf/last_node = get_turf(path[path.len]) //This is the turf at the end of the path, it should be equal to dest. if(get_turf(src) == dest) //We have arrived, no need to move again. return 1 else if(dest != last_node) //The path should lead us to our given destination. If this is not true, we must stop. - path = list() + set_path(null) return 0 var/step_count = move_speed ? move_speed : base_speed //If a value is passed into move_speed, use that instead of the default speed var. @@ -472,14 +494,14 @@ Pass a positive integer as an argument to override a bot's default speed. if(path.len > 1) step_towards(src, path[1]) if(get_turf(src) == path[1]) //Successful move - path -= path[1] + increment_path() tries = 0 else tries++ return 0 else if(path.len == 1) step_to(src, dest) - path = list() + set_path(null) return 1 @@ -496,7 +518,7 @@ Pass a positive integer as an argument to override a bot's default speed. var/datum/job/captain/All = new/datum/job/captain all_access.access = All.get_access() - path = get_path_to(src, waypoint, /turf/proc/Distance_cardinal, 0, 200, id=all_access) + set_path(get_path_to(src, waypoint, /turf/proc/Distance_cardinal, 0, 200, id=all_access)) calling_ai = caller //Link the AI to the bot! ai_waypoint = waypoint @@ -504,6 +526,9 @@ Pass a positive integer as an argument to override a bot's default speed. if(!on) turn_on() //Saves the AI the hassle of having to activate a bot manually. access_card = all_access //Give the bot all-access while under the AI's command. + if(client) + reset_access_timer_id = addtimer(src, "bot_reset", 600) //if the bot is player controlled, they get the extra access for a limited time + to_chat(src, "Priority waypoint set by [calling_ai] [caller]. Proceed to [end_area.name].
[path.len-1] meters to destination. You have been granted additional door access for 60 seconds.") if(message) to_chat(calling_ai, "[bicon(src)] [name] called to [end_area.name]. [path.len-1] meters to destination.") pathset = 1 @@ -513,7 +538,7 @@ Pass a positive integer as an argument to override a bot's default speed. if(message) to_chat(calling_ai, "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range.") calling_ai = null - path = list() + set_path(null) /mob/living/simple_animal/bot/proc/call_mode() //Handles preparing a bot for a call, as well as calling the move proc. //Handles the bot's movement during a call. @@ -528,7 +553,10 @@ Pass a positive integer as an argument to override a bot's default speed. if(calling_ai) //Simple notification to the AI if it called a bot. It will not know the cause or identity of the bot. to_chat(calling_ai, "Call command to a bot has been reset.") calling_ai = null - path = list() + if(reset_access_timer_id) + deltimer(reset_access_timer_id) + reset_access_timer_id = null + set_path(null) summon_target = null pathset = 0 access_card.access = prev_access @@ -593,7 +621,7 @@ Pass a positive integer as an argument to override a bot's default speed. else if(path.len > 0 && patrol_target) // valid path var/turf/next = path[1] if(next == loc) - path -= next + increment_path() return @@ -749,12 +777,12 @@ Pass a positive integer as an argument to override a bot's default speed. // given an optional turf to avoid /mob/living/simple_animal/bot/proc/calc_path(turf/avoid) check_bot_access() - path = get_path_to(src, patrol_target, /turf/proc/Distance_cardinal, 0, 120, id=access_card, exclude=avoid) + set_path(get_path_to(src, patrol_target, /turf/proc/Distance_cardinal, 0, 120, id=access_card, exclude=avoid)) /mob/living/simple_animal/bot/proc/calc_summon_path(turf/avoid) check_bot_access() spawn() - path = get_path_to(src, summon_target, /turf/proc/Distance_cardinal, 0, 150, id=access_card, exclude=avoid) + set_path(get_path_to(src, summon_target, /turf/proc/Distance_cardinal, 0, 150, id=access_card, exclude=avoid)) if(!path.len) //Cannot reach target. Give up and announce the issue. speak("Summon command failed, destination unreachable.",radio_channel) bot_reset() @@ -771,7 +799,7 @@ Pass a positive integer as an argument to override a bot's default speed. else if(path.len > 0 && summon_target) //Proper path acquired! var/turf/next = path[1] if(next == loc) - path -= next + increment_path() return var/moved = bot_move(summon_target, 3) // Move attempt @@ -1015,3 +1043,64 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/is_mechanical() return 1 + +/mob/living/simple_animal/bot/proc/set_path(list/newpath) + path = newpath ? newpath : list() + if(!path_hud) + return + var/list/path_huds_watching_me = list(huds[DATA_HUD_DIAGNOSTIC_ADVANCED]) + if(path_hud) + path_huds_watching_me += path_hud + for(var/V in path_huds_watching_me) + var/datum/atom_hud/H = V + H.remove_from_hud(src) + + var/list/path_images = hud_list[DIAG_PATH_HUD] + QDEL_LIST(path_images) + if(newpath) + for(var/i in 1 to newpath.len) + var/turf/T = newpath[i] + var/direction = NORTH + if(i > 1) + var/turf/prevT = path[i - 1] + var/image/prevI = path[prevT] + direction = get_dir(prevT, T) + if(i > 2) + var/turf/prevprevT = path[i - 2] + var/prevDir = get_dir(prevprevT, prevT) + var/mixDir = direction|prevDir + if(mixDir in diagonals) + prevI.dir = mixDir + if(prevDir & (NORTH|SOUTH)) + var/matrix/ntransform = matrix() + ntransform.Turn(90) + if((mixDir == NORTHWEST) || (mixDir == SOUTHEAST)) + ntransform.Scale(-1, 1) + else + ntransform.Scale(1, -1) + prevI.transform = ntransform + var/mutable_appearance/MA = new /mutable_appearance() + MA.icon = path_image_icon + MA.icon_state = path_image_icon_state + MA.layer = ABOVE_OPEN_TURF_LAYER + MA.plane = 0 + MA.appearance_flags = RESET_COLOR|RESET_TRANSFORM + MA.color = path_image_color + MA.dir = direction + var/image/I = image(loc = T) + I.appearance = MA + path[T] = I + path_images += I + + for(var/V in path_huds_watching_me) + var/datum/atom_hud/H = V + H.add_to_hud(src) + + +/mob/living/simple_animal/bot/proc/increment_path() + if(!path || !path.len) + return + var/image/I = path[path[1]] + if(I) + I.icon = null + path.Cut(1, 2) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 58911c4316b..9cfc4da18eb 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -17,6 +17,8 @@ window_id = "autoclean" window_name = "Automatic Station Cleaner v1.1" pass_flags = PASSMOB + path_image_color = "#993299" + var/blood = 1 var/list/target_types = list() diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 10c4abb458b..8d914ef1dcf 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -20,6 +20,8 @@ bot_core = /obj/machinery/bot_core/secbot window_id = "autoed209" window_name = "Automatic Security Unit v2.6" + path_image_color = "#FF0000" + data_hud_type = DATA_HUD_SECURITY_ADVANCED var/lastfired = 0 var/shot_delay = 3 //.3 seconds between shots diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index 40a2b1f1631..8144cd84bd6 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -17,6 +17,7 @@ bot_core = /obj/machinery/bot_core/floorbot window_id = "autofloor" window_name = "Automatic Station Floor Repairer v1.1" + path_image_color = "#FFA500" var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details. var/targetdirection diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 24df2cd7b96..73317c3a934 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -19,6 +19,8 @@ bot_core_type = /obj/machinery/bot_core/medbot window_id = "automed" window_name = "Automatic Medical Unit v1.1" + path_image_color = "#DDDDFF" + data_hud_type = DATA_HUD_MEDICAL_ADVANCED var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents. var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits. diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 6130213df27..380b301861e 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -26,6 +26,8 @@ model = "MULE" bot_purpose = "deliver crates and other packages between departments, as requested" bot_core_type = /obj/machinery/bot_core/mulebot + path_image_color = "#7F5200" + suffix = "" @@ -502,7 +504,7 @@ var/turf/next = path[1] reached_target = 0 if(next == loc) - path -= next + increment_path() return if(istype(next, /turf/simulated)) // to_chat(world, "at ([x],[y]) moving to ([next.x],[next.y])") @@ -513,7 +515,7 @@ if(moved && oldloc!=loc) // successful move // to_chat(world, "Successful move.") blockcount = 0 - path -= loc + increment_path() if(destination == home_destination) mode = BOT_GO_HOME @@ -570,7 +572,7 @@ // given an optional turf to avoid /mob/living/simple_animal/bot/mulebot/calc_path(turf/avoid = null) check_bot_access() - path = get_path_to(src, target, /turf/proc/Distance_cardinal, 0, 250, id=access_card, exclude=avoid) + set_path(get_path_to(src, target, /turf/proc/Distance_cardinal, 0, 250, id=access_card, exclude=avoid)) // sets the current destination // signals all beacons matching the delivery code diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 9c04e47521a..0d1cbe27cb5 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -18,6 +18,8 @@ bot_core_type = /obj/machinery/bot_core/secbot window_id = "autosec" window_name = "Automatic Security Unit v1.6" + path_image_color = "#FF0000" + data_hud_type = DATA_HUD_SECURITY_ADVANCED var/base_icon = "secbot" var/mob/living/carbon/target diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 07c4d2f25cd..054c94d7a25 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -490,6 +490,10 @@ Difficulty: Hard icon_state = "hierophant_telegraph_teleport" duration = 9 +/obj/effect/temp_visual/hierophant/telegraph/edge + icon_state = "hierophant_telegraph_edge" + duration = 40 + /obj/effect/temp_visual/hierophant/blast icon = 'icons/effects/effects.dmi' icon_state = "hierophant_blast" diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 0b0c44868ab..461b5193b69 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -106,19 +106,8 @@ /mob/living/simple_animal/updatehealth() ..() health = Clamp(health, 0, maxHealth) + med_hud_set_status() -/mob/living/simple_animal/handle_hud_icons_health() - ..() - if(healths && maxHealth > 0) - switch(health / maxHealth * 30) - if(30 to INFINITY) healths.icon_state = "health0" - if(26 to 29) healths.icon_state = "health1" - if(21 to 25) healths.icon_state = "health2" - if(16 to 20) healths.icon_state = "health3" - if(11 to 15) healths.icon_state = "health4" - if(6 to 10) healths.icon_state = "health5" - if(1 to 5) healths.icon_state = "health6" - if(0) healths.icon_state = "health7" /mob/living/simple_animal/proc/process_ai() handle_automated_movement() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index aa4fb41ca08..a98540b0a2d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -34,8 +34,15 @@ ..() /atom/proc/prepare_huds() + hud_list = list() for(var/hud in hud_possible) - hud_list[hud] = image('icons/mob/hud.dmi', src, "") + var/hint = hud_possible[hud] + switch(hint) + if(HUD_LIST_LIST) + hud_list[hud] = list() + else + var/image/I = image('icons/mob/hud.dmi', src, "") + hud_list[hud] = I /mob/proc/generate_name() return name diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index a3c3c72b175..ec416a14a74 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -17,26 +17,29 @@ //The byond version of these verbs wait for the next tick before acting. // instant verbs however can run mid tick or even during the time between ticks. +#define DO_MOVE(this_dir) var/final_dir = turn(this_dir, -dir2angle(dir)); Move(get_step(mob, final_dir), final_dir); + /client/verb/moveup() set name = ".moveup" set instant = 1 - Move(get_step(mob, NORTH), NORTH) + DO_MOVE(NORTH) /client/verb/movedown() set name = ".movedown" set instant = 1 - Move(get_step(mob, SOUTH), SOUTH) + DO_MOVE(SOUTH) /client/verb/moveright() set name = ".moveright" set instant = 1 - Move(get_step(mob, EAST), EAST) + DO_MOVE(EAST) /client/verb/moveleft() set name = ".moveleft" set instant = 1 - Move(get_step(mob, WEST), WEST) + DO_MOVE(WEST) +#undef DO_MOVE /client/Northeast() swap_hand() @@ -147,11 +150,12 @@ mob.control_object.forceMove(get_step(mob.control_object, direct)) return - +#define MOVEMENT_DELAY_BUFFER 0.75 +#define MOVEMENT_DELAY_BUFFER_DELTA 1.25 /client/Move(n, direct) if(world.time < move_delay) return - + var/old_move_delay = move_delay move_delay = world.time + world.tick_lag //this is here because Move() can now be called multiple times per tick if(!mob || !mob.loc) return 0 @@ -220,7 +224,11 @@ //We are now going to move moving = 1 - move_delay = mob.movement_delay() + world.time + var/delay = mob.movement_delay() + if(old_move_delay + (delay * MOVEMENT_DELAY_BUFFER_DELTA) + MOVEMENT_DELAY_BUFFER > world.time) + move_delay = old_move_delay + delay + else + move_delay = delay + world.time mob.last_movement = world.time if(locate(/obj/item/weapon/grab, mob)) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 255be518671..d070baa3766 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -982,6 +982,14 @@ icon_state = "skrell_hair_f" gender = FEMALE +/datum/sprite_accessory/hair/skrell/skr_tentacleslong + name = "Long Skrell Tentacles" + icon_state = "skrell_hair_verylong" + +/datum/sprite_accessory/hair/skrell/skr_tentaclesshort + name = "Short Skrell Tentacles" + icon_state = "skrell_hair_veryshort" + /datum/sprite_accessory/hair/skrell/skr_gold_m name = "Gold plated Skrell Male Tentacles" icon_state = "skrell_hair_m" @@ -1008,6 +1016,117 @@ gender = FEMALE secondary_theme = "cloth" +/datum/sprite_accessory/hair/skrell/skr_gclothtentacle_m + name = "Ombre Dye, Skrell Male Tentacles" + icon_state = "skrell_hair_m" + gender = MALE + secondary_theme = "gradient" + +/datum/sprite_accessory/hair/skrell/skr_gclothtentacle_f + name = "Ombre Dye, Skrell Female Tentacles" + icon_state = "skrell_hair_f" + gender = FEMALE + secondary_theme = "gradient" + +/datum/sprite_accessory/hair/skrell/skr_gclothtentacleslong + name = "Ombre Dye, Long Skrell Tentacles" + icon_state = "skrell_hair_verylong" + secondary_theme = "gradient" + +/datum/sprite_accessory/hair/skrell/skr_gclothtentaclesshort + name = "Ombre Dye, Short Skrell Tentacles" + icon_state = "skrell_hair_veryshort" + secondary_theme = "gradient" + +/datum/sprite_accessory/hair/skrell/skr_diablacktentacle_m + name = "Black headress Skrell Male Tentacles" + icon_state = "skrell_hair_m" + gender = MALE + secondary_theme = "blackdia" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_diablacktentacle_f + name = "Black headress Skrell Female Tentacles" + icon_state = "skrell_hair_f" + gender = FEMALE + secondary_theme = "blackdia" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_diablacktentacleslong + name = "Black headress Long Skrell Tentacles" + icon_state = "skrell_hair_verylong" + secondary_theme = "blackdia" + no_sec_colour = 1 + + +/datum/sprite_accessory/hair/skrell/skr_diagoldtentacle_m + name = "Gold headress Skrell Male Tentacles" + icon_state = "skrell_hair_m" + gender = MALE + secondary_theme = "golddia" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_diagoldtentacle_f + name = "Gold headress Skrell Female Tentacles" + icon_state = "skrell_hair_f" + gender = FEMALE + secondary_theme = "golddia" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_diagoldtentacleslong + name = "Gold headress Long Skrell Tentacles" + icon_state = "skrell_hair_verylong" + secondary_theme = "golddia" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_diasilvertentacle_m + name = "Silver headress Skrell Male Tentacles" + icon_state = "skrell_hair_m" + gender = MALE + secondary_theme = "silvdia" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_diasilvertentacle_f + name = "Silver headress Skrell Female Tentacles" + icon_state = "skrell_hair_f" + gender = FEMALE + secondary_theme = "silvdia" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_diasilvertentacleslong + name = "Silver headress Long Skrell Tentacles" + icon_state = "skrell_hair_verylong" + secondary_theme = "silvdia" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_festivetentacle_m + name = "Festive headress Skrell Male Tentacles" + icon_state = "skrell_hair_m" + gender = MALE + secondary_theme = "fest" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_festivetentacle_f + name = "Festive headress Skrell Female Tentacles" + icon_state = "skrell_hair_f" + gender = FEMALE + secondary_theme = "fest" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_festivetentacleslong + name = "Festive headress Long Skrell Tentacles" + icon_state = "skrell_hair_verylong" + secondary_theme = "fest" + no_sec_colour = 1 + +/datum/sprite_accessory/hair/skrell/skr_festivetentaclesshort + name = "Festive headress Short Skrell Tentacles" + icon_state = "skrell_hair_veryshort" + secondary_theme = "fest" + no_sec_colour = 1 + +//Tajaran styles + /datum/sprite_accessory/hair/tajara species_allowed = list("Tajaran") glasses_over = 1 @@ -1064,6 +1183,11 @@ icon_state = "hair_curly" glasses_over = null +/datum/sprite_accessory/hair/tajara/taj_hair_bedhead + name = "Tajara bedhead" + icon_state = "hair_tbedhead" + glasses_over = null + /datum/sprite_accessory/hair/tajara/taj_hair_retro name = "Tajaran Ladies' Retro" icon_state = "hair_ladies_retro" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 121f47a9e9e..34a447306db 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -239,6 +239,7 @@ \[list\] - \[/list\] : A list.
\[*\] : A dot used for lists.
\[hr\] : Adds a horizontal rule. + \[time\] : Inserts the current station time in HH:MM:SS.