+ Pan Gezenan Federation Navy Bolide-Class Lander
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT:
+ "}
+
+/obj/item/paper/fluff/ship/bolide/one
+ name = "Official Briefing"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+
logo here (one day)
+
+ Pan Gezenan Federation Navy Office of Naval Deployment
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT: Briefing Crew of Vessel
+
+
+
1. The Office of Naval Deployment has seen fit to deploy you in command of an Elated Bolide class Frigate Assault Lander (Bolide-Class). Congratulations on your assignment. You are expected to coordinate with the Marine Lieutenant assigned to the vessel for the duration of this deployment.
+
2. A Bolide-class Lander's mission profile is traditionally; landing in occupied regions, planetary assault in contested systems, construction of Navy Infrastructure, assistance of CLIP colonists, and aiding in conducting Federation Readiness Drills.
+
3. The assignment issued to your vessel is as follows: Identify locations of interest, construct infrastructure, avoid non-decisive confrontations, conduct readiness drills if possible. Deviation from these goals is accepted and expected. Failure to meet any of them will result in an investigatory effort on your command.
+
4. The Office Of Naval Deployment directs that it is supplied with the following: Reports on construction projects, reports on conflict in area, reports on crew readiness. Failure to supply pertinent reports in a timely fashion will lead to termination of your command.
+
5. The Office Of Naval Deployment directs that you coordinate with the Marine Lieutenant to ensure a chain of command is followed aboard at all times. The Office recommends assigning 'buddies' to risk-prone marines, assigning 'Team Leaders' to watch over any group of more than 3, and ensuring radio contact at all times.
+
6. The Office recommends that all other documents in this folder are read, and distributed to the crew as necessary.
+
+
+
+
+
+ Eutei-Tar
+ Eutei-Tar
+ Vice Admiral, PGF Navy
+ Assistant Director Of the Office Of Navy Deployment
+ Pan Gezenan Federation Navy Office Of Requisitions
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT: Safe storage of explosive materials
+
+
+
1. The Office of Requisition has seen fit to deploy your command with a complement of explosive compounds. These compounds include - Composition C-4, Composition X-4.
+
2. Composition C-4 is an dense explosive package composed of; RDX, Plastic binders, plasticizer. Composition C-4 is a stable, malleable explosive meant for demolition usage. It is resistant to detonation from gunshots and jostling. The C-4 charges you have been issued include a detonator in their assembly, and should not be tinkered with by untrained hands.
+
3. Ensure that any usage of Composition C-4 is monitored and controlled. Do not issue Composition c-4 to your vessel without a cause for such.
+
4. Composition X-4 is a high powered explosive package composed of an RDX filling mixed with a teslium based detonator, allowing for a far more focused explosion. Unless the casing has degraded, it is safe to handle in the same manner as Composition C-4.
+
5. Take care in assigning usage of Composition X-4 due to it's increased potency. While focused, an injury resulting from being caught in a blast would likely prove fatal.
+
6. The Office recommends assigning a trained expert to monitor field usage of explosives.
+ Pan Gezenan Federation Navy Office Of Personnel
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT: Prevention of Inappropriate Relationships.
+
+
+
The Office of Personnel recommends that the captain of any PGFN vessel keep an active eye out for inappropriate relationships in the ranks.
+
Inappropriate relationships are a relationship that fulfills one of the following criteria; Compromises the integrity of supervisory authority, causes unfairness, involves improper use of rank or position for personal gain, gives the perception that it is exploitive or coercive in nature, can create an adverse effect on good order and discipline or mission accomplishment.
+
As an officer, behaviors to avoid including enlisted in are; business matters, gambling, dating, sharing living accomodations.
+
Actual or percieved, these activities are prohibited. If it looks wrong, it's probably wrong.
+ Pan Gezenan Federation Navy Office Of Personnel
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT: Chain of Command aboard vessel.
+
+
+
The Office of Personnel recommends that the Captain of a PGFN vessel in deployment establish a chain of command that encompasses all crew aboard the vessel.
+
The ranks of all serving members aboard a vessel creates a natural chain of command for the Captain and any other officers to base any further Chain Of Command alterations upon. It should be stressed that a Captain should avoid issuing field promotions to fulfill an artifical chain of command.
+
A Captain should discuss any change in chain of command with any other officers aboard before putting it into action. This allows multiple opinions to be fed into the process, thus creating a stronger product.
+
Aboard a Bolide-Class Lander, the Office of Personnel recommends that the captain designate one 'team leader' per three marines aboard. These team leaders should report directly to the Marine Lieutenant, They should be reported to by the two marines in their team. It is not suggested to work the naval engineers into this program, as they are not expected to deploy in combat.
+
Marines should be made aware that being declared team leader carries no authority unless delegated. In the event of a conflicted chain of command, or contested order, the figure with rank should be obeyed.
+
This Office recommends monitoring marines for behavioral patterns before assigning a team leader. The ideal marine team leader is cool-headed, rational, and able to make tough choices.
+
+
+
+ "}
+
diff --git a/code/game/MapData/shuttles/pgf_woeful_cthonian.dm b/code/game/MapData/shuttles/pgf_woeful_cthonian.dm
new file mode 100644
index 000000000000..cffb8229e36c
--- /dev/null
+++ b/code/game/MapData/shuttles/pgf_woeful_cthonian.dm
@@ -0,0 +1,69 @@
+/obj/item/storage/backpack/satchel/flat/cthonian/PopulateContents()
+ new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/food/drinks/bottle/rum(src)
+ new /obj/item/reagent_containers/food/drinks/bottle/absinthe(src)
+
+/obj/item/paper/fluff/ship/cthonian
+ name = "Blank Federated Navy Paperwork"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+
logo here (one day)
+
+ Pan Gezenan Federation Navy Bolide-Class Lander
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT:
+ "}
+
+/obj/item/paper/fluff/ship/cthonian/one
+ name = "Official Briefing"
+ default_raw_text = {"
+
+
+
+
+
+
+
+
+
logo here (one day)
+
+ Pan Gezenan Federation Navy Office of Naval Deployment
+
+
XX - XX - 506
+
+
+
+
+
FOR IMMEDIATE DISTRIBUTION
+ SUBJECT: Briefing Crew of Vessel
+
+
+
1. The Office of Naval Deployment has seen fit to deploy you in command of an Woeful Cthonian class Patrol Cutter. Congratulations on your assignment. Due to the small size of this vessel, it is possible that it is your first command. If this is the case, the Office Of Naval Deployment recommends christening your vessel with the provided bottle of champagne.
+
2. A Cthonian-class Cutter's mission profile is traditionally; Patrol in contested and claimed space, assisting in CLIP anti-piracy operations, intercepting smugglers and other individual suspected of breaking the laws of the Federation, and providing information for larger vessels.
+
3. The assignment issued to your vessel is as follows: Assume a standard "contested space" patrol within the system you are operating in. Maintain stand-off relations with other states unless ordered by a higher authority. Engage and destroy pirates within the system whenever possible.
+
4. The Office Of Naval Deployment directs that it is supplied with the following: reports on pirate hideouts in system, reports on conflict in area, reports on nations in area. Failure to supply pertinent reports in a timely fashion will lead to investigation of your command.
+
+
+
+
+
+ Eutei-Tar
+ Eutei-Tar
+ Vice Admiral, PGF Navy
+ Assistant Director Of the Office Of Navy Deployment
+
+ "}
diff --git a/code/game/MapData/shuttles/srm_elder.dm b/code/game/MapData/shuttles/srm_elder.dm
index 97805731ec2f..453767e4394a 100644
--- a/code/game/MapData/shuttles/srm_elder.dm
+++ b/code/game/MapData/shuttles/srm_elder.dm
@@ -1,15 +1,12 @@
-/obj/item/melee/transforming/cleaving_saw/old
+/obj/item/melee/cleaving_saw/old
name = "old cleaving saw"
desc = "This saw, old and rusted, is still an effective tool at bleeding beasts and monsters."
force = 10
- force_on = 15 //force when active
+ active_force = 15 //force when active
throwforce = 15
- throwforce_on = 15
- faction_bonus_force = 5
- nemesis_factions = list("mining", "boss")
+ active_throwforce = 15
bleed_stacks_per_hit = 1.5
-
/obj/structure/closet/secure_closet/medicalsrm
name = "hunter doctor closet"
desc = "Everything the Hunter Doctor needs to heal the hurting masses."
diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm
index 53ccc590c72a..5f0db1fc93bc 100644
--- a/code/game/area/areas/away_content.dm
+++ b/code/game/area/areas/away_content.dm
@@ -1,33 +1,5 @@
-/*
-Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
-*/
-
-
-// Away Missions
-/area/awaymission
- name = "Strange Location"
- icon_state = "away"
- has_gravity = STANDARD_GRAVITY
- ambientsounds = AWAY_MISSION
- sound_environment = SOUND_ENVIRONMENT_ROOM
-
-/area/awaymission/beach
- name = "Beach"
- icon_state = "away"
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
- requires_power = FALSE
- has_gravity = STANDARD_GRAVITY
- ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambinice.ogg')
-
-/area/awaymission/errorroom
+/area/errorroom
name = "Super Secret Room"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
has_gravity = STANDARD_GRAVITY
-/area/awaymission/vr
- name = "Virtual Reality"
- icon_state = "awaycontent1"
- requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
- var/pacifist = TRUE // if when you enter this zone, you become a pacifist or not
- var/death = FALSE // if when you enter this zone, you die
diff --git a/code/game/area/areas/ruins/sandplanet.dm b/code/game/area/areas/ruins/sandplanet.dm
index e3a93b58e065..3dd26e967875 100644
--- a/code/game/area/areas/ruins/sandplanet.dm
+++ b/code/game/area/areas/ruins/sandplanet.dm
@@ -2,10 +2,12 @@
//whitesands surface camp saloon
+//saloon ruin
/area/ruin/whitesands/saloon
name = "Hermit Saloon"
icon_state = "green"
+//the pubby slop crash
/area/ruin/whitesands/pubbycrash
name = "Pubby-Class Wreckage"
icon_state = "bluenew"
@@ -17,3 +19,35 @@
/area/ruin/whitesands/pubbycrash/split
name = "Pubby-Class Chunk"
icon_state = "red"
+
+//e-11 manufactory
+/area/ruin/whitesands/e11manufactory
+ name = "Eoehoma Firearms Assembly Line"
+ icon_state = "mining_production"
+
+/area/ruin/whitesands/e11manufactory/warehouse
+ name = "Eoehoma Firearms Warehouse"
+ icon_state = "storage"
+
+/area/ruin/whitesands/e11manufactory/mats
+ name = "Eoehoma Firearms Material Storage"
+ icon_state = "auxstorage"
+
+/area/ruin/whitesands/e11manufactory/security
+ name = "Eoehoma Firearms Security Office"
+ icon_state = "security"
+
+/area/ruin/whitesands/e11manufactory/barracks
+ name = "Eoehoma Firearms Worker Barracks"
+ icon_state = "crew_quarters"
+
+/area/ruin/whitesands/e11manufactory/office
+ name = "Eoehoma Firearms Management Offices"
+ icon_state = "quartoffice"
+
+//cave base
+/area/ruin/whitesands/cave_base
+ name = "Abandoned Facility"
+ icon_state = "bluenew"
+
+/area/ruin/whitesands/cave_base/engi
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 7a1f7a36283a..73629ea1484f 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -1221,7 +1221,7 @@
//Returns an atom's power cell, if it has one. Overload for individual items.
/atom/movable/proc/get_cell()
- return
+ return null
/atom/movable/proc/can_be_pulled(user, grab_state, force)
if(src == user || !isturf(loc))
diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm
index a3226e864aa7..6dceae3a38dd 100644
--- a/code/game/gamemodes/clown_ops/clown_weapons.dm
+++ b/code/game/gamemodes/clown_ops/clown_weapons.dm
@@ -12,60 +12,59 @@
//BANANIUM SWORD
-/obj/item/melee/transforming/energy/sword/bananium
+/obj/item/melee/energy/sword/bananium
name = "bananium sword"
desc = "An elegant weapon, for a more civilized age."
force = 0
throwforce = 0
- force_on = 0
- throwforce_on = 0
+ active_force = 0
+ active_throwforce = 0
hitsound = null
attack_verb_on = list("slipped")
- clumsy_check = FALSE
sharpness = IS_BLUNT
sword_color = "yellow"
heat = 0
light_color = COLOR_YELLOW
var/next_trombone_allowed = 0
-/obj/item/melee/transforming/energy/sword/bananium/Initialize()
+/obj/item/melee/energy/sword/bananium/Initialize()
. = ..()
adjust_slipperiness()
/* Adds or removes a slippery component, depending on whether the sword
* is active or not.
*/
-/obj/item/melee/transforming/energy/sword/proc/adjust_slipperiness()
- if(active)
+/obj/item/melee/energy/sword/proc/adjust_slipperiness()
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
AddComponent(/datum/component/slippery, 60, GALOSHES_DONT_HELP)
else
qdel(GetComponent(/datum/component/slippery))
-/obj/item/melee/transforming/energy/sword/bananium/attack(mob/living/M, mob/living/user)
+/obj/item/melee/energy/sword/bananium/attack(mob/living/M, mob/living/user)
..()
- if(active)
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
slipper.Slip(src, M)
-/obj/item/melee/transforming/energy/sword/bananium/throw_impact(atom/hit_atom, throwingdatum)
+/obj/item/melee/energy/sword/bananium/throw_impact(atom/hit_atom, throwingdatum)
. = ..()
- if(active)
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
slipper.Slip(src, hit_atom)
-/obj/item/melee/transforming/energy/sword/bananium/attackby(obj/item/I, mob/living/user, params)
- if((world.time > next_trombone_allowed) && istype(I, /obj/item/melee/transforming/energy/sword/bananium))
+/obj/item/melee/energy/sword/bananium/attackby(obj/item/I, mob/living/user, params)
+ if((world.time > next_trombone_allowed) && istype(I, /obj/item/melee/energy/sword/bananium))
next_trombone_allowed = world.time + 50
to_chat(user, "You slap the two swords together. Sadly, they do not seem to fit!")
playsound(src, 'sound/misc/sadtrombone.ogg', 50)
return TRUE
return ..()
-/obj/item/melee/transforming/energy/sword/bananium/transform_weapon(mob/living/user, supress_message_text)
+/obj/item/melee/energy/sword/bananium/on_transform(obj/item/source, mob/user, active)
. = ..()
adjust_slipperiness()
-/obj/item/melee/transforming/energy/sword/bananium/ignition_effect(atom/A, mob/user)
+/obj/item/melee/energy/sword/bananium/ignition_effect(atom/A, mob/user)
return ""
//BANANIUM SHIELD
diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm
index 83f3e366e8a3..cdcccc307a85 100644
--- a/code/game/machinery/bank_machine.dm
+++ b/code/game/machinery/bank_machine.dm
@@ -33,7 +33,7 @@
if(value)
var/datum/bank_account/ship_account = ship_account_ref.resolve()
if(ship_account)
- ship_account.adjust_money(value, "deposit")
+ ship_account.adjust_money(value, CREDIT_LOG_DEPOSIT)
to_chat(user, "You deposit [I]. The [ship_account.account_holder] Budget is now [ship_account.account_balance] cr.")
qdel(I)
return
@@ -53,7 +53,7 @@
playsound(src, 'sound/items/poster_being_created.ogg', 100, TRUE)
syphoning_credits += 200
- ship_account.adjust_money(-200)
+ ship_account.adjust_money(-200, "siphon")
if(next_warning < world.time && prob(15))
var/area/A = get_area(loc)
var/message = "Unauthorized credit withdrawal underway in [initial(A.name)]!!"
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 0e6bc6ed6a6d..f5d4959083dc 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -237,7 +237,7 @@ Possible to do for anyone motivated enough:
for(var/I in holo_calls)
var/datum/holocall/HC = I
var/list/call_data = list(
- caller = HC.user,
+ caller = HC.caller_location,
connected = HC.connected_holopad == src ? TRUE : FALSE,
ref = REF(HC)
)
@@ -378,7 +378,7 @@ Possible to do for anyone motivated enough:
for(var/I in holo_calls)
var/datum/holocall/HC = I
if(HC.connected_holopad != src)
- caller_history = get_area_name(HC.calling_holopad)
+ caller_history = HC.caller_location
if(force_answer_call && world.time > (HC.call_start_time + (HOLOPAD_MAX_DIAL_TIME / 2)))
HC.Answer(src)
break
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index 5d89f33549d3..3a072fc59d72 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -844,10 +844,6 @@ DEFINE_BITFIELD(turret_flags, list(
stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
desc = "A ballistic machine gun auto-turret."
-/* Colonial League turrets */
-/obj/machinery/porta_turret/ship/ballistic/clip
- faction = list(FACTION_PLAYER_MINUTEMAN, "turret")
-
//high rof, range, faster projectile speed
/* 'Nanotrasen' turrets */
@@ -1011,12 +1007,59 @@ DEFINE_BITFIELD(turret_flags, list(
/obj/machinery/porta_turret/ship/pgf/heavy
name = "Etherbor Point-Defense System"
desc = "A high-powered defensive turret manufactured by Etherbor. The EPDS contains heavy energy weapons linked in tandem."
- scan_range = 10
+ scan_range = 12
stun_projectile = /obj/projectile/beam/hitscan/disabler/heavy
stun_projectile_sound = 'sound/weapons/gun/energy/kalixpistol.ogg'
lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf/sniper //fwoom
lethal_projectile_sound = 'sound/weapons/gun/laser/heavy_laser.ogg'
+///CLIP Turrets
+
+//high damage low range
+
+/obj/machinery/porta_turret/ship/clip
+ name = "Clover Mintaka"
+ desc = "Clover Photonic's offering for the Confederated League's 476FS \"Defense System\" competition, the Mintaka (and its sister systems, the Alnitak and Ori) handily beat out the Lunatex \"Vigil\" line during the final round of testing, and earned a prestigous contract."
+ faction = list(FACTION_PLAYER_MINUTEMAN, "Turret")
+ stun_projectile = /obj/projectile/beam/disabler
+ stun_projectile_sound = 'sound/weapons/gun/laser/e-fire.ogg'
+ lethal_projectile = /obj/projectile/beam/laser/assault
+ lethal_projectile_sound = 'sound/weapons/gun/laser/e-fire.ogg'
+ icon_state = "standard_lethal"
+ base_icon_state = "standard"
+
+ scan_range = 8
+ shot_delay = 10
+ max_integrity = 200
+ integrity_failure = 0.3
+
+/obj/machinery/porta_turret/ship/clip/light
+ name = "Clover Alnitak"
+ desc = "Clover Photonic's light turret system, unveiled as part of Clover's defense line-up in the early 470s. While lacking the punch of its sister systems, it still presents a hassle to circumvent."
+ stun_projectile = /obj/projectile/beam/disabler
+ stun_projectile_sound = 'sound/weapons/gun/laser/e-fire.ogg'
+ lethal_projectile = /obj/projectile/beam/laser/light
+ lethal_projectile_sound = 'sound/weapons/gun/laser/e-fire.ogg'
+
+ scan_range = 6
+ shot_delay = 10
+ max_integrity = 200
+ integrity_failure = 0.4
+
+/obj/machinery/porta_turret/ship/clip/heavy
+ name = "Clover Ori"
+ desc = "Clover Photonic's heaviest entry in the Confederated League's 476FS \"Defense System\" competition, the Ori's results demolished the handily beat out the Lunatex \"Vigil Sword\" during testing, earning better marks on durability, effectiveness, and reaction rate."
+ stun_projectile = /obj/projectile/beam/disabler
+ stun_projectile_sound = 'sound/weapons/gun/laser/e-fire.ogg'
+ lethal_projectile = /obj/projectile/beam/laser/heavylaser/assault
+ lethal_projectile_sound = 'sound/weapons/gun/laser/e40_las.ogg'
+
+ scan_range = 10
+ shot_delay = 20
+ max_integrity = 300
+ integrity_failure = 0.3
+
+
/// Frontiersmen Turrets
// fast and spitty
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 1e1718623816..a008822e8f08 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -3,7 +3,7 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "recharger"
base_icon_state = "recharger"
- desc = "A charging dock for energy based weaponry."
+ desc = "A charging dock for energy based weaponry. However someones modified it to work with most things with cells."
use_power = IDLE_POWER_USE
idle_power_usage = IDLE_DRAW_MINIMAL
active_power_usage = ACTIVE_DRAW_LOW
@@ -74,7 +74,7 @@
G.play_tool_sound(src)
return
- var/allowed = is_type_in_typecache(G, allowed_devices)
+ var/allowed = G.get_cell()
if(allowed)
if(anchored)
diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm
index a36bf79a41b3..098cd5ea3868 100644
--- a/code/game/machinery/roulette_machine.dm
+++ b/code/game/machinery/roulette_machine.dm
@@ -235,7 +235,7 @@
var/remaining_payout = payout
- my_card.registered_account.adjust_money(-payout)
+ my_card.registered_account.adjust_money(-payout, CREDIT_LOG_WITHDRAW)
for(var/cash_type in cash_values) //Loop through all bundles from most valuable to least valuable. Try to give as much of that bundle as possible until you can't anymore, then move to the next.
var/value = cash_values[cash_type] //Change this to use initial value once we change to the right bundle
diff --git a/code/game/machinery/shuttle/shuttle_heater.dm b/code/game/machinery/shuttle/shuttle_heater.dm
index f8fa1d1ef786..d2e3c0519fb0 100644
--- a/code/game/machinery/shuttle/shuttle_heater.dm
+++ b/code/game/machinery/shuttle/shuttle_heater.dm
@@ -360,8 +360,6 @@
// adds each oxidizer's power to the total oxidation max
if(GAS_O2)
oxidation_power += O2_OXIDATION_VALUE * gas_amount
- if(GAS_NITRYL)
- oxidation_power += NITRYL_OXIDATION_VALUE * gas_amount
if(GAS_NITROUS) //burning nitrous cools down the heater's main tank, just like it cools the intake on real cars.
oxidation_power += NITROUS_OXIDATION_VALUE * gas_amount
var/heat_capacity = gas_amount * NITROUS_COOLING_MULTIPIER
diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm
index d9f927a7c355..b1a588f9c6fb 100644
--- a/code/game/machinery/telecomms/machines/message_server.dm
+++ b/code/game/machinery/telecomms/machines/message_server.dm
@@ -16,10 +16,13 @@
active_power_usage = ACTIVE_DRAW_MINIMAL
armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
var/obj/item/stored
+ var/empty = FALSE
/obj/machinery/blackbox_recorder/Initialize()
. = ..()
- stored = new /obj/item/blackbox(src)
+ if(!empty)
+ stored = new /obj/item/blackbox(src)
+ update_appearance()
/obj/machinery/blackbox_recorder/attack_hand(mob/living/user)
. = ..()
diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
index a2ec15e5022f..1309d8f8fc7d 100644
--- a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
+++ b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
@@ -126,6 +126,7 @@ TURF_DECAL_COLOR_HELPER(opaque/green, COLOR_GREEN_GRAY, 255)
TURF_DECAL_COLOR_HELPER(opaque/lime, COLOR_PALE_GREEN_GRAY, 255)
TURF_DECAL_COLOR_HELPER(opaque/yellow, COLOR_BROWN, 255)
TURF_DECAL_COLOR_HELPER(opaque/beige, COLOR_BEIGE, 255)
+TURF_DECAL_COLOR_HELPER(opaque/tan, "#c59973", 255)
TURF_DECAL_COLOR_HELPER(opaque/red, COLOR_RED_GRAY, 255)
TURF_DECAL_COLOR_HELPER(opaque/bar, "#791500", 255)
TURF_DECAL_COLOR_HELPER(opaque/pink, COLOR_PALE_RED_GRAY, 255)
@@ -144,6 +145,7 @@ TURF_DECAL_COLOR_HELPER(opaque/solgovblue, "#2d2a4e", 255)
TURF_DECAL_COLOR_HELPER(opaque/solgovgold, "#eeac2e", 255)
TURF_DECAL_COLOR_HELPER(opaque/syndiered, "#730622", 255)
TURF_DECAL_COLOR_HELPER(opaque/inteqbrown, "#4b2a18", 255)
+TURF_DECAL_COLOR_HELPER(opaque/cybersunteal, "#4C9C9C", 255)
//transparent
TURF_DECAL_COLOR_HELPER(transparent/neutral, null, 75)
@@ -153,6 +155,7 @@ TURF_DECAL_COLOR_HELPER(transparent/green, COLOR_GREEN_GRAY, 140)
TURF_DECAL_COLOR_HELPER(transparent/lime, COLOR_PALE_GREEN_GRAY, 140)
TURF_DECAL_COLOR_HELPER(transparent/yellow, COLOR_BROWN, 140)
TURF_DECAL_COLOR_HELPER(transparent/beige, COLOR_BEIGE, 140)
+TURF_DECAL_COLOR_HELPER(transparent/tan, "#c59973", 140)
TURF_DECAL_COLOR_HELPER(transparent/red, COLOR_RED_GRAY, 140)
TURF_DECAL_COLOR_HELPER(transparent/bar, "#791500", 130)
TURF_DECAL_COLOR_HELPER(transparent/pink, COLOR_PALE_RED_GRAY, 140)
@@ -171,6 +174,7 @@ TURF_DECAL_COLOR_HELPER(transparent/solgovblue, "#2d2a4e", 140)
TURF_DECAL_COLOR_HELPER(transparent/solgovgold, "#eeac2e", 140)
TURF_DECAL_COLOR_HELPER(transparent/syndiered, "#730622", 140)
TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
+TURF_DECAL_COLOR_HELPER(transparent/cybersunteal, "#4C9C9C", 140)
/obj/effect/turf_decal/spline/plain
icon_state = "spline_plain"
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index f880b95497c4..dc9c7bcd6855 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -16,8 +16,8 @@
var/spreadIntoAdjacentChance = 60
var/obj/item/seeds/myseed = /obj/item/seeds/glowshroom
var/static/list/blacklisted_glowshroom_turfs = typecacheof(list(
- /turf/open/lava,
- /turf/open/floor/plating/beach/water))
+ /turf/open/lava
+ ))
/obj/structure/glowshroom/glowcap
name = "glowcap"
diff --git a/code/game/objects/effects/spawners/random.dm/salvaging.dm b/code/game/objects/effects/spawners/random.dm/salvaging.dm
index 66543e3ef47a..9a6f4571a35e 100644
--- a/code/game/objects/effects/spawners/random.dm/salvaging.dm
+++ b/code/game/objects/effects/spawners/random.dm/salvaging.dm
@@ -45,7 +45,7 @@
icon_state = "laser_gun"
loot = list(
/obj/item/gun/energy/lasercannon = 1,
- /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 1,
+ /obj/item/gun/ballistic/automatic/smg/skm_carbine/saber = 1,
/obj/item/gun/energy/temperature/security = 1,
)
diff --git a/code/game/objects/effects/spawners/random.dm/waste_planet.dm b/code/game/objects/effects/spawners/random.dm/waste_planet.dm
index 46ad61a754a6..22618dada63d 100644
--- a/code/game/objects/effects/spawners/random.dm/waste_planet.dm
+++ b/code/game/objects/effects/spawners/random.dm/waste_planet.dm
@@ -62,7 +62,7 @@
/obj/effect/spawner/random/waste/atmos_can/rare
loot = list(
/obj/machinery/portable_atmospherics/canister/tritium = 3,
- /obj/machinery/portable_atmospherics/canister/pluoxium = 3
+ /obj/machinery/portable_atmospherics/canister/methane = 3
)
/obj/effect/spawner/random/waste/salvageable
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 3f7a43fe317b..46d2634bbe8d 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -523,8 +523,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
playsound(src, 'sound/weapons/effects/deflect.ogg', 100)
if(!istype(src, /obj/item/shield))
COOLDOWN_START(src, block_cooldown, block_cooldown_time)
- return 1
- return 0
+ return TRUE
+ return FALSE
/obj/item/proc/talk_into(mob/M, input, channel, spans, datum/language/language, list/message_mods)
return ITALICS | REDUCE_RANGE
@@ -1204,6 +1204,18 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
/// Whether or not this item can be put into a storage item through attackby
/obj/item/proc/attackby_storage_insert(datum/storage, atom/storage_holder, mob/user)
return TRUE
+
+/obj/item/proc/update_weight_class(new_w_class)
+ if(w_class == new_w_class)
+ return FALSE
+
+ var/old_w_class = w_class
+ w_class = new_w_class
+ SEND_SIGNAL(src, COMSIG_ITEM_WEIGHT_CLASS_CHANGED, old_w_class, new_w_class)
+ if(!isnull(loc))
+ SEND_SIGNAL(loc, COMSIG_ATOM_CONTENTS_WEIGHT_CLASS_CHANGED, src, old_w_class, new_w_class)
+ return TRUE
+
/// How many different types of mats will be counted in a bite?
#define MAX_MATS_PER_BITE 2
diff --git a/code/game/objects/items/attachments/energy_bayonet.dm b/code/game/objects/items/attachments/energy_bayonet.dm
new file mode 100644
index 000000000000..d3f442fa3ab6
--- /dev/null
+++ b/code/game/objects/items/attachments/energy_bayonet.dm
@@ -0,0 +1,44 @@
+/obj/item/attachment/energy_bayonet
+ name = "energy bayonet"
+ desc = "Stabby-Stabby"
+ icon_state = "ebayonet"
+ force = 3
+ throwforce = 2
+ pickup_sound = 'sound/items/handling/knife1_pickup.ogg'
+ drop_sound = 'sound/items/handling/knife3_drop.ogg'
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ sharpness = IS_BLUNT
+ slot = ATTACHMENT_SLOT_MUZZLE
+ attach_features_flags = ATTACH_TOGGLE
+
+ light_range = 2
+ light_power = 0.6
+ light_on = FALSE
+ light_color = COLOR_MOSTLY_PURE_RED
+ light_system = MOVABLE_LIGHT
+
+ toggle_on_sound = 'sound/weapons/saberon.ogg'
+ toggle_off_sound = 'sound/weapons/saberoff.ogg'
+
+ pixel_shift_x = 1
+ pixel_shift_y = 4
+ spread_mod = 1
+ wield_delay = 0.2 SECONDS
+
+/obj/item/attachment/energy_bayonet/on_preattack(obj/item/gun/gun, atom/target, mob/living/user, list/params)
+ if(user.a_intent == INTENT_HARM && user.CanReach(target, src, TRUE) && toggled != 0)
+ melee_attack_chain(user, target, params)
+ return COMPONENT_NO_ATTACK
+
+
+/obj/item/attachment/energy_bayonet/toggle_attachment(obj/item/gun/gun, mob/user)
+ . = ..()
+ set_light_on(toggled)
+ update_icon()
+ sharpness = toggled ? IS_SHARP_ACCURATE : IS_BLUNT
+ force = toggled ? 19 : 3
+ throwforce = toggled ? 14 : 2
+
+/obj/item/attachment/energy_bayonet/attack_self(mob/user)
+ toggle_attachment()
diff --git a/code/game/objects/items/bank_card.dm b/code/game/objects/items/bank_card.dm
index 4a7f2f9d2f21..ecc418030008 100644
--- a/code/game/objects/items/bank_card.dm
+++ b/code/game/objects/items/bank_card.dm
@@ -47,7 +47,7 @@
to_chat(user, "[src] doesn't have a linked account to deposit [I] into!")
return
- registered_account.adjust_money(cash_money)
+ registered_account.adjust_money(cash_money, CREDIT_LOG_DEPOSIT)
SSblackbox.record_feedback("amount", "credits_inserted", cash_money)
log_econ("[cash_money] credits were inserted into [src] owned by [src.registered_name]")
if(physical_currency)
@@ -69,7 +69,7 @@
total += cash_money
- registered_account.adjust_money(cash_money)
+ registered_account.adjust_money(cash_money, CREDIT_LOG_DEPOSIT)
SSblackbox.record_feedback("amount", "credits_inserted", total)
log_econ("[total] credits were inserted into [src] owned by [src.registered_name]")
QDEL_LIST(money)
@@ -132,7 +132,7 @@
return
if(!alt_click_can_use_id(user))
return
- if(registered_account.adjust_money(-amount_to_remove))
+ if(registered_account.adjust_money(-amount_to_remove, CREDIT_LOG_WITHDRAW))
var/obj/item/holochip/holochip = new (user.drop_location(), amount_to_remove)
user.put_in_hands(holochip)
to_chat(user, "You withdraw [amount_to_remove] credits into a holochip.")
diff --git a/code/game/objects/items/desk_flags.dm b/code/game/objects/items/desk_flags.dm
index c1af9cfe6c3f..5f0d76eee5a0 100644
--- a/code/game/objects/items/desk_flags.dm
+++ b/code/game/objects/items/desk_flags.dm
@@ -35,3 +35,8 @@
name = "SUNS desk flag"
desc = "A little desk decoration in the gold and purple color palette of SUNS."
icon_state = "suns"
+
+/obj/item/desk_flag/ngr
+ name = "new gorlexian desk flag"
+ desc = "The crimson, black, and tan flag of the New Gorlex Republic."
+ icon_state = "ngr"
diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm
index e7e78abb4abc..c58d4223ca3c 100644
--- a/code/game/objects/items/documents.dm
+++ b/code/game/objects/items/documents.dm
@@ -54,6 +54,10 @@
desc = "\"Top Secret\" documents belonging to the Second Battlegroup of New Gorlex Republic. They are filled with sensitive operational intelligence. These documents are verified with a red wax seal."
icon_state = "docs_red"
+/obj/item/documents/eoehoma // For use in Eoehoma-related ruins.
+ desc = "\"Top Secret\" Eoehoma Firearms documents. Filled with weapon blueprints and eviction notices."
+ icon_state = "docs_blue"
+
/obj/item/documents/photocopy
desc = "A copy of some top-secret documents. Nobody will notice they aren't the originals... right?"
var/forgedseal = 0
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index c4cafbc8fdb9..7a21c9129ad7 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -67,7 +67,12 @@
//assembly stuff
/obj/item/grenade/c4/receive_signal()
- prime()
+ if(!active)
+ active = TRUE
+ icon_state = "[item_state]2"
+ balloon_alert_to_viewers("[src] begins ticking!")
+ addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10)
+ return
/obj/item/grenade/c4/attack_self(mob/user)
var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num|null
@@ -125,3 +130,16 @@
item_state = "plasticx4"
directional = TRUE
boom_sizes = list(0, 2, 5)
+
+
+// x-com ufo defense high ex charge 1993
+/obj/item/grenade/c4/satchel_charge
+ name = "\improper satchel charge"
+ desc = "Used to put craters into places without too much hassle. An engineer's favorite."
+ w_class = WEIGHT_CLASS_NORMAL
+ icon_state = "satchel_charge0"
+ item_state = "satchel_charge"
+ throw_range = 3
+ lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
+ boom_sizes = list(0, 3, 5)
diff --git a/code/game/objects/items/melee/chainsaw.dm b/code/game/objects/items/melee/chainsaw.dm
index d179237f8559..f0b7019200f1 100644
--- a/code/game/objects/items/melee/chainsaw.dm
+++ b/code/game/objects/items/melee/chainsaw.dm
@@ -3,13 +3,13 @@
/obj/item/chainsaw
name = "chainsaw"
desc = "A versatile power tool. Useful for limbing trees and delimbing humans."
- icon_state = "chainsaw_off"
+ icon_state = "chainsaw"
icon = 'icons/obj/weapon/axe.dmi'
lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
flags_1 = CONDUCT_1
force = 13
- var/force_on = 24
+ var/active_force = 24
w_class = WEIGHT_CLASS_HUGE
throwforce = 13
throw_speed = 2
@@ -31,8 +31,8 @@
/obj/item/chainsaw/attack_self(mob/user)
on = !on
to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr." : "the chain stops moving."]")
- force = on ? force_on : initial(force)
- throwforce = on ? force_on : initial(force)
+ force = on ? active_force : initial(force)
+ throwforce = on ? active_force : initial(force)
icon_state = "chainsaw_[on ? "on" : "off"]"
var/datum/component/butchering/butchering = src.GetComponent(/datum/component/butchering)
butchering.butchering_enabled = on
@@ -56,7 +56,7 @@
name = "THE GREAT COMMUNICATOR"
desc = "VRRRRRRR!!!"
armour_penetration = 100
- force_on = 30
+ active_force = 30
/obj/item/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(attack_type == PROJECTILE_ATTACK)
diff --git a/code/game/objects/items/melee/dualsaber.dm b/code/game/objects/items/melee/dualsaber.dm
index 28242c1006a1..1959fa81eaea 100644
--- a/code/game/objects/items/melee/dualsaber.dm
+++ b/code/game/objects/items/melee/dualsaber.dm
@@ -23,7 +23,7 @@
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
- var/w_class_on = WEIGHT_CLASS_BULKY
+ var/active_w_class = WEIGHT_CLASS_BULKY
var/saber_color = "green"
var/two_hand_force = 34
var/hacked = FALSE
@@ -43,7 +43,7 @@
to_chat(user, "You lack the grace to wield this!")
return COMPONENT_TWOHANDED_BLOCK_WIELD
sharpness = IS_SHARP
- w_class = w_class_on
+ w_class = active_w_class
hitsound = 'sound/weapons/blade1.ogg'
START_PROCESSING(SSobj, src)
set_light_on(TRUE)
@@ -128,7 +128,7 @@
return 1
/obj/item/dualsaber/ignition_effect(atom/A, mob/user)
- // same as /obj/item/melee/transforming/energy, mostly
+ // same as /obj/item/melee/energy, mostly
if(!HAS_TRAIT(src, TRAIT_WIELDED))
return ""
var/in_mouth = ""
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 34219662e53d..1985c3d7ebfa 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -1,7 +1,9 @@
-/obj/item/melee/transforming/energy
+/obj/item/melee/energy
+ sharpness = IS_SHARP
+ w_class = WEIGHT_CLASS_SMALL
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
icon = 'icons/obj/weapon/energy.dmi'
- hitsound_on = 'sound/weapons/blade1.ogg'
- heat = 3500
+ heat = 0
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
@@ -10,42 +12,81 @@
light_power = 1
light_on = FALSE
var/sword_color
-
-/obj/item/melee/transforming/energy/Initialize()
+ /// The heat given off when active.
+ var/active_heat = 3500
+
+ /// Force while active.
+ var/active_force = 30
+ /// Throwforce while active.
+ var/active_throwforce = 20
+ /// Sharpness while active.
+ var/active_sharpness = IS_SHARP
+ /// Hitsound played attacking while active.
+ var/active_hitsound = 'sound/weapons/blade1.ogg'
+ /// Weight class while active.
+ var/active_w_class = WEIGHT_CLASS_BULKY
+
+ var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/obj/item/melee/energy/Initialize(mapload)
. = ..()
- if(active)
+ AddComponent( \
+ /datum/component/transforming, \
+ force_on = active_force, \
+ throwforce_on = active_throwforce, \
+ throw_speed_on = 4, \
+ sharpness_on = active_sharpness, \
+ hitsound_on = active_hitsound, \
+ w_class_on = active_w_class, \
+ attack_verb_on = attack_verb_on, \
+ )
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
+ AddElement(/datum/element/update_icon_updates_onmob)
+ if(sharpness)
+ AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
START_PROCESSING(SSobj, src)
-/obj/item/melee/transforming/energy/Destroy()
+/obj/item/melee/energy/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/melee/transforming/energy/add_blood_DNA(list/blood_dna)
- return FALSE
+/obj/item/melee/energy/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
-/obj/item/melee/transforming/energy/get_sharpness()
- return active * sharpness
+ if(active)
+ heat = active_heat
+ START_PROCESSING(SSobj, src)
+ if(sword_color)
+ icon_state = "[base_icon_state][sword_color]"
+ else
+ heat = initial(heat)
+ STOP_PROCESSING(SSobj, src)
-/obj/item/melee/transforming/energy/process()
- open_flame()
+ tool_behaviour = (active ? TOOL_SAW : NONE) //Lets energy weapons cut trees. Also lets them do bonecutting surgery, which is kinda metal!
+ if(user)
+ balloon_alert(user, "[name] [active ? "enabled":"disabled"]")
+ playsound(src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE)
+ set_light_on(active)
+ update_appearance(UPDATE_ICON_STATE)
-/obj/item/melee/transforming/energy/transform_weapon(mob/living/user, supress_message_text)
- . = ..()
- if(.)
- if(active)
- if(sword_color)
- icon_state = "[base_icon_state][sword_color]"
- START_PROCESSING(SSobj, src)
- else
- STOP_PROCESSING(SSobj, src)
- set_light_on(active)
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
+/obj/item/melee/energy/add_blood_DNA(list/blood_dna)
+ return FALSE
+
+/obj/item/melee/energy/get_sharpness()
+ return sharpness
+/obj/item/melee/energy/process(seconds_per_tick)
+ if(heat)
+ open_flame()
-/obj/item/melee/transforming/energy/get_temperature()
- return active * heat
+/obj/item/melee/energy/get_temperature()
+ return heat
-/obj/item/melee/transforming/energy/ignition_effect(atom/A, mob/user)
- if(!active)
+/obj/item/melee/energy/ignition_effect(atom/A, mob/user)
+ if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
return ""
var/in_mouth = ""
@@ -57,28 +98,28 @@
playsound(loc, hitsound, get_clamped_volume(), TRUE, -1)
add_fingerprint(user)
-/obj/item/melee/transforming/energy/axe
+/obj/item/melee/energy/axe
name = "energy axe"
desc = "An energized battle axe."
- icon_state = "axe0"
+ icon_state = "axe"
lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/axes_righthand.dmi'
force = 40
- force_on = 150
+ active_force = 150
throwforce = 25
- throwforce_on = 30
+ active_throwforce = 30
hitsound = 'sound/weapons/bladeslice.ogg'
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
- w_class_on = WEIGHT_CLASS_HUGE
+ active_w_class = WEIGHT_CLASS_HUGE
flags_1 = CONDUCT_1
armour_penetration = 100
- attack_verb_off = list("attacked", "chopped", "cleaved", "torn", "cut")
+ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
attack_verb_on = list()
light_color = LIGHT_COLOR_LIGHT_CYAN
-/obj/item/melee/transforming/energy/sword
+/obj/item/melee/energy/sword
name = "energy sword"
desc = "For when a katana isn't enough. While Nanotrasen and the Syndicate both produce the so-called e-swords, they are visually and functionaly identical."
icon_state = "sword"
@@ -88,7 +129,7 @@
force = 3
throwforce = 5
hitsound = "swing_hit" //it starts deactivated
- attack_verb_off = list("tapped", "poked")
+ attack_verb = list("tapped", "poked")
throw_speed = 3
throw_range = 5
sharpness = IS_SHARP
@@ -96,38 +137,32 @@
armour_penetration = 35
block_chance = 50
-/obj/item/melee/transforming/energy/sword/transform_weapon(mob/living/user, supress_message_text)
- . = ..()
- if(. && active && sword_color)
- icon_state = "[base_icon_state][sword_color]"
-
-/obj/item/melee/transforming/energy/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(active)
+/obj/item/melee/energy/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
return ..()
return 0
-/obj/item/melee/transforming/energy/sword/cyborg
+/obj/item/melee/energy/sword/cyborg
sword_color = "red"
var/hitcost = 50
-/obj/item/melee/transforming/energy/sword/cyborg/attack(mob/M, mob/living/silicon/robot/R)
+/obj/item/melee/energy/sword/cyborg/attack(mob/M, mob/living/silicon/robot/R)
if(R.cell)
var/obj/item/stock_parts/cell/C = R.cell
- if(active && !(C.use(hitcost)))
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE) && !(C.use(hitcost)))
attack_self(R)
to_chat(R, "It's out of charge!")
return
return ..()
-/obj/item/melee/transforming/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs
+/obj/item/melee/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs
name = "energy saw"
desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness."
- force_on = 30
+ active_force = 30
force = 18 //About as much as a spear
hitsound = 'sound/weapons/circsawhit.ogg'
icon = 'icons/obj/surgery.dmi'
- icon_state = "esaw_0"
- icon_state_on = "esaw_1"
+ icon_state = "esaw"
sword_color = null //stops icon from breaking when turned on.
hitcost = 75 //Costs more than a standard cyborg esword
w_class = WEIGHT_CLASS_NORMAL
@@ -136,54 +171,49 @@
tool_behaviour = TOOL_SAW
toolspeed = 0.7 //faster as a saw
-/obj/item/melee/transforming/energy/sword/cyborg/saw/cyborg_unequip(mob/user)
- if(!active)
- return
- transform_weapon(user, TRUE)
-
-/obj/item/melee/transforming/energy/sword/cyborg/saw/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- return 0
+/obj/item/melee/energy/sword/cyborg/saw/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ return FALSE
-/obj/item/melee/transforming/energy/sword/saber
+/obj/item/melee/energy/sword/saber
var/list/possible_colors = list("red" = COLOR_SOFT_RED, "blue" = LIGHT_COLOR_LIGHT_CYAN, "green" = LIGHT_COLOR_GREEN, "purple" = LIGHT_COLOR_LAVENDER, "yellow" = COLOR_YELLOW)
var/hacked = FALSE
-/obj/item/melee/transforming/energy/sword/saber/Initialize(mapload)
+/obj/item/melee/energy/sword/saber/Initialize(mapload)
. = ..()
if(LAZYLEN(possible_colors))
var/set_color = pick(possible_colors)
sword_color = set_color
set_light_color(possible_colors[set_color])
-/obj/item/melee/transforming/energy/sword/saber/process()
+/obj/item/melee/energy/sword/saber/process()
. = ..()
if(hacked)
var/set_color = pick(possible_colors)
set_light_color(possible_colors[set_color])
-/obj/item/melee/transforming/energy/sword/saber/red
+/obj/item/melee/energy/sword/saber/red
possible_colors = list("red" = COLOR_SOFT_RED)
-/obj/item/melee/transforming/energy/sword/saber/blue
+/obj/item/melee/energy/sword/saber/blue
possible_colors = list("blue" = LIGHT_COLOR_LIGHT_CYAN)
-/obj/item/melee/transforming/energy/sword/saber/green
+/obj/item/melee/energy/sword/saber/green
possible_colors = list("green" = LIGHT_COLOR_GREEN)
-/obj/item/melee/transforming/energy/sword/saber/purple
+/obj/item/melee/energy/sword/saber/purple
possible_colors = list("purple" = LIGHT_COLOR_LAVENDER)
-/obj/item/melee/transforming/energy/sword/saber/yellow
+/obj/item/melee/energy/sword/saber/yellow
possible_colors = list("yellow" = COLOR_YELLOW)
-/obj/item/melee/transforming/energy/sword/saber/attackby(obj/item/W, mob/living/user, params)
+/obj/item/melee/energy/sword/saber/attackby(obj/item/W, mob/living/user, params)
if(W.tool_behaviour == TOOL_MULTITOOL)
if(!hacked)
hacked = TRUE
sword_color = "rainbow"
to_chat(user, "RNBW_ENGAGE")
- if(active)
+ if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
icon_state = "[base_icon_state]rainbow"
user.update_inv_hands()
else
@@ -192,39 +222,38 @@
return ..()
-/obj/item/melee/transforming/energy/sword/saber/pirate
+/obj/item/melee/energy/sword/saber/pirate
name = "energy cutlass"
desc = "Arrrr matey."
icon_state = "cutlass"
base_icon_state = "cutlass"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- icon_state_on = "cutlass"
-/obj/item/melee/transforming/energy/sword/saber/pirate/red
+/obj/item/melee/energy/sword/saber/pirate/red
possible_colors = list("red" = COLOR_SOFT_RED)
-/obj/item/melee/transforming/energy/sword/saber/pirate/blue
+/obj/item/melee/energy/sword/saber/pirate/blue
possible_colors = list("blue" = LIGHT_COLOR_LIGHT_CYAN)
-/obj/item/melee/transforming/energy/sword/saber/pirate/green
+/obj/item/melee/energy/sword/saber/pirate/green
possible_colors = list("green" = LIGHT_COLOR_GREEN)
-/obj/item/melee/transforming/energy/sword/saber/pirate/purple
+/obj/item/melee/energy/sword/saber/pirate/purple
possible_colors = list("purple" = LIGHT_COLOR_LAVENDER)
-/obj/item/melee/transforming/energy/sword/saber/pirate/yellow
+/obj/item/melee/energy/sword/saber/pirate/yellow
possible_colors = list("yellow" = COLOR_YELLOW)
-/obj/item/melee/transforming/energy/blade
+/obj/item/melee/energy/blade
name = "energy blade"
desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
- icon_state = "blade"
+ icon_state = "lightblade"
+ item_state = "lightblade"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
force = 30 //Normal attacks deal esword damage
hitsound = 'sound/weapons/blade1.ogg'
- active = 1
throwforce = 1 //Throwing or dropping the item deletes it.
throw_speed = 3
throw_range = 1
@@ -233,29 +262,29 @@
sharpness = IS_SHARP
//Most of the other special functions are handled in their own files. aka special snowflake code so kewl
-/obj/item/melee/transforming/energy/blade/Initialize()
+/obj/item/melee/energy/blade/Initialize()
. = ..()
spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
-/obj/item/melee/transforming/energy/blade/Destroy()
+/obj/item/melee/energy/blade/Destroy()
QDEL_NULL(spark_system)
return ..()
-/obj/item/melee/transforming/energy/blade/transform_weapon(mob/living/user, supress_message_text)
+/obj/item/melee/energy/blade/on_transform(obj/item/source, mob/user, active)
return
-/obj/item/melee/transforming/energy/blade/hardlight
+/obj/item/melee/energy/blade/hardlight
name = "hardlight blade"
desc = "An extremely sharp blade made out of hard light. Packs quite a punch."
icon_state = "lightblade"
item_state = "lightblade"
-/obj/item/melee/transforming/energy/ctf
+/obj/item/melee/energy/ctf
name = "energy sword"
desc = "That cable over there, I'm going to cut it."
- icon_state = "plasmasword0"
+ icon_state = "plasmasword"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
sharpness = IS_SHARP
@@ -264,20 +293,19 @@
force = 0
throwforce = 0
hitsound = "swing_hit" //it starts deactivated
- attack_verb_off = list("tapped", "poked")
+ attack_verb = list("tapped", "poked")
throw_speed = 3
throw_range = 5
- force_on = 200 //instakill if shields are down
+ active_force = 200 //instakill if shields are down
-/obj/item/melee/transforming/energy/ctf/transform_weapon(mob/living/user, supress_message_text)
+/obj/item/melee/energy/ctf/on_transform(obj/item/source, mob/user, active)
. = ..()
- if(. && active)
- icon_state = "plasmasword1"
-
-/obj/item/melee/transforming/energy/ctf/solgov
- armour_penetration = 40
- force_on = 34 //desword grade, but 0 blocking
-
-/obj/item/melee/transforming/energy/ctf/transform_messages(mob/living/user, supress_message_text)
+ if(active)
+ icon_state = "plasmasword_on"
playsound(user, active ? 'sound/weapons/SolGov_sword_arm.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE)
to_chat(user, "[src] [active ? "is now active":"can now be concealed"].")
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
+/obj/item/melee/energy/ctf/solgov
+ armour_penetration = 40
+ active_force = 34 //desword grade, but 0 blocking
diff --git a/code/game/objects/items/melee/energyhalberd.dm b/code/game/objects/items/melee/energyhalberd.dm
index 8ae5cdd96f36..961325d50c16 100644
--- a/code/game/objects/items/melee/energyhalberd.dm
+++ b/code/game/objects/items/melee/energyhalberd.dm
@@ -26,7 +26,7 @@
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
- var/w_class_on = WEIGHT_CLASS_BULKY
+ var/active_w_class = WEIGHT_CLASS_BULKY
var/halberd_color = "green"
var/two_hand_force = 34
var/hacked = FALSE
@@ -46,7 +46,7 @@
to_chat(user, "You lack the grace to wield this!")
return COMPONENT_TWOHANDED_BLOCK_WIELD
sharpness = IS_SHARP
- w_class = w_class_on
+ w_class = active_w_class
hitsound = 'sound/weapons/blade1.ogg'
START_PROCESSING(SSobj, src)
set_light_on(TRUE)
@@ -129,7 +129,7 @@
return 1
/obj/item/energyhalberd/ignition_effect(atom/A, mob/user)
- // same as /obj/item/melee/transforming/energy, mostly
+ // same as /obj/item/melee/energy, mostly
if(!HAS_TRAIT(src, TRAIT_WIELDED))
return ""
var/in_mouth = ""
diff --git a/code/game/objects/items/melee/fireaxe.dm b/code/game/objects/items/melee/fireaxe.dm
index b3e04ac1bc3c..7ae3728803c0 100644
--- a/code/game/objects/items/melee/fireaxe.dm
+++ b/code/game/objects/items/melee/fireaxe.dm
@@ -17,10 +17,10 @@
/obj/item/melee/axe/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 100, 80, 0 , hitsound) //axes are not known for being precision butchering tools
- AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=24, icon_wielded="[base_icon_state]1")
+ AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=24, icon_wielded="[base_icon_state]_w")
-/obj/item/fireaxe/update_icon_state()
- icon_state = "[base_icon_state]0"
+/obj/item/melee/axe/update_icon_state()
+ icon_state = "[base_icon_state]"
return ..()
/obj/item/melee/axe/afterattack(atom/A, mob/user, proximity)
@@ -35,13 +35,13 @@
/obj/item/melee/axe/fire // DEM AXES MAN, marker -Agouri
name = "fire axe"
desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
- icon_state = "fireaxe0"
+ icon_state = "fireaxe"
base_icon_state = "fireaxe"
/obj/item/melee/axe/bone // Blatant imitation of the fireaxe, but made out of bone.
name = "bone axe"
desc = "A large, vicious axe crafted out of several sharpened bone plates and crudely tied together. Made of monsters, by killing monsters, for killing monsters."
- icon_state = "bone_axe0"
+ icon_state = "bone_axe"
base_icon_state = "bone_axe"
/obj/item/melee/axe/scrap
@@ -51,4 +51,4 @@
/obj/item/melee/axe/scrap/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=22, icon_wielded="[base_icon_state]1")
+ AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=22, icon_wielded="[base_icon_state]_w")
diff --git a/code/game/objects/items/melee/knife.dm b/code/game/objects/items/melee/knife.dm
index 15d389477745..70ada48ed452 100644
--- a/code/game/objects/items/melee/knife.dm
+++ b/code/game/objects/items/melee/knife.dm
@@ -1,7 +1,8 @@
/obj/item/melee/knife
icon_state = "kitchenknife"
item_state = "kitchenknife"
- icon = 'icons/obj/weapon/knife.dmi'
+ icon = 'icons/obj/weapon/knives/knife.dmi'
+ world_file = 'icons/obj/weapon/knives/knife_world.dmi'
lefthand_file = 'icons/mob/inhands/weapons/knifes_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/knifes_righthand.dmi'
pickup_sound = 'sound/items/handling/knife1_pickup.ogg'
@@ -20,7 +21,6 @@
item_flags = EYE_STAB
tool_behaviour = TOOL_KNIFE
-
/obj/item/melee/knife/ComponentInitialize()
. = ..()
set_butchering()
@@ -105,7 +105,6 @@
force = 20
throwforce = 20
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
- world_file = 'icons/obj/world/melee.dmi'
/obj/item/melee/knife/survival
name = "survival knife"
@@ -116,7 +115,6 @@
force = 15
throwforce = 15
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
- world_file = 'icons/obj/world/melee.dmi'
/obj/item/melee/knife/bone
name = "bone dagger"
@@ -129,7 +127,6 @@
force = 15
throwforce = 15
custom_materials = null
- world_file = 'icons/obj/world/melee.dmi'
/obj/item/melee/knife/combat/cyborg
name = "cyborg knife"
@@ -168,6 +165,7 @@
flags_1 = CONDUCT_1
force = 3
w_class = WEIGHT_CLASS_SMALL
+ sharpness = IS_BLUNT
throwforce = 5
throw_speed = 3
throw_range = 6
@@ -175,27 +173,19 @@
hitsound = 'sound/weapons/genhit.ogg'
attack_verb = list("stubbed", "poked")
resistance_flags = FIRE_PROOF
- var/extended = 0
-
-/obj/item/melee/knife/switchblade/attack_self(mob/user)
- extended = !extended
- playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
- if(extended)
- force = 20
- w_class = WEIGHT_CLASS_NORMAL
- throwforce = 23
- icon_state = "switchblade_ext"
- attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = IS_SHARP
- else
- force = 3
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 5
- icon_state = "switchblade"
- attack_verb = list("stubbed", "poked")
- hitsound = 'sound/weapons/genhit.ogg'
- sharpness = IS_BLUNT
+
+/obj/item/melee/knife/switchblade/ComponentInitialize()
+ . = ..()
+ AddComponent( \
+ /datum/component/transforming, \
+ force_on = 20, \
+ throwforce_on = 23, \
+ throw_speed_on = 4, \
+ sharpness_on = IS_SHARP, \
+ hitsound_on = 'sound/weapons/bladeslice.ogg', \
+ w_class_on = WEIGHT_CLASS_NORMAL, \
+ attack_verb_on = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut"), \
+ )
/obj/item/melee/knife/letter_opener
name = "letter opener"
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index afb4bfe2ec33..13d4ac99fe18 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -5,11 +5,7 @@
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
var/projectile_block_chance = 0
-/obj/item/melee/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(attack_type == PROJECTILE_ATTACK)
- final_block_chance = projectile_block_chance //Don't bring a sword to a gunfight
- return ..()
-
+//cruft
/obj/item/melee/proc/check_martial_counter(mob/living/carbon/human/target, mob/living/carbon/human/user)
if(target.check_block())
target.visible_message("[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!",
@@ -17,6 +13,12 @@
user.Stun(40)
return TRUE
+//This is only pathed here because there is currently only melee using it, the second you want to add charged to something just make it /obj/item/get_cell()
+/obj/item/melee/get_cell()
+ var/datum/component/transforming/charged/charged_comp = GetComponent(/datum/component/transforming/charged)
+ if(charged_comp)
+ return charged_comp.cell
+
/obj/item/melee/chainofcommand
name = "chain of command"
desc = "A tool used by great men to placate the frothing masses."
@@ -101,8 +103,8 @@
attack_verb = list("beat", "smacked")
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 3.5)
w_class = WEIGHT_CLASS_HUGE
- var/homerun_ready = 0
- var/homerun_able = 0
+ var/homerun_ready = FALSE
+ var/homerun_able = FALSE
/obj/item/melee/baseball_bat/homerun
name = "home run bat"
diff --git a/code/game/objects/items/melee/spear.dm b/code/game/objects/items/melee/spear.dm
index 218638882bfb..4a7b8b789dc1 100644
--- a/code/game/objects/items/melee/spear.dm
+++ b/code/game/objects/items/melee/spear.dm
@@ -1,6 +1,6 @@
//spears
/obj/item/melee/spear
- icon_state = "spearglass0"
+ icon_state = "spearglass"
icon = 'icons/obj/weapon/spear.dmi'
lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
@@ -26,10 +26,10 @@
. = ..()
AddComponent(/datum/component/butchering, 100, 70) //decent in a pinch, but pretty bad.
AddComponent(/datum/component/jousting)
- AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]1")
+ AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]_w")
/obj/item/melee/spear/update_icon_state()
- icon_state = "[icon_prefix]0"
+ icon_state = "[icon_prefix]"
return ..()
/obj/item/melee/spear/CheckParts(list/parts_list)
@@ -37,7 +37,7 @@
if (istype(tip, /obj/item/shard/plasma))
throwforce = 21
icon_prefix = "spearplasma"
- AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]1")
+ AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]_w")
update_appearance()
qdel(tip)
..()
@@ -46,9 +46,9 @@
* Bone Spear
*/
/obj/item/melee/spear/bone //Blatant imitation of spear, but made out of bone. Not valid for explosive modification.
- icon_state = "bone_spear0"
+ icon_state = "bone_spear"
name = "bone spear"
- base_icon_state = "bone_spear0"
+ base_icon_state = "bone_spear"
icon_prefix = "bone_spear"
desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology."
//this should be a plasma spear or worse.
@@ -57,11 +57,11 @@
/obj/item/melee/spear/bone/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]1")
+ AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]_w")
/obj/item/melee/spear/explosive
name = "explosive lance"
- icon_state = "spearbomb0"
+ icon_state = "spearbomb"
base_icon_state = "spearbomb"
icon_prefix = "spearbomb"
var/obj/item/grenade/explosive = null
@@ -73,7 +73,7 @@
/obj/item/melee/spear/explosive/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]1")
+ AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]_w")
/obj/item/melee/spear/explosive/proc/set_explosive(obj/item/grenade/G)
if(explosive)
diff --git a/code/game/objects/items/melee/stunbaton.dm b/code/game/objects/items/melee/stunbaton.dm
index 05225d80cff8..152bc76d5f80 100644
--- a/code/game/objects/items/melee/stunbaton.dm
+++ b/code/game/objects/items/melee/stunbaton.dm
@@ -23,7 +23,7 @@
var/can_remove_cell = TRUE
var/turned_on = FALSE
- var/activate_sound = "sparks"
+ var/activate_sound = SFX_SPARKS
var/attack_cooldown_check = 0 SECONDS
var/attack_cooldown = 2.5 SECONDS
@@ -99,7 +99,7 @@
/obj/item/melee/baton/update_icon_state()
if(turned_on)
- icon_state = "[initial(icon_state)]_active"
+ icon_state = "[initial(icon_state)]_on"
return ..()
if(!cell)
icon_state = "[initial(icon_state)]_nocell"
@@ -110,23 +110,23 @@
/obj/item/melee/baton/examine(mob/user)
. = ..()
if(cell)
- . += "\The [src] is [round(cell.percent())]% charged."
+ . += span_notice("\The [src] is [round(cell.percent())]% charged.")
else
- . += "\The [src] does not have a power source installed."
+ . += span_warning("\The [src] does not have a power source installed.")
/obj/item/melee/baton/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stock_parts/cell))
var/obj/item/stock_parts/cell/C = W
if(cell)
- to_chat(user, "[src] already has a cell!")
+ to_chat(user, span_notice("[src] already has a cell!"))
else
if(C.maxcharge < cell_hit_cost)
- to_chat(user, "[src] requires a higher capacity cell.")
+ to_chat(user, span_notice("[src] requires a higher capacity cell."))
return
if(!user.transferItemToLoc(W, src))
return
cell = W
- to_chat(user, "You install a cell in [src].")
+ to_chat(user, span_notice("You install a cell in [src]."))
update_appearance()
else if(W.tool_behaviour == TOOL_SCREWDRIVER)
@@ -139,7 +139,7 @@
cell.update_appearance()
cell.forceMove(get_turf(src))
cell = null
- to_chat(user, "You remove the cell from [src].")
+ to_chat(user, span_notice("You remove the cell from [src]."))
turned_on = FALSE
update_appearance()
@@ -149,22 +149,22 @@
/obj/item/melee/baton/proc/toggle_on(mob/user)
if(cell && cell.charge > cell_hit_cost)
turned_on = !turned_on
- to_chat(user, "[src] is now [turned_on ? "on" : "off"].")
+ to_chat(user, span_notice("[src] is now [turned_on ? "on" : "off"]."))
playsound(src, activate_sound, 75, TRUE, -1)
else
turned_on = FALSE
if(!cell)
- to_chat(user, "[src] does not have a power source!")
+ to_chat(user, span_warning("[src] does not have a power source!"))
else
- to_chat(user, "[src] is out of charge.")
+ to_chat(user, span_warning("[src] is out of charge."))
update_appearance()
add_fingerprint(user)
/obj/item/melee/baton/proc/clumsy_check(mob/living/carbon/human/user)
if(turned_on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
playsound(src, stun_sound, 75, TRUE, -1)
- user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \
- "You accidentally hit yourself with [src]!")
+ user.visible_message(span_danger("[user] accidentally hits [user.p_them()]self with [src]!"), \
+ span_userdanger("You accidentally hit yourself with [src]!"))
user.Knockdown(stun_time*3) //should really be an equivalent to attack(user,user)
deductcharge(cell_hit_cost)
return TRUE
@@ -191,10 +191,10 @@
user.do_attack_animation(M)
return
else
- to_chat(user, "The baton is still charging!")
+ to_chat(user, span_danger("The [src] is still charging!"))
else
- M.visible_message("[user] prods [M] with [src]. Luckily it was off.", \
- "[user] prods you with [src]. Luckily it was off.")
+ M.visible_message(span_warning("[user] prods [M] with [src]. Luckily it was off."), \
+ span_warning("[user] prods you with [src]. Luckily it was off."))
else
if(turned_on)
if(attack_cooldown_check <= world.time)
@@ -206,7 +206,7 @@
if(shields_blocked(L, user))
return FALSE
if(HAS_TRAIT_FROM(L, TRAIT_IWASBATONED, user)) //no doublebaton abuse anon!
- to_chat(user, "[L] manages to avoid the attack!")
+ to_chat(user, span_danger("[L] manages to avoid the attack!"))
return FALSE
if(iscyborg(loc))
var/mob/living/silicon/robot/R = loc
@@ -228,8 +228,8 @@
if(user)
L.lastattacker = user.real_name
L.lastattackerckey = user.ckey
- L.visible_message("[user] stuns [L] with [src]!", \
- "[user] stuns you with [src]!")
+ L.visible_message(span_danger("[user] stuns [L] with [src]!"), \
+ span_userdanger("[user] stuns you with [src]!"))
log_combat(user, L, "stunned")
playsound(src, stun_sound, 50, TRUE, -1)
@@ -245,7 +245,7 @@
/obj/item/melee/baton/proc/apply_stun_effect_end(mob/living/target)
var/trait_check = HAS_TRAIT(target, TRAIT_STUNRESISTANCE) //var since we check it in out to_chat as well as determine stun duration
if(!target.IsKnockdown())
- to_chat(target, "Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]")
+ to_chat(target, span_warning("Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]"))
if(trait_check)
target.Knockdown(stun_time * 0.1)
@@ -361,7 +361,7 @@
var/on_icon_state // What is our sprite when turned on
var/off_icon_state // What is our sprite when turned off
var/on_item_state // What is our in-hand sprite when turned on
- var/force_on // Damage when on - not stunning
+ var/active_force // Damage when on - not stunning
var/force_off // Damage when off - not stunning
var/weight_class_on // What is the new size class when turned on
@@ -373,8 +373,8 @@
/obj/item/melee/classic_baton/proc/get_on_description()
. = list()
- .["local_on"] = "You extend the baton."
- .["local_off"] = "You collapse the baton."
+ .["local_on"] = span_warning("You extend the baton.")
+ .["local_off"] = span_notice("You collapse the baton.")
return .
@@ -382,8 +382,8 @@
/obj/item/melee/classic_baton/proc/get_stun_description(mob/living/target, mob/living/user)
. = list()
- .["visible"] = "[user] knocks [target] down with [src]!"
- .["local"] = "[user] knocks you down with [src]!"
+ .["visible"] = span_danger("[user] knocks [target] down with [src]!")
+ .["local"] = span_userdanger("[user] knocks you down with [src]!")
return .
@@ -391,8 +391,8 @@
/obj/item/melee/classic_baton/proc/get_silicon_stun_description(mob/living/target, mob/living/user)
. = list()
- .["visible"] = "[user] pulses [target]'s sensors with the baton!"
- .["local"] = "You pulse [target]'s sensors with the baton!"
+ .["visible"] = span_danger("[user] pulses [target]'s sensors with the baton!")
+ .["local"] = span_danger("You pulse [target]'s sensors with the baton!")
return .
@@ -410,7 +410,7 @@
add_fingerprint(user)
if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
- to_chat(user, "You hit yourself over the head!")
+ to_chat(user, span_userdanger("You hit yourself over the head!"))
user.Paralyze(knockdown_time_carbon * force)
user.apply_damage(stamina_damage, STAMINA, BODY_ZONE_HEAD)
@@ -493,7 +493,7 @@
/obj/item/melee/classic_baton/telescopic
name = "telescopic baton"
desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
- icon_state = "telebaton_0"
+ icon_state = "telebaton"
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
item_state = null
@@ -504,10 +504,10 @@
on = FALSE
on_sound = 'sound/weapons/batonextend.ogg'
- on_icon_state = "telebaton_1"
- off_icon_state = "telebaton_0"
+ on_icon_state = "telebaton_on"
+ off_icon_state = "telebaton"
on_item_state = "nullrod"
- force_on = 10
+ active_force = 10
force_off = 0
weight_class_on = WEIGHT_CLASS_BULKY
@@ -520,7 +520,7 @@
icon_state = on_icon_state
item_state = on_item_state
w_class = weight_class_on
- force = force_on
+ force = active_force
attack_verb = list("smacked", "struck", "cracked", "beaten")
else
to_chat(user, desc["local_off"])
@@ -537,7 +537,7 @@
/obj/item/melee/classic_baton/telescopic/contractor_baton
name = "contractor baton"
desc = "A compact, specialised baton assigned to Syndicate contractors. Applies light electrical shocks to targets."
- icon_state = "contractor_baton_0"
+ icon_state = "contractor_baton"
item_state = null
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
@@ -550,15 +550,15 @@
on_sound = 'sound/weapons/contractorbatonextend.ogg'
on_stun_sound = 'sound/effects/contractorbatonhit.ogg'
- on_icon_state = "contractor_baton_1"
- off_icon_state = "contractor_baton_0"
+ on_icon_state = "contractor_baton_on"
+ off_icon_state = "contractor_baton"
on_item_state = "contractor_baton"
- force_on = 16
+ active_force = 16
force_off = 5
weight_class_on = WEIGHT_CLASS_NORMAL
/obj/item/melee/classic_baton/telescopic/contractor_baton/get_wait_description()
- return "The baton is still charging!"
+ return span_danger("The baton is still charging!")
/obj/item/melee/classic_baton/telescopic/contractor_baton/additional_effects_carbon(mob/living/target, mob/living/user)
target.Jitter(20)
diff --git a/code/game/objects/items/melee/sword.dm b/code/game/objects/items/melee/sword.dm
index e74dd456b466..0b64e22ed67c 100644
--- a/code/game/objects/items/melee/sword.dm
+++ b/code/game/objects/items/melee/sword.dm
@@ -8,13 +8,22 @@
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
- obj_flags = UNIQUE_RENAME
- block_chance = 25
+ block_chance = 10
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
sharpness = IS_SHARP
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
+/obj/item/melee/sword/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/butchering, 30, 95, 5) //fast and effective, but as a sword, it might damage the results.
+
+//cruft
+/obj/item/melee/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ if(attack_type == PROJECTILE_ATTACK)
+ final_block_chance = projectile_block_chance //Don't bring a sword to a gunfight
+ return ..()
+
/obj/item/melee/sword/claymore
name = "claymore"
desc = "What are you standing around staring at this for? Get to killing!"
@@ -41,7 +50,7 @@
/obj/item/melee/sword/scrap
name = "scrap sword"
desc = "A jagged and painful weapon only effective on targets without an armour"
- icon_state = "machete0"
+ icon_state = "machete"
force = 24
throwforce = 10
armour_penetration = -35
@@ -50,7 +59,7 @@
/obj/item/melee/sword/mass
name = "mass produced machete"
desc = "A middle ground between a machete and a short sword. A simple construction of stamped steel but its so cheap its hard to complain. Its right between being a one hand and two handed weapon"
- icon_state = "machete0"
+ icon_state = "machete"
base_icon_state = "machete"
force = 20
throwforce = 15
@@ -75,8 +84,8 @@
/obj/item/melee/sword/chainsaw
name = "sacred chainsaw sword"
desc = "Suffer not a heretic to live."
- icon_state = "chainswordon"
- item_state = "chainswordon"
+ icon_state = "chainsword_on"
+ item_state = "chainsword_on"
force = 15
throwforce = 10
armour_penetration = 25
@@ -99,10 +108,6 @@
hitsound = 'sound/weapons/rapierhit.ogg'
custom_materials = list(/datum/material/iron = 1000)
-/obj/item/melee/sword/sabre/Initialize()
- . = ..()
- AddComponent(/datum/component/butchering, 30, 95, 5) //fast and effective, but as a sword, it might damage the results.
-
/obj/item/melee/sword/sabre/on_enter_storage(datum/component/storage/concrete/S)
var/obj/item/storage/belt/sabre/B = S.real_location()
if(istype(B))
@@ -152,50 +157,30 @@
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("smacked", "prodded")
- var/extended = FALSE
var/extend_sound = 'sound/weapons/batonextend.ogg'
- var/on_icon_state = "suns-tsword_ext"
- var/on_item_state = "suns-tsword_ext"
- var/off_icon_state = "suns-tsword"
- var/off_item_state = "suns-tsword"
-
- var/force_on = 10
- var/on_throwforce = 10
- var/on_blockchance = 40
-
- var/force_off = 0
- var/off_throwforce = 0
- var/off_blockchance = 0
-
- var/weight_class_on = WEIGHT_CLASS_BULKY
-
-/obj/item/melee/sword/sabre/suns/telescopic/attack_self(mob/user)
- extended = !extended
-
- if(extended)
- to_chat(user, "You extend the [src].")
- icon_state = on_icon_state
- item_state = on_item_state
- slot_flags = 0
- w_class = weight_class_on
- force = force_on
- throwforce = on_throwforce
- block_chance = on_blockchance
- attack_verb = list("slashed", "cut")
+ var/on_block_chance = 40
+
+/obj/item/melee/sword/sabre/suns/telescopic/ComponentInitialize()
+ . = ..()
+ AddComponent( \
+ /datum/component/transforming, \
+ force_on = 10, \
+ throwforce_on = 10, \
+ attack_verb_on = list("slashed", "cut"), \
+ w_class_on = WEIGHT_CLASS_BULKY, \
+ )
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
+
+/obj/item/melee/sword/sabre/suns/telescopic/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ if(active)
+ block_chance = on_block_chance
else
- to_chat(user, "You collapse the [src].")
- icon_state = off_icon_state
- item_state = off_item_state
- slot_flags = ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- force = force_off
- throwforce = off_throwforce
- block_chance = off_blockchance
- attack_verb = list("smacked", "prodded")
-
- playsound(get_turf(src), extend_sound, 50, TRUE)
- add_fingerprint(user)
+ block_chance = initial(block_chance)
+ playsound(user, extend_sound, 50, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
/obj/item/melee/sword/supermatter
name = "supermatter sword"
@@ -324,7 +309,7 @@
//HF blade
/obj/item/melee/sword/vibro
- icon_state = "hfrequency0"
+ icon_state = "hfrequency"
base_icon_state = "hfrequency"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm
deleted file mode 100644
index 8059e021b8f0..000000000000
--- a/code/game/objects/items/melee/transforming.dm
+++ /dev/null
@@ -1,88 +0,0 @@
-/obj/item/melee/transforming
- sharpness = IS_SHARP
- stealthy_audio = TRUE //Most of these are antag weps so we dont want them to be /too/ overt.
- var/active = FALSE
- var/force_on = 30 //force when active
- var/faction_bonus_force = 0 //Bonus force dealt against certain factions
- var/throwforce_on = 20
- var/icon_state_on = "axe1"
- var/hitsound_on = 'sound/weapons/blade1.ogg'
- var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- var/list/attack_verb_off = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- w_class = WEIGHT_CLASS_SMALL
- var/bonus_active = FALSE //If the faction damage bonus is active
- var/list/nemesis_factions //Any mob with a faction that exists in this list will take bonus damage/effects
- var/w_class_on = WEIGHT_CLASS_BULKY
- var/clumsy_check = TRUE
-
-/obj/item/melee/transforming/Initialize()
- . = ..()
- if(active)
- if(attack_verb_on.len)
- attack_verb = attack_verb_on
- else
- if(attack_verb_off.len)
- attack_verb = attack_verb_off
- if(embedding)
- updateEmbedding()
- if(sharpness)
- AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)
-
-/obj/item/melee/transforming/attack_self(mob/living/carbon/user)
- if(transform_weapon(user))
- clumsy_transform_effect(user)
-
-/obj/item/melee/transforming/attack(mob/living/target, mob/living/carbon/human/user)
- var/nemesis_faction = FALSE
- if(LAZYLEN(nemesis_factions))
- for(var/F in target.faction)
- if(F in nemesis_factions)
- nemesis_faction = TRUE
- force += faction_bonus_force
- nemesis_effects(user, target)
- break
- . = ..()
- if(nemesis_faction)
- force -= faction_bonus_force
-
-/obj/item/melee/transforming/proc/transform_weapon(mob/living/user, supress_message_text)
- active = !active
- if(active)
- force = force_on
- throwforce = throwforce_on
- hitsound = hitsound_on
- throw_speed = 4
- if(attack_verb_on.len)
- attack_verb = attack_verb_on
- icon_state = icon_state_on
- w_class = w_class_on
- if(embedding)
- updateEmbedding()
- else
- force = initial(force)
- throwforce = initial(throwforce)
- hitsound = initial(hitsound)
- throw_speed = initial(throw_speed)
- if(attack_verb_off.len)
- attack_verb = attack_verb_off
- icon_state = initial(icon_state)
- w_class = initial(w_class)
- if(embedding)
- disableEmbedding()
-
- transform_messages(user, supress_message_text)
- add_fingerprint(user)
- return TRUE
-
-/obj/item/melee/transforming/proc/nemesis_effects(mob/living/user, mob/living/target)
- return
-
-/obj/item/melee/transforming/proc/transform_messages(mob/living/user, supress_message_text)
- playsound(user, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE) //changed it from 50% volume to 35% because deafness
- if(!supress_message_text)
- to_chat(user, "[src] [active ? "is now active":"can now be concealed"].")
-
-/obj/item/melee/transforming/proc/clumsy_transform_effect(mob/living/user)
- if(clumsy_check && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
- to_chat(user, "You accidentally cut yourself with [src], like a doofus!")
- user.take_bodypart_damage(5,5)
diff --git a/code/game/objects/items/melee/trickweapon.dm b/code/game/objects/items/melee/trickweapon.dm
new file mode 100644
index 000000000000..af574085a158
--- /dev/null
+++ b/code/game/objects/items/melee/trickweapon.dm
@@ -0,0 +1,69 @@
+/obj/item/melee/cleaving_saw
+ name = "cleaving saw"
+ desc = "This saw, effective at drawing the blood of beasts, transforms into a long cleaver that makes use of centrifugal force."
+ force = 12
+ var/active_force = 20 //force when active
+ throwforce = 20
+ var/active_throwforce = 20
+ icon = 'icons/obj/lavaland/artefacts.dmi'
+ lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
+ inhand_x_dimension = 64
+ inhand_y_dimension = 64
+ icon_state = "cleaving_saw"
+ item_state = "cleaving_saw"
+ slot_flags = ITEM_SLOT_BELT
+ attack_verb = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ sharpness = IS_SHARP
+
+ var/transform_cooldown
+ var/swiping = FALSE
+ var/bleed_stacks_per_hit = 3
+
+/obj/item/melee/cleaving_saw/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/update_icon_updates_onmob)
+ AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)
+ AddComponent( \
+ /datum/component/transforming, \
+ transform_cooldown_time = (CLICK_CD_MELEE * 0.25), \
+ force_on = active_force, \
+ throwforce_on = active_throwforce, \
+ attack_verb_on = list("cleave", "swipe", "slash", "chop"), \
+ )
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
+
+/obj/item/melee/cleaving_saw/examine(mob/user)
+ . = ..()
+ . += span_notice("It is [HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE) ? "open, will cleave enemies in a wide arc and deal additional damage to fauna":"closed, and can be used for rapid consecutive attacks that cause fauna to bleed"].")
+ . += span_notice("Both modes will build up existing bleed effects, doing a burst of high damage if the bleed is built up high enough.")
+ . += span_notice("Transforming it immediately after an attack causes the next attack to come out faster.")
+
+/obj/item/melee/cleaving_saw/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+ user.changeNext_move(CLICK_CD_MELEE * 0.25)
+ if(user)
+ balloon_alert(user, "[active ? "opened" : "closed"] [src]")
+ playsound(user, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
+/obj/item/melee/cleaving_saw/melee_attack_chain(mob/user, atom/target, params)
+ . = ..()
+ if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
+ user.changeNext_move(CLICK_CD_MELEE * 0.5) //when closed, it attacks very rapidly
+
+/obj/item/melee/cleaving_saw/attack(mob/living/target, mob/living/carbon/human/user)
+ if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE) || swiping || !target.density || get_turf(target) == get_turf(user))
+ ..()
+ else
+ var/turf/user_turf = get_turf(user)
+ var/dir_to_target = get_dir(user_turf, get_turf(target))
+ swiping = TRUE
+ var/static/list/cleaving_saw_cleave_angles = list(0, -45, 45) //so that the animation animates towards the target clicked and not towards a side target
+ for(var/i in cleaving_saw_cleave_angles)
+ var/turf/T = get_step(user_turf, turn(dir_to_target, i))
+ for(var/mob/living/L in T)
+ if(user.Adjacent(L) && L.density)
+ melee_attack_chain(user, L)
+ swiping = FALSE
diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm
index f9d429b55a3e..00217a8550a4 100644
--- a/code/game/objects/items/sharpener.dm
+++ b/code/game/objects/items/sharpener.dm
@@ -21,7 +21,7 @@
if(requires_sharpness && !I.get_sharpness())
to_chat(user, "You can only sharpen items that are already sharp, such as knives!")
return
- if(istype(I, /obj/item/melee/transforming/energy))
+ if(istype(I, /obj/item/melee/energy))
to_chat(user, "You don't think \the [I] will be the thing getting modified if you use it on \the [src]!")
return
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 790c9cb2d22d..48dc33b79c3d 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -127,6 +127,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("dresser", /obj/structure/dresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("picture frame", /obj/item/wallframe/picture, 1, time = 10),\
new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
+ new/datum/stack_recipe("easel", /obj/structure/easel, 4, time = 10),\
new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
@@ -136,6 +137,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("rake", /obj/item/cultivator/rake, 5, time = 10),\
new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
+ new/datum/stack_recipe("wooden cabinet", /obj/structure/closet/cabinet, 10, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\
new/datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar, 3), \
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 29d2cd22dbbd..c5512e5fe47b 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -102,6 +102,14 @@
for(var/i in 1 to 7)
new /obj/item/disk/data(src)
+/obj/item/storage/box/holodisc
+ name = "holodisc box"
+ illustration = "disk_kit"
+
+/obj/item/storage/box/holodisc/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/disk/holodisk(src)
+
//guys why are my tests failing
/obj/item/storage/box/disks_plantgene
name = "plant data disks box"
@@ -171,7 +179,7 @@
internal_type = /obj/item/tank/internals/emergency_oxygen/engi //clip actually cares about their personnel
/obj/item/storage/box/survival/clip/balaclava
- mask_type = /obj/item/clothing/mask/gas/sechailer/balaclava
+ mask_type = /obj/item/clothing/mask/balaclava
internal_type = /obj/item/tank/internals/emergency_oxygen/double
/obj/item/storage/box/survival/frontier
@@ -743,6 +751,15 @@
for(var/i in 1 to 7)
new /obj/item/clothing/accessory/armband/deputy(src)
+/obj/item/storage/box/smokebombs
+ name = "box of smoke grenades"
+ desc = "Used for rapidly laying cover."
+ illustration = "grenade"
+
+/obj/item/storage/box/smokebombs/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/grenade/smokebomb(src)
+
/obj/item/storage/box/metalfoam
name = "box of metal foam grenades"
desc = "To be used to rapidly seal hull breaches."
diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm
index 91c5d9d7f02c..cc432f85b0b3 100644
--- a/code/game/objects/items/storage/filled_guncases.dm
+++ b/code/game/objects/items/storage/filled_guncases.dm
@@ -60,11 +60,24 @@
/obj/item/storage/guncase/pistol/viper
gun_type = /obj/item/gun/ballistic/revolver/viper/indie
+ mag_type = /obj/item/ammo_box/a357/empty
/obj/item/storage/guncase/pistol/ringneck
gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck/indie
mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck
+/obj/item/storage/guncase/pistol/pc76
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck
+ mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck
+
+/obj/item/storage/guncase/pistol/asp
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/asp
+ mag_type = /obj/item/ammo_box/magazine/m57_39_asp
+
+/obj/item/storage/guncase/pistol/rattlesnake
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/rattlesnake
+ mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
+
/obj/item/storage/guncase/cobra
gun_type = /obj/item/gun/ballistic/automatic/smg/cobra/indie
mag_type = /obj/item/ammo_box/magazine/m45_cobra
@@ -146,6 +159,14 @@
gun_type = /obj/item/gun/ballistic/automatic/pistol/cm23
mag_type = /obj/item/ammo_box/magazine/cm23
+/obj/item/storage/guncase/pistol/cm70
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/cm70
+ mag_type = /obj/item/ammo_box/magazine/m9mm_cm70
+
+/obj/item/storage/guncase/pistol/cm357
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/cm357
+ mag_type = /obj/item/ammo_box/magazine/cm357
+
/* idk */
/obj/item/storage/guncase/pistol/disposable
diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm
index 27b8c1f08e21..ec07ea096dc0 100644
--- a/code/game/objects/items/storage/guncases.dm
+++ b/code/game/objects/items/storage/guncases.dm
@@ -15,6 +15,7 @@
hitsound = 'sound/weapons/smash.ogg'
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
+ custom_materials = list(/datum/material/iron = 500)
var/max_items = 10
var/max_w_class = WEIGHT_CLASS_BULKY
var/gun_type
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 6a47c8544bb9..9b17eae3b197 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -17,12 +17,13 @@
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
material_flags = MATERIAL_COLOR
- var/latches = "single_latch"
+ var/latches = null
var/has_latches = TRUE
/obj/item/storage/toolbox/Initialize()
. = ..()
- if(has_latches)
+ if(has_latches && !latches)
+ latches = "single_latch"
if(prob(10))
latches = "double_latch"
if(prob(1))
@@ -71,12 +72,10 @@
material_flags = NONE
/obj/item/storage/toolbox/mechanical/PopulateContents()
- //WS Edit - Better Tool sprites
if(prob(50))
new /obj/item/wrench(src)
else
new /obj/item/wrench/crescent(src)
- //WS End
new /obj/item/screwdriver(src)
new /obj/item/weldingtool(src)
new /obj/item/crowbar(src)
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 5a1bdaabe340..97f8452e831e 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -56,7 +56,7 @@
new /obj/item/encryptionkey/syndicate(src)
if("murder")
- new /obj/item/melee/transforming/energy/sword/saber(src)
+ new /obj/item/melee/energy/sword/saber(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
new /obj/item/card/emag(src)
new /obj/item/clothing/shoes/chameleon/noslip(src)
@@ -178,7 +178,7 @@
new /obj/item/dnainjector/geladikinesis(src)
new /obj/item/dnainjector/cryokinesis(src)
new /obj/item/gun/energy/temperature/security(src)
- new /obj/item/melee/transforming/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue
+ new /obj/item/melee/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue
if("made_man")
new /obj/effect/spawner/random/clothing/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index deca5b57397e..117a6fedb84f 100644
--- a/code/game/objects/items/tanks/jetpack.dm
+++ b/code/game/objects/items/tanks/jetpack.dm
@@ -11,7 +11,7 @@
var/gas_type = GAS_O2
var/on = FALSE
var/stabilizers = FALSE
- var/full_speed = TRUE // If the jetpack will have a speedboost in space/nograv or not
+ var/full_speed = TRUE // Whether damage slowdown will affect the jetpack
var/datum/effect_system/trail_follow/ion/ion_trail
/obj/item/tank/jetpack/Initialize()
@@ -28,7 +28,7 @@
if(gas_type)
air_contents.set_moles(gas_type, ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)))
-/obj/item/tank/jetpack/ui_action_click(mob/user, action)
+/obj/item/tank/jetpack/ui_action_click(mob/living/user, action)
if(istype(action, /datum/action/item_action/toggle_jetpack))
cycle(user)
else if(istype(action, /datum/action/item_action/jetpack_stabilization))
@@ -39,7 +39,7 @@
toggle_internals(user)
-/obj/item/tank/jetpack/proc/cycle(mob/user)
+/obj/item/tank/jetpack/proc/cycle(mob/living/user)
if(user.incapacitated())
return
@@ -54,7 +54,7 @@
A.UpdateButtonIcon()
-/obj/item/tank/jetpack/proc/turn_on(mob/user)
+/obj/item/tank/jetpack/proc/turn_on(mob/living/user)
if(!allow_thrust(0.01, user))
return
on = TRUE
@@ -63,18 +63,18 @@
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(move_react))
RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(pre_move_react))
if(full_speed)
- user.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
+ user.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown_flying)
-/obj/item/tank/jetpack/proc/turn_off(mob/user)
+/obj/item/tank/jetpack/proc/turn_off(mob/living/user)
on = FALSE
stabilizers = FALSE
icon_state = initial(icon_state)
ion_trail.stop()
UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
UnregisterSignal(user, COMSIG_MOVABLE_PRE_MOVE)
- user.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
+ user.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown_flying)
-/obj/item/tank/jetpack/proc/move_react(mob/user)
+/obj/item/tank/jetpack/proc/move_react(mob/living/user)
if(!on)//If jet dont work, it dont work
return
if(!user)//Don't allow jet self using
@@ -90,7 +90,7 @@
if(length(user.client.keys_held & user.client.movement_keys))//You use jet when press keys. yes.
allow_thrust(0.01, user)
-/obj/item/tank/jetpack/proc/pre_move_react(mob/user)
+/obj/item/tank/jetpack/proc/pre_move_react(mob/living/user)
ion_trail.oldposition = get_turf(src)
/obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user)
@@ -110,7 +110,7 @@
item_state = "jetpack-sec"
volume = 20 //normal jetpacks have 70 volume
gas_type = null //it starts empty
- full_speed = FALSE //moves at hardsuit jetpack speeds
+ full_speed = FALSE // affected by damage slowdown
/obj/item/tank/jetpack/improvised/allow_thrust(num, mob/living/user)
if(rand(0,250) == 0)
@@ -181,7 +181,6 @@
volume = 1
slot_flags = null
gas_type = null
- full_speed = FALSE
custom_price = 2000
var/datum/gas_mixture/temp_air_contents
var/obj/item/tank/internals/tank = null
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 220e0e605828..3c1ce5b25ada 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -296,7 +296,7 @@
w_class = WEIGHT_CLASS_SMALL
add_fingerprint(user)
-// Copied from /obj/item/melee/transforming/energy/sword/attackby
+// Copied from /obj/item/melee/energy/sword/attackby
/obj/item/toy/sword/attackby(obj/item/W, mob/living/user, params)
if(istype(W, /obj/item/toy/sword))
if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP))
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index 15cbb9481f35..4cd16c934446 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -224,7 +224,7 @@
custom_materials = null
flags_1 = 0
icon_state = "frame-empty"
- result_path = /obj/structure/sign/painting
+ result_path = /obj/structure/sign/painting/library
/obj/structure/sign/painting
name = "Painting"
@@ -241,8 +241,8 @@
if(dir)
setDir(dir)
if(building)
- pixel_x = (dir & 3)? 0 : (dir == 4 ? -30 : 30)
- pixel_y = (dir & 3)? (dir ==1 ? -30 : 30) : 0
+ pixel_x = (dir & 3)? 0 : (dir == 4 ? 30 : -30)
+ pixel_y = (dir & 3)? (dir ==1 ? 30 : -30) : 0
//The painting is being loaded by the maploader and SSpersistence has already run. Load a painting ourselves.
if(mapload && SSpersistence.initialized)
load_persistent()
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index a69a279bad77..626640f5a607 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -55,7 +55,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/suit/armor/tdome/red(src)
for(var/i in 1 to 3)
- new /obj/item/melee/transforming/energy/sword/saber(src)
+ new /obj/item/melee/energy/sword/saber(src)
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser(src)
for(var/i in 1 to 3)
@@ -74,7 +74,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/suit/armor/tdome/green(src)
for(var/i in 1 to 3)
- new /obj/item/melee/transforming/energy/sword/saber(src)
+ new /obj/item/melee/energy/sword/saber(src)
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser(src)
for(var/i in 1 to 3)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 9c2e0605de7e..0e1bc2ec3efa 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -267,6 +267,11 @@
name = "Contraband Locker"
req_access = list(ACCESS_HEADS)
+/obj/structure/closet/secure_closet/armorycage
+ name = "armory locker"
+ req_access = list(ACCESS_ARMORY)
+ icon_state = "shotguncase"
+
/obj/structure/closet/secure_closet/armory1
name = "armory armor locker"
req_access = list(ACCESS_ARMORY)
diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm
new file mode 100644
index 000000000000..ce43fe1f70ff
--- /dev/null
+++ b/code/game/objects/structures/platforms.dm
@@ -0,0 +1,163 @@
+/obj/structure/platform
+ name = "platform"
+ desc = "An elevated platform meant to make someone feel more important."
+ icon = 'icons/obj/platform.dmi'
+ icon_state = "platform"
+ flags_1 = ON_BORDER_1
+ layer = RAILING_LAYER
+ pass_flags_self = LETPASSTHROW
+ density = TRUE
+ anchored = TRUE
+ climbable = TRUE
+
+/obj/structure/platform/Initialize()
+ . = ..()
+ if(density && flags_1 & ON_BORDER_1)
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_EXIT = PROC_REF(on_exit),
+ )
+ AddElement(/datum/element/connect_loc, loc_connections)
+
+/obj/structure/platform/corner
+ icon_state = "platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/industrial
+ icon_state = "industrial_platform"
+
+/obj/structure/platform/industrial/corner
+ icon_state = "ind_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/industrial_alt
+ icon_state = "industrial2_platform"
+
+/obj/structure/platform/industrial_alt/corner
+ icon_state = "ind2_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/military
+ icon_state = "military_platform"
+
+/obj/structure/platform/military/corner
+ icon_state = "mil_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/ship
+ icon_state = "ship_platform"
+
+/obj/structure/platform/ship/corner
+ icon_state = "ship_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/ship_two
+ icon_state = "ship2_platform"
+
+/obj/structure/platform/ship_two/corner
+ icon_state = "ship2_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/ship_three
+ icon_state = "ship3_platform"
+
+/obj/structure/platform/ship_three/corner
+ icon_state = "ship3_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/ship_four
+ icon_state = "ship4_platform"
+
+/obj/structure/platform/ship_four/corner
+ icon_state = "ship4_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/wood
+ name = "wooden platform"
+ icon_state = "wood_platform"
+ resistance_flags = FLAMMABLE
+
+/obj/structure/platform/wood/corner
+ icon_state = "wood_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/wood_two
+ name = "wooden platform"
+ icon_state = "fancy_wood_platform"
+ resistance_flags = FLAMMABLE
+
+/obj/structure/platform/wood_two/corner
+ icon_state = "fwood_platform_corners"
+ density = FALSE
+ climbable = FALSE
+
+/obj/structure/platform/attackby(obj/item/I, mob/living/user, params)
+ ..()
+ add_fingerprint(user)
+
+ if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP)
+ if(obj_integrity < max_integrity)
+ if(!I.tool_start_check(user, amount=0))
+ return
+
+ to_chat(user, span_notice("You begin repairing [src]..."))
+ if(I.use_tool(src, user, 40, volume=50))
+ obj_integrity = max_integrity
+ to_chat(user, span_notice("You repair [src]."))
+ else
+ to_chat(user, span_warning("[src] is already in good condition!"))
+ return
+
+/obj/structure/platform/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!I.tool_start_check(user, amount=0))
+ return FALSE
+ if(I.use_tool(src, user, 3 SECONDS, volume=0))
+ to_chat(user, span_warning("You cut apart the platform."))
+ deconstruct()
+ return TRUE
+
+/obj/structure/platform/deconstruct(disassembled)
+ . = ..()
+ if(!loc) //quick check if it's qdeleted already.
+ return
+ if(!(flags_1 & NODECONSTRUCT_1))
+ qdel(src)
+
+/obj/structure/platform/CanPass(atom/movable/mover, border_dir)
+ . = ..()
+ if(border_dir & dir)
+ return . || mover.throwing || mover.movement_type & (FLYING | FLOATING)
+ return TRUE
+
+/obj/structure/platform/proc/on_exit(datum/source, atom/movable/leaving, direction)
+ SIGNAL_HANDLER
+
+ if(leaving == src)
+ return // Let's not block ourselves.
+
+ if(!(direction & dir))
+ return
+
+ if(!density)
+ return
+
+ if(leaving.throwing)
+ return
+
+ if(leaving.movement_type & (PHASING | FLYING | FLOATING))
+ return
+
+ if(leaving.move_force >= MOVE_FORCE_EXTREMELY_STRONG)
+ return
+
+ leaving.Bump(src)
+ return COMPONENT_ATOM_BLOCK_EXIT
diff --git a/code/game/objects/structures/signs/signs_flags.dm b/code/game/objects/structures/signs/signs_flags.dm
index 415bce3bf6f5..48eb38cafa32 100644
--- a/code/game/objects/structures/signs/signs_flags.dm
+++ b/code/game/objects/structures/signs/signs_flags.dm
@@ -43,6 +43,12 @@
icon_state = "flag_suns"
item_flag = /obj/item/sign/flag/suns
+/obj/structure/sign/flag/ngr
+ name = "\improper New Gorlexian flag"
+ desc = "The New Gorlex Republic's colors: Red for the martyrs of Old Gorlex, Black for the endless Frontier, and tan for the sands of New Gorlex."
+ icon_state = "flag_ngr"
+ item_flag = /obj/item/sign/flag/ngr
+
// ITEM FLAGS - THE THINGS YOU HOLD AND PLACE
/obj/item/sign/flag
@@ -63,3 +69,9 @@
desc = "A folded up purple Flag. Something about this flag makes you think of chemistry."
icon_state = "folded_suns"
sign_path = /obj/structure/sign/flag/suns
+
+/obj/item/sign/flag/ngr
+ name = "folded New Gorlexian flag"
+ desc = "A folded up NGR flag. Something about this flag makes you think of explosives."
+ icon_state = "folded_ngr"
+ sign_path = /obj/structure/sign/flag/ngr
diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm
index 5c3b554c98dd..9d186868cf54 100644
--- a/code/game/turfs/closed/indestructible.dm
+++ b/code/game/turfs/closed/indestructible.dm
@@ -111,6 +111,12 @@
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS)
canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE)
+/turf/closed/indestructible/titanium/nodiagnonal
+ icon = 'icons/turf/walls/shuttle_wall.dmi'
+ icon_state = "map-shuttle_nd"
+ base_icon_state = "shuttle_wall"
+ smoothing_flags = SMOOTH_BITMASK
+
/turf/closed/indestructible/riveted
icon = 'icons/turf/walls/riveted.dmi'
icon_state = "riveted-0"
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 44acbe06f6bf..92f6d3b64782 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -267,7 +267,7 @@
pulse_strength = min(pulse_strength,air.get_moles(GAS_CO2)*1000,air.get_moles(GAS_O2)*2000) //Ensures matter is conserved properly
air.set_moles(GAS_CO2, max(air.get_moles(GAS_CO2)-(pulse_strength/1000),0))
air.set_moles(GAS_O2, max(air.get_moles(GAS_O2)-(pulse_strength/2000),0))
- air.adjust_moles(GAS_PLUOXIUM, pulse_strength/4000)
+ air.adjust_moles(GAS_O3, pulse_strength/4000)
/turf/open/IgniteTurf(power, fire_color)
if(turf_fire)
diff --git a/code/game/turfs/open/dirtystation.dm b/code/game/turfs/open/dirtystation.dm
index 29e13585bb7d..5daba45f1b1e 100644
--- a/code/game/turfs/open/dirtystation.dm
+++ b/code/game/turfs/open/dirtystation.dm
@@ -53,8 +53,7 @@
return
//Bathrooms. Blood, vomit, and shavings in the sinks.
- var/static/list/bathroom_dirt_areas = typecacheof(list( /area/ship/crew/toilet,
- /area/awaymission/research/interior/bathroom))
+ var/static/list/bathroom_dirt_areas = typecacheof(/area/ship/crew/toilet)
if(is_type_in_typecache(A, bathroom_dirt_areas))
if(prob(40))
if(prob(90))
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index 3a0184849450..2d043371a9bb 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -135,7 +135,7 @@
icon_state = "fairygrass[rand(0,3)]"
/turf/open/floor/grass/fairy/beach
- baseturfs = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/asteroid/sand
planetary_atmos = TRUE
/turf/open/floor/grass/snow
diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
index 97f3772ec208..d38a0ca6956a 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -211,6 +211,8 @@
smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_GRASS)
canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_GRASS)
layer = HIGH_TURF_LAYER
+ icon_state = "grass0"
+ base_icon_state = "grass"
var/smooth_icon = 'icons/turf/floors/grass.dmi'
baseturfs = /turf/open/floor/ship/dirt
diff --git a/code/game/turfs/open/floor/plating/beach.dm b/code/game/turfs/open/floor/plating/beach.dm
index 88bb3bbcad1b..485a5cc58a8c 100644
--- a/code/game/turfs/open/floor/plating/beach.dm
+++ b/code/game/turfs/open/floor/plating/beach.dm
@@ -1,13 +1,15 @@
+///it's all sand....
+
/turf/open/floor/plating/asteroid/sand
name = "sand"
icon = 'icons/misc/beach.dmi'
icon_state = "sand"
base_icon_state = "sand"
baseturfs = /turf/open/floor/plating/asteroid/sand
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS //custom atmos? lots of oxygen, hot?
- digResult = /obj/item/stack/ore/glass
+ initial_gas_mix = OPENTURF_DEFAULT_ATMOS
planetary_atmos = TRUE
digResult = /obj/item/stack/ore/glass/beach
+ light_color = COLOR_BEACHPLANET_LIGHT
/turf/open/floor/plating/asteroid/sand/Initialize(mapload, inherited_virtual_z)
. = ..()
@@ -16,14 +18,20 @@
/turf/open/floor/plating/asteroid/sand/lit
light_range = 2
light_power = 0.80
- light_color = LIGHT_COLOR_TUNGSTEN
/turf/open/floor/plating/asteroid/sand/dense
icon_state = "light_sand"
- planetary_atmos = TRUE
base_icon_state = "light_sand"
/turf/open/floor/plating/asteroid/sand/dense/lit
light_range = 2
light_power = 0.80
- light_color = LIGHT_COLOR_TUNGSTEN
+
+/turf/open/floor/plating/grass/beach
+ baseturfs = /turf/open/floor/plating/asteroid/sand
+ light_color = COLOR_BEACHPLANET_LIGHT
+ planetary_atmos = TRUE
+
+/turf/open/floor/plating/grass/beach/lit
+ light_range = 2
+ light_power = 0.80
diff --git a/code/game/turfs/open/floor/plating/icemoon.dm b/code/game/turfs/open/floor/plating/icemoon.dm
index 0fd0d95faed3..12a1c340edfa 100644
--- a/code/game/turfs/open/floor/plating/icemoon.dm
+++ b/code/game/turfs/open/floor/plating/icemoon.dm
@@ -17,6 +17,7 @@
bullet_sizzle = TRUE
bullet_bounce_sound = null
digResult = /obj/item/stack/sheet/mineral/snow
+ light_color = COLOR_ICEPLANET_LIGHT
// footprint vars
var/entered_dirs
var/exited_dirs
@@ -87,19 +88,17 @@
. = ..()
ScrapeAway()
+/turf/open/floor/plating/asteroid/snow/icemoon
+ baseturfs = /turf/open/openspace/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+
+ slowdown = 0
+
/turf/open/floor/plating/asteroid/snow/lit
light_range = 2
light_power = 1
baseturfs = /turf/open/floor/plating/asteroid/icerock/lit
-/turf/open/floor/plating/asteroid/snow/lit/whitesands
- baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit
- initial_gas_mix = WHITESANDS_ATMOS
-
-/turf/open/floor/plating/asteroid/snow/lit/rockplanet
- baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit
- initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
-
/turf/open/floor/plating/asteroid/snow/airless
initial_gas_mix = AIRLESS_ATMOS
@@ -142,6 +141,7 @@
floor_variance = 100
max_icon_states = 7
dug = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
/turf/open/floor/plating/asteroid/icerock/lit
light_range = 2
@@ -183,21 +183,17 @@
floor_variance = 100
max_icon_states = 7
dug = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
/turf/open/floor/plating/asteroid/iceberg/lit
light_range = 2
light_power = 1
-
-/turf/open/floor/plating/asteroid/snow/icemoon
- baseturfs = /turf/open/openspace/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
- slowdown = 0
-
/turf/open/lava/plasma/ice_moon
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
baseturfs = /turf/open/lava/plasma/ice_moon
planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
/turf/open/floor/plating/asteroid/snow/ice
name = "icy snow"
@@ -213,6 +209,8 @@
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
max_icon_states = 7
+ light_color = COLOR_ICEPLANET_LIGHT
+
/turf/open/floor/plating/asteroid/snow/ice/icemoon
baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
diff --git a/code/game/turfs/open/floor/plating/jungle.dm b/code/game/turfs/open/floor/plating/jungle.dm
new file mode 100644
index 000000000000..79121704001c
--- /dev/null
+++ b/code/game/turfs/open/floor/plating/jungle.dm
@@ -0,0 +1,57 @@
+/turf/open/floor/plating/dirt/jungle
+ slowdown = 0.5
+ baseturfs = /turf/open/floor/plating/dirt/jungle
+ initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ light_color = COLOR_JUNGLEPLANET_LIGHT
+
+/turf/open/floor/plating/dirt/jungle/lit
+ baseturfs = /turf/open/floor/plating/dirt/jungle/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/plating/dirt/jungle/dark
+ icon_state = "greenerdirt"
+ baseturfs = /turf/open/floor/plating/dirt/jungle/dark
+
+/turf/open/floor/plating/dirt/jungle/dark/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/plating/dirt/jungle/wasteland //Like a more fun version of living in Arizona.
+ name = "cracked earth"
+ desc = "Looks a bit dry."
+ icon = 'icons/turf/floors.dmi'
+ icon_state = "wasteland"
+ slowdown = 1
+ baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland
+ var/floor_variance = 15
+
+/turf/open/floor/plating/dirt/jungle/wasteland/lit
+ baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/plating/dirt/jungle/wasteland/Initialize(mapload, inherited_virtual_z)
+ .=..()
+ if(prob(floor_variance))
+ icon_state = "[initial(icon_state)][rand(0,12)]"
+
+/turf/open/floor/plating/grass/jungle
+ name = "jungle grass"
+ planetary_atmos = TRUE
+ desc = "Greener on the other side."
+ icon_state = "junglegrass"
+ base_icon_state = "junglegrass"
+ smooth_icon = 'icons/turf/floors/junglegrass.dmi'
+ baseturfs = /turf/open/floor/plating/grass/jungle
+ light_color = COLOR_JUNGLEPLANET_LIGHT
+
+/turf/open/floor/plating/grass/jungle/lit
+ baseturfs = /turf/open/floor/plating/dirt/jungle/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/water/jungle/lit
+ light_range = 2
+ light_power = 0.8
+ light_color = LIGHT_COLOR_BLUEGREEN
diff --git a/code/game/turfs/open/floor/plating/lavaland.dm b/code/game/turfs/open/floor/plating/lavaland.dm
index 84e0173819b7..b15f76eabcc2 100644
--- a/code/game/turfs/open/floor/plating/lavaland.dm
+++ b/code/game/turfs/open/floor/plating/lavaland.dm
@@ -1,3 +1,5 @@
+///baseturf
+
/turf/open/floor/plating/asteroid/basalt
name = "volcanic floor"
baseturfs = /turf/open/floor/plating/asteroid/basalt
@@ -7,11 +9,11 @@
base_icon_state = "basalt"
floor_variance = 15
digResult = /obj/item/stack/ore/glass/basalt
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
/turf/open/floor/plating/asteroid/basalt/lava //lava underneath
baseturfs = /turf/open/lava/smooth
@@ -26,11 +28,9 @@
/proc/set_basalt_light(turf/open/floor/B)
switch(B.icon_state)
if("basalt1", "basalt2", "basalt3")
- B.set_light(2, 0.6, LIGHT_COLOR_LAVA) //more light
+ B.set_light(2, 0.6, COLOR_LAVAPLANET_LIGHT) //more light
if("basalt5", "basalt9")
- B.set_light(1.4, 0.6, LIGHT_COLOR_LAVA) //barely anything!
-
-///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground.
+ B.set_light(1.4, 0.6, COLOR_LAVAPLANET_LIGHT) //barely anything!
/turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
@@ -47,7 +47,8 @@
/turf/open/floor/plating/asteroid/basalt/purple/lit
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+
+///Sand
/turf/open/floor/plating/asteroid/purple
name = "ashen sand"
@@ -57,11 +58,13 @@
turf_type = /turf/open/floor/plating/asteroid/basalt/purple
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plating/asteroid/purple/lit
light_range = 2
light_power = 0.3
- light_color = LIGHT_COLOR_FIRE
+
+///Grass
/turf/open/floor/plating/grass/lava
name = "ungodly grass"
@@ -75,7 +78,7 @@
smooth_icon = 'icons/turf/floors/lava_grass_red.dmi'
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
gender = PLURAL
/turf/open/floor/plating/grass/lava/orange
@@ -88,44 +91,68 @@
icon = 'icons/turf/floors/lava_grass_purple.dmi'
smooth_icon = 'icons/turf/floors/lava_grass_purple.dmi'
+///The Moss
+/turf/open/floor/plating/moss
+ name = "mossy carpet"
+ desc = "When the forests burned away and the sky grew dark, the moss learned to feed on the falling ash."
+ baseturfs = /turf/open/floor/plating/ashplanet //explosions and damage can destroy the moss
+ initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ icon_state = "moss"
+ icon = 'icons/turf/lava_moss.dmi'
+ base_icon_state = "moss"
+ bullet_bounce_sound = null
+ footstep = FOOTSTEP_GRASS
+ barefootstep = FOOTSTEP_GRASS
+ clawfootstep = FOOTSTEP_GRASS
+ heavyfootstep = FOOTSTEP_GENERIC_HEAVY
+ layer = HIGH_TURF_LAYER
+ gender = PLURAL
+ light_power = 1
+ light_range = 2
+ pixel_x = -9
+ pixel_y = -9
+
+///Ruin Turfs (to-do, move all ruin turfs into their own bespoke files)
+
/turf/open/floor/concrete/pavement/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/concrete/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/concrete/slab_1/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plating/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plating/rust/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plasteel/white/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
/turf/open/floor/plasteel/dark/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
- light_color = LIGHT_COLOR_FIRE
+ light_color = COLOR_LAVAPLANET_LIGHT
diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
index 84a49d1a0038..684420c8eb89 100644
--- a/code/game/turfs/open/floor/plating/misc_plating.dm
+++ b/code/game/turfs/open/floor/plating/misc_plating.dm
@@ -116,61 +116,6 @@
icon_state = "[icon_state][rand(1, 9)]"
. = ..()
-
-/turf/open/floor/plating/beach
- name = "beach"
- icon = 'icons/misc/beach.dmi'
- flags_1 = NONE
- attachment_holes = FALSE
- bullet_bounce_sound = null
- footstep = FOOTSTEP_SAND
- barefootstep = FOOTSTEP_SAND
- clawfootstep = FOOTSTEP_SAND
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
-
-/turf/open/floor/plating/beach/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
- return
-
-/turf/open/floor/plating/beach/ex_act(severity, target)
- contents_explosion(severity, target)
-
-/turf/open/floor/plating/beach/sand
- gender = PLURAL
- name = "sand"
- desc = "Surf's up."
- icon_state = "sand"
- baseturfs = /turf/open/floor/plating/beach/sand
-
-/turf/open/floor/plating/beach/coastline_t
- name = "coastline"
- desc = "Tide's high tonight. Charge your batons."
- icon_state = "sandwater_t"
- baseturfs = /turf/open/floor/plating/beach/coastline_t
-
-/turf/open/floor/plating/beach/coastline_b //need to make this water subtype.
- name = "coastline"
- icon_state = "sandwater_b"
- baseturfs = /turf/open/floor/plating/beach/coastline_b
- footstep = FOOTSTEP_LAVA
- barefootstep = FOOTSTEP_LAVA
- clawfootstep = FOOTSTEP_LAVA
- heavyfootstep = FOOTSTEP_LAVA
-
-/turf/open/floor/plating/beach/water
- gender = PLURAL
- name = "water"
- desc = "You get the feeling that nobody's bothered to actually make this water functional..."
- icon_state = "water"
- baseturfs = /turf/open/floor/plating/beach/water
- footstep = FOOTSTEP_LAVA //placeholder, kinda.
- barefootstep = FOOTSTEP_LAVA
- clawfootstep = FOOTSTEP_LAVA
- heavyfootstep = FOOTSTEP_LAVA
-
-/turf/open/floor/plating/beach/coastline_t/sandwater_inner
- icon_state = "sandwater_inner"
- baseturfs = /turf/open/floor/plating/beach/coastline_t/sandwater_inner
-
/turf/open/floor/plating/ironsand
gender = PLURAL
name = "iron sand"
@@ -331,33 +276,3 @@
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
tiled_dirt = FALSE
-/turf/open/floor/plating/grass/beach
- baseturfs = /turf/open/floor/plating/beach/sand
- planetary_atmos = TRUE
-
-/turf/open/floor/plating/grass/beach/lit
- light_range = 2
- light_power = 0.80
-
-
-
-/turf/open/floor/plating/moss
- name = "mossy carpet"
- desc = "When the forests burned away and the sky grew dark, the moss learned to feed on the falling ash."
- baseturfs = /turf/open/floor/plating/ashplanet //explosions and damage can destroy the moss
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
- planetary_atmos = TRUE
- icon_state = "moss"
- icon = 'icons/turf/lava_moss.dmi'
- base_icon_state = "moss"
- bullet_bounce_sound = null
- footstep = FOOTSTEP_GRASS
- barefootstep = FOOTSTEP_GRASS
- clawfootstep = FOOTSTEP_GRASS
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- layer = HIGH_TURF_LAYER
- gender = PLURAL
- light_power = 1
- light_range = 2
- pixel_x = -9
- pixel_y = -9
diff --git a/code/game/turfs/open/floor/plating/planet.dm b/code/game/turfs/open/floor/plating/planet.dm
index a86847ca8f78..f360ac611267 100644
--- a/code/game/turfs/open/floor/plating/planet.dm
+++ b/code/game/turfs/open/floor/plating/planet.dm
@@ -20,70 +20,11 @@
/turf/open/floor/plating/dirt/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
return
-/turf/open/floor/plating/dirt/jungle
- slowdown = 0.5
- baseturfs = /turf/open/floor/plating/dirt/jungle
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-
-/turf/open/floor/plating/dirt/jungle/lit
- baseturfs = /turf/open/floor/plating/dirt/jungle/lit
- light_range = 2
- light_power = 1
- light_color = COLOR_VERY_LIGHT_GRAY
-
-/turf/open/floor/plating/dirt/jungle/dark
- icon_state = "greenerdirt"
- baseturfs = /turf/open/floor/plating/dirt/jungle/dark
-
-/turf/open/floor/plating/dirt/jungle/dark/lit
- light_range = 2
- light_power = 1
-
-/turf/open/floor/plating/dirt/jungle/wasteland //Like a more fun version of living in Arizona.
- name = "cracked earth"
- desc = "Looks a bit dry."
- icon = 'icons/turf/floors.dmi'
- icon_state = "wasteland"
- slowdown = 1
- baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland
- var/floor_variance = 15
-
-/turf/open/floor/plating/dirt/jungle/wasteland/lit
- baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland/lit
- light_range = 2
- light_power = 1
-
-
-/turf/open/floor/plating/dirt/jungle/wasteland/Initialize(mapload, inherited_virtual_z)
- .=..()
- if(prob(floor_variance))
- icon_state = "[initial(icon_state)][rand(0,12)]"
-
/turf/open/floor/plating/dirt/icemoon
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
baseturfs = /turf/open/floor/plating/dirt/icemoon
planetary_atmos = TRUE
-/turf/open/floor/plating/grass/jungle
- name = "jungle grass"
- planetary_atmos = TRUE
- desc = "Greener on the other side."
- icon_state = "junglegrass"
- base_icon_state = "junglegrass"
- baseturfs = /turf/open/floor/plating/dirt/jungle
- smooth_icon = 'icons/turf/floors/junglegrass.dmi'
- baseturfs = /turf/open/floor/plating/grass/jungle
-
-/turf/open/floor/plating/grass/jungle/lit
- baseturfs = /turf/open/floor/plating/dirt/jungle/lit
- light_range = 2
- light_power = 1
-
-/turf/open/water/jungle/lit
- light_range = 2
- light_power = 0.8
- light_color = LIGHT_COLOR_BLUEGREEN
-
/turf/open/floor/plating/dirt/old
icon_state = "oldsmoothdirt"
@@ -98,8 +39,26 @@
light_power = 1
light_range = 2
-
/turf/open/floor/plating/dirt/dry/lit
light_power = 1
light_range = 2
+
+//Artifical sand turfs
+/turf/open/floor/plating/asteroid/sand/ship
+ name = "sand"
+ icon = 'icons/misc/beach.dmi'
+ icon_state = "sand"
+ base_icon_state = "sand"
+ baseturfs = /turf/open/floor/plating
+ initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ planetary_atmos = FALSE
+ digResult = null
+
+//artifical water turfs
+/turf/open/water/ship
+ icon = 'icons/misc/beach.dmi'
+ icon_state = "water"
+ base_icon_state = "water"
+ initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ planetary_atmos = FALSE
diff --git a/code/game/turfs/open/floor/plating/rockplanet.dm b/code/game/turfs/open/floor/plating/rockplanet.dm
index b6324ebbb3d8..9bc21c8778c6 100644
--- a/code/game/turfs/open/floor/plating/rockplanet.dm
+++ b/code/game/turfs/open/floor/plating/rockplanet.dm
@@ -9,11 +9,11 @@
baseturfs = /turf/open/floor/plating/asteroid/rockplanet
turf_type = /turf/open/floor/plating/asteroid/rockplanet
digResult = /obj/item/stack/ore/glass/rockplanet
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/plating/asteroid/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
/turf/open/floor/plating/asteroid/rockplanet/cracked
name = "iron cracked sand"
@@ -25,7 +25,6 @@
/turf/open/floor/plating/asteroid/rockplanet/cracked/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit
turf_type = /turf/open/floor/plating/asteroid/rockplanet/lit
@@ -45,83 +44,101 @@
/turf/open/floor/plating/asteroid/rockplanet/wet/cracked/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
+
+//start crackhead subtyping (open reward of 1 erika token to anyone who untangles this somewhat)
/turf/open/floor/plating/grass/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
name = "dry grass"
desc = "A patch of dry grass."
/turf/open/floor/plating/dirt/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
name = "mud"
icon_state = "greenerdirt"
/turf/open/water/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
name = "pond"
/turf/open/floor/plating/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
name = "exterior plating"
/turf/open/floor/plating/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
/turf/open/floor/plasteel/stairs/rockplanet
- initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
name = "exterior stairs"
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/engine/hull/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+//i hope whoever subtyped all the rockplanet tiles like this stubs their toe so hard.
/turf/open/floor/plasteel/rockplanet
- initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
name = "exterior floor"
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/plasteel/patterned/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/plasteel/patterned/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
name = "exterior floor"
/turf/open/floor/plasteel/patterned/brushed/rockplanet
+ name = "exterior floor"
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/plasteel/patterned/brushed/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
- name = "exterior floor"
/turf/open/floor/plasteel/patterned/ridged/rockplanet
+ name = "exterior floor"
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/plasteel/patterned/ridged/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
- name = "exterior floor"
/turf/open/floor/plating/rust/rockplanet
+ name = "exterior plating"
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/plating/rust/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
- name = "exterior plating"
/turf/open/floor/wood/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/pod/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/engine/hull/reinforced/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+///snow
+/turf/open/floor/plating/asteroid/snow/lit/rockplanet
+ light_color = COLOR_ROCKPLANET_LIGHT
+ baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
diff --git a/code/game/turfs/open/floor/plating/wasteplanet.dm b/code/game/turfs/open/floor/plating/wasteplanet.dm
index d47a1fbfc6cb..6de774313697 100644
--- a/code/game/turfs/open/floor/plating/wasteplanet.dm
+++ b/code/game/turfs/open/floor/plating/wasteplanet.dm
@@ -1,3 +1,4 @@
+///base turf
/turf/open/floor/plating/asteroid/wasteplanet
name = "dry rock"
@@ -9,20 +10,18 @@
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
digResult = /obj/item/stack/ore/glass/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
-/turf/open/water/tar/waste
- baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
- planetary_atmos = TRUE
- initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+/turf/open/floor/plating/asteroid/wasteplanet/lit
+ light_range = 2
+ light_power = 0.2
+
+///plating turfs
/turf/open/floor/plating/wasteplanet
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
-
-/turf/open/floor/plating/rust/wasteplanet
- baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
- planetary_atmos = TRUE
- initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/plating/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return
@@ -35,21 +34,20 @@
/turf/open/indestructible/hierophant/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/indestructible/hierophant/two/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/wood/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
-///Cement Turfs
-
/turf/open/floor/concrete/wasteplanet
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
@@ -69,6 +67,7 @@
/turf/open/floor/concrete/reinforced/wasteplanet
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
@@ -77,6 +76,7 @@
/turf/open/floor/concrete/pavement/wasteplanet
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
@@ -84,22 +84,84 @@
return
/turf/open/floor/plasteel/wasteplanet
+ baseturfs = /turf/open/floor/plating/wasteplanet
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/plasteel/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return
/turf/open/floor/plasteel/dark/wasteplanet
+ baseturfs = /turf/open/floor/plating/wasteplanet
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/plasteel/dark/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return
-//cement
+
+/turf/open/floor/wood/waste
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/indestructible/hierophant/waste
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/indestructible/hierophant/two/waste
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+
+
+
+///liquids
+
+/turf/open/water/waste
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/water/tar/waste
+ baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ planetary_atmos = TRUE
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/water/tar/waste/lit
+ light_range = 2
+ light_power = 0.2
+
+///biological-ish turfs
+
+/turf/open/floor/plating/grass/wasteplanet
+ icon_state = "junglegrass"
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/plating/dirt/old/waste
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/plating/grass/wasteplanet/lit
+ light_range = 2
+ light_power = 0.2
+
+/turf/open/floor/plating/dirt/old/waste/lit
+ light_range = 2
+ light_power = 0.2
+
+///cement turfs
/turf/open/floor/concrete/wasteplanet
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/concrete/wasteplanet/Initialize()
. = ..()
@@ -119,6 +181,7 @@
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/concrete/reinforced/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return
@@ -127,90 +190,79 @@
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/concrete/pavement/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return
+
+
+///Biological Turfs
+
+/turf/open/floor/plating/grass/wasteplanet
+ icon_state = "junglegrass"
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+/turf/open/floor/plating/dirt/old/waste
+ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
+
+
+
+
+
+
//open turfs then open lits.
/turf/open/floor/plating/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
/turf/open/floor/plating/wasteplanet/rust/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
/turf/open/floor/plating/asteroid/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
/turf/open/water/tar/waste/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
/turf/open/floor/concrete/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/concrete/reinforced/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/concrete/pavement/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
-
-///Biological Turfs
-
-/turf/open/floor/plating/grass/wasteplanet
- icon_state = "junglegrass"
- initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
- planetary_atmos = TRUE
-
-/turf/open/floor/plating/dirt/old/waste
- initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
- planetary_atmos = TRUE
- baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/plating/dirt/old/waste/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/floor/plating/grass/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
/turf/open/water/waste/lit //do not drink
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
-
-//cement
-
-/turf/open/floor/concrete/wasteplanet/lit
- light_range = 2
- light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
-
-/turf/open/floor/concrete/reinforced/wasteplanet/lit
- light_range = 2
- light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
-
-/turf/open/floor/concrete/pavement/wasteplanet/lit
- light_range = 2
- light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
//closed turfs are a thing
/turf/closed/wall/r_wall/wasteplanet
diff --git a/code/game/turfs/open/floor/plating/whitesands.dm b/code/game/turfs/open/floor/plating/whitesands.dm
index 6d7d0e3343f9..2607d6f174c0 100644
--- a/code/game/turfs/open/floor/plating/whitesands.dm
+++ b/code/game/turfs/open/floor/plating/whitesands.dm
@@ -1,3 +1,5 @@
+///sand (but not like the other sand that's also called sand)
+
/turf/open/floor/plating/asteroid/whitesands
name = "salted sand"
baseturfs = /turf/open/floor/plating/asteroid/whitesands
@@ -6,13 +8,13 @@
icon_plating = "sand"
planetary_atmos = TRUE
base_icon_state = WHITESANDS_SAND_ENV
- initial_gas_mix = WHITESANDS_ATMOS //Fallback, and used to tell the AACs that this is the exterior
+ initial_gas_mix = WHITESANDS_ATMOS
digResult = /obj/item/stack/ore/glass/whitesands
+ light_color = COLOR_SANDPLANET_LIGHT
/turf/open/floor/plating/asteroid/whitesands/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit
/turf/open/floor/plating/asteroid/whitesands/dried
@@ -29,11 +31,9 @@
/turf/open/floor/plating/asteroid/whitesands/dried/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried/lit
-/turf/open/floor/plating/grass/whitesands
- initial_gas_mix = WHITESANDS_ATMOS
+///basalt
/turf/open/floor/plating/asteroid/basalt/whitesands
initial_gas_mix = WHITESANDS_ATMOS
@@ -42,11 +42,14 @@
icon_state = "whitesands_basalt0"
icon_plating = "whitesands_basalt0"
dug = TRUE
+ light_color = COLOR_SANDPLANET_LIGHT
/turf/open/floor/plating/asteroid/basalt/whitesands/Initialize(mapload, inherited_virtual_z)
. = ..()
icon_state = "whitesands_basalt[rand(0,1)]"
+///grass
+
/turf/open/floor/plating/asteroid/whitesands/grass
name = "purple grass"
desc = "The few known flora on Whitesands are in a purplish color."
@@ -60,6 +63,7 @@
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_GRASS)
canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_GRASS)
+ light_color = COLOR_SANDPLANET_LIGHT
/turf/open/floor/plating/asteroid/whitesands/grass/Initialize(mapload, inherited_virtual_z)
. = ..()
@@ -80,3 +84,50 @@
/turf/open/floor/plating/asteroid/whitesands/grass/dead/lit
light_power = 1
light_range = 2
+
+///the singular snow tile:
+
+/turf/open/floor/plating/asteroid/snow/lit/whitesands
+ light_color = COLOR_SANDPLANET_LIGHT
+ baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit
+ initial_gas_mix = WHITESANDS_ATMOS
+
+/turf/open/floor/concrete/whitesands
+ initial_gas_mix = WHITESANDS_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/concrete/whitesands/lit
+ light_range = 2
+ light_power = 0.6
+
+/turf/open/floor/concrete/reinforced/whitesands
+ initial_gas_mix = WHITESANDS_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/concrete/reinforced/whitesands/lit
+ light_range = 2
+ light_power = 0.6
+
+/turf/open/floor/concrete/pavement/whitesands
+ initial_gas_mix = WHITESANDS_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/concrete/pavement/whitesands/lit
+ light_range = 2
+ light_power = 0.6
+
+/turf/open/floor/concrete/slab_1/whitesands
+ initial_gas_mix = WHITESANDS_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/concrete/slab_1/whitesands/lit
+ light_range = 2
+ light_power = 0.6
+
+/turf/open/floor/plating/whitesands
+ initial_gas_mix = WHITESANDS_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/plating/whitesands/lit
+ light_range = 2
+ light_power = 0.6
diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm
index d6bbba359303..f90d0fb72185 100644
--- a/code/modules/antagonists/traitor/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/syndicate_contract.dm
@@ -149,7 +149,7 @@
C = H.get_bankcard()
if(C && C.registered_account)
- C.registered_account.adjust_money(ransom * 0.35, "syndicate_contract")
+ C.registered_account.adjust_money(ransom * 0.35, CREDIT_LOG_SYNDICATE_CONTRACT)
C.registered_account.bank_card_talk("We've processed the ransom, agent. Here's your cut - your balance is now \
[C.registered_account.account_balance] cr.", TRUE)
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 8dbb1dc98b61..cdb2f8991406 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -11,6 +11,7 @@
throw_speed = 2
throw_range = 7
+ ///set both of these or neither.
var/obj/item/assembly/a_left = null
var/obj/item/assembly/a_right = null
@@ -21,6 +22,18 @@
)
AddElement(/datum/element/connect_loc, loc_connections)
+ //if we want to spawn an holder pre-configured.
+ if(a_left && a_right)
+ var/obj/item/assembly/left = new a_left(src)
+ var/obj/item/assembly/right = new a_right(src)
+ //i love byond
+ a_left = null
+ a_right = null
+ assemble(left, right, null)
+ a_left.secured = TRUE
+ a_right.secured = TRUE
+ update_appearance()
+
/obj/item/assembly_holder/ComponentInitialize()
. = ..()
var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS
@@ -29,7 +42,6 @@
/obj/item/assembly_holder/IsAssemblyHolder()
return TRUE
-
/obj/item/assembly_holder/proc/assemble(obj/item/assembly/A, obj/item/assembly/A2, mob/user)
attach(A,user)
attach(A2,user)
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 08b603058563..1162f1d3b6cf 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -7,7 +7,9 @@
drop_sound = 'sound/items/handling/component_drop.ogg'
pickup_sound = 'sound/items/handling/component_pickup.ogg'
var/scanning = FALSE
+ ///is the assembly arming itself?
var/timing = FALSE
+ ///seconds until the assembly arms itself
var/time = 10
var/sensitivity = 1
var/hearing_range = 3
@@ -16,11 +18,12 @@
/obj/item/assembly/prox_sensor/Initialize()
. = ..()
- proximity_monitor = new(src, 0)
+ proximity_monitor = new(src, 0, FALSE)
START_PROCESSING(SSobj, src)
/obj/item/assembly/prox_sensor/Destroy()
STOP_PROCESSING(SSobj, src)
+ QDEL_NULL(proximity_monitor)
. = ..()
/obj/item/assembly/prox_sensor/examine(mob/user)
@@ -37,6 +40,15 @@
update_appearance()
return TRUE
+/obj/item/assembly/prox_sensor/on_attach()
+ . = ..()
+ // Pick the first valid object in this list:
+ // Wiring datum's owner
+ // assembly holder's attached object
+ // assembly holder itself
+ // us
+ proximity_monitor.set_host(connected?.holder || holder?.master || holder || src, src)
+
/obj/item/assembly/prox_sensor/on_detach()
. = ..()
if(!.)
@@ -153,3 +165,11 @@
value = round(time + value)
time = clamp(value, 0, 600)
. = TRUE
+
+/obj/item/assembly/prox_sensor/preset
+ sensitivity = 2
+ hearing_range = 3
+
+/obj/item/assembly/prox_sensor/preset/Initialize()
+ . = ..()
+ toggle_scan(!scanning)
diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm
index 84f1a5040015..dfa77c24aebb 100644
--- a/code/modules/assembly/voice.dm
+++ b/code/modules/assembly/voice.dm
@@ -103,6 +103,10 @@
. = ..()
listening = FALSE
+/obj/item/assembly/voice/preset
+ mode = 1
+ recorded = "example phrase"
+
#undef INCLUSIVE_MODE
#undef EXCLUSIVE_MODE
#undef RECOGNIZER_MODE
diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm
index 221febbe14d4..84170c1b78ed 100644
--- a/code/modules/asset_cache/asset_list.dm
+++ b/code/modules/asset_cache/asset_list.dm
@@ -124,8 +124,6 @@ GLOBAL_LIST_EMPTY(asset_datums)
for(var/size_id in sizes)
.["[name]_[size_id].png"] = SSassets.transport.get_asset_url("[name]_[size_id].png")
-
-
/datum/asset/spritesheet/proc/ensure_stripped(sizes_to_strip = sizes)
for(var/size_id in sizes_to_strip)
var/size = sizes[size_id]
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index d233b74ee69c..9acdab838e8b 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -110,7 +110,6 @@
"stamp-law" = 'icons/stamp_icons/large_stamp-law.png',
"stamp-chap" = 'icons/stamp_icons/large_stamp-chap.png',
"stamp-mime" = 'icons/stamp_icons/large_stamp-mime.png',
- "stamp-centcom" = 'icons/stamp_icons/large_stamp-centcom.png',
"stamp-syndicate" = 'icons/stamp_icons/large_stamp-syndicate.png',
"stamp-solgov" = 'icons/stamp_icons/large_stamp-solgov.png',
"stamp-inteq" = 'icons/stamp_icons/large_stamp-inteq.png',
@@ -128,7 +127,21 @@
"stamp-ngr_cap" = 'icons/stamp_icons/large_stamp-ngr_captain.png',
"stamp-ngr_fore" = 'icons/stamp_icons/large_stamp-ngr_foreman.png',
"stamp-ngr_lieu" = 'icons/stamp_icons/large_stamp-ngr_lieutenant.png',
- "stamp-ngr_ensign" = 'icons/stamp_icons/large_stamp-ngr_ensign.png'
+ "stamp-ngr_ensign" = 'icons/stamp_icons/large_stamp-ngr_ensign.png',
+ "stamp-nt" = 'icons/stamp_icons/large_stamp-nt_generic.png',
+ "stamp-nt_cap" = 'icons/stamp_icons/large_stamp-nt_captain.png',
+ "stamp-nt_fo" = 'icons/stamp_icons/large_stamp-nt_officer.png',
+ "stamp-nt_engdir" = 'icons/stamp_icons/large_stamp-nt_eng_dir.png',
+ "stamp-nt_meddir" = 'icons/stamp_icons/large_stamp-nt_med_dir.png',
+ "stamp-nt_scidir" = 'icons/stamp_icons/large_stamp-nt_sci_dir.png',
+ "stamp-ns" = 'icons/stamp_icons/large_stamp-ns_generic.png',
+ "stamp-ns_cap" = 'icons/stamp_icons/large_stamp-ns_captain.png',
+ "stamp-ns_supdir" = 'icons/stamp_icons/large_stamp-ns_sup_dir.png',
+ "stamp-vi" = 'icons/stamp_icons/large_stamp-vi_generic.png',
+ "stamp-vi_cap" = 'icons/stamp_icons/large_stamp-vi_captain.png',
+ "stamp-vi_secdir" = 'icons/stamp_icons/large_stamp-vi_sec_dir.png',
+ "stamp-vi_lp" = 'icons/stamp_icons/large_stamp-vi_loss_prevention.png',
+ "stamp-nt_central" = 'icons/stamp_icons/large_stamp-nt_central.png'
)
/datum/asset/simple/fuckywucky
@@ -162,30 +175,15 @@
)
parents = list("font-awesome.css" = 'html/font-awesome/css/all.min.css')
-/datum/asset/simple/namespaced/tgfont
- assets = list(
- "tgfont.eot" = file("tgui/packages/tgfont/static/tgfont.eot"),
- "tgfont.woff2" = file("tgui/packages/tgfont/static/tgfont.woff2"),
- )
- parents = list(
- "tgfont.css" = file("tgui/packages/tgfont/static/tgfont.css"),
- )
-
/datum/asset/simple/fonts
assets = list(
"sga.ttf" = 'html/sga.ttf'
)
-/// Override this in order to start the creation of the spritehseet.
-/// This is where all your Insert, InsertAll, etc calls should be inside.
-/datum/asset/spritesheet/proc/create_spritesheets()
- SHOULD_CALL_PARENT(FALSE)
- CRASH("create_spritesheets() not implemented for [type]!")
-
/datum/asset/spritesheet/chat
name = "chat"
-/datum/asset/spritesheet/chat/create_spritesheets()
+/datum/asset/spritesheet/chat/register()
InsertAll("emoji", EMOJI_SET)
// pre-loading all lanugage icons also helps to avoid meta
InsertAll("language", 'icons/misc/language.dmi')
@@ -196,6 +194,7 @@
if (icon != 'icons/misc/language.dmi')
var/icon_state = initial(L.icon_state)
Insert("language-[icon_state]", icon, icon_state=icon_state)
+ ..()
/datum/asset/simple/lobby
assets = list(
@@ -443,8 +442,8 @@
/datum/asset/spritesheet/fish
name = "fish"
-/datum/asset/spritesheet/fish/create_spritesheets()
- for (var/path in subtypesof(/obj/item/fish))
+/datum/asset/spritesheet/fish/register()
+ for(var/path in subtypesof(/obj/item/fish))
var/obj/item/fish/fish_type = path
var/fish_icon = initial(fish_type.icon)
var/fish_icon_state = initial(fish_type.icon_state)
diff --git a/code/modules/atmospherics/auxgm/breathing_classes.dm b/code/modules/atmospherics/auxgm/breathing_classes.dm
index cfc82adbffa1..10f76d19d528 100644
--- a/code/modules/atmospherics/auxgm/breathing_classes.dm
+++ b/code/modules/atmospherics/auxgm/breathing_classes.dm
@@ -23,8 +23,9 @@
/datum/breathing_class/oxygen
gases = list(
GAS_O2 = 1,
- GAS_PLUOXIUM = 8,
+ GAS_O3 = -0.7,
GAS_CO2 = -0.7, // CO2 isn't actually toxic, just an asphyxiant
+ GAS_ARGON = -1,
)
products = list(
GAS_CO2 = 1,
diff --git a/code/modules/atmospherics/auxgm/gas_types.dm b/code/modules/atmospherics/auxgm/gas_types.dm
index 662b88046956..c42c3981214b 100644
--- a/code/modules/atmospherics/auxgm/gas_types.dm
+++ b/code/modules/atmospherics/auxgm/gas_types.dm
@@ -1,6 +1,6 @@
/datum/gas/oxygen
id = GAS_O2
- specific_heat = 20
+ specific_heat = 30
name = "Oxygen"
oxidation_temperature = T0C - 100 // it checks max of this and fire temperature, so rarely will things spontaneously combust
breath_alert_info = list(
@@ -16,7 +16,7 @@
/datum/gas/nitrogen
id = GAS_N2
- specific_heat = 20
+ specific_heat = 30
name = "Nitrogen"
breath_alert_info = list(
not_enough_alert = list(
@@ -29,6 +29,14 @@
)
)
+/datum/gas/carbon_monoxide
+ id = GAS_CO
+ specific_heat = 30
+ name = "Carbon Monoxide"
+ breath_results = GAS_CO
+
+ flags = GAS_FLAG_DANGEROUS
+
/datum/gas/carbon_dioxide //what the fuck is this?
id = GAS_CO2
specific_heat = 30
@@ -64,29 +72,26 @@
alert_type = /atom/movable/screen/alert/too_much_tox
)
)
- fire_burn_rate = OXYGEN_BURN_RATE_BASE // named when plasma fires were the only fires, surely
+ fire_burn_rate = PLASMA_BURN_RATE_BASE // named when plasma fires were the only fires, surely
fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST
fire_products = FIRE_PRODUCT_PLASMA
enthalpy = FIRE_PLASMA_ENERGY_RELEASED // 3000000, 3 megajoules, 3000 kj
+ odor = GAS_ODOR_SMOG
+ odor_emotes = TRUE
+ odor_power = 10 //extremely toxic
+
/datum/gas/water_vapor
id = GAS_H2O
- specific_heat = 40
+ specific_heat = 75
name = "Water Vapor"
gas_overlay = "water_vapor"
moles_visible = MOLES_GAS_VISIBLE
flags = GAS_FLAG_DANGEROUS
fusion_power = 8
- enthalpy = -241800 // FIRE_HYDROGEN_ENERGY_RELEASED is actually what this was supposed to be
+ enthalpy = -285800 // FIRE_HYDROGEN_ENERGY_RELEASED is actually what this was supposed to be
breath_reagent = /datum/reagent/water
-/datum/gas/hypernoblium
- id = GAS_HYPERNOB
- specific_heat = 2000
- name = "Hyper-noblium"
- gas_overlay = "freon"
- moles_visible = MOLES_GAS_VISIBLE
-
/datum/gas/nitrous_oxide
id = GAS_NITROUS
specific_heat = 40
@@ -99,18 +104,6 @@
oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 100
enthalpy = 81600
-/datum/gas/nitryl
- id = GAS_NITRYL
- specific_heat = 20
- name = "Nitryl"
- color = "#963"
- moles_visible = MOLES_GAS_VISIBLE
- flags = GAS_FLAG_DANGEROUS
- fusion_power = 15
- fire_products = list(GAS_N2 = 0.5)
- enthalpy = 33200
- oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50
-
/datum/gas/tritium
id = GAS_TRITIUM
specific_heat = 10
@@ -125,7 +118,7 @@
fire_radiation_released = 50 // arbitrary number, basically 60 moles of trit burning will just barely start to harm you
fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50
-/datum/gas/bz
+/datum/gas/bz //remove from atmospheres // https://en.wikipedia.org/wiki/3-Quinuclidinyl_benzilate not sure why we have this
id = GAS_BZ
specific_heat = 20
name = "BZ"
@@ -133,20 +126,29 @@
fusion_power = 8
enthalpy = FIRE_CARBON_ENERGY_RELEASED // it is a mystery
-/datum/gas/stimulum
- id = GAS_STIMULUM
- specific_heat = 5
- name = "Stimulum"
- fusion_power = 7
-
-/datum/gas/pluoxium
- id = GAS_PLUOXIUM
- specific_heat = 80
- name = "Pluoxium"
- fusion_power = 10
- oxidation_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST * 1000 // it is VERY stable
- oxidation_rate = 8 // when it can oxidize, it can oxidize a LOT
- enthalpy = -50000 // but it reduces the heat output a bit
+/datum/gas/ozone
+ id = GAS_O3
+ specific_heat = 30
+ name = "Ozone"
+ gas_overlay = "water_vapor"
+ moles_visible = MOLES_GAS_VISIBLE
+ color = "#a1a1e6"
+ oxidation_temperature = T0C - 100 // it checks max of this and fire temperature, so rarely will things spontaneously combust
+ oxidation_rate = 3
+ enthalpy = 142000
+
+ odor = GAS_ODOR_CHEMICAL
+ odor_emotes = TRUE
+ odor_power = 1
+
+
+/datum/gas/argon
+ id = GAS_ARGON
+ specific_heat = 20
+ name = "Argon"
+ gas_overlay = "water_vapor"
+ oxidation_rate = -1
+ //moles_visible = MOLES_GAS_VISIBLE
/datum/gas/freon
id = GAS_FREON
@@ -161,7 +163,7 @@
specific_heat = 10
name = "Hydrogen"
flags = GAS_FLAG_DANGEROUS
- moles_visible = MOLES_GAS_VISIBLE
+ //moles_visible = MOLES_GAS_VISIBLE
color = "#ffe"
fusion_power = 0
fire_products = list(GAS_H2O = 1)
@@ -171,10 +173,12 @@
/datum/gas/chlorine
id = GAS_CHLORINE
- specific_heat = 20
+ specific_heat = 30
name = "Chlorine"
flags = GAS_FLAG_DANGEROUS
moles_visible = MOLES_GAS_VISIBLE * 5
+ oxidation_temperature = T0C - 100
+ oxidation_rate = 0.5
gas_overlay = "nitrous_oxide"
color = "#FFFB89"
fusion_power = 0
@@ -192,3 +196,48 @@
enthalpy = 63000
fire_burn_rate = 1
fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST
+
+/datum/gas/sulfur_dioxide
+ id = GAS_SO2
+ specific_heat = 22
+ name = "Sulfur Dioxide"
+ flags = GAS_FLAG_DANGEROUS
+ moles_visible = MOLES_GAS_VISIBLE * 40
+ gas_overlay = "generic"
+ color = "#d4cb28"
+ enthalpy = -296800
+
+ odor = GAS_ODOR_SULFUR
+ odor_emotes = TRUE
+ odor_power = 1
+
+/datum/gas/methane
+ id = GAS_METHANE
+ specific_heat = 35
+ name = "Methane"
+ flags = GAS_FLAG_DANGEROUS
+ //moles_visible = MOLES_GAS_VISIBLE
+ color = "#ffe"
+ fusion_power = 0
+ fire_products = list(GAS_H2O = 0.5, GAS_HYDROGEN = 1)
+ enthalpy = -74600
+ fire_burn_rate = 2
+ fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50
+
+/datum/gas/ammonia
+ id = GAS_AMMONIA
+
+ specific_heat = 100 //used as a coolant
+ name = "Ammonia"
+ flags = GAS_FLAG_DANGEROUS
+ moles_visible = MOLES_GAS_VISIBLE
+ color = "#ffe"
+ gas_overlay = "nitrous_oxide"
+ fusion_power = 0
+ fire_products = list(GAS_N2 = 0.2, GAS_H2O = 0.8)
+ enthalpy = -46000
+ fire_burn_rate = 0.2
+
+ odor = GAS_ODOR_CHEMICAL
+ odor_emotes = TRUE
+ odor_power = 3
diff --git a/code/modules/atmospherics/gasmixtures/auxgm.dm b/code/modules/atmospherics/gasmixtures/auxgm.dm
index e774d1060ec3..e2f873c9dfd0 100644
--- a/code/modules/atmospherics/gasmixtures/auxgm.dm
+++ b/code/modules/atmospherics/gasmixtures/auxgm.dm
@@ -1,5 +1,5 @@
GLOBAL_LIST_INIT(hardcoded_gases, list(GAS_O2, GAS_N2, GAS_CO2, GAS_PLASMA)) //the main four gases, which were at one time hardcoded
-GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(GAS_O2, GAS_N2, GAS_CO2, GAS_PLUOXIUM, GAS_STIMULUM, GAS_NITRYL, GAS_CHLORINE, GAS_HYDROGEN_CHLORIDE))) //unable to react amongst themselves
+GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(GAS_O2, GAS_N2, GAS_CO2, GAS_CHLORINE, GAS_HYDROGEN_CHLORIDE))) //unable to react amongst themselves
// Auxgm
// It's a send-up of XGM, like what baystation got.
@@ -38,25 +38,48 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(GAS_O2, GAS_N2, GAS_CO2, GA
/datum/gas
var/id = ""
+ /// heat capacity? thats the only explanation on what this var is
var/specific_heat = 0
var/name = ""
- var/gas_overlay = "generic" //icon_state in icons/effects/atmospherics.dmi
- var/color = "#ffff" // Tints the overlay by this color. Use instead of gas_overlay, usually (but not necessarily).
+ ///icon_state in icons/effects/atmospherics.dmi
+ var/gas_overlay = "generic"
+ /// Tints the overlay by this color. Use instead of gas_overlay, usually (but not necessarily).
+ var/color = "#ffff"
var/moles_visible = null
- var/flags = NONE //currently used by canisters
- var/group = null // groups for scrubber/filter listing
- var/fusion_power = 0 // How much the gas destabilizes a fusion reaction
- var/breath_results = GAS_CO2 // what breathing this breathes out
- var/datum/reagent/breath_reagent = null // what breathing this adds to your reagents
- var/datum/reagent/breath_reagent_dangerous = null // what breathing this adds to your reagents IF it's above a danger threshold
- var/list/breath_alert_info = null // list for alerts that pop up when you have too much/not enough of something
- var/oxidation_temperature = null // temperature above which this gas is an oxidizer; null for none
- var/oxidation_rate = 1 // how many moles of this can oxidize how many moles of material
- var/fire_temperature = null // temperature above which gas may catch fire; null for none
- var/list/fire_products = null // what results when this gas is burned (oxidizer or fuel); null for none
- var/enthalpy = 0 // Standard enthalpy of formation in joules, used for fires
- var/fire_burn_rate = 1 // how many moles are burned per product released
- var/fire_radiation_released = 0 // How much radiation is released when this gas burns
+ ///currently used by canisters
+ var/flags = NONE
+ /// groups for scrubber/filter listing
+ var/group = null
+ /// How much the gas destabilizes a fusion reaction
+ var/fusion_power = 0
+ /// what breathing this breathes out
+ var/breath_results = GAS_CO2
+ /// what breathing this adds to your reagents
+ var/datum/reagent/breath_reagent = null
+ /// what breathing this adds to your reagents IF it's above a danger threshold
+ var/datum/reagent/breath_reagent_dangerous = null
+ /// list for alerts that pop up when you have too much/not enough of something
+ var/list/breath_alert_info = null
+ /// temperature above which this gas is an oxidizer; null for none
+ var/oxidation_temperature = null
+ /// how much a single mole of this gas can oxidize another mole(s) of gas
+ var/oxidation_rate = 1
+ /// temperature above which gas may catch fire; null for none
+ var/fire_temperature = null
+ /// what results when this gas is burned (oxidizer or fuel); null for none
+ var/list/fire_products = null
+ /// Standard enthalpy of formation in joules, used for fires
+ var/enthalpy = 0
+ /// how many moles are burned per product released
+ var/fire_burn_rate = 1
+ /// How much radiation is released when this gas burns
+ var/fire_radiation_released = 0
+ ///a list of odor texts this gas gives, if null or odor_power is 0 this gas is smellless
+ var/list/odor
+ ///if the odor gives negative signs such as coughing on a high concentratation. if your gas doesn't have a noticeable scent, set this to false
+ var/odor_emotes = TRUE
+ ///the multiplier per of this gas's odor, if higher its easily detected in lower conentrations and much more unbearable at lower conentrations as well
+ var/odor_power = 0
/datum/gas/proc/breath(partial_pressure, light_threshold, heavy_threshold, moles, mob/living/carbon/C, obj/item/organ/lungs/lungs)
// This is only called on gases with the GAS_FLAG_BREATH_PROC flag. When possible, do NOT use this--
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index b824c1d78d61..10c4e9e417d0 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -45,15 +45,15 @@
/datum/gas_reaction/proc/test()
return list("success" = TRUE)
-/datum/gas_reaction/nobliumsupression
+/datum/gas_reaction/argon
priority = INFINITY
- name = "Hyper-Noblium Reaction Suppression"
+ name = "Noble Gas Reaction Suppression"
id = "nobstop"
-/datum/gas_reaction/nobliumsupression/init_reqs()
- min_requirements = list(GAS_HYPERNOB = REACTION_OPPRESSION_THRESHOLD)
+/datum/gas_reaction/argon/init_reqs()
+ min_requirements = list(GAS_ARGON = REACTION_OPPRESSION_THRESHOLD)
-/datum/gas_reaction/nobliumsupression/react()
+/datum/gas_reaction/argon/react()
return STOP_REACTIONS
//water vapor: puts out fires?
@@ -223,7 +223,7 @@
else
temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE)
if(temperature_scale > 0)
- oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale
+ oxygen_burn_rate = PLASMA_BURN_RATE_BASE - temperature_scale
if(air.get_moles(GAS_O2) / air.get_moles(GAS_PLASMA) > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium.
super_saturation = TRUE
if(air.get_moles(GAS_O2) > air.get_moles(GAS_PLASMA)*PLASMA_OXYGEN_FULLBURN)
@@ -312,7 +312,7 @@
else
temperature_scale = (FREON_MAXIMUM_BURN_TEMPERATURE - temperature)/(FREON_MAXIMUM_BURN_TEMPERATURE - FREON_LOWER_TEMPERATURE) //calculate the scale based on the temperature
if(temperature_scale >= 0)
- oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale
+ oxygen_burn_rate = PLASMA_BURN_RATE_BASE - temperature_scale
if(air.get_moles(GAS_O2) > air.get_moles(GAS_FREON)*FREON_OXYGEN_FULLBURN)
freon_burn_rate = (air.get_moles(GAS_FREON)*temperature_scale)/FREON_BURN_RATE_DELTA
else
@@ -521,33 +521,7 @@
air.set_temperature(clamp(thermal_energy/new_heat_capacity, TCMB, INFINITY)) //THIS SHOULD STAY OR FUSION WILL EAT YOUR FACE
return REACTING
-/datum/gas_reaction/fusion/test()
- var/datum/gas_mixture/G = new
- G.set_moles(GAS_CO2,300)
- G.set_moles(GAS_PLASMA,1000)
- G.set_moles(GAS_TRITIUM,100.61)
- G.set_moles(GAS_NITRYL,1)
- G.set_temperature(15000)
- G.set_volume(1000)
-
- var/result = G.react()
- if(result != REACTING)
- return list("success" = FALSE, "message" = "Reaction didn't go at all!")
-
- var/instability = G.analyzer_results["fusion"]
- var/plas = G.get_moles(GAS_PLASMA)
- var/co2 = G.get_moles(GAS_CO2)
- var/temp = G.return_temperature()
-
- if(abs(instability - 2.66) > 0.01)
- return list("success" = FALSE, "message" = "Fusion is not calculating analyzer results correctly, should be 2.66, is instead [instability]")
- if(abs(plas - 458.241) > 0.5)
- return list("success" = FALSE, "message" = "Fusion is not calculating plasma correctly, should be 458.241, is instead [plas]")
- if(abs(co2 - 505.369) > 0.5)
- return list("success" = FALSE, "message" = "Fusion is not calculating co2 correctly, should be 505.369, is instead [co2]")
- if(abs(temp - 112291) > 200) // I'm not calculating this at all just putting in the values I get when I do it now
- return list("success" = FALSE, "message" = "Fusion is not calculating temperature correctly, should be around 112291, is instead [temp]")
- return ..()
+//has fusion ever worked?
/datum/gas_reaction/nitrousformation //formationn of n2o, esothermic, requires bz as catalyst
priority = 3
@@ -581,51 +555,6 @@
air.set_temperature(max(((temperature * old_heat_capacity + energy_used) / new_heat_capacity),TCMB)) //the air heats up when reacting
return REACTING
-/datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst.
- priority = 4
- name = "Nitryl formation"
- id = "nitrylformation"
-
-/datum/gas_reaction/nitrylformation/init_reqs()
- min_requirements = list(
- GAS_O2 = 20,
- GAS_N2 = 20,
- GAS_NITROUS = 5,
- "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*25
- )
-
-/datum/gas_reaction/nitrylformation/react(datum/gas_mixture/air)
- var/temperature = air.return_temperature()
-
- var/old_heat_capacity = air.heat_capacity()
- var/heat_efficency = min(temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*100),air.get_moles(GAS_O2),air.get_moles(GAS_N2))
- var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY
- if ((air.get_moles(GAS_O2) - heat_efficency < 0)|| (air.get_moles(GAS_N2) - heat_efficency < 0)) //Shouldn't produce gas from nothing.
- return NO_REACTION
- air.adjust_moles(GAS_O2, -heat_efficency)
- air.adjust_moles(GAS_N2, -heat_efficency)
- air.adjust_moles(GAS_NITRYL, heat_efficency*2)
-
- if(energy_used > 0)
- var/new_heat_capacity = air.heat_capacity()
- if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
- air.set_temperature(max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB))
- return REACTING
-
-/datum/gas_reaction/nitrylformation/test()
- var/datum/gas_mixture/G = new
- G.set_moles(GAS_O2,30)
- G.set_moles(GAS_N2,30)
- G.set_moles(GAS_NITROUS,10)
- G.set_volume(1000)
- G.set_temperature(150000)
- var/result = G.react()
- if(result != REACTING)
- return list("success" = FALSE, "message" = "Reaction didn't go at all!")
- if(G.get_moles(GAS_NITRYL) < 0.8)
- return list("success" = FALSE, "message" = "Nitryl isn't being generated correctly! Only [G.get_moles(GAS_BZ)] mols were produced, when there should be 0.8!")
- return ..()
-
/datum/gas_reaction/bzformation //Formation of BZ by combining plasma and tritium at low pressures. Exothermic.
priority = 5
name = "BZ Gas formation"
@@ -702,130 +631,6 @@
air.set_temperature(max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB))
return REACTING
-/datum/gas_reaction/stimformation //Stimulum formation follows a strange pattern of how effective it will be at a given temperature, having some multiple peaks and some large dropoffs. Exo and endo thermic.
- priority = 7
- name = "Stimulum formation"
- id = "stimformation"
-
-/datum/gas_reaction/stimformation/init_reqs()
- min_requirements = list(
- GAS_TRITIUM = 30,
- GAS_PLASMA = 10,
- GAS_BZ = 20,
- GAS_NITRYL = 30,
- "TEMP" = STIMULUM_HEAT_SCALE/2)
-
-/datum/gas_reaction/stimformation/react(datum/gas_mixture/air)
- var/old_heat_capacity = air.heat_capacity()
- var/heat_scale = min(air.return_temperature()/STIMULUM_HEAT_SCALE,air.get_moles(GAS_TRITIUM),air.get_moles(GAS_PLASMA),air.get_moles(GAS_NITRYL))
- var/stim_energy_change = heat_scale + STIMULUM_FIRST_RISE*(heat_scale**2) - STIMULUM_FIRST_DROP*(heat_scale**3) + STIMULUM_SECOND_RISE*(heat_scale**4) - STIMULUM_ABSOLUTE_DROP*(heat_scale**5)
-
- if ((air.get_moles(GAS_TRITIUM) - heat_scale < 0)|| (air.get_moles(GAS_PLASMA) - heat_scale < 0) || (air.get_moles(GAS_NITRYL) - heat_scale < 0)) //Shouldn't produce gas from nothing.
- return NO_REACTION
- air.adjust_moles(GAS_STIMULUM, heat_scale/10)
- air.adjust_moles(GAS_TRITIUM, -heat_scale)
- air.adjust_moles(GAS_PLASMA, -heat_scale)
- air.adjust_moles(GAS_NITRYL, -heat_scale)
-
- if(stim_energy_change)
- var/new_heat_capacity = air.heat_capacity()
- if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
- air.set_temperature(max(((air.return_temperature()*old_heat_capacity + stim_energy_change)/new_heat_capacity),TCMB))
- return REACTING
-
-/datum/gas_reaction/stimformation/test()
- //above mentioned "strange pattern" is a basic quintic polynomial, it's fine, can calculate it manually
- var/datum/gas_mixture/G = new
- G.set_moles(GAS_BZ,30)
- G.set_moles(GAS_PLASMA,1000)
- G.set_moles(GAS_TRITIUM,1000)
- G.set_moles(GAS_NITRYL,1000)
- G.set_volume(1000)
- G.set_temperature(12998000) // yeah, really
-
- var/result = G.react()
- if(result != REACTING)
- return list("success" = FALSE, "message" = "Reaction didn't go at all!")
- if(!G.get_moles(GAS_STIMULUM))
- return list("success" = FALSE, "message" = "Stimulum isn't being generated!")
- return ..()
-
-/datum/gas_reaction/nobliumformation //Hyper-Noblium formation is extrememly endothermic, but requires high temperatures to start. Due to its high mass, hyper-nobelium uses large amounts of nitrogen and tritium. BZ can be used as a catalyst to make it less endothermic.
- priority = 8
- name = "Hyper-Noblium condensation"
- id = "nobformation"
-
-/datum/gas_reaction/nobliumformation/init_reqs()
- min_requirements = list(
- GAS_N2 = 10,
- GAS_TRITIUM = 5,
- "ENER" = NOBLIUM_FORMATION_ENERGY)
-
-/datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air)
- . = REACTING
- var/old_heat_capacity = air.heat_capacity()
- var/nob_formed = min((air.get_moles(GAS_N2)+air.get_moles(GAS_TRITIUM))/100,air.get_moles(GAS_TRITIUM)/10,air.get_moles(GAS_N2)/20)
- var/energy_taken = nob_formed*(NOBLIUM_FORMATION_ENERGY/(max(air.get_moles(GAS_BZ),1)))
- if ((air.get_moles(GAS_TRITIUM) - 10*nob_formed < 0) || (air.get_moles(GAS_N2) - 20*nob_formed < 0))
- return NO_REACTION
- air.adjust_moles(GAS_TRITIUM, -10*nob_formed)
- air.adjust_moles(GAS_N2, -20*nob_formed)
- air.adjust_moles(GAS_HYPERNOB,nob_formed)
-
- if (nob_formed)
- var/new_heat_capacity = air.heat_capacity()
- if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
- air.set_temperature(max(((air.return_temperature()*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB))
-
-/datum/gas_reaction/nobliumformation/test()
- var/datum/gas_mixture/G = new
- G.set_moles(GAS_N2,100)
- G.set_moles(GAS_TRITIUM,500)
- G.set_volume(1000)
- G.set_temperature(5000000) // yeah, really
- var/result = G.react()
- if(result != REACTING)
- return list("success" = FALSE, "message" = "Reaction didn't go at all!")
- return ..()
-
-/datum/gas_reaction/stim_ball
- priority = 9
- name ="Stimulum Energy Ball"
- id = "stimball"
-
-/datum/gas_reaction/stim_ball/init_reqs()
- min_requirements = list(
- GAS_PLUOXIUM = STIM_BALL_GAS_AMOUNT,
- GAS_STIMULUM = STIM_BALL_GAS_AMOUNT,
- GAS_NITRYL = MINIMUM_MOLE_COUNT,
- GAS_PLASMA = MINIMUM_MOLE_COUNT,
- "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST
- )
-
-/datum/gas_reaction/stim_ball/react(datum/gas_mixture/air, datum/holder)
- var/turf/open/location
- var/old_heat_capacity = air.heat_capacity()
- if(istype(holder,/datum/pipeline)) //Find the tile the reaction is occuring on, or a random part of the network if it's a pipenet.
- var/datum/pipeline/pipenet = holder
- location = get_turf(pick(pipenet.members))
- else
- location = get_turf(holder)
- var/ball_shot_angle = 180*cos(air.get_moles(GAS_H2O)/air.get_moles(GAS_NITRYL))+180
- var/stim_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(GAS_PLASMA),air.get_moles(GAS_STIMULUM))
- var/pluox_used = min(STIM_BALL_GAS_AMOUNT/air.get_moles(GAS_PLASMA),air.get_moles(GAS_PLUOXIUM))
- var/energy_released = stim_used*STIMULUM_HEAT_SCALE//Stimulum has a lot of stored energy, and breaking it up releases some of it
- location.fire_nuclear_particle(ball_shot_angle)
- air.adjust_moles(GAS_CO2, 4*pluox_used)
- air.adjust_moles(GAS_N2, 8*stim_used)
- air.adjust_moles(GAS_PLUOXIUM, -pluox_used)
- air.adjust_moles(GAS_STIMULUM, -stim_used)
- air.adjust_moles(GAS_PLASMA, max(-air.get_moles(GAS_PLASMA)/2,-30))
- if(energy_released)
- var/new_heat_capacity = air.heat_capacity()
- if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
- air.set_temperature(clamp((air.return_temperature()*old_heat_capacity + energy_released)/new_heat_capacity,TCMB,INFINITY))
- return REACTING
-
/datum/gas_reaction/hydrogen_chloride_formation
priority = 11
name = "Hydrogen Chloride formation"
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index efa0d7b332c4..0e9c7b2888f7 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -107,9 +107,9 @@
var/datum/radio_frequency/radio_connection
//anything outright hazardous (flammable, toxic, generally Weird)
- var/list/filter_basic = list(GAS_CO2, GAS_PLASMA, GAS_NITROUS, GAS_BZ, GAS_TRITIUM, GAS_NITRYL, GAS_FREON, GAS_HYDROGEN, GAS_CHLORINE, GAS_HYDROGEN_CHLORIDE)
+ var/list/filter_basic = list(GAS_CO2, GAS_PLASMA, GAS_NITROUS, GAS_BZ, GAS_TRITIUM, GAS_FREON, GAS_HYDROGEN, GAS_CHLORINE, GAS_HYDROGEN_CHLORIDE, GAS_CO, GAS_AMMONIA, GAS_METHANE, GAS_SO2, GAS_O3)
//anything that isn't o2 or n2.
- var/list/filter_extra = list(GAS_CO2, GAS_PLASMA, GAS_NITROUS, GAS_BZ, GAS_TRITIUM, GAS_NITRYL, GAS_FREON, GAS_HYDROGEN, GAS_CHLORINE, GAS_HYDROGEN_CHLORIDE, GAS_H2O, GAS_HYPERNOB, GAS_STIMULUM, GAS_PLUOXIUM)
+ var/list/filter_extra = list(GAS_CO2, GAS_PLASMA, GAS_NITROUS, GAS_BZ, GAS_TRITIUM, GAS_FREON, GAS_HYDROGEN, GAS_CHLORINE, GAS_HYDROGEN_CHLORIDE, GAS_H2O, GAS_CO, GAS_ARGON, GAS_AMMONIA, GAS_METHANE, GAS_SO2, GAS_O3)
var/list/TLV = list( // Breathable air.
"pressure" = new/datum/tlv(HAZARD_LOW_PRESSURE, WARNING_LOW_PRESSURE, WARNING_HIGH_PRESSURE, HAZARD_HIGH_PRESSURE), // kPa. Values are min2, min1, max1, max2
@@ -120,16 +120,18 @@
GAS_PLASMA = new/datum/tlv/dangerous,
GAS_NITROUS = new/datum/tlv/dangerous,
GAS_BZ = new/datum/tlv/dangerous,
- GAS_HYPERNOB = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic
GAS_H2O = new/datum/tlv/dangerous,
GAS_TRITIUM = new/datum/tlv/dangerous,
- GAS_STIMULUM = new/datum/tlv/dangerous,
- GAS_NITRYL = new/datum/tlv/dangerous,
- GAS_PLUOXIUM = new/datum/tlv(-1, -1, 5, 6), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires
GAS_FREON = new/datum/tlv/dangerous,
GAS_HYDROGEN = new/datum/tlv/dangerous,
GAS_CHLORINE = new/datum/tlv/dangerous,
- GAS_HYDROGEN_CHLORIDE = new/datum/tlv/dangerous
+ GAS_HYDROGEN_CHLORIDE = new/datum/tlv/dangerous,
+ GAS_CO = new/datum/tlv/dangerous,
+ GAS_ARGON = new/datum/tlv(-1, -1, 1000, 1000), //inert and nontoxic
+ GAS_AMMONIA = new/datum/tlv/dangerous,
+ GAS_METHANE = new/datum/tlv/dangerous,
+ GAS_SO2 = new/datum/tlv/dangerous,
+ GAS_O3 = new/datum/tlv/dangerous,
)
/obj/machinery/airalarm/server // No checks here.
@@ -142,16 +144,18 @@
GAS_PLASMA = new/datum/tlv/no_checks,
GAS_NITROUS = new/datum/tlv/no_checks,
GAS_BZ = new/datum/tlv/no_checks,
- GAS_HYPERNOB = new/datum/tlv/no_checks,
GAS_H2O = new/datum/tlv/no_checks,
GAS_TRITIUM = new/datum/tlv/no_checks,
- GAS_STIMULUM = new/datum/tlv/no_checks,
- GAS_NITRYL = new/datum/tlv/no_checks,
- GAS_PLUOXIUM = new/datum/tlv/no_checks,
GAS_FREON = new/datum/tlv/no_checks,
GAS_HYDROGEN = new/datum/tlv/no_checks,
GAS_CHLORINE = new/datum/tlv/dangerous,
- GAS_HYDROGEN_CHLORIDE = new/datum/tlv/dangerous
+ GAS_HYDROGEN_CHLORIDE = new/datum/tlv/dangerous,
+ GAS_CO = new/datum/tlv/dangerous,
+ GAS_ARGON = new/datum/tlv/no_checks,
+ GAS_AMMONIA = new/datum/tlv/no_checks,
+ GAS_METHANE = new/datum/tlv/no_checks,
+ GAS_SO2 = new/datum/tlv/no_checks,
+ GAS_O3 = new/datum/tlv/no_checks,
)
heating_manage = FALSE
@@ -165,16 +169,18 @@
GAS_PLASMA = new/datum/tlv/dangerous,
GAS_NITROUS = new/datum/tlv/dangerous,
GAS_BZ = new/datum/tlv/dangerous,
- GAS_HYPERNOB = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic
GAS_H2O = new/datum/tlv/dangerous,
GAS_TRITIUM = new/datum/tlv/dangerous,
- GAS_STIMULUM = new/datum/tlv/dangerous,
- GAS_NITRYL = new/datum/tlv/dangerous,
- GAS_PLUOXIUM = new/datum/tlv(-1, -1, 1000, 1000), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires
GAS_FREON = new/datum/tlv/dangerous,
GAS_HYDROGEN = new/datum/tlv/dangerous,
GAS_CHLORINE = new/datum/tlv/dangerous,
- GAS_HYDROGEN_CHLORIDE = new/datum/tlv/dangerous
+ GAS_HYDROGEN_CHLORIDE = new/datum/tlv/dangerous,
+ GAS_CO = new/datum/tlv/dangerous,
+ GAS_ARGON = new/datum/tlv(-1, -1, 1000, 1000), //inert and nontoxic
+ GAS_AMMONIA = new/datum/tlv/dangerous,
+ GAS_METHANE = new/datum/tlv/dangerous,
+ GAS_SO2 = new/datum/tlv/dangerous,
+ GAS_O3 = new/datum/tlv/dangerous,
)
heating_manage = FALSE
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index dc8b278959f6..55e397652e48 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -20,7 +20,7 @@
var/id_tag = null
var/scrubbing = SCRUBBING //0 = siphoning, 1 = scrubbing
- var/filter_types = list(GAS_CO2, GAS_BZ)
+ var/filter_types = list(GAS_CO2, GAS_BZ, GAS_CO)
var/volume_rate = 200
var/widenet = 0 //is this scrubber acting on the 3x3 area around it.
var/list/turf/adjacent_turfs = list()
@@ -310,10 +310,10 @@
icon_state = "scrub_map_on-4"
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/lavaland
- filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ)
+ filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ, GAS_CO)
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3/lavaland
- filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ)
+ filter_types = list(GAS_CO2, GAS_PLASMA, GAS_H2O, GAS_BZ, GAS_CO)
#undef SIPHONING
#undef SCRUBBING
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index cb6a1b9b0bb0..b8f023185217 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -43,14 +43,10 @@
"co2" = /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
"plasma" = /obj/machinery/portable_atmospherics/canister/toxins,
"n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
- "no2" = /obj/machinery/portable_atmospherics/canister/nitryl,
"bz" = /obj/machinery/portable_atmospherics/canister/bz,
"air" = /obj/machinery/portable_atmospherics/canister/air,
"water vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor,
"tritium" = /obj/machinery/portable_atmospherics/canister/tritium,
- "hyper-noblium" = /obj/machinery/portable_atmospherics/canister/nob,
- "stimulum" = /obj/machinery/portable_atmospherics/canister/stimulum,
- "pluoxium" = /obj/machinery/portable_atmospherics/canister/pluoxium,
"caution" = /obj/machinery/portable_atmospherics/canister,
"freon" = /obj/machinery/portable_atmospherics/canister/freon,
"hydrogen" = /obj/machinery/portable_atmospherics/canister/hydrogen,
@@ -78,12 +74,24 @@
icon_state = "blue"
gas_type = GAS_O2
+/obj/machinery/portable_atmospherics/canister/ozone
+ name = "ozone canister"
+ desc = "Ozone. Sometimes called as 'pure air', this is far from the truth; ozone is not good for your lungs nor heart."
+ icon_state = "darkblue"
+ gas_type = GAS_O3
+
/obj/machinery/portable_atmospherics/canister/carbon_dioxide
name = "co2 canister"
desc = "Carbon dioxide. What the fuck is carbon dioxide?"
icon_state = "black"
gas_type = GAS_CO2
+/obj/machinery/portable_atmospherics/canister/carbon_monoxide
+ name = "co canister"
+ desc = "Carbon Monoxide. Highly dangerous and invisible to the naked eye."
+ icon_state = "black"
+ gas_type = GAS_CO
+
/obj/machinery/portable_atmospherics/canister/toxins
name = "plasma canister"
desc = "Plasma gas. The reason YOU are here. Highly toxic."
@@ -113,29 +121,11 @@
icon_state = "green"
gas_type = GAS_TRITIUM
-/obj/machinery/portable_atmospherics/canister/nob
- name = "hyper-noblium canister"
- desc = "Hyper-Noblium. More noble than all other gases."
- icon_state = "nob"
- gas_type = GAS_HYPERNOB
-
-/obj/machinery/portable_atmospherics/canister/nitryl
- name = "nitryl canister"
- desc = "Nitryl gas. Feels great 'til the acid eats your lungs."
- icon_state = "brown"
- gas_type = GAS_NITRYL
-
-/obj/machinery/portable_atmospherics/canister/stimulum
- name = "stimulum canister"
- desc = "Stimulum. High energy gas, high energy people."
- icon_state = "darkpurple"
- gas_type = GAS_STIMULUM
-
-/obj/machinery/portable_atmospherics/canister/pluoxium
- name = "pluoxium canister"
- desc = "Pluoxium. Like oxygen, but more bang for your buck."
- icon_state = "darkblue"
- gas_type = GAS_PLUOXIUM
+/obj/machinery/portable_atmospherics/canister/argon
+ name = "argon canister"
+ desc = "Argon. A noble gas that prevents other gases from reacting."
+ icon_state = "purple"
+ gas_type = GAS_ARGON
/obj/machinery/portable_atmospherics/canister/water_vapor
name = "water vapor canister"
@@ -157,6 +147,24 @@
icon_state = "orangews"
gas_type = GAS_HYDROGEN
+/obj/machinery/portable_atmospherics/canister/methane
+ name = "methane canister"
+ desc = "Methane. Used in thruster fuel along with kitchen stoves."
+ icon_state = "methane"
+ gas_type = GAS_METHANE
+
+/obj/machinery/portable_atmospherics/canister/ammonia
+ name = "ammonia canister"
+ desc = "Ammonia. Used in industrial processes."
+ icon_state = "brown"
+ gas_type = GAS_AMMONIA
+
+/obj/machinery/portable_atmospherics/canister/sulfur_dioxide
+ name = "sulfur dioxide canister"
+ desc = "Sulfur Dioxide. Produced naturally by volcanos."
+ icon_state = "sulfurdioxide"
+ gas_type = GAS_SO2
+
/obj/machinery/portable_atmospherics/canister/fuel
name = "fuel canister"
desc = "A highly volatile mix of hydrogen and oxygen."
@@ -194,7 +202,6 @@
air_contents.set_moles(GAS_CO2,300)
air_contents.set_moles(GAS_PLASMA,1000)
air_contents.set_moles(GAS_TRITIUM,100.61)
- air_contents.set_moles(GAS_NITRYL,1)
air_contents.set_temperature(15000)
/obj/machinery/portable_atmospherics/canister/proc/get_time_left()
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 7505d2b8789e..1f1f34782aca 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -8,7 +8,7 @@
var/volume_rate = 1000
var/overpressure_m = 80
var/use_overlays = TRUE
- var/list/scrubbing = list(GAS_PLASMA, GAS_CO2, GAS_NITROUS, GAS_BZ, GAS_NITRYL, GAS_TRITIUM, GAS_HYPERNOB, GAS_H2O, GAS_FREON, GAS_HYDROGEN)
+ var/list/scrubbing = list(GAS_PLASMA, GAS_CO2, GAS_NITROUS, GAS_BZ, GAS_TRITIUM, GAS_H2O, GAS_FREON, GAS_HYDROGEN, GAS_CO)
/obj/machinery/portable_atmospherics/scrubber/Destroy()
var/turf/T = get_turf(src)
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index 850d0e91ba09..bddf8561f588 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -1,66 +1,3 @@
-
-//Academy Areas
-
-/area/awaymission/academy
- name = "Academy Asteroids"
- icon_state = "away"
-
-/area/awaymission/academy/headmaster
- name = "Academy Fore Block"
- icon_state = "away1"
-
-/area/awaymission/academy/classrooms
- name = "Academy Classroom Block"
- icon_state = "away2"
-
-/area/awaymission/academy/academyaft
- name = "Academy Ship Aft Block"
- icon_state = "away3"
-
-/area/awaymission/academy/academygate
- name = "Academy Gateway"
- icon_state = "away4"
-
-/area/awaymission/academy/academycellar
- name = "Academy Cellar"
- icon_state = "away4"
-
-/area/awaymission/academy/academyengine
- name = "Academy Engine"
- icon_state = "away4"
-
-//Academy Items
-
-/obj/item/paper/fluff/awaymissions/academy/console_maint
- name = "Console Maintenance"
- default_raw_text = "We're upgrading to the latest mainframes for our consoles, the shipment should be in before spring break is over!"
-
-/obj/item/paper/fluff/awaymissions/academy/class/automotive
- name = "Automotive Repair 101"
-
-/obj/item/paper/fluff/awaymissions/academy/class/pyromancy
- name = "Pyromancy 250"
-
-/obj/item/paper/fluff/awaymissions/academy/class/biology
- name = "Biology Lab"
-
-/obj/item/paper/fluff/awaymissions/academy/grade/aplus
- name = "Summoning Midterm Exam"
- default_raw_text = "Grade: A+ Educator's Notes: Excellent form."
-
-/obj/item/paper/fluff/awaymissions/academy/grade/bminus
- name = "Summoning Midterm Exam"
- default_raw_text = "Grade: B- Educator's Notes: Keep applying yourself, you're showing improvement."
-
-/obj/item/paper/fluff/awaymissions/academy/grade/dminus
- name = "Summoning Midterm Exam"
- default_raw_text = "Grade: D- Educator's Notes: SEE ME AFTER CLASS."
-
-/obj/item/paper/fluff/awaymissions/academy/grade/failure
- name = "Pyromancy Evaluation"
- default_raw_text = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons. Suggest additional tutelage."
-
-
/obj/singularity/academy
dissipate = 0
move_self = 0
diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm
index bfbb8bbf52ea..2e289579be1a 100644
--- a/code/modules/awaymissions/mission_code/Cabin.dm
+++ b/code/modules/awaymissions/mission_code/Cabin.dm
@@ -1,40 +1,3 @@
-
-/*Cabin areas*/
-/area/awaymission/cabin
- name = "Cabin"
- icon_state = "away2"
- requires_power = TRUE
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
-/area/awaymission/cabin/snowforest
- name = "Snow Forest"
- icon_state = "away"
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-
-/area/awaymission/cabin/snowforest/sovietsurface
- name = "Snow Forest"
- icon_state = "awaycontent29"
- requires_power = FALSE
-
-/area/awaymission/cabin/lumbermill
- name = "Lumbermill"
- icon_state = "away3"
- requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-
-/area/awaymission/cabin/caves/sovietcave
- name = "Soviet Bunker"
- icon_state = "awaycontent4"
-
-/area/awaymission/cabin/caves
- name = "North Snowdin Caves"
- icon_state = "awaycontent15"
- dynamic_lighting = DYNAMIC_LIGHTING_FORCED
-
-/area/awaymission/cabin/caves/mountain
- name = "North Snowdin Mountains"
- icon_state = "awaycontent24"
-
/obj/structure/firepit
name = "firepit"
desc = "Warm and toasty."
diff --git a/code/modules/awaymissions/mission_code/caves.dm b/code/modules/awaymissions/mission_code/caves.dm
deleted file mode 100644
index abaaceefd604..000000000000
--- a/code/modules/awaymissions/mission_code/caves.dm
+++ /dev/null
@@ -1,61 +0,0 @@
-//Areas
-
-/area/awaymission/caves/BMP_asteroid
- name = "\improper BMP Asteroid Level 1"
- icon_state = "awaycontent1"
-
-/area/awaymission/caves/BMP_asteroid/level_two
- name = "\improper BMP Asteroid Level 2"
- icon_state = "awaycontent2"
-
-/area/awaymission/caves/BMP_asteroid/level_three
- name = "\improper BMP Asteroid Level 3"
- icon_state = "awaycontent3"
-
-/area/awaymission/caves/BMP_asteroid/level_four
- name = "\improper BMP Asteroid Level 4"
- icon_state = "awaycontent4"
-
-/area/awaymission/caves/research
- name = "Research Outpost"
- icon_state = "awaycontent5"
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
-/area/awaymission/caves/northblock //engineering, bridge (not really north but it doesnt really need its own APC)
-
-/area/awaymission/caves/listeningpost
- name = "Listening Post"
- icon_state = "awaycontent6"
- requires_power = FALSE
-
-//caves papers
-
-/obj/item/paper/crumpled/awaymissions/caves/unsafe_area
- default_raw_text = "
WARNING
Majority of this area is considered 'unsafe' past this point. Theres an outpost directly south of here where you can get your bearing and travel further down if needed. Traveling in groups is HIGHLY advised, the shit out there can be extremely deadly if you're alone.
Subject appears unresponsive to most interactions, refusing to move away from the corners or face any scientists. Subject appears to move between the two back corners every observation. A strange humming can be heard from inside the cell, appears to be originating from the subject itself, further testing is necessary to confirm or deny this.
Mining is hell down here, you can feel the heat of the magma no matter how thick the suit is. Conditions are barely manageable as is, restless nights and horrid work conditions. The ore maybe rich down here, but we've already lost a few men to the faults shifting, god knows how much longer till it all just collapses down and consumes everyone with it.
The caves are an unforgiving place, the only thing you'll have to traverse is the supplies in your locker and your own wit. Travel in packs when mining and try to shut down the monster dens before they overwhelm you. The job is dangerous but the haul is good, so remember this information and hopefully we'll all go home alive.
We were supposed to get a shipment of these special laser rifles and a couple 'nades to help combat the wildlife down here, but it's been weeks since we last heard from the caravan carrying the shit down here. At this point we can only assume they fell victim to one of the monster nests or the dumbasses managed to trip into the lava. So much for that shipment, I guess.
Some of the miners have gone to laying some mine traps among the lower levels of the mine to keep the monsters at bay. This probably isn't the smartest idea in a cavern like this but the boys seem to get a chuckle out of every distant blast they hear go off, so I guess it works
Although you may seem indestructible in an exosuit, remember, THIS SHIT ISN'T LAVA PROOF!! The boys have already had to deal with loosing the last two to salvage because the dumbass thought he could just wade through the lower lakes like it was nothing. The fact he even managed to get back without being fused with what was left of the exosuit is a miracle in itself. They're built to be resistant against extreme heat, not heat PROOF!
Robotics Team"
diff --git a/code/modules/awaymissions/mission_code/centcomAway.dm b/code/modules/awaymissions/mission_code/centcomAway.dm
index 60741701b4d8..8c55a870263b 100644
--- a/code/modules/awaymissions/mission_code/centcomAway.dm
+++ b/code/modules/awaymissions/mission_code/centcomAway.dm
@@ -1,39 +1,3 @@
-//centcomAway areas
-
-/area/awaymission/centcomAway
- name = "XCC-P5831"
- icon_state = "away"
- requires_power = FALSE
-
-/area/awaymission/centcomAway/general
- name = "XCC-P5831"
- ambientsounds = list('sound/ambience/ambigen3.ogg')
-
-/area/awaymission/centcomAway/maint
- name = "XCC-P5831 Maintenance"
- icon_state = "away1"
- ambientsounds = list('sound/ambience/ambisin1.ogg')
-
-/area/awaymission/centcomAway/thunderdome
- name = "XCC-P5831 Thunderdome"
- icon_state = "away2"
- ambientsounds = list('sound/ambience/ambisin2.ogg')
-
-/area/awaymission/centcomAway/cafe
- name = "XCC-P5831 Kitchen Arena"
- icon_state = "away3"
- ambientsounds = list('sound/ambience/ambisin3.ogg')
-
-/area/awaymission/centcomAway/courtroom
- name = "XCC-P5831 Courtroom"
- icon_state = "away4"
- ambientsounds = list('sound/ambience/ambisin4.ogg')
-
-/area/awaymission/centcomAway/hangar
- name = "XCC-P5831 Hangars"
- icon_state = "away4"
- ambientsounds = list('sound/ambience/ambigen5.ogg')
-
//centcomAway items
/obj/item/paper/pamphlet/centcom/visitor_info
@@ -47,17 +11,3 @@
serving as a supply and repair depot, as well as being host to its most important legal proceedings\
and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE. \
We hope you enjoy your stay!"
-
-/obj/item/paper/fluff/awaymissions/centcom/gateway_memo
- name = "Memo to XCC-P5831 QM"
- default_raw_text = "From: XCC-P5831 Management Office \
- To: Rolf Ingram, XCC-P5831 Quartermaster \
- Hey, Rolf, once you pack that gateway into the ferry hangar, make absolutely sure \
- to deactivate it! As you may know, SS13 has recently got its network up and running, \
- which means that until we get this gate shipped off to the next colonization staging \
- area, they'll be able to hop straight in here if its hooked up on our end. \
- Obviously, that's something I'd very much rather avoid. Our forensics and medical \
- teams never did figure out what happened that last time... and I can't wrap my head \
- around it myself. Why would a shuttle full of evacuees all snap and beat each other \
- to death the moment they reached safety? \
- - D. Cereza"
diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm
index 6f8bb473b77a..9e8abe6356b6 100644
--- a/code/modules/awaymissions/mission_code/challenge.dm
+++ b/code/modules/awaymissions/mission_code/challenge.dm
@@ -1,20 +1,3 @@
-//Challenge Areas
-
-/area/awaymission/challenge/start
- name = "Where Am I?"
- icon_state = "away"
-
-/area/awaymission/challenge/main
- name = "Danger Room"
- icon_state = "away1"
- requires_power = FALSE
-
-/area/awaymission/challenge/end
- name = "Administration"
- icon_state = "away2"
- requires_power = FALSE
-
-
/obj/machinery/power/emitter/energycannon
name = "Energy Cannon"
desc = "A heavy duty industrial laser."
diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm
index 914a1f2828c7..10bb96c12baa 100644
--- a/code/modules/awaymissions/mission_code/murderdome.dm
+++ b/code/modules/awaymissions/mission_code/murderdome.dm
@@ -1,8 +1,3 @@
-/area/awaymission/vr/murderdome
- name = "Murderdome"
- icon_state = "awaycontent8"
- pacifist = FALSE
-
/obj/structure/window/reinforced/fulltile/indestructable
name = "robust window"
flags_1 = PREVENT_CLICK_UNDER_1 | NODECONSTRUCT_1
diff --git a/code/modules/awaymissions/mission_code/research.dm b/code/modules/awaymissions/mission_code/research.dm
deleted file mode 100644
index b3e4ff8b863b..000000000000
--- a/code/modules/awaymissions/mission_code/research.dm
+++ /dev/null
@@ -1,69 +0,0 @@
-//Research Base Areas//--
-
-/area/awaymission/research
- name = "Research Outpost"
- icon_state = "away"
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
-/area/awaymission/research/interior
- name = "Research Inside"
- requires_power = TRUE
- icon_state = "away2"
-
-/area/awaymission/research/interior/cryo
- name = "Research Cryostasis Room"
- icon_state = "medbay"
-
-/area/awaymission/research/interior/clonestorage
- name = "Research Clone Storage"
- icon_state = "cloning"
-
-/area/awaymission/research/interior/genetics
- name = "Research Genetics Research"
- icon_state = "genetics"
-
-/area/awaymission/research/interior/engineering
- name = "Research Engineering"
- icon_state = "engine"
-
-/area/awaymission/research/interior/security
- name = "Research Security"
- icon_state = "security"
-
-/area/awaymission/research/interior/secure
- name = "Research Secure Vault"
-
-/area/awaymission/research/interior/maint
- name = "Research Maintenance"
- icon_state = "maintcentral"
-
-/area/awaymission/research/interior/dorm
- name = "Research Dorms"
- icon_state = "Sleep"
-
-/area/awaymission/research/interior/escapepods
- name = "Research Escape Wing"
- icon_state = "exit"
-
-/area/awaymission/research/interior/gateway
- name = "Research Gateway"
- icon_state = "start"
-
-/area/awaymission/research/interior/bathroom
- name = "Research Bathrooms"
- icon_state = "restrooms"
-
-/area/awaymission/research/interior/medbay
- name = "Research Medbay"
- icon_state = "medbay"
-
-/area/awaymission/research/exterior
- name = "Research Exterior"
- icon_state = "unknown"
-
-
-//research papers
-
-/obj/item/paper/crumpled/awaymissions/research/sensitive_info
- default_raw_text = "Theres a lot of sensitive info on these disks, try and keep them secure! If these backup copies get into the wrong hands, god knows what they could do with the genetic research on these disk.."
-
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 210a5cec7a47..c159e19da9ec 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -1,134 +1,3 @@
-//Snow Valley Areas//--
-
-/area/awaymission/snowdin
- name = "Snowdin"
- icon_state = "awaycontent1"
- requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
-
-/area/awaymission/snowdin/outside
- name = "Snowdin Tundra Plains"
- icon_state = "awaycontent25"
-
-/area/awaymission/snowdin/post
- name = "Snowdin Outpost"
- icon_state = "awaycontent2"
- requires_power = TRUE
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
-/area/awaymission/snowdin/post/medbay
- name = "Snowdin Outpost - Medbay"
- icon_state = "awaycontent3"
-
-/area/awaymission/snowdin/post/secpost
- name = "Snowdin Outpost - Security Checkpoint"
- icon_state = "awaycontent4"
-
-/area/awaymission/snowdin/post/hydro
- name = "Snowdin Outpost - Hydroponics"
- icon_state = "awaycontent5"
-
-/area/awaymission/snowdin/post/messhall
- name = "Snowdin Outpost - Mess Hall"
- icon_state = "awaycontent6"
-
-/area/awaymission/snowdin/post/gateway
- name = "Snowdin Outpost - Gateway"
- icon_state = "awaycontent7"
-
-/area/awaymission/snowdin/post/dorm
- name = "Snowdin Outpost - Dorms"
- icon_state = "awaycontent8"
-
-/area/awaymission/snowdin/post/kitchen
- name = "Snowdin Outpost - Kitchen"
- icon_state = "awaycontent9"
-
-/area/awaymission/snowdin/post/engineering
- name = "Snowdin Outpost - Engineering"
- icon_state = "awaycontent10"
-
-/area/awaymission/snowdin/post/custodials
- name = "Snowdin Outpost - Custodials"
- icon_state = "awaycontent11"
-
-/area/awaymission/snowdin/post/research
- name = "Snowdin Outpost - Research Area"
- icon_state = "awaycontent12"
-
-/area/awaymission/snowdin/post/garage
- name = "Snowdin Outpost - Garage"
- icon_state = "awaycontent13"
-
-/area/awaymission/snowdin/post/minipost
- name = "Snowdin Outpost - Recon Post"
- icon_state = "awaycontent19"
-
-/area/awaymission/snowdin/post/mining_main
- name = "Snowdin Outpost - Mining Post"
- icon_state = "awaycontent21"
-
-/area/awaymission/snowdin/post/mining_main/mechbay
- name = "Snowdin Outpost - Mining Post Mechbay"
- icon_state = "awaycontent25"
-
-/area/awaymission/snowdin/post/mining_main/robotics
- name = "Snowdin Outpost - Mining Post Robotics"
- icon_state = "awaycontent26"
-
-/area/awaymission/snowdin/post/cavern1
- name = "Snowdin Outpost - Cavern Outpost 1"
- icon_state = "awaycontent27"
-
-/area/awaymission/snowdin/post/cavern2
- name = "Snowdin Outpost - Cavern Outpost 2"
- icon_state = "awaycontent28"
-
-/area/awaymission/snowdin/post/mining_dock
- name = "Snowdin Outpost - Underground Mine Post"
- icon_state = "awaycontent22"
-
-/area/awaymission/snowdin/post/broken_shuttle
- name = "Snowdin Outpost - Broken Transit Shuttle"
- icon_state = "awaycontent20"
- requires_power = FALSE
-
-/area/awaymission/snowdin/igloo
- name = "Snowdin Igloos"
- icon_state = "awaycontent14"
- dynamic_lighting = DYNAMIC_LIGHTING_FORCED
-
-/area/awaymission/snowdin/cave
- name = "Snowdin Caves"
- icon_state = "awaycontent15"
- dynamic_lighting = DYNAMIC_LIGHTING_FORCED
-
-/area/awaymission/snowdin/cave/cavern
- name = "Snowdin Depths"
- icon_state = "awaycontent23"
-
-/area/awaymission/snowdin/cave/mountain
- name = "Snowdin Mountains"
- icon_state = "awaycontent24"
-
-
-/area/awaymission/snowdin/base
- name = "Snowdin Main Base"
- icon_state = "awaycontent16"
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
- requires_power = TRUE
-
-/area/awaymission/snowdin/dungeon1
- name = "Snowdin Depths"
- icon_state = "awaycontent17"
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
-/area/awaymission/snowdin/sekret
- name = "Snowdin Operations"
- icon_state = "awaycontent18"
- dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
- requires_power = TRUE
-
//liquid plasma!!!!!!//
/turf/open/floor/plasteel/dark/snowdin
@@ -265,61 +134,6 @@
keeping the rest of us on lockdown and I swear to god I keep hearing strange noises outside the walls at night. The gateway link has gone dead and without a supply of resources from Central, we're left
for dead here. We haven't heard anything back from the mining squad either, so I can only assume whatever the fuck they unearthed got them first before coming for us. I don't want to die here..."}
-/obj/item/paper/fluff/awaymissions/snowdin/saw_usage
- name = "SAW Usage"
- default_raw_text = "YOU SEEN IVAN, WHEN YOU HOLD SAAW LIKE PEESTOL, YOU STRONGER THAN RECOIL FOR FEAR OF HITTING FACE!"
-
-/obj/item/paper/fluff/awaymissions/snowdin/research_feed
- name = "Research Feed"
- default_raw_text = {"A page full of graphs and other detailed information on the seismic activity of the surrounding area."}
-
-//profile of each of the old crewmembers for the outpost
-
-/obj/item/paper/fluff/awaymissions/snowdin/profile/overseer
- name = "Personnel Record AOP#01"
- default_raw_text = {"
Caleb Reed lead several expeditions
- among uncharted planets in search of plasma for Nanotrasen, scouring from hot savanas to freezing arctics. Track record is fairly clean with only incidient including the loss of two researchers during the
- expedition of _______, where mis-used of explosive ordinance for tunneling causes a cave-in."}
-
-/obj/item/paper/fluff/awaymissions/snowdin/profile/sec1
- name = "Personnel Record AOP#02"
- default_raw_text = {"
James Reed has been a part
- of Nanotrasen's security force for over 20 years, first joining in 22XX. A clean record and unwavering loyalty to the corperation through numerous deployments to various sites makes him a valuable asset to Natotrasen
- when it comes to keeping the peace while prioritizing Nanotrasen privacy matters. "}
-
-/obj/item/paper/fluff/awaymissions/snowdin/profile/hydro1
- name = "Personnel Record AOP#03"
- default_raw_text = {"
Katherine Esterdeen is a recent
- graduate with a major in Botany and a PH.D in Ecology. Having a clean record and eager to work, Esterdeen seems to be the right fit for maintaining plants in the middle of nowhere."}
-
-/obj/item/paper/fluff/awaymissions/snowdin/profile/engi1
- name = "Personnel Record AOP#04"
- default_raw_text = {"
Recently certified to be a full-time Journeyman, Rachel has
- been assigned various construction projects in the past 5 years. Competent and has no past infractions, should be of little concern."}
-
-/obj/item/paper/fluff/awaymissions/snowdin/profile/research1
- name = "Personnel Record AOP#05"
- default_raw_text = {"