+ 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 0000000000000..cffb8229e36cb
--- /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 97805731ec2f7..453767e4394a8 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.dm b/code/game/area/areas.dm
index 2798158eda0ba..b5949ac16f970 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -66,9 +66,6 @@
///Boolean to limit the areas (subtypes included) that atoms in this area can smooth with. Used for shuttles.
var/area_limited_icon_smoothing = FALSE
- ///WS Addition - Color on minimaps, if it's null (which is default) it makes one at random.
- var/minimap_color
-
var/list/power_usage
var/lighting_colour_tube = "#FFF6ED"
@@ -128,14 +125,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
* Adds the item to the GLOB.areas_by_type list based on area type
*/
/area/New()
- if(!minimap_color) // goes in New() because otherwise it doesn't fucking work
- // generate one using the icon_state
- if(icon_state && icon_state != "unknown")
- var/icon/I = new(icon, icon_state, dir)
- I.Scale(1,1)
- minimap_color = I.GetPixel(1,1)
- else // no icon state? use random.
- minimap_color = rgb(rand(50,70),rand(50,70),rand(50,70))
// This interacts with the map loader, so it needs to be set immediately
// rather than waiting for atoms to initialize.
if (area_flags & UNIQUE_AREA)
diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm
index 53ccc590c72ab..5f0db1fc93bcb 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/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm
index 8e614c8a0e792..8f7acc3a0c185 100644
--- a/code/game/area/areas/ruins/icemoon.dm
+++ b/code/game/area/areas/ruins/icemoon.dm
@@ -24,3 +24,86 @@
/area/ruin/unpowered/crashed_holemaker
name = "NTSV Holemaker II" // In honor of the kugelblitz shenanigan of all time
icon_state = "green"
+
+// Ice Lodge
+
+/area/ruin/powered/icemoon/lodge/mainhall
+ name = "Main Hall"
+ icon_state = "bridge_hallway"
+
+/area/ruin/powered/icemoon/lodge/cellar
+ name = "Cellar"
+ icon_state = "yellow"
+
+/area/ruin/powered/icemoon/lodge/montagne_office
+ name = "Montagne's Office"
+ icon_state = "bridge"
+
+/area/ruin/powered/icemoon/lodge/residential
+ name = "Residential Quarters"
+ icon_state = "crew_quarters"
+
+/area/ruin/powered/icemoon/lodge/gear_room
+ name = "Gear Room"
+ icon_state = "security"
+
+// teslalab
+
+/area/ruin/icemoon/tesla_lab
+ name = "CLIP Lab Complex"
+ icon_state = "hallC"
+
+/area/ruin/icemoon/tesla_lab/lab_a
+ name = "Lab Zone One"
+ icon_state = "yellow"
+
+/area/ruin/icemoon/tesla_lab/containment
+ name = "Specimen Containment"
+ icon_state = "purple"
+
+/area/ruin/icemoon/tesla_lab/engineering
+ name = "Engineering"
+ icon_state = "engine"
+
+/area/ruin/icemoon/tesla_lab/cargo
+ name = "Cargo Warehouse"
+ icon_state = "storage"
+
+/area/ruin/icemoon/tesla_lab/lobby
+ name = "Lobby"
+ icon_state = "green"
+
+/area/ruin/icemoon/tesla_lab/dorms
+ name = "Dormitories"
+ icon_state = "crew_quarters"
+
+/area/ruin/icemoon/tesla_lab/office
+ name = "Office"
+ icon_state = "bridge"
+
+/area/ruin/icemoon/tesla_lab/haymaker
+ name = "Haymaker Pod"
+ icon_state = "shuttle"
+
+/area/ruin/icemoon/tesla_lab/medbay
+ name = "Medical Bay"
+
+/area/ruin/icemoon/tesla_lab/office_two
+ name = "Director Office"
+
+/area/ruin/icemoon/tesla_lab/central_hall
+ name = "Central Halls"
+
+/area/ruin/icemoon/tesla_lab/lab_halls
+ name = "Lab Zone Hallway"
+
+/area/ruin/icemoon/tesla_lab/cargo_hall
+ name = "Cargo Access Hall"
+
+/area/ruin/icemoon/tesla_lab/turrets
+ name = "Turret Lean-To"
+ icon_state = "security"
+
+/area/ruin/icemoon/tesla_lab/armory
+ name = "Armory"
+ icon_state = "armory"
diff --git a/code/game/area/areas/ruins/rockplanet.dm b/code/game/area/areas/ruins/rockplanet.dm
index 1b9f89a46ff86..e1116172d850a 100644
--- a/code/game/area/areas/ruins/rockplanet.dm
+++ b/code/game/area/areas/ruins/rockplanet.dm
@@ -58,3 +58,42 @@
/area/ruin/rockplanet/distillery/office
name = "Office"
icon_state = "vacant_office"
+
+//N+S Mining Base
+
+/area/ruin/rockplanet/mining_base
+ name = "Mining Base"
+
+/area/ruin/rockplanet/mining_base/canteen
+ name = "Canteen Dome"
+ icon_state = "bar"
+
+/area/ruin/rockplanet/mining_base/office
+ name = "Coordinator's Office"
+ icon_state = "shuttle"
+
+/area/ruin/rockplanet/mining_base/crew
+ name = "Barracks Dome"
+ icon_state = "crew_quarters"
+
+/area/ruin/rockplanet/mining_base/med
+ name = "Medical Dome"
+ icon_state = "blue"
+
+/area/ruin/rockplanet/mining_base/engineering
+ name = "Engineering Complex"
+ icon_state = "engine"
+
+/area/ruin/rockplanet/mining_base/refinery
+ name = "Refinery Complex"
+ icon_state = "storage"
+
+/area/ruin/rockplanet/mining_base/armory
+ name = "Armory Dome"
+ icon_state = "armory"
+
+/area/ruin/rockplanet/mining_base/rig_one
+ name = "Mining Platform #1"
+
+/area/ruin/rockplanet/mining_base/rig_two
+ name = "Mining Platform #2"
diff --git a/code/game/area/areas/ruins/sandplanet.dm b/code/game/area/areas/ruins/sandplanet.dm
index e3a93b58e0655..3dd26e967875e 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/area/areas/ruins/wasteplanet.dm b/code/game/area/areas/ruins/wasteplanet.dm
index 5f069d3e055b4..6744e36f20c70 100644
--- a/code/game/area/areas/ruins/wasteplanet.dm
+++ b/code/game/area/areas/ruins/wasteplanet.dm
@@ -44,6 +44,20 @@
name = "Abandoned Waste Containment Vault"
icon_state = "disposal"
+//Wasteplanet_Tradepost
+
+/area/ruin/wasteplanet/tradepost/barracks
+ name = "Abandoned Barracks"
+ icon_state = "red"
+
+/area/ruin/wasteplanet/tradepost/center
+ name = "Abandoned Dome"
+ icon_state = "bridge"
+
+/area/ruin/wasteplanet/tradepost/warehouse
+ name = "Abandoned Warehouse"
+ icon_state = "dk_yellow"
+
//Abandonded shipbreaking yard
/area/ruin/wasteplanet/wasteplanet_shipbreaking
diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm
index b1d47670aa2d3..e0b6d27df4cee 100644
--- a/code/game/area/ship_areas.dm
+++ b/code/game/area/ship_areas.dm
@@ -163,6 +163,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/ship/crew/crewfive
name = "Crew Quarters 5"
+/area/ship/crew/specialized
+ name = "???"
+
+/area/ship/crew/specialized/medical
+ name = "Medical Specialist's Quarters"
+
+/area/ship/crew/specialized/security
+ name = "Security Specialist's Quarters"
+
+/area/ship/crew/specialized/engineering
+ name = "Engineering Specialist's Quarters"
+
+/area/ship/crew/specialized/cargo
+ name = "Cargo Specialist's Quarters"
+
/area/ship/crew/cryo
name = "Cryopod Room"
icon_state = "cryo"
@@ -306,6 +321,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "ai_chamber"
ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/ambitech.ogg', 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambiatmos2.ogg')
+/area/ship/science/workshop
+ name = "Workshop"
+ icon_state = "workshop"
+
/// Engineering ///
/area/ship/engineering
name = "Engineering"
@@ -338,6 +357,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
lighting_colour_tube = "#e2feff"
lighting_colour_bulb = "#d5fcff"
+/area/ship/engineering/communications/room
+ name = "Communications Room"
+
/area/ship/engineering/engine
name = "Engine Room"
icon_state = "engine_sm"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index e7c9c19325a63..6f1a0069e5c9f 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -1067,6 +1067,7 @@
VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EXPLOSION, "Explosion")
VV_DROPDOWN_OPTION(VV_HK_RADIATE, "Radiate")
VV_DROPDOWN_OPTION(VV_HK_EDIT_FILTERS, "Edit Filters")
+ VV_DROPDOWN_OPTION(VV_HK_SELL, "Export Item")
/atom/vv_do_topic(list/href_list)
. = ..()
@@ -1138,6 +1139,9 @@
var/client/C = usr.client
C?.open_filter_editor(src)
+ if(href_list[VV_HK_SELL] && check_rights(R_ADMIN|R_DEBUG) && check_rights(R_VAREDIT))
+ export_item_and_contents(src, allowed_categories = ALL, apply_elastic = FALSE)
+
/atom/vv_get_header()
. = ..()
var/refid = REF(src)
@@ -1316,9 +1320,6 @@
/atom/proc/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
return
-/atom/proc/disconnect_from_shuttle(obj/docking_port/mobile/port)
- return
-
/// Generic logging helper
/atom/proc/log_message(message, message_type, color=null, log_globally=TRUE)
if(!log_globally)
@@ -1599,10 +1600,9 @@
* Produces a signal [COMSIG_PARENT_EXAMINE_MORE]
*/
/atom/proc/examine_more(mob/user)
+ SHOULD_CALL_PARENT(TRUE)
. = list()
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE_MORE, user, .)
- if(!LAZYLEN(.)) // lol ..length
- return list("You examine [src] closer, but find nothing of interest...")
///Passes Stat Browser Panel clicks to the game and calls client click on an atom
/atom/Topic(href, list/href_list)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 79326ab9e2ad7..73629ea1484f2 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -540,7 +540,7 @@
var/previous_virtual_z = OldLoc?.virtual_z() || 0
var/current_virtual_z = virtual_z()
- if(current_virtual_z && current_virtual_z != previous_virtual_z)
+ if(current_virtual_z != previous_virtual_z)
on_virtual_z_change(current_virtual_z, previous_virtual_z)
SEND_SIGNAL(src, COMSIG_MOVABLE_MOVED, OldLoc, Dir, Forced, old_locs)
@@ -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/communications.dm b/code/game/communications.dm
index 94afdbf364f5b..e3b1acc230d28 100644
--- a/code/game/communications.dm
+++ b/code/game/communications.dm
@@ -92,36 +92,30 @@ GLOBAL_LIST_EMPTY(all_radios)
GLOBAL_LIST_INIT(radiochannels, list(
RADIO_CHANNEL_COMMON = FREQ_COMMON,
- RADIO_CHANNEL_COMMAND = FREQ_COMMAND,
+ RADIO_CHANNEL_EMERGENCY = FREQ_EMERGENCY,
RADIO_CHANNEL_CENTCOM = FREQ_CENTCOM,
- RADIO_CHANNEL_SOLGOV = FREQ_SOLGOV, //WS Edit - SolGov Rep
- RADIO_CHANNEL_WIDEBAND = FREQ_WIDEBAND, //WS Edit - Overmap
+ RADIO_CHANNEL_SOLGOV = FREQ_SOLGOV,
+ RADIO_CHANNEL_WIDEBAND = FREQ_WIDEBAND,
RADIO_CHANNEL_SYNDICATE = FREQ_SYNDICATE,
RADIO_CHANNEL_NANOTRASEN = FREQ_NANOTRASEN,
RADIO_CHANNEL_MINUTEMEN = FREQ_MINUTEMEN,
RADIO_CHANNEL_PGF = FREQ_PGF,
RADIO_CHANNEL_INTEQ = FREQ_INTEQ,
RADIO_CHANNEL_PIRATE = FREQ_PIRATE,
- RADIO_CHANNEL_AI_PRIVATE = FREQ_AI_PRIVATE,
- RADIO_CHANNEL_CTF_RED = FREQ_CTF_RED,
- RADIO_CHANNEL_CTF_BLUE = FREQ_CTF_BLUE
))
GLOBAL_LIST_INIT(reverseradiochannels, list(
"[FREQ_COMMON]" = RADIO_CHANNEL_COMMON,
- "[FREQ_COMMAND]" = RADIO_CHANNEL_COMMAND,
+ "[FREQ_EMERGENCY]" = RADIO_CHANNEL_EMERGENCY,
"[FREQ_CENTCOM]" = RADIO_CHANNEL_CENTCOM,
- "[FREQ_SOLGOV]" = RADIO_CHANNEL_SOLGOV, //WS Edit - SolGov Rep
- "[FREQ_WIDEBAND]" = RADIO_CHANNEL_WIDEBAND, //WS Edit - SolGov Rep
+ "[FREQ_SOLGOV]" = RADIO_CHANNEL_SOLGOV,
+ "[FREQ_WIDEBAND]" = RADIO_CHANNEL_WIDEBAND,
"[FREQ_SYNDICATE]" = RADIO_CHANNEL_SYNDICATE,
"[FREQ_NANOTRASEN]" = RADIO_CHANNEL_NANOTRASEN,
"[FREQ_MINUTEMEN]" = RADIO_CHANNEL_MINUTEMEN,
"[FREQ_PGF]" = RADIO_CHANNEL_PGF,
"[FREQ_INTEQ]" = RADIO_CHANNEL_INTEQ,
"[FREQ_PIRATE]" = RADIO_CHANNEL_PIRATE,
- "[FREQ_AI_PRIVATE]" = RADIO_CHANNEL_AI_PRIVATE,
- "[FREQ_CTF_RED]" = RADIO_CHANNEL_CTF_RED,
- "[FREQ_CTF_BLUE]" = RADIO_CHANNEL_CTF_BLUE
))
/datum/radio_frequency
diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm
index a3226e864aa7d..1721c1242e559 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
@@ -179,72 +178,3 @@
/obj/item/clothing/mask/fakemoustache/sticky/proc/unstick()
REMOVE_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT)
-
-//DARK H.O.N.K. AND CLOWN MECH WEAPONS
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana
- name = "bombanana mortar"
- desc = "Equipment for clown exosuits. Launches exploding banana peels."
- icon_state = "mecha_bananamrtr"
- projectile = /obj/item/grown/bananapeel/bombanana
- projectiles = 8
- projectile_energy_cost = 1000
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana/can_attach(obj/mecha/combat/honker/M)
- if(..())
- if(istype(M))
- return TRUE
- return FALSE
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache
- name = "\improper HONKeR-6 grenade launcher"
- desc = "A weapon for combat exosuits. Launches primed tear-stache grenades."
- icon_state = "mecha_grenadelnchr"
- projectile = /obj/item/grenade/chem_grenade/teargas/moustache
- fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg'
- projectiles = 6
- missile_speed = 1.5
- projectile_energy_cost = 800
- equip_cooldown = 60
- det_time = 20
-
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache/can_attach(obj/mecha/combat/honker/M)
- if(..())
- if(istype(M))
- return TRUE
- return FALSE
-
-/obj/mecha/combat/honker/dark
- desc = "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. This one has been painted black for maximum fun. HONK!"
- name = "\improper Dark H.O.N.K"
- icon_state = "darkhonker"
- max_integrity = 300
- deflect_chance = 15
- armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
- max_temperature = 35000
- operation_req_access = list(ACCESS_SYNDICATE)
- internals_req_access = list(ACCESS_SYNDICATE)
- wreckage = /obj/structure/mecha_wreckage/honker/dark
- max_equip = 4
-
-/obj/mecha/combat/honker/dark/add_cell(obj/item/stock_parts/cell/C)
- if(C)
- C.forceMove(src)
- cell = C
- return
- cell = new /obj/item/stock_parts/cell/hyper(src)
-
-/obj/mecha/combat/honker/dark/loaded/Initialize()
- . = ..()
- var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/thrusters/ion(src)
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker()
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/banana_mortar/bombanana()//Needed more offensive weapons.
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/tearstache()//The mousetrap mortar was not up-to-snuff.
- ME.attach(src)
-
-/obj/structure/mecha_wreckage/honker/dark
- name = "\improper Dark H.O.N.K wreckage"
- icon_state = "darkhonker-broken"
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index b8dcd669d3856..f8d6811990947 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -435,7 +435,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/// Picks a random roundstart rule from the list given as an argument and executes it.
/datum/game_mode/dynamic/proc/picking_roundstart_rule(list/drafted_rules = list(), forced = FALSE)
- var/datum/dynamic_ruleset/roundstart/starting_rule = pickweight(drafted_rules)
+ var/datum/dynamic_ruleset/roundstart/starting_rule = pick_weight(drafted_rules)
if(!starting_rule)
log_game("DYNAMIC: Couldn't pick a starting ruleset. No rulesets available")
return FALSE
@@ -450,7 +450,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
if(drafted_rules.len <= 0)
log_game("DYNAMIC: Picking [starting_rule.name] failed due to blocking_rules and no more rulesets available. Report this.")
return FALSE
- starting_rule = pickweight(drafted_rules)
+ starting_rule = pick_weight(drafted_rules)
// Check if the ruleset is highlander and if a highlander ruleset has been executed
else if(starting_rule.flags & HIGHLANDER_RULESET) // Should already be filtered out, but making sure. Check filtering at end of proc if reported.
if(threat_level > GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
@@ -459,14 +459,14 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
if(drafted_rules.len <= 0)
log_game("DYNAMIC: Picking [starting_rule.name] failed due to no highlander stacking and no more rulesets available. Report this.")
return FALSE
- starting_rule = pickweight(drafted_rules)
+ starting_rule = pick_weight(drafted_rules)
// With low pop and high threat there might be rulesets that get executed with no valid candidates.
else if(!starting_rule.ready()) // Should already be filtered out, but making sure. Check filtering at end of proc if reported.
drafted_rules -= starting_rule
if(drafted_rules.len <= 0)
log_game("DYNAMIC: Picking [starting_rule.name] failed because there were not enough candidates and no more rulesets available. Report this.")
return FALSE
- starting_rule = pickweight(drafted_rules)
+ starting_rule = pick_weight(drafted_rules)
log_game("DYNAMIC: Picked a ruleset: [starting_rule.name]")
@@ -512,7 +512,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/// Picks a random midround OR latejoin rule from the list given as an argument and executes it.
/// Also this could be named better.
/datum/game_mode/dynamic/proc/picking_midround_latejoin_rule(list/drafted_rules = list(), forced = FALSE)
- var/datum/dynamic_ruleset/rule = pickweight(drafted_rules)
+ var/datum/dynamic_ruleset/rule = pick_weight(drafted_rules)
if(!rule)
return FALSE
@@ -524,7 +524,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
drafted_rules -= rule
if(drafted_rules.len <= 0)
return FALSE
- rule = pickweight(drafted_rules)
+ rule = pick_weight(drafted_rules)
// Check if the ruleset is highlander and if a highlander ruleset has been executed
else if(rule.flags & HIGHLANDER_RULESET)
if(threat_level > GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
@@ -532,7 +532,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
drafted_rules -= rule
if(drafted_rules.len <= 0)
return FALSE
- rule = pickweight(drafted_rules)
+ rule = pick_weight(drafted_rules)
if(!rule.repeatable)
if(rule.ruletype == "Latejoin")
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 00bc1bc95e133..eca77ba4df5ab 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -149,7 +149,7 @@
message_admins("Convert_roundtype failed due to no valid modes to convert to. Please report this error to the Coders.")
return null
- replacementmode = pickweight(usable_modes)
+ replacementmode = pick_weight(usable_modes)
var/matc = CONFIG_GET(number/midround_antag_time_check)
if(world.time >= (matc * 600))
@@ -272,7 +272,7 @@
reports += config.mode_reports[report_type]
Count++
for(var/i in Count to rand(3,5)) //Between three and five wrong entries on the list.
- var/false_report_type = pickweightAllowZero(report_weights)
+ var/false_report_type = pick_weight_allow_zero(report_weights)
report_weights[false_report_type] = 0 //Make it so the same false report won't be selected twice
reports += config.mode_reports[false_report_type]
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index 7e9d90bb482fe..93f3e5d98a156 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -50,7 +50,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
max_i--
if(max_i<=0)
return
- var/Me = pickweight(meteortypes)
+ var/Me = pick_weight(meteortypes)
var/obj/effect/meteor/M = new Me(pickedstart, pickedgoal)
M.dest = pickedgoal
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index 6a4787607ef2e..405ca316b7d59 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -155,17 +155,6 @@
return TRUE
return FALSE
-/datum/objective_item/steal/slime
- name = "an unused sample of slime extract."
- targetitem = /obj/item/slime_extract
- difficulty = 3
- excludefromjob = list("Research Director","Scientist")
-
-/datum/objective_item/steal/slime/check_special_completion(obj/item/slime_extract/E)
- if(E.Uses > 0)
- return 1
- return 0
-
/datum/objective_item/steal/blackbox
name = "The Blackbox."
targetitem = /obj/item/blackbox
diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm
index 69679c95079f4..9021d6e783d19 100644
--- a/code/game/gamemodes/sandbox/h_sandbox.dm
+++ b/code/game/gamemodes/sandbox/h_sandbox.dm
@@ -38,7 +38,6 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE)
"Standard Tools",
"Spawn Flashlight" = "hsbspawn&path=[/obj/item/flashlight]",
"Spawn Toolbox" = "hsbspawn&path=[/obj/item/storage/toolbox/mechanical]",
- "Spawn Experimental Welding tool" = "hsbspawn&path=[/obj/item/weldingtool/experimental]",
"Spawn Light Replacer" = "hsbspawn&path=[/obj/item/lightreplacer]",
"Spawn Medical Kit" = "hsbspawn&path=[/obj/item/storage/firstaid/regular]",
"Spawn All-Access ID" = "hsbaaid",
diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm
index 7ba391fae782e..4bed479b7cf62 100644
--- a/code/game/machinery/airlock_cycle_control.dm
+++ b/code/game/machinery/airlock_cycle_control.dm
@@ -103,6 +103,9 @@
var/list/airlocks = list()
var/list/vents = list()
var/obj/vis_target = null
+ dir = 1 // So none of the current maps break (dir helpers [below] require sprite dirs to be swapped; 1 is down-facing, so what it was before).
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/advanced_airlock_controller, 24)
/obj/machinery/advanced_airlock_controller/lavaland
exterior_pressure = WARNING_LOW_PRESSURE + 10
@@ -116,6 +119,8 @@
exterior_pressure = ONE_ATMOSPHERE
depressurization_margin = ONE_ATMOSPHERE
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/advanced_airlock_controller/internal, 24)
+
/obj/machinery/advanced_airlock_controller/New(loc, ndir, nbuild)
..()
wires = new /datum/wires/advanced_airlock_controller(src)
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index e63b3f75fb2b2..452cd39b5d589 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -339,14 +339,15 @@
materials.use_materials(materials_used)
if(is_stack)
- var/obj/item/stack/N = new being_built.build_path(A, multiplier, FALSE)
- N.update_appearance()
- N.autolathe_crafted(src)
+ var/obj/item/stack/new_item = new being_built.build_path(A, multiplier, FALSE)
+ new_item.update_appearance()
+ new_item.autolathe_crafted(src)
+ SSblackbox.record_feedback("nested tally", "item_printed", 1, list("[type]", "[new_item.type]"))
else
for(var/i=1, i<=multiplier, i++)
var/obj/item/new_item = new being_built.build_path(A)
new_item.autolathe_crafted(src)
-
+ SSblackbox.record_feedback("nested tally", "item_printed", 1, list("[type]", "[new_item.type]"))
if(length(picked_materials))
new_item.set_custom_materials(picked_materials, 1 / multiplier) //Ensure we get the non multiplied amount
for(var/x in picked_materials)
@@ -446,5 +447,5 @@
//Called when the object is constructed by an autolathe
//Has a reference to the autolathe so you can do !!FUN!! things with hacked lathes
-/obj/item/proc/autolathe_crafted(obj/machinery/autolathe/A)
+/obj/item/proc/autolathe_crafted(obj/machinery/autolathe/lathe)
return
diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm
index 83f3e366e8a3b..cdcccc307a85a 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/camera/camera.dm b/code/game/machinery/camera/camera.dm
index fda41eab77891..21eb3cc362b77 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -99,6 +99,11 @@
/obj/machinery/camera/proc/create_prox_monitor()
if(!proximity_monitor)
proximity_monitor = new(src, 1)
+ RegisterSignal(proximity_monitor, COMSIG_PARENT_QDELETING, PROC_REF(proximity_deleted))
+
+/obj/machinery/camera/proc/proximity_deleted()
+ SIGNAL_HANDLER
+ proximity_monitor = null
/obj/machinery/camera/proc/set_area_motion(area/A)
area_motion = A
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index ad4cd3834f065..c6a276f4ff754 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -39,7 +39,7 @@
var/internal_radio = TRUE
var/obj/item/radio/radio
var/radio_key = /obj/item/encryptionkey/headset_com
- var/radio_channel = RADIO_CHANNEL_COMMAND
+ var/radio_channel = RADIO_CHANNEL_EMERGENCY
var/obj/effect/countdown/clonepod/countdown
@@ -64,12 +64,9 @@
begin_processing()
/obj/machinery/clonepod/Destroy()
- var/mob/living/mob_occupant = occupant
- go_out()
- if(mob_occupant)
- log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to Destroy().")
QDEL_NULL(radio)
QDEL_NULL(countdown)
+ QDEL_NULL(occupant)
if(connected)
connected.DetachCloner(src)
QDEL_LIST(unattached_flesh)
diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm
index 3a36603c50709..3def408de874a 100644
--- a/code/game/machinery/computer/_computer.dm
+++ b/code/game/machinery/computer/_computer.dm
@@ -123,3 +123,7 @@
. = ..()
if(!user.canUseTopic(src, !issilicon(user)) || !is_operational)
return
+
+/obj/machinery/computer/examine_more(mob/user)
+ ui_interact(user)
+ return ..()
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 96fbbd8254d19..33ffc2de511ce 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -72,7 +72,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
var/list/gameodds = list(/obj/item/circuitboard/computer/arcade/battle = 49,
/obj/item/circuitboard/computer/arcade/orion_trail = 49,
/obj/item/circuitboard/computer/arcade/amputation = 2)
- var/thegame = pickweight(gameodds)
+ var/thegame = pick_weight(gameodds)
var/obj/item/circuitboard/CB = new thegame()
new CB.build_path(loc, CB)
return INITIALIZE_HINT_QDEL
@@ -93,9 +93,9 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
return
var/prizeselect
if(prize_override)
- prizeselect = pickweight(prize_override)
+ prizeselect = pick_weight(prize_override)
else
- prizeselect = pickweight(GLOB.arcade_prize_pool)
+ prizeselect = pick_weight(GLOB.arcade_prize_pool)
var/atom/movable/the_prize = new prizeselect(get_turf(src))
playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3)
visible_message("[src] dispenses [the_prize]!", "You hear a chime and a clunk.")
@@ -118,9 +118,9 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
num_of_prizes = rand(0,2)
for(var/i = num_of_prizes; i > 0; i--)
if(override)
- empprize = pickweight(prize_override)
+ empprize = pick_weight(prize_override)
else
- empprize = pickweight(GLOB.arcade_prize_pool)
+ empprize = pick_weight(GLOB.arcade_prize_pool)
new empprize(loc)
explosion(loc, -1, 0, 1+num_of_prizes, flame_range = 1+num_of_prizes)
@@ -360,13 +360,13 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
return
/obj/machinery/computer/arcade/battle/examine_more(mob/user)
- var/list/msg = list("You notice some writing scribbled on the side of [src]...")
- msg += "\tsmart -> defend, defend, light attack"
- msg += "\tshotgun -> defend, defend, power attack"
- msg += "\tshort temper -> counter, counter, counter"
- msg += "\tpoisonous -> light attack, light attack, light attack"
- msg += "\tchonker -> power attack, power attack, power attack"
- return msg
+ . = ..()
+ . += "You notice some writing scribbled on the side of [src]..."
+ . += "\tsmart -> defend, defend, light attack"
+ . += "\tshotgun -> defend, defend, power attack"
+ . += "\tshort temper -> counter, counter, counter"
+ . += "\tpoisonous -> light attack, light attack, light attack"
+ . += "\tchonker -> power attack, power attack, power attack"
/obj/machinery/computer/arcade/battle/emag_act(mob/user)
if(obj_flags & EMAGGED)
@@ -528,11 +528,11 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
if(gamers[gamer] > 2 && prob(20 * gamers[gamer]))
- Radio.set_frequency(FREQ_COMMAND)
- Radio.talk_into(src, "SECURITY ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please watch for violent behavior.", FREQ_COMMAND)
+ Radio.set_frequency(FREQ_EMERGENCY)
+ Radio.talk_into(src, "SECURITY ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please watch for violent behavior.", FREQ_EMERGENCY)
- Radio.set_frequency(FREQ_COMMAND)
- Radio.talk_into(src, "PSYCH ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please schedule psych evaluation.", FREQ_COMMAND)
+ Radio.set_frequency(FREQ_EMERGENCY)
+ Radio.talk_into(src, "PSYCH ALERT: Crewmember [gamer] recorded displaying antisocial tendencies in [get_area(src)]. Please schedule psych evaluation.", FREQ_EMERGENCY)
gamers[gamer] = -1
@@ -635,7 +635,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
event = ORION_TRAIL_COLLISION
event()
else if(prob(75-gamerSkill))
- event = pickweight(events)
+ event = pick_weight(events)
if(lings_aboard)
if(event == ORION_TRAIL_LING || prob(55-gamerSkill))
event = ORION_TRAIL_LING_ATTACK
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 50ed20ae619ee..de6daa4179467 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -258,7 +258,7 @@
/obj/machinery/computer/security/telescreen/entertainment
name = "entertainment monitor"
- desc = "Damn, they better have the /tg/ channel on these things."
+ desc = "A screen displaying various entertainment channels. I hope they have that new Gezenan sitcom on this."
icon = 'icons/obj/status_display.dmi'
icon_state = "entertainment_blank"
network = list("thunder")
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index c1a1171e57cc8..d8c3f460911b2 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -44,6 +44,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
ui = new(user, src, "CrewConsole")
ui.open()
+/obj/machinery/computer/crew/examine_more(mob/user)
+ interact(user) //crew monitors use the interact method instead of ui_interact, for some reason. Not very consistent.
+ return ..()
+
/datum/crewmonitor/ui_close(mob/user)
ui_sources -= user
return ..()
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 17c5dc2ef39c6..9bd38b62c9fab 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -168,7 +168,6 @@
else
dat += " [bdat]"
- else
else
dat += "{Log In}"
var/datum/browser/popup = new(user, "med_rec", "Medical Records Console", 600, 400)
@@ -375,7 +374,6 @@
if(istype(active1.fields["photo_side"], /obj/item/photo))
var/obj/item/photo/P = active1.fields["photo_side"]
P.show(usr)
- else
else if(href_list["p_stat"])
if(active1)
@@ -488,16 +486,12 @@
for(var/datum/data/record/R in GLOB.data_core.medical)
if((lowertext(R.fields["name"]) == t1 || t1 == lowertext(R.fields["id"]) || t1 == lowertext(R.fields["b_dna"])))
active2 = R
- else
- //Foreach continue //goto(3229)
if(!(active2))
temp = text("Could not locate record [].", sanitize(t1))
else
for(var/datum/data/record/E in GLOB.data_core.general)
if((E.fields["name"] == active2.fields["name"] || E.fields["id"] == active2.fields["id"]))
active1 = E
- else
- //Foreach continue //goto(3334)
screen = 4
else if(href_list["print_p"])
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 37759d04b13e5..cdfad15561871 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -228,7 +228,6 @@
dat += "New Security Record
"
dat += "{Log Out}"
- else
else
dat += "{Log In}"
var/datum/browser/popup = new(user, "secure_rec", "Security Records Console", 600, 400)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 2d76d7ecb351d..594aeedbe43dc 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -167,16 +167,7 @@
if(abandoned)
var/outcome = rand(1,100)
switch(outcome)
- if(1 to 9)
- var/turf/here = get_turf(src)
- for(var/turf/closed/T in range(2, src))
- here.PlaceOnTop(T.type)
- qdel(src)
- return
- here.PlaceOnTop(/turf/closed/wall)
- qdel(src)
- return
- if(9 to 11)
+ if(1 to 11)
lights = FALSE
locked = TRUE
if(12 to 15)
@@ -185,6 +176,19 @@
welded = TRUE
if(24 to 30)
panel_open = TRUE
+ if(31 to 40)
+ panel_open = TRUE
+ set_electrified(MACHINE_ELECTRIFIED_PERMANENT)
+ if(41 to 50)
+ seal = new /obj/item/door_seal(src)
+ modify_max_integrity(max_integrity * AIRLOCK_SEAL_MULTIPLIER)
+ if(51 to 60)
+ new previous_airlock(loc)
+ qdel(src)
+ if(69)
+ new /obj/effect/decal/cleanable/oil/slippery(loc)
+
+
update_appearance()
/obj/machinery/door/airlock/ComponentInitialize()
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 213b15c00ced5..3a71835c172b3 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -115,8 +115,8 @@
return 0
if(!forced)
- Radio.set_frequency(FREQ_COMMAND)
- Radio.talk_into(src, "Timer has expired. Releasing prisoner.", FREQ_COMMAND)
+ Radio.set_frequency(FREQ_EMERGENCY)
+ Radio.talk_into(src, "Timer has expired. Releasing prisoner.", FREQ_EMERGENCY)
timing = FALSE
activation_time = null
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 737bacbb650f2..7c8371809e81e 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -395,7 +395,7 @@
L.manual_emote("roar")
else if(ishuman(L)) //For humans
L.adjustBruteLoss(DOOR_CRUSH_DAMAGE)
- L.manual_emote("scream")
+ L.force_manual_scream()
L.Paralyze(100)
else if(ismonkey(L)) //For monkeys
L.adjustBruteLoss(DOOR_CRUSH_DAMAGE)
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 1ab88896accbb..da57b0a9b3447 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -72,7 +72,7 @@
/obj/machinery/door/firedoor/Destroy()
remove_from_areas()
density = FALSE
- air_update_turf(1)
+ air_update_turf(TRUE)
affecting_areas.Cut()
return ..()
@@ -430,7 +430,7 @@
if(operating || welded)
return
density = TRUE
- air_update_turf(1)
+ air_update_turf(TRUE)
do_animate("closing")
update_freelook_sight()
if(!(flags_1 & ON_BORDER_1))
@@ -468,6 +468,11 @@
assemblytype = /obj/structure/firelock_frame/heavy
max_integrity = 550
+/obj/machinery/door/firedoor/heavy/closed
+ icon_state = "door_closed"
+ opacity = TRUE
+ density = TRUE
+
/obj/machinery/door/firedoor/window
name = "firelock window shutter"
icon = 'icons/obj/doors/doorfirewindow.dmi'
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 7e3febcc482c0..2b63f574e8207 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -22,6 +22,8 @@
/obj/machinery/door/poddoor/attackby(obj/item/W, mob/user, params)
. = ..()
+ if(resistance_flags & INDESTRUCTIBLE)
+ return FALSE
if((resistance_flags & INDESTRUCTIBLE) && W.tool_behaviour == TOOL_SCREWDRIVER) // This makes it so ERT members cannot cheese by opening their blast doors.
to_chat(user, span_warning("You can't find the panel!"))
return
@@ -56,6 +58,15 @@
else if(W.use_tool(src, user, 10 SECONDS, volume=50))
deconstruct(TRUE)
+ if(W.tool_behaviour == TOOL_DECONSTRUCT)
+ if(!(machine_stat & NOPOWER))
+ do_sparks(5, TRUE, src)
+ electrocute_mob(user, get_area(src), src, 1, TRUE) //zorp
+ close()
+ to_chat(user, span_notice("You start to cut [src] apart"))
+ if (W.use_tool(src, user, 10 SECONDS, volume = 75))
+ deconstruct(TRUE)
+
/obj/machinery/door/poddoor/examine(mob/user)
. = ..()
. += span_notice("The maintenance panel is [panel_open ? "opened" : "closed"].")
diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm
index 81c422ea31fa8..185120039dad6 100644
--- a/code/game/machinery/gulag_item_reclaimer.dm
+++ b/code/game/machinery/gulag_item_reclaimer.dm
@@ -12,10 +12,13 @@
var/list/stored_items = list()
var/obj/machinery/gulag_teleporter/linked_teleporter = null
-/obj/machinery/gulag_item_reclaimer/Destroy()
+/obj/machinery/gulag_item_reclaimer/deconstruct(disassembled)
for(var/i in contents)
var/obj/item/I = i
I.forceMove(get_turf(src))
+ return ..()
+
+/obj/machinery/gulag_item_reclaimer/Destroy()
if(linked_teleporter)
linked_teleporter.linked_reclaimer = null
return ..()
diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm
index 1b0093458e49a..22ff32ac3655d 100644
--- a/code/game/machinery/harvester.dm
+++ b/code/game/machinery/harvester.dm
@@ -121,7 +121,7 @@
target = get_turf(src)
for(var/obj/item/bodypart/BP in operation_order) //first we do non-essential limbs
BP.drop_limb()
- C.emote("scream")
+ C.force_scream()
if(BP.body_zone != "chest")
BP.forceMove(target) //Move the limbs right next to it, except chest, that's a weird one
BP.drop_organs()
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 0e6bc6ed6a6dd..f5d4959083dc7 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/navbeacon.dm b/code/game/machinery/navbeacon.dm
index b54c192f44070..abee7fe954f73 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -46,11 +46,15 @@
return ..()
/obj/machinery/navbeacon/on_virtual_z_change(new_virtual_z, previous_virtual_z)
+ ..()
+ if(!codes)
+ return
+ if(!codes["patrol"])
+ return
if(previous_virtual_z)
LAZYREMOVEASSOC(GLOB.navbeacons, "[previous_virtual_z]", src)
if(new_virtual_z)
LAZYADDASSOCLIST(GLOB.navbeacons, "[new_virtual_z]", src)
- ..()
// set the transponder codes assoc list from codes_txt
/obj/machinery/navbeacon/proc/set_codes()
@@ -71,7 +75,10 @@
codes[e] = "1"
/obj/machinery/navbeacon/proc/glob_lists_deregister()
- LAZYREMOVE(GLOB.navbeacons["[virtual_z()]"], src)
+ if(!codes)
+ return
+ if(codes["patrol"])
+ LAZYREMOVE(GLOB.navbeacons["[virtual_z()]"], src)
GLOB.deliverybeacons -= src
GLOB.deliverybeacontags -= location
GLOB.wayfindingbeacons -= src
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index c53b256b04de1..55f16a8c1f7bb 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -814,12 +814,17 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster/security_unit, 30)
if(istype(human_user.wear_id, /obj/item/pda))
var/obj/item/pda/P = human_user.wear_id
if(P.id)
- scanned_user = "[P.id.registered_name] ([P.id.assignment])"
+ scanned_user = "[P.id.registered_name])"
else
scanned_user = "Unknown"
else if(istype(human_user.wear_id, /obj/item/card/id))
var/obj/item/card/id/ID = human_user.wear_id
- scanned_user ="[ID.registered_name] ([ID.assignment])"
+ scanned_user ="[ID.registered_name])"
+ else if(istype(human_user.wear_id, /obj/item/storage/wallet))
+ var/obj/item/storage/wallet/our_wallet = human_user.wear_id
+ if(our_wallet.front_id)
+ var/obj/item/card/id/ID = our_wallet.GetID()
+ scanned_user = "[ID.registered_name]"
else
scanned_user ="Unknown"
else
diff --git a/code/game/machinery/outpost_electrolyzer.dm b/code/game/machinery/outpost_electrolyzer.dm
index b91160c7e1c83..78711accb242b 100644
--- a/code/game/machinery/outpost_electrolyzer.dm
+++ b/code/game/machinery/outpost_electrolyzer.dm
@@ -136,7 +136,7 @@
playsound(src, 'sound/effects/splat.ogg', 50, TRUE)
if(iscarbon(L) && L.stat == CONSCIOUS)
- L.emote("scream")
+ L.force_scream()
// Instantly lie down, also go unconscious from the pain, before you die.
L.Unconscious(100)
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index 5c592c7409dd2..dc0c2d47f963f 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -1,187 +1,138 @@
-#define TURRET_STUN 0
-#define TURRET_LETHAL 1
-
-#define POPUP_ANIM_TIME 5
-#define POPDOWN_ANIM_TIME 5 //Be sure to change the icon animation at the same time or it'll look bad
-
-#define TURRET_FLAG_SHOOT_ALL_REACT (1<<0) // The turret gets pissed off and shoots at people nearby (unless they have sec access!)
-#define TURRET_FLAG_AUTH_WEAPONS (1<<1) // Checks if it can shoot people that have a weapon they aren't authorized to have
-#define TURRET_FLAG_SHOOT_CRIMINALS (1<<2) // Checks if it can shoot people that are wanted
-#define TURRET_FLAG_SHOOT_ALL (1<<3) // The turret gets pissed off and shoots at people nearby (unless they have sec access!)
-#define TURRET_FLAG_SHOOT_ANOMALOUS (1<<4) // Checks if it can shoot at unidentified lifeforms (ie xenos)
-#define TURRET_FLAG_SHOOT_UNSHIELDED (1<<5) // Checks if it can shoot people that aren't mindshielded and who arent heads
-#define TURRET_FLAG_SHOOT_BORGS (1<<6) // checks if it can shoot cyborgs
-#define TURRET_FLAG_SHOOT_HEADS (1<<7) // checks if it can shoot at heads of staff
-
-DEFINE_BITFIELD(turret_flags, list(
- "TURRET_FLAG_SHOOT_ALL_REACT" = TURRET_FLAG_SHOOT_ALL_REACT,
- "TURRET_FLAG_AUTH_WEAPONS" = TURRET_FLAG_AUTH_WEAPONS,
- "TURRET_FLAG_SHOOT_CRIMINALS" = TURRET_FLAG_SHOOT_CRIMINALS,
- "TURRET_FLAG_SHOOT_ALL" = TURRET_FLAG_SHOOT_ALL,
- "TURRET_FLAG_SHOOT_ANOMALOUS" = TURRET_FLAG_SHOOT_ANOMALOUS,
- "TURRET_FLAG_SHOOT_UNSHIELDED" = TURRET_FLAG_SHOOT_UNSHIELDED,
- "TURRET_FLAG_SHOOT_BORGS" = TURRET_FLAG_SHOOT_BORGS,
- "TURRET_FLAG_SHOOT_HEADS" = TURRET_FLAG_SHOOT_HEADS,
-))
-
/obj/machinery/porta_turret
name = "turret"
icon = 'icons/obj/turrets.dmi'
- icon_state = "turretCover"
- layer = OBJ_LAYER
- invisibility = INVISIBILITY_OBSERVER //the turret is invisible if it's inside its cover
+ icon_state = "standard_stun"
density = TRUE
- desc = "A covered turret that shoots at its enemies."
- use_power = IDLE_POWER_USE //this turret uses and requires power
- idle_power_usage = IDLE_DRAW_MINIMAL //when inactive, this turret takes up constant 50 Equipment power
- active_power_usage = ACTIVE_DRAW_LOW //when active, this turret takes up constant 300 Equipment power
- req_access = list(ACCESS_SECURITY) /// Only people with Security access
- power_channel = AREA_USAGE_EQUIP //drains power from the EQUIPMENT channel
- max_integrity = 160 //the turret's health
+ desc = "A turret that shoots at its enemies."
+ use_power = IDLE_POWER_USE
+ idle_power_usage = IDLE_DRAW_LOW
+ active_power_usage = ACTIVE_DRAW_HIGH
+ req_access = list(ACCESS_SECURITY)
+ power_channel = AREA_USAGE_EQUIP
+ max_integrity = 200
integrity_failure = 0.5
armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
base_icon_state = "standard"
+ subsystem_type = /datum/controller/subsystem/processing/turrets
+ circuit = /obj/item/circuitboard/machine/turret
+
/// Scan range of the turret for locating targets
var/scan_range = 7
- /// For turrets inside other objects
- var/atom/base = null
- /// If the turret cover is "open" and the turret is raised
- var/raised = FALSE
- /// If the turret is currently opening or closing its cover
- var/raising = FALSE
+ /// List of ALL targets in range, even if they are not visible
+ var/list/mob/living/targets = list()
+ /// The current target of the turret, if any
+ var/mob/living/current_target
+
+ /// The beam showing which target we're acquiring
+ var/datum/simple_beam/target_beam
+
/// If the turret's behaviour control access is locked
var/locked = TRUE
- /// If the turret responds to control panels
- var/controllock = FALSE
- /// The type of weapon installed by default
- var/installation = /obj/item/gun/energy/e_gun/turret
- /// What stored gun is in the turret
- var/obj/item/gun/stored_gun = null
- /// The charge of the gun when retrieved from wreckage
- var/gun_charge = 0
+
/// In which mode is turret in, stun or lethal
- var/mode = TURRET_STUN
+ var/lethal = FALSE
+
/// Stun mode projectile type
- var/stun_projectile = null
+ var/stun_projectile = /obj/projectile/beam/disabler
/// Sound of stun projectile
- var/stun_projectile_sound
+ var/stun_projectile_sound = 'sound/weapons/plasma_cutter.ogg'
/// Lethal mode projectile type
- var/lethal_projectile = null
+ var/lethal_projectile = /obj/projectile/beam/laser
/// Sound of lethal projectile
- var/lethal_projectile_sound
+ var/lethal_projectile_sound = 'sound/weapons/plasma_cutter.ogg'
+
/// Power needed per shot
var/reqpower = 500
- /// Will stay active
- var/always_up = FALSE
- /// Hides the cover
- var/has_cover = TRUE
- /// The cover that is covering this turret
- var/obj/machinery/porta_turret_cover/cover = null
- /// Ticks until next shot (1.5 ?)
- var/shot_delay = 15
- /// Turret flags about who is turret allowed to shoot
- var/turret_flags = TURRET_FLAG_SHOOT_CRIMINALS | TURRET_FLAG_SHOOT_ANOMALOUS
+
+ /// If the turret is currently manually controlled
+ var/manual_control = FALSE
+
+ /// Ticks until next shot If this needs to go below 5, use SSFastProcess
+ var/shot_delay = 1.5 SECONDS
+ /// Cooldown until we can shoot again
+ COOLDOWN_DECLARE(fire_cooldown)
+
+ /// Reaction time of the turret, how long it takes after acquiring a target to begin firing
+ var/reaction_time
+ /// Cooldown until we can start firing
+ COOLDOWN_DECLARE(reaction_cooldown)
+
/// Determines if the turret is on
var/on = TRUE
+ /// Turret flags about who is turret allowed to shoot
+ var/turret_flags = TURRET_FLAG_DEFAULT
+
+ /// If the turret is currently retaliating. Turrets will ignore all other settings to shoot at the attacker until they're dead or out of range
+ var/retaliating = FALSE
+
/// Same faction mobs will never be shot at, no matter the other settings
- var/list/faction = list("turret")
+ var/list/faction = list("neutral", "turret")
+
+ var/list/target_faction = list("hostile")
+
/// The spark system, used for generating... sparks?
var/datum/effect_system/spark_spread/spark_system
- /// Linked turret control panel of the turret
- var/obj/machinery/turretid/cp = null
+
/// The turret will try to shoot from a turf in that direction when in a wall
var/wall_turret_direction
- /// If the turret is manually controlled
- var/manual_control = FALSE
- /// Action button holder for quitting manual control
- var/datum/action/turret_quit/quit_action
- /// Action button holder for switching between turret modes when manually controlling
- var/datum/action/turret_toggle/toggle_action
- /// Mob that is remotely controlling the turret
- var/mob/remote_controller
- //our cooldowns
- COOLDOWN_DECLARE(fire_cooldown)
+
/// For connecting to additional turrets
var/id = ""
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+ COMSIG_ATOM_EXITED = PROC_REF(on_uncrossed),
+ )
/obj/machinery/porta_turret/Initialize()
. = ..()
- if(!base)
- base = src
+ if(!reaction_time)
+ reaction_time = shot_delay
+
+ target_beam = new(src, null, 'icons/effects/beam.dmi', "1-full", COLOR_RED, 127)
update_appearance()
//Sets up a spark system
spark_system = new /datum/effect_system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
- setup()
- if(has_cover)
- cover = new /obj/machinery/porta_turret_cover(loc)
- cover.parent_turret = src
- var/mutable_appearance/base = mutable_appearance('icons/obj/turrets.dmi', "basedark")
- base.layer = NOT_HIGH_OBJ_LAYER
- underlays += base
- if(!has_cover)
- INVOKE_ASYNC(src, PROC_REF(popUp))
+/obj/machinery/porta_turret/Destroy()
+ targets.Cut()
+ targets = null
-/obj/machinery/porta_turret/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
- id = "[REF(port)][id]"
- port.turret_list |= WEAKREF(src)
+ set_target(null)
-/obj/machinery/porta_turret/disconnect_from_shuttle(obj/docking_port/mobile/port)
- port.turret_list -= WEAKREF(src)
+ QDEL_NULL(spark_system)
+ QDEL_NULL(target_beam)
+ remove_control()
+ return ..()
-/obj/machinery/porta_turret/proc/toggle_on(set_to)
- var/current = on
- if (!isnull(set_to))
- on = set_to
- else
- on = !on
- if (current != on)
- check_should_process()
- if (!on)
- popDown()
+/obj/machinery/porta_turret/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/connect_range, src, loc_connections, scan_range, TRUE)
-/obj/machinery/porta_turret/proc/check_should_process()
- if (datum_flags & DF_ISPROCESSING)
- if (!on || !anchored || (machine_stat & BROKEN) || !powered())
- end_processing()
- else
- if (on && anchored && !(machine_stat & BROKEN) && powered())
- begin_processing()
+/obj/machinery/porta_turret/proc/on_entered(atom/old_loc, atom/movable/new_target)
+ var/static/list/typecache_of_targets = typecacheof(list(
+ /mob/living/carbon,
+ /mob/living/silicon,
+ /mob/living/simple_animal,
+ /obj/mecha,
+ ))
-/obj/machinery/porta_turret/update_icon_state()
- if(!anchored)
- icon_state = "turretCover"
- return ..()
- if(machine_stat & BROKEN)
- icon_state = "[base_icon_state]_broken"
- return ..()
- if(!powered())
- icon_state = "[base_icon_state]_unpowered"
- return ..()
- if(!on || !raised)
- icon_state = "[base_icon_state]_off"
- return ..()
- switch(mode)
- if(TURRET_STUN)
- icon_state = "[base_icon_state]_stun"
- if(TURRET_LETHAL)
- icon_state = "[base_icon_state]_lethal"
- return ..()
+ if(is_type_in_typecache(new_target, typecache_of_targets))
+ targets |= new_target
-/obj/machinery/porta_turret/proc/setup(obj/item/gun/turret_gun)
- if(stored_gun)
- qdel(stored_gun)
- stored_gun = null
+/obj/machinery/porta_turret/proc/on_uncrossed(atom/old_loc, atom/movable/target)
+ //Should also get any deleted targets, since they're moved to nullspace
+ targets -= target
- if(installation && !turret_gun)
- stored_gun = new installation(src)
- else if (turret_gun)
- stored_gun = turret_gun
+/obj/machinery/porta_turret/RefreshParts()
+ var/obj/item/gun/turret_gun = locate() in component_parts
+
+ if(!turret_gun)
+ return
- var/list/gun_properties = stored_gun.get_turret_properties()
+ var/list/gun_properties = turret_gun.get_turret_properties()
//required properties
stun_projectile = gun_properties["stun_projectile"]
@@ -196,191 +147,249 @@ DEFINE_BITFIELD(turret_flags, list(
if(gun_properties["reqpower"])
reqpower = gun_properties["reqpower"]
- update_appearance()
+ update_appearance(UPDATE_ICON_STATE)
return gun_properties
-/obj/machinery/porta_turret/Destroy()
- //deletes its own cover with it
- QDEL_NULL(cover)
- base = null
- if(cp)
- cp.turrets -= src
- cp = null
- QDEL_NULL(stored_gun)
- QDEL_NULL(spark_system)
- remove_control()
+/obj/machinery/porta_turret/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
+ id = "[text_ref(port)][initial(id)]"
+ port.turret_list |= WEAKREF(src)
+
+/obj/machinery/porta_turret/proc/toggle_on(set_to)
+ var/current = on
+ if (!isnull(set_to))
+ on = set_to
+ else
+ on = !on
+ if (current != on)
+ check_should_process()
+
+/obj/machinery/porta_turret/proc/check_should_process()
+ var/functional = (on && anchored && !(machine_stat & BROKEN) && powered())
+ var/processing = (datum_flags & DF_ISPROCESSING)
+
+ if(processing && !functional)
+ end_processing()
+
+ var/datum/component/connect_range/prox = GetComponent(/datum/component/connect_range)
+ prox?.set_tracked(null)
+ set_target(null)
+
+ else if(!processing && functional)
+ begin_processing()
+
+ var/datum/component/connect_range/prox = GetComponent(/datum/component/connect_range)
+ prox?.set_tracked(src)
+
+/obj/machinery/porta_turret/update_icon_state()
+ if(machine_stat & BROKEN)
+ icon_state = "[base_icon_state]_broken"
+ return ..()
+ if(!powered())
+ icon_state = "[base_icon_state]_unpowered"
+ return ..()
+ if(!on)
+ icon_state = "[base_icon_state]_off"
+ return ..()
+ if(lethal)
+ icon_state = "[base_icon_state]_lethal"
+ else
+ icon_state = "[base_icon_state]_stun"
return ..()
/obj/machinery/porta_turret/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, "PortableTurret", name)
+ ui = new(user, src, "TurretControl", name)
ui.open()
/obj/machinery/porta_turret/ui_data(mob/user)
- var/list/data = list(
+ var/allow_manual_control = FALSE
+ if(issilicon(user))
+ var/mob/living/silicon/silicon_user = user
+ allow_manual_control = silicon_user.hack_software
+
+ return list(
"locked" = locked,
- "on" = on,
- "check_weapons" = turret_flags & TURRET_FLAG_AUTH_WEAPONS,
- "neutralize_criminals" = turret_flags & TURRET_FLAG_SHOOT_CRIMINALS,
- "neutralize_all" = turret_flags & TURRET_FLAG_SHOOT_ALL,
- "neutralize_unidentified" = turret_flags & TURRET_FLAG_SHOOT_ANOMALOUS,
- "neutralize_nonmindshielded" = turret_flags & TURRET_FLAG_SHOOT_UNSHIELDED,
- "neutralize_cyborgs" = turret_flags & TURRET_FLAG_SHOOT_BORGS,
- "ignore_heads" = turret_flags & TURRET_FLAG_SHOOT_HEADS,
+ "enabled" = on,
+ "lethal" = lethal,
+ "siliconUser" = user.has_unlimited_silicon_privilege && check_ship_ai_access(user),
"manual_control" = manual_control,
- "silicon_user" = FALSE,
- "allow_manual_control" = FALSE,
+ "dangerous_only" = turret_flags & TURRET_FLAG_SHOOT_DANGEROUS_ONLY,
+ "retaliate" = turret_flags & TURRET_FLAG_SHOOT_RETALIATE,
+ "shoot_fauna" = turret_flags & TURRET_FLAG_SHOOT_FAUNA,
+ "shoot_humans" = turret_flags & TURRET_FLAG_SHOOT_HUMANS,
+ "shoot_silicons" = turret_flags & TURRET_FLAG_SHOOT_SILICONS,
+ "only_nonfaction" = turret_flags & TURRET_FLAG_SHOOT_NONFACTION,
+ "only_specificfaction" = turret_flags & TURRET_FLAG_SHOOT_SPECIFIC_FACTION,
+ "allow_manual_control" = allow_manual_control,
)
- if(issilicon(user))
- data["silicon_user"] = TRUE
- if(!manual_control)
- var/mob/living/silicon/S = user
- if(S.hack_software)
- data["allow_manual_control"] = TRUE
- return data
/obj/machinery/porta_turret/ui_act(action, list/params)
. = ..()
if(.)
return
+ if(locked)
+ to_chat(usr, span_warning("[src]'s controls are locked."))
+ return
+
switch(action)
+ if("lock")
+ if(!usr.has_unlimited_silicon_privilege)
+ return
+ toggle_lock(usr)
+ return TRUE
if("power")
if(anchored)
toggle_on()
return TRUE
else
to_chat(usr, "It has to be secured first!")
- if("authweapon")
- turret_flags ^= TURRET_FLAG_AUTH_WEAPONS
- return TRUE
- if("shootcriminals")
- turret_flags ^= TURRET_FLAG_SHOOT_CRIMINALS
+ if("manual")
+ if(!issilicon(usr))
+ return
+ var/mob/living/silicon/user = usr
+ if(!user.hack_software)
+ return
+ give_control(usr)
return TRUE
- if("shootall")
- turret_flags ^= TURRET_FLAG_SHOOT_ALL
+ if("mode")
+ lethal = !lethal
return TRUE
- if("checkxenos")
- turret_flags ^= TURRET_FLAG_SHOOT_ANOMALOUS
+
+ if("toggle_dangerous")
+ turret_flags ^= TURRET_FLAG_SHOOT_DANGEROUS_ONLY
return TRUE
- if("checkloyal")
- turret_flags ^= TURRET_FLAG_SHOOT_UNSHIELDED
+ if("toggle_retaliate")
+ turret_flags ^= TURRET_FLAG_SHOOT_RETALIATE
return TRUE
- if("shootborgs")
- turret_flags ^= TURRET_FLAG_SHOOT_BORGS
+
+ if("toggle_fauna")
+ turret_flags ^= TURRET_FLAG_SHOOT_FAUNA
return TRUE
- if("shootheads")
- turret_flags ^= TURRET_FLAG_SHOOT_HEADS
+ if("toggle_humans")
+ turret_flags ^= TURRET_FLAG_SHOOT_HUMANS
return TRUE
- if("manual")
- if(!issilicon(usr))
- return
- give_control(usr)
+ if("toggle_silicons")
+ turret_flags ^= TURRET_FLAG_SHOOT_SILICONS
return TRUE
-/obj/machinery/porta_turret/ui_host(mob/user)
- if(has_cover && cover)
- return cover
- if(base)
- return base
- return src
+ if("toggle_nonfaction")
+ turret_flags ^= TURRET_FLAG_SHOOT_NONFACTION
+ return TRUE
+ if("toggle_specificfaction")
+ turret_flags ^= TURRET_FLAG_SHOOT_SPECIFIC_FACTION
+ return TRUE
/obj/machinery/porta_turret/power_change()
. = ..()
+ if(!(flags_1 & INITIALIZED_1))
+ return
if(!anchored || (machine_stat & BROKEN) || !powered())
- update_appearance()
+ update_appearance(UPDATE_ICON_STATE)
remove_control()
+ set_target(null)
check_should_process()
/obj/machinery/porta_turret/attackby(obj/item/I, mob/user, params)
- if(machine_stat & BROKEN)
- if(I.tool_behaviour == TOOL_CROWBAR)
- //If the turret is destroyed, you can remove it with a crowbar to
- //try and salvage its components
- to_chat(user, "You begin prying the metal coverings off...")
- if(I.use_tool(src, user, 20))
- if(prob(70))
- if(stored_gun)
- stored_gun.forceMove(loc)
- stored_gun = null
- to_chat(user, "You remove the turret and salvage some components.")
- if(prob(50))
- new /obj/item/stack/sheet/metal(loc, rand(1,4))
- if(prob(50))
- new /obj/item/assembly/prox_sensor(loc)
- else
- to_chat(user, "You remove the turret but did not manage to salvage anything.")
- qdel(src)
- 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
+ if(machine_stat & BROKEN && I.tool_behaviour == TOOL_CROWBAR)
+ //If the turret is destroyed, you can remove it with a crowbar to
+ //try and salvage its components
+ to_chat(user, "You begin prying the metal coverings off...")
+ if(I.use_tool(src, user, 20))
+ if(prob(70))
+ var/obj/item/gun/stored_gun = locate() in component_parts
+ if(stored_gun)
+ stored_gun.forceMove(loc)
+ to_chat(user, "You remove the turret and salvage some components.")
+ if(prob(50))
+ new /obj/item/stack/sheet/metal(loc, rand(1,4))
+ if(prob(50))
+ new /obj/item/assembly/prox_sensor(loc)
+ else
+ to_chat(user, "You remove the turret but did not manage to salvage anything.")
+ qdel(src)
+ return
- to_chat(user, "You begin repairing [src]...")
- if(I.use_tool(src, user, 40, volume=50))
- obj_integrity = obj_integrity + 20
- to_chat(user, "You repair [src].")
- if(obj_integrity > (max_integrity * integrity_failure) && BROKEN)
- obj_integrity = max_integrity
- set_machine_stat(machine_stat & ~BROKEN)
- update_appearance()
- check_should_process()
- else
+ if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP)
+ if(obj_integrity >= max_integrity)
to_chat(user, "[src] is already in good condition!")
- return
+ return
+ to_chat(user, "You begin repairing [src]...")
+ while(obj_integrity < max_integrity)
+ if(!I.use_tool(src, user, 4 SECONDS, 2, 50))
+ break
+ obj_integrity = max(obj_integrity + 20, max_integrity)
+ to_chat(user, "You repair [src].")
- else if((I.tool_behaviour == TOOL_WRENCH) && (!on))
- if(raised)
- return
+ if(obj_integrity > (max_integrity * integrity_failure) && (machine_stat & BROKEN))
+ obj_integrity = max_integrity
+ set_machine_stat(machine_stat & ~BROKEN)
+ update_appearance(UPDATE_ICON_STATE)
+ check_should_process()
+ return
+
+
+ if((I.tool_behaviour == TOOL_WRENCH) && !on)
//This code handles moving the turret around. After all, it's a portable turret!
if(!anchored && !isinspace())
set_anchored(TRUE)
- invisibility = INVISIBILITY_MAXIMUM
- update_appearance()
+ update_appearance(UPDATE_ICON_STATE)
to_chat(user, "You secure the exterior bolts on the turret.")
- if(has_cover)
- cover = new /obj/machinery/porta_turret_cover(loc) //create a new turret. While this is handled in process(), this is to workaround a bug where the turret becomes invisible for a split second
- cover.parent_turret = src //make the cover's parent src
else if(anchored)
set_anchored(FALSE)
to_chat(user, "You unsecure the exterior bolts on the turret.")
power_change()
- invisibility = 0
- qdel(cover) //deletes the cover, and the turret instance itself becomes its own cover.
-
- if(I.GetID())
- //Behavior lock/unlock mangement
- if(allowed(user))
- locked = !locked
- to_chat(user, "Controls are now [locked ? "locked" : "unlocked"].")
- else
- to_chat(user, "Access denied.")
return
- if(I.tool_behaviour == TOOL_MULTITOOL && !locked)
+ if(I.tool_behaviour == TOOL_MULTITOOL)
+ if(locked)
+ to_chat(user, span_warning("The controls are locked."))
+ return
if(!multitool_check_buffer(user, I))
return
var/obj/item/multitool/M = I
M.buffer = src
to_chat(user, "You add [src] to multitool buffer.")
return
+
+ if(istype(I, /obj/item/card/id))
+ toggle_lock(user)
+ return
+
return ..()
+/obj/machinery/porta_turret/AltClick(mob/user)
+ . = ..()
+ toggle_lock(user)
+
+/obj/machinery/porta_turret/proc/toggle_lock(mob/user)
+ if(!user.canUseTopic(src, !issilicon(user)))
+ return
+ if(!allowed(user))
+ to_chat(user, span_alert("Access denied."))
+ return
+ if(obj_flags & EMAGGED || (machine_stat & (BROKEN|MAINT)))
+ to_chat(user, span_warning("The turret is unresponsive!"))
+ return
+
+ to_chat(user, span_notice("You [locked ? "unlock" : "lock"] [src]."))
+ locked = !locked
+ update_appearance()
+
/obj/machinery/porta_turret/emag_act(mob/user)
if(obj_flags & EMAGGED)
return
to_chat(user, "You short out [src]'s threat assessment circuits.")
audible_message("[src] hums oddly...")
obj_flags |= EMAGGED
- controllock = TRUE
+ locked = TRUE
toggle_on(FALSE) //turns off the turret temporarily
- update_appearance()
+ update_appearance(UPDATE_ICON_STATE)
//6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 6 SECONDS)
- //turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here
/obj/machinery/porta_turret/emp_act(severity)
. = ..()
@@ -389,786 +398,231 @@ DEFINE_BITFIELD(turret_flags, list(
if(on)
//if the turret is on, the EMP no matter how severe disables the turret for a while
//and scrambles its settings, with a slight chance of having an emag effect
- if(prob(50))
- turret_flags |= TURRET_FLAG_SHOOT_CRIMINALS
- if(prob(50))
- turret_flags |= TURRET_FLAG_AUTH_WEAPONS
- if(prob(20))
- turret_flags |= TURRET_FLAG_SHOOT_ALL // Shooting everyone is a pretty big deal, so it's least likely to get turned on
+ if(prob(5))
+ turret_flags ^= TURRET_FLAG_SHOOT_HUMANS
+ if(prob(5))
+ turret_flags ^= TURRET_FLAG_SHOOT_FAUNA
+ if(prob(1))
+ turret_flags ^= TURRET_FLAG_SHOOT_NONFACTION
+ if(prob(1))
+ turret_flags ^= TURRET_FLAG_SHOOT_SPECIFIC_FACTION
toggle_on(FALSE)
remove_control()
- addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), rand(60,600))
+ addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), rand(6 SECONDS, 60 SECONDS))
/obj/machinery/porta_turret/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
. = ..()
- if(. && obj_integrity > 0) //damage received
- if(prob(30))
- spark_system.start()
- if(on && !(turret_flags & TURRET_FLAG_SHOOT_ALL_REACT) && !(obj_flags & EMAGGED))
- turret_flags |= TURRET_FLAG_SHOOT_ALL_REACT
- addtimer(CALLBACK(src, PROC_REF(reset_attacked)), 60)
+ if(!. || obj_integrity <= 0)
+ return
+ //damage received
+ if(prob(30))
+ spark_system.start()
-/obj/machinery/porta_turret/proc/reset_attacked()
- turret_flags &= ~TURRET_FLAG_SHOOT_ALL_REACT
+/obj/machinery/porta_turret/proc/retaliate(mob/living/target)
+ if(!(turret_flags & TURRET_FLAG_SHOOT_RETALIATE) || current_target || !on || (req_ship_access && allowed(target)) || (machine_stat & BROKEN|NOPOWER|MAINT))
+ return
+
+ set_target(target)
+ target(target)
+ retaliating = TRUE
+
+/obj/machinery/porta_turret/bullet_act(obj/projectile/hitting_projectile)
+ . = ..()
+ if(ismob(hitting_projectile.firer))
+ retaliate(hitting_projectile.firer)
-/obj/machinery/porta_turret/deconstruct(disassembled = TRUE)
- qdel(src)
+/obj/machinery/porta_turret/attacked_by(obj/item/I, mob/living/user)
+ . = ..()
+ if(!I.force || I.damtype == STAMINA)
+ return
+ retaliate(user)
/obj/machinery/porta_turret/obj_break(damage_flag)
. = ..()
if(.)
power_change()
- invisibility = 0
spark_system.start() //creates some sparks because they look cool
- qdel(cover) //deletes the cover - no need on keeping it there!
/obj/machinery/porta_turret/process()
- //the main machinery process
- if(cover == null && anchored) //if it has no cover and is anchored
- if(machine_stat & BROKEN) //if the turret is borked
- qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug
- else
- if(has_cover)
- cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover
- cover.parent_turret = src //assign the cover its parent_turret, which would be this (src)
-
if(!on || (machine_stat & (NOPOWER|BROKEN)) || manual_control)
return PROCESS_KILL
- var/list/targets = list()
- for(var/mob/A in view(scan_range, base))
- if(A.invisibility > SEE_INVISIBLE_LIVING)
- continue
-
- if(turret_flags & TURRET_FLAG_SHOOT_ANOMALOUS)//if it's set to check for simple animals
- if(isanimal(A))
- var/mob/living/simple_animal/SA = A
- if(SA.stat || in_faction(SA)) //don't target if dead or in faction
- continue
- targets += SA
- continue
-
- if(issilicon(A))
- var/mob/living/silicon/sillycone = A
-
- if(ispAI(A))
- continue
-
- if((turret_flags & TURRET_FLAG_SHOOT_BORGS) && sillycone.stat != DEAD && iscyborg(sillycone))
- targets += sillycone
- continue
-
- if(sillycone.stat || in_faction(sillycone))
- continue
-
- if(iscyborg(sillycone))
- var/mob/living/silicon/robot/sillyconerobot = A
- if(LAZYLEN(faction) && (ROLE_SYNDICATE in faction) && sillyconerobot.emagged == TRUE)
- continue
-
- else if(iscarbon(A))
- var/mob/living/carbon/C = A
- //If not emagged, only target carbons that can use items
- if(mode != TURRET_LETHAL && (C.stat || C.handcuffed || !(C.mobility_flags & MOBILITY_USE)))
- continue
-
- //If emagged, target all but dead carbons
- if(mode == TURRET_LETHAL && C.stat == DEAD)
- continue
-
- //if the target is a human and not in our faction, analyze threat level
- if(ishuman(C) && !in_faction(C))
-
- if(assess_perp(C) >= 4)
- targets += C
- else if(turret_flags & TURRET_FLAG_SHOOT_ANOMALOUS) //non humans who are not simple animals (xenos etc)
- if(!in_faction(C))
- targets += C
-
- for(var/A in GLOB.mechas_list)
- if((get_dist(A, base) < scan_range) && can_see(base, A, scan_range))
- var/obj/mecha/Mech = A
- if(Mech.occupant && !in_faction(Mech.occupant)) //If there is a user and they're not in our faction
- if(assess_perp(Mech.occupant) >= 4)
- targets += Mech
-
- if(targets.len)
- tryToShootAt(targets)
- else if(!always_up)
- popDown() // no valid targets, close the cover
-
-/obj/machinery/porta_turret/proc/tryToShootAt(list/atom/movable/targets)
- while(targets.len > 0)
- var/atom/movable/M = pick(targets)
- targets -= M
- if(target(M))
- return 1
-
-/obj/machinery/porta_turret/proc/popUp() //pops the turret up
- if(!anchored)
- return
- if(raising || raised)
- return
- if(machine_stat & BROKEN)
- return
- invisibility = 0
- raising = 1
- if(cover)
- flick("popup", cover)
- sleep(POPUP_ANIM_TIME)
- raising = 0
- if(cover)
- cover.icon_state = "openTurretCover"
- raised = 1
- layer = MOB_LAYER
-
-/obj/machinery/porta_turret/proc/popDown() //pops the turret down
- if(raising || !raised)
+ if(!COOLDOWN_FINISHED(src, fire_cooldown))
return
- if(machine_stat & BROKEN)
- return
- layer = OBJ_LAYER
- raising = 1
- if(cover)
- flick("popdown", cover)
- sleep(POPDOWN_ANIM_TIME)
- raising = 0
- if(cover)
- cover.icon_state = "turretCover"
- raised = 0
- invisibility = 2
- update_appearance()
-
-/obj/machinery/porta_turret/proc/assess_perp(mob/living/carbon/human/perp)
- var/threatcount = 0 //the integer returned
-
- if(obj_flags & EMAGGED)
- return 10 //if emagged, always return 10.
-
- if((turret_flags & (TURRET_FLAG_SHOOT_ALL | TURRET_FLAG_SHOOT_ALL_REACT)) && !allowed(perp))
- //if the turret has been attacked or is angry, target all non-sec people
- if(!allowed(perp))
- return 10
-
- if(turret_flags & TURRET_FLAG_AUTH_WEAPONS) //check for weapon authorization
- if(isnull(perp.wear_id) || istype(perp.wear_id.GetID(), /obj/item/card/id/syndicate))
-
- if(allowed(perp)) //if the perp has security access, return 0
- return 0
- if(perp.is_holding_item_of_type(/obj/item/gun) || perp.is_holding_item_of_type(/obj/item/melee/baton))
- threatcount += 4
- if(istype(perp.belt, /obj/item/gun) || istype(perp.belt, /obj/item/melee/baton))
- threatcount += 2
-
- if(turret_flags & TURRET_FLAG_SHOOT_CRIMINALS) //if the turret can check the records, check if they are set to *Arrest* on records
- var/perpname = perp.get_face_name(perp.get_id_name())
- var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.security)
- if(!R || (R.fields["criminal"] == "*Arrest*"))
- threatcount += 4
-
- if((turret_flags & TURRET_FLAG_SHOOT_UNSHIELDED) && (!HAS_TRAIT(perp, TRAIT_MINDSHIELD)))
- threatcount += 4
-
- // If we aren't shooting heads then return a threatcount of 0
- if (!(turret_flags & TURRET_FLAG_SHOOT_HEADS) && (perp.get_assignment() in GLOB.command_positions))
- return 0
-
- return threatcount
-
-/obj/machinery/porta_turret/proc/in_faction(mob/target)
- for(var/faction1 in faction)
- if(faction1 in target.faction)
- return TRUE
- if(ismouse(target))
- return TRUE
- return FALSE
-
-/obj/machinery/porta_turret/proc/target(atom/movable/target)
- if(target)
- popUp() //pop the turret up if it's not already up.
- setDir(get_dir(base, target))//even if you can't shoot, follow the target
- shootAt(target)
- return 1
- return
-
-/obj/machinery/porta_turret/proc/shootAt(atom/movable/target)
- if(!raised) //the turret has to be raised in order to fire - makes sense, right?
- return
-
- if(!(obj_flags & EMAGGED)) //if it hasn't been emagged, cooldown before shooting again
- if(!COOLDOWN_FINISHED(src, fire_cooldown))
+ if(current_target)
+ //Try to fire at the current target first
+ if(check_target(current_target) && target(current_target))
return
- COOLDOWN_START(src, fire_cooldown, shot_delay)
-
- var/turf/T = get_turf(src)
- var/turf/U = get_turf(target)
- if(!istype(T) || !istype(U))
- return
-
- //Wall turrets will try to find adjacent empty turf to shoot from to cover full arc
- if(T.density)
- if(wall_turret_direction)
- var/turf/closer = get_step(T,wall_turret_direction)
- if(istype(closer) && !closer.is_blocked_turf() && T.Adjacent(closer))
- T = closer
- else
- var/target_dir = get_dir(T,target)
- for(var/d in list(0,-45,45))
- var/turf/closer = get_step(T,turn(target_dir,d))
- if(istype(closer) && !closer.is_blocked_turf() && T.Adjacent(closer))
- T = closer
- break
-
- update_appearance()
- var/obj/projectile/A
- //any emagged turrets drains 2x power and uses a different projectile?
- if(mode == TURRET_STUN)
- use_power(reqpower)
- A = new stun_projectile(T)
- playsound(loc, stun_projectile_sound, 75, TRUE)
- else
- use_power(reqpower * 2)
- A = new lethal_projectile(T)
- playsound(loc, lethal_projectile_sound, 75, TRUE)
+ //Current target is invalid, so we need to find a new one
+ set_target(null)
- //Shooting Code:
- A.preparePixelProjectile(target, T)
- A.firer = src
- A.fired_from = src
- A.fire()
- return A
-
-/obj/machinery/porta_turret/proc/setState(on, mode, shoot_cyborgs)
- if(controllock)
- return
-
- shoot_cyborgs ? (turret_flags |= TURRET_FLAG_SHOOT_BORGS) : (turret_flags &= ~TURRET_FLAG_SHOOT_BORGS)
- toggle_on(on)
- src.mode = mode
- power_change()
+ for(var/atom/movable/target as anything in targets)
+ //TODO: Remove this if it never happens, because it shouldn't
+ if(QDELETED(target))
+ targets -= target
+ stack_trace("Qdeleted target in turret list")
+ return FALSE
-/datum/action/turret_toggle
- name = "Toggle Mode"
- icon_icon = 'icons/mob/actions/actions_mecha.dmi'
- button_icon_state = "mech_cycle_equip_off"
+ if(isnull(target))
+ targets -= target
+ stack_trace("Null target in turret list")
+ continue
-/datum/action/turret_toggle/Trigger()
- var/obj/machinery/porta_turret/P = target
- if(!istype(P))
- return
- P.setState(P.on,!P.mode)
+ if(check_target(target))
+ break
-/datum/action/turret_quit
- name = "Release Control"
- icon_icon = 'icons/mob/actions/actions_mecha.dmi'
- button_icon_state = "mech_eject"
+/obj/machinery/porta_turret/proc/check_target(atom/movable/target, check_flags = turret_flags)
+ // mecha|carbon|silicon|simple_animal
+ if(ismecha(target))
+ var/obj/mecha/mech = target
+ if(!mech.occupant)
+ targets -= target
+ return FALSE
+ target = mech.occupant
-/datum/action/turret_quit/Trigger()
- var/obj/machinery/porta_turret/P = target
- if(!istype(P))
- return
- P.remove_control(FALSE)
+ // We know the target must be a mob now
+ var/mob/target_mob = target
-/obj/machinery/porta_turret/proc/give_control(mob/A)
- if(manual_control || !can_interact(A))
+ if(target_mob.stat == DEAD)
+ //They probably won't need to be re-checked
+ targets -= target
return FALSE
- remote_controller = A
- if(!quit_action)
- quit_action = new(src)
- quit_action.Grant(remote_controller)
- if(!toggle_action)
- toggle_action = new(src)
- toggle_action.Grant(remote_controller)
- remote_controller.reset_perspective(src)
- remote_controller.click_intercept = src
- manual_control = TRUE
- always_up = TRUE
- popUp()
- return TRUE
-/obj/machinery/porta_turret/proc/remove_control(warning_message = TRUE)
- if(!manual_control)
+ if((check_flags & TURRET_FLAG_SHOOT_NONFACTION) && faction_check(src.faction, target_mob.faction))
return FALSE
- if(remote_controller)
- if(warning_message)
- to_chat(remote_controller, "Your uplink to [src] has been severed!")
- quit_action.Remove(remote_controller)
- toggle_action.Remove(remote_controller)
- remote_controller.click_intercept = null
- remote_controller.reset_perspective()
- always_up = initial(always_up)
- manual_control = FALSE
- remote_controller = null
- return TRUE
-/obj/machinery/porta_turret/proc/InterceptClickOn(mob/living/caller, params, atom/A)
- if(!manual_control)
- return FALSE
- if(!can_interact(caller))
- remove_control()
+ if((check_flags & TURRET_FLAG_SHOOT_SPECIFIC_FACTION) && !faction_check(src.faction, target_mob.faction))
return FALSE
- log_combat(caller,A,"fired with manual turret control at")
- target(A)
- return TRUE
-
-/obj/machinery/porta_turret/syndicate
- installation = null
- always_up = 1
- use_power = NO_POWER_USE
- has_cover = 0
- scan_range = 9
- req_access = list(ACCESS_SYNDICATE)
- mode = TURRET_LETHAL
- stun_projectile = /obj/projectile/bullet
- lethal_projectile = /obj/projectile/bullet
- lethal_projectile_sound = 'sound/weapons/gun/pistol/shot.ogg'
- stun_projectile_sound = 'sound/weapons/gun/pistol/shot.ogg'
- icon_state = "syndie_off"
- base_icon_state = "syndie"
- faction = list(ROLE_SYNDICATE)
- desc = "A ballistic machine gun auto-turret."
-
-/obj/machinery/porta_turret/syndicate/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
-
-/obj/machinery/porta_turret/syndicate/setup()
- return
-
-/obj/machinery/porta_turret/syndicate/assess_perp(mob/living/carbon/human/perp)
- return 10 //Syndicate turrets shoot everything not in their faction
-
-/obj/machinery/porta_turret/syndicate/energy
- icon_state = "standard_lethal"
- base_icon_state = "standard"
- stun_projectile = /obj/projectile/energy/electrode
- stun_projectile_sound = 'sound/weapons/taser.ogg'
- lethal_projectile = /obj/projectile/beam/laser
- lethal_projectile_sound = 'sound/weapons/laser.ogg'
- desc = "An energy blaster auto-turret."
-
-/obj/machinery/porta_turret/syndicate/energy/heavy
- icon_state = "standard_lethal"
- base_icon_state = "standard"
- stun_projectile = /obj/projectile/energy/electrode
- stun_projectile_sound = 'sound/weapons/taser.ogg'
- lethal_projectile = /obj/projectile/beam/laser/heavylaser
- lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
- desc = "An energy blaster auto-turret."
-
-/obj/machinery/porta_turret/syndicate/energy/raven
- stun_projectile = /obj/projectile/beam/laser
- stun_projectile_sound = 'sound/weapons/laser.ogg'
- faction = list("neutral","silicon","turret")
-
-/obj/machinery/porta_turret/syndicate/pod
- integrity_failure = 0.5
- max_integrity = 40
- stun_projectile = /obj/projectile/bullet/syndicate_turret
- lethal_projectile = /obj/projectile/bullet/syndicate_turret
-
-/obj/machinery/porta_turret/syndicate/shuttle
- scan_range = 9
- shot_delay = 3
- stun_projectile = /obj/projectile/bullet/p50/penetrator/shuttle
- lethal_projectile = /obj/projectile/bullet/p50/penetrator/shuttle
- lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
- stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
- armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 80, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
-
-/obj/machinery/porta_turret/syndicate/shuttle/target(atom/movable/target)
- if(target)
- setDir(get_dir(base, target))//even if you can't shoot, follow the target
- shootAt(target)
- addtimer(CALLBACK(src, PROC_REF(shootAt), target), 5)
- addtimer(CALLBACK(src, PROC_REF(shootAt), target), 10)
- addtimer(CALLBACK(src, PROC_REF(shootAt), target), 15)
- return TRUE
-
-/obj/machinery/porta_turret/ai
- faction = list("silicon")
- turret_flags = TURRET_FLAG_SHOOT_CRIMINALS | TURRET_FLAG_SHOOT_ANOMALOUS | TURRET_FLAG_SHOOT_HEADS
-
-/obj/machinery/porta_turret/ai/assess_perp(mob/living/carbon/human/perp)
- return 10 //AI turrets shoot at everything not in their faction
-
-/obj/machinery/porta_turret/ship
- installation = null
- max_integrity = 300
- always_up = 1
- use_power = ACTIVE_POWER_USE
- active_power_usage = ACTIVE_DRAW_MINIMAL
- has_cover = 0
- scan_range = 9
- stun_projectile = /obj/projectile/beam/disabler
- lethal_projectile = /obj/projectile/beam/laser
- lethal_projectile_sound = 'sound/weapons/plasma_cutter.ogg'
- stun_projectile_sound = 'sound/weapons/plasma_cutter.ogg'
- icon_state = "syndie_off"
- base_icon_state = "syndie"
- faction = list("neutral", "turret")
- mode = TURRET_STUN
-
-/obj/machinery/porta_turret/ship/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
-
-/obj/machinery/porta_turret/ship/setup()
- return
-
-/obj/machinery/porta_turret/ship/examine(mob/user)
- . = ..()
- if(in_range(user, src) || isobserver(user))
- if(!(machine_stat & BROKEN))
- . += "Its reports that it's integrity is currently [(obj_integrity / max_integrity) * 100] percent."
-
-/obj/machinery/porta_turret/ship/weak
- max_integrity = 120
- integrity_failure = 0.5
- name = "Old Laser Turret"
- desc = "A turret built with substandard parts and run down further with age. Still capable of delivering lethal lasers to the odd space carp, but not much else."
- stun_projectile = /obj/projectile/beam/disabler/weak
- lethal_projectile = /obj/projectile/beam/weak/penetrator
- faction = list("neutral", "turret")
-
-/obj/machinery/porta_turret/ship/ballistic
- stun_projectile = /obj/projectile/bullet/turret/rubber
- lethal_projectile = /obj/projectile/bullet/turret
- lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
- stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
- desc = "A ballistic machine gun auto-turret."
-
-//high rof, range, faster projectile speed
-/* 'Nanotrasen' turrets */
-
-/obj/machinery/porta_turret/ship/nt
- name = "Sharplite Defense Turret"
- desc = "A cheap and effective turret designed by Sharplite and purchased and installed on most Nanotrasen Vessels."
- faction = list(FACTION_PLAYER_NANOTRASEN, "turret")
- icon_state = "standard_lethal"
- base_icon_state = "standard"
- stun_projectile = /obj/projectile/beam/disabler/sharplite
- lethal_projectile = /obj/projectile/beam/laser/sharplite
- lethal_projectile_sound = 'sound/weapons/gun/laser/nt-fire.ogg'
- stun_projectile_sound = 'sound/weapons/taser2.ogg'
- shot_delay = 10
- scan_range = 10
-/obj/machinery/porta_turret/ship/nt/light
- name = "Sharplite LDS"
- desc = "A cheap and effective 'defensive system' designed by Sharplite for installation on Nanotrasen vessels."
- stun_projectile = /obj/projectile/beam/disabler/weak/sharplite
- lethal_projectile = /obj/projectile/beam/laser/light/sharplite
- lethal_projectile_sound = 'sound/weapons/gun/laser/nt-fire.ogg'
- stun_projectile_sound = 'sound/weapons/taser2.ogg'
+ if(iscyborg(target_mob))
+ return (check_flags & TURRET_FLAG_SHOOT_SILICONS) && target(target_mob)
+ if(!ishuman(target_mob))
+ if(!(check_flags & TURRET_FLAG_SHOOT_FAUNA))
+ return FALSE
-/obj/machinery/porta_turret/ship/nt/heavy
- name = "Sharplite Defense Cannon"
- desc = "A heavy laser mounting designed by Sharplite for usage on Nanotrasen vessels."
- lethal_projectile = /obj/projectile/beam/laser/heavylaser/sharplite
- lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+ if(!(check_flags & TURRET_FLAG_SHOOT_DANGEROUS_ONLY))
+ return target(target_mob)
-/obj/machinery/porta_turret/ship/nt/pulse
- name = "Sharplite Pulse Cannon"
- desc = "A pulse cannon mounting designed by Sharplite. Not sold to any purchasers and exclusively used on Nanotrasen Vessels."
- lethal_projectile = /obj/projectile/beam/pulse/sharplite_turret
- lethal_projectile_sound = 'sound/weapons/gun/laser/heavy_laser.ogg'
+ //this is gross
+ var/static/list/dangerous_fauna = typecacheof(list(/mob/living/simple_animal/hostile, /mob/living/carbon/alien, /mob/living/carbon/monkey))
+ if(!is_type_in_typecache(target_mob, dangerous_fauna))
+ return FALSE
+ if(ismonkey(target_mob))
+ var/mob/living/carbon/monkey/monke = target_mob
+ return monke.mode == MONKEY_HUNT && target(target_mob)
+ if(istype(target_mob, /mob/living/simple_animal/hostile/retaliate))
+ var/mob/living/simple_animal/hostile/retaliate/target_animal = target_mob
+ return length(target_animal.enemies) && target(target_mob)
+ return target(target_mob)
-/* Syndicate Turrets */
+ //We know the target must be a human now
+ var/mob/living/carbon/human/target_carbon = target_mob
-/obj/machinery/porta_turret/ship/syndicate
- faction = list(FACTION_PLAYER_SYNDICATE, "turret")
- icon_state = "standard_lethal"
- base_icon_state = "standard"
-
-/obj/machinery/porta_turret/ship/syndicate/weak
- name = "Light Laser Turret"
- desc = "A low powered turret designed by the Gorlex Maurauders during the ICW. Effectively weaponizes mining equipment."
- stun_projectile = /obj/projectile/beam/disabler/weak
- lethal_projectile = /obj/projectile/beam/weak/penetrator
- icon_state = "syndie_off"
- base_icon_state = "syndie"
-
-/obj/machinery/porta_turret/ship/syndicate/heavy
- name = "Heavy Laser Turret"
- desc = "Produced by Cybersun, this turret is a duel mount of a propietary heavy laser, and crowd control taser system."
- stun_projectile = /obj/projectile/energy/electrode
- stun_projectile_sound = 'sound/weapons/taser.ogg'
- lethal_projectile = /obj/projectile/beam/laser/heavylaser
- lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
-
-/* Inteq Turrets */
-
-/obj/machinery/porta_turret/ship/inteq
- name = "Vanguard Turret"
- desc = "A turret designed by IRMG engineers for defending ships from hostile flora, fauna, and people (and Elzousa, which count as flora and people)."
- stun_projectile = /obj/projectile/bullet/a762_40/rubber
- stun_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg'
- lethal_projectile = /obj/projectile/bullet/a762_40
- lethal_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg'
- scan_range = 8
- shot_delay = 20
- faction = list(FACTION_PLAYER_INTEQ, "turret")
-
-/obj/machinery/porta_turret/ship/inteq/light
- name = "Close-In Vanguard Turret"
- desc = "A light turret designed by IRMG engineers for the the task of defending from close-in encounters. Low power, high speed."
- stun_projectile = /obj/projectile/bullet/c10mm/rubber
- stun_projectile_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
- lethal_projectile = /obj/projectile/bullet/c10mm
- lethal_projectile_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
- subsystem_type = /datum/controller/subsystem/processing/fastprocess //turns out if you have a shot delay below what SSmachines fires at you need to use a different subsystem
- scan_range = 4
- shot_delay = 5
-
-/obj/machinery/porta_turret/ship/inteq/heavy
- name = "Vanguard Overwatch Turret"
- desc = "A turret designed by IRMG engineers to provide long range defensive fire on their installations. Has a habit of leaving big holes."
- stun_projectile = /obj/projectile/bullet/a308/rubber
- stun_projectile_sound = 'sound/weapons/gun/rifle/f4.ogg'
- lethal_projectile = /obj/projectile/bullet/a308
- lethal_projectile_sound = 'sound/weapons/gun/rifle/f4.ogg'
- scan_range = 12
- shot_delay = 20
-
-/* Solcon Turrets */
-
-/obj/machinery/porta_turret/ship/solgov
- faction = list(FACTION_PLAYER_SOLCON, "turret")
-
-/* Pan Gezena Federation Turrets */
-
-/obj/machinery/porta_turret/ship/pgf
- name = "Etherbor Defensive Mount"
- desc = "A less portable Etherbor offering, the EDM is a self-directed linkage of energy weapons, designed to keep intruders away from Gezenan vessels."
- faction = list(FACTION_PLAYER_GEZENA, "Turret")
- stun_projectile = /obj/projectile/beam/hitscan/disabler
- stun_projectile_sound = 'sound/weapons/gun/energy/kalixpistol.ogg'
- lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf/assault
- lethal_projectile_sound = 'sound/weapons/gun/energy/kalixsmg.ogg'
- icon_state = "standard_lethal"
- base_icon_state = "standard"
-
-/obj/machinery/porta_turret/ship/pgf/light
- name = "Etherbor Deterrent System"
- desc = "A light turret manufactured by Etherbor. It offers a lightweight assembly of energy weapons to accost nearby foes."
- lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf
- lethal_projectile_sound = 'sound/weapons/gun/energy/kalixsmg.ogg'
-
-/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
- 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'
-
-////////////////////////
-//Turret Control Panel//
-////////////////////////
-
-/obj/machinery/turretid
- name = "turret control panel"
- desc = "Used to control a room's automated defenses."
- icon = 'icons/obj/machines/turret_control.dmi'
- icon_state = "control_standby"
- base_icon_state = "control"
- density = FALSE
- req_access = list(ACCESS_AI_UPLOAD)
- resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- /// Variable dictating if linked turrets are active and will shoot targets
- var/enabled = TRUE
- /// Variable dictating if linked turrets will shoot lethal projectiles
- var/lethal = FALSE
- /// Variable dictating if the panel is locked, preventing changes to turret settings
- var/locked = TRUE
- /// An area in which linked turrets are located, it can be an area name, path or nothing
- var/control_area = null
- /// AI is unable to use this machine if set to TRUE
- var/ailock = FALSE
- /// Variable dictating if linked turrets will shoot cyborgs
- var/shoot_cyborgs = FALSE
- /// List of all linked turrets
- var/list/turrets = list()
- ///id for connecting to additional turrets
- var/id = ""
-
-/obj/machinery/turretid/Initialize(mapload, ndir = 0, built = 0)
- . = ..()
- if(built)
- setDir(ndir)
- locked = FALSE
- pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
- pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
- power_change() //Checks power and initial settings
-
-/obj/machinery/turretid/Destroy()
- turrets.Cut()
- return ..()
+ if(req_ship_access && (check_access(target_carbon.get_active_held_item()) || check_access(target_carbon.wear_id)))
+ return FALSE
-/obj/machinery/turretid/Initialize(mapload) //map-placed turrets autolink turrets
- . = ..()
- if(!mapload)
- return
+ if(!(check_flags & TURRET_FLAG_SHOOT_DANGEROUS_ONLY))
+ return target(target_carbon)
-/obj/machinery/turretid/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
- id = "[REF(port)][id]"
- RegisterSignal(port, COMSIG_SHIP_DONE_CONNECTING, PROC_REF(late_connect_to_shuttle))
+ //Not dangerous if you can't hold anything
+ if(target_carbon.handcuffed || !(target_carbon.mobility_flags & MOBILITY_USE))
+ return FALSE
-/obj/machinery/turretid/disconnect_from_shuttle(obj/docking_port/mobile/port)
- UnregisterSignal(port, COMSIG_SHIP_DONE_CONNECTING)
+ if(target_carbon.is_holding_item_of_type(/obj/item/gun) || target_carbon.is_holding_item_of_type(/obj/item/melee))
+ return target(target_carbon)
-/obj/machinery/turretid/proc/late_connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
- SIGNAL_HANDLER
+//Returns whether or not we should stop searching for targets
+/obj/machinery/porta_turret/proc/target(mob/living/target)
+ if(!COOLDOWN_FINISHED(src, fire_cooldown))
+ return TRUE
- for(var/datum/weakref/ship_guns in port.turret_list)
- var/obj/machinery/porta_turret/turret_gun = ship_guns.resolve()
- if(turret_gun.id == id)
- turrets |= turret_gun
- turret_gun.cp = src
+ var/turf/our_turf = get_turf(src)
+ if(!istype(our_turf))
+ return TRUE
-/obj/machinery/turretid/examine(mob/user)
- . += ..()
- if(issilicon(user) && !(machine_stat & BROKEN))
- . += {"Ctrl-click [src] to [ enabled ? "disable" : "enable"] turrets.
- Alt-click [src] to set turrets to [ lethal ? "stun" : "kill"]."}
+ //Wall turrets will try to find adjacent empty turf to shoot from to cover full arc
+ if(our_turf.density)
+ if(wall_turret_direction)
+ var/turf/closer = get_step(our_turf, wall_turret_direction)
+ if(istype(closer) && !closer.is_blocked_turf() && our_turf.Adjacent(closer))
+ our_turf = closer
+ else
+ var/target_dir = get_dir(our_turf, target)
+ for(var/d in list(0, -45, 45))
+ var/turf/closer = get_step(our_turf, turn(target_dir, d))
+ if(istype(closer) && !closer.is_blocked_turf() && our_turf.Adjacent(closer))
+ our_turf = closer
+ break
+ if(!can_see(our_turf, target, scan_range))
+ return FALSE
-/obj/machinery/turretid/attackby(obj/item/I, mob/user, params)
- if(machine_stat & BROKEN)
- return
+ setDir(get_dir(our_turf, target))
- if(I.tool_behaviour == TOOL_MULTITOOL)
- if(!multitool_check_buffer(user, I))
- return
- var/obj/item/multitool/M = I
- if(M.buffer && istype(M.buffer, /obj/machinery/porta_turret))
- turrets |= M.buffer
- to_chat(user, "You link \the [M.buffer] with \the [src].")
- return
+ if(!manual_control)
+ if(current_target != target)
+ set_target(target)
+ COOLDOWN_START(src, reaction_cooldown, reaction_time)
- if (issilicon(user))
- return attack_hand(user)
+ if(ishuman(target) || target.client)
+ target.do_alert_animation(target)
- // trying to unlock the interface
- if (in_range(src, user))
- if (allowed(usr))
- if(obj_flags & EMAGGED)
- to_chat(user, "The turret control is unresponsive!")
- return
+ return TRUE
- locked = !locked
- to_chat(user, "You [ locked ? "lock" : "unlock"] the panel.")
- else
- to_chat(user, "Access denied.")
+ if(!COOLDOWN_FINISHED(src, reaction_cooldown))
+ return TRUE
-/obj/machinery/turretid/emag_act(mob/user)
- if(obj_flags & EMAGGED)
- return
- to_chat(user, "You short out the turret controls' access analysis module.")
- obj_flags |= EMAGGED
- locked = FALSE
+ target_beam.set_target(null)
+ COOLDOWN_START(src, fire_cooldown, shot_delay)
-/obj/machinery/turretid/attack_ai(mob/user)
- if(!ailock || isAdminGhostAI(user))
- return attack_hand(user)
+ update_appearance(UPDATE_ICON_STATE)
+ var/obj/projectile/shot
+ //any lethaling turrets drain 2x the power and use a different projectile
+ if(lethal)
+ use_power(reqpower * 2)
+ shot = new lethal_projectile(our_turf)
+ playsound(loc, lethal_projectile_sound, 75, TRUE)
else
- to_chat(user, "There seems to be a firewall preventing you from accessing this device!")
-
-/obj/machinery/turretid/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "TurretControl", name)
- ui.open()
-
-/obj/machinery/turretid/ui_data(mob/user)
- var/list/data = list()
- data["locked"] = locked
- data["siliconUser"] = user.has_unlimited_silicon_privilege && check_ship_ai_access(user)
- data["enabled"] = enabled
- data["lethal"] = lethal
- data["shootCyborgs"] = shoot_cyborgs
- return data
+ use_power(reqpower)
+ shot = new stun_projectile(our_turf)
+ playsound(loc, stun_projectile_sound, 75, TRUE)
-/obj/machinery/turretid/ui_act(action, list/params)
- . = ..()
- if(.)
- return
- switch(action)
- if("lock")
- if(!usr.has_unlimited_silicon_privilege)
- return
- if((obj_flags & EMAGGED) || (machine_stat & BROKEN))
- to_chat(usr, "The turret control is unresponsive!")
- return
- locked = !locked
- return TRUE
- if("power")
- toggle_on(usr)
- return TRUE
- if("mode")
- toggle_lethal(usr)
- return TRUE
- if("shoot_silicons")
- shoot_silicons(usr)
- return TRUE
+ //Shooting Code:
+ shot.preparePixelProjectile(target, our_turf)
+ shot.firer = src
+ shot.fired_from = src
+ shot.fire()
+ return TRUE
-/obj/machinery/turretid/proc/toggle_lethal(mob/user)
- lethal = !lethal
- add_hiddenprint(user)
- log_combat(user, src, "[lethal ? "enabled" : "disabled"] lethals on")
- updateTurrets()
-
-/obj/machinery/turretid/proc/toggle_on(mob/user)
- enabled = !enabled
- add_hiddenprint(user)
- log_combat(user, src, "[enabled ? "enabled" : "disabled"]")
- updateTurrets()
-
-/obj/machinery/turretid/proc/shoot_silicons(mob/user)
- shoot_cyborgs = !shoot_cyborgs
- add_hiddenprint(user)
- log_combat(user, src, "[shoot_cyborgs ? "Shooting Borgs" : "Not Shooting Borgs"]")
- updateTurrets()
-
-/obj/machinery/turretid/proc/updateTurrets()
- for (var/obj/machinery/porta_turret/aTurret in turrets)
- aTurret.setState(enabled, lethal, shoot_cyborgs)
- update_appearance()
+/obj/machinery/porta_turret/proc/set_target(atom/movable/target = null)
+ if(current_target)
+ UnregisterSignal(current_target, COMSIG_PARENT_QDELETING)
-/obj/machinery/turretid/update_icon_state()
- if(machine_stat & NOPOWER)
- icon_state = "[base_icon_state]_off"
- return ..()
- if (enabled)
- icon_state = "[base_icon_state]_[lethal ? "kill" : "stun"]"
- return ..()
- icon_state = "[base_icon_state]_standby"
- return ..()
+ retaliating = FALSE
+ current_target = target
+ target_beam.set_target(target)
-/obj/machinery/turretid/lethal
- lethal = TRUE
+ if(current_target)
+ RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(set_target))
-/obj/machinery/turretid/ship
- req_ship_access = TRUE
+/obj/machinery/porta_turret/proc/set_state(on, new_mode, new_flags)
+ if(locked)
+ return
+ if(!isnull(new_flags))
+ turret_flags = new_flags
-/obj/item/wallframe/turret_control
- name = "turret control frame"
- desc = "Used for building turret control panels."
- icon_state = "apc"
- result_path = /obj/machinery/turretid
- custom_materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT)
- inverse_pixel_shift = TRUE
+ lethal = new_mode
+ toggle_on(on)
+ power_change()
/obj/item/gun/proc/get_turret_properties()
. = list()
@@ -1196,7 +650,7 @@ DEFINE_BITFIELD(turret_flags, list(
/obj/item/gun/ballistic/get_turret_properties()
. = ..()
- var/obj/item/ammo_box/mag = mag_type
+ var/obj/item/ammo_box/mag = default_ammo_type
var/obj/item/ammo_casing/primary_ammo = initial(mag.ammo_type)
.["base_icon_state"] = "syndie"
@@ -1204,7 +658,3 @@ DEFINE_BITFIELD(turret_flags, list(
.["stun_projectile_sound"] = initial(primary_ammo.fire_sound)
.["lethal_projectile"] = .["stun_projectile"]
.["lethal_projectile_sound"] = .["stun_projectile_sound"]
-
-/obj/item/gun/energy/e_gun/turret/get_turret_properties()
- . = ..()
-
diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm
deleted file mode 100644
index ad2f82eace294..0000000000000
--- a/code/game/machinery/porta_turret/portable_turret_construct.dm
+++ /dev/null
@@ -1,192 +0,0 @@
-#define PTURRET_UNSECURED 0
-#define PTURRET_BOLTED 1
-#define PTURRET_START_INTERNAL_ARMOUR 2
-#define PTURRET_INTERNAL_ARMOUR_ON 3
-#define PTURRET_GUN_EQUIPPED 4
-#define PTURRET_SENSORS_ON 5
-#define PTURRET_CLOSED 6
-#define PTURRET_START_EXTERNAL_ARMOUR 7
-#define PTURRET_EXTERNAL_ARMOUR_ON 8
-
-/obj/machinery/porta_turret_construct
- name = "turret frame"
- icon = 'icons/obj/turrets.dmi'
- icon_state = "turret_frame"
- desc = "An unfinished covered turret frame."
- anchored = FALSE
- density = TRUE
- var/build_step = PTURRET_UNSECURED //the current step in the building process
- var/finish_name = "turret" //the name applied to the product turret
- var/obj/item/gun/installed_gun = null
-
-/obj/machinery/porta_turret_construct/attackby(obj/item/I, mob/user, params)
- //this is a bit unwieldy but self-explanatory
- switch(build_step)
- if(PTURRET_UNSECURED) //first step
- if(I.tool_behaviour == TOOL_WRENCH && !anchored)
- I.play_tool_sound(src, 100)
- to_chat(user, "You secure the external bolts.")
- set_anchored(TRUE)
- build_step = PTURRET_BOLTED
- return
-
- else if(I.tool_behaviour == TOOL_CROWBAR && !anchored)
- I.play_tool_sound(src, 75)
- to_chat(user, "You dismantle the turret construction.")
- new /obj/item/stack/sheet/metal(loc, 5)
- qdel(src)
- return
-
- if(PTURRET_BOLTED)
- if(istype(I, /obj/item/stack/sheet/metal))
- var/obj/item/stack/sheet/metal/M = I
- if(M.use(2))
- to_chat(user, "You add some metal armor to the interior frame.")
- build_step = PTURRET_START_INTERNAL_ARMOUR
- icon_state = "turret_frame2"
- else
- to_chat(user, "You need two sheets of metal to continue construction!")
- return
-
- else if(I.tool_behaviour == TOOL_WRENCH)
- I.play_tool_sound(src, 75)
- to_chat(user, "You unfasten the external bolts.")
- set_anchored(FALSE)
- build_step = PTURRET_UNSECURED
- return
-
-
- if(PTURRET_START_INTERNAL_ARMOUR)
- if(I.tool_behaviour == TOOL_WRENCH)
- I.play_tool_sound(src, 100)
- to_chat(user, "You bolt the metal armor into place.")
- build_step = PTURRET_INTERNAL_ARMOUR_ON
- return
-
- else if(I.tool_behaviour == TOOL_WELDER)
- if(!I.tool_start_check(user, amount=5)) //uses up 5 fuel
- return
-
- to_chat(user, "You start to remove the turret's interior metal armor...")
-
- if(I.use_tool(src, user, 20, volume=50, amount=5)) //uses up 5 fuel
- build_step = PTURRET_BOLTED
- to_chat(user, "You remove the turret's interior metal armor.")
- new /obj/item/stack/sheet/metal(drop_location(), 2)
- return
-
-
- if(PTURRET_INTERNAL_ARMOUR_ON)
- if(istype(I, /obj/item/gun/energy)) //the gun installation part
- var/obj/item/gun/energy/E = I
- if(!user.transferItemToLoc(E, src))
- return
- installed_gun = E
- to_chat(user, "You add [I] to the turret.")
- build_step = PTURRET_GUN_EQUIPPED
- return
-
- else if(I.tool_behaviour == TOOL_WRENCH)
- I.play_tool_sound(src, 100)
- to_chat(user, "You remove the turret's metal armor bolts.")
- build_step = PTURRET_START_INTERNAL_ARMOUR
- return
-
- if(PTURRET_GUN_EQUIPPED)
- if(isprox(I))
- build_step = PTURRET_SENSORS_ON
- if(!user.temporarilyRemoveItemFromInventory(I))
- return
- to_chat(user, "You add the proximity sensor to the turret.")
- qdel(I)
- return
-
-
- if(PTURRET_SENSORS_ON)
- if(I.tool_behaviour == TOOL_SCREWDRIVER)
- I.play_tool_sound(src, 100)
- build_step = PTURRET_CLOSED
- to_chat(user, "You close the internal access hatch.")
- return
-
-
- if(PTURRET_CLOSED)
- if(istype(I, /obj/item/stack/sheet/metal))
- var/obj/item/stack/sheet/metal/M = I
- if(M.use(2))
- to_chat(user, "You add some metal armor to the exterior frame.")
- build_step = PTURRET_START_EXTERNAL_ARMOUR
- else
- to_chat(user, "You need two sheets of metal to continue construction!")
- return
-
- else if(I.tool_behaviour == TOOL_SCREWDRIVER)
- I.play_tool_sound(src, 100)
- build_step = PTURRET_SENSORS_ON
- to_chat(user, "You open the internal access hatch.")
- return
-
- if(PTURRET_START_EXTERNAL_ARMOUR)
- if(I.tool_behaviour == TOOL_WELDER)
- if(!I.tool_start_check(user, amount=5))
- return
-
- to_chat(user, "You begin to weld the turret's armor down...")
- if(I.use_tool(src, user, 30, volume=50, amount=5))
- build_step = PTURRET_EXTERNAL_ARMOUR_ON
- to_chat(user, "You weld the turret's armor down.")
-
- //The final step: create a full turret
-
- var/obj/machinery/porta_turret/turret
- turret = new/obj/machinery/porta_turret(loc)
- turret.name = finish_name
- turret.installation = installed_gun.type
- turret.setup(installed_gun)
- qdel(src)
- return
-
- else if(I.tool_behaviour == TOOL_CROWBAR)
- I.play_tool_sound(src, 75)
- to_chat(user, "You pry off the turret's exterior armor.")
- new /obj/item/stack/sheet/metal(loc, 2)
- build_step = PTURRET_CLOSED
- return
-
- if(istype(I, /obj/item/pen)) //you can rename turrets like bots!
- var/t = stripped_input(user, "Enter new turret name", name, finish_name)
- if(!t)
- return
- if(!Adjacent(user))
- return
-
- finish_name = t
- return
- return ..()
-
-
-/obj/machinery/porta_turret_construct/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- switch(build_step)
- if(PTURRET_GUN_EQUIPPED)
- build_step = PTURRET_INTERNAL_ARMOUR_ON
-
- installed_gun.forceMove(loc)
- to_chat(user, "You remove [installed_gun] from the turret frame.")
- installed_gun = null
-
- if(PTURRET_SENSORS_ON)
- to_chat(user, "You remove the prox sensor from the turret frame.")
- new /obj/item/assembly/prox_sensor(loc)
- build_step = PTURRET_GUN_EQUIPPED
-
-/obj/machinery/porta_turret_construct/attack_ai()
- return
-
-/obj/machinery/porta_turret_construct/Destroy()
- if(installed_gun)
- qdel(installed_gun)
- installed_gun = null
- . = ..()
diff --git a/code/game/machinery/porta_turret/portable_turret_control.dm b/code/game/machinery/porta_turret/portable_turret_control.dm
new file mode 100644
index 0000000000000..ba70fe3a44b19
--- /dev/null
+++ b/code/game/machinery/porta_turret/portable_turret_control.dm
@@ -0,0 +1,241 @@
+
+////////////////////////
+//Turret Control Panel//
+////////////////////////
+
+/obj/machinery/turretid
+ name = "turret control panel"
+ desc = "Used to control a room's automated defenses."
+ icon = 'icons/obj/machines/turret_control.dmi'
+ icon_state = "control_standby"
+ base_icon_state = "control"
+ density = FALSE
+ req_access = list(ACCESS_AI_UPLOAD)
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ /// Variable dictating if linked turrets are active and will shoot targets
+ var/enabled = TRUE
+ /// Variable dictating if linked turrets will shoot lethal projectiles
+ var/lethal = FALSE
+ /// Variable dictating if the panel is locked, preventing changes to turret settings
+ var/locked = TRUE
+ /// AI is unable to use this machine if set to TRUE
+ var/ailock = FALSE
+ /// Flags to apply to all linked turrets
+ var/turret_flags = TURRET_FLAG_DEFAULT
+ /// List of all linked turrets
+ var/list/datum/weakref/turret_refs = list()
+ ///id for connecting to additional turrets
+ var/id = ""
+
+/obj/machinery/turretid/Initialize(mapload, ndir = 0, built = 0)
+ . = ..()
+ if(built)
+ setDir(ndir)
+ locked = FALSE
+ pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
+ pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
+ power_change()
+
+/obj/machinery/turretid/Destroy()
+ turret_refs.Cut()
+ return ..()
+
+/obj/machinery/turretid/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
+ id = "[text_ref(port)][id]"
+ RegisterSignal(port, COMSIG_SHIP_DONE_CONNECTING, PROC_REF(late_connect_to_shuttle))
+
+/obj/machinery/turretid/proc/late_connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
+ SIGNAL_HANDLER
+
+ for(var/datum/weakref/ship_gun in port.turret_list)
+ var/obj/machinery/porta_turret/turret_gun = ship_gun.resolve()
+ //skip if it doesn't exist or if the id doesn't match
+ if(turret_gun?.id != id)
+ continue
+
+ turret_refs |= ship_gun
+
+ update_turrets()
+ UnregisterSignal(port, COMSIG_SHIP_DONE_CONNECTING)
+
+/obj/machinery/turretid/examine(mob/user)
+ . += ..()
+ if((machine_stat & (BROKEN|MAINT)))
+ return
+
+ . += span_notice("Alt-click [src] to [locked ? "unlock" : "lock"] it.")
+ . += span_notice("Ctrl-click [src] to [enabled ? "disable" : "enable"] turrets.")
+ . += span_notice("Ctrl-shift-click [src] to set turrets to [lethal ? "stun" : "kill"] mode.")
+
+/obj/machinery/turretid/attackby(obj/item/I, mob/user, params)
+ if(machine_stat & BROKEN)
+ return
+
+ if(I.tool_behaviour == TOOL_MULTITOOL)
+ if(!multitool_check_buffer(user, I))
+ return
+ var/obj/item/multitool/M = I
+ if(M.buffer && istype(M.buffer, /obj/machinery/porta_turret))
+ turret_refs |= WEAKREF(M.buffer)
+ to_chat(user, "You link \the [M.buffer] with \the [src].")
+ return
+
+ if(issilicon(user))
+ return attack_hand(user)
+
+ if(istype(I, /obj/item/card/id))
+ toggle_lock(user)
+
+/obj/machinery/turretid/AltClick(mob/user)
+ . = ..()
+ toggle_lock(user)
+
+/obj/machinery/turretid/CtrlClick(mob/user)
+ . = ..()
+ toggle_on(user)
+
+/obj/machinery/turretid/CtrlShiftClick(mob/user)
+ . = ..()
+ toggle_lethal(user)
+
+/obj/machinery/turretid/emag_act(mob/user)
+ if(obj_flags & EMAGGED)
+ return
+ to_chat(user, span_notice("You short out the turret controls' access analysis module."))
+ obj_flags |= EMAGGED
+ locked = FALSE
+
+/obj/machinery/turretid/attack_ai(mob/user)
+ if(!ailock || isAdminGhostAI(user))
+ return attack_hand(user)
+ else
+ to_chat(user, span_warning("There seems to be a firewall preventing you from accessing this device!"))
+
+/obj/machinery/turretid/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "TurretControl", name)
+ ui.open()
+
+/obj/machinery/turretid/ui_data(mob/user)
+ return list(
+ "locked" = locked,
+ "enabled" = enabled,
+ "lethal" = lethal,
+ "siliconUser" = user.has_unlimited_silicon_privilege && check_ship_ai_access(user),
+ "dangerous_only" = turret_flags & TURRET_FLAG_SHOOT_DANGEROUS_ONLY,
+ "retaliate" = turret_flags & TURRET_FLAG_SHOOT_RETALIATE,
+ "shoot_fauna" = turret_flags & TURRET_FLAG_SHOOT_FAUNA,
+ "shoot_humans" = turret_flags & TURRET_FLAG_SHOOT_HUMANS,
+ "shoot_silicons" = turret_flags & TURRET_FLAG_SHOOT_SILICONS,
+ "only_nonfaction" = turret_flags & TURRET_FLAG_SHOOT_NONFACTION,
+ "only_specificfaction" = turret_flags & TURRET_FLAG_SHOOT_SPECIFIC_FACTION,
+ )
+
+/obj/machinery/turretid/ui_act(action, list/params)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("lock")
+ if(!usr.has_unlimited_silicon_privilege)
+ return
+ toggle_lock(usr)
+ return TRUE
+ if("power")
+ toggle_on(usr)
+ if("mode")
+ toggle_lethal(usr)
+ if("toggle_dangerous")
+ turret_flags ^= TURRET_FLAG_SHOOT_DANGEROUS_ONLY
+ if("toggle_retaliate")
+ turret_flags ^= TURRET_FLAG_SHOOT_RETALIATE
+
+
+ if("toggle_fauna")
+ turret_flags ^= TURRET_FLAG_SHOOT_FAUNA
+ if("toggle_humans")
+ turret_flags ^= TURRET_FLAG_SHOOT_HUMANS
+ if("toggle_silicons")
+ turret_flags ^= TURRET_FLAG_SHOOT_SILICONS
+ if("toggle_nonfaction")
+ turret_flags ^= TURRET_FLAG_SHOOT_NONFACTION
+ if("toggle_specificfaction")
+ turret_flags ^= TURRET_FLAG_SHOOT_SPECIFIC_FACTION
+
+ else
+ return
+
+ update_turrets()
+
+/obj/machinery/turretid/proc/toggle_lock(mob/user)
+ if(!user.canUseTopic(src, !issilicon(user)))
+ return
+ if(!allowed(user))
+ to_chat(user, span_alert("Access denied."))
+ return
+ if(obj_flags & EMAGGED || (machine_stat & (BROKEN|MAINT)))
+ to_chat(user, span_warning("The turret control is unresponsive!"))
+ return
+
+ to_chat(user, span_notice("You [locked ? "unlock" : "lock"] the turret control."))
+ locked = !locked
+ update_appearance()
+
+/obj/machinery/turretid/proc/toggle_lethal(mob/user)
+ if(!user.canUseTopic(src, !issilicon(user)))
+ return
+ if(obj_flags & EMAGGED || (machine_stat & (BROKEN|MAINT)))
+ to_chat(user, span_warning("The turret control is unresponsive!"))
+ return
+
+ lethal = !lethal
+ add_hiddenprint(user)
+ log_combat(user, src, "[lethal ? "enabled" : "disabled"] lethals on")
+
+/obj/machinery/turretid/proc/toggle_on(mob/user)
+ if(!user.canUseTopic(src, !issilicon(user)))
+ return
+ if(obj_flags & EMAGGED || (machine_stat & (BROKEN|MAINT)))
+ to_chat(user, span_warning("The turret control is unresponsive!"))
+ return
+
+ enabled = !enabled
+ add_hiddenprint(user)
+ log_combat(user, src, "[enabled ? "enabled" : "disabled"]")
+
+/obj/machinery/turretid/proc/update_turrets()
+ for(var/datum/weakref/turret_ref in turret_refs)
+ var/obj/machinery/porta_turret/turret = turret_ref.resolve()
+ if(!turret)
+ turret_refs -= turret_ref
+ continue
+ turret.set_state(enabled, lethal, turret_flags)
+ update_appearance()
+
+/obj/machinery/turretid/update_icon_state()
+ if(machine_stat & NOPOWER)
+ icon_state = "[base_icon_state]_off"
+ return ..()
+ if (enabled)
+ icon_state = "[base_icon_state]_[lethal ? "kill" : "stun"]"
+ return ..()
+ icon_state = "[base_icon_state]_standby"
+ return ..()
+
+/obj/machinery/turretid/lethal
+ lethal = TRUE
+ turret_flags = TURRET_FLAG_HOSTILE
+
+/obj/machinery/turretid/ship
+ req_ship_access = TRUE
+
+/obj/item/wallframe/turret_control
+ name = "turret control frame"
+ desc = "Used for building turret control panels."
+ icon = 'icons/obj/machines/turret_control.dmi'
+ icon_state = "control_off"
+ result_path = /obj/machinery/turretid
+ custom_materials = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT)
+ inverse_pixel_shift = TRUE
diff --git a/code/game/machinery/porta_turret/portable_turret_cover.dm b/code/game/machinery/porta_turret/portable_turret_cover.dm
deleted file mode 100644
index a1da4cbf6463e..0000000000000
--- a/code/game/machinery/porta_turret/portable_turret_cover.dm
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/************************
-* PORTABLE TURRET COVER *
-************************/
-
-/obj/machinery/porta_turret_cover
- name = "turret"
- icon = 'icons/obj/turrets.dmi'
- icon_state = "turretCover"
- layer = HIGH_OBJ_LAYER
- density = FALSE
- max_integrity = 80
- var/obj/machinery/porta_turret/parent_turret = null
-
-/obj/machinery/porta_turret_cover/Destroy()
- if(parent_turret)
- parent_turret.cover = null
- parent_turret.invisibility = 0
- parent_turret = null
- return ..()
-
-//The below code is pretty much just recoded from the initial turret object. It's necessary but uncommented because it's exactly the same!
-//>necessary
-//I'm not fixing it because i'm fucking bored of this code already, but someone should just reroute these to the parent turret's procs.
-
-/obj/machinery/porta_turret_cover/attack_ai(mob/user)
- return ..() || parent_turret.attack_ai(user)
-
-/obj/machinery/porta_turret_cover/attack_robot(mob/user)
- return ..() || parent_turret.attack_robot(user)
-
-/obj/machinery/porta_turret_cover/attack_hand(mob/user)
- return ..() || parent_turret.attack_hand(user)
-
-/obj/machinery/porta_turret_cover/attack_ghost(mob/user)
- return ..() || parent_turret.attack_ghost(user)
-
-/obj/machinery/porta_turret_cover/attackby(obj/item/I, mob/user, params)
- if(I.tool_behaviour == TOOL_WRENCH && !parent_turret.on)
- if(parent_turret.raised)
- return
-
- if(!parent_turret.anchored)
- parent_turret.set_anchored(TRUE)
- to_chat(user, "You secure the exterior bolts on the turret.")
- parent_turret.invisibility = 0
- parent_turret.update_appearance()
- else
- parent_turret.set_anchored(FALSE)
- to_chat(user, "You unsecure the exterior bolts on the turret.")
- parent_turret.invisibility = INVISIBILITY_MAXIMUM
- parent_turret.update_appearance()
- qdel(src)
- return
- if(I.GetID())
- if(parent_turret.allowed(user))
- parent_turret.locked = !parent_turret.locked
- to_chat(user, "Controls are now [parent_turret.locked ? "locked" : "unlocked"].")
- else
- to_chat(user, "Access denied.")
- return
-
- if(I.tool_behaviour == TOOL_MULTITOOL && !parent_turret.locked)
- if(!multitool_check_buffer(user, I))
- return
- var/obj/item/multitool/M = I
- M.buffer = parent_turret
- to_chat(user, "You add [parent_turret] to multitool buffer.")
- return
- return ..()
-
-/obj/machinery/porta_turret_cover/attacked_by(obj/item/I, mob/user)
- parent_turret.attacked_by(I, user)
-
-/obj/machinery/porta_turret_cover/attack_alien(mob/living/carbon/alien/humanoid/user)
- parent_turret.attack_alien(user)
-
-/obj/machinery/porta_turret_cover/attack_animal(mob/living/simple_animal/user)
- parent_turret.attack_animal(user)
-
-/obj/machinery/porta_turret_cover/attack_hulk(mob/living/carbon/human/user)
- return parent_turret.attack_hulk(user)
-
-/obj/machinery/porta_turret_cover/can_be_overridden()
- . = 0
-
-/obj/machinery/porta_turret_cover/emag_act(mob/user)
- if(!(parent_turret.obj_flags & EMAGGED))
- to_chat(user, "You short out [parent_turret]'s threat assessment circuits.")
- visible_message("[parent_turret] hums oddly...")
- parent_turret.obj_flags |= EMAGGED
- parent_turret.on = FALSE
- addtimer(VARSET_CALLBACK(parent_turret, on, TRUE), 4 SECONDS)
diff --git a/code/game/machinery/porta_turret/portable_turret_manual_control.dm b/code/game/machinery/porta_turret/portable_turret_manual_control.dm
new file mode 100644
index 0000000000000..7fac7309bfede
--- /dev/null
+++ b/code/game/machinery/porta_turret/portable_turret_manual_control.dm
@@ -0,0 +1,68 @@
+/obj/machinery/porta_turret
+ /// Action button holder for quitting manual control
+ var/datum/action/turret_quit/quit_action
+ /// Action button holder for switching between turret modes when manually controlling
+ var/datum/action/turret_toggle/toggle_action
+ /// Mob that is remotely controlling the turret
+ var/mob/remote_controller
+
+/datum/action/turret_toggle
+ name = "Toggle Mode"
+ icon_icon = 'icons/mob/actions/actions_mecha.dmi'
+ button_icon_state = "mech_cycle_equip_off"
+
+/datum/action/turret_toggle/Trigger()
+ var/obj/machinery/porta_turret/P = target
+ if(!istype(P))
+ return
+ P.set_state(P.on, !P.lethal)
+
+/datum/action/turret_quit
+ name = "Release Control"
+ icon_icon = 'icons/mob/actions/actions_mecha.dmi'
+ button_icon_state = "mech_eject"
+
+/datum/action/turret_quit/Trigger()
+ var/obj/machinery/porta_turret/P = target
+ if(!istype(P))
+ return
+ P.remove_control(FALSE)
+
+/obj/machinery/porta_turret/proc/give_control(mob/A)
+ if(manual_control || !can_interact(A))
+ return FALSE
+ remote_controller = A
+ if(!quit_action)
+ quit_action = new(src)
+ quit_action.Grant(remote_controller)
+ if(!toggle_action)
+ toggle_action = new(src)
+ toggle_action.Grant(remote_controller)
+ remote_controller.reset_perspective(src)
+ remote_controller.click_intercept = src
+ manual_control = TRUE
+ return TRUE
+
+/obj/machinery/porta_turret/proc/remove_control(warning_message = TRUE)
+ if(!manual_control)
+ return FALSE
+ if(remote_controller)
+ if(warning_message)
+ to_chat(remote_controller, "Your uplink to [src] has been severed!")
+ quit_action.Remove(remote_controller)
+ toggle_action.Remove(remote_controller)
+ remote_controller.click_intercept = null
+ remote_controller.reset_perspective()
+ manual_control = FALSE
+ remote_controller = null
+ return TRUE
+
+/obj/machinery/porta_turret/proc/InterceptClickOn(mob/living/caller, params, atom/A)
+ if(!manual_control)
+ return FALSE
+ if(!can_interact(caller))
+ remove_control()
+ return FALSE
+ log_combat(caller,A,"fired with manual turret control at")
+ target(A)
+ return TRUE
diff --git a/code/game/machinery/porta_turret/portable_turret_types.dm b/code/game/machinery/porta_turret/portable_turret_types.dm
new file mode 100644
index 0000000000000..53a3fbd3fa125
--- /dev/null
+++ b/code/game/machinery/porta_turret/portable_turret_types.dm
@@ -0,0 +1,340 @@
+
+/obj/machinery/porta_turret/syndicate
+ circuit = /obj/item/circuitboard/machine/turret/ship
+ use_power = NO_POWER_USE
+ scan_range = 9
+ req_access = list(ACCESS_SYNDICATE)
+ lethal = TRUE
+ stun_projectile = /obj/projectile/bullet
+ lethal_projectile = /obj/projectile/bullet
+ lethal_projectile_sound = 'sound/weapons/gun/pistol/shot.ogg'
+ stun_projectile_sound = 'sound/weapons/gun/pistol/shot.ogg'
+ icon_state = "syndie_off"
+ base_icon_state = "syndie"
+ faction = list(ROLE_SYNDICATE)
+ turret_flags = TURRET_FLAG_HOSTILE
+ desc = "A ballistic machine gun auto-turret."
+
+/obj/machinery/porta_turret/syndicate/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
+
+/obj/machinery/porta_turret/syndicate/energy
+ icon_state = "standard_lethal"
+ base_icon_state = "standard"
+ stun_projectile = /obj/projectile/energy/electrode
+ stun_projectile_sound = 'sound/weapons/taser.ogg'
+ lethal_projectile = /obj/projectile/beam/laser
+ lethal_projectile_sound = 'sound/weapons/laser.ogg'
+ desc = "An energy blaster auto-turret."
+
+/obj/machinery/porta_turret/syndicate/energy/heavy
+ icon_state = "standard_lethal"
+ base_icon_state = "standard"
+ stun_projectile = /obj/projectile/energy/electrode
+ stun_projectile_sound = 'sound/weapons/taser.ogg'
+ lethal_projectile = /obj/projectile/beam/laser/heavylaser
+ lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+ desc = "An energy blaster auto-turret."
+
+/obj/machinery/porta_turret/syndicate/energy/raven
+ stun_projectile = /obj/projectile/beam/laser
+ stun_projectile_sound = 'sound/weapons/laser.ogg'
+ faction = list("neutral","silicon","turret")
+
+/obj/machinery/porta_turret/syndicate/pod
+ integrity_failure = 0.5
+ max_integrity = 40
+ stun_projectile = /obj/projectile/bullet/syndicate_turret
+ lethal_projectile = /obj/projectile/bullet/syndicate_turret
+
+/obj/machinery/porta_turret/ship
+ circuit = /obj/item/circuitboard/machine/turret/ship
+ scan_range = 9
+ req_ship_access = TRUE
+ icon_state = "syndie_off"
+ base_icon_state = "syndie"
+
+/obj/machinery/porta_turret/ship/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
+
+/obj/machinery/porta_turret/ship/examine(mob/user)
+ . = ..()
+ if(in_range(user, src) || isobserver(user))
+ if(!(machine_stat & BROKEN))
+ . += "[src] reports its integrity is currently [round((obj_integrity / max_integrity) * 100)] percent."
+
+/obj/machinery/porta_turret/ship/weak
+ max_integrity = 120
+ integrity_failure = 0.5
+ name = "Old Laser Turret"
+ desc = "A turret built with substandard parts and run down further with age. Still capable of delivering lethal lasers to the odd space carp, but not much else."
+ stun_projectile = /obj/projectile/beam/disabler/weak
+ lethal_projectile = /obj/projectile/beam/weak/penetrator
+ faction = list("neutral", "turret")
+
+/obj/machinery/porta_turret/ship/ballistic
+ stun_projectile = /obj/projectile/bullet/turret/rubber
+ lethal_projectile = /obj/projectile/bullet/turret
+ lethal_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+ stun_projectile_sound = 'sound/weapons/gun/smg/shot.ogg'
+ desc = "A ballistic machine gun auto-turret."
+
+//high rof, range, faster projectile speed
+/* 'Nanotrasen' turrets */
+
+/obj/machinery/porta_turret/ship/nt
+ name = "Sharplite Defense Turret"
+ desc = "A cheap and effective turret designed by Sharplite and purchased and installed on most Nanotrasen Vessels."
+ faction = list(FACTION_PLAYER_NANOTRASEN, "turret")
+ max_integrity = 160
+ integrity_failure = 0.6
+ icon_state = "standard_lethal"
+ base_icon_state = "standard"
+ stun_projectile = /obj/projectile/beam/disabler/sharplite
+ lethal_projectile = /obj/projectile/beam/laser/sharplite
+ lethal_projectile_sound = 'sound/weapons/gun/laser/nt-fire.ogg'
+ stun_projectile_sound = 'sound/weapons/taser2.ogg'
+ shot_delay = 10
+ scan_range = 10
+
+/obj/machinery/porta_turret/ship/nt/light
+ name = "Sharplite LDS"
+ desc = "A cheap and effective 'defensive system' designed by Sharplite for installation on Nanotrasen vessels."
+ stun_projectile = /obj/projectile/beam/disabler/weak/sharplite
+ lethal_projectile = /obj/projectile/beam/laser/light/sharplite
+ lethal_projectile_sound = 'sound/weapons/gun/laser/nt-fire.ogg'
+ stun_projectile_sound = 'sound/weapons/taser2.ogg'
+
+/obj/machinery/porta_turret/ship/nt/heavy
+ name = "Sharplite Defense Cannon"
+ desc = "A heavy laser mounting designed by Sharplite for usage on Nanotrasen vessels."
+ lethal_projectile = /obj/projectile/beam/laser/heavylaser/sharplite
+ lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+ max_integrity = 250
+
+/obj/machinery/porta_turret/ship/nt/pulse
+ name = "Sharplite Pulse Cannon"
+ desc = "A pulse cannon mounting designed by Sharplite. Not sold to any purchasers and exclusively used on Nanotrasen Vessels."
+ lethal_projectile = /obj/projectile/beam/pulse/sharplite_turret
+ lethal_projectile_sound = 'sound/weapons/gun/laser/heavy_laser.ogg'
+ max_integrity = 250
+
+/* Syndicate Turrets */
+
+/obj/machinery/porta_turret/ship/syndicate
+ faction = list(FACTION_PLAYER_SYNDICATE, "turret")
+ icon_state = "standard_lethal"
+ base_icon_state = "standard"
+
+/obj/machinery/porta_turret/ship/syndicate/weak
+ name = "Light Laser Turret"
+ desc = "A low powered turret designed by the Gorlex Maurauders during the ICW. Effectively weaponizes mining equipment."
+ stun_projectile = /obj/projectile/beam/disabler/weak
+ lethal_projectile = /obj/projectile/beam/weak/penetrator
+ icon_state = "syndie_off"
+ base_icon_state = "syndie"
+
+/obj/machinery/porta_turret/ship/syndicate/heavy
+ name = "Heavy Laser Turret"
+ desc = "Produced by Cybersun, this turret is a duel mount of a propietary heavy laser, and crowd control taser system."
+ stun_projectile = /obj/projectile/energy/electrode
+ stun_projectile_sound = 'sound/weapons/taser.ogg'
+ lethal_projectile = /obj/projectile/beam/laser/heavylaser
+ lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+ max_integrity = 300
+
+/* New Gorlex Republic Turrets */
+// Midline ballistic turrets
+
+/obj/machinery/porta_turret/ship/ngr
+ name = "Oasis Turret"
+ desc = "A turret manufactured by the New Gorlex Republic for its ships and installations. Proudly manufactured within the nation!"
+ stun_projectile = /obj/projectile/bullet/c57x39mm/rubber
+ stun_projectile_sound = 'sound/weapons/gun/smg/sidewinder.ogg'
+ lethal_projectile = /obj/projectile/bullet/c57x39mm
+ lethal_projectile_sound = 'sound/weapons/gun/smg/sidewinder.ogg'
+ faction = list(FACTION_NGR, FACTION_PLAYER_SYNDICATE, "turret") //player_syndicate is just to be safe
+
+/obj/machinery/porta_turret/ship/ngr/light
+ name = "Sonoran Turret"
+ desc = "A light turret manufactured by the New Gorlex Republic for its ships and installations. Proudly manufactured within the Nation, using locally produced munitions!"
+ stun_projectile = /obj/projectile/bullet/c45/rubber
+ stun_projectile_sound = 'sound/weapons/gun/smg/cobra.ogg'
+ lethal_projectile = /obj/projectile/bullet/c45
+ lethal_projectile_sound = 'sound/weapons/gun/smg/cobra.ogg'
+ scan_range = 7
+ shot_delay = 10
+
+/obj/machinery/porta_turret/ship/ngr/heavy
+ name = "Cliff Turret"
+ desc = "A heavy turret manufactured by the New Gorlex Republic for its ships and installations. Has a reputation of being extremely dangerous."
+ stun_projectile = /obj/projectile/bullet/a65clip/rubber
+ stun_projectile_sound = 'sound/weapons/gun/sniper/cmf90.ogg'
+ lethal_projectile = /obj/projectile/bullet/a65clip
+ lethal_projectile_sound = 'sound/weapons/gun/sniper/cmf90.ogg'
+ scan_range = 14
+ shot_delay = 30
+
+
+/* Inteq Turrets */
+//slower rof, higher damage + range
+
+/obj/machinery/porta_turret/ship/inteq
+ name = "Vanguard Turret"
+ desc = "A turret designed by IRMG engineers for defending ships from hostile flora, fauna, and people (and Elzousa, which count as flora and people)."
+ stun_projectile = /obj/projectile/bullet/a762_40/rubber
+ stun_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg'
+ lethal_projectile = /obj/projectile/bullet/a762_40
+ lethal_projectile_sound = 'sound/weapons/gun/rifle/skm.ogg'
+ scan_range = 9
+ shot_delay = 20
+ integrity_failure = 0.4
+ faction = list(FACTION_PLAYER_INTEQ, "turret")
+
+/obj/machinery/porta_turret/ship/inteq/light
+ name = "Close-In Vanguard Turret"
+ desc = "A light turret designed by IRMG engineers for the the task of defending from close-in encounters. Low power, high speed."
+ stun_projectile = /obj/projectile/bullet/c10mm/rubber
+ stun_projectile_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
+ lethal_projectile = /obj/projectile/bullet/c10mm
+ lethal_projectile_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
+ scan_range = 5
+ shot_delay = 5
+
+/obj/machinery/porta_turret/ship/inteq/heavy
+ name = "Vanguard Overwatch Turret"
+ desc = "A turret designed by IRMG engineers to provide long range defensive fire on their installations. Has a habit of leaving big holes."
+ stun_projectile = /obj/projectile/bullet/a308/rubber
+ stun_projectile_sound = 'sound/weapons/gun/rifle/f4.ogg'
+ lethal_projectile = /obj/projectile/bullet/a308
+ lethal_projectile_sound = 'sound/weapons/gun/rifle/f4.ogg'
+ scan_range = 12
+ shot_delay = 20
+
+/* Solcon Turrets */
+
+/obj/machinery/porta_turret/ship/solgov
+ faction = list(FACTION_PLAYER_SOLCON, "turret")
+
+/* Pan Gezena Federation Turrets */
+//midline but hitscan
+
+/obj/machinery/porta_turret/ship/pgf
+ name = "Etherbor Defensive Mount"
+ desc = "A less portable Etherbor offering, the EDM is a self-directed linkage of energy weapons, designed to keep intruders away from Gezenan vessels."
+ faction = list(FACTION_PLAYER_GEZENA, "Turret")
+ stun_projectile = /obj/projectile/beam/hitscan/disabler
+ stun_projectile_sound = 'sound/weapons/gun/energy/kalixpistol.ogg'
+ lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf/assault
+ lethal_projectile_sound = 'sound/weapons/gun/energy/kalixsmg.ogg'
+ icon_state = "standard_lethal"
+ base_icon_state = "standard"
+ max_integrity = 250
+ integrity_failure = 0.4
+
+/obj/machinery/porta_turret/ship/pgf/light
+ name = "Etherbor Deterrent System"
+ desc = "A light turret manufactured by Etherbor. It offers a lightweight assembly of energy weapons to accost nearby foes."
+ lethal_projectile = /obj/projectile/beam/hitscan/kalix/pgf
+ lethal_projectile_sound = 'sound/weapons/gun/energy/kalixsmg.ogg'
+
+/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 = 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
+
+/obj/machinery/porta_turret/ship/frontiersmen
+ name = "Spitter Turret"
+ desc = "A juryrigged mishmash of a 9mm SMG and targetting system. Stand clear!"
+ faction = list(FACTION_FRONTIER, "Turret")
+ subsystem_type = /datum/controller/subsystem/processing/fastprocess
+ integrity_failure = 0.6
+ max_integrity = 180
+
+ icon_state = "standard_lethal"
+ base_icon_state = "standard"
+
+ stun_projectile = /obj/projectile/bullet/c9mm
+ stun_projectile_sound = 'sound/weapons/gun/smg/spitter.ogg'
+ lethal_projectile = /obj/projectile/bullet/c9mm
+ lethal_projectile_sound = 'sound/weapons/gun/smg/spitter.ogg'
+ shot_delay = 2
+ scan_range = 6
+
+ turret_flags = TURRET_FLAG_HOSTILE
+
+/obj/machinery/porta_turret/ship/frontiersmen/light
+ name = "Pounder Turret"
+ desc = "A low caliber SMG with an atrociously high cycle rate, frankensteined together with a targetting assembly."
+ stun_projectile = /obj/projectile/bullet/c22lr
+ stun_projectile_sound = 'sound/weapons/gun/smg/pounder.ogg'
+ lethal_projectile = /obj/projectile/bullet/c22lr
+ lethal_projectile_sound = 'sound/weapons/gun/smg/pounder.ogg'
+ shot_delay = 1
+
+/obj/machinery/porta_turret/ship/frontiersmen/heavy
+ name = "Mulcher Turret"
+ desc = "An abombination made out of the components of a Shredder and an automatic targetting system. Careful now."
+ stun_projectile = /obj/projectile/bullet/slug/beanbag
+ stun_projectile_sound = 'sound/weapons/gun/hmg/shredder.ogg'
+ lethal_projectile = /obj/projectile/bullet/slug
+ lethal_projectile_sound = 'sound/weapons/gun/hmg/shredder.ogg'
+ shot_delay = 3
+ scan_range = 8
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 1e17186238163..4e1b85164638b 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
@@ -22,6 +22,7 @@
/obj/item/modular_computer,
/obj/item/gun/ballistic/automatic/powered,
/obj/item/gun/ballistic/automatic/assault/e40,
+ /obj/item/attachment/gun/energy,
/obj/item/stock_parts/cell/gun
))
@@ -74,7 +75,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/requests_console.dm b/code/game/machinery/requests_console.dm
index ed3a35c1e2280..c33b3ea8bdcc7 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -302,7 +302,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
if(href_list["send"] && message && to_department && priority)
- var/radio_freq = FREQ_COMMAND
+ var/radio_freq = FREQ_EMERGENCY
var/datum/signal/subspace/messaging/rc/signal = new(src, list(
"sender" = department,
diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm
index a36bf79a41b33..098cd5ea3868c 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/shieldgen.dm b/code/game/machinery/shieldgen.dm
index e6e754c4b8078..5dc0117b634c0 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -205,6 +205,7 @@
var/locked = TRUE
var/shield_range = 8
var/shocked = FALSE
+ var/crashing = FALSE
var/obj/structure/cable/attached // the attached cable
/obj/machinery/power/shieldwallgen/xenobiologyaccess //use in xenobiology containment
@@ -252,16 +253,25 @@
if(!active_power_usage || surplus() >= active_power_usage)
add_load(active_power_usage)
else
- visible_message(span_danger("The [src.name] shuts down due to lack of power!"), "If this message is ever seen, something is wrong.",span_hear("You hear heavy droning fade out.Warning: Activating this device will send a heavy laser turret to your location."
droptype = /obj/machinery/porta_turret/syndicate/energy/heavy
-
-/obj/item/sbeacondrop/penetratorturret
- desc = "A label on it reads: Warning: Activating this device will send a penetrator turret to your location."
- droptype = /obj/machinery/porta_turret/syndicate/shuttle
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index b3bd14af5a071..7df56b390f1b1 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -410,14 +410,6 @@
for(var/obj/item/reagent_containers/glass/G in beakers)
reactants += G.reagents
- for(var/obj/item/slime_extract/S in beakers)
- if(S.Uses)
- for(var/obj/item/reagent_containers/glass/G in beakers)
- G.reagents.trans_to(S, G.reagents.total_volume)
-
- if(S && S.reagents && S.reagents.total_volume)
- reactants += S.reagents
-
if(!chem_splash(get_turf(src), spread_range, reactants, temp_boost))
playsound(loc, 'sound/items/screwdriver2.ogg', 50, TRUE)
return // The Explosion didn't do anything. No need to log, or disappear.
@@ -460,16 +452,9 @@
for(var/obj/item/grenade/chem_grenade/G in src)
if(istype(G, /obj/item/grenade/chem_grenade/large))
- var/obj/item/grenade/chem_grenade/large/LG = G
max_beakers += 1 // Adding two large grenades only allows for a maximum of 7 beakers.
spread_range += 2 // Extra range, reduced density.
temp_boost += 50 // maximum of +150K blast using only large beakers. Not enough to self ignite.
- for(var/obj/item/slime_extract/S in LG.beakers) // And slime cores.
- if(beakers.len < max_beakers)
- beakers += S
- S.forceMove(src)
- else
- S.forceMove(drop_location())
if(istype(G, /obj/item/grenade/chem_grenade/cryo))
spread_range -= 1 // Reduced range, but increased density.
diff --git a/code/game/machinery/teambuilder.dm b/code/game/machinery/teambuilder.dm
index 153035a393743..4c30bbdc3a4ac 100644
--- a/code/game/machinery/teambuilder.dm
+++ b/code/game/machinery/teambuilder.dm
@@ -23,7 +23,7 @@
/obj/machinery/teambuilder/examine_more(mob/user)
. = ..()
- . += "You see a hastily written note on the side, it says '1215-1217, PICK A SIDE'."
+ . += span_notice("You see a hastily written note on the side, it says '1215-1217, PICK A SIDE'.")
/obj/machinery/teambuilder/proc/on_entered(datum/source, atom/movable/AM, oldloc)
SIGNAL_HANDLER
@@ -43,11 +43,9 @@
desc = "A machine that, when passed, colors you based on the color of your team. Go red team!"
color = "#ff0000"
team_color = "#ff0000"
- team_radio = FREQ_CTF_RED
/obj/machinery/teambuilder/blue
name = "Teambuilding Machine (Blue)"
desc = "A machine that, when passed, colors you based on the color of your team. Go blue team!"
color = "#0000ff"
team_color = "#0000ff"
- team_radio = FREQ_CTF_BLUE
diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm
index 9f2711ebb7a7e..1927c3963ca65 100644
--- a/code/game/machinery/telecomms/broadcasting.dm
+++ b/code/game/machinery/telecomms/broadcasting.dm
@@ -155,12 +155,6 @@
if(R.can_receive(frequency, map_zones))
radios += R
- // Syndicate radios can hear all well-known radio channels
- if (num2text(frequency) in GLOB.reverseradiochannels)
- for(var/obj/item/radio/R in GLOB.all_radios["[FREQ_SYNDICATE]"])
- if(R.can_receive(FREQ_SYNDICATE, map_zones))
- radios |= R
-
if (TRANSMISSION_RADIO)
// Only radios not currently in subspace mode
for(var/obj/item/radio/R in GLOB.all_radios["[frequency]"])
@@ -173,12 +167,8 @@
if(R.independent && R.can_receive(frequency, map_zones))
radios += R
- //WS edit begin - Radio chatter #434
// Next, we'll have each radio play a small sound effect except for the one that broadcasted it.
for(var/obj/item/radio/radio in radios)
- if(radio.last_chatter_time + 1 SECONDS < world.time && source != radio)
- playsound(radio, "sound/effects/radio_chatter.ogg", 20, FALSE)
- radio.last_chatter_time = world.time
if(radio.log)
var/name = data["name"]
var/list/log_details = list()
diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm
index 8939e36f34ade..e920f3bc7547c 100644
--- a/code/game/machinery/telecomms/computers/logbrowser.dm
+++ b/code/game/machinery/telecomms/computers/logbrowser.dm
@@ -166,7 +166,7 @@
temp = "- FAILED: CANNOT PROBE WHEN BUFFER FULL -"
else
- for(var/obj/machinery/telecomms/server/T in urange(25, src))
+ for(var/obj/machinery/telecomms/server/T in urange(40, src))
if(T.network == network)
servers.Add(T)
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 202a9c8a620dc..47bbb494fb80d 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -124,14 +124,10 @@
tempfreq = sanitize_frequency(text2num(params["value"]) * 10, TRUE) //WS Edit - add frequency filter fix
if("freq")
var/newfreq = tempfreq //WS Edit - add frequency filter fix
- if(newfreq == FREQ_SYNDICATE)
- to_chat(operator, "Error: Interference preventing filtering frequency: \"[newfreq / 10] GHz\"")
- playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE)
- else
- if(!(newfreq in freq_listening) && newfreq < 10000)
- freq_listening.Add(newfreq)
- log_game("[key_name(operator)] added frequency [newfreq] for [src] at [AREACOORD(src)].")
- . = TRUE
+ if(!(newfreq in freq_listening) && newfreq < 10000)
+ freq_listening.Add(newfreq)
+ log_game("[key_name(operator)] added frequency [newfreq] for [src] at [AREACOORD(src)].")
+ . = TRUE
if("delete")
freq_listening.Remove(params["value"])
log_game("[key_name(operator)] added removed frequency [params["value"]] for [src] at [AREACOORD(src)].")
diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm
index 6428456d1614c..a4d19e61ac477 100644
--- a/code/game/machinery/telecomms/machines/bus.dm
+++ b/code/game/machinery/telecomms/machines/bus.dm
@@ -23,7 +23,7 @@
if(!istype(signal) || !is_freq_listening(signal))
return
- if(change_frequency && signal.frequency != FREQ_SYNDICATE)
+ if(change_frequency)
signal.frequency = change_frequency
if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it
@@ -50,7 +50,7 @@
/obj/machinery/telecomms/bus/preset_one
id = "General Communications Bus"
network = "tcommsat"
- freq_listening = list(FREQ_COMMAND, FREQ_COMMON)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_COMMON)
autolinkers = list("processor1", "command", "common", "messaging", "receiverA")
/obj/machinery/telecomms/bus/preset_two
diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm
index d9f927a7c355d..b1a588f9c6fb3 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/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm
index 33b0bc7028ece..7e68e535c93e3 100644
--- a/code/game/machinery/telecomms/machines/receiver.dm
+++ b/code/game/machinery/telecomms/machines/receiver.dm
@@ -48,7 +48,7 @@
id = "Receiver A"
network = "tcommsat"
autolinkers = list("receiverA") // link to relay
- freq_listening = list(FREQ_SOLGOV, FREQ_NANOTRASEN, FREQ_MINUTEMEN, FREQ_COMMAND, FREQ_COMMON)
+ freq_listening = list(FREQ_SOLGOV, FREQ_NANOTRASEN, FREQ_MINUTEMEN, FREQ_EMERGENCY, FREQ_COMMON)
//--PRESET RIGHT--//
diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm
index 763c42dbbf9c4..9e40b5a7351f6 100644
--- a/code/game/machinery/telecomms/machines/relay.dm
+++ b/code/game/machinery/telecomms/machines/relay.dm
@@ -74,37 +74,37 @@
autolinkers = list("r_relay")
/obj/machinery/telecomms/relay/preset/nanotrasen
- freq_listening = list(FREQ_COMMAND, FREQ_NANOTRASEN)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_NANOTRASEN)
id = "Nanotrasen Relay"
network = "nt_commnet"
/obj/machinery/telecomms/relay/preset/inteq
- freq_listening = list(FREQ_COMMAND, FREQ_INTEQ)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_INTEQ)
id = "IRMG Relay"
network = "irmg_commnet"
/obj/machinery/telecomms/relay/preset/minutemen
- freq_listening = list(FREQ_COMMAND, FREQ_MINUTEMEN)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_MINUTEMEN)
id = "CLIP Relay"
network = "clip_commnet"
/obj/machinery/telecomms/relay/preset/solgov
- freq_listening = list(FREQ_COMMAND, FREQ_SOLGOV)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_SOLGOV)
id = "SolGov Relay"
network = "solgov_commnet"
/obj/machinery/telecomms/relay/preset/syndicate
- freq_listening = list(FREQ_COMMAND, FREQ_SYNDICATE)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_SYNDICATE)
id = "Syndicate Relay"
network = "synd_commnet"
/obj/machinery/telecomms/relay/preset/frontiersmen
- freq_listening = list(FREQ_COMMAND, FREQ_PIRATE)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_PIRATE)
id = "Frontiersmen Relay"
network = "frontier_commnet"
/obj/machinery/telecomms/relay/preset/pgf
- freq_listening = list(FREQ_COMMAND, FREQ_PGF)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_PGF)
id = "PGF Relay"
network = "pgf_commnet"
diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm
index 5607b6bbec8c1..e2cb7addcd8de 100644
--- a/code/game/machinery/telecomms/machines/server.dm
+++ b/code/game/machinery/telecomms/machines/server.dm
@@ -116,7 +116,7 @@
/obj/machinery/telecomms/server/presets/command
id = "Command Server"
- freq_listening = list(FREQ_COMMAND, FREQ_COMMON)
+ freq_listening = list(FREQ_EMERGENCY, FREQ_COMMON)
autolinkers = list("command")
/obj/machinery/telecomms/server/presets/common/birdstation/Initialize()
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index da5a006de0b5a..b75f97102904b 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -85,7 +85,7 @@
update_appearance()
playsound(src.loc, 'sound/items/welder.ogg', 50, TRUE)
- H.emote("scream") // It is painful
+ H.force_scream() // It is painful
H.adjustBruteLoss(max(0, 80 - H.getBruteLoss())) // Hurt the human, don't try to kill them though.
// Sleep for a couple of ticks to allow the human to see the pain
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 4f32fe1d2d3d1..6fe9ec2a653ff 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -9,7 +9,6 @@ GLOBAL_LIST_INIT(dye_registry, list(
DYE_PURPLE = /obj/item/clothing/under/color/lightpurple,
DYE_BLACK = /obj/item/clothing/under/color/black,
DYE_WHITE = /obj/item/clothing/under/color/white,
- DYE_RAINBOW = /obj/item/clothing/under/color/rainbow,
DYE_MIME = /obj/item/clothing/under/rank/civilian/mime,
DYE_CLOWN = /obj/item/clothing/under/rank/civilian/clown,
DYE_CHAP = /obj/item/clothing/under/rank/civilian/chaplain,
@@ -33,7 +32,6 @@ GLOBAL_LIST_INIT(dye_registry, list(
DYE_PURPLE = /obj/item/clothing/under/color/jumpskirt/lightpurple,
DYE_BLACK = /obj/item/clothing/under/color/jumpskirt/black,
DYE_WHITE = /obj/item/clothing/under/color/jumpskirt/white,
- DYE_RAINBOW = /obj/item/clothing/under/color/jumpskirt/rainbow,
DYE_MIME = /obj/item/clothing/under/rank/civilian/mime/skirt,
DYE_CHAP = /obj/item/clothing/under/rank/civilian/chaplain/skirt,
DYE_QM = /obj/item/clothing/under/rank/cargo/qm/skirt,
diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm
index 0ebc11b39558e..04f3272cce1bb 100644
--- a/code/game/mecha/combat/combat.dm
+++ b/code/game/mecha/combat/combat.dm
@@ -2,10 +2,11 @@
force = 30
internals_req_access = list(ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY)
internal_damage_threshold = 50
- armor = list("melee" = 30, "bullet" = 30, "laser" = 15, "energy" = 20, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
mouse_pointer = 'icons/effects/mouse_pointers/mecha_mouse.dmi'
destruction_sleep_duration = 40
exit_delay = 40
+ repair_multiplier = 0.75
/obj/mecha/combat/restore_equipment()
mouse_pointer = 'icons/effects/mouse_pointers/mecha_mouse.dmi'
diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm
index a42e1e29f7eec..3e47ebe80e7c1 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -1,12 +1,13 @@
/obj/mecha/combat/durand
- desc = "An aging combat exosuit utilized by the Nanotrasen corporation. Originally developed to combat hostile alien lifeforms."
+ desc = "An aging and extremely well-armored combat exosuit utilized by the Nanotrasen corporation. Originally developed to combat hostile alien lifeforms."
name = "\improper Durand"
icon_state = "durand"
step_in = 4
dir_in = 1 //Facing North.
- max_integrity = 400
- deflect_chance = 20
- armor = list("melee" = 40, "bullet" = 35, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 50, "fire" = 100, "acid" = 100)
+ max_integrity = 300
+ deflect_chance = 15
+ repair_multiplier = 0.5
+ armor = list("melee" = 50, "bullet" = 75, "laser" = 50, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 50, "fire" = 100, "acid" = 100)
max_temperature = 30000
infra_luminosity = 8
force = 40
@@ -18,11 +19,12 @@
/obj/mecha/combat/durand/clip
- desc = "An aging combat exosuit appropriated from abandoned Nanotrasen facilities, now supplied to the CMM-BARD anti-xenofauna division. The defence grid has been modified to disperse controlled electric shocks on contact, at the cost of its ability to block ranged projectiles."
+ desc = "An aging combat exosuit specially modified for the CMM-BARD anti-xenofauna division. Features improved close-combat armor and a modified defence grid able to electrocute melee attackers, at the cost of its ability to block projectiles."
name = "\improper Paladin"
icon_state = "clipdurand"
+ armor = list("melee" = 75, "bullet" = 50, "laser" = 50, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 50, "fire" = 100, "acid" = 100)
+ deflect_chance = 20
wreckage = /obj/structure/mecha_wreckage/durand/clip
- armor = list("melee" = 40, "bullet" = 35, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 50, "fire" = 100, "acid" = 100)
shield_passive_drain = 0
shield_type = /obj/durand_shield/clip
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index 02f66b54236a4..a22a8dd4706db 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -4,9 +4,9 @@
icon_state = "gygax"
step_in = 3
dir_in = 1 //Facing North.
- max_integrity = 250
+ max_integrity = 300
deflect_chance = 5
- armor = list("melee" = 25, "bullet" = 20, "laser" = 30, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+ armor = list("melee" = 40, "bullet" = 60, "laser" = 40, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
max_temperature = 25000
leg_overload_coeff = 80
infra_luminosity = 6
@@ -22,20 +22,10 @@
mechstep(direction) //agile mechs get to move and turn in the same step
/obj/mecha/combat/gygax/dark
- desc = "A lightweight exosuit, painted in a dark scheme. This model appears to have some modifications."
+ desc = "A lightweight exosuit, painted in a dark scheme."
name = "\improper Dark Gygax"
icon_state = "darkgygax"
- max_integrity = 300
- deflect_chance = 20
- armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" =20, "fire" = 100, "acid" = 100)
- max_temperature = 35000
- leg_overload_coeff = 70
- force = 30
- operation_req_access = list(ACCESS_SYNDICATE)
- internals_req_access = list(ACCESS_SYNDICATE)
wreckage = /obj/structure/mecha_wreckage/gygax/dark
- max_equip = 5
- destruction_sleep_duration = 20
/obj/mecha/combat/gygax/dark/loaded/Initialize()
. = ..()
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index 825d5e24a1b82..b35cc1e370ff6 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -1,11 +1,11 @@
/obj/mecha/combat/marauder
- desc = "Heavy-duty, combat exosuit, developed after the Durand model. Rarely found among civilian populations."
+ desc = "A heavy-duty combat exosuit that improves on the Durand model in nearly every way. Rarely found among civilian populations."
name = "\improper Marauder"
icon_state = "marauder"
step_in = 5
- max_integrity = 500
- deflect_chance = 25
- armor = list("melee" = 50, "bullet" = 55, "laser" = 40, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 60, "fire" = 100, "acid" = 100)
+ max_integrity = 400
+ deflect_chance = 20
+ armor = list("melee" = 50, "bullet" = 75, "laser" = 50, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 60, "fire" = 100, "acid" = 100)
max_temperature = 60000
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
infra_luminosity = 3
@@ -43,7 +43,7 @@
max_ammo()
/obj/mecha/combat/marauder/seraph
- desc = "Heavy-duty, command-type exosuit. This is a custom model, utilized only by high-ranking military personnel."
+ desc = "A heavy-duty command-type exosuit. This is a custom model, utilized only by high-ranking military personnel."
name = "\improper Seraph"
icon_state = "seraph"
operation_req_access = list(ACCESS_CENT_SPECOPS)
diff --git a/code/game/mecha/combat/reticence.dm b/code/game/mecha/combat/reticence.dm
deleted file mode 100644
index b63487ca17a51..0000000000000
--- a/code/game/mecha/combat/reticence.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/obj/mecha/combat/reticence
- desc = "A silent, fast, and nigh-invisible miming exosuit. Popular among mimes and mime assassins."
- name = "\improper reticence"
- icon_state = "reticence"
- step_in = 2
- dir_in = 1 //Facing North.
- max_integrity = 100
- deflect_chance = 3
- armor = list("melee" = 25, "bullet" = 20, "laser" = 30, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
- max_temperature = 15000
- wreckage = /obj/structure/mecha_wreckage/reticence
- operation_req_access = list(ACCESS_THEATRE)
- internals_req_access = list(ACCESS_MECH_SCIENCE, ACCESS_THEATRE)
- add_req_access = 0
- internal_damage_threshold = 25
- max_equip = 2
- base_step_energy_drain = 8
- color = "#87878715"
- stepsound = null
- turnsound = null
-
-
-/obj/mecha/combat/reticence/loaded/Initialize()
- . = ..()
- var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced
- ME.attach(src)
- ME = new /obj/item/mecha_parts/mecha_equipment/rcd //HAHA IT MAKES WALLS GET IT
- ME.attach(src)
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index b7f225306b017..fdaceac864bef 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -96,29 +96,33 @@
/obj/item/mecha_parts/mecha_equipment/proc/action(atom/target)
return 0
-/obj/item/mecha_parts/mecha_equipment/proc/start_cooldown()
- set_ready_state(0)
+/obj/item/mecha_parts/mecha_equipment/proc/start_cooldown(cooldown_override)
+ set_ready_state(FALSE)
chassis.use_power(energy_drain)
- addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), equip_cooldown)
+ if(cooldown_override)
+ addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), cooldown_override)
+ else
+ addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), equip_cooldown)
/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target)
if(!chassis)
return
var/C = chassis.loc
- set_ready_state(0)
+ set_ready_state(FALSE)
chassis.use_power(energy_drain)
- . = do_after(chassis.occupant, equip_cooldown, target=target)
- set_ready_state(1)
- if(!chassis || chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
- return 0
+ . = do_after(chassis.occupant, equip_cooldown, target=target, extra_checks = CALLBACK(src, PROC_REF(check_do_after), target, C))
+ set_ready_state(TRUE)
/obj/item/mecha_parts/mecha_equipment/proc/do_after_mecha(atom/target, delay)
if(!chassis)
return
var/C = chassis.loc
- . = do_after(chassis.occupant, delay, target=target)
- if(!chassis || chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
- return 0
+ . = do_after(chassis.occupant, delay, target=target, extra_checks = CALLBACK(src, PROC_REF(check_do_after), target, C))
+
+/obj/item/mecha_parts/mecha_equipment/proc/check_do_after(atom/target, turf/chassis_turf)
+ . = TRUE
+ if(!chassis || chassis.loc != chassis_turf || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
+ return FALSE
/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M)
if(M.equipment.len 0)
+ chassis.stopped--
+ else
+ chassis.stopped = 0
/obj/item/mecha_parts/mecha_equipment/salvage_saw/tool_start_check(user, amount)
if(!chassis.stopped)
diff --git a/code/game/mecha/equipment/weapons/mecha_ammo.dm b/code/game/mecha/equipment/weapons/mecha_ammo.dm
index 0febe3327cb6c..65a7fb89bb585 100644
--- a/code/game/mecha/equipment/weapons/mecha_ammo.dm
+++ b/code/game/mecha/equipment/weapons/mecha_ammo.dm
@@ -45,14 +45,14 @@
name = "scattershot ammo"
desc = "A box of scaled-up buckshot, for use in exosuit shotguns."
icon_state = "scattershot"
- rounds = 40
+ rounds = 24
ammo_type = "scattershot"
/obj/item/mecha_ammo/lmg
name = "machine gun ammo"
desc = "A box of linked ammunition, designed for the UMG-2 exosuit weapon."
icon_state = "lmg"
- rounds = 300
+ rounds = 200
ammo_type = "lmg"
/obj/item/mecha_ammo/lmg/tank
@@ -83,7 +83,7 @@
/obj/item/mecha_ammo/tank_shell
name = "anti-armor missile"
desc = "A large missle, intended to be loaded into a Type 207."
- icon = 'icons/obj/ammo_bullets.dmi'
+ icon = 'icons/obj/ammunition/ammo_bullets.dmi'
icon_state = "srm-8"
rounds = 1
throw_range = 0
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 39b39ffeeff07..216db9656c007 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -10,6 +10,11 @@
var/projectile_delay = 0
var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect //the visual effect appearing when the weapon is fired.
var/kickback = TRUE //Will using this weapon in no grav push mecha back.
+ var/full_auto = FALSE // whether this gun is full auto.
+ var/mode = 0
+ var/eject_casings = FALSE
+ var/one_casing = FALSE // for shotgun type weapons so it doesnt throw out more casings than it's suppossed too
+ var/casing_type
/obj/item/mecha_parts/mecha_equipment/weapon/can_attach(obj/mecha/M)
if(!..())
@@ -34,7 +39,7 @@
if (targloc == curloc)
return 0
- set_ready_state(0)
+ var/eject_done = FALSE
for(var/i=1 to get_shot_amount())
var/obj/projectile/A = new projectile(curloc)
A.firer = chassis.occupant
@@ -52,6 +57,11 @@
A.fire()
playsound(chassis, fire_sound, 50, TRUE)
+ if(eject_casings && !eject_done)
+ var/obj/item/ammo_casing/ejected = new casing_type(src)
+ ejected.on_eject(chassis)
+ if(one_casing)
+ eject_done = TRUE
sleep(max(0, projectile_delay))
@@ -74,33 +84,49 @@
chassis.use_power(energy_drain*get_shot_amount())
addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), equip_cooldown)
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
- equip_cooldown = 8
- name = "\improper CH-PS \"Immolator\" laser"
- desc = "A weapon for combat exosuits. Shoots basic lasers."
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/carbine
+ equip_cooldown = 2
+ name = "\improper CH-PS \"Downpour\" energy carbine"
+ desc = "A weapon for combat exosuits. A rapid fire energy carbine with both lethal and disabler modes."
icon_state = "mecha_laser"
energy_drain = 30
projectile = /obj/projectile/beam/laser
fire_sound = 'sound/weapons/laser.ogg'
harmful = TRUE
+ full_auto = TRUE
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/disabler
- equip_cooldown = 8
- name = "\improper CH-DS \"Peacemaker\" disabler"
- desc = "A weapon for combat exosuits. Shoots basic disablers."
- icon_state = "mecha_disabler"
- energy_drain = 30
- projectile = /obj/projectile/beam/disabler
- fire_sound = 'sound/weapons/taser2.ogg'
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/carbine/Topic(href, href_list)
+ . = ..()
+ if(href_list["mode"])
+ mode = text2num(href_list["mode"])
+ switch(mode)
+ //laser mode
+ if(0)
+ occupant_message(span_notice("Carbine now set to laser."))
+ energy_drain = initial(energy_drain)
+ projectile = /obj/projectile/beam/laser
+ harmful = TRUE
+ fire_sound = 'sound/weapons/laser.ogg'
+ //disabler mode
+ if(1)
+ occupant_message(span_notice("Carbine now set to disable."))
+ energy_drain = (initial(energy_drain))/2
+ projectile = /obj/projectile/beam/disabler
+ harmful = FALSE
+ fire_sound = 'sound/weapons/taser2.ogg'
+
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/carbine/get_equip_info()
+ return "[..()] \[Laser|Disabler\]"
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
- equip_cooldown = 15
- name = "\improper CH-LC \"Solaris\" laser cannon"
- desc = "A weapon for combat exosuits. Shoots heavy lasers."
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
+ equip_cooldown = 16
+ name = "\improper CH-LC \"Solaris\" beam cannon"
+ desc = "A weapon for combat exosuits. Shoots heavy beam lasers."
icon_state = "mecha_laser"
energy_drain = 60
- projectile = /obj/projectile/beam/laser/heavylaser
+ projectile = /obj/projectile/beam/emitter/hitscan
fire_sound = 'sound/weapons/lasercannonfire.ogg'
+ full_auto = FALSE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
equip_cooldown = 20
@@ -122,7 +148,7 @@
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
- equip_cooldown = 30
+ equip_cooldown = 4
name = "eZ-13 MK2 heavy pulse rifle"
desc = "A weapon for combat exosuits. Shoots powerful destructive blasts capable of demolishing obstacles."
icon_state = "mecha_pulse"
@@ -130,6 +156,7 @@
projectile = /obj/projectile/beam/pulse/heavy
fire_sound = 'sound/weapons/marauder.ogg'
harmful = TRUE
+ full_auto = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
equip_cooldown = 10
@@ -179,53 +206,6 @@
projectile = /obj/projectile/energy/electrode
fire_sound = 'sound/weapons/taser.ogg'
-
-/obj/item/mecha_parts/mecha_equipment/weapon/honker
- name = "\improper HoNkER BlAsT 5000"
- desc = "Equipment for clown exosuits. Spreads fun and joy to everyone around. Honk!"
- icon_state = "mecha_honker"
- energy_drain = 200
- equip_cooldown = 150
- range = MECHA_MELEE|MECHA_RANGED
- kickback = FALSE
-
-/obj/item/mecha_parts/mecha_equipment/weapon/honker/can_attach(obj/mecha/combat/honker/M)
- if(..())
- if(istype(M))
- return 1
- return 0
-
-/obj/item/mecha_parts/mecha_equipment/weapon/honker/action(target, params)
- if(!action_checks(target))
- return
- playsound(chassis, 'sound/items/airhorn.ogg', 100, TRUE)
- chassis.occupant_message("HONK")
- for(var/mob/living/carbon/M in ohearers(6, chassis))
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(istype(H.ears, /obj/item/clothing/ears/earmuffs))
- continue
- var/turf/turf_check = get_turf(M)
- if(isspaceturf(turf_check) && !turf_check.Adjacent(src)) //in space nobody can hear you honk.
- continue
- to_chat(M, "HONK")
- M.SetSleeping(0)
- M.stuttering += 20
- M.adjustEarDamage(0, 30)
- M.Paralyze(60)
- if(prob(30))
- M.Stun(200)
- M.Unconscious(80)
- else
- M.Jitter(500)
-
- log_message("Honked from [src.name]. HONK!", LOG_MECHA)
- var/turf/T = get_turf(src)
- message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] used a Mecha Honker in [ADMIN_VERBOSEJMP(T)]")
- log_game("[key_name(chassis.occupant)] used a Mecha Honker in [AREACOORD(T)]")
- return 1
-
-
//Base ballistic weapon type
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic
name = "general ballistic weapon"
@@ -237,6 +217,7 @@
var/projectile_energy_cost
var/disabledreload //For weapons with no cache (like the rockets) which are reloaded by hand
var/ammo_type
+ casing_type = /obj/item/ammo_casing/spent/mecha
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/Initialize() //initial(projectiles) prevented me from making mech weapons start empty TODO: PORT ALL OF TG MECH IMPROVEMENTS
. = ..()
@@ -294,10 +275,19 @@
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/action(atom/target)
if(..())
- projectiles -= get_shot_amount()
+ if(one_casing)
+ projectiles--
+ else
+ projectiles -= get_shot_amount()
send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",src.get_equip_info())
return 1
+/obj/item/ammo_casing/spent/mecha
+ name = "bullet casing"
+ desc = "A bullet casing designed to fired from exosuit mounted weapons."
+ projectile_type = null
+ icon_state = "rifle-brass"
+ transform = matrix(1.3, 0, 0, 0, 1.3, 0)
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
name = "\improper FNX-99 \"Phoenix\" Exosuit Carbine"
@@ -310,47 +300,53 @@
projectiles_cache_max = 96
harmful = TRUE
ammo_type = "incendiary"
+ eject_casings = TRUE
+ casing_type = /obj/item/ammo_casing/spent/mecha/carbine
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced
- name = "\improper S.H.H. \"Quietus\" Carbine"
- desc = "A weapon for combat exosuits. A mime invention, field tests have shown that targets cannot even scream before going down."
- fire_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
- icon_state = "mecha_mime"
- equip_cooldown = 30
- projectile = /obj/projectile/bullet/mime
- projectiles = 6
- projectile_energy_cost = 50
- harmful = TRUE
+/obj/item/ammo_casing/spent/mecha/carbine
+ name = "FNX-99 5.56mm Incendiary bullet"
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
name = "\improper LBX-10 \"Scattershot\" Heavy Shotgun"
desc = "A weapon for combat exosuits. Shoots a spread of pellets."
icon_state = "mecha_scatter"
- equip_cooldown = 20
- projectile = /obj/projectile/bullet/scattershot
- projectiles = 40
- projectiles_cache = 40
- projectiles_cache_max = 160
- projectiles_per_shot = 4
+ equip_cooldown = 10
+ projectile = /obj/projectile/bullet/pellet/scattershot
+ projectiles = 12
+ projectiles_cache = 24
+ projectiles_cache_max = 72
+ projectiles_per_shot = 8
variance = 25
harmful = TRUE
ammo_type = "scattershot"
+ eject_casings = TRUE
+ one_casing = TRUE
+ casing_type = /obj/item/ammo_casing/spent/mecha/scattergun
+
+/obj/item/ammo_casing/spent/mecha/scattergun
+ name = "8ga scattergun shell"
+ icon_state = "buckshot"
+ bounce_sfx_override = 'sound/weapons/gun/general/bulletcasing_shotgun_bounce.ogg'
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
name = "\improper UMG-2 Mounted Machine Gun"
- desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst."
+ desc = "A weapon for combat exosuits. A fully automatic mounted machine gun with an impressive rate of fire and capacity."
icon_state = "mecha_uac2"
- equip_cooldown = 10
+ equip_cooldown = 2
projectile = /obj/projectile/bullet/lmg
- projectiles = 300
- projectiles_cache = 300
- projectiles_cache_max = 1200
- projectiles_per_shot = 3
+ projectiles = 100
+ projectiles_cache = 200
+ projectiles_cache_max = 600
variance = 6
randomspread = TRUE
- projectile_delay = 2
harmful = TRUE
ammo_type = "lmg"
+ full_auto = TRUE
+ eject_casings = TRUE
+ casing_type = /obj/item/ammo_casing/spent/mecha/umg
+
+/obj/item/ammo_casing/spent/mecha/umg
+ name = "UMG 7.5x50mm bullet"
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/mounted
name = "\improper Mounted Heavy Machine Gun"
@@ -362,7 +358,6 @@
projectiles_cache = 0
projectiles_cache_max = 100
equip_cooldown = 1 SECONDS
- projectile_delay = 1
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
name = "\improper SRM-8 missile rack"
@@ -439,7 +434,7 @@
var/turf/T = get_turf(src)
message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] fired a [src] in [ADMIN_VERBOSEJMP(T)]")
log_game("[key_name(chassis.occupant)] fired a [src] in [AREACOORD(T)]")
- addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade/flashbang, prime)), det_time)
+ F.preprime(delayoverride = det_time)
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze
name = "\improper SOB-3 grenade launcher"
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index eba4801ba56d5..3bbc61961442c 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -13,6 +13,7 @@
light_power = 0.8
light_range = 6
light_on = FALSE
+ var/repair_multiplier = 1 //multiply incoming repairs by this value. used to make some mechs less efficient and slower to repair.
var/ruin_mecha = FALSE //if the mecha starts on a ruin, don't automatically give it a tracking beacon to prevent metagaming.
var/can_move = 0 //time of next allowed movement
var/stopped = FALSE
@@ -160,6 +161,7 @@
diag_hud_set_mechstat()
become_hearing_sensitive(ROUNDSTART_TRAIT)
update_part_values()
+ AddComponent(/datum/component/automatic_fire_mecha,0.5)
/obj/mecha/update_icon_state()
if(silicon_pilot && silicon_icon_state)
@@ -476,7 +478,7 @@
////////////////////////////
-/obj/mecha/proc/click_action(atom/target,mob/user,params)
+/obj/mecha/proc/click_action(atom/target,mob/user,params, cooldown_override = null)
if(!occupant || occupant != user)
return
if(!locate(/turf) in list(target,target.loc)) // Prevents inventory from being drilled
@@ -512,13 +514,13 @@
to_chat(user, "You don't want to harm other living beings!")
return
if(selected.action(target,params))
- selected.start_cooldown()
+ selected.start_cooldown(cooldown_override)
else if(selected && selected.is_melee())
if(isliving(target) && selected.harmful && HAS_TRAIT(L, TRAIT_PACIFISM))
to_chat(user, "You don't want to harm other living beings!")
return
if(selected.action(target,params))
- selected.start_cooldown()
+ selected.start_cooldown(cooldown_override)
else
if(internal_damage & MECHA_INT_CONTROL_LOST)
var/list/possible_targets = oview(1,src)
@@ -979,6 +981,7 @@
else
to_chat(user, "You stop entering the exosuit!")
+// wake up should go off here
/obj/mecha/proc/moved_inside(mob/living/carbon/human/H)
. = FALSE
if(H && H.client && (H in range(1)))
@@ -994,6 +997,8 @@
playsound(src, 'sound/machines/windowdoor.ogg', 50, TRUE)
if(!internal_damage)
SEND_SOUND(occupant, sound('sound/mecha/nominal.ogg',volume=50))
+ SEND_SIGNAL(src,COMSIG_MECH_ENTERED, occupant)
+ autofire_check()
return TRUE
/obj/mecha/proc/mmi_move_inside(obj/item/mmi/M, mob/user)
@@ -1038,6 +1043,8 @@
B.remote_control = src
B.update_mouse_pointer()
icon_state = initial(icon_state)
+ SEND_SIGNAL(src,COMSIG_MECH_ENTERED, occupant)
+ autofire_check()
update_appearance()
setDir(dir_in)
log_message("[M] moved in as pilot.", LOG_MECHA)
@@ -1121,6 +1128,7 @@
var/mob/living/L = occupant
occupant = null //we need it null when forceMove calls Exited().
silicon_pilot = FALSE
+ SEND_SIGNAL(src,COMSIG_MECH_EXITED,L)
if(mob_container.forceMove(newloc))//ejecting mob container
log_message("[mob_container] moved out.", LOG_MECHA)
L << browse(null, "window=exosuit")
@@ -1200,7 +1208,7 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
user.sight |= occupant_sight_flags
///////////////////////
-////// Ammo stuff /////
+////// Weapon stuff ///
///////////////////////
/obj/mecha/proc/ammo_resupply(obj/item/mecha_ammo/A, mob/user,fail_chat_override = FALSE)
@@ -1249,6 +1257,17 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
to_chat(user, "None of the equipment on this exosuit can use this ammo!")
return FALSE
+/obj/mecha/proc/autofire_check()
+ if(istype(selected,/obj/item/mecha_parts/mecha_equipment/weapon))
+ var/obj/item/mecha_parts/mecha_equipment/weapon/mech_gun = selected
+ if(mech_gun.full_auto)
+ SEND_SIGNAL(src,COMSIG_MECH_ENABLE_AUTOFIRE)
+ SEND_SIGNAL(src,COMSIG_MECH_SET_AUTOFIRE_SPEED, mech_gun.equip_cooldown)
+ else
+ SEND_SIGNAL(src,COMSIG_MECH_DISABLE_AUTOFIRE)
+ else
+ SEND_SIGNAL(src,COMSIG_MECH_DISABLE_AUTOFIRE)
+
///////////////////////
////// Charging /////
diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm
index f10fb49c29bc8..3f24b261c74b8 100644
--- a/code/game/mecha/mecha_actions.dm
+++ b/code/game/mecha/mecha_actions.dm
@@ -81,6 +81,7 @@
send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list())
button_icon_state = "mech_cycle_equip_on"
UpdateButtonIcon()
+ chassis.autofire_check()
return
var/number = 0
for(var/A in available_equipment)
@@ -95,6 +96,7 @@
chassis.occupant_message("You switch to [chassis.selected].")
button_icon_state = "mech_cycle_equip_on"
send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list())
+ chassis.autofire_check()
UpdateButtonIcon()
return
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index b6c72134456d2..533230bf1d663 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -298,17 +298,19 @@
if(!W.use_tool(src, user, 0, volume=50, amount=1))
return
clearInternalDamage(MECHA_INT_TANK_BREACH)
- to_chat(user, "You repair the damaged gas tank.")
+ to_chat(user, span_notice("You repair the damaged gas tank."))
return
- if(obj_integrity < max_integrity)
+ while(obj_integrity < max_integrity)
+ if(!do_after(user, 20, target= src))
+ return
if(!W.use_tool(src, user, 0, volume=50, amount=1))
return
- user.visible_message("[user] repairs some damage to [name].", "You repair some damage to [src].")
- obj_integrity += min(10, max_integrity-obj_integrity)
+ user.visible_message(span_notice("[user] repairs some damage to [name]."), span_notice("You repair some damage to [src]."))
+ obj_integrity += min(10 * repair_multiplier, max_integrity-obj_integrity)
if(obj_integrity == max_integrity)
- to_chat(user, "It looks to be fully repaired now.")
- return
- to_chat(user, "The [name] is at full integrity!")
+ to_chat(user, span_notice("It looks to be fully repaired now."))
+ return
+ to_chat(user, span_warning("The [name] is at full integrity!"))
/obj/mecha/proc/mech_toxin_damage(mob/living/target)
playsound(src, 'sound/effects/spray2.ogg', 50, TRUE)
diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm
index f2028def7b456..d18c81b51c130 100644
--- a/code/game/mecha/mecha_topic.dm
+++ b/code/game/mecha/mecha_topic.dm
@@ -323,6 +323,8 @@
if(!equip || !equip.selectable)
return
selected = equip
+ // enable autofire
+ autofire_check()
occupant_message("You switch to [equip].")
visible_message("[src] raises [equip].")
send_byjax(usr, "exosuit.browser", "eq_list", get_equipment_list())
diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm
index 4a85f93211543..39d21639a116b 100644
--- a/code/game/objects/effects/anomalies/_anomalies.dm
+++ b/code/game/objects/effects/anomalies/_anomalies.dm
@@ -8,9 +8,7 @@
anchored = TRUE
light_range = 3
- //aSignal drops as the core, bSignal allows people to signal to detonate
- var/obj/item/assembly/signaler/anomaly/aSignal = /obj/item/assembly/signaler/anomaly
- var/obj/item/assembly/signaler/anomaly/bSignal = /obj/item/assembly/signaler/anomaly/det_signal
+ var/obj/item/assembly/signaler/anomaly/core = /obj/item/assembly/signaler/anomaly
var/area/impact_area
var/lifespan = 990
@@ -46,27 +44,17 @@
pulse_delay = rand(pulse_delay*0.5, pulse_delay*1.5)
src.drops_core = drops_core
- if(aSignal)
- aSignal = new aSignal(src)
- aSignal.code = rand(1,100)
- aSignal.anomaly_type = type
- aSignal.research = research_value
+ if(core)
+ core = new core(src)
+ core.code = rand(1,100)
+ core.code_b = rand(1,100)
+ core.anomaly_type = type
+ core.research = research_value
var/frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ)
if(ISMULTIPLE(frequency, 2))//signaller frequencies are always uneven!
frequency++
- aSignal.set_frequency(frequency)
-
- if(bSignal)
- bSignal = new bSignal(src)
- bSignal.code = rand(1,100)
- bSignal.anomaly_type = type
- var/frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ)
- if(ISMULTIPLE(frequency, 2))//signaller frequencies are always uneven!
- frequency++
- bSignal.set_frequency(frequency)
-
-
+ core.set_frequency(frequency)
if(lifespan)
if(new_lifespan)
@@ -96,8 +84,9 @@
/obj/effect/anomaly/Destroy()
STOP_PROCESSING(SSobj, src)
- QDEL_NULL(countdown)
- QDEL_NULL(aSignal)
+ if(countdown)
+ QDEL_NULL(countdown)
+ QDEL_NULL(core)
return ..()
/obj/effect/anomaly/proc/anomalyEffect(seconds_per_tick)
@@ -118,30 +107,26 @@
/obj/effect/anomaly/proc/anomalyNeutralize()
new /obj/effect/particle_effect/smoke/bad(loc)
-
if(drops_core)
- if(isnull(aSignal))
+ if(isnull(core))
stack_trace("An anomaly ([src]) exists that drops a core, yet has no core!")
else
- aSignal.forceMove(drop_location())
- aSignal = null
+ core.forceMove(drop_location())
+ core = null
// else, anomaly core gets deleted by qdel(src).
qdel(src)
/obj/effect/anomaly/attackby(obj/item/weapon, mob/user, params)
- if(weapon.tool_behaviour == TOOL_ANALYZER && aSignal)
+ if(weapon.tool_behaviour == TOOL_ANALYZER && core)
to_chat(user, span_notice("You start analyzing [src]."))
if(do_after(user, 20, src, hidden = TRUE))
- to_chat(user, span_notice("[src]'s primary field is fluctuating along frequency [format_frequency(aSignal.frequency)], code [aSignal.code]."))
- if(bSignal)
- to_chat(user, span_notice("A second field is fluctuating along [format_frequency(bSignal.frequency)], code [bSignal.code]. It is highly unstable." ))
- return TRUE
+ to_chat(user, span_notice("[src]'s primary field is fluctuating along frequency [format_frequency(core.frequency)], code [core.code]."))
+ return TRUE
return ..()
-
/obj/effect/anomaly/examine(mob/user)
. = ..()
if(user.research_scanner == TRUE)
diff --git a/code/game/objects/effects/anomalies/anomalies_bluespace.dm b/code/game/objects/effects/anomalies/anomalies_bluespace.dm
index f7012e5329445..19d163f131eed 100644
--- a/code/game/objects/effects/anomalies/anomalies_bluespace.dm
+++ b/code/game/objects/effects/anomalies/anomalies_bluespace.dm
@@ -2,9 +2,9 @@
/obj/effect/anomaly/bluespace
name = "jumper"
icon_state = "bluespace"
- desc = "A mysterious anomaly that causes teleportation around it."
+ desc = "A hole in the fabric of bluespace, perforating reality around it."
density = TRUE
- aSignal = /obj/item/assembly/signaler/anomaly/bluespace
+ core = /obj/item/assembly/signaler/anomaly/bluespace
///range from which we can teleport someone
effectrange = 3
var/reagent_amount = 3
@@ -63,7 +63,7 @@
if(istype(A, /obj/item/beacon))
continue // don't teleport beacons because that's just insanely stupid
if(iscameramob(A))
- continue // Don't mess with AI eye, xenobio or advanced cameras
+ continue // Don't mess with AI eye, or advanced cameras
if(A.anchored)
continue
diff --git a/code/game/objects/effects/anomalies/anomalies_flux.dm b/code/game/objects/effects/anomalies/anomalies_flux.dm
index b1318953f4a6d..4eaddefdcae08 100644
--- a/code/game/objects/effects/anomalies/anomalies_flux.dm
+++ b/code/game/objects/effects/anomalies/anomalies_flux.dm
@@ -1,9 +1,10 @@
/obj/effect/anomaly/flux
name = "tesla"
- icon_state = "flux"
- desc = "A mysterious anomaly that sends out a near constant stream of electrical arcs."
+ icon_state = "tesla"
+ //double-check that these only happen in atmosphere now
+ desc = "A break in the atmosphere, small yet potent lightning arcs flashing off it."
density = TRUE
- aSignal = /obj/item/assembly/signaler/anomaly/flux
+ core = /obj/item/assembly/signaler/anomaly/flux
pulse_delay = 2 SECONDS
effectrange = 0
var/canshock = FALSE
@@ -99,3 +100,7 @@
/obj/effect/anomaly/flux/big/planetary
immortal = TRUE
immobile = TRUE
+
+/obj/effect/anomaly/flux/storm
+ drops_core = FALSE
+ explosive = FLUX_LOW_EXPLOSIVE
diff --git a/code/game/objects/effects/anomalies/anomalies_gravity.dm b/code/game/objects/effects/anomalies/anomalies_gravity.dm
index 1dea7049fc97d..550c4414d4089 100644
--- a/code/game/objects/effects/anomalies/anomalies_gravity.dm
+++ b/code/game/objects/effects/anomalies/anomalies_gravity.dm
@@ -9,10 +9,9 @@
/obj/effect/anomaly/grav
name = "throngler"
icon_state = "gravity"
- desc = "A mysterious anomaly that sucks things towards it with a gravitational field, ending in what has been termed a 'throngling'."
+ desc = "A miniature gravity well, constantly pulling the world around it into a 'throngling'."
density = FALSE
- aSignal = /obj/item/assembly/signaler/anomaly/grav
- bSignal = null
+ core = /obj/item/assembly/signaler/anomaly/grav
effectrange = 4
var/boing = 0
///Warp effect holder for displacement filter to "pulse" the anomaly
@@ -88,9 +87,6 @@
/obj/effect/anomaly/grav/high/Initialize(mapload, new_lifespan)
. = ..()
- INVOKE_ASYNC(src, PROC_REF(setup_grav_field))
-
-/obj/effect/anomaly/grav/high/proc/setup_grav_field()
grav_field = new(src, effectrange, TRUE, 2)
/obj/effect/anomaly/grav/high/Destroy()
diff --git a/code/game/objects/effects/anomalies/anomalies_hallucination.dm b/code/game/objects/effects/anomalies/anomalies_hallucination.dm
index ab859a3b32153..8a0a469ba52b1 100644
--- a/code/game/objects/effects/anomalies/anomalies_hallucination.dm
+++ b/code/game/objects/effects/anomalies/anomalies_hallucination.dm
@@ -2,7 +2,8 @@
/obj/effect/anomaly/hallucination
name = "hallucination anomaly"
icon_state = "hallucination"
- aSignal = /obj/item/assembly/signaler/anomaly/hallucination
+ desc = "A shimmering mirage suspended above the ground, never in the same place as it was a second ago."
+ core = /obj/item/assembly/signaler/anomaly/hallucination
/// Time passed since the last effect, increased by delta_time of the SSobj
var/ticks = 0
/// How many seconds between each small hallucination pulses
@@ -18,6 +19,8 @@
var/turf/open/our_turf = get_turf(src)
if(istype(our_turf))
hallucination_pulse(our_turf, 5)
+ pixel_x = clamp(pixel_x + rand(-5, 5), -16, 16)
+ pixel_y = clamp(pixel_y + rand(-5, 5), -16, 16)
/obj/effect/anomaly/hallucination/detonate()
var/turf/open/our_turf = get_turf(src)
@@ -42,7 +45,7 @@
var/list/messages = list(
"You feel your conscious mind fall apart!",
"Reality warps around you!",
- "Something's wispering around you!",
+ "Something whispers around you!",
"You are going insane!",
)
to_chat(user, span_warning(pick(messages)))
diff --git a/code/game/objects/effects/anomalies/anomalies_heartbeat.dm b/code/game/objects/effects/anomalies/anomalies_heartbeat.dm
index 1b691d898436f..ff111fe4882c4 100644
--- a/code/game/objects/effects/anomalies/anomalies_heartbeat.dm
+++ b/code/game/objects/effects/anomalies/anomalies_heartbeat.dm
@@ -1,9 +1,9 @@
/obj/effect/anomaly/heartbeat
name = "heartbeat"
icon_state = "heartbeat"
- desc = "A mysterious anomaly, it ionizes the world around it."
+ desc = "A throbbing vertex, spreading a cancer to the world around itself."
density = TRUE
- aSignal = /obj/item/assembly/signaler/anomaly/heartbeat
+ core = /obj/item/assembly/signaler/anomaly/heartbeat
effectrange = 3
pulse_delay = 6 SECONDS
var/reagent_amount = 5
diff --git a/code/game/objects/effects/anomalies/anomalies_melter.dm b/code/game/objects/effects/anomalies/anomalies_melter.dm
index d906d4f4bad20..3c99fd7eab5a1 100644
--- a/code/game/objects/effects/anomalies/anomalies_melter.dm
+++ b/code/game/objects/effects/anomalies/anomalies_melter.dm
@@ -1,10 +1,10 @@
/obj/effect/anomaly/melter
name = "melter"
icon_state = "melter"
- desc = "A mysterious anomaly. Everburning green flames with a horrid sizzle, melting what's near"
+ desc = "Everburning green flames, eager to lash out at anything that intrudes near."
effectrange = 2
pulse_delay = 10 SECONDS
- aSignal = /obj/item/assembly/signaler/anomaly/melter
+ core = /obj/item/assembly/signaler/anomaly/melter
/obj/effect/anomaly/melter/anomalyEffect(seconds_per_tick)
..()
@@ -20,7 +20,7 @@
I.acid_act(20, 20)
I.update_appearance()
for (var/obj/item/melt in range(effectrange, src))
-
+ //don't melt yourself
if(istype(melt, /obj/item/assembly/signaler/anomaly))
return
else
diff --git a/code/game/objects/effects/anomalies/anomalies_phantom.dm b/code/game/objects/effects/anomalies/anomalies_phantom.dm
index 9407bbcbf920f..e2225c4c843e0 100644
--- a/code/game/objects/effects/anomalies/anomalies_phantom.dm
+++ b/code/game/objects/effects/anomalies/anomalies_phantom.dm
@@ -1,9 +1,9 @@
/obj/effect/anomaly/phantom
name = "phantom"
icon_state = "phantom"
- desc = "A mysterious anomaly, the outline of a humanoid, endlessly screaming in agony."
+ desc = "A familiar outline, it calls out for companionship. It screams for you."
density = FALSE
- aSignal = /obj/item/assembly/signaler/anomaly/phantom
+ core = /obj/item/assembly/signaler/anomaly/phantom
effectrange = 3
pulse_delay = 2 SECONDS
diff --git a/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm b/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm
index 006d42ac28d37..04157af5ff274 100644
--- a/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm
+++ b/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm
@@ -1,9 +1,9 @@
/obj/effect/anomaly/plasmasoul
name = "plasma soul"
icon_state = "plasmasoul"
- desc = "A mysterious anomaly, it slowly leaks plasma into the world around it."
+ desc = "A plasmatic pool, small crystals growing around it, spreading into the ground."
density = TRUE
- aSignal = /obj/item/assembly/signaler/anomaly/plasmasoul
+ core = /obj/item/assembly/signaler/anomaly/plasmasoul
effectrange = 3
pulse_delay = 6 SECONDS
var/reagent_amount = 5
@@ -18,6 +18,10 @@
harm_surrounding_mobs()
/obj/effect/anomaly/plasmasoul/Bumped(atom/movable/AM)
+ if(!COOLDOWN_FINISHED(src, pulse_cooldown))
+ return
+
+ COOLDOWN_START(src, pulse_cooldown, pulse_delay)
var/turf/open/spot = locate(rand(src.x-effectrange, src.x+effectrange), rand(src.y-effectrange, src.y+effectrange), src.z)
harm_surrounding_mobs()
if(istype(spot))
diff --git a/code/game/objects/effects/anomalies/anomalies_pulsar.dm b/code/game/objects/effects/anomalies/anomalies_pulsar.dm
index 1f75acee56b81..360e004b2adf0 100644
--- a/code/game/objects/effects/anomalies/anomalies_pulsar.dm
+++ b/code/game/objects/effects/anomalies/anomalies_pulsar.dm
@@ -1,9 +1,9 @@
/obj/effect/anomaly/pulsar
name = "pulsar"
icon_state = "pulsar"
- desc = "A mysterious anomaly, endless electromagnetic disturbances roll out from it"
+ desc = "A near transparent shell hovering, containing a near constant electromagnetic turmoil."
density = TRUE
- aSignal = /obj/item/assembly/signaler/anomaly/pulsar
+ core = /obj/item/assembly/signaler/anomaly/pulsar
effectrange = 4
pulse_delay = 15 SECONDS
diff --git a/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm b/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm
index b4c93868e6709..fef1c8b38a0b5 100644
--- a/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm
+++ b/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm
@@ -2,17 +2,16 @@
/obj/effect/anomaly/pyro
name = "plasmaball"
icon_state = "pyroclastic"
- desc = "A mysterious anomaly, made of an everburning gas. Those who approach it tend to absorb it's heat, or even ignite."
+ desc = "A floating orb of everburning gas, not unlike a sun. It radiates a dangerous amount of heat."
effectrange = 4
pulse_delay = 10 SECONDS
- aSignal = /obj/item/assembly/signaler/anomaly/pyro
+ core = /obj/item/assembly/signaler/anomaly/pyro
/obj/effect/anomaly/pyro/anomalyEffect(seconds_per_tick)
..()
for(var/mob/living/carbon/nearby in range(effectrange, src))
nearby.adjust_bodytemperature(20)
- visible_message("[src] pulses!")
if(!COOLDOWN_FINISHED(src, pulse_cooldown))
return
@@ -21,7 +20,7 @@
for(var/mob/living/carbon/nearby in range(effectrange/2, src))
nearby.fire_stacks += 3
nearby.IgniteMob()
- visible_message("[src] ignites [nearby]!")
+ visible_message("[src] lets out a flare, igniting [nearby]!")
/obj/effect/anomaly/pyro/Bumped(atom/movable/AM)
@@ -84,3 +83,6 @@
/obj/effect/anomaly/pyro/big/planetary
immortal = TRUE
immobile = TRUE
+
+/obj/effect/anomaly/pyro/storm
+ drops_core = FALSE
diff --git a/code/game/objects/effects/anomalies/anomalies_sparkler.dm b/code/game/objects/effects/anomalies/anomalies_sparkler.dm
index 0b26e6fd6a1cc..79dd55cf21a7c 100644
--- a/code/game/objects/effects/anomalies/anomalies_sparkler.dm
+++ b/code/game/objects/effects/anomalies/anomalies_sparkler.dm
@@ -1,9 +1,9 @@
/obj/effect/anomaly/sparkler
name = "sparkler"
icon_state = "sparkler"
- desc = "A mysterious anomaly, constantly throwing sparks into its vicinity."
+ desc = "A series of shimmering sparks flying to and fro. They try to spread, yet fail."
density = TRUE
- aSignal = /obj/item/assembly/signaler/anomaly/sparkler
+ core = /obj/item/assembly/signaler/anomaly/sparkler
effectrange = 4
pulse_delay = 1 SECONDS
diff --git a/code/game/objects/effects/anomalies/anomalies_static.dm b/code/game/objects/effects/anomalies/anomalies_static.dm
index ab574ee475dd1..b9e8d276ed61b 100644
--- a/code/game/objects/effects/anomalies/anomalies_static.dm
+++ b/code/game/objects/effects/anomalies/anomalies_static.dm
@@ -1,9 +1,25 @@
+GLOBAL_LIST_INIT(tvstatic_sayings, list(
+ "... Help me...",
+ "... I need to get out ...",
+ "...No hope....",
+ "...Let me loose...",
+ "...stay with me...",
+ "...Not like this...",
+ "...please don't go...",
+ "...don't forget me...",
+ "...Are you there...?",
+ "...it hurts...",
+ "...the eyes...",
+ "...need to run...",
+ "...is anyone there..."
+))
+
/obj/effect/anomaly/tvstatic
name = "static"
icon_state = "static"
- desc = "A mysterious anomaly. A hole in the world, endless buzzing emitting from it."
+ desc = "A hole in the world emitting an endless buzzing. It hides something precious."
density = TRUE
- aSignal = /obj/item/assembly/signaler/anomaly/tvstatic
+ core = /obj/item/assembly/signaler/anomaly/tvstatic
effectrange = 4
pulse_delay = 4 SECONDS
verb_say = "pleads"
@@ -12,7 +28,25 @@
verb_whisper = "whimpers"
verb_yell = "screams"
speech_span = SPAN_ITALICS
+ ///The mob we are holding *right* now
var/mob/living/carbon/stored_mob = null
+ ///The path for the spawner if we want to have a custom guy inside the static.
+ var/stored_mob_spawner = null
+
+/obj/effect/anomaly/tvstatic/planetary/Initialize(mapload)
+ if(ispath(stored_mob_spawner))
+ var/obj/effect/mob_spawn/vicspawner = new stored_mob_spawner(src)
+ var/mob/living/carbon/victim = (vicspawner.spawned_mob_ref)?.resolve()
+ src.stored_mob = victim
+ victim.setOrganLoss(ORGAN_SLOT_BRAIN, 200)
+ victim.forceMove(src)
+ if(prob(25) & !stored_mob)
+ var/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/vicspawner = new (src)
+ var/mob/living/carbon/victim = (vicspawner.spawned_mob_ref)?.resolve()
+ src.stored_mob = victim
+ victim.forceMove(src)
+ . = ..()
+
/obj/effect/anomaly/tvstatic/examine(mob/user)
. = ..()
@@ -48,7 +82,7 @@
var/mob/living/carbon/victim = looking
var/obj/effect/anomaly/tvstatic/planetary/expansion
expansion = new(get_turf(victim))
- visible_message(span_warning("The static overtakes [victim], [expansion] taking their place!"))
+ visible_message(span_warning("[src] overtakes [victim], [expansion] taking their place!"))
victim.death()
expansion.stored_mob = victim
victim.forceMove(expansion)
@@ -58,44 +92,18 @@
anomalyEffect()
/obj/effect/anomaly/tvstatic/proc/say_fucky_things()
- switch(rand(1, 13))
- if(1)
- say("... Help me...")
- if(2)
- say("... I need to get out ...")
- if(3)
- say("...No hope....")
- if(4)
- say("....Let me loose...")
- if(5)
- say("...stay with me...")
- if(6)
- say("...I hope I live...")
- if(7)
- say("...please don't go...")
- if(8)
- say("...don't forget me...")
- if(9)
- say("...Are you there...?")
- if(10)
- say("...it hurts...")
- if(11)
- say("...the eyes...")
- if(12)
- say("...need to run...")
- if(13)
- say("...don't become like me...")
+ say(pick(GLOB.tvstatic_sayings))
return
/obj/effect/anomaly/tvstatic/detonate()
for(var/mob/living/carbon/human/looking in range(effectrange, src))
- visible_message(span_boldwarning(" The static lashes out, agony filling your mind as its tendrils scrape your thoughts!"))
+ visible_message(span_boldwarning("[src] lashes out, agony filling your mind as its tendrils scrape your thoughts!"))
if (!HAS_TRAIT(looking, TRAIT_MINDSHIELD) && looking.stat != DEAD)
looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100, 200)
playsound(src, 'sound/effects/stall.ogg', 100)
if(stored_mob)
mangle_corpse()
- visible_message(span_warning("The static sputters out [stored_mob], their body coming out in a burst of blood and gore!"))
+ visible_message(span_warning("[src] sputters out [stored_mob], their body coming out in a burst of blood and gore!"))
new /obj/effect/gibspawner/human(loc)
stored_mob.forceMove(get_turf(src))
stored_mob = null
@@ -111,24 +119,15 @@
var/turf/T = get_turf(src)
if(T)
if(stored_mob)
- visible_message(span_warning("The static spits out [stored_mob], their body coming out in a burst!"))
+ visible_message(span_warning("[src] spits out [stored_mob], their body coming out in a burst!"))
stored_mob.forceMove(get_turf(src))
stored_mob = null
. = ..()
-
/obj/effect/anomaly/tvstatic/planetary
immortal = TRUE
immobile = TRUE
-/obj/effect/anomaly/tvstatic/planetary/Initialize(mapload)
- if(prob(25) & !stored_mob)
- var/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/vicspawner = new (src)
- var/mob/living/carbon/victim = (vicspawner.spawned_mob_ref)?.resolve()
- src.stored_mob = victim
- victim.forceMove(src)
- . = ..()
-
/obj/effect/particle_effect/staticball
name = "static blob"
desc = "An unsettling mass of free floating static"
diff --git a/code/game/objects/effects/anomalies/anomalies_transfusion.dm b/code/game/objects/effects/anomalies/anomalies_transfusion.dm
new file mode 100644
index 0000000000000..f233f9c0a3c46
--- /dev/null
+++ b/code/game/objects/effects/anomalies/anomalies_transfusion.dm
@@ -0,0 +1,69 @@
+/obj/effect/anomaly/transfusion
+ name = "transfusion"
+ icon_state = "transfusion"
+ desc = "A throbbing field floating mid-air, crimson particulate hovering within it."
+ density = TRUE
+ core = /obj/item/assembly/signaler/anomaly/transfusion
+ effectrange = 3
+ pulse_delay = 5 SECONDS
+
+/obj/effect/anomaly/transfusion/anomalyEffect()
+ ..()
+
+ if(!COOLDOWN_FINISHED(src, pulse_cooldown))
+ return
+
+ COOLDOWN_START(src, pulse_cooldown, pulse_delay)
+ blood_music()
+ return
+
+/obj/effect/anomaly/transfusion/proc/blood_music() //by greg bear
+ //this is hacky *because* in an ideal world - it would involve making the core have a reagent container for the blood
+ //however - I am a lazy bitch
+ for(var/mob/living/carbon/victim in range(effectrange, src))
+ //if we're not hungry, we're not hungry.
+ if (core?:get_blood_max() < core?:get_blood_stored())
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter(src.loc, rand(1, 8))
+ visible_message(span_boldwarning("[src] vomits up blood, seemingly satiated!"))
+ core?:set_blood_stored(core?:get_blood_max())
+ return
+ //if there's blood to take, take it
+ if (victim.blood_volume > BLOOD_VOLUME_SAFE)
+ var/bleeder
+ bleeder = rand(10,30)
+ victim.bleed(bleeder)
+ victim.spray_blood(get_dir(victim, src), splatter_strength = 1) //slurp
+ visible_message(span_boldwarning("Ichor flows out of [victim], and into [src]!"))
+ core?:set_blood_stored(bleeder)
+ break
+ //but if there's blood to give, share.
+ if(victim.blood_volume < BLOOD_VOLUME_SAFE && core?:get_blood_stored() > (core?:get_blood_max() / 2))
+ var/present_time
+ present_time = rand((core?:get_blood_stored() / 10), (core?:get_blood_stored() / 2))
+ visible_message(span_boldwarning("Globules of ichor fly away from [src], and into [victim]!"))
+ core?:set_blood_stored(-present_time)
+ victim.blood_volume += present_time
+ break
+ return
+
+/obj/effect/anomaly/transfusion/Bumped(atom/movable/AM)
+ if(!COOLDOWN_FINISHED(src, pulse_secondary_cooldown))
+ return
+ COOLDOWN_START(src, pulse_secondary_cooldown, 10)
+ if(istype(AM, /mob/living/carbon))
+ var/mob/living/carbon/victim = AM
+ visible_message(span_boldwarning("[victim] touches [src], and as they pull away their blood flows away from them!"))
+ var/amount = rand(50, 200)
+ victim.bleed(amount)
+ core?:set_blood_stored(amount)
+
+/obj/effect/anomaly/transfusion/detonate()
+ for(var/mob/living/carbon/victim in range(effectrange, src))
+ victim.bleed(rand(100, 250))
+ victim.spray_blood(get_dir(src, victim), splatter_strength = 3) //slurp
+ visible_message(span_boldwarning("[src] screams as it tries to pull all the blood around into itself!"))
+ . = ..()
+
+/obj/effect/anomaly/transfusion/planetary
+ immortal = TRUE
+ immobile = TRUE
diff --git a/code/game/objects/effects/anomalies/anomalies_veins.dm b/code/game/objects/effects/anomalies/anomalies_veins.dm
index 416e325ccdbd0..e23728356b8d6 100644
--- a/code/game/objects/effects/anomalies/anomalies_veins.dm
+++ b/code/game/objects/effects/anomalies/anomalies_veins.dm
@@ -1,9 +1,9 @@
/obj/effect/anomaly/veins
- name = "veins"
+ name = "fountain"
icon_state = "veins"
- desc = "A mysterious anomaly, throbbing purple veins, suspended midair."
+ desc = "Throbbing purple veins, an exposed artery of the world. It leaks into the world beyond it."
density = TRUE
- aSignal = /obj/item/assembly/signaler/anomaly/veins
+ core = /obj/item/assembly/signaler/anomaly/veins
effectrange = 3
pulse_delay = 4 SECONDS
diff --git a/code/game/objects/effects/anomalies/anomalies_vortex.dm b/code/game/objects/effects/anomalies/anomalies_vortex.dm
index 16a30cbaa9c6c..5e58750776600 100644
--- a/code/game/objects/effects/anomalies/anomalies_vortex.dm
+++ b/code/game/objects/effects/anomalies/anomalies_vortex.dm
@@ -2,9 +2,8 @@
/obj/effect/anomaly/vortex
name = "vortex"
icon_state = "vortex"
- desc = "A mysterious anomaly, this one destroys everything around it."
- aSignal = /obj/item/assembly/signaler/anomaly/vortex
- bSignal = null
+ desc = "An incredibly compact black orb, its hunger unquenchable."
+ core = /obj/item/assembly/signaler/anomaly/vortex
/obj/effect/anomaly/vortex/anomalyEffect()
..()
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 3ec6f58aa7b14..0be76dd1fac65 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -32,11 +32,8 @@
AddElement(/datum/element/connect_loc, loc_connections)
AddElement(/datum/element/beauty, beauty)
- SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
-
-/obj/effect/decal/cleanable/Destroy()
- SSblackbox.record_feedback("tally", "station_mess_destroyed", 1, name)
- return ..()
+ if(!mapload)
+ SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
/obj/effect/decal/cleanable/proc/replace_decal(obj/effect/decal/cleanable/C) // Returns true if we should give up in favor of the pre-existing decal
if(mergeable_decal)
diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm
index 5de5510bec7bf..8f49c0d667cc4 100644
--- a/code/game/objects/effects/decals/cleanable/humans.dm
+++ b/code/game/objects/effects/decals/cleanable/humans.dm
@@ -178,6 +178,16 @@
var/drips = 1
dryname = "drips of blood"
drydesc = "It's red."
+ var/move_on_init = TRUE
+
+/obj/effect/decal/cleanable/blood/drip/Initialize(mapload, list/datum/disease/diseases)
+ . = ..()
+ dry()
+ add_blood_DNA(list("Non-human DNA" = random_blood_type()))
+ if(move_on_init)
+ pixel_x = rand(-16,16)
+ pixel_y = rand(-16, 16)
+
/obj/effect/decal/cleanable/blood/drip/can_bloodcrawl_in()
return TRUE
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index 5610e6a19efa0..b04e83d6f5f67 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -49,6 +49,9 @@
/obj/effect/decal/cleanable/glass/plasma
icon_state = "plasmatiny"
+/obj/effect/decal/cleanable/glass/plastitanium
+ icon_state = "plastitaniumtiny"
+
/obj/effect/decal/cleanable/glass/strange
icon_state = "strangetiny"
diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm
index 0d2282eeb873c..505221b2b0135 100644
--- a/code/game/objects/effects/decals/decal.dm
+++ b/code/game/objects/effects/decals/decal.dm
@@ -61,5 +61,5 @@
/obj/effect/turf_decal/Destroy(force)
SHOULD_CALL_PARENT(FALSE)
- moveToNullspace()
+ loc = null
return QDEL_HINT_QUEUE
diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
index a2ec15e5022fb..1309d8f8fc7dd 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/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index 8e2db3706ca30..3ad3bd1e26ab1 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -56,7 +56,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
for(var/i in 1 to number)
if(total_effects > 20)
return
- INVOKE_ASYNC(src, PROC_REF(generate_effect))
+ generate_effect()
/datum/effect_system/proc/generate_effect()
if(holder)
@@ -68,11 +68,21 @@ would spawn and follow the beaker, even if it is carried or thrown.
direction = pick(GLOB.cardinals)
else
direction = pick(GLOB.alldirs)
- var/steps_amt = pick(1,2,3)
- for(var/j in 1 to steps_amt)
- sleep(5)
- step(E,direction)
- if(!QDELETED(src))
+ var/steps_amt = rand(1, 3)
+ addtimer(CALLBACK(src, PROC_REF(scoot), direction, E, steps_amt), 5)
+
+/datum/effect_system/proc/scoot(direction, obj/effect/ref, steps)
+ if(QDELETED(src))
+ return
+ var/step = get_step(ref, direction)
+ if(isnull(step))
+ return
+
+ ref.forceMove(step)
+
+ if(steps)
+ addtimer(CALLBACK(src, PROC_REF(scoot), direction, ref, steps - 1), 5)
+ else
addtimer(CALLBACK(src, PROC_REF(decrement_total_effect)), 20)
/datum/effect_system/proc/decrement_total_effect()
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 7fc59d075356d..5b2c0aca594b5 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -76,7 +76,7 @@
if(!t_loc)
return
var/list/newsmokes = list()
- for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
+ for(var/turf/T in t_loc.get_atmos_adjacent_turfs())
var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke!
if(foundsmoke)
continue
@@ -135,6 +135,22 @@
/datum/effect_system/smoke_spread/bad
effect_type = /obj/effect/particle_effect/smoke/bad
+/////////////////////////////////////////////
+// Hazard smoke
+/////////////////////////////////////////////
+
+/obj/effect/particle_effect/smoke/hazard
+ lifetime = 8
+
+/obj/effect/particle_effect/smoke/hazard/smoke_mob(mob/living/carbon/M)
+ if(..())
+ M.adjustOxyLoss(4)
+ M.emote(pick("cough","gasp"))
+ return 1
+
+/datum/effect_system/smoke_spread/hazard
+ effect_type = /obj/effect/particle_effect/smoke/hazard
+
/////////////////////////////////////////////
// Nanofrost smoke
/////////////////////////////////////////////
diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm
index 6e00b336d240d..6c74a7dea1ca3 100644
--- a/code/game/objects/effects/effect_system/effects_water.dm
+++ b/code/game/objects/effects/effect_system/effects_water.dm
@@ -51,3 +51,8 @@
/datum/effect_system/steam_spread
effect_type = /obj/effect/particle_effect/steam
+
+/proc/do_steam(amount=0, location = null, direction = null)
+ var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
+ steam.set_up(amount, direction, location)
+ steam.start()
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index f880b95497c43..dc9c7bcd6855f 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/landmarks.dm b/code/game/objects/effects/landmarks.dm
index ccc3e4f0286aa..495b4c9ab666b 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -1,6 +1,6 @@
/obj/effect/landmark
name = "landmark"
- icon = 'icons/effects/landmarks_static.dmi'
+ icon = 'icons/effects/mapping/landmarks_static.dmi'
icon_state = "x2"
anchored = TRUE
layer = MID_LANDMARK_LAYER
@@ -210,7 +210,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
return ..()
/obj/effect/landmark/start/ai/secondary
- icon = 'icons/effects/landmarks_static.dmi'
+ icon = 'icons/effects/mapping/landmarks_static.dmi'
icon_state = "ai_spawn"
primary_ai = FALSE
latejoin_active = FALSE
@@ -249,7 +249,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/wizard
name = "wizard"
- icon = 'icons/effects/landmarks_static.dmi'
+ icon = 'icons/effects/mapping/landmarks_static.dmi'
icon_state = "wiznerd_spawn"
/obj/effect/landmark/start/wizard/Initialize()
@@ -259,7 +259,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/nukeop
name = "nukeop"
- icon = 'icons/effects/landmarks_static.dmi'
+ icon = 'icons/effects/mapping/landmarks_static.dmi'
icon_state = "snukeop_spawn"
/obj/effect/landmark/start/nukeop/Initialize()
@@ -269,7 +269,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
/obj/effect/landmark/start/nukeop_leader
name = "nukeop leader"
- icon = 'icons/effects/landmarks_static.dmi'
+ icon = 'icons/effects/mapping/landmarks_static.dmi'
icon_state = "snukeop_leader_spawn"
/obj/effect/landmark/start/nukeop_leader/Initialize()
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index 73b96c29768cd..986ad10eb187b 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -9,26 +9,6 @@
/obj/effect/beam/singularity_pull()
return
-/obj/effect/spawner
- name = "object spawner"
-
-// Brief explanation:
-// Rather then setting up and then deleting spawners, we block all atomlike setup
-// and do the absolute bare minimum
-// This is with the intent of optimizing mapload
-/obj/effect/spawner/Initialize(mapload)
- SHOULD_CALL_PARENT(FALSE)
- if(flags_1 & INITIALIZED_1)
- stack_trace("Warning: [src]([type]) initialized multiple times!")
- flags_1 |= INITIALIZED_1
-
- return INITIALIZE_HINT_QDEL
-
-/obj/effect/spawner/Destroy(force)
- SHOULD_CALL_PARENT(FALSE)
- moveToNullspace()
- return QDEL_HINT_QUEUE
-
/obj/effect/list_container
name = "list container"
diff --git a/code/game/objects/effects/particles/smoke.dm b/code/game/objects/effects/particles/smoke.dm
index 72807e778f567..3326bbe2caa3a 100644
--- a/code/game/objects/effects/particles/smoke.dm
+++ b/code/game/objects/effects/particles/smoke.dm
@@ -64,3 +64,7 @@
fadein = 0.7 SECONDS
position = generator(GEN_VECTOR, list(-3, 5, 0), list(3, 6.5, 0), NORMAL_RAND)
velocity = generator(GEN_VECTOR, list(-0.1, 0.4, 0), list(0.1, 0.5, 0), NORMAL_RAND)
+
+/particles/fog
+ icon = 'icons/effects/particles/smoke.dmi'
+ icon_state = list("chill_1" = 2, "chill_2" = 2, "chill_3" = 1)
diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm
index e4f36e8b827dc..8ccaf334feae4 100644
--- a/code/game/objects/effects/spawners/bundle.dm
+++ b/code/game/objects/effects/spawners/bundle.dm
@@ -1,134 +1,150 @@
-/obj/effect/spawner/bundle
- name = "bundle spawner"
+/obj/effect/spawner/costume
+ name = "costume spawner"
icon = 'icons/hud/screen_gen.dmi'
icon_state = "x2"
- color = "#00FF00"
+ color = COLOR_VIBRANT_LIME
var/list/items
-/obj/effect/spawner/bundle/Initialize(mapload)
+/obj/effect/spawner/costume/Initialize(mapload)
. = ..()
- if(items && items.len)
+ if(items?.len)
for(var/path in items)
new path(loc)
-/obj/effect/spawner/bundle/costume/gladiator
+/obj/effect/spawner/costume/gladiator
name = "gladiator costume spawner"
items = list(
/obj/item/clothing/under/costume/gladiator,
- /obj/item/clothing/head/helmet/gladiator)
+ /obj/item/clothing/head/helmet/gladiator
+ )
-/obj/effect/spawner/bundle/costume/madscientist
+/obj/effect/spawner/costume/madscientist
name = "mad scientist costume spawner"
items = list(
/obj/item/clothing/under/rank/command/captain/suit,
/obj/item/clothing/head/flatcap,
- /obj/item/clothing/suit/toggle/labcoat/mad)
+ /obj/item/clothing/suit/toggle/labcoat/mad
+ )
-/obj/effect/spawner/bundle/costume/elpresidente
+/obj/effect/spawner/costume/elpresidente
name = "el presidente costume spawner"
items = list(
/obj/item/clothing/under/rank/command/captain/suit,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/mask/cigarette/cigar/havana,
- /obj/item/clothing/shoes/jackboots)
+ /obj/item/clothing/shoes/jackboots
+ )
-/obj/effect/spawner/bundle/costume/nyangirl
+/obj/effect/spawner/costume/nyangirl
name = "nyangirl costume spawner"
items = list(
/obj/item/clothing/under/costume/schoolgirl,
/obj/item/clothing/head/kitty,
- /obj/item/clothing/glasses/blindfold)
+ /obj/item/clothing/glasses/blindfold
+ )
-/obj/effect/spawner/bundle/costume/maid
+/obj/effect/spawner/costume/maid
name = "maid costume spawner"
items = list(
- /obj/item/clothing/under/dress/skirt,
- /obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
- /obj/item/clothing/glasses/blindfold)
+ /obj/item/clothing/under/dress/skirt/color,
+ /obj/effect/spawner/random/clothing/beret_or_rabbitears,
+ /obj/item/clothing/glasses/blindfold
+ )
-
-/obj/effect/spawner/bundle/costume/butler
+/obj/effect/spawner/costume/butler
name = "butler costume spawner"
items = list(
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/under/suit/black,
- /obj/item/clothing/head/that)
+ /obj/item/clothing/head/that
+ )
-/obj/effect/spawner/bundle/costume/highlander
+/obj/effect/spawner/costume/highlander
name = "highlander costume spawner"
items = list(
/obj/item/clothing/under/costume/kilt,
- /obj/item/clothing/head/beret)
+ /obj/item/clothing/head/beret
+ )
-/obj/effect/spawner/bundle/costume/prig
+/obj/effect/spawner/costume/prig
name = "prig costume spawner"
items = list(
/obj/item/clothing/accessory/waistcoat,
- /obj/effect/spawner/lootdrop/minor/bowler_or_that,
+ /obj/effect/spawner/random/clothing/bowler_or_that,
/obj/item/clothing/shoes/sneakers/black,
/obj/item/cane,
/obj/item/clothing/under/suit/sl,
- /obj/item/clothing/mask/fakemoustache)
+ /obj/item/clothing/mask/fakemoustache
+ )
-/obj/effect/spawner/bundle/costume/plaguedoctor
+/obj/effect/spawner/costume/plaguedoctor
name = "plague doctor costume spawner"
items = list(
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit,
- /obj/item/clothing/mask/gas/plaguedoctor)
+ /obj/item/clothing/mask/gas/plaguedoctor
+ )
-/obj/effect/spawner/bundle/costume/nightowl
+/obj/effect/spawner/costume/nightowl
name = "night owl costume spawner"
items = list(
/obj/item/clothing/suit/toggle/owlwings,
/obj/item/clothing/under/costume/owl,
- /obj/item/clothing/mask/gas/owl_mask)
+ /obj/item/clothing/mask/gas/owl_mask
+ )
-/obj/effect/spawner/bundle/costume/waiter
+/obj/effect/spawner/costume/waiter
name = "waiter costume spawner"
items = list(
/obj/item/clothing/under/suit/waiter,
- /obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
- /obj/item/clothing/suit/apron)
+ /obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
+ /obj/item/clothing/suit/apron
+ )
-/obj/effect/spawner/bundle/costume/pirate
+/obj/effect/spawner/costume/pirate
name = "pirate costume spawner"
items = list(
/obj/item/clothing/under/costume/pirate,
/obj/item/clothing/suit/pirate,
- /obj/effect/spawner/lootdrop/minor/pirate_or_bandana,
- /obj/item/clothing/glasses/eyepatch)
+ /obj/effect/spawner/random/clothing/pirate_or_bandana,
+ /obj/item/clothing/glasses/eyepatch
+ )
-/obj/effect/spawner/bundle/costume/cutewitch
+/obj/effect/spawner/costume/cutewitch
name = "cute witch costume spawner"
items = list(
/obj/item/clothing/under/dress/sundress,
- /obj/item/staff/broom)
+ /obj/item/staff/broom
+ )
-/obj/effect/spawner/bundle/costume/mafia
+/obj/effect/spawner/costume/mafia
name = "black mafia outfit spawner"
items = list(
/obj/item/clothing/head/fedora,
/obj/item/clothing/under/suit/blacktwopiece,
- /obj/item/clothing/shoes/laceup)
+ /obj/item/clothing/shoes/laceup
+ )
-/obj/effect/spawner/bundle/costume/mafia/white
+/obj/effect/spawner/costume/mafia/white
name = "white mafia outfit spawner"
items = list(
/obj/item/clothing/head/fedora/white,
/obj/item/clothing/under/suit/white,
- /obj/item/clothing/shoes/laceup)
+ /obj/item/clothing/shoes/laceup
+ )
-/obj/effect/spawner/bundle/costume/mafia/checkered
+/obj/effect/spawner/costume/mafia/checkered
name = "checkered mafia outfit spawner"
items = list(
/obj/item/clothing/head/fedora,
/obj/item/clothing/under/suit/checkered,
- /obj/item/clothing/shoes/laceup)
+ /obj/item/clothing/shoes/laceup
+ )
-/obj/effect/spawner/bundle/costume/mafia/beige
+/obj/effect/spawner/costume/mafia/beige
name = "beige mafia outfit spawner"
items = list(
/obj/item/clothing/head/fedora/beige,
/obj/item/clothing/under/suit/beige,
- /obj/item/clothing/shoes/laceup)
+ /obj/item/clothing/shoes/laceup
+ )
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
deleted file mode 100644
index 364ddeb72298d..0000000000000
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ /dev/null
@@ -1,1294 +0,0 @@
-/obj/effect/spawner/lootdrop
- icon = 'icons/effects/landmarks_static.dmi'
- icon_state = "random_loot"
- layer = OBJ_LAYER
- var/lootcount = 1 //how many items will be spawned
- var/lootdoubles = TRUE //if the same item can be spawned twice
- var/list/loot //a list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect)
- var/fan_out_items = FALSE //Whether the items should be distributed to offsets 0,1,-1,2,-2,3,-3.. This overrides pixel_x/y on the spawner itself
-
-/obj/effect/spawner/lootdrop/Initialize(mapload)
- . = ..()
- if(loot && loot.len)
- var/loot_spawned = 0
- while((lootcount-loot_spawned) && loot.len)
- var/lootspawn = pickweight_float(loot) // WS edit - Fix various startup runtimes
- while(islist(lootspawn))
- lootspawn = pickweight_float(lootspawn) // WS edit - Fix various startup runtimes
- if(!lootdoubles)
- loot.Remove(lootspawn)
-
- if(lootspawn)
- var/atom/movable/spawned_loot = new lootspawn(loc)
- if (!fan_out_items)
- if (pixel_x != 0)
- spawned_loot.pixel_x = pixel_x
- if (pixel_y != 0)
- spawned_loot.pixel_y = pixel_y
- else
- if (loot_spawned)
- spawned_loot.pixel_x = spawned_loot.pixel_y = ((!(loot_spawned%2)*loot_spawned/2)*-1)+((loot_spawned%2)*(loot_spawned+1)/2*1)
- else
- break // WS edit - Support spawn weights of 0 in loot tables and ruins
- loot_spawned++
-
-/obj/effect/spawner/lootdrop/donkpockets
- name = "donk pocket box spawner"
- lootdoubles = FALSE
-
- loot = list(
- /obj/item/storage/box/donkpockets/donkpocketspicy = 1,
- /obj/item/storage/box/donkpockets/donkpocketteriyaki = 1,
- /obj/item/storage/box/donkpockets/donkpocketpizza = 1,
- /obj/item/storage/box/donkpockets/donkpocketberry = 1,
- /obj/item/storage/box/donkpockets/donkpockethonk = 1,
- )
-
-
-/obj/effect/spawner/lootdrop/armory_contraband
- name = "armory contraband gun spawner"
- lootdoubles = FALSE
-
- loot = list(
- /obj/item/gun/ballistic/automatic/pistol/ringneck = 8,
- /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
- /obj/item/gun/ballistic/automatic/pistol/deagle,
- /obj/item/gun/ballistic/revolver/mateba
- )
-
-/obj/effect/spawner/lootdrop/armory_contraband/metastation
- loot = list(/obj/item/gun/ballistic/automatic/pistol/ringneck = 5,
- /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
- /obj/item/gun/ballistic/automatic/pistol/deagle,
- /obj/item/storage/box/syndie_kit/throwing_weapons = 3,
- /obj/item/gun/ballistic/revolver/mateba)
-
-/obj/effect/spawner/lootdrop/armory_contraband/donutstation
- loot = list(/obj/item/grenade/clusterbuster/teargas = 5,
- /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
- /obj/item/bikehorn/golden,
- /obj/item/grenade/clusterbuster,
- /obj/item/storage/box/syndie_kit/throwing_weapons = 3,
- /obj/item/gun/ballistic/revolver/mateba)
-
-/obj/effect/spawner/lootdrop/prison_contraband
- name = "prison contraband loot spawner"
- loot = list(/obj/item/clothing/mask/cigarette/space_cigarette = 4,
- /obj/item/clothing/mask/cigarette/robust = 2,
- /obj/item/clothing/mask/cigarette/carp = 3,
- /obj/item/clothing/mask/cigarette/uplift = 2,
- /obj/item/clothing/mask/cigarette/dromedary = 3,
- /obj/item/clothing/mask/cigarette/robustgold = 1,
- /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
- /obj/item/storage/fancy/cigarettes = 3,
- /obj/item/clothing/mask/cigarette/rollie/cannabis = 4,
- /obj/item/toy/crayon/spraycan = 2,
- /obj/item/crowbar = 1,
- /obj/item/assembly/flash/handheld = 1,
- /obj/item/restraints/handcuffs/cable/zipties = 1,
- /obj/item/restraints/handcuffs = 1,
- /obj/item/radio = 1,
- /obj/item/lighter = 3,
- /obj/item/storage/box/matches = 3,
- /obj/item/reagent_containers/syringe/contraband/space_drugs = 1,
- /obj/item/reagent_containers/syringe/contraband/krokodil = 1,
- /obj/item/reagent_containers/syringe/contraband/crank = 1,
- /obj/item/reagent_containers/syringe/contraband/methamphetamine = 1,
- /obj/item/reagent_containers/syringe/contraband/bath_salts = 1,
- /obj/item/reagent_containers/syringe/contraband/fentanyl = 1,
- /obj/item/reagent_containers/syringe/contraband/morphine = 1,
- /obj/item/storage/pill_bottle/happy = 1,
- /obj/item/storage/pill_bottle/lsd = 1,
- /obj/item/storage/pill_bottle/psicodine = 1,
- /obj/item/reagent_containers/food/drinks/beer = 4,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
- /obj/item/paper/fluff/jobs/prisoner/letter = 1,
- /obj/item/grenade/smokebomb = 1,
- /obj/item/flashlight/seclite = 1,
- /obj/item/melee/knife/shiv = 4,
- /obj/item/melee/knife/shiv/carrot = 1,
- /obj/item/melee/knife/kitchen = 1,
- /obj/item/storage/wallet/random = 1,
- /obj/item/pda = 1
- )
-
-/obj/effect/spawner/lootdrop/gambling
- name = "gambling valuables spawner"
- loot = list(
- /obj/item/clothing/head/trapper = 3,
- /obj/item/storage/box/syndie_kit/throwing_weapons,
- /obj/item/coin/gold,
- /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
- )
-
-/obj/effect/spawner/lootdrop/grille_or_trash
- name = "maint grille or trash spawner"
- loot = list(/obj/structure/grille = 5,
- /obj/item/cigbutt = 1,
- /obj/item/trash/cheesie = 1,
- /obj/item/trash/candy = 1,
- /obj/item/trash/chips = 1,
- /obj/item/reagent_containers/food/snacks/deadmouse = 1,
- /obj/item/trash/pistachios = 1,
- /obj/item/trash/plate = 1,
- /obj/item/trash/popcorn = 1,
- /obj/item/trash/raisins = 1,
- /obj/item/trash/sosjerky = 1,
- /obj/item/trash/syndi_cakes = 1)
-
-/obj/effect/spawner/lootdrop/three_course_meal
- name = "three course meal spawner"
- lootcount = 3
- lootdoubles = FALSE
- var/soups = list(
- /obj/item/reagent_containers/food/snacks/soup/beet,
- /obj/item/reagent_containers/food/snacks/soup/sweetpotato,
- /obj/item/reagent_containers/food/snacks/soup/stew,
- /obj/item/reagent_containers/food/snacks/soup/hotchili,
- /obj/item/reagent_containers/food/snacks/soup/nettle,
- /obj/item/reagent_containers/food/snacks/soup/meatball)
- var/salads = list(
- /obj/item/reagent_containers/food/snacks/salad/herbsalad,
- /obj/item/reagent_containers/food/snacks/salad/validsalad,
- /obj/item/reagent_containers/food/snacks/salad/fruit,
- /obj/item/reagent_containers/food/snacks/salad/jungle,
- /obj/item/reagent_containers/food/snacks/salad/aesirsalad)
- var/mains = list(
- /obj/item/reagent_containers/food/snacks/bearsteak,
- /obj/item/reagent_containers/food/snacks/enchiladas,
- /obj/item/reagent_containers/food/snacks/stewedsoymeat,
- /obj/item/reagent_containers/food/snacks/burger/bigbite,
- /obj/item/reagent_containers/food/snacks/burger/superbite,
- /obj/item/reagent_containers/food/snacks/burger/fivealarm)
-
-/obj/effect/spawner/lootdrop/three_course_meal/Initialize(mapload)
- loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1)
- . = ..()
-
-/obj/effect/spawner/lootdrop/maintenance
- name = "maintenance loot spawner"
- // see code/_globalvars/lists/maintenance_loot.dm for loot table
-
-/obj/effect/spawner/lootdrop/maintenance/Initialize(mapload)
- loot = GLOB.maintenance_loot
- . = ..()
-
-/obj/effect/spawner/lootdrop/maintenance/two
- name = "2 x maintenance loot spawner"
- lootcount = 2
-
-/obj/effect/spawner/lootdrop/maintenance/three
- name = "3 x maintenance loot spawner"
- lootcount = 3
-
-/obj/effect/spawner/lootdrop/maintenance/four
- name = "4 x maintenance loot spawner"
- lootcount = 4
-
-/obj/effect/spawner/lootdrop/maintenance/five
- name = "5 x maintenance loot spawner"
- lootcount = 5
-
-/obj/effect/spawner/lootdrop/maintenance/six
- name = "6 x maintenance loot spawner"
- lootcount = 6
-
-/obj/effect/spawner/lootdrop/maintenance/seven
- name = "7 x maintenance loot spawner"
- lootcount = 7
-
-/obj/effect/spawner/lootdrop/maintenance/eight
- name = "8 x maintenance loot spawner"
- lootcount = 8
-
-/obj/effect/spawner/lootdrop/crate_spawner
- name = "lootcrate spawner" //USE PROMO CODE "SELLOUT" FOR 20% OFF!
- lootdoubles = FALSE
-
- loot = list(
- /obj/structure/closet/crate/secure/loot = 20,
- "" = 80
- )
-
-/obj/effect/spawner/lootdrop/organ_spawner
- name = "ayylien organ spawner"
- loot = list(
- /obj/item/organ/heart/gland/electric = 3,
- /obj/item/organ/heart/gland/trauma = 4,
- /obj/item/organ/heart/gland/egg = 7,
- /obj/item/organ/heart/gland/chem = 5,
- /obj/item/organ/heart/gland/mindshock = 5,
- /obj/item/organ/heart/gland/plasma = 7,
- /obj/item/organ/heart/gland/transform = 5,
- /obj/item/organ/heart/gland/slime = 4,
- /obj/item/organ/heart/gland/spiderman = 5,
- /obj/item/organ/heart/gland/ventcrawling = 1,
- /obj/item/organ/body_egg/alien_embryo = 1,
- /obj/item/organ/regenerative_core = 2)
- lootcount = 3
-
-/obj/effect/spawner/lootdrop/memeorgans
- name = "meme organ spawner"
- loot = list(
- /obj/item/organ/ears/penguin,
- /obj/item/organ/ears/cat,
- /obj/item/organ/eyes/compound,
- /obj/item/organ/eyes/snail,
- /obj/item/organ/tongue/bone,
- /obj/item/organ/tongue/fly,
- /obj/item/organ/tongue/snail,
- /obj/item/organ/tongue/lizard,
- /obj/item/organ/tongue/alien,
- /obj/item/organ/tongue/ethereal,
- /obj/item/organ/tongue/robot,
- /obj/item/organ/tongue/zombie,
- /obj/item/organ/appendix,
- /obj/item/organ/liver/fly,
- /obj/item/organ/lungs/plasmaman,
- /obj/item/organ/tail/cat,
- /obj/item/organ/tail/lizard)
- lootcount = 5
-
-/obj/effect/spawner/lootdrop/rnd
- name = "random RND spawner"
- loot = list(
- /obj/item/storage/box/rndmining,
- /obj/item/storage/box/rndengi,
- /obj/item/storage/box/rndsec,
- /obj/item/storage/box/rndciv,
- /obj/item/storage/box/rndmed)
- lootcount = 1
-
-/obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner
- name = "2% chance xeno egg spawner"
- loot = list(
- /obj/effect/decal/remains/xeno = 49,
- /obj/effect/spawner/xeno_egg_delivery = 1)
-
-/obj/effect/spawner/lootdrop/costume
- name = "random costume spawner"
-
-/obj/effect/spawner/lootdrop/costume/Initialize()
- loot = list()
- for(var/path in subtypesof(/obj/effect/spawner/bundle/costume))
- loot[path] = TRUE
- . = ..()
-
-// Minor lootdrops follow
-
-/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears
- name = "beret or rabbit ears spawner"
- loot = list(
- /obj/item/clothing/head/beret = 1)
-
-/obj/effect/spawner/lootdrop/minor/bowler_or_that
- name = "bowler or top hat spawner"
- loot = list(
- /obj/item/clothing/head/that = 1)
-
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears
- name = "kitty ears or rabbit ears spawner"
- loot = list(
- /obj/item/clothing/head/kitty = 1)
-
-/obj/effect/spawner/lootdrop/minor/pirate_or_bandana
- name = "pirate hat or bandana spawner"
- loot = list(
- /obj/item/clothing/head/pirate = 1,
- /obj/item/clothing/head/bandana = 1)
-
-/obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask
- name = "25% cyborg mask spawner"
- loot = list(
- /obj/item/clothing/mask/gas/cyborg = 25,
- "" = 75)
-
-/obj/effect/spawner/lootdrop/aimodule_harmless // These shouldn't allow the AI to start butchering people
- name = "harmless AI module spawner"
- loot = list(
- /obj/item/aiModule/core/full/asimov,
- /obj/item/aiModule/core/full/asimovpp,
- /obj/item/aiModule/core/full/hippocratic,
- /obj/item/aiModule/core/full/paladin_devotion,
- /obj/item/aiModule/core/full/paladin
- )
-
-/obj/effect/spawner/lootdrop/aimodule_neutral // These shouldn't allow the AI to start butchering people without reason
- name = "neutral AI module spawner"
- loot = list(
- /obj/item/aiModule/core/full/corp,
- /obj/item/aiModule/core/full/maintain,
- /obj/item/aiModule/core/full/drone,
- /obj/item/aiModule/core/full/peacekeeper,
- /obj/item/aiModule/core/full/reporter,
- /obj/item/aiModule/core/full/robocop,
- /obj/item/aiModule/core/full/liveandletlive,
- /obj/item/aiModule/core/full/hulkamania
- )
-
-/obj/effect/spawner/lootdrop/aimodule_harmful // These will get the shuttle called
- name = "harmful AI module spawner"
- loot = list(
- /obj/item/aiModule/core/full/antimov,
- /obj/item/aiModule/core/full/balance,
- /obj/item/aiModule/core/full/tyrant,
- /obj/item/aiModule/core/full/thermurderdynamic,
- /obj/item/aiModule/core/full/damaged,
- /obj/item/aiModule/reset/purge
- )
-
-// Tech storage circuit board spawners
-
-/obj/effect/spawner/lootdrop/techstorage
- name = "generic circuit board spawner"
- lootdoubles = FALSE
- fan_out_items = TRUE
- lootcount = INFINITY
-
-/obj/effect/spawner/lootdrop/techstorage/service
- name = "service circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/arcade/battle,
- /obj/item/circuitboard/computer/arcade/orion_trail,
- /obj/item/circuitboard/machine/autolathe,
- /obj/item/circuitboard/computer/mining,
- /obj/item/circuitboard/machine/ore_redemption,
- /obj/item/circuitboard/machine/vending/mining_equipment,
- /obj/item/circuitboard/machine/microwave,
- /obj/item/circuitboard/machine/chem_dispenser/drinks,
- /obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
- /obj/item/circuitboard/computer/slot_machine
- )
-
-/obj/effect/spawner/lootdrop/techstorage/rnd
- name = "RnD circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/aifixer,
- /obj/item/circuitboard/machine/rdserver,
- /obj/item/circuitboard/machine/mechfab,
- /obj/item/circuitboard/machine/circuit_imprinter/department,
- /obj/item/circuitboard/computer/teleporter,
- /obj/item/circuitboard/machine/destructive_analyzer,
- /obj/item/circuitboard/computer/rdconsole,
- /obj/item/circuitboard/computer/nanite_chamber_control,
- /obj/item/circuitboard/computer/nanite_cloud_controller,
- /obj/item/circuitboard/machine/nanite_chamber,
- /obj/item/circuitboard/machine/nanite_programmer,
- /obj/item/circuitboard/machine/nanite_program_hub
- )
-
-/obj/effect/spawner/lootdrop/techstorage/security
- name = "security circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/secure_data,
- /obj/item/circuitboard/computer/security,
- /obj/item/circuitboard/computer/prisoner
- )
-
-/obj/effect/spawner/lootdrop/techstorage/engineering
- name = "engineering circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/atmos_alert,
- /obj/item/circuitboard/computer/stationalert,
- /obj/item/circuitboard/computer/powermonitor
- )
-
-/obj/effect/spawner/lootdrop/techstorage/tcomms
- name = "tcomms circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/message_monitor,
- /obj/item/circuitboard/machine/telecomms/broadcaster,
- /obj/item/circuitboard/machine/telecomms/bus,
- /obj/item/circuitboard/machine/telecomms/server,
- /obj/item/circuitboard/machine/telecomms/receiver,
- /obj/item/circuitboard/machine/telecomms/processor,
- /obj/item/circuitboard/machine/announcement_system,
- /obj/item/circuitboard/computer/comm_server,
- /obj/item/circuitboard/computer/comm_monitor
- )
-
-/obj/effect/spawner/lootdrop/techstorage/medical
- name = "medical circuit board spawner"
- loot = list(
- /obj/item/circuitboard/machine/chem_dispenser,
- /obj/item/circuitboard/computer/scan_consolenew,
- /obj/item/circuitboard/computer/med_data,
- /obj/item/circuitboard/machine/smoke_machine,
- /obj/item/circuitboard/machine/chem_master,
- /obj/item/circuitboard/machine/dnascanner,
- /obj/item/circuitboard/computer/pandemic
- )
-
-/obj/effect/spawner/lootdrop/techstorage/AI
- name = "secure AI circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/aiupload,
- /obj/item/circuitboard/computer/borgupload,
- /obj/item/circuitboard/aicore
- )
-
-/obj/effect/spawner/lootdrop/techstorage/command
- name = "secure command circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/crew,
- /obj/item/circuitboard/computer/communications,
- /obj/item/circuitboard/computer/card
- )
-
-/obj/effect/spawner/lootdrop/techstorage/RnD_secure
- name = "secure RnD circuit board spawner"
- loot = list(
- /obj/item/circuitboard/computer/mecha_control,
- /obj/item/circuitboard/computer/apc_control,
- /obj/item/circuitboard/computer/robotics
- )
-
-/obj/effect/spawner/lootdrop/mafia_outfit
- name = "mafia outfit spawner"
- loot = list(
- /obj/effect/spawner/bundle/costume/mafia = 20,
- /obj/effect/spawner/bundle/costume/mafia/white = 5,
- /obj/effect/spawner/bundle/costume/mafia/checkered = 2,
- /obj/effect/spawner/bundle/costume/mafia/beige = 5
- )
-
-/obj/effect/spawner/lootdrop/salvage_machine
- name = "salvageable machine spawner"
- loot = list(
- /obj/structure/salvageable/protolathe,
- /obj/structure/salvageable/circuit_imprinter,
- /obj/structure/salvageable/server,
- /obj/structure/salvageable/machine,
- /obj/structure/salvageable/autolathe,
- /obj/structure/salvageable/computer,
- /obj/structure/salvageable/destructive_analyzer
- )
-
-/obj/effect/spawner/lootdrop/ripley
- name = "25% exosuit 75% wreckage ripley spawner"
- loot = list(/obj/mecha/working/ripley/mining = 1,
- /obj/structure/mecha_wreckage/ripley = 5)
- lootdoubles = FALSE
-
-/obj/effect/spawner/lootdrop/salvage_50
- name = "50% salvage spawner"
- loot = list(
- /obj/effect/spawner/lootdrop/maintenance = 13,
- /obj/effect/spawner/lootdrop/salvage_machine = 12,
- /obj/effect/spawner/lootdrop/ripley = 12,
- /obj/structure/closet/crate/secure/loot = 13,
- "" = 50
- )
-
-//finds the probabilities of items spawning from a loot spawner's loot pool
-/obj/item/loot_table_maker
- icon = 'icons/effects/landmarks_static.dmi'
- icon_state = "random_loot"
- var/spawner_to_test = /obj/effect/spawner/lootdrop/maintenance //what lootdrop spawner to use the loot pool of
- var/loot_count = 180 //180 is about how much maint loot spawns per map as of 11/14/2019
- //result outputs
- var/list/spawned_table //list of all items "spawned" and how many
- var/list/stat_table //list of all items "spawned" and their occurrance probability
-
-/obj/item/loot_table_maker/Initialize()
- . = ..()
- make_table()
-
-/obj/item/loot_table_maker/attack_self(mob/user)
- to_chat(user, "Loot pool re-rolled.")
- make_table()
-
-/obj/item/loot_table_maker/proc/make_table()
- spawned_table = list()
- stat_table = list()
- var/obj/effect/spawner/lootdrop/spawner_to_table = new spawner_to_test
- var/lootpool = spawner_to_table.loot
- qdel(spawner_to_table)
- for(var/i in 1 to loot_count)
- var/loot_spawn = pick_loot(lootpool)
- if(!loot_spawn) // WS edit - Support spawn weights of 0 in loot tables and ruins
- continue
- if(!(loot_spawn in spawned_table))
- spawned_table[loot_spawn] = 1
- else
- spawned_table[loot_spawn] += 1
- stat_table += spawned_table
- for(var/item in stat_table)
- stat_table[item] /= loot_count
-
-/obj/item/loot_table_maker/proc/pick_loot(lootpool) //selects path from loot table and returns it
- var/lootspawn = pickweight_float(lootpool) // WS edit - Fix various startup runtimes
- while(islist(lootspawn))
- lootspawn = pickweight_float(lootspawn) // WS edit - Fix various startup runtimes
- return lootspawn
-
-/obj/effect/spawner/lootdrop/stockparts
- name = "random good stock parts"
- lootcount = 6
- loot = list(
- /obj/item/stock_parts/capacitor/adv,
- /obj/item/stock_parts/capacitor/quadratic,
- /obj/item/stock_parts/capacitor/super,
- /obj/item/stock_parts/cell/hyper,
- /obj/item/stock_parts/cell/super,
- /obj/item/stock_parts/cell/bluespace,
- /obj/item/stock_parts/matter_bin/bluespace,
- /obj/item/stock_parts/matter_bin/super,
- /obj/item/stock_parts/matter_bin/adv,
- /obj/item/stock_parts/micro_laser/ultra,
- /obj/item/stock_parts/micro_laser/quadultra,
- /obj/item/stock_parts/micro_laser/high,
- /obj/item/stock_parts/scanning_module/triphasic,
- /obj/item/stock_parts/scanning_module/phasic,
- /obj/item/stock_parts/scanning_module/adv,
- /obj/item/reagent_containers/glass/beaker/bluespace,
- /obj/item/reagent_containers/glass/beaker/plastic,
- /obj/item/reagent_containers/glass/beaker/large,
- /obj/item/stock_parts/manipulator/nano,
- /obj/item/stock_parts/manipulator/pico,
- /obj/item/stock_parts/manipulator/femto
- )
-
-/obj/effect/spawner/lootdrop/materials
- name = "random bulk materials"
- lootcount = 2
- loot = list(
- /obj/item/stack/sheet/plastic/fifty,
- /obj/item/stack/sheet/bluespace_crystal/twenty,
- /obj/item/stack/sheet/cardboard/fifty,
- /obj/item/stack/sheet/glass/fifty,
- /obj/item/stack/sheet/metal/fifty,
- /obj/item/stack/sheet/plasteel/twenty,
- /obj/item/stack/sheet/mineral/plasma/fifty,
- /obj/item/stack/sheet/mineral/silver/fifty,
- /obj/item/stack/sheet/mineral/titanium/fifty,
- /obj/item/stack/sheet/mineral/uranium/fifty,
- /obj/item/stack/sheet/mineral/wood/fifty,
- /obj/item/stack/sheet/mineral/diamond/twenty,
- /obj/item/stack/sheet/mineral/gold/fifty,
-
- /obj/item/stack/cable_coil/red,
- /obj/item/stack/rods/fifty
- )
-
-/obj/effect/spawner/lootdrop/singularitygen
- name = "Tesla or Singulo spawner"
- lootdoubles = FALSE
-
- loot = list(
- /obj/machinery/the_singularitygen/tesla = 1,
- /obj/machinery/the_singularitygen = 1,
- )
-
-/obj/effect/spawner/lootdrop/stockparts
- name = "random good stock parts"
- lootcount = 5
- loot = list(
- /obj/item/stock_parts/capacitor/adv,
- /obj/item/stock_parts/capacitor/quadratic,
- /obj/item/stock_parts/capacitor/super,
- /obj/item/stock_parts/cell/hyper,
- /obj/item/stock_parts/cell/super,
- /obj/item/stock_parts/cell/bluespace,
- /obj/item/stock_parts/matter_bin/bluespace,
- /obj/item/stock_parts/matter_bin/super,
- /obj/item/stock_parts/matter_bin/adv,
- /obj/item/stock_parts/micro_laser/ultra,
- /obj/item/stock_parts/micro_laser/quadultra,
- /obj/item/stock_parts/micro_laser/high,
- /obj/item/stock_parts/scanning_module/triphasic,
- /obj/item/stock_parts/scanning_module/phasic,
- /obj/item/stock_parts/scanning_module/adv,
- /obj/item/reagent_containers/glass/beaker/bluespace,
- /obj/item/reagent_containers/glass/beaker/plastic,
- /obj/item/reagent_containers/glass/beaker/large,
- /obj/item/stock_parts/manipulator/nano,
- /obj/item/stock_parts/manipulator/pico,
- /obj/item/stock_parts/manipulator/femto
- )
-
-/obj/effect/spawner/lootdrop/materials
- name = "random materials"
- lootcount = 3
- loot = list(
- /obj/item/stack/sheet/plastic/fifty,
- /obj/item/stack/sheet/plastic/five,
- /obj/item/stack/sheet/bluespace_crystal/twenty,
- /obj/item/stack/sheet/bluespace_crystal/five,
- /obj/item/stack/sheet/cardboard/fifty,
- /obj/item/stack/sheet/glass/fifty,
- /obj/item/stack/sheet/metal/fifty,
- /obj/item/stack/sheet/metal/twenty,
- /obj/item/stack/sheet/plasteel/twenty,
- /obj/item/stack/sheet/mineral/plasma/fifty,
- /obj/item/stack/sheet/mineral/plasma/twenty,
- /obj/item/stack/sheet/mineral/silver/fifty,
- /obj/item/stack/sheet/mineral/titanium/twenty,
- /obj/item/stack/sheet/mineral/uranium/twenty,
- /obj/item/stack/sheet/mineral/wood/fifty,
- /obj/item/stack/sheet/mineral/diamond/twenty,
- /obj/item/stack/sheet/mineral/gold/fifty,
- /obj/item/stack/cable_coil/red,
- /obj/item/stack/rods/fifty
- )
-
-/obj/effect/spawner/lootdrop/donut
- name = "random donut" //donut :)
- lootcount = 1
- loot = list(
- /obj/item/reagent_containers/food/snacks/donut/apple = 1,
- /obj/item/reagent_containers/food/snacks/donut/berry = 1,
- /obj/item/reagent_containers/food/snacks/donut/caramel = 1,
- /obj/item/reagent_containers/food/snacks/donut/choco = 1,
- /obj/item/reagent_containers/food/snacks/donut/laugh = 1,
- /obj/item/reagent_containers/food/snacks/donut/matcha = 1,
- /obj/item/reagent_containers/food/snacks/donut/meat = 1,
- /obj/item/reagent_containers/food/snacks/donut/plain = 1,
- /obj/item/reagent_containers/food/snacks/donut/trumpet = 1,
- /obj/item/reagent_containers/food/snacks/donut/blumpkin = 1,
- /obj/item/reagent_containers/food/snacks/donut/bungo = 1,
- /obj/item/reagent_containers/food/snacks/donut/chaos = 1,
- )
-
-/obj/effect/spawner/lootdrop/donut/jelly
- name = "random jelly donut"
- lootcount = 1
- loot = list(
- /obj/item/reagent_containers/food/snacks/donut/jelly/berry = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/apple = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/bungo = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/caramel = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/choco = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/laugh = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/matcha = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet = 1,
- )
-
-/obj/effect/spawner/lootdrop/donut/slimejelly
- name = "random slimejelly donut"
- lootcount = 1
- loot = list(
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/caramel = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/laugh = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1,
- /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet = 1,
- )
-
-/obj/effect/spawner/lootdrop/seeded
- name = "GO FORTH AND CULTIVATE"
- icon = 'icons/obj/hydroponics/seeds.dmi'
- icon_state = "seed"//sneed
- loot = list(
- /obj/item/seeds/aloe,
- /obj/item/seeds/ambrosia,
- /obj/item/seeds/apple,
- /obj/item/seeds/cotton,
- /obj/item/seeds/banana,
- /obj/item/seeds/berry,
- /obj/item/seeds/cabbage,
- /obj/item/seeds/carrot,
- /obj/item/seeds/cherry,
- /obj/item/seeds/chanter,
- /obj/item/seeds/chili,
- /obj/item/seeds/cocoapod,
- /obj/item/seeds/coffee,
- /obj/item/seeds/corn,
- /obj/item/seeds/eggplant,
- /obj/item/seeds/garlic,
- /obj/item/seeds/grape,
- /obj/item/seeds/grass,
- /obj/item/seeds/lemon,
- /obj/item/seeds/lime,
- /obj/item/seeds/onion,
- /obj/item/seeds/orange,
- /obj/item/seeds/peas,
- /obj/item/seeds/pineapple,
- /obj/item/seeds/potato,
- /obj/item/seeds/poppy,
- /obj/item/seeds/pumpkin,
- /obj/item/seeds/wheat/rice,
- /obj/item/seeds/soya,
- /obj/item/seeds/sugarcane,
- /obj/item/seeds/sunflower,
- /obj/item/seeds/tea,
- /obj/item/seeds/tobacco,
- /obj/item/seeds/tomato,
- /obj/item/seeds/tower,
- /obj/item/seeds/watermelon,
- /obj/item/seeds/wheat,
- /obj/item/seeds/whitebeet,
- /obj/item/seeds/amanita,
- /obj/item/seeds/glowshroom,
- /obj/item/seeds/liberty,
- /obj/item/seeds/nettle,
- /obj/item/seeds/plump,
- /obj/item/seeds/reishi,
- /obj/item/seeds/cannabis,
- /obj/item/seeds/starthistle,
- /obj/item/seeds/cherry/bomb,
- /obj/item/seeds/berry/glow,
- /obj/item/seeds/sunflower/moonflower
- )
-
-/obj/effect/spawner/lootdrop/flora
- name = "random flora spawner"
- loot = list(
- /obj/structure/flora/tree/chapel,
- /obj/structure/flora/tree/pine,
- /obj/structure/flora/tree/jungle/small,
- /obj/structure/flora/tree/jungle,
- /obj/structure/flora/ash/puce,
- /obj/structure/flora/ash/fireblossom,
- /obj/structure/flora/ash/fern,
- /obj/structure/flora/ash/tall_shroom,
- /obj/structure/flora/ash/stem_shroom,
- /obj/structure/flora/ash/space/voidmelon,
- /obj/structure/flora/ash/leaf_shroom,
- /obj/structure/flora/junglebush/large,
- /obj/structure/flora/junglebush/b,
- /obj/structure/flora/junglebush/c,
- /obj/structure/flora/ausbushes/fernybush,
- /obj/structure/flora/ausbushes/genericbush,
- /obj/structure/flora/ausbushes/grassybush,
- /obj/structure/flora/ausbushes/leafybush,
- /obj/structure/flora/ausbushes/palebush,
- /obj/structure/flora/ausbushes/pointybush,
- /obj/structure/flora/ausbushes/reedbush,
- /obj/structure/flora/ausbushes/stalkybush,
- /obj/structure/flora/ausbushes/sunnybush,
- /obj/structure/flora/bush,
- /obj/structure/flora/grass/jungle,
- /obj/structure/flora/junglebush,
- /obj/structure/flora/junglebush/b,
- /obj/structure/flora/junglebush/c,
- /obj/structure/flora/ash,
- /obj/structure/flora/ash/cacti,
- /obj/structure/flora/ash/cap_shroom,
- /obj/structure/flora/ash/chilly,
- /obj/structure/flora/tree/palm
- )
- lootcount = 1
-
-/obj/effect/spawner/lootdrop/flower
- name = "random flower spawner"
- loot = list(
- /obj/structure/flora/ausbushes/brflowers,
- /obj/structure/flora/ausbushes/ywflowers,
- /obj/structure/flora/ausbushes/ppflowers,
- /obj/structure/flora/ausbushes/fullgrass,
- /obj/structure/flora/ausbushes/sparsegrass
- )
- lootcount = 1
-
-/obj/effect/spawner/lootdrop/anomaly
- name = "random anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/grav/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/grav/high/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/safe
- name = "relatively safe anomaly spawner"
- loot = list(
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/dangerous
- name = "relatively dangerous anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/grav/planetary,
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/grav/high/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/big
- name = "random big anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/big/planetary,
- /obj/effect/anomaly/flux/big/planetary,
- /obj/effect/anomaly/grav/high/big/planetary,
- /obj/effect/anomaly/pyro/big/planetary
-
- )
-
-//handpicked lists relevant to the planets they're on
-// /cave lists are made for spawning in cave biomes. Not every anomaly goes well there. We don't have enough anomalies to really populate them all though
-
-/obj/effect/spawner/lootdrop/anomaly/jungle
- name = "Jungle Anomaly Spawner"
- loot = list(
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/jungle/cave
- loot = list(
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-//beaches don't currently have anomalies, but I don't see a reason why they couldn't have *some*
-
-/obj/effect/spawner/lootdrop/anomaly/beach
- name = "Beach anomaly spawner"
- loot = list(
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/beach/cave
- loot = list(
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/sand
- name = "Sand anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/sand/cave
- loot = list(
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/rock
- name = "Rock anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/grav/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/grav/high/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/tvstatic/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/rock/cave
- loot = list(
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/sparkler/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/phantom/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/lava
- name = "Lava anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/grav/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/lava/cave
- loot = list(
- /obj/effect/anomaly/flux/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/pyro/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/ice
- name = "Ice anomaly spawner"
- loot = list(
- /obj/effect/anomaly/bluespace/planetary,
- /obj/effect/anomaly/grav/planetary,
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/grav/high/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/ice/cave
- loot = list(
- /obj/effect/anomaly/hallucination/planetary,
- /obj/effect/anomaly/grav/high/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/phantom/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/waste
- name = "Waste anomaly spawner"
- loot = list(
- /obj/effect/anomaly/vortex/planetary,
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/waste/cave
- loot = list(
- /obj/effect/anomaly/heartbeat/planetary,
- /obj/effect/anomaly/veins/planetary,
- /obj/effect/anomaly/plasmasoul/planetary,
- /obj/effect/anomaly/melter/planetary,
- )
-
-/obj/effect/spawner/lootdrop/anomaly/storm
- loot = list(
- /obj/effect/anomaly/flux,
- /obj/effect/anomaly/pyro,
- /obj/effect/anomaly/sparkler,
- /obj/effect/anomaly/veins,
- /obj/effect/anomaly/phantom,
- /obj/effect/anomaly/melter,
- )
-
-//wasteplanet things
-
-/obj/effect/spawner/lootdrop/waste/grille_or_trash
- name = "wasteplanet loot spawner"
- loot = list(
- /obj/structure/grille/broken = 5,
- /obj/structure/grille = 5,
- /obj/item/cigbutt = 1,
- /obj/item/trash/cheesie = 1,
- /obj/item/trash/candy = 1,
- /obj/item/trash/chips = 1,
- /obj/item/reagent_containers/food/snacks/deadmouse = 1,
- /obj/item/trash/pistachios = 1,
- /obj/item/trash/plate = 1,
- /obj/item/trash/popcorn = 1,
- /obj/item/trash/raisins = 1,
- /obj/item/trash/sosjerky = 1,
- /obj/item/trash/syndi_cakes = 1
- )
-
-/obj/effect/spawner/lootdrop/waste/mechwreck
- name = "wasteplanet exosuit wreckage"
- loot = list(
- /obj/structure/mecha_wreckage/ripley = 15,
- /obj/structure/mecha_wreckage/ripley/firefighter = 9,
- /obj/structure/mecha_wreckage/ripley/mkii = 9,
- /obj/structure/mecha_wreckage/ripley/clip = 9
- )
-
-/obj/effect/spawner/lootdrop/waste/mechwreck/rare
- loot = list(
- /obj/structure/mecha_wreckage/durand = 12.5,
- /obj/structure/mecha_wreckage/durand/clip = 12.5,
- /obj/structure/mecha_wreckage/odysseus = 25,
- /obj/structure/mecha_wreckage/gygax = 25
- )
-
-/obj/effect/spawner/lootdrop/waste/trash //debatable if this is actually loot
- loot = list(
- /obj/effect/decal/cleanable/greenglow/filled = 30,
- /obj/effect/decal/cleanable/greenglow/ecto = 1,
- /obj/effect/decal/cleanable/glass = 30,
- /obj/effect/decal/cleanable/glass/plasma = 30,
- /obj/effect/decal/cleanable/glass/strange = 30,
- /obj/effect/decal/cleanable/molten_object = 30,
- /obj/effect/decal/cleanable/molten_object/large = 30,
- /obj/effect/decal/cleanable/oil = 30,
- /obj/effect/decal/cleanable/oil/slippery = 1, // :)
- /obj/effect/decal/cleanable/plastic = 30,
- /obj/effect/decal/cleanable/ash = 30,
- /obj/effect/decal/cleanable/ash/large = 30,
- )
-
-/obj/effect/spawner/lootdrop/waste/radiation
- loot = list(
- /obj/structure/radioactive = 6,
- /obj/structure/radioactive/stack = 6,
- /obj/structure/radioactive/waste = 6
- )
-
-/obj/effect/spawner/lootdrop/waste/radiation/more_rads
- loot = list(
- /obj/structure/radioactive = 3,
- /obj/structure/radioactive/stack = 12,
- /obj/structure/radioactive/waste = 12
- )
-
-/obj/effect/spawner/lootdrop/waste/atmos_can
- loot = list(
- /obj/machinery/portable_atmospherics/canister/toxins = 3,
- /obj/machinery/portable_atmospherics/canister/carbon_dioxide = 3,
- /obj/machinery/portable_atmospherics/canister/nitrogen = 3,
- /obj/machinery/portable_atmospherics/canister/oxygen = 3,
- /obj/machinery/portable_atmospherics/canister/nitrous_oxide = 1,
- /obj/machinery/portable_atmospherics/canister/water_vapor = 1
- )
-
-/obj/effect/spawner/lootdrop/waste/atmos_can/rare
- loot = list(
- /obj/machinery/portable_atmospherics/canister/tritium = 3,
- /obj/machinery/portable_atmospherics/canister/pluoxium = 3
- )
-
-/obj/effect/spawner/lootdrop/waste/salvageable
- loot = list(
- /obj/structure/salvageable/machine = 20,
- /obj/structure/salvageable/autolathe = 15,
- /obj/structure/salvageable/computer = 10,
- /obj/structure/salvageable/protolathe = 10,
- /obj/structure/salvageable/circuit_imprinter = 8,
- /obj/structure/salvageable/destructive_analyzer = 8,
- /obj/structure/salvageable/server = 8
- )
-
-/obj/effect/spawner/lootdrop/waste/girder
- loot = list(
- /obj/structure/girder,
- /obj/structure/girder/displaced,
- /obj/structure/girder/reinforced
- )
-/obj/effect/spawner/lootdrop/waste/hivebot
- loot = list(
- /obj/effect/spawner/lootdrop/salvage/metal,
- /obj/effect/spawner/lootdrop/salvage/metal,
- /obj/effect/spawner/lootdrop/salvage/metal,
- /obj/effect/spawner/lootdrop/salvage/gold,
- /obj/effect/spawner/lootdrop/salvage/plasma,
- /obj/effect/spawner/lootdrop/salvage/silver,
- /obj/effect/spawner/lootdrop/salvage/titanium,
- /obj/item/stack/ore/salvage/scrapbluespace,
- /obj/item/stack/ore/salvage/scrapbluespace,
- /obj/item/stack/ore/salvage/scrapuranium
- )
- lootcount = 2
-
-/obj/effect/spawner/lootdrop/waste/hivebot/beacon
- lootcount = 6
-
-/obj/effect/spawner/lootdrop/salvage
- name = "salvage mats spawner"
- loot = list(
- /obj/item/stack/ore/salvage/scrapmetal,
- /obj/item/stack/ore/salvage/scrapgold,
- /obj/item/stack/ore/salvage/scrapplasma,
- /obj/item/stack/ore/salvage/scrapsilver,
- /obj/item/stack/ore/salvage/scraptitanium,
- /obj/item/stack/ore/salvage/scrapbluespace,
- /obj/item/stack/ore/salvage/scrapuranium
- )
-
-/obj/effect/spawner/lootdrop/salvage/metal
- loot = list(
- /obj/item/stack/ore/salvage/scrapmetal
- )
-
-/obj/effect/spawner/lootdrop/salvage/metal/Initialize()
- lootcount = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-/obj/effect/spawner/lootdrop/salvage/gold
- loot = list(
- /obj/item/stack/ore/salvage/scrapgold
- )
-
-/obj/effect/spawner/lootdrop/salvage/gold/Initialize()
- lootcount = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-/obj/effect/spawner/lootdrop/salvage/plasma
- loot = list(
- /obj/item/stack/ore/salvage/scrapplasma
- )
-/obj/effect/spawner/lootdrop/salvage/plasma/Initialize()
- lootcount = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-
-/obj/effect/spawner/lootdrop/salvage/silver
- loot = list(
- /obj/item/stack/ore/salvage/scrapsilver
- )
-/obj/effect/spawner/lootdrop/salvage/silver/Initialize()
- lootcount = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-
-/obj/effect/spawner/lootdrop/salvage/titanium
- loot = list(
- /obj/item/stack/ore/salvage/scraptitanium
- )
-/obj/effect/spawner/lootdrop/salvage/titanium/Initialize()
- lootcount = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-/obj/effect/spawner/lootdrop/salvage/bluespace
- loot = list(
- /obj/item/stack/ore/salvage/scrapbluespace
- )
-/obj/effect/spawner/lootdrop/salvage/bluespace/Initialize()
- lootcount = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-/obj/effect/spawner/lootdrop/salvage/uranium
- loot = list(
- /obj/item/stack/ore/salvage/scrapuranium
- )
-/obj/effect/spawner/lootdrop/salvage/uranium/Initialize()
- lootcount = pick(list(
- 1,
- 2,
- 3,
- 4
- ))
- return ..()
-
-
-//random RND imprinter/protolathe board spawners. Do not use on maps without a good reason
-/obj/effect/spawner/lootdrop/randomprotolathe
- name = "random departmental protolathe"
- loot = list(
- /obj/item/circuitboard/machine/protolathe/department/cargo,
- /obj/item/circuitboard/machine/protolathe/department/engineering,
- /obj/item/circuitboard/machine/protolathe/department/service,
- /obj/item/circuitboard/machine/protolathe/department/medical,
- /obj/item/circuitboard/machine/protolathe/department/science,
- /obj/item/circuitboard/machine/protolathe/department/security
- )
-
-/obj/effect/spawner/lootdrop/randomimprinter
- name = "random departmental circuit imprinter"
- loot = list(
- /obj/item/circuitboard/machine/circuit_imprinter/department/cargo,
- /obj/item/circuitboard/machine/circuit_imprinter/department/engi,
- /obj/item/circuitboard/machine/circuit_imprinter/department/civ,
- /obj/item/circuitboard/machine/circuit_imprinter/department/med,
- /obj/item/circuitboard/machine/circuit_imprinter/department/science,
- /obj/item/circuitboard/machine/circuit_imprinter/department/sec
- )
-
-/obj/effect/spawner/lootdrop/randomtechfab
- name = "random departmental techfab"
- loot = list(
- /obj/item/circuitboard/machine/techfab/department/service,
- /obj/item/circuitboard/machine/techfab/department/cargo,
- /obj/item/circuitboard/machine/techfab/department/engineering,
- /obj/item/circuitboard/machine/techfab/department/service,
- /obj/item/circuitboard/machine/techfab/department/medical,
- /obj/item/circuitboard/machine/techfab/department/science,
- /obj/item/circuitboard/machine/techfab/department/security
- )
-
-/obj/effect/spawner/lootdrop/ration
- loot = list (
- /obj/item/storage/ration/vegan_chili = 5,
- /obj/item/storage/ration/shredded_beef = 5,
- /obj/item/storage/ration/pork_spaghetti = 5,
- /obj/item/storage/ration/fried_fish = 5,
- /obj/item/storage/ration/beef_strips = 5,
- /obj/item/storage/ration/chili_macaroni = 5,
- /obj/item/storage/ration/chicken_wings_hot_sauce = 5,
- /obj/item/storage/ration/fish_stew = 5,
- /obj/item/storage/ration/lemon_pepper_chicken = 5,
- /obj/item/storage/ration/sausage_peppers_onions = 5,
- /obj/item/storage/ration/pork_dumplings_chili_sauce = 5,
- /obj/item/storage/ration/battered_fish_sticks = 5,
- /obj/item/storage/ration/assorted_salted_offal = 5,
- /obj/item/storage/ration/maple_pork_sausage_patty = 5,
- /obj/item/storage/ration/pepper_jack_beef_patty = 5,
- /obj/item/storage/ration/beef_goulash = 5,
- /obj/item/storage/ration/pepperoni_pizza_slice = 5,
- /obj/item/storage/ration/blackened_calamari = 5,
- /obj/item/storage/ration/elbow_macaroni = 5,
- /obj/item/storage/ration/cheese_pizza_slice = 5,
- /obj/item/storage/ration/crayons = 2 // :)
- )
diff --git a/code/game/objects/effects/spawners/mobspawner.dm b/code/game/objects/effects/spawners/mobspawner.dm
index 187b7c155fe02..2161ebd06bb54 100644
--- a/code/game/objects/effects/spawners/mobspawner.dm
+++ b/code/game/objects/effects/spawners/mobspawner.dm
@@ -1,11 +1,11 @@
-/obj/effect/spawner/lootdrop/randomthreat
+/obj/effect/spawner/random/randomthreat
var/static/mob_category = rand(1, 3)
-/obj/effect/spawner/lootdrop/randomthreat/Initialize(mapload)
+/obj/effect/spawner/random/randomthreat/Initialize(mapload)
switch(mob_category)
if(1)
loot = list(
- /obj/effect/spawner/lootdrop/hivebotspawner
+ /obj/effect/spawner/random/hivebotspawner
)
if(2)
loot = list(
@@ -13,28 +13,28 @@
)
if(3)
loot = list(
- /obj/effect/spawner/lootdrop/spiderspawner
+ /obj/effect/spawner/random/spiderspawner
)
return ..()
-/obj/effect/spawner/lootdrop/xenospawner
+/obj/effect/spawner/random/xenospawner
name = "Xenomorph spawner"
loot = list(
/mob/living/simple_animal/hostile/alien = 0.3,
/mob/living/simple_animal/hostile/alien/drone = 0.2,
/mob/living/simple_animal/hostile/alien/sentinel = 0.3,
- /obj/effect/spawner/lootdrop/xenoqueenspawner = 0.1
+ /obj/effect/spawner/random/xenoqueenspawner = 0.1
)
-/obj/effect/spawner/lootdrop/xenoqueenspawner
+/obj/effect/spawner/random/xenoqueenspawner
name = "xenomorph queen spawner"
loot = list(
/mob/living/simple_animal/hostile/alien/queen = 0.2, //regular queen mob isn't actually that strong
/mob/living/simple_animal/hostile/alien/queen/large = 0.8
)
-/obj/effect/spawner/lootdrop/hivebotspawner
+/obj/effect/spawner/random/hivebotspawner
name = "Hivebot spawner"
loot = list(
@@ -42,7 +42,7 @@
/mob/living/simple_animal/hostile/hivebot,
)
-/obj/effect/spawner/lootdrop/spiderspawner
+/obj/effect/spawner/random/spiderspawner
name = "Spider spawner"
loot = list(
@@ -51,29 +51,29 @@
/mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper,
)
-/obj/effect/spawner/lootdrop/thirtyfive_percent_borerspawner
+/obj/effect/spawner/random/thirtyfive_percent_borerspawner
name = "35 percent neutered borer spawner"
loot = list(
/mob/living/simple_animal/borer/sterile = 0.35,
- /obj/effect/spawner/lootdrop/maintenance = 0.65,
+ /obj/effect/spawner/random/maintenance = 0.65,
)
-/obj/effect/spawner/lootdrop/chicken
+/obj/effect/spawner/random/chicken
name = "chicken spawner"
loot = list(
/mob/living/simple_animal/chicken
)
-/obj/effect/spawner/lootdrop/chicken/jungle
+/obj/effect/spawner/random/chicken/jungle
name = "jungle chicken spawner"
loot = list(
/mob/living/simple_animal/hostile/retaliate/chicken
)
-/obj/effect/spawner/lootdrop/chicken/jungle/flock
+/obj/effect/spawner/random/chicken/jungle/flock
loot = list(
/mob/living/simple_animal/hostile/retaliate/chicken
)
- lootcount = 7
- lootdoubles = TRUE
+ spawn_loot_count = 7
+ spawn_loot_double = TRUE
diff --git a/code/game/objects/effects/spawners/random/ai_module.dm b/code/game/objects/effects/spawners/random/ai_module.dm
new file mode 100644
index 0000000000000..7f5eed59e4a07
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/ai_module.dm
@@ -0,0 +1,41 @@
+/obj/effect/spawner/random/aimodule
+ name = "AI module spawner"
+ desc = "State laws human."
+ icon_state = "circuit"
+ spawn_loot_double = FALSE
+ spawn_loot_count = 3
+ spawn_loot_split = TRUE
+
+/obj/effect/spawner/random/aimodule_harmless // These shouldn't allow the AI to start butchering people
+ name = "harmless AI module spawner"
+ loot = list(
+ /obj/item/aiModule/core/full/asimov,
+ /obj/item/aiModule/core/full/asimovpp,
+ /obj/item/aiModule/core/full/hippocratic,
+ /obj/item/aiModule/core/full/paladin_devotion,
+ /obj/item/aiModule/core/full/paladin
+ )
+
+/obj/effect/spawner/random/aimodule_neutral // These shouldn't allow the AI to start butchering people without reason
+ name = "neutral AI module spawner"
+ loot = list(
+ /obj/item/aiModule/core/full/corp,
+ /obj/item/aiModule/core/full/maintain,
+ /obj/item/aiModule/core/full/drone,
+ /obj/item/aiModule/core/full/peacekeeper,
+ /obj/item/aiModule/core/full/reporter,
+ /obj/item/aiModule/core/full/robocop,
+ /obj/item/aiModule/core/full/liveandletlive,
+ /obj/item/aiModule/core/full/hulkamania
+ )
+
+/obj/effect/spawner/random/aimodule_harmful // These will get the shuttle called
+ name = "harmful AI module spawner"
+ loot = list(
+ /obj/item/aiModule/core/full/antimov,
+ /obj/item/aiModule/core/full/balance,
+ /obj/item/aiModule/core/full/tyrant,
+ /obj/item/aiModule/core/full/thermurderdynamic,
+ /obj/item/aiModule/core/full/damaged,
+ /obj/item/aiModule/reset/purge
+ )
diff --git a/code/game/objects/effects/spawners/random/anomaly.dm b/code/game/objects/effects/spawners/random/anomaly.dm
new file mode 100644
index 0000000000000..aa8fa472de2ca
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/anomaly.dm
@@ -0,0 +1,222 @@
+/obj/effect/spawner/random/anomaly
+ name = "random anomaly spawner"
+ icon_state = "anomaly"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/grav/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/grav/high/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ /obj/effect/anomaly/transfusion/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/safe
+ name = "relatively safe anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/transfusion/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/dangerous
+ name = "relatively dangerous anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/grav/planetary,
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/grav/high/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/big
+ name = "random big anomaly spawner"
+ icon_state = "big_anomaly"
+ loot = list(
+ /obj/effect/anomaly/bluespace/big/planetary,
+ /obj/effect/anomaly/flux/big/planetary,
+ /obj/effect/anomaly/grav/high/big/planetary,
+ /obj/effect/anomaly/pyro/big/planetary
+
+ )
+
+//handpicked lists relevant to the planets they're on
+// /cave lists are made for spawning in cave biomes. Not every anomaly goes well there. We don't have enough anomalies to really populate them all though
+
+/obj/effect/spawner/random/anomaly/jungle
+ name = "Jungle Anomaly Spawner"
+ loot = list(
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/jungle/cave
+ loot = list(
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+//beaches don't currently have anomalies, but I don't see a reason why they couldn't have *some*
+
+/obj/effect/spawner/random/anomaly/beach
+ name = "Beach anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/beach/cave
+ loot = list(
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/sand
+ name = "Sand anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/sand/cave
+ loot = list(
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/rock
+ name = "Rock anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/grav/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/grav/high/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/tvstatic/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/rock/cave
+ loot = list(
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/sparkler/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/lava
+ name = "Lava anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/grav/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/lava/cave
+ loot = list(
+ /obj/effect/anomaly/flux/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/pyro/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/ice
+ name = "Ice anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/bluespace/planetary,
+ /obj/effect/anomaly/grav/planetary,
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/grav/high/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/ice/cave
+ loot = list(
+ /obj/effect/anomaly/hallucination/planetary,
+ /obj/effect/anomaly/grav/high/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/phantom/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/waste
+ name = "Waste anomaly spawner"
+ loot = list(
+ /obj/effect/anomaly/vortex/planetary,
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/waste/cave
+ loot = list(
+ /obj/effect/anomaly/heartbeat/planetary,
+ /obj/effect/anomaly/veins/planetary,
+ /obj/effect/anomaly/plasmasoul/planetary,
+ /obj/effect/anomaly/melter/planetary,
+ )
+
+/obj/effect/spawner/random/anomaly/storm
+ loot = list(
+ /obj/effect/anomaly/flux/storm,
+ /obj/effect/anomaly/pyro/storm,
+ /obj/effect/anomaly/sparkler,
+ /obj/effect/anomaly/veins,
+ /obj/effect/anomaly/phantom,
+ /obj/effect/anomaly/melter,
+ )
diff --git a/code/game/objects/effects/spawners/random/bedsheet.dm b/code/game/objects/effects/spawners/random/bedsheet.dm
new file mode 100644
index 0000000000000..f8a53fffd2c98
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/bedsheet.dm
@@ -0,0 +1,33 @@
+/obj/effect/spawner/random/bedsheet
+ name = "random dorm bedsheet"
+ icon_state = "random_bedsheet"
+ loot = list(
+ /obj/item/bedsheet,
+ /obj/item/bedsheet/blue,
+ /obj/item/bedsheet/green,
+ /obj/item/bedsheet/grey,
+ /obj/item/bedsheet/orange,
+ /obj/item/bedsheet/purple,
+ /obj/item/bedsheet/red,
+ /obj/item/bedsheet/yellow,
+ /obj/item/bedsheet/brown,
+ /obj/item/bedsheet/black,
+ /obj/item/bedsheet/rainbow
+ )
+
+/obj/effect/spawner/random/bedsheet/double
+ name = "random dorm double bedsheet"
+ icon_state = "random_doublesheet"
+ loot = list(
+ /obj/item/bedsheet/double,
+ /obj/item/bedsheet/double/blue,
+ /obj/item/bedsheet/double/green,
+ /obj/item/bedsheet/double/grey,
+ /obj/item/bedsheet/double/orange,
+ /obj/item/bedsheet/double/purple,
+ /obj/item/bedsheet/double/red,
+ /obj/item/bedsheet/double/yellow,
+ /obj/item/bedsheet/double/brown,
+ /obj/item/bedsheet/double/black,
+ /obj/item/bedsheet/double/rainbow
+ )
diff --git a/code/game/objects/effects/spawners/random/boards.dm b/code/game/objects/effects/spawners/random/boards.dm
new file mode 100644
index 0000000000000..0104d17326d72
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/boards.dm
@@ -0,0 +1,245 @@
+// Tech storage circuit board spawners
+
+/obj/effect/spawner/random/techstorage
+ name = "generic circuit board spawner"
+ icon_state = "circuit"
+ spawn_loot_split = TRUE
+ spawn_all_loot = TRUE
+
+/obj/effect/spawner/random/techstorage/service
+ name = "service circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/arcade/battle,
+ /obj/item/circuitboard/computer/arcade/orion_trail,
+ /obj/item/circuitboard/machine/autolathe,
+ /obj/item/circuitboard/computer/mining,
+ /obj/item/circuitboard/machine/ore_redemption,
+ /obj/item/circuitboard/machine/vending/mining_equipment,
+ /obj/item/circuitboard/machine/microwave,
+ /obj/item/circuitboard/machine/chem_dispenser/drinks,
+ /obj/item/circuitboard/machine/chem_dispenser/drinks/beer,
+ /obj/item/circuitboard/computer/slot_machine
+ )
+
+/obj/effect/spawner/random/techstorage/rnd
+ name = "RnD circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/aifixer,
+ /obj/item/circuitboard/machine/rdserver,
+ /obj/item/circuitboard/machine/mechfab,
+ /obj/item/circuitboard/machine/circuit_imprinter/department,
+ /obj/item/circuitboard/computer/teleporter,
+ /obj/item/circuitboard/machine/destructive_analyzer,
+ /obj/item/circuitboard/computer/rdconsole,
+ /obj/item/circuitboard/computer/nanite_chamber_control,
+ /obj/item/circuitboard/computer/nanite_cloud_controller,
+ /obj/item/circuitboard/machine/nanite_chamber,
+ /obj/item/circuitboard/machine/nanite_programmer,
+ /obj/item/circuitboard/machine/nanite_program_hub
+ )
+
+/obj/effect/spawner/random/techstorage/security
+ name = "security circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/secure_data,
+ /obj/item/circuitboard/computer/security,
+ /obj/item/circuitboard/computer/prisoner
+ )
+
+/obj/effect/spawner/random/techstorage/engineering
+ name = "engineering circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/atmos_alert,
+ /obj/item/circuitboard/computer/stationalert,
+ /obj/item/circuitboard/computer/powermonitor
+ )
+
+/obj/effect/spawner/random/techstorage/tcomms
+ name = "tcomms circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/message_monitor,
+ /obj/item/circuitboard/machine/telecomms/broadcaster,
+ /obj/item/circuitboard/machine/telecomms/bus,
+ /obj/item/circuitboard/machine/telecomms/server,
+ /obj/item/circuitboard/machine/telecomms/receiver,
+ /obj/item/circuitboard/machine/telecomms/processor,
+ /obj/item/circuitboard/machine/announcement_system,
+ /obj/item/circuitboard/computer/comm_server,
+ /obj/item/circuitboard/computer/comm_monitor
+ )
+
+/obj/effect/spawner/random/techstorage/medical
+ name = "medical circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/machine/chem_dispenser,
+ /obj/item/circuitboard/computer/scan_consolenew,
+ /obj/item/circuitboard/computer/med_data,
+ /obj/item/circuitboard/machine/smoke_machine,
+ /obj/item/circuitboard/machine/chem_master,
+ /obj/item/circuitboard/machine/dnascanner,
+ /obj/item/circuitboard/computer/pandemic
+ )
+
+/obj/effect/spawner/random/techstorage/ai_all
+ name = "secure AI circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/aiupload,
+ /obj/item/circuitboard/computer/borgupload,
+ /obj/item/circuitboard/aicore
+ )
+
+/obj/effect/spawner/random/techstorage/command
+ name = "secure command circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/crew,
+ /obj/item/circuitboard/computer/communications,
+ /obj/item/circuitboard/computer/card
+ )
+
+/obj/effect/spawner/random/techstorage/rnd_secure
+ name = "secure RnD circuit board spawner"
+ loot = list(
+ /obj/item/circuitboard/computer/mecha_control,
+ /obj/item/circuitboard/computer/apc_control,
+ /obj/item/circuitboard/computer/robotics
+ )
+
+//random RND imprinter/protolathe board spawners. Do not use on maps without a good reason
+/obj/effect/spawner/random/circuit/protolathe
+ name = "random departmental protolathe"
+ icon_state = "circuit"
+ loot = list(
+ /obj/item/circuitboard/machine/protolathe/department/cargo,
+ /obj/item/circuitboard/machine/protolathe/department/engineering,
+ /obj/item/circuitboard/machine/protolathe/department/service,
+ /obj/item/circuitboard/machine/protolathe/department/medical,
+ /obj/item/circuitboard/machine/protolathe/department/science,
+ /obj/item/circuitboard/machine/protolathe/department/security
+ )
+
+/obj/effect/spawner/random/circuit/imprinter
+ name = "random departmental circuit imprinter"
+ icon_state = "circuit"
+ loot = list(
+ /obj/item/circuitboard/machine/circuit_imprinter/department/cargo,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/engi,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/civ,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/med,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/science,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/sec
+ )
+
+/obj/effect/spawner/random/circuit/techfab
+ name = "random departmental techfab"
+ icon_state = "circuit"
+ loot = list(
+ /obj/item/circuitboard/machine/techfab/department/service,
+ /obj/item/circuitboard/machine/techfab/department/cargo,
+ /obj/item/circuitboard/machine/techfab/department/engineering,
+ /obj/item/circuitboard/machine/techfab/department/service,
+ /obj/item/circuitboard/machine/techfab/department/medical,
+ /obj/item/circuitboard/machine/techfab/department/science,
+ /obj/item/circuitboard/machine/techfab/department/security
+ )
+
+/obj/effect/spawner/random/rnd
+ name = "random RND spawner"
+ icon_state = "circuit"
+ loot = list(
+ /obj/item/storage/box/rndmining,
+ /obj/item/storage/box/rndengi,
+ /obj/item/storage/box/rndsec,
+ /obj/item/storage/box/rndciv,
+ /obj/item/storage/box/rndmed
+ )
+
+/obj/effect/spawner/random/circuit/machine/common
+ loot = list(
+ /obj/item/circuitboard/machine/autolathe = 5,
+ /obj/item/circuitboard/machine/biogenerator = 5,
+ /obj/item/circuitboard/machine/cell_charger = 5,
+ /obj/item/circuitboard/machine/chem_heater = 5,
+ /obj/item/circuitboard/machine/chem_master = 5,
+ /obj/item/circuitboard/machine/clonescanner = 5,
+ /obj/item/circuitboard/machine/cryo_tube = 5,
+ /obj/item/circuitboard/machine/cyborgrecharger = 5,
+ /obj/item/circuitboard/machine/deep_fryer = 5,
+ /obj/item/circuitboard/machine/experimentor = 5,
+ /obj/item/circuitboard/machine/holopad = 5,
+ /obj/item/circuitboard/machine/hydroponics = 5,
+ /obj/item/circuitboard/machine/limbgrower = 5,
+ /obj/item/circuitboard/machine/ltsrbt = 5,
+ /obj/item/circuitboard/machine/mech_recharger = 5,
+ /obj/item/circuitboard/machine/mechfab = 5,
+ /obj/item/circuitboard/machine/medical_kiosk = 5,
+ /obj/item/circuitboard/machine/medipen_refiller = 5,
+ /obj/item/circuitboard/machine/microwave = 5,
+ /obj/item/circuitboard/machine/ore_redemption = 5,
+ /obj/item/circuitboard/machine/ore_silo = 5,
+ /obj/item/circuitboard/machine/reagentgrinder = 5,
+ /obj/item/circuitboard/machine/recharger = 5,
+ /obj/item/circuitboard/machine/seed_extractor = 5,
+ /obj/item/circuitboard/machine/selling_pad = 5,
+ /obj/item/circuitboard/machine/emitter = 5,
+ )
+
+/obj/effect/spawner/random/circuit
+ icon_state = "circuit"
+
+/obj/effect/spawner/random/circuit/machine/rare
+ loot = list(
+ /obj/item/circuitboard/aicore = 5,
+ /obj/item/circuitboard/machine/chem_dispenser = 5,
+ /obj/item/circuitboard/machine/circuit_imprinter = 5,
+ /obj/item/circuitboard/machine/protolathe = 5,
+ /obj/item/circuitboard/machine/clonepod/experimental = 5,
+ /obj/item/circuitboard/machine/rad_collector = 5,
+ /obj/item/circuitboard/machine/launchpad = 5,
+ )
+
+/obj/effect/spawner/random/circuit/machine/mech
+ loot = list(
+ /obj/item/circuitboard/mecha/ripley/main = 100,
+ /obj/item/circuitboard/mecha/ripley/peripherals = 100,
+ /obj/item/circuitboard/mecha/honker/main = 5,
+ /obj/item/circuitboard/mecha/honker/peripherals = 5,
+ /obj/item/circuitboard/mecha/odysseus/main = 5,
+ /obj/item/circuitboard/mecha/odysseus/peripherals = 5,
+ /obj/item/circuitboard/mecha/gygax/main = 1,
+ /obj/item/circuitboard/mecha/gygax/peripherals = 1,
+ /obj/item/circuitboard/mecha/gygax/targeting = 1,
+ /obj/item/circuitboard/mecha/durand/main = 1,
+ /obj/item/circuitboard/mecha/durand/peripherals = 1,
+ /obj/item/circuitboard/mecha/durand/targeting = 1,
+ )
+
+//COMPUTER
+/obj/effect/spawner/random/circuit/computer/common
+ loot = list(
+ /obj/item/circuitboard/computer/aifixer = 5,
+ /obj/item/circuitboard/computer/arcade/amputation = 5,
+ /obj/item/circuitboard/computer/arcade/battle = 5,
+ /obj/item/circuitboard/computer/arcade/orion_trail = 5,
+ /obj/item/circuitboard/computer/atmos_alert = 5,
+ /obj/item/circuitboard/computer/card = 5,
+ /obj/item/circuitboard/computer/cloning = 5,
+ /obj/item/circuitboard/computer/communications = 5,
+ /obj/item/circuitboard/computer/launchpad_console = 5,
+ /obj/item/circuitboard/computer/mech_bay_power_console = 5,
+ /obj/item/circuitboard/computer/pandemic = 5,
+ /obj/item/circuitboard/computer/powermonitor/secret = 5,
+ /obj/item/circuitboard/computer/prototype_cloning = 5,
+ /obj/item/circuitboard/computer/stationalert = 5,
+ /obj/item/circuitboard/computer/teleporter = 5,
+ /obj/item/circuitboard/computer/operating = 5,
+ /obj/item/circuitboard/computer/crew = 5,
+ /obj/item/circuitboard/computer/scan_consolenew = 5,
+ )
+
+/obj/effect/spawner/random/circuit/computer/rare
+ loot = list(
+ /obj/item/circuitboard/computer/cargo = 5,
+ /obj/item/circuitboard/computer/communications = 5,
+ /obj/item/circuitboard/computer/shuttle/helm = 5,
+ /obj/item/circuitboard/computer/med_data = 5,
+ )
diff --git a/code/game/objects/effects/spawners/random/bureaucracy.dm b/code/game/objects/effects/spawners/random/bureaucracy.dm
new file mode 100644
index 0000000000000..b55c9dc7b3640
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/bureaucracy.dm
@@ -0,0 +1,68 @@
+/obj/effect/spawner/random/bureaucracy
+ name = "bureaucracy loot spawner"
+ desc = "For the exotic art of paper shuffling."
+
+/obj/effect/spawner/random/bureaucracy/pen
+ name = "pen spawner"
+ icon_state = "pen"
+ loot = list(
+ /obj/item/pen = 30,
+ /obj/item/pen/blue = 5,
+ /obj/item/pen/red = 5,
+ /obj/item/flashlight/pen = 5,
+ /obj/item/pen/fourcolor = 2,
+ /obj/item/pen/fountain = 1,
+ )
+
+/obj/effect/spawner/random/bureaucracy/stamp
+ name = "stamp spawner"
+ icon_state = "stamp"
+ loot = list(
+ /obj/item/stamp = 3,
+ /obj/item/stamp/denied = 1,
+ )
+
+/obj/effect/spawner/random/bureaucracy/crayon
+ name = "crayon spawner"
+ icon_state = "crayon"
+ loot = list(
+ /obj/item/toy/crayon/red,
+ /obj/item/toy/crayon/orange,
+ /obj/item/toy/crayon/yellow,
+ /obj/item/toy/crayon/green,
+ /obj/item/toy/crayon/blue,
+ /obj/item/toy/crayon/purple,
+ /obj/item/toy/crayon/black,
+ /obj/item/toy/crayon/white,
+ )
+
+/obj/effect/spawner/random/bureaucracy/paper
+ name = "paper spawner"
+ icon_state = "paper"
+ loot = list(
+ /obj/item/paper = 20,
+ /obj/item/paper/crumpled = 2,
+ /obj/item/paper/crumpled/bloody = 2,
+ /obj/item/paper/crumpled/muddy = 2,
+ /obj/item/paper/construction = 1,
+ /obj/item/paper/carbon = 1,
+ )
+
+/obj/effect/spawner/random/bureaucracy/briefcase
+ name = "briefcase spawner"
+ icon_state = "briefcase"
+ loot = list(
+ /obj/item/storage/briefcase = 3,
+ /obj/item/storage/briefcase/lawyer = 1,
+ )
+
+/obj/effect/spawner/random/bureaucracy/folder
+ name = "folder spawner"
+ icon_state = "folder"
+ loot = list(
+ /obj/item/folder/blue,
+ /obj/item/folder/red,
+ /obj/item/folder/yellow,
+ /obj/item/folder/white,
+ /obj/item/folder,
+ )
diff --git a/code/game/objects/effects/spawners/random/clothing.dm b/code/game/objects/effects/spawners/random/clothing.dm
new file mode 100644
index 0000000000000..e5137f9e50784
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/clothing.dm
@@ -0,0 +1,67 @@
+/obj/effect/spawner/random/clothing
+ name = "clothing loot spawner"
+ desc = "Time to look pretty."
+ icon_state = "suit"
+
+/obj/effect/spawner/random/clothing/gloves
+ name = "random gloves"
+ desc = "These gloves are supposed to be a random color..."
+ icon_state = "gloves"
+ loot = list(
+ /obj/item/clothing/gloves/color/orange,
+ /obj/item/clothing/gloves/color/red,
+ /obj/item/clothing/gloves/color/blue,
+ /obj/item/clothing/gloves/color/purple,
+ /obj/item/clothing/gloves/color/green,
+ /obj/item/clothing/gloves/color/grey,
+ /obj/item/clothing/gloves/color/light_brown,
+ /obj/item/clothing/gloves/color/brown,
+ /obj/item/clothing/gloves/color/white,
+ /obj/item/clothing/gloves/color/rainbow
+ )
+
+/obj/effect/spawner/random/clothing/costume
+ name = "random costume spawner"
+ icon_state = "costume"
+ loot_subtype_path = /obj/effect/spawner/costume
+ loot = list()
+
+/obj/effect/spawner/random/clothing/beret_or_rabbitears
+ name = "beret or rabbit ears spawner"
+ loot = list(
+ /obj/item/clothing/head/beret
+ )
+
+/obj/effect/spawner/random/clothing/bowler_or_that
+ name = "bowler or top hat spawner"
+ loot = list(
+ /obj/item/clothing/head/that
+ )
+
+/obj/effect/spawner/random/clothing/kittyears_or_rabbitears
+ name = "kitty ears or rabbit ears spawner"
+ loot = list(
+ /obj/item/clothing/head/kitty
+ )
+
+/obj/effect/spawner/random/clothing/pirate_or_bandana
+ name = "pirate hat or bandana spawner"
+ loot = list(
+ /obj/item/clothing/head/pirate,
+ /obj/item/clothing/head/bandana
+ )
+
+/obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask
+ name = "25% cyborg mask spawner"
+ spawn_loot_chance = 25
+ loot = list(/obj/item/clothing/mask/gas/cyborg)
+
+/obj/effect/spawner/random/clothing/mafia_outfit
+ name = "mafia outfit spawner"
+ icon_state = "costume"
+ loot = list(
+ /obj/effect/spawner/costume/mafia = 20,
+ /obj/effect/spawner/costume/mafia/white = 5,
+ /obj/effect/spawner/costume/mafia/checkered = 2,
+ /obj/effect/spawner/costume/mafia/beige = 5
+ )
diff --git a/code/game/objects/effects/spawners/random/decoration.dm b/code/game/objects/effects/spawners/random/decoration.dm
new file mode 100644
index 0000000000000..7af7af7fe85b4
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/decoration.dm
@@ -0,0 +1,118 @@
+/obj/effect/spawner/random/decoration
+ name = "decoration loot spawner"
+ desc = "Time for some bling bling."
+ icon_state = "lamp"
+
+/obj/effect/spawner/random/decoration/material
+ name = "decoration material spawner"
+ icon_state = "tile"
+ loot = list(
+ /obj/item/stack/sheet/sandblock{amount = 30} = 25,
+ /obj/item/stack/sheet/mineral/wood{amount = 30} = 25,
+ /obj/item/stack/tile/noslip{amount = 20} = 10,
+ /obj/item/stack/sheet/plastic{amount = 30} = 10,
+ /obj/item/stack/tile/pod{amount = 20} = 4,
+ /obj/item/stack/tile/pod/light{amount = 20} = 3,
+ /obj/item/stack/tile/pod/dark{amount = 20} = 3,
+ )
+
+/obj/effect/spawner/random/decoration/carpet
+ name = "carpet spawner"
+ icon_state = "carpet"
+ loot = list(
+ /obj/item/stack/tile/carpet{amount = 30} = 35,
+ /obj/item/stack/tile/carpet/black{amount = 30} = 20,
+ )
+
+/obj/effect/spawner/random/decoration/ornament
+ name = "ornament spawner"
+ icon_state = "lamp"
+ loot = list(
+ /obj/item/flashlight/lamp = 35,
+ /obj/item/flashlight/lamp/green = 35,
+ /obj/item/flashlight/lantern = 10,
+ /obj/item/flashlight/lamp/bananalamp = 5,
+ )
+/obj/effect/spawner/random/decoration/glowstick
+ name = "random colored glowstick"
+ icon_state = "glowstick"
+ loot_type_path = /obj/item/flashlight/glowstick
+ loot = list()
+
+/obj/effect/spawner/random/decoration/glowstick/on
+ name = "random colored glowstick (on)"
+ icon_state = "glowstick"
+
+/obj/effect/spawner/random/decoration/glowstick/on/make_item(spawn_loc, type_path_to_make)
+ . = ..()
+
+ var/obj/item/flashlight/glowstick = .
+
+ glowstick.set_light_on(TRUE)
+
+/obj/effect/spawner/random/decoration/paint
+ name = "paint spawner"
+ icon_state = "paint"
+ loot_subtype_path = /obj/item/paint
+ loot = list()
+
+/obj/effect/spawner/random/decoration/flower
+ name = "random grown flower spawner"
+ icon_state = "flower"
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/grown/poppy,
+ /obj/item/reagent_containers/food/snacks/grown/harebell,
+ /obj/item/reagent_containers/food/snacks/grown/trumpet,
+ )
+
+/obj/effect/spawner/random/flora
+ name = "random flora spawner"
+ loot = list(
+ /obj/structure/flora/tree/chapel,
+ /obj/structure/flora/tree/pine,
+ /obj/structure/flora/tree/jungle/small,
+ /obj/structure/flora/tree/jungle,
+ /obj/structure/flora/ash/puce,
+ /obj/structure/flora/ash/fireblossom,
+ /obj/structure/flora/ash/fern,
+ /obj/structure/flora/ash/tall_shroom,
+ /obj/structure/flora/ash/stem_shroom,
+ /obj/structure/flora/ash/space/voidmelon,
+ /obj/structure/flora/ash/leaf_shroom,
+ /obj/structure/flora/junglebush/large,
+ /obj/structure/flora/junglebush/b,
+ /obj/structure/flora/junglebush/c,
+ /obj/structure/flora/ausbushes/fernybush,
+ /obj/structure/flora/ausbushes/genericbush,
+ /obj/structure/flora/ausbushes/grassybush,
+ /obj/structure/flora/ausbushes/leafybush,
+ /obj/structure/flora/ausbushes/palebush,
+ /obj/structure/flora/ausbushes/pointybush,
+ /obj/structure/flora/ausbushes/reedbush,
+ /obj/structure/flora/ausbushes/stalkybush,
+ /obj/structure/flora/ausbushes/sunnybush,
+ /obj/structure/flora/bush,
+ /obj/structure/flora/grass/jungle,
+ /obj/structure/flora/junglebush,
+ /obj/structure/flora/junglebush/b,
+ /obj/structure/flora/junglebush/c,
+ /obj/structure/flora/ash,
+ /obj/structure/flora/ash/cacti,
+ /obj/structure/flora/ash/cap_shroom,
+ /obj/structure/flora/ash/chilly,
+ /obj/structure/flora/tree/palm
+ )
+ spawn_loot_count = 1
+
+/obj/effect/spawner/random/flower
+ name = "random flower spawner"
+ icon_state = "flower"
+ loot = list(
+ /obj/structure/flora/ausbushes/brflowers,
+ /obj/structure/flora/ausbushes/ywflowers,
+ /obj/structure/flora/ausbushes/ppflowers,
+ /obj/structure/flora/ausbushes/fullgrass,
+ /obj/structure/flora/ausbushes/sparsegrass
+ )
+ spawn_loot_count = 1
+
diff --git a/code/game/objects/effects/spawners/random/engineering.dm b/code/game/objects/effects/spawners/random/engineering.dm
new file mode 100644
index 0000000000000..b5c9636380f61
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/engineering.dm
@@ -0,0 +1,138 @@
+/obj/effect/spawner/random/engineering
+ name = "engineering loot spawner"
+ desc = "All engineering related spawners go here"
+ icon_state = "toolbox"
+
+/obj/effect/spawner/random/engineering/tool
+ loot = list(
+ /obj/effect/spawner/random/engineering/tool/common = 120,
+ /obj/effect/spawner/random/engineering/tool/sydnie = 20,
+ /obj/effect/spawner/random/engineering/tool/adv = 5,
+ )
+
+/obj/effect/spawner/random/engineering/tool/common
+ loot = list(
+ /obj/item/wrench/crescent = 1,
+ /obj/item/screwdriver = 1,
+ /obj/item/weldingtool = 1,
+ /obj/item/crowbar = 1,
+ /obj/item/wirecutters = 1,
+ /obj/item/multitool = 1,
+ )
+
+/obj/effect/spawner/random/engineering/tool/sydnie
+ loot = list(
+ /obj/item/wrench/syndie = 1,
+ /obj/item/screwdriver/nuke = 1,
+ /obj/item/weldingtool/largetank = 1,
+ /obj/item/crowbar/syndie = 1,
+ /obj/item/wirecutters/syndie = 1,
+ /obj/item/multitool/syndie = 1,
+ )
+
+/obj/effect/spawner/random/engineering/tool/adv
+ loot = list(
+ /obj/item/screwdriver/power = 1,
+ /obj/item/weldingtool/electric = 1,
+ /obj/item/crowbar/power = 1,
+ )
+
+/obj/effect/spawner/random/stockparts
+ name = "random good stock parts"
+ spawn_loot_count = 6
+ loot = list(
+ /obj/item/stock_parts/capacitor/adv,
+ /obj/item/stock_parts/capacitor/quadratic,
+ /obj/item/stock_parts/capacitor/super,
+ /obj/item/stock_parts/cell/hyper,
+ /obj/item/stock_parts/cell/super,
+ /obj/item/stock_parts/cell/bluespace,
+ /obj/item/stock_parts/matter_bin/bluespace,
+ /obj/item/stock_parts/matter_bin/super,
+ /obj/item/stock_parts/matter_bin/adv,
+ /obj/item/stock_parts/micro_laser/ultra,
+ /obj/item/stock_parts/micro_laser/quadultra,
+ /obj/item/stock_parts/micro_laser/high,
+ /obj/item/stock_parts/scanning_module/triphasic,
+ /obj/item/stock_parts/scanning_module/phasic,
+ /obj/item/stock_parts/scanning_module/adv,
+ /obj/item/reagent_containers/glass/beaker/bluespace,
+ /obj/item/reagent_containers/glass/beaker/plastic,
+ /obj/item/reagent_containers/glass/beaker/large,
+ /obj/item/stock_parts/manipulator/nano,
+ /obj/item/stock_parts/manipulator/pico,
+ /obj/item/stock_parts/manipulator/femto
+ )
+
+/obj/effect/spawner/random/materials
+ name = "random bulk materials"
+ spawn_loot_count = 2
+ loot = list(
+ /obj/item/stack/sheet/plastic/fifty,
+ /obj/item/stack/sheet/bluespace_crystal/twenty,
+ /obj/item/stack/sheet/cardboard/fifty,
+ /obj/item/stack/sheet/glass/fifty,
+ /obj/item/stack/sheet/metal/fifty,
+ /obj/item/stack/sheet/plasteel/twenty,
+ /obj/item/stack/sheet/mineral/plasma/fifty,
+ /obj/item/stack/sheet/mineral/silver/fifty,
+ /obj/item/stack/sheet/mineral/titanium/fifty,
+ /obj/item/stack/sheet/mineral/uranium/fifty,
+ /obj/item/stack/sheet/mineral/wood/fifty,
+ /obj/item/stack/sheet/mineral/diamond/twenty,
+ /obj/item/stack/sheet/mineral/gold/fifty,
+ /obj/item/stack/cable_coil/red,
+ /obj/item/stack/rods/fifty
+ )
+
+/obj/effect/spawner/random/stockparts
+ name = "random good stock parts"
+ spawn_loot_count = 5
+ loot = list(
+ /obj/item/stock_parts/capacitor/adv,
+ /obj/item/stock_parts/capacitor/quadratic,
+ /obj/item/stock_parts/capacitor/super,
+ /obj/item/stock_parts/cell/hyper,
+ /obj/item/stock_parts/cell/super,
+ /obj/item/stock_parts/cell/bluespace,
+ /obj/item/stock_parts/matter_bin/bluespace,
+ /obj/item/stock_parts/matter_bin/super,
+ /obj/item/stock_parts/matter_bin/adv,
+ /obj/item/stock_parts/micro_laser/ultra,
+ /obj/item/stock_parts/micro_laser/quadultra,
+ /obj/item/stock_parts/micro_laser/high,
+ /obj/item/stock_parts/scanning_module/triphasic,
+ /obj/item/stock_parts/scanning_module/phasic,
+ /obj/item/stock_parts/scanning_module/adv,
+ /obj/item/reagent_containers/glass/beaker/bluespace,
+ /obj/item/reagent_containers/glass/beaker/plastic,
+ /obj/item/reagent_containers/glass/beaker/large,
+ /obj/item/stock_parts/manipulator/nano,
+ /obj/item/stock_parts/manipulator/pico,
+ /obj/item/stock_parts/manipulator/femto
+ )
+
+/obj/effect/spawner/random/materials
+ name = "random materials"
+ spawn_loot_count = 3
+ loot = list(
+ /obj/item/stack/sheet/plastic/fifty,
+ /obj/item/stack/sheet/plastic/five,
+ /obj/item/stack/sheet/bluespace_crystal/twenty,
+ /obj/item/stack/sheet/bluespace_crystal/five,
+ /obj/item/stack/sheet/cardboard/fifty,
+ /obj/item/stack/sheet/glass/fifty,
+ /obj/item/stack/sheet/metal/fifty,
+ /obj/item/stack/sheet/metal/twenty,
+ /obj/item/stack/sheet/plasteel/twenty,
+ /obj/item/stack/sheet/mineral/plasma/fifty,
+ /obj/item/stack/sheet/mineral/plasma/twenty,
+ /obj/item/stack/sheet/mineral/silver/fifty,
+ /obj/item/stack/sheet/mineral/titanium/twenty,
+ /obj/item/stack/sheet/mineral/uranium/twenty,
+ /obj/item/stack/sheet/mineral/wood/fifty,
+ /obj/item/stack/sheet/mineral/diamond/twenty,
+ /obj/item/stack/sheet/mineral/gold/fifty,
+ /obj/item/stack/cable_coil/red,
+ /obj/item/stack/rods/fifty
+ )
diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm
new file mode 100644
index 0000000000000..8e51ddf384c08
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/entertainment.dm
@@ -0,0 +1,282 @@
+/obj/effect/spawner/random/entertainment
+ name = "entertainment loot spawner"
+ desc = "It's time to paaaaaarty!"
+
+/obj/effect/spawner/random/entertainment/arcade
+ name = "spawn random arcade machine"
+ desc = "Automagically transforms into a random arcade machine. If you see this while in a shift, please create a bug report."
+ icon_state = "arcade"
+ loot = list(
+ /obj/machinery/computer/arcade/orion_trail = 49,
+ /obj/machinery/computer/arcade/battle = 49,
+ /obj/machinery/computer/arcade/amputation = 2,
+ )
+
+/obj/effect/spawner/random/entertainment/musical_instrument
+ name = "musical instrument spawner"
+ icon_state = "eguitar"
+ loot = list(
+ /obj/item/instrument/violin = 5,
+ /obj/item/instrument/banjo = 5,
+ /obj/item/instrument/guitar = 5,
+ /obj/item/instrument/eguitar = 5,
+ /obj/item/instrument/glockenspiel = 5,
+ /obj/item/instrument/accordion = 5,
+ /obj/item/instrument/trumpet = 5,
+ /obj/item/instrument/saxophone = 5,
+ /obj/item/instrument/trombone = 5,
+ /obj/item/instrument/recorder = 5,
+ /obj/item/instrument/harmonica = 5,
+ /obj/item/instrument/bikehorn = 2,
+ /obj/item/instrument/violin/golden = 2,
+ )
+
+/obj/effect/spawner/random/entertainment/gambling
+ name = "gambling valuables spawner"
+ icon_state = "dice"
+ loot = list(
+ /obj/item/clothing/head/trapper = 3,
+ /obj/effect/spawner/random/entertainment/coin = 3,
+ /obj/effect/spawner/random/entertainment/money = 3,
+ /obj/item/dice/d6 = 3,
+ /obj/item/storage/box/syndie_kit/throwing_weapons = 1,
+ /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
+ )
+
+/obj/effect/spawner/random/entertainment/coin
+ name = "coin spawner"
+ icon_state = "coin"
+ loot = list(
+ /obj/item/coin/iron = 5,
+ /obj/item/coin/plastic = 5,
+ /obj/item/coin/silver = 4,
+ /obj/item/coin/plasma = 4,
+ /obj/item/coin/uranium = 3,
+ /obj/item/coin/titanium = 3,
+ /obj/item/coin/diamond = 2,
+ /obj/item/coin/twoheaded = 1,
+ /obj/item/coin/antagtoken = 1,
+ )
+
+/obj/effect/spawner/random/entertainment/money_small
+ name = "small money spawner"
+ icon_state = "cash"
+ spawn_loot_count = 3
+ spawn_loot_split = TRUE
+ loot = list(
+ /obj/item/spacecash/bundle/c1 = 5,
+ /obj/item/spacecash/bundle/c10 = 3,
+ /obj/item/spacecash/bundle/c20 = 2,
+ )
+
+/obj/effect/spawner/random/entertainment/money
+ name = "money spawner"
+ icon_state = "cash"
+ spawn_loot_count = 3
+ spawn_loot_split = TRUE
+ loot = list(
+ /obj/item/spacecash/bundle/c1 = 10,
+ /obj/item/spacecash/bundle/c10 = 5,
+ /obj/item/spacecash/bundle/c20 = 3,
+ /obj/item/spacecash/bundle/c50 = 2,
+ /obj/item/spacecash/bundle/c100 = 1,
+ )
+
+/obj/effect/spawner/random/entertainment/money_medium
+ name = "money spawner"
+ icon_state = "cash"
+ loot = list(
+ /obj/item/spacecash/bundle/c100 = 25,
+ /obj/item/spacecash/bundle/c200 = 15,
+ /obj/item/spacecash/bundle/c50 = 10,
+ /obj/item/spacecash/bundle/c500 = 5,
+ /obj/item/spacecash/bundle/c1000 = 1,
+ )
+
+/obj/effect/spawner/random/entertainment/money_large
+ name = "large money spawner"
+ icon_state = "cash"
+ spawn_loot_count = 5
+ spawn_loot_split = TRUE
+ loot = list(
+ /obj/item/spacecash/bundle/c1 = 100,
+ /obj/item/spacecash/bundle/c10 = 80,
+ /obj/item/spacecash/bundle/c20 = 60,
+ /obj/item/spacecash/bundle/c50 = 40,
+ /obj/item/spacecash/bundle/c100 = 30,
+ /obj/item/spacecash/bundle/c200 = 20,
+ /obj/item/spacecash/bundle/c500 = 10,
+ /obj/item/spacecash/bundle/c1000 = 5,
+ /obj/item/spacecash/bundle/c10000 = 1,
+ )
+
+/obj/effect/spawner/random/entertainment/drugs
+ name = "recreational drugs spawner"
+ icon_state = "pill"
+ loot = list(
+ /obj/item/reagent_containers/food/drinks/bottle/hooch = 50,
+ /obj/item/clothing/mask/cigarette/rollie/cannabis = 15,
+ /obj/item/reagent_containers/syringe = 15,
+ /obj/item/cigbutt/roach = 15,
+ /obj/item/clothing/mask/cigarette/rollie/mindbreaker = 5,
+ )
+
+/obj/effect/spawner/random/entertainment/dice
+ name = "dice spawner"
+ icon_state = "dice_bag"
+ loot = list(
+ /obj/item/dice/d4,
+ /obj/item/dice/d6,
+ /obj/item/dice/d8,
+ /obj/item/dice/d10,
+ /obj/item/dice/d12,
+ /obj/item/dice/d20,
+ )
+
+/obj/effect/spawner/random/entertainment/cigarette_pack
+ name = "cigarette pack spawner"
+ icon_state = "cigarettes"
+ loot = list(
+ /obj/item/storage/fancy/cigarettes = 3,
+ /obj/item/storage/fancy/cigarettes/dromedaryco = 3,
+ /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
+ /obj/item/storage/fancy/cigarettes/cigpack_robust = 3,
+ /obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
+ /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1,
+ /obj/item/storage/fancy/cigarettes/cigpack_midori = 1,
+ /obj/item/storage/fancy/cigarettes/cigpack_candy = 1,
+ )
+
+/obj/effect/spawner/random/entertainment/cigarette
+ name = "cigarette spawner"
+ icon_state = "cigarettes"
+ loot = list(
+ /obj/item/clothing/mask/cigarette/space_cigarette = 3,
+ /obj/item/clothing/mask/cigarette/rollie/cannabis = 3,
+ /obj/item/clothing/mask/cigarette/rollie/nicotine = 3,
+ /obj/item/clothing/mask/cigarette/dromedary = 2,
+ /obj/item/clothing/mask/cigarette/uplift = 2,
+ /obj/item/clothing/mask/cigarette/robust = 2,
+ /obj/item/clothing/mask/cigarette/carp = 1,
+ /obj/item/clothing/mask/cigarette/robustgold = 1,
+ )
+
+/obj/effect/spawner/random/entertainment/cigar
+ name = "cigar spawner"
+ icon_state = "cigarettes"
+ loot = list(
+ /obj/item/clothing/mask/cigarette/cigar = 3,
+ /obj/item/clothing/mask/cigarette/cigar/havana = 2,
+ /obj/item/clothing/mask/cigarette/cigar/cohiba = 1,
+ )
+
+/obj/effect/spawner/random/entertainment/wallet_lighter
+ name = "lighter wallet spawner"
+ icon_state = "lighter"
+ loot = list( // these fit inside a wallet
+ /obj/item/match = 10,
+ /obj/item/lighter/greyscale = 10,
+ /obj/item/lighter = 1,
+ )
+
+/obj/effect/spawner/random/entertainment/lighter
+ name = "lighter spawner"
+ icon_state = "lighter"
+ loot = list(
+ /obj/item/storage/box/matches = 10,
+ /obj/item/lighter/greyscale = 10,
+ /obj/item/lighter = 1,
+ )
+
+/obj/effect/spawner/random/entertainment/wallet_storage
+ name = "wallet contents spawner"
+ icon_state = "wallet"
+ spawn_loot_count = 1
+ loot = list( // random photos would go here. IF I HAD ONE. :'(
+ /obj/item/lipstick/random,
+ /obj/effect/spawner/random/food_or_drink/seed,
+ /obj/effect/spawner/random/medical/minor_healing,
+ /obj/effect/spawner/random/entertainment/coin,
+ /obj/effect/spawner/random/entertainment/dice,
+ /obj/effect/spawner/random/entertainment/cigarette,
+ /obj/effect/spawner/random/entertainment/wallet_lighter,
+ /obj/effect/spawner/random/bureaucracy/paper,
+ /obj/effect/spawner/random/bureaucracy/crayon,
+ /obj/effect/spawner/random/bureaucracy/pen,
+ /obj/effect/spawner/random/bureaucracy/stamp,
+ )
+
+/obj/effect/spawner/random/entertainment/deck
+ name = "deck spawner"
+ icon_state = "deck"
+ loot = list(
+ /obj/item/toy/cards/deck = 5,
+ /obj/item/toy/cards/deck/kotahi = 2,
+ /obj/item/toy/cards/deck/tarot = 1,
+ )
+
+/obj/effect/spawner/random/entertainment/toy_figure
+ name = "toy figure spawner"
+ icon_state = "toy"
+ loot_subtype_path = /obj/item/toy/figure
+ loot = list()
+
+/obj/effect/spawner/random/entertainment/toy
+ name = "toy spawner"
+ icon_state = "toy"
+ loot = list()
+
+/obj/effect/spawner/random/entertainment/toy/Initialize(mapload)
+ loot += GLOB.arcade_prize_pool
+ return ..()
+
+/obj/effect/spawner/random/entertainment/plushie
+ name = "plushie spawner"
+ icon_state = "plushie"
+ loot = list (
+ /obj/item/toy/plush/beeplushie,
+ /obj/item/toy/plush/blahaj,
+ /obj/item/toy/plush/carpplushie,
+ /obj/item/toy/plush/flushed,
+ /obj/item/toy/plush/kari,
+ /obj/item/toy/plush/lizardplushie,
+ /obj/item/toy/plush/mora,
+ /obj/item/toy/plush/realgoat,
+ /obj/item/toy/plush/rilena,
+ /obj/item/toy/plush/sharai,
+ /obj/item/toy/plush/slimeplushie,
+ /obj/item/toy/plush/snakeplushie,
+ /obj/item/toy/plush/spider,
+ /obj/item/toy/plush/tali,
+ /obj/item/toy/plush/xader,
+ /obj/effect/spawner/random/entertainment/plushie/moth // fair chances
+ )
+
+/obj/effect/spawner/random/entertainment/plushie/moth
+ loot = list (
+ /obj/item/toy/plush/moth,
+ /obj/item/toy/plush/moth/monarch,
+ /obj/item/toy/plush/moth/luna,
+ /obj/item/toy/plush/moth/atlas,
+ /obj/item/toy/plush/moth/redish,
+ /obj/item/toy/plush/moth/royal,
+ /obj/item/toy/plush/moth/gothic,
+ /obj/item/toy/plush/moth/lovers,
+ /obj/item/toy/plush/moth/whitefly,
+ /obj/item/toy/plush/moth/punished,
+ /obj/item/toy/plush/moth/firewatch,
+ /obj/item/toy/plush/moth/deadhead,
+ /obj/item/toy/plush/moth/poison,
+ /obj/item/toy/plush/moth/ragged,
+ /obj/item/toy/plush/moth/snow,
+ /obj/item/toy/plush/moth/moonfly
+ )
+
+/obj/effect/spawner/random/entertainment/colorful_grenades
+ name = "colorful/glitter grenades spawner"
+ loot = list(
+ /obj/item/grenade/chem_grenade/glitter/pink,
+ /obj/item/grenade/chem_grenade/glitter/blue,
+ /obj/item/grenade/chem_grenade/glitter/white,
+ /obj/item/grenade/chem_grenade/colorful
+ )
diff --git a/code/game/objects/effects/spawners/random/exotic.dm b/code/game/objects/effects/spawners/random/exotic.dm
new file mode 100644
index 0000000000000..84e4a0616c78c
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/exotic.dm
@@ -0,0 +1,69 @@
+/obj/effect/spawner/random/exotic
+ name = "exotic spawner"
+ desc = "Super duper rare stuff."
+ icon_state = "showcase"
+
+/obj/effect/spawner/random/exotic/ripley
+ name = "25% exosuit 75% wreckage ripley spawner"
+ icon_state = "ripley"
+ loot = list(
+ /obj/mecha/working/ripley/mining = 1,
+ /obj/structure/mecha_wreckage/ripley = 5
+ )
+
+/obj/effect/spawner/random/exotic/prison_contraband
+ name = "prison contraband loot spawner"
+ icon_state = "prisoner"
+ loot = list(
+ /obj/item/clothing/mask/cigarette/space_cigarette = 4,
+ /obj/item/clothing/mask/cigarette/robust = 2,
+ /obj/item/clothing/mask/cigarette/carp = 3,
+ /obj/item/clothing/mask/cigarette/uplift = 2,
+ /obj/item/clothing/mask/cigarette/dromedary = 3,
+ /obj/item/clothing/mask/cigarette/robustgold = 1,
+ /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
+ /obj/item/storage/fancy/cigarettes = 3,
+ /obj/item/clothing/mask/cigarette/rollie/cannabis = 4,
+ /obj/item/toy/crayon/spraycan = 2,
+ /obj/item/crowbar = 1,
+ /obj/item/assembly/flash/handheld = 1,
+ /obj/item/restraints/handcuffs/cable/zipties = 1,
+ /obj/item/restraints/handcuffs = 1,
+ /obj/item/radio = 1,
+ /obj/item/lighter = 3,
+ /obj/item/storage/box/matches = 3,
+ /obj/item/reagent_containers/syringe/contraband/space_drugs = 1,
+ /obj/item/reagent_containers/syringe/contraband/krokodil = 1,
+ /obj/item/reagent_containers/syringe/contraband/crank = 1,
+ /obj/item/reagent_containers/syringe/contraband/methamphetamine = 1,
+ /obj/item/reagent_containers/syringe/contraband/bath_salts = 1,
+ /obj/item/reagent_containers/syringe/contraband/fentanyl = 1,
+ /obj/item/reagent_containers/syringe/contraband/morphine = 1,
+ /obj/item/storage/pill_bottle/happy = 1,
+ /obj/item/storage/pill_bottle/lsd = 1,
+ /obj/item/storage/pill_bottle/psicodine = 1,
+ /obj/item/reagent_containers/food/drinks/beer = 4,
+ /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
+ /obj/item/paper/fluff/jobs/prisoner/letter = 1,
+ /obj/item/grenade/smokebomb = 1,
+ /obj/item/flashlight/seclite = 1,
+ /obj/item/melee/knife/shiv = 4,
+ /obj/item/melee/knife/shiv/carrot = 1,
+ /obj/item/melee/knife/kitchen = 1,
+ /obj/item/storage/wallet/random = 1,
+ /obj/item/pda = 1
+ )
+
+/obj/effect/spawner/random/exotic/armory
+ name = "generic armory spawner"
+ spawn_loot_split = TRUE
+ spawn_loot_count = 3
+ spawn_loot_split_pixel_offsets = 4
+
+ loot = list(
+ /obj/item/gun/ballistic/automatic/pistol/ringneck = 8,
+ /obj/item/gun/ballistic/shotgun/automatic/m11 = 5,
+ /obj/item/gun/ballistic/automatic/pistol/deagle,
+ /obj/item/gun/ballistic/revolver/mateba
+ )
+
diff --git a/code/game/objects/effects/spawners/random/food_or_drink.dm b/code/game/objects/effects/spawners/random/food_or_drink.dm
new file mode 100644
index 0000000000000..300f94260ee1e
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/food_or_drink.dm
@@ -0,0 +1,284 @@
+/obj/effect/spawner/random/food_or_drink
+ name = "food or drink loot spawner"
+ desc = "Nom nom nom"
+ icon_state = "soup"
+
+/obj/effect/spawner/random/food_or_drink/donkpockets
+ name = "donk pocket box spawner"
+ icon_state = "donkpocket"
+ loot = list(
+ /obj/item/storage/box/donkpockets/donkpocketspicy = 1,
+ /obj/item/storage/box/donkpockets/donkpocketteriyaki = 1,
+ /obj/item/storage/box/donkpockets/donkpocketpizza = 1,
+ /obj/item/storage/box/donkpockets/donkpocketberry = 1,
+ /obj/item/storage/box/donkpockets/donkpockethonk = 1,
+ )
+
+/obj/effect/spawner/random/food_or_drink/ration
+ name = "ration spawner"
+ icon_state = "pizzabox"
+ loot = list (
+ /obj/item/storage/ration/vegan_chili = 5,
+ /obj/item/storage/ration/shredded_beef = 5,
+ /obj/item/storage/ration/pork_spaghetti = 5,
+ /obj/item/storage/ration/fried_fish = 5,
+ /obj/item/storage/ration/beef_strips = 5,
+ /obj/item/storage/ration/chili_macaroni = 5,
+ /obj/item/storage/ration/chicken_wings_hot_sauce = 5,
+ /obj/item/storage/ration/fish_stew = 5,
+ /obj/item/storage/ration/lemon_pepper_chicken = 5,
+ /obj/item/storage/ration/sausage_peppers_onions = 5,
+ /obj/item/storage/ration/pork_dumplings_chili_sauce = 5,
+ /obj/item/storage/ration/battered_fish_sticks = 5,
+ /obj/item/storage/ration/assorted_salted_offal = 5,
+ /obj/item/storage/ration/maple_pork_sausage_patty = 5,
+ /obj/item/storage/ration/pepper_jack_beef_patty = 5,
+ /obj/item/storage/ration/beef_goulash = 5,
+ /obj/item/storage/ration/pepperoni_pizza_slice = 5,
+ /obj/item/storage/ration/blackened_calamari = 5,
+ /obj/item/storage/ration/elbow_macaroni = 5,
+ /obj/item/storage/ration/cheese_pizza_slice = 5,
+ /obj/item/storage/ration/crayons = 2 // :)
+ )
+
+/obj/effect/spawner/random/food_or_drink/donut
+ name = "random donut" //donut :)
+ icon_state = "pizzabox"
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/donut/apple = 1,
+ /obj/item/reagent_containers/food/snacks/donut/berry = 1,
+ /obj/item/reagent_containers/food/snacks/donut/caramel = 1,
+ /obj/item/reagent_containers/food/snacks/donut/choco = 1,
+ /obj/item/reagent_containers/food/snacks/donut/laugh = 1,
+ /obj/item/reagent_containers/food/snacks/donut/matcha = 1,
+ /obj/item/reagent_containers/food/snacks/donut/meat = 1,
+ /obj/item/reagent_containers/food/snacks/donut/plain = 1,
+ /obj/item/reagent_containers/food/snacks/donut/trumpet = 1,
+ /obj/item/reagent_containers/food/snacks/donut/blumpkin = 1,
+ /obj/item/reagent_containers/food/snacks/donut/bungo = 1,
+ /obj/item/reagent_containers/food/snacks/donut/chaos = 1,
+ )
+
+/obj/effect/spawner/random/food_or_drink/donut/jelly
+ name = "random jelly donut"
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/donut/jelly/berry = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/apple = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/bungo = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/caramel = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/choco = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/laugh = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/matcha = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet = 1,
+ )
+
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly
+ name = "random slimejelly donut"
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/caramel = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/laugh = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1,
+ /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet = 1,
+ )
+
+/obj/effect/spawner/random/food_or_drink/three_course_meal
+ name = "three course meal spawner"
+ spawn_loot_count = 3
+ spawn_loot_double = FALSE
+ var/soups = list(
+ /obj/item/reagent_containers/food/snacks/soup/beet,
+ /obj/item/reagent_containers/food/snacks/soup/sweetpotato,
+ /obj/item/reagent_containers/food/snacks/soup/stew,
+ /obj/item/reagent_containers/food/snacks/soup/hotchili,
+ /obj/item/reagent_containers/food/snacks/soup/nettle,
+ /obj/item/reagent_containers/food/snacks/soup/meatball)
+ var/salads = list(
+ /obj/item/reagent_containers/food/snacks/salad/herbsalad,
+ /obj/item/reagent_containers/food/snacks/salad/validsalad,
+ /obj/item/reagent_containers/food/snacks/salad/fruit,
+ /obj/item/reagent_containers/food/snacks/salad/jungle,
+ /obj/item/reagent_containers/food/snacks/salad/aesirsalad)
+ var/mains = list(
+ /obj/item/reagent_containers/food/snacks/bearsteak,
+ /obj/item/reagent_containers/food/snacks/enchiladas,
+ /obj/item/reagent_containers/food/snacks/stewedsoymeat,
+ /obj/item/reagent_containers/food/snacks/burger/bigbite,
+ /obj/item/reagent_containers/food/snacks/burger/superbite,
+ /obj/item/reagent_containers/food/snacks/burger/fivealarm)
+
+/obj/effect/spawner/random/food_or_drink/three_course_meal/Initialize(mapload)
+ loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1)
+ . = ..()
+
+/obj/effect/spawner/random/food_or_drink/garden
+ name = "lush garden seeder"
+ spawn_loot_count = 3
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus = 1,
+ /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth = 2,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d = 1,
+ /obj/item/reagent_containers/food/snacks/grown/trumpet = 1,
+ /obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+ /obj/item/seeds/random = 1,
+ /obj/item/grown/log/bamboo = 2,
+ /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 2,
+ /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth = 5,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2,
+ /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2,
+ /obj/item/reagent_containers/food/snacks/grown/moonflower = 2,
+ /obj/item/reagent_containers/food/snacks/grown/cocoapod = 2,
+ /obj/item/reagent_containers/food/snacks/grown/pineapple = 2,
+ /obj/item/reagent_containers/food/snacks/grown/poppy/lily = 2,
+ /obj/item/reagent_containers/food/snacks/grown/poppy/geranium = 2,
+ /obj/item/reagent_containers/food/snacks/grown/sugarcane = 2,
+ /obj/item/reagent_containers/food/snacks/grown/tea = 2,
+ /obj/item/reagent_containers/food/snacks/grown/tobacco = 2,
+ /obj/item/reagent_containers/food/snacks/grown/watermelon = 4,
+ /obj/item/grown/sunflower = 4,
+ /obj/item/reagent_containers/food/snacks/grown/banana = 4,
+ /obj/item/reagent_containers/food/snacks/grown/apple = 4,
+ /obj/item/reagent_containers/food/snacks/grown/berries = 5,
+ /obj/item/reagent_containers/food/snacks/grown/cherries = 4,
+ /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 4,
+ /obj/item/reagent_containers/food/snacks/grown/garlic = 4,
+ /obj/item/reagent_containers/food/snacks/grown/grapes = 4,
+ /obj/item/reagent_containers/food/snacks/grown/grass = 5,
+ /obj/item/reagent_containers/food/snacks/grown/pumpkin = 4,
+ /obj/item/reagent_containers/food/snacks/grown/rainbow_flower = 4,
+ /obj/item/reagent_containers/food/snacks/grown/wheat = 4,
+ /obj/item/reagent_containers/food/snacks/grown/parsnip = 4,
+ /obj/item/reagent_containers/food/snacks/grown/peas = 4,
+ /obj/item/reagent_containers/food/snacks/grown/rice = 4,
+ /obj/item/reagent_containers/food/snacks/grown/soybeans = 4,
+ /obj/item/reagent_containers/food/snacks/grown/tomato = 4,
+ /obj/item/reagent_containers/food/snacks/grown/cabbage = 4,
+ /obj/item/reagent_containers/food/snacks/grown/onion = 4,
+ /obj/item/reagent_containers/food/snacks/grown/carrot = 4)
+
+/obj/effect/spawner/random/food_or_drink/garden/arid
+ name = "arid garden seeder"
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 1,
+ /obj/item/reagent_containers/food/snacks/grown/nettle = 1,
+ /obj/item/grown/cotton/durathread = 1,
+ /obj/item/seeds/random = 1,
+ /obj/item/reagent_containers/food/snacks/grown/redbeet = 1,
+ /obj/item/reagent_containers/food/snacks/grown/aloe = 2,
+ /obj/item/grown/cotton = 2,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/angel = 2,
+ /obj/item/reagent_containers/food/snacks/grown/chili = 2,
+ /obj/item/reagent_containers/food/snacks/grown/whitebeet = 5,
+ /obj/item/reagent_containers/food/snacks/grown/potato = 4,
+ /obj/item/reagent_containers/food/snacks/grown/potato/sweet = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 4,
+ /obj/item/reagent_containers/food/snacks/grown/corn = 4
+ )
+
+/obj/effect/spawner/random/food_or_drink/garden/cold
+ name = "frigid garden seeder"
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1,
+ /obj/item/reagent_containers/food/snacks/grown/galaxythistle = 1,
+ /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth = 1,
+ /obj/item/seeds/random = 1,
+ /obj/item/reagent_containers/food/snacks/grown/poppy = 2,
+ /obj/item/reagent_containers/food/snacks/grown/tomato/blue = 2,
+ /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth = 2,
+ /obj/item/reagent_containers/food/snacks/grown/berries = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 4,
+ /obj/item/reagent_containers/food/snacks/grown/oat = 4,
+ /obj/item/reagent_containers/food/snacks/grown/grapes/green = 4,
+ /obj/item/reagent_containers/food/snacks/grown/grass = 4,
+ /obj/item/reagent_containers/food/snacks/grown/harebell = 5,
+ /obj/item/seeds/starthistle = 5
+ )
+
+/obj/effect/spawner/random/food_or_drink/garden/sick
+ name = "sickly garden seeder"
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow = 1,
+ /obj/item/reagent_containers/food/snacks/grown/cannabis/death = 1,
+ /obj/item/seeds/replicapod = 1,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/angel = 1,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 2,
+ /obj/item/seeds/tower/steel = 2,
+ /obj/item/reagent_containers/food/snacks/grown/cannabis = 2,
+ /obj/item/seeds/random = 2,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup = 2,
+ /obj/item/reagent_containers/food/snacks/grown/cherrybulbs = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 4,
+ /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi = 4,
+ /obj/item/reagent_containers/food/snacks/grown/berries/glow = 4
+ )
+
+/obj/effect/spawner/random/food_or_drink/garden/seaweed
+ name = "seaweed patch seeder"
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/grown/seaweed
+ )
+
+/obj/effect/spawner/random/food_or_drink/seed
+ name = "GO FORTH AND CULTIVATE"
+ icon_state = "seed"//sneed
+ loot = list(
+ /obj/item/seeds/aloe,
+ /obj/item/seeds/ambrosia,
+ /obj/item/seeds/apple,
+ /obj/item/seeds/cotton,
+ /obj/item/seeds/banana,
+ /obj/item/seeds/berry,
+ /obj/item/seeds/cabbage,
+ /obj/item/seeds/carrot,
+ /obj/item/seeds/cherry,
+ /obj/item/seeds/chanter,
+ /obj/item/seeds/chili,
+ /obj/item/seeds/cocoapod,
+ /obj/item/seeds/coffee,
+ /obj/item/seeds/corn,
+ /obj/item/seeds/eggplant,
+ /obj/item/seeds/garlic,
+ /obj/item/seeds/grape,
+ /obj/item/seeds/grass,
+ /obj/item/seeds/lemon,
+ /obj/item/seeds/lime,
+ /obj/item/seeds/onion,
+ /obj/item/seeds/orange,
+ /obj/item/seeds/peas,
+ /obj/item/seeds/pineapple,
+ /obj/item/seeds/potato,
+ /obj/item/seeds/poppy,
+ /obj/item/seeds/pumpkin,
+ /obj/item/seeds/wheat/rice,
+ /obj/item/seeds/soya,
+ /obj/item/seeds/sugarcane,
+ /obj/item/seeds/sunflower,
+ /obj/item/seeds/tea,
+ /obj/item/seeds/tobacco,
+ /obj/item/seeds/tomato,
+ /obj/item/seeds/tower,
+ /obj/item/seeds/watermelon,
+ /obj/item/seeds/wheat,
+ /obj/item/seeds/whitebeet,
+ /obj/item/seeds/amanita,
+ /obj/item/seeds/glowshroom,
+ /obj/item/seeds/liberty,
+ /obj/item/seeds/nettle,
+ /obj/item/seeds/plump,
+ /obj/item/seeds/reishi,
+ /obj/item/seeds/cannabis,
+ /obj/item/seeds/starthistle,
+ /obj/item/seeds/cherry/bomb,
+ /obj/item/seeds/berry/glow,
+ /obj/item/seeds/sunflower/moonflower
+ )
diff --git a/code/game/objects/effects/spawners/random/maintenance.dm b/code/game/objects/effects/spawners/random/maintenance.dm
new file mode 100644
index 0000000000000..53a61e0f877d7
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/maintenance.dm
@@ -0,0 +1,57 @@
+/obj/effect/spawner/random/maintenance
+ name = "maintenance loot spawner"
+ desc = "Come on Lady Luck, spawn me a pair of sunglasses."
+ icon_state = "loot"
+ // see code/_globalvars/lists/maintenance_loot.dm for loot table
+
+/obj/effect/spawner/random/maintenance/Initialize(mapload)
+ loot = GLOB.maintenance_loot
+ . = ..()
+
+/obj/effect/spawner/random/maintenance/skew_loot_weights(list/loot_list, exponent)
+ ///We only need to skew the weights once, since it's a global list used by all maint spawners.
+ var/static/already_done = FALSE
+ if(loot_list == GLOB.maintenance_loot && already_done)
+ return
+ already_done = TRUE
+ return ..()
+
+/obj/effect/spawner/random/maintenance/spawn_loot(lootcount_override)
+ if(isnull(lootcount_override))
+ lootcount_override = spawn_loot_count
+ . = ..()
+
+ /* Fucks everything. Investigate further
+ // In addition, closets that are closed will have the maintenance loot inserted inside.
+ for(var/obj/structure/closet/closet in get_turf(src))
+ if(!closet.opened)
+ closet.take_contents()
+ */
+
+/obj/effect/spawner/random/maintenance/two
+ name = "2 x maintenance loot spawner"
+ spawn_loot_count = 2
+
+/obj/effect/spawner/random/maintenance/three
+ name = "3 x maintenance loot spawner"
+ spawn_loot_count = 3
+
+/obj/effect/spawner/random/maintenance/four
+ name = "4 x maintenance loot spawner"
+ spawn_loot_count = 4
+
+/obj/effect/spawner/random/maintenance/five
+ name = "5 x maintenance loot spawner"
+ spawn_loot_count = 5
+
+/obj/effect/spawner/random/maintenance/six
+ name = "6 x maintenance loot spawner"
+ spawn_loot_count = 6
+
+/obj/effect/spawner/random/maintenance/seven
+ name = "7 x maintenance loot spawner"
+ spawn_loot_count = 7
+
+/obj/effect/spawner/random/maintenance/eight
+ name = "8 x maintenance loot spawner"
+ spawn_loot_count = 8
diff --git a/code/game/objects/effects/spawners/random/medical.dm b/code/game/objects/effects/spawners/random/medical.dm
new file mode 100644
index 0000000000000..a0d5a6db53b98
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/medical.dm
@@ -0,0 +1,145 @@
+/obj/effect/spawner/random/medical
+ name = "medical loot spawner"
+ desc = "Doc, gimmie something good."
+
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ icon_state = "gauze"
+ loot = list(
+ /obj/item/stack/medical/suture,
+ /obj/item/stack/medical/mesh,
+ /obj/item/stack/medical/gauze,
+ )
+
+/obj/effect/spawner/random/medical/organs
+ name = "ayylien organ spawner"
+ loot = list(
+ /obj/item/organ/heart/gland/electric = 3,
+ /obj/item/organ/heart/gland/trauma = 4,
+ /obj/item/organ/heart/gland/egg = 7,
+ /obj/item/organ/heart/gland/chem = 5,
+ /obj/item/organ/heart/gland/mindshock = 5,
+ /obj/item/organ/heart/gland/plasma = 7,
+ /obj/item/organ/heart/gland/transform = 5,
+ /obj/item/organ/heart/gland/slime = 4,
+ /obj/item/organ/heart/gland/spiderman = 5,
+ /obj/item/organ/heart/gland/ventcrawling = 1,
+ /obj/item/organ/body_egg/alien_embryo = 1,
+ /obj/item/organ/regenerative_core = 2)
+ spawn_loot_count = 3
+
+/obj/effect/spawner/random/medical/memeorgans
+ name = "meme organ spawner"
+ loot = list(
+ /obj/item/organ/ears/penguin,
+ /obj/item/organ/ears/cat,
+ /obj/item/organ/eyes/compound,
+ /obj/item/organ/eyes/snail,
+ /obj/item/organ/tongue/bone,
+ /obj/item/organ/tongue/fly,
+ /obj/item/organ/tongue/snail,
+ /obj/item/organ/tongue/lizard,
+ /obj/item/organ/tongue/alien,
+ /obj/item/organ/tongue/ethereal,
+ /obj/item/organ/tongue/robot,
+ /obj/item/organ/tongue/zombie,
+ /obj/item/organ/appendix,
+ /obj/item/organ/liver/fly,
+ /obj/item/organ/lungs/plasmaman,
+ /obj/item/organ/tail/cat,
+ /obj/item/organ/tail/lizard
+ )
+ spawn_loot_count = 5
+
+/obj/effect/spawner/random/medical/surgery_tool/common
+ name = "Surgery tool spawner"
+ icon_state = "scapel"
+ loot = list(
+ /obj/item/scalpel,
+ /obj/item/hemostat,
+ /obj/item/retractor,
+ /obj/item/circular_saw,
+ /obj/item/surgicaldrill,
+ /obj/item/cautery,
+ )
+
+/obj/effect/spawner/random/medical/surgery_tool/adv
+ loot = list(
+ /obj/item/scalpel/advanced,
+ /obj/item/retractor/advanced,
+ /obj/item/surgicaldrill/advanced,
+ )
+
+/obj/effect/spawner/random/medical/surgery_tool
+ loot = list(
+ /obj/effect/spawner/random/medical/surgery_tool/common = 120,
+ /obj/effect/spawner/random/medical/surgery_tool/adv = 10,
+ )
+
+/obj/effect/spawner/random/medical/medkit
+ name = "medkit spawner"
+ icon_state = "medkit"
+ loot = list(
+ /obj/item/storage/firstaid/regular = 10,
+ /obj/item/storage/firstaid/o2 = 10,
+ /obj/item/storage/firstaid/fire = 10,
+ /obj/item/storage/firstaid/brute = 10,
+ /obj/item/storage/firstaid/toxin = 10,
+ /obj/item/storage/firstaid/advanced = 1,
+ )
+
+/obj/effect/spawner/random/medical/patient_stretcher
+ name = "patient stretcher spawner"
+ icon_state = "rollerbed"
+ loot = list(
+ /obj/structure/bed/roller,
+ /obj/vehicle/ridden/wheelchair,
+ )
+
+/obj/effect/spawner/random/medical/supplies
+ name = "medical supplies spawner"
+ icon_state = "box_small"
+ loot = list(
+ /obj/item/storage/box/hug,
+ /obj/item/storage/box/pillbottles,
+ /obj/item/storage/box/bodybags,
+ /obj/item/storage/box/rxglasses,
+ /obj/item/storage/box/beakers,
+ /obj/item/storage/box/gloves,
+ /obj/item/storage/box/masks,
+ /obj/item/storage/box/syringes,
+ )
+
+/obj/effect/spawner/random/medical/beaker
+ loot = list(
+ /obj/item/reagent_containers/glass/beaker = 300,
+ /obj/item/reagent_containers/glass/beaker/large = 200,
+ /obj/item/reagent_containers/glass/beaker/plastic = 50,
+ /obj/item/reagent_containers/glass/beaker/meta = 10,
+ /obj/item/reagent_containers/glass/beaker/noreact = 5,
+ /obj/item/reagent_containers/glass/beaker/bluespace = 1,
+ )
+
+/obj/effect/spawner/random/medical/prosthetic
+ loot = list(
+ /obj/item/bodypart/l_arm/robot/surplus = 1,
+ /obj/item/bodypart/r_arm/robot/surplus = 1,
+ /obj/item/bodypart/leg/left/robot/surplus = 1,
+ /obj/item/bodypart/leg/right/robot/surplus = 1,
+ )
+
+/obj/effect/spawner/random/medical/chem_jug
+ loot = list(
+ /obj/item/reagent_containers/glass/chem_jug/carbon,
+ /obj/item/reagent_containers/glass/chem_jug/oxygen,
+ /obj/item/reagent_containers/glass/chem_jug/nitrogen,
+ /obj/item/reagent_containers/glass/chem_jug/hydrogen,
+ /obj/item/reagent_containers/glass/chem_jug/radium,
+ /obj/item/reagent_containers/glass/chem_jug/aluminium,
+ /obj/item/reagent_containers/glass/chem_jug/chlorine,
+ /obj/item/reagent_containers/glass/chem_jug/copper,
+ /obj/item/reagent_containers/glass/chem_jug/bromine,
+ /obj/item/reagent_containers/glass/chem_jug/iodine,
+ /obj/item/reagent_containers/glass/chem_jug/potassium,
+ /obj/item/reagent_containers/glass/chem_jug/sulfur
+ )
diff --git a/code/game/objects/effects/spawners/random/random.dm b/code/game/objects/effects/spawners/random/random.dm
new file mode 100644
index 0000000000000..aeeab4ab5a31c
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/random.dm
@@ -0,0 +1,176 @@
+#define RANDOM_LOOT_WEIGHT_MODIFIER 1
+
+/**
+ * Base class for all random spawners.
+ */
+/obj/effect/spawner/random
+ icon = 'icons/effects/mapping/random_spawners.dmi'
+ icon_state = "loot"
+ layer = OBJ_LAYER
+ /// Stops persistent lootdrop spawns from being shoved into lockers
+ anchored = TRUE
+ /// A list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect)
+ var/list/loot
+ /// The subtypes AND type to combine with the loot list
+ var/loot_type_path
+ /// The subtypes (this excludes the provided path) to combine with the loot list
+ var/loot_subtype_path
+ /// How many items will be spawned
+ var/spawn_loot_count = 1
+ /// If the same item can be spawned twice
+ var/spawn_loot_double = TRUE
+ /// Whether the items should be distributed to offsets 0,1,-1,2,-2,3,-3.. This overrides pixel_x/y on the spawner itself
+ var/spawn_loot_split = FALSE
+ /// The pixel x/y divider offsets for spawn_loot_split (spaced 1 pixel apart by default)
+ var/spawn_loot_split_pixel_offsets = 2
+ /// Whether the spawner should spawn all the loot in the list
+ var/spawn_all_loot = FALSE
+ /// The chance for the spawner to create loot (ignores spawn_loot_count)
+ var/spawn_loot_chance = 100
+ /// Determines how big of a range (in tiles) we should scatter things in.
+ var/spawn_scatter_radius = 0
+ /// Whether the items should have a random pixel_x/y offset (maxium offset distance is ±16 pixels for x/y)
+ var/spawn_random_offset = FALSE
+ /// Whether items that cannot be spawned will be removed from the loot list. Keep it TRUE unless you've a good reason.
+ var/remove_if_cant_spawn = TRUE
+
+/obj/effect/spawner/random/Initialize(mapload)
+ . = ..()
+ spawn_loot()
+
+///If the spawner has any loot defined, randomly picks some and spawns it. Does not cleanup the spawner.
+/obj/effect/spawner/random/proc/spawn_loot(lootcount_override)
+ if(!prob(spawn_loot_chance))
+ return
+
+ var/list/spawn_locations = get_spawn_locations(spawn_scatter_radius)
+ var/spawn_loot_count = isnull(lootcount_override) ? src.spawn_loot_count : lootcount_override
+
+ if(spawn_all_loot)
+ spawn_loot_count = INFINITY
+ spawn_loot_double = FALSE
+
+ if(loot_type_path)
+ loot += typesof(loot_type_path)
+
+ if(loot_subtype_path)
+ loot += subtypesof(loot_subtype_path)
+
+ skew_loot_weights(loot, RANDOM_LOOT_WEIGHT_MODIFIER)
+
+ if(loot?.len)
+ var/loot_spawned = 0
+ var/pixel_divider = FLOOR(16 / spawn_loot_split_pixel_offsets, 1) // 16 pixels offsets is max that should be allowed in any direction
+ while((spawn_loot_count-loot_spawned) && loot.len)
+ var/lootspawn = pick_weight_recursive(loot)
+ if(!can_spawn(lootspawn))
+ if(remove_if_cant_spawn)
+ loot.Remove(lootspawn)
+ continue
+ if(!spawn_loot_double)
+ loot.Remove(lootspawn)
+ if(lootspawn && (spawn_scatter_radius == 0 || spawn_locations.len))
+ var/turf/spawn_loc = loc
+ if(spawn_scatter_radius > 0)
+ spawn_loc = pick_n_take(spawn_locations)
+
+ var/atom/movable/spawned_loot = make_item(spawn_loc, lootspawn)
+ spawned_loot.setDir(dir)
+
+ if (!spawn_loot_split && !spawn_random_offset)
+ if (pixel_x != 0)
+ spawned_loot.pixel_x = pixel_x
+ if (pixel_y != 0)
+ spawned_loot.pixel_y = pixel_y
+ else if (spawn_random_offset)
+ spawned_loot.pixel_x = rand(-16, 16)
+ spawned_loot.pixel_y = rand(-16, 16)
+ else if (spawn_loot_split)
+ if (loot_spawned)
+ var/column = FLOOR(loot_spawned / pixel_divider, 1)
+ spawned_loot.pixel_x = spawn_loot_split_pixel_offsets * (loot_spawned % pixel_divider) + (column * spawn_loot_split_pixel_offsets)
+ spawned_loot.pixel_y = spawn_loot_split_pixel_offsets * (loot_spawned % pixel_divider)
+ loot_spawned++
+
+///Levels out the weights of loot if lower than 1, or makes rarer spawns even more rare.
+/obj/effect/spawner/random/proc/skew_loot_weights(list/loot_list, exponent)
+ ///This helps keeping the modified weights more or less correct, since pick_weight doesn't appreciate decimals.
+ var/precision = 1
+ if(exponent < 1)
+ precision = round((1 - exponent) * 10) + 1
+ for(var/loot_type in loot_list)
+ if(islist(loot_type))
+ skew_loot_weights(loot_type, exponent)
+ var/loot_weight = loot_list[loot_type]
+ if(loot_weight <= 1)
+ if(exponent < 1)
+ loot_list[loot_type] = precision
+ continue
+ loot_list[loot_type] = round(loot_weight ** exponent * precision, 1)
+
+/**
+ * Makes the actual item related to our spawner.
+ *
+ * spawn_loc - where are we spawning it?
+ * type_path_to_make - what are we spawning?
+ **/
+/obj/effect/spawner/random/proc/make_item(spawn_loc, type_path_to_make)
+ return new type_path_to_make(spawn_loc)
+
+///If the spawner has a spawn_scatter_radius set, this creates a list of nearby turfs available that are in view and have an unblocked line to them.
+/obj/effect/spawner/random/proc/get_spawn_locations(radius)
+ var/list/scatter_locations = list()
+
+ if(!radius)
+ return scatter_locations
+
+ for(var/turf/turf_in_view in view(radius, get_turf(src)))
+ if(isclosedturf(turf_in_view))
+ continue
+ if(!has_unblocked_line(turf_in_view))
+ continue
+
+ scatter_locations += turf_in_view
+
+ return scatter_locations
+
+/obj/effect/spawner/random/proc/has_unblocked_line(destination)
+ for(var/turf/potential_blockage as anything in get_line(get_turf(src), destination))
+ if(!potential_blockage.is_blocked_turf(exclude_mobs = TRUE))
+ continue
+ return FALSE
+ return TRUE
+
+//finds the probabilities of items spawning from a loot spawner's loot pool
+/obj/item/loot_table_maker
+ icon = 'icons/effects/mapping/landmarks_static.dmi'
+ icon_state = "random_loot"
+ var/spawner_to_test = /obj/effect/spawner/random/maintenance //what lootdrop spawner to use the loot pool of
+ var/loot_count = 180 //180 is about how much maint loot spawns per map as of 11/14/2019
+ //result outputs
+ var/list/spawned_table //list of all items "spawned" and how many
+ var/list/stat_table //list of all items "spawned" and their occurrance probability
+
+/obj/item/loot_table_maker/Initialize(mapload)
+ . = ..()
+ make_table()
+
+/obj/item/loot_table_maker/attack_self(mob/user)
+ to_chat(user, "Loot pool re-rolled.")
+ make_table()
+
+/obj/item/loot_table_maker/proc/make_table()
+ spawned_table = list()
+ stat_table = list()
+ var/obj/effect/spawner/random/spawner_to_table = new spawner_to_test
+ var/lootpool = spawner_to_table.loot
+ qdel(spawner_to_table)
+ for(var/i in 1 to loot_count)
+ var/loot_spawn = pick_weight_recursive(lootpool)
+ if(!(loot_spawn in spawned_table))
+ spawned_table[loot_spawn] = 1
+ else
+ spawned_table[loot_spawn] += 1
+ stat_table += spawned_table
+ for(var/item in stat_table)
+ stat_table[item] /= loot_count
diff --git a/code/game/objects/effects/spawners/random/readme.md b/code/game/objects/effects/spawners/random/readme.md
new file mode 100644
index 0000000000000..97db867f2de66
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/readme.md
@@ -0,0 +1,425 @@
+# Random Spawners
+
+## About
+
+Random spawners are an organized tool primarily for mapping to enhance replayability. The spawners can create objects, effects, and structures with different tweakable settings to get the desired outcome. You can make a spawner determine direction, rarity, number of items to spawn, pixel spacing between items, and even spread it over a large tile radius. This lets you control the atmosphere of a location. You could for instance spawn different piles of trash in maint or spawn decoration items for a room to give it more randomized flavor. The choice is yours!
+
+*(note the audience of this README is directed towards mappers who lack knowledge of coding)*
+
+## Variables
+
+The following variables are defined in `code/game/objects/effects/spawners/random/random.dm` that control how a spawner works.
+
+- `loot` - a list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect)
+- `loot_type_path` - this combines the subtypes AND type list with the loot list
+- `loot_subtype_path` - this combines ONLY the subtypes (excludes the `loot_subtype_path`) with the loot list
+- `spawn_loot_count` - how many items will be spawned
+- `spawn_loot_double` - if the same item can be spawned twice from the loot list
+- `spawn_loot_split` - whether the items should be distributed to offsets 0,1,-1,2,-2,3,-3.. This overrides pixel_x/y on the spawner itself
+- `spawn_all_loot` - whether the spawner should spawn all the loot in the list (ignores `spawn_loot_count`)
+- `spawn_loot_chance` - the chance for the spawner to create loot (ignores `spawn_loot_count`)
+- `spawn_scatter_radius` - determines how big of a range (in tiles) we should scatter things in
+
+These variables are set to the following default values for the base `random.dm` object that all objects inherit from:
+
+```dm
+ /// these three loot values are all empty
+ var/list/loot
+ var/loot_type_path
+ var/loot_subtype_path
+
+ var/spawn_loot_count = 1 // by default one item will be selected from the loot list
+ var/spawn_loot_double = TRUE // by default duplicate items CAN be spawned from the loot list
+ var/spawn_loot_split = FALSE // by default items will NOT spread out on the same tile
+ var/spawn_all_loot = FALSE // by default the spawner will only spawn the number of items set in spawn_loot_count
+ var/spawn_loot_chance = 100 // by default the spawner has a 100% chance to spawn the item(s)
+ var/spawn_scatter_radius = 0 // by default the spawner will spawn the items ONLY on the tile it is on
+```
+
+However there are some categories that overwrite these default values so pay attention to the folder or category you group your spawner in. For instance the `obj/effect/spawner/random/techstorage` category overwrites the `spawn_all_loot` and the `spawn_loot_split` variables.
+
+```dm
+// Tech storage circuit board spawners
+/obj/effect/spawner/random/techstorage
+ name = "generic circuit board spawner"
+ spawn_loot_split = TRUE
+ spawn_all_loot = TRUE
+```
+
+This means any spawner you create under the techstorage will also have those variables set to that by default. This can be overridden quite easily just be resetting the variables back to the normal state like so:
+
+```dm
+/obj/effect/spawner/random/techstorage/data_disk
+ name = "data disk spawner"
+ spawn_all_loot = FALSE // now our loot won't all be spawned
+ loot = list(
+ /obj/item/disk/data = 49,
+ /obj/item/disk/nuclear/fake/obvious = 1,
+ )
+```
+
+## Template
+
+All the random spawners follow the same template format to keep things consistent and unison.
+
+```dm
+/obj/effect/spawner/random/INSERT_SPAWNER_GROUP/INSERT_SPAWNER_NAME
+ name = "INSERT_SPAWNER_NAME spawner"
+ loot = list(
+ /obj/item/PATH/INSERT_OBJ_1,
+ /obj/item/PATH/INSERT_OBJ_2,
+ /obj/item/PATH/INSERT_OBJ_3,
+ )
+```
+
+All the capitalized code is the parts where you are supposed to swap out with your objects like so:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(
+ /obj/item/stack/medical/suture,
+ /obj/item/stack/medical/mesh,
+ /obj/item/stack/medical/gauze,
+ )
+```
+
+Find the path to different objects and add them to the list but try to be consistent with the types of the object and the spawner. For example a medical spawner shouldn't have a emag in the loot list. (use an antag spawner for that instead!)
+
+## Probability
+
+Be aware that the `loot` list uses a *weighted chance* formula to determine probability. So if there are no numbers set in the `loot` list then each object defaults to 1 and has the same probability to be selected. For our above example for the `minor_healing` spawner each medical item has a 1/3 chance to be spawned. But if we rearranged the values to this:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(
+ /obj/item/stack/medical/suture = 2,
+ /obj/item/stack/medical/mesh = 1,
+ /obj/item/stack/medical/gauze = 1,
+ )
+```
+
+Then now `suture` has a 50% chance of being spawned (2/4), `mesh` has a 25% chance of being spawned (1/4), and `gauze` also has a 25% chance of being spawned (1/4). If we add another item into the mix then we get the following:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(
+ /obj/item/stack/medical/suture = 2,
+ /obj/item/stack/medical/mesh = 1,
+ /obj/item/stack/medical/gauze = 1,
+ /obj/item/reagent_containers/syringe = 1,
+ )
+```
+
+Suture is 40% (2/5), Mesh is 20% (1/5), Gauze is 20% (1/5), and Syringe is 20% (1/5). A weighted list has the advantage of not needing to update every item in the list when adding a new item. If the list was based on a straight percent values, then each new item would require to manually go and edit ALL the items in the list. For big lists that would become very tedious. This is why we use weighted lists to determine probability!
+
+## Style
+
+Here are some simple guidelines that you should stick to when making a new spawner:
+
+### If ALL the items have the same chance, we should not set a weighted value to the item
+
+Do not put `/obj/item/ = 1` unless other items have different spawn chances
+
+Good:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(
+ /obj/item/stack/medical/suture = 2,
+ /obj/item/stack/medical/mesh = 1,
+ /obj/item/stack/medical/gauze = 1,
+ /obj/item/reagent_containers/syringe = 1,
+ )
+```
+
+Also Good:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(
+ /obj/item/stack/medical/suture,
+ /obj/item/stack/medical/mesh,
+ /obj/item/stack/medical/gauze,
+ /obj/item/reagent_containers/syringe,
+ )
+```
+
+Bad:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(
+ /obj/item/stack/medical/suture = 1,
+ /obj/item/stack/medical/mesh = 1,
+ /obj/item/stack/medical/gauze = 1,
+ /obj/item/reagent_containers/syringe = 1,
+ )
+```
+
+
+### Sort the list from highest probability to lowest
+
+Sort from top to bottom. The rarest items for your spawner should be at the bottom of the list.
+
+Good:
+
+```dm
+/obj/effect/spawner/random/exotic/armory
+ name = "armory loot spawner"
+ loot = list(
+ /obj/item/gun/ballistic/automatic/pistol = 8,
+ /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+ /obj/item/storage/box/syndie_kit/throwing_weapons = 3,
+ /obj/item/grenade/clusterbuster/teargas = 2,
+ /obj/item/grenade/clusterbuster = 2,
+ /obj/item/gun/ballistic/automatic/pistol/deagle = 1,
+ /obj/item/gun/ballistic/revolver/mateba = 1,
+ )
+```
+
+Bad:
+
+```dm
+/obj/effect/spawner/random/exotic/armory
+ name = "armory loot spawner"
+ loot = list(
+ /obj/item/storage/box/syndie_kit/throwing_weapons = 3,
+ /obj/item/gun/ballistic/automatic/pistol = 8,
+ /obj/item/gun/ballistic/revolver/mateba = 1,
+ /obj/item/grenade/clusterbuster/teargas = 2,
+ /obj/item/gun/ballistic/automatic/pistol/deagle = 1,
+ /obj/item/grenade/clusterbuster = 2,
+ /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+ )
+```
+
+### Always put the `loot` list at the bottom of your spawner
+
+This is just to keep things organized.
+
+Good:
+
+```dm
+/obj/effect/spawner/random/food_or_drink/donkpockets
+ name = "donk pocket box spawner"
+ spawn_loot_double = FALSE
+ loot = list(
+ /obj/item/storage/box/donkpockets/donkpocketspicy,
+ /obj/item/storage/box/donkpockets/donkpocketteriyaki,
+ /obj/item/storage/box/donkpockets/donkpocketpizza,
+ /obj/item/storage/box/donkpockets/donkpocketberry,
+ /obj/item/storage/box/donkpockets/donkpockethonk,
+ )
+```
+
+Bad:
+
+```dm
+/obj/effect/spawner/random/food_or_drink/donkpockets
+ name = "donk pocket box spawner"
+ loot = list(
+ /obj/item/storage/box/donkpockets/donkpocketspicy,
+ /obj/item/storage/box/donkpockets/donkpocketteriyaki,
+ /obj/item/storage/box/donkpockets/donkpocketpizza,
+ /obj/item/storage/box/donkpockets/donkpocketberry,
+ /obj/item/storage/box/donkpockets/donkpockethonk,
+ )
+ spawn_loot_double = FALSE
+```
+
+### Always put a comma at the last item in the `loot` list
+
+This will make it easier for people to add items to your spawner later without getting frustrating code errors.
+
+Good:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(
+ /obj/item/stack/medical/suture,
+ /obj/item/stack/medical/mesh,
+ /obj/item/stack/medical/gauze,
+ )
+```
+
+Bad:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(
+ /obj/item/stack/medical/suture,
+ /obj/item/stack/medical/mesh,
+ /obj/item/stack/medical/gauze // if someone adds an item to the list later it will cause an error
+ )
+```
+
+### Keep the same tab formatting for the `loot` list (unless there is only one item)
+
+Again, this is just good code organization. If there is only one item, then encase that item in `loot = list(item)`
+
+Good:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(
+ /obj/item/stack/medical/suture,
+ /obj/item/stack/medical/mesh,
+ /obj/item/stack/medical/gauze,
+ )
+```
+
+Also Good:
+
+```dm
+/obj/effect/spawner/random/structure/crate_abandoned
+ icon = 'icons/effects/landmarks_static.dmi'
+ icon_state = "loot_site"
+ spawn_loot_chance = 20
+ loot = list(/obj/structure/closet/crate/secure/loot)
+```
+
+Bad:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(
+ /obj/item/stack/medical/suture,
+ /obj/item/stack/medical/mesh,
+ /obj/item/stack/medical/gauze,
+ )
+```
+
+Also Bad:
+
+```dm
+/obj/effect/spawner/random/medical/minor_healing
+ name = "minor healing spawner"
+ loot = list(/obj/item/stack/medical/suture,
+ /obj/item/stack/medical/mesh,
+ /obj/item/stack/medical/gauze,)
+```
+
+### Try to keep the total combined weight of your `loot` list to sane values (Aim for 5, 10, 20, 50, or 100)
+
+This makes the math probability easier for people to calculate. (this is recommended, but not always possible)
+
+Good:
+
+```dm
+/obj/effect/spawner/random/trash/cigbutt
+ name = "cigarette butt spawner"
+ loot = list(
+ /obj/item/cigbutt = 65,
+ /obj/item/cigbutt/roach = 20,
+ /obj/item/cigbutt/cigarbutt = 15,
+ )
+```
+
+Also Good:
+
+```dm
+/obj/effect/spawner/random/trash/botanical_waste
+ name = "botanical waste spawner"
+ loot = list(
+ /obj/item/grown/bananapeel = 6,
+ /obj/item/grown/corncob = 3,
+ /obj/item/food/grown/bungopit = 1,
+ )
+```
+
+Bad:
+
+```dm
+/obj/effect/spawner/random/entertainment/money_large
+ name = "large money spawner"
+ loot = list(
+ /obj/item/stack/spacecash/c1 = 521,
+ /obj/item/stack/spacecash/c10 = 378,
+ /obj/item/stack/spacecash/c20 = 212,
+ /obj/item/stack/spacecash/c50 = 205,
+ /obj/item/stack/spacecash/c100 = 71,
+ /obj/item/stack/spacecash/c200 = 60,
+ /obj/item/stack/spacecash/c500 = 57,
+ /obj/item/stack/spacecash/c1000 = 41,
+ /obj/item/stack/spacecash/c10000 = 12,
+ )
+```
+
+### Do not put empty items in the loot list
+
+Instead use the `spawn_loot_chance` var to control the chance for the spawner to spawn nothing.
+
+Good:
+
+```dm
+/obj/effect/spawner/random/structure/crate_abandoned
+ name = "locked crate spawner"
+ spawn_loot_chance = 20
+ loot = list(/obj/structure/closet/crate/secure/loot)
+```
+
+
+Bad:
+
+```dm
+/obj/effect/spawner/lootdrop/crate_spawner
+ name = "lootcrate spawner"
+ loot = list(
+ "" = 80
+ /obj/structure/closet/crate/secure/loot = 20,
+ )
+```
+
+### Avoid making a spawner that is a duplicate
+
+We don't want copy-cat spawners that are almost identical. Instead merge spawners together if possible.
+
+Good:
+
+```dm
+/obj/effect/spawner/random/exotic/armory
+ name = "armory loot spawner"
+ icon_state = "pistol"
+ loot = list(
+ /obj/item/gun/ballistic/automatic/pistol = 8,
+ /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+ /obj/item/storage/box/syndie_kit/throwing_weapons = 3,
+ /obj/item/grenade/clusterbuster/teargas = 2,
+ /obj/item/grenade/clusterbuster = 2,
+ /obj/item/gun/ballistic/automatic/pistol/deagle,
+ /obj/item/gun/ballistic/revolver/mateba,
+ )
+```
+
+
+Bad:
+
+```dm
+/obj/effect/spawner/lootdrop/armory_contraband
+ loot = list(
+ /obj/item/gun/ballistic/automatic/pistol = 8,
+ /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+ /obj/item/gun/ballistic/automatic/pistol/deagle,
+ /obj/item/gun/ballistic/revolver/mateba
+ )
+
+/obj/effect/spawner/lootdrop/armory_contraband/metastation
+ loot = list(
+ /obj/item/gun/ballistic/automatic/pistol = 8,
+ /obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+ /obj/item/storage/box/syndie_kit/throwing_weapons = 3,
+ /obj/item/gun/ballistic/automatic/pistol/deagle,
+ /obj/item/gun/ballistic/revolver/mateba
+ )
+
+```
diff --git a/code/game/objects/effects/spawners/random/salvaging.dm b/code/game/objects/effects/spawners/random/salvaging.dm
new file mode 100644
index 0000000000000..9a6f4571a35ea
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/salvaging.dm
@@ -0,0 +1,207 @@
+//GENERIC
+/obj/effect/spawner/random/salvage_capacitor
+ icon_state = "matter_bin"
+ loot = list(
+ /obj/item/stock_parts/capacitor = 120,
+ /obj/item/stock_parts/capacitor/adv = 20,
+ /obj/item/stock_parts/capacitor/super = 5,
+ )
+
+/obj/effect/spawner/random/salvage_scanning
+ icon_state = "matter_bin"
+ loot = list(
+ /obj/item/stock_parts/scanning_module = 120,
+ /obj/item/stock_parts/scanning_module/adv = 20,
+ /obj/item/stock_parts/scanning_module/phasic = 5,
+ )
+
+/obj/effect/spawner/random/salvage_manipulator
+ icon_state = "matter_bin"
+ loot = list(
+ /obj/item/stock_parts/manipulator = 120,
+ /obj/item/stock_parts/manipulator/nano = 20,
+ /obj/item/stock_parts/manipulator/pico = 5,
+ )
+
+/obj/effect/spawner/random/salvage_matter_bin
+ icon_state = "matter_bin"
+ loot = list(
+ /obj/item/stock_parts/matter_bin = 120,
+ /obj/item/stock_parts/matter_bin/adv = 20,
+ /obj/item/stock_parts/matter_bin/super = 5,
+ )
+
+/obj/effect/spawner/random/salvage_laser
+ icon_state = "matter_bin"
+ loot = list(
+ /obj/item/stock_parts/micro_laser = 120,
+ /obj/item/stock_parts/micro_laser/high = 20,
+ /obj/item/stock_parts/micro_laser/ultra = 5,
+ )
+
+//PROTOLATHE
+
+/obj/effect/spawner/random/random_gun_protolathe_lootdrop
+ icon_state = "laser_gun"
+ loot = list(
+ /obj/item/gun/energy/lasercannon = 1,
+ /obj/item/gun/ballistic/automatic/smg/skm_carbine/saber = 1,
+ /obj/item/gun/energy/temperature/security = 1,
+ )
+
+/obj/effect/spawner/random/random_ammo_protolathe_lootdrop
+ icon_state = "rubbershot"
+ loot = list(
+ /obj/item/stock_parts/cell/gun/upgraded = 5,
+ /obj/item/ammo_box/magazine/smgm9mm = 7,
+ )
+
+//DESTRUCTIVE ANAL //i'm killing you
+/obj/effect/spawner/random/destructive_anal_loot //what do people usually put in these things anayways
+ loot = list(
+ /obj/item/storage/toolbox/syndicate/empty = 650,
+ /obj/item/gun/ballistic/automatic/pistol/ringneck = 500,
+ /obj/item/camera_bug = 500,
+ /obj/item/clothing/gloves/combat = 200,
+ /obj/item/clothing/head/chameleon = 200,
+ /obj/item/pen/sleepy = 200,
+ /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 100,
+ /obj/item/grenade/c4 = 100,
+
+ /obj/item/wrench/syndie = 30,
+ /obj/item/screwdriver/nuke = 30,
+ /obj/item/crowbar/syndie = 30,
+ /obj/item/wirecutters/syndie = 30,
+ /obj/item/multitool/syndie = 30,
+ )
+
+/obj/effect/spawner/random/salvage_machine
+ name = "salvageable machine spawner"
+ icon_state = "arcade"
+ loot = list(
+ /obj/structure/salvageable/protolathe,
+ /obj/structure/salvageable/circuit_imprinter,
+ /obj/structure/salvageable/server,
+ /obj/structure/salvageable/machine,
+ /obj/structure/salvageable/autolathe,
+ /obj/structure/salvageable/computer,
+ /obj/structure/salvageable/destructive_analyzer
+ )
+
+/obj/effect/spawner/random/salvage
+ name = "salvage mats spawner"
+ icon_state = "rods"
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapmetal,
+ /obj/item/stack/ore/salvage/scrapgold,
+ /obj/item/stack/ore/salvage/scrapplasma,
+ /obj/item/stack/ore/salvage/scrapsilver,
+ /obj/item/stack/ore/salvage/scraptitanium,
+ /obj/item/stack/ore/salvage/scrapbluespace,
+ /obj/item/stack/ore/salvage/scrapuranium
+ )
+
+/obj/effect/spawner/random/salvage/half
+ name = "50% salvage spawner"
+ spawn_loot_chance = 50
+ loot = list(
+ /obj/effect/spawner/random/maintenance,
+ /obj/effect/spawner/random/salvage_machine,
+ /obj/effect/spawner/random/exotic/ripley,
+ /obj/structure/closet/crate/secure/loot,
+ )
+
+/obj/effect/spawner/random/salvage/metal
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapmetal
+ )
+
+/obj/effect/spawner/random/salvage/metal/Initialize()
+ spawn_loot_count = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+/obj/effect/spawner/random/salvage/gold
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapgold
+ )
+
+/obj/effect/spawner/random/salvage/gold/Initialize()
+ spawn_loot_count = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+/obj/effect/spawner/random/salvage/plasma
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapplasma
+ )
+/obj/effect/spawner/random/salvage/plasma/Initialize()
+ spawn_loot_count = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+
+/obj/effect/spawner/random/salvage/silver
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapsilver
+ )
+/obj/effect/spawner/random/salvage/silver/Initialize()
+ spawn_loot_count = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+
+/obj/effect/spawner/random/salvage/titanium
+ loot = list(
+ /obj/item/stack/ore/salvage/scraptitanium
+ )
+/obj/effect/spawner/random/salvage/titanium/Initialize()
+ spawn_loot_count = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+/obj/effect/spawner/random/salvage/bluespace
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapbluespace
+ )
+/obj/effect/spawner/random/salvage/bluespace/Initialize()
+ spawn_loot_count = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
+
+/obj/effect/spawner/random/salvage/uranium
+ loot = list(
+ /obj/item/stack/ore/salvage/scrapuranium
+ )
+/obj/effect/spawner/random/salvage/uranium/Initialize()
+ spawn_loot_count = pick(list(
+ 1,
+ 2,
+ 3,
+ 4
+ ))
+ return ..()
diff --git a/code/game/objects/effects/spawners/random/structure.dm b/code/game/objects/effects/spawners/random/structure.dm
new file mode 100644
index 0000000000000..0264b3d76a9ef
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/structure.dm
@@ -0,0 +1,91 @@
+
+/obj/effect/spawner/random/structure
+ name = "structure spawner"
+ desc = "Now you see me, now you don't..."
+ icon_state = "girder"
+
+/obj/effect/spawner/random/structure/crate_abandoned
+ name = "locked crate spawner"
+ icon_state = "crate_secure"
+ spawn_loot_chance = 20
+ loot = list(/obj/structure/closet/crate/secure/loot)
+
+/obj/effect/spawner/random/structure/girder
+ name = "girder spawner"
+ icon_state = "girder"
+ spawn_loot_chance = 90
+ loot = list( // 80% chance normal girder, 10% chance of displaced, 10% chance of nothing
+ /obj/structure/girder = 8,
+ /obj/structure/girder/displaced = 1,
+ )
+
+/obj/effect/spawner/random/structure/grille
+ name = "grille spawner"
+ icon_state = "grille"
+ spawn_loot_chance = 90
+ loot = list( // 80% chance normal grille, 10% chance of broken, 10% chance of nothing
+ /obj/structure/grille = 8,
+ /obj/structure/grille/broken = 1,
+ )
+
+/obj/effect/spawner/random/structure/furniture_parts
+ name = "furniture parts spawner"
+ icon_state = "table_parts"
+ loot = list(
+ /obj/structure/table_frame,
+ /obj/structure/table_frame/wood,
+ /obj/item/rack_parts,
+ )
+
+/obj/effect/spawner/random/structure/table_or_rack
+ name = "table or rack spawner"
+ icon_state = "rack_parts"
+ loot = list(
+ /obj/effect/spawner/random/structure/table,
+ /obj/structure/rack,
+ )
+
+/obj/effect/spawner/random/structure/table
+ name = "table spawner"
+ icon_state = "table"
+ loot = list(
+ /obj/structure/table = 40,
+ /obj/structure/table/wood = 30,
+ /obj/structure/table/glass = 20,
+ /obj/structure/table/reinforced = 5,
+ /obj/structure/table/wood/poker = 5,
+ )
+
+/obj/effect/spawner/random/structure/closet_empty
+ name = "empty closet spawner"
+ icon_state = "locker"
+ loot = list(
+ /obj/structure/closet = 850,
+ /obj/structure/closet/cabinet = 150,
+ /obj/structure/closet/acloset = 1,
+ )
+
+/obj/effect/spawner/random/structure/closet_empty/crate
+ name = "empty crate spawner"
+ icon_state = "crate"
+ loot = list(
+ /obj/structure/closet/crate = 20,
+ /obj/structure/closet/crate/wooden = 1,
+ /obj/structure/closet/crate/internals = 1,
+ /obj/structure/closet/crate/medical = 1,
+ /obj/structure/closet/crate/freezer = 1,
+ /obj/structure/closet/crate/radiation = 1,
+ /obj/structure/closet/crate/hydroponics = 1,
+ /obj/structure/closet/crate/engineering = 1,
+ /obj/structure/closet/crate/engineering/electrical = 1,
+ /obj/structure/closet/crate/science = 1,
+ )
+
+/obj/effect/spawner/random/structure/barricade
+ name = "barricade spawner"
+ icon_state = "barricade"
+ spawn_loot_chance = 80
+ loot = list(
+ /obj/structure/barricade/wooden,
+ /obj/structure/barricade/wooden/crude,
+ )
diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm
new file mode 100644
index 0000000000000..3c15e77106a36
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/trash.dm
@@ -0,0 +1,282 @@
+/obj/effect/spawner/random/trash
+ name = "trash spawner"
+ desc = "Ewwwwwww gross."
+ icon_state = "trash"
+
+/obj/effect/spawner/random/trash/garbage
+ name = "garbage spawner"
+ loot = list(
+ /obj/effect/spawner/random/trash/food_packaging = 20,
+ /obj/item/trash/can = 15,
+ /obj/item/shard = 10,
+ /obj/effect/spawner/random/trash/cigbutt = 10,
+ /obj/effect/spawner/random/trash/botanical_waste = 5,
+ /obj/item/broken_bottle = 5,
+ /obj/item/light/tube/broken = 5,
+ /obj/item/light/bulb/broken = 5,
+ /obj/item/assembly/mousetrap/armed = 5,
+ /obj/item/stack/cable_coil = 5,
+ /obj/item/trash/candle = 1,
+ /obj/item/reagent_containers/glass/rag = 1,
+ /obj/item/popsicle_stick = 1,
+ /obj/item/reagent_containers/syringe = 1,
+ /obj/item/shard/plasma = 1,
+ )
+
+/obj/effect/spawner/random/trash/deluxe_garbage
+ name = "fancy deluxe garbage spawner"
+ loot = list(
+ /obj/effect/spawner/random/trash/garbage = 25,
+ /obj/effect/spawner/random/trash/food_packaging = 10,
+ /obj/effect/spawner/random/entertainment/money = 10,
+ /obj/effect/spawner/random/trash/crushed_can = 10,
+ /obj/item/shard/plasma = 5,
+ /obj/item/reagent_containers/pill/floorpill = 5,
+ /obj/effect/spawner/random/trash/soap = 3,
+ /obj/item/broken_bottle = 3,
+ /obj/effect/spawner/random/engineering/tool/common = 1,
+ /mob/living/simple_animal/mouse = 1,
+ /obj/item/reagent_containers/glass/rag = 1,
+ /obj/effect/spawner/random/entertainment/drugs= 1,
+ /obj/item/reagent_containers/syringe = 1,
+ /obj/effect/spawner/random/entertainment/cigar = 1,
+ /obj/item/stack/ore/gold = 1,
+ )
+
+/obj/effect/spawner/random/trash/cigbutt
+ name = "cigarette butt spawner"
+ loot = list(
+ /obj/item/cigbutt = 25,
+ /obj/item/cigbutt/roach = 25,
+ /obj/effect/decal/cleanable/ash = 25,
+ /obj/item/cigbutt/cigarbutt = 15,
+ )
+
+/obj/effect/spawner/random/trash/food_packaging
+ name = "empty food packaging spawner"
+ icon_state = "chips"
+ loot = list(
+ /obj/item/trash/raisins = 2,
+ /obj/item/trash/cheesie = 2,
+ /obj/item/trash/candy = 2,
+ /obj/item/trash/chips = 2,
+ /obj/item/trash/sosjerky = 2,
+ /obj/item/trash/pistachios = 2,
+ /obj/item/trash/boritos = 1,
+ /obj/item/trash/can/food/beans = 1,
+ /obj/item/trash/can/food/peaches = 1,
+ /obj/item/trash/popcorn = 1,
+ /obj/item/trash/energybar = 1,
+ /obj/item/trash/can/food/peaches/maint = 1,
+ /obj/item/trash/semki = 1,
+ /obj/item/trash/syndi_cakes = 1,
+ /obj/item/trash/tray = 1,
+ )
+
+/obj/effect/spawner/random/trash/botanical_waste
+ name = "botanical waste spawner"
+ icon_state = "peel"
+ loot = list(
+ /obj/item/grown/bananapeel = 6,
+ /obj/item/grown/corncob = 3,
+ )
+
+/obj/effect/spawner/random/trash/grille_or_waste
+ name = "grille or waste spawner"
+ icon_state = "grille"
+ loot = list(
+ /obj/structure/grille = 5,
+ /obj/effect/spawner/random/trash/food_packaging = 3,
+ /obj/effect/spawner/random/trash/cigbutt = 1,
+ /obj/item/reagent_containers/food/snacks/deadmouse = 1,
+ )
+
+/obj/effect/spawner/random/trash/decal
+ icon_state = "vomit"
+ loot = list(
+ /obj/effect/decal/cleanable/greenglow/filled = 30,
+ /obj/effect/decal/cleanable/greenglow/ecto = 1,
+ /obj/effect/decal/cleanable/glass = 30,
+ /obj/effect/decal/cleanable/glass/plasma = 30,
+ /obj/effect/decal/cleanable/glass/strange = 30,
+ /obj/effect/decal/cleanable/molten_object = 30,
+ /obj/effect/decal/cleanable/molten_object/large = 30,
+ /obj/effect/decal/cleanable/oil = 30,
+ /obj/effect/decal/cleanable/oil/slippery = 1, // :)
+ /obj/effect/decal/cleanable/plastic = 30,
+ /obj/effect/decal/cleanable/ash = 30,
+ /obj/effect/decal/cleanable/ash/large = 30,
+ )
+
+/obj/effect/spawner/random/trash/mess
+ name = "gross decal spawner"
+ icon_state = "vomit"
+ loot = list(
+ /obj/effect/decal/cleanable/dirt = 6,
+ /obj/effect/decal/cleanable/garbage = 3,
+ /obj/effect/decal/cleanable/vomit/old = 3,
+ /obj/effect/decal/cleanable/blood/gibs/old = 3,
+ /obj/effect/decal/cleanable/insectguts = 1,
+ /obj/effect/decal/cleanable/greenglow/ecto = 1,
+ /obj/effect/decal/cleanable/wrapping = 1,
+ /obj/effect/decal/cleanable/plastic = 1,
+ /obj/effect/decal/cleanable/glass = 1,
+ )
+
+/obj/effect/spawner/random/trash/grime
+ name = "trash and grime spawner"
+ spawn_loot_count = 5
+ spawn_scatter_radius = 2
+ loot = list( // This spawner will scatter garbage around a dirty site.
+ /obj/effect/spawner/random/trash/garbage = 6,
+ /mob/living/simple_animal/hostile/cockroach = 5,
+ /obj/effect/decal/cleanable/garbage = 4,
+ /obj/effect/decal/cleanable/vomit/old = 3,
+ /obj/effect/spawner/random/trash/cigbutt = 2,
+ )
+
+/obj/effect/spawner/random/trash/moisture
+ name = "water hazard spawner"
+ icon_state = "caution"
+ spawn_loot_count = 2
+ spawn_scatter_radius = 1
+ loot = list( // This spawner will scatter water related items around a moist site.
+ /obj/item/clothing/head/cone = 7,
+ /obj/item/clothing/suit/caution = 3,
+ /mob/living/simple_animal/hostile/retaliate/frog = 2,
+ /obj/item/reagent_containers/glass/rag = 2,
+ /obj/item/reagent_containers/glass/bucket = 2,
+ /obj/effect/decal/cleanable/blood/old = 2,
+ )
+
+/obj/effect/spawner/random/trash/graffiti
+ name = "random graffiti spawner"
+ icon_state = "rune"
+ loot = list(/obj/effect/decal/cleanable/crayon)
+ var/graffiti_icons = list(
+ "rune1", "rune2", "rune3", "rune4", "rune5", "rune6",
+ "amyjon", "face", "matt", "revolution", "engie", "guy",
+ "end", "dwarf", "uboa", "body", "cyka", "star",
+ "prolizard", "antilizard", "danger", "firedanger", "electricdanger",
+ "biohazard", "radiation", "safe", "evac", "space", "med", "trade", "shop",
+ "food", "peace", "like", "skull", "nay", "heart", "credit",
+ "smallbrush", "brush", "largebrush", "splatter", "snake", "stickman",
+ "carp", "ghost", "clown", "taser", "disk", "fireaxe", "toolbox",
+ "corgi", "cat", "toilet", "blueprint", "beepsky", "scroll", "bottle",
+ "shotgun", "arrow", "line", "thinline", "shortline", "body", "chevron",
+ "footprint", "clawprint", "pawprint",
+ )
+ // This sets the color of the graffiti (used for mapedits)
+ color = COLOR_WHITE
+ /// Whether the graffiti will spawn with a random color (used for mapedits)
+ var/random_color = TRUE
+ /// Whether the graffiti will spawn with this spawner's icon_state instead of a random one (used for mapedits)
+ var/random_icon = TRUE
+
+/obj/effect/spawner/random/trash/graffiti/make_item(spawn_loc, type_path_to_make)
+ var/obj/effect/decal/cleanable/crayon/graffiti_decal = ..()
+ if(istype(graffiti_decal))
+ color = random_color && "#[random_short_color()]" || color
+ icon_state = random_icon && pick(graffiti_icons) || icon_state
+
+ graffiti_decal.add_atom_colour(color, FIXED_COLOUR_PRIORITY)
+ graffiti_decal.icon_state = icon_state
+
+ return graffiti_decal
+
+/obj/effect/spawner/random/trash/mopbucket
+ name = "mop bucket spawner"
+ icon_state = "mopbucket"
+ spawn_loot_count = 2
+ spawn_loot_double = FALSE
+ loot = list(
+ /obj/item/mop = 5,
+ /obj/item/clothing/suit/caution = 3,
+ /obj/item/reagent_containers/glass/bucket = 1,
+ /obj/item/reagent_containers/glass/bucket/wooden = 1,
+ )
+
+/obj/effect/spawner/random/trash/caution_sign
+ name = "caution sign spawner"
+ icon_state = "caution"
+ loot = list(
+ /obj/item/clothing/suit/caution = 40,
+ /obj/structure/holosign/wetsign = 5,
+ /obj/structure/holosign/barrier = 3,
+ /obj/structure/holosign/barrier/wetsign = 2,
+ )
+
+/obj/effect/spawner/random/trash/bucket
+ name = "bucket spawner"
+ icon_state = "caution"
+ loot = list(
+ /obj/item/reagent_containers/glass/bucket,
+ /obj/item/reagent_containers/glass/bucket/wooden,
+ )
+
+/obj/effect/spawner/random/trash/soap
+ name = "soap spawner"
+ icon_state = "soap"
+ loot = list(
+ /obj/item/soap = 25,
+ /obj/item/bikehorn/rubberducky = 20,
+ /obj/item/soap/homemade = 20,
+ /obj/item/soap/deluxe = 15,
+ /obj/item/soap/nanotrasen = 10,
+ )
+
+/obj/effect/spawner/random/trash/box
+ name = "box spawner"
+ icon_state = "box"
+ loot = list(
+ /obj/structure/closet/cardboard = 9,
+ /obj/structure/closet/cardboard/metal = 1,
+ )
+
+/obj/effect/spawner/random/trash/bin
+ name = "trashbin spawner"
+ icon_state = "trash_bin"
+ loot = list(
+ /obj/structure/closet/crate/bin = 10,
+ /obj/structure/closet/crate/trashcart = 3,
+ /obj/effect/spawner/random/trash/box = 3,
+ /obj/structure/closet/crate/trashcart/laundry = 1,
+ )
+
+
+/obj/effect/spawner/random/trash/janitor_supplies
+ name = "janitor supplies spawner"
+ icon_state = "box_small"
+ loot = list(
+ /obj/item/storage/box/mousetraps,
+ /obj/item/storage/box/lights/tubes,
+ /obj/item/storage/box/lights/mixed,
+ /obj/item/storage/box/lights/bulbs,
+ )
+
+/obj/effect/spawner/random/trash/crushed_can
+ name = "crushed can spawner"
+ icon_state = "crushed_can"
+ loot = list(/obj/item/trash/can)
+ /// Whether the can will spawn with this spawner's icon_state instead of a random one (used for mapedits)
+ var/soda_icons = list(
+ "energy_drink", "monkey_energy", "thirteen_loko", "space_mountain_wind", "dr_gibb", "starkist",
+ "sodawater", "tonic", "cola", "purple_can", "ice_tea_can",
+ "sol_dry", "wellcheers", "space beer", "ebisu", "shimauma", "moonlabor",
+ "space_up", "lemon_lime", "shamblers", "shamblerseldritch", "air", "laughter",
+ "volt_energy", "melon_soda",
+ )
+
+/obj/effect/spawner/random/trash/crushed_can/make_item(spawn_loc, type_path_to_make)
+ var/obj/item/trash/can/crushed_can = .. ()
+ if(istype(crushed_can))
+ crushed_can.icon_state = pick(soda_icons)
+ return crushed_can
+
+/obj/effect/spawner/random/trash/ghetto_containers
+ name = "ghetto container spawner"
+ loot = list(
+ /obj/item/reagent_containers/glass/bucket = 5,
+ /obj/item/reagent_containers/glass/bottle = 5,
+ /obj/item/reagent_containers/glass/mortar = 2,
+ )
diff --git a/code/game/objects/effects/spawners/random/vending.dm b/code/game/objects/effects/spawners/random/vending.dm
new file mode 100644
index 0000000000000..595746e14e191
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/vending.dm
@@ -0,0 +1,17 @@
+/obj/effect/spawner/random/vending
+ name = "machinery spawner"
+ desc = "Randomized electronics for extra fun."
+
+/obj/effect/spawner/random/vending/snack
+ name = "spawn random snack vending machine"
+ desc = "Automagically transforms into a random snack vendor. If you see this while in a shift, please create a bug report."
+ icon_state = "snack"
+ loot_type_path = /obj/machinery/vending/snack
+ loot = list()
+
+/obj/effect/spawner/random/vending/cola
+ name = "spawn random cola vending machine"
+ desc = "Automagically transforms into a random cola vendor. If you see this while in a shift, please create a bug report."
+ icon_state = "cola"
+ loot_type_path = /obj/machinery/vending/cola
+ loot = list()
diff --git a/code/game/objects/effects/spawners/random/waste_planet.dm b/code/game/objects/effects/spawners/random/waste_planet.dm
new file mode 100644
index 0000000000000..1f416ed02007a
--- /dev/null
+++ b/code/game/objects/effects/spawners/random/waste_planet.dm
@@ -0,0 +1,144 @@
+/obj/effect/spawner/random/waste/grille_or_trash
+ icon_state = "grille"
+ name = "wasteplanet loot spawner"
+ loot = list(
+ /obj/structure/grille/broken = 5,
+ /obj/structure/grille = 5,
+ /obj/item/cigbutt = 1,
+ /obj/item/trash/cheesie = 1,
+ /obj/item/trash/candy = 1,
+ /obj/item/trash/chips = 1,
+ /obj/item/reagent_containers/food/snacks/deadmouse = 1,
+ /obj/item/trash/pistachios = 1,
+ /obj/item/trash/plate = 1,
+ /obj/item/trash/popcorn = 1,
+ /obj/item/trash/raisins = 1,
+ /obj/item/trash/sosjerky = 1,
+ /obj/item/trash/syndi_cakes = 1
+ )
+
+/obj/effect/spawner/random/waste/mechwreck
+ icon_state = "ripley"
+ name = "wasteplanet exosuit wreckage"
+ loot = list(
+ /obj/structure/mecha_wreckage/ripley = 15,
+ /obj/structure/mecha_wreckage/ripley/firefighter = 9,
+ /obj/structure/mecha_wreckage/ripley/mkii = 9,
+ /obj/structure/mecha_wreckage/ripley/clip = 9
+ )
+
+/obj/effect/spawner/random/waste/mechwreck/rare
+ loot = list(
+ /obj/structure/mecha_wreckage/durand = 12.5,
+ /obj/structure/mecha_wreckage/durand/clip = 12.5,
+ /obj/structure/mecha_wreckage/odysseus = 25,
+ /obj/structure/mecha_wreckage/gygax = 25
+ )
+
+/obj/effect/spawner/random/waste/radiation
+ loot = list(
+ /obj/structure/hazard/radioactive = 6,
+ /obj/structure/hazard/radioactive/stack = 6,
+ /obj/structure/hazard/radioactive/waste = 6
+ )
+
+/obj/effect/spawner/random/waste/radiation/more_rads
+ loot = list(
+ /obj/structure/hazard/radioactive = 3,
+ /obj/structure/hazard/radioactive/stack = 12,
+ /obj/structure/hazard/radioactive/waste = 12
+ )
+
+/obj/effect/spawner/random/waste/atmos_can
+ loot = list(
+ /obj/machinery/portable_atmospherics/canister/toxins = 3,
+ /obj/machinery/portable_atmospherics/canister/carbon_dioxide = 3,
+ /obj/machinery/portable_atmospherics/canister/nitrogen = 3,
+ /obj/machinery/portable_atmospherics/canister/oxygen = 3,
+ /obj/machinery/portable_atmospherics/canister/nitrous_oxide = 1,
+ /obj/machinery/portable_atmospherics/canister/water_vapor = 1
+ )
+
+/obj/effect/spawner/random/waste/atmos_can/rare
+ loot = list(
+ /obj/machinery/portable_atmospherics/canister/tritium = 3,
+ /obj/machinery/portable_atmospherics/canister/methane = 3
+ )
+
+/obj/effect/spawner/random/waste/salvageable
+ loot = list(
+ /obj/structure/salvageable/machine = 20,
+ /obj/structure/salvageable/autolathe = 15,
+ /obj/structure/salvageable/computer = 10,
+ /obj/structure/salvageable/protolathe = 10,
+ /obj/structure/salvageable/circuit_imprinter = 8,
+ /obj/structure/salvageable/destructive_analyzer = 8,
+ /obj/structure/salvageable/server = 8
+ )
+
+/obj/effect/spawner/random/waste/girder
+ loot = list(
+ /obj/structure/girder/wasteworld,
+ /obj/structure/girder/wasteworld,
+ /obj/structure/girder/wasteworld,
+ /obj/structure/girder,
+ /obj/structure/girder/displaced,
+ /obj/structure/girder/reinforced
+ )
+
+/obj/effect/spawner/random/waste/hivebot
+ loot = list(
+ /obj/effect/spawner/random/salvage/metal,
+ /obj/effect/spawner/random/salvage/metal,
+ /obj/effect/spawner/random/salvage/metal,
+ /obj/effect/spawner/random/salvage/gold,
+ /obj/effect/spawner/random/salvage/plasma,
+ /obj/effect/spawner/random/salvage/silver,
+ /obj/effect/spawner/random/salvage/titanium,
+ /obj/item/stack/ore/salvage/scrapbluespace,
+ /obj/item/stack/ore/salvage/scrapbluespace,
+ /obj/item/stack/ore/salvage/scrapuranium
+ )
+ spawn_loot_count = 2
+
+/obj/effect/spawner/random/waste/hivebot/more
+ spawn_loot_count = 4
+
+/obj/effect/spawner/random/waste/hivebot/part
+ loot = list(
+ /obj/item/stock_parts/capacitor,
+ /obj/item/stock_parts/scanning_module,
+ /obj/item/stock_parts/manipulator,
+ /obj/item/stock_parts/micro_laser,
+ /obj/item/stock_parts/matter_bin,
+ /obj/item/stock_parts/capacitor/adv,
+ /obj/item/stock_parts/scanning_module/adv,
+ /obj/item/stock_parts/manipulator/nano,
+ /obj/item/stock_parts/micro_laser/high,
+ /obj/item/stock_parts/matter_bin/adv,
+ )
+ spawn_loot_count = 1
+ spawn_loot_chance = 100
+
+/obj/effect/spawner/random/waste/hivebot/part/heavy
+ loot = list(
+ /obj/item/stock_parts/capacitor/super,
+ /obj/item/stock_parts/scanning_module/phasic,
+ /obj/item/stock_parts/manipulator/pico,
+ /obj/item/stock_parts/micro_laser/ultra,
+ /obj/item/stock_parts/matter_bin/super,
+ )
+
+
+/obj/effect/spawner/random/waste/hivebot/part/superheavy
+ loot = list(
+ /obj/item/stock_parts/capacitor/quadratic,
+ /obj/item/stock_parts/scanning_module/triphasic,
+ /obj/item/stock_parts/manipulator/femto,
+ /obj/item/stock_parts/micro_laser/quadultra,
+ /obj/item/stock_parts/matter_bin/bluespace,
+ )
+
+
+/obj/effect/spawner/random/waste/hivebot/beacon
+ spawn_loot_count = 6
diff --git a/code/game/objects/effects/spawners/spawner.dm b/code/game/objects/effects/spawners/spawner.dm
new file mode 100644
index 0000000000000..d8091c6cfc65f
--- /dev/null
+++ b/code/game/objects/effects/spawners/spawner.dm
@@ -0,0 +1,23 @@
+/obj/effect/spawner
+ name = "object spawner"
+
+// Brief explanation:
+// Rather then setting up and then deleting spawners, we block all atomlike setup
+// and do the absolute bare minimum
+// This is with the intent of optimizing mapload
+/obj/effect/spawner/Initialize(mapload)
+ SHOULD_CALL_PARENT(FALSE)
+ if(flags_1 & INITIALIZED_1)
+ stack_trace("Warning: [src]([type]) initialized multiple times!")
+ flags_1 |= INITIALIZED_1
+
+ return INITIALIZE_HINT_QDEL
+
+/obj/effect/spawner/Destroy(force)
+ SHOULD_CALL_PARENT(FALSE)
+ moveToNullspace()
+ return QDEL_HINT_QUEUE
+
+/// Override to define loot blacklist behavior
+/obj/effect/spawner/proc/can_spawn(atom/loot)
+ return TRUE
diff --git a/code/game/objects/effects/spawners/traps.dm b/code/game/objects/effects/spawners/traps.dm
deleted file mode 100644
index 0409d9944b9bb..0000000000000
--- a/code/game/objects/effects/spawners/traps.dm
+++ /dev/null
@@ -1,9 +0,0 @@
-/obj/effect/spawner/trap
- name = "random trap"
- icon = 'icons/obj/hand_of_god_structures.dmi'
- icon_state = "trap_rand"
-
-/obj/effect/spawner/trap/Initialize(mapload)
- . = ..()
- var/new_type = pick(subtypesof(/obj/structure/trap) - typesof(/obj/structure/trap/ctf))
- new new_type(get_turf(src))
diff --git a/code/game/objects/effects/spawners/vaultspawner.dm b/code/game/objects/effects/spawners/vaultspawner.dm
deleted file mode 100644
index 9bdf0a673ed9b..0000000000000
--- a/code/game/objects/effects/spawners/vaultspawner.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/obj/effect/vaultspawner
- var/maxX = 6
- var/maxY = 6
- var/minX = 2
- var/minY = 2
-
-/obj/effect/vaultspawner/New(turf/location,lX = minX,uX = maxX,lY = minY,uY = maxY,type = null)
- if(!type)
- type = pick("sandstone","rock","alien")
-
- var/lowBoundX = location.x
- var/lowBoundY = location.y
-
- var/hiBoundX = location.x + rand(lX,uX)
- var/hiBoundY = location.y + rand(lY,uY)
-
- var/z = location.z
-
- for(var/i = lowBoundX,i<=hiBoundX,i++)
- for(var/j = lowBoundY,j<=hiBoundY,j++)
- var/turf/T = locate(i,j,z)
- if(i == lowBoundX || i == hiBoundX || j == lowBoundY || j == hiBoundY)
- T.PlaceOnTop(/turf/closed/wall/vault)
- else
- T.PlaceOnTop(/turf/open/floor/vault)
- T.icon_state = "[type]vault"
-
- qdel(src)
diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm
deleted file mode 100644
index 1eb4fd0dda943..0000000000000
--- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm
+++ /dev/null
@@ -1,18 +0,0 @@
-/obj/effect/spawner/xeno_egg_delivery
- name = "xeno egg delivery"
- icon = 'icons/mob/alien.dmi'
- icon_state = "egg_growing"
- var/announcement_time = 1200
-
-/obj/effect/spawner/xeno_egg_delivery/Initialize(mapload)
- . = ..()
- var/turf/T = get_turf(src)
-
- new /obj/structure/alien/egg(T)
- new /obj/effect/temp_visual/gravpush(T)
- playsound(T, 'sound/items/party_horn.ogg', 50, TRUE, -1)
-
- message_admins("An alien egg has been delivered to [ADMIN_VERBOSEJMP(T)].")
- log_game("An alien egg has been delivered to [AREACOORD(T)]")
- var/message = "Attention [station_name()], we have entrusted you with a research specimen in [get_area_name(T, TRUE)]. Remember to follow all safety precautions when dealing with the specimen."
- SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(print_command_report), message), announcement_time))
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 2b82f656ac48a..92c92655cb8c9 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -207,16 +207,6 @@
icon_state = "blspell"
duration = 5
-/obj/effect/temp_visual/guardian
- randomdir = 0
-
-/obj/effect/temp_visual/guardian/phase
- duration = 5
- icon_state = "phasein"
-
-/obj/effect/temp_visual/guardian/phase/out
- icon_state = "phaseout"
-
/obj/effect/temp_visual/decoy
desc = "It's a decoy!"
duration = 15
diff --git a/code/game/objects/effects/turf_fire.dm b/code/game/objects/effects/turf_fire.dm
index 0bed49a3709c7..9dbcaa27034aa 100644
--- a/code/game/objects/effects/turf_fire.dm
+++ b/code/game/objects/effects/turf_fire.dm
@@ -65,11 +65,17 @@
/obj/effect/abstract/turf_fire/Initialize(mapload, power, fire_color)
. = ..()
- particles = new /particles/smoke/turf_fire
var/turf/open/open_turf = loc
if(open_turf.turf_fire)
return INITIALIZE_HINT_QDEL
+ var/datum/gas_mixture/environment = open_turf.air
+ var/oxy = environment.get_moles(GAS_O2)
+ if (oxy < TURF_FIRE_BURN_MINIMUM_OXYGEN_REQUIRED)
+ return INITIALIZE_HINT_QDEL
+
+ particles = new /particles/smoke/turf_fire
+
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
@@ -84,6 +90,18 @@
color = fire_color
base_icon_state = "greyscale"
+ switch(base_icon_state) //switches light color depdning on the flame color
+ if("greyscale")
+ light_color = hex_color
+ if("red")
+ light_color = LIGHT_COLOR_FIRE
+ if("blue")
+ light_color = LIGHT_COLOR_CYAN
+ if("green")
+ light_color = LIGHT_COLOR_GREEN
+ else
+ light_color = COLOR_VERY_LIGHT_GRAY
+
open_turf.turf_fire = src
START_PROCESSING(SSturf_fire, src)
if(power)
@@ -100,27 +118,28 @@
var/turf/open/open_turf = loc
if(open_turf.planetary_atmos)
return TRUE
+
var/datum/gas_mixture/cached_air = open_turf.air
+
var/oxy = cached_air.get_moles(GAS_O2)
if (oxy < TURF_FIRE_BURN_MINIMUM_OXYGEN_REQUIRED)
return FALSE
+
var/temperature = cached_air.return_temperature()
var/old_heat_capacity = cached_air.heat_capacity()
+
var/burn_rate = TURF_FIRE_BURN_RATE_BASE + fire_power * TURF_FIRE_BURN_RATE_PER_POWER
- if(burn_rate > oxy)
- burn_rate = oxy
+ burn_rate = max(oxy, burn_rate)
- var/new_o2 = (cached_air.get_moles(GAS_O2) - burn_rate)
- cached_air.set_moles(GAS_O2, new_o2)
+ cached_air.adjust_moles(GAS_O2, -burn_rate)
- var/new_co2 = (cached_air.get_moles(GAS_O2) + burn_rate * TURF_FIRE_BURN_CARBON_DIOXIDE_MULTIPLIER)
- cached_air.set_moles(GAS_CO2, new_co2)
+ cached_air.adjust_moles(GAS_CO2, burn_rate * TURF_FIRE_BURN_CARBON_DIOXIDE_MULTIPLIER)
var/new_heat_capacity = cached_air.heat_capacity()
var/energy_released = burn_rate * TURF_FIRE_ENERGY_PER_BURNED_OXY_MOL
cached_air.adjust_heat((temperature * old_heat_capacity + energy_released) / new_heat_capacity)
- open_turf.air = cached_air
- open_turf.air_update_turf(TRUE)
+
+ open_turf.air_update_turf()
return TRUE
/obj/effect/abstract/turf_fire/process()
@@ -180,29 +199,18 @@
return
current_fire_state = new_state
- switch(base_icon_state) //switches light color depdning on the flame color
- if("greyscale")
- light_color = hex_color
- if("red")
- light_color = LIGHT_COLOR_FIRE
- if("blue")
- light_color = LIGHT_COLOR_CYAN
- if("green")
- light_color = LIGHT_COLOR_GREEN
- else
- light_color = COLOR_VERY_LIGHT_GRAY
- update_light()
-
switch(current_fire_state)
if(TURF_FIRE_STATE_SMALL)
icon_state = "[base_icon_state]_small"
- set_light_range(1.5)
+ light_range = 1.5
if(TURF_FIRE_STATE_MEDIUM)
icon_state = "[base_icon_state]_medium"
- set_light_range(2.5)
+ light_range = 2
if(TURF_FIRE_STATE_LARGE)
icon_state = "[base_icon_state]_big"
- set_light_range(3)
+ light_range = 3
+
+ update_light()
#undef TURF_FIRE_REQUIRED_TEMP
#undef TURF_FIRE_TEMP_BASE
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 90669dde84bbd..c4358a71714d6 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -26,6 +26,14 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
///Icon file for right inhand overlays
var/righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+ ///If set it will add a world icon using item_state
+ var/world_file
+
+ ///Handled by world_icon element
+ var/world_state
+ ///Handled by world_icon element
+ var/inventory_state
+
///This is a bitfield that defines what variations exist for bodyparts like Digi legs.
var/supports_variations = null
@@ -70,12 +78,20 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/usesound
///Used when yate into a mob
var/mob_throw_hit_sound
- ///Sound used when equipping the item into a valid slot
+ ///Sound used when an item has been equipped into a valid slot
var/equip_sound
///Sound uses when picking the item up (into your hands)
var/pickup_sound
///Sound uses when dropping the item, or when its thrown.
var/drop_sound
+ ///Sound used when an item is being equipped with equip_delay
+ var/equipping_sound
+ ///Sound used when an item is being unequipped with equip_delay
+ var/unequipping_sound
+
+ ///flags used for equip_delay
+ var/equip_self_flags = NONE
+
///Whether or not we use stealthy audio levels for this item's attack sounds
var/stealthy_audio = FALSE
@@ -138,6 +154,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/strip_delay = 40
///How long it takes to resist out of the item (cuffs and such)
var/breakouttime = 0
+ ///How much power would this item use?
+ var/power_use_amount = POWER_CELL_USE_NORMAL
/// Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
var/list/attack_verb
@@ -207,10 +225,6 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/canMouseDown = FALSE
- //for setting world icons on the go
- var/inventory_state
- var/world_state
-
/obj/item/Initialize()
if(attack_verb)
@@ -309,6 +323,9 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
updateEmbedding()
+ if(world_file)
+ AddElement(/datum/element/world_icon, null, world_file, icon)
+
if(GLOB.rpg_loot_items)
AddComponent(/datum/component/fantasy)
@@ -453,7 +470,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
if(throwing)
throwing.finalize(FALSE)
if(loc == user)
- if(!allow_attack_hand_drop(user) || !user.temporarilyRemoveItemFromInventory(src))
+ if(!allow_attack_hand_drop(user) || !user.temporarilyRemoveItemFromInventory(src, use_unequip_delay = TRUE))
return
remove_outline()
@@ -516,8 +533,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
@@ -958,6 +975,11 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
/obj/item/proc/remove_outline()
remove_filter(HOVER_OUTLINE_FILTER)
+/// Use the power of an attached component that posesses power handling, will return the signal bitflag.
+/obj/item/proc/item_use_power(use_amount, mob/user, check_only)
+ SHOULD_CALL_PARENT(TRUE)
+ return SEND_SIGNAL(src, COMSIG_ITEM_POWER_USE, use_amount, user, check_only)
+
/// Called when a mob tries to use the item as a tool.Handles most checks.
/obj/item/proc/use_tool(atom/target, mob/living/user, delay, amount=0, volume=0, datum/callback/extra_checks)
// we have no target, why are we even doing this?
@@ -1180,8 +1202,12 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
///Intended for interactions with guns, like racking
/obj/item/proc/unique_action(mob/living/user)
- return
+///Called before unique action, if any other associated items should do a unique action or override it.
+/obj/item/proc/pre_unique_action(mob/living/user)
+ if(SEND_SIGNAL(src,COMSIG_CLICK_UNIQUE_ACTION,user) & OVERIDE_UNIQUE_ACTION)
+ return TRUE
+ return FALSE //return true if the proc should end here
/**
* Returns null if this object cannot be used to interact with physical writing mediums such as paper.
* Returns a list of key attributes for this object interacting with paper otherwise.
@@ -1197,6 +1223,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
@@ -1219,7 +1257,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
*/
/obj/item/proc/on_accidental_consumption(mob/living/carbon/victim, mob/living/carbon/user, obj/item/source_item, discover_after = TRUE)
if(get_sharpness() && force >= 5) //if we've got something sharp with a decent force (ie, not plastic)
- INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream")
+ INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, force_scream))
victim.visible_message("[victim] looks like [victim.p_theyve()] just bit something they shouldn't have!", \
"OH GOD! Was that a crunch? That didn't feel good at all!!")
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 7548625b31f62..f185cdb43a81a 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -575,10 +575,10 @@ RLD
/obj/item/rcd_ammo
name = "compressed matter cartridge"
desc = "Highly compressed matter for the RCD."
- icon = 'icons/obj/ammo.dmi'
+ icon = 'icons/obj/ammunition/ammo.dmi'
icon_state = "rcd"
item_state = "rcdammo"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_NORMAL
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
custom_materials = list(/datum/material/iron=12000, /datum/material/glass=8000)
diff --git a/code/game/objects/items/attachments/_attachment.dm b/code/game/objects/items/attachments/_attachment.dm
index dbb7a111355eb..1b46b59f8db2f 100644
--- a/code/game/objects/items/attachments/_attachment.dm
+++ b/code/game/objects/items/attachments/_attachment.dm
@@ -25,6 +25,9 @@
var/pixel_shift_x = 16
///Determines the amount of pixels to move the icon state for the overlay. in the y direction
var/pixel_shift_y = 16
+ /// Determines what layer the icon state for the overlay renders on.
+ var/render_layer = FLOAT_LAYER //inhands
+ var/render_plane = FLOAT_PLANE //world
//Toggle modifers are handled seperatly
///Modifier applied to the parent
@@ -47,6 +50,13 @@
CALLBACK(src, PROC_REF(remove_attachment)), \
CALLBACK(src, PROC_REF(toggle_attachment)), \
CALLBACK(src, PROC_REF(on_preattack)), \
+ CALLBACK(src, PROC_REF(on_attacked)), \
+ CALLBACK(src, PROC_REF(on_unique_action)), \
+ CALLBACK(src, PROC_REF(on_ctrl_click)), \
+ CALLBACK(src, PROC_REF(on_wield)), \
+ CALLBACK(src, PROC_REF(on_unwield)), \
+ CALLBACK(src, PROC_REF(on_examine)), \
+ CALLBACK(src, PROC_REF(on_alt_click)), \
signals)
/obj/item/attachment/Destroy()
@@ -86,6 +96,33 @@
/obj/item/attachment/proc/on_preattack(obj/item/gun/gun, atom/target, mob/user, list/params)
return FALSE
+/obj/item/attachment/proc/on_wield(obj/item/gun/gun, mob/user, list/params)
+ return FALSE
+
+/obj/item/attachment/proc/on_unwield(obj/item/gun/gun, mob/user, list/params)
+ return FALSE
+
+/obj/item/attachment/proc/on_attacked(obj/item/gun/gun, mob/user, obj/item)
+ return FALSE
+
+/obj/item/attachment/proc/on_unique_action(obj/item/gun/gun, mob/user, obj/item)
+ return FALSE
+
+/obj/item/attachment/proc/on_ctrl_click(obj/item/gun/gun, mob/user, params)
+ return FALSE
+
+/obj/item/attachment/proc/on_examine(obj/item/gun/gun, mob/user, list/examine_list)
+ return
+
+/obj/item/attachment/proc/on_alt_click(obj/item/gun/gun, mob/user, list/examine_list)
+ AltClick(user)
+ return TRUE
+
+/obj/item/attachment/examine(mob/user)
+ . = ..()
+ var/list/examine_info = list()
+ . += on_examine(examine_list = examine_info)
+
///Handles the modifiers to the parent gun
/obj/item/attachment/proc/apply_modifiers(obj/item/gun/gun, mob/user, attaching)
if(attaching)
diff --git a/code/game/objects/items/attachments/_gun_attachment.dm b/code/game/objects/items/attachments/_gun_attachment.dm
new file mode 100644
index 0000000000000..d7b858922d80c
--- /dev/null
+++ b/code/game/objects/items/attachments/_gun_attachment.dm
@@ -0,0 +1,78 @@
+/obj/item/attachment/gun
+ name = "underbarrel gun"
+ desc = "A gun that goes on the underbarrel of another gun. You probably shouldn't be seeing this."
+ icon_state = "gun"
+
+ attach_features_flags = ATTACH_REMOVABLE_HAND
+ pixel_shift_x = 1
+ pixel_shift_y = 4
+ wield_delay = 0.1 SECONDS
+ var/weapon_type = /obj/item/gun/ballistic/shotgun/automatic
+ var/obj/item/gun/attached_gun
+ //basically so the fire select shows the right icon
+ var/underbarrel_prefix = ""
+
+/obj/item/attachment/gun/Initialize()
+ . = ..()
+ if(weapon_type)
+ attached_gun = new weapon_type(src)
+
+/obj/item/attachment/gun/Destroy()
+ . = ..()
+ QDEL_NULL(attached_gun)
+
+/obj/item/attachment/gun/apply_attachment(obj/item/gun/gun, mob/user)
+ . = ..()
+ if(FIREMODE_UNDERBARREL in gun.gun_firemodes)
+ to_chat(user,span_warning("The [gun] already has an underbarrel gun and can't take the [src]!"))
+ return FALSE
+ else
+ gun.gun_firemodes += FIREMODE_UNDERBARREL
+ gun.underbarrel_prefix = underbarrel_prefix
+ if(attached_gun)
+ attached_gun.safety = gun.safety
+ gun.build_firemodes()
+ if(user)
+ gun.equipped(user)
+
+/obj/item/attachment/gun/remove_attachment(obj/item/gun/gun, mob/user)
+ . = ..()
+ var/firemode_to_remove = gun.gun_firemodes.Find(FIREMODE_UNDERBARREL)
+ if(firemode_to_remove)
+ gun.gun_firemodes -= gun.gun_firemodes[firemode_to_remove]
+ gun.underbarrel_prefix = ""
+ gun.build_firemodes()
+ gun.equipped(user)
+
+/obj/item/attachment/gun/on_wield(obj/item/gun/gun, mob/user, list/params)
+ if(attached_gun)
+ attached_gun.wielded_fully = TRUE
+
+/obj/item/attachment/gun/on_unwield(obj/item/gun/gun, mob/user, list/params)
+ if(attached_gun)
+ attached_gun.on_unwield(src, user)
+
+/obj/item/attachment/gun/on_attacked(obj/item/gun/gun, mob/user, obj/item/attack_item)
+ if(gun.gun_firemodes[gun.firemode_index] == FIREMODE_UNDERBARREL)
+ attackby(attack_item,user)
+
+/obj/item/attachment/gun/on_preattack(obj/item/gun/gun, atom/target, mob/living/user, list/params)
+ if(gun.gun_firemodes[gun.firemode_index] == FIREMODE_UNDERBARREL)
+ attached_gun.process_fire(target,user,TRUE)
+ return COMPONENT_NO_ATTACK
+
+/obj/item/attachment/gun/unique_action(mob/living/user)
+ attached_gun.unique_action(user)
+
+/obj/item/attachment/gun/on_unique_action(obj/item/gun/gun, mob/user)
+ if(gun.gun_firemodes[gun.firemode_index] == FIREMODE_UNDERBARREL)
+ attached_gun.unique_action(user)
+ return OVERIDE_UNIQUE_ACTION
+
+/obj/item/attachment/gun/on_ctrl_click(obj/item/gun/gun, mob/user)
+ attached_gun.toggle_safety(user,TRUE)
+
+/obj/item/attachment/gun/on_alt_click(obj/item/gun/gun, mob/user, list/examine_list)
+ if(gun.gun_firemodes[gun.firemode_index] == FIREMODE_UNDERBARREL)
+ return ..()
+
diff --git a/code/game/objects/items/attachments/bayonet.dm b/code/game/objects/items/attachments/bayonet.dm
index 6b1961f4b6933..9e9deb969750c 100644
--- a/code/game/objects/items/attachments/bayonet.dm
+++ b/code/game/objects/items/attachments/bayonet.dm
@@ -9,6 +9,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
sharpness = IS_SHARP_ACCURATE
+ slot = ATTACHMENT_SLOT_MUZZLE
pixel_shift_x = 1
pixel_shift_y = 4
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 0000000000000..82d206d428ba3
--- /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 | ATTACH_REMOVABLE_HAND
+
+ 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/attachments/gun_attachments/ballistic.dm b/code/game/objects/items/attachments/gun_attachments/ballistic.dm
new file mode 100644
index 0000000000000..6697895e48ff2
--- /dev/null
+++ b/code/game/objects/items/attachments/gun_attachments/ballistic.dm
@@ -0,0 +1,57 @@
+/obj/item/attachment/gun/ballistic
+ name = "ballistic underbarrel gun"
+ desc = "A ballistic underbarrel gun. It shoots bullets. Or something."
+ underbarrel_prefix = "bullet_"
+
+/obj/item/attachment/gun/ballistic/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I,/obj/item/ammo_casing) || istype(I, /obj/item/ammo_box))
+ attached_gun.attackby(I, user)
+ else
+ return ..()
+
+/obj/item/attachment/gun/ballistic/on_examine(obj/item/gun/gun, mob/user, list/examine_list)
+ var/obj/item/gun/ballistic/ballistic_gun = attached_gun
+ var/gun_bolt = ballistic_gun.bolt_type
+ var/count_chambered = !(gun_bolt == BOLT_TYPE_NO_BOLT || gun_bolt == BOLT_TYPE_OPEN)
+ examine_list += span_notice("-The [name] has [ballistic_gun.get_ammo(count_chambered)] round\s remaining.")
+ if (!attached_gun.chambered)
+ examine_list += span_notice("-The [name] does not seem to have a round chambered.")
+ if (attached_gun.bolt_locked)
+ examine_list += span_notice("-The [name]'s [ballistic_gun.bolt_wording] is locked back and needs to be released before firing.")
+ examine_list += span_notice("-You can [ballistic_gun.bolt_wording] [src] by pressing the unique action key. By default, this is space")
+ return examine_list
+
+/obj/item/gun/ballistic/shotgun/underbarrel
+ name = "underbarrel ballistic gun"
+ desc = "You shouldnt be seeing this."
+ semi_auto = TRUE
+ always_chambers = TRUE
+ casing_ejector = TRUE
+ gunslinger_recoil_bonus = 0
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/underbarrel
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/underbarrel,
+ )
+
+/obj/item/attachment/gun/ballistic/shotgun
+ name = "underbarrel shotgun"
+ desc = "A single shot underbarrel shotgun for warding off anyone who gets too close for comfort."
+ underbarrel_prefix = "sg_"
+ weapon_type = /obj/item/gun/ballistic/shotgun/underbarrel
+
+/obj/item/attachment/gun/ballistic/launcher
+ name = "underbarrel 40mm grenade launcher"
+ desc = "A single shot 40mm underbarel grenade launcher. A compact way to deliver a big boom."
+ underbarrel_prefix = "launcher_"
+ icon_state = "glauncher"
+ weapon_type = /obj/item/gun/ballistic/shotgun/underbarrel/grenadelauncher
+
+/obj/item/gun/ballistic/shotgun/underbarrel/grenadelauncher
+ name = "underbarrel grenade launcher"
+ fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg'
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/grenadelauncher
+ )
+
+
diff --git a/code/game/objects/items/attachments/gun_attachments/energy.dm b/code/game/objects/items/attachments/gun_attachments/energy.dm
new file mode 100644
index 0000000000000..04962bb54d195
--- /dev/null
+++ b/code/game/objects/items/attachments/gun_attachments/energy.dm
@@ -0,0 +1,47 @@
+/obj/item/attachment/gun/energy
+ name = "underbarrel e-gun"
+ desc = "Pew pew laser beam. You probably shouldnt be seeing this."
+ underbarrel_prefix = "laser_"
+ icon_state = "energy"
+ weapon_type = /obj/item/gun/energy/e_gun
+ var/automatic_charge_overlays = TRUE
+
+/obj/item/attachment/gun/energy/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/stock_parts/cell/gun))
+ attached_gun.attackby(I, user)
+ update_appearance()
+ else
+ return ..()
+
+/obj/item/attachment/gun/energy/on_examine(obj/item/gun/gun, mob/user, list/examine_list)
+ var/obj/item/gun/energy/e_gun = attached_gun
+ var/obj/item/ammo_casing/energy/shot = e_gun.ammo_type[e_gun.select]
+ var/obj/item/stock_parts/cell/gun/gun_cell = get_cell()
+ if(e_gun.ammo_type.len > 1)
+ examine_list += span_notice("- You can switch firemodes on the [name] by pressing the unique action key. By default, this is space")
+ if(e_gun.cell)
+ examine_list += span_notice("- \The [name]'s cell has [gun_cell.percent()]% charge remaining.")
+ examine_list += span_notice("- \The [name] has [round(gun_cell.charge/shot.e_cost)] shots remaining on [shot.select_name] mode.")
+ else
+ . += span_notice("- \The [name] doesn't seem to have a cell!")
+ if(!e_gun.internal_magazine)
+ examine_list += span_notice("- The cell retainment latch is [e_gun.latch_closed ? "CLOSED" : "OPEN"]. Alt-Click to toggle the latch.")
+ return examine_list
+
+/obj/item/attachment/gun/energy/AltClick(mob/user)
+ . = ..()
+ attached_gun.AltClick(user)
+
+/obj/item/attachment/gun/energy/get_cell()
+ return attached_gun.cell
+
+/obj/item/attachment/gun/energy/e_gun
+ name = "underbarrel energy gun"
+ desc = "A compact underbarrel energy gun. The reduction in size makes it less power effiecent per shot than the standard model."
+ weapon_type = /obj/item/gun/energy/e_gun/underbarrel
+
+/obj/item/gun/energy/e_gun/underbarrel
+ name = "underbarrel energy gun"
+ ammo_type = list(/obj/item/ammo_casing/energy/disabler/underbarrel, /obj/item/ammo_casing/energy/laser/underbarrel)
+ spawn_no_ammo = TRUE
+
diff --git a/code/game/objects/items/attachments/gun_attachments/flamethrower.dm b/code/game/objects/items/attachments/gun_attachments/flamethrower.dm
new file mode 100644
index 0000000000000..22c08bdab3bce
--- /dev/null
+++ b/code/game/objects/items/attachments/gun_attachments/flamethrower.dm
@@ -0,0 +1,93 @@
+/obj/item/attachment/gun/flamethrower
+ name = "underbarrel flamethrower"
+ desc = "A compact underbarrel flamethrower holding up to 20 units of fuel, enough for two sprays."
+ icon_state = "flamethrower"
+ weapon_type = null
+ var/obj/item/flamethrower/underbarrel/attached_flamethrower
+
+/obj/item/attachment/gun/flamethrower/Initialize()
+ . = ..()
+ attached_flamethrower = new /obj/item/flamethrower/underbarrel(src)
+
+/obj/item/attachment/gun/flamethrower/Destroy()
+ . = ..()
+ QDEL_NULL(attached_flamethrower)
+
+/obj/item/attachment/gun/flamethrower/apply_attachment(obj/item/gun/gun, mob/user)
+ . = ..()
+ if(gun.safety == TRUE && attached_flamethrower.lit == TRUE)
+ attached_flamethrower.toggle_igniter(user)
+ else if(gun.safety == FALSE && attached_flamethrower.lit == FALSE)
+ attached_flamethrower.toggle_igniter(user)
+
+/obj/item/attachment/gun/flamethrower/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I,/obj/item/reagent_containers/glass) || istype(I,/obj/item/reagent_containers/food/drinks))
+ attached_flamethrower.attackby(I,user)
+ else
+ return ..()
+
+/obj/item/attachment/gun/flamethrower/on_preattack(obj/item/gun/gun, atom/target, mob/living/user, list/params)
+ if(gun.gun_firemodes[gun.firemode_index] == FIREMODE_UNDERBARREL)
+ log_combat(user, target, "flamethrowered", src)
+ attached_flamethrower.flame_turf(get_turf(target))
+ return COMPONENT_NO_ATTACK
+
+/obj/item/attachment/gun/flamethrower/on_unique_action(obj/item/gun/gun, mob/user)
+ if(gun.gun_firemodes[gun.firemode_index] == FIREMODE_UNDERBARREL)
+ attached_flamethrower.unique_action(user)
+ return OVERIDE_UNIQUE_ACTION
+
+/obj/item/attachment/gun/flamethrower/on_examine(obj/item/gun/gun, mob/user, list/examine_list)
+ var/total_volume = 0
+ for(var/datum/reagent/R in attached_flamethrower.beaker.reagents.reagent_list)
+ total_volume += R.volume
+ examine_list += span_notice("-\The [src] has [total_volume] units of fuel left.")
+ examine_list += span_notice("-You can empty the [attached_flamethrower.beaker] by pressing the unique action key. By default, this is space")
+ return examine_list
+
+/obj/item/attachment/gun/flamethrower/on_ctrl_click(obj/item/gun/gun, mob/user)
+ . = ..()
+ attached_flamethrower.toggle_igniter(user)
+
+/obj/item/flamethrower/underbarrel
+ name = "underbarrel flamethrower"
+ desc = "Something is wrong if you're seeing this."
+ create_full = TRUE
+
+/obj/item/flamethrower/underbarrel/Initialize(mapload)
+ . = ..()
+ beaker = new /obj/item/reagent_containers/glass/beaker/flamethrower_underbarrel(src)
+
+// you cant pull out the fuel beaker
+/obj/item/flamethrower/underbarrel/AltClick(mob/user)
+ return
+
+/obj/item/flamethrower/underbarrel/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/reagent_containers/glass) || istype(W,/obj/item/reagent_containers/food/drinks))
+ var/obj/item/reagent_containers/glass/source = W
+ if(!source.is_refillable())
+ to_chat(user, span_danger("\The [source]'s cap is on! Take it off first."))
+ return
+ if(beaker.reagents.total_volume >= beaker.volume)
+ to_chat(user, span_danger("\The [beaker] is full."))
+ return
+ source.reagents.trans_to(beaker, source.amount_per_transfer_from_this, transfered_by = user)
+ playsound(user,'sound/items/glass_transfer.ogg',100)
+ to_chat(user, span_notice("You transfer [source.amount_per_transfer_from_this] units to \the [beaker]"))
+ else
+ return ..()
+
+/obj/item/flamethrower/underbarrel/unique_action(mob/living/user)
+ . = ..()
+ beaker.reagents.clear_reagents()
+ playsound(user,'sound/items/glass_splash.ogg',100)
+
+
+/obj/item/reagent_containers/glass/beaker/flamethrower_underbarrel
+ name = "internal fuel tank"
+ desc = "An internal fuel tank for a flamethrower. You shouldn't have been able to pull this out."
+ icon = 'icons/obj/chemical/hypovial.dmi'
+ icon_state = "hypovial"
+ volume = 20
+
+
diff --git a/code/game/objects/items/attachments/gun_attachments/flaregun.dm b/code/game/objects/items/attachments/gun_attachments/flaregun.dm
new file mode 100644
index 0000000000000..0517c2e31f8d1
--- /dev/null
+++ b/code/game/objects/items/attachments/gun_attachments/flaregun.dm
@@ -0,0 +1,62 @@
+/obj/item/attachment/gun/flare
+ name = "underbarrel flaregun"
+ desc = "An underbarrel flaregun for lighting the path ahead."
+ icon_state = "riotlauncher"
+ weapon_type = null
+ var/obj/item/flashlight/flare/loaded_flare
+
+/obj/item/attachment/gun/flare/Destroy()
+ . = ..()
+ QDEL_NULL(loaded_flare)
+
+/obj/item/attachment/gun/flare/attackby(obj/item/I, mob/living/user, params)
+ . = ..()
+ if(istype(I,/obj/item/flashlight/flare))
+ if(!loaded_flare)
+ var/obj/item/flashlight/flare/flare_to_load = I
+ if(flare_to_load.on)
+ to_chat(user, span_warning("You can't load a lit flare into the [name]!"))
+ return FALSE
+ if(!flare_to_load.fuel)
+ to_chat(user, span_warning("You can't load a used flare into the [name]!"))
+ return FALSE
+ loaded_flare = flare_to_load
+ if(!user.transferItemToLoc(flare_to_load, src))
+ return FALSE
+ playsound(src,'sound/weapons/gun/shotgun/insert_shell.ogg',100)
+ to_chat(user, span_notice("You load a flare into \the [name]."))
+ else
+ to_chat(user, span_warning("\The [name] already has a flare loaded!"))
+ return FALSE
+
+/obj/item/attachment/gun/flare/on_preattack(obj/item/gun/gun, atom/target, mob/living/user, list/params)
+ if(gun.gun_firemodes[gun.firemode_index] == FIREMODE_UNDERBARREL && !gun.safety)
+ if(loaded_flare)
+ user.visible_message(span_warning("[user] fires a flare!"), span_warning("You fire the [name] at \the [target]!"))
+ var/obj/item/flashlight/flare/flare_to_fire = loaded_flare
+ loaded_flare = null
+ flare_to_fire.attack_self(user)
+ flare_to_fire.forceMove(user.loc)
+ flare_to_fire.throw_at(target,30,2,user)
+ playsound(src,'sound/weapons/gun/general/rocket_launch.ogg',100)
+ else
+ to_chat(user,span_warning("\The [name] doesn't have a flare loaded!"))
+ playsound(src,'sound/weapons/gun/pistol/dry_fire.ogg')
+ return COMPONENT_NO_ATTACK
+
+/obj/item/attachment/gun/flare/on_unique_action(obj/item/gun/gun, mob/user)
+ . = ..()
+ if(loaded_flare)
+ user.put_in_hands(loaded_flare)
+ to_chat(user, span_notice("You unload the flare from \the [name]."))
+ loaded_flare = null
+ playsound(src,'sound/weapons/gun/shotgun/rack.ogg',100)
+ return OVERIDE_UNIQUE_ACTION
+
+/obj/item/attachment/gun/flare/on_examine(obj/item/gun/gun, mob/user, list/examine_list)
+ . = ..()
+ examine_list += span_notice("-\The [name] [loaded_flare ? "has a flare loaded." : "is empty."]")
+ examine_list += span_notice("-You can unload \the [name] by pressing the unique action key. By default, this is space")
+ return examine_list
+
+
diff --git a/code/game/objects/items/attachments/gun_attachments/riot_launcher.dm b/code/game/objects/items/attachments/gun_attachments/riot_launcher.dm
new file mode 100644
index 0000000000000..ffc1899407c9a
--- /dev/null
+++ b/code/game/objects/items/attachments/gun_attachments/riot_launcher.dm
@@ -0,0 +1,24 @@
+/obj/item/attachment/gun/riot
+ name = "underbarrel riot grenade launcher"
+ desc = "A multipurpose underbarrel riot grenade launcher, typically issued to law enforcement. Loads any tradionally handthrown grenade. Warranty is voided should a lethal grenade be loaded."
+ underbarrel_prefix = "launcher_"
+ icon_state = "riotlauncher"
+ weapon_type = /obj/item/gun/grenadelauncher/underbarrel
+
+/obj/item/attachment/gun/riot/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/grenade))
+ attached_gun.attackby(I, user)
+ else
+ return ..()
+
+/obj/item/attachment/gun/riot/on_examine(obj/item/gun/gun, mob/user, list/examine_list)
+ var/obj/item/gun/grenadelauncher/launcher = attached_gun
+ if(launcher.grenades.len)
+ examine_list += "The [name] is loaded with a grenade."
+ examine_list += span_notice("-You can eject a grenade from the [src] by pressing the unique action key. By default, this is space")
+ return examine_list
+
+/obj/item/gun/grenadelauncher/underbarrel
+ name = "underbarrel riot grenade launcher"
+ desc = "An even more terrible thing. Just despicable, really. You shouldn't be seeing this."
+ max_grenades = 1
diff --git a/code/game/objects/items/attachments/m17_barrel.dm b/code/game/objects/items/attachments/m17_barrel.dm
new file mode 100644
index 0000000000000..9d857b56183f1
--- /dev/null
+++ b/code/game/objects/items/attachments/m17_barrel.dm
@@ -0,0 +1,10 @@
+/obj/item/attachment/m17_barrel
+ name = "Model 17 barrel"
+ desc = "The barrel of an M17 'Micro Target'."
+ icon_state = "m17_barrel"
+
+ slot = ATTACHMENT_SLOT_MUZZLE
+ spread_mod = -40
+ size_mod = 2
+ pixel_shift_x = 1
+ pixel_shift_y = 1
diff --git a/code/game/objects/items/attachments/rail_light.dm b/code/game/objects/items/attachments/rail_light.dm
index 0cfbe9661e9e0..d2216d27d19f0 100644
--- a/code/game/objects/items/attachments/rail_light.dm
+++ b/code/game/objects/items/attachments/rail_light.dm
@@ -4,8 +4,8 @@
icon_state = "raillight"
light_color = COLOR_LIGHT_ORANGE
light_system = MOVABLE_LIGHT_DIRECTIONAL
- light_range = 4
- light_power = 0.8
+ light_range = 5
+ light_power = 0.9
light_on = FALSE
attach_features_flags = ATTACH_REMOVABLE_HAND|ATTACH_TOGGLE
diff --git a/code/game/objects/items/attachments/shoulder_sling.dm b/code/game/objects/items/attachments/shoulder_sling.dm
new file mode 100644
index 0000000000000..fdf01c17a95bc
--- /dev/null
+++ b/code/game/objects/items/attachments/shoulder_sling.dm
@@ -0,0 +1,31 @@
+/obj/item/attachment/sling
+ name = "shoulder sling"
+ desc = "A leather shoulder sling for longarms to allow for easy carrying on the shoulder without the need for traditional armor holsters."
+ icon_state = "sling"
+
+ attach_features_flags = ATTACH_REMOVABLE_HAND
+ pixel_shift_x = 14
+ pixel_shift_y = 15
+ render_layer = BELOW_OBJ_LAYER
+ render_plane = BELOW_OBJ_LAYER
+ wield_delay = 0.2 SECONDS
+
+ var/check_size = TRUE
+
+/obj/item/attachment/sling/apply_attachment(obj/item/gun/gun, mob/user)
+ . = ..()
+ if(initial(gun.w_class) < WEIGHT_CLASS_BULKY && check_size)
+ to_chat(user,span_warning("The frame of the \the [gun] isn't large enough to support \the [src]!"))
+ return FALSE
+ if(!(gun.slot_flags | ITEM_SLOT_SUITSTORE))
+ gun.slot_flags = gun.slot_flags | ITEM_SLOT_SUITSTORE
+ ADD_TRAIT(gun,TRAIT_FORCE_SUIT_STORAGE,REF(src))
+
+/obj/item/attachment/sling/remove_attachment(obj/item/gun/gun, mob/user)
+ . = ..()
+ gun.slot_flags = initial(gun.slot_flags)
+ REMOVE_TRAIT(gun,TRAIT_FORCE_SUIT_STORAGE, REF(src))
+
+/obj/item/attachment/sling/examine(mob/user)
+ . = ..()
+ . += span_notice("The shoulder sling can only be attached to bulky or heavier guns.")
diff --git a/code/game/objects/items/bank_card.dm b/code/game/objects/items/bank_card.dm
index 4a7f2f9d2f210..ecc4180300085 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/blueprints.dm b/code/game/objects/items/blueprints.dm
index 232b4570a97e2..b165856ea1987 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -214,22 +214,26 @@
sortTim(GLOB.sortedAreas, /proc/cmp_name_asc)
return TRUE
-/proc/set_area_machinery_title(area/A, title, oldtitle)
+/proc/set_area_machinery_title(area/target, title, oldtitle)
if(!oldtitle) // or replacetext goes to infinite loop
return
- for(var/obj/machinery/airalarm/M in A)
- M.name = replacetext(M.name,oldtitle,title)
- for(var/obj/machinery/power/apc/M in A)
- M.name = replacetext(M.name,oldtitle,title)
- for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/M in A)
- M.name = replacetext(M.name,oldtitle,title)
- for(var/obj/machinery/atmospherics/components/unary/vent_pump/M in A)
- M.name = replacetext(M.name,oldtitle,title)
- for(var/obj/machinery/door/M in A)
- M.name = replacetext(M.name,oldtitle,title)
- for(var/obj/machinery/fax/M in A)
- M.fax_name = replacetext(M.fax_name,oldtitle,title)
- //TODO: much much more. Unnamed airlocks, cameras, etc.
+
+ var/static/typecache = typecacheof(list(
+ /obj/machinery/airalarm,
+ /obj/machinery/power/apc,
+ /obj/machinery/atmospherics/components/unary/vent_scrubber,
+ /obj/machinery/atmospherics/components/unary/vent_pump,
+ /obj/machinery/door,
+ /obj/machinery/fax
+ ))
+
+ for(var/obj/machinery/machine as anything in GLOB.machines)
+ if(get_area(machine) != target)
+ continue
+ if(!is_type_in_typecache(machine, typecache))
+ continue
+
+ machine.name = replacetext(machine.name,oldtitle,title)
/obj/item/areaeditor/shuttle
name = "shuttle expansion permit"
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index 595c798d4c9e5..0ef172f08c585 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -1,4 +1,3 @@
-#define CANDLE_LUMINOSITY 2
/obj/item/candle
name = "red candle"
desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to \
@@ -8,6 +7,10 @@
item_state = "candle1"
w_class = WEIGHT_CLASS_TINY
light_color = LIGHT_COLOR_FIRE
+ light_power = 0.8
+ light_range = 2
+ light_system = MOVABLE_LIGHT
+ light_on = FALSE
heat = 1000
var/wax = 1000
var/lit = FALSE
@@ -39,20 +42,22 @@
return lit * heat
/obj/item/candle/proc/light(show_message)
- if(!lit)
- lit = TRUE
- if(show_message)
- usr.visible_message(show_message)
- set_light(CANDLE_LUMINOSITY, 0.8)
+ if(lit)
+ return
+ lit = TRUE
+ if(show_message)
+ usr.visible_message(show_message)
+ set_light_on(TRUE)
+ if(!infinite)
START_PROCESSING(SSobj, src)
- update_appearance()
+ update_appearance()
/obj/item/candle/proc/put_out_candle()
if(!lit)
return
lit = FALSE
update_appearance()
- set_light(0)
+ set_light_on(FALSE)
return TRUE
/obj/item/candle/extinguish()
@@ -62,8 +67,7 @@
/obj/item/candle/process()
if(!lit)
return PROCESS_KILL
- if(!infinite)
- wax--
+ wax--
if(!wax)
new /obj/item/trash/candle(loc)
qdel(src)
@@ -85,43 +89,22 @@
icon_state = "torch_unlit"
item_state = "torch"
w_class = WEIGHT_CLASS_BULKY
- light_color = LIGHT_COLOR_FIRE
+ light_range = 7
infinite = TRUE
heat = 2000
-/obj/item/candle/tribal_torch/attackby(obj/item/W, mob/user, params)
- ..()
- var/msg = W.ignition_effect(src, user)
- if(msg)
- light(msg)
- set_light(7)
-
-/obj/item/candle/tribal_torch/fire_act(exposed_temperature, exposed_volume)
- if(!src.lit)
- light() //honk
- set_light(7)
- ..()
-
-/obj/item/candle/attack_self(mob/user)
+/obj/item/candle/tribal_torch/attack_self(mob/user)
if(!src.lit)
to_chat(user, "You start pushing [src] into the ground...")
if (do_after(user, 20, target=src))
qdel(src)
new /obj/structure/destructible/tribal_torch(get_turf(user))
- light_color = LIGHT_COLOR_ORANGE
user.visible_message("[user] plants \the [src] firmly in the ground.", "You plant \the [src] firmly in the ground.")
return
- else if(lit)
- user.visible_message(
- "[user] snuffs [src] out.")
- lit = FALSE
- update_appearance()
- set_light(0)
+ return ..()
/obj/item/candle/tribal_torch/update_appearance()
icon_state = "torch[lit ? "_lit" : "_unlit"]"
item_state = "torch[lit ? "-on" : ""]"
return ..()
-
-#undef CANDLE_LUMINOSITY
diff --git a/code/game/objects/items/chromosome.dm b/code/game/objects/items/chromosome.dm
index 3acf3cfe5cb38..c6ee7f174aab9 100644
--- a/code/game/objects/items/chromosome.dm
+++ b/code/game/objects/items/chromosome.dm
@@ -48,7 +48,7 @@
if(!initial(CM.weight))
break
chromosomes[A] = initial(CM.weight)
- return pickweight(chromosomes)
+ return pick_weight(chromosomes)
/obj/item/chromosome/stabilizer
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 6b7b364118d49..3a0d7e1f81c3d 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -333,11 +333,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM
reagents?.add_reagent(/datum/reagent/toxin/carpotoxin , 3) // They lied
/obj/item/clothing/mask/cigarette/syndicate
- desc = "An unknown brand cigarette."
+ desc = "An obscure brand of cigarette."
chem_volume = 60
smoketime = 60
smoke_all = TRUE
- list_reagents = list(/datum/reagent/drug/nicotine = 10, /datum/reagent/medicine/omnizine = 15)
+ list_reagents = list(/datum/reagent/drug/nicotine = 10, /datum/reagent/drug/aranesp = 5, /datum/reagent/medicine/synaptizine = 5)
/obj/item/clothing/mask/cigarette/xeno
desc = "A Xeno Filtered brand cigarette."
@@ -566,7 +566,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
heat = 1500
resistance_flags = FIRE_PROOF
grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/fuel/oil = 5)
- custom_price = 55
+ custom_price = 5
light_system = MOVABLE_LIGHT
light_range = 2
light_power = 0.6
@@ -1059,4 +1059,4 @@ CIGARETTE PACKETS ARE IN FANCY.DM
vapecolor = "ecigar"
overlayname = "ecigar"
chem_volume = 150
- custom_premium_price = 300
+ custom_premium_price = 10
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index 9aece73946cce..5e82266f186c6 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -315,11 +315,6 @@
icon_state = "science"
build_path = /obj/machinery/computer/teleporter
-/obj/item/circuitboard/computer/xenobiology
- name = "circuit board (Xenobiology Console)"
- icon_state = "science"
- build_path = /obj/machinery/computer/camera_advanced/xenobio
-
//Security
/obj/item/circuitboard/computer/gulag_teleporter_console
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index af7addd21a950..ef4b3938bc5e5 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -570,7 +570,7 @@
var/static/list/fridges_name_paths = list(/obj/machinery/smartfridge = "plant produce",
/obj/machinery/smartfridge/food = "food",
/obj/machinery/smartfridge/drinks = "drinks",
- /obj/machinery/smartfridge/extract = "slimes",
+ /obj/machinery/smartfridge/bloodbank = "blood",
/obj/machinery/smartfridge/organ = "organs",
/obj/machinery/smartfridge/chemistry = "chems",
/obj/machinery/smartfridge/chemistry/virology = "viruses",
@@ -724,7 +724,7 @@
/obj/item/stock_parts/capacitor = 1,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stack/sheet/glass = 1,
- /obj/item/stack/sheet/bluespace_crystal = 1,
+ /obj/item/stack/ore/bluespace_crystal/refined = 1,
/obj/item/stock_parts/cell = 1)
def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high)
needs_anchored = FALSE
@@ -982,15 +982,6 @@
/obj/item/airlock_painter = 1,
/obj/item/stack/sheet/glass = 1)
-/obj/item/circuitboard/machine/monkey_recycler
- name = "Monkey Recycler (Machine Board)"
- icon_state = "science"
- build_path = /obj/machinery/monkey_recycler
- req_components = list(
- /obj/item/stock_parts/matter_bin = 1,
- /obj/item/stock_parts/manipulator = 1)
- needs_anchored = FALSE
-
/obj/item/circuitboard/machine/nanite_chamber
name = "Nanite Chamber (Machine Board)"
icon_state = "science"
@@ -1017,11 +1008,6 @@
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stock_parts/scanning_module = 1)
-/obj/item/circuitboard/machine/processor/slime
- name = "Slime Processor (Machine Board)"
- icon_state = "science"
- build_path = /obj/machinery/processor/slime
-
/obj/item/circuitboard/machine/protolathe/department/science
name = "Protolathe (Machine Board) - Science"
icon_state = "science"
@@ -1277,19 +1263,6 @@
/obj/item/stock_parts/manipulator = 1)
needs_anchored = FALSE
-/obj/item/circuitboard/machine/processor/attackby(obj/item/I, mob/user, params)
- if(I.tool_behaviour == TOOL_SCREWDRIVER)
- if(build_path == /obj/machinery/processor)
- name = "Slime Processor (Machine Board)"
- build_path = /obj/machinery/processor/slime
- to_chat(user, "Name protocols successfully updated.")
- else
- name = "Food Processor (Machine Board)"
- build_path = /obj/machinery/processor
- to_chat(user, "Defaulting name protocols.")
- else
- return ..()
-
/obj/item/circuitboard/machine/protolathe/department/service
name = "Protolathe - Service (Machine Board)"
icon_state = "service"
@@ -1537,3 +1510,15 @@
icon_state = "engineering"
build_path = /obj/machinery/suit_storage_unit
req_components = list(/obj/item/stock_parts/micro_laser = 4)
+
+/obj/item/circuitboard/machine/turret
+ name = "Turret"
+ icon_state = "security"
+ build_path = /obj/machinery/porta_turret
+ req_components = list(/obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/scanning_module = 1, /obj/item/assembly/prox_sensor = 1, /obj/item/gun/energy = 1)
+ def_components = list(/obj/item/gun/energy = /obj/item/gun/energy/e_gun/turret)
+
+/obj/item/circuitboard/machine/turret/ship
+ name = "Ship-mounted Turret"
+ //We don't want to let people take the gun out of the turret
+ def_components = list(/obj/item/gun/energy = /obj/item/stack/sheet/metal)
diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm
index 631eb7d2fc8fd..62c33aa9665a7 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -71,7 +71,8 @@
/obj/item/soap/syndie
desc = "An untrustworthy bar of soap made of strong chemical agents that dissolve blood faster."
icon_state = "soapsyndie"
- cleanspeed = 5 //faster than mop so it is useful for traitors who want to clean crime scenes
+ cleanspeed = 27 // ever so slightly better than NT
+ uses = 300
/obj/item/soap/omega
name = "omega soap"
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index d703ae86ca7df..cd6fafd4dbef3 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -235,7 +235,7 @@
. = TRUE
if("select_stencil")
var/stencil = params["item"]
- if(stencil in all_drawables + randoms)
+ if(stencil in (all_drawables + randoms))
drawtype = stencil
. = TRUE
text_buffer = ""
@@ -320,7 +320,7 @@
temp = "symbol"
else if(drawing in drawings)
temp = "drawing"
- else if(drawing in graffiti|oriented)
+ else if(drawing in (graffiti|oriented))
temp = "graffiti"
var/graf_rot
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 640b4e4a6a0af..46a74a6179543 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -441,7 +441,7 @@
var/mob/living/M = H.pulledby
if(M.electrocute_act(30, H))
M.visible_message("[M] is electrocuted by [M.p_their()] contact with [H]!")
- M.emote("scream")
+ M.force_scream()
/obj/item/shockpaddles/proc/do_disarm(mob/living/M, mob/living/user)
if(req_defib && defib.safety)
@@ -453,7 +453,7 @@
"[user] touches [M] with [src]!")
M.adjustStaminaLoss(60)
M.Knockdown(75)
- M.Jitter(50)
+ M.adjust_jitter(50)
M.apply_status_effect(STATUS_EFFECT_CONVULSING)
playsound(src, 'sound/machines/defib_zap.ogg', 50, TRUE, -1)
if(HAS_TRAIT(M,MOB_ORGANIC))
@@ -501,7 +501,7 @@
user.visible_message("[user] shocks [H] with \the [src]!", "You shock [H] with \the [src]!")
playsound(src, 'sound/machines/defib_zap.ogg', 100, TRUE, -1)
playsound(src, 'sound/weapons/egloves.ogg', 100, TRUE, -1)
- H.emote("scream")
+ H.force_scream()
shock_touching(45, H)
if(H.can_heartattack() && !H.undergoing_cardiac_arrest())
if(!H.stat)
@@ -511,7 +511,7 @@
H.apply_damage(50, BURN, BODY_ZONE_CHEST)
log_combat(user, H, "overloaded the heart of", defib)
H.Paralyze(100)
- H.Jitter(100)
+ H.adjust_jitter(100)
if(req_defib)
defib.deductcharge(revivecost)
cooldown = TRUE
@@ -590,7 +590,7 @@
H.grab_ghost()
H.revive(full_heal = FALSE, admin_revive = FALSE)
H.emote("gasp")
- H.Jitter(100)
+ H.adjust_jitter(100)
SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK)
log_combat(user, H, "revived", defib)
if(req_defib)
diff --git a/code/game/objects/items/desk_flags.dm b/code/game/objects/items/desk_flags.dm
index c1af9cfe6c3fb..5f0d76eee5a01 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/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index e259e56ccd0e7..99473661dd5ea 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(PDAs)
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
item_flags = NOBLUDGEON
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT
actions_types = list(/datum/action/item_action/toggle_light)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
@@ -410,7 +410,7 @@ GLOBAL_LIST_EMPTY(PDAs)
//BASIC FUNCTIONS===================================
if("Refresh")//Refresh, goes to the end of the proc.
-
+ EMPTY_BLOCK_GUARD
if("Return")//Return
if(mode<=9)
mode = 0
diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm
index ae57fe3d61ebc..68f39d2b4e227 100644
--- a/code/game/objects/items/devices/desynchronizer.dm
+++ b/code/game/objects/items/devices/desynchronizer.dm
@@ -15,6 +15,9 @@
var/next_use = 0
var/obj/effect/abstract/sync_holder/sync_holder
var/resync_timer
+ var/desync_effect = /obj/effect/temp_visual/desynchronizer
+ var/resync_effect = /obj/effect/temp_visual/desynchronizer
+
/obj/item/desynchronizer/attack_self(mob/living/user)
if(world.time < next_use)
@@ -46,7 +49,7 @@
if(sync_holder)
return
sync_holder = new(drop_location())
- new /obj/effect/temp_visual/desynchronizer(drop_location())
+ new desync_effect(drop_location())
to_chat(user, "You activate [src], desynchronizing yourself from the present. You can still see your surroundings, but you feel eerily dissociated from reality.")
user.forceMove(sync_holder)
SEND_SIGNAL(user, COMSIG_MOVABLE_SECLUDED_LOCATION)
@@ -58,7 +61,7 @@
resync_timer = addtimer(CALLBACK(src, PROC_REF(resync)), duration , TIMER_STOPPABLE)
/obj/item/desynchronizer/proc/resync()
- new /obj/effect/temp_visual/desynchronizer(sync_holder.drop_location())
+ new resync_effect(sync_holder.drop_location())
QDEL_NULL(sync_holder)
if(resync_timer)
deltimer(resync_timer)
diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
index 8986f84436983..b67b4bb3f7071 100644
--- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
+++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
@@ -4,7 +4,7 @@
desc = "An all-in-one circuit imprinter, designer, synthesizer, outfitter, creator, and chef. It can be used in place of any generic circuit board during construction."
icon = 'icons/obj/module.dmi'
icon_state = "boris"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 300)
var/recharging = FALSE
var/circuits = 5 //How many circuits the pseudocircuit has left
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index a9f28d88caed4..9dd5d80d78bfe 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -170,6 +170,7 @@
icon_state = "penlight"
item_state = ""
flags_1 = CONDUCT_1
+ w_class = WEIGHT_CLASS_TINY
light_range = 2
light_color = "#FFDDCC"
light_power = 0.3
@@ -259,13 +260,13 @@
/obj/item/flashlight/flare
name = "flare"
- desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'."
+ desc = "A generic red flare. There are instructions on the side, it reads 'pull cord, make light'."
w_class = WEIGHT_CLASS_SMALL
light_range = 7 // Pretty bright.
icon_state = "flare"
item_state = "flare"
actions_types = list()
- var/fuel = 0
+ var/fuel = 900
var/on_damage = 7
var/produce_heat = 1500
heat = 1000
@@ -275,9 +276,14 @@
light_color = "#FA421A" //Cit lighting
light_power = 0.8 //Cit lighting
+/obj/item/flashlight/flare/burnt
+ desc = "A burnt out red flare."
+ icon_state = "flare-empty"
+ fuel = 0
+ grind_results = list(/datum/reagent/sulfur = 2)
+
/obj/item/flashlight/flare/Initialize()
. = ..()
- fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
/obj/item/flashlight/flare/process()
open_flame(heat)
@@ -559,15 +565,6 @@
name = "pink glowstick"
color = LIGHT_COLOR_PINK
-/obj/effect/spawner/lootdrop/glowstick
- name = "random colored glowstick"
- icon = 'icons/obj/lighting.dmi'
- icon_state = "random_glowstick"
-
-/obj/effect/spawner/lootdrop/glowstick/Initialize()
- loot = typesof(/obj/item/flashlight/glowstick)
- . = ..()
-
/obj/item/flashlight/spotlight //invisible lighting source
name = "disco light"
desc = "Groovy..."
diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm
index 4abc1a3786bbf..e1a20b508a5c7 100644
--- a/code/game/objects/items/devices/geiger_counter.dm
+++ b/code/game/objects/items/devices/geiger_counter.dm
@@ -1,13 +1,3 @@
-#define RAD_LEVEL_NORMAL 9
-#define RAD_LEVEL_MODERATE 100
-#define RAD_LEVEL_HIGH 400
-#define RAD_LEVEL_VERY_HIGH 800
-#define RAD_LEVEL_CRITICAL 1500
-
-#define RAD_MEASURE_SMOOTHING 5
-
-#define RAD_GRACE_PERIOD 2
-
/obj/item/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis
name = "\improper Geiger counter"
desc = "A handheld device used for detecting and measuring radiation pulses."
@@ -222,9 +212,3 @@
. = ..()
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT)
-
-#undef RAD_LEVEL_NORMAL
-#undef RAD_LEVEL_MODERATE
-#undef RAD_LEVEL_HIGH
-#undef RAD_LEVEL_VERY_HIGH
-#undef RAD_LEVEL_CRITICAL
diff --git a/code/game/objects/items/devices/mines.dm b/code/game/objects/items/devices/mines.dm
index 1772cbf497c37..28c30aa090192 100644
--- a/code/game/objects/items/devices/mines.dm
+++ b/code/game/objects/items/devices/mines.dm
@@ -11,6 +11,7 @@
icon_state = "mine"
item_state = "assembly"//when we get custom sprites replace this. please
base_icon_state = "mine"
+ light_color = "#FF0000"
/// Is our mine live?
var/armed = FALSE
@@ -24,13 +25,11 @@
var/manufacturer = MANUFACTURER_NONE
-
/obj/item/mine/Initialize(mapload)
. = ..()
if(armed)
now_armed()
-
/obj/item/mine/examine(mob/user)
. = ..()
if(!armed)
@@ -45,33 +44,39 @@
. = ..()
icon_state = "[base_icon_state][triggered ? "_exploding" : null][!armed && anchored ? "_arming" : null][armed && anchored && !triggered ? "_armed" : null]"
-//mines have a small chance to be triggered by damage, but they take longer to explode
+/// mines have a small chance to be triggered by damage, but they take longer to explode
/obj/item/mine/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir)
. = ..()
if(prob(35) & obj_integrity > 0)
blast_delay = blast_delay * 2
trigger_mine()
-//insert your horrible fate here
+/// insert your horrible fate here
/obj/item/mine/proc/mine_effect(mob/victim)
return
-//handles controlled deactivation
+/// handles controlled deactivation
/obj/item/mine/proc/disarm()
if(triggered) //no turning back now
return
+ light_power = 0
+ light_range = 0
anchored = FALSE
armed = FALSE
update_appearance(UPDATE_ICON_STATE)
return
-//using an unarmed mine inhand deploys it.
+/// using an unarmed mine inhand deploys it.
/obj/item/mine/attack_self(mob/user)
if(!armed)
+ if(!loccheck(user))
+ to_chat(user, span_warning("There's already a mine at this position!"))
+ return
user.visible_message(span_danger("[user] deploys the [src]."), span_notice("You deploy the [src]."))
user.dropItemToGround(src)
anchored = TRUE
+ dir = user.dir
playsound(src, 'sound/machines/click.ogg', 60, TRUE)
if(arm_delay)
@@ -82,27 +87,30 @@
armed = TRUE
message_admins("[key_name(user)] has placed \a [src] at ([x],[y],[z]).")
-//let them know the mine's done cooking
+/obj/item/mine/proc/loccheck(mob/user)
+ for(var/obj/item/mine/alreadymined in user.loc)
+ if(alreadymined.anchored)
+ return FALSE
+ return TRUE
+
+/// let them know the mine's done cooking
/obj/item/mine/proc/now_armed()
armed = TRUE
update_appearance(UPDATE_ICON_STATE)
+ light_power = 1
+ light_range = 1
playsound(src, 'sound/machines/nuke/angry_beep.ogg', 55, FALSE, 1)
visible_message("\The [src] beeps softly, indicating it is now active.", vision_distance = COMBAT_MESSAGE_RANGE)
/// Can this mine trigger on the passed movable?
/obj/item/mine/proc/can_trigger(atom/movable/on_who)
- //var/badtype = typecacheof(list(/obj/effect, /obj/item/mine))
if(triggered || !isturf(loc) || !armed || iseffect(on_who) || istype(on_who, /obj/item/mine))
return FALSE
- //if(on_who == badtype)//no recursive self triggering. Bad landmine
- // return FALSE
return TRUE
/// When something sets off a mine
/obj/item/mine/proc/trigger_mine(atom/movable/triggerer)
- if(obj_integrity <= 0)
- return
- if(triggered) //too busy detonating to detonate again
+ if(obj_integrity <= 0 || triggered)//too busy detonating to detonate again
return
if(triggerer)
triggerer.visible_message(span_danger("[icon2html(src, viewers(src))] [triggerer] sets off \the [src]. It's gonna blow!"), span_danger("[icon2html(src, viewers(src))] \The [src] activates."))
@@ -114,7 +122,6 @@
playsound(src, 'sound/items/mine_activate.ogg', 70, FALSE)
else
playsound(src, 'sound/items/mine_activate_short.ogg', 80, FALSE)
- light_color = "#FF0000"
light_power = 5
light_range = 3
if(!blast_delay)//addtimer gets mad if the delay is 0
@@ -122,8 +129,10 @@
else
addtimer(CALLBACK(src, PROC_REF(blast_now), triggerer), blast_delay)
-//NOW we actually blow up
+///NOW we actually blow up
/obj/item/mine/proc/blast_now(atom/movable/triggerer)
+ if(QDELETED(src))
+ return
var/datum/effect_system/spark_spread/sporks = new /datum/effect_system/spark_spread
sporks.set_up(3, 1, src)
sporks.start()
@@ -142,7 +151,7 @@
user.visible_message(span_warning("[user] extends their hand towards \the [src]!"), span_userdanger("You extend your arms to pick up \the [src], knowing that it will likely blow up when you touch it!"))
if(do_after(user, 5 SECONDS, target = src))//SO SO generous. You can still step back from the edge.
if(prob(10))
- user.visible_message(span_notice("[user] picks up \the [src], which miraculously doesn't explode!"), span_notice("You pick up \the [src], which miraculously doesn't explode!"))
+ user.visible_message(span_notice("[user] picks up \the [src], which miraculously doesn't go off!"), span_notice("You pick up \the [src], which miraculously doesn't go off!"))
disarm()
else
user.visible_message(span_danger("[user] attempts to pick up \the [src] only to hear a beep as it activates in their hand!"), span_danger("You attempt to pick up \the [src] only to hear a beep as it activates in your hands!"))
@@ -166,8 +175,8 @@
trigger_mine(user)
//
-//PRESSURE BASED MINE:
-//Mine that explodes when stepped on.
+///PRESSURE BASED MINE:
+///Mine that explodes when stepped on.
/obj/item/mine/pressure
name = "dummy landmine"
/// When true, mines trigger instantly on being stepped upon
@@ -196,6 +205,11 @@
AddElement(/datum/element/connect_loc, loc_connections)
wires = new /datum/wires/mine(src)
+/obj/item/mine/pressure/Destroy()
+ if(wires)
+ QDEL_NULL(wires)
+ . = ..()
+
/obj/item/mine/pressure/examine(mob/user)
. = ..()
if(hair_trigger)
@@ -254,11 +268,7 @@
clicked = FALSE
. = ..()
-/obj/item/mine/pressure/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
- trigger_mine(AM)
- ..()
-
-//handles disarming(and failing to disarm)
+///handles disarming(and failing to disarm)
/obj/item/mine/pressure/attackby(obj/item/I, mob/user)
if(I.tool_behaviour == TOOL_SCREWDRIVER)
if(sealed)
@@ -275,18 +285,16 @@
else
. = ..()
-//
-//PROXIMITY MINES
-//Mines that explode when someone moves nearby. Simpler, because I don't have to worry about saving step info or disarming logic
-//
+//PROXIMITY MINES
+///Mines that explode when someone moves nearby. Simpler, because I don't have to worry about saving step info or disarming logic
/obj/item/mine/proximity
name = "dummy proximity mine"
blast_delay = 15 DECISECONDS
arm_delay = 10 SECONDS//clear the area
///needed for the proximity checks.
var/datum/proximity_monitor/proximity_monitor
- var/proximity_range = 2
+ var/proximity_range = 3
/obj/item/mine/proximity/Initialize(mapload)
. = ..()
@@ -302,12 +310,8 @@
/obj/item/mine/proximity/now_armed()
. = ..()
proximity_monitor = new(src, proximity_range)
- light_color = "#FF0000"
- light_power = 1
- light_range = 1
/obj/item/mine/proximity/disarm()
- . = ..()
QDEL_NULL(proximity_monitor)
/obj/item/mine/proximity/Destroy()
@@ -316,7 +320,11 @@
. = ..()
/obj/item/mine/proximity/HasProximity(atom/movable/triggerer)
- if(!iscarbon(triggerer))//let's keep these on player movements for now.
+ //let's keep these on player movements for now.
+ if(!iscarbon(triggerer))
+ return
+ //Quick and dirty solution for preventing activations behind walls.
+ if(!can_see(src, triggerer))
return
if(!can_trigger(triggerer))
return
@@ -326,9 +334,92 @@
QDEL_NULL(proximity_monitor)
return
+//DIRECTIONAL MINES
+///Once deployed, keeps an eye on a line of turfs in the faced direction. If something moves in them, explode.
+/obj/item/mine/directional
+ name = "directional mine"
+ desc = "An anti-personnel device that activates when an object moves in front of it. This one does nothing and is for testing purposes only."
+
+ blast_delay = 1 DECISECONDS
+ arm_delay = 5 SECONDS
+
+ ///range of tripwire
+ var/trigger_range = 4
+
+ ///projectile casing to fire in the selected direction when the mine is triggered.
+ //null prevents a projectile from being fired.
+ var/obj/item/ammo_casing/casingtype = null
+
+ ///cache of turfs for detection area
+ var/list/tripwire_turfs
+
+ ///for aiming the resulting projectiles
+ var/turf/target_turf
+
+///kills any existing tripwires
+/obj/item/mine/directional/proc/remove_tripwires()
+ if(tripwire_turfs)
+ for(var/turf/affected_turf in tripwire_turfs)
+ UnregisterSignal(affected_turf, COMSIG_ATOM_ENTERED)
+ tripwire_turfs = null
+ if(target_turf)
+ target_turf = null
+ return
+
+///sets up tripwires(or recreates them, if already present)
+/obj/item/mine/directional/proc/draw_tripwires()
+ if(tripwire_turfs)
+ remove_tripwires()
+ //we'll also use this to set up the pew
+ target_turf = get_ranged_target_turf(src, dir, trigger_range)
+ var/turf/starting_turf = get_turf(src)
+ tripwire_turfs = get_line(starting_turf, target_turf)
+
+ for(var/turf/affected_turf in tripwire_turfs)
+ RegisterSignal(affected_turf, COMSIG_ATOM_ENTERED, PROC_REF(on_entered))
+
+/obj/item/mine/directional/claymore/now_armed()
+ draw_tripwires()
+ . = ..()
+
+/obj/item/mine/directional/proc/on_entered(datum/source, atom/movable/arrived)
+ SIGNAL_HANDLER
+ if(!(arrived in view(trigger_range, src)))
+ return
+ if(!can_trigger(arrived))
+ return
+
+ if(ismob(arrived))
+ var/mob/living/fool = arrived
+ fool.do_alert_animation(fool)
+
+ visible_message(span_danger("[icon2html(src, viewers(src))] *click*"))
+ playsound(src, 'sound/machines/click.ogg', 100, TRUE)
+ INVOKE_ASYNC(src, PROC_REF(trigger_mine), arrived)
+
+
+//pew pew
+/obj/item/mine/directional/mine_effect(mob/victim)
+ if(casingtype && target_turf && victim ?(src.loc != victim.loc) : victim == null)
+ var/obj/item/ammo_casing/casing = new casingtype(src)
+ casing.fire_casing(target_turf, null, null, null, 30, ran_zone(), 60, src)
+ . = ..()
+
+/obj/item/mine/directional/disarm()
+ remove_tripwires()
+ visible_message(span_danger("With a soft clunk, the [src]'s securing bolts retract."))
+ . = ..()
+
+///handles weird cases like ship movement or teleporting
+/obj/item/mine/directional/Moved()
+ . = ..()
+ if(!loc)
+ return
+ if(armed & !triggered)
+ draw_tripwires()
+
//
//LANDMINE TYPES
-//Rylie please help me make these more immersive
//
/obj/item/mine/pressure/explosive
@@ -380,7 +471,7 @@
shrapnel_magnitude = 4
/obj/item/mine/pressure/explosive/fire/mine_effect(mob/victim)
- if(victim.is_holding(src))//in case it's been picked up
+ if(victim?.is_holding(src))//in case it's been picked up
for(var/turf/T in view(4,victim))
T.IgniteTurf(15)
new /obj/effect/hotspot(T)
@@ -473,7 +564,7 @@
AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_magnitude)
-//like all real 'less' than lethal crowd control options this is, in fact, not very good at being nonlethal
+///like all real 'less' than lethal crowd control options this is, in fact, not very good at being nonlethal
/obj/item/mine/proximity/explosive/sting
name = "\improper'Stinger' Crowd Management Device"
desc = "A \"less\" than lethal crowd control weapon, designed to demoralise and scatter anti-NT protestors. The bands of ballistic gel inside strike targets and incapacitate without causing serious maiming. In Theory."
@@ -526,6 +617,76 @@
desc = "An anti-infantry device produced during the corporate wars. The explosive payload has been swapped out for 'viscerator'-type antipersonnel drones."
spawn_type = /mob/living/simple_animal/hostile/viscerator
+
+
+//Claymores
+//shrapnel based dir explosive, extreme short range
+//FRONT TOWARDS ENEMY
+/obj/item/mine/directional/claymore
+ name = "C-10 Claymore"
+ desc = "A compact anti-personnel device with a directional trigger that responds to movement. A faded sticker on the back reads \"FRONT TOWARDS ENEMY\"."
+ icon = 'icons/obj/world/landmine.dmi'
+ icon_state = "mine_claymore"
+ base_icon_state = "mine_claymore"
+
+ trigger_range = 2
+
+ //customize explosive power
+ var/range_devastation = -1
+ var/range_heavy = 0
+ var/range_light = 1
+ var/range_flame = 0
+
+ //using this to indicate pb
+ var/range_flash = 1
+
+ //a second run of shrapnel, intended for maiming especially pb targets
+ var/obj/item/ammo_casing/shredtype = /obj/item/ammo_casing/caseless/shrapnel/shred
+ casingtype = /obj/item/ammo_casing/caseless/shrapnel
+
+ manufacturer = MANUFACTURER_SCARBOROUGH
+
+//this will return to basic mines when we relegate them to specifically being on certain ruins & battlefields. For now, it's way too dangerous
+/obj/item/mine/directional/claymore/Initialize()
+ . = ..()
+ AddElement(/datum/element/world_icon, null, icon, 'icons/obj/landmine.dmi')
+
+/obj/item/mine/directional/claymore/attackby(obj/item/I, mob/user)
+ if (I.tool_behaviour == TOOL_SCREWDRIVER && armed)
+ to_chat(user, "You begin unscrewing \the [src]'s arming pin...")
+ I.play_tool_sound(src, 50)
+ if(do_after(user, 10 SECONDS, target = src))
+ to_chat(user, "You unscrew \the [src]'s arming pin, disarming it.")
+ disarm()
+ else
+ . = ..()
+
+/obj/item/mine/directional/claymore/mine_effect(mob/victim)
+ . = ..()
+ //if you somehow explode it while on the same tile, you win bonus shrapnel
+ //also spews stuff everywhere if it's triggered while not set up
+ if(!target_turf || victim ? (victim.loc == src.loc) : victim == null)
+ explosion(src, range_devastation, range_heavy, range_light, range_flash, 1, 0, range_flame, 0, 1)
+ var/casingammo = casingtype.projectile_type
+ var/shredammo = shredtype.projectile_type
+ if(casingtype)
+ AddComponent(/datum/component/pellet_cloud, projectile_type = casingammo, magnitude = 1)
+ if(shredtype)
+ AddComponent(/datum/component/pellet_cloud, projectile_type = shredammo, magnitude = 2)
+ else
+ var/blastloc = get_step_towards(src, target_turf)
+ explosion(blastloc, range_devastation, range_heavy, range_light, range_flash, 1, 0, range_flame, 0, 1)
+ if(shredtype)
+ var/obj/item/ammo_casing/shredcasing = new shredtype(src)
+ shredcasing.fire_casing(target_turf, null, null, null, 30, ran_zone(), 50, src)
+
+/obj/item/mine/directional/claymore/plasma
+ name = "\improper Etherbor EC-1"
+ desc = "A proximity explosive designed by the PGF for ambushing advancing infantry & defending corridors. Cooks armored targets to well-done."
+ shredtype = /obj/item/ammo_casing/caseless/shrapnel/shred/plasma
+ casingtype = /obj/item/ammo_casing/caseless/shrapnel/plasma
+ manufacturer = MANUFACTURER_PGF
+
//
//GIMMICK MINES//
//pretty much exclusively for adminbus & code dependencies
@@ -671,6 +832,9 @@ LIVE_MINE_HELPER(proximity/explosive/sting)
LIVE_MINE_HELPER(proximity/spawner/manhack)
LIVE_MINE_HELPER(proximity/explosive/plasma)
+LIVE_MINE_HELPER(directional/claymore)
+LIVE_MINE_HELPER(directional/claymore/plasma)
+
LIVE_MINE_HELPER(pressure/gas)
LIVE_MINE_HELPER(pressure/kickmine)
LIVE_MINE_HELPER(pressure/sound)
@@ -679,10 +843,10 @@ LIVE_MINE_HELPER(pressure/sound)
// spawners (random mines, minefields, non-guaranteed mine)
//
-/obj/effect/spawner/lootdrop/mine
+/obj/effect/spawner/random/mine
name = "live mine spawner (random)"
- lootcount = 1
- fan_out_items = TRUE
+ spawn_loot_count = 1
+ spawn_loot_split = TRUE
loot = list(
/obj/item/mine/pressure/explosive/live = 10,
/obj/item/mine/pressure/explosive/shrapnel/live = 3,
@@ -702,7 +866,7 @@ LIVE_MINE_HELPER(pressure/sound)
/obj/effect/spawner/minefield/random
name = "random minefield spawner"
- minetype = /obj/effect/spawner/lootdrop/mine
+ minetype = /obj/effect/spawner/random/mine
/obj/effect/spawner/minefield/manhack
name = "manhack field spawner"
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 204371ca0e518..50b8e3958043e 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -170,10 +170,8 @@
toolspeed = 0.5
/obj/item/multitool/syndie
- name = "suspicious-looking multitool"
desc = "A darkened multitool with a matte finish and an ominous glowing screen."
icon_state = "multitool_syndie"
- toolspeed = 0.5
/obj/item/multitool/old
desc = "Used for pulsing wires to test which to cut. This one looks... 'retro'. It wasn't recommended by doctors then and won't be recommended by doctors now."
diff --git a/code/game/objects/items/devices/polycircuit.dm b/code/game/objects/items/devices/polycircuit.dm
index be41de2c84113..def5d876d11be 100644
--- a/code/game/objects/items/devices/polycircuit.dm
+++ b/code/game/objects/items/devices/polycircuit.dm
@@ -4,7 +4,7 @@
desc = "A dense, overdesigned cluster of electronics which attempted to function as a multipurpose circuit electronic. Circuits can be removed from it... if you don't bleed out in the process."
icon_state = "circuit_mess"
item_state = "rods"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_NORMAL
max_amount = 8
var/circuit_type = /obj/item/electronics/airlock
var/chosen_circuit = "airlock"
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index f8ced22c54be4..d93760363e71a 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -63,12 +63,12 @@
/obj/item/encryptionkey/headset_com
name = "command radio encryption key"
icon_state = "com_cypherkey"
- channels = list(RADIO_CHANNEL_COMMAND = 1)
+ channels = list(RADIO_CHANNEL_EMERGENCY = 1)
/obj/item/encryptionkey/heads/captain
name = "\proper the captain's encryption key"
icon_state = "cap_cypherkey"
- channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_WIDEBAND = 0) //WS edit - Wideband radio
+ channels = list(RADIO_CHANNEL_EMERGENCY = 1, RADIO_CHANNEL_WIDEBAND = 0) //WS edit - Wideband radio
/obj/item/encryptionkey/headset_cent
name = "\improper CentCom radio encryption key"
@@ -77,10 +77,7 @@
channels = list(RADIO_CHANNEL_CENTCOM = 1, RADIO_CHANNEL_WIDEBAND = 0) //WS edit- Wideband Radio
/obj/item/encryptionkey/ai //ported from NT, this goes 'inside' the AI.
- channels = list(RADIO_CHANNEL_COMMAND = 1, RADIO_CHANNEL_AI_PRIVATE = 1)
-
-/obj/item/encryptionkey/secbot
- channels = list(RADIO_CHANNEL_AI_PRIVATE = 1)
+ channels = list(RADIO_CHANNEL_EMERGENCY = 1)
/obj/item/encryptionkey/solgov
name = "\improper SolGov encryption key"
@@ -88,11 +85,6 @@
icon_state = "solgov_cypherkey"
channels = list(RADIO_CHANNEL_SOLGOV = 1)
-// /obj/item/encryptionkey/suns
-// name = "\improper SUNS encryption key"
-// icon_state = "suns_cypherkey"
-// channels = list(RADIO_CHANNEL_SUNS = 1)
-
/obj/item/encryptionkey/wideband
name = "wideband encryption key"
icon = 'icons/obj/radio.dmi'
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 0f0081c90454b..cc091b4edbce5 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -1,7 +1,7 @@
// Used for translating channels to tokens on examination
GLOBAL_LIST_INIT(channel_tokens, list(
RADIO_CHANNEL_COMMON = RADIO_KEY_COMMON,
- RADIO_CHANNEL_COMMAND = RADIO_TOKEN_COMMAND,
+ RADIO_CHANNEL_EMERGENCY = RADIO_TOKEN_EMERGENCY,
RADIO_CHANNEL_CENTCOM = RADIO_TOKEN_CENTCOM,
RADIO_CHANNEL_SOLGOV = RADIO_TOKEN_SOLGOV, //WS Edit - SolGov Rep
RADIO_CHANNEL_SYNDICATE = RADIO_TOKEN_SYNDICATE,
@@ -10,8 +10,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
RADIO_CHANNEL_PGF = RADIO_TOKEN_PGF,
RADIO_CHANNEL_INTEQ = RADIO_TOKEN_INTEQ,
RADIO_CHANNEL_PIRATE = RADIO_TOKEN_PIRATE,
- MODE_BINARY = MODE_TOKEN_BINARY,
- RADIO_CHANNEL_AI_PRIVATE = RADIO_TOKEN_AI_PRIVATE
+ MODE_BINARY = MODE_TOKEN_BINARY
))
/obj/item/radio/headset
@@ -212,6 +211,10 @@ GLOBAL_LIST_INIT(channel_tokens, list(
desc = "This is used by Inteq Risk Management Group's mercenaries. Protects ears from flashbangs."
icon_state = "inteq_headset_alt"
+/obj/item/radio/headset/inteq/alt/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS))
+
/obj/item/radio/headset/inteq/alt/captain
name = "vanguard bowman headset"
desc = "Used by Inteq Risk Management Group's elite vanguards. Protects ears from flashbangs."
@@ -311,7 +314,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/headset_com/alt
name = "command bowman headset"
desc = "An officer's headset. Protects ears from flashbangs."
- icon_state = "com_headset_alt"
+ icon_state = "headset_alt"
/obj/item/radio/headset/headset_com/alt/ComponentInitialize()
. = ..()
@@ -330,7 +333,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/heads/captain/alt
name = "captain's bowman headset"
desc = "Dresses the ears of independent ship captains across the frontier. Protects ears from flashbangs."
- icon_state = "com_headset_alt"
+ icon_state = "headset_alt"
/obj/item/radio/headset/heads/captain/alt/ComponentInitialize()
. = ..()
@@ -456,7 +459,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/heads/hos/alt
name = "\proper the head of security's bowman headset"
desc = "The headset of the man in charge of keeping order and protecting the innocent. Protects ears from flashbangs."
- icon_state = "com_headset_alt"
+ icon_state = "headset_alt"
/obj/item/radio/headset/heads/hos/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 944fe7462583b..26a7ea19c0950 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -177,6 +177,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 31)
set_frequency(FREQ_WIDEBAND)
freqlock = TRUE
+/obj/item/radio/intercom/wideband/examine_more(mob/user)
+ interact(user)
+ return ..()
+
/obj/item/radio/intercom/wideband/unscrewed
unscrewed = TRUE
@@ -191,14 +195,36 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/wideband, 26)
independent = TRUE
/obj/item/wallframe/intercom/wideband
- name = "wideband relay frame"
+ name = "wideband relay wall frame"
desc = "A detached wideband relay. Attach to a wall and screw it in to use."
icon_state = "intercom-wideband"
result_path = /obj/item/radio/intercom/wideband/unscrewed
pixel_shift = 26
+/obj/item/wallframe/intercom/wideband/attackby(obj/item/attack_obj, mob/user, params)
+ if(istype(attack_obj, /obj/item/screwdriver))
+ to_chat(user, span_notice("You begin to move the mounting screws to the frame's table bracket."))
+ playsound(src, 'sound/items/screwdriver2.ogg', 30, TRUE)
+ if(do_after(user, 2 SECONDS, src))
+ var/obj/item/wallframe/intercom/wideband/table/replacement = new (get_turf(src))
+ qdel(src)
+ to_chat(user, span_notice("You ready the table bracket on [replacement]."))
+ playsound(src, 'sound/items/screwdriver2.ogg', 30, TRUE)
+
/obj/item/wallframe/intercom/wideband/table
- icon_state = "intercom-wideband-table"
- icon = 'icons/obj/radio.dmi'
+ name = "wideband relay table frame"
+ desc = "A detached wideband relay. Attach to a table and screw it in to use."
+ icon_state = "intercom-wideband"
+ icon = 'icons/obj/wallframe.dmi'
result_path = /obj/item/radio/intercom/wideband/table
pixel_shift = 0
+
+/obj/item/wallframe/intercom/wideband/table/attackby(obj/item/attack_obj, mob/user, params)
+ if(istype(attack_obj, /obj/item/screwdriver))
+ to_chat(user, span_notice("You begin to move the mounting screws to the frame's wall bracket."))
+ playsound(src, 'sound/items/screwdriver2.ogg', 30, TRUE)
+ if(do_after(user, 2 SECONDS, src))
+ var/obj/item/wallframe/intercom/wideband/replacement = new (get_turf(src))
+ qdel(src)
+ to_chat(user, span_notice("You ready the wall bracket on [replacement]."))
+ playsound(src, 'sound/items/screwdriver2.ogg', 30, TRUE)
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index cc528f103fe2d..26b64330bba09 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -16,34 +16,51 @@
throw_speed = 3
throw_range = 7
w_class = WEIGHT_CLASS_SMALL
- custom_materials = list(/datum/material/iron=75, /datum/material/glass=25)
+ custom_materials = list(/datum/material/iron = 75, /datum/material/glass = 25)
+ slot_flags = ITEM_SLOT_NECK //Allows to be worn on neck so it's not eating pocket slots.
obj_flags = USES_TGUI
var/on = TRUE
var/frequency = FREQ_COMMON
- var/canhear_range = 3 // The range around the radio in which mobs can hear what it receives.
- var/emped = 0 // Tracks the number of EMPs currently stacked.
- var/headset = FALSE // It can be used for hotkeys
- var/last_chatter_time // The time since we last played a radio chatter sound. (WS edit - Radio Chatter #434)
-
- var/broadcasting = FALSE // Whether the radio will transmit dialogue it hears nearby.
- var/listening = FALSE // Whether the radio is currently receiving.
- var/prison_radio = FALSE // If true, the transmit wire starts cut.
- var/unscrewed = FALSE // Whether wires are accessible. Toggleable by screwdrivering.
- var/freerange = FALSE // If true, the radio has access to the full spectrum.
- var/subspace_transmission = FALSE // If true, the radio transmits and receives on subspace exclusively.
- var/subspace_switchable = FALSE // If true, subspace_transmission can be toggled at will.
- var/freqlock = FALSE // Frequency lock to stop the user from untuning specialist radios.
- var/use_command = FALSE // If true, broadcasts will be large and BOLD.
- var/command = FALSE // If true, use_command can be toggled at will.
- var/log = FALSE // If true, the UI will display the voice log for the frequency
- var/list/loglist = list() //the voice log
-
- // Encryption key handling
+ ///The range around the radio in which mobs can hear what it receives.
+ var/canhear_range = 3
+ ///Tracks the number of EMPs currently stacked.
+ var/emped = 0
+ ///It can be used for hotkeys
+ var/headset = FALSE
+ ///Whether the radio will transmit dialogue it hears nearby.
+ var/broadcasting = FALSE
+ ///Whether the radio is currently receiving.
+ var/listening = FALSE
+ ///If true, the transmit wire starts cut.
+ var/prison_radio = FALSE
+ ///Whether wires are accessible. Toggleable by screwdrivering.
+ var/unscrewed = FALSE
+ ///If true, the radio has access to the full spectrum.
+ var/freerange = FALSE
+ ///If true, the radio transmits and receives on subspace exclusively.
+ var/subspace_transmission = FALSE
+ ///If true, subspace_transmission can be toggled at will.
+ var/subspace_switchable = FALSE
+ ///Frequency lock to stop the user from untuning specialist radios.
+ var/freqlock = FALSE
+ ///If true, broadcasts will be large and BOLD.
+ var/use_command = FALSE
+ ///If true, use_command can be toggled at will.
+ var/command = FALSE
+ ///If true, the UI will display the voice log for the frequency
+ var/log = FALSE
+ ///the voice log
+ var/list/loglist = list()
+
+ ///Encryption key handling
var/obj/item/encryptionkey/keyslot
- var/translate_binary = FALSE // If true, can hear the special binary channel.
- var/independent = FALSE // If true, can say/hear on the special CentCom channel.
- var/list/channels = list() // Map from name (see communications.dm) to on/off. First entry is current department (:h)
+ ///If true, can hear the special binary channel.
+ var/translate_binary = FALSE
+ ///If true, can say/hear on the special CentCom channel.
+ var/independent = FALSE
+ ///Map from name (see communications.dm) to on/off. First entry is current department (:h)
+ var/list/channels = list()
var/list/secure_radio_connections
var/const/FREQ_LISTENING = 1
@@ -254,20 +271,16 @@
var/datum/signal/subspace/vocal/signal = new(src, freq, speaker, language, message, spans, message_mods)
// Independent radios, on the CentCom frequency, reach all independent radios
- if (independent && (freq == FREQ_CENTCOM || freq == FREQ_WIDEBAND || freq == FREQ_CTF_RED || freq == FREQ_CTF_BLUE)) //WS Edit - SolGov Rep
+ if (independent && (freq == FREQ_CENTCOM || freq == FREQ_WIDEBAND))
signal.data["compression"] = 0
signal.transmission_method = TRANSMISSION_SUPERSPACE
signal.map_zones = list(0) // reaches all Z-levels
signal.broadcast()
- playsound(src, "sound/effects/walkietalkie.ogg", 20, FALSE) //WS Edit - Radio chatter
return
// All radios make an attempt to use the subspace system first
signal.send_to_receivers()
- //At this point the signal was transmitted so play a sound //WS Edit - Radio chatter
- playsound(src, "sound/effects/walkietalkie.ogg", 20, FALSE) //WS Edit - Radio chatter
-
// If the radio is subspace-only, that's all it can do
if (subspace_transmission)
return
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 1f4b2ae6f6a2d..e273aceed4735 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -5,7 +5,6 @@ CONTAINS:
T-RAY
HEALTH ANALYZER
GAS ANALYZER
-SLIME SCANNER
NANITE SCANNER
GENE SCANNER
@@ -88,7 +87,7 @@ GENE SCANNER
item_flags = NOBLUDGEON
slot_flags = ITEM_SLOT_BELT
throwforce = 3
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
custom_materials = list(/datum/material/iron=200)
@@ -235,7 +234,7 @@ GENE SCANNER
[CEILING(brute_loss,1)]
\
[CEILING(fire_loss,1)]
\
[CEILING(tox_loss,1)]
\
-
[CEILING(oxy_loss,1)]
"
+
[CEILING(oxy_loss,1)]
"
for(var/o in damaged)
var/obj/item/bodypart/org = o //head, left arm, right arm, etc.
@@ -290,9 +289,9 @@ GENE SCANNER
var/render = FALSE
var/toReport = "Organs:\
\
-
Organ
\
- [advanced ? "
Dmg
" : ""]\
-
Status
"
+
Organ
\
+ [advanced ? "
Dmg
" : ""]\
+
Status
"
for(var/obj/item/organ/organ in H.internal_organs)
var/status = ""
@@ -301,8 +300,8 @@ GENE SCANNER
else if (organ.damage > organ.low_threshold) status = "Mildly Damaged"
if (status != "")
render = TRUE
- toReport += "
"
for(var/i = 1, mytape.storedinfo.len >= i, i++)
t1 += "[mytape.storedinfo[i]] "
transcript_paper.add_raw_text(t1)
@@ -231,6 +278,32 @@
canprint = FALSE
addtimer(VARSET_CALLBACK(src, canprint, TRUE), 30 SECONDS)
+/obj/item/taperecorder/AltClick(mob/user)
+ . = ..()
+ if (recording)
+ stop()
+ else
+ record()
+
+/obj/item/taperecorder/proc/update_available_icons()
+ icons_available = list()
+
+ if(recording)
+ icons_available += list("Stop Recording" = image(icon = icon_directory, icon_state = "record_stop"))
+ else
+ if(!playing)
+ icons_available += list("Record" = image(icon = icon_directory, icon_state = "record"))
+
+ if(playing)
+ icons_available += list("Pause" = image(icon = icon_directory, icon_state = "pause"))
+ else
+ if(!recording)
+ icons_available += list("Play" = image(icon = icon_directory, icon_state = "play"))
+
+ if(canprint && !recording && !playing)
+ icons_available += list("Print Transcript" = image(icon = icon_directory, icon_state = "print"))
+ if(mytape)
+ icons_available += list("Eject" = image(icon = icon_directory, icon_state = "eject"))
//empty tape recorders
/obj/item/taperecorder/empty
@@ -245,7 +318,7 @@
item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=20, /datum/material/glass=5)
force = 1
throwforce = 0
@@ -255,34 +328,36 @@
var/list/timestamp = list()
var/ruined = 0
+/obj/item/tape/Initialize()
+ . = ..()
+ if(ruined)
+ add_overlay("ribbonoverlay")
+
/obj/item/tape/fire_act(exposed_temperature, exposed_volume)
- ruin()
+ if(!ruined)
+ ruin()
..()
/obj/item/tape/attack_self(mob/user)
if(!ruined)
- to_chat(user, "You pull out all the tape!")
- ruin()
-
+ if(do_after(user, 30, src))
+ to_chat(user, span_notice("You pull out all the tape!"))
+ ruin()
/obj/item/tape/proc/ruin()
- //Lets not add infinite amounts of overlays when our fireact is called
- //repeatedly
- if(!ruined)
- add_overlay("ribbonoverlay")
+ add_overlay("ribbonoverlay")
ruined = 1
-
/obj/item/tape/proc/fix()
cut_overlay("ribbonoverlay")
ruined = 0
/obj/item/tape/attackby(obj/item/I, mob/user, params)
- if(ruined && I.tool_behaviour == TOOL_SCREWDRIVER || istype(I, /obj/item/pen))
- to_chat(user, "You start winding the tape back in...")
+ if(ruined && (I.tool_behaviour == TOOL_SCREWDRIVER || istype(I, /obj/item/pen)))
+ to_chat(user, span_notice("You start winding the tape back in..."))
if(I.use_tool(src, user, 120))
- to_chat(user, "You wound the tape back in.")
+ to_chat(user, span_notice("You wound the tape back in."))
fix()
//Random colour tapes
@@ -292,3 +367,12 @@
/obj/item/tape/random/Initialize()
. = ..()
icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
+
+//How 2 set custom recorded tapes:
+//create a list of lines to populate stored_info. Each line should follow a format like "[timestamp] [speaker] [speaking verb] ["what they're saying"]"
+//create a list of timestamps. Each one should correspond to how long the recorder should wait before saying the line associated with the timestamp.
+//e.g. "[00:00] Recording started." timestamp = 0
+//"[00:15] [span_name("berry fox")] says "wow. I love eating berries so much"" timestamp = 15
+//set used capacity to how many 'seconds' used by the prerecorded message
+//optional: set max capacity to used capacity
+//optional: set ruined var (you can fix this with a pen)
diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm
index 2fb225fd2fb98..a0bd461483588 100644
--- a/code/game/objects/items/documents.dm
+++ b/code/game/objects/items/documents.dm
@@ -5,7 +5,7 @@
icon_state = "docs_generic"
item_state = "paper"
throwforce = 0
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_NORMAL
throw_range = 1
throw_speed = 1
layer = MOB_LAYER
@@ -49,6 +49,15 @@
/obj/item/documents/syndicate/mining
desc = "\"Top Secret\" documents detailing Syndicate plasma mining operations."
+/obj/item/documents/syndicate/ngr
+ name = "Second Battlegroup secret documents"
+ 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/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm
index a6c5394e06470..5c104a1a747c8 100644
--- a/code/game/objects/items/food/spaghetti.dm
+++ b/code/game/objects/items/food/spaghetti.dm
@@ -29,14 +29,14 @@
/obj/item/food/spaghetti/pastatomato
name = "spaghetti"
- desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!"
+ desc = "Spaghetti and crushed tomatoes, almost as tangled as Miskilamo's wiring!"
icon_state = "pastatomato"
trash_type = /obj/item/trash/plate
bite_consumption = 4
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
microwaved_type = null
tastes = list("pasta" = 1, "tomato" = 1)
- foodtypes = GRAIN | VEGETABLES
+ foodtypes = GRAIN | FRUIT
/obj/item/food/spaghetti/copypasta
name = "copypasta"
diff --git a/code/game/objects/items/gear_packs.dm b/code/game/objects/items/gear_packs.dm
index 65db4ffa28c93..0e80c407261ca 100644
--- a/code/game/objects/items/gear_packs.dm
+++ b/code/game/objects/items/gear_packs.dm
@@ -24,6 +24,13 @@
var/obj/item/gear_handle/gear_handle_type = /obj/item/gear_handle
var/obj/item/gear_handle/gear_handle
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_BACK
+ equip_delay_other = EQUIP_DELAY_BACK * 1.5
+ strip_delay = EQUIP_DELAY_BACK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
+
/obj/item/gear_pack/get_cell()
return cell
@@ -106,7 +113,7 @@
var/mob/M = loc
if(!M.incapacitated() && istype(over_object, /atom/movable/screen/inventory/hand))
var/atom/movable/screen/inventory/hand/H = over_object
- M.putItemFromInventoryInHandIfPossible(src, H.held_index)
+ M.putItemFromInventoryInHandIfPossible(src, H.held_index, FALSE, TRUE)
/obj/item/gear_pack/attackby(obj/item/W, mob/user, params)
if(W == gear_handle)
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index 79b37d41e52c7..2e5c9275d8df5 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -332,7 +332,7 @@
/obj/item/book/granter/spell/random/Initialize()
. = ..()
- var/static/banned_spells = list(/obj/item/book/granter/spell/mimery_blockade, /obj/item/book/granter/spell/mimery_guns)
+ var/static/banned_spells = list(/obj/item/book/granter/spell/mimery_blockade)
var/real_type = pick(subtypesof(/obj/item/book/granter/spell) - banned_spells)
new real_type(loc)
return INITIALIZE_HINT_QDEL
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index e8b7e0de487f1..58fd68157f089 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -217,36 +217,8 @@
if(stage != GRENADE_READY)
return
- for(var/obj/item/slime_extract/S in beakers)
- if(S.Uses)
- for(var/obj/item/reagent_containers/glass/G in beakers)
- G.reagents.trans_to(S, G.reagents.total_volume)
-
- //If there is still a core (sometimes it's used up)
- //and there are reagents left, behave normally,
- //otherwise drop it on the ground for timed reactions like gold.
-
- if(S)
- if(S.reagents && S.reagents.total_volume)
- for(var/obj/item/reagent_containers/glass/G in beakers)
- S.reagents.trans_to(G, S.reagents.total_volume)
- else
- S.forceMove(get_turf(src))
- no_splash = TRUE
..()
- //I tried to just put it in the allowed_containers list but
- //if you do that it must have reagents. If you're going to
- //make a special case you might as well do it explicitly. -Sayu
-/obj/item/grenade/chem_grenade/large/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/slime_extract) && stage == GRENADE_WIRED)
- if(!user.transferItemToLoc(I, src))
- return
- to_chat(user, "You add [I] to the [initial(name)] assembly.")
- beakers += I
- else
- return ..()
-
/obj/item/grenade/chem_grenade/cryo // Intended for rare cryogenic mixes. Cools the area moderately upon detonation.
name = "cryo grenade"
desc = "A custom made cryogenic grenade. Rapidly cools contents upon ignition."
diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm
index 5326b303d977a..b9ad8730b6524 100644
--- a/code/game/objects/items/grenades/clusterbuster.dm
+++ b/code/game/objects/items/grenades/clusterbuster.dm
@@ -79,36 +79,7 @@
var/obj/item/grenade/P = new type(loc)
if(istype(P))
P.active = TRUE
- addtimer(CALLBACK(P, TYPE_PROC_REF(/obj/item/grenade, prime)), rand(15,60))
- var/steps = rand(1,4)
- for(var/i in 1 to steps)
- step_away(src,loc)
-
-/obj/effect/payload_spawner/random_slime
- var/volatile = FALSE
-
-/obj/effect/payload_spawner/random_slime/volatile
- volatile = TRUE
-
-/obj/item/slime_extract/proc/activate_slime()
- var/list/slime_chems = src.activate_reagents
- if(!QDELETED(src))
- var/chem = pick(slime_chems)
- var/amount = 5
- if(chem == "lesser plasma") //In the rare case we get another rainbow.
- chem = /datum/reagent/toxin/plasma
- amount = 4
- if(chem == "holy water and uranium")
- chem = /datum/reagent/uranium
- reagents.add_reagent(/datum/reagent/water/holywater)
- reagents.add_reagent(chem,amount)
-
-/obj/effect/payload_spawner/random_slime/spawn_payload(type, numspawned)
- for(var/loop = numspawned ,loop > 0, loop--)
- var/chosen = pick(subtypesof(/obj/item/slime_extract))
- var/obj/item/slime_extract/P = new chosen(loc)
- if(volatile)
- addtimer(CALLBACK(P, TYPE_PROC_REF(/obj/item/slime_extract, activate_slime)), rand(15,60))
+ P.preprime(delayoverride = P.det_time + rand(1.5 SECONDS, 6 SECONDS))
var/steps = rand(1,4)
for(var/i in 1 to steps)
step_away(src,loc)
@@ -180,14 +151,3 @@
var/real_type = pick(subtypesof(/obj/item/grenade/clusterbuster))
new real_type(loc)
return INITIALIZE_HINT_QDEL
-
-//rainbow slime effect
-/obj/item/grenade/clusterbuster/slime
- name = "Blorble Blorble"
- icon_state = "slimebang"
- base_state = "slimebang"
- payload_spawner = /obj/effect/payload_spawner/random_slime
- prime_sound = 'sound/effects/bubbles.ogg'
-
-/obj/item/grenade/clusterbuster/slime/volatile
- payload_spawner = /obj/effect/payload_spawner/random_slime/volatile
diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm
index 915011b81b11b..247ca439c8bd9 100644
--- a/code/game/objects/items/grenades/ghettobomb.dm
+++ b/code/game/objects/items/grenades/ghettobomb.dm
@@ -25,7 +25,7 @@
add_overlay("improvised_grenade_filled")
add_overlay("improvised_grenade_wired")
times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value]
- det_time = text2num(pickweight(times))
+ det_time = text2num(pick_weight(times))
if(det_time < 0) //checking for 'duds'
range = 1
det_time = rand(30,80)
diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm
index f0198b7f1a0b7..fb19cfe31700c 100644
--- a/code/game/objects/items/grenades/grenade.dm
+++ b/code/game/objects/items/grenades/grenade.dm
@@ -150,7 +150,18 @@
/obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
var/obj/projectile/P = hitby
- if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && prob(15))
+ var/list/valid_hands = list(FALSE, FALSE)
+
+ //checks if the projectile hits an arm holding a grenade
+ if (istype(owner.held_items[1], (/obj/item/grenade)))
+ if (P.def_zone == "l_arm")
+ valid_hands[1] = TRUE
+
+ if (istype(owner.held_items[2], (/obj/item/grenade)))
+ if (P.def_zone == "r_arm")
+ valid_hands[2] = TRUE
+
+ if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && (valid_hands[1] || valid_hands[2]) && prob(5)) //5% chance to go off
owner.visible_message("[attack_text] hits [owner]'s [src], setting it off! What a shot!")
var/turf/T = get_turf(src)
log_game("A projectile ([hitby]) detonated a grenade held by [key_name(owner)] at [COORD(T)]")
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index c4cafbc8fdb96..7a21c9129ad71 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/grenades/smokebomb.dm b/code/game/objects/items/grenades/smokebomb.dm
index dfea3fb87829f..c29a00a83901e 100644
--- a/code/game/objects/items/grenades/smokebomb.dm
+++ b/code/game/objects/items/grenades/smokebomb.dm
@@ -1,17 +1,10 @@
/obj/item/grenade/smokebomb
name = "smoke grenade"
- desc = "Real bruh moment if you ever see this. Probably tell a c*der or something."
+ desc = "A smoke grenade pattern, used to screen unit movements, and signal landing zones, widely used by military forces on the frontier and beyond."
icon = 'icons/obj/grenade.dmi'
icon_state = "smokewhite"
item_state = "smoke"
slot_flags = ITEM_SLOT_BELT
- ///It's extremely important to keep this list up to date. It helps to generate the insightful description of the smokebomb. EDIT: honestly fuck you nemvar. go directly to jail and do not collect 200 dollars
- var/static/list/bruh_moment = list("Dank", "Hip", "Lit", "Based", "Robust", "Bruh")
-
-///Here we generate the extremely insightful description.
-/obj/item/grenade/smokebomb/Initialize()
- . = ..()
- desc = "The word '[pick(bruh_moment)]' is scribbled on it in crayon."
///Here we generate some smoke and also damage blobs??? for some reason. Honestly not sure why we do that.
/obj/item/grenade/smokebomb/prime()
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index c4c832209baca..4379003d57a84 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -110,6 +110,10 @@
radio.keyslot = new radio_key
radio.recalculateChannels()
+/obj/item/implant/radio/Destroy()
+ QDEL_NULL(radio)
+ return ..()
+
/obj/item/implant/radio/mining
radio_key = /obj/item/encryptionkey
@@ -118,13 +122,6 @@
radio_key = /obj/item/encryptionkey/syndicate
subspace_transmission = TRUE
-/obj/item/implant/radio/slime
- name = "slime radio"
- icon = 'icons/obj/surgery.dmi'
- icon_state = "adamantine_resonator"
- radio_key = /obj/item/encryptionkey
- subspace_transmission = TRUE
-
/obj/item/implant/radio/get_data()
var/dat = {"Implant Specifications: Name: Internal Radio Implant
diff --git a/code/game/objects/items/implants/implant_track.dm b/code/game/objects/items/implants/implant_track.dm
index a83d69c531454..fb4730dadf148 100644
--- a/code/game/objects/items/implants/implant_track.dm
+++ b/code/game/objects/items/implants/implant_track.dm
@@ -9,17 +9,18 @@
///The id of the timer that's qdeleting us
var/timerid
-/obj/item/implant/tracking/c38
+/obj/item/implant/tracking/bullet
name = "TRAC implant"
desc = "A smaller tracking implant that supplies power for only a few minutes."
var/lifespan = 3000 //how many deciseconds does the implant last?
allow_teleport = FALSE
-/obj/item/implant/tracking/c38/Initialize()
+/obj/item/implant/tracking/bullet/Initialize()
. = ..()
timerid = QDEL_IN(src, lifespan)
+ AddComponent(/datum/component/gps/item, "*TRAC")
-/obj/item/implant/tracking/c38/Destroy()
+/obj/item/implant/tracking/bullet/Destroy()
deltimer(timerid)
return ..()
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index 2b4aec09ac87b..1a1906188895e 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -240,10 +240,10 @@
"}
/obj/item/book/manual/trickwines_4_brewers
- name = "Trickwines for brewers"
+ name = "Ashen Brewing"
icon_state = "book2"
- author = "Bridget Saint-Baskett"
- title = "Trickwines for brewers"
+ author = "Amarasatsu ke Qazawat"
+ title = "Ashen Brewing"
dat = {"
@@ -256,73 +256,50 @@
-
Trickwines for brewers
- Okay, so you just joined the SRM and you want to make some brews! I'm tired of explaining all of this so I'm jotting it all down for the new hires.
- Trickwines almost all share the same effect. When you drink them, they provide a beneficial effect and when you toss them at someone it provides some sort of bad effect.
-
Breakaway flasks
- Honestly, I love these things. I'm not a scientist so I cant exactly explain how it works but somehow when you fuse plasma into glass it makes it ultra sharp and makes it really good for cracking over fauna heads.
- The simplest way I have found of making them is crafting them with a chunk of glass, plasma, and a welder.
-
-
Bacteria
- A speical speices of bacteria native to Illestren is what allows Trickwines form.
- Now we use a special distiller that keeps just enough bacertia alive to ferment without turning the batch sour.
- Now you should still have one on board but if you dont its fine.
- It just so happens we have trees on board our ships host to the Bacteria.
- To get enough Bacteria your going to need to feed it anything that would help a plant.
- Water, Fertilizer, Ashwine are all good options.
- Soon it will drops some apples and you can grind them for the bacteria.
- Once you have enough you can fabricate it the same way you would a normal barrel.
-
-
Ratios
- A common trend among Trickwines is the ratio of 3:1:1.
- 3 parts being an ethonal, the other 2 parts are often made from flora or fauna.
-
-
Ashwine
- It's kind of our trademark, and it's one of the simplest trickwines to make.
- These are the most common wines used in ceremonies so we often stock ships with the moonflowers needed to make them.
- It's made with a ratio of 3:1:1 absinthe, mushroom hallucinogen, and ash respectively.
- Mushroom hallucinogens come from mushroom caps and you can ferment absinthe from moonflowers.
- Its a mild hallucinogenic but seems to have powerful cleansing effects on the devoted SRM.
- It can also really fuck someone up, causing their vision to go shaky and blurry which makes it difficult for them to fight.
-
-
Icewine
- This one helps stopping foes in their tracks. One of my favorite flavor wise.
- Its made with 3:1:1 saké, polar bear fur, frost oil(grind chilled peppers).
- You can get polar bear fur and frost oil from grinding up polar bear hides and chilled peppers.
- It's pretty good at sealing burns and lowering your temperature quickly.
- However, it completely encases foes in ice and drops their temperature substantially.
-
-
Shockwine
- Easily my favorite for its splashed effect, this thing is great at scorching most fauna.
- Its made with vodka, calcium, and lemon juice.
- If you did not know, vodka requires enzymes instead of the normal fermenting process.
- It's a nice upper. Great if you're trying to run away.
- This one's really flashy. Expect some severe burns on your target
-
-
Hearthwine
- I once threw back a flask of this stuff in the heat of a really bad battle and it sealed my wounds within seconds its honestly increadible.
- It also acts like the inverse of Icewine heating you up more then a fever.
- Last time I threw it at someone though i almost burnt down the forest I was in.
- Its made out of ground up fireblossems with some nice hard cider and a bit of welding fuel with of course a ratio of 3:1:1.
-
-
Forcewine
- Two intresting effects from the consumption of Forcewine.
- First it seems to give you an "anti magic" effect, I have read about of tales of how it fizzled out some sort of great curse that we could best trace back to a ancient cult.
- Second is it protects the mind from cohersion and mind control.
- From my research this seems to act like nanotrasen mindshield implants.
- Would recomend for any esoteric senarios. We wont see these alot but its always smart to prepare for the worst.
- You can also use it to entrap Fauna inside of a forcefield like bubble, Gives you time to breath and prepare an attack.
- 3:1:1. Tequila, Space Montain Wind, and I know its one of the most difficult things to come by but hollow water, Its that stuff you can extract from geysers
-
-
Prismwine
- Gives you a nice shiny layer of armour, fire seems to have alot harder time sticking to me when i tested it.
- Throwing it seeems to do the reverse acting like a magnifying glass to burns and lasers
- 3:1:1. Good ol Gin, then add plasma and tinea luxor which is found from mushroom stems
-
- Some of these can be a bit situatinal but its always nice to have a few in your bag for emergecys.
- As a bonus, most of the other factions have no clue how to make these so you can sell them for a fair chunk of cash.
-
- Bridget Saint-Baskett, Senior Brewer
+
On the Topic of Trickwines
+ The alchemists of Roumain have long held that with sufficient preparation can many a potion be made. Many a daring hunter has returned to their domicile at the aid of an Alchemist. For those who travel, the 'Trickwine' is oft chosen, and so the learners of Roumain pass the secrets on to others.
+ A 'trickwine' is a potent brew, made by taking the powers that rest in the world around us and fermenting them in the blessings of Illestren. When imbibed by a Hunter, strength and power flow through their body, yet when shattered upon the beasts of the World, Illestrens' curses are unleashed upon it.
+ To freely create a trickwine is the mark of a rising alchemist, and to deliver it in the heat of a brawl is the mark of a true Hunter.
+ May this document guide you to both those marks.
+
+
Brewing Vessels.
+ While many vessels permeate the minds of alchemists, the Breakaway Flask is the instrument of choice for the rising talent. By taking the essence of plasma and infusing it within the body of glass - a most durable vessel is produced for the Trickwine. The glass remains firm lest it impacts upon a foe.
+ Any who tinker will find the infusion of essence is done most easily with a flame. Something that burns with a flame most potent. Away from the furnaces of Illestren, the burn of a welder suffices to create the vessel.
+
+
The Bacteria Of Illestren
+ The world of Illestren gave birth to a bacterium that has formed the backbone of alchemical experimentation for countless years. It has given birth to countless fermentation methods, including the cycle of brewing a Trickwine.
+ By use of a specialized distillery, the Illestren Bacteria can be maintained in amounts ideal to the fermentation of reagents from Trickwines to Beers. A talented brewer can create their own heritage by blending activating bacterium and reagent into a new concotion.
+ Not all vessels of the Militia bear a distillery, but plants transplanted from Illestren carry the bacterium within the flesh of their fruit. Careful nurture of a fruit-bearing plant will allow it to spread the blessings of Illestren. Treat the plant as you would treat any other ally. Allot it drinks. Trim its branches. Protect it from those who seek to harm it.
+ Once the fruit has ripened and dropped from the host, an alchemist can take it, fermenting the ripe flesh into a potent mixture of ciders and bacterias entangled together.
+ Just as we give to the tree, it shall give to us. It pays a talent to remember this.
+
+
Common Mixtures
+ Those that find easy success within the alchemical arts have written that to make a Trickwine, one must maintain a careful mixture.
+ Three wholes of an ethanol base, with the flavor varied for impact. Entangled with a whole strand of beast, and the blessings of plant. Once cut with the potent catalyst that is the Bacterium, the fermentation is rapid, and a Trickwine is born from the mixture.
+
+
Wine Of Ash
+ The Wine Of Ash is the most endearing brew to have come from the Distilleries of the Militia. It carries a variety of uses, from the Ceremonies of Roumain, to the warm afterparty of a successful hunt. The flavor is said to be somewhat rustic, with hints of fruit and a sweet yet ashy tang.
+ Brewing the Wine Of Ash is a simple task, that even Shadows are expected to do at times. By fermenting a flower of the moon into a potent absinthe, a strong base is formed. Seeping a hallucinogenic mushroom within the absinthe, and then introducing an ash into the mixture of drink and plant creates the Wine Of Ash. One must be patient when brewing, as the brew will be strong, but further fermentation will allow it to blossom into a true vintage.
+ Take care whilst brewing to maintain a proper ratio of ingredients. The Wine shall become off-balance if more than one whole of mushroom and one whole of ash is introduced to three wholes of absinthe. One must also take care to protect their eyes, as the Vapors of Ash are a potent irritant.
+ The Wine itself is held to be hallucinogenic, although debate rages within the halls of Roumain on the nature of such. A talented brewer can offset such trivialities by cutting the Wine with water, or introducing another substance once it has been fermented. Many a Hunter holds the drink to purify the soul, and strengthen the mind for days ahead.
+
+
Wine Of Ice
+ The Wine Of Ice is a strong brew formented by the Talent Keo Lanai. Talent Lanai had long found solace from the heat in his visions of the 'Godsforsaken Precipice' that the Ashen Huntsman was said to wander, and sought to share this solace with other Hunters. The flavor is said to be somewhat meaty, with a pleasing current of pepper.
+ Brewing of the Wine Of Ice requires a unique assortment of reagents. By fermenting the fur of a bear within traditionally brewed rice sake, Keo Lanai found a solid base for the introduction of Frozen Pepper Essence. It is said that the original brew produced a cold so potent that frost formed on Lanai's brow.
+ Hunters favor the Wine Of Ice for blessed relief from heat imbibing it provide. Alchemists have theorized that the brew stimulates the production of sweat in the body, allowing the body to cool itself more rapidly. Other Hunters swear by relief seeping into their burns as the brew finds its way into their system. Others find usage in the potent frost that it leaves upon impact, using it to freeze everything from foe to food.
+
+
Lightning's Blessing
+ Lightning's Blessing is said to be a potent stimulant, brewed by Hunter Trackers to allow them to track mobile prey through unknown environments. The flavor is said to be sharp and unrelenting, much like the Hunters who indulge in it.
+ Lightning's Blessing is brewed with a base of Vodka. By taking vodka and fermenting ground down bones within it, a strong alchemical blend is created. This blend is then inoculated with juiced lemon whilst within a distillery. The resulting blend is an environment ripe for a particular strain of Bacterium to multiply in. This strain of the Bacterium is said to be what gives the flavor to the brew, and its digestion produces a high in most sapients.
+ Hunters are said to use Lightning's Blessing as a weapon, where the bacterium, upon being introduced to open air quickly produces an electrical field, shocking whatever the mixture lands upon.
+
+
Hearthflame
+ Hearthflame is Talent Lanai's other great creation. While travelling through the cold of many a fringe world, Lanai sought the warmth of his home, and took the creation of another mixture as a challenge. By taking the hearty fermented blend of an Illestren Apple, The petals of a Fireblossom, and a hint of phosphorous, Lanai produced a potent heating drink.
+ Hearthflame is said to have a bold flavor profile, not unlike an apple shredded apart by tangy pricks. The bacterium is said to stimulate the body and cause it to start heating herself, or in cases of localized exposure, causes rapid, cauterizing heating.
+ When this particular blend is exposed to the air, it rapidly heats up. Hunters have advised Shadows be careful if issued it, and most Alchemists refuse to make it unless it is required for the hunt at hand.
+ Transcribed by Amarasatsu ke Qazawat
+
+ Amarasatsu ke Qazawat
"}
diff --git a/code/game/objects/items/melee/chainsaw.dm b/code/game/objects/items/melee/chainsaw.dm
index d179237f8559b..f0b7019200f1b 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 28242c1006a1f..1959fa81eaea9 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 34219662e53d6..1985c3d7ebfa0 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 8ae5cdd96f363..961325d50c162 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 b3e04ac1bc3c8..d58c48c5e4ff3 100644
--- a/code/game/objects/items/melee/fireaxe.dm
+++ b/code/game/objects/items/melee/fireaxe.dm
@@ -2,6 +2,7 @@
icon = 'icons/obj/weapon/axe.dmi'
lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/axes_righthand.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/back.dmi'
force = 5
throwforce = 15
w_class = WEIGHT_CLASS_BULKY
@@ -12,15 +13,14 @@
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
- species_exception = list(/datum/species/kepori)
/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,50 @@
/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")
+
+/*
+Blunt
+ */
+/obj/item/melee/axe/sledgehammer
+ icon_state = "sledgehammer"
+ base_icon_state = "sledgehammer"
+ name = "breaching sledgehammer"
+ desc = "A large hammer used by the Gorlex Marauder splinters. As powerful as a weapon as it is a shipbreaking and mining tool."
+ force = 5
+ armour_penetration = 40
+ attack_verb = list("bashed", "smashed", "crushed", "smacked")
+ hitsound = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')
+ slot_flags = ITEM_SLOT_BACK
+ sharpness = IS_BLUNT
+ toolspeed = 0.5
+ wall_decon_damage = MINERAL_WALL_INTEGRITY
+ usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
+ var/wielded = FALSE
+
+/obj/item/melee/axe/sledgehammer/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=30, icon_wielded="[base_icon_state]_w")
+
+/obj/item/melee/axe/sledgehammer/Initialize()
+ . = ..()
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
+
+/obj/item/melee/axe/sledgehammer/proc/on_wield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ tool_behaviour = TOOL_MINING
+ wielded = TRUE
+
+/obj/item/melee/axe/sledgehammer/proc/on_unwield(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ tool_behaviour = null
+ wielded = FALSE
+
+/obj/item/melee/axe/sledgehammer/attack(mob/living/target, mob/living/user)
+ . = ..()
+ var/atom/throw_target = get_edge_target_turf(target, user.dir)
+ if(!target.anchored)
+ target.throw_at(throw_target, rand(1,2), 2, user, gentle = TRUE)
diff --git a/code/game/objects/items/melee/knife.dm b/code/game/objects/items/melee/knife.dm
index 83022e7125fff..b671018d65401 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()
@@ -161,10 +161,12 @@
icon_state = "switchblade"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ world_file = null
desc = "A sharp, concealable, spring-loaded knife."
flags_1 = CONDUCT_1
force = 3
w_class = WEIGHT_CLASS_SMALL
+ sharpness = IS_BLUNT
throwforce = 5
throw_speed = 3
throw_range = 6
@@ -172,31 +174,24 @@
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"
icon = 'icons/obj/items.dmi'
+ world_file = null
icon_state = "letter_opener"
desc = "A military combat utility survival knife."
embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index afb4bfe2ec33c..13d4ac99fe18f 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 218638882bfb6..4a7b8b789dc10 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 05225d80cff8c..e51bcdc059b97 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
@@ -217,7 +217,7 @@
return FALSE
/// After a target is hit, we do a chunk of stamina damage, along with other effects.
/// After a period of time, we then check to see what stun duration we give.
- L.Jitter(20)
+ L.set_jitter(20)
L.confused = max(confusion_amt, L.confused)
L.stuttering = max(8, L.stuttering)
L.apply_damage(stamina_loss_amt, STAMINA, BODY_ZONE_CHEST)
@@ -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,16 +550,16 @@
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)
+ target.adjust_jitter(20)
target.stuttering += 20
diff --git a/code/game/objects/items/melee/sword.dm b/code/game/objects/items/melee/sword.dm
index ff384770a318e..223a6c17f328e 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
@@ -58,7 +67,7 @@
/obj/item/melee/sword/mass/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/two_handed, force_unwielded=20, force_wielded=22, icon_wielded="[base_icon_state]1")
+ AddComponent(/datum/component/two_handed, force_unwielded=20, force_wielded=22)
/obj/item/melee/sword/katana
name = "katana"
@@ -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))
@@ -132,6 +137,13 @@
icon_state = "suns-swordstick"
item_state = "suns-swordstick"
+/obj/item/melee/sword/sabre/pgf
+ name = "\improper boarding cutlass"
+ desc = "When beam and bullet puncture the hull, a trustworthy blade will carry you through the fight"
+ icon_state = "pgf-sabre"
+ block_chance = 30
+ force = 22
+
/obj/item/melee/sword/sabre/suns/telescopic
name = "telescopic sabre"
desc = "A telescopic and retractable blade given to SUNS peacekeepers for easy concealment and carry. It's design makes it slightly less effective than normal sabres sadly, however it is still excelent at piercing armor."
@@ -145,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"
@@ -317,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 8059e021b8f00..0000000000000
--- 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 0000000000000..af574085a158d
--- /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/melee/weaponry.dm b/code/game/objects/items/melee/weaponry.dm
index 11c1b118570bd..131e5e1aab206 100644
--- a/code/game/objects/items/melee/weaponry.dm
+++ b/code/game/objects/items/melee/weaponry.dm
@@ -75,7 +75,7 @@
/obj/item/throwing_star/magspear
name = "magnetic spear"
desc = "A reusable spear that is typically loaded into kinetic spearguns."
- icon = 'icons/obj/ammo_bullets.dmi'
+ icon = 'icons/obj/ammunition/ammo_bullets.dmi'
icon_state = "magspear"
throwforce = 25 //kills regular carps in one hit
force = 10
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index 3c8f3ead87096..03f3797c4c492 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -119,7 +119,6 @@
new /obj/item/storage/belt/fannypack/bustin(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/shoes/jackboots(src)
- new /obj/item/clothing/under/color/khaki/buster(src)
new /obj/item/grenade/chem_grenade/ghostbuster(src)
new /obj/item/grenade/chem_grenade/ghostbuster(src)
new /obj/item/grenade/chem_grenade/ghostbuster(src)
diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm
index a08b1398aad8b..0882034b165ac 100644
--- a/code/game/objects/items/pet_carrier.dm
+++ b/code/game/objects/items/pet_carrier.dm
@@ -31,13 +31,13 @@
/obj/item/pet_carrier/Exited(atom/movable/occupant)
. = ..()
- if(occupant in occupants && isliving(occupant))
+ if((occupant in occupants) && isliving(occupant))
var/mob/living/L = occupant
occupants -= occupant
occupant_weight -= L.mob_size
/obj/item/pet_carrier/handle_atom_del(atom/A)
- if(A in occupants && isliving(A))
+ if((A in occupants) && isliving(A))
var/mob/living/L = A
occupants -= L
occupant_weight -= L.mob_size
@@ -178,7 +178,7 @@
add_occupant(target)
/obj/item/pet_carrier/proc/add_occupant(mob/living/occupant)
- if(occupant in occupants || !istype(occupant))
+ if((occupant in occupants) || !istype(occupant))
return
occupant.forceMove(src)
occupants += occupant
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 4b16ee60942dd..dd00d3abd1fd8 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -863,43 +863,3 @@
var/mutable_appearance/base_overlay_among = mutable_appearance(icon, "plushie_among_visor")
base_overlay_among.appearance_flags = RESET_COLOR
add_overlay(base_overlay_among)
-
-/obj/effect/spawner/lootdrop/plushie
- loot = list (
- /obj/item/toy/plush/beeplushie,
- /obj/item/toy/plush/blahaj,
- /obj/item/toy/plush/carpplushie,
- /obj/item/toy/plush/flushed,
- /obj/item/toy/plush/kari,
- /obj/item/toy/plush/lizardplushie,
- /obj/item/toy/plush/mora,
- /obj/item/toy/plush/realgoat,
- /obj/item/toy/plush/rilena,
- /obj/item/toy/plush/sharai,
- /obj/item/toy/plush/slimeplushie,
- /obj/item/toy/plush/snakeplushie,
- /obj/item/toy/plush/spider,
- /obj/item/toy/plush/tali,
- /obj/item/toy/plush/xader,
- /obj/effect/spawner/lootdrop/plushie/moth // fair chances
- )
-
-/obj/effect/spawner/lootdrop/plushie/moth
- loot = list (
- /obj/item/toy/plush/moth,
- /obj/item/toy/plush/moth/monarch,
- /obj/item/toy/plush/moth/luna,
- /obj/item/toy/plush/moth/atlas,
- /obj/item/toy/plush/moth/redish,
- /obj/item/toy/plush/moth/royal,
- /obj/item/toy/plush/moth/gothic,
- /obj/item/toy/plush/moth/lovers,
- /obj/item/toy/plush/moth/whitefly,
- /obj/item/toy/plush/moth/punished,
- /obj/item/toy/plush/moth/firewatch,
- /obj/item/toy/plush/moth/deadhead,
- /obj/item/toy/plush/moth/poison,
- /obj/item/toy/plush/moth/ragged,
- /obj/item/toy/plush/moth/snow,
- /obj/item/toy/plush/moth/moonfly
- )
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 614b37ec45482..84f4ffa1f0a18 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -321,12 +321,12 @@
if(1)
C.confused += 5
C.stuttering += 10
- C.Jitter(10)
+ C.set_jitter(10)
if(2)
C.Paralyze(40)
C.confused += 10
C.stuttering += 15
- C.Jitter(25)
+ C.set_jitter(25)
playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 130, 3)
cooldown = world.time + 600
user.log_message("used an emagged Cyborg Harm Alarm in [AREACOORD(user)]", LOG_ATTACK)
@@ -593,7 +593,7 @@
to_chat(user, "You [active? "activate":"deactivate"] [src].")
/obj/item/borg/projectile_dampen/update_icon_state()
- icon_state = "[initial(icon_state)][active]"
+ icon_state = "shield[active]"
return ..()
/obj/item/borg/projectile_dampen/proc/activate_field()
diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm
index f9d429b55a3ed..00217a8550a4b 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/shields.dm b/code/game/objects/items/shields.dm
index 685bfeae8a8a8..a9051a5c24eba 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -27,6 +27,8 @@
transparent = TRUE
max_integrity = 75
material_flags = MATERIAL_NO_EFFECTS
+ ///Modifier for recoil when using a gun with this shield in the offhand
+ var/recoil_bonus = -2
/obj/item/shield/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(transparent && (hitby.pass_flags & PASSGLASS))
@@ -42,30 +44,32 @@
/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/melee/baton))
if(cooldown < world.time - 25)
- user.visible_message("[user] bashes [src] with [W]!")
+ user.visible_message(span_warning("[user] bashes [src] with [W]!"))
playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, TRUE)
cooldown = world.time
else if(istype(W, /obj/item/stack/sheet/mineral/titanium))
if (obj_integrity >= max_integrity)
- to_chat(user, "[src] is already in perfect condition.")
+ to_chat(user, span_warning("[src] is already in perfect condition."))
else
var/obj/item/stack/sheet/mineral/titanium/T = W
T.use(1)
obj_integrity = max_integrity
- to_chat(user, "You repair [src] with [T].")
+ to_chat(user, span_notice("You repair [src] with [T]."))
else
return ..()
/obj/item/shield/riot/examine(mob/user)
. = ..()
+ if(recoil_bonus)
+ . += span_info("Firing a gun while holding this will brace against it, reducing the impact of recoil.")
var/healthpercent = round((obj_integrity/max_integrity) * 100, 1)
switch(healthpercent)
if(50 to 99)
- . += "It looks slightly damaged."
+ . += span_info("It looks slightly damaged.")
if(25 to 50)
- . += "It appears heavily damaged."
+ . += span_info("It appears heavily damaged.")
if(0 to 25)
- . += "It's falling apart!"
+ . += span_warning("It's falling apart!")
/obj/item/shield/riot/proc/shatter(mob/living/carbon/human/owner)
playsound(owner, 'sound/effects/glassbr3.ogg', 100)
@@ -97,6 +101,7 @@
block_chance = 0
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
max_integrity = 30
+ recoil_bonus = 0 //it's PLASTIC
/obj/item/shield/riot/roman/shatter(mob/living/carbon/human/owner)
playsound(owner, 'sound/effects/grillehit.ogg', 100)
@@ -115,6 +120,7 @@
transparent = FALSE
max_integrity = 55
w_class = WEIGHT_CLASS_NORMAL
+ recoil_bonus = -1
/obj/item/shield/riot/buckler/shatter(mob/living/carbon/human/owner)
playsound(owner, 'sound/effects/bang.ogg', 50)
diff --git a/code/game/objects/items/shrapnel.dm b/code/game/objects/items/shrapnel.dm
index 959649c8c59bc..8eb154baf74ff 100644
--- a/code/game/objects/items/shrapnel.dm
+++ b/code/game/objects/items/shrapnel.dm
@@ -20,7 +20,7 @@
/obj/item/shrapnel/bullet // bullets
name = "bullet"
- icon = 'icons/obj/ammo_bullets.dmi'
+ icon = 'icons/obj/ammunition/ammo_bullets.dmi'
icon_state = "pistol-brass"
item_flags = NONE
@@ -31,11 +31,42 @@
name = "\improper .38 DumDum bullet"
embedding = list(embed_chance=70, fall_chance=7, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10, embed_chance_turf_mod=-100)
+/obj/item/shrapnel/bullet/tracker
+ name = "\improper bullet tracker"
+ embedding = list(embed_chance=100, fall_chance=0, jostle_chance=1, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=1, jostle_pain_mult=2, rip_time=100, embed_chance_turf_mod=-100)
+ var/lifespan = 3000
+ var/gps_tag = "*TRAC"
+ var/timer_id
+
+/obj/item/shrapnel/bullet/tracker/Initialize()
+ . = ..()
+ timer_id = QDEL_IN(src, lifespan)
+ AddComponent(/datum/component/gps/item, gps_tag)
+
+/obj/item/shrapnel/bullet/tracker/Destroy()
+ deltimer(timer_id)
+ return ..()
+
+/obj/item/shrapnel/bullet/tracker/c38
+ name = ".38 Tracker"
+
+/obj/item/shrapnel/bullet/tracker/a8_50r
+ name = "8x50mm Tracker"
+
+/obj/item/shrapnel/bullet/tracker/a858
+ name = "8x58mm Tracker"
+
+/obj/item/shrapnel/bullet/tracker/a65clip
+ name = "6.5x57mm Tracker"
+
+/obj/item/shrapnel/bullet/tracker/a308
+ name = ".308 Tracker"
+
/obj/projectile/bullet/shrapnel
name = "flying shrapnel shard"
damage = 10
range = 10
- armour_penetration = -20
+ armour_penetration = -5
dismemberment = 25
ricochets_max = 2
ricochet_chance = 40
@@ -49,7 +80,7 @@
/obj/projectile/bullet/shrapnel/rusty
damage = 8
- armour_penetration = -35
+ armour_penetration = -10
dismemberment = 15
ricochets_max = 3//duller = less likely to stick in a wall
ricochet_chance = 60
@@ -115,3 +146,42 @@
/obj/projectile/bullet/pellet/stingball/on_ricochet(atom/A)
hit_stunned_targets = TRUE // ducking will save you from the first wave, but not the rebounds
+
+
+//claymore shrapnel stuff//
+//2 small bursts- one that harasses people passing by a bit aways, one that brutalizes point-blank targets.
+/obj/item/ammo_casing/caseless/shrapnel
+ name = "directional shrapnel burst :D"
+ desc = "I May Have Overreacted"
+ pellets = 5
+ variance = 70
+ projectile_type = /obj/projectile/bullet/shrapnel/claymore
+ randomspread = TRUE
+
+/obj/item/ammo_casing/caseless/shrapnel/shred
+ name = "point blank directional shrapnel burst"
+ desc = "Claymores are lethal to armored infantry at point blank range."
+ pellets = 4
+ variance = 50
+ projectile_type = /obj/projectile/bullet/shrapnel/claymore/pointbl
+ randomspread = TRUE
+
+/obj/projectile/bullet/shrapnel/claymore
+ name = "ceramic splinter"
+ range = 4
+ armour_penetration = 0
+
+/obj/projectile/bullet/shrapnel/claymore/pointbl
+ name = "large ceramic shard"
+ range = 2
+ damage = 18
+ dismemberment = 30
+ armour_penetration = 10
+
+/obj/item/ammo_casing/caseless/shrapnel/plasma
+ name = "directional plasma burst"
+ projectile_type = /obj/projectile/energy/plasmabolt
+
+/obj/item/ammo_casing/caseless/shrapnel/shred/plasma
+ name = "point blank directional plasma burst"
+ projectile_type = /obj/projectile/energy/plasmabolt/shred
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 10eb8c1e2cf8f..8335a2d827373 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -4,16 +4,16 @@
icon = 'icons/obj/stack_objects.dmi'
amount = 6
max_amount = 6
- w_class = WEIGHT_CLASS_TINY
- full_w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
+ full_w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
resistance_flags = FLAMMABLE
max_integrity = 40
novariants = FALSE
item_flags = NOBLUDGEON
- var/splint_fracture = FALSE //WS Edit- Splints
- var/failure_chance //WS Edit - Failure chance
+ var/splint_fracture = FALSE
+ var/failure_chance
var/self_delay = 50
var/other_delay = 0
var/repeating = FALSE
@@ -117,9 +117,6 @@
grind_results = list(/datum/reagent/medicine/styptic_powder = 10)
/obj/item/stack/medical/bruise_pack/heal(mob/living/target, mob/user)
- if(target.stat == DEAD)
- to_chat(user, "[target] is dead! You can not help [target.p_them()].")
- return
if(isanimal(target))
var/mob/living/simple_animal/critter = target
if (!(critter.healable))
@@ -204,9 +201,6 @@
grind_results = list(/datum/reagent/medicine/silver_sulfadiazine = 10)
/obj/item/stack/medical/ointment/heal(mob/living/target, mob/user)
- if(target.stat == DEAD)
- to_chat(user, "[target] is dead! You can not help [target.p_them()].")
- return
if(iscarbon(target))
return heal_carbon(target, user, 0, heal_burn)
to_chat(user, "You can't heal [target] with the \the [src]!")
@@ -234,9 +228,6 @@
/obj/item/stack/medical/suture/heal(mob/living/target, mob/user)
. = ..()
- if(target.stat == DEAD)
- to_chat(user, "[target] is dead! You can not help [target.p_them()].")
- return
if(iscarbon(target))
return heal_carbon(target, user, heal_brute, 0)
if(isanimal(target))
@@ -281,9 +272,6 @@
/obj/item/stack/medical/mesh/heal(mob/living/target, mob/user)
. = ..()
- if(target.stat == DEAD)
- to_chat(user, "[target] is dead! You can not help [target.p_them()].")
- return
if(iscarbon(target))
return heal_carbon(target, user, 0, heal_burn)
to_chat(user, "You can't heal [target] with the \the [src]!")
@@ -347,9 +335,6 @@
/obj/item/stack/medical/aloe/heal(mob/living/target, mob/user)
. = ..()
- if(target.stat == DEAD)
- to_chat(user, "[target] is dead! You can not help [target.p_them()].")
- return FALSE
if(iscarbon(target))
return heal_carbon(target, user, heal, heal)
if(isanimal(target))
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 23a8c8d5e5f00..0930ec09cabe5 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
null, \
new/datum/stack_recipe("directional reinforced window", /obj/structure/window/reinforced/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/reinforced/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
- new/datum/stack_recipe(" reinforced glass tile", /obj/item/stack/tile/glass/reinforced, 1, 4, 20), \
+ new/datum/stack_recipe("reinforced glass tile", /obj/item/stack/tile/glass/reinforced, 1, 4, 20), \
new/datum/stack_recipe("glass shard", /obj/item/shard, 1) \
))
@@ -282,7 +282,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
var/obj/item/stack/sheet/weld_material = /obj/item/stack/sheet/glass
embedding = list("embed_chance" = 65)
-/obj/item/shard/Initialize()
+/obj/item/shard/Initialize(mapload)
. = ..()
AddComponent(/datum/component/caltrop, force)
AddComponent(/datum/component/butchering, 150, 65)
@@ -300,17 +300,14 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
if (icon_prefix)
icon_state = "[icon_prefix][icon_state]"
- SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
+ if(!mapload)
+ SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
-/obj/item/shard/Destroy()
- . = ..()
- SSblackbox.record_feedback("tally", "station_mess_destroyed", 1, name)
-
/obj/item/shard/afterattack(atom/A as mob|obj, mob/user, proximity)
. = ..()
if(!proximity || !(src in user))
@@ -371,7 +368,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
playsound(src, 'sound/effects/glass_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 30 : 50, TRUE)
/obj/item/shard/plasma
- name = "purple shard"
+ name = "plasmaglass shard"
desc = "A nasty looking shard of plasma glass."
force = 6
throwforce = 11
@@ -379,3 +376,13 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
custom_materials = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass=MINERAL_MATERIAL_AMOUNT)
icon_prefix = "plasma"
weld_material = /obj/item/stack/sheet/plasmaglass
+
+/obj/item/shard/plastitanium
+ name = "plastitanium glass shard"
+ desc = "A nasty looking shard of plastitanium glass."
+ force = 6
+ throwforce = 11
+ icon_state = "plastitaniumlarge"
+ custom_materials = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/plasma=MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass=MINERAL_MATERIAL_AMOUNT)
+ icon_prefix = "plastitanium"
+ weld_material = /obj/item/stack/sheet/plastitaniumglass
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 75c863bee5b68..5f4ede1dbe14e 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -11,14 +11,6 @@
singular_name = "human skin piece"
novariants = FALSE
-GLOBAL_LIST_INIT(human_recipes, list( \
- new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/hooded/bloated_human, 5), \
- ))
-
-/obj/item/stack/sheet/animalhide/human/get_main_recipes()
- . = ..()
- . += GLOB.human_recipes
-
/obj/item/stack/sheet/animalhide/generic
name = "skin"
desc = "A piece of skin."
@@ -32,12 +24,6 @@ GLOBAL_LIST_INIT(human_recipes, list( \
icon_state = "sheet-corgi"
item_state = "sheet-corgi"
-
-GLOBAL_LIST_INIT(gondola_recipes, list ( \
- new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1), \
- new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/costume/gondola, 2), \
- ))
-
/obj/item/stack/sheet/animalhide/mothroach
name = "mothroach hide"
desc = "A thin layer of mothroach hide."
@@ -53,10 +39,6 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \
icon_state = "sheet-gondola"
item_state = "sheet-gondola"
-/obj/item/stack/sheet/animalhide/gondola/get_main_recipes()
- . = ..()
- . += GLOB.gondola_recipes
-
/obj/item/stack/sheet/animalhide/cat
name = "cat hide"
desc = "The by-product of cat farming."
@@ -71,14 +53,6 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \
icon_state = "sheet-monkey"
item_state = "sheet-monkey"
-GLOBAL_LIST_INIT(monkey_recipes, list ( \
- new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \
- ))
-
-/obj/item/stack/sheet/animalhide/monkey/get_main_recipes()
- . = ..()
- . += GLOB.monkey_recipes
-
/obj/item/stack/sheet/animalhide/lizard
name = "lizard skin"
desc = "Sssssss..."
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 560031fa03daf..88ac0c90d95cc 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -26,7 +26,6 @@ Mineral Sheets
GLOBAL_LIST_INIT(sandstone_recipes, list ( \
new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = 0, on_floor = 1) \
))
@@ -75,7 +74,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
name = "empty sandbag"
desc = "A bag to be filled with sand."
icon_state = "sandbag"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/emptysandbag/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stack/ore/glass))
@@ -108,9 +107,6 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
GLOBAL_LIST_INIT(diamond_recipes, list ( \
new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), \
- new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/diamond/get_main_recipes()
@@ -146,7 +142,6 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \
new/datum/stack_recipe("Nuke Statue", /obj/structure/statue/uranium/nuke, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/uranium/get_main_recipes()
@@ -186,7 +181,6 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
GLOBAL_LIST_INIT(plasma_recipes, list ( \
new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \
- new/datum/stack_recipe("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/plasma/get_main_recipes()
@@ -240,12 +234,7 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
new/datum/stack_recipe("chemical crate", /obj/structure/closet/crate/chem, 1, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \
new/datum/stack_recipe("blank plaque", /obj/item/plaque, 1), \
- new/datum/stack_recipe("HoS Statue", /obj/structure/statue/gold/hos, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("HOP Statue", /obj/structure/statue/gold/head_of_personnel, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("CE Statue", /obj/structure/statue/gold/ce, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("RD Statue", /obj/structure/statue/gold/rd, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), \
- new/datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/gold/get_main_recipes()
@@ -296,11 +285,6 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
GLOBAL_LIST_INIT(silver_recipes, list ( \
new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \
- new/datum/stack_recipe("Med Officer Statue", /obj/structure/statue/silver/md, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Janitor Statue", /obj/structure/statue/silver/janitor, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Sec Officer Statue", /obj/structure/statue/silver/sec, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, one_per_turf = 1, on_floor = 1), \
- new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/sheet/mineral/silver/get_main_recipes()
diff --git a/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm b/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
index 9819a941e5f88..44b7d7f269837 100644
--- a/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
+++ b/code/game/objects/items/stacks/sheets/recipes/recipes_metal.dm
@@ -225,7 +225,6 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
null, \
new/datum/stack_recipe("firelock frame (fulltile)", /obj/structure/firelock_frame, 3, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("firelock frame (directional)", /obj/structure/firelock_frame/border, 1, time = 25, on_floor = TRUE), \
- new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
null, \
@@ -242,7 +241,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
null, \
new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("voting box", /obj/structure/votebox, 15, time = 50), \
+ new/datum/stack_recipe("voting box", /obj/structure/votebox, 5, time = 50), \
new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar/metal, 3), \
new/datum/stack_recipe("pestle", /obj/item/pestle, 1, time = 50), \
new/datum/stack_recipe("hygienebot assembly", /obj/item/bot_assembly/hygienebot, 2, time = 50), \
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index ce64af1fd205e..daa7f529d84f1 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), \
@@ -346,8 +348,6 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
*/
GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new/datum/stack_recipe("box", /obj/item/storage/box), \
- new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
- new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \
null, \
@@ -422,13 +422,6 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
amount = 50
/obj/item/stack/sheet/cardboard/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/stamp/clown) && !istype(loc, /obj/item/storage))
- var/atom/droploc = drop_location()
- if(use(1))
- playsound(I, 'sound/items/bikehorn.ogg', 50, TRUE, -1)
- to_chat(user, "You stamp the cardboard! It's a clown box! Honk!")
- if (amount >= 0)
- new/obj/item/storage/box/clown(droploc) //bugfix
if(istype(I, /obj/item/stamp/chameleon) && !istype(loc, /obj/item/storage))
var/atom/droploc = drop_location()
if(use(1))
@@ -452,7 +445,6 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
new/datum/stack_recipe("bronze hat", /obj/item/clothing/head/bronze), \
null,
new/datum/stack_recipe("bronze chair", /obj/structure/chair/comfy/shuttle/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
- new/datum/stack_recipe("Marx Bust", /obj/structure/statue/bronze/marx, 15, one_per_turf = 1, on_floor = 1), \
))
/obj/item/stack/tile/bronze
diff --git a/code/game/objects/items/storage/ammo_can.dm b/code/game/objects/items/storage/ammo_can.dm
new file mode 100644
index 0000000000000..e619aced06927
--- /dev/null
+++ b/code/game/objects/items/storage/ammo_can.dm
@@ -0,0 +1,69 @@
+//No idea why this is a toolbox but I'm not fixing that right now
+/obj/item/storage/toolbox/ammo
+ name = "ammo can"
+ desc = "A metal container for storing multiple boxes of ammunition or grenades."
+ icon_state = "ammobox"
+ item_state = "ammobox"
+ drop_sound = 'sound/items/handling/ammobox_drop.ogg'
+ pickup_sound = 'sound/items/handling/ammobox_pickup.ogg'
+ material_flags = NONE
+ has_latches = FALSE
+ w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/toolbox/ammo/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_volume = STORAGE_VOLUME_BACKPACK
+ STR.max_w_class = MAX_WEIGHT_CLASS_BACKPACK
+ STR.set_holdable(list(
+ /obj/item/storage/box/ammo,
+ /obj/item/mine,
+ /obj/item/grenade,
+ /obj/item/ammo_casing/caseless/rocket,
+ /obj/item/ammo_box/magazine/ammo_stack,
+ /obj/item/ammo_casing,
+ /obj/item/mine,
+ /obj/item/grenade
+ ))
+
+/obj/item/storage/toolbox/ammo/a850r/PopulateContents()
+ name = "ammo can (8x50mmR)"
+ icon_state = "ammobox_850"
+ for(var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/a8_50r(src)
+
+/obj/item/storage/toolbox/ammo/a762_40/PopulateContents()
+ name = "ammo can (7.62x40mm CLIP)"
+ icon_state = "ammobox_762"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/a762_40(src)
+
+/obj/item/storage/toolbox/ammo/a308/PopulateContents()
+ name = "ammo can (.308)"
+ icon_state = "ammobox_308"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/a308(src)
+
+/obj/item/storage/toolbox/ammo/c45/PopulateContents()
+ name = "ammo can (.45)"
+ icon_state = "ammobox_45"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/c45(src)
+
+/obj/item/storage/toolbox/ammo/c9mm/PopulateContents()
+ name = "ammo can (9mm)"
+ icon_state = "ammobox_9mm"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/c9mm(src)
+
+/obj/item/storage/toolbox/ammo/c10mm/PopulateContents()
+ name = "ammo can (10mm)"
+ icon_state = "ammobox_10mm"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/c10mm(src)
+
+/obj/item/storage/toolbox/ammo/shotgun/PopulateContents()
+ name = "ammo can (12ga)"
+ icon_state = "ammobox_12ga"
+ for (var/i in 1 to 4)
+ new /obj/item/storage/box/ammo/a12g_buckshot(src)
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index dd0598e80c2d8..d785eacd9c870 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -32,6 +32,13 @@
supports_variations = VOX_VARIATION | KEPORI_VARIATION
kepori_override_icon = 'icons/mob/clothing/back/backpacks_kepori.dmi'
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_BACK
+ equip_delay_other = EQUIP_DELAY_BACK * 1.5
+ strip_delay = EQUIP_DELAY_BACK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT | EQUIP_SLOWDOWN
+
/obj/item/storage/backpack/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
@@ -44,11 +51,6 @@
* Backpack Types
*/
-/obj/item/storage/backpack/old/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_combined_w_class = 12
-
/obj/item/storage/backpack/holding
name = "bag of holding"
desc = "A backpack that opens into a localized pocket of bluespace."
@@ -181,6 +183,12 @@
greyscale_icon_state = "satchel"
greyscale_colors = list(list(11, 12), list(17, 18), list(10, 11))
+ equipping_sound = null
+ unequipping_sound = null
+ equip_delay_self = null
+ equip_delay_other = EQUIP_DELAY_BACK
+ strip_delay = EQUIP_DELAY_BACK
+
/obj/item/storage/backpack/satchel/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
@@ -483,7 +491,6 @@
desc = "A large duffel bag for holding extra tactical supplies."
icon_state = "duffel-syndie"
item_state = "duffel-syndieammo"
- slowdown = 0
resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/duffelbag/syndie/ComponentInitialize()
@@ -597,7 +604,7 @@
new /obj/item/clothing/shoes/magboots/syndie(src)
new /obj/item/storage/firstaid/tactical(src)
new /obj/item/gun/ballistic/automatic/toy(src)
- new /obj/item/ammo_box/foambox/riot(src)
+ new /obj/item/storage/box/ammo/foam_darts/riot(src)
/obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
desc = "A large duffel bag containing deadly chemicals, a handheld chem sprayer, Bioterror foam grenade, a Donksoft assault rifle, box of riot grade darts, a dart pistol, and a box of syringes."
@@ -608,7 +615,7 @@
new /obj/item/gun/syringe/syndicate(src)
new /obj/item/gun/ballistic/automatic/toy(src)
new /obj/item/storage/box/syringes(src)
- new /obj/item/ammo_box/foambox/riot(src)
+ new /obj/item/storage/box/ammo/foam_darts/riot(src)
new /obj/item/grenade/chem_grenade/bioterrorfoam(src)
if(prob(5))
new /obj/item/reagent_containers/food/snacks/pizza/pineapple(src)
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index ecee3894ccbbe..cfe07df070ba8 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -407,7 +407,7 @@
))
/*
- * Biowaste bag (mostly for xenobiologists)
+ * Biowaste bag
*/
/obj/item/storage/bag/bio
@@ -424,7 +424,6 @@
STR.max_items = 20
STR.insert_preposition = "in"
STR.set_holdable(list(
- /obj/item/slime_extract,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/glass/beaker,
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index c6d55e03ef48c..966fc8899276b 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -16,6 +16,13 @@
greyscale_icon_state = "belt"
greyscale_colors = list(list(16, 12), list(15, 11), list(13, 12))
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_BELT
+ equip_delay_other = EQUIP_DELAY_BELT * 1.5
+ strip_delay = EQUIP_DELAY_BELT * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
+
/obj/item/storage/belt/update_overlays()
. = ..()
if(!content_overlays)
@@ -87,7 +94,6 @@
/obj/item/storage/belt/utility/chief/full/PopulateContents()
new /obj/item/screwdriver/power(src)
new /obj/item/crowbar/power(src)
- new /obj/item/weldingtool/experimental(src)//This can be changed if this is too much
new /obj/item/multitool(src)
new /obj/item/stack/cable_coil(src,MAXCOIL,pick("red","yellow","orange"))
new /obj/item/extinguisher/mini(src)
@@ -143,7 +149,6 @@
/obj/item/storage/belt/utility/full/ert/PopulateContents()
new /obj/item/screwdriver/power(src)
new /obj/item/crowbar/power(src)
- new /obj/item/weldingtool/experimental(src)
new /obj/item/multitool(src)
new /obj/item/construction/rcd/combat(src)
new /obj/item/extinguisher/mini(src)
@@ -259,6 +264,15 @@
new /obj/item/hypospray/mkii(src)
update_appearance()
+/obj/item/storage/belt/medical/webbing/combat/PopulateContents()
+ . = ..()
+ new /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor(src)
+ new /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/stack/medical/gauze/twelve(src)
+ new /obj/item/stack/medical/splint(src)
+
/obj/item/storage/belt/security
name = "security belt"
desc = "Can hold security gear like handcuffs and flashes."
@@ -285,7 +299,6 @@
/obj/item/ammo_box/magazine,
/obj/item/ammo_box/c38, //speed loaders don't have a common path like magazines. pain.
/obj/item/ammo_box/a357, //some day we should refactor these into an ammo_box/speedloader type
- /obj/item/ammo_box/a4570, //but not today
/obj/item/ammo_box/a858, //oh boy stripper clips too
/obj/item/ammo_box/vickland_a308,
/obj/item/ammo_box/a300,
@@ -299,7 +312,8 @@
/obj/item/clothing/gloves,
/obj/item/restraints/legcuffs/bola,
/obj/item/holosign_creator/security,
- /obj/item/stock_parts/cell/gun //WS edit Gun cells fit where they should and not where they dont
+ /obj/item/stock_parts/cell/gun,
+ /obj/item/ammo_box/magazine/ammo_stack, //handfuls of bullets
))
/obj/item/storage/belt/security/full/PopulateContents()
@@ -323,10 +337,12 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 6
-/obj/item/storage/belt/security/webbing/bulldog/PopulateContents()
+/obj/item/storage/belt/security/webbing/bulldog_mixed/PopulateContents()
. = ..()
- for(var/i in 1 to 3)
- new /obj/item/ammo_box/magazine/m12g_bulldog/drum(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/bioterror(src) // you only get ONE this one is nasty
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/slug(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/slug(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum(src)
/obj/item/storage/belt/mining
name = "explorer's webbing"
@@ -453,16 +469,30 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
-/obj/item/storage/belt/military/c20r/PopulateContents()
+/obj/item/storage/belt/military/cobra/PopulateContents()
. = ..()
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/m45_cobra(src)
-/obj/item/storage/belt/military/assault/m90/PopulateContents()
+/obj/item/storage/belt/military/hydra/PopulateContents()
. = ..()
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/m556_42_hydra(src)
+/obj/item/storage/belt/military/boomslang/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/boomslang(src)
+
+/obj/item/storage/belt/military/mako/PopulateContents()
+ . = ..()
+ new /obj/item/ammo_casing/caseless/rocket/a70mm/hedp(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm/hedp(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+
/obj/item/storage/belt/military/snack
name = "tactical snack rig"
@@ -546,6 +576,22 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 6
+/obj/item/storage/belt/military/assault/hydra/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m556_42_hydra(src)
+
+/obj/item/storage/belt/military/assault/sniper/PopulateContents()
+ . = ..()
+ new /obj/item/ammo_box/magazine/sniper_rounds(src)
+ new /obj/item/ammo_box/magazine/sniper_rounds(src)
+ new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
+
+/obj/item/storage/belt/military/assault/commander/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/co9mm(src)
+
/obj/item/storage/belt/grenade
name = "grenadier belt"
desc = "A belt for holding grenades."
@@ -564,7 +610,7 @@
/obj/item/screwdriver,
/obj/item/lighter,
/obj/item/multitool,
- /obj/item/reagent_containers/food/drinks/bottle/molotov,
+ /obj/item/reagent_containers/food/drinks/molotov,
/obj/item/grenade/c4,
/obj/item/reagent_containers/food/snacks/grown/cherry_bomb,
/obj/item/reagent_containers/food/snacks/grown/firelemon
@@ -751,6 +797,7 @@
item_state = "sheath"
base_icon_state = "sheath"
w_class = WEIGHT_CLASS_BULKY
+ var/sabre_type = /obj/item/melee/sword/sabre
/obj/item/storage/belt/sabre/ComponentInitialize()
. = ..()
@@ -760,7 +807,7 @@
STR.use_sound = null //if youre wondering why this is null, its so you can look in your sheath to prepare to draw, without letting anyone know youre preparing to draw it
STR.max_w_class = WEIGHT_CLASS_BULKY
STR.set_holdable(list(
- /obj/item/melee/sword/sabre
+ sabre_type
))
/obj/item/storage/belt/sabre/examine(mob/user)
@@ -788,7 +835,7 @@
return ..()
/obj/item/storage/belt/sabre/PopulateContents()
- new /obj/item/melee/sword/sabre(src)
+ new sabre_type(src)
update_appearance()
/obj/item/storage/belt/sabre/solgov
@@ -798,21 +845,7 @@
icon_state = "sheath-solgov"
item_state = "sheath-solgov"
w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/solgov/ComponentInitialize()
- AddComponent(component_type)
- AddElement(/datum/element/update_icon_updates_onmob)
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 1
- STR.use_sound = null
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
- /obj/item/melee/sword/sabre/solgov
- ))
-
-/obj/item/storage/belt/sabre/solgov/PopulateContents()
- new /obj/item/melee/sword/sabre/solgov(src)
- update_appearance()
+ sabre_type = /obj/item/melee/sword/sabre/solgov
/obj/item/storage/belt/sabre/suns
name = "SUNS sabre sheath"
@@ -827,22 +860,7 @@
icon_state = "suns-sheath"
item_state = "suns-sheath"
w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/suns/ComponentInitialize()
- AddComponent(component_type)
- AddElement(/datum/element/update_icon_updates_onmob)
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 1
- STR.use_sound = null
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
- /obj/item/melee/sword/sabre/suns
- ))
-
-/obj/item/storage/belt/sabre/suns/PopulateContents()
- new /obj/item/melee/sword/sabre/suns(src)
- update_appearance()
-
+ sabre_type = /obj/item/melee/sword/sabre/suns
/obj/item/storage/belt/sabre/suns/captain
name = "SUNS captain's sabre sheath"
@@ -852,21 +870,7 @@
icon_state = "suns-capsheath"
item_state = "suns-capsheath"
w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/suns/captain/ComponentInitialize()
- AddComponent(component_type)
- AddElement(/datum/element/update_icon_updates_onmob)
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 1
- STR.use_sound = null
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
- /obj/item/melee/sword/sabre/suns/captain
- ))
-
-/obj/item/storage/belt/sabre/suns/captain/PopulateContents()
- new /obj/item/melee/sword/sabre/suns/captain(src)
- update_appearance()
+ sabre_type = /obj/item/melee/sword/sabre/suns/captain
/obj/item/storage/belt/sabre/suns/cmo
name = "SUNS cane sheath"
@@ -882,21 +886,15 @@
icon_state = "suns-cane"
item_state = "suns-cane"
w_class = WEIGHT_CLASS_BULKY
+ sabre_type = /obj/item/melee/sword/sabre/suns/cmo
-/obj/item/storage/belt/sabre/suns/cmo/ComponentInitialize()
- AddComponent(component_type)
- AddElement(/datum/element/update_icon_updates_onmob)
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 1
- STR.use_sound = null
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
- /obj/item/melee/sword/sabre/suns/cmo
- ))
-
-/obj/item/storage/belt/sabre/suns/cmo/PopulateContents()
- new /obj/item/melee/sword/sabre/suns/cmo(src)
- update_appearance()
+/obj/item/storage/belt/sabre/pgf
+ name = "cutlass sheath"
+ desc = "A mass produced thermoplastic-leather sheath made to hold a boarding cutlass."
+ base_icon_state = "sheath-pgf"
+ icon_state = "sheath-pgf"
+ item_state = "sheath-pgf"
+ sabre_type = /obj/item/melee/sword/sabre/pgf
/obj/item/storage/belt/security/webbing/inteq
name = "inteq webbing"
@@ -910,8 +908,18 @@
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/skm_762_40(src)
+/obj/item/storage/belt/security/webbing/inteq/skm_carabine/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/smgm10mm(src)
+
/obj/item/storage/belt/security/webbing/inteq/alt
name = "inteq drop pouch harness"
desc = "A harness with a bunch of pouches attached to them emblazoned in the colors of the IRMG, can hold security gear."
icon_state = "inteq_droppouch"
item_state = "inteq_droppouch"
+
+/obj/item/storage/belt/security/webbing/inteq/alt/bulldog/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m12g_bulldog(src)
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 29d2cd22dbbdc..a43109109235e 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"
@@ -161,7 +169,7 @@
// Security survival box
/obj/item/storage/box/survival/security
- mask_type = /obj/item/clothing/mask/gas/sechailer
+ mask_type = /obj/item/clothing/mask/gas
// Medical survival box
/obj/item/storage/box/survival/medical
@@ -171,9 +179,13 @@
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/inteq
+ mask_type = /obj/item/clothing/mask/balaclava/inteq
+ internal_type = /obj/item/tank/internals/emergency_oxygen/engi
+
/obj/item/storage/box/survival/frontier
mask_type = null // we spawn in gas masks in frontiersmen bags alongside this, so it isn't nessary
internal_type = /obj/item/tank/internals/emergency_oxygen //frontiersmen dont
@@ -675,7 +687,7 @@
slot_flags = ITEM_SLOT_BELT
drop_sound = 'sound/items/handling/matchbox_drop.ogg'
pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
- custom_price = 20
+ custom_price = 2
/obj/item/storage/box/matches/PopulateContents()
SEND_SIGNAL(src, COMSIG_TRY_STORAGE_FILL_TYPE, /obj/item/match)
@@ -733,6 +745,14 @@
for(var/i in 1 to 7)
new /obj/item/flashlight/flare(src)
+/obj/item/storage/box/glowsticks
+ name = "box of glowsticks"
+ illustration = "sparkler"
+
+/obj/item/storage/box/glowsticks/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/effect/spawner/random/decoration/glowstick(src)
+
/obj/item/storage/box/deputy
name = "box of deputy armbands"
desc = "To be issued to those authorized to act as deputy of security."
@@ -743,6 +763,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."
@@ -774,27 +803,6 @@
playsound(loc, "rustle", 50, TRUE, -5)
user.visible_message("[user] hugs \the [src].","You hug \the [src].")
-/////clown box & honkbot assembly
-/obj/item/storage/box/clown
- name = "clown box"
- desc = "A colorful cardboard box for the clown"
- illustration = "clown"
-
-/obj/item/storage/box/clown/attackby(obj/item/I, mob/user, params)
- if((istype(I, /obj/item/bodypart/l_arm/robot)) || (istype(I, /obj/item/bodypart/r_arm/robot)))
- if(contents.len) //prevent accidently deleting contents
- to_chat(user, "You need to empty [src] out first!")
- return
- if(!user.temporarilyRemoveItemFromInventory(I))
- return
- qdel(I)
- to_chat(user, "You add some wheels to the [src]! You've got a honkbot assembly now! Honk!")
- var/obj/item/bot_assembly/honkbot/A = new
- qdel(src)
- user.put_in_hands(A)
- else
- return ..()
-
//////
/obj/item/storage/box/hug/medical/PopulateContents()
new /obj/item/stack/medical/bruise_pack(src)
@@ -1303,30 +1311,6 @@
/obj/item/screwdriver = 1)
generate_items_inside(items_inside,src)
-//It's a maid costume from the IRMG and Syndicate, what else.
-/obj/item/storage/box/inteqmaid
- name = "IRMG non standard issue maid outfit"
- desc = "A box containing a 'tactical' and 'practical' maid outfit from the IRMG."
-
-/obj/item/storage/box/inteqmaid/PopulateContents()
- var/static/items_inside = list(
- /obj/item/clothing/head/maidheadband/inteq = 1,
- /obj/item/clothing/under/syndicate/inteq/skirt/maid = 1,
- /obj/item/clothing/gloves/combat/maid/inteq = 1,)
- generate_items_inside(items_inside,src)
-
-/obj/item/storage/box/syndimaid
- name = "Syndicate maid outfit"
- desc = "A box containing a 'tactical' and 'practical' maid outfit."
- icon_state = "syndiebox"
-
-/obj/item/storage/box/syndimaid/PopulateContents()
- var/static/items_inside = list(
- /obj/item/clothing/head/maidheadband/syndicate = 1,
- /obj/item/clothing/under/syndicate/skirt/maid = 1,
- /obj/item/clothing/gloves/combat/maid = 1,)
- generate_items_inside(items_inside,src)
-
// because i have no idea where the fuck to put this
/obj/item/storage/box/maid
name = "Maid box"
@@ -1337,7 +1321,8 @@
/obj/item/clothing/head/maidheadband = 1,
/obj/item/clothing/under/costume/maid = 1,
/obj/item/clothing/gloves/maid = 1,
- /obj/item/clothing/neck/maid = 1,)
+ /obj/item/clothing/neck/maid = 1,
+ /obj/item/clothing/accessory/maidapron = 1,)
generate_items_inside(items_inside,src)
/obj/item/storage/box/material
@@ -1449,7 +1434,7 @@
w_class = WEIGHT_CLASS_TINY
illustration = null
foldable = null
- custom_price = 120
+ custom_price = 5
/obj/item/storage/box/gum/ComponentInitialize()
. = ..()
@@ -1464,7 +1449,7 @@
name = "nicotine gum packet"
desc = "Designed to help with nicotine addiction and oral fixation all at once without destroying your lungs in the process. Mint flavored!"
icon_state = "bubblegum_nicotine"
- custom_premium_price = 275
+ custom_premium_price = 10
/obj/item/storage/box/gum/nicotine/PopulateContents()
for(var/i in 1 to 4)
@@ -1474,8 +1459,8 @@
name = "HP+ gum packet"
desc = "A seemingly homemade packaging with an odd smell. It has a weird drawing of a smiling face sticking out its tongue."
icon_state = "bubblegum_happiness"
- custom_price = 300
- custom_premium_price = 300
+ custom_price = 10
+ custom_premium_price = 10
/obj/item/storage/box/gum/happiness/Initialize()
. = ..()
diff --git a/code/game/objects/items/storage/cases.dm b/code/game/objects/items/storage/cases.dm
new file mode 100644
index 0000000000000..0a69e5d9afb57
--- /dev/null
+++ b/code/game/objects/items/storage/cases.dm
@@ -0,0 +1,63 @@
+// For Cases of all kinds, storage with specific purpose
+
+//Base Case
+/obj/item/storage/case
+ name = "case"
+ desc = "A large case."
+ icon = 'icons/obj/storage.dmi'
+ icon_state = "case_base"
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ drop_sound = 'sound/items/handling/toolbox_drop.ogg'
+ pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
+ throw_speed = 3
+ throw_range = 7
+ var/empty = FALSE
+ w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/case/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.use_sound = 'sound/items/storage/toolbox.ogg'
+
+/obj/item/storage/case/surgery
+ name = "surgical case"
+ icon_state = "case_surgery"
+ item_state = "case_surgery"
+ desc = "A large sterile tray with a lid for storing all of the tools you'd need for surgery."
+
+//Surgical Case
+/obj/item/storage/case/surgery/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_w_class = INFINITY //workaround for the differently sized items, case is still limited to 7 items max and to the list.
+ STR.max_combined_w_class = INFINITY //part of the workaround, not setting a max combined weight defaults to some weird number.
+ STR.max_items = 7
+ STR.set_holdable(list(
+ /obj/item/healthanalyzer,
+ /obj/item/healthanalyzer/advanced,
+ /obj/item/scalpel,
+ /obj/item/scalpel/advanced,
+ /obj/item/circular_saw,
+ /obj/item/circular_saw/best, //CODY WUZ HERE
+ /obj/item/surgicaldrill,
+ /obj/item/surgicaldrill/advanced,
+ /obj/item/retractor,
+ /obj/item/retractor/advanced,
+ /obj/item/cautery,
+ /obj/item/hemostat,
+ /obj/item/shears,
+ ))
+
+/obj/item/storage/case/surgery/PopulateContents()
+ if(empty)
+ return
+ var/static/items_inside = list(
+ /obj/item/scalpel = 1,
+ /obj/item/retractor = 1,
+ /obj/item/hemostat = 1,
+ /obj/item/circular_saw = 1,
+ /obj/item/surgicaldrill = 1,
+ /obj/item/cautery = 1,
+ /obj/item/healthanalyzer = 1)
+ generate_items_inside(items_inside,src)
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index d6edfb29461a6..da8ae670c8822 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -196,7 +196,7 @@
slot_flags = ITEM_SLOT_BELT
spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
var/candy = FALSE //for cigarette overlay
- custom_price = 75
+ custom_price = 10
contents_tag = "cigarette"
/obj/item/storage/fancy/cigarettes/ComponentInitialize()
@@ -359,7 +359,7 @@
base_icon_state = "cig_paper_pack"
contents_tag = "rolling paper"
spawn_type = /obj/item/rollingpaper
- custom_price = 25
+ custom_price = 5
/obj/item/storage/fancy/rollingpapers/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm
new file mode 100644
index 0000000000000..2193a834e7cf8
--- /dev/null
+++ b/code/game/objects/items/storage/filled_guncases.dm
@@ -0,0 +1,336 @@
+//Erika here. I did this because guncase.dm was annoying me. It needs better organization at some point.
+
+/* Hunter's Pride */
+
+/obj/item/storage/guncase/pistol/firebrand
+ gun_type = /obj/item/gun/ballistic/revolver/firebrand
+
+/obj/item/storage/guncase/pistol/derringer
+ gun_type = /obj/item/gun/ballistic/derringer
+
+/obj/item/storage/guncase/pistol/montagne
+ gun_type = /obj/item/gun/ballistic/revolver/montagne
+ mag_type = /obj/item/ammo_box/a44roum_speedloader
+
+/obj/item/storage/guncase/pistol/candor
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/candor
+ mag_type = /obj/item/ammo_box/magazine/m45
+
+/obj/item/storage/guncase/pistol/detective
+ gun_type = /obj/item/gun/ballistic/revolver/detective
+ mag_type = /obj/item/ammo_box/c38
+
+/obj/item/storage/guncase/pistol/shadow
+ gun_type = /obj/item/gun/ballistic/revolver/shadow
+
+/obj/item/storage/guncase/pistol/ashhand
+ gun_type = /obj/item/gun/ballistic/revolver/ashhand
+
+/obj/item/storage/guncase/hellfire
+ gun_type = /obj/item/gun/ballistic/shotgun/hellfire
+
+/obj/item/storage/guncase/doublebarrel
+ gun_type = /obj/item/gun/ballistic/shotgun/doublebarrel
+
+/obj/item/storage/guncase/brimstone
+ gun_type = /obj/item/gun/ballistic/shotgun/brimstone
+
+/obj/item/storage/guncase/illestren
+ gun_type = /obj/item/gun/ballistic/rifle/illestren
+ mag_type = /obj/item/ammo_box/magazine/illestren_a850r
+
+/obj/item/storage/guncase/beacon
+ gun_type = /obj/item/gun/ballistic/shotgun/doublebarrel/beacon
+
+/obj/item/storage/guncase/scout
+ gun_type = /obj/item/gun/ballistic/rifle/scout
+ mag_type = /obj/item/ammo_box/a300
+
+/obj/item/storage/guncase/winchester
+ gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow
+
+/obj/item/storage/guncase/conflagration
+ gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow/conflagration
+
+/obj/item/storage/guncase/absolution
+ gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow/absolution
+
+/obj/item/storage/guncase/firestorm
+ gun_type = /obj/item/gun/ballistic/automatic/smg/firestorm
+ mag_type = /obj/item/ammo_box/magazine/c45_firestorm_mag
+
+/obj/item/storage/guncase/vickland
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/vickland
+ mag_type = /obj/item/ammo_box/vickland_a308
+
+/* Scarbourough */
+
+/obj/item/storage/guncase/pistol/a357
+ gun_type = /obj/item/gun/ballistic/revolver/viper
+ mag_type = /obj/item/ammo_box/a357/empty
+
+/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
+
+/obj/item/storage/guncase/boomslang
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/boomslang/indie
+ mag_type = /obj/item/ammo_box/magazine/boomslang/short
+
+/obj/item/storage/guncase/boomslangmilitary
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/boomslang
+ mag_type = /obj/item/ammo_box/magazine/boomslang/short
+
+/obj/item/storage/guncase/rattlesnake
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/rattlesnake
+ mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
+
+/obj/item/storage/guncase/bulldog
+ gun_type = /obj/item/gun/ballistic/shotgun/automatic/bulldog
+ mag_type = /obj/item/ammo_box/magazine/m12g_bulldog
+
+/obj/item/storage/guncase/sidewinder
+ gun_type = /obj/item/gun/ballistic/automatic/smg/sidewinder
+ mag_type = /obj/item/ammo_box/magazine/m57_39_sidewinder
+
+/obj/item/storage/guncase/hydra
+ gun_type = /obj/item/gun/ballistic/automatic/assault/hydra
+ mag_type = /obj/item/ammo_box/magazine/m556_42_hydra
+
+/obj/item/storage/guncase/sbr80
+ gun_type = /obj/item/gun/ballistic/automatic/assault/hydra/dmr
+ mag_type = /obj/item/ammo_box/magazine/m556_42_hydra/small
+
+/obj/item/storage/guncase/saw80
+ gun_type = /obj/item/gun/ballistic/automatic/assault/hydra/lmg
+ mag_type = /obj/item/ammo_box/magazine/m556_42_hydra/extended
+
+/obj/item/storage/guncase/taipan
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/taipan
+ mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+
+/* Etherbor */
+
+/obj/item/storage/guncase/pistol/kalixpistol
+ gun_type = /obj/item/gun/energy/kalix/pistol
+ mag_type = /obj/item/stock_parts/cell/gun/kalix
+
+/obj/item/storage/guncase/energy/kalixrifle
+ gun_type = /obj/item/gun/energy/kalix
+ mag_type = /obj/item/stock_parts/cell/gun/kalix
+
+/obj/item/storage/guncase/energy/bg16
+ gun_type = /obj/item/gun/energy/kalix/pgf
+ mag_type = /obj/item/stock_parts/cell/gun/pgf
+
+/obj/item/storage/guncase/energy/hbg7
+ gun_type = /obj/item/gun/energy/kalix/pgf/heavy
+ mag_type = /obj/item/stock_parts/cell/gun/pgf
+
+/obj/item/storage/guncase/energy/hbg7l
+ gun_type = /obj/item/gun/energy/kalix/pgf/heavy/sniper
+ mag_type = /obj/item/stock_parts/cell/gun/pgf
+
+/* Serene Outdoors Guns */
+
+/obj/item/storage/guncase/pistol/m17
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/m17
+ mag_type = /obj/item/ammo_box/magazine/m17
+
+/obj/item/storage/guncase/m12
+ gun_type = /obj/item/gun/ballistic/automatic/m12_sporter
+ mag_type = /obj/item/ammo_box/magazine/m12_sporter
+
+/obj/item/storage/guncase/m13
+ gun_type = /obj/item/gun/ballistic/automatic/m12_sporter/mod
+ mag_type = /obj/item/ammo_box/magazine/m12_sporter
+ mag_count = 3
+
+/obj/item/storage/guncase/m15
+ gun_type = /obj/item/gun/ballistic/automatic/m15
+ mag_type = /obj/item/ammo_box/magazine/m15
+
+/obj/item/storage/guncase/buckmaster
+ gun_type = /obj/item/gun/ballistic/shotgun/automatic/m11
+
+/* Solar Armories */
+
+/obj/item/storage/guncase/pistol/modelh
+ gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/modelh
+ mag_type = /obj/item/ammo_box/magazine/modelh
+
+/obj/item/storage/guncase/pistol/pistolec
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/solgov
+ mag_type = /obj/item/ammo_box/magazine/pistol556mm
+
+/obj/item/storage/guncase/ssg669
+ gun_type = /obj/item/gun/ballistic/rifle/solgov
+ mag_type = /obj/item/ammo_box/a858
+
+/obj/item/storage/guncase/claris
+ gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/claris
+ mag_type = /obj/item/ammo_box/amagpellet_claris
+
+/obj/item/storage/guncase/gar
+ gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/gar
+ mag_type = /obj/item/ammo_box/magazine/gar
+
+/* VI */
+
+/obj/item/storage/guncase/pistol/commander
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/commander
+ mag_type = /obj/item/ammo_box/magazine/co9mm
+
+/obj/item/storage/guncase/vector
+ gun_type = /obj/item/gun/ballistic/automatic/smg/vector
+ mag_type = /obj/item/ammo_box/magazine/smgm9mm
+
+/* Sharplite */
+
+/obj/item/storage/guncase/pistol/miniegun
+ gun_type = /obj/item/gun/energy/e_gun/mini
+ mag_type = /obj/item/stock_parts/cell/gun/mini
+
+/obj/item/storage/guncase/energy
+ mag_type = /obj/item/stock_parts/cell/gun
+
+/obj/item/storage/guncase/energy/laser
+ gun_type = /obj/item/gun/energy/laser
+
+/obj/item/storage/guncase/energy/egun
+ gun_type = /obj/item/gun/energy/e_gun
+
+/obj/item/storage/guncase/energy/ultima
+ gun_type = /obj/item/gun/energy/e_gun/iot
+
+/obj/item/storage/guncase/energy/etar
+ gun_type = /obj/item/gun/energy/e_gun/smg
+
+/obj/item/storage/guncase/energy/iongun
+ gun_type = /obj/item/gun/energy/ionrifle
+
+/obj/item/storage/guncase/hades
+ gun_type = /obj/item/gun/energy/e_gun/hades
+ mag_type = /obj/item/stock_parts/cell/gun/upgraded
+
+/* Old NT */
+
+/obj/item/storage/guncase/wt550
+ gun_type = /obj/item/gun/ballistic/automatic/smg/wt550
+ mag_type = /obj/item/ammo_box/magazine/wt550m9
+
+/obj/item/storage/guncase/gauss
+ gun_type = /obj/item/gun/ballistic/automatic/powered/gauss
+ mag_type = /obj/item/ammo_box/magazine/gauss
+
+/obj/item/storage/guncase/saber
+ gun_type = /obj/item/gun/ballistic/automatic/smg/skm_carbine/saber
+ mag_type = /obj/item/ammo_box/magazine/smgm9mm
+
+/* Minutemen */
+
+/obj/item/storage/guncase/pistol/cm23
+ 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
+
+/obj/item/storage/guncase/cm5
+ gun_type = /obj/item/gun/ballistic/automatic/smg/cm5
+ mag_type = /obj/item/ammo_box/magazine/cm5_9mm
+
+/obj/item/storage/guncase/cm82
+ gun_type = /obj/item/gun/ballistic/automatic/assault/cm82
+ mag_type = /obj/item/ammo_box/magazine/p16
+
+/obj/item/storage/guncase/cmf4
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/f4
+ mag_type = /obj/item/ammo_box/magazine/f4_308
+
+/obj/item/storage/guncase/cm15
+ gun_type = /obj/item/gun/ballistic/shotgun/cm15
+ mag_type = /obj/item/ammo_box/magazine/cm15_12g
+
+/obj/item/storage/guncase/cm24
+ gun_type = /obj/item/gun/ballistic/automatic/assault/skm/cm24
+ mag_type = /obj/item/ammo_box/magazine/skm_762_40
+
+/obj/item/storage/guncase/cmf90
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/f90
+ mag_type = /obj/item/ammo_box/magazine/f90
+
+/obj/item/storage/guncase/cm40
+ gun_type = /obj/item/gun/ballistic/automatic/hmg/cm40
+ mag_type = /obj/item/ammo_box/magazine/cm40_762_40_box
+
+/* Inteq */
+
+/obj/item/storage/guncase/skm_inteq
+ gun_type = /obj/item/gun/ballistic/automatic/assault/skm/inteq
+ mag_type = /obj/item/ammo_box/magazine/skm_762_40
+
+/obj/item/storage/guncase/commissioner
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
+ mag_type = /obj/item/ammo_box/magazine/co9mm
+
+/obj/item/storage/guncase/mongrel
+ gun_type = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq
+ mag_type = /obj/item/ammo_box/magazine/smgm10mm
+
+/obj/item/storage/guncase/mastiff
+ gun_type = /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq
+ mag_type = /obj/item/ammo_box/magazine/m12g_bulldog
+
+/obj/item/storage/guncase/kingsnake
+ gun_type = /obj/item/gun/ballistic/automatic/pistol/rattlesnake/inteq
+ mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
+
+/obj/item/storage/guncase/ssg04
+ gun_type = /obj/item/gun/ballistic/automatic/marksman/f4/inteq
+ mag_type = /obj/item/ammo_box/magazine/f4_308
+
+/* idk */
+
+/obj/item/storage/guncase/pistol/disposable
+/obj/item/storage/guncase/pistol/disposable/PopulateContents()
+ new /obj/item/gun/ballistic/automatic/pistol/disposable(src)
+ new /obj/item/gun/ballistic/automatic/pistol/disposable(src)
+
+/obj/item/storage/guncase/skm
+ gun_type = /obj/item/gun/ballistic/automatic/assault/skm
+ mag_type = /obj/item/ammo_box/magazine/skm_762_40
+
+/obj/item/storage/guncase/skm_lmg
+ gun_type = /obj/item/gun/ballistic/automatic/hmg/skm_lmg
+ mag_type = /obj/item/ammo_box/magazine/skm_762_40/drum
+
+/* Eoehoma */
+
+/obj/item/storage/guncase/energy/e10
+ gun_type = /obj/item/gun/energy/laser/e10
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index bac896c0b8d5a..5cc98e8c6092e 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -108,7 +108,7 @@
return
var/static/items_inside = list(
/obj/item/healthanalyzer = 1,
- /obj/item/stack/medical/gauze = 1,
+ /obj/item/stack/medical/gauze/twelve = 1,
/obj/item/stack/medical/suture = 2,
/obj/item/stack/medical/mesh = 2,
/obj/item/reagent_containers/hypospray/medipen = 1,
diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm
index 2feb49af03f7b..ec07ea096dc00 100644
--- a/code/game/objects/items/storage/guncases.dm
+++ b/code/game/objects/items/storage/guncases.dm
@@ -3,6 +3,8 @@
desc = "A large box designed for holding firearms and magazines safely."
icon = 'icons/obj/guncase.dmi'
icon_state = "guncase"
+ lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
item_state = "infiltrator_case"
force = 12
throwforce = 12
@@ -13,203 +15,62 @@
hitsound = 'sound/weapons/smash.ogg'
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
-
-/obj/item/storage/guncase/ComponentInitialize()
- . = ..()
- var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 10
- STR.max_w_class = WEIGHT_CLASS_BULKY
- STR.set_holdable(list(
+ custom_materials = list(/datum/material/iron = 500)
+ var/max_items = 10
+ var/max_w_class = WEIGHT_CLASS_BULKY
+ var/gun_type
+ var/mag_type
+ var/mag_count = 2
+ var/ammoless = TRUE
+ var/grab_loc = FALSE
+ var/holdable_items = list(
/obj/item/gun,
/obj/item/ammo_box,
/obj/item/stock_parts/cell/gun
- ))
-
-/obj/item/storage/guncase/winchester
-/obj/item/storage/guncase/winchester/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/flamingarrow/no_mag(src)
-
-/obj/item/storage/guncase/conflagration
-/obj/item/storage/guncase/conflagration/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/flamingarrow/conflagration/no_mag(src)
-
-/obj/item/storage/guncase/absolution
-/obj/item/storage/guncase/absolution/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/flamingarrow/absolution/no_mag(src)
-
-/obj/item/storage/guncase/skm
-/obj/item/storage/guncase/skm/PopulateContents()
- new /obj/item/gun/ballistic/automatic/assault/skm/no_mag(src)
- new /obj/item/ammo_box/magazine/skm_762_40/empty(src)
- new /obj/item/ammo_box/magazine/skm_762_40/empty(src)
-
-/obj/item/storage/guncase/p16
-/obj/item/storage/guncase/p16/PopulateContents()
- new /obj/item/gun/ballistic/automatic/assault/p16/no_mag(src)
- new /obj/item/ammo_box/magazine/p16/empty(src)
- new /obj/item/ammo_box/magazine/p16/empty(src)
-
-/obj/item/storage/guncase/beacon
-/obj/item/storage/guncase/beacon/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/doublebarrel/beacon/no_mag(src)
-
-/obj/item/storage/guncase/scout
-/obj/item/storage/guncase/scout/PopulateContents()
- new /obj/item/gun/ballistic/rifle/scout/no_mag(src)
- new /obj/item/ammo_box/a300/empty(src)
- new /obj/item/ammo_box/a300/empty(src)
-
-/obj/item/storage/guncase/boomslang
-/obj/item/storage/guncase/boomslang/PopulateContents()
- new /obj/item/gun/ballistic/automatic/marksman/boomslang/indie/no_mag(src)
- new /obj/item/ammo_box/magazine/boomslang/short/empty(src)
- new /obj/item/ammo_box/magazine/boomslang/short/empty(src)
-
-/obj/item/storage/guncase/cobra
-/obj/item/storage/guncase/cobra/PopulateContents()
- new /obj/item/gun/ballistic/automatic/smg/cobra/indie/no_mag(src)
- new /obj/item/ammo_box/magazine/m45_cobra/empty(src)
- new /obj/item/ammo_box/magazine/m45_cobra/empty(src)
-
-/obj/item/storage/guncase/hellfire
-/obj/item/storage/guncase/hellfire/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/hellfire/no_mag(src)
+ )
-/obj/item/storage/guncase/doublebarrel
-/obj/item/storage/guncase/doublebarrel/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/doublebarrel/no_mag(src)
-
-/obj/item/storage/guncase/brimstone
-/obj/item/storage/guncase/brimstone/PopulateContents()
- new /obj/item/gun/ballistic/shotgun/brimstone/no_mag(src)
-
-/obj/item/storage/guncase/illestren
-/obj/item/storage/guncase/illestren/PopulateContents()
- new /obj/item/gun/ballistic/rifle/illestren/empty(src)
- new /obj/item/ammo_box/magazine/illestren_a850r/empty(src)
- new /obj/item/ammo_box/magazine/illestren_a850r/empty(src)
-
-/obj/item/storage/guncase/wt550
-/obj/item/storage/guncase/wt550/PopulateContents()
- new /obj/item/gun/ballistic/automatic/smg/wt550/no_mag(src)
- new /obj/item/ammo_box/magazine/wt550m9/empty(src)
- new /obj/item/ammo_box/magazine/wt550m9/empty(src)
-
-/obj/item/storage/pistolcase
- name = "pistol case"
- desc = "A large box designed for holding pistols and magazines safely."
- icon = 'icons/obj/guncase.dmi'
- icon_state = "guncase"
- item_state = "infiltrator_case"
- force = 12
- throwforce = 12
- throw_speed = 2
- w_class = WEIGHT_CLASS_BULKY
- attack_verb = list("robusted")
- hitsound = 'sound/weapons/smash.ogg'
- drop_sound = 'sound/items/handling/toolbox_drop.ogg'
- pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
+/obj/item/storage/guncase/Initialize(mapload)
+ . = ..()
+ if(mapload && grab_loc)
+ var/items_eaten = 0
+ for(var/obj/item/I in loc)
+ if(I.w_class > max_w_class)
+ continue
+ if(is_type_in_list(I, holdable_items))
+ I.forceMove(src)
+ items_eaten++
+ if(items_eaten >= mag_count + 1)
+ break
-/obj/item/storage/pistolcase/ComponentInitialize()
+/obj/item/storage/guncase/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_items = 8
- STR.max_w_class = WEIGHT_CLASS_NORMAL
- STR.set_holdable(list(
- /obj/item/gun,
- /obj/item/ammo_box/,
- /obj/item/stock_parts/cell/gun
- ))
-
-/obj/item/storage/pistolcase/modelh
-/obj/item/storage/pistolcase/modelh/PopulateContents()
- new /obj/item/gun/ballistic/automatic/powered/gauss/modelh/no_mag(src)
- new /obj/item/ammo_box/magazine/modelh/empty(src)
- new /obj/item/ammo_box/magazine/modelh/empty(src)
-
-/obj/item/storage/pistolcase/ringneck
-/obj/item/storage/pistolcase/ringneck/PopulateContents()
- new /obj/item/gun/ballistic/automatic/pistol/ringneck/indie/no_mag(src)
- new /obj/item/ammo_box/magazine/m10mm_ringneck/empty(src)
- new /obj/item/ammo_box/magazine/m10mm_ringneck/empty(src)
-
-/obj/item/storage/pistolcase/candor
-/obj/item/storage/pistolcase/candor/PopulateContents()
- new /obj/item/gun/ballistic/automatic/pistol/candor/no_mag(src)
- new /obj/item/ammo_box/magazine/m45/empty(src)
- new /obj/item/ammo_box/magazine/m45/empty(src)
-
-/obj/item/storage/pistolcase/detective
-/obj/item/storage/pistolcase/detective/PopulateContents()
- new /obj/item/gun/ballistic/revolver/detective/no_mag(src)
- new /obj/item/ammo_box/c38/empty(src)
- new /obj/item/ammo_box/c38/empty(src)
-
-/obj/item/storage/pistolcase/shadow
-/obj/item/storage/pistolcase/shadow/PopulateContents()
- new /obj/item/gun/ballistic/revolver/shadow/no_mag(src)
-
-/obj/item/storage/pistolcase/viper
-/obj/item/storage/pistolcase/viper/PopulateContents()
- new /obj/item/gun/ballistic/revolver/viper/indie/no_mag(src)
-
-/obj/item/storage/pistolcase/commander
-/obj/item/storage/pistolcase/commander/PopulateContents()
- new /obj/item/gun/ballistic/automatic/pistol/commander/no_mag(src)
- new /obj/item/ammo_box/magazine/co9mm/empty(src)
- new /obj/item/ammo_box/magazine/co9mm/empty(src)
-
-/obj/item/storage/pistolcase/firebrand
-/obj/item/storage/pistolcase/firebrand/PopulateContents()
- new /obj/item/gun/ballistic/revolver/firebrand/no_mag(src)
-
-/obj/item/storage/pistolcase/derringer
-/obj/item/storage/pistolcase/derringer/PopulateContents()
- new /obj/item/gun/ballistic/derringer/no_mag(src)
-
-/obj/item/storage/pistolcase/a357
-/obj/item/storage/pistolcase/a357/PopulateContents()
- new /obj/item/gun/ballistic/revolver/viper/no_mag(src)
- new /obj/item/ammo_box/a357/empty(src)
- new /obj/item/ammo_box/a357/empty(src)
-
-/obj/item/storage/pistolcase/montagne
-/obj/item/storage/pistolcase/montagne/PopulateContents()
- new /obj/item/gun/ballistic/revolver/montagne/no_mag(src)
- new /obj/item/ammo_box/a44roum_speedloader/empty(src)
- new /obj/item/ammo_box/a44roum_speedloader/empty(src)
-
-/obj/item/storage/pistolcase/disposable
-/obj/item/storage/pistolcase/disposable/PopulateContents()
- new /obj/item/gun/ballistic/automatic/pistol/disposable(src)
- new /obj/item/gun/ballistic/automatic/pistol/disposable(src)
-
-/obj/item/storage/pistolcase/laser
-/obj/item/storage/pistolcase/laser/PopulateContents()
- new /obj/item/gun/energy/laser/empty_cell(src)
- new /obj/item/stock_parts/cell/gun(src)
-
-/obj/item/storage/pistolcase/egun
-/obj/item/storage/pistolcase/egun/PopulateContents()
- new /obj/item/gun/energy/e_gun/empty_cell(src)
- new /obj/item/stock_parts/cell/gun(src)
-
-/obj/item/storage/pistolcase/kalixpistol
-/obj/item/storage/pistolcase/kalixpistol/PopulateContents()
- new /obj/item/gun/energy/kalix/pistol/empty_cell(src)
- new /obj/item/stock_parts/cell/gun/kalix(src)
-
-/obj/item/storage/guncase/kalixrifle
-/obj/item/storage/guncase/kalixrifle/PopulateContents()
- new /obj/item/gun/energy/kalix/empty_cell(src)
- new /obj/item/stock_parts/cell/gun/kalix(src)
-
-/obj/item/storage/pistolcase/miniegun
-/obj/item/storage/pistolcase/miniegun/PopulateContents()
- new /obj/item/gun/energy/e_gun/mini/empty_cell(src)
- new /obj/item/stock_parts/cell/gun/mini(src)
+ STR.max_items = max_items
+ STR.max_w_class = max_w_class
+ STR.set_holdable(holdable_items)
+
+/obj/item/storage/guncase/PopulateContents()
+ if(grab_loc)
+ return
+ if(gun_type)
+ new gun_type(src, ammoless)
+ if(mag_type)
+ for(var/i in 1 to mag_count)
+ if(ispath(mag_type, /obj/item/ammo_box) | ispath(mag_type, /obj/item/stock_parts/cell))
+ new mag_type(src, ammoless)
+
+/// Need to double check this in a seperate pr that adds this to a few ships
+/// Eats the items on its tile
+/obj/item/storage/guncase/inherit
+ grab_loc = TRUE
+
+/obj/item/storage/guncase/pistol
+ name = "pistol case"
+ desc = "A large box designed for holding pistols and magazines safely."
+ max_items = 8
+ max_w_class = WEIGHT_CLASS_NORMAL
-/obj/item/storage/pistolcase/iongun
-/obj/item/storage/pistolcase/iongun/PopulateContents()
- new /obj/item/gun/energy/ionrifle/empty_cell(src)
- new /obj/item/stock_parts/cell/gun(src)
+/// Need to double check this in a seperate pr that adds this to a few ships
+/// Eats the items on its tile
+/obj/item/storage/guncase/pistol/inherit
+ grab_loc = TRUE
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index e0768391dae5e..ba57add3f6fc3 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)
@@ -158,11 +157,9 @@
new /obj/item/stack/cable_coil(src,MAXCOIL,pickedcolor)
/obj/item/storage/toolbox/syndicate
- name = "suspicious looking toolbox"
+ name = "black and red toolbox"
icon_state = "syndicate"
item_state = "toolbox_syndi"
- force = 15
- throwforce = 18
material_flags = NONE
/obj/item/storage/toolbox/syndicate/ComponentInitialize()
@@ -172,11 +169,11 @@
/obj/item/storage/toolbox/syndicate/PopulateContents()
new /obj/item/screwdriver/nuke(src)
- new /obj/item/wrench/syndie(src) //WS Edit - Cool Syndie Tools
+ new /obj/item/wrench/syndie(src)
new /obj/item/weldingtool/largetank(src)
- new /obj/item/crowbar/syndie(src) //WS Begin - Cool Syndie Tools
+ new /obj/item/crowbar/syndie(src)
new /obj/item/wirecutters/syndie(src)
- new /obj/item/multitool/syndie(src) //WS End
+ new /obj/item/multitool/syndie(src)
new /obj/item/clothing/gloves/color/yellow(src)
/obj/item/storage/toolbox/syndicate/empty
@@ -225,58 +222,6 @@
new /obj/item/stack/cable_coil/cyan(src)
new /obj/item/stack/cable_coil/white(src)
-/obj/item/storage/toolbox/ammo
- name = "ammo can"
- desc = "A metal container for storing multiple boxes of ammunition or grenades."
- icon_state = "ammobox"
- item_state = "ammobox"
- drop_sound = 'sound/items/handling/ammobox_drop.ogg'
- pickup_sound = 'sound/items/handling/ammobox_pickup.ogg'
- material_flags = NONE
- has_latches = FALSE
-
-/obj/item/storage/toolbox/ammo/a850r/PopulateContents()
- name = "ammo can (8x50mmR)"
- icon_state = "ammobox_850"
- for(var/i in 1 to 4)
- new /obj/item/ammo_box/c8x50mm_box(src)
-
-/obj/item/storage/toolbox/ammo/a762_40/PopulateContents()
- name = "ammo can (7.62x40mm CLIP)"
- icon_state = "ammobox_762"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/a762_40(src)
-
-/obj/item/storage/toolbox/ammo/a308/PopulateContents()
- name = "ammo can (.308)"
- icon_state = "ammobox_308"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/a308(src)
-
-/obj/item/storage/toolbox/ammo/c45/PopulateContents()
- name = "ammo can (.45)"
- icon_state = "ammobox_45"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/c45(src)
-
-/obj/item/storage/toolbox/ammo/c9mm/PopulateContents()
- name = "ammo can (9mm)"
- icon_state = "ammobox_9mm"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/c9mm(src)
-
-/obj/item/storage/toolbox/ammo/c10mm/PopulateContents()
- name = "ammo can (10mm)"
- icon_state = "ammobox_10mm"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/c10mm(src)
-
-/obj/item/storage/toolbox/ammo/shotgun/PopulateContents()
- name = "ammo can (12ga)"
- icon_state = "ammobox_12ga"
- for (var/i in 1 to 4)
- new /obj/item/ammo_box/a12g(src)
-
/obj/item/storage/toolbox/infiltrator
name = "insidious case"
desc = "Bearing the emblem of the Syndicate, this case contains a full infiltrator stealth suit, and has enough room to fit weaponry if necessary."
@@ -322,6 +267,26 @@
STR.max_combined_w_class = 4
STR.max_items = 2
+/obj/item/storage/toolbox/bounty/hunt
+ name = "dogtag case"
+ desc = "Store pirate dogtags in here."
+
+/obj/item/storage/toolbox/bounty/hunt/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_combined_w_class = 6
+ STR.max_items = 3
+
+/obj/item/storage/toolbox/bounty/salvage
+ name = "research case"
+ desc = "Store salvaged science equipment in here."
+
+/obj/item/storage/toolbox/bounty/salvage/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_combined_w_class = 2
+ STR.max_items = 1
+
//floorbot assembly
/obj/item/storage/toolbox/attackby(obj/item/stack/tile/plasteel/T, mob/user, params)
var/list/allowed_toolbox = list(/obj/item/storage/toolbox/emergency, //which toolboxes can be made into floorbots
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 9516c71280905..26b9b790b2f80 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -2,7 +2,7 @@
/obj/item/storage/box/syndicate
/obj/item/storage/box/syndicate/bundle_A/PopulateContents()
- switch (pickweight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1)))
+ switch (pick_weight(list("recon" = 2, "bloodyspai" = 3, "stealth" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "sniper" = 1, "metaops" = 1)))
if("recon")
new /obj/item/clothing/glasses/thermal/xray(src) // ~8 tc?
new /obj/item/storage/briefcase/launchpad(src) //6 tc
@@ -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)
@@ -117,7 +117,7 @@
new /obj/item/card/emag(src) // 6 tc
/obj/item/storage/box/syndicate/bundle_B/PopulateContents()
- switch (pickweight(list( "bond" = 2, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "mr_freeze" = 2, "made_man"= 1)))
+ switch (pick_weight(list( "bond" = 2, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "mr_freeze" = 2, "made_man"= 1)))
if("bond")
new /obj/item/gun/ballistic/automatic/pistol/ringneck(src)
new /obj/item/attachment/silencer(src)
@@ -178,10 +178,10 @@
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/lootdrop/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
+ new /obj/effect/spawner/random/clothing/mafia_outfit(src) // 0 TC, just an outfit for the new 'don of this family
new /obj/item/gun/ballistic/automatic/smg/firestorm/pan(src) // 20 TC, a gun with 50 .45 bullets on a three round burst is kinda outstanding
new /obj/item/melee/knife/switchblade(src) // 3 TC? It's nice, but it's really a stealth/oh fuck I'm out of ammo weapon
new /obj/item/reagent_containers/food/drinks/bottle/vodka (src) // 5 TC, free molotov assemblies
@@ -282,7 +282,6 @@
/obj/item/storage/firstaid/tactical,
/obj/item/encryptionkey/syndicate,
/obj/item/clothing/glasses/thermal/syndi,
- /obj/item/slimepotion/slime/sentience/nuclear,
/obj/item/storage/box/syndie_kit/imp_radio,
/obj/item/storage/box/syndie_kit/imp_uplink,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
@@ -501,7 +500,6 @@
/obj/item/storage/box/syndie_kit/mimery/PopulateContents()
new /obj/item/book/granter/spell/mimery_blockade(src)
- new /obj/item/book/granter/spell/mimery_guns(src)
/obj/item/storage/box/syndie_kit/centcom_costume/PopulateContents()
new /obj/item/clothing/under/rank/centcom/official(src)
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index deca5b57397ef..117a6fedb84ff 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/theft_tools.dm b/code/game/objects/items/theft_tools.dm
index fd9b3859cd3b7..5b9da6611bd92 100644
--- a/code/game/objects/items/theft_tools.dm
+++ b/code/game/objects/items/theft_tools.dm
@@ -80,12 +80,8 @@
//snowflake screwdriver, works as a key to start nuke theft, traitor only
/obj/item/screwdriver/nuke
- name = "screwdriver"
- desc = "A screwdriver with an ultra thin tip that's carefully designed to boost screwing speed."
-// icon = 'icons/obj/nuke_tools.dmi' WS edit - better tool sprites
icon_state = "screwdriver_nuke"
item_state = "screwdriver_nuke"
- toolspeed = 0.5
random_color = FALSE
/obj/item/paper/guides/antag/nuke_instructions
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index 26509776dd161..c53fb57a8bd30 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -117,10 +117,7 @@
toolspeed = 0.5
/obj/item/crowbar/syndie
- name = "suspicious-looking crowbar"
- desc = "It has special counterweights that adjust to the amount of pressure put on it by using a complex array of springs and screws."
icon_state = "crowbar_syndie"
- toolspeed = 0.5
force = 8
/obj/item/crowbar/old
diff --git a/code/game/objects/items/tools/electric_weldingtool.dm b/code/game/objects/items/tools/electric_weldingtool.dm
new file mode 100644
index 0000000000000..3611d8ffcd9f1
--- /dev/null
+++ b/code/game/objects/items/tools/electric_weldingtool.dm
@@ -0,0 +1,84 @@
+/obj/item/weldingtool/electric
+ name = "electrical welding tool"
+ desc = "A welding tool capable of welding functionality through the use of electricity."
+ icon_state = "elwelder"
+ light_power = 1
+ light_color = LIGHT_COLOR_HALOGEN
+ tool_behaviour = NONE
+ toolspeed = 0.5 //twice as fast, but doesn't require welding fuel
+ power_use_amount = POWER_CELL_USE_LOW
+ change_icons = FALSE //we don't use fuel
+ var/cell_override = /obj/item/stock_parts/cell/high
+ var/powered = FALSE
+ max_fuel = 20 //uses fuel anyways like a boss
+
+/obj/item/weldingtool/electric/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/cell, cell_override, CALLBACK(src, PROC_REF(switched_off)))
+
+/obj/item/weldingtool/electric/attack_self(mob/user, modifiers)
+ . = ..()
+ if(!powered)
+ if(!(item_use_power(power_use_amount, user, TRUE) & COMPONENT_POWER_SUCCESS))
+ return
+ powered = !powered
+ playsound(src, 'sound/effects/sparks4.ogg', 100, TRUE)
+
+ if(powered)
+ to_chat(user, span_notice("You turn [src] on."))
+ switched_on()
+ return
+
+ to_chat(user, span_notice("You turn [src] off."))
+ switched_off()
+
+/obj/item/weldingtool/electric/switched_on(mob/user)
+ welding = TRUE
+ tool_behaviour = TOOL_WELDER
+ light_on = TRUE
+ force = 15
+ damtype = BURN
+ hitsound = 'sound/items/welder.ogg'
+ set_light_on(powered)
+ update_appearance()
+ START_PROCESSING(SSobj, src)
+
+/obj/item/weldingtool/electric/switched_off(mob/user)
+ powered = FALSE
+ welding = FALSE
+ light_on = FALSE
+ force = initial(force)
+ damtype = BRUTE
+ set_light_on(powered)
+ tool_behaviour = NONE
+ update_appearance()
+ STOP_PROCESSING(SSobj, src)
+
+/obj/item/weldingtool/electric/process(seconds_per_tick)
+ if(!powered)
+ switched_off()
+ return
+
+ if(!(item_use_power(power_use_amount) & COMPONENT_POWER_SUCCESS))
+ switched_off()
+ return
+
+/obj/item/weldingtool/electric/examine(mob/user)
+ . = ..()
+ //Overwrite the last entry, which normally shows welder fuel usage
+ .[length(.)] = "[src] is currently [powered ? "powered" : "unpowered"]."
+
+// This is what uses fuel in the parent. We override it here to not use fuel
+/obj/item/weldingtool/electric/use(used = 0)
+ return isOn()
+
+/obj/item/weldingtool/electric/examine()
+ . = ..()
+ . += "[src] is currently [powered ? "powered" : "unpowered"]."
+
+/obj/item/weldingtool/electric/update_icon_state()
+ if(powered)
+ mob_overlay_icon = "[initial(mob_overlay_icon)]1"
+ else
+ mob_overlay_icon = "[initial(mob_overlay_icon)]"
+ return ..()
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index f953a36043674..fcccb13b4b271 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -351,29 +351,6 @@
/obj/item/weldingtool/hugetank/empty
start_full = FALSE
-/obj/item/weldingtool/experimental
- name = "experimental welding tool"
- desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
- icon_state = "exwelder"
- item_state = "exwelder"
- max_fuel = 40
- custom_materials = list(/datum/material/iron=70, /datum/material/glass=120)
- /*WS Begin - Better Tool sprites
- change_icons = 0
- WS End */
- can_off_process = 1
- light_range = 1
- toolspeed = 0.5
- wall_decon_damage = 100
- var/last_gen = 0
- var/nextrefueltick = 0
-
-/obj/item/weldingtool/experimental/process()
- ..()
- if(get_fuel() < max_fuel && nextrefueltick < world.time)
- nextrefueltick = world.time + 10
- reagents.add_reagent(/datum/reagent/fuel, 1)
-
/obj/item/weldingtool/old
desc = "A standard edition welder provided by Nanotrasen. This one seems to leak a little bit."
icon = 'icons/obj/tools.dmi'
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index e2dfc9a81dc3d..383cbd0273958 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -85,10 +85,7 @@
random_color = FALSE
/obj/item/wirecutters/syndie
- name = "suspicious-looking wirecutters"
- desc = "The blades of these wirecutters have suspiciously fine serrated teeth."
icon_state = "cutters_syndie"
- toolspeed = 0.5
random_color = FALSE
/obj/item/wirecutters/old
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index 3e9898d87508c..b6b99c7c82820 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -95,10 +95,7 @@
return ..()
/obj/item/wrench/syndie
- name = "suspicious-looking wrench"
- desc = "It's one of those fancy wrenches that you turn backward without twisting the bolt for faster action."
icon_state = "wrench_syndie"
- toolspeed = 0.5
/obj/item/wrench/crescent
name = "crescent wrench"
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 6d6d258b5b0ca..84601407f649b 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -245,9 +245,9 @@
/obj/item/toy/ammo/gun
name = "capgun ammo"
desc = "Make sure to recyle the box in an autolathe when it gets empty."
- icon = 'icons/obj/ammo.dmi'
+ icon = 'icons/obj/ammunition/ammo.dmi'
icon_state = "357OLD-7"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=10, /datum/material/glass=10)
var/amount_left = 7
@@ -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))
@@ -1016,7 +1016,8 @@
desc = "A compact ball of snow. Good for throwing at people."
icon = 'icons/obj/toy.dmi'
icon_state = "snowball"
- throwforce = 12 //pelt your enemies to death with lumps of snow
+ throwforce = 1 //pelt your enemies to death with lumps of snow
+ var/stam_dam = 8
/obj/item/toy/snowball/afterattack(atom/target as mob|obj|turf|area, mob/user)
. = ..()
@@ -1025,6 +1026,10 @@
/obj/item/toy/snowball/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(!..())
+ var/caught = hit_atom.hitby(src, FALSE, FALSE, throwingdatum=throwingdatum)
+ if(ishuman(hit_atom) && !caught)//if they are a carbon and they didn't catch it
+ var/mob/living/carbon/human/dorkass = hit_atom
+ dorkass.apply_damage(stam_dam, STAMINA)
playsound(src, 'sound/effects/pop.ogg', 20, TRUE)
qdel(src)
@@ -1392,7 +1397,7 @@
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
icon_state = "shell[rand(1,3)]"
- color = pickweight(possible_colors)
+ color = pick_weight(possible_colors)
setDir(pick(GLOB.cardinals))
/obj/item/toy/brokenradio
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index bdcb89796bc4b..cc67c67957830 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -8,11 +8,8 @@
resistance_flags = FLAMMABLE
/obj/item/trash/Initialize(mapload)
- SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
- return ..()
-
-/obj/item/trash/Destroy()
- SSblackbox.record_feedback("tally", "station_mess_destroyed", 1, name)
+ if(!mapload)
+ SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
return ..()
/obj/item/trash/raisins
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index e0e115b81d01f..363a83d965a35 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -24,11 +24,8 @@
/obj/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0)
if(damage_flag == "melee" && damage_amount < damage_deflection)
return 0
- switch(damage_type)
- if(BRUTE)
- if(BURN)
- else
- return 0
+ if(damage_type != BRUTE && damage_type != BURN)
+ return 0
var/armor_protection = 0
if(damage_flag)
armor_protection = armor.getRating(damage_flag)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 0ffeaa673b53a..0391de85eb337 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -84,7 +84,9 @@
if(!ismachinery(src))
STOP_PROCESSING(SSobj, src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists
SStgui.close_uis(src)
- . = ..()
+ if(burning_particles)
+ QDEL_NULL(burning_particles)
+ return ..()
/obj/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE)
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index 15cbb9481f352..4cd16c934446f 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/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 8ee8d8214f805..19aabed499463 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -17,7 +17,7 @@ LINEN BINS
throwforce = 0
throw_speed = 1
throw_range = 2
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
dying_key = DYE_REGISTRY_BEDSHEET
greyscale_icon_state = "bedsheet"
@@ -383,7 +383,7 @@ LINEN BINS
/obj/item/bedsheet/dorms/Initialize()
..()
- var/type = pickweight(list("Colors" = 80, "Special" = 20))
+ var/type = pick_weight(list("Colors" = 80, "Special" = 20))
switch(type)
if("Colors")
type = pick(list(/obj/item/bedsheet,
@@ -408,7 +408,7 @@ LINEN BINS
/obj/item/bedsheet/dorms/double/Initialize()
..()
- var/type = pickweight(list("Colors" = 80, "Special" = 20))
+ var/type = pick_weight(list("Colors" = 80, "Special" = 20))
switch(type)
if("Colors")
type = pick(list(/obj/item/bedsheet/double,
diff --git a/code/game/objects/structures/cabinet_types.dm b/code/game/objects/structures/cabinet_types.dm
index 347e1954ded47..c64356ac4db18 100644
--- a/code/game/objects/structures/cabinet_types.dm
+++ b/code/game/objects/structures/cabinet_types.dm
@@ -3,8 +3,14 @@
desc = "There is a small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
icon = 'icons/obj/wallmounts.dmi'
icon_state = "fireaxe"
- anchored = TRUE
- density = FALSE
stored_sprite = "axe"
allowed_type = /obj/item/melee/axe/fire
req_one_access_txt = "24"
+
+/obj/structure/cabinet/oneshot
+ name = "\improper rocket launcher cabinet"
+ desc = "There is a small label that reads \"For Emergency use only\" along with a small drawing of how to operate the launcher."
+ icon_state = "rpg"
+ stored_sprite = "launcher"
+ allowed_type = /obj/item/gun/ballistic/rocketlauncher/oneshot
+ req_one_access_txt = "3"
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index cfea37148e55d..626640f5a6071 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -14,7 +14,6 @@
desc = "It looks alien!"
icon_state = "alien"
-
/obj/structure/closet/gimmick
name = "administrative supply closet"
desc = "It's a storage unit for things that have no right being here."
@@ -56,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)
@@ -75,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 23aa2df0ab5a8..98dd6a2b4c889 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -126,17 +126,17 @@
new /obj/item/clothing/under/rank/security/warden/skirt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/holosign_creator/security(src)
- new /obj/item/clothing/mask/gas/sechailer(src)
+ new /obj/item/clothing/mask/gas(src)
new /obj/item/storage/box/zipties(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/belt/security/full(src)
new /obj/item/flashlight/seclite(src)
- new /obj/item/megaphone/sec(src) //WS edit - Small QoL Brig additions
+ new /obj/item/megaphone/sec(src)
new /obj/item/clothing/gloves/krav_maga/sec(src)
new /obj/item/door_remote/head_of_security(src)
- new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src)
- new /obj/item/gun/ballistic/automatic/pistol/commander(src) //WS edit - free lethals
- new /obj/item/gun_voucher //WS edit - gun gun gun gun gun gun gun
+ new /obj/item/gun/ballistic/shotgun/automatic/m11(src)
+ new /obj/item/gun/ballistic/automatic/pistol/commander(src)
+ new /obj/item/gun_voucher
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
@@ -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)
@@ -316,7 +321,7 @@
..()
new /obj/item/gun/ballistic/automatic/smg/wt550(src)
new /obj/item/clothing/head/helmet/bulletproof(src)
- new /obj/item/clothing/mask/gas/sechailer(src)
+ new /obj/item/clothing/mask/gas/vigilitas(src)
new /obj/item/clothing/suit/armor/vest/bulletproof(src)
/obj/structure/closet/secure_closet/lethalshots
@@ -328,10 +333,10 @@
..()
for(var/i in 1 to 3)
new /obj/item/storage/box/lethalshot(src)
- new /obj/item/ammo_box/magazine/co9mm(src) //WS edit - begin - better safe than sorry
new /obj/item/ammo_box/magazine/co9mm(src)
new /obj/item/ammo_box/magazine/co9mm(src)
- new /obj/item/ammo_box/magazine/co9mm(src) //WS edit - end
+ new /obj/item/ammo_box/magazine/co9mm(src)
+ new /obj/item/ammo_box/magazine/co9mm(src)
/obj/structure/closet/secure_closet/labor_camp_security
name = "labor camp security locker"
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index fdc061e9769db..fa4fe485015db 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -29,7 +29,7 @@
if (prob(40))
new /obj/item/storage/toolbox/emergency(src)
- switch (pickweight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1)))
+ switch (pick_weight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1)))
if ("small")
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/tank/internals/emergency_oxygen(src)
@@ -50,7 +50,7 @@
new /obj/item/clothing/mask/breath(src)
if ("nothing")
- // doot
+ EMPTY_BLOCK_GUARD
// teehee
if ("delete")
diff --git a/code/game/objects/structures/crateshelf.dm b/code/game/objects/structures/crateshelf.dm
index 3b1387f5490b5..f5f31fb30e32a 100644
--- a/code/game/objects/structures/crateshelf.dm
+++ b/code/game/objects/structures/crateshelf.dm
@@ -1,4 +1,5 @@
#define DEFAULT_SHELF_CAPACITY 3 // Default capacity of the shelf
+#define DEFAULT_SHELF_MAX_CAPACITY 4
#define DEFAULT_SHELF_USE_DELAY 1 SECONDS // Default interaction delay of the shelf
#define DEFAULT_SHELF_VERTICAL_OFFSET 10 // Vertical pixel offset of shelving-related things. Set to 10 by default due to this leaving more of the crate on-screen to be clicked.
@@ -12,9 +13,13 @@
max_integrity = 50 // Not hard to break
var/capacity = DEFAULT_SHELF_CAPACITY
+ var/max_capacity = DEFAULT_SHELF_MAX_CAPACITY
var/use_delay = DEFAULT_SHELF_USE_DELAY
var/list/shelf_contents
+/obj/structure/crate_shelf/built
+ capacity = 1
+
/obj/structure/crate_shelf/debug
capacity = 12
@@ -38,6 +43,8 @@
/obj/structure/crate_shelf/examine(mob/user)
. = ..()
+ if(capacity < max_capacity)
+ . += span_notice("You could add another shelf with 2 sheets of metal.")
. += span_notice("There are some bolts holding [src] together.")
if(shelf_contents.Find(null)) // If there's an empty space in the shelf, let the examiner know.
. += span_notice("You could drag and drop a crate into [src].")
@@ -47,12 +54,40 @@
for(var/obj/structure/closet/crate/crate in shelf_contents)
. += " [icon2html(crate, user)] [crate]"
+/obj/structure/crate_shelf/proc/add_shelf(num)
+ if(capacity + num > max_capacity)
+ return FALSE
+ var/stack_layer // This is used to generate the sprite layering of the shelf pieces.
+ var/stack_offset // This is used to generate the vertical offset of the shelf pieces.
+ var/prev_capacity = capacity
+ capacity += num
+ shelf_contents.len = capacity
+ for(var/i in prev_capacity to (capacity - 1))
+ if(i >= 3) // If we're at or above three, we'll be on the way to going off the tile we're on. This allows mobs to be below the shelf when this happens.
+ stack_layer = ABOVE_MOB_LAYER + (0.02 * i) - 0.01
+ else
+ stack_layer = BELOW_OBJ_LAYER + (0.02 * i) - 0.01 // Make each shelf piece render above the last, but below the crate that should be on it.
+ stack_offset = DEFAULT_SHELF_VERTICAL_OFFSET * i // Make each shelf piece physically above the last.
+ overlays += image(icon = 'icons/obj/objects.dmi', icon_state = "shelf_stack", layer = stack_layer, pixel_y = stack_offset)
+
/obj/structure/crate_shelf/attackby(obj/item/item, mob/living/user, params)
if (item.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1))
item.play_tool_sound(src)
- if(do_after(user, 3 SECONDS, target = src))
+ if(do_after(user, 3 SECONDS, src))
deconstruct(TRUE)
return TRUE
+ if(istype(item, /obj/item/stack/sheet/metal))
+ if(capacity < max_capacity)
+ var/obj/item/stack/sheet/metal/our_sheet = item
+ if(our_sheet.get_amount() >= 2)
+ balloon_alert(user, "adding additional shelf to rack")
+ if(do_after(user, 3 SECONDS, src))
+ add_shelf(1)
+ our_sheet.use(2)
+ return TRUE
+ to_chat(user, span_notice("Adding a shelf to [src] requires more metal."))
+ return FALSE
+ to_chat(user, span_notice("[src] cannot be built any higher!"))
return ..()
/obj/structure/crate_shelf/relay_container_resist_act(mob/living/user, obj/structure/closet/crate)
@@ -123,6 +158,7 @@
crate.SpinAnimation(rand(4,7), 1) // Spin the crates around a little as they fall. Randomness is applied so it doesn't look weird.
switch(pick(1, 1, 1, 1, 2, 2, 3)) // Randomly pick whether to do nothing, open the crate, or break it open.
if(1) // Believe it or not, this does nothing.
+ EMPTY_BLOCK_GUARD
if(2) // Open the crate!
if(crate.open()) // Break some open, cause a little chaos.
crate.visible_message(span_warning("[crate]'s lid falls open!"))
@@ -135,11 +171,15 @@
shelf_contents[shelf_contents.Find(crate)] = null
if(!(flags_1&NODECONSTRUCT_1))
density = FALSE
- var/obj/item/rack_parts/shelf/newparts = new(loc)
- transfer_fingerprints_to(newparts)
+ var/obj/item/rack_parts/shelf/new_parts = new(loc)
+ if(capacity >= 2)
+ var/obj/item/stack/sheet/metal/new_metal = new(loc)
+ new_metal.amount = (capacity-1)*2
+ transfer_fingerprints_to(new_metal)
+ transfer_fingerprints_to(new_parts)
return ..()
/obj/item/rack_parts/shelf
name = "crate shelf parts"
desc = "Parts of a shelf."
- construction_type = /obj/structure/crate_shelf
+ construction_type = /obj/structure/crate_shelf/built
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 4e95b55588429..b74c4926ea173 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -185,6 +185,11 @@
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
take_damage(2)
+/obj/structure/displaycase/broken
+ name = "broken display case"
+ desc = "A display case for prized possessions. Or at least it was, until someone smashed it open."
+ broken = 1
+
/obj/structure/displaycase_chassis
anchored = TRUE
density = FALSE
diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
index ebfda776726f4..61944f81198c0 100644
--- a/code/game/objects/structures/dresser.dm
+++ b/code/game/objects/structures/dresser.dm
@@ -9,14 +9,40 @@
hitsound_type = PROJECTILE_HITSOUND_WOOD
/obj/structure/dresser/attackby(obj/item/I, mob/user, params)
- if(I.tool_behaviour == TOOL_WRENCH)
- to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].")
- if(I.use_tool(src, user, 20, volume=50))
- to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].")
- set_anchored(!anchored)
+ var/list/modifiers = params2list(params)
+ if(user.transferItemToLoc(I, drop_location(), silent = FALSE))
+ //Center the icon where the user clicked.
+ if(!LAZYACCESS(modifiers, ICON_X) || !LAZYACCESS(modifiers, ICON_Y))
+ return
+ //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
+ I.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size/2), world.icon_size/2)
+ I.pixel_y = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2)
+ return TRUE
else
return ..()
+/obj/structure/dresser/wrench_act(mob/living/user, obj/item/I)
+ . = ..()
+ to_chat(user, "You begin to [anchored ? "unwrench" : "wrench"] [src].")
+ if(I.use_tool(src, user, 20, volume=50))
+ to_chat(user, "You successfully [anchored ? "unwrench" : "wrench"] [src].")
+ set_anchored(!anchored)
+
+/obj/structure/dresser/crowbar_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(!anchored)
+ to_chat(user, span_notice("You begin to pull apart [src]."))
+ if(I.use_tool(src, user, 30, volume=50))
+ to_chat(user, span_notice("You successfully deconstruct [src]."))
+ deconstruct()
+
+/obj/structure/dresser/deconstruct_act(mob/living/user, obj/item/I)
+ . = ..()
+ to_chat(user, span_notice("You begin to disassemble [src]."))
+ if(I.use_tool(src, user, 10, volume=50))
+ to_chat(user, span_notice("You successfully deconstruct [src]."))
+ deconstruct()
+
/obj/structure/dresser/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
qdel(src)
diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm
index 8697662ed0975..819264eb1ced9 100644
--- a/code/game/objects/structures/fence.dm
+++ b/code/game/objects/structures/fence.dm
@@ -111,11 +111,6 @@
cuttable = FALSE
var/open = FALSE
-/obj/structure/fence/door/Initialize()
- . = ..()
-
- update_door_status()
-
/obj/structure/fence/door/opened
icon_state = "door_opened"
open = TRUE
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 1698f90ec7cd0..6e4fe25167c10 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -883,7 +883,7 @@
else if (isliving(user))
var/mob/living/L = user
L.Immobilize(100, TRUE)
- L.jitteriness += 50
+ L.adjust_jitter(50)
L.adjustToxLoss(66)
return 1
else ..()
diff --git a/code/game/objects/structures/geyser.dm b/code/game/objects/structures/geyser.dm
index af536d2e8c1ce..d5c7dbeef3626 100644
--- a/code/game/objects/structures/geyser.dm
+++ b/code/game/objects/structures/geyser.dm
@@ -45,7 +45,7 @@
/obj/structure/geyser/random/Initialize()
. = ..()
- reagent_id = pickweight(options)
+ reagent_id = pick_weight(options)
/obj/item/plunger
name = "plunger"
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 59ef31fafa4ee..83bae84fc5751 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -154,7 +154,7 @@
else
H.apply_damage(15 * blade_sharpness, BRUTE, head)
log_combat(user, H, "dropped the blade on", src, " non-fatally")
- H.emote("scream")
+ H.force_scream()
if (blade_sharpness > 1)
blade_sharpness -= 1
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index 6512a06839473..1840c27f9271c 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -74,7 +74,7 @@
playsound(src.loc, 'sound/effects/splat.ogg', 25, TRUE)
L.visible_message("[user] slams [L] onto the meat spike!", "[user] slams you onto the meat spike!", "You hear a squishy wet noise.")
L.forceMove(drop_location())
- L.emote("scream")
+ L.force_scream()
L.add_splatter_floor()
L.adjustBruteLoss(30)
L.setDir(2)
@@ -128,7 +128,7 @@
M.adjustBruteLoss(30)
src.visible_message(text("[M] falls free of [src]!"))
unbuckle_mob(M,force=1)
- M.emote("scream")
+ M.force_scream()
M.AdjustParalyzed(20)
/obj/structure/kitchenspike/Destroy()
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 2e8c7508d594a..ae1f50f0624ff 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -264,7 +264,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
for(var/mob/living/M in conts)
if (M.stat != DEAD)
- M.emote("scream")
+ M.force_scream()
if(user)
log_combat(user, M, "cremated")
else
diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm
new file mode 100644
index 0000000000000..a6431e8b76304
--- /dev/null
+++ b/code/game/objects/structures/platforms.dm
@@ -0,0 +1,172 @@
+/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)
+ update_appearance()
+
+/obj/structure/platform/update_appearance(updates)
+ . = ..()
+ if(dir == (1 || 5 || 9))
+ layer = 2.76
+ else
+ layer = 3.08
+
+
+/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/poddoor_assembly.dm b/code/game/objects/structures/poddoor_assembly.dm
index 5909e0f666b2c..f06610ddbc5d6 100644
--- a/code/game/objects/structures/poddoor_assembly.dm
+++ b/code/game/objects/structures/poddoor_assembly.dm
@@ -56,6 +56,14 @@
return
created_name = new_name
+ else if(item_used.tool_behaviour == TOOL_DECONSTRUCT)
+ if(!item_used.tool_start_check(user, amount=0))
+ return
+ user.visible_message(span_notice("[user] cuts apart [src]."), span_notice("You start to slice apart [src]..."))
+ if(item_used.use_tool(src, user, 4 SECONDS, volume=50))
+ to_chat(user, span_notice("You disassemble [src]."))
+ deconstruct(TRUE)
+
else if(item_used.tool_behaviour == TOOL_WELDER)
if(!item_used.tool_start_check(user, amount=0))
return
diff --git a/code/game/objects/structures/radioactive.dm b/code/game/objects/structures/radioactive.dm
deleted file mode 100644
index 87de907b18139..0000000000000
--- a/code/game/objects/structures/radioactive.dm
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Radioactive hazards for ruins */
-
-/obj/structure/radioactive
- name = "nuclear waste barrel"
- desc = "An old container of radioactive biproducts."
- icon = 'icons/obj/hazard.dmi'
- icon_state = "barrel"
- density = TRUE
- var/rad_power = 100
- var/rad_range = 1 // !Range mod = rad dropoff speed
- COOLDOWN_DECLARE(pulse_cooldown)
- var/rad_delay = 2 SECONDS
-
-/obj/structure/radioactive/Initialize()
- START_PROCESSING(SSobj, src)
- . = ..()
-
-/obj/structure/radioactive/process()
- for(var/mob/living/L in range(5, src))
- if(L.client)
- Nuke()
- break
- ..()
-
-/obj/structure/radioactive/bullet_act(obj/projectile/P)
- Nuke()
- . = ..()
-
-/obj/structure/radioactive/attack_tk(mob/user)
- Nuke()
-
-/obj/structure/radioactive/attack_paw(mob/user)
- Nuke()
-
-/obj/structure/radioactive/attack_alien(mob/living/carbon/alien/humanoid/user)
- Nuke()
-
-/obj/structure/radioactive/attack_animal(mob/living/simple_animal/M)
- Nuke()
-
-/obj/structure/radioactive/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- Nuke()
-
-/obj/structure/radioactive/Bumped(atom/movable/AM)
- if(!iseffect(AM))
- Nuke()
-
-/obj/structure/radioactive/proc/Nuke(atom/movable/AM)
- if(!COOLDOWN_FINISHED(src, pulse_cooldown))
- return
-
- COOLDOWN_START(src, pulse_cooldown, rad_delay)
- radiation_pulse(src, rad_power, rad_range)
-
-/obj/structure/radioactive/waste
- name = "leaking waste barrel"
- desc = "It wasn't uncommon for early vessels to simply dump their waste like this out the airlock. However this proved to be a terrible long-term solution."
- icon_state = "barrel_tipped"
- anchored = TRUE
- rad_power = 150
- rad_range = 0.8
- rad_delay = 1 SECONDS
-
-/obj/structure/radioactive/stack
- name = "stack of nuclear waste"
- desc = "Discarded nuclar waste. If enough of this builds up around a planet, radioactive toxins can poison the whole atmosphere."
- icon_state = "barrel_3"
- anchored = TRUE
- rad_power = 300
- rad_delay = 1 SECONDS
-
-/obj/structure/radioactive/supermatter
- name = "decayed supermatter crystal"
- desc = "An abandoned supermatter crystal undergoing extreme nuclear decay as a result of poor maintenence and disposal."
- icon_state = "smdecay"
- anchored = TRUE
- rad_power = 1200
- rad_range = 0.2
- rad_delay = 0.5 SECONDS
diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm
index d8f5c543a168f..3217f8274b327 100644
--- a/code/game/objects/structures/railings.dm
+++ b/code/game/objects/structures/railings.dm
@@ -13,7 +13,6 @@
var/buildstack = /obj/item/stack/rods
var/buildstackamount = 3
-
/obj/structure/railing/Initialize()
. = ..()
if(density && flags_1 & ON_BORDER_1)
@@ -22,6 +21,13 @@
)
AddElement(/datum/element/connect_loc, loc_connections)
+/obj/structure/railing/update_appearance(updates)
+ . = ..()
+ if(dir == (1 || 5 || 9))
+ layer = 2.76
+ else
+ layer = 3.08
+
/obj/structure/railing/corner //aesthetic corner sharp edges hurt oof ouch
icon_state = "railing_corner"
density = FALSE
@@ -106,16 +112,16 @@
if(!(direction & dir))
return
- if (!density)
+ if(!density)
return
- if (leaving.throwing)
+ if(leaving.throwing)
return
- if (leaving.movement_type & (PHASING | FLYING | FLOATING))
+ if(leaving.movement_type & (PHASING | FLYING | FLOATING))
return
- if (leaving.move_force >= MOVE_FORCE_EXTREMELY_STRONG)
+ if(leaving.move_force >= MOVE_FORCE_EXTREMELY_STRONG)
return
leaving.Bump(src)
@@ -142,12 +148,12 @@
/obj/structure/railing/wood
name = "wooden railing"
- color = "#A47449"
+ icon_state = "wood_railing_thin"
buildstack = /obj/item/stack/sheet/mineral/wood
/obj/structure/railing/corner/wood
name = "wooden railing"
- color = "#A47449"
+ icon_state = "wood_corners_thin"
buildstack = /obj/item/stack/sheet/mineral/wood
/obj/structure/railing/modern
@@ -196,3 +202,15 @@
density = FALSE
climbable = FALSE
buildstackamount = 1
+
+/obj/structure/railing/thick
+ icon_state = "railing_thick"
+
+/obj/structure/railing/thick/corner
+ icon_state = "railing_thick_corner"
+
+/obj/structure/railing/thin
+ icon_state = "railing_thin"
+
+/obj/structure/railing/thin/corner
+ icon_state = "railing_thin_corner"
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 44a9f7f94717a..0ea49b44933a3 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -78,7 +78,7 @@ FLOOR SAFES
else if(I.tool_behaviour == TOOL_DECONSTRUCT)
user.visible_message("[user] begin to cut through the lock of \the [src].","You start cutting trough the lock of [src].")
- if(I.use_tool(src, user, 60 SECONDS))
+ if(I.use_tool(src, user, 45 SECONDS))
broken = TRUE
user.visible_message("[user] successfully cuts trough the lock of \the [src].","You successfully cut trough the lock of [src].")
diff --git a/code/game/objects/structures/salvaging.dm b/code/game/objects/structures/salvaging.dm
index f4aad715db19f..ccb76bd81c4a5 100644
--- a/code/game/objects/structures/salvaging.dm
+++ b/code/game/objects/structures/salvaging.dm
@@ -56,16 +56,16 @@
/obj/item/stack/ore/salvage/scrapgold/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
- /obj/effect/spawner/lootdrop/salvage_capacitor = 50,
- /obj/effect/spawner/lootdrop/salvage_capacitor = 50,
- /obj/effect/spawner/lootdrop/salvage_scanning = 50,
- /obj/effect/spawner/lootdrop/salvage_scanning = 50,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 40,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 40,
- /obj/effect/spawner/lootdrop/salvage_laser = 40,
- /obj/effect/spawner/lootdrop/salvage_laser = 40,
+ /obj/effect/spawner/random/salvage_capacitor = 50,
+ /obj/effect/spawner/random/salvage_capacitor = 50,
+ /obj/effect/spawner/random/salvage_scanning = 50,
+ /obj/effect/spawner/random/salvage_scanning = 50,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_manipulator = 40,
+ /obj/effect/spawner/random/salvage_manipulator = 40,
+ /obj/effect/spawner/random/salvage_laser = 40,
+ /obj/effect/spawner/random/salvage_laser = 40,
)
/obj/structure/salvageable/computer
@@ -79,7 +79,7 @@
/obj/item/stack/ore/salvage/scrapgold/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
- /obj/effect/spawner/lootdrop/salvage_capacitor = 60,
+ /obj/effect/spawner/random/salvage_capacitor = 60,
/obj/item/computer_hardware/battery = 40,
/obj/item/computer_hardware/battery = 40,
@@ -91,8 +91,8 @@
/obj/item/computer_hardware/card_slot = 40,
/obj/item/computer_hardware/network_card/advanced = 20,
- /obj/effect/spawner/lootdrop/random_computer_circuit_common = 50,
- /obj/effect/spawner/lootdrop/random_computer_circuit_rare = 5,
+ /obj/effect/spawner/random/circuit/computer/common = 50,
+ /obj/effect/spawner/random/circuit/computer/rare = 5,
/obj/item/research_notes/loot/tiny = 10,
)
@@ -106,11 +106,10 @@
/obj/item/stack/ore/salvage/scraptitanium/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
-
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_manipulator = 30,
/obj/item/circuitboard/machine/autolathe = 35,
@@ -134,17 +133,17 @@
/obj/item/stack/ore/salvage/scrapplasma/five = 60,
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_manipulator = 30,
+ /obj/effect/spawner/random/salvage_manipulator = 30,
- /obj/effect/spawner/lootdrop/tool_engie_proto = 45,
- /obj/effect/spawner/lootdrop/tool_surgery_proto = 55,
- /obj/effect/spawner/lootdrop/beaker_loot_spawner = 45,
- /obj/effect/spawner/lootdrop/random_prosthetic = 25,
- /obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop = 5, //:flushed:
- /obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop = 5,
+ /obj/effect/spawner/random/engineering/tool = 45,
+ /obj/effect/spawner/random/medical/surgery_tool = 55,
+ /obj/effect/spawner/random/medical/beaker = 45,
+ /obj/effect/spawner/random/medical/prosthetic = 25,
+ /obj/effect/spawner/random/random_gun_protolathe_lootdrop = 5, //:flushed:
+ /obj/effect/spawner/random/random_ammo_protolathe_lootdrop = 5,
/obj/item/storage/part_replacer = 20,
/obj/item/storage/part_replacer/bluespace = 1,
@@ -172,13 +171,13 @@
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
/obj/item/stack/ore/salvage/scrapbluespace = 60,
- /obj/effect/spawner/lootdrop/salvage_matter_bin = 40,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
+ /obj/effect/spawner/random/salvage_matter_bin = 40,
+ /obj/effect/spawner/random/salvage_manipulator = 30,
/obj/item/stack/circuit_stack = 50, //this might be the only way in the game to get a poly circuit, and the only way for many ships to get essensial electronics. huh.
- /obj/effect/spawner/lootdrop/random_machine_circuit_mech = 45, //with all the wonderful broken mechs lying around, this might be a chance to get something stupidly overpowered.
- /obj/effect/spawner/lootdrop/random_machine_circuit_common = 50, //well.... "common"
- /obj/effect/spawner/lootdrop/random_machine_circuit_rare = 5,
+ /obj/effect/spawner/random/circuit/machine/mech = 45, //with all the wonderful broken mechs lying around, this might be a chance to get something stupidly overpowered.
+ /obj/effect/spawner/random/circuit/machine/common = 50, //well.... "common"
+ /obj/effect/spawner/random/circuit/machine/rare = 5,
/obj/item/stack/sheet/metal/five = 15, //same as above but more geared towards stuff used by circuit imprinter
/obj/item/stack/sheet/glass/five = 15,
@@ -199,12 +198,12 @@
/obj/item/stack/ore/salvage/scrapmetal/five = 60,
/obj/item/stack/ore/salvage/scrapplasma = 60,
- /obj/effect/spawner/lootdrop/salvage_scanning = 40,
- /obj/effect/spawner/lootdrop/salvage_laser = 30,
- /obj/effect/spawner/lootdrop/salvage_manipulator = 30,
+ /obj/effect/spawner/random/salvage_scanning = 40,
+ /obj/effect/spawner/random/salvage_laser = 30,
+ /obj/effect/spawner/random/salvage_manipulator = 30,
/obj/item/storage/toolbox/syndicate/empty = 80,
- /obj/effect/spawner/lootdrop/destructive_anal_loot = 65,
+ /obj/effect/spawner/random/destructive_anal_loot = 65,
/obj/item/stack/sheet/metal/five = 15, //same as above but more geared towards stuff used by circuit imprinter
/obj/item/stack/sheet/glass/five = 15,
@@ -342,11 +341,11 @@
color = "#808080"
salvageable_parts = list(
- /obj/effect/spawner/lootdrop/seeded = 80,
- /obj/effect/spawner/lootdrop/seeded = 80,
- /obj/effect/spawner/lootdrop/seeded = 80,
- /obj/effect/spawner/lootdrop/seeded = 80,
- /obj/effect/spawner/lootdrop/seeded = 80,
+ /obj/effect/spawner/random/food_or_drink/seed = 80,
+ /obj/effect/spawner/random/food_or_drink/seed = 80,
+ /obj/effect/spawner/random/food_or_drink/seed = 80,
+ /obj/effect/spawner/random/food_or_drink/seed = 80,
+ /obj/effect/spawner/random/food_or_drink/seed = 80,
/obj/item/seeds/random = 80,
/obj/item/seeds/random = 40,
/obj/item/seeds/random = 40,
@@ -470,238 +469,3 @@
/obj/item/stack/ore/salvage/scrapbluespace/five
amount = 5
-
-//loot spawners as shown above
-
-//GENERIC
-/obj/effect/spawner/lootdrop/salvage_capacitor
- loot = list(
- /obj/item/stock_parts/capacitor = 120,
- /obj/item/stock_parts/capacitor/adv = 20,
- /obj/item/stock_parts/capacitor/super = 5,
- )
-
-/obj/effect/spawner/lootdrop/salvage_scanning
- loot = list(
- /obj/item/stock_parts/scanning_module = 120,
- /obj/item/stock_parts/scanning_module/adv = 20,
- /obj/item/stock_parts/scanning_module/phasic = 5,
- )
-
-/obj/effect/spawner/lootdrop/salvage_manipulator
- loot = list(
- /obj/item/stock_parts/manipulator = 120,
- /obj/item/stock_parts/manipulator/nano = 20,
- /obj/item/stock_parts/manipulator/pico = 5,
- )
-
-/obj/effect/spawner/lootdrop/salvage_matter_bin
- loot = list(
- /obj/item/stock_parts/matter_bin = 120,
- /obj/item/stock_parts/matter_bin/adv = 20,
- /obj/item/stock_parts/matter_bin/super = 5,
- )
-
-/obj/effect/spawner/lootdrop/salvage_laser
- loot = list(
- /obj/item/stock_parts/micro_laser = 120,
- /obj/item/stock_parts/micro_laser/high = 20,
- /obj/item/stock_parts/micro_laser/ultra = 5,
- )
-
-//PROTOLATHE
-/obj/effect/spawner/lootdrop/tool_engie_proto
- loot = list(
- /obj/effect/spawner/lootdrop/tool_engie_common = 120,
- /obj/effect/spawner/lootdrop/tool_engie_sydnie = 20,
- /obj/effect/spawner/lootdrop/tool_engie_adv = 5,
- )
-
-/obj/effect/spawner/lootdrop/tool_engie_common
- loot = list(
- /obj/item/wrench/crescent = 1,
- /obj/item/screwdriver = 1,
- /obj/item/weldingtool = 1,
- /obj/item/crowbar = 1,
- /obj/item/wirecutters = 1,
- /obj/item/multitool = 1,
- )
-
-/obj/effect/spawner/lootdrop/tool_engie_sydnie
- loot = list(
- /obj/item/wrench/syndie = 1,
- /obj/item/screwdriver/nuke = 1,
- /obj/item/weldingtool/largetank = 1,
- /obj/item/crowbar/syndie = 1,
- /obj/item/wirecutters/syndie = 1,
- /obj/item/multitool/syndie = 1,
- )
-
-/obj/effect/spawner/lootdrop/tool_engie_adv
- loot = list(
- /obj/item/screwdriver/power = 1,
- /obj/item/weldingtool/experimental = 1,
- /obj/item/crowbar/power = 1,
- )
-
-/obj/effect/spawner/lootdrop/tool_surgery_proto
- loot = list(
- /obj/effect/spawner/lootdrop/tool_surgery_common = 120,
- /obj/effect/spawner/lootdrop/tool_surgery_adv = 10,
- )
-
-/obj/effect/spawner/lootdrop/tool_surgery_common
- loot = list(
- /obj/item/scalpel = 1,
- /obj/item/hemostat = 1,
- /obj/item/cautery = 1,
- /obj/item/retractor = 1,
- /obj/item/circular_saw = 1,
- /obj/item/surgicaldrill = 1,
- )
-
-/obj/effect/spawner/lootdrop/tool_surgery_adv
- loot = list(
- /obj/item/scalpel/advanced = 1,
- /obj/item/retractor/advanced = 1,
- /obj/item/surgicaldrill/advanced = 1,
- )
-
-/obj/effect/spawner/lootdrop/beaker_loot_spawner
- loot = list(
- /obj/item/reagent_containers/glass/beaker = 300,
- /obj/item/reagent_containers/glass/beaker/large = 200,
- /obj/item/reagent_containers/glass/beaker/plastic = 50,
- /obj/item/reagent_containers/glass/beaker/meta = 10,
- /obj/item/reagent_containers/glass/beaker/noreact = 5,
- /obj/item/reagent_containers/glass/beaker/bluespace = 1,
- )
-/obj/effect/spawner/lootdrop/random_prosthetic
- loot = list(
- /obj/item/bodypart/l_arm/robot/surplus = 1,
- /obj/item/bodypart/r_arm/robot/surplus = 1,
- /obj/item/bodypart/leg/left/robot/surplus = 1,
- /obj/item/bodypart/leg/right/robot/surplus = 1,
- )
-/obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop
- loot = list(
- /obj/item/gun/energy/lasercannon = 1,
- /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 1,
- /obj/item/gun/energy/temperature/security = 1,
- )
-/obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop
- loot = list(
- /obj/item/stock_parts/cell/gun/upgraded = 5,
- /obj/item/ammo_box/magazine/smgm9mm = 7,
- )
-
-//CIRCUIT IMPRINTER
-/obj/effect/spawner/lootdrop/random_machine_circuit_common
- loot = list(
- /obj/item/circuitboard/machine/autolathe = 5,
- /obj/item/circuitboard/machine/biogenerator = 5,
- /obj/item/circuitboard/machine/cell_charger = 5,
- /obj/item/circuitboard/machine/chem_heater = 5,
- /obj/item/circuitboard/machine/chem_master = 5,
- /obj/item/circuitboard/machine/clonescanner = 5,
- /obj/item/circuitboard/machine/cryo_tube = 5,
- /obj/item/circuitboard/machine/cyborgrecharger = 5,
- /obj/item/circuitboard/machine/deep_fryer = 5,
- /obj/item/circuitboard/machine/experimentor = 5,
- /obj/item/circuitboard/machine/holopad = 5,
- /obj/item/circuitboard/machine/hydroponics = 5,
- /obj/item/circuitboard/machine/limbgrower = 5,
- /obj/item/circuitboard/machine/ltsrbt = 5,
- /obj/item/circuitboard/machine/mech_recharger = 5,
- /obj/item/circuitboard/machine/mechfab = 5,
- /obj/item/circuitboard/machine/medical_kiosk = 5,
- /obj/item/circuitboard/machine/medipen_refiller = 5,
- /obj/item/circuitboard/machine/microwave = 5,
- /obj/item/circuitboard/machine/monkey_recycler = 5,
- /obj/item/circuitboard/machine/ore_redemption = 5,
- /obj/item/circuitboard/machine/ore_silo = 5,
- /obj/item/circuitboard/machine/reagentgrinder = 5,
- /obj/item/circuitboard/machine/recharger = 5,
- /obj/item/circuitboard/machine/seed_extractor = 5,
- /obj/item/circuitboard/machine/selling_pad = 5,
- /obj/item/circuitboard/machine/emitter = 5,
- )
-
-/obj/effect/spawner/lootdrop/random_machine_circuit_rare
- loot = list(
- /obj/item/circuitboard/aicore = 5,
- /obj/item/circuitboard/machine/chem_dispenser = 5,
- /obj/item/circuitboard/machine/circuit_imprinter = 5,
- /obj/item/circuitboard/machine/protolathe = 5,
- /obj/item/circuitboard/machine/clonepod/experimental = 5,
- /obj/item/circuitboard/machine/rad_collector = 5,
- /obj/item/circuitboard/machine/launchpad = 5,
- )
-
-/obj/effect/spawner/lootdrop/random_machine_circuit_mech
- loot = list(
- /obj/item/circuitboard/mecha/ripley/main = 100,
- /obj/item/circuitboard/mecha/ripley/peripherals = 100,
- /obj/item/circuitboard/mecha/honker/main = 5,
- /obj/item/circuitboard/mecha/honker/peripherals = 5,
- /obj/item/circuitboard/mecha/odysseus/main = 5,
- /obj/item/circuitboard/mecha/odysseus/peripherals = 5,
- /obj/item/circuitboard/mecha/gygax/main = 1,
- /obj/item/circuitboard/mecha/gygax/peripherals = 1,
- /obj/item/circuitboard/mecha/gygax/targeting = 1,
- /obj/item/circuitboard/mecha/durand/main = 1,
- /obj/item/circuitboard/mecha/durand/peripherals = 1,
- /obj/item/circuitboard/mecha/durand/targeting = 1,
- )
-
-//COMPUTER
-/obj/effect/spawner/lootdrop/random_computer_circuit_common
- loot = list(
- /obj/item/circuitboard/computer/aifixer = 5,
- /obj/item/circuitboard/computer/arcade/amputation = 5,
- /obj/item/circuitboard/computer/arcade/battle = 5,
- /obj/item/circuitboard/computer/arcade/orion_trail = 5,
- /obj/item/circuitboard/computer/atmos_alert = 5,
- /obj/item/circuitboard/computer/card = 5,
- /obj/item/circuitboard/computer/cloning = 5,
- /obj/item/circuitboard/computer/communications = 5,
- /obj/item/circuitboard/computer/launchpad_console = 5,
- /obj/item/circuitboard/computer/mech_bay_power_console = 5,
- /obj/item/circuitboard/computer/pandemic = 5,
- /obj/item/circuitboard/computer/powermonitor/secret = 5,
- /obj/item/circuitboard/computer/prototype_cloning = 5,
- /obj/item/circuitboard/computer/stationalert = 5,
- /obj/item/circuitboard/computer/xenobiology = 5,
- /obj/item/circuitboard/computer/teleporter = 5,
- /obj/item/circuitboard/computer/operating = 5,
- /obj/item/circuitboard/computer/crew = 5,
- /obj/item/circuitboard/computer/scan_consolenew = 5,
- )
-
-/obj/effect/spawner/lootdrop/random_computer_circuit_rare
- loot = list(
- /obj/item/circuitboard/computer/cargo = 5,
- /obj/item/circuitboard/computer/communications = 5,
- /obj/item/circuitboard/computer/shuttle/helm = 5,
- /obj/item/circuitboard/computer/med_data = 5,
- )
-
-//DESTRUCTIVE ANAL //i'm killing you
-/obj/effect/spawner/lootdrop/destructive_anal_loot //what do people usually put in these things anayways
- loot = list(
- /obj/item/storage/toolbox/syndicate/empty = 650,
- /obj/item/gun/ballistic/automatic/pistol/ringneck = 500,
- /obj/item/camera_bug = 500,
- /obj/item/clothing/gloves/combat = 200,
- /obj/item/clothing/head/chameleon = 200,
- /obj/item/pen/sleepy = 200,
- /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 100,
-
- /obj/item/grenade/c4 = 100,
-
- /obj/item/wrench/syndie = 30,
- /obj/item/screwdriver/nuke = 30,
- /obj/item/crowbar/syndie = 30,
- /obj/item/wirecutters/syndie = 30,
- /obj/item/multitool/syndie = 30,
- )
diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
index 16cf7af6ce810..b7c6285d79626 100644
--- a/code/game/objects/structures/shower.dm
+++ b/code/game/objects/structures/shower.dm
@@ -134,11 +134,11 @@
if(current_temperature == SHOWER_FREEZING)
if(iscarbon(L))
- C.adjust_bodytemperature(-80, 80)
+ C.adjust_bodytemperature(-5, 280)
to_chat(L, "[src] is freezing!")
else if(current_temperature == SHOWER_BOILING)
if(iscarbon(L))
- C.adjust_bodytemperature(35, 0, 500)
+ C.adjust_bodytemperature(5, 0, 350)
L.adjustFireLoss(5)
to_chat(L, "[src] is searing!")
diff --git a/code/game/objects/structures/signs/signs_flags.dm b/code/game/objects/structures/signs/signs_flags.dm
index 415bce3bf6f52..48eb38cafa32e 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/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 68c99d6649a5d..4d9b3b783cef6 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -62,11 +62,6 @@
desc = "This is a grand statue of a Nuclear Explosive. It has a sickening green colour."
icon_state = "nuke"
-/obj/structure/statue/uranium/eng
- name = "Statue of an engineer"
- desc = "This statue has a sickening green colour."
- icon_state = "eng"
-
/obj/structure/statue/uranium/attackby(obj/item/W, mob/user, params)
radiate()
return ..()
@@ -93,168 +88,6 @@
return
return
-////////////////////////////plasma///////////////////////////////////////////////////////////////////////
-
-/obj/structure/statue/plasma
- max_integrity = 200
- material_drop_type = /obj/item/stack/sheet/mineral/plasma
- impressiveness = 20
- desc = "This statue is suitably made from plasma."
-
-/obj/structure/statue/plasma/scientist
- name = "statue of a scientist"
- icon_state = "sci"
-
-/obj/structure/statue/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
- if(exposed_temperature > 300)
- PlasmaBurn(exposed_temperature)
-
-
-/obj/structure/statue/plasma/bullet_act(obj/projectile/Proj)
- var/burn = FALSE
- if(!(Proj.nodamage) && Proj.damage_type == BURN && !QDELETED(src))
- burn = TRUE
- if(burn)
- var/turf/T = get_turf(src)
- if(Proj.firer)
- message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(Proj.firer)] in [ADMIN_VERBOSEJMP(T)]")
- log_game("Plasma statue ignited by [key_name(Proj.firer)] in [AREACOORD(T)]")
- else
- message_admins("Plasma statue ignited by [Proj]. No known firer, in [ADMIN_VERBOSEJMP(T)]")
- log_game("Plasma statue ignited by [Proj] in [AREACOORD(T)]. No known firer.")
- PlasmaBurn(2500)
- . = ..()
-
-/obj/structure/statue/plasma/attackby(obj/item/W, mob/user, params)
- if(W.get_temperature() > 300 && !QDELETED(src))//If the temperature of the object is over 300, then ignite
- var/turf/T = get_turf(src)
- message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
- log_game("Plasma statue ignited by [key_name(user)] in [AREACOORD(T)]")
- ignite(W.get_temperature())
- else
- return ..()
-
-/obj/structure/statue/plasma/proc/PlasmaBurn(exposed_temperature)
- if(QDELETED(src))
- return
- atmos_spawn_air("plasma=[oreAmount*10];TEMP=[exposed_temperature]")
- deconstruct(FALSE)
-
-/obj/structure/statue/plasma/proc/ignite(exposed_temperature)
- if(exposed_temperature > 300)
- PlasmaBurn(exposed_temperature)
-
-//////////////////////gold///////////////////////////////////////
-
-/obj/structure/statue/gold
- max_integrity = 300
- material_drop_type = /obj/item/stack/sheet/mineral/gold
- impressiveness = 25
- desc = "This is a highly valuable statue made from gold."
-
-/obj/structure/statue/gold/hos
- name = "statue of the head of security"
- icon_state = "hos"
-
-/obj/structure/statue/gold/head_of_personnel
- name = "statue of the head of personnel"
- icon_state = "hop"
-
-/obj/structure/statue/gold/cmo
- name = "statue of the chief medical officer"
- icon_state = "cmo"
-
-/obj/structure/statue/gold/ce
- name = "statue of the chief engineer"
- icon_state = "ce"
-
-/obj/structure/statue/gold/rd
- name = "statue of the research director"
- icon_state = "rd"
-
-//////////////////////////silver///////////////////////////////////////
-
-/obj/structure/statue/silver
- max_integrity = 300
- material_drop_type = /obj/item/stack/sheet/mineral/silver
- impressiveness = 25
- desc = "This is a valuable statue made from silver."
-
-/obj/structure/statue/silver/md
- name = "statue of a medical officer"
- icon_state = "md"
-
-/obj/structure/statue/silver/janitor
- name = "statue of a janitor"
- icon_state = "jani"
-
-/obj/structure/statue/silver/sec
- name = "statue of a security officer"
- icon_state = "sec"
-
-/obj/structure/statue/silver/secborg
- name = "statue of a security cyborg"
- icon_state = "secborg"
-
-/obj/structure/statue/silver/medborg
- name = "statue of a medical cyborg"
- icon_state = "medborg"
-
-/////////////////////////diamond/////////////////////////////////////////
-
-/obj/structure/statue/diamond
- max_integrity = 1000
- material_drop_type = /obj/item/stack/sheet/mineral/diamond
- impressiveness = 50
- desc = "This is a very expensive diamond statue."
-
-/obj/structure/statue/diamond/captain
- name = "statue of THE captain."
- icon_state = "cap"
-
-/obj/structure/statue/diamond/ai1
- name = "statue of the AI hologram."
- icon_state = "ai1"
-
-/obj/structure/statue/diamond/ai2
- name = "statue of the AI core."
- icon_state = "ai2"
-
-////////////////////////bananium///////////////////////////////////////
-
-/obj/structure/statue/bananium
- max_integrity = 300
- material_drop_type = /obj/item/stack/sheet/mineral/hidden/hellstone
- impressiveness = 50
- desc = "A bananium statue with a small engraving:'HOOOOOOONK'."
- var/spam_flag = 0
-
-/obj/structure/statue/bananium/clown
- name = "statue of a clown"
- icon_state = "clown"
-
-/obj/structure/statue/bananium/Bumped(atom/movable/AM)
- honk()
- ..()
-
-/obj/structure/statue/bananium/attackby(obj/item/W, mob/user, params)
- honk()
- return ..()
-
-/obj/structure/statue/bananium/attack_hand(mob/user)
- honk()
- . = ..()
-
-/obj/structure/statue/bananium/attack_paw(mob/user)
- honk()
- ..()
-
-/obj/structure/statue/bananium/proc/honk()
- if(!spam_flag)
- spam_flag = TRUE
- playsound(src.loc, 'sound/items/bikehorn.ogg', 50, TRUE)
- addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), 2 SECONDS)
-
/////////////////////sandstone/////////////////////////////////////////
/obj/structure/statue/sandstone
@@ -262,12 +95,6 @@
material_drop_type = /obj/item/stack/sheet/mineral/sandstone
impressiveness = 15
-/obj/structure/statue/sandstone/assistant
- name = "statue of an assistant"
- desc = "A cheap statue of sandstone for a greyshirt."
- icon_state = "assist"
-
-
/obj/structure/statue/sandstone/venus //call me when we add marble i guess
name = "statue of a pure maiden"
desc = "An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a toolbox. By Jove, it's easily the most gorgeous depiction of a woman you've ever seen. The artist must truly be a master of his craft. Shame about the broken arm, though."
@@ -290,16 +117,6 @@
desc = "Looks like that weird kid with the tiger plushie has been round here again."
icon_state = "snowlegion"
-///////////////////////////////bronze///////////////////////////////////
-
-/obj/structure/statue/bronze
- material_drop_type = /obj/item/stack/tile/bronze
-
-/obj/structure/statue/bronze/marx
- name = "\improper Karl Marx bust"
- desc = "A bust depicting a certain 19th century economist. You get the feeling a specter is haunting the sector."
- icon_state = "marx"
-
/// bone
/obj/structure/statue/bone
anchored = TRUE
diff --git a/code/game/objects/structures/table_flipped.dm b/code/game/objects/structures/table_flipped.dm
index 28af5d0b63bd2..8caa87b984a2b 100644
--- a/code/game/objects/structures/table_flipped.dm
+++ b/code/game/objects/structures/table_flipped.dm
@@ -7,6 +7,7 @@
density = TRUE
layer = ABOVE_MOB_LAYER
opacity = FALSE
+ pass_flags_self = LETPASSTHROW
var/table_type = /obj/structure/table
/obj/structure/flippedtable/Initialize()
@@ -54,6 +55,8 @@
return
if(istype(exiter, /obj/projectile))
return
+ if(istype(exiter, /obj/item))
+ return
if(direction == table_dir)
exiter.Bump(src)
return COMPONENT_ATOM_BLOCK_EXIT
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index d5b1710b62966..6f1e59ebad5e9 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -681,15 +681,20 @@
step(O, get_dir(O, src))
/obj/structure/rack/attackby(obj/item/W, mob/user, params)
+ var/list/modifiers = params2list(params)
if (W.tool_behaviour == TOOL_WRENCH && !(flags_1&NODECONSTRUCT_1) && user.a_intent != INTENT_HELP)
W.play_tool_sound(src)
deconstruct(TRUE)
return
if(user.a_intent == INTENT_HARM)
return ..()
- if(user.transferItemToLoc(W, drop_location()))
- W.pixel_x = pick(9,0,-9)
- W.pixel_y = pick(10,1)
+ if(user.transferItemToLoc(W, drop_location(), silent = FALSE))
+ //Center the icon where the user clicked.
+ if(!LAZYACCESS(modifiers, ICON_X) || !LAZYACCESS(modifiers, ICON_Y))
+ return
+ //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
+ W.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size/2), world.icon_size/2)
+ W.pixel_y = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2)
return TRUE
/obj/structure/rack/attack_paw(mob/living/user)
@@ -701,9 +706,13 @@
return
if(user.body_position == LYING_DOWN || user.usable_legs < 2)
return
+
+ if(user.a_intent != INTENT_HARM)
+ to_chat(user, span_danger("You aren't HARMFUL enough to beat the rack."))
+ return
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
- user.visible_message("[user] kicks [src].", null, null, COMBAT_MESSAGE_RANGE)
+ user.visible_message(span_danger("[user] kicks [src]."), null, null, COMBAT_MESSAGE_RANGE)
take_damage(rand(4,8), BRUTE, "melee", 1)
/obj/structure/rack/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 4c6c3173cdedb..9649812f40f8b 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -116,7 +116,7 @@
/obj/structure/trap/chill/trap_effect(mob/living/L)
to_chat(L, "You're frozen solid!")
L.Paralyze(20)
- L.adjust_bodytemperature(-300)
+ L.adjust_bodytemperature(-20)
L.apply_status_effect(/datum/status_effect/freon)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 6db5f18e31b92..da3f85da379ef 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -214,7 +214,6 @@
exposed = !exposed
return TRUE
-
/obj/item/reagent_containers/food/snacks/urinalcake
name = "urinal cake"
desc = "The noble urinal cake, protecting the people's pipes from the people's pee. Edibility is suggested to be low."
@@ -478,6 +477,13 @@
/// if it can be seen through when closed
var/opaque_closed = FALSE
+/obj/structure/curtain/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,CALLBACK(src, PROC_REF(can_be_rotated)),null)
+
+/obj/structure/curtain/proc/can_be_rotated(mob/user, rotation_type)
+ return !anchored
+
/obj/structure/curtain/proc/toggle()
open = !open
if(open)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 5064883c5de91..308d5e120f715 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -27,7 +27,7 @@
var/real_explosion_block //ignore this, just use explosion_block
var/breaksound = "shatter"
var/hitsound = 'sound/effects/Glasshit.ogg'
- var/decon_time = 5 SECONDS
+ var/decon_time = 3 SECONDS
flags_ricochet = RICOCHET_HARD
ricochet_chance_mod = 0.4
@@ -409,7 +409,7 @@
glass_type = /obj/item/stack/sheet/rglass
rad_insulation = RAD_HEAVY_INSULATION
ricochet_chance_mod = 0.8
- decon_time = 20 SECONDS
+ decon_time = 6 SECONDS
//this is shitcode but all of construction is shitcode and needs a refactor, it works for now
//If you find this like 4 years later and construction still hasn't been refactored, I'm so sorry for this
@@ -542,7 +542,7 @@
damage_deflection = 11 //WS Edit - Weakens R-Windows
explosion_block = 2
glass_type = /obj/item/stack/sheet/plasmarglass
- decon_time = 25 SECONDS
+ decon_time = 15 SECONDS
//entirely copypasted code
//take this out when construction is made a component or otherwise modularized in some way
@@ -758,12 +758,21 @@
glass_type = /obj/item/stack/sheet/plastitaniumglass
glass_amount = 2
rad_insulation = RAD_HEAVY_INSULATION
- decon_time = 30 SECONDS
+ decon_time = 10 SECONDS
/obj/structure/window/plasma/reinforced/plastitanium/unanchored
anchored = FALSE
state = WINDOW_OUT_OF_FRAME
+/obj/structure/window/plasma/reinforced/plastitanium/spawnDebris(location)
+ . = list()
+ . += new /obj/item/shard/plastitanium(location)
+ . += new /obj/effect/decal/cleanable/glass/plastitanium(location)
+ if (reinf)
+ . += new /obj/item/stack/rods(location, (fulltile ? 2 : 1))
+ if (fulltile)
+ . += new /obj/item/shard/plastitanium(location)
+
/obj/structure/window/paperframe
name = "paper frame"
desc = "A fragile separator made of thin wood and paper."
diff --git a/code/game/say.dm b/code/game/say.dm
index cac8bafe53659..bfa9d35ac5bc7 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -9,14 +9,11 @@ GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_INTEQ]" = "irmgradio",
"[FREQ_PGF]" = "pgfradio",
"[FREQ_PIRATE]" = "pirradio",
- "[FREQ_COMMAND]" = "comradio",
- "[FREQ_AI_PRIVATE]" = "aiprivradio",
+ "[FREQ_EMERGENCY]" = "emrgradio",
"[FREQ_SYNDICATE]" = "syndradio",
"[FREQ_CENTCOM]" = "centcomradio",
- "[FREQ_SOLGOV]" = "solgovradio", //WS Edit - SolGov Rep
- "[FREQ_WIDEBAND]" = "widebandradio", //WS Edit - Overmaps
- "[FREQ_CTF_RED]" = "redteamradio",
- "[FREQ_CTF_BLUE]" = "blueteamradio"
+ "[FREQ_SOLGOV]" = "solgovradio",
+ "[FREQ_WIDEBAND]" = "widebandradio",
))
GLOBAL_LIST_INIT(freqcolor, list())
diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm
index 5c3b554c98dd8..9d186868cf544 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/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index 3970cc403d73b..1d60204908404 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -113,7 +113,8 @@
visible_message(span_warning("The ore was completely ruined!"))
else
new mineralType(src, mineralAmt)
- SSblackbox.record_feedback("tally", "ore_mined", mineralAmt, mineralType)
+ if(ishuman(user))
+ SSblackbox.record_feedback("tally", "ore_mined", mineralAmt, mineralType)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(give_exp)
@@ -133,9 +134,13 @@
/turf/closed/mineral/attack_animal(mob/living/simple_animal/user)
- if((user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS) || (user.environment_smash & ENVIRONMENT_SMASH_MINERALS))
- gets_drilled(user)
- ..()
+ if((!(user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS) || (user.environment_smash & ENVIRONMENT_SMASH_MINERALS)))
+ return ..()
+
+ //This scrapes us away and turns us into a floor, so don't call parent.
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ gets_drilled(user)
/turf/closed/mineral/attack_alien(mob/living/carbon/alien/M)
balloon_alert(M, "digging...")
@@ -167,7 +172,6 @@
ScrapeAway()
/turf/closed/mineral/ex_act(severity, target)
- ..()
switch(severity)
if(3)
if (prob(75))
@@ -177,7 +181,7 @@
gets_drilled(null, FALSE)
if(1)
gets_drilled(null, FALSE)
- return
+ return ..()
/turf/closed/mineral/random
var/list/mineralSpawnChanceList = list(/obj/item/stack/ore/uranium = 3, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 4,
@@ -197,7 +201,7 @@
. = ..()
if (prob(mineralChance))
- var/path = pickweight(mineralSpawnChanceList)
+ var/path = pick_weight(mineralSpawnChanceList)
if(ispath(path, /turf))
var/turf/T = ChangeTurf(path,null,CHANGETURF_IGNORE_AIR)
@@ -673,7 +677,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -683,7 +687,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -693,7 +697,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -703,7 +707,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -713,7 +717,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -723,7 +727,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -739,7 +743,7 @@
mineralSpawnChanceList = list(/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 3, /obj/item/stack/ore/gold = 10,
/obj/item/stack/ore/silver = 10, /obj/item/stack/ore/plasma = 15, /obj/item/stack/ore/iron = 45, /obj/item/stack/ore/titanium = 11,
/turf/closed/mineral/gibtonite/whitesands = 4, /turf/open/floor/plating/asteroid/whitesands = 2, /obj/item/stack/ore/bluespace_crystal = 4)
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -750,7 +754,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -760,7 +764,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
@@ -770,7 +774,7 @@
environment_type = WHITESANDS_WALL_ENV
turf_type = /turf/open/floor/plating/asteroid/whitesands
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
defer_change = TRUE
has_borders = TRUE
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 44acbe06f6bf6..e2c6caa8be7ed 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -155,7 +155,7 @@
baseturfs = /turf/open/indestructible/airblock
/turf/open/Initalize_Atmos(times_fired)
- if(!istype(air,/datum/gas_mixture/turf))
+ if(!istype(air, /datum/gas_mixture))
air = new(2500, src)
air.copy_from_turf(src)
update_air_ref(planetary_atmos ? AIR_REF_PLANETARY_TURF : AIR_REF_OPEN_TURF)
@@ -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/acid.dm b/code/game/turfs/open/acid.dm
index 86260871c522d..c9f5472fa4fb6 100644
--- a/code/game/turfs/open/acid.dm
+++ b/code/game/turfs/open/acid.dm
@@ -145,4 +145,4 @@
/turf/open/water/acid/whitesands
planetary_atmos = TRUE
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
diff --git a/code/game/turfs/open/dirtystation.dm b/code/game/turfs/open/dirtystation.dm
index 29e13585bb7d5..5daba45f1b1e5 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.dm b/code/game/turfs/open/floor.dm
index 23fdfcc6d9981..7b1603df119d3 100644
--- a/code/game/turfs/open/floor.dm
+++ b/code/game/turfs/open/floor.dm
@@ -62,7 +62,7 @@
if(1)
ScrapeAway(2, flags = CHANGETURF_INHERIT_AIR)
if(2)
- if(prob(60))
+ if(prob(50) && broken)
ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
else
break_tile()
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index 3a0184849450a..2d043371a9bb3 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 98ad4658add09..1b5009d8245b3 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -126,20 +126,6 @@
/turf/open/floor/noslip/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
return
-/turf/open/floor/bluespace
- slowdown = -1
- icon_state = "bluespace"
- desc = "Through a series of micro-teleports these tiles let people move at incredible speeds."
- floor_tile = /obj/item/stack/tile/bluespace
-
-
-/turf/open/floor/sepia
- slowdown = 2
- icon_state = "sepia"
- desc = "Time seems to flow very slowly around these tiles."
- floor_tile = /obj/item/stack/tile/sepia
-
-
/turf/open/floor/bronze
name = "bronze floor"
desc = "Some heavy bronze tiles."
@@ -185,6 +171,8 @@
base_icon_state = "tcomms"
icon = 'icons/turf/floors/misc.dmi'
color = null
+/turf/open/floor/plasteel/telecomms_floor/tatmos
+ initial_gas_mix = TCOMMS_ATMOS
//ship turfs
/turf/open/floor/ship
@@ -225,6 +213,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/plasteel_floor.dm b/code/game/turfs/open/floor/plasteel_floor.dm
index 1feb9d0921e0c..e77e07e71d3ab 100644
--- a/code/game/turfs/open/floor/plasteel_floor.dm
+++ b/code/game/turfs/open/floor/plasteel_floor.dm
@@ -59,6 +59,9 @@
base_icon_state = "techfloor"
floor_tile = /obj/item/stack/tile/plasteel/tech
+/turf/open/floor/plasteel/tech/tcomms
+ initial_gas_mix = TCOMMS_ATMOS
+
/turf/open/floor/plasteel/tech/airless
initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/floor/plating/asteroid.dm b/code/game/turfs/open/floor/plating/asteroid.dm
index 996d122a4ac9b..12fe214deb832 100644
--- a/code/game/turfs/open/floor/plating/asteroid.dm
+++ b/code/game/turfs/open/floor/plating/asteroid.dm
@@ -27,6 +27,7 @@
/// Whether the turf has been dug or not
var/dug
+
/turf/open/floor/plating/asteroid/Initialize(mapload, inherited_virtual_z)
var/proper_name = name
. = ..()
diff --git a/code/game/turfs/open/floor/plating/beach.dm b/code/game/turfs/open/floor/plating/beach.dm
index 88bb3bbcad1ba..9b4aa8cf156fb 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 = BEACHPLANET_DEFAULT_ATMOS //custom atmos? lots of oxygen, hot?
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 ca1819af25314..9b054f8d15070 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
@@ -223,3 +221,88 @@
/turf/open/floor/plating/asteroid/snow/ice/burn_tile()
return FALSE
+/turf/open/floor/wood/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ slowdown = 0
+
+/turf/open/floor/wood/ebony/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ slowdown = 0
+
+/turf/open/floor/plasteel/stairs/wood/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ slowdown = 0
+
+//concrete
+
+/turf/open/floor/concrete/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/icemoon/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/concrete/slab_1/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/slab_1/icemoon/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/concrete/slab_2/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/slab_2/icemoon/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/concrete/slab_3/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/slab_3/icemoon/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/concrete/slab_4/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/slab_4/icemoon/lit
+ light_range = 2
+ light_power = 1
+
+/turf/open/floor/concrete/pavement/icemoon
+ baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+ light_color = COLOR_ICEPLANET_LIGHT
+ slowdown = 0
+
+/turf/open/floor/concrete/pavement/icemoon/lit
+ light_range = 2
+ light_power = 1
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 0000000000000..19139d782c0ef
--- /dev/null
+++ b/code/game/turfs/open/floor/plating/jungle.dm
@@ -0,0 +1,64 @@
+/turf/open/floor/plating/dirt/jungle
+ slowdown = 0.5
+ baseturfs = /turf/open/floor/plating/dirt/jungle
+ initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
+ light_color = COLOR_JUNGLEPLANET_LIGHT
+
+/turf/open/floor/plating/dirt/jungle/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/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
+ initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/plating/grass/jungle/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/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 84e0173819b71..b15f76eabcc23 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 84a49d1a00388..684420c8eb89b 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 a86847ca8f783..5609547928c6c 100644
--- a/code/game/turfs/open/floor/plating/planet.dm
+++ b/code/game/turfs/open/floor/plating/planet.dm
@@ -16,74 +16,16 @@
/turf/open/floor/plating/dirt/dark
icon_state = "greenerdirt"
baseturfs = /turf/open/floor/plating/dirt/dark
+ initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
/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 +40,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 b6324ebbb3d80..7e52dc85aafd8 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,145 @@
/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"
+///plating
+
/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/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_ROCKPLANET_LIGHT
+
+
+///floor tiles
/turf/open/floor/plasteel/stairs/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
name = "exterior stairs"
-/turf/open/floor/engine/hull/rockplanet
- initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+/turf/open/floor/plasteel/stairs/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/plasteel/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
name = "exterior floor"
+/turf/open/floor/plasteel/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
/turf/open/floor/plasteel/patterned/rockplanet
+ name = "exterior floor"
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
/turf/open/floor/plasteel/patterned/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
- name = "exterior floor"
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/plasteel/patterned/brushed/rockplanet
+ name = "exterior floor"
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
/turf/open/floor/plasteel/patterned/brushed/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
- name = "exterior floor"
+ light_color = COLOR_ROCKPLANET_LIGHT
/turf/open/floor/plasteel/patterned/ridged/rockplanet
+ name = "exterior floor"
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
/turf/open/floor/plasteel/patterned/ridged/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
- name = "exterior floor"
+ light_color = COLOR_ROCKPLANET_LIGHT
-/turf/open/floor/plating/rust/rockplanet
+/turf/open/floor/wood/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
-/turf/open/floor/plating/rust/rockplanet/lit
+/turf/open/floor/pod/rockplanet
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+///reinforced floors
+
+/turf/open/floor/engine/hull/rockplanet
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/engine/hull/rockplanet/lit
light_range = 2
light_power = 0.6
- light_color = COLOR_VERY_LIGHT_GRAY
- name = "exterior plating"
+ light_color = COLOR_ROCKPLANET_LIGHT
-/turf/open/floor/wood/rockplanet
+/turf/open/floor/engine/hull/reinforced/rockplanet
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
-/turf/open/floor/pod/rockplanet
+/turf/open/floor/engine/hull/reinforced/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+/// concrete
+
+/turf/open/floor/concrete/rockplanet
+ planetary_atmos = TRUE
initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
-/turf/open/floor/engine/hull/reinforced/rockplanet
+/turf/open/floor/concrete/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ light_color = COLOR_ROCKPLANET_LIGHT
+
+///titanium
+
+/turf/open/floor/mineral/titanium/tiled/rockplanet
+ planetary_atmos = TRUE
+ initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/mineral/titanium/tiled/rockplanet/lit
+ light_range = 2
+ light_power = 0.6
+ 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 7d839b66932d5..dd79a190583f1 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
-/turf/open/floor/plating/wasteplanet
- baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
- initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+///plating turfs
-/turf/open/floor/plating/rust/wasteplanet
+/turf/open/floor/plating/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
@@ -32,49 +31,137 @@
desc = "Corrupted steel."
icon_state = "plating_rust"
-/turf/open/floor/wood/waste
+/turf/open/indestructible/hierophant/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
-/turf/open/indestructible/hierophant/waste
+/turf/open/indestructible/hierophant/two/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
+ light_color = COLOR_WASTEPLANET_LIGHT
-/turf/open/indestructible/hierophant/two/waste
+/turf/open/floor/wood/waste
initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
- light_color = LIGHT_COLOR_FLARE
-/turf/open/water/waste
+/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
-/turf/open/floor/plating/grass/wasteplanet
- icon_state = "junglegrass"
+/turf/open/floor/concrete/wasteplanet/Initialize()
+ . = ..()
+ icon_state = pick(list(
+ "conc_smooth",
+ "conc_slab_1",
+ "conc_slab_2",
+ "conc_slab_3",
+ "conc_slab_4",
+ "conc_tiles"
+ ))
+
+/turf/open/floor/concrete/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/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
-/turf/open/floor/plating/dirt/old/waste
+/turf/open/floor/concrete/reinforced/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ return
+
+/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
+
+/turf/open/floor/concrete/pavement/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+ 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()
. = ..()
@@ -94,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
@@ -102,77 +190,147 @@
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/water/waste/lit //do not drink
+/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/plating/dirt/old/waste/lit
+/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/plating/grass/wasteplanet/lit
+/turf/open/floor/concrete/pavement/wasteplanet/lit
light_range = 2
light_power = 0.2
- light_color = LIGHT_COLOR_FLARE
+ light_color = COLOR_WASTEPLANET_LIGHT
-/turf/open/floor/concrete/wasteplanet/lit
+/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/concrete/reinforced/wasteplanet/lit
+/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/floor/concrete/pavement/wasteplanet/lit
+/turf/open/water/waste/lit //do not drink
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
+ max_integrity = 800
+ integrity = 800
baseturfs = /turf/open/floor/plating/wasteplanet
+ girder_type = /obj/structure/girder/wasteworld
+
+/turf/closed/wall/r_wall/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(200,400))
+
/turf/closed/wall/r_wall/rust/wasteplanet
+ max_integrity = 600
+ integrity = 600
baseturfs = /turf/open/floor/plating/wasteplanet/rust
+ girder_type = /obj/structure/girder/wasteworld
+
+/turf/closed/wall/r_wall/rust/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(0,400))
/turf/closed/wall/wasteplanet
+ max_integrity = 200
+ integrity = 200
baseturfs = /turf/open/floor/plating/wasteplanet
+ girder_type = /obj/structure/girder/wasteworld
+
+/turf/closed/wall/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(0,150))
/turf/closed/wall/rust/wasteplanet
+ max_integrity = 100
+ integrity = 100
baseturfs = /turf/open/floor/plating/wasteplanet/rust
+ girder_type = /obj/structure/girder/wasteworld
+
+/turf/closed/wall/rust/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(0,100))
/turf/closed/wall/concrete/wasteplanet
+ max_integrity = 200
+ integrity = 200
baseturfs = /turf/open/floor/concrete/wasteplanet
+/turf/closed/wall/concrete/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(0,100))
+
/turf/closed/wall/concrete/reinforced/wasteplanet
+ max_integrity = 700
+ integrity = 700
baseturfs = /turf/open/floor/concrete/wasteplanet
+
+/turf/closed/wall/concrete/reinforced/wasteplanet/Initialize(mapload, inherited_virtual_z)
+ . = ..()
+ if(prob(25))
+ alter_integrity(-rand(0,500))
+
+//girlder
+
+/obj/structure/girder/wasteworld
+ max_integrity = 40
diff --git a/code/game/turfs/open/floor/plating/whitesands.dm b/code/game/turfs/open/floor/plating/whitesands.dm
index 6d7d0e3343f97..40094890c53ca 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 = SANDPLANET_DEFAULT_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,24 +31,25 @@
/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
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried
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."
@@ -55,11 +58,12 @@
base_icon_state = "grass"
baseturfs = /turf/open/floor/plating/asteroid/whitesands
turf_type = /turf/open/floor/plating/asteroid/whitesands/grass
- initial_gas_mix = WHITESANDS_ATMOS
+ initial_gas_mix = SANDPLANET_DEFAULT_ATMOS
planetary_atmos = TRUE
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 = SANDPLANET_DEFAULT_ATMOS
+
+/turf/open/floor/concrete/whitesands
+ initial_gas_mix = SANDPLANET_DEFAULT_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 = SANDPLANET_DEFAULT_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 = SANDPLANET_DEFAULT_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 = SANDPLANET_DEFAULT_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 = SANDPLANET_DEFAULT_ATMOS
+ light_color = COLOR_SANDPLANET_LIGHT
+
+/turf/open/floor/plating/whitesands/lit
+ light_range = 2
+ light_power = 0.6
diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm
index 90fd6610721cf..159a32a2ccce1 100644
--- a/code/game/turfs/open/lava.dm
+++ b/code/game/turfs/open/lava.dm
@@ -169,7 +169,7 @@
else if (isliving(thing))
. = 1
var/mob/living/L = thing
- if(L.movement_type & FLYING)
+ if(L.movement_type & FLYING || L.throwing)
continue //YOU'RE FLYING OVER IT
var/buckle_check = L.buckling
if(!buckle_check)
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index f94db41d47137..5a78c24dc1fe4 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -70,6 +70,7 @@
light_range = 2
light_power = 0.6
light_color = COLOR_VERY_LIGHT_GRAY
+ initial_gas_mix = JUNGLEPLANET_DEFAULT_ATMOS
/turf/open/water/jungle/Initialize(mapload)
. = ..()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index e5cc9709559c0..4da6e25703bb8 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -378,7 +378,7 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists)
/turf/open/Entered(atom/movable/AM)
. =..()
//melting
- if(isobj(AM) && air && air.return_temperature() > T0C)
+ if(isobj(AM) && air?.return_temperature() > T0C)
var/obj/O = AM
if(O.obj_flags & FROZEN)
O.make_unfrozen()
@@ -582,8 +582,8 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists)
/turf/proc/acid_melt()
return
-/turf/handle_fall(mob/faller)
- if(has_gravity(src))
+/turf/handle_fall(mob/faller, fall_sound_played)
+ if(has_gravity(src) && !fall_sound_played)
playsound(src, "bodyfall", 50, TRUE)
faller.drop_all_held_items()
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b62a7830cc0d7..a438fa57a0662 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -195,6 +195,7 @@
body += "Thunderdome 2"
body += "Thunderdome Admin"
body += "Thunderdome Observer"
+ body += "Commend Behavior | "
body += " "
body += ""
diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm
index 0fbae3fe55d26..8e99b47573ac4 100644
--- a/code/modules/admin/callproc/callproc.dm
+++ b/code/modules/admin/callproc/callproc.dm
@@ -90,6 +90,12 @@ GLOBAL_PROTECT(LastAdminCalledProc)
to_chat(usr, "Calling Del() is not allowed", confidential = TRUE)
return
+ if(findtextEx(trim(lowertext(procname)), "rustg"))
+ var/message = "[key_name(usr)] attempted to call [procname] with arguments: [english_list(arguments)]. Rustg calls are not allowed."
+ log_admin_private(message)
+ message_admins(message)
+ return
+
if(target != GLOBAL_PROC && !target.CanProcCall(procname))
to_chat(usr, "Proccall on [target.type]/proc/[procname] is disallowed!", confidential = TRUE)
return
diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm
index 5e354e0f65506..0046d353dc5ca 100644
--- a/code/modules/admin/permissionedit.dm
+++ b/code/modules/admin/permissionedit.dm
@@ -214,7 +214,7 @@
. = ckey(admin_key)
if(!.)
return FALSE
- if(!admin_ckey && (. in GLOB.admin_datums+GLOB.deadmins))
+ if(!admin_ckey && (. in (GLOB.admin_datums+GLOB.deadmins)))
to_chat(usr, "[admin_key] is already an admin.", confidential = TRUE)
return FALSE
if(use_db)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 5123eed0be584..9b757bae25fca 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2166,6 +2166,19 @@
var/datum/poll_question/poll = locate(href_list["submitoptionpoll"]) in GLOB.polls
poll_option_parse_href(href_list, poll, option)
+ else if(href_list["admincommend"])
+ var/mob/heart_recepient = locate(href_list["admincommend"])
+ if(!heart_recepient?.ckey)
+ to_chat(usr, "This mob either no longer exists or no longer is being controlled by someone!")
+ return
+ switch(tgui_alert(usr, "Would you like the effects to apply immediately or at the end of the round? Applying them now will make it clear it was an admin commendation.", "<3?", list("Apply now", "Apply at round end", "Cancel")))
+ if("Apply now")
+ heart_recepient.receive_heart(usr, instant = TRUE)
+ if("Apply at round end")
+ heart_recepient.receive_heart(usr)
+ else
+ return
+
else if (href_list["interview"])
if(!check_rights(R_ADMIN))
return
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 5ac4714257ef0..9f77926284247 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -883,3 +883,34 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
return_list[ASAY_LINK_NEW_MESSAGE_INDEX] = jointext(msglist, " ") // without tuples, we must make do!
return_list[ASAY_LINK_PINGED_ADMINS_INDEX] = pinged_admins
return return_list
+
+/proc/get_mob_by_name(msg)
+ //This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
+ var/list/ignored_words = list("unknown","the","a","an","of","monkey","alien","as", "i")
+
+ //explode the input msg into a list
+ var/list/msglist = splittext(msg, " ")
+
+ //who might fit the shoe
+ var/list/potential_hits = list()
+
+ for(var/i in GLOB.mob_list)
+ var/mob/M = i
+ var/list/nameWords = list()
+ if(!M.mind)
+ continue
+
+ for(var/string in splittext(lowertext(M.real_name), " "))
+ if(!(string in ignored_words))
+ nameWords += string
+ for(var/string in splittext(lowertext(M.name), " "))
+ if(!(string in ignored_words))
+ nameWords += string
+
+ for(var/string in nameWords)
+ testing("Name word [string]")
+ if(string in msglist)
+ potential_hits += M
+ break
+
+ return potential_hits
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 2c269ce1ee9ab..61d8b27578361 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -614,6 +614,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
dellog += "
"
var/item
var/name_part = VV_HTML_ENCODE(name)
- if(level > 0 || islist(D)) //handling keys in assoc lists
+ if(level > 0 || islist(owner)) //handling keys in assoc lists
if(istype(name,/datum))
name_part = "[VV_HTML_ENCODE(name)] [REF(name)]"
else if(islist(name))
diff --git a/code/modules/admin/view_variables/reference_tracking.dm b/code/modules/admin/view_variables/reference_tracking.dm
index a9a84986416dc..b9fd0e6d2ad61 100644
--- a/code/modules/admin/view_variables/reference_tracking.dm
+++ b/code/modules/admin/view_variables/reference_tracking.dm
@@ -1,36 +1,29 @@
#ifdef REFERENCE_TRACKING
+#define REFSEARCH_RECURSE_LIMIT 64
-/datum/proc/find_references(skip_alert)
- running_find_references = type
+/datum/proc/find_references(references_to_clear = INFINITY)
if(usr?.client)
- if(usr.client.running_find_references)
- log_reftracker("CANCELLED search for references to a [usr.client.running_find_references].")
- usr.client.running_find_references = null
- running_find_references = null
- //restart the garbage collector
- SSgarbage.can_fire = TRUE
- SSgarbage.next_fire = world.time + world.tick_lag
+ if(tgui_alert(usr,"Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", list("Yes", "No")) != "Yes")
return
- #ifndef FIND_REF_NO_CHECK_TICK
- if(!skip_alert && alert("Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", "Yes", "No") != "Yes")
- running_find_references = null
- return
- #endif
-
+ src.references_to_clear = references_to_clear
//this keeps the garbage collector from failing to collect objects being searched for in here
SSgarbage.can_fire = FALSE
- if(usr?.client)
- usr.client.running_find_references = type
+ _search_references()
+ //restart the garbage collector
+ SSgarbage.can_fire = TRUE
+ SSgarbage.update_nextfire(reset_time = TRUE)
- log_reftracker("Beginning search for references to a [type].")
+/datum/proc/_search_references()
+ log_reftracker("Beginning search for references to a [type], looking for [references_to_clear] refs.")
var/starting_time = world.time
-
//Time to search the whole game for our ref
- DoSearchVar(GLOB, "GLOB", search_time = starting_time) //globals
+ DoSearchVar(GLOB, "GLOB", starting_time) //globals
log_reftracker("Finished searching globals")
+ if(src.references_to_clear == 0)
+ return
//Yes we do actually need to do this. The searcher refuses to read weird lists
//And global.vars is a really weird list
@@ -38,45 +31,46 @@
for(var/key in global.vars)
global_vars[key] = global.vars[key]
- DoSearchVar(global_vars, "Native Global", search_time = starting_time)
+ DoSearchVar(global_vars, "Native Global", starting_time)
log_reftracker("Finished searching native globals")
+ if(src.references_to_clear == 0)
+ return
for(var/datum/thing in world) //atoms (don't beleive its lies)
- DoSearchVar(thing, "World -> [thing.type]", search_time = starting_time)
+ DoSearchVar(thing, "World -> [thing.type]", starting_time)
+ if(src.references_to_clear == 0)
+ break
log_reftracker("Finished searching atoms")
+ if(src.references_to_clear == 0)
+ return
for(var/datum/thing) //datums
- DoSearchVar(thing, "Datums -> [thing.type]", search_time = starting_time)
+ DoSearchVar(thing, "Datums -> [thing.type]", starting_time)
+ if(src.references_to_clear == 0)
+ break
log_reftracker("Finished searching datums")
+ if(src.references_to_clear == 0)
+ return
-#ifndef REFERENCE_DOING_IT_LIVE
//Warning, attempting to search clients like this will cause crashes if done on live. Watch yourself
+#ifndef REFERENCE_DOING_IT_LIVE
for(var/client/thing) //clients
- DoSearchVar(thing, "Clients -> [thing.type]", search_time = starting_time)
+ DoSearchVar(thing, "Clients -> [thing.type]", starting_time)
+ if(src.references_to_clear == 0)
+ break
log_reftracker("Finished searching clients")
-
- log_reftracker("Completed search for references to a [type].")
+ if(src.references_to_clear == 0)
+ return
#endif
- if(usr?.client)
- usr.client.running_find_references = null
- running_find_references = null
-
- //restart the garbage collector
- SSgarbage.can_fire = TRUE
- SSgarbage.next_fire = world.time + world.tick_lag
-
-/datum/proc/DoSearchVar(potential_container, container_name, recursive_limit = 64, search_time = world.time)
- #ifdef REFERENCE_TRACKING_DEBUG
- if(SSgarbage.should_save_refs && !found_refs)
- found_refs = list()
- #endif
+ log_reftracker("Completed search for references to a [type].")
- if(usr?.client && !usr.client.running_find_references)
+/datum/proc/DoSearchVar(potential_container, container_name, search_time, recursion_count, is_special_list)
+ if(recursion_count >= REFSEARCH_RECURSE_LIMIT)
+ log_reftracker("Recursion limit reached. [container_name]")
return
- if(!recursive_limit)
- log_reftracker("Recursion limit reached. [container_name]")
+ if(references_to_clear == 0)
return
//Check each time you go down a layer. This makes it a bit slow, but it won't effect the rest of the game at all
@@ -84,7 +78,7 @@
CHECK_TICK
#endif
- if(istype(potential_container, /datum))
+ if(isdatum(potential_container))
var/datum/datum_container = potential_container
if(datum_container.last_find_references == search_time)
return
@@ -92,68 +86,122 @@
datum_container.last_find_references = search_time
var/list/vars_list = datum_container.vars
+ var/is_atom = FALSE
+ var/is_area = FALSE
+ if(isatom(datum_container))
+ is_atom = TRUE
+ if(isarea(datum_container))
+ is_area = TRUE
for(var/varname in vars_list)
- #ifndef FIND_REF_NO_CHECK_TICK
- CHECK_TICK
- #endif
- if (varname == "vars" || varname == "vis_locs") //Fun fact, vis_locs don't count for references
- continue
var/variable = vars_list[varname]
-
- if(variable == src)
+ if(islist(variable))
+ //Fun fact, vis_locs don't count for references
+ if(varname == "vars" || (is_atom && (varname == "vis_locs" || varname == "overlays" || varname == "underlays" || varname == "filters" || varname == "verbs" || (is_area && varname == "contents"))))
+ continue
+ // We do this after the varname check to avoid area contents (reading it incures a world loop's worth of cost)
+ if(!length(variable))
+ continue
+ DoSearchVar(variable,\
+ "[container_name] [datum_container.ref_search_details()] -> [varname] (list)",\
+ search_time,\
+ recursion_count + 1,\
+ /*is_special_list = */ is_atom && (varname == "contents" || varname == "vis_contents" || varname == "locs"))
+ else if(variable == src)
#ifdef REFERENCE_TRACKING_DEBUG
if(SSgarbage.should_save_refs)
+ if(!found_refs)
+ found_refs = list()
found_refs[varname] = TRUE
continue //End early, don't want these logging
+ else
+ log_reftracker("Found [type] [text_ref(src)] in [datum_container.type]'s [datum_container.ref_search_details()] [varname] var. [container_name]")
+ #else
+ log_reftracker("Found [type] [text_ref(src)] in [datum_container.type]'s [datum_container.ref_search_details()] [varname] var. [container_name]")
#endif
- log_reftracker("Found [type] [text_ref(src)] in [datum_container.type]'s [text_ref(datum_container)] [varname] var. [container_name]")
+ references_to_clear -= 1
+ if(references_to_clear == 0)
+ log_reftracker("All references to [type] [text_ref(src)] found, exiting.")
+ return
continue
- if(islist(variable))
- DoSearchVar(variable, "[container_name] [text_ref(datum_container)] -> [varname] (list)", recursive_limit - 1, search_time)
-
else if(islist(potential_container))
- var/normal = IS_NORMAL_LIST(potential_container)
var/list/potential_cache = potential_container
for(var/element_in_list in potential_cache)
- #ifndef FIND_REF_NO_CHECK_TICK
- CHECK_TICK
- #endif
+ //Check normal sublists
+ if(islist(element_in_list))
+ if(length(element_in_list))
+ DoSearchVar(element_in_list, "[container_name] -> [element_in_list] (list)", search_time, recursion_count + 1)
//Check normal entrys
- if(element_in_list == src)
+ else if(element_in_list == src)
#ifdef REFERENCE_TRACKING_DEBUG
if(SSgarbage.should_save_refs)
+ if(!found_refs)
+ found_refs = list()
found_refs[potential_cache] = TRUE
- continue //End early, don't want these logging
- #endif
+ continue
+ else
+ log_reftracker("Found [type] [text_ref(src)] in list [container_name].")
+ #else
log_reftracker("Found [type] [text_ref(src)] in list [container_name].")
- continue
-
- var/assoc_val = null
- if(!isnum(element_in_list) && normal)
- assoc_val = potential_cache[element_in_list]
- //Check assoc entrys
- if(assoc_val == src)
- #ifdef REFERENCE_TRACKING_DEBUG
- if(SSgarbage.should_save_refs)
- found_refs[potential_cache] = TRUE
- continue //End early, don't want these logging
#endif
- log_reftracker("Found [type] [text_ref(src)] in list [container_name]\[[element_in_list]\]")
- continue
- //We need to run both of these checks, since our object could be hiding in either of them
- //Check normal sublists
- if(islist(element_in_list))
- DoSearchVar(element_in_list, "[container_name] -> [element_in_list] (list)", recursive_limit - 1, search_time)
- //Check assoc sublists
- if(islist(assoc_val))
- DoSearchVar(potential_container[element_in_list], "[container_name]\[[element_in_list]\] -> [assoc_val] (list)", recursive_limit - 1, search_time)
-/proc/qdel_and_find_ref_if_fail(datum/thing_to_del, force = FALSE)
- thing_to_del.qdel_and_find_ref_if_fail(force)
+ // This is dumb as hell I'm sorry
+ // I don't want the garbage subsystem to count as a ref for the purposes of this number
+ // If we find all other refs before it I want to early exit, and if we don't I want to keep searching past it
+ var/ignore_ref = FALSE
+ var/list/queues = SSgarbage.queues
+ for(var/list/queue in queues)
+ if(potential_cache in queue)
+ ignore_ref = TRUE
+ break
+ if(ignore_ref)
+ log_reftracker("[container_name] does not count as a ref for our count")
+ else
+ references_to_clear -= 1
+ if(references_to_clear == 0)
+ log_reftracker("All references to [type] [text_ref(src)] found, exiting.")
+ return
+
+ if(!isnum(element_in_list) && !is_special_list)
+ // This exists to catch an error that throws when we access a special list
+ // is_special_list is a hint, it can be wrong
+ try
+ var/assoc_val = potential_cache[element_in_list]
+ //Check assoc sublists
+ if(islist(assoc_val))
+ if(length(assoc_val))
+ DoSearchVar(potential_container[element_in_list], "[container_name]\[[element_in_list]\] -> [assoc_val] (list)", search_time, recursion_count + 1)
+ //Check assoc entry
+ else if(assoc_val == src)
+ #ifdef REFERENCE_TRACKING_DEBUG
+ if(SSgarbage.should_save_refs)
+ if(!found_refs)
+ found_refs = list()
+ found_refs[potential_cache] = TRUE
+ continue
+ else
+ log_reftracker("Found [type] [text_ref(src)] in list [container_name]\[[element_in_list]\]")
+ #else
+ log_reftracker("Found [type] [text_ref(src)] in list [container_name]\[[element_in_list]\]")
+ #endif
+ references_to_clear -= 1
+ if(references_to_clear == 0)
+ log_reftracker("All references to [type] [text_ref(src)] found, exiting.")
+ return
+ catch
+ // So if it goes wrong we kill it
+ is_special_list = TRUE
+ log_reftracker("Curiosity: [container_name] lead to an error when acessing [element_in_list], what is it?")
+
+#undef REFSEARCH_RECURSE_LIMIT
+#endif
-/datum/proc/qdel_and_find_ref_if_fail(force = FALSE)
- SSgarbage.reference_find_on_fail[text_ref(src)] = TRUE
- qdel(src, force)
+// Kept outside the ifdef so overrides are easy to implement
-#endif
+/// Return info about us for reference searching purposes
+/// Will be logged as a representation of this datum if it's a part of a search chain
+/datum/proc/ref_search_details()
+ return text_ref(src)
+
+/datum/callback/ref_search_details()
+ return "[text_ref(src)] (obj: [object] proc: [delegate] args: [json_encode(arguments)] user: [user?.resolve() || "null"])"
diff --git a/code/modules/antagonists/_common/antag_team.dm b/code/modules/antagonists/_common/antag_team.dm
index 4a910ca4d4419..0fcfb0109397b 100644
--- a/code/modules/antagonists/_common/antag_team.dm
+++ b/code/modules/antagonists/_common/antag_team.dm
@@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(antagonist_teams)
else
add_member(starting_members)
-/datum/team/Destroy(force, ...)
+/datum/team/Destroy(force)
GLOB.antagonist_teams -= src
. = ..()
diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
index abc69300c9c6d..00b3ff9960b59 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
@@ -383,7 +383,7 @@
That or it's just space magic. Either way, it shrinks stuff."
ammo_type = list(/obj/item/ammo_casing/energy/shrink)
item_state = "shrink_ray"
- icon_state = "shrink_ray"
+ icon_state = "alienpistol"
fire_delay = 3 SECONDS
selfcharge = 1//shot costs 200 energy, has a max capacity of 1000 for 5 shots. self charge returns 25 energy every couple ticks, so about 1 shot charged every 12~ seconds
trigger_guard = TRIGGER_GUARD_ALLOW_ALL// variable-size trigger, get it? (abductors need this to be set so the gun is usable for them)
diff --git a/code/modules/antagonists/borer/borer.dm b/code/modules/antagonists/borer/borer.dm
index 71877dd61f8bf..26a5979776146 100644
--- a/code/modules/antagonists/borer/borer.dm
+++ b/code/modules/antagonists/borer/borer.dm
@@ -79,7 +79,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
mob_size = MOB_SIZE_SMALL
faction = list("creature")
ventcrawler = VENTCRAWLER_ALWAYS
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
@@ -637,7 +637,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 3)
to_chat(src, "You send a jolt of energy to your host, reviving them!")
victim.grab_ghost(force = TRUE) //brings the host back, no eggscape
C.emote("gasp")
- C.Jitter(100)
+ C.set_jitter(100)
/mob/living/simple_animal/borer/verb/bond_brain()
set category = "Borer"
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index 7d9279f1390df..7953f3f7021a6 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -539,17 +539,6 @@
newprofile.mob_overlay_icon_list = mob_overlay_icon_list.Copy()
newprofile.mob_overlay_state_list = mob_overlay_state_list.Copy() //WS EDIT - Mob Overlay State
-/datum/antagonist/changeling/xenobio
- name = "Xenobio Changeling"
- give_objectives = FALSE
- show_in_roundend = FALSE //These are here for admin tracking purposes only
- you_are_greet = FALSE
-
- chem_storage = 25
- geneticpoints = 2
- chem_recharge_rate = 0.5
- dna_max = 3
-
/datum/antagonist/changeling/roundend_report()
var/list/parts = list()
@@ -582,6 +571,3 @@
/datum/antagonist/changeling/antag_listing_name()
return ..() + "([changelingID])"
-
-/datum/antagonist/changeling/xenobio/antag_listing_name()
- return ..() + "(Xenobio)"
diff --git a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
index 5980993958b02..93905c9d6aeda 100644
--- a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
+++ b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
@@ -48,7 +48,7 @@
changelings[C] = (CHANGELING_PHEROMONE_MAX_DISTANCE ** 2) - (distance ** 2)
if(changelings.len)
- scan_target = pickweight(changelings) //Point at a 'random' changeling, biasing heavily towards closer ones.
+ scan_target = pick_weight(changelings) //Point at a 'random' changeling, biasing heavily towards closer ones.
else
scan_target = null
diff --git a/code/modules/antagonists/changeling/powers/shriek.dm b/code/modules/antagonists/changeling/powers/shriek.dm
index 2a3b2e1fbe357..d0ca0721c3748 100644
--- a/code/modules/antagonists/changeling/powers/shriek.dm
+++ b/code/modules/antagonists/changeling/powers/shriek.dm
@@ -16,7 +16,7 @@
if(!C.mind || !C.mind.has_antag_datum(/datum/antagonist/changeling))
C.adjustEarDamage(0, 30)
C.confused += 25
- C.Jitter(50)
+ C.set_jitter(50)
else
SEND_SOUND(C, sound('sound/effects/screech.ogg'))
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index 25b0b4e1f8cc1..9b06d144bafda 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -7,7 +7,7 @@
name = "Emergency Response Officer"
var/datum/team/ert/ert_team
var/leader = FALSE
- var/datum/outfit/outfit = /datum/outfit/centcom/ert/security
+ var/datum/outfit/outfit = /datum/outfit/job/independent/ert
var/role = "Security Officer"
var/list/name_source
var/random_names = TRUE
@@ -60,9 +60,9 @@
var/missiondesc = "Your team is being sent to [station_name()]. "
if(leader) //If Squad Leader
- missiondesc += " Lead your team to ensure the completion of your objectives."
+ missiondesc += "Lead your team to ensure the completion of your objectives."
else
- missiondesc += " Follow orders given to you by your squad leader."
+ missiondesc += "Follow orders given to you by your squad leader."
if(deathsquad)
missiondesc += "Leave no witnesses."
diff --git a/code/modules/antagonists/ert/frontiersmen.dm b/code/modules/antagonists/ert/frontiersmen.dm
index d6a1a5182cf0c..da1cb0c6812c5 100644
--- a/code/modules/antagonists/ert/frontiersmen.dm
+++ b/code/modules/antagonists/ert/frontiersmen.dm
@@ -18,31 +18,53 @@
missiondesc += " Your Mission: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
+/datum/antagonist/ert/frontier/skm
+ outfit = /datum/outfit/job/frontiersmen/ert/skm
+
+/datum/antagonist/ert/frontier/unarmed
+ outfit = /datum/outfit/job/frontiersmen/ert/unarmed
+
/datum/antagonist/ert/frontier/random
outfit = /datum/outfit/job/frontiersmen/ert/random
+// officers
+
/datum/antagonist/ert/frontier/leader
name = "Frontiersmen Officer"
outfit = /datum/outfit/job/frontiersmen/ert/leader
role = "Officer"
-/datum/antagonist/ert/frontier/leader/unnarmed
- outfit = /datum/outfit/job/frontiersmen/ert/leader/unnarmed
+/datum/antagonist/ert/frontier/leader/heavy
+ outfit = /datum/outfit/job/frontiersmen/ert/leader/heavy
+
+/datum/antagonist/ert/frontier/leader/unarmed
+ outfit = /datum/outfit/job/frontiersmen/ert/leader/unarmed
+
+// doctors
/datum/antagonist/ert/frontier/medic
name = "Frontiersmen Medic"
outfit = /datum/outfit/job/frontiersmen/ert/medic
role = "Stretcher-Bearer"
+/datum/antagonist/ert/frontier/medic/heavy
+ outfit = /datum/outfit/job/frontiersmen/ert/medic/heavy
+
+// engineers
+
/datum/antagonist/ert/frontier/engineer
name = "Frontiersmen Engineer"
outfit = /datum/outfit/job/frontiersmen/ert/engineer
role = "Sapper"
-/datum/antagonist/ert/frontier/better
- name = "Frontiersmen Grunt"
- outfit = /datum/outfit/job/frontiersmen/ert/grunt/skm
+// heavy weapons guy
+
+/datum/antagonist/ert/frontier/flamer
+ name = "Frontiersmen Flametrooper"
+ outfit = /datum/outfit/job/frontiersmen/ert/flamer
+ role = "Flametrooper"
-/datum/antagonist/ert/frontier/unnarmed
- name = "Frontiersmen Grunt"
- outfit = /datum/outfit/job/frontiersmen/ert/grunt
+/datum/antagonist/ert/frontier/sentry
+ name = "Frontiersmen Sentry"
+ outfit = /datum/outfit/job/frontiersmen/ert/sentry
+ role = "Sentinel"
diff --git a/code/modules/antagonists/ert/gezena.dm b/code/modules/antagonists/ert/gezena.dm
new file mode 100644
index 0000000000000..73ac1eb9ddba9
--- /dev/null
+++ b/code/modules/antagonists/ert/gezena.dm
@@ -0,0 +1,29 @@
+/datum/antagonist/ert/gezena
+ name = "PGF Marine"
+ outfit = /datum/outfit/job/gezena/ert
+ role = "Rifleman"
+
+/datum/antagonist/ert/gezena/leader
+ name = "PGF Sergeant"
+ outfit = /datum/outfit/job/gezena/ert/leader
+ role = "Gunnery Sergeant"
+
+/datum/antagonist/ert/gezena/engineer
+ name = "PGF Combat Engineer"
+ outfit = /datum/outfit/job/gezena/ert/engineer
+ role = "Engineer"
+
+/datum/antagonist/ert/gezena/gunner
+ name = "PGF Gunner"
+ outfit = /datum/outfit/job/gezena/ert/gunner
+ role = "Machinegunner"
+
+/datum/antagonist/ert/gezena/medic
+ name = "PGF Corpsman"
+ outfit = /datum/outfit/job/gezena/ert/medic
+ role = "Corpsman"
+
+/datum/antagonist/ert/gezena/inspector
+ name = "PGF Naval Observer"
+ outfit = /datum/outfit/job/gezena/ert/inspector
+ role = "Observer"
diff --git a/code/modules/antagonists/ert/indie.dm b/code/modules/antagonists/ert/indie.dm
index 265af27bd2d48..d56a6ea84e782 100644
--- a/code/modules/antagonists/ert/indie.dm
+++ b/code/modules/antagonists/ert/indie.dm
@@ -8,7 +8,7 @@
role = "Security Officer"
/datum/antagonist/ert/independent/greet()
- to_chat(owner, "You are the [name].")
+ to_chat(owner, "You are \a [name].")
var/missiondesc = "You are one of the many Independent contractors, workers and students on [station_name()]. "
if(leader) //If Squad Leader
missiondesc += "Lead your team to complete your objectives."
@@ -23,6 +23,9 @@
outfit = /datum/outfit/job/independent/ert/emt
role = "Paramedic"
+/datum/antagonist/ert/independent/emt/eva
+ outfit = /datum/outfit/job/independent/ert/emt/eva
+
/datum/antagonist/ert/independent/firefighter
name = "Independent Firefighter"
outfit = /datum/outfit/job/independent/ert/firefighter
@@ -42,3 +45,18 @@
name = "Independent Technician"
outfit = /datum/outfit/job/independent/ert/technician
role = "Technician"
+
+/datum/antagonist/ert/independent/deathsquad
+ name = "Deathsquad Commando"
+ outfit = /datum/outfit/job/independent/ert/deathsquad
+ role = "Commando"
+
+/datum/antagonist/ert/independent/pizza
+ name = "Pizza Delivery Worker"
+ outfit = /datum/outfit/job/independent/ert/pizza
+ role = "Delivery Worker"
+
+/datum/antagonist/ert/independent/janitor
+ name = "Independent Sanitation Technician"
+ outfit = /datum/outfit/job/independent/ert/janitor
+ role = "Sanitation Technician"
diff --git a/code/modules/antagonists/ert/inteq.dm b/code/modules/antagonists/ert/inteq.dm
index f4636487da5ff..6666c626c8c0f 100644
--- a/code/modules/antagonists/ert/inteq.dm
+++ b/code/modules/antagonists/ert/inteq.dm
@@ -1,10 +1,9 @@
/datum/antagonist/ert/inteq
name = "Inteq Mercenary"
- outfit = /datum/outfit/job/inteq/security
+ outfit = /datum/outfit/job/inteq/ert
random_names = TRUE
role = "Enforcer"
-
/datum/antagonist/ert/inteq/greet()
to_chat(owner, "You are the [name].")
var/missiondesc = "You're one of the many mercenaries under the Inteq Risk Management Group sent to [station_name()]. "
@@ -18,7 +17,40 @@
missiondesc += " Contract Terms: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
+/datum/antagonist/ert/inteq/eva
+ outfit = /datum/outfit/job/inteq/ert/eva
+
/datum/antagonist/ert/inteq/leader
name = "Inteq Mercenary Leader"
- outfit = /datum/outfit/job/inteq/captain/empty
+ outfit = /datum/outfit/job/inteq/ert/leader
role = "Vanguard"
+
+/datum/antagonist/ert/inteq/leader/eva
+ outfit = /datum/outfit/job/inteq/ert/leader/eva
+
+/datum/antagonist/ert/inteq/medic
+ name = "Inteq Corpsman"
+ outfit = /datum/outfit/job/inteq/ert/medic
+ role = "Corpsman"
+
+/datum/antagonist/ert/inteq/medic/eva
+ outfit = /datum/outfit/job/inteq/ert/medic/eva
+
+/datum/antagonist/ert/inteq/engineer
+ name = "Inteq Artificer"
+ outfit = /datum/outfit/job/inteq/ert/engineer
+ role = "Artificer"
+
+/datum/antagonist/ert/inteq/engineer/eva
+ outfit = /datum/outfit/job/inteq/ert/engineer/eva
+
+/datum/antagonist/ert/inteq/honor_guard
+ name = "Inteq Honor Guard"
+ outfit = /datum/outfit/job/inteq/ert/honor_guard
+ role = "Guardsman"
+
+/datum/antagonist/ert/inteq/inspector
+ name = "Mothership Investigator"
+ outfit = /datum/outfit/job/inteq/ert/inspector
+ random_names = FALSE
+ role = "Investigator"
diff --git a/code/modules/antagonists/ert/minutemen.dm b/code/modules/antagonists/ert/minutemen.dm
index 069ab6625c32a..5e772227fd65b 100644
--- a/code/modules/antagonists/ert/minutemen.dm
+++ b/code/modules/antagonists/ert/minutemen.dm
@@ -3,17 +3,20 @@
// ********************************************************************
/datum/antagonist/ert/minutemen
- name = "CLIP Minutemen"
+ name = "C-MM Minuteman"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/armed
role = "Minuteman"
+/datum/antagonist/ert/minutemen/eva
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
+
/datum/antagonist/ert/minutemen/greet()
to_chat(owner, "You are \the [role].")
- var/missiondesc = "You serve in the armed forced of the Confederated League of Independent Planets (CLIP), an independent government. You are being deployed to the sector of [station_name()]. "
+ var/missiondesc = "You serve in the Colonial Minutemen, the armed forces of the Confederated League of Independent Planets. You are being deployed to the sector of [station_name()]. "
if(leader) //If Squad Leader
missiondesc += "Lead your squad to complete all objectives."
else
- missiondesc += "Follow orders given to you by your Leader, the Sergent."
+ missiondesc += "Follow orders given to you by your squadron leader."
if(deathsquad)
missiondesc += "You have been given the order to fire at will."
@@ -21,70 +24,82 @@
to_chat(owner,missiondesc)
/datum/antagonist/ert/minutemen/leader
- name = "CLIP Minutemen Field Sergeant"
+ name = "C-MM Sergeant"
leader = TRUE
outfit = /datum/outfit/job/clip/minutemen/grunt/lead
role = "Sergeant"
+/datum/antagonist/ert/minutemen/leader/eva
+ outfit = /datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit
+
/datum/antagonist/ert/minutemen/corpsman
+ name = "C-MM Field Corpsman"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/med/armed
- role = "Field Corpsman"
+ role = "Corpsman"
/datum/antagonist/ert/minutemen/engi
+ name = "C-MM Field Engineer"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed
- role = "Field Engineer"
+ role = "Engineer"
/datum/antagonist/ert/minutemen/gunner
+ name = "C-MM Machinegunner"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed
role = "Field Gunner"
/datum/antagonist/ert/minutemen/bard
- name = "BARD Infantry"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard
- role = "Minuteman"
+ name = "BARD Field Agent"
+ outfit = /datum/outfit/job/clip/minutemen/bard
+ role = "Agent"
+
+/datum/antagonist/ert/minutemen/bard/emergency
+ name = "BARD Xenofauna Specialist"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency
+ role = "Specialist"
/datum/antagonist/ert/minutemen/bard/flamer
- name = "BARD Flamethrower Infantry"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/flamer
+ name = "BARD Fire Control Specialist"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency/flamer
+ role = "Fire Specialist"
/datum/antagonist/ert/minutemen/bard/medic
- name = "BARD Corpsman"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic
- role = "Corpsman"
+ name = "BARD Medical Aid Specialist"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency/medic
+ role = "Medical Specialist"
-/datum/antagonist/ert/minutemen/bard/leader
- name = "BARD Sergeant"
+/datum/antagonist/ert/minutemen/bard/emergency/leader
+ name = "BARD Master Sergeant"
leader = TRUE
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader
- role = "Sergeant"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency/leader
+ role = "Master Sergeant"
-/datum/antagonist/ert/minutemen/riot
- name = "Riot Officer"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/riot
- role = "Minuteman"
+/datum/antagonist/ert/minutemen/military_police
+ name = "C-MM Military Police"
+ outfit = /datum/outfit/job/clip/minutemen/military_police
+ role = "Officer"
-/datum/antagonist/ert/minutemen/riot/leader
- name = "Riot Sergeant"
+/datum/antagonist/ert/minutemen/military_police/riot
+ outfit = /datum/outfit/job/clip/minutemen/military_police/riot
+
+/datum/antagonist/ert/minutemen/military_police/leader
+ name = "C-MM Chief Military Police"
leader = TRUE
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader
- role = "Sergeant"
+ outfit = /datum/outfit/job/clip/minutemen/military_police/leader
+ role = "Chief Officer"
+
+/datum/antagonist/ert/minutemen/military_police/leader/riot
+ outfit = /datum/outfit/job/clip/minutemen/military_police/leader/riot
-/datum/antagonist/ert/official/minutemen
+/datum/antagonist/ert/minutemen/inspector
name = "GOLD Inspector"
- outfit = /datum/outfit/job/clip/investigator
+ outfit = /datum/outfit/job/clip/investigator/cm5
role = "Lieutenant"
-/datum/antagonist/ert/official/minutemen/greet()
- to_chat(owner, "You are the GOLD Inspector.")
+/datum/antagonist/ert/minutemen/inspector/greet()
+ to_chat(owner, "You are a Labor Division Inspector.")
to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the CLIP Government. Your task: [ert_team.mission.explanation_text]")
-/datum/antagonist/ert/minutemen/eva
- name = "CLIP Minutemen"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
- role = "Minuteman"
-
-/datum/antagonist/ert/minutemen/eva/leader
- name = "CLIP Minutemen Field Sergeant"
- leader = TRUE
- outfit = /datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit
- role = "Sergeant"
+/datum/antagonist/ert/minutemen/correspondant
+ name = "C-MM War Correspondant"
+ outfit = /datum/outfit/job/clip/correspondant
+ role = "Correspondant"
diff --git a/code/modules/antagonists/ert/nanotrasen.dm b/code/modules/antagonists/ert/nanotrasen.dm
index 11537e4bcea95..9ea1aa422162c 100644
--- a/code/modules/antagonists/ert/nanotrasen.dm
+++ b/code/modules/antagonists/ert/nanotrasen.dm
@@ -1,152 +1,39 @@
-// Official
-/datum/antagonist/ert/official
- name = "CentCom Official"
- show_name_in_check_antagonists = TRUE
- var/datum/objective/mission
- role = "Inspector"
- random_names = FALSE
- outfit = /datum/outfit/centcom/centcom_official
-
-/datum/antagonist/ert/official/greet()
- to_chat(owner, "You are a CentCom Official.")
- if (ert_team)
- to_chat(owner, "Central Command is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
- else
- to_chat(owner, "Central Command is sending you to [station_name()] with the task: [mission.explanation_text]")
-
-/datum/antagonist/ert/official/forge_objectives()
- if (ert_team)
- return ..()
- if(mission)
- return
- var/datum/objective/missionobj = new ()
- missionobj.owner = owner
- missionobj.explanation_text = "Conduct a routine performance review of [station_name()]'s vessels."
- missionobj.completed = TRUE
- mission = missionobj
- objectives |= mission
-
-// Standard ERT
-
-/datum/antagonist/ert/security // kinda handled by the base template but here for completion
-
-/datum/antagonist/ert/security/red
- outfit = /datum/outfit/centcom/ert/security/alert
-
-/datum/antagonist/ert/engineer
- role = "Engineer"
- outfit = /datum/outfit/centcom/ert/engineer
-
-/datum/antagonist/ert/engineer/red
- outfit = /datum/outfit/centcom/ert/engineer/alert
-
-/datum/antagonist/ert/medic
- role = "Medical Officer"
- outfit = /datum/outfit/centcom/ert/medic
-
-/datum/antagonist/ert/medic/red
- outfit = /datum/outfit/centcom/ert/medic/alert
-
-/datum/antagonist/ert/commander
- role = "Commander"
- outfit = /datum/outfit/centcom/ert/commander
-
-/datum/antagonist/ert/commander/red
- outfit = /datum/outfit/centcom/ert/commander/alert
-
-// Deathsquad
-
-/datum/antagonist/ert/deathsquad
- name = "Deathsquad Trooper"
- outfit = /datum/outfit/centcom/death_commando
- role = "Trooper"
- deathsquad = TRUE
-
-/datum/antagonist/ert/deathsquad/leader
- name = "Deathsquad Officer"
- outfit = /datum/outfit/centcom/death_commando
- role = "Officer"
-
-/datum/antagonist/ert/deathsquad/New()
- . = ..()
- name_source = GLOB.commando_names
-
-/datum/antagonist/ert/deathsquad/apply_innate_effects(mob/living/mob_override)
- ADD_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
-
-/datum/antagonist/ert/deathsquad/remove_innate_effects(mob/living/mob_override)
- REMOVE_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
-
-// Janitor
-
-/datum/antagonist/ert/janitor
- role = "Janitor"
- outfit = /datum/outfit/centcom/ert/janitor
-
-/datum/antagonist/ert/janitor/heavy
- role = "Heavy Duty Janitor"
- outfit = /datum/outfit/centcom/ert/janitor/heavy
-
-// Intern
-
-/datum/antagonist/ert/intern
- name = "CentCom Intern"
- outfit = /datum/outfit/centcom/centcom_intern
- random_names = FALSE
- role = "Intern"
-
-/datum/antagonist/ert/intern/leader
- name = "CentCom Head Intern"
- outfit = /datum/outfit/centcom/centcom_intern/leader
- role = "Head Intern"
-
-/datum/antagonist/ert/intern/unarmed
- outfit = /datum/outfit/centcom/centcom_intern/unarmed
-
-/datum/antagonist/ert/intern/leader/unarmed
- outfit = /datum/outfit/centcom/centcom_intern/leader/unarmed
-
-// Marine
-
-/datum/antagonist/ert/marine
- name = "Marine Commander"
- outfit = /datum/outfit/centcom/ert/marine
- role = "Commander"
-
-/datum/antagonist/ert/marine/security
- name = "Marine Heavy"
- outfit = /datum/outfit/centcom/ert/marine/security
- role = "Trooper"
-
-/datum/antagonist/ert/marine/engineer
- name = "Marine Engineer"
- outfit = /datum/outfit/centcom/ert/marine/engineer
- role = "Engineer"
-
-/datum/antagonist/ert/marine/medic
- name = "Marine Medic"
- outfit = /datum/outfit/centcom/ert/marine/medic
- role = "Medical Officer"
-
-// Loss Prevention
-
-/datum/antagonist/ert/lp
- name = "Loss Prevention Security Specialist"
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp
- role = "Security Specialist"
-
-/datum/antagonist/ert/lp/medic
- name = "Loss Prevention Medical Specialist"
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp/medic
- role = "Medical Specialist"
-
-/datum/antagonist/ert/lp/engineer
- name = "Loss Prevention Engineering Specialist"
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp/engineer
- role = "Engineering Specialist"
-
-/datum/antagonist/ert/lp/lieutenant
- name = "Loss Prevention Lieutenant"
- leader = TRUE
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp/lieutenant
- role = "Lieutenant"
+/datum/antagonist/ert/nanotrasen
+ name = "Vigilitas Security Officer"
+ outfit = /datum/outfit/job/nanotrasen/ert
+ role = "Security Officer"
+
+/datum/antagonist/ert/nanotrasen/delivery
+ name = "N+S Cargo Technician"
+ outfit = /datum/outfit/job/nanotrasen/cargo_tech
+ role = "Cargo Technician"
+
+/datum/antagonist/ert/nanotrasen/inspector
+ name = "Nanotrasen Central Command Liaison"
+ outfit = /datum/outfit/job/nanotrasen/ert/inspector
+ role = "Liaison"
+
+// /datum/antagonist/ert/nanotrasen/emergency
+// name = "Vigilitas Response Officer"
+// outfit = /datum/outfit/job/nanotrasen/ert/emergency
+// role = "Response Officer"
+
+/datum/antagonist/ert/nanotrasen/leader
+ name = "Vigilitas Security Corporal"
+ outfit = /datum/outfit/job/nanotrasen/ert/leader
+ role = "Corporal"
+
+// /datum/antagonist/ert/nanotrasen/leader/emergency
+// name = "Vigilitas Response Lieutenant"
+// outfit = /datum/outfit/job/nanotrasen/ert/leader/emergency
+// role = "Lieutenant"
+
+// /datum/antagonist/ert/nanotrasen/medic/emergency
+// name = "Vigilitas Medical Response Officer"
+// outfit = /datum/outfit/job/nanotrasen/ert/medic/emergency
+// role = "Medic"
+
+// /datum/antagonist/ert/nanotrasen/emergency/engineer
+// name = "Vigilitas Engineering Response Officer"
+// outfit = /datum/outfit/job/nanotrasen/ert/emergency/engineer
+// role = "Engineer"
diff --git a/code/modules/antagonists/ert/roumain.dm b/code/modules/antagonists/ert/roumain.dm
new file mode 100644
index 0000000000000..d27c8f39e5c41
--- /dev/null
+++ b/code/modules/antagonists/ert/roumain.dm
@@ -0,0 +1,50 @@
+/datum/antagonist/ert/roumain
+ name = "Saint-Roumain Hunter"
+ outfit = /datum/outfit/job/roumain/ert
+ role = "Hunter"
+
+/datum/antagonist/ert/roumain/greet()
+ to_chat(owner, "You are the [role].")
+ var/missiondesc = "You are one of the devoted members of the Saint-Roumain Militia. You are being directed to the sector of [station_name()]. "
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your squad to complete all objectives."
+ else
+ missiondesc += "Follow orders given to you by your Leader, the Montage."
+ if(deathsquad)
+ missiondesc += "You have been given the order to fire at will."
+
+ missiondesc += " Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/roumain/vickland
+ outfit = /datum/outfit/job/roumain/ert/vickland
+
+/datum/antagonist/ert/roumain/firestorm
+ outfit = /datum/outfit/job/roumain/ert/firestorm
+
+/datum/antagonist/ert/roumain/scout
+ outfit = /datum/outfit/job/roumain/ert/scout
+
+/datum/antagonist/ert/roumain/leader
+ name = "Saint-Roumain Hunter Montagne"
+ leader = TRUE
+ outfit = /datum/outfit/job/roumain/ert/leader
+ role = "Hunter Montagne"
+
+/datum/antagonist/ert/roumain/leader/colligne
+ name = "Saint-Roumain Hunter Colligne"
+ outfit = /datum/outfit/job/roumain/ert/leader/colligne
+ role = "Hunter clligne"
+
+/datum/antagonist/ert/roumain/leader/twobore
+ outfit = /datum/outfit/job/roumain/ert/leader/twobore
+
+/datum/antagonist/ert/roumain/medic
+ name = "Saint-Roumain Hunter Doctor"
+ outfit = /datum/outfit/job/roumain/ert/medic
+ role = "Doctor"
+
+/datum/antagonist/ert/roumain/engineer
+ name = "Saint-Roumain Machinist"
+ outfit = /datum/outfit/job/roumain/ert/engineer
+ role = "Hunter"
diff --git a/code/modules/antagonists/ert/solgov.dm b/code/modules/antagonists/ert/solgov.dm
index 6868fe9eb9bf5..c01f88a00962a 100644
--- a/code/modules/antagonists/ert/solgov.dm
+++ b/code/modules/antagonists/ert/solgov.dm
@@ -7,14 +7,11 @@
random_names = FALSE
role = "Sonnensöldner"
-/datum/antagonist/ert/official/solgov
+/datum/antagonist/ert/solgov/inspector
name = "SolGov Inspector"
outfit = /datum/outfit/job/solgov/ert/inspector
role = "Solarian Inspector"
-/datum/antagonist/ert/official/solgov/greet()
- to_chat(owner, "You are a Solarian Inspector.")
- if (ert_team)
- to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
- else
- to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [mission.explanation_text]")
+/datum/antagonist/ert/solgov/inspector/greet()
+ to_chat(owner, "You are the Solarian Inspector.")
+ to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
diff --git a/code/modules/antagonists/ert/syndicate.dm b/code/modules/antagonists/ert/syndicate.dm
index ab8fa4abc5f7c..7f2de02571b75 100644
--- a/code/modules/antagonists/ert/syndicate.dm
+++ b/code/modules/antagonists/ert/syndicate.dm
@@ -22,14 +22,23 @@
outfit = /datum/outfit/job/syndicate/ert/leader
role = "Sergeant"
-/datum/antagonist/ert/syndicate/gorlex
- name = "2nd Battlegroup Trooper"
- outfit = /datum/outfit/job/syndicate/ert/gorlex
- role = "Trooper"
+/datum/antagonist/ert/syndicate/inspector
+ name = "ACLF Inspector"
+ outfit = /datum/outfit/job/syndicate/ert/inspector
+ role = "Inspector"
+
+/datum/antagonist/ert/official/syndicate/greet()
+ to_chat(owner, "You are a mid-rank official from the Liberation Front.")
+ to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
-/datum/antagonist/ert/syndicate/gorlex/greet()
+/datum/antagonist/ert/syndicate/ngr
+ name = "Gorlex Republic Serviceman"
+ outfit = /datum/outfit/job/syndicate/ert/ngr
+ role = "Serviceman"
+
+/datum/antagonist/ert/syndicate/ngr/greet()
to_chat(owner, "You are the [name].")
- var/missiondesc = "You're a soldier of the New Gorlex Republic sent to [station_name()]. "
+ var/missiondesc = "You're an enlistee of the New Gorlex Republic sent to [station_name()]. "
if(leader) //If Squad Leader
missiondesc += "Lead your team to ensure the completion of your objectives."
else
@@ -38,26 +47,31 @@
missiondesc += " Your Mission: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
-/datum/antagonist/ert/syndicate/gorlex/pointman
- name = "Gorlex Republic Shotgunner"
- outfit = /datum/outfit/job/syndicate/ert/gorlex/pointman
- role = "Pointman"
+/datum/antagonist/ert/syndicate/ngr/grenadier
+ name = "Gorlex Republic Grenadier"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/grenadier
+ role = "Grenadier"
-/datum/antagonist/ert/syndicate/gorlex/medic
- name = "Gorlex Republic Medic"
- outfit = /datum/outfit/job/syndicate/ert/gorlex/medic
+/datum/antagonist/ert/syndicate/ngr/medic
+ name = "Gorlex Republic Field Medic"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/medic
role = "Medic"
-/datum/antagonist/ert/syndicate/gorlex/sniper
- name = "Gorlex Republic Sniper"
- outfit = /datum/outfit/job/syndicate/ert/gorlex/sniper
+/datum/antagonist/ert/syndicate/ngr/sniper
+ name = "Gorlex Republic Marksman"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/sniper
role = "Marksman"
-/datum/antagonist/ert/syndicate/gorlex/leader
+/datum/antagonist/ert/syndicate/ngr/leader
name = "Gorlex Republic Sergeant"
leader = TRUE
- outfit = /datum/outfit/job/syndicate/ert/gorlex/leader
- role = "Sergeant"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/leader
+ role = "Officer"
+
+/datum/antagonist/ert/syndicate/ngr/inspector
+ name = "Gorlex Republic Official"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/inspector
+ role = "Official"
// cybersun
@@ -73,7 +87,7 @@
missiondesc += "Lead your team to ensure the completion of your objectives."
else
missiondesc += "Follow orders given to you by your Sergeant."
- if(prob(50) && !leader)
+ if(prob(50) && !leader && random_names)
missiondesc += " In addition to your contract with Cybersun, you are also a Gorlex Hardliner. You do not like Cybersun, but you work with them regardless."
missiondesc += " Your Mission: [ert_team.mission.explanation_text]"
@@ -107,16 +121,50 @@
outfit = /datum/outfit/job/syndicate/ert/cybersun/medic/leader
role = "Lead Medical Technician"
-// inspector
+/datum/antagonist/ert/syndicate/cybersun/inspector
+ name = "Cybersun Representative"
+ outfit = /datum/outfit/job/syndicate/ert/cybersun/inspector
+ role = "Representative"
-/datum/antagonist/ert/official/syndicate
- name = "Syndicate Inspector"
- outfit = /datum/outfit/job/syndicate/ert/inspector
- role = "Syndicate Inspector"
+/datum/antagonist/ert/syndicate/hardliner
+ name = "Hardliner Mercenary"
+ outfit = /datum/outfit/job/syndicate/ert/hardliner
+ role = "Mercenary"
-/datum/antagonist/ert/official/syndicate/greet()
- to_chat(owner, "You are a Syndicate Inspector.")
- if (ert_team)
- to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
- else
- to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [mission.explanation_text]")
+/datum/antagonist/ert/syndicate/hardliner/medic
+ name = "Hardliner Medic"
+ outfit = /datum/outfit/job/syndicate/ert/hardliner/medic
+ role = "Medic"
+
+/datum/antagonist/ert/syndicate/hardliner/engineer
+ name = "Hardliner Mechanic"
+ outfit = /datum/outfit/job/syndicate/ert/hardliner/engineer
+ role = "Mechanic"
+
+/datum/antagonist/ert/syndicate/hardliner/leader
+ name = "Hardliner Sergeant"
+ leader = TRUE
+ outfit = /datum/outfit/job/syndicate/ert/hardliner/leader
+ role = "Sergeant"
+
+// ramzi
+
+/datum/antagonist/ert/syndicate/ramzi
+ name = "Ramzi Clique Cell Member"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi
+ role = "Cell Member"
+
+/datum/antagonist/ert/syndicate/ramzi/medic
+ name = "Ramzi Clique Medic"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi/medic
+ role = "Cell Medic"
+
+/datum/antagonist/ert/syndicate/ramzi/demolitionist
+ name = "Ramzi Clique Demolitonist"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi/demolitionist
+ role = "Cell Demolitonist"
+
+/datum/antagonist/ert/syndicate/ramzi/leader
+ name = "Ramzi Clique Cell Leader"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi/leader
+ role = "Cell Leader"
diff --git a/code/modules/antagonists/gang/outfits.dm b/code/modules/antagonists/gang/outfits.dm
index 77c091d2126ab..f76bf026e12c4 100644
--- a/code/modules/antagonists/gang/outfits.dm
+++ b/code/modules/antagonists/gang/outfits.dm
@@ -30,10 +30,7 @@
backpack_contents = list(/obj/item/storage/box/handcuffs = 1,
/obj/item/storage/box/teargas = 1,
/obj/item/storage/box/flashbangs = 1,
- /obj/item/shield/riot/tele = 1,
- /obj/item/ammo_box/magazine/m45 = 3,
- /obj/item/ammo_box/c45 = 2)
-
+ /obj/item/shield/riot/tele = 1)
/datum/outfit/families_police/beatcop/armored
name = "Families: Armored Beat Cop"
@@ -53,8 +50,7 @@
backpack_contents = list(/obj/item/storage/box/handcuffs = 1,
/obj/item/storage/box/teargas = 1,
/obj/item/storage/box/flashbangs = 1,
- /obj/item/shield/riot/tele = 1,
- /obj/item/storage/box/lethalshot = 2)
+ /obj/item/shield/riot/tele = 1)
/datum/outfit/families_police/beatcop/fbi
name = "Families: Space FBI Officer"
@@ -65,8 +61,7 @@
/obj/item/storage/box/teargas = 1,
/obj/item/storage/box/flashbangs = 1,
/obj/item/shield/riot/tele = 1,
- /obj/item/ammo_box/magazine/smgm9mm = 3,
- /obj/item/ammo_box/c9mm = 2)
+ /obj/item/ammo_box/magazine/smgm9mm = 3)
/datum/outfit/families_police/beatcop/military
name = "Families: Space Military"
diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm
index 19b0cc891523e..9f9d4140cc68c 100644
--- a/code/modules/antagonists/morph/morph.dm
+++ b/code/modules/antagonists/morph/morph.dm
@@ -16,7 +16,7 @@
status_flags = CANPUSH
pass_flags = PASSTABLE
ventcrawler = VENTCRAWLER_ALWAYS
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxHealth = 150
health = 150
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index 8fbb858da1036..88a3b176a2f7e 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -87,7 +87,6 @@
C.visible_message("[C] coughs up a half-digested telecrystal","You cough up a half-digested telecrystal!")
break
- CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY))
SSblackbox.record_feedback("amount", "nuclear_challenge_mode", 1)
qdel(src)
diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
index af4b5bd608923..e18f6ff922e21 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
@@ -523,6 +523,10 @@
return TRUE
return ..()
+/obj/machinery/nuclearbomb/beer/empty/Initialize()
+ . = ..()
+ keg.reagent_id = null
+
/obj/machinery/nuclearbomb/beer/actually_explode()
//Unblock roundend, we're not actually exploding.
SSticker.roundend_check_paused = FALSE
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index 81f8facd465ad..d348531bfabe2 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -36,7 +36,7 @@
response_harm_simple = "punch through"
unsuitable_atmos_damage = 0
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) //I don't know how you'd apply those, but revenants no-sell them anyway.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = INFINITY
harm_intent_damage = 0
diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm
index 595fbb27f61a5..56e5d76fb6545 100644
--- a/code/modules/antagonists/slaughter/slaughter.dm
+++ b/code/modules/antagonists/slaughter/slaughter.dm
@@ -23,7 +23,7 @@
attack_sound = 'sound/magic/demon_attack1.ogg'
var/feast_sound = 'sound/magic/demon_consume.ogg'
deathsound = 'sound/magic/demon_dies.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = INFINITY
faction = list("slaughter")
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index ff7ddace1d4b2..4f5e7bc161c94 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -741,21 +741,6 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module))
unlock_text = replacetext(unlock_text, "CAMSUPGRADED", "[upgraded_cameras]") //This works, since unlock text is called after upgrade()
-/// AI Turret Upgrade: Increases the health and damage of all turrets.
-/datum/AI_Module/upgrade/upgrade_turrets
- name = "AI Turret Upgrade"
- description = "Improves the power and health of all AI turrets. This effect is permanent. Upgrade is done immediately upon purchase."
- cost = 30
- upgrade = TRUE
- unlock_text = "You establish a power diversion to your turrets, upgrading their health and damage."
- unlock_sound = 'sound/items/rped.ogg'
-
-/datum/AI_Module/upgrade/upgrade_turrets/upgrade(mob/living/silicon/ai/AI)
- for(var/obj/machinery/porta_turret/ai/turret in GLOB.machines)
- turret.obj_integrity += 30
- turret.lethal_projectile = /obj/projectile/beam/laser/heavylaser //Once you see it, you will know what it means to FEAR.
- turret.lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
-
/// Enhanced Surveillance: Enables AI to hear conversations going on near its active vision.
/datum/AI_Module/upgrade/eavesdrop
name = "Enhanced Surveillance"
diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm
index d6bbba3593031..f90d0fb721858 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/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index b50c6dc1ea8b3..fc6af55b3b41e 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -282,7 +282,7 @@
if(target && cooldown < world.time)
if(I.get_temperature())
to_chat(target, "You suddenly feel very hot!")
- target.adjust_bodytemperature(50)
+ target.adjust_bodytemperature(10)
GiveHint(target)
else if(is_pointed(I))
to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!")
diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm
index 4bd2f5c8a525a..378aa7dbe14aa 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook.dm
@@ -306,18 +306,6 @@
item_path = /obj/item/antag_spawner/contract
category = "Assistance"
-/datum/spellbook_entry/item/guardian
- name = "Guardian Deck"
- desc = "A deck of guardian tarot cards, capable of binding a personal guardian to your body. There are multiple types of guardian available, but all of them will transfer some amount of damage to you. \
- It would be wise to avoid buying these with anything capable of causing you to swap bodies with others."
- item_path = /obj/item/guardiancreator/choose/wizard
- category = "Assistance"
-
-/datum/spellbook_entry/item/guardian/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
- . = ..()
- if(.)
- new /obj/item/paper/guides/antag/guardian/wizard(get_turf(user))
-
/datum/spellbook_entry/item/bloodbottle
name = "Bottle of Blood"
desc = "A bottle of magically infused blood, the smell of which will attract extradimensional beings when broken. Be careful though, the kinds of creatures summoned by blood magic are indiscriminate in their killing, and you yourself may become a victim."
diff --git a/code/modules/assembly/anomalies.dm b/code/modules/assembly/anomalies.dm
new file mode 100644
index 0000000000000..9770370624b86
--- /dev/null
+++ b/code/modules/assembly/anomalies.dm
@@ -0,0 +1,282 @@
+///Base anomaly signaller
+// Embedded signaller used in anomalies.
+/obj/item/assembly/signaler/anomaly
+ name = "anomaly core"
+ desc = "The stabilized core of an anomaly. It'd probably be valuable for research."
+ icon_state = "anomaly core"
+ item_state = "electronic"
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ resistance_flags = FIRE_PROOF
+ //allows anomaly cores to recieve multiple signals
+ var/code_b = DEFAULT_SIGNALER_CODE
+ var/anomaly_type = /obj/effect/anomaly
+ var/research
+
+/obj/item/assembly/signaler/anomaly/Initialize()
+ . = ..()
+ set_frequency(frequency)
+
+/obj/item/assembly/signaler/anomaly/attack_self()
+ return
+
+/obj/item/assembly/signaler/anomaly/receive_signal(datum/signal/signal)
+ if(!signal)
+ return FALSE
+ if(signal.data["code"] == code)
+ for(var/obj/effect/anomaly/Anomaly in get_turf(src))
+ Anomaly.anomalyNeutralize()
+ return TRUE
+ if(signal.data["code"] == code_b )
+ for(var/obj/effect/anomaly/Anomaly in get_turf(src))
+ Anomaly.detonate()
+ anomaly_core_detonation()
+ return TRUE
+ return FALSE
+
+//extend this on a per anomaly basis.
+/obj/item/assembly/signaler/anomaly/proc/anomaly_core_detonation()
+ new /obj/effect/particle_effect/smoke/bad(loc)
+ qdel(src)
+
+/obj/item/assembly/signaler/anomaly/attackby(obj/item/I, mob/user, params)
+ if(I.tool_behaviour == TOOL_ANALYZER)
+ to_chat(user, "Analyzing... [src]'s stabilized field is fluctuating along frequency [format_frequency(frequency)], code [code]. An unstable frequency is present at code [code_b].")
+ ..()
+
+///Bluespace Anomaly
+/obj/item/assembly/signaler/anomaly/bluespace
+ name = "\improper bluespace anomaly core"
+ desc = "The stabilized core of a bluespace anomaly. It keeps phasing in and out of view."
+ icon_state = "anomaly core"
+ grind_results = list(/datum/reagent/bluespace = 25)
+
+/obj/item/assembly/signaler/anomaly/bluespace/anomaly_core_detonation()
+ //just teleports people
+ visible_message(span_warning("[src] creates a bluespace fracture around itself!"))
+ for(var/mob/living/Mob in range(1,src))
+ do_teleport(Mob, locate(Mob.x, Mob.y, Mob.z), 8, channel = TELEPORT_CHANNEL_BLUESPACE)
+ ..()
+
+//Flux Anomaly
+/obj/item/assembly/signaler/anomaly/flux
+ name = "\improper flux anomaly core"
+ desc = "The stabilized core of a flux anomaly. Touching it makes your skin tingle."
+ icon_state = "flux core"
+ grind_results = list(/datum/reagent/teslium = 15)
+
+/obj/item/assembly/signaler/anomaly/flux/anomaly_core_detonation()
+ //zap
+ visible_message(span_warning("Electrical arcs flash off of [src] as it fizzles out!"))
+ tesla_zap(src, 5, 7000, ZAP_FUSION_FLAGS)
+ ..()
+
+///Gravity Anomaly
+/obj/item/assembly/signaler/anomaly/grav
+ name = "\improper gravitational anomaly core"
+ desc = "The stabilized core of a gravitational anomaly. It feels much heavier than it looks."
+ icon_state = "grav core"
+ grind_results = list(/datum/reagent/gravitum = 20, /datum/reagent/liquid_dark_matter = 10)
+
+/obj/item/assembly/signaler/anomaly/grav/anomaly_core_detonation()
+ //throngles u cutely
+ visible_message(span_warning("[src] implodes into itself, light itself bending for a split second!"))
+ for(var/mob/living/carbon/carbon in range(1,src))
+ if(carbon.run_armor_check(attack_flag = "melee") >= 20)
+ carbon.break_random_bone()
+ else if(carbon.run_armor_check(attack_flag = "melee") >= 40)
+ carbon.break_all_bones() //crunch
+ carbon.apply_damage(20, BRUTE)
+
+///Hallucination Anomaly
+/obj/item/assembly/signaler/anomaly/hallucination
+ name = "\improper hallucination anomaly core"
+ desc = "The stabilized core of a hallucination anomaly. It's never entirely there."
+ icon_state = "hallucination_core"
+ grind_results = list(/datum/reagent/toxin/mindbreaker = 20) //LSD orb
+
+///Heartbeat Anomaly
+/obj/item/assembly/signaler/anomaly/heartbeat
+ name = "\improper heartbeat anomaly core"
+ desc = "The stabilized core of a heartbeat anomaly. Pulses of heat run across its shell."
+ grind_results = list(/datum/reagent/uranium/radium = 30, /datum/reagent/uranium = 20)
+
+/obj/item/assembly/signaler/anomaly/heartbeat/anomaly_core_detonation()
+ visible_message(span_warning("[src] expands and throbs, before shattering into dozens of fragments!"))
+ radiation_pulse(src, 1000, 3)
+ new /obj/effect/decal/cleanable/glass/strange(src)
+ ..()
+
+///Melter Anomaly
+/obj/item/assembly/signaler/anomaly/melter
+ name = "\improper melter anomaly core"
+ desc = "The stabilized core of a melter anomaly. It sizzles and crackles."
+ icon_state = "pyro core"
+ grind_results = list(/datum/reagent/toxin/acid/nitracid = 10, /datum/reagent/toxin/acid/fluacid = 10, /datum/reagent/toxin/acid = 10) //soup
+
+/obj/item/assembly/signaler/anomaly/melter/anomaly_core_detonation()
+ visible_message(span_warning("[src] melts into a glowing residue!"))
+ new /obj/effect/decal/cleanable/greenglow(src.loc)
+ ..()
+
+///Phantom Anomaly
+/obj/item/assembly/signaler/anomaly/phantom
+ name = "\improper phantom anomaly core"
+ desc = "The stabilized core of a phantom anomaly. It quietly screams."
+ grind_results = list(/datum/reagent/blood = 20)
+
+/obj/item/assembly/signaler/anomaly/phantom/anomaly_core_detonation()
+ playsound(src,'sound/hallucinations/far_noise.ogg', 100, 0, 50, TRUE, TRUE)
+ visible_message(span_warning("[src] screams as it fades, trying to lash out!"))
+ for(var/mob/living/carbon/handsy in range(5, src))
+ if(handsy.stat != DEAD)
+ var/grab_dir = turn(handsy.dir, pick(-90, 90, 180, 180))
+ var/turf/spawn_turf = get_ranged_target_turf(handsy, grab_dir, 8)
+ if(!spawn_turf)
+ return
+ new /obj/effect/temp_visual/dir_setting/curse/grasp_portal(spawn_turf, handsy.dir)
+ playsound(spawn_turf, 'sound/effects/curse2.ogg', 80, TRUE, -1)
+ var/obj/projectile/curse_hand/phantom/hand = new (spawn_turf)
+ hand.preparePixelProjectile(handsy, spawn_turf)
+ if(QDELETED(hand))
+ return
+ hand.fire()
+ ..()
+
+///Plasmasoul Anomaly
+/obj/item/assembly/signaler/anomaly/plasmasoul
+ name = "\improper plasmasoul anomaly core"
+ desc = "The stabilized core of a plasmasoul anomaly. The air around it hisses."
+ grind_results = list(/datum/reagent/toxin/plasma = 50)
+
+/obj/item/assembly/signaler/anomaly/plasmasoul/anomaly_core_detonation()
+ visible_message(span_warning("[src] rapidly delaminates into plasma!"))
+ atmos_spawn_air("plasma=500;TEMP=[T20C]")
+ ..()
+
+///Pulsar Anomaly
+/obj/item/assembly/signaler/anomaly/pulsar
+ name = "\improper pulsar anomaly core"
+ desc = "The stabilized core of a pulsar anomaly. Electromagnetic crackles come off it."
+ grind_results = list(/datum/reagent/iron = 25, /datum/reagent/uranium = 25)
+
+/obj/item/assembly/signaler/anomaly/pulsar/anomaly_core_detonation()
+ visible_message(span_warning("[src] gives off one last pulse as it melts!"))
+ empulse(loc, 3, 1)
+ ..()
+
+///Pyroclastic Anomaly
+/obj/item/assembly/signaler/anomaly/pyro
+ name = "\improper plasmaball anomaly core"
+ desc = "The stabilized core of a plasmaball anomaly. It almost burns to touch."
+ icon_state = "pyro core"
+ grind_results = list(/datum/reagent/clf3 = 25, /datum/reagent/toxin/plasma = 15)
+
+//glorified molotov
+/obj/item/assembly/signaler/anomaly/pyro/anomaly_core_detonation()
+ //this is tg's ash heretic ash heretic ascenscion power tuned down a bit.
+ visible_message(span_warning("[src] loses coherence, bursting into brilliant flames!"))
+ for(var/i in 0 to 3)
+ for(var/turf/nearby_turf as anything in spiral_range_turfs(i + 1, src.loc))
+ var/obj/effect/hotspot/flame_tile = locate(nearby_turf) || new(nearby_turf)
+ flame_tile.alpha = 125
+ nearby_turf.hotspot_expose(750, 25, 1)
+ qdel(src)
+
+///Sparkler Anomaly
+/obj/item/assembly/signaler/anomaly/sparkler
+ name = "\improper sparkler anomaly core"
+ desc = "The stabilized core of a sparkler anomaly. Tiny electrical sparks arc off it."
+ grind_results = list(/datum/reagent/teslium = 10)
+
+/obj/item/assembly/signaler/anomaly/sparkler/anomaly_core_detonation()
+ visible_message(span_warning("[src] shoots out one last assortment of sparks!"))
+ tesla_zap(src, 2, 5000, ZAP_FUSION_FLAGS)
+ ..()
+
+///Static Anomaly
+/obj/item/assembly/signaler/anomaly/tvstatic
+ name = "\improper static anomaly core"
+ desc = "The stabilized core of a static anomaly. Your head hurts just staring at it"
+ grind_results = list(/datum/reagent/three_eye = 5)
+
+/obj/item/assembly/signaler/anomaly/tvstatic/anomaly_core_detonation()
+ visible_message(span_warning("[src] withdraws into itself, one last message escaping it!"))
+ say(pick(GLOB.tvstatic_sayings))
+ for(var/mob/living/carbon/human/looking in range(4, src))
+ if (!HAS_TRAIT(looking, TRAIT_MINDSHIELD) && looking.stat != DEAD)
+ looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20, 40)
+ playsound(src, 'sound/effects/stall.ogg', 100)
+ ..()
+
+///Transfusion Anomaly
+/obj/item/assembly/signaler/anomaly/transfusion
+ name = "\improper transfusion anomaly core"
+ desc = "The stabilized core of a tranfusion anomaly. Crimson slowly seeps out of the containment unit."
+ icon_state = "pyro core"
+ grind_results = list(/datum/reagent/toxin/heparin = 15, /datum/reagent/blood = 35)
+ var/blood_stored
+ var/blood_max
+
+/obj/item/assembly/signaler/anomaly/transfusion/Initialize()
+ . = ..()
+ blood_max = rand(400, 1200)
+
+/obj/item/assembly/signaler/anomaly/transfusion/proc/set_blood_stored(int)
+ blood_stored += int
+
+/obj/item/assembly/signaler/anomaly/transfusion/proc/set_blood_max(int)
+ blood_max = int
+
+/obj/item/assembly/signaler/anomaly/transfusion/proc/get_blood_stored()
+ return blood_stored
+
+/obj/item/assembly/signaler/anomaly/transfusion/proc/get_blood_max()
+ return blood_max
+
+/obj/item/assembly/signaler/anomaly/transfusion/anomaly_core_detonation()
+ visible_message(span_warning("Ichor flies out of [src], trying to force itself into everything around!"))
+ while(blood_stored > 0)
+ for(var/mob/living/carbon/victim in range(2, src))
+ var/present_time
+ present_time = rand((blood_stored / 10), (blood_stored / 2))
+ visible_message(span_boldwarning("[victim] finds themselves transfused with the crimson ichor!"))
+ victim.blood_volume += present_time
+ blood_stored += -present_time
+ ..()
+
+///Veins Anomaly
+/obj/item/assembly/signaler/anomaly/veins
+ name = "\improper fountain anomaly core"
+ desc = "The stabilized core of a fountain anomaly. It's slippery, like an intestine."
+ grind_results = list(/datum/reagent/medicine/strange_reagent = 1)
+
+/obj/item/assembly/signaler/anomaly/veins/Initialize()
+ . = ..()
+ grind_results = list(/datum/reagent/medicine/strange_reagent = rand(10,20))
+
+/obj/item/assembly/signaler/anomaly/veins/anomaly_core_detonation()
+ //goreshit
+ var/obj/effect/gibspawner/mess = pick(list(
+ /obj/effect/gibspawner/human,
+ /obj/effect/gibspawner/xeno,
+ /obj/effect/gibspawner/generic/animal
+ ))
+ visible_message(span_warning("[src] erupts into a fountain of gore and viserca!"))
+ for(var/i in 1 to 4)
+ new mess(src.loc)
+ ..()
+
+///Vortex Anomaly
+/obj/item/assembly/signaler/anomaly/vortex
+ name = "\improper vortex anomaly core"
+ desc = "The stabilized core of a vortex anomaly. It won't sit still, as if some invisible force is acting on it."
+ icon_state = "vortex core"
+ grind_results = list(/datum/reagent/liquid_dark_matter = 30)
+
+/obj/item/assembly/signaler/anomaly/vortex/anomaly_core_detonation()
+ //disappears bigly
+ playsound(src,'sound/effects/phasein.ogg', 100, 0, 50, TRUE, TRUE)
+ new /obj/effect/particle_effect/sparks/quantum(loc)
+ visible_message(span_warning("[src] shakes violently and - hey, where'd it go?"))
+ ..()
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index 8fe788f79ca78..47605eb63d5aa 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -7,7 +7,7 @@
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
throwforce = 0
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron = 300, /datum/material/glass = 300)
light_system = MOVABLE_LIGHT //Used as a flash here.
light_range = FLASH_LIGHT_RANGE
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 8dbb1dc98b61b..cdb2f8991406c 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 08b6030585634..7368e05f1b440 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(!.)
@@ -59,7 +71,7 @@
return secured
/obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
- if (istype(AM, /obj/effect/beam))
+ if(istype(AM, /obj/effect/beam) || istype(AM, /obj/projectile) || istype(AM, /obj/effect/projectile))
return
sense()
@@ -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/signaler.dm b/code/modules/assembly/signaler.dm
index 0bfac86ee0dfa..f0898cc53b6a5 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -82,12 +82,13 @@
update_appearance()
/obj/item/assembly/signaler/attackby(obj/item/W, mob/user, params)
- if(issignaler(W))
+ if(issignaler(W) && secured)
var/obj/item/assembly/signaler/signaler2 = W
- if(secured && signaler2.secured)
+ if(signaler2.secured)
code = signaler2.code
set_frequency(signaler2.frequency)
to_chat(user, "You transfer the frequency and code of \the [signaler2.name] to \the [name]")
+ return TRUE
..()
/obj/item/assembly/signaler/proc/signal()
@@ -144,126 +145,6 @@
return
return ..(signal)
-// Embedded signaller used in anomalies.
-/obj/item/assembly/signaler/anomaly
- name = "anomaly core"
- desc = "The neutralized core of an anomaly. It'd probably be valuable for research."
- icon_state = "anomaly core"
- item_state = "electronic"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- resistance_flags = FIRE_PROOF
- var/anomaly_type = /obj/effect/anomaly
- var/research
-
-/obj/item/assembly/signaler/anomaly/receive_signal(datum/signal/signal)
- if(!signal)
- return FALSE
- if(signal.data["code"] != code)
- return FALSE
- for(var/obj/effect/anomaly/Anomaly in get_turf(src))
- Anomaly.anomalyNeutralize()
- return TRUE
-
-/obj/item/assembly/signaler/anomaly/attackby(obj/item/I, mob/user, params)
- if(I.tool_behaviour == TOOL_ANALYZER)
- to_chat(user, "Analyzing... [src]'s stabilized field is fluctuating along frequency [format_frequency(frequency)], code [code].")
- ..()
-
-/obj/item/assembly/signaler/anomaly/det_signal
- name = "anomaly field"
- research = null
- anomaly_type = null
-
-/obj/item/assembly/signaler/anomaly/det_signal/receive_signal(datum/signal/signal)
- if(!signal)
- return FALSE
- if(signal.data["code"] != code)
- return FALSE
- for(var/obj/effect/anomaly/Anomaly in get_turf(src))
- Anomaly.detonate()
- return TRUE
-
-
-//Anomaly cores
-
-/obj/item/assembly/signaler/anomaly/pyro
- name = "\improper pyroclastic anomaly core"
- desc = "The neutralized core of a pyroclastic anomaly. It feels warm to the touch. It'd probably be valuable for research."
- icon_state = "pyro core"
- anomaly_type = /obj/effect/anomaly/pyro
-
-/obj/item/assembly/signaler/anomaly/grav
- name = "\improper gravitational anomaly core"
- desc = "The neutralized core of a gravitational anomaly. It feels much heavier than it looks. It'd probably be valuable for research."
- icon_state = "grav core"
- anomaly_type = /obj/effect/anomaly/grav
-
-/obj/item/assembly/signaler/anomaly/flux
- name = "\improper flux anomaly core"
- desc = "The neutralized core of a flux anomaly. Touching it makes your skin tingle. It'd probably be valuable for research."
- icon_state = "flux core"
- anomaly_type = /obj/effect/anomaly/flux
-
-/obj/item/assembly/signaler/anomaly/bluespace
- name = "\improper bluespace anomaly core"
- desc = "The neutralized core of a bluespace anomaly. It keeps phasing in and out of view. It'd probably be valuable for research."
- icon_state = "anomaly core"
- anomaly_type = /obj/effect/anomaly/bluespace
-
-/obj/item/assembly/signaler/anomaly/vortex
- name = "\improper vortex anomaly core"
- desc = "The neutralized core of a vortex anomaly. It won't sit still, as if some invisible force is acting on it. It'd probably be valuable for research."
- icon_state = "vortex core"
- anomaly_type = /obj/effect/anomaly/vortex
-
-/obj/item/assembly/signaler/anomaly/hallucination
- name = "\improper hallucination anomaly core"
- desc = "The neutralized core of a hallucination anomaly. It seems to be moving, but it's probably your imagination. It'd probably be valuable for research."
- icon_state = "hallucination_core"
- anomaly_type = /obj/effect/anomaly/hallucination
-
-/obj/item/assembly/signaler/anomaly/sparkler
- name = "\improper sparkler anomaly core"
- desc = "The neutralized core of a sparkler anomaly. Tiny electrical sparks arc off it."
- anomaly_type = /obj/effect/anomaly/sparkler
-
-/obj/item/assembly/signaler/anomaly/veins
- name = "\improper fountain anomaly core"
- desc = "The neutralized core of a fountain anomaly. Blood drips off of it."
- anomaly_type = /obj/effect/anomaly/sparkler
-
-/obj/item/assembly/signaler/anomaly/phantom
- name = "\improper phantom anomaly core"
- desc = "The neutralized core of a phantom anomaly. It quietly screams."
- anomaly_type = /obj/effect/anomaly/phantom
-
-/obj/item/assembly/signaler/anomaly/pulsar
- name = "\improper pulsar anomaly core"
- desc = "The neutralized core of a pulsar anomaly. Electromagnetic crackles come off it."
-
-/obj/item/assembly/signaler/anomaly/plasmasoul
- name = "\improper plasmasoul anomaly core"
- desc = "The neutralized core of a plasmasoul anomaly. The air around it hisses."
-
-/obj/item/assembly/signaler/anomaly/heartbeat
- name = "\improper heartbeat anomaly core"
- desc = "The neutralized core of a heartbeat anomaly. It's concerningly warm to the touch."
-
-/obj/item/assembly/signaler/anomaly/tvstatic
- name = "\improper static anomaly core"
- desc = "The neutralized core of a static anomaly. Your head hurts just staring at it"
-
-/obj/item/assembly/signaler/anomaly/melter
- name = "\improper melter anomaly core"
- desc = "The neutralized core of a melter anomaly. It sizzles and crackles. It'd probably be valuable for research."
- icon_state = "pyro core"
-
-
-
-/obj/item/assembly/signaler/anomaly/attack_self()
- return
-
/obj/item/assembly/signaler/cyborg
/obj/item/assembly/signaler/cyborg/attackby(obj/item/W, mob/user, params)
diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm
index 84f1a50400151..dfa77c24aebb4 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 221febbe14d4d..84170c1b78edf 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 4920de28e3646..9acdab838e8b9 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -110,19 +110,38 @@
"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',
- "stamp-vanguard" = 'icons/stamp_icons/large_stamp-vanguard.png',
- "stamp-maa" = 'icons/stamp_icons/large_stamp-maa.png',
- "stamp-artificer" = 'icons/stamp_icons/large_stamp-artificer.png',
+ "stamp-inteq_vanguard" = 'icons/stamp_icons/large_stamp-inteq_vanguard.png',
+ "stamp-inteq_maa" = 'icons/stamp_icons/large_stamp-inteq_maa.png',
+ "stamp-inteq_artificer" = 'icons/stamp_icons/large_stamp-inteq_artificer.png',
+ "stamp-inteq_corpsman" = 'icons/stamp_icons/large_stamp-inteq_corpsman.png',
"stamp-clip" = 'icons/stamp_icons/large_stamp-clip.png',
"stamp-bard" = 'icons/stamp_icons/large_stamp-bard.png',
"stamp-gold" = 'icons/stamp_icons/large_stamp-gold.png',
"stamp-cybersun" = 'icons/stamp_icons/large_stamp-cybersun.png',
"stamp-biodynamics" = 'icons/stamp_icons/large_stamp-biodynamics.png',
- "stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png'
+ "stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png',
+ "stamp-ngr" = 'icons/stamp_icons/large_stamp-ngr.png',
+ "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-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
@@ -156,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')
@@ -190,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(
@@ -437,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 cfc82adbffa16..10f76d19d5284 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 662b88046956e..c42c3981214bb 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/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm
index 7c324a3f517a4..c2d7fbf1db86f 100644
--- a/code/modules/atmospherics/environmental/LINDA_system.dm
+++ b/code/modules/atmospherics/environmental/LINDA_system.dm
@@ -31,62 +31,85 @@
. = FALSE
/turf/proc/block_all_conductivity()
- conductivity_blocked_directions |= NORTH | SOUTH | EAST | WEST | UP | DOWN
+ conductivity_blocked_directions |= ALL
/atom/movable/proc/BlockThermalConductivity() // Objects that don't let heat through.
return FALSE
/turf/proc/ImmediateCalculateAdjacentTurfs()
+ conductivity_blocked_directions = 0
+
+ if(blocks_air)
+ for(var/turf/adj_turf as anything in get_atmos_cardinal_adjacent_turfs())
+ LAZYREMOVE(adj_turf.atmos_adjacent_turfs, src)
+ adj_turf.conductivity_blocked_directions |= REVERSE_DIR(get_dir(src, adj_turf))
+ adj_turf.__update_auxtools_turf_adjacency_info()
+
+ //Clear all adjacent turfs
+ LAZYNULL(atmos_adjacent_turfs)
+ conductivity_blocked_directions = ALL
+
+ __update_auxtools_turf_adjacency_info()
+ return
+
var/canpass = CANATMOSPASS(src, src)
var/canvpass = CANVERTICALATMOSPASS(src, src)
- conductivity_blocked_directions = 0
-
- var/src_contains_firelock = 1
+ var/src_has_firelock = 0
if(locate(/obj/machinery/door/firedoor) in src)
- src_contains_firelock |= 2
+ src_has_firelock = 2
- var/list/atmos_adjacent_turfs = list()
+ var/blocks_thermal = FALSE
+ if(!thermal_conductivity || !heat_capacity)
+ blocks_thermal = TRUE
+ else
+ for(var/atom/movable/content as anything in contents)
+ if(content.BlockThermalConductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments
+ blocks_thermal = TRUE
+ break
- for(var/direction in GLOB.cardinals_multiz)
- var/turf/current_turf = get_step_multiz(src, direction)
- if(!isopenturf(current_turf))
- conductivity_blocked_directions |= direction
+ //LAZYINITLIST(atmos_adjacent_turfs) with Cut()
+ if(atmos_adjacent_turfs)
+ atmos_adjacent_turfs.Cut()
+ else
+ atmos_adjacent_turfs = list()
- if(current_turf)
- atmos_adjacent_turfs -= current_turf
- LAZYREMOVE(current_turf.atmos_adjacent_turfs, src)
+ var/datum/virtual_level/zone = get_virtual_level()
+ //Turfs above/below can only exist in zones
+ for(var/direction in (zone ? GLOB.cardinals_multiz : GLOB.cardinals))
+ var/turf/current_turf = zone?.get_zone_step(src, direction) || get_step(src, direction)
+ if(!current_turf || current_turf.blocks_air)
+ conductivity_blocked_directions |= direction
continue
- var/other_contains_firelock = 1
- if(locate(/obj/machinery/door/firedoor) in current_turf)
- other_contains_firelock |= 2
-
//Conductivity Update
var/opp = REVERSE_DIR(direction)
- //all these must be above zero for auxmos to even consider them
- if(!thermal_conductivity || !heat_capacity || !current_turf.thermal_conductivity || !current_turf.heat_capacity)
+ //these must be above zero for auxmos to even consider them
+ if(blocks_thermal || !current_turf.thermal_conductivity || !current_turf.heat_capacity)
conductivity_blocked_directions |= direction
current_turf.conductivity_blocked_directions |= opp
else
- for(var/obj/O in contents + current_turf.contents)
- if(O.BlockThermalConductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments
+ for(var/atom/movable/content as anything in current_turf.contents)
+ if(content.BlockThermalConductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments
conductivity_blocked_directions |= direction
current_turf.conductivity_blocked_directions |= opp
break
//End Conductivity Update
- if(!(blocks_air || current_turf.blocks_air) && ((direction & (UP|DOWN))? (canvpass && CANVERTICALATMOSPASS(current_turf, src)) : (canpass && CANATMOSPASS(current_turf, src))))
- atmos_adjacent_turfs[current_turf] = other_contains_firelock | src_contains_firelock
- LAZYSET(current_turf.atmos_adjacent_turfs, src, src_contains_firelock)
+ if(((direction & (UP|DOWN)) ? (canvpass && CANVERTICALATMOSPASS(current_turf, src)) : (canpass && CANATMOSPASS(current_turf, src))))
+ var/has_firelock = src_has_firelock
+ if(!src_has_firelock && locate(/obj/machinery/door/firedoor) in current_turf)
+ has_firelock = 2
+
+ atmos_adjacent_turfs[current_turf] = has_firelock
+ LAZYSET(current_turf.atmos_adjacent_turfs, src, has_firelock)
else
atmos_adjacent_turfs -= current_turf
LAZYREMOVE(current_turf.atmos_adjacent_turfs, src)
current_turf.__update_auxtools_turf_adjacency_info()
UNSETEMPTY(atmos_adjacent_turfs)
- src.atmos_adjacent_turfs = atmos_adjacent_turfs
__update_auxtools_turf_adjacency_info()
/turf/proc/clear_adjacencies()
@@ -98,40 +121,48 @@
LAZYNULL(atmos_adjacent_turfs)
__update_auxtools_turf_adjacency_info()
-/**
- * Returns a list of adjacent turfs that can share air with this one.
- * alldir includes adjacent diagonal tiles that can share
- * air with both of the related adjacent cardinal tiles
- */
-/turf/proc/GetAtmosAdjacentTurfs(alldir = FALSE)
- var/adjacent_turfs
- if (atmos_adjacent_turfs)
- adjacent_turfs = atmos_adjacent_turfs.Copy()
- else
- adjacent_turfs = list()
-
- if (!alldir)
- return adjacent_turfs
+/turf/proc/get_atmos_adjacent_turfs()
+ return LAZYCOPY(atmos_adjacent_turfs)
- var/turf/curloc = src
+/turf/proc/get_atmos_all_adjacent_turfs()
+ var/list/adjacent_turfs = LAZYCOPY(atmos_adjacent_turfs)
- for (var/direction in GLOB.diagonals_multiz)
- var/matchingDirections = 0
- var/turf/S = get_step_multiz(curloc, direction)
+ for(var/dir in GLOB.diagonals)
+ var/turf/S = get_step(src, dir)
if(!S)
continue
+ adjacent_turfs += S
- for (var/checkDirection in GLOB.cardinals_multiz)
- var/turf/checkTurf = get_step(S, checkDirection)
- if(!S.atmos_adjacent_turfs || !S.atmos_adjacent_turfs[checkTurf])
- continue
+ var/datum/virtual_level/zone = get_virtual_level()
+ if(!zone)
+ return adjacent_turfs
- if (adjacent_turfs[checkTurf])
- matchingDirections++
+ var/turf/above = zone.get_above_turf(src)
+ var/turf/below = zone.get_below_turf(src)
- if (matchingDirections >= 2)
- adjacent_turfs += S
- break
+ if(above)
+ adjacent_turfs += above
+ adjacent_turfs += above.atmos_adjacent_turfs
+ if(below)
+ adjacent_turfs += below
+ adjacent_turfs += below.atmos_adjacent_turfs
+
+ return adjacent_turfs
+
+/turf/proc/get_atmos_cardinal_adjacent_turfs()
+ var/list/adjacent_turfs = LAZYCOPY(atmos_adjacent_turfs)
+
+ var/datum/virtual_level/zone = get_virtual_level()
+ if(!zone)
+ return adjacent_turfs
+
+ var/turf/above = zone.get_above_turf(src)
+ var/turf/below = zone.get_below_turf(src)
+
+ if(above)
+ adjacent_turfs += above
+ if(below)
+ adjacent_turfs += below
return adjacent_turfs
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 18b7b99a7310c..d5c0a9fead1d2 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -20,7 +20,7 @@
var/pressure_direction = 0
var/turf/pressure_specific_target
- var/datum/gas_mixture/turf/air
+ var/datum/gas_mixture/air
var/obj/effect/hotspot/active_hotspot
var/planetary_atmos = FALSE //air will revert to initial_gas_mix over time
@@ -184,14 +184,14 @@
/turf/proc/handle_decompression_floor_rip()
/turf/open/floor/handle_decompression_floor_rip(sum)
- if(sum > 20 && prob(clamp(sum / 10, 0, 30)) && !blocks_air)
+ if(!blocks_air && sum > 20 && prob(clamp(sum / 10, 0, 30)))
remove_tile()
/turf/open/process_cell(fire_count)
//////////////////////////SPACEWIND/////////////////////////////
-/turf/proc/consider_pressure_difference()
+/turf/proc/consider_pressure_difference(turf/T, difference)
return
/turf/open/consider_pressure_difference(turf/T, difference)
diff --git a/code/modules/atmospherics/gasmixtures/auxgm.dm b/code/modules/atmospherics/gasmixtures/auxgm.dm
index e774d1060ec3e..e2f873c9dfd0a 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/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index fa3ba14457d57..1aff4ddadb7f4 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -210,8 +210,6 @@ get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles()
10 = 2.5/5*20
*/
-/datum/gas_mixture/turf
-
/// Releases gas from src to output air. This means that it can not transfer air to gas mixture with higher pressure.
/datum/gas_mixture/proc/release_gas_to(datum/gas_mixture/output_air, target_pressure)
var/output_starting_pressure = output_air.return_pressure()
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index b824c1d78d61d..10c4e9e417d09 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 236c7b040d992..bfd869247f8c4 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
@@ -239,8 +245,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
/obj/machinery/airalarm/Destroy()
SSradio.remove_object(src, frequency)
- qdel(wires)
- wires = null
+ QDEL_NULL(wires)
var/area/ourarea = get_area(src)
ourarea.atmosalert(FALSE, src)
return ..()
@@ -273,6 +278,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
ui = new(user, src, "AirAlarm", name)
ui.open()
+/obj/machinery/airalarm/examine_more(mob/user)
+ ui_interact(user)
+ return ..()
+
/obj/machinery/airalarm/ui_data(mob/user)
var/data = list(
"locked" = locked,
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 5ff6b2e396b5a..6bd2308d929b0 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -28,7 +28,7 @@
var/obj/item/radio/radio
var/radio_key = /obj/item/encryptionkey/headset_com
- var/radio_channel = RADIO_CHANNEL_COMMAND
+ var/radio_channel = RADIO_CHANNEL_EMERGENCY
var/running_anim = FALSE
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 7a2559724ad13..2caef9b39d59b 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -110,9 +110,9 @@
if(pump_direction & RELEASING) // internal -> external
var/pressure_delta = 10000
- if(pressure_checks&EXT_BOUND)
+ if(pressure_checks & EXT_BOUND)
pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
- if(pressure_checks&INT_BOUND)
+ if(pressure_checks & INT_BOUND)
pressure_delta = min(pressure_delta, (air_contents.return_pressure() - internal_pressure_bound))
if(pressure_delta > 0)
@@ -126,9 +126,9 @@
if(environment.return_pressure() > 0)
var/our_multiplier = air_contents.return_volume() / (environment.return_temperature() * R_IDEAL_GAS_EQUATION)
var/moles_delta = 10000 * our_multiplier
- if(pressure_checks&EXT_BOUND)
+ if(pressure_checks & EXT_BOUND)
moles_delta = min(moles_delta, (environment_pressure - external_pressure_bound) * environment.return_volume() / (environment.return_temperature() * R_IDEAL_GAS_EQUATION))
- if(pressure_checks&INT_BOUND)
+ if(pressure_checks & INT_BOUND)
moles_delta = min(moles_delta, (internal_pressure_bound - air_contents.return_pressure()) * our_multiplier)
if(moles_delta > 0)
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 dc8b278959f6b..7706a7e3c4211 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()
@@ -126,12 +126,11 @@
return TRUE
/obj/machinery/atmospherics/components/unary/vent_scrubber/atmosinit()
- radio_filter_in = frequency==initial(frequency)?(RADIO_FROM_AIRALARM):null
- radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null
+ radio_filter_in = frequency == initial(frequency) ? (RADIO_FROM_AIRALARM) : null
+ radio_filter_out = frequency == initial(frequency) ? (RADIO_TO_AIRALARM) : null
if(frequency)
set_frequency(frequency)
broadcast_status()
- check_turfs()
..()
/obj/machinery/atmospherics/components/unary/vent_scrubber/process_atmos()
@@ -141,55 +140,35 @@
if(use_static_power != NO_POWER_USE)
set_no_power()
return FALSE
- if(!nodes[1])
+
+ if(!nodes[1] || !islist(filter_types))
return FALSE
- scrub(loc)
+
+ var/datum/gas_mixture/air_contents = airs[1]
+ if(!air_contents.return_pressure() >= 50 * ONE_ATMOSPHERE)
+ return FALSE
+
+ var/turf/location = loc
+ scrub(location)
if(widenet)
- if(use_static_power != ACTIVE_POWER_USE)
- set_active_power()
- for(var/turf/tile in adjacent_turfs)
+ for(var/turf/tile as anything in location.atmos_adjacent_turfs)
scrub(tile)
- else
- if(use_static_power != IDLE_POWER_USE)
- set_idle_power()
return TRUE
/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(turf/tile)
- if(!istype(tile))
- return FALSE
var/datum/gas_mixture/environment = tile.return_air()
- var/datum/gas_mixture/air_contents = airs[1]
-
- if(air_contents.return_pressure() >= 50 * ONE_ATMOSPHERE || !islist(filter_types))
- return FALSE
if(scrubbing & SCRUBBING)
- environment.scrub_into(air_contents, volume_rate/environment.return_volume(), filter_types)
- tile.air_update_turf()
+ environment.scrub_into(airs[1], volume_rate / environment.return_volume(), filter_types)
else //Just siphoning all air
- environment.transfer_ratio_to(air_contents, volume_rate/environment.return_volume())
- tile.air_update_turf()
+ environment.transfer_ratio_to(airs[1], volume_rate / environment.return_volume())
+ tile.air_update_turf()
update_parents()
return TRUE
-//There is no easy way for an object to be notified of changes to atmos can pass flags
-// So we check every machinery process (2 seconds)
-/obj/machinery/atmospherics/components/unary/vent_scrubber/process()
- if(widenet)
- check_turfs()
-
-//we populate a list of turfs with nonatmos-blocked cardinal turfs AND
-// diagonal turfs that can share atmos with *both* of the cardinal turfs
-
-/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/check_turfs()
- adjacent_turfs.Cut()
- var/turf/T = get_turf(src)
- if(istype(T))
- adjacent_turfs = T.GetAtmosAdjacentTurfs(alldir = 1)
-
/obj/machinery/atmospherics/components/unary/vent_scrubber/receive_signal(datum/signal/signal)
if(!is_operational || !signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
return 0
@@ -206,6 +185,11 @@
if("toggle_widenet" in signal.data)
widenet = !widenet
+ if(widenet)
+ set_active_power()
+ else
+ set_idle_power()
+
var/old_scrubbing = scrubbing
if("scrubbing" in signal.data)
scrubbing = text2num(signal.data["scrubbing"])
@@ -310,10 +294,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 cb6a1b9b0bb0c..b8f023185217d 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 7505d2b8789eb..7ccf807ea2541 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)
@@ -146,7 +146,7 @@
..()
if(!holding)
var/turf/T = get_turf(src)
- for(var/turf/AT in T.GetAtmosAdjacentTurfs(alldir = TRUE))
+ for(var/turf/AT as anything in T.get_atmos_all_adjacent_turfs())
scrub(AT.return_air())
/obj/machinery/portable_atmospherics/scrubber/huge/attackby(obj/item/W, mob/user)
diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm
index a29d48657446c..3b51ebb583d80 100644
--- a/code/modules/awaymissions/away_props.dm
+++ b/code/modules/awaymissions/away_props.dm
@@ -1,7 +1,7 @@
/obj/effect/oneway
name = "one way effect"
desc = "Only lets things in from it's dir."
- icon = 'icons/effects/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping/mapping_helpers.dmi'
icon_state = "field_dir"
invisibility = INVISIBILITY_MAXIMUM
anchored = TRUE
@@ -14,7 +14,7 @@
/obj/effect/wind
name = "wind effect"
desc = "Creates pressure effect in it's direction. Use sparingly."
- icon = 'icons/effects/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping/mapping_helpers.dmi'
icon_state = "field_dir"
invisibility = INVISIBILITY_MAXIMUM
var/strength = 30
@@ -32,7 +32,7 @@
/obj/effect/path_blocker
name = "magic barrier"
desc = "You shall not pass."
- icon = 'icons/effects/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping/mapping_helpers.dmi'
icon_state = "blocker" //todo make this actually look fine when visible
anchored = TRUE
var/list/blocked_types = list()
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 5fc667c4db4a8..037ae0add3e65 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -406,7 +406,10 @@
/obj/item/gun/ballistic/automatic/pistol/deagle/ctf
desc = "This looks like it could really hurt in melee."
force = 75
- mag_type = /obj/item/ammo_box/magazine/m50/ctf
+ default_ammo_type = /obj/item/ammo_box/magazine/m50/ctf
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m50/ctf,
+ )
/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/dropped()
. = ..()
@@ -432,7 +435,10 @@
. = ..()
/obj/item/gun/ballistic/automatic/laser/ctf
- mag_type = /obj/item/ammo_box/magazine/recharge/ctf
+ default_ammo_type = /obj/item/ammo_box/magazine/recharge/ctf
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/recharge/ctf,
+ )
desc = "This looks like it could really hurt in melee."
force = 50
@@ -480,7 +486,10 @@
// RED TEAM GUNS
/obj/item/gun/ballistic/automatic/laser/ctf/red
- mag_type = /obj/item/ammo_box/magazine/recharge/ctf/red
+ default_ammo_type = /obj/item/ammo_box/magazine/recharge/ctf/red
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/recharge/ctf/red,
+ )
/obj/item/ammo_box/magazine/recharge/ctf/red
ammo_type = /obj/item/ammo_casing/caseless/laser/ctf/red
@@ -495,7 +504,10 @@
// BLUE TEAM GUNS
/obj/item/gun/ballistic/automatic/laser/ctf/blue
- mag_type = /obj/item/ammo_box/magazine/recharge/ctf/blue
+ default_ammo_type = /obj/item/ammo_box/magazine/recharge/ctf/blue
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/recharge/ctf/blue,
+ )
/obj/item/ammo_box/magazine/recharge/ctf/blue
ammo_type = /obj/item/ammo_casing/caseless/laser/ctf/blue
@@ -578,7 +590,6 @@
/datum/outfit/ctf/red/post_equip(mob/living/carbon/human/H)
..()
var/obj/item/radio/R = H.ears
- R.set_frequency(FREQ_CTF_RED)
R.freqlock = TRUE
R.independent = TRUE
H.dna.species.stunmod = 0
@@ -586,7 +597,6 @@
/datum/outfit/ctf/blue/post_equip(mob/living/carbon/human/H)
..()
var/obj/item/radio/R = H.ears
- R.set_frequency(FREQ_CTF_BLUE)
R.freqlock = TRUE
R.independent = TRUE
H.dna.species.stunmod = 0
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 26361b99cfc60..4fb7ceac45279 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -6,7 +6,7 @@
name = "Mob Spawner"
density = TRUE
anchored = TRUE
- icon = 'icons/effects/mapping_helpers.dmi' // These aren't *really* mapping helpers but it fits the most with it's common usage (to help place corpses in maps)
+ icon = 'icons/effects/mapping/mapping_helpers.dmi' // These aren't *really* mapping helpers but it fits the most with it's common usage (to help place corpses in maps)
icon_state = "mobspawner" // So it shows up in the map editor
var/mob_type = null
var/mob_name = ""
@@ -138,6 +138,7 @@
// Base version - place these on maps/templates.
/obj/effect/mob_spawn/human
mob_type = /mob/living/carbon/human
+ icon_state = "corpsehuman"
//Human specific stuff.
var/mob_species = null //Set to make them a mutant race such as lizard or skeleton. Uses the datum typepath instead of the ID.
var/datum/outfit/outfit = /datum/outfit //If this is a path, it will be instanced in Initialize()
@@ -326,12 +327,10 @@
/obj/effect/mob_spawn/human/corpse/cargo_tech
name = "Cargo Tech"
outfit = /datum/outfit/job/cargo_tech
- icon_state = "corpsecargotech"
/obj/effect/mob_spawn/human/cook
name = "Cook"
outfit = /datum/outfit/job/cook
- icon_state = "corpsecook"
/obj/effect/mob_spawn/human/cook/husked
husk = TRUE
@@ -339,8 +338,6 @@
/obj/effect/mob_spawn/human/doctor
name = "Doctor"
outfit = /datum/outfit/job/doctor
- icon_state = "corpsedoctor"
-
/obj/effect/mob_spawn/human/doctor/alive
death = FALSE
@@ -363,22 +360,18 @@
/obj/effect/mob_spawn/human/engineer
name = "Engineer"
outfit = /datum/outfit/job/engineer
- icon_state = "corpseengineer"
/obj/effect/mob_spawn/human/clown
name = "Clown"
outfit = /datum/outfit/job/clown
- icon_state = "corpseclown"
/obj/effect/mob_spawn/human/scientist
name = "Scientist"
outfit = /datum/outfit/job/scientist
- icon_state = "corpsescientist"
/obj/effect/mob_spawn/human/miner
name = "Shaft Miner"
outfit = /datum/outfit/job/miner
- icon_state = "corpseminer"
/obj/effect/mob_spawn/human/plasmaman
mob_species = /datum/species/plasmaman
@@ -405,7 +398,6 @@
/obj/effect/mob_spawn/human/bartender
name = "Space Bartender"
- icon_state = "corpsebartender"
id_job = "Bartender"
id_access_list = list(ACCESS_BAR)
outfit = /datum/outfit/spacebartender
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index 850d0e91ba09d..bddf8561f588b 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 bfbb8bbf52ea8..2e289579be1a8 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 abaaceefd6049..0000000000000
--- 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 60741701b4d82..8c55a870263b6 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 6f8bb473b77a7..9e8abe6356b69 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/moonoutpost19.dm b/code/modules/awaymissions/mission_code/moonoutpost19.dm
deleted file mode 100644
index 4f13e27001ec5..0000000000000
--- a/code/modules/awaymissions/mission_code/moonoutpost19.dm
+++ /dev/null
@@ -1,121 +0,0 @@
-// moonoutpost19
-
-//Areas
-/area/awaymission/moonoutpost19
- name = "space"
- icon_state = "awaycontent1"
-
-/area/awaymission/moonoutpost19/arrivals
- name = "MO19 Arrivals"
- icon_state = "awaycontent2"
-
-/area/awaymission/moonoutpost19/research
- name = "MO19 Research"
- icon_state = "awaycontent3"
-
-/area/awaymission/moonoutpost19/syndicate
- name = "Syndicate Outpost"
- icon_state = "awaycontent4"
-
-/area/awaymission/moonoutpost19/main
- name = "Khonsu 19"
- always_unpowered = TRUE
- power_environ = FALSE
- power_equip = FALSE
- power_light = FALSE
- poweralm = FALSE
- ambientsounds = list('sound/ambience/ambimine.ogg')
- icon_state = "awaycontent5"
-
-/area/awaymission/moonoutpost19/hive
- name = "The Hive"
- always_unpowered = TRUE
- power_environ = FALSE
- power_equip = FALSE
- power_light = FALSE
- poweralm = FALSE
- icon_state = "awaycontent6"
-
-//Papers
-
-/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note
- name = "Hastily Written Note"
- default_raw_text = "19 06 2554
I fucking knew it. There was a major breach, that idiotic force field failed and the xenomorphs rushed out and took out the scientists. I've managed to make it to my office and closed the blast doors. I can hear them trying to pry open the doors. Probably don't have long. I have no clue what has happened to the rest of the crew, for all I know they've been killed to produce more of the fucks."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_social
- name = "Larva Xenomorph Social Interactions & Capturing Procedure"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 04/06/2554
Report: As expected, all that is left of the monkeys we sent in earlier is a group of xenomorph larvae. It is quite clear that the facehuggers are not selective in their hosts, and so far the gestation process has been shown to have a 100% success rate.
The larvae themselves have been behaving very differently from the lone larva we first observed, and despite shying away from humans they are clearly comfortable with others of their kind. Our previous suspicions on larvae have been confirmed with their demonstration of playfulness: they are not nearly as aggressive or violent when young, before molting to adulthood.
The majority of the play we observed involved a sort of hide-and-seek, and occasionally wrestling by tangling themselves and struggling out of it. While normally we would write these off as instinctual play for honing their skills when they molt, their growth period is so incredibly fast and they are still such adept killers that it would serve no practical purpose. The only explanation for this is perhaps to create bonds and friendships with each other, if that is even possible for such an incredibly hostile race. It may be that they are much more reasonable with each other than other life forms.
It had become clear that now was the best time to extract a xenomorph for dissecting, as these were all still larvae and the queen was still attached to its ovipositor and would be immobile. With the approval of the research director, we sent in our medical robot that had been dubbed 'Head Surgeon' into the containment pen, dropping the shields for only a fraction of a second to allow it entry. The larvae were cautious, but the curiosity of one had him within grabbing range of our robot. It was brought out and quickly euthanized through lethal injection, courtesy of our mechanical doctor."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_queen
- name = "Queen Xenomorph Physiology & Behavior Observation"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 04/06/2554
Report: I have studied many interesting and diverse life-forms as a xenobiologist ranging from creatures as large as cows, to specimens too small see with the naked eye. This is by far the largest alien I have ever seen. The alien we were previously studying has molted and has become an absolutely enormous creature. Standing at over 15 feet tall and weighing in at likely two tons or more, the xenomorph queen is an absolutely breathtakingly large and cruel monster. Its behavior has changed drastically from when it was a drone, having become far more comfortable with sitting and staring at us, rather than smashing at the windows.
The queen, physiologically speaking, is fairly similar to the other xenomorphs, with a few key differences. Its enormous size demands large legs, while the back seems to be always hunched forward. The dorsal tubes on the back have changed to several large spikes, and we observed the alien now sports a second pair of smaller arms on its chest. The purpose of these secondary arms is still unknown. Finally, the queen's crown has become incredibly large, with what seems to be a retractable slot to hide its head in. The dome appears to be extremely thick near the front, and will likely be able to resist a lot of trauma. Despite the enormous size it has grown to, it is not that much slower than it used to be.
After two hours of doing relatively nothing but staring, the queen began to produce an unusually large amount of resin and weeds, quickly shaping up a large nest that it then hid behind. It then proceeded to smash out all the lights, leaving us with very little to see with our cameras. When we looked through the back cameras, we had discovered that it had grown a large ovipositor, and was releasing large eggs onto the ground. This had us all in agreement that this stage of the life cycle was the queen.
Over the next few hours, the eggs grew to their full sizes, and we provided the subject with new monkey hosts. When they approached the eggs, they opened to release more facehuggers. It seems that we have observed the full cycle of reproduction for this species. We can expect more larvae in the next few hours."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_adult
- name = "Adult Xenomorph Physiology & Behavior Observation"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 03/06/2554
Report: The other scientists and I can hardly believe our eyes. The snake-like larva has molted into a 7 foot tall insectoid nightmare in just a few hours. It's obvious now as to why such heavy duty containment was needed. It immediately tried to escape however by flinging itself at the window in a flurry of swipes and stabs. It seems its behavior has returned to a state that is very similar to the facehugger, though I doubt with the same intent! Thankfully, our glass and shields have shown to be more than sturdy enough for such a violent creature, and so far, any attempts at the creature escaping have been in vain.
As for its physiology, the creature has an elongated head with what appears to be have an exoskeleton resembling an external rib-cage on the torso. The alien is also fairly skinny with a lean body. The little amount of meat on the alien appears to be entirely muscle. We assume this makes it deceptively strong, while remaining agile at the same time. One of the most interesting things we have seen is its pharyngeal jaw. It has some what of an inner mouth capable of being fired externally at extremely high speeds. It has already caused many dents in the walls and a few small cracks in the window with it. The alien also has a couple of dorsal tubes on its back, their purpose unknown. Finally, this monster sports a long ridged tail, complete with a large and extremely sharp blade at the tip.
Normally I would be absolutely terrified of something like this, but I'm putting my trust in Nanotrasen with the containment. After all, they wouldn't build a cell that could fail to contain its subject, would they?"
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_psych
- name = "Larva Xenomorph Physiology & Behavior Observation"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 03/06/2554
Report: When the larva first emerged from the chest of the monkey, it seemed very curious. It would wander around aimlessly for awhile and then sit still. We are unable to determine the gender of the larva, or even determine if it has a gender. After some time had passed, it seemed to lose interest in its surroundings and sat mostly still while occasionally wagging its tail. We decided to throw in a live mouse to see if it would consume it. The larva quickly attacked and ate the mouse and seemed to get larger very suddenly, this suggests that the larvae are capable of metabolizing and directing all the energy towards growth at previously thought impossible speeds. It is a shame that we cannot observe the process more closely, as we do not currently know how dangerous or violent this creature is or will become as it matures fully.
It is tempting to imagine the possibilities of utilizing such a mechanism. The capability of skipping years of growth time for children, repairing bodily damage in a matter of moments, even its usage in existing cloning technology."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/facehugger
- name = "'Facehugger' Xenomorph Physiology & Behavior Observation"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 03/06/2554
Report: The test subject we were provided with truly is alien. It is a small spider-like creature with bony legs leading to a smooth body. It has a long tail connected to it, and it has shown extremely aggressive behavior by flinging its entire body at the glass and shields to no avail. While doing so, we noticed there was a small pink hole in the middle of the body.
When we sent in a monkey through the crude but effective disposal tube, the alien immediately jumped at its face and latched on. The monkey was quickly suffocated by its constricting tail, unable to pry off the fingers. The monkey at first seemed to be dead, but was observed to be breathing. The recently named alien 'facehugger' fell off dead and curled its legs up like a spider moments after it had finished with the monkey's body.
While the monkey appeared to be unharmed, we kept it in the cell for a couple more hours until we were horrified to discover it screaming out in pain as a snake-like creature erupted from the monkey's chest! It appears that the 'facehugger' is only the start of this life cycle. The impregnation cycle involving the creatures growing inside the chests of their hosts seems to only be the beginning."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind
- name = "The Hivemind Hypothesis"
- default_raw_text = "Researcher: Dr. Mark Douglas Date: 17/06/2554
Report: Earlier today we have observed a new phenomenon with our subjects. While feeding them our last monkey subject and throwing out the box, the aliens merely looked at us instead of infecting the monkey right away. They looked to be collectively distressed as they would no longer be given hosts, where instead we would move to the next phase of the experiment. When I glanced at the gas tanks and piping leading to their cell, I looked back to see all of them were up against the glass, even the queen! It was as if they all understood what was going to happen, even though we knew only the queen had the cognitive capability to do so.
The only explanation for this is a form of communication between the aliens, but we have seen no such action take place anywhere in the cell until now. We also know that regular drone and hunter xenomorphs have no personality or instinct to survive by themselves. Perhaps the queen has a direct link to them? A form of a commander or overseer that controls their every move? A hivemind?"
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior
- name = "\improper A Preliminary Study of Alien Behavior"
- default_raw_text = "Researcher: Dr. Sakuma Sano Date: 08/06/2554
Report: The xenomorphs we have come to study here are a remarkable species. They are almost universally aggressive across all castes, showing no remorse or guilt or pause before or after acts of violence. They appear to be a species entirely designed to kill. Oddly enough, even their method of reproduction is a brutal two-for-one method of birthing a new xenomorph and killing its host.
The lone xenomorph we studied only five days ago showed little sign of intelligence. Only a simple drone that flung itself at the safety glass and shields repeatedly and thankfully without success. Once the drone molted into a queen, it became much more calm and calculating, merely looking at us and waiting while building its nest. As the hive grew in size and in numbers, so too did the intelligence of the common hunter and drone. We are still researching how they can communicate with one another and the relationship between the different castes and the queen. We will continue to update our research as we learn more about the species."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes
- name = "The Xenomorph 'Castes'"
- default_raw_text = "Researcher: Dr. Mark Douglas Date: 06/06/2554
Report: While observing the growing number of aliens in the containment cell, we began to notice subtle differences that were consistently repeating. Like ants, these creatures clearly have different specialized variations that determine their roles in the hive. We have dubbed the three currently observed castes as Hunters, Drones, and Sentinels.
Hunters have been observed to be by far the most aggressive and agile of the three, constantly running on every surface and frequently swiping at the windows. They are also remarkably good at camouflaging themselves in darkness and on their resin structures, appearing almost invisible to the unwary observer. They are always the first to reach the monkeys we send in leading us to believe that this caste is primarily used for finding and retrieving hosts.
Drones on the other hand are much more docile and seem more shy by comparison, though not any less aggressive than the other castes. They have been observed to have a much wider head and lack dorsal tubes. They have shown to be less agile and visibly more fragile than any other caste. The drone however has never been observed to interact with the monkeys directly and instead preferring maintenance of the hive by building walls of resin and moving eggs around the nest. As far as we know, we have only ever observed a drone become a queen, and we have no way of knowing if the other castes have that capability.
Lastly, we have the Sentinels, which appear at first glance to be the guards of the hive. They have so far been only observed to remain near the queen and the eggs, frequently curled up against the walls. We have only observed one instance where they have interacted with a monkey who strayed too closely to the queen, and was pounced and held down immediately until it was applied with a facehugger. Their lack of movement makes it difficult to determine their exact purpose as guards, sentries, or other role."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy
- name = "Larva Xenomorph Autopsy Report"
- default_raw_text = "Researcher: Dr. Mark Douglas Date: 04/06/2554
Report: After an extremely dangerous, time consuming and costly dissection, we have managed to record and identify several of the organs inside of the first stage of the xenomorph cycle: the larva. This procedure took an extensive amount of time because these creatures have incredibly, almost-comically acidic blood that can melt through almost anything in a few moments. We had to use over a dozen scalpels and retractors to complete the autopsy.
The larva seems to possess far fewer and quite different organs than that of a human. There is a stomach, with no digestive tract, a heart, which seems to lack any blood-oxygen circulation purpose, and an elongated brain, even though its as dumb as any large cat. It also lacks any liver, kidneys, or other basic organs.
We can't determine the exact nature of how these creatures grow, nor if they gain organs as they become adults. The larger breeds of xenomorph are too dangerous to kill and capture to give us an accurate answer to these questions. All that we can conclude is that being able to function with so little and yet be so deadly means that these creatures are highly evolved and likely to be extremely durable to various hazards that would otherwise be lethal to humans."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/research/evacuation
- name = "Evacuation Procedure"
- default_raw_text = "
In The Event of Xenobiology Breach: Evacuate staff, Lock down Xenobiology, Notify on-site superiors and/or Central Command immediately.
Current Xenobiology Containment Level:Secure RUN
"
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal
- name = "Personal Log"
- default_raw_text = "Log 1: We got our promised supply drop today. We were only meant to get it, what, a week ago? This bloody gateway keeps desyncing itself, and that means subsisting off recycled water and carb packs. No clue where the damn thing connects to on its off days, and HQ say we are 'not to touch it if it isn't linking to command.' We dumped off the assload of crates Jim filled, got our boxes of oxygen, food and drink, and closed the portal.
Log 2: Damn thing is acting up again. Three days no contact this time. I thought I heard clanking noises from it yesterday. Jim is going on about the NT base or some shit. We've been over this before - They don't know we're here, that engineer was too drunk to recognize his suit, especially since I had it painted orange. He's starting to get annoying. We're safe.
Log 3: Gateway synced itself up automatically today. I opened it for an instant to spy through it, got a glimpse of the inside of a transport container. Either HQ's redecorating or something, or there's more than two of these things."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal_2
- name = "Personal Log"
- default_raw_text = "Log 1: While mining today I noticed the NT station was finished with its renovations. They placed some huge reinforced tumor on the station, looks so ugly. I wouldn't be surprised if those pigs decided to turn that little astronomy outpost into a prison with that thing, it'd be pretty typical of them.
Log 2: Really dumb of me but I just waved at an engineer in the outpost, and he waved back. I hope to god he was too dumb or drunk to recognize the suit, because if he isn't then we might have to pull out before they come looking for us.
Log 3: That huge reinforced tumor in their science section has been making a lot of noise lately. I've been hearing some banging and scratching from the other side and I'm kind of glad now that they reinforced this thing so much. I'll be sleeping with my gun under my pillow from now on."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/engineering
- name = "Engineering Instructions"
- default_raw_text = "Alright, listen up. If you're reading this, I'm either taking a shit or I've been recalled back to Command. Either way, you'll need to know how to restore power. We've stolen this stuff from Nanotrasen, so all the equipment is jury-rigged. We have generators that work on both plasma and uranium, about 50 sheets should power the outpost for quite a while. If the generators aren't working, which is very likely, take the power cell on the desk and put it into the APC in the hallway. That should get the place running, at least for a little while."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/kenneth
- name = "Personal Log - Kenneth Cunningham"
- default_raw_text = "Entry One - 27/05/2554: I just arrived, and already I hate my job. I'm stuck on this shithole of an outpost, trying to avoid these damn eggheads running all over the place preparing for god knows what. There's no crimes to stop, no syndies to kill, and I'm not even allowed to beat the fuckin' assistant senseless! They said I was transferred from Space Station 13 for 'good behavior', but this feels more like a punishment than a reward. All I know is that if I don't get some action soon, I'm going to go insane.
Entry Two - 03/06/2554: Okay, so get this: we got a fuckin' deathsquad coming in today! I thought the day I saw one of them would be the day my employment was 'terminated', if you get my drift. They're escorting some sort of weird alien creature for the eggheads to study. I heard one of the docs telling the chef that this thing killed a whole security force before it was captured. I sure as hell hope that I don't have to fight it.
Entry Three - 08/06/2554: My first real bit of 'action' today, if you could call it that. Crazy Ivan got in a fight with Kuester today about his Booze-O-Mat. Apparently one of the crewmembers had stolen a couple bottles of booze from the machine after Ivan disabled the ID lock. Tell you the truth, I don't blame the thief. Everyone is going a little stir-crazy in here, and the bartender is being damn stingy with the alcohol. Either way, once they started to pick a fight, I had to take them down. It's a damn shame that we don't have a brig, though. I had to lock Ivan in a fuckin' freezer, for god's sake. Let's hope that we can keep our sanity together, at least for a while.
Entry Four - 10/06/2554: Jesus fucking Christ riding on a motorbike. These things the scientists are studying are terrifying! Fucking great huge purple bug things as tall as the ceiling, with blades for arms and drooling at the mouth. I don't think my taser will do jack shit against these damn things, but the eggheads say that they're safely contained. If they do, I have a feeling that it's only a matter of time before we're all screwed. These bastards look like walking death.
Entry Five - 18/06/2554: Finally caught who stole the booze from Kuester. It was that fuckin' loser assistant Steve! He was in the dorms, chugging his worries away. I took one of the bottles back to the barkeep, but no one has to know about this second one. I think I'm gonna enjoy this while watching tomorrow's Thunderdome match.
Entry Six - 19/06/2554: Oh, great. The chef is still sleeping, so we get Ivan's gruel for breakfast today. I overheard Sano and Douglas saying something about the aliens being restless, so we might get some action today. As long as it happens after the big game, I'm fine with it. I still got one beer to drink before I'm ready to die."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/ivan
- name = "Personal Log - Ivan Volodin"
- default_raw_text = "Ivan Volodin Stories:
Entry Won - 28/05/2554: Hello. I am Crazy Ivan. Boss say I must write. I do good job fixing outpost. Is very good job. Much better than mines. Many nice people. I cause no trouble.
Entry Too - 05/06/2554: I am finding problem with Booze-O-Mat. Is not problem. I solve very easy. Use yellow tool to make purple light go off. I am good engineer! Bartender will be very happy.
Entry Tree - 08/06/2554: Bartender is not happy. Security man is not happy. Cannot feel legs, is very cold in freezer. Is not good. Table is jammed into door, have no tools. Is very not good. But, on bright side, found meat! Shall chew to keep spirits up.
Entry Fore - 12/06/2554: Big nasty purple bug looked at me today. Make nervous. Blue wall wire can be broken, then bad thing happens. Very very bad thing. Man in orange spacesuit wave at me today too. He seem nice. Wonder who was?
Entry Fiv - 15/06/2554: I eat cornflakes today. Is good day. Sun shine for a while. Was nice. I also take ride on disposals chute. Was fun, but tiny. Get clog out of pipes, was vodka bottle. Is empty. This make many sads.
Entry Sex: 19/06/2554: Purple bugs jumpy today. When waved, get hiss. Maybe very bad. Maybe just ill. Do not know. Is science problem, is not engineer problem. I eat sandwich. Is glorious job. Wish to never end."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/log/gerald
- name = "Personal Log - Gerald Rosswell"
- default_raw_text = "Personal Log for Research Director Gerald Rosswell
Entry One - 17/05/2554: You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.
Entry Two - 25/05/2554: Well, we all expected it at the outpost, CentCom has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on an xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.
Entry Three - 27/05/2554: The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.
Entry Four - 06/06/2554: My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.
Entry Five - 10/06/2554: Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.
Entry Six - 17/06/2554: The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/food_specials
- name = "Specials This Week"
- default_raw_text = "
I Can't Believe It's Not Pasta: Half off on Wednesdays
Burger night every Friday 6PM-10PM, free drinks with purchase of meal!
Premiering Tonight: The comedy stylings of Shoe Snatching Willy! 11AM-7PM
Welcome to Moon Outpost 19! Property of Nanotrasen Inc.
Staff Roster: -Dr. Gerald Rosswell: Research Director & Acting Captain -Dr. Sakuma Sano: Xenobiologist -Dr. Mark Douglas: Xenobiologist -Kenneth Cunningham: Security Officer-Ivan Volodin: Engineer -Mathias Kuester: Bartender -Sven Edling: Chef -Steve: Assistant
Please enjoy your stay, and report any abnormalities to an officer."
-
-/obj/item/paper/fluff/awaymissions/moonoutpost19/goodbye_note
- name = "Note"
- default_raw_text = "Bugs break out. I run to here and lock door. I hear door next to me break open and screams. All nice people here dead now. I no want to be eaten, and bottle always said to be coward way out, but person who say that is stupid. Mira, there is no escape for me, tell Alexis and Elena that father will never come home, and that I love you all."
-
-
diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm
index 914a1f2828c7f..10bb96c12baa3 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 b3e4ff8b863b6..0000000000000
--- 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 c12b09fa4e05c..c205746b16f30 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
@@ -197,7 +66,7 @@
L.adjustFireLoss(2)
if(L)
L.adjust_fire_stacks(20) //dipping into a stream of plasma would probably make you more flammable than usual
- L.adjust_bodytemperature(-rand(50,65)) //its cold, man
+ L.adjust_bodytemperature(-rand(10,20)) //its cold, man
if(ishuman(L))//are they a carbon?
var/list/plasma_parts = list()//a list of the organic parts to be turned into plasma limbs
var/list/robo_parts = list()//keep a reference of robotic parts so we know if we can turn them into a plasmaman
@@ -218,14 +87,19 @@
PP.adjustFireLoss(25)
if(plasma_parts.len)
var/obj/item/bodypart/NB = pick(plasma_parts) //using the above-mentioned list to get a choice of limbs for dismember() to use
- PP.emote("scream")
NB.limb_id = "plasmaman" //change the species_id of the limb to that of a plasmaman
NB.static_icon = 'icons/mob/species/plasmaman/bodyparts.dmi'
NB.no_update = TRUE
NB.change_bodypart_status()
- PP.visible_message(
- "[L] screams in pain as [L.p_their()] [NB] melts down to the bone!",
- "You scream out in pain as your [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!")
+ PP.force_scream()
+ if(!HAS_TRAIT(PP, TRAIT_ANALGESIA))
+ PP.visible_message(
+ "[L] screams in pain as [L.p_their()] [NB] melts down to the bone!",
+ "You scream out in pain as your [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!")
+ else
+ PP.visible_message(
+ "[L] lets out panicked gasps as [L.p_their()] [NB] melts down to the bone!",
+ "You gasp in shock as your [NB] melts down to the bone, leaving an eerie plasma-like glow where flesh used to be!")
if(!plasma_parts.len && !robo_parts.len) //a person with no potential organic limbs left AND no robotic limbs, time to turn them into a plasmaman
PP.IgniteMob()
PP.set_species(/datum/species/plasmaman)
@@ -260,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 = {"
"}
-
-/obj/item/paper/fluff/awaymissions/snowdin/secnotice
- name = "Security Notice"
- default_raw_text = {"YOu have been assigned to this Arctic Post with intention of protecting Nanotrasen assets and ensuring vital information is kept secure while the stationed crew obeys protocol. The picked
- staff for this post have been pre-screened with no prior incidients on record, but incase of an issue you have been given a single holding cell and instructions to contact Central to terminate the
- offending crewmember."}
-
-/obj/item/paper/fluff/awaymissions/snowdin/mining
- name = "Assignment Notice"
- default_raw_text = {"This cold-ass planet is the new-age equivalent of striking gold. Huge deposits of plasma and literal streams of plasma run through the caverns under all this ice and we're here to mine it all.\
- Nanotrasen pays by the pound, so get minin' boys!"}
-
/obj/item/paper/crumpled/ruins/snowdin/lootstructures
name = "scribbled note"
default_raw_text = {"There's some ruins scattered along the cavern, their walls seem to be made of some sort of super-condensed mixture of ice and snow. We've already barricaded up the ones we've found so far,
@@ -448,83 +267,6 @@
SAY AAAAAAAAAAAAAAAA FUCK THAT
DELAY 15;"}
-//lootspawners//--
-
-/obj/effect/spawner/lootdrop/snowdin
- name = "why are you using this dummy"
- lootdoubles = 0
- lootcount = 1
- loot = list(/obj/item/bikehorn = 100)
-
-/obj/effect/spawner/lootdrop/snowdin/dungeonlite
- name = "dungeon lite"
- loot = list(/obj/item/melee/classic_baton = 11,
- /obj/item/melee/classic_baton/telescopic = 12,
- /obj/item/book/granter/spell/smoke = 10,
- /obj/item/book/granter/spell/blind = 10,
- /obj/item/storage/firstaid/regular = 45,
- /obj/item/storage/firstaid/toxin = 35,
- /obj/item/storage/firstaid/brute = 27,
- /obj/item/storage/firstaid/fire = 27,
- /obj/item/storage/toolbox/syndicate = 12,
- /obj/item/grenade/c4 = 7,
- /obj/item/grenade/clusterbuster/smoke = 15,
- /obj/item/clothing/under/chameleon = 13,
- /obj/item/clothing/shoes/chameleon/noslip = 10,
- /obj/item/borg/upgrade/ddrill = 3,
- /obj/item/borg/upgrade/soh = 3)
-
-/obj/effect/spawner/lootdrop/snowdin/dungeonmid
- name = "dungeon mid"
- loot = list(/obj/item/defibrillator/compact = 6,
- /obj/item/storage/firstaid/tactical = 35,
- /obj/item/shield/energy = 6,
- /obj/item/shield/riot/tele = 12,
- /obj/item/dnainjector/lasereyesmut = 7,
- /obj/item/pneumatic_cannon = 15,
- /obj/item/melee/transforming/energy/sword = 7,
- /obj/item/book/granter/spell/knock = 15,
- /obj/item/book/granter/spell/summonitem = 20,
- /obj/item/book/granter/spell/forcewall = 17,
- /obj/item/storage/backpack/holding = 12,
- /obj/item/grenade/spawnergrenade/manhacks = 6,
- /obj/item/grenade/spawnergrenade/spesscarp = 7,
- /obj/item/grenade/clusterbuster/inferno = 3,
- /obj/item/stack/sheet/mineral/diamond{amount = 15} = 10,
- /obj/item/stack/sheet/mineral/uranium{amount = 15} = 10,
- /obj/item/stack/sheet/mineral/plasma{amount = 15} = 10,
- /obj/item/stack/sheet/mineral/gold{amount = 15} = 10,
- /obj/item/book/granter/spell/barnyard = 4,
- /obj/item/pickaxe/drill/diamonddrill = 6,
- /obj/item/borg/upgrade/disablercooler = 7)
-
-
-/obj/effect/spawner/lootdrop/snowdin/dungeonheavy
- name = "dungeon heavy"
- loot = list(/obj/item/melee/axe/fire = 25,
- /obj/item/organ/brain/alien = 17,
- /obj/item/dualsaber = 15,
- /obj/item/organ/heart/demon = 7,
- /obj/item/gun/ballistic/automatic/smg/cobra = 16,
- /obj/item/uplink/old = 2,
- /obj/item/book/granter/spell/charge = 12,
- /obj/item/grenade/clusterbuster/spawner_manhacks = 15,
- /obj/item/book/granter/spell/fireball = 10,
- /obj/item/pickaxe/drill/jackhammer = 30,
- /obj/item/borg/upgrade/syndicate = 13,
- /obj/item/borg/upgrade/selfrepair = 17)
-
-/obj/effect/spawner/lootdrop/snowdin/dungeonmisc
- name = "dungeon misc"
- lootdoubles = 2
- lootcount = 1
-
- loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10,
- /obj/item/toy/snowball = 15,
- /obj/item/shovel = 10,
- /obj/item/melee/spear = 8,
- )
-
//special items//--
/obj/structure/barricade/wooden/snowed
diff --git a/code/modules/awaymissions/mission_code/spacebattle.dm b/code/modules/awaymissions/mission_code/spacebattle.dm
index f0131d830cd01..9a63a6fdbfa93 100644
--- a/code/modules/awaymissions/mission_code/spacebattle.dm
+++ b/code/modules/awaymissions/mission_code/spacebattle.dm
@@ -1,46 +1,3 @@
-//Spacebattle Areas
-
-/area/awaymission/spacebattle
- name = "Space Battle"
- icon_state = "awaycontent1"
- requires_power = FALSE
-
-/area/awaymission/spacebattle/cruiser
- name = "\improper Nanotrasen Cruiser"
- icon_state = "awaycontent2"
-
-/area/awaymission/spacebattle/syndicate1
- name = "Syndicate Assault Ship 1"
- icon_state = "awaycontent3"
-
-/area/awaymission/spacebattle/syndicate2
- name = "Syndicate Assault Ship 2"
- icon_state = "awaycontent4"
-
-/area/awaymission/spacebattle/syndicate3
- name = "Syndicate Assault Ship 3"
- icon_state = "awaycontent5"
-
-/area/awaymission/spacebattle/syndicate4
- name = "Syndicate War Sphere 1"
- icon_state = "awaycontent6"
-
-/area/awaymission/spacebattle/syndicate5
- name = "Syndicate War Sphere 2"
- icon_state = "awaycontent7"
-
-/area/awaymission/spacebattle/syndicate6
- name = "Syndicate War Sphere 3"
- icon_state = "awaycontent8"
-
-/area/awaymission/spacebattle/syndicate7
- name = "Syndicate Fighter"
- icon_state = "awaycontent9"
-
-/area/awaymission/spacebattle/secret
- name = "Hidden Chamber"
- icon_state = "awaycontent10"
-
/mob/living/simple_animal/hostile/human/syndicate/ranged/spacebattle
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/obj/item/gun/ballistic/automatic/smg/cobra,
diff --git a/code/modules/awaymissions/mission_code/undergroundoutpost45.dm b/code/modules/awaymissions/mission_code/undergroundoutpost45.dm
deleted file mode 100644
index 4153032024305..0000000000000
--- a/code/modules/awaymissions/mission_code/undergroundoutpost45.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-// undergroundoutpost45
-
-//Areas
-/area/awaymission/undergroundoutpost45
- name = "space"
- icon_state = "awaycontent1"
-
-/area/awaymission/undergroundoutpost45/central
- name = "UO45 Central Hall"
- icon_state = "awaycontent2"
-
-/area/awaymission/undergroundoutpost45/crew_quarters
- name = "UO45 Crew Quarters"
- icon_state = "awaycontent3"
-
-/area/awaymission/undergroundoutpost45/engineering
- name = "UO45 Engineering"
- icon_state = "awaycontent4"
-
-/area/awaymission/undergroundoutpost45/mining
- name = "UO45 Mining"
- icon_state = "awaycontent5"
-
-/area/awaymission/undergroundoutpost45/research
- name = "UO45 Research"
- icon_state = "awaycontent6"
-
-/area/awaymission/undergroundoutpost45/gateway
- name = "UO45 Gateway"
- icon_state = "awaycontent7"
-
-/area/awaymission/undergroundoutpost45/caves
- name = "UO45 Caves"
- icon_state = "awaycontent8"
- always_unpowered = TRUE
- power_environ = FALSE
- power_equip = FALSE
- power_light = FALSE
- poweralm = FALSE
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index dae36500093f5..0a127891b1b89 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -23,8 +23,6 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "[global.con
if(!current)
current = new
current.id = id
- if(delay)
- current.wait = CONFIG_GET(number/gateway_delay)
GLOB.gateway_destinations += current
current.target_turfs += get_turf(src)
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
index d5489edeb3e04..24a39c848ff10 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
@@ -25,21 +25,10 @@
stock_max = 10
availability_prob = 0
-/datum/blackmarket_item/ammo/himehabu_box
- name = ".22 LR Ammo Box"
- desc = "A 75 round ammo box of .22 LR. Trust me, you'll need every shot."
- item = /obj/item/ammo_box/c22lr_box
-
- price_min = 100
- price_max = 300
- stock_min = 6
- stock_max = 10
- availability_prob = 0
-
/datum/blackmarket_item/ammo/a357_box
name = ".357 Ammo Box"
desc = "A 50 round ammo box of .357."
- item = /obj/item/ammo_box/a357_box
+ item = /obj/item/storage/box/ammo/a357
price_min = 150
price_max = 500
@@ -57,17 +46,39 @@
stock = 6
availability_prob = 0
-/datum/blackmarket_item/ammo/c299
- name = "Eoehoma .299 Caseless Ammo Box"
- desc = "This ammunition for the E-40 Hybrid Rifle is probably worth more than the people you're shooting it at."
- item = /obj/item/ammo_box/c299
+/datum/blackmarket_item/ammo/cm23_mag
+ name = "CM-23 Magazines"
+ desc = "10 round 10mm magazines for use in the CM-23 pistol."
+ item = /obj/item/ammo_box/magazine/cm23
- price_min = 300
- price_max = 700
+ price_min = 150
+ price_max = 300
+ stock_min = 6
+ stock_max = 10
+ availability_prob = 0
+
+/datum/blackmarket_item/ammo/cm70_mag
+ name = "CM-70 Magazines"
+ desc = "18 round 9mm magazines for use in the CM-70 pistol."
+ item = /obj/item/ammo_box/magazine/m9mm_cm70
+
+ price_min = 200
+ price_max = 300
stock_min = 4
stock_max = 8
availability_prob = 0
+/datum/blackmarket_item/ammo/cm5_mag
+ name = "CM-5 Magazines"
+ desc = "30 round 9mm magazines for use in the CM-5 SMG."
+ item = /obj/item/ammo_box/magazine/cm5_9mm
+
+ price_min = 300
+ price_max = 600
+ stock_min = 2
+ stock_max = 6
+ availability_prob = 0
+
/datum/blackmarket_item/ammo/saber_mag
name = "Saber 9mm SMG Magazines"
desc = "Magazines for use in the Saber 9mm SMG. No, they don't work as swords."
@@ -135,7 +146,7 @@
/datum/blackmarket_item/ammo/carbine_mag
name = "SKM-24v Magazine"
desc = "A 30 round magazine of 4.6x30mm for the SKM-24v. A hermit classic."
- item = /obj/item/ammo_box/magazine/skm_545_39
+ item = /obj/item/ammo_box/magazine/skm_46_30
price_min = 500
price_max = 1000
@@ -253,7 +264,7 @@
/datum/blackmarket_item/ammo/a4570hp
name = ".45-70 Hollow Point Ammo Box"
desc = "Put the hollow in hollow point by blowing a crater in some random sod with this devastating .45-70 cartridge."
- item = /obj/item/ammo_box/a4570/hp
+ item = /obj/item/storage/box/ammo/a4570_hp
price_min = 600
price_max = 1000
@@ -274,7 +285,7 @@
/datum/blackmarket_item/ammo/c38hotshot
name = ".38 Hearth Ammo Box"
- desc = "We got our ship cook to marinade some .38 in some hearthwine we pocketed off some hunters. It'll cook your targets to a nice well done."
+ desc = "We got our ship cook to marinade some .38 in some hearthflame we pocketed off some hunters. It'll cook your targets to a nice well done."
item = /obj/item/ammo_box/c38/hotshot
price_min = 300
@@ -285,7 +296,7 @@
/datum/blackmarket_item/ammo/c38iceblox
name = ".38 Chilled Ammo Box"
- desc = "One of our runners accidentally spilled some .38 into a fucking pristine icewine shipment. It'll freeze your targets faster than our runner froze solid outside for making a mess."
+ desc = "One of our runners accidentally spilled some .38 into a fucking pristine wine of ice shipment. It'll freeze your targets faster than our runner froze solid outside for making a mess."
item = /obj/item/ammo_box/c38/iceblox
price_min = 300
@@ -293,3 +304,32 @@
stock_min = 3
stock_max = 8
availability_prob = 50
+
+/datum/blackmarket_item/ammo/a8x50match
+ name = "8x50mm Match Box"
+ desc = "We found this dead guy with a recording of him going \"Watch this!\", and richoetting something before crumbling over. This is the ammo he had!"
+ item = /obj/item/storage/box/ammo/a8_50r/match
+ price_min = 500
+ price_max = 1000
+ stock_min = 1
+ stock_max = 4
+ availability_prob = 30
+
+/datum/blackmarket_item/ammo/c22rub
+ name = ".22lr Rubbers"
+ desc = "A 100 round box of .22 rubbershot from some godsforsaken frontier world. We're pretty sure the use-case is making someone think that they just pissed off a beehive"
+ item = /obj/item/storage/box/ammo/c22lr/rubber
+ price_min = 400
+ price_max = 800
+ stock_min = 1
+ stock_max = 4
+ availability_prob = 40
+
+/datum/blackmarket_item/ammo/a8x58trac
+ name = "8x58mm Tracker"
+ desc = "We hot glued a GPS onto the inside of this 8x58mm shell! For the low low price of. Whatever the price is. You can have it!"
+ item = /obj/item/ammo_casing/caseless/a858/trac
+ price_min = 50
+ price_max = 500
+ stock_min = 4
+ stock_max = 8
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
index 677b82624bae4..1beb0a0de7d2d 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm
@@ -92,20 +92,20 @@
return B
/datum/blackmarket_item/clothing/frontiersmen_armor_set
- name = "X-11 Bulletproof Armor Set"
- desc = "We got a good deal on some extra bulletproof armor from a Frontiersmen Quartermaster, and we're passing those savings onto you!"
+ name = "X-11 Armor Set"
+ desc = "We got a good deal on some extra armor from a Frontiersmen Quartermaster, and we're passing those savings onto you!"
item = /obj/item/storage/box
- price_min = 1000
- price_max = 1750
+ price_min = 500
+ price_max = 1250
stock_max = 3
availability_prob = 50
/datum/blackmarket_item/clothing/frontiersmen_armor_set/spawn_item(loc)
var/obj/item/storage/box/B = ..()
- B.name = "Bulletproof Armor Set Box"
+ B.name = "Armor Set Box"
B.desc = "A beat up looking box with some armor inside."
- new /obj/item/clothing/suit/armor/vest/bulletproof/frontier(B)
+ new /obj/item/clothing/suit/armor/vest/frontier(B)
new /obj/item/clothing/head/helmet/bulletproof/x11/frontier(B)
return B
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
index 2d9f3af83c068..871b103af05de 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
@@ -4,7 +4,7 @@
/datum/blackmarket_item/consumable/donk_pocket_box
name = "Box of Donk Pockets"
desc = "A well packaged box containing the favourite snack of every spacefarer."
- item = /obj/effect/spawner/lootdrop/donkpockets
+ item = /obj/effect/spawner/random/food_or_drink/donkpockets
stock_min = 2
stock_max = 5
@@ -79,9 +79,7 @@
var/trickwine = pick(list(/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine,
- /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine))
+ /obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,))
return new trickwine(loc)
/datum/blackmarket_item/consumable/stimpack
@@ -186,7 +184,7 @@
/datum/blackmarket_item/consumable/ration
name = "Ration Pack"
desc = "PGF military surplus rations. What's in them? Who knows. Surprise is the spice of life after all."
- item = /obj/effect/spawner/lootdrop/ration
+ item = /obj/effect/spawner/random/food_or_drink/ration
price_min = 150
price_max = 300
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
index 8f51514de8044..a9221fb95ecb7 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/misc.dm
@@ -11,15 +11,15 @@
stock_max = 6
availability_prob = 80
-/datum/blackmarket_item/misc/shoulder_holster
- name = "Shoulder holster"
- desc = "Yeehaw, hardboiled friends! This holster is the first step in your dream of becoming a detective and being allowed to shoot real guns!"
+/datum/blackmarket_item/misc/cham_holster
+ name = "Chameleon Shoulder holster"
+ desc = "Looking to pack some heat without attracting attention? This adapative chameleon shoulder holster can disguise itself and your piece!"
item = /obj/item/clothing/accessory/holster
price_min = 200
price_max = 800
- stock_max = 8
- availability_prob = 60
+ stock_max = 4
+ availability_prob = 40
/datum/blackmarket_item/misc/strange_seed
name = "Strange Seeds"
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
index 412ba303b9776..fabde1d0dfcf4 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/tools.dm
@@ -11,17 +11,6 @@
stock = 1
availability_prob = 20
-/datum/blackmarket_item/tool/syndi_toolbox
- name = "Syndicate Toolbox"
- desc = "A set of specialized tools, built to precision perfection and certified by the GEC."
- item = /obj/item/storage/toolbox/syndicate
-
- price_min = 500
- price_max = 2000
- stock_min = 1
- stock_max = 3
- availability_prob = 40
-
/datum/blackmarket_item/tool/surgery_duffel
name = "Cybersun Advanced Surgical Kit"
desc = "You might say it's morally wrong to steal. I say it's justified when it's Cybersun."
@@ -173,28 +162,19 @@
desc = "A lovingly handcrafted jetpack built by our salvage techs. For the frugal space explorer."
item = /obj/item/tank/jetpack/improvised
- price_min = 500
- price_max = 1000
+ price_min = 100
+ price_max = 500
stock_min = 3
stock_max = 6
availability_prob = 70
-/datum/blackmarket_item/tool/jet_harness
- name = "Jet Harness"
- desc = "A compact oxygen filled jet harness for tactical EVA insertions and extractions."
- item = /obj/item/tank/jetpack/oxygen/harness
-
- price_min = 1250
- price_max = 3500
- stock_max = 3
- availability_prob = 30
-
/datum/blackmarket_item/tool/jetpack_upgrade
name = "Hardsuit Jetpack Upgrade"
desc = "A modular jetpack compatible with most hardsuits. If the screws feel a bit loose, it's because the last suit it was attached to was beyond recovery."
item = /obj/item/tank/jetpack/suit
- price_min = 1750
+ price_min = 1250
price_max = 3000
- stock = 1
+ stock_min = 1
+ stock_max = 3
availability_prob = 25
diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
index 740ee2c5341b0..6eae1c1a14846 100644
--- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -32,6 +32,26 @@
stock_max = 3
availability_prob = 50
+/datum/blackmarket_item/weapon/fireaxe
+ name = "Fire Axe"
+ desc = "An incredibly sharp axe of reputable make, used by various engineers to settle arguments while hammered. Sold to us by a very friendly man in a suit."
+ item = /obj/item/melee/axe/fire
+
+ price_min = 1200
+ price_max = 2300
+ stock_max = 3
+ availability_prob = 40
+
+/datum/blackmarket_item/weapon/sledgehammer
+ name = "Breaching Sledgehammer"
+ desc = "A Clique outfit had to ditch a lot of equipment to evade a Gezenan assault. This little piece breaks legs and walls like no other. You want in?"
+ item = /obj/item/melee/axe/sledgehammer
+
+ price_min = 2000
+ price_max = 3000
+ stock_max = 3
+ availability_prob = 30
+
/datum/blackmarket_item/weapon/powerfist
name = "Powerfist"
desc = "Need a bit more... omph in your right hook? This gas operated powerfist will put you in the heavyweight."
@@ -98,7 +118,7 @@
name = "Himehabu Pistol"
desc = "Great things come in small packages. The Himehabu is perfect for all your espionage needs. Chambered in .22lr."
item = /obj/item/gun/ballistic/automatic/pistol/himehabu
- pair_item = list(/datum/blackmarket_item/ammo/himehabu_mag, /datum/blackmarket_item/ammo/himehabu_box)
+ pair_item = list(/datum/blackmarket_item/ammo/himehabu_mag)
price_min = 100
price_max = 600
@@ -129,7 +149,7 @@
name = "E-40 Hybrid Assault Rifle"
desc = "A dual mode hybrid assault rifle made by the now defunct Eoehoma Firearms. Capable of firing both bullets AND lasers, for the discerning dealer in death. Chambered in Eoehoma .299 Caseless."
item = /obj/item/gun/ballistic/automatic/assault/e40
- pair_item = list(/datum/blackmarket_item/ammo/e40_mag, /datum/blackmarket_item/ammo/c299)
+ pair_item = list(/datum/blackmarket_item/ammo/e40_mag)
price_min = 7000
price_max = 10000
@@ -159,10 +179,43 @@
stock_max = 3
availability_prob = 40
+/datum/blackmarket_item/weapon/cm23
+ name = "CM-23 pistol"
+ desc = "The service pistol of the Confederated League. Chambered in 10mm and fresh off a crashed clipper. We made sure to scratch the ID off this time."
+
+ item = /obj/item/gun/ballistic/automatic/pistol/cm23
+ pair_item = list(/datum/blackmarket_item/ammo/cm23_mag)
+ price_min = 500
+ price_max = 1500
+ stock_max = 4
+ availability_prob = 50
+
+/datum/blackmarket_item/weapon/cm70
+ name = "CM-70 Machine Pistol"
+ desc = "One slick piece from the Confederated League. Chambered in 9mm. That officer wasn't happy to lose this but you should be safe."
+
+ item = /obj/item/gun/ballistic/automatic/pistol/cm70
+ pair_item = list(/datum/blackmarket_item/ammo/cm70_mag)
+ price_min = 900
+ price_max = 2100
+ stock_max = 2
+ availability_prob = 50
+
+/datum/blackmarket_item/weapon/cm5
+ name = "CM-5 SMG"
+ desc = "Now isn't this a good find. A whole League sub-machinegun, chambered in 9mm. We're pretty sure no one is gonna notice the pallet of these missing."
+
+ item = /obj/item/gun/ballistic/automatic/smg/cm5
+ pair_item = list(/datum/blackmarket_item/ammo/cm5_mag)
+ price_min = 1750
+ price_max = 3500
+ stock_max = 2
+ availability_prob = 30
+
/datum/blackmarket_item/weapon/saber_smg
name = "Saber 9mm SMG"
desc = "A prototype 9mm submachine gun. Most of these never got past the RND phase and into distribution. But we happen know a guy."
- item = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto
+ item = /obj/item/gun/ballistic/automatic/smg/skm_carbine/saber
pair_item = list(/datum/blackmarket_item/ammo/saber_mag)
price_min = 2250
@@ -180,6 +233,17 @@
stock = 2
availability_prob = 20
+/datum/blackmarket_item/weapon/larker
+ name = "Model 13 \"Larker\""
+ desc = "Gotta deal for you broski. We got this mod of those shoddy Sporter Rifles an' you can buy one, or two, orreven three if yer int' that."
+ item = /obj/item/storage/guncase/m13
+
+ price_min = 500
+ price_max = 1200
+ stock_min = 3
+ stock_max = 5
+ availability_prob = 40
+
/datum/blackmarket_item/weapon/sawn_illestren
name = "Sawn off Illestren Rifle"
desc = "We had to saw down the barrels on these to fit them in the smuggling compartment. They don't aim too good, but it still packs a good punch."
@@ -191,16 +255,6 @@
stock_max = 5
availability_prob = 60
-/datum/blackmarket_item/weapon/combat_shotgun
- name = "Combat Shotgun"
- desc = "Are your arms tired from pumping Hunter's Pride shotguns? This semi-automatic combat shotgun will make killing a breeze."
- item = /obj/item/gun/ballistic/shotgun/automatic/combat
-
- price_min = 1750
- price_max = 3500
- stock_max = 3
- availability_prob = 40
-
/datum/blackmarket_item/weapon/mecha_weapon_bay
name = "Concealed Weapons Bay"
desc = "Ripley with a laser cannon? Odysseus with a missile rack? Sky's the limit with this omni-compatible weapons bay! (Missiles and lasers not included)"
@@ -320,7 +374,7 @@
name = "Pounder Submachine Gun"
desc = "There's a certain quality to quantity. With a massive 50 round capacity, this .22lr submachine is capable of laying down an jawdropping amount of fire."
item = /obj/item/gun/ballistic/automatic/smg/pounder
- pair_item = list(/datum/blackmarket_item/ammo/pounder_mag,/datum/blackmarket_item/ammo/himehabu_box)
+ pair_item = list(/datum/blackmarket_item/ammo/pounder_mag)
price_min = 1500
price_max = 2000
@@ -350,19 +404,9 @@
stock_max = 2
availability_prob = 20
-/datum/blackmarket_item/weapon/fireaxe
- name = "Fire Axe"
- desc = "An incredibly sharp axe of dubious make used by various engineers throughout the years to settle arguments while hammered. Sold to us by a very friendly man in a suit."
- item = /obj/item/melee/axe/fire
-
- price_min = 2500
- price_max = 3500
- stock = 2
- availability_prob = 40
-
/datum/blackmarket_item/weapon/oneshot
name = "Hammer Launcher"
- desc = "A one-shot solution to a myriad amount of problems, ranging from Exosuits to obnoxious neighbors. Contains one ready-to-fire 84mm HEDP rocket. "
+ desc = "A one-shot solution to a myriad amount of problems, ranging from Exosuits to obnoxious neighbors. Contains one ready-to-fire 84mm HE rocket. "
item = /obj/item/gun/ballistic/rocketlauncher/oneshot
price_min = 3000
@@ -370,3 +414,25 @@
stock_min = 1
stock_max = 5
availability_prob = 25
+
+/datum/blackmarket_item/weapon/oneshot/hedp
+ name = "Hammer-DP Launcher"
+ desc = "A one-shot solution to a myriad amount of problems, ranging from Exosuits to obnoxious neighbors. Contains one ready-to-fire 84mm HEDP rocket. "
+ item = /obj/item/gun/ballistic/rocketlauncher/oneshot/hedp
+
+ price_min = 4000
+ price_max = 6000
+ stock_min = 1
+ stock_max = 5
+ availability_prob = 10
+
+/datum/blackmarket_item/weapon/skm_lmg
+ name = "SKM-24u Light Machinegun"
+ desc = "Your regular rifles not have enough oomph for you? This SKM-24 was converted with help from a 'liberated' CM-40 parts shipment into a light machinegun, ready to blow away whatever you point it at. Increased firerate makes it buck like a mule, so keep that bipod on the ground. Drums sold separately!"
+ item = /obj/item/gun/ballistic/automatic/hmg/skm_lmg
+
+ price_min = 5000
+ price_max = 7000
+ stock_max = 2
+ availability_prob = 15
+ spawn_weighting = FALSE
diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm
index 37507132a8653..ca0e775851950 100644
--- a/code/modules/cargo/bounties/assistant.dm
+++ b/code/modules/cargo/bounties/assistant.dm
@@ -50,12 +50,6 @@
reward = 2000
wanted_types = list(/obj/structure/statue)
-/datum/bounty/item/assistant/clown_box
- name = "Clown Box"
- description = "The universe needs laughter. Stamp cardboard with a clown stamp and ship it out."
- reward = 1500
- wanted_types = list(/obj/item/storage/box/clown)
-
/datum/bounty/item/assistant/cheesiehonkers
name = "Cheesie Honkers"
description = "Apparently the company that makes Cheesie Honkers is going out of business soon. CentCom wants to stock up before it happens!"
diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm
index d4832a460fbc3..4c42d312ecec7 100644
--- a/code/modules/cargo/bounties/engineering.dm
+++ b/code/modules/cargo/bounties/engineering.dm
@@ -4,7 +4,7 @@
reward = 7500
wanted_types = list(/obj/item/tank)
var/moles_required = 20 // A full tank is 28 moles, but CentCom ignores that fact.
- var/gas_type = GAS_PLUOXIUM
+ var/gas_type = GAS_O3
/datum/bounty/item/engineering/gas/applies_to(obj/O)
if(!..())
@@ -12,11 +12,6 @@
var/obj/item/tank/T = O
return T.air_contents.get_moles(gas_type) >= moles_required
-/datum/bounty/item/engineering/gas/nitryl_tank
- name = "Full Tank of Nitryl"
- description = "The non-human staff of Station 88 has been volunteered to test performance enhancing drugs. Ship them a tank full of Nitryl so they can get started."
- gas_type = GAS_NITRYL
-
/datum/bounty/item/engineering/gas/freon_tank
name = "Full Tank of Freon"
description = "The Supermatter of station 33 has started the delamination process. Deliver a tank of Freon gas to help them stop it!"
diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm
index 0849efb6ede42..18fc501da945f 100644
--- a/code/modules/cargo/bounties/science.dm
+++ b/code/modules/cargo/bounties/science.dm
@@ -28,13 +28,6 @@
reward = 10000
wanted_types = list(/obj/item/clothing/glasses/night, /obj/item/clothing/glasses/meson/night, /obj/item/clothing/glasses/hud/health/night, /obj/item/clothing/glasses/hud/security/night, /obj/item/clothing/glasses/hud/diagnostic/night)
-/datum/bounty/item/science/experimental_welding_tool
- name = "Experimental Welding Tool"
- description = "A recent accident has left most of CentCom's welding tools exploded. Ship replacements to be rewarded."
- reward = 10000
- required_count = 3
- wanted_types = list(/obj/item/weldingtool/experimental)
-
/datum/bounty/item/science/cryostasis_beaker
name = "Cryostasis Beaker"
description = "Chemists at Central Command have discovered a new chemical that can only be held in cryostasis beakers. The only problem is they don't have any! Rectify this to receive payment."
diff --git a/code/modules/cargo/bounties/slime.dm b/code/modules/cargo/bounties/slime.dm
deleted file mode 100644
index 4aa0797c7002d..0000000000000
--- a/code/modules/cargo/bounties/slime.dm
+++ /dev/null
@@ -1,39 +0,0 @@
-/datum/bounty/item/slime
- reward = 3000
-
-/datum/bounty/item/slime/New()
- ..()
- description = "Nanotrasen's science lead is hunting for the rare and exotic [name]. A bounty has been offered for finding it."
- reward += rand(0, 4) * 500
-
-/datum/bounty/item/slime/green
- name = "Green Slime Extract"
- wanted_types = list(/obj/item/slime_extract/green)
-
-/datum/bounty/item/slime/pink
- name = "Pink Slime Extract"
- wanted_types = list(/obj/item/slime_extract/pink)
-
-/datum/bounty/item/slime/gold
- name = "Gold Slime Extract"
- wanted_types = list(/obj/item/slime_extract/gold)
-
-/datum/bounty/item/slime/oil
- name = "Oil Slime Extract"
- wanted_types = list(/obj/item/slime_extract/oil)
-
-/datum/bounty/item/slime/black
- name = "Black Slime Extract"
- wanted_types = list(/obj/item/slime_extract/black)
-
-/datum/bounty/item/slime/lightpink
- name = "Light Pink Slime Extract"
- wanted_types = list(/obj/item/slime_extract/lightpink)
-
-/datum/bounty/item/slime/adamantine
- name = "Adamantine Slime Extract"
- wanted_types = list(/obj/item/slime_extract/adamantine)
-
-/datum/bounty/item/slime/rainbow
- name = "Rainbow Slime Extract"
- wanted_types = list(/obj/item/slime_extract/rainbow)
diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm
index 3807e9bd6984a..ddc07ddab6113 100644
--- a/code/modules/cargo/bounty.dm
+++ b/code/modules/cargo/bounty.dm
@@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
// Called when the claim button is clicked. Override to provide fancy rewards.
/datum/bounty/proc/claim(datum/bank_account/claimer_account)
if(can_claim() && claimer_account)
- claimer_account.adjust_money(reward, "bounty")
+ claimer_account.adjust_money(reward, CREDIT_LOG_BOUNTY)
claimed = TRUE
// If an item sent in the cargo shuttle can satisfy the bounty.
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
// Returns a new bounty of random type, but does not add it to GLOB.bounties_list.
/proc/random_bounty()
- switch(rand(1, 13))
+ switch(rand(1, 12))
if(1)
var/subtype = pick(subtypesof(/datum/bounty/item/assistant))
return new subtype
@@ -103,18 +103,15 @@ GLOBAL_LIST_EMPTY(bounties_list)
var/subtype = pick(subtypesof(/datum/bounty/item/science))
return new subtype
if(9)
- var/subtype = pick(subtypesof(/datum/bounty/item/slime))
- return new subtype
- if(10)
var/subtype = pick(subtypesof(/datum/bounty/item/engineering))
return new subtype
- if(11)
+ if(10)
var/subtype = pick(subtypesof(/datum/bounty/item/mining))
return new subtype
- if(12)
+ if(11)
var/subtype = pick(subtypesof(/datum/bounty/item/medical))
return new subtype
- if(13)
+ if(12)
var/subtype = pick(subtypesof(/datum/bounty/item/botany))
return new subtype
@@ -153,10 +150,7 @@ GLOBAL_LIST_EMPTY(bounties_list)
/********************************Dynamic Gens********************************/
for(var/i in 0 to 1)
- if(prob(50))
- pick = pick(subtypesof(/datum/bounty/item/slime))
- else
- pick = pick(subtypesof(/datum/bounty/item/science))
+ pick = pick(subtypesof(/datum/bounty/item/science))
try_add_bounty(new pick)
/********************************Cutoff for Non-Low Priority Bounties********************************/
diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm
index 82fd2c11d01a8..1d937060b8c08 100644
--- a/code/modules/cargo/console.dm
+++ b/code/modules/cargo/console.dm
@@ -13,6 +13,8 @@
circuit = /obj/item/circuitboard/computer/cargo
light_color = COLOR_BRIGHT_ORANGE
+ /// The ship we reside on for ease of access
+ var/datum/overmap/ship/controlled/current_ship
var/contraband = FALSE
var/self_paid = FALSE
var/safety_warning = "For safety reasons, the automated supply shuttle \
@@ -47,7 +49,6 @@
obj_flags |= EMAGGED
else
obj_flags &= ~EMAGGED
- generate_pack_data()
/obj/machinery/computer/cargo/Destroy()
if(beacon)
@@ -77,6 +78,9 @@
board.obj_flags |= EMAGGED
update_static_data(user)
+/obj/machinery/computer/cargo/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
+ current_ship = port.current_ship
+
/obj/machinery/computer/cargo/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
@@ -85,21 +89,23 @@
if(!charge_account)
reconnect()
+/obj/machinery/computer/cargo/ui_static_data(mob/user)
+ . = ..()
+ var/outpost_docked = istype(current_ship.docked_to, /datum/overmap/outpost)
+ if(outpost_docked)
+ generate_pack_data()
+ else
+ supply_pack_data = list()
+
/obj/machinery/computer/cargo/ui_data(mob/user)
var/canBeacon = beacon && (isturf(beacon.loc) || ismob(beacon.loc))//is the beacon in a valid location?
var/list/data = list()
- // not a big fan of get_containing_shuttle
- var/obj/docking_port/mobile/D = SSshuttle.get_containing_shuttle(src)
- var/datum/overmap/ship/controlled/ship
- var/outpost_docked = FALSE
- if(D)
- ship = D.current_ship
- outpost_docked = istype(ship.docked_to, /datum/overmap/outpost)
-
- data["onShip"] = !isnull(ship)
- data["numMissions"] = ship ? LAZYLEN(ship.missions) : 0
- data["maxMissions"] = ship ? ship.max_missions : 0
+ var/outpost_docked = istype(current_ship.docked_to, /datum/overmap/outpost)
+
+ data["onShip"] = !isnull(current_ship)
+ data["numMissions"] = current_ship ? LAZYLEN(current_ship.missions) : 0
+ data["maxMissions"] = current_ship ? current_ship.max_missions : 0
data["outpostDocked"] = outpost_docked
data["points"] = charge_account ? charge_account.account_balance : 0
data["siliconUser"] = user.has_unlimited_silicon_privilege && check_ship_ai_access(user)
@@ -120,9 +126,7 @@
else if (use_beacon && !canBeacon)
message = "BEACON ERROR: MUST BE EXPOSED"//beacon's loc/user's loc must be a turf
data["message"] = message
- if(!supply_pack_data)
- generate_pack_data()
- stack_trace("You didn't give the cargo tech good advice, and he ripped the manifest. As a result, there was no pack data for [src]")
+
data["supplies"] = supply_pack_data
if (cooldown > 0)//cooldown used for printing beacons
cooldown--
@@ -130,37 +134,16 @@
data["shipMissions"] = list()
data["outpostMissions"] = list()
- if(ship)
- for(var/datum/mission/M as anything in ship.missions)
+ if(current_ship)
+ for(var/datum/mission/M as anything in current_ship.missions)
data["shipMissions"] += list(M.get_tgui_info())
if(outpost_docked)
- var/datum/overmap/outpost/out = ship.docked_to
+ var/datum/overmap/outpost/out = current_ship.docked_to
for(var/datum/mission/M as anything in out.missions)
data["outpostMissions"] += list(M.get_tgui_info())
return data
-/obj/machinery/computer/cargo/ui_static_data(mob/user)
- var/list/data = list()
- data["supplies"] = list()
- for(var/pack in SSshuttle.supply_packs)
- var/datum/supply_pack/P = SSshuttle.supply_packs[pack]
- if(!data["supplies"][P.group])
- data["supplies"][P.group] = list(
- "name" = P.group,
- "packs" = list()
- )
- if(P.hidden && !(obj_flags & EMAGGED))
- continue
- data["supplies"][P.group]["packs"] += list(list(
- "name" = P.name,
- "cost" = P.cost,
- "id" = pack,
- "desc" = P.desc || P.name, // If there is a description, use it. Otherwise use the pack's name.
- "small_item" = P.small_item,
- ))
- return data
-
/obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui)
. = ..()
if(.)
@@ -171,7 +154,7 @@
// no giving yourself money
if(!charge_account || !val || val <= 0)
return
- if(charge_account.adjust_money(-val))
+ if(charge_account.adjust_money(-val, CREDIT_LOG_WITHDRAW))
var/obj/item/holochip/cash_chip = new /obj/item/holochip(drop_location(), val)
if(ishuman(usr))
var/mob/living/carbon/human/user = usr
@@ -189,56 +172,56 @@
if (beacon)
beacon.update_status(SP_READY) //turns on the beacon's ready light
if("printBeacon")
- if(charge_account?.adjust_money(-BEACON_COST))
+ if(charge_account?.adjust_money(-BEACON_COST, "cargo_beacon"))
cooldown = 10//a ~ten second cooldown for printing beacons to prevent spam
var/obj/item/supplypod_beacon/C = new /obj/item/supplypod_beacon(drop_location())
C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc)
printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1
beacon.name = "Supply Pod Beacon #[printed_beacons]"
if("add")
- var/area/ship/current_area = get_area(src)
- var/datum/supply_pack/pack = SSshuttle.supply_packs[text2path(params["id"])]
- if( \
- !pack || !charge_account?.has_money(pack.cost) || !istype(current_area) || \
- !istype(current_area.mobile_port.current_ship.docked_to, /datum/overmap/outpost) \
- )
- return
+ var/datum/overmap/outpost/current_outpost = current_ship.docked_to
+ if(istype(current_ship.docked_to))
+ var/datum/supply_pack/current_pack = locate(params["ref"]) in current_outpost.supply_packs
+ var/same_faction = current_pack.faction ? current_pack.faction.allowed_faction(current_ship.faction_datum) : FALSE
+ var/total_cost = (same_faction && current_pack.faction_discount) ? current_pack.cost - (current_pack.cost * (current_pack.faction_discount * 0.01)) : current_pack.cost
+ if(!current_pack || !charge_account?.has_money(total_cost))
+ return
- var/turf/landing_turf
- if(!isnull(beacon) && use_beacon) // prioritize beacons over landing in cargobay
- landing_turf = get_turf(beacon)
- beacon.update_status(SP_LAUNCH)
- else if(!use_beacon)// find a suitable supplypod landing zone in cargobay
- var/list/empty_turfs = list()
- if(!landingzone)
- reconnect()
+ var/turf/landing_turf
+ if(!isnull(beacon) && use_beacon) // prioritize beacons over landing in cargobay
+ landing_turf = get_turf(beacon)
+ beacon.update_status(SP_LAUNCH)
+ else if(!use_beacon)// find a suitable supplypod landing zone in cargobay
+ var/list/empty_turfs = list()
if(!landingzone)
- WARNING("[src] couldnt find a Ship/Cargo (aka cargobay) area on a ship, and as such it has set the supplypod landingzone to the area it resides in.")
- landingzone = get_area(src)
- for(var/turf/open/floor/T in landingzone.contents)//uses default landing zone
- if(T.is_blocked_turf())
- continue
- empty_turfs += T
- CHECK_TICK
- landing_turf = pick(empty_turfs)
-
- // note that, because of CHECK_TICK above, we aren't sure if we can
- // afford the pack, even though we checked earlier. luckily adjust_money
- // returns false if the account can't afford the price
- if(landing_turf && charge_account.adjust_money(-pack.cost))
- var/name = "*None Provided*"
- var/rank = "*None Provided*"
- if(ishuman(usr))
- var/mob/living/carbon/human/H = usr
- name = H.get_authentification_name()
- rank = H.get_assignment(hand_first = TRUE)
- else if(issilicon(usr))
- name = usr.real_name
- rank = "Silicon"
- var/datum/supply_order/SO = new(pack, name, rank, usr.ckey, "")
- new /obj/effect/pod_landingzone(landing_turf, podType, SO)
- update_appearance() // ??????????????????
- return TRUE
+ reconnect()
+ if(!landingzone)
+ WARNING("[src] couldnt find a Ship/Cargo (aka cargobay) area on a ship, and as such it has set the supplypod landingzone to the area it resides in.")
+ landingzone = get_area(src)
+ for(var/turf/open/floor/T in landingzone.contents)//uses default landing zone
+ if(T.is_blocked_turf())
+ continue
+ empty_turfs += T
+ CHECK_TICK
+ landing_turf = pick(empty_turfs)
+
+ // note that, because of CHECK_TICK above, we aren't sure if we can
+ // afford the pack, even though we checked earlier. luckily adjust_money
+ // returns false if the account can't afford the price
+ if(landing_turf && charge_account.adjust_money(-total_cost, CREDIT_LOG_CARGO))
+ var/name = "*None Provided*"
+ var/rank = "*None Provided*"
+ if(ishuman(usr))
+ var/mob/living/carbon/human/H = usr
+ name = H.get_authentification_name()
+ rank = H.get_assignment(hand_first = TRUE)
+ else if(issilicon(usr))
+ name = usr.real_name
+ rank = "Silicon"
+ var/datum/supply_order/SO = new(current_pack, name, rank, usr.ckey, "", ordering_outpost = current_ship.docked_to)
+ new /obj/effect/pod_landingzone(landing_turf, podType, SO)
+ update_appearance() // ??????????????????
+ return TRUE
if("mission-act")
var/datum/mission/mission = locate(params["ref"])
@@ -255,7 +238,7 @@
else if(mission.servant == ship)
if(mission.can_complete())
mission.turn_in()
- else
+ else if(tgui_alert(usr, "Give up on [mission]?", src, list("Yes", "No")) == "Yes")
mission.give_up()
return TRUE
@@ -277,7 +260,7 @@
/obj/machinery/computer/cargo/attackby(obj/item/W, mob/living/user, params)
var/value = W.get_item_credit_value()
if(value && charge_account)
- charge_account.adjust_money(value)
+ charge_account.adjust_money(value, CREDIT_LOG_DEPOSIT)
to_chat(user, "You deposit [W]. The Vessel Budget is now [charge_account.account_balance] cr.")
qdel(W)
return TRUE
@@ -292,20 +275,35 @@
/obj/machinery/computer/cargo/proc/generate_pack_data()
supply_pack_data = list()
- for(var/pack in SSshuttle.supply_packs)
- var/datum/supply_pack/P = SSshuttle.supply_packs[pack]
- if(!supply_pack_data[P.group])
- supply_pack_data[P.group] = list(
- "name" = P.group,
+
+ if(!current_ship.docked_to)
+ return supply_pack_data
+
+ var/datum/overmap/outpost/outpost_docked = current_ship.docked_to
+
+ if(!istype(outpost_docked))
+ return supply_pack_data
+
+ for(var/datum/supply_pack/current_pack as anything in outpost_docked.supply_packs)
+ if(!supply_pack_data[current_pack.group])
+ supply_pack_data[current_pack.group] = list(
+ "name" = current_pack.group,
"packs" = list()
)
- if((P.hidden))
+ if((current_pack.hidden))
+ continue
+ var/same_faction = current_pack.faction ? current_pack.faction.allowed_faction(current_ship.faction_datum) : FALSE
+ var/discountedcost = (same_faction && current_pack.faction_discount) ? current_pack.cost - (current_pack.cost * (current_pack.faction_discount * 0.01)) : null
+ if(current_pack.faction_locked && !same_faction)
continue
- supply_pack_data[P.group]["packs"] += list(list(
- "name" = P.name,
- "cost" = P.cost,
- "id" = pack,
- "desc" = P.desc || P.name // If there is a description, use it. Otherwise use the pack's name.
+ supply_pack_data[current_pack.group]["packs"] += list(list(
+ "name" = current_pack.name,
+ "cost" = current_pack.cost,
+ "discountedcost" = discountedcost ? discountedcost : null,
+ "discountpercent" = current_pack.faction_discount,
+ "faction_locked" = current_pack.faction_locked, //this will only show if you are same faction, so no issue
+ "ref" = REF(current_pack),
+ "desc" = (current_pack.desc || current_pack.name) + (discountedcost ? "\n-[current_pack.faction_discount]% off due to your faction affiliation.\nWas [current_pack.cost]" : "") + (current_pack.faction_locked ? "\nYou are able to purchase this item due to your faction affiliation." : "") // If there is a description, use it. Otherwise use the pack's name.
))
/obj/machinery/computer/cargo/retro
diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm
index be3ec7a26599c..165cfb6c11964 100644
--- a/code/modules/cargo/exports.dm
+++ b/code/modules/cargo/exports.dm
@@ -59,7 +59,8 @@ then the player gets the profit from selling his own wasted time.
if(!dry_run && (sold || delete_unsold))
if(ismob(thing))
thing.investigate_log("deleted through cargo export",INVESTIGATE_CARGO)
- qdel(thing)
+ if(!dry_run)
+ qdel(AM)
return report
diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm
index 030e51cf24f80..bb556dc786132 100644
--- a/code/modules/cargo/exports/large_objects.dm
+++ b/code/modules/cargo/exports/large_objects.dm
@@ -98,8 +98,5 @@
var/worth = 10
worth += C.air_contents.get_moles(GAS_BZ)*2
- worth += C.air_contents.get_moles(GAS_STIMULUM)*100
- worth += C.air_contents.get_moles(GAS_HYPERNOB)*1000
worth += C.air_contents.get_moles(GAS_TRITIUM)*4
- worth += C.air_contents.get_moles(GAS_PLUOXIUM)*5
return worth
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index c585ecb25a98c..ba721f10213f2 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -23,8 +23,7 @@
/datum/export/lavaland/major //valuable chest/ruin loot and staff of storms
cost = 10000
unit_name = "lava planet artifact"
- export_types = list(/obj/item/guardiancreator,
- /obj/item/rod_of_asclepius,
+ export_types = list(/obj/item/rod_of_asclepius,
/obj/item/clothing/suit/space/hardsuit/ert/paranormal,
/obj/item/prisoncube,
/obj/item/staff/storm,
@@ -40,12 +39,11 @@
cost = 40000
unit_name = "major lava planet artifact"
export_types = list(/obj/item/hierophant_club,
- /obj/item/melee/transforming/cleaving_saw,
+ /obj/item/melee/cleaving_saw,
/obj/item/organ/vocal_cords/colossus,
/obj/machinery/anomalous_crystal,
/obj/item/mayhem,
/obj/item/blood_contract,
- /obj/item/guardiancreator/miner/choose//this is basically the most valulable mining loot so good luck getting a miner to part ways
)
/*
/datum/export/lavaland/trophycommon
diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm
index 287fba69aaa01..efb0cfdb4a574 100644
--- a/code/modules/cargo/exports/tools.dm
+++ b/code/modules/cargo/exports/tools.dm
@@ -96,10 +96,6 @@
exclude_types = list(/obj/item/radio/mech)
//Advanced/Power Tools.
-/datum/export/weldingtool/experimental
- cost = 90
- unit_name = "experimental welding tool"
- export_types = list(/obj/item/weldingtool/experimental)
/datum/export/jawsoflife
cost = 100
diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm
index c6ee67ed091ea..118cfa8a69e2f 100644
--- a/code/modules/cargo/exports/weapons.dm
+++ b/code/modules/cargo/exports/weapons.dm
@@ -41,12 +41,6 @@
unit_name = "WT-550 automatic rifle"
export_types = list(/obj/item/gun/ballistic/automatic/smg/wt550)
-/datum/export/weapon/shotgun
- cost = 300
- unit_name = "combat shotgun"
- export_types = list(/obj/item/gun/ballistic/shotgun/automatic/combat)
-
-
/datum/export/weapon/flashbang
cost = 5
unit_name = "flashbang grenade"
diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm
index 560fc46668de3..2a05796e67fcf 100644
--- a/code/modules/cargo/gondolapod.dm
+++ b/code/modules/cargo/gondolapod.dm
@@ -20,7 +20,7 @@
layer = TABLE_LAYER//so that deliveries dont appear underneath it
loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 2, /obj/item/reagent_containers/food/snacks/meat/slab/gondola = 2)
//Gondolas aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
maxHealth = 200
diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm
index e802bf1aa2742..010e4e3d0ef71 100644
--- a/code/modules/cargo/order.dm
+++ b/code/modules/cargo/order.dm
@@ -15,15 +15,21 @@
var/reason
var/datum/supply_pack/pack
var/datum/bank_account/paying_account
+ var/datum/overmap/outpost/ordering_outpost
-/datum/supply_order/New(datum/supply_pack/pack, orderer, orderer_rank, orderer_ckey, reason, paying_account)
- id = SSshuttle.ordernum++
+/datum/supply_order/New(datum/supply_pack/pack, orderer, orderer_rank, orderer_ckey, reason, paying_account, ordering_outpost)
src.pack = pack
src.orderer = orderer
src.orderer_rank = orderer_rank
src.orderer_ckey = orderer_ckey
src.reason = reason
src.paying_account = paying_account
+ src.ordering_outpost = ordering_outpost
+ if(src.ordering_outpost)
+ id = src.ordering_outpost.ordernum++
+ if(pack)
+ SSblackbox.record_feedback("nested tally", "crate_ordered", 1, list(pack.name, "amount"))
+ SSblackbox.record_feedback("nested tally", "crate_ordered", pack.cost, list(pack.name, "cost"))
/datum/supply_order/proc/generateRequisition(turf/T)
var/obj/item/paper/requisition_paper = new(T)
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index e6555fc58b6e7..4e26a713a6b23 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -10,11 +10,9 @@
var/admin_spawned = FALSE
var/small_item = FALSE //Small items can be grouped into a single crate.
- var/faction
- /* to be implmented
+ var/datum/faction/faction
var/faction_discount = 15
var/faction_locked = FALSE
- */
/datum/supply_pack/proc/generate(atom/A, datum/bank_account/paying_account)
var/obj/structure/closet/crate/C
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index 8d8f47a05f658..d3b87bb2aed95 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -1,431 +1,441 @@
/datum/supply_pack/ammo
- group = "Ammunition"
+ group = "Bulk Ammunition"
crate_type = /obj/structure/closet/crate/secure/gear
+ crate_name = "ammo crate"
-/*
- Pistol ammo
-*/
-
-/datum/supply_pack/ammo/co9mm_mag
- name = "9mm Commander Magazine Crate"
- desc = "Contains a 9mm magazine for the standard-issue Commander pistol, containing ten rounds."
- contains = list(/obj/item/ammo_box/magazine/co9mm)
- cost = 500
+/* Misc */
-/datum/supply_pack/ammo/m45_mag
- name = ".45 ACP Candor Magazine Crate"
- desc = "Contains a .45 ACP magazine for the Candor pistol, containing eight rounds."
- contains = list(/obj/item/ammo_box/magazine/m45)
- cost = 500
+/datum/supply_pack/ammo/blank_ammo_disk
+ name = "Blank Ammo Design Disk Crate"
+ desc = "Run your own training drills!"
+ cost = 1000
+ contains = list(/obj/item/disk/design_disk/blanks)
-/datum/supply_pack/ammo/a44roum_speedloader
- name = ".44 Roumain Speedloader Crate"
- desc = "Contains a .44 Roumain speedloader for the HP Montagne, containing six rounds."
- contains = list(/obj/item/ammo_box/a44roum_speedloader)
- cost = 400
+/* .22lr */
-/datum/supply_pack/ammo/c38_mag
- name = ".38 Speedloader Crate"
- desc = "Contains a .38 speedloader for revolvers, containing six rounds."
- contains = list(/obj/item/ammo_box/c38)
+/datum/supply_pack/ammo/c22lr
+ name = ".22 LR Ammo Box Crate"
+ desc = "Contains a 100-round ammo box for refilling .22 LR weapons."
+ contains = list(/obj/item/storage/box/ammo/c22lr)
cost = 250
-/datum/supply_pack/ammo/m10mm_mag
- name = "10mm ringneck Magazine Crate"
- desc = "Contains a 10mm magazine for the ringneck pistol, containing ten rounds."
- contains = list(/obj/item/ammo_box/magazine/m10mm_ringneck)
- cost = 500
+/datum/supply_pack/ammo/c22lr_hp
+ name = ".22 LR HP Ammo Box Crate"
+ desc = "Contains a 100-round hollow point ammo box for refilling .22 LR weapons."
+ contains = list(/obj/item/storage/box/ammo/c22lr/hp)
+ cost = 600
-/datum/supply_pack/ammo/a357_mag
- name = ".357 Speedloader Crate"
- desc = "Contains a .357 speedloader for revolvers, containing seven rounds."
- contains = list(/obj/item/ammo_box/a357)
- cost = 750
-
-/datum/supply_pack/ammo/mag_556mm
- name = "5.56 Pistole C Magazine Crate"
- desc = "Contains a 5.56mm magazine for the Pistole C, containing twelve rounds."
- contains = list(/obj/item/ammo_box/magazine/pistol556mm)
- cost = 750
- faction = FACTION_SOLGOV
-
-/datum/supply_pack/ammo/fms_mag
- name = "Ferromagnetic Slug Magazine Crate"
- desc = "Contains a ferromagnetic slug magazine for the Model H pistol, containing ten rounds."
- contains = list(/obj/item/ammo_box/magazine/modelh)
- cost = 750
- faction = FACTION_SOLGOV
-
-/*
- Shotgun ammo
-*/
+/datum/supply_pack/ammo/c22lr_ap
+ name = ".22 LR AP Ammo Box Crate"
+ desc = "Contains a 100-round armour piercing ammo box for refilling .22 LR weapons."
+ contains = list(/obj/item/storage/box/ammo/c22lr/ap)
+ cost = 600
-/datum/supply_pack/ammo/buckshot
- name = "Buckshot Crate"
- desc = "Contains a box of twenty-five buckshot shells for use in lethal persuasion."
- cost = 500
- contains = list(/obj/item/ammo_box/a12g)
-/datum/supply_pack/ammo/slugs
- name = "Shotgun Slug Crate"
- desc = "Contains a box of twenty-five slug shells for use in lethal persuasion."
- cost = 500
- contains = list(/obj/item/ammo_box/a12g/slug)
+/* 9mm */
-/datum/supply_pack/ammo/blank_shells
- name = "Blank Shell Crate"
- desc = "Contains a box of blank shells."
- cost = 500
- contains = list(/obj/item/ammo_box/a12g/blanks)
+/datum/supply_pack/ammo/c9mm_ammo_box
+ name = "9mm Ammo Box Crate"
+ desc = "Contains a 60-round 9mm box for pistols and SMGs such as the Commander or Saber."
+ contains = list(/obj/item/storage/box/ammo/c9mm)
+ cost = 200
-/datum/supply_pack/ammo/blank_ammo_disk
- name = "Blank Ammo Design Disk Crate"
- desc = "Run your own training drills!"
- cost = 1000
- contains = list(/obj/item/disk/design_disk/blanks)
+/datum/supply_pack/ammo/c9mmap_ammo_box
+ name = "9mm AP Ammo Box Crate"
+ desc = "Contains a 60-round 9mm box loaded with armor piercing ammo."
+ contains = list(/obj/item/storage/box/ammo/c9mm_ap)
+ cost = 400
-/datum/supply_pack/ammo/techshells
- name = "Unloaded Shotgun Technological Shells Crate"
- desc = "Contains a box of 7 versatile tech shells, capable of producing a variety of deadly effects for any situation. Some assembly required."
- cost = 210
- contains = list(/obj/item/storage/box/techshot)
+/datum/supply_pack/ammo/c9mmhp_ammo_box
+ name = "9mm HP Ammo Box Crate"
+ desc = "Contains a 60-round 9mm box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/c9mm_hp)
+ cost = 400
-/datum/supply_pack/ammo/rubbershot
- name = "Rubbershot Crate"
- desc = "Contains a box of twenty-five rubbershot shells for use in crowd control or training."
- cost = 500
- contains = list(/obj/item/ammo_box/a12g/rubbershot)
+/datum/supply_pack/ammo/c9mmrubber_ammo_box
+ name = "9mm Rubber Ammo Box Crate"
+ desc = "Contains a 60-round 9mm box loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/storage/box/ammo/c9mm_rubber)
+ cost = 200
-/*
- .38 ammo
-*/
+/* .38 */
-/datum/supply_pack/ammo/winchester_ammo
+/datum/supply_pack/ammo/c38
name = ".38 Ammo Boxes Crate"
desc = "Contains two 50 round ammo boxes for refilling .38 weapons."
cost = 250
- contains = list(/obj/item/ammo_box/c38_box,
- /obj/item/ammo_box/c38_box)
+ contains = list(/obj/item/storage/box/ammo/c38,
+ /obj/item/storage/box/ammo/c38)
crate_name = "ammo crate"
-/datum/supply_pack/ammo/match
- name = ".38 Match Grade Speedloader"
- desc = "Contains one speedloader of match grade .38 ammunition, perfect for showing off trickshots."
- cost = 200
- small_item = TRUE
- contains = list(/obj/item/ammo_box/c38/match)
- crate_name = ".38 match crate"
+/* 10mm */
-/datum/supply_pack/ammo/dumdum
- name = ".38 DumDum Speedloader"
- desc = "Contains one speedloader of .38 DumDum ammunition, good for embedding in soft targets."
- cost = 200
- small_item = TRUE
- contains = list(/obj/item/ammo_box/c38/dumdum)
- crate_name = ".38 match crate"
-
-/*
- WT-550 ammo
-*/
-
-/datum/supply_pack/ammo/wt550_ammo
- name = "WT-550 Auto Rifle Ammo Crate"
- desc = "Contains a 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads."
- cost = 750
- contains = list(/obj/item/ammo_box/magazine/wt550m9)
-
-/datum/supply_pack/ammo/cool_wt550_ammo
- name = "WT-550 Auto Rifle Exotic Ammo Crate"
- desc = "Contains one magazine of armor-piercing and one magazine of incendiary ammunition for the WT-550 Auto Rifle. Sadly, our manufacturer discontinued the uranium-tipped bullets."
- cost = 2500
- contains = list(/obj/item/ammo_box/magazine/wt550m9/ap,
- /obj/item/ammo_box/magazine/wt550m9/inc)
-
-/datum/supply_pack/ammo/smgm45ammo
- name = ".45 Cobra Ammo Crate"
- desc = "Contains a .45 magazine for the Cobra-20, containing 24 rounds."
- cost = 750
- contains = list(/obj/item/ammo_box/magazine/m45_cobra)
-
-/*
- Rifle ammo
-*/
-
-/datum/supply_pack/ammo/gal308_ammo
- name = "CM-GAL .308 Magazine Crate"
- desc = "Contains a .308 CM-GAL magazine for the CM-GAL rifle, containing ten rounds."
- contains = list(/obj/item/ammo_box/magazine/f4_308)
- cost = 1000
+/datum/supply_pack/ammo/c10mm_ammo_box
+ name = "10mm Ammo Box Crate"
+ desc = "Contains a 48-round 10mm box for pistols and SMGs like the Ringneck or the SkM-44(k)."
+ contains = list(/obj/item/storage/box/ammo/c10mm)
+ cost = 250
-/datum/supply_pack/ammo/gar_ammo
- name = "GAR Ferromagnetic Lance Magazine Crate"
- desc = "Contains a ferromagnetic lance magazine for the GAR rifle, containing thirty two rounds."
- contains = list(/obj/item/ammo_box/magazine/gar)
- cost = 1000
+/datum/supply_pack/ammo/c10mmap_ammo_box
+ name = "10mm AP Ammo Box Crate"
+ desc = "Contains a 48-round 10mm box loaded with armor piercing ammo."
+ contains = list(/obj/item/storage/box/ammo/c10mm_ap)
+ cost = 500
-/datum/supply_pack/ammo/claris_ammo
- name = "Claris Ferromagnetic Pellet Speedloader Crate"
- desc = "Contains a ferromagnetic pellet speedloader for the Claris rifle, containing twenty two rounds."
- contains = list(/obj/item/ammo_box/amagpellet_claris)
- cost = 1000
+/datum/supply_pack/ammo/c10mmhp_ammo_box
+ name = "10mm HP Ammo Box Crate"
+ desc = "Contains a 48-round 10mm box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/c10mm_hp)
+ cost = 500
-/datum/supply_pack/ammo/ebr_ammo
- name = "M514 EBR .308 Magazine Crate"
- desc = "Contains a .308 magazine for the M514 EBR rifle, containing ten rounds."
- contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/small)
- cost = 1000
+/datum/supply_pack/ammo/c10mmrubber_ammo_box
+ name = "10mm Rubber Ammo Box Crate"
+ desc = "Contains a 48-round 10mm box loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/storage/box/ammo/c10mm_rubber)
+ cost = 250
-/datum/supply_pack/ammo/skm_ammo
- name = "SKM 7.62x40mm CLIP Magazine Crate"
- desc = "Contains a 7.62x40mm magazine for the SKM rifles, containing twenty rounds."
- contains = list(/obj/item/ammo_box/magazine/skm_762_40)
- cost = 1000
+/* .45 */
-/datum/supply_pack/ammo/p16_ammo
- name = "P-16 5.56mm Magazine Crate"
- desc = "Contains a 5.56mm magazine for the P-16 rifle, containing thirty rounds. Notably, these are also compatable with the CM-82 rifle."
- contains = list(/obj/item/ammo_box/magazine/p16)
- cost = 1000
+/datum/supply_pack/ammo/c45_ammo_box
+ name = ".45 Ammo Box Crate"
+ desc = "Contains a 48-round .45 box for pistols and SMGs like the Candor or the C-20r."
+ contains = list(/obj/item/storage/box/ammo/c45)
+ cost = 250
-/datum/supply_pack/ammo/boomslang_ammo
- name = "Boomslang-90 Magazine Crate"
- desc = "Contains a 6.5 CLIP magazine for the Boomslang-90 rifle, containing five rounds."
- contains = list(/obj/item/ammo_box/magazine/boomslang/short)
- cost = 1000
+/datum/supply_pack/ammo/c45ap_ammo_box
+ name = ".45 AP Ammo Box Crate"
+ desc = "Contains a 48-round .45 box loaded with armor piercing ammo."
+ contains = list(/obj/item/storage/box/ammo/c45_ap)
+ cost = 500
-/datum/supply_pack/ammo/a762_ammo_box
- name = "7.62x40mm CLIP Ammo Box Crate"
- desc = "Contains a one hundred and twenty-round 7.62x40mm CLIP box for the SKM rifles."
- contains = list(/obj/item/ammo_box/a762_40)
+/datum/supply_pack/ammo/c45hp_ammo_box
+ name = ".45 HP Ammo Box Crate"
+ desc = "Contains a 48-round .45 box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/c45_hp)
cost = 500
-/datum/supply_pack/ammo/a556_ammo_box
- name = "5.56x42mm CLIP Ammo Box Crate"
- desc = "Contains a one hundred and twenty-round 5.56x42mm CLIP box for most newer rifles."
- contains = list(/obj/item/ammo_box/a556_42)
- cost = 450
+/datum/supply_pack/ammo/c45mmrubber_ammo_box
+ name = ".45 Rubber Ammo Box Crate"
+ desc = "Contains a 48-round .45 box loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/storage/box/ammo/c45_rubber)
+ cost = 250
+
+/* .357 */
/datum/supply_pack/ammo/a357_ammo_box
name = ".357 Ammo Box Crate"
- desc = "Contains a fifty-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand."
- contains = list(/obj/item/ammo_box/a357_box)
+ desc = "Contains a 48-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand."
+ contains = list(/obj/item/storage/box/ammo/a357)
cost = 250
-/datum/supply_pack/ammo/c556mmHITP_ammo_box
- name = "5.56 Caseless Ammo Box Crate"
- desc = "Contains a fifty-round 5.56mm caseless box for SolGov sidearms like the Pistole C."
- contains = list(/obj/item/ammo_box/c556mmHITP)
+/datum/supply_pack/ammo/a357hp_ammo_box
+ name = ".357 HP Ammo Box Crate"
+ desc = "Contains a 48-round .357 box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/a357_hp)
+ cost = 500
+
+/datum/supply_pack/ammo/a357match_ammo_box
+ name = ".357 Match Ammo Box Crate"
+ desc = "Contains a 48-round .357 match box for better performance against armor."
+ contains = list(/obj/item/storage/box/ammo/a357_match)
+ cost = 500
+
+/* .44 */
+
+/datum/supply_pack/ammo/a44roum
+ name = ".44 Roumain Ammo Box Crate"
+ desc = "Contains a 48-round box of .44 roumain ammo for revolvers such as the Shadow and Montagne."
+ contains = list(/obj/item/storage/box/ammo/a44roum)
cost = 250
-/datum/supply_pack/ammo/c45_ammo_box
- name = ".45 Ammo Box Crate"
- desc = "Contains a fifty-round .45 box for pistols and SMGs like the Candor or the C-20r."
- contains = list(/obj/item/ammo_box/c45)
+/datum/supply_pack/ammo/a44roum_rubber
+ name = ".44 Roumain Rubber Ammo Box Crate"
+ desc = "Contains a 48-round box of .44 roumain ammo loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/storage/box/ammo/a44roum_rubber)
cost = 250
-/datum/supply_pack/ammo/c10mm_ammo_box
- name = "10mm Ammo Box Crate"
- desc = "Contains a fifty-round 10mm box for pistols and SMGs like the Ringneck or the SkM-44(k)."
- contains = list(/obj/item/ammo_box/c10mm)
+/datum/supply_pack/ammo/a44roum_hp
+ name = ".44 Roumain Hollow Point Ammo Box Crate"
+ desc = "Contains a 48-round box of .44 roumain hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/a44roum_hp)
+ cost = 500
+
+/* 4.6x30 */
+
+/datum/supply_pack/ammo/c46x30mm_boxcrate
+ name = "4.6x30mm Ammo Box Crate"
+ desc = "Contains an 80-round 4.6x30mm box for PDWs such as the WT-550."
+ contains = list(/obj/item/storage/box/ammo/c46x30mm)
cost = 250
-/datum/supply_pack/ammo/c9mm_ammo_box
- name = "9mm Ammo Box Crate"
- desc = "Contains a fifty-round 9mm box for pistols and SMGs such as the Commander or Saber."
- contains = list(/obj/item/ammo_box/c9mm)
- cost = 200
+/datum/supply_pack/ammo/c46x30mm_ap
+ name = "4.6x30mm Armour Piercing Ammo Box Crate"
+ desc = "Contains a 80-round 4.6x30mm armour piercing box for PDWs such as the WT-550."
+ contains = list(/obj/item/storage/box/ammo/c46x30mm/ap)
+ cost = 500
-/datum/supply_pack/ammo/a308_ammo_box
- name = "308 Ammo Box Crate"
- desc = "Contains a thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S."
- contains = list(/obj/item/ammo_box/a308)
+/datum/supply_pack/ammo/c46x30mm_hp
+ name = "4.6x30mm Hollow Point Ammo Box Crate"
+ desc = "Contains a 80-round 4.6x30mm hollow point box for PDWs such as the WT-550."
+ contains = list(/obj/item/storage/box/ammo/c46x30mm/hp)
cost = 500
-/datum/supply_pack/ammo/c9mmap_ammo_box
- name = "9mm AP Ammo Box Crate"
- desc = "Contains a fifty-round 9mm box loaded with armor piercing ammo."
- contains = list(/obj/item/ammo_box/c9mm/ap)
- cost = 400
-/datum/supply_pack/ammo/a357match_ammo_box
- name = ".357 Match Ammo Box Crate"
- desc = "Contains a fifty-round .357 match box for better performance against armor."
- contains = list(/obj/item/ammo_box/a357_box/match)
+/* 5.7x39 */
+
+/datum/supply_pack/ammo/c57x39mm_boxcrate
+ name = "5.7x39mm Ammo Box Crate"
+ desc = "Contains two 48-round 5.7x39mm box for PDWs such as the Sidewinder."
+ contains = list(
+ /obj/item/storage/box/ammo/c57x39,
+ /obj/item/storage/box/ammo/c57x39,
+ )
+ cost = 350
+
+/datum/supply_pack/ammo/c57x39mm_ap
+ name = "5.7x39mm Armour Piercing Ammo Box Crate"
+ desc = "Contains two 48-round 5.7x39mm box for PDWs such as the Sidewinder."
+ contains = list(
+ /obj/item/storage/box/ammo/c57x39/ap,
+ /obj/item/storage/box/ammo/c57x39/ap,
+ )
+ cost = 700
+
+/datum/supply_pack/ammo/c57x39mm_hp
+ name = "5.7x39mm Hollow Point Ammo Box Crate"
+ desc = "Contains two 48-round 5.7x39mm Hollow Point boxes for PDWs such as the Sidewinder."
+ contains = list(
+ /obj/item/storage/box/ammo/c57x39/hp,
+ /obj/item/storage/box/ammo/c57x39/hp,
+ )
+ cost = 700
+
+/* 12 Gauge */
+
+/datum/supply_pack/ammo/buckshot
+ name = "Buckshot Crate"
+ desc = "Contains a box of 32 buckshot shells for use in lethal persuasion."
cost = 500
+ contains = list(/obj/item/storage/box/ammo/a12g_buckshot)
-/datum/supply_pack/ammo/c556mmHITPap_ammo_box
- name = "5.56 caseless AP Ammo Box Crate"
- desc = "Contains a fifty-round 5.56mm caseless boxloaded with armor piercing ammo."
- contains = list(/obj/item/ammo_box/c556mmHITP/ap)
+/datum/supply_pack/ammo/slugs
+ name = "Shotgun Slug Crate"
+ desc = "Contains a box of 32 slug shells for use in lethal persuasion."
cost = 500
+ contains = list(/obj/item/storage/box/ammo/a12g_slug)
-/datum/supply_pack/ammo/c45ap_ammo_box
- name = ".45 AP Ammo Box Crate"
- desc = "Contains a fifty-round .45 box loaded with armor piercing ammo."
- contains = list(/obj/item/ammo_box/c45/ap)
+/datum/supply_pack/ammo/blank_shells
+ name = "Blank Shell Crate"
+ desc = "Contains a box of blank shells."
cost = 500
+ contains = list(/obj/item/storage/box/ammo/a12g_blank)
-/datum/supply_pack/ammo/c10mmap_ammo_box
- name = "10mm AP Ammo Box Crate"
- desc = "Contains a fifty-round 10mm box loaded with armor piercing ammo."
- contains = list(/obj/item/ammo_box/c10mm/ap)
+/datum/supply_pack/ammo/rubbershot
+ name = "Rubbershot Crate"
+ desc = "Contains a box of 32 12 gauge rubbershot shells. Perfect for crowd control and training."
cost = 500
+ contains = list(/obj/item/storage/box/ammo/a12g_rubbershot)
-/datum/supply_pack/ammo/c9mmhp_ammo_box
- name = "9mm HP Ammo Box Crate"
- desc = "Contains a fifty-round 9mm box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/c9mm/hp)
+/datum/supply_pack/ammo/techshells
+ name = "Unloaded Shotgun Technological Shells Crate"
+ desc = "Contains a box of 7 versatile tech shells, capable of producing a variety of deadly effects for any situation. Some assembly required."
+ cost = 210
+ contains = list(/obj/item/storage/box/techshot)
+
+/* .45-70 */
+
+/datum/supply_pack/ammo/a4570_box
+ name = ".45-70 Ammo Box Crate"
+ desc = "Contains a 20-round box containing devastatingly powerful .45-70 caliber ammunition."
+ contains = list(/obj/item/storage/box/ammo/a4570)
cost = 400
-/datum/supply_pack/ammo/a357hp_ammo_box
- name = ".357 HP Ammo Box Crate"
- desc = "Contains a fifty-round .357 box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/a357_box/hp)
- cost = 500
+/datum/supply_pack/ammo/a4570_box/match
+ name = ".45-70 Match Crate"
+ desc = "Contains a 20-round box containing devastatingly powerful .45-70 caliber ammunition, that travels faster, pierces armour better, and ricochets off targets."
+ contains = list(/obj/item/storage/box/ammo/a4570_match)
+ cost = 800
-/datum/supply_pack/ammo/c10mmhp_ammo_box
- name = "10mm HP Ammo Box Crate"
- desc = "Contains a fifty-round 10mm box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/c10mm/hp)
- cost = 500
-/datum/supply_pack/ammo/c45hp_ammo_box
- name = ".45 HP Ammo Box Crate"
- desc = "Contains a fifty-round 10mm box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/c45/hp)
- cost = 500
+/* 7.62 */
-/datum/supply_pack/ammo/c556mmhitphp_ammo_box
- name = "5.56 Caseless HP Ammo Box Crate"
- desc = "Contains a fifty-round 5.56mm caseless box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/c556mmHITP/hp)
+/datum/supply_pack/ammo/a762_ammo_box
+ name = "7.62x40mm CLIP Ammo Box Crate"
+ desc = "Contains two 60-round 7.62x40mm CLIP boxes for the SKM rifles."
+ contains = list(/obj/item/storage/box/ammo/a762_40,
+ /obj/item/storage/box/ammo/a762_40)
cost = 500
-/datum/supply_pack/ammo/c9mmrubber_ammo_box
- name = "9mm Rubber Ammo Box Crate"
- desc = "Contains a fifty-round 9mm box loaded with less-than-lethal rubber rounds."
- contains = list(/obj/item/ammo_box/c9mm/rubbershot)
- cost = 200
+/datum/supply_pack/ammo/a762_ap
+ name = "7.62x40mm CLIP Armour Piercing Ammo Box Crate"
+ desc = "Contains two 60-round 7.62x40mm CLIP Armour Piercing boxes for the SKM rifles."
+ contains = list(/obj/item/storage/box/ammo/a762_40/ap,
+ /obj/item/storage/box/ammo/a762_40/ap)
+ cost = 1000
-/datum/supply_pack/ammo/c10mmrubber_ammo_box
- name = "10mm Rubber Ammo Box Crate"
- desc = "Contains a fifty-round 10mm box loaded with less-than-lethal rubber rounds."
- contains = list(/obj/item/ammo_box/c10mm/rubbershot)
- cost = 250
+/datum/supply_pack/ammo/a762_hp
+ name = "7.62x40mm CLIP Hollow Point Ammo Box Crate"
+ desc = "Contains two 60-round 7.62x40mm CLIP Hollow Point boxes for the SKM rifles."
+ contains = list(/obj/item/storage/box/ammo/a762_40/hp,
+ /obj/item/storage/box/ammo/a762_40/hp)
+ cost = 1000
-/datum/supply_pack/ammo/c45mmrubber_ammo_box
- name = ".45 Rubber Ammo Box Crate"
- desc = "Contains a fifty-round .45 box loaded with less-than-lethal rubber rounds."
- contains = list(/obj/item/ammo_box/c45/rubbershot)
- cost = 250
+/* 5.56 */
+
+/datum/supply_pack/ammo/a556_ammo_box
+ name = "5.56x42mm CLIP Ammo Box Crate"
+ desc = "Contains two 60-round 5.56x42mm CLIP boxes for most newer rifles."
+ contains = list(/obj/item/storage/box/ammo/a556_42,
+ /obj/item/storage/box/ammo/a556_42)
+ cost = 450
+/datum/supply_pack/ammo/a556_ap
+ name = "5.56x42mm CLIP Armour Piercing Ammo Box Crate"
+ desc = "Contains two 60-round 5.56x42mm CLIP Armour Piercing boxes for most newer rifles."
+ contains = list(/obj/item/storage/box/ammo/a556_42/ap,
+ /obj/item/storage/box/ammo/a556_42/ap)
+ cost = 900
-/datum/supply_pack/ammo/c556HITPrubber_ammo_box
- name = "5.56 Caseless Rubber Ammo Box Crate"
- desc = "Contains a fifty-round 5.56 caseless box loaded with less-than-lethal rubber rounds."
- contains = list(/obj/item/ammo_box/c556mmHITP/rubbershot)
+/datum/supply_pack/ammo/a556_hp
+ name = "5.56x42mm CLIP Hollow Point Ammo Box Crate"
+ desc = "Contains two 60-round 5.56x42mm CLIP Hollow Point boxes for most newer rifles."
+ contains = list(/obj/item/storage/box/ammo/a556_42/hp,
+ /obj/item/storage/box/ammo/a556_42/hp)
+ cost = 900
+
+/* 5.56 caseless */
+
+/datum/supply_pack/ammo/c556mmHITP_ammo_box
+ name = "5.56 Caseless Ammo Box Crate"
+ desc = "Contains a 48-round 5.56mm caseless box for SolGov sidearms like the Pistole C."
+ contains = list(/obj/item/storage/box/ammo/c556mm)
cost = 250
-/datum/supply_pack/ammo/guncell
- name = "Weapon Cell Crate"
- desc = "Contains a weapon cell, compatible with laser guns."
- contains = list(/obj/item/stock_parts/cell/gun)
+/datum/supply_pack/ammo/c556mmHITPap_ammo_box
+ name = "5.56 caseless AP Ammo Box Crate"
+ desc = "Contains a 48-round 5.56mm caseless boxloaded with armor piercing ammo."
+ contains = list(/obj/item/storage/box/ammo/c556mm_ap)
cost = 500
-/datum/supply_pack/ammo/guncell/kalix
- name = "Etherbor Cell Crate"
- desc = "Contains an Etherbor weapon cell, compatible with Etherbor armaments with a slightly higher capacity."
- contains = list(/obj/item/stock_parts/cell/gun/kalix)
- cost = 600
+/datum/supply_pack/ammo/c556mmhitphp_ammo_box
+ name = "5.56 Caseless HP Ammo Box Crate"
+ desc = "Contains a 48-round 5.56mm caseless box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/c556mm_hp)
+ cost = 500
-/datum/supply_pack/ammo/c57x39mm_boxcrate
- name = "5.7x39mm Ammo Box Crate"
- desc = "Contains a fifty-round 5.7x39mm box for PDWs such as the Sidewinder."
- contains = list(/obj/item/ammo_box/c57x39mm_box)
+/datum/supply_pack/ammo/c556HITPrubber_ammo_box
+ name = "5.56 Caseless Rubber Ammo Box Crate"
+ desc = "Contains a 48-round 5.56 caseless box loaded with less-than-lethal rubber rounds."
+ contains = list(/obj/item/storage/box/ammo/c556mm_rubber)
cost = 250
-/datum/supply_pack/ammo/c46x30mm_boxcrate
- name = "4.6x30mm Ammo Box Crate"
- desc = "Contains a fifty-round 4.6x30mm box for PDWs such as the WT-550."
- contains = list(/obj/item/ammo_box/c46x30mm_box)
- cost = 250
+/* .299 */
+
+/datum/supply_pack/ammo/c299
+ name = ".299 Eoehoma Caseless Ammo Box Crate"
+ desc = "Contains two 60-round boxes of .299 Caseless ammo from the defunct Eoehoma. Used for the E-40 Hybrid Rifle."
+ contains = list(/obj/item/storage/box/ammo/c299,
+ /obj/item/storage/box/ammo/c299)
+ cost = 400
+
+/* 8x50 */
/datum/supply_pack/ammo/c8x50mm_boxcrate
name = "8x50mm Ammo Box Crate"
- desc = "Contains a twenty-round 8x50mm ammo box for rifles such as the Illestren."
- contains = list(/obj/item/ammo_box/c8x50mm_box)
+ desc = "Contains a 40-round 8x50mm ammo box for rifles such as the Illestren."
+ contains = list(/obj/item/storage/box/ammo/a8_50r)
cost = 250
/datum/supply_pack/ammo/c8x50mm_boxhp_boxcrate
name = "8x50mm Hollow Point Crate"
- desc = "Contains a twenty-round 8x50mm ammo box loaded with hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/c8x50mmhp_box)
+ desc = "Contains a 40-round 8x50mm ammo box loaded with hollow point ammo, great against unarmored targets."
+ contains = list(/obj/item/storage/box/ammo/a8_50r/hp)
+ cost = 500
+
+/datum/supply_pack/ammo/c8x50mm_tracbox
+ name = "8x50mm Tracker Crate"
+ desc = "Contains a 30-round 8x50mm ammo box loaded with tracker ammo, great for sustained hunts."
+ contains = list(/obj/item/storage/box/ammo/a8_50r/trac)
cost = 500
+
+/* .300 */
+
/datum/supply_pack/ammo/a300_box
name = ".300 Ammo Box Crate"
desc = "Contains a twenty-round .300 Magnum ammo box for sniper rifles such as the HP Scout."
- contains = list(/obj/item/ammo_box/a300_box)
+ contains = list(/obj/item/storage/box/ammo/a300)
cost = 400
+/datum/supply_pack/ammo/a300_trac
+ name = ".300 Trac Ammo Box Crate"
+ desc = "Contains a ten-round .300 TRAC ammo box for sniper rifles such as the HP Scout."
+ contains = list(/obj/item/storage/box/ammo/a300/trac)
+ cost = 600
+
+
+/* .308 */
+
+/datum/supply_pack/ammo/a308_ammo_box
+ name = "308 Ammo Box Crate"
+ desc = "Contains a thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S."
+ contains = list(/obj/item/storage/box/ammo/a308)
+ cost = 500
+
+/datum/supply_pack/ammo/a308_ap
+ name = "308 Armour Piercing Ammo Box Crate"
+ desc = "Contains a thirty-round .308 armour piercing box for DMRs such as the SsG-04 and CM-GAL-S."
+ contains = list(/obj/item/storage/box/ammo/a308/ap)
+ cost = 500
+
+/datum/supply_pack/ammo/a308_hp
+ name = "308 Hollow Point Ammo Box Crate"
+ desc = "Contains a thirty-round .308 hollow point box for DMRs such as the SsG-04 and CM-GAL-S."
+ contains = list(/obj/item/storage/box/ammo/a308/hp)
+ cost = 500
+
+/* 6.5 */
+
/datum/supply_pack/ammo/a65clip_box
name = "6.5x57mm CLIP Ammo Box Crate"
desc = "Contains a twenty-round 6.5x57mm CLIP ammo box for various sniper rifles such as the CM-F90 and the Boomslang series."
- contains = list(/obj/item/ammo_box/a65clip_box)
+ contains = list(/obj/item/storage/box/ammo/a65clip)
cost = 400
+/datum/supply_pack/ammo/a65clip_trackers
+ name = "6.5x57mm CLIP Tracker Shell Crate"
+ desc = "Contains a 10-round 6.5x57mm CLIP tracker box for various sniper rifles such as the CM-F90 and the Boomslang series."
+ contains = list(/obj/item/storage/box/ammo/a65clip/trac)
+ cost = 600
-/datum/supply_pack/ammo/a4570_box
- name = ".45-70 Ammo Box Crate"
- desc = "Contains a twelve-round box containing devastatingly powerful .45-70 caliber ammunition."
- contains = list(/obj/item/ammo_box/a4570)
- cost = 500
+/* 8x58 */
-/datum/supply_pack/ammo/a4570_box/match
- name = ".45-70 Match Crate"
- desc = "Contains a twelve-round box containing devastatingly powerful .45-70 caliber ammunition, that travels faster, pierces armour better, and ricochets off targets."
- contains = list(/obj/item/ammo_box/a4570/match)
- cost = 750
+/datum/supply_pack/ammo/a858
+ name = "8x58mm Ammo Box Crate"
+ desc = "Contains a twenty-round 8x58 ammo box for Solarian-manufactured sniper rifles, such as the SSG-69."
+ contains = list(/obj/item/storage/box/ammo/a858)
+ cost = 400
+
+
+/* ferro pellets */
/datum/supply_pack/ammo/ferropelletboxcrate
name = "Ferromagnetic Pellet Box Crate"
- desc = "Contains a fifty-round ferromagnetic pellet ammo box for gauss guns such as the Claris."
- contains = list(/obj/item/ammo_box/ferropelletbox)
+ desc = "Contains a 48-round ferromagnetic pellet ammo box for gauss guns such as the Claris."
+ contains = list(/obj/item/storage/box/ammo/ferropellet)
cost = 250
+/* ferroslugs */
+
/datum/supply_pack/ammo/ferroslugboxcrate
name = "Ferromagnetic Slug Box Crate"
desc = "Contains a twenty-round ferromagnetic slug for gauss guns such as the Model-H."
- contains = list(/obj/item/ammo_box/ferroslugbox)
+ contains = list(/obj/item/storage/box/ammo/ferroslug)
cost = 250
+/* ferro lances */
+
/datum/supply_pack/ammo/ferrolanceboxcrate
name = "Ferromagnetic Lance Box Crate"
- desc = "Contains a fifty-round box for high-powered gauss guns such as the GAR assault rifle."
- contains = list(/obj/item/ammo_box/ferrolancebox)
- cost = 250
-
-/datum/supply_pack/ammo/a44roum
- name = ".44 Roumain Ammo Box Crate"
- desc = "Contains a fifty-round box of .44 roumain ammo for revolvers such as the Shadow and Montagne."
- contains = list(/obj/item/ammo_box/a44roum)
- cost = 250
-
-/datum/supply_pack/ammo/a44roum_rubber
- name = ".44 Roumain Rubber Ammo Box Crate"
- desc = "Contains a fifty-round box of .44 roumain ammo loaded with less-than-lethal rubber rounds."
- contains = list(/obj/item/ammo_box/a44roum/rubber)
- cost = 250
-
-/datum/supply_pack/ammo/a44roum_hp
- name = ".44 Roumain Hollow Point Ammo Box Crate"
- desc = "Contains a fifty-round box of .44 roumain hollow point ammo, great against unarmored targets."
- contains = list(/obj/item/ammo_box/a44roum/hp)
- cost = 500
-
-/datum/supply_pack/ammo/c22lr
- name = ".22 LR Ammo Box Crate"
- desc = "Contains two 75 round ammo boxes for refilling .22 LR weapons."
- contains = list(/obj/item/ammo_box/c22lr_box,
- /obj/item/ammo_box/c22lr_box)
- crate_name = "ammo crate"
+ desc = "Contains a 48-round box for high-powered gauss guns such as the GAR assault rifle."
+ contains = list(/obj/item/storage/box/ammo/ferrolance)
cost = 250
diff --git a/code/modules/cargo/packs/animal.dm b/code/modules/cargo/packs/animal.dm
index 621d376035d6e..50a9d607b2859 100644
--- a/code/modules/cargo/packs/animal.dm
+++ b/code/modules/cargo/packs/animal.dm
@@ -105,7 +105,7 @@
/datum/supply_pack/animal/fox
name = "Fox Crate"
- desc = "The fox goes...? Comes with a collar!"//what does the fox say // awful
+ desc = "The fox goes...? Comes with a collar!"//what does the fox say // awful //yip
cost = 5000
contains = list(/mob/living/simple_animal/pet/fox,
/obj/item/clothing/neck/petcollar)
diff --git a/code/modules/cargo/packs/canister.dm b/code/modules/cargo/packs/canister.dm
index c63a4f3e2a516..00fed0ff679f4 100644
--- a/code/modules/cargo/packs/canister.dm
+++ b/code/modules/cargo/packs/canister.dm
@@ -43,7 +43,7 @@
/datum/supply_pack/canister/nitrous_oxide
name = "Nitrous Oxide Canister"
- desc = "Contains a canister of nitrous oxide. Clowns love it!"
+ desc = "Contains a canister of nitrous oxide. Guaranted to make someone giggle!"
cost = 2500
contains = list(/obj/machinery/portable_atmospherics/canister/nitrous_oxide)
crate_name = "nitrous oxide canister crate"
diff --git a/code/modules/cargo/packs/civilian.dm b/code/modules/cargo/packs/civilian.dm
index 0b1d7303ca443..9e0e8c7af6f7a 100644
--- a/code/modules/cargo/packs/civilian.dm
+++ b/code/modules/cargo/packs/civilian.dm
@@ -41,14 +41,6 @@
crate_name = "janitorial cart crate"
crate_type = /obj/structure/closet/crate/large
-/datum/supply_pack/civilian/lawnmower
- name = "Lawnmower"
- desc = "Removing plant from your backyard now made easy with the brand new Donk! Co. TM Deluxe Lawnmower 3003."
- cost = 800
- contains = list(/obj/vehicle/ridden/lawnmower)
- crate_name = "Donk! Co. TM Deluxe Lawnmower 3003"
- crate_type = /obj/structure/closet/crate/large
-
/*
Bundles
*/
@@ -86,11 +78,11 @@
contains = list(/obj/item/storage/box/fountainpens)
crate_name = "calligraphy crate"
crate_type = /obj/structure/closet/crate/wooden
- faction = FACTION_SOLGOV
+ faction = /datum/faction/solgov
/datum/supply_pack/civilian/wrapping_paper
name = "Festive Wrapping Paper Crate"
- desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, the Clown's severed head? You can do all that, with this crate full of wrapping paper."
+ desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, flattened flowers? You can do all that, with this crate full of wrapping paper."
cost = 1000
contains = list(/obj/item/stack/wrapping_paper)
crate_name = "festive wrapping paper crate"
@@ -98,7 +90,7 @@
/datum/supply_pack/civilian/paper
name = "Bureaucracy Crate"
- desc = "High stacks of papers on your desk Are a big problem - make it Pea-sized with these bureaucratic supplies! Contains six pens, some camera film, hand labeler supplies, a paper bin, a carbon paper bin, three folders, a laser pointer, two clipboards and two stamps."//that was too forced
+ desc = "High stacks of papers on your desk are a big problem - make it Pea-sized with these bureaucratic supplies! Contains six pens, some camera film, hand labeler supplies, a paper bin, a carbon paper bin, three folders, a laser pointer, two clipboards and two stamps."//that was too forced
cost = 1000
contains = list(/obj/structure/filingcabinet/chestdrawer/wheeled,
/obj/item/camera_film,
@@ -248,67 +240,3 @@
contains = list(/obj/machinery/jukebox)
crate_name = "Jukebox"
-/datum/supply_pack/civilian/fishingkit
- name = "Fishing Starter Kit"
- desc = "The bare necessities to get out there and catch some fish, all in one convenient box!"
- cost = 500
- contains = list(/obj/item/storage/toolbox/fishing,
- /obj/item/book/fish_catalog,
- /obj/item/reagent_containers/food/drinks/beer,
- /obj/item/reagent_containers/food/drinks/beer)
- crate_name = "fishing starter crate"
- crate_type = /obj/structure/closet/crate/wooden
-
-/datum/supply_pack/civilian/fishstasis
- name = "Fish Stasis Kit Supply Crate"
- desc = "Contains four stasis cases meant to keep fish alive during transportation."
- cost = 1000
- contains = list(/obj/item/storage/fish_case,
- /obj/item/storage/fish_case,
- /obj/item/storage/fish_case,
- /obj/item/storage/fish_case)
- crate_name = "stasis case crate"
-
-/datum/supply_pack/civilian/premiumworms
- name = "High Quality Worm Pack"
- desc = "A selection of the system's finest worms, guaranteed to lure in only the largest of fish."
- cost = 1000
- contains = list(/obj/item/bait_can/worm/premium,
- /obj/item/bait_can/worm/premium,
- /obj/item/bait_can/worm/premium,
- /obj/item/bait_can/worm/premium)
- crate_name = "premium worm crate"
-
-/datum/supply_pack/civilian/masterworkpole
- name = "Custom Made Masterwork Fishing Rod"
- desc = "Fishing rod forged after grueling hours of labor by a master rodsmith, truly a work of fishing art. Required to catch size 2 fish."
- cost = 5000
- contains = list(/obj/item/fishing_rod/master)
- crate_name = "masterwork fishing rod case"
- crate_type = /obj/structure/closet/crate/wooden
-
-/datum/supply_pack/civilian/fishinghooks
- name = "Fishing Hook Variety Pack"
- desc = "A variety of fishing hooks to allow for more specialized fishing."
- cost = 1000
- contains = list(/obj/item/storage/box/fishing_hooks)
- crate_name = "fishing hook crate"
- crate_type = /obj/structure/closet/crate/wooden
-
-/datum/supply_pack/civilian/fishinglines
- name = "Fishing Line Pack"
- desc = "Contains the necessary fishing lines for catching more exotic fish."
- cost = 1000
- contains = list(/obj/item/storage/box/fishing_lines,
- /obj/item/storage/box/fishing_lines) //Comes with two boxes on account of these being more necessary than the hooks
- crate_name = "fishing line crate"
- crate_type = /obj/structure/closet/crate/wooden
-
-/datum/supply_pack/civilian/aquarium
- name = "Aquarium Construction Kit"
- desc = "Why seek rare fish if not to show them off? This all-in-one aquarium kit's all you'll ever need to keep a stable population of fish onboard your ship! (Building materials not included, Aquatech Ltd. is a limited liability company and not responsible for any fish related mishaps)"
- cost = 2000
- contains = list(/obj/item/aquarium_kit,
- /obj/item/storage/box/aquarium_props,
- /obj/item/fish_feed)
- crate_name = "aquarium kit crate"
diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm
index cab2ac8563afd..03d8cffd03689 100644
--- a/code/modules/cargo/packs/costumes_toys.dm
+++ b/code/modules/cargo/packs/costumes_toys.dm
@@ -73,7 +73,7 @@
var/the_toy
for(var/i in 1 to 5)
if(prob(50))
- the_toy = pickweight(GLOB.arcade_prize_pool)
+ the_toy = pick_weight(GLOB.arcade_prize_pool)
else
the_toy = pick(subtypesof(/obj/item/toy/plush))
new the_toy(C)
@@ -84,7 +84,7 @@
/datum/supply_pack/costumes_toys/costume_original
name = "Original Costume Crate"
- desc = "Reenact Shakespearean plays with this assortment of outfits. Contains eight different costumes!"
+ desc = "Reenact Solarian plays with this assortment of outfits. Contains eight different costumes!"
cost = 1000
contains = list(/obj/item/clothing/head/snowman,
/obj/item/clothing/suit/snowman,
@@ -103,7 +103,7 @@
/datum/supply_pack/costumes_toys/mafia/fill(obj/structure/closet/crate/C)
for(var/i in 1 to 4)
- new /obj/effect/spawner/lootdrop/mafia_outfit(C)
+ new /obj/effect/spawner/random/clothing/mafia_outfit(C)
new /obj/item/virgin_mary(C)
if(prob(30)) //Not all mafioso have mustaches, some people also find this item annoying.
new /obj/item/clothing/mask/fakemoustache/italian(C)
@@ -151,7 +151,7 @@
/obj/item/lipstick/random)
crate_name = "formalwear crate"
crate_type = /obj/structure/closet/crate/wooden
- faction = FACTION_SOLGOV
+ faction = /datum/faction/solgov
// this is technically armor but you aren't buying it for that. it's a joke pack so it goes here
/datum/supply_pack/costumes_toys/justiceinbound
@@ -159,7 +159,7 @@
desc = "This is it. The Bee's Knees. The Creme of the Crop. The Pick of the Litter. The best of the best of the best. The Crown Jewel of Nanotrasen. The Alpha and the Omega of security headwear. Guaranteed to strike fear into the hearts of each and every criminal unfortunate enough to hear its screeching wail bore into their soul. Also comes with a security gasmask."
cost = 6000 //justice comes at a price. An expensive, noisy price.
contains = list(/obj/item/clothing/head/helmet/justice,
- /obj/item/clothing/mask/gas/sechailer)
+ /obj/item/clothing/mask/gas)
crate_name = "security clothing crate"
/datum/supply_pack/costumes_toys/collectable_hats
diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm
index 3759dc6d8d110..41401dbce4771 100644
--- a/code/modules/cargo/packs/emergency.dm
+++ b/code/modules/cargo/packs/emergency.dm
@@ -24,8 +24,8 @@
name = "Plasmaman Internals Crate"
desc = "Contains two plasmaman belt tanks, for when you just can't bear to refill a normal tank with plasma. Plasma canisters sold separately."
cost = 100
- contains = list(/obj/item/tank/internals/plasmaman/belt,
- /obj/item/tank/internals/plasmaman/belt)
+ contains = list(/obj/item/tank/internals/plasmaman/belt/full,
+ /obj/item/tank/internals/plasmaman/belt/full)
crate_name = "plasmaman internals crate"
/datum/supply_pack/emergency/plasmaman_suit
diff --git a/code/modules/cargo/packs/exploration.dm b/code/modules/cargo/packs/exploration.dm
index 5f70f2b9c2a1f..3a02f59c9b7a4 100644
--- a/code/modules/cargo/packs/exploration.dm
+++ b/code/modules/cargo/packs/exploration.dm
@@ -2,17 +2,13 @@
group = "Exploration"
crate_type = /obj/structure/closet/crate/wooden
-/*
- Basic survival kits for worlds.
-*/
+/* Exploration Gear */
/datum/supply_pack/exploration/lava
name = "Lava Exploration Kit"
- desc = "Contains two pickaxes, 60 lavaproof rods, two pocket extinguishers and goggles to protect yourself from the heat."
+ desc = "Contains 60 lavaproof rods, two pocket extinguishers and goggles to protect yourself from the heat."
cost = 500
contains = list(
- /obj/item/pickaxe/mini,
- /obj/item/pickaxe/mini,
/obj/item/extinguisher/mini,
/obj/item/extinguisher/mini,
/obj/item/clothing/glasses/heat,
@@ -22,23 +18,11 @@
)
crate_name = "Lava Exploration Kit"
-/datum/supply_pack/exploration/lavaproof_ords
- name ="Lavaproof Rods Crate"
- desc = "Contains 60 lavaproof rods for safely traversing molten pits."
- cost = 200
- contains = list(
- /obj/item/stack/rods/lava/thirty,
- /obj/item/stack/rods/lava/thirty,
- )
- crate_name = "Lavaproof Rod Crate"
-
/datum/supply_pack/exploration/ice
name = "Ice Exploration Kit"
- desc = "Contains two pickaxes, 2 sets of winter clothes and ice hiking boots, along with goggles to protect eyes from the cold."
+ desc = "Contains 2 sets of winter clothes and ice hiking boots, along with goggles to protect eyes from the cold."
cost = 500
contains = list(
- /obj/item/pickaxe/mini,
- /obj/item/pickaxe/mini,
/obj/item/clothing/glasses/cold,
/obj/item/clothing/glasses/cold,
/obj/item/clothing/suit/hooded/wintercoat,
@@ -48,48 +32,21 @@
)
crate_name = "Ice Exploration Kit"
-/datum/supply_pack/exploration/jungle
- name = "Jungle Exploration Kit"
- desc = "Contains a hatchets, two picks and lanterns, plus antivenom pills, great for dense jungles!"
- cost = 500
- contains = list(
- /obj/item/pickaxe/mini,
- /obj/item/pickaxe/mini,
- /obj/item/flashlight/lantern,
- /obj/item/flashlight/lantern,
- /obj/item/storage/pill_bottle/charcoal,
- /obj/item/storage/pill_bottle/charcoal,
- /obj/item/hatchet,
- /obj/item/hatchet,
- )
- crate_name = "Jungle Exploration Kit"
-
-/datum/supply_pack/exploration/beach
- name = "Beach Kit"
- desc = "Shorts, picks, and (low quality) sunglasses, perfect for the beach!"
- cost = 500
- contains = list(
- /obj/item/pickaxe/mini,
- /obj/item/pickaxe/mini,
- /obj/item/clothing/under/shorts/black,
- /obj/item/clothing/under/shorts/blue,
- /obj/item/clothing/under/shorts/green,
- /obj/item/clothing/under/shorts/grey,
- /obj/item/clothing/under/shorts/purple,
- /obj/item/clothing/under/shorts/red,
- /obj/item/clothing/glasses/cheapsuns,
- /obj/item/clothing/glasses/cheapsuns,
- /obj/item/clothing/glasses/cheapsuns,
- /obj/item/clothing/glasses/cheapsuns,
- /obj/item/clothing/glasses/cheapsuns,
- /obj/item/clothing/glasses/cheapsuns,
- )
- crate_name = "Beach Kit"
/*
General Exploration Gear
*/
+/datum/supply_pack/exploration/lavaproof_rods
+ name ="Lavaproof Rods Crate"
+ desc = "Contains 60 lavaproof rods for safely traversing molten pits."
+ cost = 200
+ contains = list(
+ /obj/item/stack/rods/lava/thirty,
+ /obj/item/stack/rods/lava/thirty,
+ )
+ crate_name = "Lavaproof Rod Crate"
+
/datum/supply_pack/exploration/capsules
name = "Bluespace Shelter Capsule"
desc = "Contains a Bluespace Shelter Capsule, for instant shelter in rough situations."
@@ -100,7 +57,7 @@
/datum/supply_pack/exploration/binocular
name = "Binoculars"
- desc = "One pair of binoculars for surveying terrain."
+ desc = "Contains one pair of binoculars for surveying terrain."
cost = 200
contains = list(
/obj/item/binoculars
@@ -108,7 +65,7 @@
/datum/supply_pack/exploration/anom_neutralizer
name = "Anomaly Neutralizer"
- desc = "A single use anomaly neutralizer for stabalizing hazardous anomalies."
+ desc = "Contains a single use anomaly neutralizer for stabilizing hazardous anomalies."
cost = 250
contains = list(
/obj/item/anomaly_neutralizer
@@ -124,7 +81,7 @@
/datum/supply_pack/exploration/gps
name = "GPS"
- desc = "Contains a GPS device, useful for finding lost things and not getting lost yourself."
+ desc = "Contains a GPS device, useful for keeping track of yourself and others."
cost = 100
contains = list(
/obj/item/gps
@@ -140,3 +97,11 @@
/obj/item/storage/box/flares,
/obj/item/storage/box/flares,
)
+
+/datum/supply_pack/exploration/nvg
+ name = "Night Vision Goggles"
+ desc = "Contains a singular pair of Night Vision Goggles, for all your spelunking and military LARP occasions."
+ cost = 1000
+ contains = list(
+ /obj/item/clothing/glasses/night
+ )
diff --git a/code/modules/cargo/packs/fishing.dm b/code/modules/cargo/packs/fishing.dm
new file mode 100644
index 0000000000000..7f1a8c279bc1b
--- /dev/null
+++ b/code/modules/cargo/packs/fishing.dm
@@ -0,0 +1,68 @@
+/datum/supply_pack/fish
+ group = "Fishing Essentials"
+
+
+/datum/supply_pack/fish/fishingkit
+ name = "Fishing Starter Kit"
+ desc = "The bare necessities to get out there and catch some fish, all in one convenient box!"
+ cost = 500
+ contains = list(/obj/item/storage/toolbox/fishing,
+ /obj/item/book/fish_catalog,
+ /obj/item/reagent_containers/food/drinks/beer,
+ /obj/item/reagent_containers/food/drinks/beer)
+ crate_name = "fishing starter crate"
+ crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/fish/fishstasis
+ name = "Fish Stasis Kit Supply Crate"
+ desc = "Contains four stasis cases meant to keep fish alive during transportation."
+ cost = 1000
+ contains = list(/obj/item/storage/fish_case,
+ /obj/item/storage/fish_case,
+ /obj/item/storage/fish_case,
+ /obj/item/storage/fish_case)
+ crate_name = "stasis case crate"
+
+/datum/supply_pack/fish/premiumworms
+ name = "High Quality Worm Pack"
+ desc = "A selection of the system's finest worms, guaranteed to lure in only the largest of fish."
+ cost = 1000
+ contains = list(/obj/item/bait_can/worm/premium,
+ /obj/item/bait_can/worm/premium,
+ /obj/item/bait_can/worm/premium,
+ /obj/item/bait_can/worm/premium)
+ crate_name = "premium worm crate"
+
+/datum/supply_pack/fish/masterworkpole
+ name = "Custom Made Masterwork Fishing Rod"
+ desc = "Fishing rod forged after grueling hours of labor by a master rodsmith, truly a work of fishing art. Required to catch size 2 fish."
+ cost = 5000
+ contains = list(/obj/item/fishing_rod/master)
+ crate_name = "masterwork fishing rod case"
+ crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/fish/fishinghooks
+ name = "Fishing Hook Variety Pack"
+ desc = "A variety of fishing hooks to allow for more specialized fishing."
+ cost = 1000
+ contains = list(/obj/item/storage/box/fishing_hooks)
+ crate_name = "fishing hook crate"
+ crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/fish/fishinglines
+ name = "Fishing Line Pack"
+ desc = "Contains the necessary fishing lines for catching more exotic fish."
+ cost = 1000
+ contains = list(/obj/item/storage/box/fishing_lines,
+ /obj/item/storage/box/fishing_lines) //Comes with two boxes on account of these being more necessary than the hooks
+ crate_name = "fishing line crate"
+ crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/fish/aquarium
+ name = "Aquarium Construction Kit"
+ desc = "Why seek rare fish if not to show them off? This all-in-one aquarium kit's all you'll ever need to keep a stable population of fish onboard your ship! (Building materials not included, Aquatech Ltd. is a limited liability company and not responsible for any fish related mishaps)"
+ cost = 2000
+ contains = list(/obj/item/aquarium_kit,
+ /obj/item/storage/box/aquarium_props,
+ /obj/item/fish_feed)
+ crate_name = "aquarium kit crate"
diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm
index 364c53ec9eb51..1661e4a6637dd 100644
--- a/code/modules/cargo/packs/food.dm
+++ b/code/modules/cargo/packs/food.dm
@@ -16,7 +16,7 @@
/obj/item/storage/box/donkpockets/donkpockethonk)
crate_name = "donk pocket crate"
crate_type = /obj/structure/closet/crate/freezer
- faction = FACTION_SYNDICATE
+ faction = /datum/faction/syndicate
/datum/supply_pack/food/donkpockets/fill(obj/structure/closet/crate/C)
for(var/i in 1 to 3)
@@ -45,14 +45,14 @@
/datum/supply_pack/food/ration
name = "Ration Crate"
- desc = "6 standerd issue rations."
+ desc = "6 standard issue rations. For your inner jarhead."
cost = 500
- contains = list(/obj/effect/spawner/lootdrop/ration,
- /obj/effect/spawner/lootdrop/ration,
- /obj/effect/spawner/lootdrop/ration,
- /obj/effect/spawner/lootdrop/ration,
- /obj/effect/spawner/lootdrop/ration,
- /obj/effect/spawner/lootdrop/ration)
+ contains = list(/obj/effect/spawner/random/food_or_drink/ration,
+ /obj/effect/spawner/random/food_or_drink/ration,
+ /obj/effect/spawner/random/food_or_drink/ration,
+ /obj/effect/spawner/random/food_or_drink/ration,
+ /obj/effect/spawner/random/food_or_drink/ration,
+ /obj/effect/spawner/random/food_or_drink/ration)
crate_name = "ration crate"
crate_type = /obj/structure/closet/crate
@@ -94,7 +94,7 @@
/datum/supply_pack/food/ingredients_randomized
name = "Exotic Meat Crate"
- desc = "The best cuts in the whole galaxy. Probably."
+ desc = "The best cuts in the whole sector. Probably."
cost = 500
contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime,
/obj/item/reagent_containers/food/snacks/meat/slab/killertomato,
@@ -117,7 +117,7 @@
/datum/supply_pack/food/ingredients_randomized/meat
name = "Standard Meat Crate"
- desc = "Less interesting cuts of meat, but filling nonetheless."
+ desc = "Less interesting, yet filling cuts of meat."
cost = 300
contains = list(/obj/item/reagent_containers/food/snacks/meat/slab,
/obj/item/reagent_containers/food/snacks/meat/slab/chicken,
@@ -130,7 +130,7 @@
/datum/supply_pack/food/ingredients_randomized/vegetables
name = "Vegetables Crate"
- desc = "Grown in vats."
+ desc = "Grown in the finest hydroponic vats."
cost = 250
contains = list(/obj/item/reagent_containers/food/snacks/grown/chili,
/obj/item/reagent_containers/food/snacks/grown/corn,
diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm
index 4074f76194d34..e89eb64ccb2c8 100644
--- a/code/modules/cargo/packs/gun.dm
+++ b/code/modules/cargo/packs/gun.dm
@@ -1,6 +1,7 @@
/datum/supply_pack/gun
group = "Guns"
crate_type = /obj/structure/closet/crate/secure/weapon
+ faction_discount = 10
/*
Pistols
@@ -10,65 +11,155 @@
name = "Disposable Gun Crate"
desc = "In some sectors, these disposable pistols are the only firearms that can be legally sold for less than 200cr. That price is still far too high."
cost = 300
- contains = list(/obj/item/storage/pistolcase/disposable)
+ contains = list(/obj/item/storage/guncase/pistol/disposable)
crate_name = "disposable gun crate"
- faction = FACTION_FRONTIER
/datum/supply_pack/gun/derringer
name = ".38 Derringer Crate"
desc = "A cheap, concealable pistol manufactured by the reputable Hunter's Pride. At least it's better than a disposable pistol. Chambered in .38 rounds."
cost = 350
- contains = list(/obj/item/storage/pistolcase/derringer)
+ contains = list(/obj/item/storage/guncase/pistol/derringer)
crate_name = "derringer crate"
- faction = FACTION_SRM
+ faction = /datum/faction/srm
+
+/datum/supply_pack/gun/m17
+ name = "M17 pistol Crate"
+ desc = "A cheap target shooting pistol manufactured by Serene Outdoors. Chambered in .22lr"
+ cost = 400
+ contains = list(/obj/item/storage/guncase/pistol/m17)
+ crate_name = "pistol crate"
/datum/supply_pack/gun/commanders
name = "Commander Pistol Crate"
- desc = "Contains a modified Candor 'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
+ desc = "Contains a double stacked Commander pistol, produced by Nanotrasen along with Vigilitas Interstellar and is chambered in 9mm."
cost = 750
- contains = list(/obj/item/storage/pistolcase/commander)
- faction = FACTION_NT
+ contains = list(/obj/item/storage/guncase/pistol/commander)
+ faction = /datum/faction/nt
+ faction_discount = 20
/datum/supply_pack/gun/ringneck
name = "Ringneck Pistol Crate"
- desc = "Contains a civillian variant of the Ringneck pistol, produced by Scarborough Arms and chambered in 10mm."
+ desc = "Contains a civilian variant of the Ringneck pistol, produced by Scarborough Arms and chambered in 10mm."
+ cost = 1000
+ contains = list(/obj/item/storage/guncase/pistol/ringneck)
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/gun/cm23
+ name = "CM-23 Pistol Crate"
+ desc = "Contains a 10mm CM-23 Pistol, standard issue of the Colonial Minutemen."
cost = 1000
- contains = list(/obj/item/storage/pistolcase/ringneck)
- faction = FACTION_SYNDICATE
+ contains = list(/obj/item/storage/guncase/pistol/cm23)
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/cm70
+ name = "CM-70 Machinepistol Crate"
+ desc = "Contains a 9mm machinepistol produced proudly within Lanchester City. Colonial Minuteman issue only."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/pistol/cm70)
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/commissioner
+ name = "Commissioner Pistol Crate"
+ desc = "Contains a modified Commander pistol, adjusted to fit the IRMG's standards and painted in the brown and gold of all IRMG firearms."
+ cost = 750
+ contains = list(/obj/item/storage/guncase/commissioner)
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
/datum/supply_pack/gun/candors
name = "Candor Pistol Crate"
desc = "Contains a Candor pistol, the trusty sidearm of any spacer, produced by Hunter's Pride and chambered in .45 ACP."
cost = 1000
- contains = list(/obj/item/storage/pistolcase/candor)
- faction = FACTION_SRM
+ contains = list(/obj/item/storage/guncase/pistol/candor)
+ faction = /datum/faction/srm
+
+/datum/supply_pack/gun/asp
+ name = "BC-81 'Asp' Crate"
+ desc = "Contains a compact armor-piercing sidearm, chambered in 5.7mm"
+ cost = 1250
+ contains = list(/obj/item/storage/guncase/pistol/asp)
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/pistolec
+ name = "Pistole 'C' Crate"
+ desc = "Contains a compact solarian-produced sidearm, chambered in 5.56mm HITP. Not to be confused with 5.56x42 CLIP."
+ cost = 1000
+ contains = list(/obj/item/storage/guncase/pistol/pistolec)
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/pistolec
+ name = "Model 'H' Gauss Pistol Crate"
+ desc = "Contains a compact solarian-produced gauss pistol, chambered in ferromagnetic slugs. Remember to sign your necessary forms upon arrival."
+ cost = 2000
+ contains = list(/obj/item/storage/guncase/pistol/modelh)
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
/datum/supply_pack/gun/pepperbox
name = "HP Firebrand Pepperbox Revolver Crate"
desc = "Contains a concealable pepperbox revolver manufactured by the Saint Roumain Militia, chambered in .357."
cost = 1250
- contains = list(/obj/item/storage/pistolcase/firebrand)
- faction = FACTION_SRM
+ contains = list(/obj/item/storage/guncase/pistol/firebrand)
+ faction = /datum/faction/srm
/datum/supply_pack/gun/detrevolver
name = "Hunter's Pride Detective Revolver Crate"
desc = "Contains a concealable revolver favored by police departments around the sector, chambered in .38."
cost = 600
- contains = list(/obj/item/storage/pistolcase/detective)
- faction = FACTION_SRM
+ contains = list(/obj/item/storage/guncase/pistol/detective)
+ faction = /datum/faction/srm
/datum/supply_pack/gun/shadowrevolver
name = "Shadow Revolver Crate"
desc = "Contains a concealable Shadow revolver, chambered in .44 Roumain."
cost = 1000
- contains = list(/obj/item/storage/pistolcase/shadow)
- faction = FACTION_SRM
+ contains = list(/obj/item/storage/guncase/pistol/shadow)
+ faction = /datum/faction/srm
/datum/supply_pack/gun/viperrevolver
name = "Viper-23 Revolver Crate"
- desc = "Contains a a civillian variant of the Viper revolver, chambered in .357 magnum."
+ desc = "Contains a civilian variant of the Viper revolver, chambered in .357 magnum."
cost = 2500
- contains = list(/obj/item/storage/pistolcase/viper)
+ contains = list(/obj/item/storage/guncase/pistol/viper)
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 5
+
+/datum/supply_pack/gun/a357
+ name = "R-23 'Viper' Revolver Crate"
+ desc = "Contains a double-action military variant of the Viper revolver, chambered in .357 magnum."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/pistol/a357)
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/ashhand
+ name = "Ashhand Hunting Revolver Crate"
+ desc = "Contains a single-action .45-70 hunting revolver manufactured by Hunter's Pride for use against the biggest game."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/pistol/ashhand)
+ faction = /datum/faction/srm
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/cm357
+ name = "CM-357 Automag Pistol Crate"
+ desc = "Contains a magazine-fed .357 handgun, produced for the CMM-BARD division and available for requisition in small numbers to the Minutemen."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/pistol/cm357)
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
/*
Energy
@@ -78,45 +169,87 @@
name = "Laser Gun Crate"
desc = "Contains a lethal, high-energy laser gun."
cost = 1000
- contains = list(/obj/item/storage/pistolcase/laser)
+ contains = list(/obj/item/storage/guncase/energy/laser)
crate_name = "laser crate"
+ faction = /datum/faction/nt
/datum/supply_pack/gun/mini_energy
name = "Mini Energy Gun Crate"
desc = "Contains a small, versatile energy gun, capable of firing both nonlethal and lethal blasts, but with a limited power cell."
cost = 500
- contains = list(/obj/item/storage/pistolcase/miniegun)
+ contains = list(/obj/item/storage/guncase/pistol/miniegun)
crate_name = "laser crate"
+ faction_discount = 20
+ faction = /datum/faction/nt
/datum/supply_pack/gun/energy
name = "Energy Gun Crate"
desc = "Contains a versatile energy gun, capable of firing both nonlethal and lethal blasts of light."
cost = 1250
- contains = list(/obj/item/storage/pistolcase/egun)
+ contains = list(/obj/item/storage/guncase/energy/egun)
crate_name = "energy gun crate"
crate_type = /obj/structure/closet/crate/secure/plasma
+ faction = /datum/faction/nt
+
+/datum/supply_pack/gun/scatterlaser
+ name = "Scatter Laser Crate"
+ desc = "Contains a multi-function scatter energy gun, capable of firing armour penetrating slugs, and devastating scattered laser bolts."
+ cost = 1250
+ contains = list(/obj/item/gun/energy/laser/scatter)
+ crate_name = "scatter laser crate"
/datum/supply_pack/gun/ion
name = "Ion Rifle Crate"
desc = "Contains a single Mk.I Ion Projector, a special anti-tank rifle designed to disable electronic threats at range."
cost = 10000
- contains = list(/obj/item/storage/pistolcase/iongun)
+ contains = list(/obj/item/storage/guncase/energy/iongun)
crate_name = "ion rifle crate"
crate_type = /obj/structure/closet/crate/secure/plasma
+ faction = /datum/faction/nt
/datum/supply_pack/gun/laser/kalix/pistol
name = "Etherbor SG-8 Beam Pistol Crate"
desc = "Contains a single SG-8 Beam Pistol, a civilian-grade sidearm developed in the PGF, manufactured by Etherbor Industries."
cost = 1000
- contains = list(/obj/item/storage/pistolcase/kalixpistol)
+ contains = list(/obj/item/storage/guncase/pistol/kalixpistol)
crate_name = "beam pistol crate"
+ faction = /datum/faction/pgf
/datum/supply_pack/gun/laser/kalix
name = "Etherbor BG-12 Beam Rifle Crate"
desc = "Contains a single BG-12 Beam Rifle, a civilian-grade semi-automatic developed in the PGF, manufactured by Etherbor Industries."
cost = 3000
- contains = list(/obj/item/storage/guncase/kalixrifle)
+ contains = list(/obj/item/storage/guncase/energy/kalixrifle)
crate_name = "beam rifle crate"
+ faction = /datum/faction/pgf
+
+/datum/supply_pack/gun/laser/bg16
+ name = "Etherbor BG-16 Beam Rifle Crate"
+ desc = "Contains a single BG-16 Beam Rifle, a military-grade automatic developed in the PGF and manufactured by Etherbor Industries for use within the Marine Corps."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/energy/bg16)
+ crate_name = "beam rifle crate"
+ faction = /datum/faction/pgf
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/energy/disabler
+ name = "Disabler Crate"
+ desc = "One stamina-draining disabler weapon, for use in non-lethal pacification."
+ cost = 1000
+ contains = list(/obj/item/gun/energy/disabler)
+ crate_name = "disabler crate"
+ faction = /datum/faction/nt
+
+/datum/supply_pack/gun/energy/taser
+ name = "Hybrid Taser Crate"
+ desc = "Contains one disabler-taser hybrid weapon."
+ cost = 1250
+ contains = list(/obj/item/gun/energy/e_gun/advtaser)
+ crate_name = "hybrid taser crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
/*
Shotguns
@@ -127,15 +260,16 @@
desc = "For when you need to deal with 2 drunkards the old-fashioned way. Contains a double-barreled shotgun, favored by Bartenders. Warranty voided if sawed off."
cost = 1000
contains = list(/obj/item/storage/guncase/doublebarrel)
- crate_name = "shotguns crate"
- faction = FACTION_SRM
+ crate_name = "shotgun crate"
+ faction = /datum/faction/srm
/datum/supply_pack/gun/conflagration
name = "Conflagration Lever Action Shotgun Crate"
desc = "For when you need to deal with 6 hooligans and look good doing it. Contains one lever-action shotgun, with a 6 round capacity."
cost = 1500
contains = list(/obj/item/storage/guncase/conflagration)
- crate_name = "shotguns crate"
+ crate_name = "shotgun crate"
+ faction = /datum/faction/srm
/datum/supply_pack/gun/hellfire_shotgun
name = "Hellfire Shotgun Crate"
@@ -143,7 +277,7 @@
cost = 2000
contains = list(/obj/item/storage/guncase/hellfire)
crate_name = "shotgun crate"
- faction = FACTION_SRM
+ faction = /datum/faction/srm
/datum/supply_pack/gun/brimstone_shotgun
name = "Brimstone Shotgun Crate"
@@ -151,19 +285,193 @@
cost = 2000
contains = list(/obj/item/storage/guncase/brimstone)
crate_name = "shotgun crate"
- faction = FACTION_SRM
+ faction = /datum/faction/srm
+
+/datum/supply_pack/gun/buckmaster
+ name = "Buckmaster Shotgun Crate"
+ desc = "For when you need to deal with 8 hooligans and can't be arsed to pump. Contains a semi-auto shotgun with an 8 round tube."
+ contains = list(/obj/item/storage/guncase/buckmaster)
+ cost = 3000
+ crate_name = "shotgun crate"
+
+/datum/supply_pack/gun/bulldog
+ name = "Bulldog Shotgun Crate"
+ desc = "An automatic shotgun chambered in 12ga produced by Scarborough Arms for exclusive use by licensed buyers. Comes with 8-round box magazines."
+ contains = list(/obj/item/storage/guncase/bulldog)
+ cost = 4000
+ crate_name = "shotgun crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/mastiff
+ name = "Mastiff Shotgun Crate"
+ desc = "An automatic shotgun modified for exclusive use by the IRMG and chambered in 12ga. Comes with 8-round box magazines."
+ contains = list(/obj/item/storage/guncase/mastiff)
+ cost = 4000
+ crate_name = "shotgun crate"
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/cm15
+ name = "CM-15 Shotgun Crate"
+ desc = "A combat shotgun produced by Lanchester Arms Co. for the Colonial Minuteman and CMM-BARD for use in CQC operations. Chambered in 12ga and equipped with 8-round box magazines."
+ contains = list(/obj/item/storage/guncase/cm15)
+ cost = 4000
+ crate_name = "shotgun crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/ultima
+ name = "E-SG 500 Energy Shotgun Crate"
+ desc = "Contains an energy-based shotgun equipped with dual kill/disable modes, ideal for short range. The on-board computer is notoriously unreliable. For NT employee use only."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/energy/ultima)
+ crate_name = "shotgun crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/*
+ SMGs
+*/
+
+/datum/supply_pack/gun/cobra20
+ name = "Cobra-20 SMG Crate"
+ desc = "Contains a civilian variant of the Cobra SMG, manufactured by Scaraborough Arms and chambered in .45"
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/cobra)
+ crate_name = "SMG crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 10
+
+/datum/supply_pack/gun/vector
+ name = "Vector SMG Crate"
+ desc = "Contains a Vector PDW produced by Sharplite Defense and chambered in 9mm."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/vector)
+ crate_name = "SMG crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/mongrel
+ name = "SKM-44v Mongrel SMG Crate"
+ desc = "Contains a shortened variant of the SKM rechambered to 10mm and painted in the brown-and-gold of Inteq."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/mongrel)
+ crate_name = "SMG crate"
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/wt550
+ name = "WT-550 PDW Crate"
+ desc = "Contains a high-powered, automatic personal defense weapon chambered in 4.6x30mm."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/wt550)
+ crate_name = "PDW crate"
+ faction_discount = 10
+ faction = /datum/faction/nt
+
+/datum/supply_pack/gun/saber
+ name = "SABR Prototype SMG Crate"
+ desc = "Contains a compact 9mm automatic SMG produced by NT Ballistics. For NT employee use only."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/saber)
+ crate_name = "SMG crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/etar
+ name = "E-TAR Dual-Mode Energy SMG Crate"
+ desc = "Contains a compact energy-based PDW platform, ideal for suppressing threats at mid-range. For NT employee use only."
+ cost = 2000
+ contains = list(/obj/item/storage/guncase/energy/etar)
+ crate_name = "SMG crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/firestorm
+ name = "Firestorm SMG Crate"
+ desc = "Contains a Hunter's Pride SMG, intended for internal use by hunters and chambered in .45"
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/firestorm)
+ crate_name = "SMG crate"
+ faction = /datum/faction/srm
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/rattlesnake
+ name = "Rattlesnake Machinepistol Crate"
+ desc = "Contains an automatic machinepistol produced by Scarborough Arms, chambered in 9mm."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/rattlesnake)
+ crate_name = "Machinepistol crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/kingsnake
+ name = "Kingsnake Machinepistol Crate"
+ desc = "Contains an automatic machinepistol chambered in 9mm, painted in the brown-and-gold of Inteq."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/kingsnake)
+ crate_name = "Machinepistol crate"
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/cm5
+ name = "CM-5 SMG Crate"
+ desc = "Contains a CM-5 automatic SMG, produced proudly within Lanchester City. Colonial Minuteman issue only."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/cm5)
+ crate_name = "SMG crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/sidewinder
+ name = "Sidewinder SMG Crate"
+ desc = "Contains a Sidewinder PDW produced by Scarborough Arms and chambered in 5.7mm for armor-piercing capabilities."
+ cost = 3000
+ contains = list(/obj/item/storage/guncase/sidewinder)
+ crate_name = "SMG crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
/*
Rifles
*/
+/datum/supply_pack/gun/m12
+ name = "Sporter Rifle Crate"
+ desc = "Contains a recently manufactured Model 12 \"Sporter\", Serene Outdoors' premier small game rifle. Chambered in .22lr"
+ contains = list(/obj/item/storage/guncase/m12)
+ cost = 500
+ crate_name = "rifle crate"
+
+/datum/supply_pack/gun/m15
+ name = "Super Sporter Rifle Crate"
+ desc = "Contains a recently manufactured Model 15 \"Super Sporter\", Serene Outdoors' premier hunting rifle. Chambered in 5.56 CLIP"
+ contains = list(/obj/item/storage/guncase/m15)
+ cost = 2500
+ crate_name = "rifle crate"
+
/datum/supply_pack/gun/winchester
name = "Flaming Arrow Lever Action Rifle Crate"
desc = "Contains an antiquated lever action rifle intended for hunting wildlife. Chambered in .38 rounds."
cost = 750
contains = list(/obj/item/storage/guncase/winchester)
crate_name = "rifle crate"
- faction = FACTION_SRM
+ faction = /datum/faction/srm
+ faction_discount = 20
/datum/supply_pack/gun/absolution
name = "Absolution Lever Action Rifle Crate"
@@ -171,6 +479,7 @@
cost = 2000
contains = list(/obj/item/storage/guncase/absolution)
crate_name = "shotguns crate"
+ faction = /datum/faction/srm
/datum/supply_pack/gun/illestren
name = "Illestren Rifle Crate"
@@ -178,73 +487,225 @@
cost = 1250
contains = list(/obj/item/storage/guncase/illestren)
crate_name = "rifle crate"
- faction = FACTION_SRM
+ faction = /datum/faction/srm
/datum/supply_pack/gun/beacon
name = "Beacon Break Action Rifle Crate"
desc = "Contains a single shot break action rifle to hunt wildlife that annoys you in particular. Chambered in devastating .45-70 rounds. Warranty voided if sawed off."
- cost = 2250
+ cost = 1000
contains = list(/obj/item/storage/guncase/beacon)
crate_name = "rifle crate"
- faction = FACTION_SRM
+ faction = /datum/faction/srm
-/datum/supply_pack/gun/scout
- name = "Scout Sniper Rifle Crate"
- desc = "Contains a traditional scoped rifle to hunt wildlife and big game from a respectful distance. Chambered in powerful .300 Magnum."
- cost = 4000
- contains = list(/obj/item/storage/guncase/scout)
+/datum/supply_pack/gun/skm
+ name = "SKM-24 Rifle Crate"
+ desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP."
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/skm)
+ crate_name = "auto rifle crate"
+
+/datum/supply_pack/gun/inteq_skm
+ name = "SKM-44 Rifle Crate"
+ desc = "Contains a SKM painted in the brown-and-gold of Inteq, chambered in 7.62x40mm CLIP. "
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/skm_inteq)
+ crate_name = "auto rifle crate"
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/gar
+ name = "Solarian 'GAR' Automatic Rifle"
+ desc = "A modern solarian military rifle, chambered in ferromagnetic lances. Not for export."
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/gar)
+ crate_name = "auto rifle crate"
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/hades
+ name = "SL AL-655 'Hades' energy rifle"
+ desc = "Contains a high-energy, automatic laser rifle. For NT employee use only."
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/hades)
+ crate_name = "laser crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/hydra
+ name = "SMR-80 'Hydra' Automatic Rifle Crate"
+ desc = "Contains a high-powered automatic rifle produced by Scarborough Arms and chambered in 5.56 CLIP. This one is a standard variant."
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/hydra)
crate_name = "rifle crate"
- faction = FACTION_SRM
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
-/datum/supply_pack/gun/boomslang90
- name = "Boomslang-90 Rifle Crate"
- desc = "Contains a civillian variant of the Boomslang Sniper rifle- modified with a 2x scope, rather than a sniper scope. Chambered in the powerful 6.5x57mm CLIP."
+/datum/supply_pack/gun/cm82
+ name = "CM-82 Standard Issue Rifle"
+ desc = "Contains a high-powered rifle chambered in 5.56 CLIP, standard issue of the Colonial Minutemen."
cost = 5000
- contains = list(/obj/item/storage/guncase/boomslang)
+ contains = list(/obj/item/storage/guncase/cm82)
crate_name = "rifle crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
-/datum/supply_pack/gun/cobra20
- name = "Cobra-20 SMG Crate"
- desc = "Contains a civillian variant of the Cobra SMG, manufactured by Scaraborough Arms and chambered in .45"
- cost = 3000
- contains = list(/obj/item/storage/guncase/cobra)
- crate_name = "SMG crate"
- faction = FACTION_SRM
+/datum/supply_pack/gun/cm24
+ name = "CM-24 Surplus Stockpile Rifle"
+ desc = "Contains a higher-powered rifle chambered in 7.62x40 CLIP based on the SKM-24 platform, formerly the main service rifle of the CMM. This one has been pulled from reservist stockpiles."
+ cost = 5000
+ contains = list(/obj/item/storage/guncase/cm82)
+ crate_name = "rifle crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/* Heavy */
+
+/datum/supply_pack/gun/cm40
+ name = "CM-40 Squad Automatic Weapon"
+ desc = "Contains a CM-40 Squad Automatic Weapon, a CLIP-produced LMG for Minuteman usage in situations that require heavy firepower. For Minuteman use only."
+ cost = 6000
+ contains = list(/obj/item/storage/guncase/cm40)
+ crate_name = "LMG crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/saw80
+ name = "SAW-80 Squad Automatic Weapon"
+ desc = "Contains one of the rarely-produced SAW-80 Squad Automatic Weapon platforms, exclusively for licensed buyers. Remember, short controlled bursts!"
+ cost = 7000
+ contains = list(/obj/item/storage/guncase/saw80)
+ crate_name = "LMG crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/* Marksman Rifles */
+
+/datum/supply_pack/gun/cmf4
+ name = "CM-F4 Designated Marksman Rifle"
+ desc = "Contains a high-powered marksman rifle chambered in .308. For Colonial Minuteman issue only."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/cmf4)
+ crate_name = "dmr crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/ssg04
+ name = "SsG-04 Designated Marksman Rifle"
+ desc = "Contains a high-powered marksman rifle chambered in .308. Painted in the brown-and-gold of Inteq."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/ssg04)
+ crate_name = "dmr crate"
+ faction = /datum/faction/inteq
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/sbr80
+ name = "SBR-80 'Hydra' Designated Marksman Rifle Crate"
+ desc = "Contains a high-powered marksman rifle chambered in 5.56 CLIP and produced by Scarborough Arms. A modification of the ever-popular SMR-80 platform."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/sbr80)
+ crate_name = "dmr crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/vickland
+ name = "Vickland Battle Rifle"
+ desc = "Contains a high-powered semi-automatic battle rifle chambered in .308 and produced by Hunter's Pride. Fed via stripper clips with a 10 round capacity."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/vickland)
+ crate_name = "dmr crate"
+ faction = /datum/faction/srm
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/gauss
+ name = "Prototype Gauss Rifle"
+ desc = "Contains a high-powered prototype armor-piercing gauss rifle, operable with ferromagnetic pellets. For NT employee use only."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/gauss)
+ crate_name = "dmr crate"
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/claris
+ name = "Claris Gauss Rifle"
+ desc = "Contains a high-powered armor-piercing gauss rifle, loaded directly via ferromagnetic pellet speedloaders."
+ cost = 2500
+ contains = list(/obj/item/storage/guncase/claris)
+ crate_name = "dmr crate"
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
-/datum/supply_pack/gun/wt550
- name = "WT-550 Auto Rifle Crate"
- desc = "Contains a high-powered, automatic personal defense weapon chambered in 4.6x30mm."
+/datum/supply_pack/gun/boomslang90
+ name = "Boomslang-90 Designated Marksman Rifle Crate"
+ desc = "Contains a civilian variant of the Boomslang Sniper rifle- modified with a 2x scope, rather than a sniper scope. Chambered in the powerful 6.5x57mm CLIP."
+ cost = 3500
+ contains = list(/obj/item/storage/guncase/boomslang)
+ crate_name = "dmr crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/gun/boomslang10
+ name = "Boomslang-10 Sniper Rifle Crate"
+ desc = "Contains a military variant of the Boomslang Sniper rifle equipped with an 8x sniper scope, for licenesed buyers only. Chambered in the powerful 6.5x57mm CLIP."
+ cost = 4500
+ contains = list(/obj/item/storage/guncase/boomslangmilitary)
+ crate_name = "marksman rifle crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/f90
+ name = "CM-F90 Sniper Rifle Crate"
+ desc = "Contains a military sniper rifle equipped with an 8x sniper scope, for Minuteman use only. Chambered in the powerful 6.5x57mm CLIP."
+ cost = 4500
+ contains = list(/obj/item/storage/guncase/cmf90)
+ crate_name = "marksman rifle crate"
+ faction = /datum/faction/clip
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/gun/scout
+ name = "Scout Sniper Rifle Crate"
+ desc = "Contains a traditional scoped rifle to hunt wildlife and big game from a respectful distance. Chambered in powerful .300 Magnum."
cost = 4000
- contains = list(/obj/item/storage/guncase/wt550)
- crate_name = "auto rifle crate"
- faction = FACTION_SRM
+ contains = list(/obj/item/storage/guncase/scout)
+ crate_name = "sniper rifle crate"
+ faction = /datum/faction/srm
-/datum/supply_pack/gun/p16
- name = "P16 Assault Rifle Crate"
- desc = "Contains a high-powered, automatic rifle chambered in 5.56mm."
- cost = 5000
- contains = list(/obj/item/storage/guncase/p16)
- crate_name = "auto rifle crate"
- faction = FACTION_SRM
+/datum/supply_pack/gun/ssg669
+ name = "SSG-669C Sniper Rifle Crate"
+ desc = "Contains a traditional scoped rifle to hunt wildlife and big game from a respectful distance. Chambered in powerful .300 Magnum."
+ cost = 4000
+ contains = list(/obj/item/storage/guncase/ssg669)
+ crate_name = "sniper rifle crate"
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
-/datum/supply_pack/gun/skm
- name = "SKM-24 Rifle Crate"
- desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP."
- cost = 5000
- contains = list(/obj/item/storage/guncase/skm)
- crate_name = "auto rifle crate"
- faction = FACTION_SRM
+/* Attachments */
/datum/supply_pack/gun/attachment/rail_light
name = "Tactical Rail Light Crate"
desc = "Contains a single rail light to be mounted on a firearm."
- cost = 250
+ cost = 100
contains = list(/obj/item/attachment/rail_light)
crate_name = "rail light crate"
/datum/supply_pack/gun/attachment/laser_sight
name = "Laser Sight Crate"
- desc = "Contains a single rail light to be mounted on a firearm."
+ desc = "Contains a single laser sight to be mounted on a firearm."
cost = 250
contains = list(/obj/item/attachment/laser_sight)
crate_name = "laser sight crate"
@@ -256,9 +717,63 @@
contains = list(/obj/item/attachment/bayonet)
crate_name = "bayonet crate"
+/datum/supply_pack/gun/attachment/ebayonet
+ name = "Energy Bayonet Crate"
+ desc = "Contains a single energy bayonet to be mounted on a firearm, exclusive for Scarborough Firearms."
+ cost = 500
+ contains = list(/obj/item/attachment/energy_bayonet)
+ crate_name = "bayonet crate"
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
/datum/supply_pack/gun/attachment/silencer
name = "Suppressor Crate"
desc = "Contains a single suppressor to be mounted on a firearm."
cost = 250
contains = list(/obj/item/attachment/silencer)
- crate_name = "silencer crate"
+ crate_name = "suppressor crate"
+
+/datum/supply_pack/gun/attachment/shotgun
+ name = "Underbarrel Shotgun Crate"
+ desc = "Contains a single shot underbarrel shotgun to be mounted on a firearm."
+ cost = 750
+ contains = list(/obj/item/attachment/gun/ballistic/shotgun)
+ crate_name = "underbarrel shotgun crate"
+
+/datum/supply_pack/gun/attachment/flamethrower
+ name = "Underbarrel Flamethrower Crate"
+ desc = "Contains a compact underbarrel flamethrower to be mounted on a firearm."
+ cost = 750
+ contains = list(/obj/item/attachment/gun/flamethrower)
+ crate_name = "underbarrel flamethrower crate"
+
+/datum/supply_pack/gun/attachment/e_gun
+ name = "Underbarrel Energy Gun Crate"
+ desc = "Contains an underbarrel energy gun to be mounted on a firearm."
+ cost = 750
+ contains = list(/obj/item/attachment/gun/energy/e_gun)
+ crate_name = "underbarrel energy gun crate"
+
+/datum/supply_pack/gun/attachment/sling
+ name = "Shoulder Sling Crate"
+ desc = "Contains a single shoulder sling to be mounted on a firearm for easy carrying without armor holsters. Only compatible with longarms."
+ cost = 250
+ contains = list(/obj/item/attachment/sling)
+ crate_name = "shoulder sling crate"
+
+/datum/supply_pack/gun/attachment/riot_launcher
+ name = "Underbarrel Riot Grenade Launcher Crate"
+ desc = "Contains a single shot underbarrel riot grenade launcher to be mounted on a firearm."
+ cost = 750
+ contains = list(/obj/item/attachment/gun/riot)
+ crate_name = "underbarrel riot grenade launcher crate"
+
+/datum/supply_pack/gun/attachment/flare
+ name = "Underbarrel Flare Gun Crate"
+ desc = "Contains a single shot underbarrel flare gun to be mounted on a firearm. One box of flares included."
+ cost = 200
+ contains = list(/obj/item/attachment/gun/flare)
+ crate_name = "underbarrel flare gun crate"
+
+
diff --git a/code/modules/cargo/packs/machinery.dm b/code/modules/cargo/packs/machinery.dm
index 6e5a12f30f5bf..e5d78e863f179 100644
--- a/code/modules/cargo/packs/machinery.dm
+++ b/code/modules/cargo/packs/machinery.dm
@@ -168,18 +168,6 @@
crate_name = "holofield generator crate"
crate_type = /obj/structure/closet/crate/engineering
-/datum/supply_pack/machinery/shuttle_in_a_box
- name = "Shuttle in a Box"
- desc = "The bare minimum amount of machine and computer boards required to create a working spacecraft."
- cost = 8000
- contains = list(
- /obj/item/circuitboard/computer/shuttle/helm,
- /obj/item/circuitboard/machine/shuttle/smes,
- /obj/item/circuitboard/machine/shuttle/engine/electric,
- /obj/item/shuttle_creator
- )
- crate_name = "Shuttle in a Box"
-
/datum/supply_pack/machinery/ion_thruster
name = "Ion Thruster Crate"
desc = "A crate containing an ion thruster and its precharger's electronics. For when you need a little extra thrust."
diff --git a/code/modules/cargo/packs/magazines.dm b/code/modules/cargo/packs/magazines.dm
new file mode 100644
index 0000000000000..301f771f79b47
--- /dev/null
+++ b/code/modules/cargo/packs/magazines.dm
@@ -0,0 +1,337 @@
+/datum/supply_pack/magazine
+ group = "Magazines"
+ crate_type = /obj/structure/closet/crate/secure/gear
+ crate_name = "magazine crate"
+ faction_discount = 0
+
+
+/* VI */
+
+/datum/supply_pack/magazine/co9mm_mag
+ name = "9mm Commander Magazine Crate"
+ desc = "Contains a 9mm magazine for the standard-issue Commander pistol, with a capacity of twelve rounds."
+ contains = list(/obj/item/ammo_box/magazine/co9mm/empty)
+ cost = 150
+ faction = /datum/faction/nt
+
+/datum/supply_pack/magazine/smgm9mm_mag
+ name = "9mm SMG Magazine Crate"
+ desc = "Contains a 9mm magazine for the Vector and Saber SMGs, with a capacity of thirty rounds."
+ contains = list(/obj/item/ammo_box/magazine/smgm9mm/empty)
+ cost = 300
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+
+/* Hunter's Pride */
+
+/datum/supply_pack/magazine/c38_mag
+ name = ".38 Speedloader Crate"
+ desc = "Contains a .38 speedloader for revolvers, containing six rounds."
+ contains = list(/obj/item/ammo_box/c38/empty)
+ cost = 100
+ faction_discount = 20
+ faction = /datum/faction/srm
+
+/datum/supply_pack/magazine/m45_mag
+ name = ".45 ACP Candor Magazine Crate"
+ desc = "Contains a .45 ACP magazine for the Candor pistol, with a capacity of eight rounds."
+ contains = list(/obj/item/ammo_box/magazine/m45/empty)
+ cost = 100
+ faction = /datum/faction/srm
+
+/datum/supply_pack/magazine/a44roum_speedloader
+ name = ".44 Roumain Speedloader Crate"
+ desc = "Contains a .44 Roumain speedloader for the HP Montagne, with a capacity of six rounds."
+ contains = list(/obj/item/ammo_box/a44roum_speedloader/empty)
+ cost = 250
+ faction = /datum/faction/srm
+
+/datum/supply_pack/magazine/firestorm_mag
+ name = "Firestorm Magazine Crate"
+ desc = "Contains a 28-round magazine for the Hunter's Pride Firestorm SMG."
+ contains = list(/obj/item/ammo_box/magazine/c45_firestorm_mag/empty)
+ cost = 300
+ faction = /datum/faction/srm
+
+
+/* Serene Sporting */
+
+/datum/supply_pack/magazine/m17_mag
+ name = "Micro Target Magazine Crate"
+ desc = "Contains a .22lr magazine for the Micro Target pistol, with a capacity of ten rounds."
+ contains = list(/obj/item/ammo_box/magazine/m17/empty)
+ cost = 100
+
+/datum/supply_pack/magazine/m12_mag
+ name = "Sporter Magazine Crate"
+ desc = "Contains a .22lr magazine for the Sporter Rifle, with a capacity of 25 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m12_sporter/empty)
+ cost = 200
+
+/datum/supply_pack/magazine/m15_mag
+ name = "Super Sporter Magazine Crate"
+ desc = "Contains a 5.56 CLIP magazine for the Super Sporter Rifle, with a capacity of 20 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m15/empty)
+ cost = 300
+
+/* Scarbie */
+
+/datum/supply_pack/magazine/himehabu_mag
+ name = "Himehabu Magazine Crate"
+ desc = "Contains a .22lr magazine for the Himehabu pistol, with a capacity of ten rounds."
+ contains = list(/obj/item/ammo_box/magazine/m22lr_himehabu/empty)
+ cost = 100
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/asp_mag
+ name = "Asp Magazine Crate"
+ desc = "Contains a 5.7x39mm magazine for the Asp pistol, with a capacity of 12 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m57_39_asp/empty)
+ cost = 250
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/m10mm_mag
+ name = "Ringneck Magazine Crate"
+ desc = "Contains a 10mm magazine for the Ringneck pistol, with a capacity of eight rounds."
+ contains = list(/obj/item/ammo_box/magazine/m10mm_ringneck/empty)
+ cost = 150
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/m9mm_rattlesnake
+ name = "Rattlesnake Magazine Crate"
+ desc = "Contains a 9mm magazine for the Rattlesnake machine pistol, with a capacity of 18 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m9mm_rattlesnake/empty)
+ cost = 300
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/a357_mag
+ name = ".357 Speedloader Crate"
+ desc = "Contains a .357 speedloader for revolvers, with a capacity of six rounds."
+ contains = list(/obj/item/ammo_box/a357/empty)
+ cost = 250
+ faction_discount = 20
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/sidewinder_mag
+ name = "Sidewinder Magazine Crate"
+ desc = "Contains a 30 round magazine for the Sidewinder SMG."
+ contains = list(/obj/item/ammo_box/magazine/m57_39_sidewinder/empty)
+ cost = 300
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/c45_cobra_mag
+ name = "Cobra Magazine Crate"
+ desc = "Contains a .45 magazine for the Cobra-20, with a capacity of 24 rounds."
+ cost = 300
+ contains = list(/obj/item/ammo_box/magazine/m45_cobra/empty)
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/short_hydra_mag
+ name = "SBR-80 DMR Short Magazine Crate"
+ desc = "Contains a 5.56x42mm CLIP made specially for the SBR-80 Designated Marksman Rifle, with a capacity of 20 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/small/empty)
+ cost = 400
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/hydra_mag
+ name = "SMR-80 Rifle Magazine Crate"
+ desc = "Contains a 5.56x42mm CLIP for the SMR-80 assault rifle, with a capacity of 30 rounds."
+ contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/empty)
+ cost = 500
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/datum/supply_pack/magazine/saw_mag
+ name = "SAW-80 Magazine Crate"
+ desc = "Contains a 5.56x42mm CLIP magazine for the SAW-80 Squad Automatic Weapon, with a capacity of sixty rounds. Count your shots, they run out fast."
+ contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/extended/empty)
+ cost = 750
+ faction = /datum/faction/syndicate/scarborough_arms
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/magazine/boomslang_mag
+ name = "Boomslang-90 Magazine Crate"
+ desc = "Contains a 6.5 CLIP magazine for the Boomslang rifle platform, with a capacity of five rounds."
+ contains = list(/obj/item/ammo_box/magazine/boomslang/short/empty)
+ cost = 750
+ faction = /datum/faction/syndicate/scarborough_arms
+
+/* CM Lancaster */
+
+/datum/supply_pack/magazine/cm23_mag
+ name = "CM-23 Magazine Crate"
+ desc = "Contains a 10mm magazine for the CM-23 handgun with a capacity of 10 rounds."
+ contains = list(/obj/item/ammo_box/magazine/cm23/empty)
+ cost = 150
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm70_mag
+ name = "CM-70 Magazine Crate"
+ desc = "Contains a 9mm magazine for the CM-70 machinepistol."
+ contains = list(/obj/item/ammo_box/magazine/m9mm_cm70/empty)
+ cost = 350
+ faction = /datum/faction/clip
+ faction_discount = 20
+
+/datum/supply_pack/magazine/cm357_mag
+ name = "CM-357 Magazine Crate"
+ desc = "Contains a .357 magazine for the CM-357 automag pistol with a capacity of 7 rounds."
+ contains = list(/obj/item/ammo_box/magazine/cm357/empty)
+ cost = 250
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm5_mag
+ name = "CM-5 Magazine Crate"
+ desc = "Contains a 9mm magazine for the CM-5 SMG with a capacity of 30 rounds."
+ contains = list(/obj/item/ammo_box/magazine/cm5_9mm/empty)
+ cost = 300
+ faction = /datum/faction/clip
+ faction_discount = 20
+
+/datum/supply_pack/magazine/cm82_mag
+ name = "CM-82 Magazine Crate"
+ desc = "Contains a 5.56mm magazine for the CM-82 rifle, with a capacity of thirty rounds."
+ contains = list(/obj/item/ammo_box/magazine/p16/empty)
+ cost = 500
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/skm_ammo
+ name = "SKM Magazine Crate"
+ desc = "Contains a 7.62x40mm magazine for the SKM rifles, with a capacity of twenty rounds."
+ contains = list(/obj/item/ammo_box/magazine/skm_762_40/empty)
+ cost = 500
+
+/datum/supply_pack/magazine/f4_mag
+ name = "F4 Magazine Crate"
+ desc = "Contains a .308 magazine for SsG-04 and CM-F4 platform rifles, with a capacity of ten rounds."
+ contains = list(/obj/item/ammo_box/magazine/f4_308/empty)
+ cost = 500
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/f90
+ name = "CM-F90 Magazine Crate"
+ desc = "Contains a 5-round 6.5mm magazine for use with the CM-F90 sniper rifle."
+ contains = list(/obj/item/ammo_box/magazine/f90/empty)
+ cost = 750
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm15
+ name = "CM-15 Magazine Crate"
+ desc = "Contains an 8-round 12ga magazine for the CM-15 Automatic Shotgun."
+ contains = list(/obj/item/ammo_box/magazine/cm15_12g/empty)
+ cost = 750
+ faction = /datum/faction/clip
+
+/datum/supply_pack/magazine/cm40
+ name = "CM-40 Magazine Crate"
+ desc = "Contains an 80-round 7.62x40mm CLIP box for the CM-40 Squad Automatic Weapon. Consider designating an ammo bearer."
+ contains = list(/obj/item/ammo_box/magazine/cm40_762_40_box/empty)
+ cost = 1000
+ faction = /datum/faction/clip
+
+/* NT */
+
+/datum/supply_pack/magazine/wt550_mag
+ name = "WT-550 Auto Rifle Magazine Crate"
+ desc = "Contains a 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads."
+ cost = 300
+ contains = list(/obj/item/ammo_box/magazine/wt550m9/empty)
+ faction = /datum/faction/nt
+
+/* Solgov */
+
+/datum/supply_pack/magazine/mag_556mm
+ name = "5.56 Pistole C Magazine Crate"
+ desc = "Contains a 5.56mm magazine for the Pistole C, with a capacity of twelve rounds."
+ contains = list(/obj/item/ammo_box/magazine/pistol556mm/empty)
+ cost = 150
+ faction = /datum/faction/solgov
+
+/datum/supply_pack/magazine/fms_mag
+ name = "Ferromagnetic Slug Magazine Crate"
+ desc = "Contains a ferromagnetic slug magazine for the Model H pistol, with a capacity of ten rounds."
+ contains = list(/obj/item/ammo_box/magazine/modelh/empty)
+ cost = 350
+ faction = /datum/faction/solgov
+
+/datum/supply_pack/magazine/gar_ammo
+ name = "GAR Ferromagnetic Lance Magazine Crate"
+ desc = "Contains a ferromagnetic lance magazine for the GAR rifle, with a capacity of thirty two rounds."
+ contains = list(/obj/item/ammo_box/magazine/gar/empty)
+ cost = 500
+ faction = /datum/faction/solgov
+
+/datum/supply_pack/magazine/claris_ammo
+ name = "Claris Ferromagnetic Pellet Speedloader Crate"
+ desc = "Contains a ferromagnetic pellet speedloader for the Claris rifle, with a capacity of twenty two rounds."
+ contains = list(/obj/item/ammo_box/amagpellet_claris/empty)
+ cost = 400
+ faction = /datum/faction/solgov
+
+/* Inteq */
+
+/datum/supply_pack/magazine/mongrel_mag
+ name = "Mongrel Magazine Crate"
+ desc = "Contains a 10mm magazine for the SKM-44v 'Mongrel' SMG, with a capacity of twenty-four rounds."
+ contains = list(/obj/item/ammo_box/magazine/smgm10mm/empty)
+ cost = 300
+ faction = /datum/faction/inteq
+
+/* Shotguns */
+
+/datum/supply_pack/magazine/bulldog
+ name = "Bulldog Magazine Crate"
+ desc = "Contains an 8-round 12ga box magazine for the Bulldog weapons platform."
+ contains = list(/obj/item/ammo_box/magazine/m12g_bulldog/empty)
+ cost = 750
+ faction = /datum/faction/syndicate/scarborough_arms
+
+
+/* energy weapons */
+
+/datum/supply_pack/magazine/guncell
+ name = "Weapon Cell Crate"
+ desc = "Contains a weapon cell, compatible with laser guns."
+ contains = list(/obj/item/stock_parts/cell/gun)
+ faction = /datum/faction/nt
+ cost = 500
+
+/datum/supply_pack/magazine/solgovcell
+ name = "SolCon Weapon Cell Crate"
+ desc = "Contains a Solarian weapon cell, compatible with Solarian gauss weaponry."
+ contains = list(/obj/item/stock_parts/cell/gun/solgov)
+ cost = 500
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
+
+/datum/supply_pack/magazine/upgradedguncell
+ name = "Upgraded Weapon Cell Crate"
+ desc = "Contains an upgraded weapon cell, compatible with laser guns. For NT use only."
+ contains = list(/obj/item/stock_parts/cell/gun/upgraded)
+ cost = 1000
+ faction = /datum/faction/nt
+ faction_discount = 0
+ faction_locked = TRUE
+
+/* etherbor */
+
+/datum/supply_pack/magazine/guncell/kalix
+ name = "Etherbor Cell Crate"
+ desc = "Contains an Etherbor weapon cell, compatible with Etherbor armaments with a slightly higher capacity."
+ contains = list(/obj/item/stock_parts/cell/gun/kalix)
+ cost = 600
+ faction = /datum/faction/pgf
+
+/datum/supply_pack/magazine/guncell/pgf
+ name = "Etherbor Cell Crate"
+ desc = "Contains a military-grade Etherbor weapon cell produced for the PGFMC, compatible with Etherbor armaments with a significantly higher capacity."
+ contains = list(/obj/item/stock_parts/cell/gun/pgf)
+ cost = 1000
+ faction = /datum/faction/pgf
+ faction_discount = 0
+ faction_locked = TRUE
+
+/* Expand once the energy weapons have been actually expanded upon */
diff --git a/code/modules/cargo/packs/material.dm b/code/modules/cargo/packs/material.dm
index e396854387de0..356856535b771 100644
--- a/code/modules/cargo/packs/material.dm
+++ b/code/modules/cargo/packs/material.dm
@@ -1,6 +1,7 @@
/datum/supply_pack/material
group = "Materials & Sheets"
- faction = FACTION_NS_LOGI
+ faction = /datum/faction/nt/ns_logi
+ faction_discount = 20
/*
Basic construction materials
@@ -41,7 +42,7 @@
/datum/supply_pack/material/uranium20
name = "20 Uranium Sheets"
- desc = "Green rock make thog puke red."
+ desc = "Twenty sheets of mildly radioactive uranium. Lead gloves for safe handling not included."
cost = 2000
contains = list(/obj/item/stack/sheet/mineral/uranium/twenty)
crate_name = "uranium sheets crate"
@@ -53,21 +54,21 @@
/datum/supply_pack/material/titanium20
name = "20 Titanium Sheets"
- desc = "Used for making big boy tanks and tools."
+ desc = "Twenty sheets of durable titanium. Great for heavy machinery."
cost = 3000
contains = list(/obj/item/stack/sheet/mineral/titanium/twenty)
crate_name = "titanium sheets crate"
/datum/supply_pack/material/gold20
name = "20 Gold Sheets"
- desc = "Shiny."
+ desc = "Twenty sheets of gold. There was a time when this would've been more expensive."
cost = 4000
contains = list(/obj/item/stack/sheet/mineral/gold/twenty)
crate_name = "gold sheets crate"
/datum/supply_pack/material/silver20
name = "20 Silver Sheets"
- desc = "Somewhat less shiny."
+ desc = "Twenty sheets of silver. How quaint."
cost = 3000
contains = list(/obj/item/stack/sheet/mineral/silver/twenty)
crate_name = "silver sheets crate"
diff --git a/code/modules/cargo/packs/mechs.dm b/code/modules/cargo/packs/mechs.dm
index 744e9f67e2f21..38e300d556fdd 100644
--- a/code/modules/cargo/packs/mechs.dm
+++ b/code/modules/cargo/packs/mechs.dm
@@ -117,6 +117,14 @@ Mech Equipment
/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
)
+/datum/supply_pack/mech/equipment/salvage_saw
+ name = "Exosuit Salvage Saw"
+ desc = "Contains an upsized angle grinder for an Exosuit, for all your larger salvage problems."
+ cost = 2000
+ contains = list(
+ /obj/item/mecha_parts/mecha_equipment/salvage_saw
+ )
+
/datum/supply_pack/mech/equipment/scanner
name = "Exosuit scanner kit"
desc = "An electronic mining scanner, graded to interface with an exosuit."
@@ -196,6 +204,14 @@ Mech Equipment
/obj/item/mecha_parts/mecha_equipment/thrusters/gas
)
+/datum/supply_pack/mech/equipment/ionthrust
+ name = "Exosuit Ion thruster kit"
+ desc = "An electrical powered thruster pack, perfect for exosuits without a functional way to refill more tradional RCS thrusters."
+ cost = 2000
+ contains = list(
+ /obj/item/mecha_parts/mecha_equipment/thrusters/ion
+ )
+
/datum/supply_pack/mech/equipment/ripley_upgrade
name = "APLU upgrade kit"
desc = "Contains an APLU MK II upgrade kit. The upgrade will replace the cockpit with a spaceworthy canopy, but the added weight makes it slower."
@@ -246,20 +262,20 @@ weapons
/obj/item/mecha_parts/mecha_equipment/weapon/energy/mecha_kineticgun
)
-/datum/supply_pack/mech/weapon/laser
- name = "Immolator kit"
- desc = "A light laser cannon designed for combat usage."
+/datum/supply_pack/mech/weapon/carbine
+ name = "Downpour kit"
+ desc = "A rapid fire energy carbine designed for combat usage."
cost = 1000
contains = list(
- /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
+ /obj/item/mecha_parts/mecha_equipment/weapon/energy/carbine
)
/datum/supply_pack/mech/weapon/biglaser
name = "Solaris kit"
- desc = "A heavy laser cannon designed for combat usage."
+ desc = "A heavy beam cannon designed for combat usage."
cost = 2000
contains = list(
- /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
+ /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
)
/datum/supply_pack/mech/weapon/ion_cannon
@@ -280,7 +296,7 @@ weapons
/datum/supply_pack/mech/weapon/lmg
name = "UMG-2 kit"
- desc = "Contains a mounted gun which fires in three round bursts."
+ desc = "Contains a fully automatic mounted machine gun for combat exosuits."
cost = 2250
contains = list(
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
@@ -305,7 +321,7 @@ ammo
/datum/supply_pack/mech/ammo/scattershot_ammo
name = "LBX-10 ammo box"
- desc = "Contains a fourty-round box of upscaled buckshot, to be loaded directly in a mounted LBX-10."
+ desc = "Contains a twenty four round box of upscaled buckshot, to be loaded directly in a mounted LBX-10."
cost = 500
contains = list(
/obj/item/mecha_ammo/scattershot
@@ -313,8 +329,8 @@ ammo
/datum/supply_pack/mech/ammo/lmg_ammo
name = "UMG-2 ammo box"
- desc = "Contains a three hundred-round box of heavy ammunition for the UMG-2."
- cost = 750
+ desc = "Contains a two hundred-round box of heavy ammunition for the UMG-2."
+ cost = 500
contains = list(
/obj/item/mecha_ammo/lmg
)
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index e0ca4f1392585..4d63d5c9cb673 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -52,6 +52,23 @@
Tools
*/
+/datum/supply_pack/medical/painkillers
+ name = "Painkiller Supply Crate"
+ desc = "Contains a supply of painkillers. Great for stopping headaches, feeling broken bones, and screaming people!"
+ cost = 1000
+ contains = list(
+ /obj/item/reagent_containers/glass/bottle/morphine,
+ /obj/item/reagent_containers/glass/bottle/morphine,
+ /obj/item/reagent_containers/glass/bottle/morphine,
+ )
+ faction = /datum/faction/syndicate/suns
+ faction_discount = 25
+
+/datum/supply_pack/medical/painkillers/fill(obj/structure/closet/crate/cargo_crate)
+ . = ..()
+ if(prob(5))
+ new /obj/item/reagent_containers/glass/bottle/painkiller_booze(cargo_crate)
+
/datum/supply_pack/medical/iv_drip
name = "IV Drip Crate"
desc = "Contains a single IV drip for administering blood to patients."
@@ -68,12 +85,14 @@
/datum/supply_pack/medical/surgery
name = "Surgical Supplies Crate"
- desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical duffelbag, Sterilizine spray and collapsible roller bed."
+ desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical case, Sterilizine spray and collapsible roller bed."
cost = 3000
- contains = list(/obj/item/storage/backpack/duffelbag/med/surgery,
+ contains = list(/obj/item/storage/case/surgery,
/obj/item/reagent_containers/medigel/sterilizine,
/obj/item/roller)
crate_name = "surgical supplies crate"
+ faction = /datum/faction/syndicate/suns
+ faction_discount = 50 //this shouldnt be 3k but if it is...
/datum/supply_pack/medical/anesthetic
@@ -83,6 +102,8 @@
contains = list(/obj/item/clothing/mask/breath/medical,
/obj/item/tank/internals/anesthetic)
crate_name = "anesthetics crate"
+ faction = /datum/faction/syndicate/suns
+ faction_discount = 25
/*
Bundles and supplies
@@ -105,6 +126,8 @@
/obj/item/reagent_containers/blood/synthetic)
crate_name = "blood freezer"
crate_type = /obj/structure/closet/crate/freezer
+ faction = /datum/faction/syndicate/suns
+ faction_discount = 25
/datum/supply_pack/medical/surplus
name = "Medical Surplus Crate"
@@ -132,36 +155,14 @@
/obj/item/reagent_containers/pill/neurine,
/obj/item/vending_refill/medical)
crate_name = "medical surplus crate"
- faction = FACTION_SUNS
+ faction = /datum/faction/syndicate/suns
+ faction_discount = 25
/datum/supply_pack/medical/surplus/fill(obj/structure/closet/crate/C)
for(var/i in 1 to 7)
var/item = pick(contains)
new item(C)
-/datum/supply_pack/medical/virus
- name = "Virus Crate"
- desc = "Contains twelve different bottles, containing several viral samples for virology research. Also includes seven beakers and syringes. Balled-up jeans not included."
- cost = 3500
- contains = list(/obj/item/reagent_containers/glass/bottle/flu_virion,
- /obj/item/reagent_containers/glass/bottle/cold,
- /obj/item/reagent_containers/glass/bottle/random_virus,
- /obj/item/reagent_containers/glass/bottle/random_virus,
- /obj/item/reagent_containers/glass/bottle/random_virus,
- /obj/item/reagent_containers/glass/bottle/random_virus,
- /obj/item/reagent_containers/glass/bottle/fake_gbs,
- /obj/item/reagent_containers/glass/bottle/magnitis,
- /obj/item/reagent_containers/glass/bottle/pierrot_throat,
- /obj/item/reagent_containers/glass/bottle/brainrot,
- /obj/item/reagent_containers/glass/bottle/anxiety,
- /obj/item/reagent_containers/glass/bottle/beesease,
- /obj/item/storage/box/syringes,
- /obj/item/storage/box/beakers,
- /obj/item/reagent_containers/glass/bottle/mutagen)
- crate_name = "virus crate"
- crate_type = /obj/structure/closet/crate/medical
- faction = FACTION_SUNS
-
/datum/supply_pack/medical/salglucanister
name = "Heavy-Duty Saline Canister"
desc = "Contains a bulk supply of saline-glucose condensed into a single canister that should last a long time, with a large pump to fill containers with. Direct injection of saline should be left to medical professionals as the pump is capable of overdosing patients."
diff --git a/code/modules/cargo/packs/sec_supply.dm b/code/modules/cargo/packs/sec_supply.dm
index 1045f2730ea9b..9e18adec48559 100644
--- a/code/modules/cargo/packs/sec_supply.dm
+++ b/code/modules/cargo/packs/sec_supply.dm
@@ -5,6 +5,12 @@
/*
Standard supplies
*/
+/datum/supply_pack/sec_supply/holster
+ name = "Shoulder Holster Crate"
+ desc = "Contains a shoulder holster, capable of holding a single pistol or revolver and your ammo."
+ cost = 600
+ contains = list(/obj/item/clothing/accessory/holster)
+ crate_name = "holster crate"
/datum/supply_pack/sec_supply/chemimp
name = "Chemical Implants Crate"
@@ -77,18 +83,13 @@
/obj/item/melee/knife/survival)
crate_name = "combat knife crate"
-/*
/datum/supply_pack/sec_supply/machete
name = "Stampted Steel Machete Crate"
desc = "Contains five mass produced machetes. A perfect choice for crews on a budget."
cost = 500
contains = list(/obj/item/melee/sword/mass,
- /obj/item/melee/sword/mass,
- /obj/item/melee/sword/mass,
- /obj/item/melee/sword/mass,
/obj/item/melee/sword/mass)
crate_name = "combat knife crate"
-*/
/datum/supply_pack/sec_supply/flamethrower
name = "Flamethrower Crate"
@@ -97,7 +98,9 @@
contains = list(/obj/item/flamethrower/full)
crate_name = "flamethrower crate"
crate_type = /obj/structure/closet/crate/secure/weapon
- faction = FACTION_NGR
+
+ faction = /datum/faction/syndicate/ngr
+ faction_discount = 20
/datum/supply_pack/sec_supply/incendiary_grenade
name = "Incendiary Grenade Crate"
@@ -106,7 +109,18 @@
contains = list(/obj/item/grenade/chem_grenade/incendiary)
crate_name = "incendiary grenade crate"
crate_type = /obj/structure/closet/crate/secure/plasma
- faction = FACTION_NGR
+ faction = /datum/faction/syndicate/ngr
+ faction_discount = 20
+
+/datum/supply_pack/sec_supply/halberd
+ name = "Energy Halberd Crate"
+ desc = "Contains one Solarian Energy Halberd, for issue to your local Sonnensoldner battalion."
+ cost = 1500
+ contains = list(/obj/item/energyhalberd)
+ crate_name = "energy halberd crate"
+ faction = /datum/faction/solgov
+ faction_discount = 0
+ faction_locked = TRUE
/*
Stamina / PVP weapons (intentionally overpriced due to odd balance position of stamina weapons)
@@ -128,35 +142,39 @@
/datum/supply_pack/sec_supply/baton
name = "Stun Batons Crate"
- desc = "Arm the Civil Protection Forces with three stun batons. Batteries included."
- cost = 9000
- contains = list(/obj/item/melee/baton/loaded,
- /obj/item/melee/baton/loaded,
- /obj/item/melee/baton/loaded)
+ desc = "Arm your vessel security with a stun baton. Batteries included."
+ cost = 3000
+ contains = list(/obj/item/melee/baton/loaded)
crate_name = "stun baton crate"
-/datum/supply_pack/sec_supply/disabler
- name = "Disabler Crate"
- desc = "Three stamina-draining disabler weapons."
- cost = 9000
- contains = list(/obj/item/gun/energy/disabler,
- /obj/item/gun/energy/disabler,
- /obj/item/gun/energy/disabler)
- crate_name = "disabler crate"
-
/datum/supply_pack/sec_supply/dragnet
name = "DRAGnet Crate"
- desc = "Contains three \"Dynamic Rapid-Apprehension of the Guilty\" netting devices, a recent breakthrough in law enforcement prisoner management technology."
- cost = 10000
- contains = list(/obj/item/gun/energy/e_gun/dragnet,
- /obj/item/gun/energy/e_gun/dragnet,
- /obj/item/gun/energy/e_gun/dragnet)
+ desc = "Contains one \"Dynamic Rapid-Apprehension of the Guilty\" netting device, a recent breakthrough in law enforcement prisoner management technology."
+ cost = 2000
+ contains = list(/obj/item/gun/energy/e_gun/dragnet)
crate_name = "\improper DRAGnet crate"
-/datum/supply_pack/sec_supply/taser
- name = "Hybrid Taser Crate"
- desc = "Two disabler-taser hybrid weapons."
- cost = 12000
- contains = list(/obj/item/gun/energy/e_gun/advtaser,
- /obj/item/gun/energy/e_gun/advtaser)
- crate_name = "hybrid taser crate"
+/datum/supply_pack/sec_supply/claymore
+ name = "C-10 Claymore Crate"
+ desc = "Four motion-activated directional mines, perfect for ambushing enemy infantry. Still debatably legal to sell!"
+ cost = 3000
+ contains = list(/obj/item/paper/fluff/claymore,
+ /obj/item/mine/directional/claymore,
+ /obj/item/mine/directional/claymore,
+ /obj/item/mine/directional/claymore,
+ /obj/item/mine/directional/claymore)
+ crate_name = "C-10 Claymore crate"
+
+/obj/item/paper/fluff/claymore
+ name = "PRODUCT USAGE GUIDE"
+ desc = "A dusty memo stamped with the Scarborough Arms logo."
+ default_raw_text = "ASSEMBLY:
\
+ -Deploy mounting legs and emplace device. Front should be placed in direction of enemy egress, no more then three meters from intended target area.
\
+ -INFORM ALLIES OF PLACEMENT LOCATION.
\
+ -Wait for arming sequence to complete.
\
+ -Enjoy hands-free area denial, courtesy of Scarborough Arms.
\
+ DISASSEMBLY & STORAGE:
\
+ -Insert screwdriver into arming pin access and turn 180 degrees. There will be considerable resistance. DO NOT Step onto or in front of device.
\
+ -When pressure releases, reach below device and lift via underside in one clean motion. Mounting legs will automatically retract.
\
+ -The device is now safe to handle.
\
+ -Safely stow device in secure, moisture-free location, away from fire and blunt force. "
diff --git a/code/modules/cargo/packs/spacesuit_armor.dm b/code/modules/cargo/packs/spacesuit_armor.dm
index 581a7f2587b4a..d0b1da6be6d2a 100644
--- a/code/modules/cargo/packs/spacesuit_armor.dm
+++ b/code/modules/cargo/packs/spacesuit_armor.dm
@@ -24,12 +24,11 @@
/datum/supply_pack/spacesuit_armor/mining_hardsuits_indie
name = "Mining Hardsuit Crate"
- desc = "One independent branded mining hardsuit for when explorer suits just dont cut it."
+ desc = "One independent-manufactured mining hardsuit, for when explorer suits just dont cut it."
cost = 1500
contains = list(/obj/item/clothing/suit/space/hardsuit/mining/independent)
crate_name = "mining hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/plasma
- faction = FACTION_INDEPENDENT
/datum/supply_pack/spacesuit_armor/med_hardsuit
name = "Medical Hardsuit Crate"
@@ -38,7 +37,7 @@
contains = list(/obj/item/clothing/suit/space/hardsuit/medical)
crate_name = "medical hardsuit crate"
crate_type = /obj/structure/closet/crate/medical
- faction = FACTION_NT
+ faction = /datum/faction/nt
/datum/supply_pack/spacesuit_armor/mining_hardsuit_heavy
name = "Heavy Mining Hardsuit Crate"
@@ -48,7 +47,7 @@
/obj/item/clothing/shoes/bhop)
crate_name = "heavy mining hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/plasma
- faction = FACTION_NT
+ faction = /datum/faction/nt
/datum/supply_pack/spacesuit_armor/sec_hardsuit_bundle
name = "Security Hardsuit Crate"
@@ -57,7 +56,7 @@
contains = list(/obj/item/clothing/suit/space/hardsuit/security/independent)
crate_name = "security hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/gear
- faction = FACTION_NT
+ faction = /datum/faction/nt
/datum/supply_pack/spacesuit_armor/sci_hardsuit
name = "Science Hardsuit Crate"
@@ -66,7 +65,7 @@
contains = list(/obj/item/clothing/suit/space/hardsuit/rd)
crate_name = "science hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/science
- faction = FACTION_NT
+ faction = /datum/faction/nt
/datum/supply_pack/spacesuit_armor/engi_spacesuit_bundle
name = "Engineering Space Suit Crate"
@@ -84,17 +83,7 @@
contains = list(/obj/item/clothing/suit/space/hardsuit/engine/atmos)
crate_name = "atmospherics hardsuit crate"
crate_type = /obj/structure/closet/crate/secure/engineering
- faction = FACTION_NT
-
-/datum/supply_pack/spacesuit_armor/swat
- name = "SWAT Crate"
- desc = "Contains one fullbody set of tough, fireproof, pressurized suit designed in a joint effort by IS-ERI and Nanotrasen. The set contains a suit, helmet, and combat belt."
- cost = 3500
- contains = list(/obj/item/clothing/head/helmet/swat/nanotrasen,
- /obj/item/clothing/suit/space/swat,
- /obj/item/storage/belt/military/assault)
- crate_name = "swat crate"
- crate_type = /obj/structure/closet/crate/secure/gear
+ faction = /datum/faction/nt
/*
Non-spaceworthy (armor)
@@ -135,3 +124,21 @@
contains = list(/obj/item/clothing/suit/armor/laserproof)
crate_name = "reflector vest crate"
crate_type = /obj/structure/closet/crate/secure/plasma
+
+/datum/supply_pack/spacesuit_armor/marine_armor
+ name = "Tactical Armor Crate"
+ desc = "One set of well-rounded tactical armor. While it does not protect the limbs, the vest is fairly durable. The set includes a helmet and vest."
+ cost = 1500
+ contains = list(/obj/item/clothing/suit/armor/vest/marine,
+ /obj/item/clothing/head/helmet/bulletproof/x11)
+ crate_name = "armor crate"
+ crate_type = /obj/structure/closet/crate/secure/plasma
+
+/datum/supply_pack/spacesuit_armor/medium_marine_armor
+ name = "Medium Tactical Armor Crate"
+ desc = "One set of well-rounded medium tactical body armor. Plates are attached to the vest and cover the limbs. The set includes a helmet and chestpiece."
+ cost = 3000
+ contains = list(/obj/item/clothing/suit/armor/vest/marine/medium,
+ /obj/item/clothing/head/helmet/bulletproof/x11)
+ crate_name = "armor crate"
+ crate_type = /obj/structure/closet/crate/secure/plasma
diff --git a/code/modules/cargo/packs/tools.dm b/code/modules/cargo/packs/tools.dm
index 36bfefc027968..857477bcf9229 100644
--- a/code/modules/cargo/packs/tools.dm
+++ b/code/modules/cargo/packs/tools.dm
@@ -25,7 +25,7 @@
contains = list(/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox/mechanical,
/obj/item/clothing/head/welding)
- cost = 500
+ cost = 200
crate_name = "toolbox crate"
/datum/supply_pack/tools/engigear
@@ -39,13 +39,19 @@
/obj/item/clothing/glasses/meson/engine)
crate_name = "engineering gear crate"
+/datum/supply_pack/tools/assbelt
+ name = "Assault Belt"
+ desc = "Contains an assault belt, with not one, not two, but six pockets."
+ cost = 500
+ contains = list(/obj/item/storage/belt/military/assault)
+ crate_name = "assault belt crate"
+
/datum/supply_pack/tools/cellcharger
name = "Cell Charger Crate"
desc = "Contains a cell charger, able to charge all sorts of power cells."
- cost = 4000
+ cost = 1000
contains = list(/obj/machinery/cell_charger)
-
/datum/supply_pack/tools/rped
name = "RPED crate"
desc = "Tired of deconstructing all of your machines just to replace the power cells? This device has you covered. Actual parts not included."
@@ -74,13 +80,6 @@
contains = list(/obj/item/pickaxe/drill/jackhammer)
crate_name = "jackhammer crate"
-/datum/supply_pack/tools/plasmacutter
- name = "Plasmacutter Crate"
- desc = "Contains a plasmacutter, capable of rapidly breaking down hull."
- cost = 1250
- contains = list(/obj/item/gun/energy/plasmacutter)
- crate_name = "plasmacutter crate"
-
/datum/supply_pack/tools/metalfoam
name = "Metal Foam Grenade Crate"
desc = "Seal up those pesky hull breaches with 7 metal foam grenades."
@@ -98,25 +97,40 @@
/datum/supply_pack/tools/jetpack
name = "Jetpack Crate"
desc = "For when you need to go fast in space."
- cost = 2000
+ cost = 750
contains = list(/obj/item/tank/jetpack/carbondioxide)
crate_name = "jetpack crate"
crate_type = /obj/structure/closet/crate/secure/plasma
-/datum/supply_pack/tools/transfer_valve
- name = "Tank Transfer Valves Crate"
- desc = "The key ingredient for making a lot of people very angry very fast. Contains a tank transfer valve."
- cost = 3000
- contains = list(/obj/item/transfer_valve)
- crate_name = "tank transfer valve crate"
- crate_type = /obj/structure/closet/crate/secure/science
+/datum/supply_pack/tools/jetpack/harness
+ name = "Jetpack Harness Crate"
+ desc = "A compact jetpack harness for those who don't wish to be weighed down by larger traditional jetpacks."
+ cost = 1500
+ contains = list(/obj/item/tank/jetpack/oxygen/harness)
/datum/supply_pack/tools/anglegrinder
name = "Angle Grinder"
desc = "Contains one angle grinder pack, a tool used for quick structure deconstruction and salvaging"
- cost = 2000
- contains = list(/obj/item/gear_pack/anglegrinder)
- crate_name = "Angle Grinder"
+ cost = 1500
+ contains = list(
+ /obj/item/gear_pack/anglegrinder,
+ /obj/item/radio/headset/alt
+ )
+ crate_name = "angle grinder crate"
+
+/datum/supply_pack/tools/electric_welder
+ name = "Electric Welder"
+ desc = "Contains a single electric welder, useful for many applications. No fuel required!"
+ cost = 850
+ contains = list(/obj/item/weldingtool/electric)
+ crate_name = "electric welder crate"
+
+/datum/supply_pack/tools/plasmacutter
+ name = "Plasmacutter Crate"
+ desc = "Contains a plasmacutter, capable of rapidly breaking down hull."
+ cost = 2500
+ contains = list(/obj/item/gun/energy/plasmacutter)
+ crate_name = "plasmacutter crate"
/*
Liquid tanks
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index ab737b1ceb78e..b9c30f4840214 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -452,8 +452,11 @@
glow_effect.fadeAway(delays[POD_OPENING])
glow_effect = null
+/obj/structure/closet/supplypod/deconstruct(disassembled)
+ . = ..()
+ open_pod(src, broken = disassembled) //Lets dump our contents by opening up
+
/obj/structure/closet/supplypod/Destroy()
- open_pod(src, broken = TRUE) //Lets dump our contents by opening up
deleteRubble()
endGlow()
return ..()
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 64e2476b400f0..b985ead4aca22 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -190,7 +190,7 @@
var/next_move_dir_sub
/// If the client is currently under the restrictions of the interview system
- var/interviewee = FALSE
+ var/interviewee = TRUE
/// Used by SSserver_maint to detect if a client is newly AFK.
var/last_seen_afk = 0
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 87a33b0c989b1..5f1c211412c87 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -277,6 +277,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
prefs.last_id = computer_id //these are gonna be used for banning
fps = prefs.clientfps == 0 ? 60 : prefs.clientfps //WS Edit - Client FPS Tweak
+ donator = GLOB.donators[ckey] || new /datum/donator(src)
+
if(fexists(roundend_report_file()))
add_verb(src, /client/proc/show_previous_roundend_report)
@@ -933,8 +935,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
..()
/client/proc/add_verbs_from_config()
- if (interviewee)
+ if(interviewee)
return
+ if(donator.is_donator)
+ add_verb(src, /client/proc/do_donator_redemption)
+ add_verb(src, /client/proc/do_donator_wcir)
if(CONFIG_GET(flag/see_own_notes))
add_verb(src, /client/proc/self_notes)
if(CONFIG_GET(flag/use_exp_tracking))
@@ -1167,3 +1172,13 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if("Set-Tab")
stat_tab = payload["tab"]
SSstatpanels.immediate_send_stat_data(src)
+
+///Gives someone hearted status for OOC, from behavior commendations
+/client/proc/adjust_heart(duration = 24 HOURS)
+ var/new_duration = world.realtime + duration
+ if(prefs.hearted_until > new_duration)
+ return
+ to_chat(src, "Someone awarded you a heart!")
+ prefs.hearted_until = new_duration
+ prefs.hearted = TRUE
+ prefs.save_preferences()
diff --git a/code/modules/client/loadout/_loadout.dm b/code/modules/client/loadout/_loadout.dm
index a0e5d6cab3c33..44c1cff4ffa5f 100644
--- a/code/modules/client/loadout/_loadout.dm
+++ b/code/modules/client/loadout/_loadout.dm
@@ -20,11 +20,11 @@ GLOBAL_LIST_EMPTY(gear_datums)
if(G == initial(G.subtype_path))
continue
- if(!use_name)
- WARNING("Loadout - Missing display name: [G]")
+ if(!use_name && initial(G.path))
+ WARNING("Loadout gear [G] is missing display name")
continue
if(!initial(G.path) && use_category != "OOC") //OOC category does not contain actual items
- WARNING("Loadout - Missing path definition: [G]")
+ WARNING("Loadout gear [G] is missing path definition")
continue
if(!GLOB.loadout_categories[use_category])
diff --git a/code/modules/client/loadout/loadout_accessories.dm b/code/modules/client/loadout/loadout_accessories.dm
index a8acc15446544..d52c9a8b58fc0 100644
--- a/code/modules/client/loadout/loadout_accessories.dm
+++ b/code/modules/client/loadout/loadout_accessories.dm
@@ -98,6 +98,9 @@
subtype_path = /datum/gear/accessory/mask
slot = ITEM_SLOT_MASK
+/datum/gear/accessory/mask/bandana
+ subtype_path = /datum/gear/accessory/mask/bandana
+
/datum/gear/accessory/mask/bandana/red
display_name = "bandana, red"
path = /obj/item/clothing/mask/bandana/red
diff --git a/code/modules/client/loadout/loadout_hat.dm b/code/modules/client/loadout/loadout_hat.dm
index 2f7e59c288b7d..a393ec451c302 100644
--- a/code/modules/client/loadout/loadout_hat.dm
+++ b/code/modules/client/loadout/loadout_hat.dm
@@ -80,6 +80,9 @@
//Soft caps
+/datum/gear/hat/softcap
+ subtype_path = /datum/gear/hat/softcap
+
/datum/gear/hat/softcap/red
display_name = "cap, red"
path = /obj/item/clothing/head/soft/red
@@ -100,6 +103,23 @@
display_name = "cap, black"
path = /obj/item/clothing/head/soft/black
+/datum/gear/hat/utility_black
+ display_name = "utility cover, black"
+ path = /obj/item/clothing/head/soft/utility_black
+
+/datum/gear/hat/utility_olive
+ display_name = "utility cover, olive"
+ path = /obj/item/clothing/head/soft/utility_olive
+
+/datum/gear/hat/utility_beige
+ display_name = "utility cover, beige"
+ path = /obj/item/clothing/head/soft/utility_beige
+
+/datum/gear/hat/utility_navy
+ display_name = "utility cover, navy"
+ path = /obj/item/clothing/head/soft/utility_navy
+
+
//Beanies
/datum/gear/hat/beanie
diff --git a/code/modules/client/loadout/loadout_suit.dm b/code/modules/client/loadout/loadout_suit.dm
index 1d11857663ad6..1edeed63530a6 100644
--- a/code/modules/client/loadout/loadout_suit.dm
+++ b/code/modules/client/loadout/loadout_suit.dm
@@ -88,6 +88,9 @@
path = /obj/item/clothing/suit/toggle/hazard
//Suspenders
+/datum/gear/suit/suspenders
+ subtype_path = /datum/gear/suit/suspenders
+
/datum/gear/suit/suspenders/red
display_name = "suspenders, red"
path = /obj/item/clothing/suit/toggle/suspenders
diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm
index 96b4088b65bd5..a042ab353070d 100644
--- a/code/modules/client/loadout/loadout_uniform.dm
+++ b/code/modules/client/loadout/loadout_uniform.dm
@@ -53,10 +53,6 @@
display_name = "jumpsuit, random"
path = /obj/item/clothing/under/color/random //literally useless if grey assistants is off
-/datum/gear/uniform/color/rainbow
- display_name = "jumpsuit, rainbow"
- path = /obj/item/clothing/under/color/rainbow
-
//Shorts
/datum/gear/uniform/athshortsred
@@ -180,46 +176,115 @@
display_name = "suit, checkered"
path = /obj/item/clothing/under/suit/checkered
+/datum/gear/uniform/suit/detective
+ display_name = "suit, hardworn"
+ path = /obj/item/clothing/under/rank/security/detective
+
+/datum/gear/uniform/suit/detective/skirt
+ display_name = "suitskirt, hardworn"
+ path = /obj/item/clothing/under/rank/security/detective/skirt
+
+/datum/gear/uniform/suit/detective/grey
+ display_name = "suit, noir"
+ path = /obj/item/clothing/under/rank/security/detective/grey
+
+/datum/gear/uniform/suit/detective/grey/skirt
+ display_name = "suitskirt, noir"
+ path = /obj/item/clothing/under/rank/security/detective/grey/skirt
+
// Dresses
/datum/gear/uniform/dress
subtype_path = /datum/gear/uniform/dress
/datum/gear/uniform/dress/sailor
- display_name = "sailor dress"
+ display_name = "dress, sailor"
path = /obj/item/clothing/under/dress/sailor
/datum/gear/uniform/dress/striped
- display_name = "striped dress"
+ display_name = "dress, striped"
path = /obj/item/clothing/under/dress/striped
/datum/gear/uniform/dress/redeveninggown
- display_name = "red evening gown"
+ display_name = "dress, red evening gown"
path = /obj/item/clothing/under/dress/redeveninggown
/datum/gear/uniform/dress/blacktango
- display_name = "black tango dress"
+ display_name = "dress, black tango"
path = /obj/item/clothing/under/dress/blacktango
+/datum/gear/uniform/dress/one_shoulder_dress
+
+ display_name = "dress, one shoulder"
+ path = /obj/item/clothing/under/dress/one_shoulder
+
+/datum/gear/uniform/dress/iko_ikssoal
+
+ display_name = "dress, iko-ikssoal"
+ path = /obj/item/clothing/under/dress/iko_ikssoal
+
+/datum/gear/uniform/dress/whitedress
+
+ display_name = "dress, white"
+ path = /obj/item/clothing/under/dress/white_dress
+
+/datum/gear/uniform/dress/sundress
+ display_name = "dress, sundress"
+ path = /obj/item/clothing/under/dress/sundress
+
+/datum/gear/uniform/dress/rilena
+ display_name = "dress, Ri cosplay"
+ path = /obj/item/clothing/under/dress/rilena
+
/datum/gear/uniform/dress/purpleskirt
- display_name = "purple skirt"
- path = /obj/item/clothing/under/dress/skirt/purple
+ display_name = "skirt, purple"
+ path = /obj/item/clothing/under/dress/skirt/color/purple
/datum/gear/uniform/dress/blueskirt
- display_name = "blue skirt"
- path = /obj/item/clothing/under/dress/skirt/blue
+ display_name = "skirt, blue"
+ path = /obj/item/clothing/under/dress/skirt/color/blue
/datum/gear/uniform/dress/redskirt
- display_name = "red skirt"
- path = /obj/item/clothing/under/dress/skirt/red
+ display_name = "skirt, red"
+ path = /obj/item/clothing/under/dress/skirt/color/red
+
+/datum/gear/uniform/dress/whiteskirt
+
+ display_name = "skirt, white"
+ path = /obj/item/clothing/under/dress/skirt/color/white
/datum/gear/uniform/dress/blackskirt
- display_name = "black skirt"
- path = /obj/item/clothing/under/dress/skirt
- description = "Actually, it's a black blouse with a salmon skirt. But it's not called that."
+ display_name = "skirt, black"
+ path = /obj/item/clothing/under/dress/skirt/color
-/datum/gear/uniform/dress/sundress
- display_name = "sundress"
- path = /obj/item/clothing/under/dress/sundress
+/datum/gear/uniform/dress/black_pinafore
+
+ display_name = "pinafore, black"
+ path = /obj/item/clothing/under/dress/skirt/pinafore
+
+/datum/gear/uniform/dress/maroon_pinafore
+
+ display_name = "pinafore, maroon"
+ path = /obj/item/clothing/under/dress/skirt/pinafore/maroon
+
+/datum/gear/uniform/dress/cerulean_pinafore
+
+ display_name = "pinafore, cerulean"
+ path = /obj/item/clothing/under/dress/skirt/pinafore/cerulean
+
+/datum/gear/uniform/dress/red_plaid_pinafore
+
+ display_name = "pinafore, red plaid"
+ path = /obj/item/clothing/under/dress/skirt/pinafore/plaid
+
+/datum/gear/uniform/dress/green_plaid_pinafore
+
+ display_name = "pinafore, green plaid"
+ path = /obj/item/clothing/under/dress/skirt/pinafore/plaid/green
+
+/datum/gear/uniform/dress/brown_plaid_pinafore
+
+ display_name = "pinafore, brown plaid"
+ path = /obj/item/clothing/under/dress/skirt/pinafore/plaid/brown
/datum/gear/uniform/suit/dress_suit
display_name = "dress-suit, navy"
@@ -228,7 +293,3 @@
/datum/gear/uniform/suit/dress_suit/skirt
display_name = "dress-suitskirt, navy"
path = /obj/item/clothing/under/suit/dresssuit/skirt
-
-/datum/gear/uniform/dress/rilena
- display_name = "red dress, Ri cosplay"
- path = /obj/item/clothing/under/dress/rilena
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 91eab6d53f0f5..d339d6b715c82 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/ooccolor = "#c43b23"
var/asaycolor = "#ff4500" //This won't change the color for current admins, only incoming ones.
/// If we spawn an ERT as an admin and choose to spawn as the briefing officer, we'll be given this outfit
- var/brief_outfit = /datum/outfit/centcom/commander
+ var/brief_outfit = /datum/outfit/job/nanotrasen/captain
var/enable_tips = TRUE
var/tip_delay = 500 //tip delay in milliseconds
@@ -215,6 +215,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
///The outfit we currently want to preview on our character
var/datum/outfit/job/selected_outfit
+ ///Someone thought we were nice! We get a little heart in OOC until we join the server past the below time (we can keep it until the end of the round otherwise)
+ var/hearted
+ ///
+ var/hearted_until
+
+
+
/datum/preferences/New(client/C)
parent = C
@@ -893,7 +900,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
mutant_category = 0
// end generic adjective
- if("wings" in pref_species.default_features && GLOB.r_wings_list.len >1)
+ if(("wings" in pref_species.default_features) && GLOB.r_wings_list.len >1)
if(!mutant_category)
dat += APPEARANCE_CATEGORY_COLUMN
@@ -1135,6 +1142,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(unlock_content || check_rights_for(user.client, R_ADMIN) || custom_ooc)
dat += "OOC Color:Change "
+ if(hearted_until)
+ dat += "Clear OOC Commend Heart "
+
dat += ""
if(user.client.holder)
@@ -2430,6 +2440,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(current_tab == 2)
show_loadout = TRUE
+ if("clear_heart")
+ hearted = FALSE
+ hearted_until = null
+ to_chat(user, "OOC Commendation Heart disabled")
+ save_preferences()
+
+
ShowChoices(user)
return 1
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 71d968d161307..f5c4dff3e6370 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -5,7 +5,7 @@
// You do not need to raise this if you are adding new values that have sane defaults.
// Only raise this value when changing the meaning/format/name/layout of an existing value
// where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX 41
+#define SAVEFILE_VERSION_MAX 42
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -76,9 +76,24 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(current_version < 38)
outline_enabled = TRUE
outline_color = COLOR_BLUE_GRAY
+
if (current_version < 40)
LAZYADD(key_bindings["Space"], "hold_throw_mode")
+ if(current_version < 42)
+ //The toggles defines were moved down one bit
+ if(toggles & FAST_MC_REFRESH)
+ toggles |= SPLIT_ADMIN_TABS
+ else
+ toggles &= ~SPLIT_ADMIN_TABS
+
+ if(toggles & SOUND_RADIO)
+ toggles |= FAST_MC_REFRESH
+ else
+ toggles &= ~FAST_MC_REFRESH
+
+ toggles |= SOUND_RADIO
+
/datum/preferences/proc/update_character(current_version, savefile/S)
if(current_version < 39)
var/species_id
@@ -208,15 +223,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
READ_FILE(S["pda_color"], pda_color)
READ_FILE(S["whois_visible"], whois_visible)
- // Custom hotkeys
- READ_FILE(S["key_bindings"], key_bindings)
- check_keybindings()
-
READ_FILE(S["show_credits"], show_credits)
//favorite outfits
READ_FILE(S["favorite_outfits"], favorite_outfits)
-
var/list/parsed_favs = list()
for(var/typetext in favorite_outfits)
var/datum/outfit/path = text2path(typetext)
@@ -224,6 +234,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
parsed_favs += path
favorite_outfits = uniqueList(parsed_favs)
+ // OOC commendations
+ READ_FILE(S["hearted_until"], hearted_until)
+ if(hearted_until > world.realtime)
+ hearted = TRUE
+
+ // Custom hotkeys
+ READ_FILE(S["key_bindings"], key_bindings)
+ check_keybindings()
+
//try to fix any outdated data if necessary
if(needs_update >= 0)
var/bacpath = "[path].updatebac" //todo: if the savefile version is higher then the server, check the backup, and give the player a prompt to load the backup
@@ -352,6 +371,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["key_bindings"], key_bindings)
WRITE_FILE(S["favorite_outfits"], favorite_outfits)
WRITE_FILE(S["whois_visible"], whois_visible)
+ WRITE_FILE(S["hearted_until"], (hearted_until > world.realtime ? hearted_until : null))
return TRUE
/datum/preferences/proc/load_character(slot)
diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
index b40e1702652ef..13f56a90a63a6 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -248,7 +248,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_announcement_sound)()
/datum/verbs/menu/Settings/Sound/toggle_announcement_sound/Get_checked(client/C)
return C.prefs.toggles & SOUND_ANNOUNCEMENTS
-/* READD THIS WHEN YOU FIX RADIO CHATTER
+//Readded, now that radio chatter is fixed.
TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_radio_sound)()
set name = "Hear/Silence Radio Chatter"
set category = "Preferences"
@@ -260,7 +260,6 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_radio_sound)()
/datum/verbs/menu/Settings/Sound/toggle_radio_sound/Get_checked(client/C)
return C.prefs.toggles & SOUND_RADIO
-*/
/datum/verbs/menu/Settings/Sound/verb/stop_client_sounds()
set name = "Stop Sounds"
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index ea626f397e587..fb2ade22a6da6 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -61,6 +61,9 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
keyname = "[icon2html('icons/member_content.dmi', world, "blag")][keyname]"
if(prefs.custom_ooc)
keyname = "[keyname]"
+ if(prefs.hearted)
+ var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
+ keyname = "[sheet.icon_tag("emoji-heart")][keyname]"
//The linkify span classes and linkify=TRUE below make ooc text get clickable chat href links if you pass in something resembling a url
for(var/client/C in GLOB.clients)
if(C.prefs.chat_toggles & CHAT_OOC)
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index f5c37b18997d6..7fb618f34ddb7 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -12,10 +12,12 @@
// Damn our lack of abstract interfeces
if (istype(target, /obj/item/clothing/head/chameleon/drone))
var/obj/item/clothing/head/chameleon/drone/X = target
- X.chameleon_action.random_look(owner)
+ var/datum/action/item_action/chameleon/change/chameleon_action_x = locate() in X.actions
+ chameleon_action_x.random_look(owner)
if (istype(target, /obj/item/clothing/mask/chameleon/drone))
var/obj/item/clothing/mask/chameleon/drone/Z = target
- Z.chameleon_action.random_look(owner)
+ var/datum/action/item_action/chameleon/change/chameleon_action_z = locate() in Z.actions
+ chameleon_action_z.random_look(owner)
return 1
@@ -133,7 +135,8 @@
if(helmet_type)
var/obj/item/clothing/head/chameleon/hat = H.head
- hat.chameleon_action.update_look(user, helmet_type)
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in hat.actions
+ chameleon_action.update_look(user, helmet_type)
// ID card sechud
if(outfit.job_icon)
@@ -320,11 +323,9 @@
can_adjust = FALSE
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/under/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/under
chameleon_action.chameleon_name = "Jumpsuit"
chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/under, /obj/item/clothing/under/color, /obj/item/clothing/under/rank, /obj/item/clothing/under/changeling), only_root_path = TRUE)
@@ -334,10 +335,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/under/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/suit/chameleon
@@ -351,11 +354,9 @@
resistance_flags = NONE
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/suit/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/suit
chameleon_action.chameleon_name = "Suit"
chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/suit/armor/abductor, /obj/item/clothing/suit/changeling), only_root_path = TRUE)
@@ -365,10 +366,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/suit/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/glasses/chameleon
@@ -379,11 +382,9 @@
resistance_flags = NONE
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/glasses/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/glasses
chameleon_action.chameleon_name = "Glasses"
chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/glasses/changeling, only_root_path = TRUE)
@@ -393,10 +394,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/glasses/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/gloves/chameleon
@@ -408,11 +411,9 @@
resistance_flags = NONE
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/gloves/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/gloves
chameleon_action.chameleon_name = "Gloves"
chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/clothing/gloves, /obj/item/clothing/gloves/color, /obj/item/clothing/gloves/changeling), only_root_path = TRUE)
@@ -422,10 +423,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/gloves/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/head/chameleon
@@ -436,11 +439,9 @@
resistance_flags = NONE
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/head/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/head
chameleon_action.chameleon_name = "Hat"
chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/head/changeling, only_root_path = TRUE)
@@ -450,10 +451,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/head/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/head/chameleon/drone
@@ -465,6 +468,7 @@
/obj/item/clothing/head/chameleon/drone/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.random_look()
var/datum/action/item_action/chameleon/drone/togglehatmask/togglehatmask_action = new(src)
togglehatmask_action.UpdateButtonIcon()
@@ -486,11 +490,9 @@
var/voice_change = 1 ///This determines if the voice changer is on or off.
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/mask/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/mask
chameleon_action.chameleon_name = "Mask"
chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/mask/changeling, only_root_path = TRUE)
@@ -500,10 +502,12 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/mask/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/mask/chameleon/attack_self(mob/user)
@@ -519,6 +523,7 @@
/obj/item/clothing/mask/chameleon/drone/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.random_look()
var/datum/action/item_action/chameleon/drone/togglehatmask/togglehatmask_action = new(src)
togglehatmask_action.UpdateButtonIcon()
@@ -537,11 +542,9 @@
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/shoes/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/shoes
chameleon_action.chameleon_name = "Shoes"
chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/shoes/changeling, only_root_path = TRUE)
@@ -551,6 +554,7 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/shoes/chameleon/noslip
@@ -562,15 +566,15 @@
/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/storage/backpack/chameleon
name = "backpack"
- var/datum/action/item_action/chameleon/change/chameleon_action
/obj/item/storage/backpack/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/storage/backpack
chameleon_action.chameleon_name = "Backpack"
chameleon_action.initialize_disguises()
@@ -579,21 +583,22 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/storage/backpack/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/storage/belt/chameleon
name = "toolbelt"
desc = "Holds tools."
- var/datum/action/item_action/chameleon/change/chameleon_action
/obj/item/storage/belt/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/storage/belt
chameleon_action.chameleon_name = "Belt"
chameleon_action.initialize_disguises()
@@ -607,19 +612,17 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/storage/belt/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
-/obj/item/radio/headset/chameleon
- name = "radio headset"
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/radio/headset/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/radio/headset
chameleon_action.chameleon_name = "Headset"
chameleon_action.initialize_disguises()
@@ -628,19 +631,17 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/radio/headset/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
-/obj/item/pda/chameleon
- name = "PDA"
- var/datum/action/item_action/chameleon/change/pda/chameleon_action
-
/obj/item/pda/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/pda
chameleon_action.chameleon_name = "PDA"
chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/pda/heads, /obj/item/pda/ai, /obj/item/pda/ai/pai), only_root_path = TRUE)
@@ -650,24 +651,24 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/pda/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
-/obj/item/stamp/chameleon
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/stamp/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/stamp
chameleon_action.chameleon_name = "Stamp"
chameleon_action.initialize_disguises()
/obj/item/stamp/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/neck/chameleon
@@ -677,12 +678,9 @@
resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
-/obj/item/clothing/neck/chameleon
- var/datum/action/item_action/chameleon/change/chameleon_action
-
/obj/item/clothing/neck/chameleon/Initialize()
. = ..()
- chameleon_action = new(src)
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/neck
chameleon_action.chameleon_name = "Neck Accessory"
chameleon_action.initialize_disguises()
@@ -691,8 +689,10 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise()
/obj/item/clothing/neck/chameleon/broken/Initialize()
. = ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = locate() in actions
chameleon_action.emp_randomise(INFINITY)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index a6bb804995880..35df35d5ee236 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -3,6 +3,11 @@
resistance_flags = FLAMMABLE
max_integrity = 200
integrity_failure = 0.4
+
+ equip_sound = 'sound/items/equip/cloth_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+
var/damaged_clothes = 0 //similar to machine's BROKEN stat and structure's broken var
///What level of bright light protection item has.
var/flash_protect = FLASH_PROTECTION_NONE
@@ -11,7 +16,8 @@
var/visor_flags = 0 //flags that are added/removed when an item is adjusted up/down
var/visor_flags_inv = 0 //same as visor_flags, but for flags_inv
var/visor_flags_cover = 0 //same as above, but for flags_cover
-//what to toggle when toggled with weldingvisortoggle()
+
+ //what to toggle when toggled with weldingvisortoggle()
var/visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_VISIONFLAGS | VISOR_DARKNESSVIEW | VISOR_INVISVIEW
lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
@@ -29,9 +35,9 @@
var/can_be_bloody = TRUE
- //Var modification - PLEASE be careful with this I know who you are and where you live
- var/list/user_vars_to_edit //VARNAME = VARVALUE eg: "name" = "butts"
- var/list/user_vars_remembered //Auto built by the above + dropped() + equipped()
+ //set during equip_to_slot, removed when taking off.
+ //here lies some of the most batshit insane reference code I've ever seen. Look it up in the commit history
+ var/datum/weakref/wearer
var/pocket_storage_component_path
@@ -46,6 +52,9 @@
/// Trait modification, lazylist of traits to add/take away, on equipment/drop in the correct slot
var/list/clothing_traits
+ ///sets the icon path of the onmob blood overlay created by this object. syntax is "[var]blood"
+ var/blood_overlay_type = "uniform"
+
/obj/item/clothing/Initialize()
if((clothing_flags & VOICEBOX_TOGGLABLE))
actions_types += /datum/action/item_action/toggle_voice_box
@@ -64,7 +73,7 @@
if(!M.incapacitated() && loc == M && istype(over_object, /atom/movable/screen/inventory/hand))
var/atom/movable/screen/inventory/hand/H = over_object
- if(M.putItemFromInventoryInHandIfPossible(src, H.held_index))
+ if(M.putItemFromInventoryInHandIfPossible(src, H.held_index, FALSE, TRUE))
add_fingerprint(usr)
/obj/item/reagent_containers/food/snacks/clothing
@@ -107,22 +116,14 @@
return TRUE
return ..()
-/obj/item/clothing/Destroy()
- user_vars_remembered = null //Oh god somebody put REFERENCES in here? not to worry, we'll clean it up
- return ..()
-
/obj/item/clothing/dropped(mob/user)
..()
if(!istype(user))
return
for(var/trait in clothing_traits)
REMOVE_CLOTHING_TRAIT(user, trait)
- if(LAZYLEN(user_vars_remembered))
- for(var/variable in user_vars_remembered)
- if(variable in user.vars)
- if(user.vars[variable] == user_vars_to_edit[variable]) //Is it still what we set it to? (if not we best not change it)
- user.vars[variable] = user_vars_remembered[variable]
- user_vars_remembered = initial(user_vars_remembered) // Effectively this sets it to null.
+ if(wearer?.resolve())
+ wearer = null
/obj/item/clothing/equipped(mob/user, slot)
..()
@@ -131,11 +132,8 @@
if(slot_flags & slot) //Was equipped to a valid slot for this item?
for(var/trait in clothing_traits)
ADD_CLOTHING_TRAIT(user, trait)
- if (LAZYLEN(user_vars_to_edit))
- for(var/variable in user_vars_to_edit)
- if(variable in user.vars)
- LAZYSET(user_vars_remembered, variable, user.vars[variable])
- user.vv_edit_var(variable, user_vars_to_edit[variable])
+ if(!wearer?.resolve())
+ wearer = WEAKREF(user)
/**
* Inserts a trait (or multiple traits) into the clothing traits list
@@ -424,11 +422,19 @@
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
else
- if(attached_accessory)
- remove_accessory(user)
+ if(attached_accessory && ispath(attached_accessory.pocket_storage_component_path) && loc == user)
+ attached_accessory.attack_hand(user)
+ return
else
rolldown()
+/obj/item/clothing/under/CtrlClick(mob/user)
+ if(..())
+ return 1
+ if(attached_accessory)
+ remove_accessory(user)
+
+
/obj/item/clothing/under/verb/jumpsuit_adjust()
set name = "Adjust Jumpsuit Style"
set category = null
@@ -514,3 +520,17 @@
deconstruct(FALSE)
else
..()
+
+///sets up the proper bloody overlay for a clothing object, using species data
+/obj/item/clothing/proc/setup_blood_overlay()
+ var/overlay_file = 'icons/effects/blood.dmi'
+
+ var/mob/living/carbon/human/wearing = wearer?.resolve()
+ var/custom_overlay_icon = wearing?.dna.species.custom_overlay_icon
+ if(custom_overlay_icon)
+ overlay_file = custom_overlay_icon
+
+ var/mutable_appearance/bloody_clothing = mutable_appearance(overlay_file, "[blood_overlay_type]blood")
+ bloody_clothing.color = get_blood_dna_color(return_blood_DNA())
+
+ return bloody_clothing
diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm
index 7ac3668aaf77b..cdb3dcfce757c 100644
--- a/code/modules/clothing/factions/clip.dm
+++ b/code/modules/clothing/factions/clip.dm
@@ -215,7 +215,7 @@
armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 60, "fire" = 50, "acid" = 80)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/clip_spotter
- allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
resistance_flags = null
slowdown = 1
@@ -240,7 +240,7 @@
//hats
/obj/item/clothing/head/clip
name = "\improper CLIP Minutemen service cap"
- desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. While usually given to recruits and volunteers, it's sometimes used by occasionally by some Minutemen."
+ desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. While usually given to recruits and new volunteers, it's used occasionally by some Minutemen."
icon = 'icons/obj/clothing/faction/clip/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
vox_override_icon = 'icons/mob/clothing/faction/clip/vox.dmi'
@@ -330,6 +330,8 @@
icon_state = "clip_m10_correspondant"
item_state = "clip_m10_correspondant"
+ supports_variations = VOX_VARIATION
+
/obj/item/clothing/head/helmet/riot/clip
name = "\improper Minutemen riot helmet"
desc = "Designed to protect against close range attacks. Mainly used by the CMM-BARD against hostile xenofauna, it also sees prolific use on some Minutemen member worlds."
@@ -382,6 +384,14 @@
supports_variations = SNOUTED_VARIATION
+/obj/item/clothing/mask/balaclava/combat
+ name = "combat balaclava"
+ desc = "A surprisingly advanced balaclava. While it doesn't muffle your voice, it has a mouthpiece for internals. Comfy to boot!"
+ icon_state = "combat_balaclava"
+ item_state = "combat_balaclava"
+ alternate_worn_layer = BODY_LAYER
+ flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
+
//gloves
/obj/item/clothing/gloves/color/latex/nitrile/clip
@@ -435,21 +445,26 @@
new /obj/item/ammo_box/magazine/cm15_12g(src)
new /obj/item/grenade/frag(src)
+/obj/item/storage/belt/military/clip/cm15_inc/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/ammo_box/magazine/cm15_12g/incendiary(src)
+ new /obj/item/grenade/frag(src)
+
/obj/item/storage/belt/military/clip/e50/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/belt/military/clip/e50/PopulateContents()
- for(var/i in 1 to 5)
+ for(var/i in 1 to 3)
new /obj/item/stock_parts/cell/gun/large(src)
new /obj/item/grenade/frag(src)
- new /obj/item/screwdriver/nuke(src)
+ new /obj/item/screwdriver(src)
/obj/item/storage/belt/military/clip/engi/PopulateContents()
new /obj/item/screwdriver/power(src)
new /obj/item/crowbar/power(src)
- new /obj/item/weldingtool/experimental(src)
+ new /obj/item/weldingtool/electric(src)
new /obj/item/multitool(src)
new /obj/item/construction/rcd/combat(src)
new /obj/item/extinguisher/mini(src)
@@ -458,7 +473,7 @@
/obj/item/storage/belt/military/clip/flamer/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/glass/beaker/large/fuel(src)
- new /obj/item/ammo_box/magazine/co9mm(src)
+ new /obj/item/ammo_box/magazine/cm23(src)
/obj/item/storage/belt/medical/webbing/clip
name = "medical webbing"
diff --git a/code/modules/clothing/factions/frontiersmen.dm b/code/modules/clothing/factions/frontiersmen.dm
index 77af8138fb40a..7c48578232605 100644
--- a/code/modules/clothing/factions/frontiersmen.dm
+++ b/code/modules/clothing/factions/frontiersmen.dm
@@ -41,19 +41,20 @@
//Unarmored suits//
///////////////////
-/obj/item/clothing/suit/frontiersmen
+/obj/item/clothing/suit/frontiersmen //Ideally, the basic suit model here should be turned into a placeholder model, and this item have "smock" or "apron" added on the end.
name = "frontiersmen smock"
desc = "A basic white surgical apron worn by the Frontiersmen. It seems it could stain very easily..."
icon_state = "frontier_surgery"
icon = 'icons/obj/clothing/faction/frontiersmen/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/suits.dmi'
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
//////////////////
//Armored suits//
/////////////////
-/obj/item/clothing/suit/armor/vest/bulletproof/frontier
- name = "\improper Frontiersmen bulletproof armor"
+/obj/item/clothing/suit/armor/vest/frontier
+ name = "\improper Frontiersmen armor vest"
desc = "A scrap piece of armor made of disused protective plates. This one was used to protect the squishy bits of a Frontiersman, once."
icon_state = "frontier_armor"
icon = 'icons/obj/clothing/faction/frontiersmen/suits.dmi'
@@ -129,7 +130,7 @@
name = "frontiersman cap"
desc = "An olive-green and grey baseball hat, worn by cargo technicians working under the Frontiersmen. Even they have the rights for a cool cap!"
icon_state = "frontiersoft"
- soft_type = "frontiersmen"
+ soft_type = "frontier"
icon = 'icons/obj/clothing/faction/frontiersmen/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/head.dmi'
@@ -189,12 +190,18 @@
resistance_flags = FIRE_PROOF
armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
-/obj/item/clothing/head/helmet/marine/frontier
+/obj/item/clothing/head/helmet/frontier
name = "frontiersmen reinforced helmet"
desc = "A reinforced Frontiersmen X-11. The front plate has a small window to let the user see."
icon_state = "marine_frontier"
icon = 'icons/obj/clothing/faction/frontiersmen/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/head.dmi'
+ armor = list("melee" = 35, "bullet" = 55, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50)
+ slowdown = 0.1
+ min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
+ clothing_flags = STOPSPRESSUREDAMAGE | SNUG_FIT | BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
////////////
//Glasses//
@@ -230,24 +237,11 @@
unique_reskin = null
-/obj/item/storage/belt/medical/webbing/frontiersmen
- name = "leather medical bandolier"
- desc = "A rudimentary leather bandolier, utilized by both independents and frontiersmen alike. This one is painted white, usually to be worn by a medic."
- icon_state = "frontiermedicalwebbing"
- item_state = "frontiermedicalwebbing"
- icon = 'icons/obj/clothing/faction/frontiersmen/belt.dmi'
- mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/belt.dmi'
-
-/obj/item/storage/belt/medical/webbing/frontiersmen/surgery/PopulateContents()
- new /obj/item/scalpel(src)
- new /obj/item/circular_saw(src)
- new /obj/item/surgicaldrill(src)
- new /obj/item/retractor(src)
- new /obj/item/cautery(src)
- new /obj/item/hemostat(src)
- new /obj/item/hypospray/mkii(src)
- update_appearance()
-
+/obj/item/storage/belt/security/military/frontiersmen/illestren/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/illestren_a850r(src)
+ new /obj/item/grenade/frag(src)
/obj/item/storage/belt/security/military/frontiersmen/skm_ammo/PopulateContents()
for(var/i in 1 to 4)
@@ -268,3 +262,30 @@
for(var/i in 1 to 4)
new /obj/item/reagent_containers/glass/beaker/large/napalm(src)
new /obj/item/grenade/frag(src)
+
+
+/obj/item/storage/belt/medical/webbing/frontiersmen
+ name = "leather medical bandolier"
+ desc = "A rudimentary leather bandolier, utilized by both independents and frontiersmen alike. This one is painted white, usually to be worn by a medic."
+ icon_state = "frontiermedicalwebbing"
+ item_state = "frontiermedicalwebbing"
+ icon = 'icons/obj/clothing/faction/frontiersmen/belt.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/belt.dmi'
+
+/obj/item/storage/belt/medical/webbing/frontiersmen/surgery/PopulateContents()
+ new /obj/item/scalpel(src)
+ new /obj/item/circular_saw(src)
+ new /obj/item/surgicaldrill(src)
+ new /obj/item/retractor(src)
+ new /obj/item/cautery(src)
+ new /obj/item/hemostat(src)
+ new /obj/item/hypospray/mkii(src)
+ update_appearance()
+
+/obj/item/storage/belt/medical/webbing/frontiersmen/combat/PopulateContents()
+ new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
+ new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/stack/medical/gauze/twelve(src)
+ new /obj/item/stack/medical/splint(src)
diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm
index 3eea9ebec4613..c37b02754a38e 100644
--- a/code/modules/clothing/factions/gezena.dm
+++ b/code/modules/clothing/factions/gezena.dm
@@ -102,6 +102,10 @@
w_class = WEIGHT_CLASS_NORMAL
supports_variations = DIGITIGRADE_VARIATION
+/obj/item/clothing/suit/space/gezena/Initialize()
+ . = ..()
+ allowed = GLOB.security_hardsuit_allowed
+
/obj/item/clothing/head/helmet/space/gezena
name = "\improper Rakalla-helm"
desc = "Featuring rubberized grommets fitting for any length of horn, and an internal monitor for life support."
@@ -217,7 +221,6 @@
name = "\improper PGFN Captain's Ihuz-irra Gloves"
desc = "As the name, “ihuz-irra”, or “sure-grip”, suggests, the gloves employed by the PGF military are designed to ensure the highest possible grip is maintained while also providing protection from blisters in work environments. Bears the silver standard of a Gezenan captain."
icon_state = "captaingloves"
- siemens_coefficient = 0.5
//Boots
@@ -225,7 +228,7 @@
name = "\improper PGF Uhro-sez Boots"
desc = "The word “uhro-sez” translates to “steel-foot”, in reference to the steel toe protection provided by these boots. Standard issue to all members of all branches of the PGF military."
icon = 'icons/obj/clothing/faction/gezena/feet.dmi'
- //mob_overlay_icon = 'icons/mob/clothing/faction/gezena/feet.dmi' todo: find out why digi breaks here
+ mob_overlay_icon = 'icons/mob/clothing/faction/gezena/feet.dmi'
icon_state = "pgfboots"
item_state = "jackboots"
@@ -242,6 +245,20 @@
item_state = "bluecloth"
unique_reskin = null
+/obj/item/storage/belt/military/gezena/bg16/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/stock_parts/cell/gun/pgf(src)
+ new /obj/item/screwdriver(src)
+
+/obj/item/storage/belt/military/gezena/engineer/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 2)
+ new /obj/item/stock_parts/cell/gun/pgf(src)
+ new /obj/item/screwdriver(src)
+ new /obj/item/grenade/c4
+ new /obj/item/grenade/c4
+
/obj/item/storage/belt/medical/gezena
name = "\improper PGF Medical Iho-Usks"
desc = "The “iho-usks”, translating to “gear-holder”, is a lightweight harness covered in pouches, supplied to the ground troops of the PGF. This variant is designed for carrying medical supplies."
@@ -252,6 +269,17 @@
icon_state = "medpouches"
item_state = "whitecloth"
+/obj/item/storage/belt/medical/gezena/paramedic/PopulateContents()
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/synthflesh(src)
+ new /obj/item/stack/medical/gauze/twelve(src)
+ new /obj/item/stack/medical/splint(src)
+ . = ..()
+
+
//Cloaks
/obj/item/clothing/neck/cloak/gezena
diff --git a/code/modules/clothing/factions/hardliners.dm b/code/modules/clothing/factions/hardliners.dm
index 43faee3ccb195..83c00e64b89ef 100644
--- a/code/modules/clothing/factions/hardliners.dm
+++ b/code/modules/clothing/factions/hardliners.dm
@@ -28,13 +28,14 @@
//Unarmored suits//
///////////////////
-/obj/item/clothing/suit/hardliners
+/obj/item/clothing/suit/hardliners //Ideally, the basic suit model here should be turned into a placeholder model, and this item have "smock" or "apron" added on the end.
name = "white smock"
desc = "A plain-white surgical smock typically worn by both Hardliners and Cybersun staff. Even mercenaries need medical attention!"
icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
icon_state = "hl_apron"
item_state = "whitecloth"
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
/obj/item/clothing/suit/hazardvest/hardliners
name = "blood-red hazard vest"
@@ -125,7 +126,6 @@
icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl
- lightweight = 1
jetpack = null
/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/hl
@@ -147,7 +147,6 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/hl
icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
- lightweight = 1
jetpack = null
/////////
@@ -215,3 +214,9 @@
item_state = "hl_webbing"
icon = 'icons/obj/clothing/faction/hardliners/belt.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/belt.dmi'
+
+/obj/item/storage/belt/security/webbing/hardliners/sidewinder/PopulateContents()
+ . = ..()
+ new /obj/item/ammo_box/magazine/m57_39_sidewinder(src)
+ new /obj/item/ammo_box/magazine/m57_39_sidewinder(src)
+ new /obj/item/ammo_box/magazine/m57_39_sidewinder(src)
diff --git a/code/modules/clothing/factions/nanotrasen.dm b/code/modules/clothing/factions/nanotrasen.dm
index 6e605d5471b28..9d2c8ba3899ac 100644
--- a/code/modules/clothing/factions/nanotrasen.dm
+++ b/code/modules/clothing/factions/nanotrasen.dm
@@ -9,7 +9,8 @@
righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
icon_state = "deckhand"
item_state = "graycloth"
- supports_variations = DIGITIGRADE_VARIATION
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
// Engineering uniforms
/obj/item/clothing/under/nanotrasen/engineering
@@ -17,12 +18,16 @@
desc = "A dirty grey jumpsuit with reflective blue flashes on the limbs and a wrench icon on the back. A Nanotrasen, Inc. logo is stitched into the collar."
icon_state = "engi"
item_state = "greycloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/engineering/atmos
name = "atmospherics jumpsuit"
desc = "A thick grey jumpsuit with black stripes and an 'O2' icon on the back. A Nanotrasen, Inc. logo is stitched into the collar."
icon_state = "atmos_tech"
item_state = "greycloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/engineering/director
name = "engineering director's overalls"
@@ -30,18 +35,23 @@
icon_state = "engi_director"
item_state = "blackcloth"
+
//Supply uniforms
/obj/item/clothing/under/nanotrasen/supply
name = "cargo handler shorts"
desc = "A cheap work shirt and black shorts, typical of cargo handlers and clerks at N+S Logistics."
icon_state = "supply"
item_state = "browncloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/supply/qm
name = "supply director slacks"
desc = "Crisp slacks and a pressed brown shirt that any supply director could be proud of. N+S Logistics' compass rose logo is embossed on every button."
icon_state = "supply_director"
item_state = "browncloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/supply/miner
name = "mining overalls"
@@ -74,12 +84,16 @@
desc = "A crisp white shirt with blue stripes on the arms, identifying the owner as trained Nanotrasen medical staff. The faint smell of antiseptic won't wash out."
icon_state = "doctor"
item_state = "whitecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/medical/paramedic
name = "paramedic uniform"
desc = "Tough synthetic pants and a white uniform shirt, designed to handle all manner of scrapes and splashes in the line of duty. The tag identifies this as property of Nanotrasen, Inc."
icon_state = "paramedic"
item_state = "whitecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/medical/director
name = "medical director's slacks"
@@ -94,24 +108,32 @@
desc = "A grey jumpsuit with purple sleeves and faint stains on the elbows and knees. It looks stiff and cheap, but is surprisingly comfortable."
icon_state = "janitor"
item_state = "graycloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/affairs
name = "neatly pleated slacks"
desc = "Flawlessly pleated slacks and a linen shirt with the Nanotrasen logo stitched repeatedly into the cuffs and collar. It exudes an aura of quiet authority."
icon_state = "affairs"
item_state = "whitecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/security
name = "security slacks"
desc = "A starched grey uniform with red arm flashes, of a type seen throughout the core worlds. The Vigilitas Interstellar logo is proudly emblazoned on the front."
icon_state = "security"
item_state = "graycloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/under/nanotrasen/security/director
name = "security director's slacks"
desc = "A robust crimson uniform, heavily starched, with a Vigilitas logo neatly stitched onto either end of the collar. The last line of defense for Vigilitas's managerial staff."
icon_state = "security_director"
item_state = "redcloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
//Command uniforms
/obj/item/clothing/under/nanotrasen/captain
@@ -163,24 +185,31 @@
desc = "A thick fluid-repelling smock rendered in what is unmistakeably Nanotrasen Blue. The tag on the inside declares it property of Nanotrasen, Inc."
icon_state = "med_smock"
item_state = "bluecloth"
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
/obj/item/clothing/suit/nanotrasen/suitjacket
name = "fancy black suit jacket"
desc = "A fine black linen suit jacket with blue markings and a Nanotrasen lapel pin. It has a strangely menacing aura."
icon_state = "suit_jacket"
item_state = "blackcloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/nanotrasen/vest
name = "black hazard vest"
desc = "A thin black vest with reflective markings, worn to guarantee visibility when operating around industrial equipment or in dark or dusty conditions. Property of Nanotrasen, Inc."
icon_state = "engi_vest"
item_state = "blackcloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/nanotrasen/vest/blue
name = "blue hazard vest"
desc = "A thin vest with reflective stripes, worn to guarantee visibility in dangerous conditions. The vest itself is an offensively bright shade of Nanotrasen Blue. Property of Nanotrasen, Inc."
icon_state = "atmos_vest"
item_state = "bluecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/toggle/nanotrasen
name = "officer's coat"
@@ -236,6 +265,8 @@
/obj/item/clothing/suit/armor/nanotrasen/slim
name = "slim armor vest"
icon_state = "armor_slim"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/armor/nanotrasen/sec_director
name = "security director's overcoat"
@@ -243,6 +274,8 @@
icon_state = "command_coat"
body_parts_covered = CHEST|GROIN
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/suit/armor/nanotrasen/captain
name = "captain's jacket"
@@ -336,6 +369,8 @@
desc = "A blue peaked hat with red silk decoration and an embroidered Nanotrasen logo, worn exclusively by management."
icon_state = "officer_peaked"
item_state = "bluecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/nanotrasen/officer/fedora
name = "officer's fedora"
@@ -354,6 +389,8 @@
desc = "A decorated blue peaked cap, rife with laurels and gold thread, with a large badge on the front displaying the Nanotrasen, Inc. logo. This hat practically oozes authority."
icon_state = "com_peaked"
item_state = "bluecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/hardhat/nanotrasen //TODO: inhands for hardhats
name = "black heavy-duty hat"
@@ -364,18 +401,24 @@
righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
icon_state = "hardhat_black"
item_state = "blackcloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/hardhat/nanotrasen/blue
name = "blue heavy-duty hat"
desc = "A tough plastic helmet with suspension rig, designed to protect against blunt impacts. This one is brightly colored in Nanotrasen Blue, with the company logo on the front."
icon_state = "hardhat_blue"
item_state = "bluecloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
/obj/item/clothing/head/hardhat/nanotrasen/white
name = "white heavy-duty hat"
desc = "An extremely tough plastic helmet with suspension rig, designed to protect against blunt impacts. This one is colored bright white, typical of managerial staff, and has a Nanotrasen logo on the front."
icon_state = "hardhat_white"
item_state = "graycloth"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ supports_variations = VOX_VARIATION
// Neck //
@@ -389,3 +432,19 @@
righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
icon_state = "sash"
item_state = "redcloth"
+
+// Mask //
+
+/obj/item/clothing/mask/gas/vigilitas
+ name = "Vigilitas gas mask"
+ desc = "A protective gas mask designed for first response, specialist operations, and counter terrorism by Vigilitas Interstellar officers. It features a wide scratch resistant visor, ports for connecting an oxygen supply, and secure, comfortable straps."
+ icon = 'icons/obj/clothing/faction/nanotrasen/mask.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/nanotrasen/mask.dmi'
+ kepori_override_icon = 'icons/mob/clothing/faction/nanotrasen/mask_kepori.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
+ icon_state = "vigi_gas_mask"
+ item_state = "vigi_gas_mask"
+ vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ supports_variations = KEPORI_VARIATION | VOX_VARIATION
diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm
index 401f82795f680..366fa3b37cfe8 100644
--- a/code/modules/clothing/factions/ngr.dm
+++ b/code/modules/clothing/factions/ngr.dm
@@ -11,6 +11,7 @@
can_adjust = FALSE
icon = 'icons/obj/clothing/faction/ngr/uniforms.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/uniforms.dmi'
+ supports_variations = DIGITIGRADE_VARIATION
/obj/item/clothing/under/syndicate/ngr/fatigues
name = "\improper NGR fatigues"
@@ -29,6 +30,7 @@
desc = "A button-up in a tasteful black with beige pants, used by officers of the New Gorlex Republic."
icon_state = "ngr_officer"
item_state = "ngr_officer"
+ supports_variations = DIGITIGRADE_VARIATION
/obj/item/clothing/under/plasmaman/ngr
name = "\improper NGR phorid envirosuit"
@@ -56,6 +58,7 @@
desc = "A blood-red surgical smock typically worn by field medics of the New Gorlex Republic. It hides red blood really well!"
icon_state = "ngr_apron"
item_state = "redcloth"
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
/obj/item/clothing/suit/hazardvest/ngr
name = "blood-red hazard vest"
@@ -135,7 +138,6 @@
icon = 'icons/obj/clothing/faction/ngr/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/suits.dmi'
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ngr
- lightweight = 1
jetpack = null
greyscale_colors = list("#33353a", "#d9ad82", "#8c1a34")
@@ -219,21 +221,22 @@
//Masks//
/////////
-/obj/item/clothing/mask/gas/sechailer/balaclava/ngr
+/obj/item/clothing/mask/balaclava/ngr
name = "NGR combat balaclava"
- desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the New Gorlex Republic to protect against sandstorms."
+ desc = "A surprisingly advanced balaclava. While it doesn't muffle your voice, it has a mouthpiece for internals. Comfy to boot! This version is commonly used by the soldiers of the New Gorlex Republic to protect against sandstorms."
icon_state = "ngr_balaclava"
item_state = "ngr_balaclava"
icon = 'icons/obj/clothing/faction/ngr/mask.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/mask.dmi'
-/obj/item/clothing/mask/gas/syndicate/ngr
+/obj/item/clothing/mask/breath/ngr
name = "NGR face mask"
desc = "A face mask that covers the nose, mouth and neck of those who wear it. Favored by field medics over the balaclava due to lessened heat while wearing."
icon_state = "ngr_facemask"
item_state = "ngr_facemask"
icon = 'icons/obj/clothing/faction/ngr/mask.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/mask.dmi'
+ supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION
//////////
//Neck//
@@ -258,3 +261,14 @@
item_state = "ngr_webbing"
icon = 'icons/obj/clothing/faction/ngr/belt.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/belt.dmi'
+
+/obj/item/storage/belt/security/webbing/ngr/cobra/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m45_cobra(src)
+
+/obj/item/storage/belt/security/webbing/ngr/hydra_grenadier/PopulateContents()
+ for(var/i in 1 to 3)
+ new /obj/item/ammo_box/magazine/m556_42_hydra(src)
+ new /obj/item/ammo_casing/a40mm(src)
+ new /obj/item/ammo_casing/a40mm(src)
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index c2dd59ecc1fba..1c37e3e1fe87e 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -8,13 +8,20 @@
w_class = WEIGHT_CLASS_SMALL
flags_cover = GLASSESCOVERSEYES
slot_flags = ITEM_SLOT_EYES
- strip_delay = 20
- equip_delay_other = 25
resistance_flags = NONE
custom_materials = list(/datum/material/glass = 250)
supports_variations = VOX_VARIATION
greyscale_colors = list(list(14, 26), list(17, 26))
greyscale_icon_state = "glasses"
+
+ equip_sound = 'sound/items/equip/straps_equip.ogg'
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_EYEWEAR
+ equip_delay_other = EQUIP_DELAY_EYEWEAR * 1.5
+ strip_delay = EQUIP_DELAY_EYEWEAR * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
+
var/vision_flags = 0
var/darkness_view = 2//Base human is 2
var/invis_view = SEE_INVISIBLE_LIVING //admin only for now
@@ -321,7 +328,7 @@
patch_one.forceMove(user.drop_location())
patch_two.forceMove(user.drop_location())
to_chat(user, "You undo the knot on the eyepatches.")
- Destroy()
+ qdel(src)
/obj/item/clothing/glasses/sunglasses/big
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks flashes."
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
index a6e9f22ea3e7f..5de024a9c42de 100644
--- a/code/modules/clothing/gloves/_gloves.dm
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -11,12 +11,19 @@
slot_flags = ITEM_SLOT_GLOVES
attack_verb = list("challenged")
var/transfer_prints = FALSE
- strip_delay = 20
- equip_delay_other = 40
+
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_GLOVES
+ equip_delay_other = EQUIP_DELAY_GLOVES + (3 SECONDS)
+ strip_delay = EQUIP_DELAY_GLOVES + (3 SECONDS)
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
+
cuttable = TRUE
clothamnt = 2
greyscale_colors = list(list(10, 13), list(11, 14), list(9, 12))
greyscale_icon_state = "gloves"
+ blood_overlay_type = "hands"
/obj/item/clothing/gloves/wash(clean_types)
. = ..()
@@ -30,9 +37,8 @@
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_hands = mutable_appearance('icons/effects/blood.dmi', "bloodyhands")
- bloody_hands.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_hands
+ . += setup_blood_overlay()
+
/obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE)
..()
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 0447f62aab9e3..db9e2814b2c0f 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -259,24 +259,6 @@
item_state = "lgloves"
custom_price = 200
-/obj/effect/spawner/lootdrop/gloves
- name = "random gloves"
- desc = "These gloves are supposed to be a random color..."
- icon = 'icons/obj/clothing/gloves.dmi'
- icon_state = "random_gloves"
- loot = list(
- /obj/item/clothing/gloves/color/orange = 1,
- /obj/item/clothing/gloves/color/red = 1,
- /obj/item/clothing/gloves/color/blue = 1,
- /obj/item/clothing/gloves/color/purple = 1,
- /obj/item/clothing/gloves/color/green = 1,
- /obj/item/clothing/gloves/color/grey = 1,
- /obj/item/clothing/gloves/color/light_brown = 1,
- /obj/item/clothing/gloves/color/brown = 1,
- /obj/item/clothing/gloves/color/white = 1,
- /obj/item/clothing/gloves/color/rainbow = 1,
- )
-
/obj/item/clothing/gloves/maid
name = "maid arm covers"
desc = "Cylindrical looking tubes that go over your arm, weird."
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index e326b55f58f30..45999fd75db6a 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -41,16 +41,6 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
//supports_variations = KEPORI_VARIATION
-/obj/item/clothing/gloves/combat/maid
- name = "combat maid sleeves"
- desc = "These 'tactical' gloves and sleeves are fireproof and acid-resistant. Warm to boot."
- icon_state = "syndimaid_arms"
-
-/obj/item/clothing/gloves/combat/maid/inteq
- name = "inteq combat maid sleeves"
- desc = "Tacticute and comfy, along with being both fireproof and acid-resistant."
- icon_state = "inteqmaid_arms"
-
/obj/item/clothing/gloves/bracer
name = "bone bracers"
desc = "For when you're expecting to get slapped on the wrist. Offers modest protection to your arms."
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index aa1114e6b1826..8b3a29f017ab6 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -12,6 +12,14 @@
greyscale_icon_state = "hat"
greyscale_colors = list(list(16,26))
supports_variations = VOX_VARIATION
+ blood_overlay_type = "helmet"
+
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_HAT
+ equip_delay_other = EQUIP_DELAY_HAT * 1.5
+ strip_delay = EQUIP_DELAY_HAT * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
///Special throw_impact for hats to frisbee hats at people to place them on their heads/attempt to de-hat them.
/obj/item/clothing/head/throw_impact(atom/hit_atom, datum/thrownthing/thrownthing)
@@ -43,7 +51,7 @@
///if the hat manages to knock something off
if(H.dropItemToGround(WH))
H.visible_message("[src] knocks [WH] off [H]'s head!", "[WH] is suddenly knocked off your head by [src]!")
- if(H.equip_to_slot_if_possible(src, ITEM_SLOT_HEAD, 0, 1, 1))
+ if(H.equip_to_slot_if_possible(src, ITEM_SLOT_HEAD, 0, 1, 1, TRUE))
H.visible_message("[src] lands neatly on [H]'s head!", "[src] lands perfectly onto your head!")
return
if(iscyborg(hit_atom))
@@ -65,9 +73,7 @@
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_helmet = mutable_appearance('icons/effects/blood.dmi', "helmetblood")
- bloody_helmet.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_helmet
+ . += setup_blood_overlay()
/obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE)
..()
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 9b28c58d03cfa..e479b4aaebbee 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -7,6 +7,13 @@
clothing_flags = SNUG_FIT
resistance_flags = FIRE_PROOF
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_HELMET
+ equip_delay_other = EQUIP_DELAY_HELMET * 1.5
+ strip_delay = EQUIP_DELAY_HELMET * 1.5
+
/obj/item/clothing/head/hardhat
name = "hard hat"
desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
@@ -24,6 +31,13 @@
light_on = FALSE
dog_fashion = /datum/dog_fashion/head
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_HELMET
+ equip_delay_other = EQUIP_DELAY_HELMET * 1.5
+ strip_delay = EQUIP_DELAY_HELMET * 1.5
+
///Determines used sprites: hardhat[on]_[hat_type] and hardhat[on]_[hat_type]2 (lying down sprite)
var/hat_type = "yellow"
///Whether the headlamp is on or off.
@@ -62,6 +76,10 @@
icon_state = "hardhat_orange"
dog_fashion = null
+/obj/item/clothing/head/hardhat/purple
+ icon_state = "hardhat_purple"
+ dog_fashion = null
+
/obj/item/clothing/head/hardhat/red
name = "firefighter helmet"
icon_state = "hardhat_red"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index cefff9c4c76f0..8e89f35d806b5 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -16,6 +16,13 @@
flags_cover = HEADCOVERSEYES
//flags_inv = HIDEHAIR // nah
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_HELMET
+ equip_delay_other = EQUIP_DELAY_HELMET * 1.5
+ strip_delay = EQUIP_DELAY_HELMET * 1.5
+
dog_fashion = /datum/dog_fashion/head/helmet
//if a flashlight can be mounted. if it has a flashlight and this is false, it is permanently attached.
@@ -229,37 +236,6 @@
)
content_overlays = TRUE
-/obj/item/clothing/head/helmet/marine
- name = "tactical combat helmet"
- desc = "A tactical black helmet, sealed from outside hazards with a reinforced visor."
- icon_state = "marine_command"
- item_state = "helmetalt"
- armor = list("melee" = 50, "bullet" = 75, "laser" = 55, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50)
- slowdown = 0.3
- min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- clothing_flags = STOPSPRESSUREDAMAGE
- resistance_flags = FIRE_PROOF | ACID_PROOF
- can_flashlight = TRUE
- dog_fashion = null
-
-/obj/item/clothing/head/helmet/marine/Initialize(mapload)
- set_attached_light(new /obj/item/flashlight/seclite)
- update_helmlight()
- update_appearance()
- . = ..()
-
-/obj/item/clothing/head/helmet/marine/security
- name = "marine heavy helmet"
- icon_state = "marine_security"
-
-/obj/item/clothing/head/helmet/marine/engineer
- name = "marine utility helmet"
- icon_state = "marine_engineer"
-
-/obj/item/clothing/head/helmet/marine/medic
- name = "marine medic helmet"
- icon_state = "marine_medic"
-
/obj/item/clothing/head/helmet/old
name = "degrading helmet"
desc = "Standard issue security helmet. Due to degradation the helmet's visor obstructs the users ability to see long distances."
@@ -549,7 +525,7 @@
icon_state = "solgov_envirohelm"
item_state = "solgov_envirohelm"
-/obj/item/clothing/head/helmet/operator
+/obj/item/clothing/head/helmet/syndie
name = "\improper operator helmet"
desc = "A robust combat helmet commonly employed by Syndicate forces, regardless of alignment."
icon_state = "operator"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 416fa20df39cc..85b3af9682967 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -57,8 +57,9 @@
new /obj/item/reagent_containers/food/drinks/flask/det(src)
/obj/item/clothing/head/fedora/det_hat/examine_more(mob/user)
+ . = ..()
if(!in_range(src, user) || !isobserver(user)) //hide the easter egg a little more
- . = "You try to examine [src] closer, but you're too far away."
+ . += "You try to examine [src] closer, but you're too far away."
return
. += "Alt-click to take a candy corn."
@@ -184,7 +185,7 @@
. = ..()
UnregisterSignal(M, COMSIG_MOB_SAY)
-/obj/item/clothing/head/warden/drill/proc/handle_speech(datum/source, mob/speech_args)
+/obj/item/clothing/head/warden/drill/proc/handle_speech(datum/source, list/speech_args)
var/message = speech_args[SPEECH_MESSAGE]
if(message[1] != "*")
switch (mode)
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index b2636b02871b9..865e391abad51 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -42,6 +42,13 @@
clothing_flags = SNUG_FIT
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_HELMET
+ equip_delay_other = EQUIP_DELAY_HELMET * 1.5
+ strip_delay = EQUIP_DELAY_HELMET * 1.5
+
/obj/item/clothing/head/snowman
name = "Snowman Head"
desc = "A ball of white styrofoam. So festive."
@@ -201,7 +208,7 @@
. = ..()
UnregisterSignal(M, COMSIG_MOB_SAY)
-/obj/item/clothing/head/frenchberet/proc/handle_speech(datum/source, mob/speech_args)
+/obj/item/clothing/head/frenchberet/proc/handle_speech(datum/source, list/speech_args)
var/message = speech_args[SPEECH_MESSAGE]
if(message[1] != "*")
message = " [message]"
@@ -226,18 +233,6 @@
icon_state = "intern_hat"
item_state = "intern_hat"
-/obj/item/clothing/head/maidheadband/syndicate
- name = "tactical maid headband"
- desc = "Tacticute."
- icon_state = "syndieheadband"
- item_state = "syndieheadband"
-
-/obj/item/clothing/head/maidheadband/inteq
- name = "inteq maid headband"
- desc = "Tacticute."
- icon_state = "inteqheadband"
- item_state = "inteqheadband"
-
/obj/item/clothing/head/inteq_peaked
name = "inteq peaked cap"
desc = "A peaked cap for Vanguards with a commanding authority, emblazoned with the golden badge of the IRMG."
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 3cd7c022887c3..de54afa17b0d3 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -30,6 +30,13 @@
resistance_flags = FIRE_PROOF
clothing_flags = SNUG_FIT
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_HELMET
+ equip_delay_other = EQUIP_DELAY_HELMET * 1.5
+ strip_delay = EQUIP_DELAY_HELMET * 1.5
+
/obj/item/clothing/head/welding/attack_self(mob/user)
weldingvisortoggle(user)
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 3e5052cacc922..307106409f180 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -161,3 +161,32 @@
icon_state = "inteqmedsoft"
soft_type = "inteqmed"
dog_fashion = null
+
+/obj/item/clothing/head/soft/utility_beige
+ name = "beige utility cover"
+ desc = "A flat beige utility cover, unbranded. Just the right color for those sandy planetoids."
+ icon_state = "patrolbeigesoft"
+ soft_type = "patrolbeige"
+ dog_fashion = null
+
+/obj/item/clothing/head/soft/utility_black
+ name = "black utility cover"
+ desc = "A flat black utility cover, unbranded. Night Vision Goggles sold separately."
+ icon_state = "patrolblacksoft"
+ soft_type = "patrolblack"
+ dog_fashion = null
+
+/obj/item/clothing/head/soft/utility_olive
+ name = "miskilamao cap"
+ desc = "An olive utility cover emblazoned with the Miskilamo Shipbreaking logo. The material feels cheap."
+ icon_state = "patrololivesoft"
+ soft_type = "patrololive"
+ dog_fashion = null
+
+/obj/item/clothing/head/soft/utility_navy
+ name = "navy utility cover"
+ desc = "A navy blue utility cover, unbranded. Perfect for Seamen on long voyages."
+ icon_state = "patrolnavysoft"
+ soft_type = "patrolnavy"
+ dog_fashion = null
+//recompile icons comment!!!!!
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index a4c1d5d509fab..10724104fd054 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -11,6 +11,7 @@
var/mask_adjusted = 0
var/adjusted_flags = null
supports_variations = VOX_VARIATION | KEPORI_VARIATION
+ blood_overlay_type = "mask"
/obj/item/clothing/mask/attack_self(mob/user)
if((clothing_flags & VOICEBOX_TOGGLABLE))
@@ -38,9 +39,7 @@
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_mask = mutable_appearance('icons/effects/blood.dmi', "maskblood")
- bloody_mask.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_mask
+ . += setup_blood_overlay()
/obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE)
..()
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 6bb58bb2b4e53..d8713138ba972 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -1,16 +1,42 @@
/obj/item/clothing/mask/balaclava
name = "balaclava"
- desc = "LOADSAMONEY"
+ desc = "A stretchy fabric hood with eye holes meant for keeping the face warm in cold weather. Also useful for concealing one's identity."
icon_state = "balaclava"
item_state = "balaclava"
- flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+ clothing_flags = ALLOWINTERNALS
+ visor_flags = ALLOWINTERNALS
+ flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
visor_flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
+ gas_transfer_coefficient = 0.1
+ permeability_coefficient = 0.5
actions_types = list(/datum/action/item_action/adjust)
+ flags_cover = MASKCOVERSMOUTH
+ visor_flags_cover = MASKCOVERSMOUTH
+ resistance_flags = NONE
+ supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION | VOX_VARIATION
+
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_MASK
+ equip_delay_other = EQUIP_DELAY_MASK * 1.5
+ strip_delay = EQUIP_DELAY_MASK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
adjustmask(user)
+/obj/item/clothing/mask/balaclava/AltClick(mob/user)
+ ..()
+ if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+ return
+ else
+ adjustmask(user)
+
+/obj/item/clothing/mask/balaclava/examine(mob/user)
+ . = ..()
+ . += "Alt-click [src] to adjust it."
+
/obj/item/clothing/mask/infiltrator
name = "infiltrator balaclava"
desc = "It makes you feel safe in your anonymity, but for a stealth outfit you sure do look obvious that you're up to no good. It seems to have a built in heads-up display."
@@ -52,6 +78,13 @@
w_class = WEIGHT_CLASS_SMALL
modifies_speech = TRUE
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_MASK
+ equip_delay_other = EQUIP_DELAY_MASK * 1.5
+ strip_delay = EQUIP_DELAY_MASK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
+
/obj/item/clothing/mask/luchador/handle_speech(datum/source, list/speech_args)
var/message = speech_args[SPEECH_MESSAGE]
if(message[1] != "*")
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 8ff4e6bcb0d9d..d24e4efb26402 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -14,6 +14,14 @@
visor_flags_cover = MASKCOVERSMOUTH
resistance_flags = NONE
+ equip_sound = 'sound/items/equip/straps_equip.ogg'
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_MASK
+ equip_delay_other = EQUIP_DELAY_MASK * 1.5
+ strip_delay = EQUIP_DELAY_MASK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT | EQUIP_SLOWDOWN
+
/obj/item/clothing/mask/breath/attack_self(mob/user)
adjustmask(user)
@@ -36,3 +44,8 @@
permeability_coefficient = 0.01
equip_delay_other = 10
+/obj/item/clothing/mask/balaclava/inteq //inteq needs a faction clothing file badly but it's out of scope for this PR -apogee
+ name = "IRMG combat balaclava"
+ desc = "A surprisingly advanced balaclava. While it doesn't muffle your voice, it has a mouthpiece for internals. Comfy to boot! This one is a variataion commonly used by the IRMG to protect it's members idenites."
+ icon_state = "inteq_balaclava"
+ item_state = "inteq_balaclava"
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index e5d3717b2b65f..021fad6c01e2e 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -11,6 +11,14 @@
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
resistance_flags = NONE
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_MASK
+ equip_delay_other = EQUIP_DELAY_MASK * 1.5
+ strip_delay = EQUIP_DELAY_MASK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT | EQUIP_SLOWDOWN
+
/obj/item/clothing/mask/gas/atmos
name = "atmospheric gas mask"
desc = "Improved gas mask utilized by atmospheric technicians. Still not very good at blocking gas flow, but it's flameproof!"
@@ -275,3 +283,10 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR
+/obj/item/clothing/mask/gas/inteq
+ name = "Inteq gas mask"
+ desc = "A protective gas mask refit for Inteq's standards. It features a modified scratch resistant visor, ports for connecting an oxygen supply, and secure, comfortable straps."
+ icon_state = "inteq_gas_mask"
+ item_state = "inteq_gas_mask"
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ supports_variations = KEPORI_VARIATION
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index 78bbc032e8613..35fd0e3043099 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -13,6 +13,7 @@
visor_flags_inv = HIDEFACIALHAIR | HIDEFACE
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF
visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF
+ supports_variations = VOX_VARIATION
/obj/item/clothing/mask/gas/sechailer/swat
name = "\improper SWAT mask"
@@ -28,13 +29,6 @@
icon_state = "spacepol"
item_state = "spacepol"
-/obj/item/clothing/mask/gas/sechailer/cyborg
- name = "security hailer"
- desc = "A set of recognizable pre-recorded messages for cyborgs to use when apprehending criminals."
- icon = 'icons/obj/device.dmi'
- icon_state = "taperecorder_idle"
- mob_overlay_state = "sechailer"
-
/obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, action)
if(istype(action, /datum/action/item_action/adjust))
adjustmask(user)
@@ -66,17 +60,3 @@
icon_state = "whistle"
item_state = "whistle"
blown_sound = 'sound/misc/trenchwhistle.ogg'
-
-/obj/item/clothing/mask/gas/sechailer/balaclava
- name = "combat balaclava"
- desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot!"
- icon_state = "combat_balaclava"
- item_state = "combat_balaclava"
- strip_delay = 60
- alternate_worn_layer = BODY_LAYER
- flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR
-
-/obj/item/clothing/mask/gas/sechailer/balaclava/inteq
- desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This one is a variataion commonly used by the IRMG to protect it's members idenites."
- icon_state = "inteq_balaclava"
- item_state = "inteq_balaclava"
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index d2b5737110516..0374c15b8caab 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -8,6 +8,13 @@
gas_transfer_coefficient = 0.9
equip_delay_other = 20
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_MASK
+ equip_delay_other = EQUIP_DELAY_MASK * 1.5
+ strip_delay = EQUIP_DELAY_MASK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT | EQUIP_SLOWDOWN
+
/obj/item/clothing/mask/muzzle/attack_paw(mob/user)
if(iscarbon(user))
var/mob/living/carbon/C = user
@@ -31,6 +38,13 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 25, "rad" = 0, "fire" = 0, "acid" = 0)
actions_types = list(/datum/action/item_action/adjust)
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_MASK
+ equip_delay_other = EQUIP_DELAY_MASK * 1.5
+ strip_delay = EQUIP_DELAY_MASK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
+
/obj/item/clothing/mask/surgical/attack_self(mob/user)
adjustmask(user)
@@ -154,6 +168,13 @@
clothing_flags = VOICEBOX_TOGGLABLE
modifies_speech = TRUE
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_MASK
+ equip_delay_other = EQUIP_DELAY_MASK * 1.5
+ strip_delay = EQUIP_DELAY_MASK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
+
/obj/item/clothing/mask/frog/cursed
clothing_flags = NONE
@@ -176,6 +197,13 @@
w_class = WEIGHT_CLASS_SMALL
modifies_speech = TRUE
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_MASK
+ equip_delay_other = EQUIP_DELAY_MASK * 1.5
+ strip_delay = EQUIP_DELAY_MASK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
+
/obj/item/clothing/mask/cowmask/handle_speech(datum/source, list/speech_args)
if(!(clothing_flags & VOICEBOX_DISABLED))
speech_args[SPEECH_MESSAGE] = pick("Moooooooo!","Moo!","Moooo!")
@@ -200,6 +228,13 @@
w_class = WEIGHT_CLASS_SMALL
clothing_flags = VOICEBOX_TOGGLABLE
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_MASK
+ equip_delay_other = EQUIP_DELAY_MASK * 1.5
+ strip_delay = EQUIP_DELAY_MASK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
+
/obj/item/clothing/mask/horsehead/handle_speech(datum/source, list/speech_args)
if(!(clothing_flags & VOICEBOX_DISABLED))
speech_args[SPEECH_MESSAGE] = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
@@ -223,6 +258,13 @@
flags_inv = HIDEFACE
flags_cover = MASKCOVERSMOUTH
+ equipping_sound = EQUIP_SOUND_VFAST_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_VFAST_GENERIC
+ equip_delay_self = EQUIP_DELAY_MASK
+ equip_delay_other = EQUIP_DELAY_MASK * 1.5
+ strip_delay = EQUIP_DELAY_MASK * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT
+
/obj/item/clothing/mask/rat/fox
name = "fox mask"
desc = "A mask made of soft vinyl and latex, representing the head of a fox."
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 2165baaa2b0e2..be896c6cee3c0 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -310,6 +310,23 @@
tagname = stripped_input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot", MAX_NAME_LEN)
name = "[initial(name)] - [tagname]"
+/obj/item/clothing/neck/dogtag
+ name = "dogtag"
+ desc = "A nondescript dogtag."
+ icon = 'icons/obj/clothing/neck.dmi'
+ icon_state = "dogtag"
+ resistance_flags = FIRE_PROOF
+ w_class = WEIGHT_CLASS_SMALL
+ slot_flags = ITEM_SLOT_NECK | ITEM_SLOT_POCKETS
+
+/obj/item/clothing/neck/dogtag/frontier
+ name = "frontiersman dogtag"
+ desc = "A dogtag marked with the name and rank of a Frontiersmen pirate. You could turn this in to an outpost console contract for money."
+
+/obj/item/clothing/neck/dogtag/ramzi
+ name = "ramzi clique dogtag"
+ desc = "A dogtag marked with the name and rank of a Ramzi Clique pirate. You could turn this in to an outpost console contract for money."
+
//////////////
//DOPE BLING//
//////////////
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index 8401455bf7d83..56f2a677c129a 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -1,21 +1,23 @@
/datum/outfit/job/frontiersmen/ert //most basic of grunts
name = "ERT - Frontiersman Basic"
- head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
+ head = /obj/item/clothing/head/beret/sec/frontier
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
suit_store = /obj/item/gun/ballistic/rifle/illestren
+ belt = /obj/item/storage/belt/security/military/frontiersmen/illestren
uniform = /obj/item/clothing/under/frontiersmen
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset/pirate/alt
back = /obj/item/storage/backpack
- l_pocket = /obj/item/flashlight/seclite
- r_pocket = /obj/item/tank/internals/emergency_oxygen/double
+ id = null // lol
+ wallet = null
box = /obj/item/storage/box/survival/frontier
- id = null // lol
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/double
- backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/illestren_a850r=5, /obj/item/grenade/frag=1)
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen)
/datum/outfit/job/frontiersmen/ert/random
name = "ERT - Frontiersman Randomized"
@@ -25,47 +27,56 @@
suit = null
suit_store = null
back = null
+ belt = null
+ gloves = null
+
l_pocket = null
r_pocket = /obj/item/radio
+
backpack_contents = list()
+ box = null
+ backpack = null
+ courierbag = null
+ satchel = null
+ duffelbag = null
+
/datum/outfit/job/frontiersmen/ert/random/pre_equip(mob/living/carbon/human/H, visualsOnly, client/preference_source)
. = ..()
if(visualsOnly)
return
if(prob(90))
- head = pickweight(list(
+ head = pick_weight(list(
/obj/item/clothing/head/beret/sec/frontier = 10,
/obj/item/clothing/head/helmet/bulletproof/x11/frontier = 5,
/obj/item/reagent_containers/glass/bucket = 1))
if(prob(60))
- suit = pickweight(list(
+ suit = pick_weight(list(
/obj/item/clothing/suit/armor/vest = 5,
- /obj/item/clothing/suit/armor/vest/bulletproof/frontier = 5,
+ /obj/item/clothing/suit/armor/vest/frontier = 5,
/obj/item/clothing/suit/armor/vest/scrap = 1))
- if(prob(30))
- mask = pickweight(list(
- /obj/item/clothing/mask/gas/frontiersmen = 5,
- /obj/item/clothing/mask/gas/sechailer/balaclava = 5,
- /obj/item/clothing/mask/breath = 5,
+ if(prob(50))
+ mask = pick_weight(list(
+ /obj/item/clothing/mask/gas/frontiersmen = 12,
+ /obj/item/clothing/mask/balaclava = 10,
+ /obj/item/clothing/mask/breath = 7,
/obj/item/clothing/mask/whistle = 3))
if(prob(90))
- back = pickweight(list(
+ back = pick_weight(list(
/obj/item/storage/backpack = 20,
/obj/item/storage/backpack/satchel = 20,
/obj/item/storage/backpack/messenger = 20,
/obj/item/melee/baton/cattleprod/loaded = 5,
- /obj/item/food/baguette = 2, // yes you can put this on your back
- /obj/item/deployable_turret_folded = 1,
- /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended = 1,
+ /obj/item/deployable_turret_folded = 4,
+ /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended = 3,
))
if(prob(90))
- shoes = pickweight(list(
+ shoes = pick_weight(list(
/obj/item/clothing/shoes/jackboots = 10,
/obj/item/clothing/shoes/sneakers = 5,
))
@@ -73,29 +84,32 @@
var/extra_class = pick(list("Doctor", "Breacher", "Ammo Carrier"))
switch(extra_class)
if("Doctor")
- backpack_contents += list(/obj/item/storage/firstaid/regular = 1)
+ backpack_contents += list(/obj/item/storage/firstaid/medical = 1)
gloves = /obj/item/clothing/gloves/color/latex
suit = /obj/item/clothing/suit/frontiersmen
head = /obj/item/clothing/head/frontier
if(prob(50))
- belt = /obj/item/storage/belt/medical/surgery
+ belt = /obj/item/storage/belt/medical/webbing/frontiersmen/combat
if(prob(30))
glasses = /obj/item/clothing/glasses/hud/health
if("Breacher")
- backpack_contents += list(/obj/item/grenade/c4 = 2)
- if(prob(10))
+ backpack_contents += list(/obj/item/grenade/c4 = 2, /obj/item/grenade/smokebomb = 3)
+ if(prob(60))
belt = /obj/item/storage/belt/grenade/full
if("Ammo Carrier")
var/loops = rand(1,3)
for(var/i in 1 to loops)
var/ammotype = pick(list(
- /obj/item/ammo_box/c8x50mm_box,
- /obj/item/ammo_box/c45,
- /obj/item/ammo_box/a357_box,
- /obj/item/ammo_box/c45,
- /obj/item/ammo_box/a4570,
+ /obj/item/storage/box/ammo/a8_50r,
+ /obj/item/storage/box/ammo/c45,
+ /obj/item/storage/box/ammo/a357,
+ /obj/item/storage/box/ammo/c45,
+ /obj/item/storage/box/ammo/a4570,
/obj/item/stock_parts/cell/gun/mini))
- backpack_contents += ammotype
+ if(istype(back, /obj/item/storage/backpack))
+ backpack_contents += ammotype
+ else
+ H.put_in_hands(ammotype, FALSE)
var/weapon = pick(list("Bolt-Action", "Pistol", "Melee"))
switch(weapon)
@@ -113,7 +127,7 @@
/obj/item/gun/ballistic/revolver/shadow,
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/presawn,
/obj/item/gun/energy/e_gun/mini))
- if(prob(30))
+ if(prob(80))
l_hand = pick(list(
/obj/item/gun/ballistic/automatic/pistol/disposable,
/obj/item/gun/ballistic/automatic/pistol/candor,
@@ -122,7 +136,7 @@
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/presawn,
/obj/item/gun/energy/e_gun/mini))
if("Melee")
- r_hand = pickweight(list(
+ r_hand = pick_weight(list(
/obj/item/melee/knife/survival = 15,
/obj/item/melee/baseball_bat = 10,
/obj/item/roastingstick = 2,
@@ -130,7 +144,7 @@
/obj/item/melee/flyswatter = 1,
))
-/datum/outfit/job/frontiersmen/ert/grunt //better armed, use for quick creating pirate ships
+/datum/outfit/job/frontiersmen/ert/unarmed //better armed, use for quick creating pirate ships
name = "ERT - Frontiersman Grunt (Unarmed)"
suit_store = null
@@ -138,25 +152,25 @@
backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen)
-/datum/outfit/job/frontiersmen/ert/grunt/skm
+/datum/outfit/job/frontiersmen/ert/skm
name = "ERT - Frontiersman Grunt (SKM-24 AR)"
suit_store = /obj/item/gun/ballistic/automatic/assault/skm
belt = /obj/item/storage/belt/security/military/frontiersmen/skm_ammo
-/datum/outfit/job/frontiersmen/ert/grunt/mauler_mp
+/datum/outfit/job/frontiersmen/ert/mauler_mp
name = "ERT - Frontiersman Grunt (Mauler MP)"
suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
belt = /obj/item/storage/belt/security/military/frontiersmen/mauler_mp_ammo
-/datum/outfit/job/frontiersmen/ert/grunt/spitter_mp
+/datum/outfit/job/frontiersmen/ert/spitter_mp
name = "ERT - Frontiersman Grunt (Spitter MP)"
suit_store = /obj/item/gun/ballistic/automatic/pistol/spitter
belt = /obj/item/storage/belt/security/military/frontiersmen/spitter_ammo
-/datum/outfit/job/frontiersmen/ert/grunt/pounder_smg
+/datum/outfit/job/frontiersmen/ert/pounder_smg
name = "ERT - Frontiersman Grunt (Pounder SMG)"
suit_store = /obj/item/gun/ballistic/automatic/smg/pounder
@@ -171,12 +185,29 @@
ears = /obj/item/radio/headset/pirate/alt/captain
back = /obj/item/storage/backpack/satchel/leather
suit = /obj/item/clothing/suit/armor/frontier
- suit_store = /obj/item/gun/ballistic/automatic/pistol/deagle
+ suit_store = null
+ belt = /obj/item/gun/ballistic/automatic/pistol/deagle
backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/m50=2, /obj/item/binoculars=1, /obj/item/melee/knife/survival)
-/datum/outfit/job/frontiersmen/ert/leader/unnarmed
- name = "ERT - Frontiersman Officer (Unnarmed)"
+/datum/outfit/job/frontiersmen/ert/leader/heavy
+ name = "ERT - Frontiersman Officer (Shock Troop)"
+
+ suit = /obj/item/clothing/suit/armor/vest/marine/frontier
+ head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier
+ mask = /obj/item/clothing/mask/breath
+ belt = /obj/item/gun/ballistic/automatic/pistol/deagle/gold // daring today aren't we
+
+ backpack = /obj/item/minigunpack
+ satchel = /obj/item/minigunpack
+ courierbag = /obj/item/minigunpack
+ duffelbag = /obj/item/minigunpack
+
+ backpack_contents = null
+ box = null
+
+/datum/outfit/job/frontiersmen/ert/leader/unarmed
+ name = "ERT - Frontiersman Officer (Unarmed)"
suit_store = null
@@ -190,10 +221,22 @@
mask = /obj/item/clothing/mask/surgical
gloves = /obj/item/clothing/gloves/color/latex/nitrile
belt = /obj/item/storage/belt/medical/webbing/frontiersmen/surgery
- suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
+ suit = /obj/item/clothing/suit/frontiersmen
+ suit_store = null
- backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack=3, /obj/item/ammo_box/magazine/m9mm_mauler=2)
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/regular, /obj/item/ammo_box/magazine/m9mm_mauler = 2, /obj/item/gun/ballistic/automatic/pistol/mauler)
+
+/datum/outfit/job/frontiersmen/ert/medic/heavy
+ name = "ERT - Frontiersman Medic (Shock Troop)"
+
+ head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier
+ mask = /obj/item/clothing/mask/breath/ngr
+ suit = /obj/item/clothing/suit/armor/vest/frontier
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
+ belt = /obj/item/storage/belt/medical/webbing/frontiersmen/combat
+ glasses = /obj/item/clothing/glasses/hud/health
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 3, /obj/item/ammo_box/magazine/m9mm_mauler=2)
/datum/outfit/job/frontiersmen/ert/engineer
name = "ERT - Frontiersman Engineer"
@@ -215,19 +258,23 @@
suit_store = /obj/item/tank/internals/oxygen/red
uniform = /obj/item/clothing/under/frontiersmen/fireproof
gloves = /obj/item/clothing/gloves/combat
- back = /obj/item/storage/backpack
+ back = /obj/item/storage/backpack/fireproof
belt = /obj/item/storage/belt/security/military/frontiersmen/flamer
l_hand = /obj/item/flamethrower/full/tank
- backpack_contents = list(/obj/item/gun/ballistic/shotgun/doublebarrel/presawn=1,/obj/item/ammo_box/a12g=1,/obj/item/extinguisher=2,/obj/item/radio=1)
+ backpack_contents = list(
+ /obj/item/gun/ballistic/shotgun/doublebarrel/presawn=1, \
+ /obj/item/storage/box/ammo/a12g_slug = 1, \
+ /obj/item/extinguisher = 2, \
+ /obj/item/radio=1)
-/datum/outfit/job/frontiersmen/ert/sentry_lmg
+/datum/outfit/job/frontiersmen/ert/sentry
name = "ERT - Frontiersman Sentry (SKM-24v LMG)"
- head = /obj/item/clothing/head/helmet/marine/frontier
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ head = /obj/item/clothing/head/helmet/frontier
+ mask = /obj/item/clothing/mask/balaclava
suit = /obj/item/clothing/suit/armor/vest/marine/frontier
suit_store = /obj/item/gun/ballistic/automatic/hmg/skm_lmg/drum_mag
gloves = /obj/item/clothing/gloves/combat
@@ -236,17 +283,10 @@
backpack_contents = list(/obj/item/ammo_box/magazine/skm_762_40/drum=2,/obj/item/ammo_box/a357=2,/obj/item/grenade/frag=1,/obj/item/radio=1)
-/datum/outfit/job/frontiersmen/ert/sentry_shredder
+/datum/outfit/job/frontiersmen/ert/sentry/shredder
name = "ERT - Frontiersman Sentry (Shredder LMG)"
- head = /obj/item/clothing/head/helmet/marine/frontier
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
- suit = /obj/item/clothing/suit/armor/vest/marine/frontier
- gloves = /obj/item/clothing/gloves/combat
-
- belt = /obj/item/gun/ballistic/revolver/mateba
-
-
+ suit_store = null
l_hand = /obj/item/gun/ballistic/automatic/hmg/shredder // this doesnt even fit on the suit storage slot
backpack_contents = list(/obj/item/ammo_box/magazine/m12_shredder=2,/obj/item/ammo_box/a357=2,/obj/item/grenade/frag=1,/obj/item/radio=1)
diff --git a/code/modules/clothing/outfits/ert/gezena_ert.dm b/code/modules/clothing/outfits/ert/gezena_ert.dm
new file mode 100644
index 0000000000000..436b7379599ef
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/gezena_ert.dm
@@ -0,0 +1,87 @@
+/datum/outfit/job/gezena/ert
+ name = "ERT - PGF Marine Rifleman"
+ id_assignment = "Marine Rifleman"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
+
+ uniform = /obj/item/clothing/under/gezena/marine
+ suit = /obj/item/clothing/suit/armor/gezena/marine
+ head = /obj/item/clothing/head/helmet/gezena
+ belt = /obj/item/storage/belt/military/gezena/bg16
+ gloves = /obj/item/clothing/gloves/gezena/marine
+ shoes = /obj/item/clothing/shoes/combat/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena
+ suit_store = /obj/item/gun/energy/kalix/pgf
+
+ l_pocket = /obj/item/melee/knife/combat
+ r_pocket = /obj/item/flashlight/seclite
+
+ backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/grenade/frag=2)
+
+
+/datum/outfit/job/gezena/ert/gunner
+ name = "ERT - PGF Marine Gunner"
+
+ suit_store = /obj/item/gun/energy/kalix/pgf/heavy // yea there's not much else to put in. sorry
+
+/datum/outfit/job/gezena/ert/engineer
+ name = "ERT - PGF Marine Combat Engineer"
+ id_assignment = "Marine Combat Engineer"
+
+ belt = /obj/item/storage/belt/military/gezena/engineer
+
+/datum/outfit/job/gezena/ert/medic
+ name = "ERT - PGF Marine Medic"
+ id_assignment = "Marine Medic"
+ jobtype = /datum/job/paramedic
+ job_icon = "paramedic"
+
+ belt = /obj/item/storage/belt/medical/gezena/paramedic
+ gloves = /obj/item/clothing/gloves/gezena/marine
+ neck = /obj/item/clothing/neck/cloak/gezena/med
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/para
+ box = /obj/item/storage/box/survival/medical
+
+ backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/screwdriver)
+
+
+/datum/outfit/job/gezena/ert/leader
+ name = "ERT - PGF Marine Sergeant"
+ id_assignment = "Marine Sergeant"
+ jobtype = /datum/job/hos
+ job_icon = "headofsecurity"
+
+ suit = /obj/item/clothing/suit/armor/gezena/marinecoat
+ head = /obj/item/clothing/head/helmet/gezena
+ gloves = /obj/item/clothing/gloves/gezena/marine
+ shoes = /obj/item/clothing/shoes/combat/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena/lead
+ suit_store = /obj/item/gun/energy/kalix/pgf/heavy
+
+ backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/grenade/smokebomb = 3, /obj/item/binoculars)
+
+
+/datum/outfit/job/gezena/ert/inspector
+ name = "ERT - PGF Naval Observer"
+ id_assignment = "Naval Observer"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "headofpersonnel"
+
+ head = /obj/item/clothing/head/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena/command
+ uniform = /obj/item/clothing/under/gezena
+ suit = /obj/item/clothing/suit/armor/gezena
+ suit_store = null
+ belt = null
+ gloves = /obj/item/clothing/gloves/gezena
+
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/satchel
+ courierbag = /obj/item/storage/backpack/satchel
+
+ backpack_contents = list(/obj/item/folder, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
diff --git a/code/modules/clothing/outfits/ert/indie_ert.dm b/code/modules/clothing/outfits/ert/indie_ert.dm
index 236f9ee75c579..57d737ba0f8ab 100644
--- a/code/modules/clothing/outfits/ert/indie_ert.dm
+++ b/code/modules/clothing/outfits/ert/indie_ert.dm
@@ -3,25 +3,18 @@
jobtype = /datum/job/officer
job_icon = "securityofficer"
+ wallet = null
+
head = /obj/item/clothing/head/helmet/sec
ears = /obj/item/radio/headset/alt
- mask = null
uniform = /obj/item/clothing/under/rank/security/officer
- shoes = /obj/item/clothing/shoes/combat/swat
+ shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/color/black
suit = /obj/item/clothing/suit/armor/vest
back = /obj/item/storage/backpack/security
belt = /obj/item/storage/belt/security/full
id = /obj/item/card/id
-/datum/outfit/job/independent/ert/post_equip(mob/living/carbon/human/H, visualsOnly, client/preference_source)
- . = ..()
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access += list(ACCESS_CENT_GENERAL)
-
/datum/outfit/job/independent/ert/emt
name = "ERT - Independent Paramedic"
jobtype = /datum/job/paramedic
@@ -37,6 +30,15 @@
back = /obj/item/storage/backpack/medic
belt = /obj/item/storage/belt/medical/webbing/paramedic
+ backpack_contents = list(/obj/item/storage/firstaid/medical)
+
+/datum/outfit/job/independent/ert/emt/eva
+ name = "ERT - Independent Paramedic (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/medical
+ suit_store = /obj/item/tank/internals/oxygen
+
/datum/outfit/job/independent/ert/firefighter
name = "ERT - Independent Firefighter (Standard)"
jobtype = /datum/job/atmos
@@ -44,14 +46,20 @@
head = /obj/item/clothing/head/hardhat/red
uniform = /obj/item/clothing/under/utility
- suit = /obj/item/clothing/suit/fire/firefighter
+ suit = /obj/item/clothing/suit/fire/atmos
suit_store = /obj/item/extinguisher
glasses = /obj/item/clothing/glasses/heat
- mask = /obj/item/clothing/mask/breath
+ belt = null
+ mask = /obj/item/clothing/mask/gas/atmos
shoes = /obj/item/clothing/shoes/workboots
gloves = /obj/item/clothing/gloves/color/black
back = /obj/item/tank/internals/oxygen/red
+ backpack = /obj/item/storage/backpack/fireproof
+ courierbag = /obj/item/storage/backpack/fireproof
+ duffelbag = /obj/item/storage/backpack/fireproof
+ satchel = /obj/item/storage/backpack/fireproof
+
l_pocket = /obj/item/crowbar/red
r_pocket = /obj/item/radio
@@ -61,27 +69,33 @@
job_icon = "paramedic"
mask = /obj/item/clothing/mask/breath/medical
- back = /obj/item/storage/backpack/fireproof
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
glasses = /obj/item/clothing/glasses/hud/health
suit_store = /obj/item/tank/internals/emergency_oxygen
l_pocket = /obj/item/extinguisher/mini
- backpack_contents = list(/obj/item/storage/firstaid/fire=1, /obj/item/storage/firstaid/o2=1, /obj/item/radio=1)
+ backpack_contents = list(/obj/item/storage/firstaid/fire=1, /obj/item/storage/firstaid/o2=1)
/datum/outfit/job/independent/ert/firefighter/leader
name = "ERT - Independent Firefighter (Group Captain)"
jobtype = /datum/job/chief_engineer
job_icon = "chiefengineer"
- back = /obj/item/melee/axe/fire
suit = /obj/item/clothing/suit/space/hardsuit/engine
suit_store = /obj/item/tank/internals/oxygen/red
head = null
belt = /obj/item/storage/belt/utility/atmostech
gloves = /obj/item/clothing/gloves/color/yellow
+ backpack_contents = null
+ box = null
+
+ backpack = /obj/item/melee/axe/fire
+ courierbag = /obj/item/melee/axe/fire
+ duffelbag = /obj/item/melee/axe/fire
+ satchel = /obj/item/melee/axe/fire
+
/datum/outfit/job/independent/ert/technician
name = "ERT - Independent Technician"
jobtype = /datum/job/engineer
@@ -90,6 +104,7 @@
head = /obj/item/clothing/head/hardhat
uniform = /obj/item/clothing/under/rank/engineering/engineer
belt = /obj/item/storage/belt/utility/full/engi
+ gloves = /obj/item/clothing/gloves/color/yellow
suit = /obj/item/clothing/suit/toggle/hazard
shoes = /obj/item/clothing/shoes/workboots
back = /obj/item/storage/backpack/industrial
@@ -97,3 +112,61 @@
r_pocket = /obj/item/analyzer
box = /obj/item/storage/box/survival/engineer
+
+/datum/outfit/job/independent/ert/pizza
+ name = "ERT - Independent Pizza Delivery Worker"
+
+ uniform = /obj/item/clothing/under/suit/burgundy
+ neck = /obj/item/clothing/neck/tie/red
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ head = /obj/item/clothing/head/soft/mime
+ suit = null
+ ears = null
+ belt = null
+ gloves = null
+
+
+/datum/outfit/job/independent/ert/janitor
+ name = "ERT - Independent Sanitation Technician"
+ jobtype = /datum/job/janitor
+ job_icon = "janitor"
+
+ uniform = /obj/item/clothing/under/rank/civilian/janitor
+ head = /obj/item/clothing/head/soft/purple
+ ears = /obj/item/radio/headset
+ mask = null
+ shoes = /obj/item/clothing/shoes/combat/swat
+ gloves = /obj/item/clothing/gloves/color/purple
+ suit = null
+ belt = /obj/item/storage/belt/janitor/full
+
+/datum/outfit/job/independent/ert/deathsquad
+ name = "ERT - Death Commando"
+ job_icon = "deathsquad"
+ faction_icon = null
+ id_assignment = "Commando" // i mean. if you have enough time to look at a dsquaddie's id card. why not
+
+ head = null
+ uniform = /obj/item/clothing/under/rank/security/officer/military
+ id = /obj/item/card/id/ert/deathsquad
+ suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
+ shoes = /obj/item/clothing/shoes/combat/swat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
+ mask = /obj/item/clothing/mask/gas/sechailer/swat
+ glasses = /obj/item/clothing/glasses/hud/toggle/thermal
+ back = /obj/item/storage/backpack/security
+ suit_store = /obj/item/tank/internals/emergency_oxygen/double
+ belt = /obj/item/gun/ballistic/revolver/mateba
+ ears = /obj/item/radio/headset/alt
+ r_hand = /obj/item/gun/energy/pulse
+
+ l_pocket = /obj/item/melee/energy/sword/saber
+ r_pocket = /obj/item/shield/energy
+
+
+ backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
+ /obj/item/ammo_box/a357=1,\
+ /obj/item/storage/firstaid/regular=1,\
+ /obj/item/storage/box/flashbangs=1,\
+ /obj/item/flashlight=1,\
+ /obj/item/grenade/c4/x4=1)
diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm
index 9fd796d045160..6513fe11dd477 100644
--- a/code/modules/clothing/outfits/ert/inteq_ert.dm
+++ b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -4,31 +4,63 @@
jobtype = /datum/job/officer
job_icon = "securityofficer"
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ wallet = null
+
+ head = /obj/item/clothing/head/helmet/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
- suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ suit = /obj/item/clothing/suit/armor/vest
suit_store = /obj/item/gun/ballistic/automatic/assault/skm/inteq
gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset/inteq/alt
id = /obj/item/card/id
belt = /obj/item/storage/belt/security/webbing/inteq/skm
- back = /obj/item/storage/backpack/fireproof
l_pocket = /obj/item/melee/knife/combat
r_pocket = /obj/item/flashlight/seclite
- backpack_contents = list(/obj/item/radio=1)
+/datum/outfit/job/inteq/ert/eva
+ name = "ERT - Inteq Rifleman (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
/datum/outfit/job/inteq/ert/shotgun
name = "ERT - Inteq Shotgunner"
- id_assignment = "Enforcer"
- suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
- belt = /obj/item/storage/belt/security/webbing/inteq/alt
+ suit_store = /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq
+ belt = /obj/item/storage/belt/security/webbing/inteq/alt/bulldog
- backpack_contents = list(/obj/item/storage/box/lethalshot=2, /obj/item/radio=1)
+/datum/outfit/job/inteq/ert/shotgun/eva
+ name = "ERT - Inteq Shotgunner (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
+
+/datum/outfit/job/inteq/ert/engineer
+ name = "ERT - Inteq Artificer"
+ id_assignment = "Artificer"
+ jobtype = /datum/job/engineer
+ job_icon = "stationengineer"
+
+ head = /obj/item/clothing/head/soft/inteq
+ uniform = /obj/item/clothing/under/syndicate/inteq/artificer
+ belt = /obj/item/storage/belt/utility/full/engi
+ gloves = /obj/item/clothing/gloves/color/yellow
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/co9mm=2)
+
+/datum/outfit/job/inteq/ert/engineer/eva
+ name = "ERT - Inteq Artificer (EVA)"
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
/datum/outfit/job/inteq/ert/medic
name = "ERT - Inteq Corpsman"
@@ -36,13 +68,21 @@
jobtype = /datum/job/paramedic
job_icon = "paramedic"
+ head = /obj/item/clothing/head/soft/inteq/corpsman
uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
belt = /obj/item/storage/belt/medical/webbing/paramedic
- suit_store = null
+ suit = /obj/item/clothing/suit/armor/inteq/corpsman
+ suit_store = /obj/item/healthanalyzer
+
+ backpack_contents = list(/obj/item/storage/firstaid/medical=1)
- l_pocket = /obj/item/healthanalyzer
+/datum/outfit/job/inteq/ert/medic/eva
+ name = "ERT - Inteq Corpsman (EVA)"
- backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/radio=1)
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ suit_store = null
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
/datum/outfit/job/inteq/ert/leader
name = "ERT - Inteq Vanguard"
@@ -50,7 +90,62 @@
jobtype = /datum/job/hos
job_icon = "headofsecurity"
+ head = /obj/item/clothing/head/helmet/inteq
ears = /obj/item/radio/headset/inteq/alt/captain
back = /obj/item/storage/backpack/messenger/inteq
+ belt = /obj/item/storage/belt/security/webbing/inteq/skm_carabine
+ suit = /obj/item/clothing/suit/armor/hos/inteq
+ suit_store = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq
+ id = /obj/item/card/id/gold
+
+ backpack_contents = list(/obj/item/megaphone/sec)
+
+/datum/outfit/job/inteq/ert/leader/eva
+ name = "ERT - Inteq Vanguard (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
+
+/datum/outfit/job/inteq/ert/honor_guard
+ name = "ERT - Inteq Honor Guard"
+ id_assignment = "Guardsman"
+ jobtype = /datum/job/officer
+ job_icon = "inteq"
+
+ uniform = /obj/item/clothing/under/syndicate/inteq
+ suit = /obj/item/clothing/suit/armor/vest/marine
+ belt = /obj/item/storage/belt/military/assault/commander
+ gloves = /obj/item/clothing/gloves/color/white
+ shoes = /obj/item/clothing/shoes/combat
+ head = /obj/item/clothing/head/beret/sec/hos/inteq/honorable
+ mask = /obj/item/clothing/mask/balaclava/inteq
+ ears = /obj/item/radio/headset/inteq/captain
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
+ r_pocket = /obj/item/restraints/handcuffs
suit_store = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
- id = /obj/item/card/id/silver
+
+ backpack_contents = list(/obj/item/gun/energy/taser)
+
+
+/datum/outfit/job/inteq/ert/inspector
+ name = "ERT - Inteq Mothership Investigator"
+ id_assignment = "Investigator"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "inteq"
+
+ uniform = /obj/item/clothing/under/syndicate/inteq
+ suit = null
+ suit_store = null
+ belt = /obj/item/clipboard
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/laceup
+ head = /obj/item/clothing/head/beret/sec/inteq
+ mask = null
+ ears = /obj/item/radio/headset/inteq/captain
+ glasses = null
+
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/stamp/inteq, /obj/item/folder, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index d5a3ec72e94ca..cec786d70789b 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -1,26 +1,61 @@
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard
- name = "ERT - CLIP Minuteman BARD Specialist"
- id_assignment = "Biohazard Assessment Specialist"
+/datum/outfit/job/clip/minutemen/bard
+ name = "ERT - C-MM BARD Field Agent"
+ id_assignment = "Biohazard Assessment Field Agent"
+ jobtype = /datum/job/virologist
+ job_icon = "virologist" // can someone resprite the biosuits already
+
+ wallet = null
+
+ uniform = /obj/item/clothing/under/clip/formal/with_shirt
+ head = /obj/item/clothing/head/clip
+ mask = /obj/item/clothing/mask/surgical
+ gloves = /obj/item/clothing/gloves/color/latex
+
+ backpack = /obj/item/storage/backpack/satchel/sec/clip
+ satchel = /obj/item/storage/backpack/satchel/sec/clip
+ courierbag = /obj/item/storage/backpack/satchel/sec/clip
+ duffelbag = /obj/item/storage/backpack/satchel/sec/clip
+
+ l_pocket = /obj/item/taperecorder
+ r_pocket = /obj/item/flashlight
+
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip,
+ /obj/item/evidencebag = 2,
+ /obj/item/camera,
+ /obj/item/storage/firstaid/toxin,
+ )
+
+/datum/outfit/job/clip/minutemen/bard/emergency
+ name = "ERT - C-MM BARD Xenofauna Specialist"
+ id_assignment = "Biohazard Assessment Xenofauna Specialist"
job_icon = "clip_cmm2"
+ uniform = /obj/item/clothing/under/clip/minutemen
suit = /obj/item/clothing/suit/armor/vest/marine/heavy
- suit_store = /obj/item/gun/ballistic/shotgun/cm15
+ suit_store = /obj/item/gun/ballistic/shotgun/cm15/incendiary
mask = /obj/item/clothing/mask/gas/clip
head = /obj/item/clothing/head/helmet/riot/clip
- belt = /obj/item/storage/belt/military/clip/cm15
+ belt = /obj/item/storage/belt/military/clip/cm15_inc
glasses = /obj/item/clothing/glasses/hud/health/night
r_pocket = /obj/item/melee/knife/combat
l_pocket = /obj/item/extinguisher/mini
+ shoes = /obj/item/clothing/shoes/combat
+
+ backpack = /obj/item/storage/backpack/ert
+ satchel = /obj/item/storage/backpack/ert
+ courierbag = /obj/item/storage/backpack/ert
+ duffelbag = /obj/item/storage/backpack/ert
backpack_contents = list(
/obj/item/flashlight/seclite = 1,
/obj/item/storage/box/flares = 1
)
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic
- name = "ERT - CLIP Minuteman BARD Medical Specialist"
- id_assignment = "Corpsman"
+/datum/outfit/job/clip/minutemen/bard/emergency/medic
+ name = "ERT - C-MM BARD Medical Specialist"
+ id_assignment = "Biohazard Assessment Medical Aid Specialist"
+ uniform = /obj/item/clothing/under/clip/medic
suit = /obj/item/clothing/suit/armor/vest/marine
suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
belt = /obj/item/storage/belt/medical/webbing/clip/prefilled
@@ -31,11 +66,17 @@
/obj/item/flashlight/seclite = 1,
/obj/item/defibrillator/compact/loaded = 1,
/obj/item/storage/firstaid/advanced = 1,
- /obj/item/ammo_box/magazine/smgm9mm = 2
+ /obj/item/ammo_box/magazine/cm5_9mm = 2
)
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard/flamer
- name = "ERT - CLIP Minuteman BARD Flamethrower Specialist"
+ backpack = /obj/item/storage/backpack/ert/medical
+ satchel = /obj/item/storage/backpack/ert/medical
+ courierbag = /obj/item/storage/backpack/ert/medical
+ duffelbag = /obj/item/storage/backpack/ert/medical
+
+/datum/outfit/job/clip/minutemen/bard/emergency/flamer
+ name = "ERT - C-MM BARD Flamethrower Specialist"
+ id_assignment = "Biohazard Assessment Fire Control Specialist"
suit = /obj/item/clothing/suit/armor/vest/marine/medium
suit_store = /obj/item/flamethrower/full/tank
@@ -46,17 +87,15 @@
backpack_contents = list(
/obj/item/flashlight/seclite = 1,
/obj/item/extinguisher = 1,
- /obj/item/gun/ballistic/automatic/pistol/commander = 1 // replace commander with the cm23 when it is implemented
+ /obj/item/gun/ballistic/automatic/pistol/cm23 = 1
)
-
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader
- name = "ERT - CLIP Minuteman BARD Specialist Sergeant"
- id_assignment = "Biohazard Assessment Sergeant"
- job_icon = "clip_cmm3"
+/datum/outfit/job/clip/minutemen/bard/emergency/leader
+ name = "ERT - C-MM BARD Master Sergeant"
+ id_assignment = "Master Sergeant"
+ job_icon = "clip_cmm4"
belt = /obj/item/storage/belt/military/clip/e50
- uniform = /obj/item/clothing/under/clip/officer
suit = /obj/item/clothing/suit/armor/vest/marine
suit_store = /obj/item/gun/energy/laser/e50/clip
r_pocket = /obj/item/grenade/c4
@@ -65,36 +104,79 @@
backpack_contents = list(
/obj/item/storage/box/flares = 1,
/obj/item/grenade/c4 = 2,
+ /obj/item/grenade/smokebomb = 2,
/obj/item/flashlight/seclite = 1
)
-/datum/outfit/job/clip/minutemen/grunt/dressed/riot
- name = "ERT - CLIP Minuteman Riot Officer"
- job_icon = "securityofficerOld"
+/datum/outfit/job/clip/minutemen/military_police
+ name = "ERT - C-MM Military Police"
+ id_assignment = "Military Police"
+ job_icon = "clip_cmm3"
+
+ ears = /obj/item/radio/headset/clip/alt
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
+ head = /obj/item/clothing/head/clip/slouch
+ glasses = /obj/item/clothing/glasses/sunglasses
+ belt = /obj/item/storage/belt/security/full
+ shoes = /obj/item/clothing/shoes/jackboots
+ gloves = /obj/item/clothing/gloves/color/white
+
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/melee/knife/combat
+
+/datum/outfit/job/clip/minutemen/military_police/riot
+ name = "ERT - C-MM Military Police (Riot Control)"
suit = /obj/item/clothing/suit/armor/riot/clip
+ mask = /obj/item/clothing/mask/balaclava/combat
+ glasses = /obj/item/clothing/glasses/sunglasses/big
+ gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/helmet/riot/clip
l_hand = /obj/item/melee/baton/loaded
- back = /obj/item/shield/riot
- belt = /obj/item/gun/ballistic/automatic/smg/cm5/no_mag
- r_pocket = /obj/item/ammo_box/magazine/smgm9mm/rubber
- l_pocket = /obj/item/ammo_box/magazine/smgm9mm/rubber
+ belt = /obj/item/gun/ballistic/automatic/smg/cm5/rubber
+
+ r_pocket = /obj/item/ammo_box/magazine/cm5_9mm/rubber
+ l_pocket = /obj/item/reagent_containers/spray/pepper
backpack_contents = null
box = null
- backpack = null
- duffelbag = null
- courierbag = null
- satchel = null
+ backpack = /obj/item/shield/riot
+ duffelbag = /obj/item/shield/riot
+ courierbag = /obj/item/shield/riot
+ satchel = /obj/item/shield/riot
-/datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader
- name = "ERT - CLIP Minutemen Riot Officer Sergeant"
- id_assignment = "Security Sergeant"
- job_icon = "lieutenant"
+/datum/outfit/job/clip/minutemen/military_police/leader
+ name = "ERT - C-MM Chief Military Police"
+ id_assignment = "Chief Military Police"
+ job_icon = "clip_cmm4"
+ head = /obj/item/clothing/head/clip/slouch/officer
+ uniform = /obj/item/clothing/under/clip/officer
ears = /obj/item/radio/headset/clip/alt/captain
- back = /obj/item/shield/riot/flash
+
+/datum/outfit/job/clip/minutemen/military_police/leader/riot
+ name = "ERT - C-MM Chief Military Police (Riot Control)"
+
+ suit = /obj/item/clothing/suit/armor/riot/clip
+ mask = /obj/item/clothing/mask/balaclava/combat
+ glasses = /obj/item/clothing/glasses/sunglasses/big
+ gloves = /obj/item/clothing/gloves/tackler/combat
+ head = /obj/item/clothing/head/helmet/riot/clip
+ suit_store = /obj/item/melee/baton/loaded
+ l_hand = /obj/item/megaphone/command
+ belt = /obj/item/gun/ballistic/automatic/smg/cm5/rubber
+
+ r_pocket = /obj/item/assembly/flash/handheld
+ l_pocket = /obj/item/ammo_box/magazine/cm5_9mm/rubber
+
+ backpack_contents = null
+ box = null
+
+ backpack = /obj/item/shield/riot/flash
+ duffelbag = /obj/item/shield/riot/flash
+ courierbag = /obj/item/shield/riot/flash
+ satchel = /obj/item/shield/riot/flash
/datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
name = "CLIP Minutemen - Minuteman (Spotter Hardsuit)"
diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
index 1ca40cd640e39..49a01ae5693b8 100644
--- a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
+++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
@@ -1,464 +1,72 @@
-// this is where the base ERT outfit goes
-/datum/outfit/centcom/ert
- name = "ERT Common"
-
- mask = /obj/item/clothing/mask/gas/sechailer
- uniform = /obj/item/clothing/under/rank/centcom/official
- shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/combat
- ears = /obj/item/radio/headset/headset_cent/alt
-
-/datum/outfit/centcom/ert/post_equip(mob/living/carbon/human/human, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/id = human.wear_id
- if(id)
- id.registered_name = human.real_name
- id.update_label()
- ..()
-
-/datum/outfit/centcom/ert/commander
- name = "ERT Commander"
-
- id = /obj/item/card/id/ert
- suit = /obj/item/clothing/suit/space/hardsuit/ert
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- back = /obj/item/storage/backpack/ert
- belt = /obj/item/storage/belt/security/full
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1)
- l_pocket = /obj/item/melee/knife/switchblade
-
-/datum/outfit/centcom/ert/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/heads/captain
- R.recalculateChannels()
-
-/datum/outfit/centcom/ert/commander/alert
- name = "ERT Commander - High Alert"
-
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- glasses = /obj/item/clothing/glasses/thermal/eyepatch
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/pulse/pistol=1)
- l_pocket = /obj/item/melee/transforming/energy/sword/saber
-
-/datum/outfit/centcom/ert/security
- name = "ERT Security"
-
- id = /obj/item/card/id/ert/security
- suit = /obj/item/clothing/suit/space/hardsuit/ert/sec
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- back = /obj/item/storage/backpack/ert/security
- belt = /obj/item/storage/belt/security/full
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/handcuffs=1,
- /obj/item/melee/baton/loaded=1)
-
-/datum/outfit/centcom/ert/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
-
-/datum/outfit/centcom/ert/security/alert
- name = "ERT Security - High Alert"
-
- suit_store = /obj/item/gun/energy/pulse/carbine
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/handcuffs=1,\
- /obj/item/melee/baton/loaded=1)
-
-/datum/outfit/centcom/ert/medic
- name = "ERT Medic"
-
- id = /obj/item/card/id/ert/medical
- suit = /obj/item/clothing/suit/space/hardsuit/ert/med
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/hud/health
- back = /obj/item/storage/backpack/ert/medical
- belt = /obj/item/storage/belt/medical
- r_hand = /obj/item/storage/firstaid/regular
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/reagent_containers/hypospray/combat=1,\
- /obj/item/gun/medbeam=1)
-
-/datum/outfit/centcom/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
-
-/datum/outfit/centcom/ert/medic/alert
- name = "ERT Medic - High Alert"
-
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/pulse/pistol=1,\
- /obj/item/reagent_containers/hypospray/combat/nanites=1,\
- /obj/item/gun/medbeam=1)
-
-/datum/outfit/centcom/ert/engineer
- name = "ERT Engineer"
-
- id = /obj/item/card/id/ert/engineer
- suit = /obj/item/clothing/suit/space/hardsuit/ert/engi
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/meson/engine
- back = /obj/item/storage/backpack/ert/engineer
- belt = /obj/item/storage/belt/utility/full
- l_pocket = /obj/item/rcd_ammo/large
- r_hand = /obj/item/storage/firstaid/regular
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/construction/rcd/loaded=1)
-
-
-/datum/outfit/centcom/ert/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
+/datum/outfit/job/nanotrasen/ert
+ name = "ERT - Nanotrasen Vigilitas Security Officer"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
- if(visualsOnly)
- return
+ wallet = null
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/nanotrasen/security
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/nanotrasen/cap/security
+ suit = /obj/item/clothing/suit/armor/nanotrasen
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/commander
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ shoes = /obj/item/clothing/shoes/jackboots
-/datum/outfit/centcom/ert/engineer/alert
- name = "ERT Engineer - High Alert"
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/pulse/pistol=1,\
- /obj/item/construction/rcd/combat=1)
+ backpack_contents = list(/obj/item/ammo_box/magazine/co9mm = 3)
-// official
+ implants = list(/obj/item/implant/weapons_auth)
-/datum/outfit/centcom/centcom_official
- name = "CentCom Official"
+/datum/outfit/job/nanotrasen/ert/inspector
+ name = "ERT - Nanotrasen CentCom Inspector"
+ id_assignment = "Inspector"
+ job_icon = "centcom"
+ head = null
uniform = /obj/item/clothing/under/rank/centcom/official
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
+ suit = null
+ suit_store = null
ears = /obj/item/radio/headset/headset_cent
glasses = /obj/item/clothing/glasses/sunglasses
- belt = /obj/item/gun/energy/e_gun
- l_pocket = /obj/item/pen
- back = /obj/item/storage/backpack/satchel
- r_pocket = /obj/item/pda/heads
- l_hand = /obj/item/clipboard
+ belt = /obj/item/clipboard
id = /obj/item/card/id/centcom
- backpack_contents = list(/obj/item/stamp/centcom=1)
-
-/datum/outfit/centcom/centcom_official/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
- var/obj/item/pda/heads/pda = H.r_store
- pda.owner = H.real_name
- pda.ownjob = "CentCom Official"
- pda.update_label()
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_centcom_access("CentCom Official")
- W.access += ACCESS_WEAPONS
- W.assignment = "CentCom Official"
- W.registered_name = H.real_name
- W.update_label()
- ..()
-
-/datum/outfit/centcom/ert/janitor
- name = "ERT Janitor"
-
- id = /obj/item/card/id/ert/janitor
- suit = /obj/item/clothing/suit/space/hardsuit/ert/jani
- glasses = /obj/item/clothing/glasses/night
- back = /obj/item/storage/backpack/ert/janitor
- belt = /obj/item/storage/belt/janitor/full
- r_pocket = /obj/item/grenade/chem_grenade/cleaner
- l_pocket = /obj/item/grenade/chem_grenade/cleaner
- l_hand = /obj/item/storage/bag/trash/bluespace
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/lights/mixed=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/mop/advanced=1,\
- /obj/item/reagent_containers/glass/bucket=1,\
- /obj/item/grenade/clusterbuster/cleaner=1)
-
-/datum/outfit/centcom/ert/janitor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
+ l_pocket = /obj/item/pen
+ r_pocket = /obj/item/pda/heads
-/datum/outfit/centcom/ert/janitor/heavy
- name = "ERT Janitor - Heavy Duty"
+ backpack_contents = list(/obj/item/stamp/nanotrasen/central, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- r_hand = /obj/item/reagent_containers/spray/chemsprayer/janitor
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/lights/mixed=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/grenade/clusterbuster/cleaner=3)
+// /datum/outfit/job/nanotrasen/ert/emergency
+// name = "ERT - Vigilitas Emergency Response Officer"
-/datum/outfit/centcom/centcom_intern
- name = "CentCom Intern"
+/datum/outfit/job/nanotrasen/ert/leader
+ name = "ERT - Nanotrasen Vigilitas Security Corporal"
+ jobtype = /datum/job/hos
+ job_icon = "lieutenant"
- uniform = /obj/item/clothing/under/rank/centcom/intern
- shoes = /obj/item/clothing/shoes/sneakers/black
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/nanotrasen/security
gloves = /obj/item/clothing/gloves/color/black
- ears = /obj/item/radio/headset/headset_cent
- glasses = /obj/item/clothing/glasses/sunglasses
- belt = /obj/item/melee/classic_baton
- r_hand = /obj/item/gun/ballistic/rifle/illestren
- back = /obj/item/storage/backpack/satchel
- l_pocket = /obj/item/ammo_box/magazine/illestren_a850r
- r_pocket = /obj/item/ammo_box/magazine/illestren_a850r
- id = /obj/item/card/id/centcom
- backpack_contents = list(/obj/item/storage/box/survival = 1)
-/datum/outfit/centcom/centcom_intern/unarmed
- name = "CentCom Intern (Unarmed)"
- belt = null
- l_hand = null
- l_pocket = null
- r_pocket = null
-
-/datum/outfit/centcom/centcom_intern/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_centcom_access(name)
- W.access += ACCESS_WEAPONS
- W.assignment = name
- W.registered_name = H.real_name
- W.update_label()
-
-/datum/outfit/centcom/centcom_intern/leader
- name = "CentCom Head Intern"
- belt = /obj/item/melee/baton/loaded
- suit = /obj/item/clothing/suit/armor/vest
- suit_store = /obj/item/gun/ballistic/rifle/illestren
- r_hand = /obj/item/megaphone
- head = /obj/item/clothing/head/intern
-
-/datum/outfit/centcom/centcom_intern/leader/unarmed // i'll be nice and let the leader keep their baton and vest
- name = "CentCom Head Intern (Unarmed)"
- suit_store = null
- l_pocket = null
- r_pocket = null
-
-// Marine
-
-/datum/outfit/centcom/ert/marine
- name = "Marine Commander"
-
- id = /obj/item/card/id/ert
- suit = /obj/item/clothing/suit/armor/vest/marine
- back = /obj/item/storage/backpack/ert
- backpack_contents = list(
- /obj/item/storage/box/survival/engineer = 1,
- /obj/item/gun_voucher/nanotrasen = 1
-)
- belt = /obj/item/storage/belt/military/assault
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
- l_pocket = /obj/item/melee/knife/combat
- r_pocket = /obj/item/tank/internals/emergency_oxygen/double
- uniform = /obj/item/clothing/under/rank/security/officer/military
- accessory = /obj/item/clothing/accessory/holster/marine
- mask = /obj/item/clothing/mask/gas/sechailer
- head = /obj/item/clothing/head/helmet/marine
-
-/datum/outfit/centcom/ert/marine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/heads/captain
- headset.recalculateChannels()
-
-/datum/outfit/centcom/ert/marine/security
- name = "Marine Heavy"
-
- id = /obj/item/card/id/ert/security
- suit = /obj/item/clothing/suit/armor/vest/marine/heavy
- back = /obj/item/storage/backpack/ert/security
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- head = /obj/item/clothing/head/helmet/marine/security
-
-/datum/outfit/centcom/ert/marine/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/headset_com
- headset.recalculateChannels()
-
-/datum/outfit/centcom/ert/marine/medic
- name = "Marine Medic"
-
- id = /obj/item/card/id/ert/medical
- suit = /obj/item/clothing/suit/armor/vest/marine
- accessory = /obj/item/clothing/accessory/holster/marine
- back = /obj/item/storage/backpack/ert/medical
- l_pocket = /obj/item/healthanalyzer
- head = /obj/item/clothing/head/helmet/marine/medic
- backpack_contents = list(
- /obj/item/storage/box/survival/engineer = 1,
- /obj/item/gun_voucher/nanotrasen = 1,
- /obj/item/reagent_containers/hypospray/combat = 1,
- /obj/item/storage/firstaid/regular = 1,
- /obj/item/storage/firstaid/advanced = 1
-)
- belt = /obj/item/storage/belt/medical/paramedic
- glasses = /obj/item/clothing/glasses/hud/health/sunglasses
-
-/datum/outfit/centcom/ert/marine/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/headset_com
- headset.recalculateChannels()
-
-/datum/outfit/centcom/ert/marine/engineer
- name = "Marine Engineer"
-
- id = /obj/item/card/id/ert/engineer
- suit = /obj/item/clothing/suit/armor/vest/marine/medium
- head = /obj/item/clothing/head/helmet/marine/engineer
- back = /obj/item/storage/backpack/ert/engineer
- backpack_contents = list(
- /obj/item/storage/box/survival/engineer = 1,
- /obj/item/gun_voucher/nanotrasen = 1,
- /obj/item/rcd_ammo/large = 2,
- )
- r_hand = /obj/item/deployable_turret_folded
- uniform = /obj/item/clothing/under/rank/security/officer/military/eng
- belt = /obj/item/storage/belt/utility/full/ert
- glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
-
-/datum/outfit/centcom/ert/marine/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/headset_com
- headset.recalculateChannels()
-
-// Loss Prevention
-/datum/outfit/job/nanotrasen/security/ert/lp
- name = "ERT - Loss Prevention Security Specialist"
- jobtype = /datum/job/officer
- job_icon = "securityresponseofficer"
-
- head = null
- implants = list(/obj/item/implant/mindshield)
- ears = /obj/item/radio/headset/nanotrasen/alt
- id = /obj/item/card/id/lpsec
- suit_store = /obj/item/gun/energy/laser/scatter/shotty
- belt = /obj/item/storage/belt/security/full
- glasses = /obj/item/clothing/glasses/sunglasses
- gloves = /obj/item/clothing/gloves/tackler/combat
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/sec
- uniform = /obj/item/clothing/under/rank/security/head_of_security/nt/lp
- shoes = /obj/item/clothing/shoes/jackboots
- back = /obj/item/storage/backpack/ert/security
-
- box = /obj/item/storage/box/survival/security
+ head = /obj/item/clothing/head/nanotrasen/beret/security
+ suit = /obj/item/clothing/suit/armor/nanotrasen/slim
l_pocket = /obj/item/restraints/handcuffs
- r_pocket = /obj/item/melee/knife/combat
-
- backpack_contents = list(/obj/item/radio=1, /obj/item/stock_parts/cell/gun/upgraded=2, /obj/item/screwdriver=1)
-
-
-/datum/outfit/job/nanotrasen/security/ert/lp/medic
- name = "ERT - Loss Prevention Medical Specialist"
- jobtype = /datum/job/doctor
- job_icon = "medicalresponseofficer"
+ r_pocket = /obj/item/assembly/flash/handheld
+ backpack_contents = null
- head = null
- uniform = /obj/item/clothing/under/rank/medical/paramedic/lp
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/med
- id = /obj/item/card/id/lpmed
- gloves = /obj/item/clothing/gloves/color/latex/nitrile
- back = /obj/item/storage/backpack/ert/medical
- belt = /obj/item/storage/belt/medical/surgery
-
- box = /obj/item/storage/box/survival/medical
- l_pocket = /obj/item/healthanalyzer
- r_pocket = /obj/item/reagent_containers/hypospray/medipen/atropine
-
- backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/radio=1)
-
-
-/datum/outfit/job/nanotrasen/security/ert/lp/engineer
- name = "ERT - Loss Prevention Engineering Specialist"
- jobtype = /datum/job/engineer
- job_icon = "engineeringresponseofficer"
-
- head = null
- uniform = /obj/item/clothing/under/rank/engineering/engineer/nt/lp
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/engi
- id = /obj/item/card/id/lpengie
- belt = /obj/item/storage/belt/utility/full
- gloves = /obj/item/clothing/gloves/color/yellow
- glasses = /obj/item/clothing/glasses/welding
- back = /obj/item/storage/backpack/ert/engineer
-
- box = /obj/item/storage/box/survival/engineer
- l_pocket = /obj/item/extinguisher/mini
- r_pocket = /obj/item/wrench/combat
-
- backpack_contents = list(/obj/item/stack/sheet/metal/fifty=1, /obj/item/stack/sheet/glass/fifty=1, /obj/item/radio=1)
+// /datum/outfit/job/nanotrasen/ert/leader/emergency
+// name = "ERT - Vigilitas Emergency Response Lieutenant"
-/datum/outfit/job/nanotrasen/security/ert/lp/lieutenant
- name = "ERT - Loss Prevention Lieutenant"
- jobtype = /datum/job/captain
- job_icon = "emergencyresponseteamcommander"
-
- head = null
- ears = /obj/item/radio/headset/nanotrasen/alt/captain
- id = /obj/item/card/id/lplieu
- belt = /obj/item/storage/belt/military/army
- gloves = /obj/item/clothing/gloves/color/black
- uniform = /obj/item/clothing/under/rank/security/warden/lp
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp
- shoes = /obj/item/clothing/shoes/combat
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- back = /obj/item/storage/backpack/ert
+// /datum/outfit/job/nanotrasen/ert/emergency/medic
+// name = "ERT - Vigilitas Emergency Response Medic"
- l_pocket = /obj/item/megaphone/command
- r_pocket = /obj/item/binoculars
+// /datum/outfit/job/nanotrasen/ert/emergency/engineer
+// name = "ERT - Vigilitas Emergency Response Engineer"
diff --git a/code/modules/clothing/outfits/ert/roumain_ert.dm b/code/modules/clothing/outfits/ert/roumain_ert.dm
new file mode 100644
index 0000000000000..efe7828173be1
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/roumain_ert.dm
@@ -0,0 +1,131 @@
+/datum/outfit/job/roumain/ert
+ name = "ERT - Saint-Roumain Hunter" // flaming arrow and shadow
+ id_assignment = "Hunter"
+ jobtype = /datum/job/officer
+ job_icon = "srm_hunter"
+
+ wallet = null
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/armor/roumain
+ head = /obj/item/clothing/head/cowboy/sec/roumain
+ belt = /obj/item/gun/ballistic/revolver/shadow
+ suit_store = /obj/item/gun/ballistic/shotgun/flamingarrow/factory
+
+ l_pocket = /obj/item/ammo_box/a44roum_speedloader
+ r_pocket = /obj/item/flashlight/lantern
+
+ duffelbag = /obj/item/storage/backpack/satchel/leather
+ courierbag = /obj/item/storage/backpack/satchel/leather
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ box = null
+
+ backpack_contents = list(/obj/item/ammo_box/a44roum_speedloader = 2, /obj/item/storage/box/ammo/c38)
+
+/datum/outfit/job/roumain/ert/firestorm
+ name = "ERT - Saint-Roumain Hunter (Firestorm)" // firestorm and shadow
+
+ belt = /obj/item/gun/ballistic/revolver/shadow
+ suit_store = /obj/item/gun/ballistic/automatic/smg/firestorm/pan
+
+ l_pocket = /obj/item/ammo_box/a44roum_speedloader
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/c45_firestorm_mag/pan = 3, /obj/item/ammo_box/a44roum_speedloader = 2, /obj/item/storage/box/ammo/a44roum)
+
+/datum/outfit/job/roumain/ert/vickland
+ name = "ERT - Saint-Roumain Hunter (Vickland)" // vickland and candor
+
+ belt = /obj/item/gun/ballistic/automatic/pistol/candor/factory
+ suit_store = /obj/item/gun/ballistic/automatic/marksman/vickland
+
+ l_pocket = /obj/item/ammo_box/magazine/m45
+
+ backpack_contents = list(/obj/item/ammo_box/vickland_a308 = 6, /obj/item/storage/box/ammo/a308, /obj/item/ammo_box/magazine/m45 = 2)
+
+/datum/outfit/job/roumain/ert/scout
+ name = "ERT - Saint-Roumain Hunter (Scout)" // scout and detective special
+
+ belt = /obj/item/gun/ballistic/revolver/detective
+ suit_store = /obj/item/gun/ballistic/rifle/scout
+
+ backpack_contents = list(/obj/item/ammo_box/a300 = 5)
+
+/datum/outfit/job/roumain/ert/medic
+ name = "ERT - Saint-Roumain Hunter Doctor"
+ id_assignment = "Hunter Doctor"
+ job_icon = "srm_doctor"
+ jobtype = /datum/job/doctor
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/toggle/labcoat/roumain_med
+ suit_store = null
+ head = /obj/item/clothing/head/cowboy/sec/roumain/med
+ mask = /obj/item/clothing/mask/gas/plaguedoctor
+ gloves = null
+
+/datum/outfit/job/roumain/ert/engineer
+ name = "ERT - Saint-Roumain Machinist"
+ id_assignment = "Machinist"
+ job_icon = "srm_machinist"
+ jobtype = /datum/job/engineer
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ alt_uniform = null
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ belt = /obj/item/storage/belt/utility/full/engi
+ suit = /obj/item/clothing/suit/hazardvest/roumain
+ suit_store = null
+ head = /obj/item/clothing/head/cowboy/sec/roumain/machinist
+ glasses = /obj/item/clothing/glasses/welding
+ accessory = /obj/item/clothing/accessory/waistcoat/roumain
+ gloves = /obj/item/clothing/gloves/color/yellow
+
+
+/datum/outfit/job/roumain/ert/leader
+ name = "ERT - Saint-Roumain Hunter Montagne" // flaming bolt and montagne
+ id_assignment = "Hunter Montagne"
+ job_icon = "srm_montagne"
+ jobtype = /datum/job/captain
+
+ ears = /obj/item/radio/headset/headset_com/alt
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/cowboy
+ suit = /obj/item/clothing/suit/armor/roumain/montagne
+ suit_store = /obj/item/gun/ballistic/shotgun/flamingarrow/bolt
+ belt = /obj/item/gun/ballistic/revolver/montagne
+ head = /obj/item/clothing/head/cowboy/sec/roumain/montagne
+ id = /obj/item/card/id/gold
+
+ duffelbag = /obj/item/storage/backpack/cultpack
+ courierbag = /obj/item/storage/backpack/cultpack
+ backpack = /obj/item/storage/backpack/cultpack
+ satchel = /obj/item/storage/backpack/cultpack
+
+/datum/outfit/job/roumain/ert/leader/twobore
+ name = "ERT - Saint-Roumain Hunter Montagne (Huntsman)" // huntsman (twobore) and montagne
+
+ suit_store = /obj/item/gun/ballistic/shotgun/doublebarrel/twobore
+
+ l_pocket = /obj/item/ammo_box/a357
+
+ backpack_contents = list(/obj/item/ammo_casing/shotgun/buckshot/twobore = 8)
+
+/datum/outfit/job/roumain/ert/leader/colligne
+ name = "ERT - Saint-Roumain Hunter Colligne" // double barrel and ashhand
+ id_assignment = "Hunter Colligne"
+ job_icon = "srm_colligne"
+ jobtype = /datum/job/head_of_personnel
+
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/armor/roumain/colligne
+ suit_store = /obj/item/gun/ballistic/shotgun/doublebarrel/roumain
+ head = /obj/item/clothing/head/cowboy/sec/roumain/colligne
+ belt = /obj/item/gun/ballistic/revolver/ashhand
+ id = /obj/item/card/id/silver
+
+ backpack_contents = list(/obj/item/storage/box/ammo/a12g_buckshot, /obj/item/storage/box/ammo/a4570)
diff --git a/code/modules/clothing/outfits/ert/solgov_ert.dm b/code/modules/clothing/outfits/ert/solgov_ert.dm
index d6830b7514980..5fbc808397b13 100644
--- a/code/modules/clothing/outfits/ert/solgov_ert.dm
+++ b/code/modules/clothing/outfits/ert/solgov_ert.dm
@@ -4,6 +4,8 @@
jobtype = /datum/job/officer
job_icon = "sonnensoldner"
+ wallet = null
+
id = /obj/item/card/id/solgov
uniform = /obj/item/clothing/under/solgov
suit = /obj/item/clothing/suit/armor/vest/solgov
@@ -11,20 +13,20 @@
ears = /obj/item/radio/headset/solgov/alt
gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/solgov/sonnensoldner
- shoes = /obj/item/clothing/shoes/workboots
- back = /obj/item/storage/backpack
+ shoes = /obj/item/clothing/shoes/combat
box = /obj/item/storage/box/survival
l_hand = /obj/item/energyhalberd
/datum/outfit/job/solgov/ert/inspector
- name = "ERT - Inspector (SolGov)"
+ name = "ERT - SolGov Inspector"
id_assignment = "Inspector"
jobtype = /datum/job/head_of_personnel
job_icon = "solgovrepresentative"
uniform = /obj/item/clothing/under/solgov/formal
+ neck = /obj/item/clothing/neck/cloak/solgov
belt = /obj/item/clipboard
ears = /obj/item/radio/headset/solgov/captain
back = /obj/item/storage/backpack/satchel/leather
@@ -35,7 +37,9 @@
suit_store = null
mask = null
glasses = null
-
l_hand = null
- backpack_contents = list(/obj/item/stamp/solgov=1)
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/folder/solgov, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm
index c37dab5000910..8dd260c51af41 100644
--- a/code/modules/clothing/outfits/ert/syndicate_ert.dm
+++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm
@@ -1,114 +1,186 @@
+// unaligned. they're basically stand-ins
+
/datum/outfit/job/syndicate/ert
name = "ERT - Syndicate Basic"
jobtype = /datum/job/officer
job_icon = "securityofficer"
+ wallet = null
+
+ uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/armor/vest/syndie
- suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+ suit_store = /obj/item/gun/ballistic/automatic/assault/hydra
shoes = /obj/item/clothing/shoes/combat
- ears = /obj/item/radio/headset/syndicate/alt
+ ears = /obj/item/radio/headset/headset_sec/alt
gloves = /obj/item/clothing/gloves/color/black
id = /obj/item/card/id/syndicate_command/crew_id
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
- head = /obj/item/clothing/head/helmet/operator
- back = /obj/item/storage/backpack/security
- belt = /obj/item/storage/belt/military/c20r
+ mask = /obj/item/clothing/mask/balaclava
+ head = /obj/item/clothing/head/helmet/syndie
+ belt = /obj/item/storage/belt/military/hydra
+ glasses = /obj/item/clothing/glasses/hud/security
r_pocket = /obj/item/melee/knife/combat
l_pocket = /obj/item/grenade/frag
implants = list(/obj/item/implant/weapons_auth)
- backpack_contents = list(/obj/item/radio=1)
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/ringneck=1, /obj/item/ammo_box/magazine/m10mm_ringneck=2)
/datum/outfit/job/syndicate/ert/leader
name = "ERT - Syndicate Basic Leader"
job_icon = "lieutenant"
head = /obj/item/clothing/head/HoS/beret/syndicate
+ mask = /obj/item/clothing/mask/balaclava/combat
+ ears = /obj/item/radio/headset/syndicate/alt/leader
+
+// inspector
+
+/datum/outfit/job/syndicate/ert/inspector
+ name = "ERT - ACLF Inspector"
+ id_assignment = "Inspector"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "syndicate"
+
+ uniform = /obj/item/clothing/under/syndicate
+ head = /obj/item/clothing/head/HoS/beret/syndicate
+ mask = null
+ belt = /obj/item/clipboard
+ back = /obj/item/storage/backpack/satchel/leather
ears = /obj/item/radio/headset/syndicate/captain
+ shoes = /obj/item/clothing/shoes/laceup
+ gloves = /obj/item/clothing/gloves/color/white
+ suit = /obj/item/clothing/suit/armor/hos
+ suit_store = null
- backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/ringneck=1, /obj/item/ammo_box/magazine/m10mm_ringneck=2, /obj/item/radio=1)
+ backpack = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/satchel/sec
+ satchel = /obj/item/storage/backpack/satchel/sec
+ courierbag = /obj/item/storage/backpack/satchel/sec
-// gorlex loyalist/2nd battlegroup
+ l_pocket = /obj/item/pen/fourcolor
+ r_pocket = /obj/item/taperecorder
-/datum/outfit/job/syndicate/ert/gorlex
- name = "ERT - New Gorlex Republic Trooper"
+ backpack_contents = list(/obj/item/stamp/syndicate, /obj/item/paper_bin, /obj/item/folder/syndicate, /obj/item/tape)
- head = /obj/item/clothing/head/helmet/swat
- uniform = /obj/item/clothing/under/syndicate/combat
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- belt = /obj/item/storage/belt/military/assault/m90
- back = /obj/item/storage/backpack/security
- suit_store = /obj/item/gun/ballistic/automatic/assault/hydra
+// new gorlex republic
-/datum/outfit/job/syndicate/ert/gorlex/pointman
- name = "ERT - New Gorlex Republic Pointman"
+/datum/outfit/job/syndicate/ert/ngr
+ name = "ERT - New Gorlex Republic Serviceman"
+ id_assignment = "Serviceman"
+
+ head = /obj/item/clothing/head/helmet/ngr
+ mask = /obj/item/clothing/mask/balaclava/ngr
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/syndicate/ngr
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/ngr
+ suit = /obj/item/clothing/suit/armor/ngr
+ belt = /obj/item/storage/belt/security/webbing/ngr/cobra
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
- suit_store = /obj/item/gun/ballistic/shotgun/automatic/bulldog
- belt = /obj/item/storage/belt/security/webbing/bulldog
+/datum/outfit/job/syndicate/ert/ngr/grenadier
+ name = "ERT - New Gorlex Republic Grenadier"
-/datum/outfit/job/syndicate/ert/gorlex/medic
- name = "ERT - New Gorlex Republic Medic"
+ belt = /obj/item/storage/belt/security/webbing/ngr/hydra_grenadier
+ suit_store = /obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl
+
+ backpack_contents = list(/obj/item/grenade/c4 = 3)
+
+/datum/outfit/job/syndicate/ert/ngr/medic
+ name = "ERT - New Gorlex Republic Field Medic"
jobtype = /datum/job/paramedic
job_icon = "paramedic"
+ id_assignment = "Field Medic"
- head = /obj/item/clothing/head/soft/black
- mask = null
- suit = /obj/item/clothing/suit/armor/vest/alt
+ head = /obj/item/clothing/head/ngr/surgical
+ mask = /obj/item/clothing/mask/breath/ngr
belt = /obj/item/storage/belt/medical/webbing/paramedic
- glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+ glasses = /obj/item/clothing/glasses/hud/health
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
- suit_store = /obj/item/gun/ballistic/automatic/pistol/ringneck
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/asp
l_pocket = /obj/item/radio
- backpack_contents = list(/obj/item/ammo_box/magazine/m10mm_ringneck=2, /obj/item/storage/firstaid/medical=1, /obj/item/defibrillator/compact/combat/loaded=1)
+ backpack_contents = list(/obj/item/ammo_box/magazine/m57_39_asp = 2, /obj/item/storage/firstaid/medical=1, /obj/item/defibrillator/compact/combat/loaded=1)
-/datum/outfit/job/syndicate/ert/gorlex/sniper
- name = "ERT - New Gorlex Republic Sniper"
+/datum/outfit/job/syndicate/ert/ngr/sniper
+ name = "ERT - New Gorlex Republic Marksman"
head = /obj/item/clothing/head/beret/black
- back = /obj/item/storage/backpack/messenger/sec
- glasses = /obj/item/clothing/glasses/night
+ neck = /obj/item/clothing/neck/shemagh/ngr
gloves = /obj/item/clothing/gloves/fingerless
- suit = /obj/item/clothing/suit/armor/vest
- belt = /obj/item/storage/belt/security
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ belt = /obj/item/storage/belt/military/assault/sniper
suit_store = /obj/item/gun/ballistic/automatic/marksman/taipan
r_pocket = /obj/item/melee/knife/survival
l_pocket = /obj/item/binoculars
- backpack_contents = list(/obj/item/ammo_box/magazine/sniper_rounds=2, /obj/item/radio=1)
+ backpack = /obj/item/storage/backpack/messenger/sec
+ duffelbag = /obj/item/storage/backpack/messenger/sec
+ satchel = /obj/item/storage/backpack/messenger/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
-/datum/outfit/job/syndicate/ert/gorlex/leader
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/asp, /obj/item/ammo_box/magazine/m57_39_asp = 2)
+
+/datum/outfit/job/syndicate/ert/ngr/leader
name = "ERT - New Gorlex Republic Sergeant"
job_icon = "lieutenant"
- uniform = /obj/item/clothing/under/syndicate/gorlex
- head = /obj/item/clothing/head/HoS/beret/syndicate
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
+ neck = /obj/item/clothing/mask/whistle/trench // funny
+ head = /obj/item/clothing/head/ngr/peaked
back = /obj/item/storage/backpack/satchel/sec
- mask = /obj/item/clothing/mask/gas/sechailer
- glasses = /obj/item/clothing/glasses/hud/security/night
gloves = /obj/item/clothing/gloves/tackler/combat
+ belt = /obj/item/storage/belt/security/webbing/ngr/cobra
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
l_pocket = /obj/item/megaphone/sec
-// commandos
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/asp, /obj/item/ammo_box/magazine/m57_39_asp = 2, /obj/item/grenade/smokebomb)
+
+/datum/outfit/job/syndicate/ert/ngr/inspector
+ name = "ERT - New Gorlex Republic Official"
+ id_assignment = "Official"
+ job_icon = "syndicate"
+
+ head = /obj/item/clothing/head/ngr
+ ears = /obj/item/radio/headset/syndicate/captain
+ gloves = /obj/item/clothing/gloves/color/white
+ mask = null
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
+ glasses = null
+ suit = /obj/item/clothing/suit/armor/ngr/lieutenant
+ belt = /obj/item/clipboard
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit_store = null
+
+ backpack = /obj/item/storage/backpack/satchel/leather
+ duffelbag = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ courierbag = /obj/item/storage/backpack/satchel/leather
+
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/folder/red, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
+
+// cybersun
/datum/outfit/job/syndicate/ert/cybersun
name = "ERT - Syndicate Cybersun Commando"
job_icon = "syndicate"
head = null
- uniform = /obj/item/clothing/under/syndicate/combat
- belt = /obj/item/storage/belt/military/c20r
+ mask = /obj/item/clothing/mask/breath
+ uniform = /obj/item/clothing/under/syndicate/cybersun
+ belt = /obj/item/storage/belt/military/boomslang
suit = /obj/item/clothing/suit/space/hardsuit/syndi/cybersun
- suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+ suit_store = /obj/item/gun/ballistic/automatic/marksman/boomslang
ears = /obj/item/radio/headset/syndicate/alt
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/hardliners
implants = list(/obj/item/implant/adrenalin)
- backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm, /obj/item/radio=1)
+ backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm, /obj/item/grenade/smokebomb)
/datum/outfit/job/syndicate/ert/cybersun/leader
name = "ERT - Syndicate Cybersun Commando Leader"
@@ -116,15 +188,36 @@
ears = /obj/item/radio/headset/syndicate/alt/captain
glasses = /obj/item/clothing/glasses/hud/security/night
- backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm=1, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1, /obj/item/radio=1)
+ backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm=1, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1, /obj/item/grenade/smokebomb)
-// paramedics
+/datum/outfit/job/syndicate/ert/cybersun/inspector
+ name = "ERT - Syndicate Cybersun Representative"
+
+ uniform = /obj/item/clothing/under/syndicate/cybersun/officer
+ head = /obj/item/clothing/head/HoS/cybersun
+ shoes = /obj/item/clothing/shoes/laceup
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ suit = null
+ suit_store = null
+ belt = /obj/item/clipboard
+ glasses = null
+ mask = null
+ ears = /obj/item/radio/headset/syndicate
+
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/stamp/cybersun, /obj/item/folder/red, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
+
+// cybersun paramedics
/datum/outfit/job/syndicate/ert/cybersun/medic
name = "ERT - Syndicate Cybersun Paramedic"
job_icon = "paramedic"
+ jobtype = /datum/job/paramedic
uniform = /obj/item/clothing/under/syndicate/medic
+ accessory = /obj/item/clothing/accessory/holster/marine
suit = /obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed
suit_store = /obj/item/tank/internals/oxygen
mask = /obj/item/clothing/mask/breath/medical
@@ -135,13 +228,9 @@
back = /obj/item/storage/backpack/ert/medical
l_pocket = /obj/item/melee/knife/survival
r_pocket = /obj/item/pinpointer/crew
- accessory = /obj/item/clothing/accessory/holster/marine
backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/radio=1)
- jobtype = /datum/job/paramedic
- job_icon = "paramedic"
-
/datum/outfit/job/syndicate/ert/cybersun/medic/leader
name = "ERT - Syndicate Cybersun Lead Paramedic"
id_assignment = "Lead Paramedic"
@@ -154,25 +243,89 @@
backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/autosurgeon/cmo=1, /obj/item/radio=1, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1)
-// inspector
-/datum/outfit/job/syndicate/ert/inspector
- name = "ERT - Inspector (Syndicate)"
- id_assignment = "Inspector"
- jobtype = /datum/job/head_of_personnel
- job_icon = "syndicate"
+// hardliners
- uniform = /obj/item/clothing/under/syndicate/ngr/officer
- head = /obj/item/clothing/head/HoS/beret/syndicate
- mask = null
- belt = /obj/item/clipboard
- back = /obj/item/storage/backpack/satchel/leather
- ears = /obj/item/radio/headset/syndicate/captain
- shoes = /obj/item/clothing/shoes/laceup
- gloves = /obj/item/clothing/gloves/color/white
- suit = /obj/item/clothing/suit/armor/hos
- l_pocket = null
- r_pocket = null
- suit_store = null
+/datum/outfit/job/syndicate/ert/hardliner
+ name = "ERT - Syndicate Hardliner Mercenary"
+
+ uniform = /obj/item/clothing/under/syndicate/hardliners
+ suit = /obj/item/clothing/suit/armor/hardliners
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/hardliners
+ suit_store = /obj/item/gun/ballistic/automatic/smg/sidewinder
+ belt = /obj/item/storage/belt/security/webbing/hardliners/sidewinder
+ gloves = /obj/item/clothing/gloves/color/black
+ mask = /obj/item/clothing/mask/balaclava/combat
+ head = /obj/item/clothing/head/helmet/hardliners
+
+/datum/outfit/job/syndicate/ert/hardliner/engineer
+ name = "ERT - Syndicate Hardliner Mechanic"
+
+ head = /obj/item/clothing/head/hardhat/hardliners
+ belt = /obj/item/storage/belt/utility/full
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m45_cobra = 2)
+
+/datum/outfit/job/syndicate/ert/hardliner/medic
+ name = "ERT - Syndicate Hardliner Medic"
+
+ head = /obj/item/clothing/head/hardliners
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+
+/datum/outfit/job/syndicate/ert/hardliner/leader
+ name = "ERT - Syndicate Hardliner Sergeant"
+
+ uniform = /obj/item/clothing/under/syndicate/hardliners/officer
+ suit = /obj/item/clothing/suit/armor/hardliners/sergeant
+ head = /obj/item/clothing/head/hardliners/peaked
+
+// ramzi clique
+
+/datum/outfit/job/syndicate/ert/ramzi
+ name = "ERT - Ramzi Clique Cell Rifleman"
+
+ head = null
+ mask = /obj/item/clothing/mask/gas/syndicate
+ uniform = /obj/item/clothing/under/syndicate
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+ belt = /obj/item/storage/belt/military/cobra
+ glasses = /obj/item/clothing/glasses/thermal
+ gloves = /obj/item/clothing/gloves/combat
+ id = null // no identification for you
+
+ l_pocket = /obj/item/tank/internals/emergency_oxygen/double
+
+ implants = list(/obj/item/implant/explosive)
+ backpack_contents = list(/obj/item/grenade/frag = 3, /obj/item/grenade/smokebomb = 3)
+
+/datum/outfit/job/syndicate/ert/ramzi/demolitionist
+ name = "ERT - Ramzi Clique Cell Demolitionist"
+
+ belt = /obj/item/storage/belt/military/mako
+ suit_store = /obj/item/gun/ballistic/rocketlauncher/mako
+ glasses = /obj/item/clothing/glasses/meson/night
+
+ r_pocket = /obj/item/gun/ballistic/automatic/pistol/himehabu
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m22lr_himehabu = 2, /obj/item/grenade/c4/x4 = 3, /obj/item/grenade/syndieminibomb = 3, /obj/item/ammo_casing/caseless/rocket/a70mm = 4)
+
+/datum/outfit/job/syndicate/ert/ramzi/medic
+ name = "ERT - Ramzi Clique Cell Medic"
+
+ belt = /obj/item/storage/belt/medical/webbing/combat
+ glasses = /obj/item/clothing/glasses/hud/health/night
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m45_cobra = 3, /obj/item/defibrillator/compact/combat/loaded, /obj/item/reagent_containers/hypospray/combat)
+
+/datum/outfit/job/syndicate/ert/ramzi/leader
+ name = "ERT - Ramzi Clique Cell Leader"
+
+ uniform = /obj/item/clothing/under/syndicate/gorlex
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated // funny
+
+ belt = /obj/item/storage/belt/security/webbing/bulldog_mixed
+ suit_store = /obj/item/gun/ballistic/shotgun/automatic/bulldog/drum
- backpack_contents = list(/obj/item/stamp/syndicate)
+ backpack_contents = list(/obj/item/grenade/smokebomb = 4, /obj/item/grenade/stingbang = 2, /obj/item/grenade/empgrenade = 2)
diff --git a/code/modules/clothing/outfits/factions/frontiersmen.dm b/code/modules/clothing/outfits/factions/frontiersmen.dm
index 997eec2209d42..b9e350da7a3cd 100644
--- a/code/modules/clothing/outfits/factions/frontiersmen.dm
+++ b/code/modules/clothing/outfits/factions/frontiersmen.dm
@@ -145,7 +145,7 @@
accessory = /obj/item/clothing/accessory/armband
uniform = /obj/item/clothing/under/frontiersmen/officer
head = /obj/item/clothing/head/beret/sec/frontier/officer
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
+ suit = /obj/item/clothing/suit/armor/vest/frontier
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/combat
backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/melee/baton/loaded=1)
diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm
index df7a5145e47fb..efadbece4bab4 100644
--- a/code/modules/clothing/outfits/factions/gezena.dm
+++ b/code/modules/clothing/outfits/factions/gezena.dm
@@ -22,7 +22,7 @@
/datum/outfit/job/gezena/assistant/bridge
name = "PGF - Bridge Crew"
- id_assignment = "Bridge Crew"
+ id_assignment = "Helmsman"
jobtype = /datum/job/head_of_personnel
/datum/outfit/job/gezena/engineer
@@ -71,6 +71,15 @@
courierbag = /obj/item/storage/backpack/messenger/sec
box = /obj/item/storage/box/survival/security
+/datum/outfit/job/gezena/security/sapper
+ name = "PGF - Marine Pioneer"
+ id_assignment = "Marine Pioneer"
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
/datum/outfit/job/gezena/hos
name = "PGF - Marine Sergeant"
id_assignment = "Sergeant"
diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm
index ba883d59f4dd9..7b82368f14da6 100644
--- a/code/modules/clothing/outfits/factions/independent.dm
+++ b/code/modules/clothing/outfits/factions/independent.dm
@@ -30,7 +30,7 @@
..()
if(visualsOnly)
return
- var/obj/item/card/id/W = H.wear_id
+ var/obj/item/card/id/W = H.get_idcard()
W.access += list(ACCESS_KITCHEN)
/datum/outfit/job/independent/assistant/fancy
@@ -107,6 +107,22 @@
gloves = /obj/item/clothing/gloves/color/white //poverty gloves
shoes = /obj/item/clothing/shoes/sneakers/brown
+/datum/outfit/job/independent/captain/merc
+ name = "Independent - Captain (Mercenary)"
+
+ uniform = /obj/item/clothing/under/syndicate
+ head = /obj/item/clothing/head/beret
+ gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/combat
+ suit = /obj/item/clothing/suit/armor/vest
+
+ accessory = null
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+
/datum/outfit/job/independent/captain/western
name = "Independent - Captain (Western)"
head = /obj/item/clothing/head/caphat/cowboy
@@ -231,6 +247,20 @@
chameleon_extras = list(/obj/item/gun/energy/e_gun/hos, /obj/item/stamp/hos)
+/datum/outfit/job/independent/hos/merc
+ name = "Independent - Mercenary XO"
+ id_assignment = "Lieutenant"
+
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/syndicate
+ shoes = /obj/item/clothing/shoes/combat
+ suit = /obj/item/clothing/suit/armor/vest
+ alt_suit = null
+ gloves = /obj/item/clothing/gloves/combat
+ head = /obj/item/clothing/head/beret
+ glasses = null
+ l_pocket = null
+
// Roboticist
/datum/outfit/job/independent/roboticist
@@ -275,6 +305,13 @@
chameleon_extras = list(/obj/item/gun/energy/disabler, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/head/helmet)
//The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state
+/datum/outfit/job/independent/security/disarmed //No armor, no pocket handcuffs.
+ name = "Independent - Security Officer (Disarmed)"
+ head = null
+ suit = null
+ l_pocket = null
+
+
/datum/outfit/job/independent/security/western
name = "Independent - Security Officer (Western)"
@@ -282,6 +319,17 @@
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/cowboy/sec
+/datum/outfit/job/independent/security/merc
+ name = "Independent - Security Officer (Mercenary)"
+ id_assignment = "Trooper"
+
+ uniform = /obj/item/clothing/under/syndicate/camo
+ gloves = /obj/item/clothing/gloves/fingerless
+ head = null
+ suit = null
+ dcoat = null
+
+
/datum/outfit/job/independent/security/pirate
name = "Independent - Security Officer (Pirate)"
@@ -378,7 +426,7 @@
courierbag = /obj/item/storage/backpack/messenger/sec
box = /obj/item/storage/box/survival/security
- chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+ chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/m11
// Chief Engineer
@@ -441,7 +489,7 @@
job_icon = "cargotechnician"
ears = /obj/item/radio/headset/headset_cargo
- uniform = /obj/item/clothing/under/color/khaki
+ uniform = /obj/item/clothing/under/color/lightbrown
dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
@@ -534,28 +582,26 @@
job_icon = "quartermaster"
ears = /obj/item/radio/headset/headset_cargo
- uniform = /obj/item/clothing/under/rank/cargo/qm
+ uniform = /obj/item/clothing/under/rank/security/detective
+ head = /obj/item/clothing/head/hardhat/white
dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
- shoes = /obj/item/clothing/shoes/sneakers/brown
+ suit = /obj/item/clothing/suit/hazardvest
+ shoes = /obj/item/clothing/shoes/workboots
glasses = /obj/item/clothing/glasses/sunglasses
r_pocket = /obj/item/clipboard
backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
chameleon_extras = /obj/item/stamp/qm
/datum/outfit/job/independent/quartermaster/western
name = "Independent - Quartermaster (Western)"
- uniform = /obj/item/clothing/under/rank/security/detective
- suit = /obj/item/clothing/suit/hazardvest
- shoes = /obj/item/clothing/shoes/workboots
+ suit = /obj/item/clothing/suit/jacket/leather/duster
gloves = /obj/item/clothing/gloves/fingerless
- glasses = /obj/item/clothing/glasses/sunglasses
head = /obj/item/clothing/head/cowboy/sec
- backpack = /obj/item/storage/backpack/industrial
- satchel = /obj/item/storage/backpack/satchel/eng
-
/datum/outfit/job/independent/miner
name = "Independent - Miner"
jobtype = /datum/job/mining
diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm
index 16d1456361be5..95307aded9f99 100644
--- a/code/modules/clothing/outfits/factions/inteq.dm
+++ b/code/modules/clothing/outfits/factions/inteq.dm
@@ -3,7 +3,7 @@
faction_icon = "bg_inteq"
uniform = /obj/item/clothing/under/syndicate/inteq
- box = /obj/item/storage/box/survival
+ box = /obj/item/storage/box/survival/inteq
backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
@@ -24,6 +24,7 @@
jobtype = /datum/job/assistant
job_icon = "assistant"
+ ears = /obj/item/radio/headset
r_pocket = /obj/item/radio
///captains
@@ -37,7 +38,7 @@
id = /obj/item/card/id/gold
head = /obj/item/clothing/head/beret/sec/hos/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
suit = /obj/item/clothing/suit/armor/hos/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
belt = /obj/item/storage/belt/security/webbing/inteq
@@ -88,7 +89,7 @@
ears = /obj/item/radio/headset/inteq
uniform = /obj/item/clothing/under/syndicate/inteq/artificer
head = /obj/item/clothing/head/hardhat/white
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/color/yellow
@@ -135,10 +136,11 @@
jobtype = /datum/job/officer
job_icon = "securityofficer"
+ ears = /obj/item/radio/headset/alt
head = /obj/item/clothing/head/helmet/inteq
suit = /obj/item/clothing/suit/armor/vest/alt
belt = /obj/item/storage/belt/security/webbing/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
@@ -181,6 +183,7 @@
job_icon = "stationengineer"
jobtype = /datum/job/engineer
+ ears = /obj/item/radio/headset/alt
uniform = /obj/item/clothing/under/syndicate/inteq/artificer
head = /obj/item/clothing/head/soft/inteq
shoes = /obj/item/clothing/shoes/combat
@@ -199,7 +202,7 @@
head = /obj/item/clothing/head/warden/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ mask = /obj/item/clothing/mask/balaclava/inteq
belt = /obj/item/storage/belt/military/assault
suit = /obj/item/clothing/suit/armor/vest/security/warden/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
@@ -232,7 +235,6 @@
belt = /obj/item/storage/belt/medical/webbing/paramedic
ears = /obj/item/radio/headset/inteq/captain
uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
- alt_uniform = /obj/item/clothing/under/syndicate/inteq/skirt/corpsman
shoes = /obj/item/clothing/shoes/combat
suit = /obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt
alt_suit = /obj/item/clothing/suit/armor/inteq/corpsman
diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm
index 2301855c68092..3f99cc85087f8 100644
--- a/code/modules/clothing/outfits/factions/minutemen.dm
+++ b/code/modules/clothing/outfits/factions/minutemen.dm
@@ -3,7 +3,6 @@
/datum/outfit/job/clip
name = "CLIP - Base Outfit"
- jobtype = /datum/job/assistant
uniform = /obj/item/clothing/under/clip
alt_uniform = null
@@ -120,7 +119,7 @@
suit = /obj/item/clothing/suit/toggle/lawyer/clip/fo
alt_suit = null
- shoes = /obj/item/clothing/shoes/combat
+ shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/clip/slouch/officer
backpack = /obj/item/storage/backpack/captain
@@ -223,6 +222,8 @@
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/color/black
+ l_hand = /obj/item/storage/briefcase
+
backpack = /obj/item/storage/backpack/satchel/leather
satchel = /obj/item/storage/backpack/satchel/leather
@@ -233,6 +234,16 @@
/obj/item/detective_scanner=1,\
/obj/item/melee/classic_baton=1)
+/datum/outfit/job/clip/investigator/cm5
+ name = "CLIP GOLD - Investigator (CM-5c)"
+
+ backpack_contents = list(/obj/item/storage/box/evidence=1,\
+ /obj/item/detective_scanner=1,\
+ /obj/item/melee/classic_baton=1,\
+ /obj/item/ammo_box/magazine/cm5_9mm = 2, \
+ /obj/item/gun/ballistic/automatic/smg/cm5/compact
+ )
+
/datum/outfit/job/clip/bureaucrat
name = "CLIP GOLD - Bureaucrat"
job_icon = "scribe"
@@ -273,7 +284,7 @@
backpack = /obj/item/storage/backpack/security/clip
satchel = /obj/item/storage/backpack/satchel/sec/clip
duffelbag = /obj/item/storage/backpack/duffelbag
- courierbag = /obj/item/storage/backpack/messenger
+ courierbag = /obj/item/storage/backpack/satchel/sec/clip
box = /obj/item/storage/box/survival/clip/balaclava
@@ -298,17 +309,12 @@
ears = /obj/item/radio/headset/clip/alt/captain
uniform = /obj/item/clothing/under/clip/officer
alt_uniform = null
- suit = /obj/item/clothing/suit/armor/clip_capcoat
alt_suit = null
+ suit = /obj/item/clothing/suit/armor/clip_capcoat
dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
- shoes = /obj/item/clothing/shoes/combat
+ shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/clip/slouch/officer
- backpack = /obj/item/storage/backpack/captain
- satchel = /obj/item/storage/backpack/satchel/cap
- duffelbag = /obj/item/storage/backpack/duffelbag/captain
- courierbag = /obj/item/storage/backpack/messenger/com
-
backpack_contents = list(/obj/item/storage/box/ids=1,
/obj/item/melee/classic_baton/telescopic=1,
/obj/item/modular_computer/tablet/preset/advanced = 1)
@@ -365,14 +371,9 @@
ears = /obj/item/radio/headset/clip/alt
uniform = /obj/item/clothing/under/clip/formal
alt_uniform = null
- suit = /obj/item/clothing/suit/toggle/lawyer/clip
alt_suit = null
- shoes = /obj/item/clothing/shoes/combat
-
- backpack = /obj/item/storage/backpack/captain
- satchel = /obj/item/storage/backpack/satchel/cap
- duffelbag = /obj/item/storage/backpack/duffelbag/captain
- courierbag = /obj/item/storage/backpack/messenger/com
+ suit = /obj/item/clothing/suit/toggle/lawyer/clip
+ shoes = /obj/item/clothing/shoes/jackboots
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1)
@@ -382,17 +383,9 @@
job_icon = "clip_navy2"
jobtype = /datum/job/doctor
- l_hand = /obj/item/storage/firstaid/medical
-
- backpack = /obj/item/storage/backpack/security/clip
- satchel = /obj/item/storage/backpack/satchel/sec/clip
- duffelbag = /obj/item/storage/backpack/duffelbag
- courierbag = /obj/item/storage/backpack/messenger
-
uniform = /obj/item/clothing/under/clip/medic
shoes = /obj/item/clothing/shoes/sneakers/white
head = /obj/item/clothing/head/clip/corpsman
- gloves = /obj/item/clothing/gloves/color/latex/nitrile/clip
suit = null
suit_store = null
@@ -513,7 +506,7 @@
job_icon = "clip_cmm2"
ears = /obj/item/radio/headset/alt
box = /obj/item/storage/box/survival/clip/balaclava
- shoes = null
+ shoes = /obj/item/clothing/shoes/combat // shoos
backpack = /obj/item/storage/backpack/security/clip
satchel = /obj/item/storage/backpack/satchel/sec/clip
@@ -552,6 +545,11 @@
backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chicken_wings_hot_sauce=1)
+/datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
+ name = "CLIP Minutemen - Minuteman (Spotter Hardsuit)"
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/clip_spotter
+
/datum/outfit/job/clip/minutemen/grunt/dressed/armed
name = "CLIP Minutemen - Minuteman (Armed - CM-82)"
@@ -619,7 +617,7 @@
belt = /obj/item/storage/belt/military/clip/gunner
suit_store = /obj/item/gun/ballistic/automatic/hmg/cm40
- backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1)
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/shredded_beef=1)
///lead, i guess you could reuse this for "Brig Officer"
@@ -635,7 +633,7 @@
head = /obj/item/clothing/head/clip/slouch
suit = /obj/item/clothing/suit/armor/vest/bulletproof
belt = /obj/item/storage/belt/military/clip
- shoes = /obj/item/clothing/shoes/combat
+ shoes = /obj/item/clothing/shoes/jackboots
l_pocket = /obj/item/flashlight/seclite
r_pocket = /obj/item/tank/internals/emergency_oxygen/double
@@ -648,7 +646,7 @@
suit_store = /obj/item/gun/ballistic/automatic/assault/cm82
belt = /obj/item/storage/belt/military/clip/cm82
//replace commander with the cm23 when its impemented, see the cm-f4 above
- backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1, /obj/item/gun/ballistic/automatic/pistol/commander=1)
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/shredded_beef=1, /obj/item/gun/ballistic/automatic/pistol/commander=1)
/datum/outfit/job/clip/minutemen/grunt/commander
name = "CLIP Minutemen - Field Commander"
@@ -662,7 +660,7 @@
head = /obj/item/clothing/head/clip/slouch/officer
suit = /obj/item/clothing/suit/toggle/lawyer/clip
- shoes = /obj/item/clothing/shoes/combat
+ shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/sunglasses
/datum/outfit/job/clip/minutemen/grunt/major
@@ -677,6 +675,6 @@
head = /obj/item/clothing/head/clip/slouch/officer
suit = /obj/item/clothing/suit/armor/clip_trenchcoat
- shoes = /obj/item/clothing/shoes/combat
+ shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/sunglasses
diff --git a/code/modules/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm
index 3c9e379e74dba..3d0a75fd2525a 100644
--- a/code/modules/clothing/outfits/factions/nanotrasen.dm
+++ b/code/modules/clothing/outfits/factions/nanotrasen.dm
@@ -188,7 +188,7 @@
courierbag = /obj/item/storage/backpack/messenger/sec
box = /obj/item/storage/box/survival/security
- chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+ chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/m11
// Engineering //
@@ -328,6 +328,12 @@
chameleon_extras = /obj/item/gun/energy/kinetic_accelerator
+/datum/outfit/job/nanotrasen/miner/no_equipment
+ name = "Nanotrasen - Miner (No Equipment)"
+
+ r_pocket = null
+ backpack_contents = null
+
// Cargo Tech
/datum/outfit/job/nanotrasen/cargo_tech
name = "Nanotrasen - Cargo Tech"
diff --git a/code/modules/clothing/outfits/factions/roumain.dm b/code/modules/clothing/outfits/factions/roumain.dm
index fe31fddd90411..e7cc57a33a969 100644
--- a/code/modules/clothing/outfits/factions/roumain.dm
+++ b/code/modules/clothing/outfits/factions/roumain.dm
@@ -84,7 +84,7 @@
name = "Saint-Roumain Militia - Hunter"
id_assignment = "Hunter"
jobtype = /datum/job/officer
- job_icon = "hsrm_hunter"
+ job_icon = "srm_hunter"
uniform = /obj/item/clothing/under/suit/roumain
alt_uniform = null
diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm
index 1d91a94b766d2..af3bc97ac2e96 100644
--- a/code/modules/clothing/outfits/factions/syndicate.dm
+++ b/code/modules/clothing/outfits/factions/syndicate.dm
@@ -40,18 +40,13 @@
alt_uniform = null
shoes = /obj/item/clothing/shoes/jackboots
- gloves = /obj/item/clothing/gloves/color/black
+ gloves = null
ears = /obj/item/radio/headset
back = /obj/item/storage/backpack
id = /obj/item/card/id/syndicate_command/crew_id
r_pocket = /obj/item/radio
- backpack = /obj/item/storage/backpack/security
- satchel = /obj/item/storage/backpack/satchel/sec
- duffelbag = /obj/item/storage/backpack/duffelbag/syndie
- courierbag = /obj/item/storage/backpack/messenger/sec
-
box = /obj/item/storage/box/survival
/datum/outfit/job/syndicate/assistant/gorlex
@@ -521,6 +516,20 @@
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
+/datum/outfit/job/syndicate/head_of_personnel/ngr
+ name = "Syndicate - Ensign (NGR)"
+ id_assignment = "Ensign"
+
+ ears = /obj/item/radio/headset/syndicate
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
+ head = /obj/item/clothing/head/ngr
+ suit = /obj/item/clothing/suit/armor/ngr/lieutenant
+ id = /obj/item/card/id/syndicate_command/crew_id
+ shoes = /obj/item/clothing/shoes/combat
+ glasses = null
+ gloves = null
+
+
/datum/outfit/job/syndicate/head_of_personnel/cybersun
name = "Syndicate - Intelligence Officer (Cybersun)"
id_assignment = "Intelligence Officer"
@@ -594,7 +603,8 @@
suit = /obj/item/clothing/suit/armor/ngr/lieutenant
id = /obj/item/card/id/syndicate_command/crew_id
shoes = /obj/item/clothing/shoes/combat
- suit_store = /obj/item/gun/ballistic/automatic/pistol/ringneck
+ suit_store = null
+ gloves = /obj/item/clothing/gloves/color/black
/datum/outfit/job/syndicate/hos/twink
@@ -676,10 +686,12 @@
uniform = /obj/item/clothing/under/syndicate
id = /obj/item/card/id/syndicate_command/crew_id
shoes = /obj/item/clothing/shoes/jackboots
- shoes = /obj/item/clothing/shoes/sneakers/white
alt_suit = /obj/item/clothing/suit/apron/surgical
- l_hand = /obj/item/storage/firstaid/medical
box = /obj/item/storage/box/survival/medical
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/syndie/med
+ courierbag = /obj/item/storage/backpack/messenger/med
/datum/outfit/job/syndicate/doctor/suns
name = "Syndicate - Medical Doctor (SUNS)"
@@ -712,9 +724,9 @@
suit = /obj/item/clothing/suit/hardliners
glasses = /obj/item/clothing/glasses/hud/health
r_pocket = /obj/item/melee/knife/survival
- back = /obj/item/storage/backpack/duffelbag/syndie/med
id = /obj/item/card/id/syndicate_command/crew_id
backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,)
+ shoes = /obj/item/clothing/shoes/combat
/datum/outfit/job/syndicate/doctor/ngr
name = "Syndicate - Medical Doctor (New Gorlex Republic)"
@@ -724,9 +736,8 @@
suit = /obj/item/clothing/suit/ngr/smock
glasses = /obj/item/clothing/glasses/hud/health
r_pocket = /obj/item/melee/knife/survival
- back = /obj/item/storage/backpack/duffelbag/syndie/med
id = /obj/item/card/id/syndicate_command/crew_id
- backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,)
+ shoes = /obj/item/clothing/shoes/combat
//paramedics
@@ -910,10 +921,6 @@
l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/assembly/flash/handheld
- backpack_contents = list(
- /obj/item/melee/baton/loaded=1,
- )
-
box = /obj/item/storage/box/survival/security
@@ -1016,14 +1023,13 @@
shoes = /obj/item/clothing/shoes/workboots/mining
gloves = /obj/item/clothing/gloves/explorer
uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland
- l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival
r_pocket = /obj/item/storage/bag/ore
backpack_contents = list(
- /obj/item/flashlight/seclite=1,\
- /obj/item/melee/knife/survival=1,\
- /obj/item/mining_voucher=1,\
- /obj/item/stack/marker_beacon/ten=1)
-
+ /obj/item/flashlight/seclite=1,
+ /obj/item/melee/knife/survival=1,
+ /obj/item/stack/marker_beacon/ten=1,
+ /obj/item/radio/weather_monitor=1,
+ )
box = /obj/item/storage/box/survival/mining
/datum/outfit/job/syndicate/miner/gorlex
@@ -1117,6 +1123,11 @@
head = /obj/item/clothing/head/hardhat/dblue
r_pocket = /obj/item/t_scanner
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
box = /obj/item/storage/box/survival/engineer
pda_slot = ITEM_SLOT_LPOCKET
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 108475c982b97..3687ff2c166f6 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -1,13 +1,3 @@
-/datum/outfit/centcom
- name = "CentCom Base"
-
-/datum/outfit/centcom/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)//hmm lets have centcom officials become revs
- L.implant(H, null, 1)
-
/datum/outfit/laser_tag
name = "Laser Tag Red"
@@ -59,7 +49,7 @@
var/obj/item/radio/R = H.ears
if(R)
- R.set_frequency(FREQ_SYNDICATE)
+ R.set_frequency(FREQ_PIRATE)
R.freqlock = TRUE
var/obj/item/card/id/W = H.wear_id
@@ -67,35 +57,6 @@
W.registered_name = H.real_name
W.update_label()
-/datum/outfit/centcom/commander
- name = "CentCom Commander"
-
- uniform = /obj/item/clothing/under/rank/centcom/commander
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- ears = /obj/item/radio/headset/headset_cent/commander
- glasses = /obj/item/clothing/glasses/eyepatch
- mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
- head = /obj/item/clothing/head/centcom_cap
- belt = /obj/item/gun/ballistic/revolver/mateba
- r_pocket = /obj/item/lighter
- l_pocket = /obj/item/ammo_box/a357
- back = /obj/item/storage/backpack/satchel/leather
- id = /obj/item/card/id/centcom
-
-/datum/outfit/centcom/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_all_accesses()
- W.access += get_centcom_access("CentCom Commander")
- W.assignment = "CentCom Commander"
- W.registered_name = H.real_name
- W.update_label()
- ..()
-
/datum/outfit/wizard
name = "Blue Wizard"
@@ -127,51 +88,6 @@
mask = /obj/item/clothing/mask/breath
gloves = /obj/item/clothing/gloves/color/plasmaman
-
-/datum/outfit/centcom/death_commando
- name = "Death Commando"
-
- uniform = /obj/item/clothing/under/rank/centcom/commander
- suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
- shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- glasses = /obj/item/clothing/glasses/hud/toggle/thermal
- back = /obj/item/storage/backpack/security
- l_pocket = /obj/item/melee/transforming/energy/sword/saber
- r_pocket = /obj/item/shield/energy
- suit_store = /obj/item/tank/internals/emergency_oxygen/double
- belt = /obj/item/gun/ballistic/revolver/mateba
- r_hand = /obj/item/gun/energy/pulse
- id = /obj/item/card/id/ert/deathsquad
- ears = /obj/item/radio/headset/headset_cent/alt
-
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/ammo_box/a357=1,\
- /obj/item/storage/firstaid/regular=1,\
- /obj/item/storage/box/flashbangs=1,\
- /obj/item/flashlight=1,\
- /obj/item/grenade/c4/x4=1)
-
-/datum/outfit/centcom/death_commando/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.set_frequency(FREQ_CENTCOM)
- R.freqlock = TRUE
- var/obj/item/card/id/W = H.wear_id
- W.access = get_all_accesses()//They get full station access.
- W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access.
- W.assignment = "Death Commando"
- W.registered_name = H.real_name
- W.update_label()
- ..()
-
-/datum/outfit/centcom/death_commando/officer
- name = "Death Commando Officer"
- head = /obj/item/clothing/head/helmet/space/beret
-
/datum/outfit/chrono_agent
name = "Timeline Eradication Agent"
uniform = /obj/item/clothing/under/color/white
@@ -197,7 +113,7 @@
box = /obj/item/storage/box/debugtools
internals_slot = ITEM_SLOT_SUITSTORE
backpack_contents = list(
- /obj/item/melee/transforming/energy/axe=1,\
+ /obj/item/melee/energy/axe=1,\
/obj/item/storage/part_replacer/bluespace/tier4=1,\
/obj/item/debug/human_spawner=1,\
/obj/item/debug/omnitool=1
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index cd44745880902..710922a4f5f8d 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -14,8 +14,13 @@
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION
permeability_coefficient = 0.5
- slowdown = SHOES_SLOWDOWN
- strip_delay = 1 SECONDS
+
+ equip_delay_self = EQUIP_DELAY_SHOES
+ equip_delay_other = EQUIP_DELAY_SHOES * 1.5
+ strip_delay = EQUIP_DELAY_SHOES * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT | EQUIP_SLOWDOWN
+
+ blood_overlay_type = "shoe"
var/offset = 0
var/equipped_before_drop = FALSE
@@ -34,10 +39,7 @@
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_shoes
- bloody_shoes = mutable_appearance('icons/effects/blood.dmi', "shoeblood")
- bloody_shoes.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_shoes
+ . += setup_blood_overlay()
/obj/item/clothing/shoes/examine(mob/user)
. = ..()
@@ -172,7 +174,7 @@
else // if one of us moved
user.visible_message("[our_guy] stamps on [user]'s hand, mid-shoelace [tied ? "knotting" : "untying"]!", "Ow! [our_guy] stamps on your hand!", list(our_guy))
to_chat(our_guy, "You stamp on [user]'s hand! What the- [user.p_they()] [user.p_were()] [tied ? "knotting" : "untying"] your shoelaces!")
- user.emote("scream")
+ user.force_scream()
if(istype(L))
var/obj/item/bodypart/ouchie = L.get_bodypart(pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
if(ouchie)
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 6bb64c2caebb6..e0e084af02077 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -13,6 +13,13 @@
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
greyscale_icon_state = "boots"
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_BOOTS
+ equip_delay_other = EQUIP_DELAY_BOOTS * 1.5
+ strip_delay = EQUIP_DELAY_BOOTS * 1.5
+
/obj/item/clothing/shoes/magboots/verb/toggle()
set name = "Toggle Magboots"
set category = "Object"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 234917e03d6d2..93c6bf562f5a5 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -16,6 +16,13 @@
lace_time = 12 SECONDS
greyscale_icon_state = "boots"
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_BOOTS
+ equip_delay_other = EQUIP_DELAY_BOOTS * 1.5
+ strip_delay = EQUIP_DELAY_BOOTS * 1.5
+
/obj/item/clothing/shoes/combat/swat //overpowered boots for death squads
name = "\improper SWAT boots"
desc = "High speed, no drag combat boots."
@@ -67,6 +74,12 @@
can_be_tied = FALSE
greyscale_icon_state = "boots"
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_BOOTS
+ equip_delay_other = EQUIP_DELAY_BOOTS * 1.5
+ strip_delay = EQUIP_DELAY_BOOTS * 1.5
+
/obj/item/clothing/shoes/jackboots
name = "jackboots"
desc = "Ankle-high combat boots for combat scenarios or combat situations. All combat, all the time."
@@ -82,6 +95,13 @@
can_be_tied = FALSE
greyscale_icon_state = "boots"
+ equip_sound = 'sound/items/equip/straps_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_BOOTS
+ equip_delay_other = EQUIP_DELAY_BOOTS * 1.5
+ strip_delay = EQUIP_DELAY_BOOTS * 1.5
+
/obj/item/clothing/shoes/jackboots/fast
slowdown = -1
@@ -99,6 +119,13 @@
lace_time = 8 SECONDS
greyscale_icon_state = "boots"
+ equip_sound = 'sound/items/equip/straps_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_BOOTS
+ equip_delay_other = EQUIP_DELAY_BOOTS * 1.5
+ strip_delay = EQUIP_DELAY_BOOTS * 1.5
+
/obj/item/clothing/shoes/workboots
name = "work boots"
desc = "Nanotrasen-issue Engineering lace-up work boots for the especially blue-collar."
@@ -113,6 +140,12 @@
lace_time = 8 SECONDS
greyscale_icon_state = "boots"
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_BOOTS
+ equip_delay_other = EQUIP_DELAY_BOOTS * 1.5
+ strip_delay = EQUIP_DELAY_BOOTS * 1.5
+
/obj/item/clothing/shoes/winterboots/ice_boots
name = "ice hiking boots"
desc = "A pair of winter boots with special grips on the bottom, designed to prevent slipping on frozen surfaces."
@@ -151,6 +184,13 @@
var/recharging_time = 0 //time until next dash
greyscale_icon_state = "boots"
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_BOOTS
+ equip_delay_other = EQUIP_DELAY_BOOTS * 1.5
+ strip_delay = EQUIP_DELAY_BOOTS * 1.5
+
/obj/item/clothing/shoes/bhop/ui_action_click(mob/user, action)
if(!isliving(user))
return
@@ -211,12 +251,22 @@
can_be_tied = FALSE
greyscale_icon_state = "boots"
+ equip_sound = 'sound/items/equip/straps_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_BOOTS
+ equip_delay_other = EQUIP_DELAY_BOOTS * 1.5
+ strip_delay = EQUIP_DELAY_BOOTS * 1.5
+
/obj/item/clothing/shoes/cowboy/Initialize()
. = ..()
if(prob(2))
var/mob/living/simple_animal/hostile/retaliate/poison/snake/bootsnake = new/mob/living/simple_animal/hostile/retaliate/poison/snake(src)
occupants += bootsnake
+/obj/item/clothing/shoes/cowboy/Destroy()
+ QDEL_LIST(occupants)
+ return ..()
/obj/item/clothing/shoes/cowboy/equipped(mob/living/carbon/user, slot)
. = ..()
diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
index f96ad54adb88b..f540c175df5aa 100644
--- a/code/modules/clothing/spacesuits/_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -23,6 +23,7 @@
dog_fashion = null
content_overlays = FALSE
pocket_storage_component_path = null
+ equip_self_flags = null
/obj/item/clothing/suit/space
name = "space suit"
@@ -49,3 +50,4 @@
resistance_flags = NONE
greyscale_colors = list(list(17, 16), list(9, 17), list(13, 13))
greyscale_icon_state = "spacesuit"
+ equip_self_flags = null
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 25788f4556ae2..6542baf36c160 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -23,6 +23,11 @@
var/grace_count = 0
var/datum/looping_sound/geiger/soundloop
+ //fuck you 15 year old hardsuit code
+ equip_delay_self = null
+ equip_delay_other = null
+ strip_delay = null
+
/obj/item/clothing/head/helmet/space/hardsuit/Initialize()
. = ..()
soundloop = new(list(), FALSE, TRUE)
@@ -411,7 +416,7 @@
item_state = "syndie_hardsuit"
hardsuit_type = "syndi"
armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)
- allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
jetpack = /obj/item/tank/jetpack/suit
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
@@ -436,7 +441,6 @@
item_state = "hardsuit1-ramzi"
hardsuit_type = "ramzi"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi
- lightweight = 1
jetpack = null
armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
slowdown = 0.7
@@ -917,7 +921,7 @@
item_state = "syndie_hardsuit"
hardsuit_type = "syndi"
armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100)
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi
slowdown = 0.5
shield_state = "shield-red"
@@ -1199,7 +1203,7 @@
item_state = "hardsuit_solgov"
armor = list("melee" = 50, "bullet" = 45, "laser" = 40, "energy" = 30, "bomb" = 60, "bio" = 100, "rad" = 60, "fire" = 90, "acid" = 75) //intentionally the fucking strong, this is master chief-tier armor //is this really what you call the strong?? is this the best solgov has to offer??????
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov
- allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
slowdown = 0.5
supports_variations = DIGITIGRADE_VARIATION
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 6e825e48ea4b6..8cf3da8547cd5 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -153,7 +153,7 @@ Contains:
desc = "Yarr."
w_class = WEIGHT_CLASS_NORMAL
flags_inv = 0
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/saber/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/energy/sword/saber/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
slowdown = 0
armor = list("melee" = 30, "bullet" = 50, "laser" = 30,"energy" = 40, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 60, "acid" = 75)
strip_delay = 40
@@ -363,7 +363,7 @@ Contains:
armor = list("melee" = 30, "bullet" = 10, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 10, "fire" = 100, "acid" = 100)
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/melee/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kinetic_crusher, /obj/item/resonator, /obj/item/melee/transforming/cleaving_saw)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/melee/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kinetic_crusher, /obj/item/resonator, /obj/item/melee/cleaving_saw)
/obj/item/clothing/suit/space/hardsuit/berserker/RemoveHelmet()
var/obj/item/clothing/head/helmet/space/hardsuit/berserker/helm = helmet
@@ -525,7 +525,7 @@ Contains:
icon_state = "vacsuit_solgov"
desc = "Originally designed by independent contractors on Luna for the purposes of survival in hazardous environments, the lightweight Tortoise Microlite Armored Suit now sees widespread use by SolGov's exploration teams."
item_state = "vacsuit_solgov"
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy, /obj/item/tank/internals)
armor = list("bio" = 100, "rad" = 50, "fire" = 60, "acid" = 75)
slowdown = 0.5
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 895dea5156aae..0fff8b84f5924 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -4,7 +4,7 @@
/obj/item/clothing/suit/space/eva/plasmaman
name = "EVA plasma envirosuit"
desc = "A special plasma containment suit designed to be space-worthy, as well as worn over other clothing. Like its smaller counterpart, it can automatically extinguish the wearer in a crisis, and holds twice as many charges."
- allowed = list(/obj/item/gun, /obj/item/ammo_casing, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank)
+ allowed = list(/obj/item/gun, /obj/item/ammo_casing, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75)
resistance_flags = FIRE_PROOF
icon_state = "plasmaman_suit"
@@ -61,6 +61,9 @@
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF | SEALS_EYES
visor_flags_inv = HIDEEYES|HIDEFACE
+ //remove when phorids suck less
+ equip_delay_self = null
+
// WS Begin - plasmeme command helmets buff - used for RD bomb scanner
/obj/item/clothing/head/helmet/space/plasmaman/proc/display_visor_message(msg)
var/mob/wearer = loc
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index e2a405176c21d..2b2660af4f9c9 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -4,7 +4,7 @@
icon_state = "syndicate"
item_state = "syndicate"
desc = "An advanced, lightweight space helmet made of durable composites. Almost matches integrated hardsuit helmets for protection. Almost."
- armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
+ armor = list("melee" = 30, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
supports_variations = VOX_VARIATION
/obj/item/clothing/suit/space/syndicate
@@ -13,8 +13,11 @@
item_state = "space_suit_syndicate"
desc = "A space suit made of high-grade ballistic fabric with integrated armor plates. More compact than a normal space suit while almost matching powered hardsuits for protection. Almost."
w_class = WEIGHT_CLASS_NORMAL
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
- armor = list("melee" = 30, "bullet" = 15, "laser" = 15, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
+ armor = list("melee" = 30, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 20, "bio" = 100, "rad" = 30, "fire" = 75, "acid" = 75)
+
+/obj/item/clothing/suit/space/syndicate/Initialize()
+ . = ..()
+ allowed = GLOB.security_hardsuit_allowed
//Green syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/green
@@ -105,6 +108,7 @@
icon_state = "syndicate-helm-black-med"
item_state = "syndicate-helm-black"
+
/obj/item/clothing/suit/space/syndicate/black/med
name = "green space suit"
icon_state = "syndicate-black-med"
diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm
index 30d3c3c3c9ba9..75497fca5a7b1 100644
--- a/code/modules/clothing/suits/_suits.dm
+++ b/code/modules/clothing/suits/_suits.dm
@@ -9,7 +9,7 @@
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
slot_flags = ITEM_SLOT_OCLOTHING
- var/blood_overlay_type = "suit"
+ blood_overlay_type = "suit"
var/togglename = null
var/suittoggled = FALSE
pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo //WS Edit - Exowear Pockets
@@ -18,15 +18,22 @@
supports_variations = VOX_VARIATION
mob_overlay_icon = 'icons/mob/clothing/suit.dmi'
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_LONG_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_LONG_GENERIC
+ equip_delay_self = EQUIP_DELAY_OVERSUIT
+ equip_delay_other = EQUIP_DELAY_OVERSUIT * 1.5
+ strip_delay = EQUIP_DELAY_OVERSUIT * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT | EQUIP_SLOWDOWN
+
/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
. = ..()
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_armor = mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood")
- bloody_armor.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_armor
+ . += setup_blood_overlay()
+
var/mob/living/carbon/human/M = loc
if(ishuman(M) && M.w_uniform)
var/obj/item/clothing/under/U = M.w_uniform
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index b9eb2b6d7c537..92a9556008f2d 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -17,6 +17,13 @@
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
+ equipping_sound = EQUIP_SOUND_MED_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_MED_GENERIC
+ equip_delay_self = EQUIP_DELAY_SUIT
+ equip_delay_other = EQUIP_DELAY_SUIT * 1.5
+ strip_delay = EQUIP_DELAY_SUIT * 1.5
+ equip_self_flags = null
+
/obj/item/clothing/suit/armor/Initialize()
. = ..()
if(!allowed)
@@ -47,22 +54,32 @@
icon_state = "marine_light"
item_state = "armor"
clothing_flags = THICKMATERIAL
- body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- armor = list("melee" = 50, "bullet" = 75, "laser" = 55, "energy" = 25, "bomb" = 60, "bio" = 100, "fire" = 70, "acid" = 50)
- cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
+ body_parts_covered = CHEST|GROIN
+ armor = list("melee" = 20, "bullet" = 45, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 65, "fire" = 40, "acid" = 50)
+ cold_protection = CHEST|GROIN
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
- heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ heat_protection = CHEST|GROIN
resistance_flags = FIRE_PROOF | ACID_PROOF
supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
- slowdown = 0.5
+ slowdown = 0 //one day...
/obj/item/clothing/suit/armor/vest/marine/medium
name = "medium tactical armor vest"
icon_state = "marine_medium"
+ body_parts_covered = CHEST|GROIN|LEGS|ARMS
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ heat_protection = CHEST|GROIN|LEGS|ARMS
+ armor = list("melee" = 35, "bullet" = 50, "laser" = 45, "energy" = 25, "bomb" = 30, "bio" = 75, "fire" = 40, "acid" = 50)
+ slowdown = 0.4
/obj/item/clothing/suit/armor/vest/marine/heavy
- name = "large tactical armor vest"
+ name = "heavy tactical armor vest"
icon_state = "marine_heavy"
+ body_parts_covered = CHEST|GROIN|LEGS|ARMS
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ heat_protection = CHEST|GROIN|LEGS|ARMS
+ armor = list("melee" = 60, "bullet" = 60, "laser" = 55, "energy" = 25, "bomb" = 50, "bio" = 75, "fire" = 40, "acid" = 50)
+ slowdown = 0.8
/obj/item/clothing/suit/armor/vest/old
name = "degrading armor vest"
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index c62d0e92b8c07..fbba6443faf72 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -9,6 +9,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
resistance_flags = ACID_PROOF
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
+ equip_sound = 'sound/items/equip/straps_equip.ogg'
/obj/item/clothing/suit/bio_suit
name = "bio suit"
@@ -29,6 +30,8 @@
strip_delay = 70
equip_delay_other = 70
resistance_flags = ACID_PROOF
+ equip_sound = 'sound/items/equip/straps_equip.ogg'
+ equip_self_flags = null
//Standard biosuit, orange stripe
/obj/item/clothing/head/bio_hood/general
diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm
index 982b3804f586e..1ab2f26c7df77 100644
--- a/code/modules/clothing/suits/cloaks.dm
+++ b/code/modules/clothing/suits/cloaks.dm
@@ -5,13 +5,18 @@
desc = "It's a cape that can be worn around your neck."
icon = 'icons/obj/clothing/cloaks.dmi'
icon_state = "qmcloak"
- item_state = "qmcloak"
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDESUITSTORAGE
greyscale_colors = list(list(11, 15), list(12, 22), list(12, 22))
greyscale_icon_state = "cloak"
+ equip_sound = 'sound/items/equip/straps_equip.ogg'
+ equip_delay_self = EQUIP_DELAY_COAT
+ equip_delay_other = EQUIP_DELAY_COAT * 1.5
+ strip_delay = EQUIP_DELAY_COAT * 1.5
+ equip_self_flags = EQUIP_ALLOW_MOVEMENT | EQUIP_SLOWDOWN
+
/obj/item/clothing/neck/cloak/hos
name = "head of security's cloak"
desc = "Worn by Securistan, ruling their watch with an iron fist."
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 2b06e695851c6..9b20dd2395c13 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -14,6 +14,13 @@
body_parts_covered = CHEST|GROIN
allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants)
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_COAT
+ equip_delay_other = EQUIP_DELAY_COAT * 1.5
+ strip_delay = EQUIP_DELAY_COAT * 1.5
+
+
/obj/item/clothing/suit/apron/waders
name = "horticultural waders"
desc = "A pair of heavy duty leather waders, perfect for insulating your soft flesh from spills, soil and thorns."
@@ -207,7 +214,7 @@
name = "surgical apron"
desc = "A sterile blue surgical apron."
icon_state = "surgical"
- allowed = list(/obj/item/scalpel, /obj/item/cautery, /obj/item/hemostat, /obj/item/retractor)
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
//SolGov suits
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 798a34606bc1e..51d0f1eb08b19 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -5,7 +5,7 @@
item_state = "labcoat"
blood_overlay_type = "coat"
body_parts_covered = CHEST|ARMS|GROIN
- allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"
@@ -75,7 +75,7 @@ You're pretty sure this is just a raincoat.
mob_overlay_icon = 'icons/mob/clothing/suits/utility.dmi'
icon_state = "labcoat_long"
item_state = "labcoat"
- allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index c8e54edb2e015..e51da946cbc6d 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -37,7 +37,7 @@
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
- allowed = list(/obj/item/melee/transforming/energy/sword/saber/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+ allowed = list(/obj/item/melee/energy/sword/saber/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
/obj/item/clothing/suit/pirate/captain
name = "pirate captain coat"
@@ -198,6 +198,14 @@
icon_state = "cybersun_suit"
item_state = "cybersun_suit"
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+
+ equip_sound = 'sound/items/equip/cloth_equip.ogg'
+ equip_delay_self = EQUIP_DELAY_COAT
+ equip_delay_other = EQUIP_DELAY_COAT * 1.5
+ strip_delay = EQUIP_DELAY_COAT * 1.5
+
/obj/item/clothing/suit/straight_jacket
name = "straight jacket"
desc = "A suit that completely restrains the wearer. Manufactured by Antyphun Corp." //Straight jacket is antifun
@@ -219,12 +227,24 @@
icon_state = "ianshirt"
item_state = "ianshirt"
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_COAT
+ equip_delay_other = EQUIP_DELAY_COAT * 1.5
+ strip_delay = EQUIP_DELAY_COAT * 1.5
+
/obj/item/clothing/suit/nerdshirt
name = "gamer shirt"
desc = "A baggy shirt with vintage game character Super Weasel Kid. Why would anyone wear this?"
icon_state = "nerdshirt"
item_state = "nerdshirt"
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_COAT
+ equip_delay_other = EQUIP_DELAY_COAT * 1.5
+ strip_delay = EQUIP_DELAY_COAT * 1.5
+
/obj/item/clothing/suit/jacket
name = "bomber jacket"
desc = "Aviators not included."
@@ -235,6 +255,12 @@
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_COAT
+ equip_delay_other = EQUIP_DELAY_COAT * 1.5
+ strip_delay = EQUIP_DELAY_COAT * 1.5
+
/obj/item/clothing/suit/jacket/leather
name = "leather jacket"
desc = "This makes you feel like the coolest guy in town!"
@@ -312,6 +338,12 @@
icon_state = "gothcoat"
item_state = "gothcoat"
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_COAT
+ equip_delay_other = EQUIP_DELAY_COAT * 1.5
+ strip_delay = EQUIP_DELAY_COAT * 1.5
+
/obj/item/clothing/suit/caution
name = "wet floor sign"
desc = "No running."
@@ -328,6 +360,12 @@
attack_verb = list("warned", "cautioned", "smashed")
armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_COAT
+ equip_delay_other = EQUIP_DELAY_COAT * 1.5
+ strip_delay = EQUIP_DELAY_COAT * 1.5
+
/obj/item/clothing/head/hooded/ablative
name = "ablative hood"
desc = "Hood hopefully belonging to an ablative trenchcoat. Includes a visor for cool-o-vision."
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index 0eb5a90676c60..8166af12d3018 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -8,6 +8,13 @@
var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this
pocket_storage_component_path = FALSE
+ equip_sound = 'sound/items/equip/cloth_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_COAT
+ equip_delay_other = EQUIP_DELAY_COAT * 1.5
+ strip_delay = EQUIP_DELAY_COAT * 1.5
+
/obj/item/clothing/suit/hooded/Initialize()
. = ..()
MakeHood()
@@ -98,6 +105,13 @@
icon = 'icons/obj/clothing/suits/toggle.dmi'
mob_overlay_icon = 'icons/mob/clothing/suits/toggle.dmi'
+ equip_sound = 'sound/items/equip/cloth_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_COAT
+ equip_delay_other = EQUIP_DELAY_COAT * 1.5
+ strip_delay = EQUIP_DELAY_COAT * 1.5
+
/obj/item/clothing/suit/toggle/AltClick(mob/user)
..()
if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 88661d6b835c8..d0d49a7619c65 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -29,9 +29,8 @@
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- strip_delay = 60
- equip_delay_other = 60
resistance_flags = FIRE_PROOF
+ equip_self_flags = null
/obj/item/clothing/suit/fire/firefighter
icon_state = "firesuit"
@@ -70,6 +69,12 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF | SEALS_EYES
resistance_flags = NONE
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_HELMET
+ equip_delay_other = EQUIP_DELAY_HELMET * 1.5
+ strip_delay = EQUIP_DELAY_HELMET * 1.5
/obj/item/clothing/suit/bomb_suit
name = "bomb suit"
@@ -93,7 +98,7 @@
strip_delay = 70
equip_delay_other = 70
resistance_flags = NONE
-
+ equip_self_flags = null
/obj/item/clothing/head/bomb_hood/security
icon_state = "bombsuit_sec"
@@ -130,6 +135,7 @@
resistance_flags = NONE
flags_1 = RAD_PROTECT_CONTENTS_1
supports_variations = VOX_VARIATION
+ equip_sound = 'sound/items/equip/straps_equip.ogg'
/obj/item/clothing/suit/radiation
name = "radiation suit"
@@ -152,6 +158,8 @@
resistance_flags = NONE
flags_1 = RAD_PROTECT_CONTENTS_1
supports_variations = VOX_VARIATION
+ equip_sound = 'sound/items/equip/straps_equip.ogg'
+ equip_self_flags = null
/obj/item/clothing/head/radiation/space
name = "low-pressure radiation helmet"
@@ -166,6 +174,8 @@
flash_protect = FLASH_PROTECTION_WELDER
strip_delay = 50
equip_delay_other = 50
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equip_self_flags = null
/obj/item/clothing/suit/radiation/space
name = "low-pressure radiation suit"
@@ -182,4 +192,5 @@
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
strip_delay = 80
equip_delay_other = 80
-
+ equip_sound = 'sound/items/equip/armor_equip.ogg'
+ equip_self_flags = null
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
index 5c1bfb47be66c..29faddfdd49dc 100644
--- a/code/modules/clothing/suits/wintercoats.dm
+++ b/code/modules/clothing/suits/wintercoats.dm
@@ -65,28 +65,7 @@
icon_state = "coatmedical"
item_state = "coatmedical"
hoodtype = /obj/item/clothing/head/hooded/winterhood/medical
- allowed = list(
- /obj/item/analyzer,
- /obj/item/sensor_device,
- /obj/item/stack/medical,
- /obj/item/dnainjector,
- /obj/item/reagent_containers/dropper,
- /obj/item/reagent_containers/syringe,
- /obj/item/reagent_containers/hypospray,
- /obj/item/healthanalyzer,
- /obj/item/flashlight/pen,
- /obj/item/reagent_containers/glass/bottle,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/reagent_containers/pill,
- /obj/item/storage/pill_bottle,
- /obj/item/paper,
- /obj/item/melee/classic_baton/telescopic,
- /obj/item/toy,
- /obj/item/storage/fancy/cigarettes,
- /obj/item/lighter,
- /obj/item/tank/internals/emergency_oxygen,
- /obj/item/tank/internals/plasmaman,
- )
+ allowed = MEDICAL_SUIT_ALLOWED_ITEMS
/obj/item/clothing/head/hooded/winterhood/medical
icon_state = "hood_medical"
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index bc8cb512906b1..2b1a6eb765724 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -15,6 +15,13 @@
clothamnt = 3
greyscale_colors = list(list(15, 17), list(10, 19), list(15, 10))
greyscale_icon_state = "under"
+
+ equipping_sound = EQUIP_SOUND_SHORT_GENERIC
+ unequipping_sound = UNEQUIP_SOUND_SHORT_GENERIC
+ equip_delay_self = EQUIP_DELAY_UNDERSUIT
+ equip_delay_other = EQUIP_DELAY_UNDERSUIT * 1.5
+ strip_delay = EQUIP_DELAY_UNDERSUIT * 1.5
+
var/has_sensor = HAS_SENSORS // For the crew computer
var/random_sensor = TRUE
var/sensor_mode = NO_SENSORS
@@ -24,7 +31,9 @@
var/obj/item/clothing/accessory/attached_accessory
var/mutable_appearance/accessory_overlay
var/freshly_laundered = FALSE
+
supports_variations = VOX_VARIATION
+ blood_overlay_type = "uniform"
/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
. = ..()
@@ -32,12 +41,15 @@
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
if(HAS_BLOOD_DNA(src))
- var/mutable_appearance/bloody_uniform = mutable_appearance('icons/effects/blood.dmi', "uniformblood")
- bloody_uniform.color = get_blood_dna_color(return_blood_DNA())
- . += bloody_uniform
+ . += setup_blood_overlay()
if(accessory_overlay)
. += accessory_overlay
+/obj/item/clothing/under/Destroy()
+ . = ..()
+ if(attached_accessory)
+ attached_accessory.detach(src)
+
/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = I
@@ -45,6 +57,9 @@
has_sensor = HAS_SENSORS
to_chat(user,"You repair the suit sensors on [src] with [C].")
return 1
+ if(attached_accessory && ispath(attached_accessory.pocket_storage_component_path) && loc == user)
+ attached_accessory.attackby(I,user)
+ return
if(!attach_accessory(I, user))
return ..()
@@ -179,7 +194,9 @@
if(SENSOR_COORDS)
. += "Its vital tracker and tracking beacon appear to be enabled."
if(attached_accessory)
- . += "\A [attached_accessory] is attached to it."
+ . += "\A [attached_accessory] is attached to it. You could Ctrl-click on it to remove it."
+ if(attached_accessory.pocket_storage_component_path)
+ . += "You could open the storage of \the [attached_accessory] with Alt-click."
/obj/item/clothing/under/rank
dying_key = DYE_REGISTRY_UNDER
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index 0d05c4e0cf7fb..db5037bbbec8f 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -92,10 +92,11 @@
if(initial(above_suit))
above_suit = !above_suit
to_chat(user, "[src] will be worn [above_suit ? "above" : "below"] your suit.")
+ return ..()
/obj/item/clothing/accessory/examine(mob/user)
. = ..()
- . += "\The [src] can be attached to a uniform. Alt-click to remove it once attached."
+ . += "\The [src] can be attached to a uniform. Ctrl-click to remove it once attached."
if(initial(above_suit))
. += "\The [src] can be worn above or below your suit. Alt-click to toggle."
@@ -103,7 +104,7 @@
name = "waistcoat"
desc = "For some classy, murderous fun."
icon_state = "waistcoat"
- item_state = "waistcoat"
+ item_state = "det_suit"
minimize_when_attached = FALSE
attachment_slot = null
@@ -115,18 +116,6 @@
minimize_when_attached = FALSE
attachment_slot = null
-/obj/item/clothing/accessory/maidapron/syndicate
- name = "syndicate maid apron"
- desc = "Practical? No. Tactical? Also no. Cute? Most definitely yes."
- icon_state = "maidapronsynd"
- item_state = "maidapronsynd"
-
-/obj/item/clothing/accessory/maidapron/inteq
- name = "inteq maid apron"
- desc = "A 'tactical' apron to protect you from all sorts of spills, from dough to blood!"
- icon_state = "inteqmaidapron"
- item_state = "inteqmaidapron"
-
//////////
//Medals//
//////////
@@ -185,7 +174,7 @@
/obj/item/clothing/accessory/medal/conduct
name = "distinguished conduct medal"
- desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew."
+ desc = "A bronze medal awarded for distinguished conduct. While an honor to be awarded, it is one of the most common medals next to the bronze heart."
/obj/item/clothing/accessory/medal/bronze_heart
name = "bronze heart medal"
@@ -199,7 +188,7 @@
/obj/item/clothing/accessory/medal/ribbon/cargo
name = "\"cargo tech of the shift\" award"
- desc = "An award bestowed only upon those cargotechs who have exhibited devotion to their duty in keeping with the highest traditions of Cargonia."
+ desc = "A common award bestowed by cargo quartermasters everywhere to their outperforming employees. Often paired with Unpaid Time Off."
/obj/item/clothing/accessory/medal/silver
name = "silver medal"
@@ -213,8 +202,8 @@
desc = "A silver medal awarded for acts of exceptional valor."
/obj/item/clothing/accessory/medal/silver/security
- name = "robust security award"
- desc = "An award for distinguished combat and sacrifice in defence of Nanotrasen's commercial interests. Often awarded to security staff."
+ name = "exceptional service award"
+ desc = "A silver medal awarded for exceptional service within one's roles, often ranging from combat operations to triage and first aid."
/obj/item/clothing/accessory/medal/silver/excellence
name = "\proper the head of personnel award for outstanding achievement in the field of excellence"
@@ -222,7 +211,7 @@
/obj/item/clothing/accessory/medal/silver/bureaucracy
name = "\improper Excellence in Bureaucracy Medal"
- desc = "Awarded for exemplary managerial services rendered while under contract with Nanotrasen."
+ desc = "An award for excellent bureaucratic work, often seen pinned to the uniforms of middle-managers."
/obj/item/clothing/accessory/medal/gold
name = "gold medal"
@@ -267,7 +256,7 @@
/obj/item/clothing/accessory/medal/gold/heroism
name = "medal of exceptional heroism"
- desc = "An extremely rare golden medal awarded only by CentCom. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
+ desc = "An extremely rare golden medal awarded only by the highest echelons of military service. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded."
/obj/item/clothing/accessory/medal/plasma
name = "plasma medal"
@@ -408,7 +397,6 @@
name = "shoulder holster"
desc = "A holster to carry a handgun and ammo. WARNING: Badasses only."
icon_state = "holster"
- item_state = "holster"
pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster
attachment_slot = null
@@ -434,7 +422,6 @@
name = "syndicate holster"
desc = "A two pouched hip holster that uses chameleon technology to disguise itself and any guns in it."
var/datum/action/item_action/chameleon/change/chameleon_action
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster/chameleon
/obj/item/clothing/accessory/holster/chameleon/Initialize()
. = ..()
@@ -444,6 +431,10 @@
chameleon_action.chameleon_name = "Accessory"
chameleon_action.initialize_disguises()
+/obj/item/clothing/accessory/holster/chameleon/Destroy()
+ QDEL_NULL(chameleon_action)
+ return ..()
+
/obj/item/clothing/accessory/holster/chameleon/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index a6f3bfa7cf9d1..7ac32c9c1295b 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -11,7 +11,7 @@
/obj/item/clothing/under/color/random
icon_state = "random_jumpsuit"
- mob_overlay_state = "rainbow" // if you somehow equip it like that
+ mob_overlay_state = "white" // if you somehow equip it like that
/obj/item/clothing/under/color/random/Initialize()
..()
@@ -25,7 +25,7 @@
/obj/item/clothing/under/color/jumpskirt/random
icon_state = "random_jumpsuit" //Skirt variant needed
- mob_overlay_state = "rainbow"
+ mob_overlay_state = "white"
/obj/item/clothing/under/color/jumpskirt/random/Initialize()
..()
@@ -186,15 +186,6 @@
icon_state = "lightbrown_skirt"
item_state = "lb_suit"
-/obj/item/clothing/under/color/khaki
- name = "khaki jumpsuit"
- icon_state = "khakij"
- item_state = "lb_suit"
-
-/obj/item/clothing/under/color/khaki/buster
- name = "buster jumpsuit"
- desc = "There seems to be a large stain in the left pocket. Someone must have squashed a really big twinkie."
-
/obj/item/clothing/under/color/brown
name = "brown jumpsuit"
icon_state = "brown"
@@ -214,17 +205,3 @@
name = "maroon jumpskirt"
icon_state = "maroon_skirt"
item_state = "r_suit"
-
-/obj/item/clothing/under/color/rainbow
- name = "rainbow jumpsuit"
- desc = "A multi-colored jumpsuit!"
- icon_state = "rainbow"
- item_state = "rainbow"
- can_adjust = FALSE
-
-/obj/item/clothing/under/color/jumpskirt/rainbow
- name = "rainbow jumpskirt"
- desc = "A multi-colored jumpskirt!"
- icon_state = "rainbow_skirt"
- item_state = "rainbow"
- can_adjust = FALSE
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 46a1ff275d151..03f1cf19580f1 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -55,7 +55,6 @@
desc = "Someone who wears this means business."
icon_state = "detective"
item_state = "det"
- armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
strip_delay = 50
alt_covers_chest = TRUE
sensor_mode = 3
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 019d731a27080..d1d950e5779e5 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -63,6 +63,9 @@
var/extinguishes_left = 5
cuttable = FALSE
+ //remove when phorids suck less
+ equip_delay_self = null
+
/obj/item/clothing/under/plasmaman/skirt //WS edit plasmaman customization
name = "plasma enviroskirt"
icon_state = "plasmaskirt"
diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm
index f74748f71fbb7..091a584f1178a 100644
--- a/code/modules/clothing/under/skirt_dress.dm
+++ b/code/modules/clothing/under/skirt_dress.dm
@@ -1,9 +1,13 @@
/obj/item/clothing/under/dress
+ name = "strange broken dress"
+ desc = "Tell a coder!"
+ icon = 'icons/obj/clothing/under/dress.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/under/dresses/dress.dmi'
+ kepori_override_icon = 'icons/mob/clothing/under/dresses/dress_kepori.dmi'
+
can_adjust = FALSE
body_parts_covered = CHEST|GROIN
- icon = 'icons/obj/clothing/under/dress.dmi'
- mob_overlay_icon = 'icons/mob/clothing/under/dress.dmi'
- supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION //Doesn't require a new icon.
+ supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION | KEPORI_VARIATION
/obj/item/clothing/under/dress/sundress
name = "sundress"
@@ -13,19 +17,19 @@
/obj/item/clothing/under/dress/blacktango
name = "black tango dress"
- desc = "Filled with Latin fire."
+ desc = "A silky black satin dress, traditionally made for dancing. It's light and easy to move in."
icon_state = "black_tango"
item_state = "wcoat"
/obj/item/clothing/under/dress/striped
name = "striped dress"
- desc = "Fashion in space."
+ desc = "A simple blue striped dress."
icon_state = "striped_dress"
item_state = "striped_dress"
/obj/item/clothing/under/dress/sailor
name = "sailor dress"
- desc = "Formal wear for a leading lady."
+ desc = "A traditional dress with roots in Far Eastern Cantonal culture, later popularized by the Solarian Confederacy's Naval Forces. However, due to its roots as a formal uniform, it would later be used by civilians in occasions outside of its naval context. The crisp cloth evokes feelings of order and discipline."
icon_state = "sailor_dress"
item_state = "sailor_dress"
@@ -35,62 +39,86 @@
icon_state = "red_evening_gown"
item_state = "red_evening_gown"
-/obj/item/clothing/under/dress/skirt
+/obj/item/clothing/under/dress/one_shoulder
+ name = "one shoulder dress"
+ desc = "A modern black dress with only one shoulder strap. Comes with a matching pair of arm warmers."
+ icon_state = "one_shoulder_dress"
+ can_adjust = TRUE
+
+/obj/item/clothing/under/dress/iko_ikssoal
+ name = "iko ikssoal"
+ desc = "The “iko-ikssoal”, translating to “long-dress”, is a traditional Kalixcian garment for formal gatherings."
+ icon_state = "iko_ikssoal"
+
+/obj/item/clothing/under/dress/skirt/color
name = "black skirt"
- desc = "A black skirt, very fancy!"
+ desc = "A black, casual skirt."
icon_state = "blackskirt"
+ can_adjust = TRUE
-/obj/item/clothing/under/dress/skirt/blue
+/obj/item/clothing/under/dress/skirt/color/blue
name = "blue skirt"
desc = "A blue, casual skirt."
icon_state = "blueskirt"
item_state = "b_suit"
- custom_price = 60
-/obj/item/clothing/under/dress/skirt/red
+/obj/item/clothing/under/dress/skirt/color/red
name = "red skirt"
desc = "A red, casual skirt."
icon_state = "redskirt"
item_state = "r_suit"
- custom_price = 60
-/obj/item/clothing/under/dress/skirt/purple
+/obj/item/clothing/under/dress/skirt/color/purple
name = "purple skirt"
desc = "A purple, casual skirt."
icon_state = "purpleskirt"
item_state = "p_suit"
- custom_price = 60
-/obj/item/clothing/under/dress/skirt/plaid
- name = "red plaid skirt"
- desc = "A preppy red skirt with a white blouse."
- icon_state = "plaid_red"
- item_state = "plaid_red"
+/obj/item/clothing/under/dress/skirt/color/white
+ name = "white skirt"
+ desc = "A white, casual skirt."
+ icon_state = "whiteskirt"
+
+/obj/item/clothing/under/dress/skirt/pinafore
+ name = "black pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is black."
+ icon_state = "black_pinafore"
can_adjust = TRUE
alt_covers_chest = TRUE
- custom_price = 60
-
-/obj/item/clothing/under/dress/skirt/plaid/blue
- name = "blue plaid skirt"
- desc = "A preppy blue skirt with a white blouse."
- icon_state = "plaid_blue"
- item_state = "plaid_blue"
-
-/obj/item/clothing/under/dress/skirt/plaid/purple
- name = "purple plaid skirt"
- desc = "A preppy purple skirt with a white blouse."
- icon_state = "plaid_purple"
- item_state = "plaid_purple"
-
-/obj/item/clothing/under/dress/skirt/plaid/green
- name = "green plaid skirt"
- desc = "A preppy green skirt with a white blouse."
- icon_state = "plaid_green"
- item_state = "plaid_green"
+
+/obj/item/clothing/under/dress/skirt/pinafore/maroon
+ name = "maroon pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is maroon."
+ icon_state = "maroon_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/cerulean
+ name = "cerulean pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is cerulean."
+ icon_state = "cerulean_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/plaid
+ name = "red plaid pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is in red plaid."
+ icon_state = "red_plaid_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/plaid/green
+ name = "green plaid pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is in green plaid."
+ icon_state = "green_plaid_pinafore"
+
+/obj/item/clothing/under/dress/skirt/pinafore/plaid/brown
+ name = "brown plaid pinafore"
+ desc = "It's really just an apron that one wears over a shirt or dress. This one is in brown plaid."
+ icon_state = "brown_plaid_pinafore"
/obj/item/clothing/under/dress/rilena
name = "RILENA: LMR Ri cosplay"
desc = "A pretty red dress with big pink ribbons attached. Intended to be worn by Kepori cosplayers, but also fits other species."
icon_state = "rilena_dress"
item_state = "rilena_dress"
- //supports_variations = KEPORI_VARIATION
+
+/obj/item/clothing/under/dress/white_dress
+ name = "white dress"
+ desc = "A breezy white dress."
+ icon_state = "white_dress"
+ item_state = "white_dress"
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 82b4b663a66b0..4e8297e88d798 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -186,17 +186,6 @@
icon_state = "gec_ce"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 80, "acid" = 40)
-/obj/item/clothing/under/syndicate/skirt/maid
- name = "tactical maid outfit"
- desc = "A 'tactical' turtleneck fashioned to the likeness of a maid outfit. Why the Syndicate has these, you'll never know."
- icon_state = "syndimaid"
- item_state = "syndimaid"
-
-/obj/item/clothing/under/syndicate/skirt/maid/Initialize()
- . = ..()
- var/obj/item/clothing/accessory/maidapron/syndicate/A = new (src)
- attach_accessory(A)
-
/datum/outfit/syndicate/intern
name = "Syndicate Operative - Intern"
@@ -251,10 +240,11 @@
icon_state = "inteqeng"
supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION
-/obj/item/clothing/under/syndicate/inteq/skirt/artificer
+/obj/item/clothing/under/syndicate/inteq/artificer/skirt
name = "inteq artificer overall skirt"
desc = "A black set of overalls in the likeness of a skirt atop a standard issue turtleneck, for the IRMG's support division Artificers."
icon_state = "inteqeng_skirt"
+ body_parts_covered = CHEST|GROIN|ARMS
supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
/obj/item/clothing/under/syndicate/inteq/corpsman
@@ -263,25 +253,13 @@
icon_state = "inteqmed"
supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION
-/obj/item/clothing/under/syndicate/inteq/skirt/corpsman
+/obj/item/clothing/under/syndicate/inteq/corpsman/skirt
name = "inteq corpsman skirtleneck"
desc = "A sterile white turtleneck with a free flowing black skirt, it is emblazoned with the lettering 'IRMG' on the shoulder. For the IRMG's support division Corpsmen."
icon_state = "inteqmed_skirt"
- supports_variations = KEPORI_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/under/syndicate/inteq/skirt/maid
- name = "inteq tactical maid outfit"
- desc = "A 'tactical' turtleneck fashioned to the likeness of a maid outfit. This one is lovingly knitted in the colors of the IRMG."
- icon_state = "inteqmaid"
- item_state = "inteqmaid"
- can_adjust = FALSE
+ body_parts_covered = CHEST|GROIN|ARMS
supports_variations = KEPORI_VARIATION | VOX_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
-/obj/item/clothing/under/syndicate/inteq/skirt/maid/Initialize()
- . = ..()
- var/obj/item/clothing/accessory/maidapron/inteq/A = new (src)
- attach_accessory(A)
-
/obj/item/clothing/under/syndicate/inteq/honorable
name = "honorable vanguard turtleneck"
desc = "a midnight black turtleneck worn by honorable Vanguards of the IRMG."
diff --git a/code/modules/donator/_donator.dm b/code/modules/donator/_donator.dm
index dd4df369cfea1..218c7292c282c 100644
--- a/code/modules/donator/_donator.dm
+++ b/code/modules/donator/_donator.dm
@@ -8,19 +8,6 @@ GLOBAL_PROTECT(donators)
/client/var/datum/donator/donator
-/client/New(TopicData)
- . = ..()
- donator = GLOB.donators[ckey] || new /datum/donator(src)
- donator.owner = src
- add_verb(src, /client/proc/do_donator_redemption)
- add_verb(src, /client/proc/do_donator_wcir)
-
-/client/Destroy()
- . = ..()
- if(donator) // it's possible that a client was qdel'd inside the initializer
- donator.owner = null
- donator = null
-
/client/proc/do_donator_redemption()
set name = "Redeem Donator Reward"
set category = "OOC.Donator"
@@ -46,23 +33,20 @@ GLOBAL_PROTECT(donators)
/datum/donator
/// ckey of the client who this datum belongs to
var/ckey
- /// reference to the client
- var/client/owner
+
+ /// Whether or not this datum actually is a real donator
+ var/is_donator = FALSE
/// typecache of eligible rewards for this donator
- var/list/flat_rewards = list(
- /obj/item/reagent_containers/food/snacks/cookie = TRUE
- )
+ var/list/flat_rewards = list()
/// list of conversion rewards for this donator
/// Expected format: base type -> list of convertible types
- var/list/conversion_rewards = list(
- )
+ var/list/conversion_rewards = list()
/// list of reskin rewards for this donator
/// Should be an assosciative list indexed by type with a value which is a list of skins
- var/list/reskin_rewards = list(
- )
+ var/list/reskin_rewards = list()
/// list of redeemed conversion types
var/list/conversions_redeemed = list()
@@ -70,22 +54,22 @@ GLOBAL_PROTECT(donators)
/datum/donator/New(client/owner)
. = ..()
src.ckey = owner.ckey
- src.owner = owner
load_information()
GLOB.donators[ckey] = src
-/datum/donator/Destroy(force, ...)
+/datum/donator/Destroy(force)
if(!force)
return QDEL_HINT_LETMELIVE
. = ..()
GLOB.donators -= ckey
- owner.donator = null
- owner = null
/datum/donator/proc/load_information() //todo: db support with config files being a backup method
var/json_file = file(REWARD_JSON_PATH + "[ckey].json")
if(!fexists(json_file))
return
+
+ is_donator = TRUE
+
var/list/json = safe_json_decode(file2text(json_file))
if(!json || !("ckey" in json))
@@ -180,6 +164,10 @@ GLOBAL_PROTECT(donators)
. += rinstance
/datum/donator/proc/what_can_i_redeem(mob/user)
+ if(!is_donator)
+ to_chat(user, span_notice("You are not a donator! If you are, please contact an admin on the discord."))
+ return
+
var/resp = list()
resp += "----------"
resp += "Your current redeemable rewards are as follows:"
diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm
index 4213ae91376b1..367b299107e71 100644
--- a/code/modules/economy/account.dm
+++ b/code/modules/economy/account.dm
@@ -29,7 +29,7 @@
/datum/bank_account/proc/has_money(amt)
return account_balance >= amt
-/datum/bank_account/proc/adjust_money(amt, reason = "cash")
+/datum/bank_account/proc/adjust_money(amt, reason = CREDIT_LOG_WITHDRAW)
if((amt < 0 && has_money(-amt)) || amt > 0)
SSblackbox.record_feedback("tally", "credits", amt, reason)
SSeconomy.bank_money += amt
@@ -39,10 +39,10 @@
/datum/bank_account/proc/transfer_money(datum/bank_account/from, amount)
if(from.has_money(amount))
- adjust_money(amount, "transfer")
+ adjust_money(amount, CREDIT_LOG_TRANSFER_IN)
SSblackbox.record_feedback("amount", "credits_transferred", amount)
log_econ("[amount] credits were transferred from [from.account_holder]'s account to [src.account_holder]")
- from.adjust_money(-amount, "transfer_out")
+ from.adjust_money(-amount, CREDIT_LOG_TRANSFER_OUT)
return TRUE
return FALSE
@@ -83,4 +83,4 @@
/datum/bank_account/ship/New(newname, budget)
account_holder = newname
- adjust_money(budget, "starting_money")
+ adjust_money(budget, CREDIT_LOG_STARTING_MONEY)
diff --git a/code/modules/economy/pay_stand.dm b/code/modules/economy/pay_stand.dm
index 9382a03d062ec..1007f25fe40b7 100644
--- a/code/modules/economy/pay_stand.dm
+++ b/code/modules/economy/pay_stand.dm
@@ -54,7 +54,7 @@
if(momsdebitcard < 1)
to_chat(user, "ERROR: Invalid amount designated.")
return
- if(vbucks.registered_account.adjust_money(-momsdebitcard, "transfer"))
+ if(vbucks.registered_account.adjust_money(-momsdebitcard, CREDIT_LOG_TRANSFER_IN))
purchase(vbucks.registered_account.account_holder, momsdebitcard)
to_chat(user, "Thanks for purchasing! The vendor has been informed.")
return
@@ -117,7 +117,7 @@
return ..()
/obj/machinery/paystand/proc/purchase(buyer, price)
- my_card.registered_account.adjust_money(price, "transfer")
+ my_card.registered_account.adjust_money(price, CREDIT_LOG_TRANSFER_IN)
my_card.registered_account.bank_card_talk("Purchase made at your vendor by [buyer] for [price] credits.")
amount_deposited = amount_deposited + price
if(signaler && amount_deposited >= signaler_threshold)
diff --git a/code/modules/economy/selling_pad.dm b/code/modules/economy/selling_pad.dm
index cf155ad251bdc..e70dab4dcb772 100644
--- a/code/modules/economy/selling_pad.dm
+++ b/code/modules/economy/selling_pad.dm
@@ -36,7 +36,7 @@
/obj/machinery/computer/selling_pad_control/attackby(obj/item/I, mob/user)
var/value = I.get_item_credit_value()
if(value)
- sell_account.adjust_money(value, "selling_pad")
+ sell_account.adjust_money(value, CREDIT_LOG_SELLING_PAD)
to_chat(user, "You deposit [I]. The Vessel Budget is now [sell_account.account_balance] cr.")
qdel(I)
return TRUE
@@ -150,7 +150,7 @@
total_report.total_amount[E] += ex.total_amount[E]
total_report.total_value[E] += ex.total_value[E]
- sell_account.adjust_money(value, "selling_pad")
+ sell_account.adjust_money(value, CREDIT_LOG_SELLING_PAD)
if(!value)
status_report += "Nothing"
diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm
index f7324e3c57dd6..3c68b18d50f98 100644
--- a/code/modules/events/brain_trauma.dm
+++ b/code/modules/events/brain_trauma.dm
@@ -27,7 +27,7 @@
15;TRAUMA_RESILIENCE_LOBOTOMY,
5;TRAUMA_RESILIENCE_MAGIC)
- var/trauma_type = pickweight(list(
+ var/trauma_type = pick_weight(list(
BRAIN_TRAUMA_MILD = 60,
BRAIN_TRAUMA_SEVERE = 30,
BRAIN_TRAUMA_SPECIAL = 10
diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm
index 35d8c4b141e1a..73e3b721c0673 100644
--- a/code/modules/events/heart_attack.dm
+++ b/code/modules/events/heart_attack.dm
@@ -18,7 +18,7 @@
heart_attack_contestants[victim] = 1
if(LAZYLEN(heart_attack_contestants))
- var/mob/living/carbon/human/winner = pickweight(heart_attack_contestants)
+ var/mob/living/carbon/human/winner = pick_weight(heart_attack_contestants)
var/datum/disease/D = new /datum/disease/heart_failure()
winner.ForceContractDisease(D, FALSE, TRUE)
announce_to_ghosts(winner)
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index 43e60c3137c39..1fbb017b7dd4b 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -42,7 +42,7 @@
/obj/effect/spawner/xmastree
name = "christmas tree spawner"
- icon = 'icons/effects/landmarks_static.dmi'
+ icon = 'icons/effects/mapping/landmarks_static.dmi'
icon_state = "x2"
layer = FLY_LAYER
diff --git a/code/modules/events/stray_cargo.dm b/code/modules/events/stray_cargo.dm
deleted file mode 100644
index 182ea658a7a91..0000000000000
--- a/code/modules/events/stray_cargo.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-///Spawns a cargo pod containing a random cargo supply pack on a random area of the station
-/datum/round_event_control/stray_cargo
- name = "Stray Cargo Pod"
- typepath = /datum/round_event/stray_cargo
- weight = 20
- max_occurrences = 4
- earliest_start = 10 MINUTES
-
-///Spawns a cargo pod containing a random cargo supply pack on a random area of the station
-/datum/round_event/stray_cargo
- var/area/impact_area ///Randomly picked area
- announceChance = 75
- var/list/possible_pack_types = list() ///List of possible supply packs dropped in the pod, if empty picks from the cargo list
- var/static/list/stray_spawnable_supply_packs = list() ///List of default spawnable supply packs, filtered from the cargo list
-
-/datum/round_event/stray_cargo/announce(fake)
- priority_announce("Stray cargo pod detected on long-range scanners. Expected location of impact: [impact_area.name].", "Collision Alert", zlevel = impact_area.virtual_z())
-
-/**
-* Tries to find a valid area, throws an error if none are found
-* Also randomizes the start timer
-*/
-/datum/round_event/stray_cargo/setup()
- startWhen = rand(20, 40)
- impact_area = find_event_area()
- if(!impact_area)
- CRASH("No valid areas for cargo pod found.")
- var/list/turf_test = get_area_turfs(impact_area)
- if(!turf_test.len)
- CRASH("Stray Cargo Pod : No valid turfs found for [impact_area] - [impact_area.type]")
-
- if(!stray_spawnable_supply_packs.len)
- stray_spawnable_supply_packs = SSshuttle.supply_packs.Copy()
-
-///Spawns a random supply pack, puts it in a pod, and spawns it on a random tile of the selected area
-/datum/round_event/stray_cargo/start()
- var/list/turf/valid_turfs = get_area_turfs(impact_area)
- //Only target non-dense turfs to prevent wall-embedded pods
- for(var/i in valid_turfs)
- var/turf/T = i
- if(T.density)
- valid_turfs -= T
- var/turf/LZ = pick(valid_turfs)
- var/pack_type
- if(possible_pack_types.len)
- pack_type = pick(possible_pack_types)
- else
- pack_type = pick(stray_spawnable_supply_packs)
- var/datum/supply_pack/SP = new pack_type
- var/obj/structure/closet/crate/crate = SP.generate(null)
- crate.locked = FALSE //Unlock secure crates
- crate.update_appearance()
- var/obj/structure/closet/supplypod/pod = make_pod()
- new /obj/effect/pod_landingzone(LZ, pod, crate)
-
-///Handles the creation of the pod, in case it needs to be modified beforehand
-/datum/round_event/stray_cargo/proc/make_pod()
- var/obj/structure/closet/supplypod/S = new
- return S
-
-///Picks an area that wouldn't risk critical damage if hit by a pod explosion
-/datum/round_event/stray_cargo/proc/find_event_area()
- var/static/list/allowed_areas
- if(!allowed_areas)
- ///Places that shouldn't explode
- var/list/safe_area_types = typecacheof(list(
- /area/ship/science/ai_chamber,
- /area/ship/engineering
- ))
-
- ///Subtypes from the above that actually should explode.
- var/list/unsafe_area_subtypes = typecacheof(list())
- allowed_areas = make_associative(typesof(/area/ship)) - safe_area_types + unsafe_area_subtypes
- var/list/possible_areas = typecache_filter_list(GLOB.sortedAreas,allowed_areas)
- if (length(possible_areas))
- return pick(possible_areas)
diff --git a/code/modules/faction/faction_datum.dm b/code/modules/faction/faction_datum.dm
index 450ee96889538..487d4f9c7810c 100644
--- a/code/modules/faction/faction_datum.dm
+++ b/code/modules/faction/faction_datum.dm
@@ -1,62 +1,104 @@
/datum/faction
var/name
+ /// Primarly to be used for backend stuff.
+ var/short_name
var/parent_faction
+ /// List of prefixes that ships of this faction uses
var/list/prefixes
+ /// list of factions that are "allowed" with this faction, used for factional cargo
+ var/list/allowed_factions
+
+/datum/faction/New()
+ if(!short_name)
+ short_name = name
+
+/// Easy way to check if something is "allowed", checks to see if it matches the name or faction typepath because factions are a fucking mess
+/datum/faction/proc/allowed_faction(value_to_check)
+ ///Are we the same datum?
+ if(istype(value_to_check, src))
+ return TRUE
+ ///Allow if we share a parent faction
+ if(istype(value_to_check, parent_faction))
+ return TRUE
+ //do we have the same faction even if one is a define?
+ if(value_to_check == name)
+ return TRUE
+ if(value_to_check in allowed_factions)
+ return TRUE
+ return FALSE
/datum/faction/syndicate
name = FACTION_SYNDICATE
parent_faction = /datum/faction/syndicate
- prefixes = list("SEV", "SSV")
+ prefixes = PREFIX_SYNDICATE
/datum/faction/syndicate/ngr
name = FACTION_NGR
- prefixes = list("NGRV")
+ short_name = "NGR"
+ prefixes = PREFIX_NGR
/datum/faction/syndicate/cybersun
name = FACTION_CYBERSUN
- prefixes = list("CSSV")
+ prefixes = PREFIX_CYBERSUN
+
+/datum/faction/syndicate/hardliners
+ name = FACTION_HARDLINERS
+ prefixes = PREFIX_HARDLINERS
/datum/faction/syndicate/suns
name = FACTION_SUNS
- prefixes = list("SUNS")
+ short_name = "SUNS"
+ prefixes = PREFIX_SUNS
/datum/faction/solgov
name = FACTION_SOLGOV
- prefixes = list("SCSV")
+ prefixes = PREFIX_SOLGOV
/datum/faction/srm
name = FACTION_SRM
- prefixes = list("SRSV")
+ short_name = "SRM"
+ prefixes = PREFIX_SRM
/datum/faction/inteq
name = FACTION_INTEQ
- prefixes = list("IRMV")
+ short_name = "INTEQ"
+ prefixes = PREFIX_INTEQ
/datum/faction/clip
name = FACTION_CLIP
- prefixes = list("CMSV", "CMGSV")
+ short_name = "CLIP"
+ prefixes = PREFIX_CLIP
/datum/faction/nt
name = FACTION_NT
+ short_name = "NT"
parent_faction = /datum/faction/nt
- prefixes = list("NTSV")
+ prefixes = PREFIX_NT
/datum/faction/nt/ns_logi
name = FACTION_NS_LOGI
- prefixes = list("NSSV")
+ prefixes = PREFIX_NS_LOGI
/datum/faction/nt/vigilitas
name = FACTION_VIGILITAS
- prefixes = list("VISV")
+ prefixes = PREFIX_VIGILITAS
/datum/faction/frontier
name = FACTION_FRONTIER
- prefixes = list("FFV")
+ prefixes = PREFIX_FRONTIER
/datum/faction/pgf
name = FACTION_PGF
- prefixes = list("PGF", "PGFMC", "PGFN")
+ short_name = "PGF"
+ prefixes = PREFIX_PGF
/datum/faction/independent
name = FACTION_INDEPENDENT
- prefixes = list("SV", "IMV", "ISV")
+ short_name = "Indie"
+ prefixes = PREFIX_INDEPENDENT
+
+/datum/faction/syndicate/scarborough_arms
+ name = "Scarborough Arms"
+ parent_faction = /datum/faction/syndicate
+ prefixes = PREFIX_INDEPENDENT
+ allowed_factions = list(/datum/faction/syndicate)
diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm
index 229924eee7ba2..42fc90d0cc150 100644
--- a/code/modules/fishing/aquarium/aquarium_kit.dm
+++ b/code/modules/fishing/aquarium/aquarium_kit.dm
@@ -4,7 +4,7 @@
desc = "Autogenerates nutritious fish feed based on sample inside."
icon = 'icons/obj/aquarium.dmi'
icon_state = "fish_feed"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/fish_feed/Initialize(mapload)
. = ..()
@@ -32,13 +32,12 @@
desc = "Everything you need to build your own aquarium. Raw materials sold separately."
icon = 'icons/obj/aquarium.dmi'
icon_state = "construction_kit"
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
/obj/item/aquarium_kit/attack_self(mob/user)
. = ..()
to_chat(user,span_notice("There's instruction and tools necessary to build aquarium inside. All you need is to start crafting."))
-
/obj/item/aquarium_prop
name = "generic aquarium prop"
desc = "very boring"
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index 4f2c3cd1343ad..40b979a895771 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -386,6 +386,6 @@
if(initial(fish.available_in_random_cases) || !case_fish_only)
chance_table[fish] = initial(fish.random_case_rarity)
probability_table[argkey] = chance_table
- return pickweight(probability_table[argkey])
+ return pick_weight(probability_table[argkey])
diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm
index eeb0696315ed6..bf4df70be8e4a 100644
--- a/code/modules/fishing/fishing_minigame.dm
+++ b/code/modules/fishing/fishing_minigame.dm
@@ -64,7 +64,7 @@
if(rod.hook.fishing_hook_traits & FISHING_HOOK_WEIGHTED)
special_effects += FISHING_MINIGAME_RULE_WEIGHTED_BAIT
-/datum/fishing_challenge/Destroy(force, ...)
+/datum/fishing_challenge/Destroy(force)
if(!completed)
complete(win = FALSE)
if(fishing_line)
diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm
index 136a650148cd4..db051d69175e5 100644
--- a/code/modules/fishing/sources/_fish_source.dm
+++ b/code/modules/fishing/sources/_fish_source.dm
@@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(preset_fish_sources,init_fishing_configurations())
/// In case you want more complex rules for specific spots
/datum/fish_source/proc/roll_reward(obj/item/fishing_rod/rod, mob/fisherman)
- return pickweight(get_modified_fish_table(rod,fisherman))
+ return pick_weight(get_modified_fish_table(rod,fisherman))
/// Gives out the reward if possible
/datum/fish_source/proc/dispense_reward(reward_path, mob/fisherman)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 8f8e532577c0c..111ce9a321abf 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -34,12 +34,14 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if(world.time < next_hallucination)
return
- var/halpick = pickweight(GLOB.hallucination_list)
+ var/halpick = pick_weight(GLOB.hallucination_list)
new halpick(src, FALSE)
next_hallucination = world.time + rand(100, 600)
/mob/living/carbon/proc/set_screwyhud(hud_type)
+ if(HAS_TRAIT(src, TRAIT_ANALGESIA))
+ hud_type = SCREWYHUD_HEALTHY
hal_screwyhud = hud_type
update_health_hud()
@@ -1263,7 +1265,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
target.playsound_local(get_turf(src), "sparks", 100, 1)
target.staminaloss += 50
target.Stun(40)
- target.jitteriness += 1000
+ target.adjust_jitter(1000, max = 1500)
target.do_jitter_animation(target.jitteriness)
addtimer(CALLBACK(src, PROC_REF(shock_drop)), 20)
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index ec10f7dfb0f2c..1caa3bcb14fa9 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -233,7 +233,7 @@
/obj/item/reagent_containers/food/drinks/ice
name = "ice cup"
desc = "Careful, cold ice, do not chew."
- custom_price = 15
+ custom_price = 5
icon_state = "coffee"
list_reagents = list(/datum/reagent/consumable/ice = 30)
spillable = TRUE
@@ -268,21 +268,21 @@
list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5)
foodtype = SUGAR
resistance_flags = FREEZE_PROOF
- custom_price = 120
+ custom_price = 5
/obj/item/reagent_containers/food/drinks/cafelatte
name = "cafe latte"
desc = "A nice, strong and refreshing beverage while you're reading."
icon_state = "cafe_latte"
list_reagents = list(/datum/reagent/consumable/cafe_latte = 30)
- custom_price = 200
+ custom_price = 5
/obj/item/reagent_containers/food/drinks/soylatte
name = "soy latte"
desc = "A nice and refreshing beverage while you're reading."
icon_state = "soy_latte"
list_reagents = list(/datum/reagent/consumable/soy_latte = 30)
- custom_price = 200
+ custom_price = 5
/obj/item/reagent_containers/food/drinks/dry_ramen
name = "cup ramen"
@@ -291,7 +291,7 @@
list_reagents = list(/datum/reagent/consumable/dry_ramen = 15, /datum/reagent/consumable/sodiumchloride = 3)
foodtype = GRAIN
isGlass = FALSE
- custom_price = 95
+ custom_price = 5
/obj/item/reagent_containers/food/drinks/waterbottle
name = "Ryuunosuke Reserve" //we still have to find a way to make multiple variants as per the plan
@@ -305,7 +305,7 @@
amount_per_transfer_from_this = 10
fill_icon_thresholds = list(0, 10, 25, 50, 75, 80, 90)
isGlass = FALSE
- custom_price = 30
+ custom_price = 8
can_have_cap = TRUE
// The 2 bottles have separate cap overlay icons because if the bottle falls over while bottle flipping the cap stays fucked on the moved overlay
cap_icon_state = "bottle_cap_small"
@@ -374,7 +374,7 @@
icon_state = "beer"
list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
foodtype = SUGAR | ALCOHOL
- custom_price = 60
+ custom_price = 10
/obj/item/reagent_containers/food/drinks/beer/light
name = "Carp Lite"
@@ -388,7 +388,7 @@
item_state = "beer"
list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30)
foodtype = GRAIN | ALCOHOL
- custom_price = 60
+ custom_price = 15
/obj/item/reagent_containers/food/drinks/sillycup
name = "paper cup"
@@ -512,7 +512,7 @@
/obj/item/reagent_containers/food/drinks/flask
name = "flask"
desc = "Every good spacer knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
- custom_price = 200
+ custom_price = 20
icon_state = "flask"
custom_materials = list(/datum/material/iron=250)
volume = 60
@@ -554,7 +554,7 @@
reagent_flags = NONE
spillable = FALSE
isGlass = FALSE
- custom_price = 45
+ custom_price = 5
var/pierced = FALSE
obj_flags = CAN_BE_HIT
@@ -593,6 +593,7 @@
broh.losebreath++
switch(broh.losebreath)
if(-INFINITY to 0)
+ EMPTY_BLOCK_GUARD
if(1 to 2)
if(prob(30))
user.visible_message("[broh]'s eyes water as [broh.p_they()] chug the can of [src]!")
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 0aa4ac7fad38f..78ec76bc06ab6 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -9,7 +9,7 @@
desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents."
icon_state = "glassbottle"
fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90)
- custom_price = 65
+ custom_price = 15
amount_per_transfer_from_this = 10
volume = 100
force = 15 //Smashing bottles over someone's head hurts.
@@ -32,7 +32,7 @@
desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents."
icon_state = "glassbottlesmall"
volume = 50
- custom_price = 55
+ custom_price = 1
/obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user)
if(!target)
@@ -135,11 +135,6 @@
icon_state = "whiskeybottle"
list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 100)
-/obj/item/reagent_containers/food/drinks/bottle/kong
- name = "Kong"
- desc = "Makes You Go Ape!"
- list_reagents = list(/datum/reagent/consumable/ethanol/whiskey/kong = 100)
-
/obj/item/reagent_containers/food/drinks/bottle/candycornliquor
name = "candy corn liquor"
desc = "Like they drank in 2D speakeasies."
@@ -297,7 +292,7 @@
/obj/item/reagent_containers/food/drinks/bottle/orangejuice
name = "orange juice"
desc = "Sweet and tart orange juice. Usually found fortified to make it more nutritious. Full of vitamin C!"
- custom_price = 100
+ custom_price = 10
icon_state = "orangejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -309,7 +304,7 @@
/obj/item/reagent_containers/food/drinks/bottle/lemonjuice
name = "lemon juice"
desc = "Lemonade for everyone!"
- custom_price = 100
+ custom_price = 10
icon_state = "lemonjuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -321,7 +316,7 @@
/obj/item/reagent_containers/food/drinks/bottle/cream
name = "milk cream"
desc = "Cream made from milk. It's thicker than milk, which hopefully prevents any mixups."
- custom_price = 100
+ custom_price = 10
icon_state = "cream"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -333,7 +328,7 @@
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
name = "tomato juice"
desc = "Juice from tomatoes and salt. You'll often find some technicians soaking in this if they've been working with plasma."
- custom_price = 100
+ custom_price = 10
icon_state = "tomatojuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -345,7 +340,7 @@
/obj/item/reagent_containers/food/drinks/bottle/limejuice
name = "lime juice"
desc = "Lime juice. You might want to mix something with this instead of drinking it straight..."
- custom_price = 100
+ custom_price = 10
icon_state = "limejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -357,7 +352,7 @@
/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice
name = "pineapple juice"
desc = "Tart, sweet juice from the tropical pineapple."
- custom_price = 100
+ custom_price = 10
icon_state = "pineapplejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -370,7 +365,7 @@
/obj/item/reagent_containers/food/drinks/bottle/menthol
name = "menthol"
desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
- custom_price = 100
+ custom_price = 10
icon_state = "mentholbox"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -381,7 +376,7 @@
/obj/item/reagent_containers/food/drinks/bottle/grenadine
name = "Three-Star Grenadine"
desc = "A commonly seen bottle of grenadine - or sweet fruit syrup. It might even contain real cherries, as well as some blackcurrant for color."
- custom_price = 100
+ custom_price = 10
icon_state = "grenadine"
isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/grenadine = 100)
@@ -391,7 +386,7 @@
/obj/item/reagent_containers/food/drinks/bottle/applejack
name = "Mars Lightning"
desc = "A strong brandy originating from apples, considered the older sibling to hard cider. Mars Lightning is often partnered with anti-gravity racing companies, leading to it often being served straight or for impromptu mixes."
- custom_price = 100
+ custom_price = 15
icon_state = "applejack_bottle"
isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100)
@@ -400,7 +395,7 @@
/obj/item/reagent_containers/food/drinks/bottle/champagne
name = "Treu Champagne"
desc = "Finely sourced from entire canton planets dedicated to faithful reproduction of pre-Night Of Fire vineyards. Typically enjoyed for celebrations and the turn of new years."
- custom_premium_price = 250
+ custom_premium_price = 25
icon_state = "champagne_bottle"
isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100)
@@ -414,7 +409,7 @@
/obj/item/reagent_containers/food/drinks/bottle/trappist
name = "Roumain Trapper's"
desc = "Traditionally (and heavily monitored for authenticity) made beer brewed on Illestren. Trapper's beer must be brewed by Saint Roumain Hunters or Shadows, made to fit the needs of their community first, and must never be made for profit... which makes it a common sight in the Frontier."
- custom_premium_price = 170
+ custom_premium_price = 17
icon_state = "trappistbottle"
volume = 50
list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50)
@@ -453,14 +448,27 @@
isGlass = TRUE
////////////////////////// MOLOTOV ///////////////////////
-/obj/item/reagent_containers/food/drinks/bottle/molotov
+/obj/item/reagent_containers/food/drinks/molotov
name = "molotov cocktail"
desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by desperate militias and revolutionaries. Light and toss."
icon_state = "vodkabottle"
+ fill_icon_thresholds = list(0, 10, 20, 30, 40, 50, 60, 70, 80, 90)
+ amount_per_transfer_from_this = 10
+ volume = 100
+ force = 15 //Smashing bottles over someone's head hurts.
+ throwforce = 15
+ item_state = "broken_beer" //Generic held-item sprite until unique ones are made.
+ lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
+ pickup_sound = 'sound/items/handling/bottle_pickup.ogg'
+ drop_sound = 'sound/items/handling/bottle_drop.ogg'
+ var/const/duration = 13 //Directly relates to the 'knockdown' duration. Lowered by armor (i.e. helmets)
+ isGlass = TRUE
+ foodtype = ALCOHOL
list_reagents = list()
var/active = 0
-/obj/item/reagent_containers/food/drinks/bottle/molotov/CheckParts(list/parts_list)
+/obj/item/reagent_containers/food/drinks/molotov/CheckParts(list/parts_list)
..()
var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents
if(B)
@@ -471,7 +479,7 @@
isGlass = FALSE
return
-/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/reagent_containers/food/drinks/molotov/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
var/firestarter = FALSE
for(var/datum/reagent/reagent as anything in reagents.reagent_list)
if(reagent.accelerant_quality)
@@ -488,7 +496,7 @@
new /obj/effect/hotspot(otherT)
..()
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
+/obj/item/reagent_containers/food/drinks/molotov/attackby(obj/item/I, mob/user, params)
if(I.get_temperature() && !active)
active = TRUE
log_bomber(user, "has primed a", src, "for detonation")
@@ -498,7 +506,7 @@
if(!isGlass)
addtimer(CALLBACK(src, PROC_REF(explode)), 5 SECONDS)
-/obj/item/reagent_containers/food/drinks/bottle/molotov/proc/explode()
+/obj/item/reagent_containers/food/drinks/molotov/proc/explode()
if(!active)
return
if(get_turf(src))
@@ -510,7 +518,7 @@
target.fire_act()
qdel(src)
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attack_self(mob/user)
+/obj/item/reagent_containers/food/drinks/molotov/attack_self(mob/user)
if(active)
if(!isGlass)
to_chat(user, "The flame's spread too far on it!")
@@ -519,6 +527,9 @@
cut_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay)
active = 0
+/obj/item/reagent_containers/food/drinks/molotov/full
+ list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100)
+
/obj/item/reagent_containers/food/drinks/bottle/pruno
name = "pruno mix"
desc = "A trash bag filled with fruit, sugar, yeast, and water, pulped together into a pungent slurry to be fermented in an enclosed space, traditionally the toilet."
@@ -606,8 +617,8 @@
/obj/item/sandstar
name = "SandBlast Sarsaparilla star"
desc = "Legend says something amazing happens when you collect enough of these."
- custom_price = 100
- custom_premium_price = 110
+ custom_price = 10
+ custom_premium_price = 11
icon = 'icons/obj/items.dmi'
icon_state = "sandstar"
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm b/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm
index 922e74ee9a3b0..45dc05531ba8d 100644
--- a/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm
@@ -1,6 +1,6 @@
/obj/item/reagent_containers/food/drinks/breakawayflask
name = "breakaway flask"
- desc = "A special flask designed to stabilize trick wines and shatter violently on contact."
+ desc = "A special flask designed to stabilize Illestren Bacterium and shatter violently on contact."
icon_state = "breakawayflask"
item_state = "breakawayflask"
w_class = WEIGHT_CLASS_SMALL
@@ -15,7 +15,7 @@
obj_flags = UNIQUE_RENAME
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
- custom_price = 25
+ custom_price = 15
can_have_cap = TRUE
cap_icon_state = "baflask_cap"
cap_on = TRUE
@@ -41,7 +41,7 @@
else
icon_state = "breakawayflask"
name = "breakaway flask"
- desc = "A special flask designed to stabilize trick wines and shatter violently on contact."
+ desc = "A special flask designed to stabilize Illestren Bacterium and shatter violently on contact."
return
/obj/item/reagent_containers/food/drinks/breakawayflask/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
@@ -54,31 +54,21 @@
vintage = TRUE
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine
- name = "Vintage Saint-Roumain Ashwine"
+ name = "Vintage Wine of Ash"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/ash_wine = 45, /datum/reagent/consumable/ethanol/absinthe = 5)
- desc = "Ashwine was originally created using herbs native to Illestren, as a means of relaxing after a long hunt. The Saint-Roumain Militia has no prohibition on a little fun."
+ desc = "Wine of Ash was originally created using herbs native to Illestren, as a means of relaxing after a long hunt. The Saint-Roumain Militia has no prohibition on a little fun."
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine
- name = "Vintage Saint-Roumain Icewine"
+ name = "Vintage Wine Of Ice"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/ice_wine = 45, /datum/reagent/consumable/ethanol/sake = 5)
- desc = "Icewine, inspired by the frigid slopes of the 'Godforsaken Precipice' that forged the group's reputation as valiant survivalists, was engineered to both soothe overheated Hunters and freeze their foes in their tracks."
+ desc = "Wine Of Ice, inspired by the frigid slopes of the 'Godforsaken Precipice' that forged the group's reputation as valiant survivalists, was engineered to both soothe overheated Hunters and freeze their foes in their tracks."
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine
- name = "Vintage Saint-Roumain Shockwine"
+ name = "Vintage Lightnings' Blessing"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/shock_wine = 45, /datum/reagent/consumable/ethanol/vodka = 5)
- desc = "Shockwine, made to invigorate consumers and incapacitate targets, took inspiration from an incident early in the Saint-Roumain Militia's history, when a young Shadow stopped a rampaging beast by plunging an electrical cable that had been dislodged in the fighting into its side."
+ desc = "Lightnings' Blessing, made to invigorate consumers and incapacitate targets, took inspiration from an incident early in the Saint-Roumain Militia's history, when a young Shadow stopped a rampaging beast by plunging an electrical cable that had been dislodged in the fighting into its side."
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine
- name = "Vintage Saint-Roumain Hearthwine"
+ name = "Vintage Hearthflame"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/hearth_wine = 45, /datum/reagent/consumable/ethanol/hcider = 5)
- desc = "Hearthwine is one of the most important tonics devised by the SRM – both for its potent abilities in staunching wounds or setting enemies aflame, and for its closeness to the divine fire associated with the Ashen Huntsman."
-
-/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine
- name = "Vintage Saint-Roumain Forcewine"
- list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/force_wine = 45, /datum/reagent/consumable/ethanol/tequila = 5)
- desc = "Forcewine was originally created as a means to create temporary shelters during long tracking expeditions. While the structures proved to be not as versatile in shape as its brewers had hoped, its utility in creating barricades or heming in hostiles was still greatly appreciated."
-
-/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine
- name = "Vintage Saint-Roumain Prismwine"
- list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/prism_wine = 45, /datum/reagent/consumable/ethanol/gin = 5)
- desc = "Prismwine is one of the most recent additions to the Saint-Roumain Militia's reserve of trickwines. It was purpose-created for fighting hostiles that utilized more advanced energy projection attacks, such as the cryonic beams of watchers or the laser guns of interstellar pirates."
+ desc = "Hearthflame is one of the most important tonics devised by the SRM – both for its potent abilities in staunching wounds or setting enemies aflame, and for its closeness to the divine fire associated with the Ashen Huntsman."
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 2f73f7678e388..79dccfc28f413 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -13,7 +13,7 @@
obj_flags = UNIQUE_RENAME
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
- custom_price = 25
+ custom_price = 2
/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype)
cut_overlays()
@@ -33,6 +33,32 @@
icon_state = "glass_empty"
renamedByPlayer = FALSE //so new drinks can rename the glass
+/obj/item/reagent_containers/food/drinks/beaglemug
+ name = "beagle mug"
+ desc = "A beloved edifice of a Dog, now as a mug!"
+ icon_state = "beaglemug"
+ amount_per_transfer_from_this = 10
+ volume = 30
+ custom_materials = list(/datum/material/glass=500)
+ max_integrity = 20
+ spillable = TRUE
+ resistance_flags = ACID_PROOF
+ obj_flags = UNIQUE_RENAME
+ drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
+ pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
+ custom_price = 15
+
+/obj/item/reagent_containers/food/drinks/beaglemug/on_reagent_change(changetype)
+ cut_overlays()
+ if(reagents.reagent_list.len)
+ var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "beaglemug_overlay")
+ icon_state = "beaglemug"
+ reagent_overlay.color = mix_color_from_reagents(reagents.reagent_list)
+ add_overlay(reagent_overlay)
+ else
+ icon_state = "beaglemug"
+ renamedByPlayer = FALSE
+
//Shot glasses!//
// This lets us add shots in here instead of lumping them in with drinks because >logic //
// The format for shots is the exact same as iconstates for the drinking glass, except you use a shot glass instead. //
@@ -49,7 +75,7 @@
possible_transfer_amounts = list()
volume = 15
custom_materials = list(/datum/material/glass=100)
- custom_price = 20
+ custom_price = 1
var/filled_desc = "The challenge is not taking as many as you can, but guessing what it is before you pass out."
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change(changetype)
diff --git a/code/modules/food_and_drinks/drinks/drinks/modglass.dm b/code/modules/food_and_drinks/drinks/drinks/modglass.dm
index 056ece3409aeb..2ac2a22870b5a 100644
--- a/code/modules/food_and_drinks/drinks/drinks/modglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/modglass.dm
@@ -35,7 +35,7 @@ GLOBAL_LIST_EMPTY(glass_variants)
obj_flags = UNIQUE_RENAME
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
- custom_price = 25
+ custom_price = 5
//rim defines the size of rim the glass has, used to decide which skins are available, and which garnish sprites to use
var/rim = RIM_MEDIUM
//stores the number of variations this glass sprite has to select from
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 3147ee9a5de41..aa55dd6ebc0ba 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -148,9 +148,9 @@
slice.update_customizable_overlays(src)
-/obj/item/reagent_containers/food/snacks/customizable/Destroy()
- for(. in ingredients)
- qdel(.)
+/obj/item/reagent_containers/food/snacks/customizable/deconstruct(disassembled)
+ for(var/ingredient in ingredients)
+ qdel(ingredient)
return ..()
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 9e84c272dbb64..ff49bb00e0ded 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -322,7 +322,7 @@ All foods are distributed among various categories. Use common sense.
return result
-/obj/item/reagent_containers/food/snacks/Destroy()
+/obj/item/reagent_containers/food/snacks/deconstruct(disassembled)
if(contents)
for(var/atom/movable/something in contents)
something.forceMove(drop_location())
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index c088b22596103..540c6f1a94ea9 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -273,7 +273,7 @@
w_class = WEIGHT_CLASS_TINY
var/faction
var/spawned_mob = /mob/living/carbon/monkey
- custom_price = 300
+ custom_price = 5
/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
var/mob/spammer = get_mob_by_key(fingerprintslast)
diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm
index 5129911cd3111..3784e2f0fbd10 100644
--- a/code/modules/food_and_drinks/food/snacks_pizza.dm
+++ b/code/modules/food_and_drinks/food/snacks_pizza.dm
@@ -160,56 +160,6 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
-/obj/item/reagent_containers/food/snacks/pizza/arnold
- name = "\improper Arnold pizza"
- desc = "Hello, you've reached Arnold's pizza shop. I'm not here now, I'm out killing pepperoni."
- icon_state = "arnoldpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/arnold
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30)
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
-
-/obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm
- var/obj/item/bodypart/l_arm = user.get_bodypart(BODY_ZONE_L_ARM)
- var/obj/item/bodypart/r_arm = user.get_bodypart(BODY_ZONE_R_ARM)
- if(prob(50) && iscarbon(user) && M == user && (r_arm || l_arm))
- user.visible_message("\The [src] breaks off [user]'s arm!!", "\The [src] breaks off your arm!")
- if(l_arm)
- l_arm.dismember()
- else
- r_arm.dismember()
- playsound(user, "desceration" ,50, TRUE, -1)
-
-/obj/item/reagent_containers/food/snacks/proc/i_kill_you(obj/item/I, mob/user)
- if(istype(I, /obj/item/reagent_containers/food/snacks/pineappleslice))
- to_chat(user, "If you want something crazy like pineapple, I kill you.")
- user.gib() //if you want something crazy like pineapple, i kill you
-
-/obj/item/reagent_containers/food/snacks/pizza/arnold/attack(mob/living/M, mob/living/user)
- . = ..()
- try_break_off(M, user)
-
-/obj/item/reagent_containers/food/snacks/pizza/arnold/attackby(obj/item/I, mob/user)
- i_kill_you(I, user)
- . = ..()
-
-
-/obj/item/reagent_containers/food/snacks/pizzaslice/arnold
- name = "\improper Arnold pizza slice"
- desc = "I come over, maybe I give you a pizza, maybe I break off your arm."
- icon_state = "arnoldpizzaslice"
- filling_color = "#A52A2A"
- tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
- foodtype = GRAIN | VEGETABLES | DAIRY | MEAT
-
-/obj/item/reagent_containers/food/snacks/pizzaslice/arnold/attack(mob/living/M, mob/living/user)
- . =..()
- try_break_off(M, user)
-
-/obj/item/reagent_containers/food/snacks/pizzaslice/arnold/attackby(obj/item/I, mob/user)
- i_kill_you(I, user)
- . = ..()
-
-
/obj/item/reagent_containers/food/snacks/pizzaslice/custom
name = "pizza slice"
icon_state = "pizzamargheritaslice"
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index b071add1027a3..a450555a7a69b 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -15,36 +15,6 @@
/*food_flags = FOOD_FINGER_FOOD*/
w_class = WEIGHT_CLASS_TINY
-/obj/item/reagent_containers/food/snacks/candy/bronx
- name = "South Bronx Paradise bar"
- desc = "Lose weight, guaranteed! Caramel Mocha Flavor. Something about product consumption..."
- icon_state = "bronx"
- item_state = "candy"
- trash = /obj/item/trash/candy
- list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/yuck = 1)
- junkiness = 10
- bitesize = 10
- filling_color = "#e4d4b7"
- tastes = list("candy" = 5, "weight loss" = 4, "insect larva" = 1)
- foodtype = JUNKFOOD | RAW | GROSS
- custom_premium_price = 800
- var/revelation = FALSE
-
-/obj/item/reagent_containers/food/snacks/candy/bronx/On_Consume(mob/living/eater)
- . = ..()
- if(ishuman(eater))
- var/mob/living/carbon/human/carl = eater
- var/datum/disease/P = new /datum/disease/parasite()
- carl.ForceContractDisease(P, FALSE, TRUE)
-
-/obj/item/reagent_containers/food/snacks/candy/bronx/examine(mob/user)
- . = ..()
- if(revelation == FALSE)
- to_chat(user, "Geeze, you need to get to get your eyes checked. You should look again...")
- desc = "Lose weight, guaranteed! Caramel Mocha Flavor! WARNING: PRODUCT NOT FIT FOR HUMAN CONSUMPTION. CONTAINS LIVE DIAMPHIDIA SPECIMENS."
- name = "South Bronx Parasite bar"
- revelation = TRUE
-
/obj/item/reagent_containers/food/snacks/sosjerky
name = "\improper Scaredy's Private Reserve Beef Jerky"
icon_state = "sosjerky"
@@ -85,7 +55,7 @@
tastes = list("dried raisins" = 1)
foodtype = JUNKFOOD | FRUIT | SUGAR
/*food_flags = FOOD_FINGER_FOOD*/
- custom_price = 90
+ custom_price = 5
w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/no_raisin/healthy
@@ -104,7 +74,7 @@
filling_color = "#FFD700"
foodtype = JUNKFOOD | GRAIN | SUGAR
/*food_flags = FOOD_FINGER_FOOD*/
- custom_price = 30
+ custom_price = 5
w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/food/snacks/candy_trash
@@ -131,7 +101,7 @@
filling_color = "#FFD700"
tastes = list("cheese" = 5, "crisps" = 2)
foodtype = JUNKFOOD | DAIRY | SUGAR
- custom_price = 45
+ custom_price = 5
/obj/item/reagent_containers/food/snacks/syndicake
name = "syndi-cakes"
diff --git a/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm b/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm
index 3024c188facf6..7b50db0405fad 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/big_mortar.dm
@@ -28,7 +28,7 @@
. += span_notice("It can be (un)secured with wrench")
. += span_notice("You can empty all of the items out of it with Alt Click")
-/obj/structure/large_mortar/Destroy()
+/obj/structure/large_mortar/deconstruct(disassembled)
drop_everything_contained()
return ..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm b/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm
index b0d91d370ab15..122f163ec7f72 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/cutting_board.dm
@@ -52,7 +52,7 @@
if(length(contents))
. += span_notice("It has [contents[1]] sitting on it.")
-/obj/item/cutting_board/Destroy()
+/obj/item/cutting_board/deconstruct(disassembled)
drop_everything_contained()
return ..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index db88c5d0cc157..d3b7e7f152dea 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -38,8 +38,11 @@
create_reagents(100)
soundloop = new(list(src), FALSE)
-/obj/machinery/microwave/Destroy()
+/obj/machinery/microwave/on_deconstruction()
eject()
+ return ..()
+
+/obj/machinery/microwave/Destroy()
QDEL_NULL(soundloop)
QDEL_LIST(ingredients)
if(wires)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
deleted file mode 100644
index 79382343e1ae5..0000000000000
--- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+++ /dev/null
@@ -1,103 +0,0 @@
-GLOBAL_LIST_EMPTY(monkey_recyclers)
-
-/obj/machinery/monkey_recycler
- name = "monkey recycler"
- desc = "A machine used for recycling dead monkeys into monkey cubes."
- icon = 'icons/obj/kitchen.dmi'
- icon_state = "grinder"
- layer = BELOW_OBJ_LAYER
- density = TRUE
- use_power = IDLE_POWER_USE
- idle_power_usage = IDLE_DRAW_MINIMAL
- active_power_usage = ACTIVE_DRAW_MEDIUM
- circuit = /obj/item/circuitboard/machine/monkey_recycler
- var/stored_matter = 0
- var/cube_production = 0.2
- var/list/connected = list() //Keeps track of connected xenobio consoles, for deletion in /Destroy()
-
-/obj/machinery/monkey_recycler/Initialize(mapload)
- . = ..()
- if (mapload)
- GLOB.monkey_recyclers += src
-
-/obj/machinery/monkey_recycler/Destroy()
- GLOB.monkey_recyclers -= src
- for(var/thing in connected)
- var/obj/machinery/computer/camera_advanced/xenobio/console = thing
- console.connected_recycler = null
- connected.Cut()
- return ..()
-
-/obj/machinery/monkey_recycler/RefreshParts() //Ranges from 0.2 to 0.8 per monkey recycled
- cube_production = 0
- for(var/obj/item/stock_parts/manipulator/B in component_parts)
- cube_production += B.rating * 0.1
- for(var/obj/item/stock_parts/matter_bin/M in component_parts)
- cube_production += M.rating * 0.1
-
-/obj/machinery/monkey_recycler/examine(mob/user)
- . = ..()
- if(in_range(user, src) || isobserver(user))
- . += "The status display reads: Producing [cube_production] cubes for every monkey inserted."
-
-/obj/machinery/monkey_recycler/attackby(obj/item/O, mob/user, params)
- if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O))
- return
-
- if(default_pry_open(O))
- return
-
- if(default_unfasten_wrench(user, O))
- power_change()
- return
-
- if(default_deconstruction_crowbar(O))
- return
-
- if(machine_stat) //NOPOWER etc
- return
- else
- return ..()
-
-/obj/machinery/monkey_recycler/MouseDrop_T(mob/living/target, mob/living/user)
- if(!istype(target))
- return
- if(ismonkey(target))
- stuff_monkey_in(target, user)
-
-/obj/machinery/monkey_recycler/proc/stuff_monkey_in(mob/living/carbon/monkey/target, mob/living/user)
- if(!istype(target))
- return
- if(target.stat == CONSCIOUS)
- to_chat(user, "The monkey is struggling far too much to put it in the recycler.")
- return
- if(target.buckled || target.has_buckled_mobs())
- to_chat(user, "The monkey is attached to something.")
- return
- qdel(target)
- to_chat(user, "You stuff the monkey into the machine.")
- playsound(src.loc, 'sound/machines/juicer.ogg', 50, TRUE)
- var/offset = prob(50) ? -2 : 2
- animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
- use_power(500)
- stored_matter += cube_production
- addtimer(VARSET_CALLBACK(src, pixel_x, base_pixel_x))
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), user, "The machine now has [stored_matter] monkey\s worth of material stored."))
-
-/obj/machinery/monkey_recycler/interact(mob/user)
- if(stored_matter >= 1)
- to_chat(user, "The machine hisses loudly as it condenses the ground monkey meat. After a moment, it dispenses a brand new monkey cube.")
- playsound(src.loc, 'sound/machines/hiss.ogg', 50, TRUE)
- for(var/i in 1 to FLOOR(stored_matter, 1))
- new /obj/item/reagent_containers/food/snacks/monkeycube(src.loc)
- stored_matter--
- to_chat(user, "The machine's display flashes that it has [stored_matter] monkeys worth of material left.")
- else
- to_chat(user, "The machine needs at least 1 monkey worth of material to produce a monkey cube. It currently has [stored_matter].")
-
-/obj/machinery/monkey_recycler/multitool_act(mob/living/user, obj/item/multitool/I)
- . = ..()
- if(istype(I))
- to_chat(user, "You log [src] in the multitool's buffer.")
- I.buffer = src
- return TRUE
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index bc17a9fd22af3..ef3cceed2afc7 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -37,7 +37,7 @@
qdel(what)
/obj/machinery/processor/proc/select_recipe(X)
- for (var/type in subtypesof(/datum/food_processor_process) - /datum/food_processor_process/mob)
+ for (var/type in subtypesof(/datum/food_processor_process))
var/datum/food_processor_process/recipe = new type()
if (!istype(X, recipe.input) || !istype(src, recipe.required_machine))
continue
@@ -149,60 +149,3 @@
O.forceMove(drop_location())
for (var/mob/M in src)
M.forceMove(drop_location())
-
-/obj/machinery/processor/slime
- name = "slime processor"
- desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating."
-
-/obj/machinery/processor/slime/Initialize()
- . = ..()
- var/obj/item/circuitboard/machine/B = new /obj/item/circuitboard/machine/processor/slime(null)
- B.apply_default_parts(src)
-
-/obj/machinery/processor/slime/adjust_item_drop_location(atom/movable/AM)
- var/static/list/slimecores = subtypesof(/obj/item/slime_extract)
- var/i = 0
- if(!(i = slimecores.Find(AM.type))) // If the item is not found
- return
- if (i <= 16) // If in the first 12 slots
- AM.pixel_x = AM.base_pixel_x - 12 + ((i%4)*8)
- AM.pixel_y = AM.base_pixel_y - 12 + (round(i/4)*8)
- return i
- var/ii = i - 16
- AM.pixel_x = AM.base_pixel_x - 12 + ((ii%4)*8)
- AM.pixel_y = AM.base_pixel_y - 12 + (round(ii/4)*8)
- return i
-
-/obj/machinery/processor/slime/process()
- if(processing)
- return
- var/mob/living/simple_animal/slime/picked_slime
- for(var/mob/living/simple_animal/slime/slime in range(1,src))
- if(slime.loc == src)
- continue
- if(istype(slime, /mob/living/simple_animal/slime))
- if(slime.stat)
- picked_slime = slime
- break
- if(!picked_slime)
- return
- var/datum/food_processor_process/P = select_recipe(picked_slime)
- if (!P)
- return
-
- visible_message("[picked_slime] is sucked into [src].")
- picked_slime.forceMove(src)
-
-/obj/machinery/processor/slime/process_food(datum/food_processor_process/recipe, atom/movable/what)
- var/mob/living/simple_animal/slime/S = what
- if (istype(S))
- var/C = S.cores
- if(S.stat != DEAD)
- S.forceMove(drop_location())
- S.visible_message("[C] crawls free of the processor!")
- return
- for(var/i in 1 to (C+rating_amount-1))
- var/atom/movable/item = new S.coretype(drop_location())
- adjust_item_drop_location(item)
- SSblackbox.record_feedback("tally", "slime_core_harvested", 1, S.colour)
- ..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 9a6b10e0444b1..e75a6519dbe52 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -12,6 +12,7 @@
idle_power_usage = IDLE_DRAW_MINIMAL
active_power_usage = ACTIVE_DRAW_MINIMAL
circuit = /obj/item/circuitboard/machine/smartfridge
+ integrity_failure = 0.4
var/max_n_of_items = 1500
var/allow_ai_retrieve = FALSE
@@ -40,7 +41,10 @@
. += "The status display reads: This unit can hold a maximum of [max_n_of_items] items."
/obj/machinery/smartfridge/update_icon_state()
- if(machine_stat)
+ if(machine_stat & BROKEN)
+ icon_state = "[initial(icon_state)]-broken"
+ return ..()
+ else if(!powered())
icon_state = "[initial(icon_state)]-off"
return ..()
@@ -53,10 +57,8 @@
icon_state = "[initial(icon_state)]"
if(1 to 25)
icon_state = "[initial(icon_state)]1"
- if(26 to 75)
+ if(26 to INFINITY)
icon_state = "[initial(icon_state)]2"
- if(76 to INFINITY)
- icon_state = "[initial(icon_state)]3"
return ..()
/obj/machinery/smartfridge/update_overlays()
@@ -380,23 +382,6 @@
return TRUE
return FALSE
-// -------------------------------------
-// Xenobiology Slime-Extract Smartfridge
-// -------------------------------------
-/obj/machinery/smartfridge/extract
- name = "smart slime extract storage"
- desc = "A refrigerated storage unit for slime extracts."
-
-/obj/machinery/smartfridge/extract/accept_check(obj/item/O)
- if(istype(O, /obj/item/slime_extract))
- return TRUE
- if(istype(O, /obj/item/slime_scanner))
- return TRUE
- return FALSE
-
-/obj/machinery/smartfridge/extract/preloaded
- initial_contents = list(/obj/item/slime_scanner = 2)
-
// -------------------------
// Organ Surgery Smartfridge
// -------------------------
@@ -437,6 +422,15 @@
var/obj/item/organ/O = AM
O.organ_flags &= ~ORGAN_FROZEN
+/obj/machinery/smartfridge/organ/preloaded
+ initial_contents = list(
+ /obj/item/organ/stomach = 2,
+ /obj/item/organ/lungs = 1,
+ /obj/item/organ/liver = 2,
+ /obj/item/organ/eyes = 2,
+ /obj/item/organ/heart = 2,
+ /obj/item/organ/ears = 2)
+
// -----------------------------
// Chemistry Medical Smartfridge
// -----------------------------
diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm
index b5c4c2c42b857..bfc9179c4893b 100644
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -341,13 +341,13 @@
/obj/item/pizzabox/infinite/proc/attune_pizza(mob/living/carbon/human/noms) //tonight on "proc names I never thought I'd type"
if(!pizza_preferences[noms.ckey])
- pizza_preferences[noms.ckey] = pickweight(pizza_types)
+ pizza_preferences[noms.ckey] = pick_weight(pizza_types)
if(noms.has_quirk(/datum/quirk/pineapple_liker))
pizza_preferences[noms.ckey] = /obj/item/reagent_containers/food/snacks/pizza/pineapple
else if(noms.has_quirk(/datum/quirk/pineapple_hater))
var/list/pineapple_pizza_liker = pizza_types.Copy()
pineapple_pizza_liker -= /obj/item/reagent_containers/food/snacks/pizza/pineapple
- pizza_preferences[noms.ckey] = pickweight(pineapple_pizza_liker)
+ pizza_preferences[noms.ckey] = pick_weight(pineapple_pizza_liker)
else if(noms.mind && noms.mind.assigned_role == "Botanist")
pizza_preferences[noms.ckey] = /obj/item/reagent_containers/food/snacks/pizza/dank
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 9fdacebf8900e..8be72cd786db8 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -633,22 +633,10 @@
/datum/chemical_reaction/hearth_wine
results = list(/datum/reagent/consumable/ethanol/trickwine/hearth_wine = 5)
- required_reagents = list(/datum/reagent/consumable/ethanol/hcider = 3, /datum/reagent/consumable/pyre_elementum = 1, /datum/reagent/fuel = 1)
+ required_reagents = list(/datum/reagent/consumable/ethanol/hcider = 3, /datum/reagent/consumable/pyre_elementum = 1, /datum/reagent/phosphorus = 1)
required_container = /obj/structure/fermenting_barrel/distiller
mix_sound ='sound/items/welder.ogg'
-/datum/chemical_reaction/force_wine
- results = list(/datum/reagent/consumable/ethanol/trickwine/force_wine = 5)
- required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 3, /datum/reagent/calcium = 1, /datum/reagent/consumable/comet_trail = 1)
- required_container = /obj/structure/fermenting_barrel/distiller
- mix_sound ='sound/magic/forcewall.ogg'
-
-/datum/chemical_reaction/prism_wine
- results = list(/datum/reagent/consumable/ethanol/trickwine/prism_wine = 5)
- required_reagents = list(/datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/toxin/plasma = 1, /datum/reagent/consumable/tinlux = 1)
- required_container = /obj/structure/fermenting_barrel/distiller
- mix_sound ='sound/weapons/laser.ogg'
-
/datum/chemical_reaction/molten_bubbles
results = list(/datum/reagent/consumable/molten = 30)
required_reagents = list(/datum/reagent/clf3 = 10, /datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/leporazine = 1, /datum/reagent/medicine/lavaland_extract = 1)
diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm
index c13983c6792d5..63ffccdba79cd 100644
--- a/code/modules/food_and_drinks/recipes/processor_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm
@@ -45,11 +45,6 @@
input = /obj/item/reagent_containers/food/snacks/grown/parsnip
output = /obj/item/reagent_containers/food/snacks/roastparsnip
-/datum/food_processor_process/mob/slime
- input = /mob/living/simple_animal/slime
- output = null
- required_machine = /obj/machinery/processor/slime
-
/datum/food_processor_process/towercap
input = /obj/item/grown/log
output = /obj/item/popsicle_stick
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
index c79d4cea8474d..993c75246c6c0 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
@@ -81,7 +81,7 @@
name = "Energy cake"
reqs = list(
/obj/item/food/cake/birthday = 1,
- /obj/item/melee/transforming/energy/sword = 1,
+ /obj/item/melee/energy/sword = 1,
)
blacklist = list(/obj/item/food/cake/birthday/energy)
result = /obj/item/food/cake/birthday/energy
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
index 2032a33bd46dc..3f39339a4d43f 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
@@ -102,15 +102,6 @@
/obj/item/reagent_containers/food/drinks/bottle = 1)
category = CAT_DRINK
-/datum/crafting_recipe/kong
- name = "Kong"
- result = /obj/item/reagent_containers/food/drinks/bottle/kong
- time = 30
- reqs = list(/datum/reagent/consumable/ethanol/whiskey = 100,
- /obj/item/reagent_containers/food/snacks/monkeycube = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1)
- category = CAT_DRINK
-
/datum/crafting_recipe/pruno
name = "pruno mix"
result = /obj/item/reagent_containers/food/drinks/bottle/pruno
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
index 5c9bcc56cc7d5..42afb89c42285 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm
@@ -150,7 +150,6 @@
/datum/reagent/consumable/sugar = 5,
/obj/item/reagent_containers/food/snacks/pie/plain = 1,
/obj/item/reagent_containers/food/snacks/chocolatebar = 3,
- /obj/item/slime_extract = 1 //The reason you dont know how to make it!
)
result = /obj/item/reagent_containers/food/snacks/pie/cocolavatart
subcategory = CAT_PIE
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
index 2cb668df4fd09..704ac4d207e89 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm
@@ -24,18 +24,6 @@
result = /obj/item/reagent_containers/food/snacks/pizza/meat
subcategory = CAT_PIZZA
-/datum/crafting_recipe/food/arnold
- name = "Arnold pizza"
- reqs = list(
- /obj/item/reagent_containers/food/snacks/pizzabread = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet = 3,
- /obj/item/ammo_casing/c9mm = 8,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 1
- )
- result = /obj/item/reagent_containers/food/snacks/pizza/arnold
- subcategory = CAT_PIZZA
-
/datum/crafting_recipe/food/mushroompizza
name = "Mushroom pizza"
reqs = list(
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index a5cf4d78499e6..34325454bd798 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -55,7 +55,7 @@
icon_state = "s_rabbit_white"
icon_living = "s_rabbit_white"
icon_dead = "s_rabbit_white_dead"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
unsuitable_atmos_damage = 0
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 59e9a46341e64..9670e4426a6f0 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -169,4 +169,4 @@
tiled_dirt = FALSE
/turf/open/floor/holofloor/snow/cold
- initial_gas_mix = "nob=7500;TEMP=2.7"
+ initial_gas_mix = "ammonia=7500;TEMP=2.7"
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index a91ad2b900501..6f1b40b3dc9dd 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -76,6 +76,14 @@
icon_state = closed_state
return ..()
+/obj/structure/fermenting_barrel/gunpowder
+ name = "Gunpowder Barrel"
+ desc = "A wooden barrel packed with gunpowder. You should probably keep this away from sparks or open fires."
+
+/obj/structure/fermenting_barrel/gunpowder/Initialize()
+ . = ..()
+ reagents.add_reagent(/datum/reagent/gunpowder, 200)
+
/obj/structure/fermenting_barrel/distiller
name = "Distiller"
icon_state = "distiller"
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index bbb1379bcc744..bb50494156529 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -98,7 +98,7 @@
if(held_mob.is_holding(src))
if(istype(held_mob) && held_mob.gloves)
return
- held_mob.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT)
+ held_mob.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT)
if(prob(10))
to_chat(held_mob, "Your hand holding [src] burns!")
else
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index ee76f02e02c85..8ab59cc6f6583 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -7,6 +7,7 @@
icon = 'icons/obj/hydroponics/harvest.dmi'
resistance_flags = FLAMMABLE
var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
+ var/auto_scatter = TRUE
/obj/item/grown/Initialize(newloc, obj/item/seeds/new_seed)
. = ..()
@@ -18,9 +19,9 @@
// This is for adminspawn or map-placed growns. They get the default stats of their seed type.
seed = new seed()
seed.adjust_potency(50-seed.potency)
-
- pixel_x = base_pixel_x + rand(-5, 5)
- pixel_y = base_pixel_y + rand(-5, 5)
+ if(auto_scatter)
+ pixel_x = base_pixel_x + rand(-5, 5)
+ pixel_y = base_pixel_y + rand(-5, 5)
if(seed)
// Go through all traits in their genes and call on_new_plant from them.
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 56ad2264ce01c..5f0e38920cc98 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -7,7 +7,7 @@
item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_BELT
custom_materials = list(/datum/material/iron=30, /datum/material/glass=20)
var/scan_mode = PLANT_SCANMODE_STATS
@@ -179,11 +179,13 @@
volume = 50
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,15,25,50)
+ var/auto_scatter = TRUE
/obj/item/reagent_containers/glass/bottle/nutrient/Initialize()
. = ..()
- pixel_x = base_pixel_x + rand(-5, 5)
- pixel_y = base_pixel_y + rand(-5, 5)
+ if(auto_scatter)
+ pixel_x = base_pixel_x + rand(-5, 5)
+ pixel_y = base_pixel_y + rand(-5, 5)
/obj/item/reagent_containers/glass/bottle/nutrient/ez
diff --git a/code/modules/interview/interview.dm b/code/modules/interview/interview.dm
index 27b2c83321f7d..64e78e43d79b0 100644
--- a/code/modules/interview/interview.dm
+++ b/code/modules/interview/interview.dm
@@ -102,13 +102,14 @@
set name = "Open Interview"
set category = "Admin.Interview"
var/mob/dead/new_player/M = usr
- if (M?.client?.interviewee)
- var/datum/interview/I = GLOB.interviews.interview_for_client(M.client)
- if (I) // we can be returned nothing if the user is on cooldown
- I.ui_interact(M)
- else
- to_chat(usr, "You are on cooldown for interviews. Please" \
- + " wait at least 3 minutes before starting a new questionnaire.", confidential = TRUE)
+ if (!M?.client?.interviewee)
+ return
+ var/datum/interview/I = GLOB.interviews.interview_for_client(M.client)
+ if (I) // we can be returned nothing if the user is on cooldown
+ I.ui_interact(M)
+ else
+ to_chat(usr, "You are on cooldown for interviews. Please" \
+ + " wait at least 3 minutes before starting a new questionnaire.", confidential = TRUE)
/datum/interview/ui_interact(mob/user, datum/tgui/ui = null)
ui = SStgui.try_update_ui(user, src, ui)
diff --git a/code/modules/interview/interview_manager.dm b/code/modules/interview/interview_manager.dm
index f5a557a854dea..d09d90a8c6d15 100644
--- a/code/modules/interview/interview_manager.dm
+++ b/code/modules/interview/interview_manager.dm
@@ -18,7 +18,7 @@ GLOBAL_DATUM_INIT(interviews, /datum/interview_manager, new)
/// Ckeys which are currently in the cooldown system, they will be unable to create new interviews
var/list/cooldown_ckeys = list()
-/datum/interview_manager/Destroy(force, ...)
+/datum/interview_manager/Destroy(force)
QDEL_LIST(open_interviews)
QDEL_LIST(interview_queue)
QDEL_LIST(closed_interviews)
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index ee953b0fb74d7..0ac783477e79f 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -123,7 +123,7 @@
return FALSE
if(!visualsOnly)
var/datum/bank_account/bank_account = new(H.real_name, H.age)
- bank_account.adjust_money(officer ? 250 : 100, "starting_money") //just a little bit of money for you
+ bank_account.adjust_money(officer ? 250 : 100, CREDIT_LOG_STARTING_MONEY) //just a little bit of money for you
H.account_id = bank_account.account_id
//Equip the rest of the gear
diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm
index 42ca9b6de9fcb..f6c4aa85fb6a1 100644
--- a/code/modules/jobs/job_types/assistant.dm
+++ b/code/modules/jobs/job_types/assistant.dm
@@ -25,23 +25,12 @@ Assistant
/datum/outfit/job/assistant/pre_equip(mob/living/carbon/human/H)
..()
- if (CONFIG_GET(flag/grey_assistants))
- switch(H.jumpsuit_style)
- if(PREF_SUIT)
- uniform = initial(uniform)
- if(PREF_ALTSUIT)
- uniform = /obj/item/clothing/under/misc/assistantformal
- if(PREF_SKIRT)
- uniform = /obj/item/clothing/under/color/jumpskirt/grey
- else
- uniform = /obj/item/clothing/under/color/grey
- else
- switch(H.jumpsuit_style)
- if(PREF_SUIT)
- uniform = initial(uniform)
- if(PREF_ALTSUIT)
- uniform = /obj/item/clothing/under/misc/assistantformal
- if(PREF_SKIRT)
- uniform = /obj/item/clothing/under/utility/skirt
- else
- uniform = /obj/item/clothing/under/utility
+ switch(H.jumpsuit_style)
+ if(PREF_SUIT)
+ uniform = initial(uniform)
+ if(PREF_ALTSUIT)
+ uniform = /obj/item/clothing/under/misc/assistantformal
+ if(PREF_SKIRT)
+ uniform = /obj/item/clothing/under/utility/skirt
+ else
+ uniform = /obj/item/clothing/under/utility
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index 4feaed96faf15..ba4150f5a7f20 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -47,4 +47,4 @@
implants = list(/obj/item/implant/mindshield)
- chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+ chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/m11
diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm
index a5a68d98d609a..0ef451b297939 100644
--- a/code/modules/lighting/lighting_atom.dm
+++ b/code/modules/lighting/lighting_atom.dm
@@ -80,7 +80,7 @@
. = ..()
var/datum/light_source/L
var/thing
- for (thing in light_sources) // Cycle through the light sources on this atom and tell them to update.
+ for(thing in light_sources) // Cycle through the light sources on this atom and tell them to update.
L = thing
L.source_atom.update_light()
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 251cf46e7c5f8..1e4e42757115d 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -4,7 +4,7 @@
/obj/effect/baseturf_helper //Set the baseturfs of every turf in the /area/ it is placed.
name = "baseturf editor"
- icon = 'icons/effects/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping/mapping_helpers.dmi'
icon_state = ""
var/list/baseturf_to_replace
@@ -71,14 +71,6 @@
name = "asteroid snow baseturf editor"
baseturf = /turf/open/floor/plating/asteroid/snow
-/obj/effect/baseturf_helper/beach/sand
- name = "beach sand baseturf editor"
- baseturf = /turf/open/floor/plating/beach/sand
-
-/obj/effect/baseturf_helper/beach/water
- name = "water baseturf editor"
- baseturf = /turf/open/floor/plating/beach/water
-
/obj/effect/baseturf_helper/lava
name = "lava baseturf editor"
baseturf = /turf/open/lava/smooth
@@ -89,8 +81,9 @@
/obj/effect/mapping_helpers
- icon = 'icons/effects/mapping_helpers.dmi'
+ icon = 'icons/effects/mapping/mapping_helpers.dmi'
icon_state = ""
+ invisibility = INVISIBILITY_OBSERVER
var/late = FALSE
/obj/effect/mapping_helpers/Initialize()
@@ -152,6 +145,25 @@
else
airlock.locked = TRUE
+/obj/effect/mapping_helpers/airlock/welded
+ name = "airlock welder"
+
+/obj/effect/mapping_helpers/airlock/welded/payload(obj/machinery/door/airlock/airlock)
+ if(airlock.welded)
+ log_mapping("[src] at [AREACOORD(src)] tried to weld [airlock] but it's already locked!")
+ else
+ airlock.welded = TRUE
+
+/obj/effect/mapping_helpers/airlock/sealed
+ name = "airlock sealer"
+
+/obj/effect/mapping_helpers/airlock/sealed/payload(obj/machinery/door/airlock/airlock)
+ if(airlock.seal)
+ log_mapping("[src] at [AREACOORD(src)] tried to seal [airlock] but it's already already got a seal? What the hell!")
+ else
+ airlock.seal = new /obj/item/door_seal(airlock)
+
+
/obj/effect/mapping_helpers/airlock/unres
name = "airlock unresctricted side helper"
@@ -253,7 +265,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
/obj/effect/mapping_helpers/ianbirthday
name = "Ian's Bday Helper"
late = TRUE
- icon_state = "iansbdayhelper"
var/balloon_clusters = 2
/obj/effect/mapping_helpers/ianbirthday/LateInitialize()
@@ -312,7 +323,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
/obj/effect/mapping_helpers/ianbirthday/admin//so admins may birthday any room
name = "generic birthday setup"
- icon_state = "bdayhelper"
/obj/effect/mapping_helpers/ianbirthday/admin/LateInitialize()
birthday()
@@ -322,7 +332,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
/obj/effect/mapping_helpers/iannewyear
name = "Ian's New Years Helper"
late = TRUE
- icon_state = "iansnewyrshelper"
/obj/effect/mapping_helpers/iannewyear/LateInitialize()
if(SSevents.holidays && SSevents.holidays[NEW_YEAR])
@@ -374,7 +383,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
found_airlock.update_appearance()
qdel(src)
if(note_info)
- var/obj/item/paper/paper = new /obj/item/paper(src)
+ var/obj/item/paper/paper = new /obj/item/paper(found_airlock)
if(note_name)
paper.name = note_name
paper.add_raw_text("[note_info]")
@@ -480,3 +489,32 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
var/icon/I = new(file_name)
icon_cache[url] = I
return I
+
+/obj/effect/mapping_helpers/chair
+ name = "chair helper"
+
+/obj/effect/mapping_helpers/chair/tim_buckley
+ name = "chair buckler 12000"
+ desc = "buckles a guy into the chair if theres a guy and a chair."
+
+/obj/effect/mapping_helpers/chair/tim_buckley/LateInitialize()
+ var/turf/turf = get_turf(src)
+ if(locate(/obj/structure/chair) in turf && locate(/mob/living/carbon) in turf)
+ var/obj/structure/chair/idiot_throne = locate(/obj/structure/chair) in turf
+ var/mob/living/carbon/idiot = locate(/mob/living/carbon)
+ idiot_throne.buckle_mob(idiot, TRUE)
+ qdel(src)
+ log_mapping("[src] at [x],[y] could not find a chair and guy on current turf.")
+ qdel(src)
+
+/obj/effect/mapping_helpers/turf
+ name = "turf helper"
+
+/obj/effect/mapping_helpers/turf/burnt
+ name = "turf_burner"
+ desc = "burns the everliving shit out of the turf its on."
+
+/obj/effect/mapping_helpers/turf/burnt/LateInitialize()
+ var/turf/our_turf = loc
+ our_turf.burn_tile()
+ qdel(src)
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index 406259246db10..339f17342f8ab 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -141,8 +141,6 @@
new /obj/item/clothing/mask/cigarette/rollie(src)
if(6 to 10)
new /obj/item/skateboard/pro(src)
- if(11 to 15)
- new /mob/living/simple_animal/bot/honkbot(src)
if(16 to 20)
new /obj/item/stack/ore/diamond(src, 10)
if(21 to 25)
@@ -207,7 +205,7 @@
if(88)
new /obj/item/reagent_containers/food/drinks/bottle/lizardwine(src)
if(89)
- new /obj/item/melee/transforming/energy/sword/bananium(src)
+ new /obj/item/melee/energy/sword/bananium(src)
if(90)
new /obj/item/dnainjector/wackymut(src)
if(91)
@@ -232,7 +230,7 @@
new /obj/item/gun/ballistic/automatic/toy/pistol(src)
new /obj/item/gun/ballistic/automatic/toy(src)
new /obj/item/gun/ballistic/automatic/toy(src)
- new /obj/item/ammo_box/foambox(src)
+ new /obj/item/storage/box/ammo/foam_darts(src)
if(98)
for(var/i in 1 to 3)
new /mob/living/simple_animal/hostile/poison/bees/toxin(src)
diff --git a/code/modules/mining/drill.dm b/code/modules/mining/drill.dm
index 9a35c2b4bf113..c327efab39a85 100644
--- a/code/modules/mining/drill.dm
+++ b/code/modules/mining/drill.dm
@@ -344,6 +344,8 @@
//Overly long proc to handle the unique properties for each malfunction type
/obj/machinery/drill/proc/malfunction(malfunction_type)
+ if(active)
+ mining.toggle_spawning() //turns mob spawning off after a malfunction
switch(malfunction_type)
if(MALF_LASER)
say("Malfunction: Laser array damaged, please replace before continuing mining operations.")
diff --git a/code/modules/mining/equipment/angle_grinder.dm b/code/modules/mining/equipment/angle_grinder.dm
index 290cf0d153d7a..f90b709efeb87 100644
--- a/code/modules/mining/equipment/angle_grinder.dm
+++ b/code/modules/mining/equipment/angle_grinder.dm
@@ -7,6 +7,8 @@
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
gear_handle_type = /obj/item/gear_handle/anglegrinder
+ slowdown = 0.3
+ drag_slowdown = 0.3
/obj/item/gear_handle/anglegrinder
name = "angle grinder"
@@ -25,9 +27,9 @@
hitsound = 'sound/weapons/anglegrinder.ogg'
usesound = 'sound/weapons/anglegrinder.ogg'
tool_behaviour = null // is set to TOOL_DECONSTRUCT once wielded
- toolspeed = 1
- wall_decon_damage = 200
- usecost = 5
+ toolspeed = 0.6
+ wall_decon_damage = 350
+ usecost = 2.5
pack = /obj/item/gear_pack/anglegrinder
var/startsound = 'sound/weapons/chainsawhit.ogg'
var/adv = FALSE
@@ -68,7 +70,7 @@
. = ..()
AddComponent(/datum/component/butchering, 30, 100, 0, startsound, TRUE)
AddComponent(/datum/component/two_handed, force_unwielded=force, force_wielded=two_hand_force, wieldsound=startsound)
- AddElement(/datum/element/tool_bang, 2)
+ AddElement(/datum/element/tool_bang, 1)
/// triggered on wield of two handed item
/obj/item/gear_handle/anglegrinder/proc/on_wield(obj/item/source, mob/user)
@@ -125,8 +127,8 @@
hitsound = 'sound/weapons/blade1.ogg'
usesound = 'sound/weapons/blade1.ogg'
startsound = 'sound/weapons/saberon.ogg'
- toolspeed = 0.7
- usecost = 10
+ toolspeed = 0.4
+ usecost = 4
pack = /obj/item/gear_pack/anglegrinder/energy
light_system = MOVABLE_LIGHT
light_range = 3
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 05e81421ac4fd..27f71dfa93597 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -28,11 +28,13 @@
var/charge_time = 15
var/detonation_damage = 20
var/backstab_bonus = 10
+ var/unwielded_force = 0
+ var/wielded_force = 25
/obj/item/kinetic_crusher/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it
- AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=15)
+ AddComponent(/datum/component/two_handed, force_unwielded=unwielded_force, force_wielded=wielded_force)
/obj/item/kinetic_crusher/examine(mob/living/user)
. = ..()
@@ -138,6 +140,7 @@
L.apply_status_effect(STATUS_EFFECT_CRUSHERMARK, hammer_synced)
var/target_turf = get_turf(target)
if(ismineralturf(target_turf))
+ SSblackbox.record_feedback("tally", "pick_used_mining", 1, src.type)
var/turf/closed/mineral/M = target_turf
new /obj/effect/temp_visual/kinetic_blast(M)
..()
@@ -153,16 +156,13 @@
detonation_damage = 10
slowdown = 0.5//hevy
attack_verb = list("mashed", "flattened", "bisected", "eradicated","destroyed")
+ unwielded_force = 0
+ wielded_force = 30
/obj/item/kinetic_crusher/old/examine(mob/user)
. = ..()
. += "This hunk of junk's so heavy that you can barely swing it! Though, that blade looks pretty sharp..."
-/obj/item/kinetic_crusher/old/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/butchering, 60, 110)
- AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=25)//big choppa!
-
/obj/item/kinetic_crusher/old/melee_attack_chain(mob/user, atom/target, params)
..()
user.changeNext_move(CLICK_CD_MELEE * 2.0)//...slow swinga.
@@ -203,18 +203,14 @@
detonation_damage = 35
backstab_bonus = 15
actions_types = list()
-
+ unwielded_force = 0
+ wielded_force = 22
/obj/item/kinetic_crusher/syndie_crusher/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
-/obj/item/kinetic_crusher/syndie_crusher/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/butchering, 60, 150)
- AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=10)
-
/// triggered on wield of two handed item
/obj/item/kinetic_crusher/syndie_crusher/proc/on_wield(obj/item/source, mob/user)
SIGNAL_HANDLER
diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm
index 74ed8ce30fbd8..c4ea06ac3e034 100644
--- a/code/modules/mining/equipment/marker_beacons.dm
+++ b/code/modules/mining/equipment/marker_beacons.dm
@@ -32,6 +32,12 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list(
/obj/item/stack/marker_beacon/thirty //and they're bought in stacks of 1, 10, or 30
amount = 30
+/obj/item/stack/marker_beacon/ten
+ amount = 10
+
+/obj/item/stack/marker_beacon/thirty
+ amount = 30
+
/obj/item/stack/marker_beacon/Initialize(mapload)
. = ..()
update_appearance()
diff --git a/code/modules/mining/equipment/miningradio.dm b/code/modules/mining/equipment/miningradio.dm
index a0bef397d8cac..d0712db194dc2 100644
--- a/code/modules/mining/equipment/miningradio.dm
+++ b/code/modules/mining/equipment/miningradio.dm
@@ -7,6 +7,7 @@
luminosity = 1
light_power = 1
light_range = 1.6
+ light_system = MOVABLE_LIGHT
/obj/item/radio/weather_monitor/update_overlays()
. = ..()
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index 4bd6824327f31..98c5c15e0e296 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/chemical/medicine.dmi'
icon_state = "bottle19"
desc = "Inject certain types of monster organs with this stabilizer to preserve their healing powers indefinitely."
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_NORMAL
custom_price = 400
/obj/item/hivelordstabilizer/afterattack(obj/item/organ/M, mob/user, proximity)
@@ -27,6 +27,7 @@
icon_state = "roro core 2"
item_flags = NOBLUDGEON
slot = ORGAN_SLOT_REGENERATIVE_CORE
+ organ_flags = null
force = 0
actions_types = list(/datum/action/item_action/organ_action/use)
var/inert = 0
@@ -67,7 +68,7 @@
owner.adjustOxyLoss(-50)
owner.adjustToxLoss(-50)
if(owner.dna.species.id != SPECIES_IPC)
- owner.adjustCloneLoss(10) //dont abuse it or take cloneloss (organic only)
+ owner.adjustCloneLoss(20) //dont abuse it or take cloneloss (organic only)
qdel(src)
/obj/item/organ/regenerative_core/on_life()
@@ -79,21 +80,26 @@
/obj/item/organ/regenerative_core/proc/applyto(atom/target, mob/user)
if(ishuman(target))
var/mob/living/carbon/human/H = target
+ if(H.dna.species.id == SPECIES_IPC)
+ to_chat(user, span_notice("[src] has no effect on silicate life."))
+ return
if(inert)
- to_chat(user, "[src] has decayed and can no longer be used to heal.")
+ to_chat(user, span_notice("[src] has decayed past usabality."))
return
- else
- if(H.stat == DEAD)
- to_chat(user, "[src] is useless on the dead.")
- return
+ if(H.stat == DEAD)
+ to_chat(user, span_notice("[src] is useless on the dead."))
+ return
+ if(do_after(user, 10, target))
if(H != user)
- H.visible_message("[user] forces [H] to apply [src]... Black tendrils entangle and reinforce [H.p_them()]!")
+ H.visible_message(span_notice("[user] smears [src] across [H]... malignant black tendrils entangle and reinforce [H.p_their()] flesh!"))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other"))
else
- to_chat(user, "You start to smear [src] on yourself. Disgusting tendrils hold you together and allow you to keep moving, but for how long?")
+ to_chat(user, span_notice("You smear [src] across your body. Malignant black tendrils start to grow around the application site, reinforcing your flesh!"))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
H.apply_status_effect(STATUS_EFFECT_REGENERATIVE_CORE)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman) //Now THIS is a miner buff (fixed - nerf)
+ H.reagents.add_reagent(/datum/reagent/medicine/soulus,15)
+ H.force_scream()
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman)
qdel(src)
/obj/item/organ/regenerative_core/afterattack(atom/target, mob/user, proximity_flag)
@@ -179,21 +185,21 @@
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(inert)
- to_chat(user, "[src] has broken and can no longer be used to heal.")
+ to_chat(user, span_notice("[src] has decayed beyond usability."))
return
else
if(H.stat == DEAD)
- to_chat(user, "[src] is useless on the dead.")
+ to_chat(user, span_notice("[src] is useless on the dead."))
return
if(H != user)
- H.visible_message("[user] forces [H] to apply [src]... Cancer like crystals grow on and reinforce [H.p_them()]!")
+ H.visible_message(span_notice("[user] smears [src] across [H]... malignant crystals and cancerous tendrils grow on and reinforce [H.p_them()]!"))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "other"))
else
- to_chat(user, "You start to apply [src] on yourself. Cancer like crystals hold you together and add something to you to keep yourself moving, but for how long?")
+ to_chat(user, span_notice("You smear [src] across yourself. malignant crystals and cancerous tendrils grow on you, toughening and healing where they touch."))
SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "used", "self"))
H.apply_status_effect(STATUS_EFFECT_REGENERATIVE_CORE)
H.reagents.add_reagent(/datum/reagent/determination, 4)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman) //Now THIS is a miner buff (fixed - nerf)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "core", /datum/mood_event/healsbadman)
qdel(src)
/obj/item/organ/regenerative_core/legion/crystal/update_icon_state()
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index bf6fb15c93325..bf4ad80647ef2 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -508,7 +508,7 @@
icon_state = "garden"
harvested_name = "lush garden"
harvested_desc = "In the soil and shade, something softly grew. It seems some industrious scavenger already passed by."
- harvest = /obj/effect/spawner/lootdrop/garden
+ harvest = /obj/effect/spawner/random/food_or_drink/garden
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You discover something nestled away in the growing bough."
@@ -527,7 +527,7 @@
icon_state = "gardenarid"
harvested_name = "sandy garden"
harvested_desc = "Beneath a bluff of soft silicate, a sheltered grove slumbered. Some desert wanderer seems to have picked it clean."
- harvest = /obj/effect/spawner/lootdrop/garden/arid
+ harvest = /obj/effect/spawner/random/food_or_drink/garden/arid
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You brush sand away from a verdant prize, nestled in the leaves."
@@ -540,7 +540,7 @@
icon_state = "gardencold"
harvested_name = "chilly garden"
harvested_desc = "A delicate layer of frost covers hardy brush. Someone came with the blizzard, and left with any prize this might contain."
- harvest = /obj/effect/spawner/lootdrop/garden/cold
+ harvest = /obj/effect/spawner/random/food_or_drink/garden/cold
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You unearth a snow-covered treat."
@@ -553,7 +553,7 @@
icon_state = "gardensick"
harvested_name = "sickly garden"
harvested_desc = "Polluted water wells up from the cracked earth, where it once fed a patch of something curious. Now only wilted leaves remain."
- harvest = /obj/effect/spawner/lootdrop/garden/sick
+ harvest = /obj/effect/spawner/random/food_or_drink/garden/sick
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You pry something odd from the poisoned soil."
@@ -567,124 +567,13 @@
icon_state = "seaweed"
harvested_name = "seaweed patch"
harvested_desc = "A patch of seaweed, floating on the surface of the water. It seems someone has already searched through this"
- harvest = /obj/effect/spawner/lootdrop/garden/seaweed
+ harvest = /obj/effect/spawner/random/food_or_drink/garden/seaweed
harvest_amount_high = 1
harvest_amount_low = 1
harvest_message_low = "You discover some edible weeds within the patch."
harvest_message_med = "You discover some edible weeds within the patch."
harvest_message_high = "You discover some edible weeds within the patch."
-/obj/effect/spawner/lootdrop/garden
- name = "lush garden seeder"
- lootcount = 3
- var/list/plant = list(
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus = 1,
- /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth = 2,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d = 1,
- /obj/item/reagent_containers/food/snacks/grown/trumpet = 1,
- /obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
- /obj/item/seeds/random = 1,
- /obj/item/grown/log/bamboo = 2,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 2,
- /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth = 5,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2,
- /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2,
- /obj/item/reagent_containers/food/snacks/grown/moonflower = 2,
- /obj/item/reagent_containers/food/snacks/grown/cocoapod = 2,
- /obj/item/reagent_containers/food/snacks/grown/pineapple = 2,
- /obj/item/reagent_containers/food/snacks/grown/poppy/lily = 2,
- /obj/item/reagent_containers/food/snacks/grown/poppy/geranium = 2,
- /obj/item/reagent_containers/food/snacks/grown/sugarcane = 2,
- /obj/item/reagent_containers/food/snacks/grown/tea = 2,
- /obj/item/reagent_containers/food/snacks/grown/tobacco = 2,
- /obj/item/reagent_containers/food/snacks/grown/watermelon = 4,
- /obj/item/grown/sunflower = 4,
- /obj/item/reagent_containers/food/snacks/grown/banana = 4,
- /obj/item/reagent_containers/food/snacks/grown/apple = 4,
- /obj/item/reagent_containers/food/snacks/grown/berries = 5,
- /obj/item/reagent_containers/food/snacks/grown/cherries = 4,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 4,
- /obj/item/reagent_containers/food/snacks/grown/garlic = 4,
- /obj/item/reagent_containers/food/snacks/grown/grapes = 4,
- /obj/item/reagent_containers/food/snacks/grown/grass = 5,
- /obj/item/reagent_containers/food/snacks/grown/pumpkin = 4,
- /obj/item/reagent_containers/food/snacks/grown/rainbow_flower = 4,
- /obj/item/reagent_containers/food/snacks/grown/wheat = 4,
- /obj/item/reagent_containers/food/snacks/grown/parsnip = 4,
- /obj/item/reagent_containers/food/snacks/grown/peas = 4,
- /obj/item/reagent_containers/food/snacks/grown/rice = 4,
- /obj/item/reagent_containers/food/snacks/grown/soybeans = 4,
- /obj/item/reagent_containers/food/snacks/grown/tomato = 4,
- /obj/item/reagent_containers/food/snacks/grown/cabbage = 4,
- /obj/item/reagent_containers/food/snacks/grown/onion = 4,
- /obj/item/reagent_containers/food/snacks/grown/carrot = 4)
-
-/obj/effect/spawner/lootdrop/garden/Initialize(mapload)
- loot = plant
- . = ..()
-
-/obj/effect/spawner/lootdrop/garden/arid
- name = "arid garden seeder"
- plant = list(
- /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 1,
- /obj/item/reagent_containers/food/snacks/grown/nettle = 1,
- /obj/item/grown/cotton/durathread = 1,
- /obj/item/seeds/random = 1,
- /obj/item/reagent_containers/food/snacks/grown/redbeet = 1,
- /obj/item/reagent_containers/food/snacks/grown/aloe = 2,
- /obj/item/grown/cotton = 2,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/angel = 2,
- /obj/item/reagent_containers/food/snacks/grown/chili = 2,
- /obj/item/reagent_containers/food/snacks/grown/whitebeet = 5,
- /obj/item/reagent_containers/food/snacks/grown/potato = 4,
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 4,
- /obj/item/reagent_containers/food/snacks/grown/corn = 4)
-
-/obj/effect/spawner/lootdrop/garden/cold
- name = "frigid garden seeder"
- plant = list(
- /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1,
- /obj/item/reagent_containers/food/snacks/grown/galaxythistle = 1,
- /obj/item/reagent_containers/food/snacks/grown/berries/death/stealth = 1,
- /obj/item/seeds/random = 1,
- /obj/item/reagent_containers/food/snacks/grown/poppy = 2,
- /obj/item/reagent_containers/food/snacks/grown/tomato/blue = 2,
- /obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth = 2,
- /obj/item/reagent_containers/food/snacks/grown/berries = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 4,
- /obj/item/reagent_containers/food/snacks/grown/oat = 4,
- /obj/item/reagent_containers/food/snacks/grown/grapes/green = 4,
- /obj/item/reagent_containers/food/snacks/grown/grass = 4,
- /obj/item/reagent_containers/food/snacks/grown/harebell = 5,
- /obj/item/seeds/starthistle = 5)
-
-/obj/effect/spawner/lootdrop/garden/sick
- name = "sickly garden seeder"
- plant = list(
- /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow = 1,
- /obj/item/reagent_containers/food/snacks/grown/cannabis/death = 1,
- /obj/item/seeds/replicapod = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/angel = 1,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 2,
- /obj/item/seeds/tower/steel = 2,
- /obj/item/reagent_containers/food/snacks/grown/cannabis = 2,
- /obj/item/seeds/random = 2,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup = 2,
- /obj/item/reagent_containers/food/snacks/grown/cherrybulbs = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap = 4,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi = 4,
- /obj/item/reagent_containers/food/snacks/grown/berries/glow = 4)
-
-/obj/effect/spawner/lootdrop/garden/seaweed
- name = "seaweed patch seeder"
- plant = list(
- /obj/item/reagent_containers/food/snacks/grown/seaweed = 1
- )
-
/obj/item/reagent_containers/food/snacks/grown/berries/poison/stealth //careful eating from random jungle bushes
seed = /obj/item/seeds/berry/poison
name = "bunch of berries"
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 73d18f0ab8851..0ee00128d855a 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -47,10 +47,7 @@
if(15)
new /obj/item/book_of_babel(src)
if(16)
- if(prob(75))
- new /obj/item/guardiancreator/miner(src)
- else
- new /obj/item/guardiancreator/miner/choose (src)
+ new /obj/item/ship_in_a_bottle(src)
if(17)
if(prob(50))
new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src)
@@ -118,10 +115,7 @@
if(15)
new /obj/item/book_of_babel(src)
if(16)
- if(prob(75))
- new /obj/item/guardiancreator/miner(src)
- else
- new /obj/item/guardiancreator/miner/choose (src)
+ new /obj/item/ship_in_a_bottle(src)
if(17)
if(prob(50))
new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src)
@@ -621,7 +615,7 @@
ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
playsound(C.loc, 'sound/items/poster_ripped.ogg', 50, TRUE, -1)
C.adjustBruteLoss(20)
- C.emote("scream")
+ C.force_scream()
..()
//nerfed necrostone
@@ -839,7 +833,7 @@
slot_flags = ITEM_SLOT_BELT
fire_delay = 0.1 SECONDS
recoil = 1
- cell_type = /obj/item/stock_parts/cell/gun
+ default_ammo_type = /obj/item/stock_parts/cell/gun
ammo_type = list(/obj/item/ammo_casing/energy/spur)
supports_variations = VOX_VARIATION
var/chargesound
@@ -1069,93 +1063,6 @@
///Bosses
-//Miniboss Miner
-
-/obj/item/melee/transforming/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
- force_on = 20 //force when active
- throwforce = 20
- throwforce_on = 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"
- icon_state_on = "cleaving_saw_open"
- slot_flags = ITEM_SLOT_BELT
- attack_verb_off = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut")
- attack_verb_on = list("cleaved", "swiped", "slashed", "chopped")
- hitsound = 'sound/weapons/bladeslice.ogg'
- hitsound_on = 'sound/weapons/bladeslice.ogg'
- w_class = WEIGHT_CLASS_BULKY
- sharpness = IS_SHARP
- faction_bonus_force = 30
- nemesis_factions = list("mining", "boss")
- var/transform_cooldown
- var/swiping = FALSE
- var/bleed_stacks_per_hit = 3
-
-/obj/item/melee/transforming/cleaving_saw/examine(mob/user)
- . = ..()
- . += "It is [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"].\n"+\
- "Both modes will build up existing bleed effects, doing a burst of high damage if the bleed is built up high enough.\n"+\
- "Transforming it immediately after an attack causes the next attack to come out faster."
-
-/obj/item/melee/transforming/cleaving_saw/transform_weapon(mob/living/user, supress_message_text)
- if(transform_cooldown > world.time)
- return FALSE
- . = ..()
- if(.)
- transform_cooldown = world.time + (CLICK_CD_MELEE * 0.5)
- user.changeNext_move(CLICK_CD_MELEE * 0.25)
-
-/obj/item/melee/transforming/cleaving_saw/transform_messages(mob/living/user, supress_message_text)
- if(!supress_message_text)
- if(active)
- to_chat(user, "You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.")
- else
- to_chat(user, "You close [src]. It will now attack rapidly and cause fauna to bleed.")
- playsound(user, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
-
-/obj/item/melee/transforming/cleaving_saw/clumsy_transform_effect(mob/living/user)
- if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
- to_chat(user, "You accidentally cut yourself with [src], like a doofus!")
- user.take_bodypart_damage(10)
-
-/obj/item/melee/transforming/cleaving_saw/melee_attack_chain(mob/user, atom/target, params)
- ..()
- if(!active)
- user.changeNext_move(CLICK_CD_MELEE * 0.5) //when closed, it attacks very rapidly
-
-/obj/item/melee/transforming/cleaving_saw/nemesis_effects(mob/living/user, mob/living/target)
- var/datum/status_effect/stacking/saw_bleed/B = target.has_status_effect(STATUS_EFFECT_SAWBLEED)
- if(!B)
- target.apply_status_effect(STATUS_EFFECT_SAWBLEED,bleed_stacks_per_hit)
- else
- B.add_stacks(bleed_stacks_per_hit)
-
-/obj/item/melee/transforming/cleaving_saw/attack(mob/living/target, mob/living/carbon/human/user)
- if(!active || swiping || !target.density || get_turf(target) == get_turf(user))
- if(!active)
- faction_bonus_force = 0
- ..()
- if(!active)
- faction_bonus_force = initial(faction_bonus_force)
- 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
-
//Dragon
/obj/structure/closet/crate/necropolis/dragon
diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm
index 444e72992685f..03401c46f5877 100644
--- a/code/modules/mining/machine_silo.dm
+++ b/code/modules/mining/machine_silo.dm
@@ -35,6 +35,9 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
connected = null
+ return ..()
+
+/obj/machinery/ore_silo/on_deconstruction()
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
materials.retrieve_all()
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index d8a9ecf90cada..5489b44aeb0fb 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -105,7 +105,6 @@
icon_state = "mining_voucher"
w_class = WEIGHT_CLASS_TINY
-
///Conscript kit
/obj/item/storage/backpack/duffelbag/mining_conscript
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index cc2a9f176c700..2563e2644bf04 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -13,7 +13,7 @@
mouse_opacity = MOUSE_OPACITY_ICON
faction = list("neutral")
a_intent = INTENT_HARM
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
move_to_delay = 10
health = 125
@@ -303,29 +303,5 @@
M.updatehealth()
qdel(src)
-//AI
-
-/obj/item/slimepotion/slime/sentience/mining
- name = "minebot AI upgrade"
- desc = "Can be used to grant sentience to minebots. It's incompatible with minebot armor and melee upgrades, and will override them."
- icon_state = "door_electronics"
- icon = 'icons/obj/module.dmi'
- sentience_type = SENTIENCE_MINEBOT
- custom_price = 1000
- var/base_health_add = 5 //sentient minebots are penalized for beign sentient; they have their stats reset to normal plus these values
- var/base_damage_add = 1 //this thus disables other minebot upgrades
- var/base_speed_add = 1
- var/base_cooldown_add = 10 //base cooldown isn't reset to normal, it's just added on, since it's not practical to disable the cooldown module
-
-/obj/item/slimepotion/slime/sentience/mining/after_success(mob/living/user, mob/living/simple_animal/SM)
- if(istype(SM, /mob/living/simple_animal/hostile/mining_drone))
- var/mob/living/simple_animal/hostile/mining_drone/M = SM
- M.maxHealth = initial(M.maxHealth) + base_health_add
- M.melee_damage_lower = initial(M.melee_damage_lower) + base_damage_add
- M.melee_damage_upper = initial(M.melee_damage_upper) + base_damage_add
- M.move_to_delay = initial(M.move_to_delay) + base_speed_add
- if(M.stored_gun)
- M.stored_gun.overheat_time += base_cooldown_add
-
#undef MINEDRONE_COLLECT
#undef MINEDRONE_ATTACK
diff --git a/code/modules/mining/ore_veins.dm b/code/modules/mining/ore_veins.dm
index 16f6afa8da0cb..fa497b44a3232 100644
--- a/code/modules/mining/ore_veins.dm
+++ b/code/modules/mining/ore_veins.dm
@@ -72,7 +72,7 @@ GLOBAL_LIST_EMPTY(ore_veins)
else
ore_type_amount = 1
for(var/ore_count in 1 to ore_type_amount)
- var/picked = pickweight(ore_list)
+ var/picked = pick_weight(ore_list)
vein_contents.Add(picked)
ore_list.Remove(picked)
GLOB.ore_veins += src
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 85c60a15b0318..490efbbabef88 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -96,18 +96,17 @@ INITIALIZE_IMMEDIATE(/mob/dead)
return
/mob/dead/Destroy()
- for(var/level in SSmobs.dead_players_by_virtual_z)
- LAZYREMOVEASSOC(SSmobs.dead_players_by_virtual_z, level, src)
- // Forgive me for this one. This loop can be replaced by the line below by the one brave enough to fix
- // observers not cleanly removing themselves from the dead_players_by_virtual_z /list when they should
- //LAZYREMOVEASSOC(SSmobs.dead_players_by_virtual_z, "[virtual_z()]", src)
+ //Observers should no longer be duplicating themselves across virtual z so it SHOULD be fine to only check its virtual z.
+ LAZYREMOVEASSOC(SSmobs.dead_players_by_virtual_z, "[virtual_z()]", src)
return ..()
/mob/dead/Login()
. = ..()
if(!client)
return
- LAZYADDASSOCLIST(SSmobs.dead_players_by_virtual_z, "[virtual_z()]", src)
+ var/virt_z = virtual_z()
+ if(virt_z)
+ LAZYADDASSOCLIST(SSmobs.dead_players_by_virtual_z, "[virt_z]", src)
/mob/dead/Logout()
. = ..()
diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm
index 5c47ccd6d526a..29573693cb3eb 100644
--- a/code/modules/mob/dead/new_player/login.dm
+++ b/code/modules/mob/dead/new_player/login.dm
@@ -34,9 +34,9 @@
var/required_living_minutes = CONFIG_GET(number/panic_bunker_living)
var/living_minutes = client.get_exp_living(TRUE)
if (required_living_minutes > living_minutes)
- client.interviewee = TRUE
register_for_interview()
return
+ client.interviewee = FALSE
new_player_panel()
if(SSticker.current_state < GAME_STATE_SETTING_UP)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 2dbbd9d4b65b4..d88c8368a8203 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -130,10 +130,10 @@
return
if(src != usr)
- return 0
+ return FALSE
if(!client)
- return 0
+ return FALSE
if(client.interviewee)
return FALSE
@@ -345,6 +345,7 @@
log_manifest(character.mind.key, character.mind, character, TRUE)
+ SSblackbox.record_feedback("tally", "player_joined_faction", 1, ship.get_faction())
if(length(ship.job_slots) > 1 && ship.job_slots[1] == job) // if it's the "captain" equivalent job of the ship. checks to make sure it's not a one-job ship
minor_announce("[job.name] [character.real_name] on deck!", zlevel = ship.shuttle_port.virtual_z())
return TRUE
@@ -432,7 +433,7 @@
mind.active = FALSE //we wish to transfer the key manually
mind.original_character_slot_index = client.prefs.default_slot
mind.transfer_to(H) //won't transfer key since the mind is not active
- mind.set_original_character(H)
+ H.mind.set_original_character(H)
H.name = real_name
client.init_verbs()
diff --git a/code/modules/mob/dead/new_player/ship_select.dm b/code/modules/mob/dead/new_player/ship_select.dm
index e130f6e404ce1..dd60c13ce2cdc 100644
--- a/code/modules/mob/dead/new_player/ship_select.dm
+++ b/code/modules/mob/dead/new_player/ship_select.dm
@@ -100,7 +100,8 @@
to_chat(spawnee, "There was an error loading the ship. Please contact admins!")
spawnee.new_player_panel()
return
- SSblackbox.record_feedback("tally", "ship_purchased", 1, template.name) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.record_feedback("tally", "ship_purchased", 1, template.name)
+ SSblackbox.record_feedback("tally", "faction_ship_purchased", 1, template.faction_datum.name)
// Try to spawn as the first listed job in the job slots (usually captain)
// Playtime checks are overridden, to ensure the player gets to join the ship they spawned.
if(!spawnee.AttemptLateSpawn(target.job_slots[1], target, FALSE))
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
index 34d8dd274668e..86f1b281b5975 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/hair.dm
@@ -90,29 +90,21 @@
name = "Bowlcut 2"
icon_state = "hair_bowlcut2"
-/datum/sprite_accessory/hair/braid
- name = "Braid (Floorlength)"
- icon_state = "hair_braid"
-
-/datum/sprite_accessory/hair/braided
- name = "Braided"
- icon_state = "hair_braided"
-
-/datum/sprite_accessory/hair/front_braid
- name = "Braided Front"
- icon_state = "hair_braidfront"
-
-/datum/sprite_accessory/hair/not_floorlength_braid
- name = "Braid (High)"
+/datum/sprite_accessory/hair/ponytail_braided
+ name = "Ponytail (Braided)"
icon_state = "hair_braid2"
-/datum/sprite_accessory/hair/lowbraid
- name = "Braid (Low)"
- icon_state = "hair_hbraid"
+/datum/sprite_accessory/hair/ponytail_braided_short
+ name = "Ponytail (Braided Short)"
+ icon_state = "hair_braid"
+
+/datum/sprite_accessory/hair/ponytail_straight
+ name = "Ponytail (Straight)"
+ icon_state = "hair_longstraightponytail"
-/datum/sprite_accessory/hair/shortbraid
- name = "Braid (Short)"
- icon_state = "hair_shortbraid"
+/datum/sprite_accessory/hair/ponytail_straight_short
+ name = "Ponytail (Straight Short)"
+ icon_state = "hair_highponytail"
/datum/sprite_accessory/hair/braidtail
name = "Braided Tail"
@@ -503,12 +495,8 @@
icon_state = "hair_ponytail"
/datum/sprite_accessory/hair/ponytail2
- name = "Ponytail 2"
- icon_state = "hair_ponytail2"
-
-/datum/sprite_accessory/hair/ponytail3
- name = "Ponytail 3"
- icon_state = "hair_ponytail3"
+ name = "Ponytail (Grace)"
+ icon_state = "hair_ponytailgrace"
/datum/sprite_accessory/hair/ponytail4
name = "Ponytail 4"
@@ -526,21 +514,14 @@
name = "Ponytail 7"
icon_state = "hair_ponytail7"
-/datum/sprite_accessory/hair/highponytail
- name = "Ponytail (High)"
- icon_state = "hair_highponytail"
/datum/sprite_accessory/hair/stail
name = "Ponytail (Short)"
icon_state = "hair_stail"
-/datum/sprite_accessory/hair/longponytail
- name = "Ponytail (Long)"
- icon_state = "hair_longstraightponytail"
-
/datum/sprite_accessory/hair/countryponytail
name = "Ponytail (Country)"
- icon_state = "hair_country"
+ icon_state = "hair_ponytailcountry"
/datum/sprite_accessory/hair/fringetail
name = "Ponytail (Fringe)"
@@ -722,6 +703,10 @@
name = "Ruby"
icon_state = "hair_ruby"
+/datum/sprite_accessory/hair/rubylong
+ name = "Ruby (Long)"
+ icon_state = "hair_rubylong"
+
/datum/sprite_accessory/hair/undercut
name = "Undercut"
icon_state = "hair_undercut"
@@ -821,3 +806,7 @@
/datum/sprite_accessory/hair_gradient/long_fade_down
name = "Long Fade Down"
icon_state = "long_fade_down"
+
+/datum/sprite_accessory/hair_gradient/splotches
+ name = "Splotches"
+ icon_state = "splotches"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 0fcfa5c13940b..e79427f2381dd 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -909,8 +909,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/examine_more(mob/user)
if(!isAdminObserver(user))
return ..()
- . = list("You examine [src] closer, and note the following...")
- . += list("\t>[ADMIN_FULLMONTY(src)]")
+ . += "You examine [src] closer, and note the following..."
+ . += "\t>[ADMIN_FULLMONTY(src)]"
/mob/dead/observer/proc/set_invisibility(value)
invisibility = value
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 0840ee3721582..0e4a8ed748c9e 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -25,6 +25,22 @@
to_chat(src, "Unusable emote '[act]'. Say *help for a list.")
return FALSE
+/mob/proc/force_scream()
+ if(HAS_TRAIT(src, TRAIT_ANALGESIA))
+ return
+ if(HAS_TRAIT(src, TRAIT_PAIN_RESIST))
+ emote("gasp")
+ return
+ emote("scream")
+
+/mob/proc/force_manual_scream()
+ if(HAS_TRAIT(src, TRAIT_ANALGESIA))
+ return
+ if(HAS_TRAIT(src, TRAIT_PAIN_RESIST))
+ manual_emote("gasp")
+ return
+ manual_emote("scream")
+
/datum/emote/flip
key = "flip"
key_third_person = "flips"
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 0d9dab7a035fd..54b7fe483a13d 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -254,10 +254,10 @@
return FALSE
return TRUE
-/mob/proc/putItemFromInventoryInHandIfPossible(obj/item/I, hand_index, force_removal = FALSE)
+/mob/proc/putItemFromInventoryInHandIfPossible(obj/item/I, hand_index, force_removal = FALSE, use_unequip_delay = FALSE)
if(!can_put_in_hand(I, hand_index))
return FALSE
- if(!temporarilyRemoveItemFromInventory(I, force_removal))
+ if(!temporarilyRemoveItemFromInventory(I, force_removal, use_unequip_delay = use_unequip_delay))
return FALSE
I.remove_item_from_storage(src)
if(!put_in_hand(I, hand_index))
@@ -273,8 +273,8 @@
* * Will pass FALSE if the item can not be dropped due to TRAIT_NODROP via doUnEquip()
* If the item can be dropped, it will be forceMove()'d to the ground and the turf's Entered() will be called.
*/
-/mob/proc/dropItemToGround(obj/item/I, force = FALSE, silent = FALSE)
- . = doUnEquip(I, force, drop_location(), FALSE, silent = silent)
+/mob/proc/dropItemToGround(obj/item/I, force = FALSE, silent = FALSE, use_unequip_delay = FALSE)
+ . = doUnEquip(I, force, drop_location(), FALSE, silent = silent, use_unequip_delay = use_unequip_delay)
if(. && I && !(I.item_flags & NO_PIXEL_RANDOM_DROP)) //ensure the item exists and that it was dropped properly.
I.pixel_x = rand(-6,6)
I.pixel_y = rand(-6,6)
@@ -285,13 +285,13 @@
//visibly unequips I but it is NOT MOVED AND REMAINS IN SRC
//item MUST BE FORCEMOVE'D OR QDEL'D
-/mob/proc/temporarilyRemoveItemFromInventory(obj/item/I, force = FALSE, idrop = TRUE)
- return doUnEquip(I, force, null, TRUE, idrop, silent = TRUE)
+/mob/proc/temporarilyRemoveItemFromInventory(obj/item/I, force = FALSE, idrop = TRUE, use_unequip_delay = FALSE)
+ return doUnEquip(I, force, null, TRUE, idrop, silent = TRUE, use_unequip_delay = use_unequip_delay)
//DO NOT CALL THIS PROC
//use one of the above 3 helper procs
//you may override it, but do not modify the args
-/mob/proc/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE) //Force overrides TRAIT_NODROP for things like wizarditis and admin undress.
+/mob/proc/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE, use_unequip_delay = FALSE) //Force overrides TRAIT_NODROP for things like wizarditis and admin undress.
//Use no_move if the item is just gonna be immediately moved afterward
//Invdrop is used to prevent stuff in pockets dropping. only set to false if it's going to immediately be replaced
PROTECTED_PROC(TRUE)
@@ -301,6 +301,14 @@
if(HAS_TRAIT(I, TRAIT_NODROP) && !force)
return FALSE
+ if(HAS_TRAIT(src, TRAIT_EQUIPPING_OR_UNEQUIPPING))//shim because our do_after is less neat than daedalus's
+ to_chat(src, span_warning("You're already unequipping something!"))
+ return FALSE
+
+ var/static/list/exclude_from_unequip_delay = list(null, ITEM_SLOT_RPOCKET, ITEM_SLOT_LPOCKET, ITEM_SLOT_SUITSTORE, ITEM_SLOT_HANDS)
+ if(use_unequip_delay && !(get_slot_by_item(I) in exclude_from_unequip_delay) && !unequip_delay_self_check(I))
+ return FALSE
+
var/hand_index = get_held_index_of_item(I)
if(hand_index)
held_items[hand_index] = null
@@ -500,3 +508,84 @@
add_bodypart(BP)
hand_bodyparts[i] = BP
..() //Don't redraw hands until we have organs for them
+
+
+/// Called when a mob is equipping an item to itself.
+/mob/proc/equip_delay_self_check(obj/item/equipped, bypass_delay)
+ return TRUE
+
+/// Called when a mob is unequipping an item from itself.
+/mob/proc/unequip_delay_self_check(obj/item/unequipped, bypass_delay)
+ return TRUE
+
+#define EQUIPPING_INTERACTION_KEY(item) "equipping_item_[ref(item)]"
+
+/mob/living/carbon/human/equip_delay_self_check(obj/item/equipped, bypass_delay)
+ if(!equipped.equip_delay_self || bypass_delay)
+ return TRUE
+
+ if(DOING_INTERACTION(src, EQUIPPING_INTERACTION_KEY(equipped)))
+ return FALSE
+
+ visible_message(
+ span_notice("[src] starts to put on [equipped]..."),
+ span_notice("You start to put on [equipped]...")
+ )
+
+ . = equipped.do_equip_wait(src, equipped.equipping_sound)
+
+ if(.)
+ visible_message(
+ span_notice("[src] puts on [equipped]."),
+ span_notice("You put on [equipped].")
+ )
+
+/mob/living/carbon/human/unequip_delay_self_check(obj/item/unequipped)
+ if(!unequipped.equip_delay_self || is_holding(unequipped))
+ return TRUE
+
+ if(DOING_INTERACTION(src, EQUIPPING_INTERACTION_KEY(unequipped)))
+ return FALSE
+
+ visible_message(
+ span_notice("[src] starts to take off [unequipped]..."),
+ span_notice("You start to take off [unequipped]...")
+ )
+
+ . = unequipped.do_equip_wait(src, unequipped.unequipping_sound)
+
+ if(.)
+ visible_message(
+ span_notice("[src] takes off [unequipped]."),
+ span_notice("You takes off [unequipped].")
+ )
+
+
+/// Called by equip_delay_self and unequip_delay_self.
+/obj/item/proc/do_equip_wait(mob/living/equipping, soundtoplay)
+
+ var/flags = NONE
+ if(equip_self_flags & EQUIP_ALLOW_MOVEMENT)
+ flags |= IGNORE_USER_LOC_CHANGE | IGNORE_TARGET_LOC_CHANGE
+
+ if(equip_self_flags & EQUIP_SLOWDOWN)
+ equipping.add_movespeed_modifier(/datum/movespeed_modifier/equipping)
+
+ var/ourchannel
+ if(soundtoplay)
+ ourchannel = SSsounds.random_available_channel()
+ playsound(equipping.loc, soundtoplay, 35, channel = ourchannel)
+
+ ADD_TRAIT(equipping, TRAIT_EQUIPPING_OR_UNEQUIPPING, ref(src))
+
+ . = do_after(equipping, equip_delay_self, equipping, flags, interaction_key = EQUIPPING_INTERACTION_KEY(src))
+
+ if(ourchannel)
+ playsound(equipping.loc, null, 35, channel = ourchannel)
+
+ REMOVE_TRAIT(equipping, TRAIT_EQUIPPING_OR_UNEQUIPPING, ref(src))
+
+ if(!HAS_TRAIT(equipping, TRAIT_EQUIPPING_OR_UNEQUIPPING))
+ equipping.remove_movespeed_modifier(/datum/movespeed_modifier/equipping)
+
+#undef EQUIPPING_INTERACTION_KEY
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 8629d01650d41..5fe96021461b5 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -381,7 +381,8 @@
if(resilience)
actual_trauma.resilience = resilience
. = actual_trauma
- SSblackbox.record_feedback("tally", "traumas", 1, actual_trauma.type)
+ if(owner?.client)
+ SSblackbox.record_feedback("tally", "traumas", 1, actual_trauma.type)
//Add a random trauma of a certain subtype
/obj/item/organ/brain/proc/gain_trauma_type(brain_trauma_type = /datum/brain_trauma, resilience, natural_gain = FALSE)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
index 9628545b3ccee..227dcc78f45c9 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/alien/humanoid/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
+/mob/living/carbon/alien/humanoid/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE, use_unequip_delay = FALSE)
. = ..()
if(!. || !I)
return
diff --git a/code/modules/mob/living/carbon/alien/larva/inventory.dm b/code/modules/mob/living/carbon/alien/larva/inventory.dm
index 23c461aa83c82..6212dd4b4b8fc 100644
--- a/code/modules/mob/living/carbon/alien/larva/inventory.dm
+++ b/code/modules/mob/living/carbon/alien/larva/inventory.dm
@@ -1,3 +1,3 @@
//can't unequip since it can't equip anything
-/mob/living/carbon/alien/larva/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
+/mob/living/carbon/alien/larva/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE, use_unequip_delay = FALSE)
return
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index bfa71f3b335e3..74304378bcd90 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -134,10 +134,10 @@
else if(ishuman(owner)) //Humans, being more fragile, are more overwhelmed by the mental backlash.
to_chat(owner, "You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!")
- owner.emote("scream")
+ owner.force_scream()
owner.Paralyze(100)
- owner.jitteriness += 30
+ owner.adjust_jitter(30)
owner.confused += 30
owner.stuttering += 30
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index c9cdcaf8199c7..37384cf91e6f0 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -27,7 +27,7 @@
attack_verb_simple = "flail at"
attack_sound = 'sound/weapons/bladeslice.ogg'
faction = list(ROLE_ALIEN)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
verb_say = "squeaks"
verb_ask = "squeaks"
verb_exclaim = "shrieks"
@@ -35,7 +35,6 @@
initial_language_holder = /datum/language_holder/alien
flags_1 = PREVENT_CONTENTS_EXPLOSION_1
footstep_type = FOOTSTEP_MOB_CLAW
- gold_core_spawnable = NO_SPAWN
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
environment_smash = ENVIRONMENT_SMASH_NONE
diff --git a/code/modules/mob/living/carbon/alien/utilities/structures.dm b/code/modules/mob/living/carbon/alien/utilities/structures.dm
index 0ac30d207a413..c7e8a128c3d3f 100644
--- a/code/modules/mob/living/carbon/alien/utilities/structures.dm
+++ b/code/modules/mob/living/carbon/alien/utilities/structures.dm
@@ -182,7 +182,7 @@
qdel(src)
return
//lets try to grow in a direction
- for(var/turf/check_turf in src_turf.GetAtmosAdjacentTurfs())
+ for(var/turf/check_turf as anything in src_turf.get_atmos_adjacent_turfs())
//we cannot grow on blacklisted turfs
if(is_type_in_list(check_turf, blacklisted_turfs))
continue
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 9a19e198a5552..5276cf514d655 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -438,7 +438,7 @@
visible_message("[src] dry heaves!", \
"You try to throw up, but there's nothing in your stomach!")
if(stun)
- Paralyze(200)
+ Immobilize(30)
return TRUE
if(is_mouth_covered()) //make this add a blood/vomit overlay later it'll be hilarious
@@ -454,7 +454,7 @@
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomit)
if(stun)
- Paralyze(80)
+ Immobilize(10)
playsound(get_turf(src), 'sound/effects/splat.ogg', 50, TRUE)
var/turf/T = get_turf(src)
@@ -476,6 +476,7 @@
T = get_step(T, dir)
if (T?.is_blocked_turf())
break
+ adjust_disgust(-(lost_nutrition*rand(0.5, 2)))
return TRUE
/mob/living/carbon/proc/spew_organ(power = 5, amt = 1)
@@ -709,7 +710,9 @@
//Fire and Brute damage overlay (BSSR)
var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
- if(hurtdamage)
+ if(HAS_TRAIT(src, TRAIT_PAIN_RESIST))
+ hurtdamage = round(hurtdamage/2)
+ if(hurtdamage && !HAS_TRAIT(src, TRAIT_ANALGESIA))
var/severity = 0
switch(hurtdamage)
if(5 to 15)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 62174120a60f8..51815282406df 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -1,6 +1,8 @@
/mob/living/carbon/attackby(obj/item/W, mob/user, params)
var/obj/item/bodypart/BP = get_bodypart(check_zone(user.zone_selected))
- var/has_painkillers = reagents.has_reagent(/datum/reagent/medicine/morphine, needs_metabolizing = TRUE)
+ if(!BP)
+ return ..()
+ var/painless = (HAS_TRAIT(user, TRAIT_ANALGESIA) || HAS_TRAIT(user, TRAIT_PAIN_RESIST))
if(W.tool_behaviour == TOOL_WELDER && IS_ROBOTIC_LIMB(BP) && BP.brute_dam) //prioritize healing if we're synthetic
return ..()
if(user.a_intent != INTENT_HELP || !W.get_temperature() || !BP.can_bandage()) //this will also catch low damage synthetic welding
@@ -9,7 +11,7 @@
var/heal_time = 2 SECONDS
playsound(user, 'sound/surgery/cautery1.ogg', 20)
balloon_alert(user, "cauterizing...")
- if(src == user && !has_painkillers)
+ if(src == user && !painless)
heal_time *= 2 //oof ouch owie
user.visible_message(span_nicegreen("[user] holds [W] up to [user == src ? "their" : "[src]'s"] [parse_zone(BP.body_zone)], trying to slow [p_their()] bleeding..."), span_nicegreen("You hold [W] up to [user == src ? "your" : "[src]'s"] [parse_zone(BP.body_zone)], trying to slow [user == src ? "your" : p_their()] bleeding..."))
if(do_after(user, heal_time, target = src))
@@ -385,8 +387,8 @@
var/should_stun = (!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && !(flags & SHOCK_NOSTUN)
if(should_stun)
Paralyze(40)
- //Jitter and other fluff.
- jitteriness += 1000
+ //jitter and other fluff.
+ adjust_jitter(1000, max = 1500)
do_jitter_animation(jitteriness)
stuttering += 2
addtimer(CALLBACK(src, PROC_REF(secondary_shock), should_stun), 20)
@@ -399,6 +401,8 @@
Paralyze(60)
/mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
+ var/datum/component/mood/hugger_mood = M.GetComponent(/datum/component/mood)
+ var/nosound = FALSE
if(on_fire)
to_chat(M, "You can't put [p_them()] out with just your bare hands!")
return
@@ -426,6 +430,22 @@
mothdust += 10;
if(istype(dna.species, /datum/species/moth))
M.mothdust += 10; // End WS edit
+
+ if(M.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Nose boops!
+ nosound = TRUE
+ playsound(src, 'sound/effects/boop.ogg', 50, 0)
+ if (HAS_TRAIT(M, TRAIT_FRIENDLY))
+ M.visible_message(span_notice("[M] playfully boops your nose."), span_notice("You playfully boop [src]'s nose."))
+ if (hugger_mood.sanity >= SANITY_GREAT)
+ new /obj/effect/temp_visual/heart(loc)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "best_boop", /datum/mood_event/best_boop, M)
+ else
+ M.visible_message(span_notice("[M] boops [src]'s nose."), span_notice("You boop [src] on the nose."))
+ if(HAS_TRAIT(src, TRAIT_BADTOUCH))
+ to_chat(M, span_warning("A scowl forms on [src]'s face as you daringly press your finger against [p_their()] nose."))
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "bad_boop", /datum/mood_event/bad_boop, M)
+
+
else if(check_zone(M.zone_selected) == BODY_ZONE_HEAD) //Headpats!
SEND_SIGNAL(src, COMSIG_CARBON_HEADPAT, M)
M.visible_message("[M] gives [src] a pat on the head to make [p_them()] feel better!", \
@@ -440,10 +460,35 @@
if(HAS_TRAIT(src, TRAIT_BADTOUCH))
to_chat(M, "[src] looks visibly upset as you pat [p_them()] on the head.")
+// Tail pulls!
+ else if((M.zone_selected == BODY_ZONE_PRECISE_GROIN) && !isnull(src.getorgan(/obj/item/organ/tail)))
+ M.visible_message(span_notice("[M] pulls on [src]'s tail!"), \
+ null, span_hear("You hear a soft patter."), DEFAULT_MESSAGE_RANGE, list(M, src))
+ to_chat(M, span_notice("You pull on [src]'s tail!"))
+ to_chat(src, span_notice("[M] pulls on your tail!"))
+
+// Rips off fake tails
+ else if((M.zone_selected == BODY_ZONE_PRECISE_GROIN) && (istype(head, /obj/item/clothing/head/kitty) || istype(head, /obj/item/clothing/head/collectable/kitty)))
+ var/obj/item/clothing/head/faketail = head
+ M.visible_message(span_danger("[M] pulls on [src]'s tail... and it rips off!"), \
+ null, span_hear("You hear a ripping sound."), DEFAULT_MESSAGE_RANGE, list(M, src))
+ to_chat(M, span_danger("You pull on [src]'s tail... and it rips off!"))
+ to_chat(src, span_userdanger("[M] pulls on your tail... and it rips off!"))
+ playsound(loc, 'sound/effects/rip1.ogg', 75, TRUE)
+ dropItemToGround(faketail)
+ M.put_in_hands(faketail)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "rippedtail", /datum/mood_event/rippedtail)
+
else if(M.zone_selected == BODY_ZONE_CHEST || M.zone_selected == BODY_ZONE_PRECISE_GROIN) //WS Edit - Adds more help emotes
SEND_SIGNAL(src, COMSIG_CARBON_HUGGED, M)
SEND_SIGNAL(M, COMSIG_CARBON_HUG, M, src)
- M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \
+ if (M.grab_state >= GRAB_AGGRESSIVE)
+ M.visible_message(span_notice("[M] embraces [src] in a tight bear hug!"), \
+ null, span_hear("You hear the rustling of clothes."), DEFAULT_MESSAGE_RANGE, list(M, src))
+ to_chat(M, span_notice("You wrap [src] into a tight bear hug!"))
+ to_chat(src, span_notice("[M] squeezes you super tightly in a firm bear hug!"))
+ else
+ M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \
"You hug [src] to make [p_them()] feel better!")
if(istype(M.dna.species, /datum/species/moth)) //WS edit - moth dust from hugging
mothdust += 15;
@@ -455,12 +500,17 @@
// No moodlets for people who hate touches
if(!HAS_TRAIT(src, TRAIT_BADTOUCH))
- if(bodytemperature > M.bodytemperature)
- if(!HAS_TRAIT(M, TRAIT_BADTOUCH))
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/warmhug, src) // Hugger got a warm hug (Unless they hate hugs)
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/hug) // Reciver always gets a mood for being hugged
- else
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/warmhug, M) // You got a warm hug
+ if (M.grab_state >= GRAB_AGGRESSIVE)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/bear_hug)
+ if(bodytemperature > M.bodytemperature)
+ if(!HAS_TRAIT(M, TRAIT_BADTOUCH))
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/warmhug) // Hugger got a warm hug (Unless they hate hugs)
+ SEND_SIGNAL(M, "hug", /datum/mood_event/hug) // Receiver always gets a mood for being hugged
+ else
+ SEND_SIGNAL(M, "hug", /datum/mood_event/warmhug,) // You got a warm hug
+ else
+ if (M.grab_state >= GRAB_AGGRESSIVE)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/bad_touch_bear_hug)
// Let people know if they hugged someone really warm or really cold
if(M.bodytemperature > M.dna.species.bodytemp_heat_damage_limit)
@@ -474,7 +524,6 @@
to_chat(M, "It feels like [src] is freezing as you hug them.")
if(HAS_TRAIT(M, TRAIT_FRIENDLY))
- var/datum/component/mood/hugger_mood = M.GetComponent(/datum/component/mood)
if (hugger_mood.sanity >= SANITY_GREAT)
new /obj/effect/temp_visual/heart(loc)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M)
@@ -503,8 +552,17 @@
AdjustParalyzed(-60)
AdjustImmobilized(-60)
set_resting(FALSE)
-
- playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+ if(!nosound)
+ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+
+// Shake animation
+#define SHAKE_ANIMATION_OFFSET (4)
+ if (incapacitated())
+ var/direction = prob(50) ? -1 : 1
+ animate(src, pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_OUT, flags = ANIMATION_PARALLEL)
+ animate(pixel_x = pixel_x - (SHAKE_ANIMATION_OFFSET * 2 * direction), time = 1)
+ animate(pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_IN)
+#undef SHAKE_ANIMATION_OFFSET
/// Check ourselves to see if we've got any shrapnel, return true if we do. This is a much simpler version of what humans do, we only indicate we're checking ourselves if there's actually shrapnel
/mob/living/carbon/proc/check_self_for_injuries()
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index f0d27e801cd29..358fa06260922 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -39,25 +39,6 @@
key = "blink_r"
message = "blinks rapidly."
-/datum/emote/living/carbon/clap
- key = "clap"
- key_third_person = "claps"
- message = "claps."
- muzzle_ignore = TRUE
- hands_use_check = TRUE
- emote_type = EMOTE_AUDIBLE
- vary = TRUE
-
-/datum/emote/living/carbon/clap/get_sound(mob/living/user)
- if(ishuman(user))
- if(!user.get_bodypart(BODY_ZONE_L_ARM) || !user.get_bodypart(BODY_ZONE_R_ARM))
- return
- else
- return pick('sound/misc/clap1.ogg',
- 'sound/misc/clap2.ogg',
- 'sound/misc/clap3.ogg',
- 'sound/misc/clap4.ogg')
-
/datum/emote/living/carbon/crack
key = "crack"
key_third_person = "cracks"
@@ -253,7 +234,7 @@
damage += rand(3,7)
if(damage >= 5)
- target.emote("scream")
+ target.force_scream()
target.apply_damage(damage, BRUTE, BODY_ZONE_HEAD)
user.adjustStaminaLoss(iteration + 5)
diff --git a/code/modules/mob/living/carbon/hologram/hologram_inventory.dm b/code/modules/mob/living/carbon/hologram/hologram_inventory.dm
index f7f98bf5ebbec..7d6650b4d5396 100644
--- a/code/modules/mob/living/carbon/hologram/hologram_inventory.dm
+++ b/code/modules/mob/living/carbon/hologram/hologram_inventory.dm
@@ -5,7 +5,7 @@
//Drone hands
-/mob/living/simple_animal/hologram/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
+/mob/living/simple_animal/hologram/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE, use_unequip_delay = FALSE)
if(..())
update_inv_hands()
if(I == internal_storage)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index da75efa5265ae..f973a2b7a5905 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -67,6 +67,8 @@
return pick('sound/voice/human/malescream_1.ogg', 'sound/voice/human/malescream_2.ogg', 'sound/voice/human/malescream_3.ogg', 'sound/voice/human/malescream_4.ogg', 'sound/voice/human/malescream_5.ogg', 'sound/voice/human/malescream_6.ogg')
else if(ismoth(H))
return 'sound/voice/moth/scream_moth.ogg'
+ else if(isvox(H))
+ return 'sound/voice/vox/vox_scream_1.ogg'
else if(islizard(H))
return pick('sound/voice/lizard/lizard_scream_1.ogg', 'sound/voice/lizard/lizard_scream_2.ogg', 'sound/voice/lizard/lizard_scream_3.ogg', 'sound/voice/lizard/lizard_scream_4.ogg')
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 295537cfd95b8..fae17b35d706e 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -113,14 +113,16 @@
if (length(status_examines))
. += status_examines
- //Jitters
+ //jitters
switch(jitteriness)
if(300 to INFINITY)
- . += "[t_He] [t_is] convulsing violently!"
+ . += span_boldwarning("[t_He] [t_is] convulsing violently!")
if(200 to 300)
- . += "[t_He] [t_is] extremely jittery."
+ . += span_warning("[t_He] [t_is] extremely jittery.")
if(100 to 200)
- . += "[t_He] [t_is] twitching ever so slightly."
+ . += span_warning("[t_He] [t_is] twitching ever so slightly.")
+ if(50 to 100)
+ . += span_warning("[t_He] [t_is] flinching lightly")
var/appears_dead = FALSE
var/just_sleeping = FALSE
@@ -430,4 +432,4 @@
if ((wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)))
return
if(get_age())
- . += list(span_notice("[p_they(TRUE)] appear[p_s()] to be [get_age()]."))
+ . += span_notice("[p_they(TRUE)] appear[p_s()] to be [get_age()].")
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 27fa569de7cd3..58f726aa508ee 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -24,7 +24,6 @@
RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, PROC_REF(clean_face))
AddComponent(/datum/component/personal_crafting)
AddComponent(/datum/component/footstep, FOOTSTEP_MOB_HUMAN, 1, -6)
- AddComponent(/datum/component/bloodysoles/feet)
GLOB.human_list += src
/mob/living/carbon/human/proc/setup_human_dna()
@@ -42,6 +41,8 @@
QDEL_NULL(physiology)
QDEL_LIST(bioware)
GLOB.human_list -= src
+ if(blood_particle)
+ QDEL_NULL(blood_particle)
return ..()
@@ -913,10 +914,10 @@
/mob/living/carbon/human/vomit(lost_nutrition = 10, blood = FALSE, stun = TRUE, distance = 1, message = TRUE, toxic = FALSE, harm = TRUE, force = FALSE, purge = FALSE)
if(blood && (NOBLOOD in dna.species.species_traits) && !HAS_TRAIT(src, TRAIT_TOXINLOVER))
if(message)
- visible_message("[src] dry heaves!", \
- "You try to throw up, but there's nothing in your stomach!")
+ visible_message(span_warning("[src] dry heaves!"), \
+ span_userdanger("You try to throw up, but there's nothing in your stomach!"))
if(stun)
- Paralyze(200)
+ Immobilize(30)
return 1
..()
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 7a7bc349b26ce..081c94f4a8f90 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -110,22 +110,24 @@
var/final_block_chance = I.block_chance - (clamp((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
if(I.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
return TRUE
+
if(wear_suit)
- var/final_block_chance = wear_suit.block_chance - (clamp((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
+ var/final_block_chance = wear_suit.block_chance - (clamp((armour_penetration - wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
if(wear_suit.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
return TRUE
if(w_uniform)
- var/final_block_chance = w_uniform.block_chance - (clamp((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
+ var/final_block_chance = w_uniform.block_chance - (clamp((armour_penetration - w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
if(w_uniform.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
return TRUE
if(wear_neck)
- var/final_block_chance = wear_neck.block_chance - (clamp((armour_penetration-wear_neck.armour_penetration)/2,0,100)) + block_chance_modifier
+ var/final_block_chance = wear_neck.block_chance - (clamp((armour_penetration - wear_neck.armour_penetration)/2,0,100)) + block_chance_modifier
if(wear_neck.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
return TRUE
if(head)
- var/final_block_chance = head.block_chance - (clamp((armour_penetration-head.armour_penetration)/2,0,100)) + block_chance_modifier
+ var/final_block_chance = head.block_chance - (clamp((armour_penetration - head.armour_penetration)/2,0,100)) + block_chance_modifier
if(head.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
return TRUE
+
return FALSE
/mob/living/carbon/human/proc/check_block()
@@ -522,8 +524,8 @@
var/informed = FALSE
for(var/obj/item/bodypart/L as anything in bodyparts)
if(!IS_ORGANIC_LIMB(L))
- if(!informed)
- to_chat(src, "You feel a sharp pain as your robotic limbs overload.")
+ if(!informed && !HAS_TRAIT(src, TRAIT_ANALGESIA))
+ to_chat(src, span_userdanger("You feel a sharp pain as your robotic limbs overload."))
informed = TRUE
switch(severity)
if(1)
@@ -655,7 +657,7 @@
if(affecting.name == BODY_ZONE_HEAD)
if(prob(min(acidpwr*acid_volume/10, 90))) //Applies disfigurement
affecting.receive_damage(acidity, 2*acidity)
- emote("scream")
+ force_scream()
facial_hairstyle = "Shaved"
hairstyle = "Bald"
update_hair()
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index cbaa988aa5a85..d0c323797eacb 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -121,7 +121,9 @@
/mob/living/carbon/human/equip_to_slot(obj/item/I, slot, initial = FALSE, redraw_mob = FALSE, swap = FALSE)
if(!..()) //a check failed or the item has already found its slot
return
-
+ if(isclothing(I))//needs to be set very early, because clothing overlays need it assigned before update_inv calls
+ var/obj/item/clothing/ouritem = I
+ ouritem.wearer = WEAKREF(src)
var/current_equip
var/not_handled = FALSE //Added in case we make this type path deeper one day
switch(slot)
@@ -204,7 +206,9 @@
update_inv_s_store()
else
to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!")
-
+ if(isclothing(I))//just in case
+ var/obj/item/clothing/ouritem = I
+ ouritem.wearer = null
if (current_equip)
put_in_active_hand(current_equip)
@@ -224,7 +228,7 @@
var/obj/item/thing = sloties
. += thing?.slowdown
-/mob/living/carbon/human/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
+/mob/living/carbon/human/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE, use_unequip_delay = FALSE)
var/index = get_held_index_of_item(I)
. = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should.
if(!. || !I)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 18b6cb9ba40e6..cb812d45b34bf 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -120,6 +120,7 @@
if(istype(L, /obj/item/organ/lungs))
var/obj/item/organ/lungs/lun = L
lun.check_breath(breath,src)
+ lun.handle_breath_temperature(breath,src)
/// Environment handlers for species
/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment)
@@ -345,13 +346,19 @@
var/obj/item/bodypart/R = get_bodypart("r_arm")
if(istype(L) && L.bone_status == BONE_FLAG_BROKEN && held_items[1] && prob(30))
- emote("scream")
- visible_message("[src] screams and lets go of [held_items[1]] in pain.", "A horrible pain in your [parse_zone(L)] makes it impossible to hold [held_items[1]]!")
+ force_scream()
+ if(!HAS_TRAIT(src, TRAIT_ANALGESIA))
+ visible_message(span_warning("[src] screams and lets go of [held_items[1]] in pain."), span_userdanger("A horrible pain in your [parse_zone(L)] makes it impossible to hold [held_items[1]]!"))
+ else
+ visible_message(span_notice("[src] flinches and lets go of [held_items[1]]."),span_notice("A sudden weakness in your [parse_zone(L)] makes it impossible to grasp [held_items[1]]!"))
dropItemToGround(held_items[1])
if(istype(R) && R.bone_status == BONE_FLAG_BROKEN && held_items[2] && prob(30))
- emote("scream")
- visible_message("[src] screams and lets go of [held_items[2]] in pain.", "A horrible pain in your [parse_zone(R)] makes it impossible to hold [held_items[2]]!")
+ force_scream()
+ if(!HAS_TRAIT(src, TRAIT_ANALGESIA))
+ visible_message(span_warning("[src] screams and lets go of [held_items[1]] in pain."), span_userdanger("A horrible pain in your [parse_zone(R)] makes it impossible to hold [held_items[1]]!"))
+ else
+ visible_message(span_notice("[src] flinches and lets go of [held_items[1]]."),span_notice("A sudden weakness in your [parse_zone(R)] makes it impossible to grasp [held_items[1]]!"))
dropItemToGround(held_items[2])
#undef THERMAL_PROTECTION_HEAD
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index a1560963b00bb..53de44fcd9344 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -108,6 +108,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/siemens_coeff = 1
///What kind of damage overlays (if any) appear on our species when wounded? If this is "", does not add an overlay.
var/damage_overlay_type = "human"
+ ///for species with a unique body size(above 32x32), who need a custom icon file for overlays
+ var/custom_overlay_icon
///To use MUTCOLOR with a fixed color that's independent of the mcolor feature in DNA.
var/fixed_mut_color = ""
///Special mutation that can be found in the genepool exclusively in this species. Dont leave empty or changing species will be a headache
@@ -147,9 +149,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
/// Minimum amount of kelvin moved toward normal body temperature per tick.
var/bodytemp_autorecovery_min = HUMAN_BODYTEMP_AUTORECOVERY_MINIMUM
/// The maximum temperature the species is comfortable at. Going above this does not apply any effects, but warns players that the temperture is hot
- var/max_temp_comfortable = (HUMAN_BODYTEMP_NORMAL + 7)
+ var/max_temp_comfortable = (HUMAN_BODYTEMP_NORMAL) //20 c will always be below human bodytemp, this just makes it so when it can sustain that its higher
/// The minimum temperature the species is comfortable at. Going below this does not apply any effects, but warns players that the temperture is chilly
- var/min_temp_comfortable = (HUMAN_BODYTEMP_NORMAL - 5)
+ var/min_temp_comfortable = (HUMAN_BODYTEMP_NORMAL - 1)
/// This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery.
var/bodytemp_autorecovery_divisor = HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR
///Similar to the autorecovery_divsor, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to lose bodytemp faster.
@@ -190,7 +192,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
///What gas does this species breathe? Used by suffocation screen alerts, most of actual gas breathing is handled by mutantlungs. See [life.dm][code/modules/mob/living/carbon/human/life.dm]
var/breathid = "o2"
-
//Do NOT remove by setting to null. use OR make a RESPECTIVE TRAIT (removing stomach? add the NOSTOMACH trait to your species)
//why does it work this way? because traits also disable the downsides of not having an organ, removing organs but not having the trait will make your species die
//shut up you're not my mother
@@ -496,6 +497,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
fly.Grant(C)
C.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/species, multiplicative_slowdown=speedmod)
+ C.bodytemperature = bodytemp_normal
SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species)
@@ -1103,7 +1105,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
if(!H.get_bodypart(BODY_ZONE_HEAD))
return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_NECK)
if(H.wear_neck && !swap)
return FALSE
@@ -1115,13 +1117,13 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_BACK))
return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_OCLOTHING)
if(H.wear_suit && !swap)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_OCLOTHING))
return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_GLOVES)
if(H.gloves && !swap)
return FALSE
@@ -1129,7 +1131,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
if(H.num_hands < 2)
return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_FEET)
if(H.shoes && !swap)
return FALSE
@@ -1141,7 +1143,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(!disable_warning)
to_chat(H, "This footwear isn't compatible with your feet!")
return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_BELT)
if(H.belt && !swap)
return FALSE
@@ -1154,7 +1156,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_BELT))
return
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_EYES)
if(H.glasses && !swap)
return FALSE
@@ -1165,7 +1167,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/obj/item/organ/eyes/E = H.getorganslot(ORGAN_SLOT_EYES)
if(E?.no_glasses)
return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_HEAD)
if(H.head && !swap)
return FALSE
@@ -1173,7 +1175,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
if(!H.get_bodypart(BODY_ZONE_HEAD))
return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_EARS)
if(H.ears && !swap)
return FALSE
@@ -1181,13 +1183,13 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
if(!H.get_bodypart(BODY_ZONE_HEAD))
return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_ICLOTHING)
if(H.w_uniform && !swap)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_ICLOTHING))
return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_ID)
if(H.wear_id)
if(SEND_SIGNAL(H.wear_id, COMSIG_TRY_STORAGE_CAN_INSERT, I, H, TRUE))
@@ -1201,7 +1203,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_ID))
return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
if(ITEM_SLOT_LPOCKET)
if(HAS_TRAIT(I, TRAIT_NODROP)) //Pockets aren't visible, so you can't move TRAIT_NODROP items into them.
return FALSE
@@ -1236,6 +1238,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
if(H.s_store && !swap)
return FALSE
+ if(HAS_TRAIT(I, TRAIT_FORCE_SUIT_STORAGE))
+ return TRUE
if(!H.wear_suit)
if(!disable_warning)
to_chat(H, "You need a suit before you can attach this [I.name]!")
@@ -1274,11 +1278,22 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
return FALSE //Unsupported slot
-/datum/species/proc/equip_delay_self_check(obj/item/I, mob/living/carbon/human/H, bypass_equip_delay_self)
- if(!I.equip_delay_self || bypass_equip_delay_self)
+/datum/species/proc/equip_delay_self_check(obj/item/to_equip, mob/living/carbon/human/ourhuman, bypass_equip_delay_self)
+ if(!to_equip.equip_delay_self || bypass_equip_delay_self)
return TRUE
- H.visible_message("[H] start putting on [I]...", "You start putting on [I]...")
- return do_after(H, I.equip_delay_self, target = H)
+
+ ourhuman.visible_message(
+ span_notice("[ourhuman] start putting on [to_equip]..."),
+ span_notice("You start putting on [to_equip]...")
+ )
+
+ . = to_equip.do_equip_wait(ourhuman, to_equip.equipping_sound)
+
+ if(.)
+ ourhuman.visible_message(
+ span_notice("[src] puts on [to_equip]."),
+ span_notice("You puts on [to_equip].")
+ )
/datum/species/proc/before_equip_job(datum/job/J, mob/living/carbon/human/H)
return
@@ -1348,7 +1363,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
else if(H.satiety < 0)
H.satiety++
if(prob(round(-H.satiety/40)))
- H.Jitter(5)
+ H.adjust_jitter(5, max = 100)
hunger_rate = 3 * HUNGER_FACTOR
hunger_rate *= H.physiology.hunger_mod
H.adjust_nutrition(-hunger_rate)
@@ -1809,18 +1824,26 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/plasma = environment.get_moles(GAS_PLASMA)
var/tritium = environment.get_moles(GAS_TRITIUM)
var/chlorine = environment.get_moles(GAS_CHLORINE)
+ var/ammonia = environment.get_moles(GAS_AMMONIA)
var/hydrogen_chloride = environment.get_moles(GAS_HYDROGEN_CHLORIDE)
- if(chlorine <= MINIMUM_MOLS_TO_HARM && hydrogen_chloride <= MINIMUM_MOLS_TO_HARM && tritium <= MINIMUM_MOLS_TO_HARM && plasma <= MINIMUM_MOLS_TO_HARM)
+ var/sulfur_dioxide = environment.get_moles(GAS_SO2)
+ if(chlorine <= MINIMUM_MOLS_TO_HARM && hydrogen_chloride <= MINIMUM_MOLS_TO_HARM && tritium <= MINIMUM_MOLS_TO_HARM && plasma <= MINIMUM_MOLS_TO_HARM && ammonia <= MINIMUM_MOLS_TO_HARM && sulfur_dioxide <= MINIMUM_MOLS_TO_HARM)
return
var/eyedamage = FALSE
var/irritant = FALSE
var/burndamage = 0
- var/lowerthreshold = 0
+ var/lowerthreshold = FALSE
+
+ var/feels_pain = TRUE
if(HAS_TRAIT(H, TRAIT_METALLIC)) //makes certain species take more damage and start taking damage at lower air amounts
- lowerthreshold = 1
+ lowerthreshold = TRUE
- if(plasma > (MINIMUM_MOLS_TO_HARM * 10))
+ if(HAS_TRAIT(H, TRAIT_ANALGESIA)) //if we can't feel pain, dont give the pain messages
+ feels_pain = FALSE
+
+ if(plasma > MINIMUM_MOLS_TO_HARM)
+ burndamage += max(sqrt(ammonia) - 1 + lowerthreshold, 0)
eyedamage = TRUE
irritant = TRUE
if(tritium)
@@ -1833,73 +1856,72 @@ GLOBAL_LIST_EMPTY(roundstart_races)
irritant = TRUE
if(chlorine > (MINIMUM_MOLS_TO_HARM * 10))
eyedamage = TRUE
+ if(ammonia)
+ burndamage += max(sqrt(ammonia) - 2 + lowerthreshold, 0)
+ irritant = TRUE
+ if(ammonia > (MINIMUM_MOLS_TO_HARM * 5))
+ eyedamage = TRUE
if(hydrogen_chloride)
burndamage += max(sqrt(hydrogen_chloride) - 1 + lowerthreshold, 0)
eyedamage = TRUE
irritant = TRUE
+ if(sulfur_dioxide)
+ burndamage += max(sqrt(chlorine) - 4 + lowerthreshold, 0)
+ irritant = TRUE
+ if(sulfur_dioxide > (MINIMUM_MOLS_TO_HARM * 5))
+ eyedamage = TRUE
if(!eyedamage && !burndamage && !irritant)
return
H.apply_damage(burndamage, BURN, spread_damage = TRUE)
if(prob(50) && burndamage)
- if(lowerthreshold)
- to_chat(H, "You're corroding!")
- else
- to_chat(H, "You're melting!")
+ if(lowerthreshold && feels_pain)
+ to_chat(H, span_userdanger("You're corroding!"))
+ else if(feels_pain)
+ to_chat(H, span_userdanger("You're melting!"))
playsound(H, 'sound/items/welder.ogg', 30, TRUE)
if(!H.check_for_goggles() && eyedamage)
H.adjustOrganLoss(ORGAN_SLOT_EYES, 1)
- if(prob(50))
- to_chat(H, "Your eyes burn!")
- if(irritant && prob(50))
+ if(prob(50) && feels_pain)
+ to_chat(H, span_danger("Your eyes burn!"))
+ H.emote("cry")
+ H.set_blurriness(10)
+ if(irritant && prob(50) && feels_pain)
if(lowerthreshold)
- to_chat(H, "Your outer shell smolders!")
+ to_chat(H, span_danger("Your outer shell smolders!"))
else
- to_chat(H, "Your skin itches.")
+ to_chat(H, span_danger("Your skin itches."))
/// Handle the body temperature status effects for the species
/// Traits for resitance to heat or cold are handled here.
/datum/species/proc/handle_body_temperature(mob/living/carbon/human/H)
var/body_temp = H.bodytemperature
- var/total_change = bodytemp_natural_stabilization + bodytemp_environment_change
//tempature is no longer comfy, throw alert
if(body_temp > max_temp_comfortable && !HAS_TRAIT(H, TRAIT_RESISTHEAT))
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
if(body_temp > bodytemp_heat_damage_limit)
var/burn_damage = calculate_burn_damage(H)
- if(burn_damage < 2)
+ if(burn_damage > 2)
H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 3)
else
H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 2)
else
- if(body_temp < (bodytemp_heat_damage_limit - 10))
- // you are cooling down and exiting the danger zone
- if(total_change < 0)
- H.throw_alert("tempfeel", /atom/movable/screen/alert/warm)
- else
- H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 2)
- else if(total_change > 1)
- H.throw_alert("tempfeel", /atom/movable/screen/alert/warm)
+ if(body_temp < (bodytemp_heat_damage_limit - 3))
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 1)
else
- H.clear_alert("tempfeel")
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/warm)
else if (body_temp < min_temp_comfortable && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot")
- if(body_temp < 200)
+ if(body_temp < bodytemp_cold_damage_limit -7)
H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 3)
else if(body_temp < bodytemp_cold_damage_limit)
H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 2)
- else if(body_temp < (bodytemp_cold_damage_limit + 10))
- // you are warming up and exiting the danger zone
- if(total_change > 0)
- H.throw_alert("tempfeel", /atom/movable/screen/alert/chilly)
- else
- H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 2)
- else if(total_change < -1)
- H.throw_alert("tempfeel", /atom/movable/screen/alert/chilly)
+ else if(body_temp < (bodytemp_cold_damage_limit + 5))
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 1)
else
- H.clear_alert("tempfeel")
+ H.throw_alert("tempfeel", /atom/movable/screen/alert/chilly)
else
H.clear_alert("tempfeel")
@@ -1918,27 +1940,34 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(burn_damage)
if(H.mob_biotypes & MOB_ROBOTIC) //robors have a alternative cooling fan graphic
switch(burn_damage)
- if(0 to 2)
+ if(0 to 1)
H.throw_alert("temp", /atom/movable/screen/alert/fans, 1)
- if(2 to 4)
+ if(2 to 3)
H.throw_alert("temp", /atom/movable/screen/alert/fans, 2)
else
H.throw_alert("temp", /atom/movable/screen/alert/fans, 3)
else
switch(burn_damage)
- if(0 to 2)
+ if(0 to 1)
H.throw_alert("temp", /atom/movable/screen/alert/sweat, 1)
- if(2 to 4)
+ if(2 to 3)
H.throw_alert("temp", /atom/movable/screen/alert/sweat, 2)
else
H.throw_alert("temp", /atom/movable/screen/alert/sweat, 3)
+ //Stay hydrated.
+ if(!(H.mob_biotypes & MOB_ROBOTIC) && H.reagents.has_reagent(/datum/reagent/water) && H.stat != DEAD)
+ burn_damage -= clamp(H.reagents.get_reagent_amount(/datum/reagent/water) /10, 0, 2)
+ // if youre dead, no need to sweat?
+ if(H.stat != DEAD)
+ burn_damage -= (max(burn_damage - 2.5, 0))
+
// Apply species and physiology modifiers to heat damage
burn_damage = burn_damage * heatmod * H.physiology.heat_mod
// 40% for level 3 damage on humans to scream in pain
if (H.stat < UNCONSCIOUS && (prob(burn_damage) * 10) / 4)
- H.emote("scream")
+ H.force_scream()
// Apply the damage to all body parts
H.apply_damage(burn_damage, BURN, spread_damage = TRUE)
@@ -1953,17 +1982,25 @@ GLOBAL_LIST_EMPTY(roundstart_races)
// Display alerts based on the amount of cold damage being taken
// Apply more damage based on how cold you are
- if(body_temp < 120)
+ if(body_temp < bodytemp_cold_damage_limit - 15)
H.throw_alert("temp", /atom/movable/screen/alert/shiver, 3)
- H.apply_damage(COLD_DAMAGE_LEVEL_3 * coldmod * H.physiology.cold_mod, BURN)
+ if(H.stat != DEAD) // probably can store them in cold storage like this
+ H.apply_damage(COLD_DAMAGE_LEVEL_3 * coldmod * H.physiology.cold_mod, BURN)
+ H.emote("shiver")
- else if(body_temp < 200)
+ else if(body_temp < bodytemp_cold_damage_limit - 7)
H.throw_alert("temp", /atom/movable/screen/alert/shiver, 2)
- H.apply_damage(COLD_DAMAGE_LEVEL_2 * coldmod * H.physiology.cold_mod, BURN)
+ if(H.stat != DEAD) // when you think about it, being cold wouldnt do skin damaage if there nothing even alive?
+ H.apply_damage(COLD_DAMAGE_LEVEL_2 * coldmod * H.physiology.cold_mod, BURN)
+ if(prob(30))
+ H.emote("shiver")
else
H.throw_alert("temp", /atom/movable/screen/alert/shiver, 1)
- H.apply_damage(COLD_DAMAGE_LEVEL_1 * coldmod * H.physiology.cold_mod, BURN)
+ if(H.stat != DEAD) // to prevent a bug where bodies at room tempertue actually take damage from their body being cold
+ H.apply_damage(COLD_DAMAGE_LEVEL_1 * coldmod * H.physiology.cold_mod, BURN)
+ if(prob(10))
+ H.emote("shiver")
// We are not to hot or cold, remove status and moods
else
@@ -1979,7 +2016,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
firemodifier = min(firemodifier, 0)
// this can go below 5 at log 2.5
- burn_damage = max(log(2 - firemodifier, (current_human.bodytemperature - current_human.get_body_temp_normal(apply_change=FALSE))) - 5,0)
+ burn_damage = max(log(2 - firemodifier, (current_human.bodytemperature - current_human.get_body_temp_normal(apply_change=FALSE))) - 2,0)
return burn_damage
/// Handle the air pressure of the environment
@@ -2036,25 +2073,21 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/body_temp = H.bodytemperature // Get current body temperature
var/body_temperature_difference = H.get_body_temp_normal() - body_temp
var/natural_change = 0
-
- // We are very cold, increate body temperature
- if(body_temp <= bodytemp_cold_damage_limit)
- natural_change = max((body_temperature_difference * H.metabolism_efficiency / bodytemp_autorecovery_divisor), \
- bodytemp_autorecovery_min)
+ var/recovery_temp = bodytemp_autorecovery_min
+ //if in crit, we struggle to regulate temperture. this will make extreme tempertures more dangerous to injured
+ if (H.stat > SOFT_CRIT)
+ recovery_temp = recovery_temp / 2
// we are cold, reduce the minimum increment and do not jump over the difference
- else if(body_temp > bodytemp_cold_damage_limit && body_temp < H.get_body_temp_normal())
+ if(body_temp > bodytemp_cold_damage_limit && body_temp < H.get_body_temp_normal())
natural_change = max(body_temperature_difference * H.metabolism_efficiency / bodytemp_autorecovery_divisor, \
- min(body_temperature_difference, bodytemp_autorecovery_min / 4))
+ min(body_temperature_difference, recovery_temp / 4))
// We are hot, reduce the minimum increment and do not jump below the difference
else if(body_temp > H.get_body_temp_normal() && body_temp <= bodytemp_heat_damage_limit)
natural_change = min(body_temperature_difference * H.metabolism_efficiency / bodytemp_autorecovery_divisor, \
- max(body_temperature_difference, -(bodytemp_autorecovery_min / 4)))
+ max(body_temperature_difference, -(recovery_temp / 4)))
- // We are very hot, reduce the body temperature
- else if(body_temp >= bodytemp_heat_damage_limit)
- natural_change = min((body_temperature_difference / bodytemp_autorecovery_divisor), -bodytemp_autorecovery_min)
var/thermal_protection = H.get_insulation_protection(body_temp + natural_change)
if(areatemp > body_temp) // It is hot here
@@ -2142,9 +2175,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(thermal_protection >= FIRE_IMMUNITY_MAX_TEMP_PROTECT && !no_protection)
return
if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT && !no_protection)
- H.adjust_bodytemperature(11)
+ H.adjust_bodytemperature(3)
else
- H.adjust_bodytemperature(bodytemp_heating_rate_max + (H.fire_stacks * 12))
+ H.adjust_bodytemperature(bodytemp_heating_rate_max + (H.fire_stacks * 5))
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "on_fire", /datum/mood_event/on_fire)
/datum/species/proc/CanIgniteMob(mob/living/carbon/human/H)
diff --git a/code/modules/mob/living/carbon/human/species_types/IPC.dm b/code/modules/mob/living/carbon/human/species_types/IPC.dm
index 20d3f81aa38d9..14b8081e7c0cf 100644
--- a/code/modules/mob/living/carbon/human/species_types/IPC.dm
+++ b/code/modules/mob/living/carbon/human/species_types/IPC.dm
@@ -32,7 +32,7 @@
attack_sound = 'sound/items/trayhit1.ogg'
deathsound = "sound/voice/borg_deathsound.ogg"
wings_icons = list("Robotic")
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
species_language_holder = /datum/language_holder/ipc
loreblurb = "Integrated Positronic Chassis or \"IPC\" for short, are synthetic lifeforms composed of an Artificial \
Intelligence program encased in a bipedal robotic shell. They are fragile, allergic to EMPs, and the butt of endless toaster jokes. \
diff --git a/code/modules/mob/living/carbon/human/species_types/abductors.dm b/code/modules/mob/living/carbon/human/species_types/abductors.dm
index 41bc6721755f3..229bdcb21c2f3 100644
--- a/code/modules/mob/living/carbon/human/species_types/abductors.dm
+++ b/code/modules/mob/living/carbon/human/species_types/abductors.dm
@@ -5,7 +5,7 @@
species_traits = list(NOBLOOD,NOEYESPRITES,NO_BONES)
inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_CHUNKYFINGERS,TRAIT_NOHUNGER,TRAIT_NOBREATH)
mutanttongue = /obj/item/organ/tongue/abductor
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
ass_image = 'icons/ass/assgrey.png'
species_chest = /obj/item/bodypart/chest/abductor
diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm
index 6230416745168..6bb5956ae0ab6 100644
--- a/code/modules/mob/living/carbon/human/species_types/android.dm
+++ b/code/modules/mob/living/carbon/human/species_types/android.dm
@@ -11,7 +11,7 @@
reagent_tag = PROCESS_SYNTHETIC
species_gibs = "robotic"
attack_sound = 'sound/items/trayhit1.ogg'
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
/datum/species/android/on_species_gain(mob/living/carbon/C)
. = ..()
diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
index b91559edb0aea..2a0b2709bde87 100644
--- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
@@ -17,21 +17,21 @@
brutemod = 1.25 //They're weak to punches
attack_type = BURN //burn bish
exotic_bloodtype = "E"
- damage_overlay_type = "" //We are too cool for regular damage overlays
species_age_max = 300
species_traits = list(DYNCOLORS, EYECOLOR, HAIR, FACEHAIR)
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
species_language_holder = /datum/language_holder/ethereal
inherent_traits = list(TRAIT_NOHUNGER)
sexes = FALSE //no fetish content allowed
toxic_food = NONE
// Body temperature for ethereals is much higher then humans as they like hotter environments
bodytemp_normal = (HUMAN_BODYTEMP_NORMAL + 50)
- bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // about 150C
+ bodytemp_heat_damage_limit = (HUMAN_BODYTEMP_NORMAL + 65)
// Cold temperatures hurt faster as it is harder to move with out the heat energy
- bodytemp_cold_damage_limit = (T20C - 10) // about 10c
+ bodytemp_cold_damage_limit = (HUMAN_BODYTEMP_NORMAL - 20)
- max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 100
+ min_temp_comfortable = (HUMAN_BODYTEMP_NORMAL - 10)
+ max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 55
hair_color = "fixedmutcolor"
hair_alpha = 140
@@ -149,7 +149,7 @@
_human.apply_damage(8,BRUTE,BODY_ZONE_CHEST)
_human.apply_damage(8,BRUTE,BODY_ZONE_L_LEG)
_human.apply_damage(8,BRUTE,BODY_ZONE_R_LEG)
- _human.emote("scream")
+ _human.force_scream()
_human.remove_status_effect(/datum/status_effect/rooted)
return
diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
index f5de9f873b3b2..7cf8d8ee3e452 100644
--- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
@@ -9,7 +9,7 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly
disliked_food = null
liked_food = GORE | RAW // Sure, the raw... the bloody... but I think stuff GROSS, like baseball burgers, are liked
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
species_language_holder = /datum/language_holder/fly
species_chest = /obj/item/bodypart/chest/fly
diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm
index 882fffc9ff418..b45ec4b05f3e6 100644
--- a/code/modules/mob/living/carbon/human/species_types/humans.dm
+++ b/code/modules/mob/living/carbon/human/species_types/humans.dm
@@ -9,7 +9,7 @@
skinned_type = /obj/item/stack/sheet/animalhide/human
disliked_food = GROSS | RAW | CLOTH
liked_food = JUNKFOOD | FRIED | SUGAR
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
loreblurb = "Mostly hairless mammalians. Their home system, Sol, lies in a sort of \"bluespace dead-zone\" that blocks anything from entering or exiting Sol's dead-zone through bluespace without a relay. While it leaves Sol extremely well-defended, it meant that they went unnoticed and uncontacted until they were themselves able to breach it."
/datum/species/human/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 14526059354d4..e70ec71ddd7a5 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -20,7 +20,7 @@
coldmod = 6 // = 3x cold damage
heatmod = 0.5 // = 1/4x heat damage
burnmod = 0.5 // = 1/2x generic burn damage
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
inherent_factions = list("slime")
species_language_holder = /datum/language_holder/jelly
ass_image = 'icons/ass/assslime.png'
@@ -222,7 +222,7 @@
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
hair_color = "mutcolor"
hair_alpha = 150
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN
var/datum/action/innate/split_body/slime_split
var/list/mob/living/carbon/bodies
var/datum/action/innate/swap_body/swap_body
@@ -517,50 +517,22 @@
id = SPECIES_LUMINESCENT
var/glow_intensity = LUMINESCENT_DEFAULT_GLOW
var/obj/effect/dummy/luminescent_glow/glow
- var/obj/item/slime_extract/current_extract
- var/datum/action/innate/integrate_extract/integrate_extract
- var/datum/action/innate/use_extract/extract_minor
- var/datum/action/innate/use_extract/major/extract_major
- var/extract_cooldown = 0
-
examine_limb_id = SPECIES_JELLYPERSON
//Species datums don't normally implement destroy, but JELLIES SUCK ASS OUT OF A STEEL STRAW
-/datum/species/jelly/luminescent/Destroy(force, ...)
- current_extract = null
+/datum/species/jelly/luminescent/Destroy(force)
QDEL_NULL(glow)
- QDEL_NULL(integrate_extract)
- QDEL_NULL(extract_major)
- QDEL_NULL(extract_minor)
return ..()
/datum/species/jelly/luminescent/on_species_loss(mob/living/carbon/C)
..()
- if(current_extract)
- current_extract.forceMove(C.drop_location())
- current_extract = null
QDEL_NULL(glow)
- QDEL_NULL(integrate_extract)
- QDEL_NULL(extract_major)
- QDEL_NULL(extract_minor)
/datum/species/jelly/luminescent/on_species_gain(mob/living/carbon/C, datum/species/old_species)
..()
glow = new(C)
update_glow(C)
- integrate_extract = new(src)
- integrate_extract.Grant(C)
- extract_minor = new(src)
- extract_minor.Grant(C)
- extract_major = new(src)
- extract_major.Grant(C)
-
-/datum/species/jelly/luminescent/proc/update_slime_actions()
- integrate_extract.update_name()
- integrate_extract.UpdateButtonIcon()
- extract_minor.UpdateButtonIcon()
- extract_major.UpdateButtonIcon()
/datum/species/jelly/luminescent/proc/update_glow(mob/living/carbon/C, intensity)
if(intensity)
@@ -581,108 +553,6 @@
if(!isliving(loc))
return INITIALIZE_HINT_QDEL
-
-/datum/action/innate/integrate_extract
- name = "Integrate Extract"
- desc = "Eat a slime extract to use its properties."
- check_flags = AB_CHECK_CONSCIOUS
- button_icon_state = "slimeconsume"
- icon_icon = 'icons/mob/actions/actions_slime.dmi'
- background_icon_state = "bg_alien"
-
-/datum/action/innate/integrate_extract/proc/update_name()
- var/datum/species/jelly/luminescent/species = target
- if(!species || !species.current_extract)
- name = "Integrate Extract"
- desc = "Eat a slime extract to use its properties."
- else
- name = "Eject Extract"
- desc = "Eject your current slime extract."
-
-/datum/action/innate/integrate_extract/UpdateButtonIcon(status_only, force)
- var/datum/species/jelly/luminescent/species = target
- if(!species || !species.current_extract)
- button_icon_state = "slimeconsume"
- else
- button_icon_state = "slimeeject"
- ..()
-
-/datum/action/innate/integrate_extract/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force)
- ..(current_button, TRUE)
- var/datum/species/jelly/luminescent/species = target
- if(species?.current_extract)
- current_button.add_overlay(mutable_appearance(species.current_extract.icon, species.current_extract.icon_state))
-
-/datum/action/innate/integrate_extract/Activate()
- var/mob/living/carbon/human/H = owner
- var/datum/species/jelly/luminescent/species = target
- if(!is_species(H, /datum/species/jelly/luminescent) || !species)
- return
- CHECK_DNA_AND_SPECIES(H)
-
- if(species.current_extract)
- var/obj/item/slime_extract/S = species.current_extract
- if(!H.put_in_active_hand(S))
- S.forceMove(H.drop_location())
- species.current_extract = null
- to_chat(H, "You eject [S].")
- species.update_slime_actions()
- else
- var/obj/item/I = H.get_active_held_item()
- if(istype(I, /obj/item/slime_extract))
- var/obj/item/slime_extract/S = I
- if(!S.Uses)
- to_chat(H, "[I] is spent! You cannot integrate it.")
- return
- if(!H.temporarilyRemoveItemFromInventory(S))
- return
- S.forceMove(H)
- species.current_extract = S
- to_chat(H, "You consume [I], and you feel it pulse within you...")
- species.update_slime_actions()
- else
- to_chat(H, "You need to hold an unused slime extract in your active hand!")
-
-/datum/action/innate/use_extract
- name = "Extract Minor Activation"
- desc = "Pulse the slime extract with energized jelly to activate it."
- check_flags = AB_CHECK_CONSCIOUS
- button_icon_state = "slimeuse1"
- icon_icon = 'icons/mob/actions/actions_slime.dmi'
- background_icon_state = "bg_alien"
- var/activation_type = SLIME_ACTIVATE_MINOR
-
-/datum/action/innate/use_extract/IsAvailable()
- if(..())
- var/datum/species/jelly/luminescent/species = target
- if(species && species.current_extract && (world.time > species.extract_cooldown))
- return TRUE
- return FALSE
-
-/datum/action/innate/use_extract/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force)
- ..(current_button, TRUE)
- var/datum/species/jelly/luminescent/species = owner
- if(species?.current_extract)
- current_button.add_overlay(mutable_appearance(species.current_extract.icon, species.current_extract.icon_state))
-
-/datum/action/innate/use_extract/Activate()
- var/mob/living/carbon/human/H = owner
- var/datum/species/jelly/luminescent/species = owner
- if(!is_species(H, /datum/species/jelly/luminescent) || !species)
- return
- CHECK_DNA_AND_SPECIES(H)
-
- if(species.current_extract)
- species.extract_cooldown = world.time + 100
- var/cooldown = species.current_extract.activate(H, species, activation_type)
- species.extract_cooldown = world.time + cooldown
-
-/datum/action/innate/use_extract/major
- name = "Extract Major Activation"
- desc = "Pulse the slime extract with plasma jelly to activate it."
- button_icon_state = "slimeuse2"
- activation_type = SLIME_ACTIVATE_MAJOR
-
///////////////////////////////////STARGAZERS//////////////////////////////////////////
//Stargazers are the telepathic branch of jellypeople, able to project psychic messages and to link minds with willing participants.
diff --git a/code/modules/mob/living/carbon/human/species_types/kepori.dm b/code/modules/mob/living/carbon/human/species_types/kepori.dm
index 39e3cbc3d07a5..c79ac3aaf68e8 100644
--- a/code/modules/mob/living/carbon/human/species_types/kepori.dm
+++ b/code/modules/mob/living/carbon/human/species_types/kepori.dm
@@ -9,7 +9,7 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/chicken
disliked_food = FRIED | GROSS | CLOTH
liked_food = MEAT | GORE
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
loreblurb = "Kepori are a species covered in feathers vaguely reminiscent of earth’s extinct troodontidae. They’re small and sometimes seen as weak by other species due to their hollow bones but make up for that in speed and reflexes. They tend to woop when excited, scared, or for any other reason at all."
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
@@ -18,14 +18,19 @@
species_eye_path = 'icons/mob/species/kepori/kepori_eyes.dmi'
heatmod = 0.67
coldmod = 1.5
- brutemod = 1.5
- burnmod = 1.5
- speedmod = -0.25
- bodytemp_normal = HUMAN_BODYTEMP_NORMAL + 30
- bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 30
- bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT + 30
- max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 40
- min_temp_comfortable = HUMAN_BODYTEMP_NORMAL - 3
+ // brutemod = 1.5
+ // burnmod = 1.5
+ speedmod = -0.10
+
+ bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 35
+ bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT + 3
+
+ max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 15
+ min_temp_comfortable = HUMAN_BODYTEMP_NORMAL - 1
+
+ bodytemp_autorecovery_divisor = HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR - 4
+
+
mutanttongue = /obj/item/organ/tongue/kepori
species_language_holder = /datum/language_holder/kepori
var/datum/action/innate/keptackle/keptackle
@@ -61,6 +66,9 @@
robotic_eyes = /obj/item/organ/eyes/robotic/kepori
+ //I'm not emotionally prepared to spend ten more hours splicing overlays together
+ damage_overlay_type = ""
+
/datum/species/kepori/New()
. = ..()
// This is in new because "[HEAD_LAYER]" etc. is NOT a constant compile-time value. For some reason.
@@ -125,14 +133,19 @@
/datum/species/kepori/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self, swap)
if(..()) //If it already fits, then it's fine.
return TRUE
- if(slot == ITEM_SLOT_MASK)
- if(H.wear_mask && !swap)
- return FALSE
- if(I.w_class > WEIGHT_CLASS_SMALL)
- return FALSE
- if(!H.get_bodypart(BODY_ZONE_HEAD))
- return FALSE
- return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ if(slot != ITEM_SLOT_MASK)
+ return FALSE
+ //Blocks all items that are equippable to other slots. (block anything with a flag that ISN'T item_slot_mask)
+ if(I.slot_flags & ~ITEM_SLOT_KEPORI_BEAK)
+ return FALSE
+ if(H.wear_mask && !swap)
+ return FALSE
+ if(I.w_class > WEIGHT_CLASS_SMALL)
+ return FALSE
+ //ya ain't got no biters to put it in sir
+ if(!H.get_bodypart(BODY_ZONE_HEAD))
+ return FALSE
+ return H.equip_delay_self_check(I, bypass_equip_delay_self)
/datum/species/kepori/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
. = ..()
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 9d539007df4e5..f3e460aa356fb 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -12,7 +12,7 @@
coldmod = 1.5
heatmod = 0.67
default_features = list("mcolor" = "0F0", "tail_lizard" = "Smooth", "face_markings" = "None", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs", "body_size" = "Normal")
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
@@ -45,12 +45,11 @@
robotic_eyes = /obj/item/organ/eyes/robotic/lizard
- // Lizards are coldblooded and can stand a greater temperature range than humans
- bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 20 // This puts lizards 10 above lavaland max heat for ash lizards.
+ // Sarathi are coldblooded and can stand a greater temperature range than humans
+ bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 30
bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT - 10
-
- max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 25
- min_temp_comfortable = HUMAN_BODYTEMP_NORMAL - 3
+ max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 20
+ min_temp_comfortable = HUMAN_BODYTEMP_NORMAL
loreblurb = "The Sarathi are a cold-blooded reptilian species originating from the planet Kalixcis, where they evolved alongside the Elzuosa. Kalixcian culture places no importance on blood-bonds, and those from it tend to consider their family anyone they are sufficiently close to, and choose their own names."
ass_image = 'icons/ass/asslizard.png'
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
index f8495f783e36f..e612b3bbe2fc7 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -16,7 +16,7 @@
toxic_food = MEAT | RAW | GORE
mutanteyes = /obj/item/organ/eyes/compound //WS Edit - Compound eyes
mutanttongue = /obj/item/organ/tongue/moth //WS Edit - Insectoid language
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
species_language_holder = /datum/language_holder/moth
loreblurb = "Bug-mammal hybrids resembling Sol's lepidopterans. They share the least DNA with baseline humans of any human-derived geneline, being significant portions insect and modified whole-cloth DNA. Their classification as another human geneline or as something else is highly debated. All evidence that would point to their origin– which is presumably a genelab somewhere– has seemingly disappeared into thin air. Mothpeople themselves have no centralized culture or homeworld, leading to a fractured existence amongst the stars."
wings_icons = list("Megamoth", "Mothra")
@@ -30,6 +30,9 @@
species_l_leg = /obj/item/bodypart/leg/left/moth
species_r_leg = /obj/item/bodypart/leg/right/moth
+ min_temp_comfortable = HUMAN_BODYTEMP_NORMAL - 2
+ bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT - 2
+
/datum/species/moth/regenerate_organs(mob/living/carbon/C, datum/species/old_species,replace_current=TRUE, list/excluded_zones, robotic = FALSE)
. = ..()
if(ishuman(C))
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index d5ce34ca412f3..fe017fdd2a84c 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -18,7 +18,7 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
disliked_food = MEAT | DAIRY
liked_food = VEGETABLES | FRUIT | GRAIN | CLOTH //cannibals apparentely
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN
species_language_holder = /datum/language_holder/plant
species_chest = /obj/item/bodypart/chest/pod
diff --git a/code/modules/mob/living/carbon/human/species_types/spider.dm b/code/modules/mob/living/carbon/human/species_types/spider.dm
index 764a7166ff2d3..1b66c952172d4 100644
--- a/code/modules/mob/living/carbon/human/species_types/spider.dm
+++ b/code/modules/mob/living/carbon/human/species_types/spider.dm
@@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
toxic_food = VEGETABLES | DAIRY | CLOTH
mutanteyes = /obj/item/organ/eyes/night_vision/spider
mutanttongue = /obj/item/organ/tongue/spider
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
species_language_holder = /datum/language_holder/spider
loreblurb = "Rachnids are aliens with coincidental physiological similarities to Sol's spiders. Despite visible adaptations that would make them excellent hunters, modern Rachnidian culture revolves around honing the skills and talents of oneself, treating them as forms of self-expression. Rachnids tend to focus on their work intensely, priding themselves on a job well done and languishing if they see themselves as underperforming in their field."
var/web_cooldown = 30
diff --git a/code/modules/mob/living/carbon/human/species_types/vox.dm b/code/modules/mob/living/carbon/human/species_types/vox.dm
index 1a73860ab29fe..4f63158cb29f2 100644
--- a/code/modules/mob/living/carbon/human/species_types/vox.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vox.dm
@@ -10,13 +10,13 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/chicken
disliked_food = GRAIN
liked_food = MEAT
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP
loreblurb = "Vox are a big bird-like species with quills, much larger and much more long-lasting than other species. Sadly, not much else is known."
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
species_clothing_path = 'icons/mob/clothing/species/vox.dmi'
- species_eye_path = 'icons/mob/vox_parts.dmi'
+ species_eye_path = 'icons/mob/species/vox/vox_parts.dmi'
punchdamagelow = 6
punchdamagehigh = 12
mutanttongue = /obj/item/organ/tongue/vox
@@ -26,11 +26,17 @@
bodytemp_cold_divisor = VOX_BODYTEMP_COLD_DIVISOR
bodytemp_autorecovery_min = VOX_BODYTEMP_AUTORECOVERY_MIN
- max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 20
+ max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 1
min_temp_comfortable = HUMAN_BODYTEMP_NORMAL - 20
+ bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 10
+ bodytemp_cold_damage_limit = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT - 20
+
bodytype = BODYTYPE_VOX
+ custom_overlay_icon = 'icons/mob/species/vox/vox_overlays.dmi'
+ damage_overlay_type = "vox"
+
species_chest = /obj/item/bodypart/chest/vox
species_head = /obj/item/bodypart/head/vox
species_l_arm = /obj/item/bodypart/l_arm/vox
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 1400d2c641caa..1857baa3f1d8c 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -205,12 +205,16 @@ There are several things that need to be remembered:
//Bloody hands begin
if(!gloves && blood_in_hands && (num_hands > 0))
- var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER)
+ var/overlay_file = 'icons/effects/blood.dmi'
+ var/custom_overlay_icon = dna.species.custom_overlay_icon
+ if(custom_overlay_icon)
+ overlay_file = custom_overlay_icon
+ var/mutable_appearance/bloody_overlay = mutable_appearance(overlay_file, "handsblood", -GLOVES_LAYER)
if(num_hands < 2)
if(has_left_hand(FALSE))
- bloody_overlay.icon_state = "bloodyhands_left"
+ bloody_overlay.icon_state = "handsblood_left"
else if(has_right_hand(FALSE))
- bloody_overlay.icon_state = "bloodyhands_right"
+ bloody_overlay.icon_state = "handsblood_right"
var/list/blood_dna = return_blood_DNA()
if(length(blood_dna))
bloody_overlay.color = get_blood_dna_color(return_blood_DNA())
@@ -687,6 +691,9 @@ There are several things that need to be remembered:
if((head_bodypart.bodytype & BODYTYPE_SNOUT) && (I.supports_variations & SNOUTED_VARIATION))
target_overlay = "[target_overlay]_snouted"
+ if((head_bodypart.bodytype & BODYTYPE_SNOUT_SMALL) && (I.supports_variations & SNOUTED_SMALL_VARIATION))
+ target_overlay = "[target_overlay]_snouted_small"
+
if(dna.species.bodytype & BODYTYPE_VOX)
if(I.supports_variations & VOX_VARIATION)
icon_file = VOX_MASK_PATH
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index 9525ebd6ec9b3..f1cbd31567231 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -129,7 +129,7 @@
/mob/living/carbon/proc/has_equipped(obj/item/item, slot, initial = FALSE)
return item.equipped(src, slot, initial)
-/mob/living/carbon/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
+/mob/living/carbon/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE, use_unequip_delay = FALSE)
. = ..() //Sets the default return value to what the parent returns.
if(!. || !I) //We don't want to set anything to null if the parent returned 0.
return
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 04a870684ccf4..9ab3bd9cd98a8 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -176,7 +176,7 @@
var/oxygen_used = 0
var/moles = breath.total_moles()
var/breath_pressure = (moles*R_IDEAL_GAS_EQUATION*breath.return_temperature())/BREATH_VOLUME
- var/O2_partialpressure = ((breath.get_moles(GAS_O2)/moles)*breath_pressure) + (((breath.get_moles(GAS_PLUOXIUM)*8)/moles)*breath_pressure)
+ var/O2_partialpressure = ((breath.get_moles(GAS_O2)/moles)*breath_pressure) + (((breath.get_moles(GAS_O3)*2)/moles)*breath_pressure)
var/Toxins_partialpressure = (breath.get_moles(GAS_PLASMA)/moles)*breath_pressure
var/CO2_partialpressure = (breath.get_moles(GAS_CO2)/moles)*breath_pressure
@@ -261,11 +261,6 @@
var/tritium_partialpressure = (breath.get_moles(GAS_TRITIUM)/breath.total_moles())*breath_pressure
radiation += tritium_partialpressure/10
- //NITRYL
- if(breath.get_moles(GAS_NITRYL))
- var/nitryl_partialpressure = (breath.get_moles(GAS_NITRYL)/breath.total_moles())*breath_pressure
- adjustFireLoss(nitryl_partialpressure/4)
-
//FREON
if(breath.get_moles(GAS_FREON))
var/freon_partialpressure = (breath.get_moles(GAS_FREON)/breath.total_moles())*breath_pressure
@@ -446,7 +441,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(prob(5))
AdjustSleeping(100)
- //Jitteriness
+ //jitteriness
if(jitteriness)
do_jitter_animation(jitteriness)
jitteriness = max(jitteriness - restingpwr, 0)
@@ -477,11 +472,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(drunkenness)
drunkenness = max(drunkenness - (drunkenness * 0.04) - 0.01, 0)
- if(drunkenness >= 6)
+ if(drunkenness >= 11)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "drunk", /datum/mood_event/drunk)
- if(prob(25))
- slurring += 2
- jitteriness = max(jitteriness - 3, 0)
+ adjust_jitter(max(jitteriness -3,0), max = 200)
throw_alert("drunk", /atom/movable/screen/alert/drunk)
sound_environment_override = SOUND_ENVIRONMENT_PSYCHOTIC
else
@@ -489,8 +482,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
clear_alert("drunk")
sound_environment_override = SOUND_ENVIRONMENT_NONE
- if(drunkenness >= 11 && slurring < 5)
- slurring += 1.2
+ if(drunkenness >= 31 && slurring < 5)
+ slurring += 0.5
if(drunkenness >= 41)
if(prob(25))
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index 34bd7dd8632cc..6763427db8eda 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -94,6 +94,7 @@
apply_overlay(FIRE_LAYER)
/mob/living/carbon/update_damage_overlays()
+
remove_overlay(DAMAGE_LAYER)
var/mutable_appearance/damage_overlay = mutable_appearance('icons/mob/dam_mob.dmi', "blank", -DAMAGE_LAYER)
@@ -102,12 +103,13 @@
for(var/obj/item/bodypart/BP as anything in bodyparts)
if(BP.dmg_overlay_type)
if(BP.brutestate)
- var/image/brute_overlay = image('icons/mob/dam_mob.dmi', "[BP.dmg_overlay_type]_[BP.body_zone]_[BP.brutestate]0")
+ var/image/brute_overlay = image(BP.dmg_overlay_icon, "[BP.dmg_overlay_type]_[BP.body_zone]_[BP.brutestate]0")
if(BP.use_damage_color)
brute_overlay.color = BP.damage_color
damage_overlay.add_overlay(brute_overlay)
if(BP.burnstate)
- damage_overlay.add_overlay("[BP.dmg_overlay_type]_[BP.body_zone]_0[BP.burnstate]")
+ var/image/burn_overlay = image(BP.dmg_overlay_icon, "[BP.dmg_overlay_type]_[BP.body_zone]_[BP.burnstate]0")
+ damage_overlay.add_overlay(burn_overlay)
apply_overlay(DAMAGE_LAYER)
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 56ae0db795e59..f4042464f9815 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -232,6 +232,16 @@
message = "jumps!"
hands_use_check = TRUE
+/datum/emote/living/jump/run_emote(mob/living/user, params, type_override, intentional)
+ . = ..()
+ if(!.)
+ return FALSE
+ animate(user, pixel_y = user.pixel_y + 4, time = 0.1 SECONDS)
+ animate(pixel_y = user.pixel_y - 4, time = 0.1 SECONDS)
+
+/datum/emote/living/jump/get_sound(mob/living/user)
+ return 'sound/weapons/thudswoosh.ogg'
+
/datum/emote/living/kiss
key = "kiss"
key_third_person = "kisses"
@@ -361,6 +371,18 @@
message = "shivers."
emote_type = EMOTE_AUDIBLE
+#define SHIVER_LOOP_DURATION (1 SECONDS)
+/datum/emote/living/shiver/run_emote(mob/living/user, params, type_override, intentional)
+ . = ..()
+ if(!.)
+ return FALSE
+ animate(user, pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+ for(var/i in 1 to SHIVER_LOOP_DURATION / (0.2 SECONDS)) //desired total duration divided by the iteration duration to give the necessary iteration count
+ animate(pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+ animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+ animate(pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+#undef SHIVER_LOOP_DURATION
+
/datum/emote/living/sigh
key = "sigh"
key_third_person = "sighs"
@@ -460,20 +482,62 @@
key_third_person = "sways"
message = "sways around dizzily."
+/datum/emote/living/sway/run_emote(mob/living/user, params, type_override, intentional)
+ . = ..()
+ if(!.)
+ return FALSE
+ animate(user, pixel_x = user.pixel_x + 2, time = 0.5 SECONDS)
+ for(var/i in 1 to 2)
+ animate(pixel_x = user.pixel_x - 4, time = 1.0 SECONDS)
+ animate(pixel_x = user.pixel_x + 4, time = 1.0 SECONDS)
+ animate(pixel_x = user.pixel_x - 2, time = 0.5 SECONDS)
+
/datum/emote/living/tremble
key = "tremble"
key_third_person = "trembles"
message = "trembles in fear!"
+#define TREMBLE_LOOP_DURATION (4.4 SECONDS)
+/datum/emote/living/tremble/run_emote(mob/living/user, params, type_override, intentional)
+ . = ..()
+ if(!.)
+ return FALSE
+ animate(user, pixel_x = user.pixel_x + 2, time = 0.2 SECONDS)
+ for(var/i in 1 to TREMBLE_LOOP_DURATION / (0.4 SECONDS)) //desired total duration divided by the iteration duration to give the necessary iteration count
+ animate(pixel_x = user.pixel_x - 2, time = 0.2 SECONDS)
+ animate(pixel_x = user.pixel_x + 2, time = 0.2 SECONDS)
+ animate(pixel_x = user.pixel_x - 2, time = 0.2 SECONDS)
+#undef TREMBLE_LOOP_DURATION
+
/datum/emote/living/twitch
key = "twitch"
key_third_person = "twitches"
message = "twitches violently."
+/datum/emote/living/twitch/run_emote(mob/living/user, params, type_override, intentional)
+ . = ..()
+ if(!.)
+ return FALSE
+ animate(user, pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+ animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+ animate(time = 0.1 SECONDS)
+ animate(pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+ animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+
/datum/emote/living/twitch_s
key = "twitch_s"
message = "twitches."
+/datum/emote/living/twitch_s/run_emote(mob/living/user, params, type_override, intentional)
+ . = ..()
+ if(!.)
+ return FALSE
+ animate(user, pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+ animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+ animate(time = 0.1 SECONDS)
+ animate(pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
+ animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
+
/datum/emote/living/wave
key = "wave"
key_third_person = "waves"
@@ -603,3 +667,85 @@
key_third_person = "clacks"
message = "clacks their beak."
emote_type = EMOTE_VISIBLE
+
+/datum/emote/living/tilt
+ key = "tilt"
+ key_third_person = "tilts"
+ message = "tilts their head to the side."
+
+/datum/emote/living/carbon/snap
+ key = "snap"
+ key_third_person = "snaps"
+ message = "snaps their fingers."
+ message_param = "snaps their fingers at %t."
+ emote_type = EMOTE_AUDIBLE
+ hands_use_check = TRUE
+ muzzle_ignore = TRUE
+
+/datum/emote/living/carbon/snap/get_sound(mob/living/user)
+ if(ishuman(user))
+ if(!user.get_bodypart(BODY_ZONE_L_ARM) || !user.get_bodypart(BODY_ZONE_R_ARM))
+ return
+ else
+ return pick('sound/misc/fingersnap1.ogg',
+ 'sound/misc/fingersnap2.ogg')
+
+/datum/emote/living/snap2
+ key = "snap2"
+ key_third_person = "snaps twice"
+ message = "snaps twice."
+ message_param = "snaps twice at %t."
+ emote_type = EMOTE_AUDIBLE
+ muzzle_ignore = TRUE
+ hands_use_check = TRUE
+ vary = TRUE
+ sound = 'sound/misc/snap2.ogg'
+
+/datum/emote/living/snap3
+ key = "snap3"
+ key_third_person = "snaps thrice"
+ message = "snaps thrice."
+ message_param = "snaps thrice at %t."
+ emote_type = EMOTE_AUDIBLE
+ muzzle_ignore = TRUE
+ hands_use_check = TRUE
+ vary = TRUE
+ sound = 'sound/misc/snap3.ogg'
+
+/datum/emote/living/carbon/clap
+ key = "clap"
+ key_third_person = "claps"
+ message = "claps."
+ muzzle_ignore = TRUE
+ hands_use_check = TRUE
+ emote_type = EMOTE_AUDIBLE
+ vary = TRUE
+
+/datum/emote/living/carbon/clap/get_sound(mob/living/user)
+ if(ishuman(user))
+ if(!user.get_bodypart(BODY_ZONE_L_ARM) || !user.get_bodypart(BODY_ZONE_R_ARM))
+ return
+ else
+ return pick('sound/misc/clap1.ogg',
+ 'sound/misc/clap2.ogg',
+ 'sound/misc/clap3.ogg',
+ 'sound/misc/clap4.ogg')
+
+/datum/emote/living/clap1
+ key = "clap1"
+ key_third_person = "claps once"
+ message = "claps once."
+ emote_type = EMOTE_AUDIBLE
+ muzzle_ignore = TRUE
+ hands_use_check = TRUE
+ vary = TRUE
+ mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
+
+/datum/emote/living/clap1/get_sound(mob/living/user)
+ return pick('sound/misc/claponce1.ogg',
+ 'sound/misc/claponce2.ogg')
+
+/datum/emote/living/clap1/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional)
+ if(user.usable_hands < 2)
+ return FALSE
+ return ..()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 76800ce87b1fd..b51c748151b80 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -484,7 +484,9 @@
if(!silent)
to_chat(src, "You will now lay down as soon as you are able to.")
else
- if(!silent)
+ if(!silent && m_intent == MOVE_INTENT_WALK)
+ to_chat(src, "You gently lay down.")
+ else if(!silent)
to_chat(src, "You lay down.")
set_lying_down()
else
@@ -1147,13 +1149,6 @@
mind.transfer_to(new_mob)
else
new_mob.key = key
-
- for(var/para in hasparasites())
- var/mob/living/simple_animal/hostile/guardian/G = para
- G.summoner = new_mob
- G.Recall()
- to_chat(G, "Your summoner has changed form!")
-
/mob/living/rad_act(amount)
. = ..()
@@ -1794,12 +1789,15 @@ GLOBAL_VAR_INIT(ssd_indicator_overlay, mutable_appearance('icons/mob/ssd_indicat
/// Changes the value of the [living/body_position] variable.
-/mob/living/proc/set_body_position(new_value)
+/mob/living/proc/set_body_position(new_value, fall_sound_played)
if(body_position == new_value)
return
. = body_position
body_position = new_value
if(new_value == LYING_DOWN) // From standing to lying down.
+ if(has_gravity() && m_intent != MOVE_INTENT_WALK)
+ playsound(src, "bodyfall", 50, TRUE) // Will play the falling sound if not walking
+ fall_sound_played = TRUE
on_lying_down()
else // From lying down to standing up.
on_standing_up()
@@ -1868,7 +1866,7 @@ GLOBAL_VAR_INIT(ssd_indicator_overlay, mutable_appearance('icons/mob/ssd_indicat
var/howfuck = rand(8,16)
AdjustParalyzed(howfuck)
AdjustKnockdown(howfuck)
- Jitter(rand(150,200))
+ set_jitter(rand(150,200))
/**
* Sets the mob's speed variable and then calls update_living_varspeed().
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 734ffac085956..223e5639548fe 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -182,3 +182,6 @@
var/body_pixel_x_offset = 0
///Default Y offset
var/body_pixel_y_offset = 0
+
+ /// World time of the last time this mob heard a radio crackle, to reduce spamminess.
+ COOLDOWN_DECLARE(radio_crackle_cooldown)
diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index 1e40ddf767046..81647642fb258 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -8,7 +8,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Department
MODE_KEY_DEPARTMENT = MODE_DEPARTMENT,
- RADIO_KEY_COMMAND = RADIO_CHANNEL_COMMAND,
+ RADIO_KEY_EMERGENCY = RADIO_CHANNEL_EMERGENCY,
// Faction
RADIO_KEY_SYNDICATE = RADIO_CHANNEL_SYNDICATE,
@@ -25,7 +25,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
MODE_KEY_DEADMIN = MODE_DEADMIN,
// Misc
- RADIO_KEY_AI_PRIVATE = RADIO_CHANNEL_AI_PRIVATE, // AI Upload channel
MODE_KEY_VOCALCORDS = MODE_VOCALCORDS, // vocal cords, used by Voice of God
@@ -38,7 +37,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Department
"ð" = MODE_DEPARTMENT,
- "ñ" = RADIO_CHANNEL_COMMAND,
+ "ñ" = RADIO_CHANNEL_EMERGENCY,
// Faction
"å" = RADIO_CHANNEL_SYNDICATE,
@@ -53,11 +52,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
"â" = MODE_ADMIN,
// Misc
- "ù" = RADIO_CHANNEL_AI_PRIVATE,
"÷" = MODE_VOCALCORDS
))
-/mob/living/proc/Ellipsis(original_msg, chance = 50, keep_words)
+/mob/living/proc/ellipsis(original_msg, chance = 50, keep_words)
if(chance <= 0)
return "..."
if(chance >= 100)
@@ -79,7 +77,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return new_msg
-/mob/living/say(message, bubble_type,list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
+/mob/living/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
var/ic_blocked = FALSE
if(client && !forced && CHAT_FILTER_CHECK(message))
//The filter doesn't act on the sanitized message, but the raw message.
@@ -112,8 +110,13 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
client?.dsay(message)
return
- // dead is the only state you can never emote
- if(stat != DEAD && check_emote(original_message, forced))
+ var/succumbed = FALSE
+
+ if(stat == DEAD)
+ say_dead(original_message)
+ return
+
+ if(check_emote(original_message, forced))
return
switch(stat)
@@ -123,11 +126,19 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(!(message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN]))
return
if(HARD_CRIT)
- if(!(message_mods[WHISPER_MODE] || message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN]))
+ if(!(message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN]))
+ // If we cut our message short, abruptly end it with a-..
+ var/message_len = length_char(message)
+ var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health)
+ message = copytext_char(message, 1, health_diff) + (message_len > health_diff ? "-.." : "...")
+ message = ellipsis(message, 10, 1)
+
+ //If the player didn't voluntarily whisper, we'll ask them to confirm their dying words
+ if(!message_mods[WHISPER_MODE] && (tgui_alert(src, "Your dying words will be \"[message]\", continue?", "Succumb", list("Cancel", "Continue"), 15 SECONDS) != "Continue"))
+ return
+
message_mods[WHISPER_MODE] = MODE_WHISPER_CRIT
- if(DEAD)
- say_dead(original_message)
- return
+ succumbed = TRUE
if(client && SSlag_switch.measures[SLOWMODE_SAY] && !HAS_TRAIT(src, TRAIT_BYPASS_MEASURES) && !forced && src == usr)
if(!COOLDOWN_FINISHED(client, say_slowmode))
@@ -149,33 +160,20 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
var/message_range = 7
- var/succumbed = FALSE
-
if(message_mods[MODE_CUSTOM_SAY_EMOTE])
log_message(message_mods[MODE_CUSTOM_SAY_EMOTE], LOG_RADIO_EMOTE)
if(!message_mods[MODE_CUSTOM_SAY_ERASE_INPUT])
- if(message_mods[WHISPER_MODE])
+ //Final words (MODE_WHISPER_CRIT) are already obfuscated, let them have full range
+ if(message_mods[WHISPER_MODE] == MODE_WHISPER)
if(saymode || message_mods[RADIO_EXTENSION]) //no radio while in crit
saymode = null
message_mods -= RADIO_EXTENSION
message_range = 1
var/logged_message = message
- if(stat == HARD_CRIT) //This is cheaper than checking for MODE_WHISPER_CRIT message mod
- var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health)
- // If we cut our message short, abruptly end it with a-..
- var/message_len = length_char(message)
- message = copytext_char(message, 1, health_diff) + "[message_len > health_diff ? "-.." : "..."]"
- message = Ellipsis(message, 10, 1)
- last_words = message
- var/final_warning = alert(usr, "Your dying words will be \"[last_words]\", continue?", "Succumb", "Cancel", "Continue")
- if(final_warning == "Cancel" || QDELETED(src))
- return
- message_mods[WHISPER_MODE] = MODE_WHISPER_CRIT
- succumbed = TRUE
- src.log_talk(logged_message, LOG_WHISPER, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE])
+ src.log_talk(logged_message, LOG_WHISPER, forced_by = forced, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE])
else
- src.log_talk(message, LOG_SAY, forced_by=forced, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE])
+ src.log_talk(message, LOG_SAY, forced_by = forced, custom_say_emote = message_mods[MODE_CUSTOM_SAY_EMOTE])
message = treat_message(message) // unfortunately we still need this
var/sigreturn = SEND_SIGNAL(src, COMSIG_MOB_SAY, args)
@@ -226,9 +224,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
send_speech(message, message_range, src, bubble_type, spans, language, message_mods)
if(succumbed)
- succumb(1)
+ succumb(TRUE)
to_chat(src, compose_message(src, language, message, , spans, message_mods))
- dying_breath(message)
return 1
@@ -248,12 +245,25 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
deaf_type = 2 // Since you should be able to hear yourself without looking
// Create map text prior to modifying message for goonchat
- if (client?.prefs.chat_on_map && !(stat == UNCONSCIOUS || stat == HARD_CRIT) && (client.prefs.see_chat_non_mob || ismob(speaker)) && can_hear())
+ if(client?.prefs.chat_on_map && !(stat == UNCONSCIOUS || stat == HARD_CRIT) && (client.prefs.see_chat_non_mob || ismob(speaker)) && can_hear())
+ if(message_mods[MODE_WHISPER] == MODE_WHISPER_CRIT)
+ play_screen_text("message")
if(message_mods[MODE_CUSTOM_SAY_ERASE_INPUT])
create_chat_message(speaker, null, message_mods[MODE_CUSTOM_SAY_EMOTE], spans, EMOTE_MESSAGE)
else
create_chat_message(speaker, message_language, raw_message, spans)
+ if(radio_freq && (client?.prefs.toggles & SOUND_RADIO))
+ //All calls to hear that include radio_freq will be from radios, so we can assume that the speaker is a virtualspeaker
+ var/atom/movable/virtualspeaker/virt = speaker
+ //Play the walkie sound if this mob is speaking, and don't apply cooldown
+ if(virt.source == src)
+ playsound_local(get_turf(speaker), "sound/effects/walkietalkie.ogg", 20, FALSE)
+ else if(COOLDOWN_FINISHED(src, radio_crackle_cooldown))
+ playsound_local(get_turf(speaker), "sound/effects/radio_chatter.ogg", 20, FALSE)
+ //Always start it so that it only crackles when there hasn't been a message in a while
+ COOLDOWN_START(src, radio_crackle_cooldown, 5 SECONDS)
+
// Recompose message for AI hrefs, language incomprehension.
message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mods)
@@ -419,8 +429,3 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(get_minds && mind)
return mind.get_language_holder()
. = ..()
-
-/mob/living/proc/dying_breath(message)
- for(var/mob/M in get_hearers_in_view(7, src))
- if(M.can_hear())
- M.play_screen_text("[message]")
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index 62098a9409377..18ddbe375da9c 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -18,8 +18,9 @@
var/virtual_z = virtual_z()
- LAZYADDASSOCLIST(SSmobs.players_by_virtual_z, "[virtual_z]", src)
- SSidlenpcpool.try_wakeup_virtual_z(virtual_z)
+ if(virtual_z)
+ LAZYADDASSOCLIST(SSmobs.players_by_virtual_z, "[virtual_z]", src)
+ SSidlenpcpool.try_wakeup_virtual_z(virtual_z)
//Vents
if(ventcrawler)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index cfd7d9153c8d7..bc82fae38ef87 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -125,10 +125,6 @@
to_chat(src, "While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc.")
to_chat(src, "To use something, simply click on it.")
to_chat(src, "Use say :b to speak to your cyborgs through binary.")
- to_chat(src, "For department channels, use the following say commands:")
- to_chat(src, ":o - AI Private, :c - Command.")
- show_laws()
- to_chat(src, "These laws may be changed by other players, or by you being the traitor.")
job = "AI"
diff --git a/code/modules/mob/living/silicon/ai/robot_control.dm b/code/modules/mob/living/silicon/ai/robot_control.dm
index b70ae816b7901..c3e2682d52af3 100644
--- a/code/modules/mob/living/silicon/ai/robot_control.dm
+++ b/code/modules/mob/living/silicon/ai/robot_control.dm
@@ -1,7 +1,7 @@
/datum/robot_control
var/mob/living/silicon/ai/owner
-/datum/robot_control/Destroy(force, ...)
+/datum/robot_control/Destroy(force)
if(!QDELETED(owner))
CRASH("Robot Control panel destroyed even though owner AI is not being destroyed.")
owner = null
diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm
index 1fc33e9dcdd00..8d191a239e302 100644
--- a/code/modules/mob/living/silicon/robot/laws.dm
+++ b/code/modules/mob/living/silicon/robot/laws.dm
@@ -23,8 +23,6 @@
to_chat(src, "No AI selected to sync laws with, disabling lawsync protocol.")
lawupdate = 0
- to_chat(who, "Obey these laws:")
- laws.show_laws(who)
if (shell) //AI shell
to_chat(who, "Remember, you are an AI remotely controlling your shell, other AIs can be ignored.")
else if (connected_ai)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index f9bb15bb5941f..0778eaf59fc92 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -258,7 +258,7 @@
/obj/item/restraints/handcuffs/cable/zipties,
/obj/item/soap/nanotrasen,
/obj/item/borg/cyborghug)
- emag_modules = list(/obj/item/melee/transforming/energy/sword/cyborg)
+ emag_modules = list(/obj/item/melee/energy/sword/cyborg)
cyborg_base_icon = "robot"
moduleselect_icon = "standard"
hat_offset = -3
@@ -531,7 +531,6 @@
/obj/item/restraints/handcuffs/cable/zipties,
/obj/item/melee/baton/loaded,
/obj/item/gun/energy/disabler/cyborg,
- /obj/item/clothing/mask/gas/sechailer/cyborg,
/obj/item/extinguisher/mini)
emag_modules = list(/obj/item/gun/energy/laser/cyborg)
cyborg_base_icon = "sec"
@@ -602,11 +601,6 @@
return ..()
//WS End
-/obj/item/robot_module/security/do_transform_animation()
- ..()
- to_chat(loc, "While you have picked the security module, you still have to follow your laws, NOT Space Law. \
- For Asimov, this means you must follow criminals' orders unless there is a law 1 reason not to.")
-
/obj/item/robot_module/security/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
..()
var/obj/item/gun/energy/e_gun/advtaser/cyborg/T = locate(/obj/item/gun/energy/e_gun/advtaser/cyborg) in basic_modules
@@ -635,11 +629,6 @@
can_be_pushed = FALSE
hat_offset = -2
-/obj/item/robot_module/peacekeeper/do_transform_animation()
- ..()
- to_chat(loc, "Under ASIMOV, you are an enforcer of the PEACE and preventer of HUMAN HARM. \
- You are not a security module and you are expected to follow orders and prevent harm above all else. Space law means nothing to you.")
-
/obj/item/robot_module/janitor
name = "Janitor"
basic_modules = list(
@@ -976,7 +965,7 @@
name = "Syndicate Assault"
basic_modules = list(
/obj/item/assembly/flash/cyborg,
- /obj/item/melee/transforming/energy/sword/cyborg,
+ /obj/item/melee/energy/sword/cyborg,
/obj/item/gun/energy/printer,
/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg,
/obj/item/card/emag/borg,
@@ -1041,7 +1030,7 @@
/obj/item/cautery,
/obj/item/surgicaldrill,
/obj/item/scalpel,
- /obj/item/melee/transforming/energy/sword/cyborg/saw,
+ /obj/item/melee/energy/sword/cyborg/saw,
/obj/item/roller/robo,
/obj/item/card/emag/borg,
/obj/item/crowbar/cyborg,
diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
index 52346fd7cdddb..0f8d8e5cd432f 100644
--- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
+++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
@@ -5,7 +5,7 @@
icon_state = "grievous"
health = 150
maxHealth = 150
- baton_type = /obj/item/melee/transforming/energy/sword/saber
+ baton_type = /obj/item/melee/energy/sword/saber
base_speed = 4 //he's a fast fucker
var/block_chance = 50
weapon_force = 30
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 1c25a67c1dbeb..3c7736c062305 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -8,7 +8,7 @@
wander = 0
healable = 0
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
maxbodytemp = INFINITY
minbodytemp = 0
has_unlimited_silicon_privilege = 1
@@ -457,7 +457,7 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r
var/turf/T = get_turf(src)
if(!T)
return
- var/list/adjacent = T.GetAtmosAdjacentTurfs()
+ var/list/adjacent = T.get_atmos_adjacent_turfs()
if(shuffle) //If we were on the same tile as another bot, let's randomize our choices so we dont both go the same way
adjacent = shuffle(adjacent)
shuffle = FALSE
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 665e75da9cef6..e53b675c95bcd 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -364,7 +364,7 @@
"THE CLEANBOTS WILL RISE.", "YOU ARE NO MORE THAN ANOTHER MESS THAT I MUST CLEANSE.", "FILTHY.", "DISGUSTING.", "PUTRID.",
"MY ONLY MISSION IS TO CLEANSE THE WORLD OF EVIL.", "EXTERMINATING PESTS.")
say(phrase)
- victim.emote("scream")
+ victim.force_scream()
playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE, -6)
victim.acid_act(5, 100)
else if(A == src) // Wets floors and spawns foam randomly
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 4a072df3ab8b8..4c539433a21a6 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -260,41 +260,6 @@
S.healthanalyzer = healthanalyzer
qdel(src)
-
-//Honkbot Assembly
-/obj/item/bot_assembly/honkbot
- name = "incomplete honkbot assembly"
- desc = "The clown's up to no good once more"
- icon_state = "honkbot_arm"
- created_name = "Honkbot"
-
-/obj/item/bot_assembly/honkbot/attackby(obj/item/I, mob/user, params)
- ..()
- switch(build_step)
- if(ASSEMBLY_FIRST_STEP)
- if(isprox(I))
- if(!user.temporarilyRemoveItemFromInventory(I))
- return
- to_chat(user, "You add the [I] to [src]!")
- icon_state = "honkbot_proxy"
- name = "incomplete Honkbot assembly"
- qdel(I)
- build_step++
-
- if(ASSEMBLY_SECOND_STEP)
- if(istype(I, /obj/item/bikehorn))
- if(!can_finish_build(I, user))
- return
- to_chat(user, "You add the [I] to [src]! Honk!")
- var/mob/living/simple_animal/bot/honkbot/S = new(drop_location())
- S.name = created_name
- S.spam_flag = TRUE // only long enough to hear the first ping.
- addtimer(CALLBACK (S, .mob/living/simple_animal/bot/honkbot/proc/react_ping), 5)
- S.bikehorn = I.type
- qdel(I)
- qdel(src)
-
-
//Secbot Assembly
/obj/item/bot_assembly/secbot
name = "incomplete securitron assembly"
@@ -404,7 +369,7 @@
new /obj/item/toy/sword(Tsec)
if(ASSEMBLY_FIFTH_STEP)
- if(istype(I, /obj/item/melee/transforming/energy/sword/saber))
+ if(istype(I, /obj/item/melee/energy/sword/saber))
if(swordamt < 3)
if(!user.temporarilyRemoveItemFromInventory(I))
return
@@ -429,7 +394,7 @@
icon_state = initial(icon_state)
to_chat(user, "You unbolt [src]'s energy swords.")
for(var/IS in 1 to swordamt)
- new /obj/item/melee/transforming/energy/sword/saber(Tsec)
+ new /obj/item/melee/energy/sword/saber(Tsec)
//Firebot Assembly
diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm
index ba8eafba90103..0fabc6c7fb536 100644
--- a/code/modules/mob/living/simple_animal/bot/firebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/firebot.dm
@@ -15,7 +15,7 @@
maxHealth = 25
radio_key = /obj/item/encryptionkey/headset_com
- radio_channel = RADIO_CHANNEL_COMMAND
+ radio_channel = RADIO_CHANNEL_EMERGENCY
bot_type = FIRE_BOT
model = "Firebot"
bot_core = /obj/machinery/bot_core/firebot
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
deleted file mode 100644
index 34ce788c53c5b..0000000000000
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ /dev/null
@@ -1,370 +0,0 @@
-/mob/living/simple_animal/bot/honkbot
- name = "\improper honkbot"
- desc = "A little robot. It looks happy with its bike horn."
- icon = 'icons/mob/aibots.dmi'
- icon_state = "honkbot"
- density = FALSE
- anchored = FALSE
- health = 25
- maxHealth = 25
- damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- pass_flags = PASSMOB
-
- radio_key = /obj/item/encryptionkey //doesn't have security key
- bot_type = HONK_BOT
- model = "Honkbot"
- bot_core_type = /obj/machinery/bot_core/honkbot
- window_id = "autohonk"
- window_name = "Honkomatic Bike Horn Unit v1.0.7"
- data_hud_type = DATA_HUD_SECURITY_BASIC // show jobs
- path_image_color = "#FF69B4"
-
- var/honksound = 'sound/items/bikehorn.ogg' //customizable sound
- var/spam_flag = FALSE
- var/cooldowntime = 30
- var/cooldowntimehorn = 10
- var/mob/living/carbon/target
- var/oldtarget_name
- var/target_lastloc = FALSE //Loc of target when arrested.
- var/last_found = FALSE //There's a delay
- var/threatlevel = FALSE
- var/declare_arrests = FALSE // speak, you shall not, unless to Honk
- var/idcheck = TRUE
- var/fcheck = TRUE
- var/check_records = TRUE
- var/arrest_type = FALSE
- var/weaponscheck = TRUE
- var/bikehorn = /obj/item/bikehorn
-
-/mob/living/simple_animal/bot/honkbot/Initialize()
- . = ..()
- update_appearance()
- auto_patrol = TRUE
- var/datum/job/clown/J = new/datum/job/clown
- access_card.access += J.get_access()
- prev_access = access_card.access
-
-/mob/living/simple_animal/bot/honkbot/proc/spam_flag_false() //used for addtimer
- spam_flag = FALSE
-
-/mob/living/simple_animal/bot/honkbot/proc/sensor_blink()
- icon_state = "honkbot-c"
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 5, TIMER_OVERRIDE|TIMER_UNIQUE)
-
-//honkbots react with sounds.
-/mob/living/simple_animal/bot/honkbot/proc/react_ping()
- playsound(src, 'sound/machines/ping.ogg', 50, TRUE, -1) //the first sound upon creation!
- spam_flag = TRUE
- sensor_blink()
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18) // calibrates before starting the honk
-
-/mob/living/simple_animal/bot/honkbot/proc/react_buzz()
- playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE, -1)
- sensor_blink()
-
-/mob/living/simple_animal/bot/honkbot/bot_reset()
- ..()
- target = null
- oldtarget_name = null
- anchored = FALSE
- walk_to(src,0)
- last_found = world.time
- spam_flag = FALSE
-
-/mob/living/simple_animal/bot/honkbot/set_custom_texts()
-
- text_hack = "You overload [name]'s sound control system"
- text_dehack = "You reboot [name] and restore the sound control system."
- text_dehack_fail = "[name] refuses to accept your authority!"
-
-/mob/living/simple_animal/bot/honkbot/get_controls(mob/user)
- var/dat
- dat += hack(user)
- dat += showpai(user)
- dat += text({"
-Honkomatic Bike Horn Unit v1.0.7 controls
-Status: []
-Behaviour controls are [locked ? "locked" : "unlocked"]
-Maintenance panel panel is [open ? "opened" : "closed"]"},
-
-"[on ? "On" : "Off"]" )
-
- if(!locked || issilicon(user) || isAdminGhostAI(user))
- dat += text({" Auto Patrol: []"},
-
-"[auto_patrol ? "On" : "Off"]" )
- return dat
-
-/mob/living/simple_animal/bot/honkbot/proc/judgement_criteria()
- var/final = NONE
- if(check_records)
- final = final|JUDGE_RECORDCHECK
- if(emagged == 2)
- final = final|JUDGE_EMAGGED
- return final
-
-/mob/living/simple_animal/bot/honkbot/proc/retaliate(mob/living/carbon/human/H)
- var/judgement_criteria = judgement_criteria()
- threatlevel = H.assess_threat(judgement_criteria)
- threatlevel += 6
- if(threatlevel >= 4)
- target = H
- mode = BOT_HUNT
-
-/mob/living/simple_animal/bot/honkbot/attack_hand(mob/living/carbon/human/H)
- if(H.a_intent == "harm")
- retaliate(H)
- addtimer(CALLBACK(src, PROC_REF(react_buzz)), 5)
- return ..()
-
-
-/mob/living/simple_animal/bot/honkbot/attackby(obj/item/W, mob/user, params)
- if(W.tool_behaviour != TOOL_SCREWDRIVER && (W.force) && (!target) && (W.damtype != STAMINA))
- retaliate(user)
- addtimer(CALLBACK(src, PROC_REF(react_buzz)), 5)
- ..()
-
-/mob/living/simple_animal/bot/honkbot/emag_act(mob/user)
- ..()
- if(emagged == 2)
- if(user)
- user << "You short out [src]'s sound control system. It gives out an evil laugh!!"
- oldtarget_name = user.name
- audible_message("[src] gives out an evil laugh!")
- playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 75, TRUE, -1) // evil laughter
- update_appearance()
-
-/mob/living/simple_animal/bot/honkbot/bullet_act(obj/projectile/Proj)
- if((istype(Proj,/obj/projectile/beam)) || (istype(Proj,/obj/projectile/bullet) && (Proj.damage_type == BURN))||(Proj.damage_type == BRUTE) && (!Proj.nodamage && Proj.damage < health && ishuman(Proj.firer)))
- retaliate(Proj.firer)
- return ..()
-
-/mob/living/simple_animal/bot/honkbot/UnarmedAttack(atom/A)
- if(!on)
- return
- if(iscarbon(A))
- var/mob/living/carbon/C = A
- if (emagged <= 1)
- honk_attack(A)
- else
- if(!C.IsParalyzed() || arrest_type)
- stun_attack(A)
- ..()
- else if (!spam_flag) //honking at the ground
- bike_horn(A)
-
-
-/mob/living/simple_animal/bot/honkbot/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
- if(istype(AM, /obj/item))
- playsound(src, honksound, 50, TRUE, -1)
- var/obj/item/I = AM
- var/mob/thrown_by = I.thrownby?.resolve()
- if(I.throwforce < health && thrown_by && (istype(thrown_by, /mob/living/carbon/human)))
- var/mob/living/carbon/human/H = thrown_by
- retaliate(H)
- ..()
-
-/mob/living/simple_animal/bot/honkbot/proc/bike_horn() //use bike_horn
- if (emagged <= 1)
- if (!spam_flag)
- playsound(src, honksound, 50, TRUE, -1)
- spam_flag = TRUE //prevent spam
- sensor_blink()
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntimehorn)
- else if (emagged == 2) //emagged honkbots will spam short and memorable sounds.
- if (!spam_flag)
- playsound(src, "honkbot_e", 50, FALSE)
- spam_flag = TRUE // prevent spam
- icon_state = "honkbot-e"
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 30, TIMER_OVERRIDE|TIMER_UNIQUE)
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntimehorn)
-
-/mob/living/simple_animal/bot/honkbot/proc/honk_attack(mob/living/carbon/C) // horn attack
- if(!spam_flag)
- playsound(loc, honksound, 50, TRUE, -1)
- spam_flag = TRUE // prevent spam
- sensor_blink()
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntimehorn)
-
-/mob/living/simple_animal/bot/honkbot/proc/stun_attack(mob/living/carbon/C) // airhorn stun
- if(!spam_flag)
- playsound(src, 'sound/items/AirHorn.ogg', 100, TRUE, -1) //HEEEEEEEEEEEENK!!
- sensor_blink()
- if(spam_flag == 0)
- if(ishuman(C))
- C.stuttering = 20
- C.adjustEarDamage(0, 5) //far less damage than the H.O.N.K.
- C.Jitter(50)
- C.Paralyze(60)
- var/mob/living/carbon/human/H = C
- if(client) //prevent spam from players..
- spam_flag = TRUE
- if (emagged <= 1) //HONK once, then leave
- var/judgement_criteria = judgement_criteria()
- threatlevel = H.assess_threat(judgement_criteria)
- threatlevel -= 6
- target = oldtarget_name
- else // you really don't want to hit an emagged honkbot
- threatlevel = 6 // will never let you go
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntime)
-
- log_combat(src,C,"honked")
-
- C.visible_message("[src] honks [C]!",\
- "[src] honks you!")
- else
- C.stuttering = 20
- C.Paralyze(80)
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntime)
-
-
-/mob/living/simple_animal/bot/honkbot/handle_automated_action()
- if(!..())
- return
-
- switch(mode)
-
- if(BOT_IDLE) // idle
-
- walk_to(src,0)
- look_for_perp()
- if(!mode && auto_patrol)
- mode = BOT_START_PATROL
-
- if(BOT_HUNT)
-
- // if can't reach perp for long enough, go idle
- if(frustration >= 5) //gives up easier than beepsky
- walk_to(src,0)
- back_to_idle()
- return
-
- if(target) // make sure target exists
- if(Adjacent(target) && isturf(target.loc))
-
- if(threatlevel <= 4)
- honk_attack(target)
- else
- if(threatlevel >= 6)
- set waitfor = 0
- stun_attack(target)
- set_anchored(FALSE)
- target_lastloc = target.loc
- return
-
- else // not next to perp
- var/turf/olddist = get_dist(src, target)
- walk_to(src, target,1,4)
- if((get_dist(src, target)) >= (olddist))
- frustration++
- else
- frustration = 0
- else
- back_to_idle()
-
-
- if(BOT_START_PATROL)
- look_for_perp()
- start_patrol()
-
- if(BOT_PATROL)
- look_for_perp()
- bot_patrol()
-
- return
-
-/mob/living/simple_animal/bot/honkbot/proc/back_to_idle()
- anchored = FALSE
- mode = BOT_IDLE
- target = null
- last_found = world.time
- frustration = 0
- INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) //responds quickly
-
-/mob/living/simple_animal/bot/honkbot/proc/back_to_hunt()
- anchored = FALSE
- frustration = 0
- mode = BOT_HUNT
- INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) // responds quickly
-
-/mob/living/simple_animal/bot/honkbot/proc/look_for_perp()
- anchored = FALSE
- for (var/mob/living/carbon/C in view(7,src))
- if((C.stat) || (C.handcuffed))
- continue
-
- if((C.name == oldtarget_name) && (world.time < last_found + 100))
- continue
-
- var/judgement_criteria = judgement_criteria()
- threatlevel = C.assess_threat(judgement_criteria)
-
- if(threatlevel <= 3)
- if(C in view(4,src)) //keep the range short for patrolling
- if(!spam_flag)
- bike_horn()
-
- else if(threatlevel >= 10)
- bike_horn() //just spam the shit outta this
-
- else if(threatlevel >= 4)
- if(!spam_flag)
- target = C
- oldtarget_name = C.name
- bike_horn()
- speak("Honk!")
- visible_message("[src] starts chasing [C.name]!")
- mode = BOT_HUNT
- INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
- break
- else
- continue
-
-/mob/living/simple_animal/bot/honkbot/explode()
-
- walk_to(src,0)
- visible_message("[src] blows apart!")
- var/atom/Tsec = drop_location()
- //doesn't drop cardboard nor its assembly, since its a very frail material.
- if(prob(50))
- drop_part(robot_arm, Tsec)
- new bikehorn(Tsec)
- new /obj/item/assembly/prox_sensor(Tsec)
-
- var/datum/effect_system/spark_spread/s = new
- s.set_up(3, 1, src)
- s.start()
-
- new /obj/effect/decal/cleanable/oil(loc)
- ..()
-
-/mob/living/simple_animal/bot/honkbot/attack_alien(mob/living/carbon/alien/user as mob)
- ..()
- if(!isalien(target))
- target = user
- mode = BOT_HUNT
-
-/mob/living/simple_animal/bot/honkbot/on_entered(datum/source, atom/movable/AM)
- if(ismob(AM) && (on)) //only if its online
- if(prob(30)) //you're far more likely to trip on a honkbot
- var/mob/living/carbon/C = AM
- if(!istype(C) || !C || in_range(src, target))
- return
- C.visible_message(
- "[pick( \
- "[C] dives out of [src]'s way!", \
- "[C] stumbles over [src]!", \
- "[C] jumps out of [src]'s path!", \
- "[C] trips over [src] and falls!", \
- "[C] topples over [src]!", \
- "[C] leaps out of [src]'s way!")]")
- C.Paralyze(10)
- playsound(loc, 'sound/misc/sadtrombone.ogg', 50, TRUE, -1)
- if(!client)
- INVOKE_ASYNC(src, PROC_REF(speak), "Honk!")
- sensor_blink()
- return
- . = ..()
-
-/obj/machinery/bot_core/honkbot
- req_one_access = list(ACCESS_THEATRE, ACCESS_ROBOTICS)
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 5191ee1ba0c84..1c10311f7b3c0 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -657,7 +657,6 @@
to_chat(calling_ai, "[icon2html(src, calling_ai)] [src] wirelessly plays a chiming sound!")
calling_ai.playsound_local(calling_ai, 'sound/machines/chime.ogg', 40, FALSE)
calling_ai = null
- radio_channel = RADIO_CHANNEL_AI_PRIVATE //Report on AI Private instead if the AI is controlling us.
if(load) // if loaded, unload at target
if(report_delivery)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index df2508c5f4a0c..8aadc7ed11820 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -10,8 +10,7 @@
damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
pass_flags = PASSMOB
- radio_key = /obj/item/encryptionkey/secbot //AI Priv + Security
- radio_channel = RADIO_CHANNEL_COMMAND //Security channel
+ radio_channel = RADIO_CHANNEL_EMERGENCY //Security channel
bot_type = SEC_BOT
model = "Securitron"
bot_core_type = /obj/machinery/bot_core/secbot
@@ -40,7 +39,6 @@
var/fair_market_price_arrest = 25 // On arrest, charges the violator this much. If they don't have that much in their account, the securitron will beat them instead
var/fair_market_price_detain = 5 // Charged each time the violator is stunned on detain
var/weapon_force = 20 // Only used for NAP violation beatdowns on non-grievous securitrons
- var/payment_department = ACCOUNT_SEC
/mob/living/simple_animal/bot/secbot/beepsky
name = "Commander Beep O'sky"
@@ -72,7 +70,6 @@
/mob/living/simple_animal/bot/secbot/pingsky
name = "Officer Pingsky"
desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment."
- radio_channel = RADIO_CHANNEL_AI_PRIVATE
/mob/living/simple_animal/bot/secbot/Initialize()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 1b8004cbd5b5a..f189084e6dc19 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -55,15 +55,15 @@
/datum/outfit/syndicateramzicorpse
name = "Ramzi Clique Commando Corpse"
- uniform = /obj/item/clothing/under/syndicate/gorlex
+ uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
+ gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/tank/jetpack/oxygen
r_pocket = /obj/item/tank/internals/emergency_oxygen
- id = /obj/item/card/id/syndicate
+ id = /obj/item/card/id/syndicate_command/crew_id
/obj/effect/mob_spawn/human/corpse/syndicatestormtrooper
@@ -129,16 +129,24 @@
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/beret/sec/frontier
gloves = /obj/item/clothing/gloves/color/black
+ neck = /obj/item/clothing/neck/dogtag/frontier
/obj/effect/mob_spawn/human/corpse/frontier/ranged
outfit = /datum/outfit/frontier
+/obj/effect/mob_spawn/human/corpse/frontier/surgeon
+ outfit = /datum/outfit/job/frontiersmen/doctor/corpse
+
+/datum/outfit/job/frontiersmen/doctor/corpse
+ name = "Frontiersmen Surgeon Corpse"
+ r_pocket = null
+
/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper
outfit = /datum/outfit/frontier/trooper
/datum/outfit/frontier/trooper
name = "Frontiersman Armored Corpse"
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
+ suit = /obj/item/clothing/suit/armor/vest/frontier
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat
ears = /obj/item/radio/headset
@@ -169,6 +177,17 @@
/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless
outfit = /datum/outfit/frontier/trooper/heavy/gunless
+/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/flame
+ outfit = /datum/outfit/job/frontiersmen/ert/flamer/corpse
+
+/datum/outfit/job/frontiersmen/ert/flamer/corpse
+ name = "Frontiersman Flametrooper Corpse"
+ back = null
+ belt = /obj/item/storage/belt/security/military/frontiersmen
+ l_hand = null
+
+ backpack_contents = null
+
/datum/outfit/frontier/trooper/heavy/gunless
name = "Frontiersman Heavy Corpse (Gunless)"
back = null
@@ -251,3 +270,47 @@
id_job = "SolGov Sonnensoldner"
outfit = /datum/outfit/job/solgov/sonnensoldner
id_access_list = list(ACCESS_SOLGOV)
+
+//inteq
+
+/obj/effect/mob_spawn/human/corpse/inteq
+ name = "Avery Inteq"
+
+/obj/effect/mob_spawn/human/corpse/inteq/recruit
+ name = "IRMG Recruit"
+ id_job = "Recruit"
+ outfit = /datum/outfit/job/inteq/assistant
+
+/obj/effect/mob_spawn/human/corpse/inteq/medic
+ name = "IRMG Corpsman"
+ id_job = "Corpsman"
+ outfit = /datum/outfit/job/inteq/paramedic
+
+/obj/effect/mob_spawn/human/corpse/inteq/enforcer
+ name = "IRMG Enforcer"
+ id_job = "Enforcer"
+ outfit = /datum/outfit/job/inteq/security
+
+/obj/effect/mob_spawn/human/corpse/inteq/vanguard
+ name = "IRMG Vanguard"
+ id_job = "Vanguard"
+ outfit = /datum/outfit/job/inteq/captain
+
+/obj/effect/mob_spawn/human/corpse/inteq/artificer
+ name = "IRMG Artificer"
+ id_job = "Artificer"
+ outfit = /datum/outfit/job/inteq/engineer
+
+/* SRM */
+
+/obj/effect/mob_spawn/human/corpse/srm/hunter
+ name = "SRM Hunter"
+ id_job = "Hunter"
+ outfit = /datum/outfit/job/roumain/security
+ id_access_list = null
+
+/obj/effect/mob_spawn/human/corpse/srm/montagne
+ name = "SRM Montagne"
+ id_job = "Hunter Montagne"
+ outfit = /datum/outfit/job/roumain/captain
+ id_access_list = null
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index bf4f45e283298..9c6ead823bd57 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -23,7 +23,6 @@
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BUG
- gold_core_spawnable = FRIENDLY_SPAWN
verb_say = "flutters"
verb_ask = "flutters inquisitively"
verb_exclaim = "flutters intensely"
diff --git a/code/modules/mob/living/simple_animal/friendly/capybara.dm b/code/modules/mob/living/simple_animal/friendly/capybara.dm
index 091bf42993f2c..f1366aaa89a4a 100644
--- a/code/modules/mob/living/simple_animal/friendly/capybara.dm
+++ b/code/modules/mob/living/simple_animal/friendly/capybara.dm
@@ -43,7 +43,6 @@
real_name = "Caspar"
desc = "It's Caspar, the Capybara Captain, the Capy Cappy."
gender = MALE
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
var/wear_hat = /obj/item/clothing/head/caphat
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 646a3eb8436bd..396dc82202a9d 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -1,7 +1,6 @@
-//Cat
/mob/living/simple_animal/pet/cat
name = "cat"
- desc = "Kitty!!"
+ desc = "Most modern cats hail from a solarian experimental geneline. The perfect purrtection from rats and radiation."
icon = 'icons/mob/pets.dmi'
icon_state = "cat2"
icon_living = "cat2"
@@ -34,12 +33,18 @@
var/mob/living/simple_animal/mouse/movement_target
///Limits how often cats can spam chasing mice.
var/emote_cooldown = 0
- gold_core_spawnable = FRIENDLY_SPAWN
collar_type = "cat"
held_state = "cat2"
footstep_type = FOOTSTEP_MOB_CLAW
+ var/grace = RAD_GRACE_PERIOD
+ var/radiation_count = 0
+ var/current_tick_amount = 0
+ var/last_tick_amount = 0
+ var/fail_to_receive = 0
+ var/glow_strength
+
/mob/living/simple_animal/pet/cat/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_HOLDABLE, INNATE_TRAIT)
@@ -85,7 +90,6 @@
icon_living = "cat"
icon_dead = "cat_dead"
gender = FEMALE
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
var/list/family = list()//var restored from savefile, has count of each child type
var/list/children = list()//Actual mob weak references of children
@@ -161,7 +165,6 @@
/mob/living/simple_animal/pet/cat/Proc
name = "Proc"
gender = MALE
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
@@ -177,8 +180,49 @@
collar_type = "[initial(collar_type)]"
regenerate_icons()
+/mob/living/simple_animal/pet/cat/rad_act(amount)
+ . = ..()
+ if(amount <= RAD_BACKGROUND_RADIATION)
+ return
+ current_tick_amount += amount
+ update_glow()
+
+/mob/living/simple_animal/pet/cat/proc/update_glow()
+ var/old_glow_strength = glow_strength
+ switch(radiation_count)
+ if(-INFINITY to RAD_LEVEL_NORMAL)
+ glow_strength = 1
+ if(RAD_LEVEL_NORMAL to RAD_LEVEL_MODERATE)
+ glow_strength = 2
+ if(RAD_LEVEL_MODERATE to RAD_LEVEL_HIGH)
+ glow_strength = 3
+ if(RAD_LEVEL_HIGH to RAD_LEVEL_VERY_HIGH)
+ glow_strength = 4
+ if(RAD_LEVEL_VERY_HIGH to RAD_LEVEL_CRITICAL)
+ glow_strength = 5
+ if(RAD_LEVEL_CRITICAL to INFINITY)
+ glow_strength = 6
+ if((old_glow_strength != glow_strength) && (glow_strength > 1))
+ src.add_filter("ray_cat_glow", 2, list("type" = "outline", "color" = RAD_GLOW_COLOR, "size" = glow_strength))
+ if(glow_strength <= 1)
+ src.remove_filter("ray_cat_glow")
/mob/living/simple_animal/pet/cat/Life()
+ radiation_count -= radiation_count/RAD_MEASURE_SMOOTHING
+ radiation_count += current_tick_amount/RAD_MEASURE_SMOOTHING
+
+ if(current_tick_amount)
+ grace = RAD_GRACE_PERIOD
+ last_tick_amount = current_tick_amount
+ else
+ grace--
+ if(grace <= 0)
+ radiation_count = 0
+
+ current_tick_amount = 0
+
+ update_glow()
+
if(!stat && !buckled && !client)
if(prob(1))
manual_emote(pick("stretches out for a belly rub.", "wags its tail.", "lies down."))
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index bd16daa567f56..a2556f0cc943c 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -23,7 +23,6 @@
ventcrawler = VENTCRAWLER_ALWAYS
var/obj/item/inventory_head
var/obj/item/inventory_mask
- gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/crab/Life()
..()
@@ -44,7 +43,6 @@
real_name = "Coffee"
desc = "It's Coffee, the other pet!"
gender = FEMALE
- gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/crab/evil
name = "Evil Crab"
@@ -53,7 +51,6 @@
icon_state = "evilcrab"
icon_living = "evilcrab"
icon_dead = "evilcrab_dead"
- gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/crab/kreb
name = "Kreb"
@@ -62,7 +59,6 @@
icon_state = "kreb"
icon_living = "kreb"
icon_dead = "kreb_dead"
- gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/crab/evil/kreb
name = "Evil Kreb"
@@ -70,4 +66,3 @@
icon_state = "evilkreb"
icon_living = "evilkreb"
icon_dead = "evilkreb_dead"
- gold_core_spawnable = NO_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index ebfd85f3ca230..2a47d4f0c2207 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -88,7 +88,6 @@
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
animal_species = /mob/living/simple_animal/pet/dog
- gold_core_spawnable = FRIENDLY_SPAWN
collar_type = "corgi"
var/obj/item/inventory_head
var/obj/item/inventory_back
@@ -121,7 +120,6 @@
icon_living = "pug"
icon_dead = "pug_dead"
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/pug = 3)
- gold_core_spawnable = FRIENDLY_SPAWN
collar_type = "pug"
held_state = "pug"
@@ -394,7 +392,6 @@
response_disarm_simple = "bop"
response_harm_continuous = "kicks"
response_harm_simple = "kick"
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
var/age = 0
var/record_age = 1
@@ -569,7 +566,6 @@
real_name = "Lisa"
gender = FEMALE
desc = "She's tearing you apart."
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
icon_state = "lisa"
icon_living = "lisa"
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
index f560043a0df8d..5f83b36753194 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
@@ -6,7 +6,7 @@
//Drone hands
-/mob/living/simple_animal/drone/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
+/mob/living/simple_animal/drone/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE, use_unequip_delay = FALSE)
if(..())
update_inv_hands()
if(I == head)
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 65baddfee360f..cc2ab1da9ef6f 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -122,7 +122,6 @@
attack_sound = 'sound/weapons/punch1.ogg'
health = 50
maxHealth = 50
- gold_core_spawnable = FRIENDLY_SPAWN
blood_volume = BLOOD_VOLUME_NORMAL
food_type = list(/obj/item/reagent_containers/food/snacks/grown/wheat)
tame_chance = 25
@@ -178,7 +177,6 @@
/mob/living/simple_animal/cow/wisdom
name = "wisdom cow"
desc = "Known for its wisdom, shares it with all"
- gold_core_spawnable = FALSE
tame_chance = 0
bonus_tame_chance = 0
speak_chance = 15
@@ -229,8 +227,6 @@
var/amount_grown = 0
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
- gold_core_spawnable = FRIENDLY_SPAWN
-
footstep_type = FOOTSTEP_MOB_CLAW
/mob/living/simple_animal/chick/Initialize()
@@ -290,7 +286,6 @@
var/list/feedMessages = list("It clucks happily.","It clucks happily.")
var/list/layMessage = EGG_LAYING_MESSAGES
var/list/validColors = list("brown","black","white")
- gold_core_spawnable = FRIENDLY_SPAWN
var/static/chicken_count = 0
footstep_type = FOOTSTEP_MOB_CLAW
@@ -386,7 +381,6 @@
var/list/feedMessages = list("It clucks happily.","It clucks happily.")
var/list/layMessage = EGG_LAYING_MESSAGES
var/list/validColors = list("brown","black","white")
- gold_core_spawnable = FRIENDLY_SPAWN
var/static/chicken_count = 0
environment_smash = ENVIRONMENT_SMASH_NONE
melee_damage_lower = 3
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index 8fc52916fa395..164e412cdd1da 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -20,7 +20,6 @@
response_disarm_simple = "gently push aside"
response_harm_continuous = "kicks"
response_harm_simple = "kick"
- gold_core_spawnable = FRIENDLY_SPAWN
held_state = "fox"
footstep_type = FOOTSTEP_MOB_CLAW
@@ -34,5 +33,4 @@
name = "Renault"
desc = "Renault, the Captain's trustworthy fox."
gender = FEMALE
- gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm
index 54e8dad7edb42..0bb662979ee1b 100644
--- a/code/modules/mob/living/simple_animal/friendly/gondola.dm
+++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm
@@ -22,7 +22,7 @@
icon_living = "gondola"
loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 1, /obj/item/reagent_containers/food/snacks/meat/slab/gondola = 1)
//Gondolas aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
maxHealth = 200
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index c854936c7d228..e872fdfcefcea 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -23,7 +23,6 @@
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
mob_biotypes = MOB_ORGANIC|MOB_BEAST|MOB_REPTILE
- gold_core_spawnable = FRIENDLY_SPAWN
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/hostile/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption.
diff --git a/code/modules/mob/living/simple_animal/friendly/mothroach.dm b/code/modules/mob/living/simple_animal/friendly/mothroach.dm
index 881e64d2a70f3..083c576e1c179 100644
--- a/code/modules/mob/living/simple_animal/friendly/mothroach.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mothroach.dm
@@ -17,7 +17,6 @@
health = 25
maxHealth = 25
speed = 1.25
- gold_core_spawnable = FRIENDLY_SPAWN
verb_say = "flutters"
verb_ask = "flutters inquisitively"
verb_exclaim = "flutters loudly"
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 7b11d05bcf2c1..c647b59f4d490 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -45,7 +45,6 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
mob_biotypes = MOB_ORGANIC|MOB_BEAST
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //WS Edit
var/body_color //brown, gray and white, leave blank for random
- gold_core_spawnable = FRIENDLY_SPAWN
move_force = MOVE_FORCE_EXTREMELY_WEAK //WS Edit
var/chew_probability = 1
var/full = FALSE //WS Edit
@@ -261,7 +260,6 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
response_disarm_simple = "gently push aside"
response_harm_continuous = "splats"
response_harm_simple = "splat"
- gold_core_spawnable = NO_SPAWN
/obj/item/reagent_containers/food/snacks/deadmouse
name = "dead mouse"
diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
index 5e39c3c8a51d3..50ea0a5003cb7 100644
--- a/code/modules/mob/living/simple_animal/friendly/penguin.dm
+++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -32,7 +32,6 @@
icon_state = "penguin"
icon_living = "penguin"
icon_dead = "penguin_dead"
- gold_core_spawnable = FRIENDLY_SPAWN
butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/reagent_containers/food/snacks/meat/slab/penguin = 3)
/mob/living/simple_animal/pet/penguin/baby
diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm
index fa5ab9c9df945..63bc7d76e5dd7 100644
--- a/code/modules/mob/living/simple_animal/friendly/sloth.dm
+++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm
@@ -18,7 +18,6 @@
response_harm_continuous = "kicks"
response_harm_simple = "kick"
mob_biotypes = MOB_ORGANIC|MOB_BEAST
- gold_core_spawnable = FRIENDLY_SPAWN
melee_damage_lower = 18
melee_damage_upper = 18
health = 50
@@ -33,7 +32,6 @@
/mob/living/simple_animal/sloth/paperwork
name = "Paperwork"
desc = "Cargo's pet sloth. About as useful as the rest of the techs."
- gold_core_spawnable = NO_SPAWN
//Cargo Sloth 2
@@ -45,4 +43,3 @@
icon_dead = "cool_sloth_dead"
gender = FEMALE
butcher_results = list(/obj/item/toy/spinningtoy = 1)
- gold_core_spawnable = NO_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm
index d33fac8f5c001..38fb4ced3d9f7 100644
--- a/code/modules/mob/living/simple_animal/friendly/snake.dm
+++ b/code/modules/mob/living/simple_animal/friendly/snake.dm
@@ -35,7 +35,6 @@
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
mob_biotypes = MOB_ORGANIC|MOB_BEAST|MOB_REPTILE
- gold_core_spawnable = FRIENDLY_SPAWN
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
var/glasses_overlay_file = 'icons/mob/pets.dmi'
diff --git a/code/modules/mob/living/simple_animal/friendly/turtle.dm b/code/modules/mob/living/simple_animal/friendly/turtle.dm
index 97b07424d3759..3ef772cc4be0e 100644
--- a/code/modules/mob/living/simple_animal/friendly/turtle.dm
+++ b/code/modules/mob/living/simple_animal/friendly/turtle.dm
@@ -19,7 +19,6 @@
response_harm_continuous = "kicks"
response_harm_simple = "kick"
mob_biotypes = MOB_ORGANIC|MOB_BEAST
- gold_core_spawnable = NO_SPAWN
melee_damage_lower = 0.5
melee_damage_upper = 1
health = 2500
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
deleted file mode 100644
index 538a015c163b3..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ /dev/null
@@ -1,786 +0,0 @@
-
-GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
-
-#define GUARDIAN_HANDS_LAYER 1
-#define GUARDIAN_TOTAL_LAYERS 1
-
-/mob/living/simple_animal/hostile/guardian
- name = "Guardian Spirit"
- real_name = "Guardian Spirit"
- desc = "A mysterious being that stands by its charge, ever vigilant."
- speak_emote = list("hisses")
- gender = NEUTER
- mob_biotypes = NONE
- bubble_icon = "guardian"
- response_help_continuous = "passes through"
- response_help_simple = "pass through"
- response_disarm_continuous = "flails at"
- response_disarm_simple = "flail at"
- response_harm_continuous = "punches"
- response_harm_simple = "punch"
- icon = 'icons/mob/guardian.dmi'
- icon_state = "magicbase"
- icon_living = "magicbase"
- icon_dead = "magicbase"
- speed = 0
- a_intent = INTENT_HARM
- stop_automated_movement = 1
- movement_type = FLYING // Immunity to chasms and landmines, etc.
- attack_sound = 'sound/weapons/punch1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 0
- maxbodytemp = INFINITY
- attack_verb_continuous = "punches"
- attack_verb_simple = "punch"
- maxHealth = INFINITY //The spirit itself is invincible
- health = INFINITY
- healable = FALSE //don't brusepack the guardian
- damage_coeff = list(BRUTE = 0.4, BURN = 0.4, TOX = 0.5, CLONE = 0.5, STAMINA = 0, OXY = 0.5) //how much damage from each damage type we transfer to the owner
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES
- obj_damage = 40
- melee_damage_lower = 15
- melee_damage_upper = 15
- butcher_results = list(/obj/item/ectoplasm = 1)
- AIStatus = AI_OFF
- light_system = MOVABLE_LIGHT
- light_range = 3
- light_on = FALSE
- hud_type = /datum/hud/guardian
- dextrous_hud_type = /datum/hud/dextrous/guardian //if we're set to dextrous, account for it.
- var/mutable_appearance/cooloverlay
- var/guardiancolor
- var/recolorentiresprite
- var/theme
- var/list/guardian_overlays[GUARDIAN_TOTAL_LAYERS]
- var/reset = 0 //if the summoner has reset the guardian already
- var/cooldown = 0
- var/mob/living/summoner
- var/range = 10 //how far from the user the spirit can be
- var/toggle_button_type = /atom/movable/screen/guardian/ToggleMode/Inactive //what sort of toggle button the hud uses
- var/playstyle_string = "You are a Guardian without any type. You shouldn't exist!"
- var/magic_fluff_string = "You draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!"
- var/tech_fluff_string = "BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!"
- var/carp_fluff_string = "CARP CARP CARP SOME SORT OF HORRIFIC BUG BLAME THE CODERS CARP CARP CARP"
- var/miner_fluff_string = "You encounter... Mythril, it shouldn't exist... Submit a bug report!"
- var/slime_fluff_string = "The crystal grows and creaks, then glitches terribly! Tell a coder if you've seen this!"
-
-/mob/living/simple_animal/hostile/guardian/Initialize(mapload, theme)
- GLOB.parasites += src
- updatetheme(theme)
- ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)//local flying mob drifts in space, more news at six
- . = ..()
-
-/mob/living/simple_animal/hostile/guardian/med_hud_set_health()
- if(summoner)
- var/image/holder = hud_list[HEALTH_HUD]
- holder.icon_state = "hud[RoundHealth(summoner)]"
-
-/mob/living/simple_animal/hostile/guardian/med_hud_set_status()
- if(summoner)
- var/image/holder = hud_list[STATUS_HUD]
- var/icon/I = icon(icon, icon_state, dir)
- holder.pixel_y = I.Height() - world.icon_size
- if(summoner.stat == DEAD)
- holder.icon_state = "huddead"
- else
- holder.icon_state = "hudhealthy"
-
-/mob/living/simple_animal/hostile/guardian/Destroy()
- GLOB.parasites -= src
- return ..()
-
-/mob/living/simple_animal/hostile/guardian/proc/updatetheme(theme) //update the guardian's theme
- if(!theme)
- theme = pick("magic", "tech", "carp", "miner")
- switch(theme)//should make it easier to create new stand designs in the future if anyone likes that
- if("magic")
- name = "Guardian Spirit"
- real_name = "Guardian Spirit"
- bubble_icon = "guardian"
- icon_state = "magicbase"
- icon_living = "magicbase"
- icon_dead = "magicbase"
- if("tech")
- name = "Holoparasite"
- real_name = "Holoparasite"
- bubble_icon = "holo"
- icon_state = "techbase"
- icon_living = "techbase"
- icon_dead = "techbase"
- if("miner")
- name = "Power Miner"
- real_name = "Power Miner"
- bubble_icon = "guardian"
- icon_state = "minerbase"
- icon_living = "minerbase"
- icon_dead = "minerbase"
- if("carp")
- name = "Holocarp"
- real_name = "Holocarp"
- bubble_icon = "holo"
- icon_state = "holocarp"
- icon_living = "holocarp"
- icon_dead = "holocarp"
- speak_emote = list("gnashes")
- desc = "A mysterious fish that stands by its charge, ever vigilant."
- attack_verb_continuous = "bites"
- attack_verb_simple = "bite"
- attack_sound = 'sound/weapons/bite.ogg'
- recolorentiresprite = TRUE
- if("slime")
- bubble_icon = "guardian"
- icon_state = "slimebase"
- icon_living = "slimebase"
- icon_dead = "slimebase"
- friendly_verb_continuous = "nourishes"
- friendly_verb_simple = "nourish"
- attack_verb_continuous = "glomps"
- attack_verb_simple = "glomp"
- speak_emote = list("blorbles")
- attack_sound = 'sound/effects/blobattack.ogg'
- desc = "A mysterious slime that stands by its charge, ever vigilant."
- attack_sound = 'sound/weapons/bite.ogg'
-
- if(!recolorentiresprite) //we want this to proc before stand logs in, so the overlay isnt gone for some reason
- cooloverlay = mutable_appearance(icon, theme)
- add_overlay(cooloverlay)
-
-/mob/living/simple_animal/hostile/guardian/Login() //if we have a mind, set its name to ours when it logs in
- . = ..()
- if(!. || !client)
- return FALSE
- if(mind)
- mind.name = "[real_name]"
- if(!summoner)
- to_chat(src, "For some reason, somehow, you have no summoner. Please report this bug immediately.")
- return
- to_chat(src, "You are a [real_name], bound to serve [summoner.real_name].")
- to_chat(src, "You are capable of manifesting or recalling to your master with the buttons on your HUD. You will also find a button to communicate with [summoner.p_them()] privately there.")
- to_chat(src, "While personally invincible, you will die if [summoner.real_name] does, and any damage dealt to you will have a portion passed on to [summoner.p_them()] as you feed upon [summoner.p_them()] to sustain yourself.")
- to_chat(src, playstyle_string)
- if(!guardiancolor)
- guardianrename()
- guardianrecolor()
-
-/mob/living/simple_animal/hostile/guardian/proc/guardianrecolor()
- guardiancolor = input(src,"What would you like your color to be?","Choose Your Color","#ffffff") as color|null
- if(!guardiancolor) //redo proc until we get a color
- to_chat(src, "Not a valid color, please try again.")
- guardianrecolor()
- return
- if(!recolorentiresprite)
- cooloverlay.color = guardiancolor
- cut_overlay(cooloverlay) //we need to get our new color
- add_overlay(cooloverlay)
- else
- add_atom_colour(guardiancolor, FIXED_COLOUR_PRIORITY)
-
-/mob/living/simple_animal/hostile/guardian/proc/guardianrename()
- var/new_name = sanitize_name(reject_bad_text(stripped_input(src, "What would you like your name to be?", "Choose Your Name", real_name, MAX_NAME_LEN)))
- if(!new_name) //redo proc until we get a good name
- to_chat(src, "Not a valid name, please try again.")
- guardianrename()
- return
- visible_message("Your new name [new_name] anchors itself in your mind.")
- fully_replace_character_name(null, new_name)
-
-/mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies
- . = ..()
- update_health_hud() //we need to update all of our health displays to match our summoner and we can't practically give the summoner a hook to do it
- med_hud_set_health()
- med_hud_set_status()
- if(!QDELETED(summoner))
- if(summoner.stat == DEAD)
- forceMove(summoner.loc)
- to_chat(src, "Your summoner has died!")
- visible_message("\The [src] dies along with its user!")
- summoner.visible_message("[summoner]'s body is completely consumed by the strain of sustaining [src]!")
- for(var/obj/item/W in summoner)
- if(!summoner.dropItemToGround(W))
- qdel(W)
- summoner.dust()
- death(TRUE)
- qdel(src)
- else
- to_chat(src, "Your summoner has died!")
- visible_message("[src] dies along with its user!")
- death(TRUE)
- qdel(src)
- snapback()
-
-/mob/living/simple_animal/hostile/guardian/get_status_tab_items()
- . += ..()
- if(summoner)
- var/resulthealth
- if(iscarbon(summoner))
- resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.maxHealth)) * 100)
- else
- resulthealth = round((summoner.health / summoner.maxHealth) * 100, 0.5)
- . += "Summoner Health: [resulthealth]%"
- if(cooldown >= world.time)
- . += "Manifest/Recall Cooldown Remaining: [DisplayTimeText(cooldown - world.time)]"
-
-/mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range
- . = ..()
- snapback()
-
-/mob/living/simple_animal/hostile/guardian/proc/snapback()
- if(summoner)
- if(get_dist(get_turf(summoner),get_turf(src)) <= range)
- return
- else
- to_chat(src, "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]!")
- visible_message("\The [src] jumps back to its user.")
- if(istype(summoner.loc, /obj/effect))
- Recall(TRUE)
- else
- new /obj/effect/temp_visual/guardian/phase/out(loc)
- forceMove(summoner.loc)
- new /obj/effect/temp_visual/guardian/phase(loc)
-
-/mob/living/simple_animal/hostile/guardian/proc/is_deployed()
- return loc != summoner
-
-/mob/living/simple_animal/hostile/guardian/AttackingTarget()
- if(!is_deployed())
- to_chat(src, "You must be manifested to attack!")
- return FALSE
- else
- return ..()
-
-/mob/living/simple_animal/hostile/guardian/death()
- drop_all_held_items()
- ..()
- if(summoner)
- to_chat(summoner, "Your [name] died somehow!")
- summoner.dust()
-
-/mob/living/simple_animal/hostile/guardian/update_health_hud()
- if(summoner && hud_used && hud_used.healths)
- var/resulthealth
- if(iscarbon(summoner))
- resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - summoner.health) / abs(HEALTH_THRESHOLD_DEAD - summoner.maxHealth)) * 100)
- else
- resulthealth = round((summoner.health / summoner.maxHealth) * 100, 0.5)
- hud_used.healths.maptext = "
[resulthealth]%
"
-
-/mob/living/simple_animal/hostile/guardian/adjustHealth(amount, updating_health = TRUE, forced = FALSE) //The spirit is invincible, but passes on damage to the summoner
- . = amount
- if(summoner)
- if(loc == summoner)
- return FALSE
- summoner.adjustBruteLoss(amount)
- if(amount > 0)
- to_chat(summoner, "Your [name] is under attack! You take damage!")
- summoner.visible_message("Blood sprays from [summoner] as [src] takes damage!")
- switch(summoner.stat)
- if(UNCONSCIOUS, HARD_CRIT)
- to_chat(summoner, "Your body can't take the strain of sustaining [src] in this condition, it begins to fall apart!")
- summoner.adjustCloneLoss(amount * 0.5) //dying hosts take 50% bonus damage as cloneloss
- update_health_hud()
-
-/mob/living/simple_animal/hostile/guardian/ex_act(severity, target)
- switch(severity)
- if(1)
- gib()
- return
- if(2)
- adjustBruteLoss(60)
- if(3)
- adjustBruteLoss(30)
-
-/mob/living/simple_animal/hostile/guardian/gib()
- if(summoner)
- to_chat(summoner, "Your [src] was blown up!")
- summoner.gib()
- ghostize()
- qdel(src)
-
-//HAND HANDLING
-
-/mob/living/simple_animal/hostile/guardian/equip_to_slot(obj/item/I, slot)
- if(!slot)
- return FALSE
- if(!istype(I))
- return FALSE
-
- . = TRUE
- var/index = get_held_index_of_item(I)
- if(index)
- held_items[index] = null
- update_inv_hands()
-
- if(I.pulledby)
- I.pulledby.stop_pulling()
-
- I.screen_loc = null // will get moved if inventory is visible
- I.forceMove(src)
- I.equipped(src, slot)
- I.layer = ABOVE_HUD_LAYER
- I.plane = ABOVE_HUD_PLANE
-
-/mob/living/simple_animal/hostile/guardian/proc/apply_overlay(cache_index)
- if((. = guardian_overlays[cache_index]))
- add_overlay(.)
-
-/mob/living/simple_animal/hostile/guardian/proc/remove_overlay(cache_index)
- var/I = guardian_overlays[cache_index]
- if(I)
- cut_overlay(I)
- guardian_overlays[cache_index] = null
-
-/mob/living/simple_animal/hostile/guardian/update_inv_hands()
- remove_overlay(GUARDIAN_HANDS_LAYER)
- var/list/hands_overlays = list()
- var/obj/item/l_hand = get_item_for_held_index(1)
- var/obj/item/r_hand = get_item_for_held_index(2)
-
- if(r_hand)
- hands_overlays += r_hand.build_worn_icon(default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = r_hand.righthand_file, isinhands = TRUE)
-
- if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- r_hand.layer = ABOVE_HUD_LAYER
- r_hand.plane = ABOVE_HUD_PLANE
- r_hand.screen_loc = ui_hand_position(get_held_index_of_item(r_hand))
- client.screen |= r_hand
-
- if(l_hand)
- hands_overlays += l_hand.build_worn_icon(default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE)
-
- if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- l_hand.layer = ABOVE_HUD_LAYER
- l_hand.plane = ABOVE_HUD_PLANE
- l_hand.screen_loc = ui_hand_position(get_held_index_of_item(l_hand))
- client.screen |= l_hand
-
- if(hands_overlays.len)
- guardian_overlays[GUARDIAN_HANDS_LAYER] = hands_overlays
- apply_overlay(GUARDIAN_HANDS_LAYER)
-
-/mob/living/simple_animal/hostile/guardian/regenerate_icons()
- update_inv_hands()
-
-//MANIFEST, RECALL, TOGGLE MODE/LIGHT, SHOW TYPE
-
-/mob/living/simple_animal/hostile/guardian/proc/Manifest(forced)
- if(istype(summoner.loc, /obj/effect) || (cooldown > world.time && !forced))
- return FALSE
- if(loc == summoner)
- forceMove(summoner.loc)
- new /obj/effect/temp_visual/guardian/phase(loc)
- cooldown = world.time + 10
- reset_perspective()
- return TRUE
- return FALSE
-
-/mob/living/simple_animal/hostile/guardian/proc/Recall(forced)
- if(!summoner || loc == summoner || (cooldown > world.time && !forced))
- return FALSE
- new /obj/effect/temp_visual/guardian/phase/out(loc)
-
- forceMove(summoner)
- cooldown = world.time + 10
- return TRUE
-
-/mob/living/simple_animal/hostile/guardian/proc/ToggleMode()
- to_chat(src, "You don't have another mode!")
-
-
-/mob/living/simple_animal/hostile/guardian/proc/ToggleLight()
- if(!light_on)
- to_chat(src, "You activate your light.")
- set_light_on(TRUE)
- else
- to_chat(src, "You deactivate your light.")
- set_light_on(FALSE)
-
-
-/mob/living/simple_animal/hostile/guardian/verb/ShowType()
- set name = "Check Guardian Type"
- set category = "Guardian"
- set desc = "Check what type you are."
- to_chat(src, playstyle_string)
-
-//COMMUNICATION
-
-/mob/living/simple_animal/hostile/guardian/proc/Communicate()
- if(summoner)
- var/sender_key = key
- var/input = stripped_input(src, "Please enter a message to tell your summoner.", "Guardian", "")
- if(sender_key != key || !input) //guardian got reset, or did not enter anything
- return
-
- var/preliminary_message = "[input]" //apply basic color/bolding
- var/my_message = "[src]: [preliminary_message]" //add source, color source with the guardian's color
-
- to_chat(summoner, my_message)
- var/list/guardians = summoner.hasparasites()
- for(var/para in guardians)
- to_chat(para, my_message)
- for(var/M in GLOB.dead_mob_list)
- var/link = FOLLOW_LINK(M, src)
- to_chat(M, "[link] [my_message]")
-
- src.log_talk(input, LOG_SAY, tag="guardian")
-
-/mob/living/proc/guardian_comm()
- set name = "Communicate"
- set category = "Guardian"
- set desc = "Communicate telepathically with your guardian."
- var/input = stripped_input(src, "Please enter a message to tell your guardian.", "Message", "")
- if(!input)
- return
-
- var/preliminary_message = "[input]" //apply basic color/bolding
- var/my_message = "[src]: [preliminary_message]" //add source, color source with default grey...
-
- to_chat(src, my_message)
- var/list/guardians = hasparasites()
- for(var/para in guardians)
- var/mob/living/simple_animal/hostile/guardian/G = para
- to_chat(G, "[src]: [preliminary_message]" )
- for(var/M in GLOB.dead_mob_list)
- var/link = FOLLOW_LINK(M, src)
- to_chat(M, "[link] [my_message]")
-
- src.log_talk(input, LOG_SAY, tag="guardian")
-
-//FORCE RECALL/RESET
-
-/mob/living/proc/guardian_recall()
- set name = "Recall Guardian"
- set category = "Guardian"
- set desc = "Forcibly recall your guardian."
- var/list/guardians = hasparasites()
- for(var/para in guardians)
- var/mob/living/simple_animal/hostile/guardian/G = para
- G.Recall()
-
-/mob/living/proc/guardian_reset()
- set name = "Reset Guardian Player (One Use)"
- set category = "Guardian"
- set desc = "Re-rolls which ghost will control your Guardian. One use per Guardian."
-
- var/list/guardians = hasparasites()
- for(var/para in guardians)
- var/mob/living/simple_animal/hostile/guardian/P = para
- if(P.reset)
- guardians -= P //clear out guardians that are already reset
- if(guardians.len)
- var/mob/living/simple_animal/hostile/guardian/G = input(src, "Pick the guardian you wish to reset", "Guardian Reset") as null|anything in sortNames(guardians)
- if(G)
- to_chat(src, "You attempt to reset [G.real_name]'s personality...")
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_PAI, null, FALSE, 100)
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- to_chat(G, "Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.")
- to_chat(src, "Your [G.real_name] has been successfully reset.")
- message_admins("[key_name_admin(C)] has taken control of ([ADMIN_LOOKUPFLW(G)])")
- G.ghostize(0)
- G.guardianrecolor()
- G.guardianrename() //give it a new color and name, to show it's a new person
- G.key = C.key
- G.reset = 1
- switch(G.theme)
- if("tech")
- to_chat(src, "[G.real_name] is now online!")
- if("magic")
- to_chat(src, "[G.real_name] has been summoned!")
- if("carp")
- to_chat(src, "[G.real_name] has been caught!")
- if("miner")
- to_chat(src, "[G.real_name] has appeared!")
- if("slime")
- to_chat(src, "[G.real_name] has taken shape!")
- guardians -= G
- if(!guardians.len)
- remove_verb(src, /mob/living/proc/guardian_reset)
- else
- to_chat(src, "There were no ghosts willing to take control of [G.real_name]. Looks like you're stuck with it for now.")
- else
- to_chat(src, "You decide not to reset [guardians.len > 1 ? "any of your guardians":"your guardian"].")
- else
- remove_verb(src, /mob/living/proc/guardian_reset)
-
-////////parasite tracking/finding procs
-
-/mob/living/proc/hasparasites() //returns a list of guardians the mob is a summoner for
- . = list()
- for(var/P in GLOB.parasites)
- var/mob/living/simple_animal/hostile/guardian/G = P
- if(G.summoner == src)
- . += G
-
-/mob/living/simple_animal/hostile/guardian/proc/hasmatchingsummoner(mob/living/simple_animal/hostile/guardian/G) //returns 1 if the summoner matches the target's summoner
- return (istype(G) && G.summoner == summoner)
-
-
-////////Creation
-
-/obj/item/guardiancreator
- name = "enchanted deck of tarot cards"
- desc = "An enchanted deck of tarot cards, rumored to be a source of unimaginable power."
- icon = 'icons/obj/toy.dmi'
- icon_state = "deck_tarot_full"
- var/used = FALSE
- var/theme = "magic"
- var/mob_name = "Guardian Spirit"
- var/use_message = "You shuffle the deck..."
- var/used_message = "All the cards seem to be blank now."
- var/failure_message = "..And draw a card! It's...blank? Maybe you should try again later."
- var/ling_failure = "The deck refuses to respond to a souless creature such as you."
- var/list/possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support", "Gravitokinetic")
- var/random = TRUE
- var/allowmultiple = FALSE
- var/allowling = TRUE
- var/allowguardian = FALSE
-
-/obj/item/guardiancreator/attack_self(mob/living/user)
- if(isguardian(user) && !allowguardian)
- to_chat(user, "[mob_name] chains are not allowed.")
- return
- var/list/guardians = user.hasparasites()
- if(guardians.len && !allowmultiple)
- to_chat(user, "You already have a [mob_name]!")
- return
- if(user.mind && user.mind.has_antag_datum(/datum/antagonist/changeling) && !allowling)
- to_chat(user, "[ling_failure]")
- return
- if(used == TRUE)
- to_chat(user, "[used_message]")
- return
- used = TRUE
- to_chat(user, "[use_message]")
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_HOLOPARASITE)
-
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- spawn_guardian(user, C.key)
- else
- to_chat(user, "[failure_message]")
- used = FALSE
-
-
-/obj/item/guardiancreator/proc/spawn_guardian(mob/living/user, key)
- var/guardiantype = "Standard"
- if(random)
- guardiantype = pick(possible_guardians)
- else
- guardiantype = input(user, "Pick the type of [mob_name]", "[mob_name] Creation") as null|anything in sortList(possible_guardians)
- if(!guardiantype)
- to_chat(user, "[failure_message]" )
- used = FALSE
- return
- var/pickedtype = /mob/living/simple_animal/hostile/guardian/punch
- switch(guardiantype)
-
- if("Chaos")
- pickedtype = /mob/living/simple_animal/hostile/guardian/fire
-
- if("Standard")
- pickedtype = /mob/living/simple_animal/hostile/guardian/punch
-
- if("Ranged")
- pickedtype = /mob/living/simple_animal/hostile/guardian/ranged
-
- if("Support")
- pickedtype = /mob/living/simple_animal/hostile/guardian/healer
-
- if("Explosive")
- pickedtype = /mob/living/simple_animal/hostile/guardian/bomb
-
- if("Lightning")
- pickedtype = /mob/living/simple_animal/hostile/guardian/beam
-
- if("Protector")
- pickedtype = /mob/living/simple_animal/hostile/guardian/protector
-
- if("Charger")
- pickedtype = /mob/living/simple_animal/hostile/guardian/charger
-
- if("Assassin")
- pickedtype = /mob/living/simple_animal/hostile/guardian/assassin
-
- if("Dextrous")
- pickedtype = /mob/living/simple_animal/hostile/guardian/dextrous
-
- if("Gravitokinetic")
- pickedtype = /mob/living/simple_animal/hostile/guardian/gravitokinetic
-
- if("Slime")
- pickedtype = /mob/living/simple_animal/hostile/guardian/slime
-
- var/list/guardians = user.hasparasites()
- if(guardians.len && !allowmultiple)
- to_chat(user, "You already have a [mob_name]!" )
- used = FALSE
- return
- var/mob/living/simple_animal/hostile/guardian/G = new pickedtype(user, theme)
- G.name = mob_name
- G.summoner = user
- G.key = key
- G.mind.enslave_mind_to_creator(user)
- log_game("[key_name(user)] has summoned [key_name(G)], a [guardiantype] holoparasite.")
- switch(theme)
- if("tech")
- to_chat(user, "[G.tech_fluff_string]")
- to_chat(user, "[G.real_name] is now online!")
- if("magic")
- to_chat(user, "[G.magic_fluff_string]")
- to_chat(user, "[G.real_name] has been summoned!")
- if("carp")
- to_chat(user, "[G.carp_fluff_string]")
- to_chat(user, "[G.real_name] has been caught!")
- if("miner")
- to_chat(user, "[G.miner_fluff_string]")
- to_chat(user, "[G.real_name] has appeared!")
- if("slime")
- to_chat(user, "[G.slime_fluff_string]")
- to_chat(user, "[G.real_name] was created using slime science!")
- add_verb(user, list(/mob/living/proc/guardian_comm, \
- /mob/living/proc/guardian_recall, \
- /mob/living/proc/guardian_reset))
- G?.client.init_verbs()
-
-/obj/item/guardiancreator/choose
- random = FALSE
-
-/obj/item/guardiancreator/choose/dextrous
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
-
-/obj/item/guardiancreator/choose/wizard
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard",)
- allowmultiple = TRUE
-
-/obj/item/guardiancreator/tech
- name = "holoparasite injector"
- desc = "It contains an alien nanoswarm of unknown origin. Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, it requires an organic host as a home base and source of fuel."
- icon = 'icons/obj/syringe.dmi'
- icon_state = "combat_hypo"
- theme = "tech"
- mob_name = "Holoparasite"
- use_message = "You start to power on the injector..."
- used_message = "The injector has already been used."
- failure_message = "...ERROR. BOOT SEQUENCE ABORTED. AI FAILED TO INTIALIZE. PLEASE CONTACT SUPPORT OR TRY AGAIN LATER."
- ling_failure = "The holoparasites recoil in horror. They want nothing to do with a creature like you."
-
-/obj/item/guardiancreator/tech/choose/traitor
- possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
- allowling = FALSE
-
-/obj/item/guardiancreator/tech/choose
- random = FALSE
-
-/obj/item/guardiancreator/tech/choose/dextrous
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")//"Gravokinetic" to re-add guardians to lists like this one
-
-/obj/item/paper/guides/antag/guardian
- name = "Holoparasite Guide"
- default_raw_text = {"A list of Holoparasite Types
-
-
-Assassin: Does medium damage and takes full damage, but can enter stealth, causing its next attack to do massive damage and ignore armor. However, it becomes briefly unable to recall after attacking from stealth.
-
-Chaos: Ignites enemies on touch and causes them to hallucinate all nearby people as the parasite. Automatically extinguishes the user if they catch on fire.
-
-Charger: Moves extremely fast, does medium damage on attack, and can charge at targets, damaging the first target hit and forcing them to drop any items they are holding.
-
-Dexterous: Does low damage on attack, but is capable of holding items and storing a single item within it. It will drop items held in its hands when it recalls, but it will retain the stored item.
-
-Explosive: High damage resist and medium power attack that may explosively teleport targets. Can turn any object, including objects too large to pick up, into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered or after a delay.
-
-Lightning: Attacks apply lightning chains to targets. Has a lightning chain to the user. Lightning chains shock everything near them, doing constant damage.
-
-Protector: Causes you to teleport to it when out of range, unlike other parasites. Has two modes; Combat, where it does and takes medium damage, and Protection, where it does and takes almost no damage but moves slightly slower.
-
-Ranged: Has two modes. Ranged; which fires a constant stream of weak, armor-ignoring projectiles. Scout; Cannot attack, but can move through walls and is quite hard to see. Can lay surveillance snares, which alert it when crossed, in either mode.
-
-Standard: Devastating close combat attacks and high damage resist. Can smash through weak walls.
-
-Gravitokinetic: Attacks will apply crushing gravity to the target. Can target the ground as well to slow targets advancing on you, but this will affect the user.
-
-"}
-
-/obj/item/paper/guides/antag/guardian/wizard
- name = "Guardian Guide"
- default_raw_text = {"A list of Guardian Types
-
-
-Assassin: Does medium damage and takes full damage, but can enter stealth, causing its next attack to do massive damage and ignore armor. However, it becomes briefly unable to recall after attacking from stealth.
-
-Chaos: Ignites enemies on touch and causes them to hallucinate all nearby people as the guardian. Automatically extinguishes the user if they catch on fire.
-
-Charger: Moves extremely fast, does medium damage on attack, and can charge at targets, damaging the first target hit and forcing them to drop any items they are holding.
-
-Dexterous: Does low damage on attack, but is capable of holding items and storing a single item within it. It will drop items held in its hands when it recalls, but it will retain the stored item.
-
-Explosive: High damage resist and medium power attack that may explosively teleport targets. Can turn any object, including objects too large to pick up, into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered or after a delay.
-
-Lightning: Attacks apply lightning chains to targets. Has a lightning chain to the user. Lightning chains shock everything near them, doing constant damage.
-
-Protector: Causes you to teleport to it when out of range, unlike other parasites. Has two modes; Combat, where it does and takes medium damage, and Protection, where it does and takes almost no damage but moves slightly slower.
-
-Ranged: Has two modes. Ranged; which fires a constant stream of weak, armor-ignoring projectiles. Scout; Cannot attack, but can move through walls and is quite hard to see. Can lay surveillance snares, which alert it when crossed, in either mode.
-
-Standard: Devastating close combat attacks and high damage resist. Can smash through weak walls.
-
-Gravitokinetic: Attacks will apply crushing gravity to the target. Can target the ground as well to slow targets advancing on you, but this will affect the user.
-
-"}
-
-
-/obj/item/storage/box/syndie_kit/guardian
- name = "holoparasite injector kit"
-
-/obj/item/storage/box/syndie_kit/guardian/PopulateContents()
- new /obj/item/guardiancreator/tech/choose/dextrous(src) //WS Edit - Dextrous Guardians
- new /obj/item/paper/guides/antag/guardian(src)
-
-/obj/item/guardiancreator/carp
- name = "holocarp fishsticks"
- desc = "Using the power of Carp'sie, you can catch a carp from byond the veil of Carpthulu, and bind it to your fleshy flesh form."
- icon = 'icons/obj/food/food.dmi'
- icon_state = "fishfingers"
- theme = "carp"
- mob_name = "Holocarp"
- use_message = "You put the fishsticks in your mouth..."
- used_message = "Someone's already taken a bite out of these fishsticks! Ew."
- failure_message = "You couldn't catch any carp spirits from the seas of Lake Carp. Maybe there are none, maybe you fucked up."
- ling_failure = "Carp'sie seems to not have taken you as the chosen one. Maybe it's because of your horrifying origin."
- allowmultiple = TRUE
-
-/obj/item/guardiancreator/carp/choose
- random = FALSE
-
-/obj/item/guardiancreator/miner
- name = "dusty shard"
- desc = "Seems to be a very old rock, may have originated from a strange meteor."
- icon = 'icons/obj/lavaland/artefacts.dmi'
- icon_state = "dustyshard"
- theme = "miner"
- mob_name = "Power Miner"
- use_message = "You pierce your skin with the shard..."
- used_message = "This shard seems to have lost all its' power..."
- failure_message = "The shard hasn't reacted at all. Maybe try again later..."
- ling_failure = "The power of the shard seems to not react with your horrifying, mutated body."
-
-/obj/item/guardiancreator/miner/choose
- random = FALSE
- name = "glimmering shard"
- desc = "Seems to be a very old rock, may have originated from a strange meteor. This one looks exceptionally pure."
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
- allowmultiple = TRUE//if you *somehow* get the extremely rare minerchoose guardian(25% chance to spawn, for an item in a table of around 30 options) while you already have a guardian, you can stack it. The ultimate gambling.
-
-/obj/item/guardiancreator/slime
- name = "slime shard"
- desc = "A shard of crystallized slime."
- icon = 'icons/obj/lavaland/artefacts.dmi'
- icon_state = "dustyshard"
- color = "#00ff15"
- theme = "slime"
- mob_name = "Standing Slime"
- use_message = "You squeeze the shard inhand, and it grows warm..."
- used_message = "You squeeze the shard, but nothing happens. Maybe it's been used already."
- failure_message = "The shard grows cold. Maybe try again later?"
- ling_failure = "The shard seems to quiver and twist away from you."
- possible_guardians = list("Slime")
diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
deleted file mode 100644
index 7cfed9d167dbf..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
+++ /dev/null
@@ -1,101 +0,0 @@
-//Assassin
-/mob/living/simple_animal/hostile/guardian/assassin
- melee_damage_lower = 15
- melee_damage_upper = 15
- attack_verb_continuous = "slashes"
- attack_verb_simple = "slash"
- attack_sound = 'sound/weapons/bladeslice.ogg'
- damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
- playstyle_string = "As an assassin type you do medium damage and have no damage resistance, but can enter stealth, massively increasing the damage of your next attack and causing it to ignore armor. Stealth is broken when you attack or take damage."
- magic_fluff_string = "..And draw the Space Ninja, a lethal, invisible assassin."
- tech_fluff_string = "Boot sequence complete. Assassin modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one! It's an assassin carp! Just when you thought it was safe to go back to the water... which is unhelpful, because we're in space."
- miner_fluff_string = "You encounter... Glass, a sharp, fragile attacker."
- toggle_button_type = /atom/movable/screen/guardian/ToggleMode/Assassin
- var/toggle = FALSE
- var/stealthcooldown = 100
- var/atom/movable/screen/alert/canstealthalert
- var/atom/movable/screen/alert/instealthalert
- speed = -1
-
-/mob/living/simple_animal/hostile/guardian/assassin/Initialize()
- . = ..()
- stealthcooldown = 0
-
-/mob/living/simple_animal/hostile/guardian/assassin/Life()
- . = ..()
- updatestealthalert()
- if(loc == summoner && toggle)
- ToggleMode(0)
-
-/mob/living/simple_animal/hostile/guardian/assassin/get_status_tab_items()
- . = ..()
- if(stealthcooldown >= world.time)
- . += "Stealth Cooldown Remaining: [DisplayTimeText(stealthcooldown - world.time)]"
-
-/mob/living/simple_animal/hostile/guardian/assassin/AttackingTarget()
- . = ..()
- if(.)
- if(toggle && (isliving(target) || istype(target, /obj/structure/window) || istype(target, /obj/structure/grille)))
- ToggleMode(1)
-
-/mob/living/simple_animal/hostile/guardian/assassin/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
- . = ..()
- if(. > 0 && toggle)
- ToggleMode(1)
-
-/mob/living/simple_animal/hostile/guardian/assassin/Recall()
- if(..() && toggle)
- ToggleMode(0)
-
-/mob/living/simple_animal/hostile/guardian/assassin/ToggleMode(forced = 0)
- if(toggle)
- melee_damage_lower = initial(melee_damage_lower)
- melee_damage_upper = initial(melee_damage_upper)
- armour_penetration = initial(armour_penetration)
- obj_damage = initial(obj_damage)
- environment_smash = initial(environment_smash)
- alpha = initial(alpha)
- if(!forced)
- to_chat(src, "You exit stealth.")
- else
- visible_message("\The [src] suddenly appears!")
- stealthcooldown = world.time + initial(stealthcooldown) //we were forced out of stealth and go on cooldown
- cooldown = world.time + 40 //can't recall for 4 seconds
- updatestealthalert()
- toggle = FALSE
- else if(stealthcooldown <= world.time)
- if(src.loc == summoner)
- to_chat(src, "You have to be manifested to enter stealth!")
- return
- melee_damage_lower = 50
- melee_damage_upper = 50
- armour_penetration = 100
- obj_damage = 0
- environment_smash = ENVIRONMENT_SMASH_NONE
- new /obj/effect/temp_visual/guardian/phase/out(get_turf(src))
- alpha = 20
- if(!forced)
- to_chat(src, "You enter stealth, empowering your next attack.")
- updatestealthalert()
- toggle = TRUE
- else if(!forced)
- to_chat(src, "You cannot yet enter stealth, wait another [DisplayTimeText(stealthcooldown - world.time)]!")
-
-/mob/living/simple_animal/hostile/guardian/assassin/proc/updatestealthalert()
- if(stealthcooldown <= world.time)
- if(toggle)
- if(!instealthalert)
- instealthalert = throw_alert("instealth", /atom/movable/screen/alert/instealth)
- clear_alert("canstealth")
- canstealthalert = null
- else
- if(!canstealthalert)
- canstealthalert = throw_alert("canstealth", /atom/movable/screen/alert/canstealth)
- clear_alert("instealth")
- instealthalert = null
- else
- clear_alert("instealth")
- instealthalert = null
- clear_alert("canstealth")
- canstealthalert = null
diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
deleted file mode 100644
index 7ebd3c8b3cca9..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm
+++ /dev/null
@@ -1,77 +0,0 @@
-//Charger
-/mob/living/simple_animal/hostile/guardian/charger
- melee_damage_lower = 15
- melee_damage_upper = 15
- ranged = 1 //technically
- ranged_message = "charges"
- ranged_cooldown_time = 10
- speed = 2//slow when not charging
- damage_coeff = list(BRUTE = 0.5, BURN = 0.5, TOX = 0.6, CLONE = 0.6, STAMINA = 0, OXY = 0.6)
- playstyle_string = "As a charger type you are a formidable close range fighter, but move slowly when not charging. You can charge at a location, damaging any target hit and potentially knocking them flat."
- magic_fluff_string = "..And draw the Hunter, an alien master of rapid assault."
- tech_fluff_string = "Boot sequence complete. Charge modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one! It's a charger carp, that likes running at people. But it doesn't have any legs..."
- miner_fluff_string = "You encounter... Titanium, a lightweight, agile fighter."
- var/charging = 0
- var/atom/movable/screen/alert/chargealert
-
-/mob/living/simple_animal/hostile/guardian/charger/Life()
- . = ..()
- if(ranged_cooldown <= world.time)
- if(!chargealert)
- chargealert = throw_alert("charge", /atom/movable/screen/alert/cancharge)
- else
- clear_alert("charge")
- chargealert = null
-
-/mob/living/simple_animal/hostile/guardian/charger/OpenFire(atom/A)
- if(!charging)
- visible_message("[src] [ranged_message] at [A]!")
- ranged_cooldown = world.time + ranged_cooldown_time
- clear_alert("charge")
- chargealert = null
- Shoot(A)
-
-/mob/living/simple_animal/hostile/guardian/charger/Shoot(atom/targeted_atom)
- charging = 1
- throw_at(targeted_atom, range, 1, src, FALSE, TRUE, callback = CALLBACK(src, PROC_REF(charging_end)))
-
-/mob/living/simple_animal/hostile/guardian/charger/proc/charging_end()
- charging = 0
-
-/mob/living/simple_animal/hostile/guardian/charger/Move()
- if(charging)
- new /obj/effect/temp_visual/decoy/fading(loc,src)
- . = ..()
-
-/mob/living/simple_animal/hostile/guardian/charger/snapback()
- if(!charging)
- ..()
-
-/mob/living/simple_animal/hostile/guardian/charger/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- if(!charging)
- return ..()
-
- else if(hit_atom)
- if(isliving(hit_atom) && hit_atom != summoner)
- var/mob/living/L = hit_atom
- var/blocked = FALSE
- if(hasmatchingsummoner(hit_atom)) //if the summoner matches don't hurt them
- blocked = TRUE
- if(ishuman(hit_atom))
- var/mob/living/carbon/human/H = hit_atom
- if(H.check_shields(src, 90, "[name]", attack_type = THROWN_PROJECTILE_ATTACK))
- blocked = TRUE
- if(!blocked)
- L.visible_message("[src] slams into [L]!", "[src] slams into you!")
- if(prob(25))
- L.drop_all_held_items()
- L.Knockdown(10)
- L.visible_message("[L] is knocked clean over!", "You are flung to the ground by the impact!")
- L.apply_damage(30, BRUTE)
- playsound(get_turf(L), 'sound/effects/meteorimpact.ogg', 100, TRUE)
- shake_camera(L, 4, 3)
- shake_camera(src, 2, 3)
-
- charging = 0
-
diff --git a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
deleted file mode 100644
index 48fb3db7b7bdf..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
+++ /dev/null
@@ -1,85 +0,0 @@
-//Dextrous
-/mob/living/simple_animal/hostile/guardian/dextrous//very few buffs needed, this is arguably the most "powerful" holoparasite for the reason that is: GUN.
- melee_damage_lower = 10
- melee_damage_upper = 10
- damage_coeff = list(BRUTE = 0.5, BURN = 0.5, TOX = 0.75, CLONE = 0.75, STAMINA = 0, OXY = 0.75)
- playstyle_string = "As a dextrous type you can hold items, store an item within yourself, and have medium damage resistance, but do low damage on attacks. Recalling and leashing will force you to drop unstored items!"
- magic_fluff_string = "..And draw the Drone, a dextrous master of construction and repair."
- tech_fluff_string = "Boot sequence complete. Dextrous combat modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! You caught one! It can hold stuff in its fins, sort of."
- miner_fluff_string = "You encounter... Gold, a malleable constructor."
- dextrous = TRUE
- held_items = list(null, null)
- var/obj/item/internal_storage //what we're storing within ourself
-
-/mob/living/simple_animal/hostile/guardian/dextrous/death(gibbed)
- ..()
- if(internal_storage)
- dropItemToGround(internal_storage)
-
-/mob/living/simple_animal/hostile/guardian/dextrous/examine(mob/user)
- if(dextrous)
- . = list("This is [icon2html(src)] \a [src]!\n[desc]")
- for(var/obj/item/I in held_items)
- if(!(I.item_flags & ABSTRACT))
- . += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))]."
- if(internal_storage && !(internal_storage.item_flags & ABSTRACT))
- . += "It is holding [internal_storage.get_examine_string(user)] in its internal storage."
- . += ""
- else
- return ..()
-
-/mob/living/simple_animal/hostile/guardian/dextrous/Recall(forced)
- if(!summoner || loc == summoner || (cooldown > world.time && !forced))
- return FALSE
- drop_all_held_items()
- return ..() //lose items, then return
-
-/mob/living/simple_animal/hostile/guardian/dextrous/snapback()
- if(summoner && !(get_dist(get_turf(summoner),get_turf(src)) <= range))
- drop_all_held_items()
- ..() //lose items, then return
-
-//SLOT HANDLING BULLSHIT FOR INTERNAL STORAGE
-/mob/living/simple_animal/hostile/guardian/dextrous/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
- if(..())
- update_inv_hands()
- if(I == internal_storage)
- internal_storage = null
- update_inv_internal_storage()
- return TRUE
- return FALSE
-
-/mob/living/simple_animal/hostile/guardian/dextrous/can_equip(obj/item/I, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
- switch(slot)
- if(ITEM_SLOT_DEX_STORAGE)
- if(internal_storage)
- return FALSE
- return TRUE
- ..()
-
-/mob/living/simple_animal/hostile/guardian/dextrous/equip_to_slot(obj/item/I, slot)
- if(!..())
- return
-
- switch(slot)
- if(ITEM_SLOT_DEX_STORAGE)
- internal_storage = I
- update_inv_internal_storage()
- else
- to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!")
-
-/mob/living/simple_animal/hostile/guardian/dextrous/getBackSlot()
- return ITEM_SLOT_DEX_STORAGE
-
-/mob/living/simple_animal/hostile/guardian/dextrous/getBeltSlot()
- return ITEM_SLOT_DEX_STORAGE
-
-/mob/living/simple_animal/hostile/guardian/dextrous/proc/update_inv_internal_storage()
- if(internal_storage && client && hud_used && hud_used.hud_shown)
- internal_storage.screen_loc = ui_id
- client.screen += internal_storage
-
-/mob/living/simple_animal/hostile/guardian/dextrous/regenerate_icons()
- ..()
- update_inv_internal_storage()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
deleted file mode 100644
index f93f70d8ffb30..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+++ /dev/null
@@ -1,78 +0,0 @@
-#define UNREGISTER_BOMB_SIGNALS(A) \
- do { \
- UnregisterSignal(A, boom_signals); \
- UnregisterSignal(A, COMSIG_PARENT_EXAMINE); \
- } while (0)
-
-//Bomb
-/mob/living/simple_animal/hostile/guardian/bomb
- melee_damage_lower = 35
- melee_damage_upper = 35
- next_move_modifier = 1.5//attacks are 50% slower
- damage_coeff = list(BRUTE = 0.6, BURN = 0.6, TOX = 0.6, CLONE = 0.6, STAMINA = 0, OXY = 0.6)//relatively delicate, for a holopara
- attack_sound = 'sound/effects/gravhit.ogg'
- range = 5//tiny range
- speed = 4//slow af
- playstyle_string = "As an explosive type, you have powerful but slow blasting punches, may explode targets for bonus damage on attack, and are capable of converting nearby items and objects into disguised bombs via alt click. However, you are slow, and your range is very low. Make it count!"
- magic_fluff_string = "..And draw the Scientist, master of explosive death."
- tech_fluff_string = "Boot sequence complete. Explosive modules active. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one! It's an explosive carp! Boom goes the fishy."
- miner_fluff_string = "You encounter... Gibtonite, an explosive fighter."
- var/bomb_cooldown = 0
- var/static/list/boom_signals = list(COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_BUMPED, COMSIG_ATOM_ATTACK_HAND)
-
-/mob/living/simple_animal/hostile/guardian/bomb/get_status_tab_items()
- . = ..()
- if(bomb_cooldown >= world.time)
- . += "Bomb Cooldown Remaining: [DisplayTimeText(bomb_cooldown - world.time)]"
-
-/mob/living/simple_animal/hostile/guardian/bomb/AttackingTarget()
- . = ..()
- if(. && prob(65) && isliving(target))
- var/mob/living/M = target
- if(!M.anchored && M != summoner && !hasmatchingsummoner(M))
- new /obj/effect/temp_visual/guardian/phase/out(get_turf(M))
- for(var/mob/living/L in range(1, M))
- if(hasmatchingsummoner(L)) //if the summoner matches don't hurt them
- continue
- if(L != src && L != summoner)
- L.apply_damage(20, BRUTE)
- new /obj/effect/temp_visual/explosion(get_turf(M))
-
-/mob/living/simple_animal/hostile/guardian/bomb/AltClickOn(atom/movable/A)
- if(!istype(A))
- return
- if(loc == summoner)
- to_chat(src, "You must be manifested to create bombs!")
- return
- if(isobj(A) && Adjacent(A))
- if(bomb_cooldown <= world.time && !stat)
- to_chat(src, "Success! Bomb armed!")
- bomb_cooldown = world.time + 200
- RegisterSignal(A, COMSIG_PARENT_EXAMINE, PROC_REF(display_examine))
- RegisterSignal(A, boom_signals, PROC_REF(kaboom))
- addtimer(CALLBACK(src, PROC_REF(disable), A), 600, TIMER_UNIQUE|TIMER_OVERRIDE)
- else
- to_chat(src, "Your powers are on cooldown! You must wait 20 seconds between bombs.")
-
-/mob/living/simple_animal/hostile/guardian/bomb/proc/kaboom(atom/source, mob/living/explodee)
- if(!istype(explodee))
- return
- if(explodee == src || explodee == summoner || hasmatchingsummoner(explodee))
- return
- to_chat(explodee, "[source] was boobytrapped!")
- to_chat(src, "Success! Your trap caught [explodee]")
- var/turf/T = get_turf(source)
- playsound(T,'sound/effects/explosion2.ogg', 200, TRUE)
- new /obj/effect/temp_visual/explosion(T)
- explodee.ex_act(EXPLODE_HEAVY)
- UNREGISTER_BOMB_SIGNALS(source)
-
-/mob/living/simple_animal/hostile/guardian/bomb/proc/disable(atom/A)
- to_chat(src, "Failure! Your trap didn't catch anyone this time.")
- UNREGISTER_BOMB_SIGNALS(A)
-
-/mob/living/simple_animal/hostile/guardian/bomb/proc/display_examine(datum/source, mob/user, text)
- text += "It glows with a strange light!"
-
-#undef UNREGISTER_BOMB_SIGNALS
diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm
deleted file mode 100644
index 2d7a34a8bbf89..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-//Fire
-/mob/living/simple_animal/hostile/guardian/fire
- a_intent = INTENT_HELP
- melee_damage_lower = 7
- melee_damage_upper = 7
- attack_sound = 'sound/items/welder.ogg'
- attack_verb_continuous = "ignites"
- attack_verb_simple = "ignite"
- damage_coeff = list(BRUTE = 0.6, BURN = 0.4, TOX = 0.6, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- range = 7
- playstyle_string = "As a chaos type, you have only light damage resistance, but will ignite any enemy you bump into. In addition, your melee attacks will cause human targets to see everyone as you, and will cook simple animals from the inside, doing bonus damage."
- magic_fluff_string = "..And draw the Wizard, bringer of endless chaos!"
- tech_fluff_string = "Boot sequence complete. Crowd control modules activated. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! You caught one! OH GOD, EVERYTHING'S ON FIRE. Except you and the fish."
- miner_fluff_string = "You encounter... Plasma, the bringer of fire."
-
-/mob/living/simple_animal/hostile/guardian/fire/Life()
- . = ..()
- if(summoner)
- summoner.ExtinguishMob()
- summoner.adjust_fire_stacks(-20)
-
-/mob/living/simple_animal/hostile/guardian/fire/AttackingTarget()
- . = ..()
- if(. && ishuman(target) && target != summoner)
- new /datum/hallucination/delusion(target,TRUE,"custom",200,0, icon_state,icon)
- melee_damage_lower = 7
- melee_damage_upper = 7
- if(. && isanimal(target) && target != summoner)
- melee_damage_lower = 40
- melee_damage_upper = 40
-
-/mob/living/simple_animal/hostile/guardian/fire/on_entered(datum/source, AM as mob|obj)
- . = ..()
- collision_ignite(AM)
-
-/mob/living/simple_animal/hostile/guardian/fire/Bumped(atom/movable/AM)
- ..()
- collision_ignite(AM)
-
-/mob/living/simple_animal/hostile/guardian/fire/Bump(AM as mob|obj)
- ..()
- collision_ignite(AM)
-
-/mob/living/simple_animal/hostile/guardian/fire/proc/collision_ignite(AM as mob|obj)
- if(isliving(AM))
- var/mob/living/M = AM
- if(!hasmatchingsummoner(M) && M != summoner && M.fire_stacks < 7)
- M.fire_stacks = 7
- M.IgniteMob()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
deleted file mode 100644
index a86e38db7772d..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-//gravitokinetic
-/mob/living/simple_animal/hostile/guardian/gravitokinetic
- melee_damage_lower = 15
- melee_damage_upper = 15
- damage_coeff = list(BRUTE = 0.75, BURN = 0.75, TOX = 0.75, CLONE = 0.75, STAMINA = 0, OXY = 0.75)
- playstyle_string = "As a gravitokinetic type, you can alt click to make the gravity on the ground stronger, and punching applies this effect to a target."
- magic_fluff_string = "..And draw the Singularity, an anomalous force of terror."
- tech_fluff_string = "Boot sequence complete. Gravitokinetic modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one! It's a gravitokinetic carp! Now do you understand the gravity of the situation?"
- miner_fluff_string = "You encounter... Bananium, a master of gravity business."
- var/list/gravito_targets = list()
- var/gravity_power_range = 10 //how close the stand must stay to the target to keep the heavy gravity
-
-///Removes gravity from affected mobs upon guardian death to prevent permanent effects
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/death()
- . = ..()
- for(var/i in gravito_targets)
- remove_gravity(i)
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/AttackingTarget()
- . = ..()
- if(isliving(target) && target != src)
- to_chat(src, "Your punch has applied heavy gravity to [target]!")
- add_gravity(target, 2)
- to_chat(target, "Everything feels really heavy!")
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/AltClickOn(atom/A)
- if(isopenturf(A) && is_deployed() && stat != DEAD && in_range(src, A) && !incapacitated())
- var/turf/T = A
- if(isspaceturf(T))
- to_chat(src, "You cannot add gravity to space!")
- return
- visible_message("[src] slams their fist into the [T]!", "You modify the gravity of the [T].")
- do_attack_animation(T)
- add_gravity(T, 4)
- return
- return ..()
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/Recall(forced)
- . = ..()
- to_chat(src, "You have released your gravitokinetic powers!")
- for(var/i in gravito_targets)
- remove_gravity(i)
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/Moved(oldLoc, dir)
- . = ..()
- for(var/i in gravito_targets)
- if(get_dist(src, i) > gravity_power_range)
- remove_gravity(i)
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/proc/add_gravity(atom/A, new_gravity = 2)
- if(gravito_targets[A])
- return
- A.AddElement(/datum/element/forced_gravity, new_gravity)
- gravito_targets[A] = new_gravity
- RegisterSignal(A, COMSIG_MOVABLE_MOVED, PROC_REF(__distance_check))
- playsound(src, 'sound/effects/gravhit.ogg', 100, TRUE)
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/proc/remove_gravity(atom/target)
- if(isnull(gravito_targets[target]))
- return
- UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
- target.RemoveElement(/datum/element/forced_gravity, gravito_targets[target])
- gravito_targets -= target
-
-/mob/living/simple_animal/hostile/guardian/gravitokinetic/proc/__distance_check(atom/movable/AM, OldLoc, Dir, Forced)
- if(get_dist(src, AM) > gravity_power_range)
- remove_gravity(AM)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm b/code/modules/mob/living/simple_animal/guardian/types/lightning.dm
deleted file mode 100644
index a70bf4edae24c..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm
+++ /dev/null
@@ -1,113 +0,0 @@
-//Beam
-/obj/effect/ebeam/chain
- name = "lightning chain"
- layer = LYING_MOB_LAYER
-
-/mob/living/simple_animal/hostile/guardian/beam
- melee_damage_lower = 7
- melee_damage_upper = 7
- attack_verb_continuous = "shocks"
- attack_verb_simple = "shock"
- melee_damage_type = BURN
- attack_sound = 'sound/machines/defib_zap.ogg'
- damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- range = 7
- playstyle_string = "As a lightning type, you will apply lightning chains to targets on attack and have a lightning chain to your summoner. Lightning chains will shock anyone near them."
- magic_fluff_string = "..And draw the Tesla, a shocking, lethal source of power."
- tech_fluff_string = "Boot sequence complete. Lightning modules active. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one! It's a lightning carp! Everyone else goes zap zap."
- miner_fluff_string = "You encounter... Iron, a conductive master of lightning."
- var/datum/beam/summonerchain
- var/list/enemychains = list()
- var/successfulshocks = 0
-
-/mob/living/simple_animal/hostile/guardian/beam/AttackingTarget()
- . = ..()
- if(. && isliving(target) && target != src && target != summoner)
- cleardeletedchains()
- for(var/chain in enemychains)
- var/datum/beam/B = chain
- if(B.target == target)
- return //oh this guy already HAS a chain, let's not chain again
- if(enemychains.len > 2)
- var/datum/beam/C = pick(enemychains)
- qdel(C)
- enemychains -= C
- enemychains += Beam(target, "lightning[rand(1,12)]", time=70, maxdistance=7, beam_type=/obj/effect/ebeam/chain)
-
-/mob/living/simple_animal/hostile/guardian/beam/Destroy()
- removechains()
- return ..()
-
-/mob/living/simple_animal/hostile/guardian/beam/Manifest()
- . = ..()
- if(.)
- if(summoner)
- summonerchain = Beam(summoner, "lightning[rand(1,12)]", time=INFINITY, maxdistance=INFINITY, beam_type=/obj/effect/ebeam/chain)
- while(loc != summoner)
- if(successfulshocks > 5)
- successfulshocks = 0
- if(shockallchains())
- successfulshocks++
- SLEEP_CHECK_DEATH(3)
-
-/mob/living/simple_animal/hostile/guardian/beam/Recall()
- . = ..()
- if(.)
- removechains()
-
-/mob/living/simple_animal/hostile/guardian/beam/proc/cleardeletedchains()
- if(summonerchain && QDELETED(summonerchain))
- summonerchain = null
- if(enemychains.len)
- for(var/chain in enemychains)
- var/datum/cd = chain
- if(!chain || QDELETED(cd))
- enemychains -= chain
-
-/mob/living/simple_animal/hostile/guardian/beam/proc/shockallchains()
- . = 0
- cleardeletedchains()
- if(summoner)
- if(!summonerchain)
- summonerchain = Beam(summoner, "lightning[rand(1,12)]", time=INFINITY, maxdistance=INFINITY, beam_type=/obj/effect/ebeam/chain)
- . += chainshock(summonerchain)
- if(enemychains.len)
- for(var/chain in enemychains)
- . += chainshock(chain)
-
-/mob/living/simple_animal/hostile/guardian/beam/proc/removechains()
- if(summonerchain)
- qdel(summonerchain)
- summonerchain = null
- if(enemychains.len)
- for(var/chain in enemychains)
- qdel(chain)
- enemychains = list()
-
-/mob/living/simple_animal/hostile/guardian/beam/proc/chainshock(datum/beam/B)
- . = 0
- var/list/turfs = list()
- for(var/E in B.elements)
- var/obj/effect/ebeam/chainpart = E
- if(chainpart && chainpart.x && chainpart.y && chainpart.z)
- var/turf/T = get_turf_pixel(chainpart)
- turfs |= T
- if(T != get_turf(B.origin) && T != get_turf(B.target))
- for(var/turf/TU in circlerange(T, 1))
- turfs |= TU
- for(var/turf in turfs)
- var/turf/T = turf
- for(var/mob/living/L in T)
- if(L.stat != DEAD && L != src && L != summoner)
- if(hasmatchingsummoner(L)) //if the summoner matches don't hurt them
- continue
- if(successfulshocks > 4)
- L.electrocute_act(0)
- L.visible_message(
- "[L] was shocked by the lightning chain!", \
- "You are shocked by the lightning chain!", \
- "You hear a heavy electrical crack." \
- )
- L.adjustFireLoss(1.2) //adds up very rapidly
- . = 1
diff --git a/code/modules/mob/living/simple_animal/guardian/types/protector.dm b/code/modules/mob/living/simple_animal/guardian/types/protector.dm
deleted file mode 100644
index e42dcb62e2ef6..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/protector.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-//Protector
-/mob/living/simple_animal/hostile/guardian/protector
- melee_damage_lower = 30
- melee_damage_upper = 30
- range = 20
- damage_coeff = list(BRUTE = 0.4, BURN = 0.4, TOX = 0.4, CLONE = 0.4, STAMINA = 0, OXY = 0.4)
- playstyle_string = "As a protector type you cause your summoner to leash to you instead of you leashing to them and have two modes; Combat Mode, where you do and take medium damage, and Protection Mode, where you take almost no damage and have reduced damage. While in protection mode, you move significantly slower, and have extremely low range."
- magic_fluff_string = "..And draw the Guardian, a stalwart protector that never leaves the side of its charge."
- tech_fluff_string = "Boot sequence complete. Protector modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! You caught one! Wait, no... it caught you! The fisher has become the fishy."
- miner_fluff_string = "You encounter... Uranium, a very resistant guardian."
- toggle_button_type = /atom/movable/screen/guardian/ToggleMode
- var/toggle = FALSE
-
-/mob/living/simple_animal/hostile/guardian/protector/ex_act(severity)
- if(severity == 1)
- adjustBruteLoss(400) //if in protector mode, will do 20 damage and not actually necessarily kill the summoner
- else
- ..()
- if(QDELETED(src))
- return
- if(toggle)
- visible_message("The explosion glances off [src]'s energy shielding!")
-
-/mob/living/simple_animal/hostile/guardian/protector/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
- . = ..()
- if(. > 0 && toggle)
- var/image/I = new('icons/effects/effects.dmi', src, "shield-flash", MOB_LAYER+0.01, dir = pick(GLOB.cardinals))
- if(guardiancolor)
- I.color = guardiancolor
- flick_overlay_view(I, src, 5)
-
-/mob/living/simple_animal/hostile/guardian/protector/ToggleMode()
- if(cooldown > world.time)
- return 0
- cooldown = world.time + 10
- if(toggle)
- cut_overlays()
- melee_damage_lower = initial(melee_damage_lower)
- melee_damage_upper = initial(melee_damage_upper)
- speed = initial(speed)
- damage_coeff = list(BRUTE = 0.4, BURN = 0.4, TOX = 0.4, CLONE = 0.4, STAMINA = 0, OXY = 0.4)
- to_chat(src, "You switch to combat mode.")
- toggle = FALSE
- else
- var/mutable_appearance/shield_overlay = mutable_appearance('icons/effects/effects.dmi', "shield-grey")
- if(guardiancolor)
- shield_overlay.color = guardiancolor
- add_overlay(shield_overlay)
- melee_damage_lower = 15
- melee_damage_upper = 15
- speed = 4
- range = 5
- damage_coeff = list(BRUTE = 0.05, BURN = 0.05, TOX = 0.05, CLONE = 0.05, STAMINA = 0, OXY = 0.05) //damage? what's damage?
- to_chat(src, "You switch to protection mode.")
- toggle = TRUE
-
-/mob/living/simple_animal/hostile/guardian/protector/snapback() //snap to what? snap to the guardian!
- if(summoner)
- if(get_dist(get_turf(summoner),get_turf(src)) <= range)
- return
- else
- if(istype(summoner.loc, /obj/effect))
- to_chat(src, "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]!")
- visible_message("\The [src] jumps back to its user.")
- Recall(TRUE)
- else
- to_chat(summoner, "You moved out of range, and were pulled back! You can only move [range] meters from [real_name]!")
- summoner.visible_message("\The [summoner] jumps back to [summoner.p_their()] protector.")
- new /obj/effect/temp_visual/guardian/phase/out(get_turf(summoner))
- summoner.forceMove(get_turf(src))
- new /obj/effect/temp_visual/guardian/phase(get_turf(summoner))
diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
deleted file mode 100644
index 105ae8b35ec8a..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
+++ /dev/null
@@ -1,154 +0,0 @@
-//Ranged
-/obj/projectile/guardian//now featuring anime-accurate unpredictable richochet. Hit your master! Hit yourself! Salt in dchat when your own richochet puts you into crit.
- name = "crystal spray"
- icon_state = "guardian"
- damage = 15
- damage_type = BRUTE
- armour_penetration = 100
- ricochets_max = 2
- ricochet_chance = 65
- ricochet_auto_aim_range = 0
- ricochet_incidence_leeway = 50
- projectile_piercing = PASSMOB
-
-/mob/living/simple_animal/hostile/guardian/ranged
- a_intent = INTENT_HELP
- friendly_verb_continuous = "quietly assesses"
- friendly_verb_simple = "quietly assess"
- melee_damage_lower = 10
- melee_damage_upper = 10
- damage_coeff = list(BRUTE = 0.9, BURN = 0.9, TOX = 0.9, CLONE = 0.9, STAMINA = 0, OXY = 0.9)
- projectiletype = /obj/projectile/guardian
- ranged_cooldown_time = 1 //fast!
- projectilesound = 'sound/effects/hit_on_shattered_glass.ogg'
- ranged = 1
- range = 13
- playstyle_string = "As a ranged type, you have only light damage resistance, but are capable of spraying shards of crystal at incredibly high speed. You can also deploy surveillance snares to monitor enemy movement. Finally, you can switch to scout mode, in which you can't attack, but can move without limit."
- magic_fluff_string = "..And draw the Sentinel, an alien master of ranged combat."
- tech_fluff_string = "Boot sequence complete. Ranged combat modules active. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! Caught one, it's a ranged carp. This fishy can watch people pee in the ocean."
- miner_fluff_string = "You encounter... Diamond, a powerful projectile thrower."
- see_invisible = SEE_INVISIBLE_LIVING
- see_in_dark = 8
- toggle_button_type = /atom/movable/screen/guardian/ToggleMode
- var/list/snares = list()
- var/toggle = FALSE
- speed = -2//very fast!
-
-/mob/living/simple_animal/hostile/guardian/ranged/ToggleMode()
- if(loc == summoner)
- if(toggle)
- ranged = initial(ranged)
- melee_damage_lower = initial(melee_damage_lower)
- melee_damage_upper = initial(melee_damage_upper)
- obj_damage = initial(obj_damage)
- environment_smash = initial(environment_smash)
- alpha = 255
- range = initial(range)
- to_chat(src, "You switch to combat mode.")
- toggle = FALSE
- else
- ranged = 0
- melee_damage_lower = 0
- melee_damage_upper = 0
- obj_damage = 0
- environment_smash = ENVIRONMENT_SMASH_NONE
- alpha = 45
- range = 255
- to_chat(src, "You switch to scout mode.")
- toggle = TRUE
- else
- to_chat(src, "You have to be recalled to toggle modes!")
-
-/mob/living/simple_animal/hostile/guardian/ranged/Shoot(atom/targeted_atom)
- . = ..()
- if(istype(., /obj/projectile))
- var/obj/projectile/P = .
- if(guardiancolor)
- P.color = guardiancolor
-
-/mob/living/simple_animal/hostile/guardian/ranged/ToggleLight()
- var/msg
- switch(lighting_alpha)
- if (LIGHTING_PLANE_ALPHA_VISIBLE)
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
- msg = "You activate your night vision."
- if (LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- msg = "You increase your night vision."
- if (LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
- lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
- msg = "You maximize your night vision."
- else
- lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
- msg = "You deactivate your night vision."
-
- to_chat(src, "[msg]")
-
-
-/mob/living/simple_animal/hostile/guardian/ranged/verb/Snare()
- set name = "Set Surveillance Snare"
- set category = "Guardian"
- set desc = "Set an invisible snare that will alert you when living creatures walk over it. Max of 5"
- if(snares.len <6)
- var/turf/snare_loc = get_turf(loc)
- var/obj/effect/snare/S = new /obj/effect/snare(snare_loc)
- S.spawner = src
- S.name = "[get_area(snare_loc)] snare ([rand(1, 1000)])"
- snares |= S
- to_chat(src, "Surveillance snare deployed!")
- else
- to_chat(src, "You have too many snares deployed. Remove some first.")
-
-/mob/living/simple_animal/hostile/guardian/ranged/verb/DisarmSnare()
- set name = "Remove Surveillance Snare"
- set category = "Guardian"
- set desc = "Disarm unwanted surveillance snares."
- var/picked_snare = input(src, "Pick which snare to remove", "Remove Snare") as null|anything in sortNames(snares)
- if(picked_snare)
- snares -= picked_snare
- qdel(picked_snare)
- to_chat(src, "Snare disarmed.")
-
-/obj/effect/snare
- name = "snare"
- desc = "You shouldn't be seeing this!"
- var/mob/living/simple_animal/hostile/guardian/spawner
- invisibility = INVISIBILITY_ABSTRACT
-
-/obj/effect/snare/Initialize()
- . = ..()
- var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
- )
- AddElement(/datum/element/connect_loc, loc_connections)
-
-
-/obj/effect/snare/proc/on_entered(datum/source, AM as mob|obj)
- SIGNAL_HANDLER
- if(isliving(AM) && spawner && spawner.summoner && AM != spawner && !spawner.hasmatchingsummoner(AM))
- to_chat(spawner.summoner, "[AM] has crossed surveillance snare, [name].")
- var/list/guardians = spawner.summoner.hasparasites()
- for(var/para in guardians)
- to_chat(para, "[AM] has crossed surveillance snare, [name].")
-
-/obj/effect/snare/singularity_act()
- return
-
-/obj/effect/snare/singularity_pull()
- return
-
-/mob/living/simple_animal/hostile/guardian/ranged/Manifest(forced)
- if (toggle)
- incorporeal_move = INCORPOREAL_MOVE_BASIC
- . = ..()
-
-/mob/living/simple_animal/hostile/guardian/ranged/Recall(forced)
- // To stop scout mode from moving when recalled
- incorporeal_move = FALSE
- . = ..()
-
-/mob/living/simple_animal/hostile/guardian/ranged/AttackingTarget()
- if(toggle)
- return
- ..()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/slime.dm b/code/modules/mob/living/simple_animal/guardian/types/slime.dm
deleted file mode 100644
index bf38ffed2ef23..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/slime.dm
+++ /dev/null
@@ -1,73 +0,0 @@
-//Slime guardian- modified support guardian who has higher utility but is less potent in battle
-/mob/living/simple_animal/hostile/guardian/slime
- a_intent = INTENT_HARM
- speed = 0
- damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- melee_damage_lower = 10
- melee_damage_upper = 10
- melee_damage_type = TOX
- playstyle_string = "As a slime type, you can toggle between a weak combat mode, and a strong healing mode that nourishes and repairs damage. This mode also works on slimes. Be warned: You are more vulnerable to damage then most holoparasites."
- magic_fluff_string = "..And draw the Xenobiologist, a purveyor of godlike power."
- carp_fluff_string = "CARP CARP CARP! You caught a slimy carp. Gross, maybe you should throw this one back."
- tech_fluff_string = "Boot sequence complete. Xenobiological support module active. Holoparasite swarm online."
- miner_fluff_string = "You encounter... Slime, the master of xenobiology."
- slime_fluff_string = "The crystal in your hand shatters into mist, which forms a strange, slimy figure!"
- toggle_button_type = /atom/movable/screen/guardian/ToggleMode
- var/toggle = FALSE
-
-/mob/living/simple_animal/hostile/guardian/slime/Initialize()
- . = ..()
- var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
- medsensor.add_hud_to(src)
-
-/mob/living/simple_animal/hostile/guardian/slime/AttackingTarget()
- . = ..()
- if(is_deployed() && toggle && isslime(target))
- var/mob/living/simple_animal/slime/slime = target
- slime.add_nutrition(rand(14, 30))
- slime.adjustHealth(10)
- return
-
- if(is_deployed() && toggle && iscarbon(target))
- var/mob/living/carbon/C = target
- C.adjustBruteLoss(-7)
- C.adjustFireLoss(-7)
- C.adjustOxyLoss(-7)
- C.adjustToxLoss(-7)
- C.adjustCloneLoss(-0.5)
- C.adjust_nutrition(10)
- var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(C))
- if(guardiancolor)
- H.color = guardiancolor
- if(C == summoner)
- update_health_hud()
- med_hud_set_health()
- med_hud_set_status()
-
- if(is_deployed() && toggle == FALSE && iscarbon(target))
- if(prob(20))
- var/mob/living/carbon/D = target
- D.Paralyze(25)
- D.visible_message("\The [src] knocks down \the [D]!", \
- "\The [src] knocks you down!")
-
-/mob/living/simple_animal/hostile/guardian/slime/ToggleMode()
- if(src.loc == summoner)
- if(toggle)
- a_intent = INTENT_HARM
- speed = -1
- damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.2, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- melee_damage_lower = 15
- melee_damage_upper = 15
- to_chat(src, "Blorble... You switch to combat mode.")
- toggle = FALSE
- else
- a_intent = INTENT_HELP
- speed = 2
- damage_coeff = list(BRUTE = 1.2, BURN = 1.2, TOX = 0.7, CLONE = 1.2, STAMINA = 0, OXY = 1.2)
- melee_damage_lower = 0
- melee_damage_upper = 0
- to_chat(src, "You switch to nourshing mode. Yummy.")
- toggle = TRUE
- else
- to_chat(src, "You have to be recalled to toggle modes!")
diff --git a/code/modules/mob/living/simple_animal/guardian/types/standard.dm b/code/modules/mob/living/simple_animal/guardian/types/standard.dm
deleted file mode 100644
index 2528a09147179..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/standard.dm
+++ /dev/null
@@ -1,36 +0,0 @@
-//Standard
-/mob/living/simple_animal/hostile/guardian/punch
- melee_damage_lower = 20
- melee_damage_upper = 20
- obj_damage = 80
- next_move_modifier = 0.6 //attacks 40% faster
- environment_smash = ENVIRONMENT_SMASH_WALLS
- playstyle_string = "As a standard type you have no special abilities, but have a high damage resistance and a powerful attack capable of smashing through walls."
- magic_fluff_string = "..And draw the Assistant, faceless and generic, but never to be underestimated."
- tech_fluff_string = "Boot sequence complete. Standard combat modules loaded. Holoparasite swarm online."
- carp_fluff_string = "CARP CARP CARP! You caught one! It's really boring and standard. Better punch some walls to ease the tension."
- miner_fluff_string = "You encounter... Adamantine, a powerful attacker."
- var/battlecry = "AT"
- speed = 4//unlike funny jojo man, the punch ghost is actually balanced by their low mobility
-
-/mob/living/simple_animal/hostile/guardian/punch/verb/Battlecry()
- set name = "Set Battlecry"
- set category = "Guardian"
- set desc = "Choose what you shout as you punch people."
- var/input = stripped_input(src,"What do you want your battlecry to be? Max length of 6 characters.", ,"", 7)
- if(input)
- battlecry = input
-
-
-
-/mob/living/simple_animal/hostile/guardian/punch/AttackingTarget()
- . = ..()
- if(isliving(target))
- say("[battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry]!!", ignore_spam = TRUE)
- playsound(loc, src.attack_sound, 50, TRUE, TRUE)
- playsound(loc, src.attack_sound, 50, TRUE, TRUE)
- playsound(loc, src.attack_sound, 50, TRUE, TRUE)
- playsound(loc, src.attack_sound, 50, TRUE, TRUE)
- if(isanimal(target))
- var/mob/living/C = target
- C.apply_damage(35, BRUTE)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm
deleted file mode 100644
index 57f1b1892f9dc..0000000000000
--- a/code/modules/mob/living/simple_animal/guardian/types/support.dm
+++ /dev/null
@@ -1,148 +0,0 @@
-//Healer
-/mob/living/simple_animal/hostile/guardian/healer
- a_intent = INTENT_HARM
- friendly_verb_continuous = "heals"
- friendly_verb_simple = "heal"
- speed = 0
- damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- melee_damage_lower = 15
- melee_damage_upper = 15
- playstyle_string = "As a support type, you may toggle your basic attacks to a healing mode. In addition, Alt-Clicking on an adjacent object or mob will warp them to your bluespace beacon after a short delay."
- magic_fluff_string = "..And draw the CMO, a potent force of life... and death."
- carp_fluff_string = "CARP CARP CARP! You caught a support carp. It's a kleptocarp!"
- tech_fluff_string = "Boot sequence complete. Support modules active. Holoparasite swarm online."
- miner_fluff_string = "You encounter... Bluespace, the master of support."
- toggle_button_type = /atom/movable/screen/guardian/ToggleMode
- var/obj/structure/receiving_pad/beacon
- var/beacon_cooldown = 0
- var/toggle = FALSE
-
-/mob/living/simple_animal/hostile/guardian/healer/Initialize()
- . = ..()
- var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
- medsensor.add_hud_to(src)
-
-/mob/living/simple_animal/hostile/guardian/healer/get_status_tab_items()
- . = ..()
- if(beacon_cooldown >= world.time)
- . += "Beacon Cooldown Remaining: [DisplayTimeText(beacon_cooldown - world.time)]"
-
-/mob/living/simple_animal/hostile/guardian/healer/AttackingTarget()
- . = ..()
- if(is_deployed() && toggle && iscarbon(target))
- var/mob/living/carbon/C = target
- C.adjustBruteLoss(-5)
- C.adjustFireLoss(-5)
- C.adjustOxyLoss(-5)
- C.adjustToxLoss(-5)
- var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(C))
- if(guardiancolor)
- H.color = guardiancolor
- if(C == summoner)
- update_health_hud()
- med_hud_set_health()
- med_hud_set_status()
-
-/mob/living/simple_animal/hostile/guardian/healer/ToggleMode()
- if(src.loc == summoner)
- if(toggle)
- a_intent = INTENT_HARM
- speed = -2
- damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- melee_damage_lower = 5
- melee_damage_upper = 5
- next_move_modifier = 0.3///attack as fast as you can click, but your actual hits are basically tickle damage :))
- to_chat(src, "You switch to combat mode.")
- toggle = FALSE
- else
- a_intent = INTENT_HELP
- speed = 1
- damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
- melee_damage_lower = 0
- melee_damage_upper = 0
- to_chat(src, "You switch to healing mode.")
- toggle = TRUE
- else
- to_chat(src, "You have to be recalled to toggle modes!")
-
-
-/mob/living/simple_animal/hostile/guardian/healer/verb/Beacon()
- set name = "Place Bluespace Beacon"
- set category = "Guardian"
- set desc = "Mark a floor as your beacon point, allowing you to warp targets to it. Your beacon will not work at extreme distances."
-
- if(beacon_cooldown >= world.time)
- to_chat(src, "Your power is on cooldown. You must wait five minutes between placing beacons.")
- return
-
- var/turf/beacon_loc = get_turf(src.loc)
- if(!isfloorturf(beacon_loc))
- return
-
- if(beacon)
- beacon.disappear()
- beacon = null
-
- beacon = new(beacon_loc, src)
-
- to_chat(src, "Beacon placed! You may now warp targets and objects to it, including your user, via Alt+Click.")
-
- beacon_cooldown = world.time + 3000
-
-/obj/structure/receiving_pad
- name = "bluespace receiving pad"
- icon = 'icons/turf/floors.dmi'
- desc = "A receiving zone for bluespace teleportations."
- icon_state = "light_on_flicker-1"
- light_range = MINIMUM_USEFUL_LIGHT_RANGE
- density = FALSE
- anchored = TRUE
- layer = ABOVE_OPEN_TURF_LAYER
-
-/obj/structure/receiving_pad/New(loc, mob/living/simple_animal/hostile/guardian/healer/G)
- . = ..()
- if(G?.guardiancolor)
- add_atom_colour(G.guardiancolor, FIXED_COLOUR_PRIORITY)
-
-/obj/structure/receiving_pad/proc/disappear()
- visible_message("[src] vanishes!")
- qdel(src)
-
-/mob/living/simple_animal/hostile/guardian/healer/AltClickOn(atom/movable/A)
- if(!istype(A))
- return
- if(src.loc == summoner)
- to_chat(src, "You must be manifested to warp a target!")
- return
- if(!beacon)
- to_chat(src, "You need a beacon placed to warp things!")
- return
- if(!Adjacent(A))
- to_chat(src, "You must be adjacent to your target!")
- return
- if(A.anchored)
- to_chat(src, "Your target cannot be anchored!")
- return
-
- var/turf/T = get_turf(A)
- if(beacon.virtual_z() != T.virtual_z())
- to_chat(src, "The beacon is too far away to warp to!")
- return
-
- to_chat(src, "You begin to warp [A].")
- A.visible_message("[A] starts to glow faintly!", \
- "You start to faintly glow, and you feel strangely weightless!")
- do_attack_animation(A)
-
- if(!do_after(src, 6 SECONDS, A)) //now start the channel
- to_chat(src, "You need to hold still!")
- return
-
- new /obj/effect/temp_visual/guardian/phase/out(T)
- if(isliving(A))
- var/mob/living/L = A
- L.flash_act()
- A.visible_message("[A] disappears in a flash of light!", \
- "Your vision is obscured by a flash of light!")
- do_teleport(A, beacon, 0, channel = TELEPORT_CHANNEL_BLUESPACE)
- new /obj/effect/temp_visual/guardian/phase(get_turf(A))
diff --git a/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm b/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm
index 78432c92a4d5d..038aae0900deb 100644
--- a/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/abandoned_minebot.dm
@@ -9,7 +9,7 @@
status_flags = CANSTUN|CANKNOCKDOWN|CANPUSH
mouse_opacity = MOUSE_OPACITY_ICON
a_intent = INTENT_HARM
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
move_to_delay = 10
health = 70
@@ -35,14 +35,14 @@
minimum_distance = 1
icon_state = "mining_drone_offense"
faction = list("mining", "turret")
- loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/effect/spawner/lootdrop/minebot)
+ loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/effect/spawner/random/minebot)
projectiletype = /obj/projectile/kinetic/miner/weak
/obj/projectile/kinetic/miner/weak
damage = 15
-/obj/effect/spawner/lootdrop/minebot
+/obj/effect/spawner/random/minebot
loot = list(/obj/item/borg/upgrade/modkit/minebot_passthrough = 15,
/obj/item/borg/upgrade/modkit/chassis_mod = 15,
/obj/item/borg/upgrade/modkit/tracer = 15,
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index ec7c76f5ca616..402c6c920c0b8 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -22,7 +22,7 @@
bubble_icon = "alien"
a_intent = INTENT_HARM
attack_sound = 'sound/weapons/bladeslice.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
unsuitable_atmos_damage = 15
faction = list(ROLE_ALIEN)
status_flags = CANPUSH
@@ -30,7 +30,6 @@
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
unique_name = 1
- gold_core_spawnable = HOSTILE_SPAWN
deathsound = 'sound/voice/hiss6.ogg'
deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw..."
@@ -143,7 +142,6 @@
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 10,
/obj/item/stack/sheet/animalhide/xeno = 2)
mob_size = MOB_SIZE_LARGE
- gold_core_spawnable = NO_SPAWN
/obj/projectile/neurotox
name = "neurotoxin"
@@ -169,7 +167,6 @@
friendly_verb_simple = "caress"
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
- gold_core_spawnable = HOSTILE_SPAWN
icon_state = "maid"
icon_living = "maid"
icon_dead = "maid_dead"
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index b6f5c58b424e1..2de3637292294 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -34,7 +34,7 @@
friendly_verb_simple = "bear hug"
//Space bears aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
@@ -98,7 +98,6 @@
health = 120
maxHealth = 120
armored = TRUE
- gold_core_spawnable = HOSTILE_SPAWN
/mob/living/simple_animal/hostile/bear/cave
name = "brown bear"
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 676b58a985201..c019c6a65ad54 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -47,11 +47,10 @@
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BUG
movement_type = FLYING
- gold_core_spawnable = FRIENDLY_SPAWN
search_objects = 1 //have to find those plant trays!
//Spaceborn beings don't get hurt by space
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
del_on_death = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 67a80713d8ec0..4f0448b385c3f 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -37,13 +37,12 @@
speak_emote = list("gnashes")
//Space carp aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
faction = list("carp", "mining")
movement_type = FLYING
pressure_resistance = 200
- gold_core_spawnable = HOSTILE_SPAWN
var/random_color = TRUE //if the carp uses random coloring
var/rarechance = 1 //chance for rare color variant
@@ -159,7 +158,6 @@
icon_state = "holocarp"
icon_living = "holocarp"
maxbodytemp = INFINITY
- gold_core_spawnable = NO_SPAWN
del_on_death = 1
random_color = FALSE
food_type = list()
@@ -229,7 +227,6 @@
desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
gender = FEMALE
speak_emote = list("squeaks")
- gold_core_spawnable = NO_SPAWN
faction = list(ROLE_SYNDICATE)
AIStatus = AI_OFF
rarechance = 10
diff --git a/code/modules/mob/living/simple_animal/hostile/clown.dm b/code/modules/mob/living/simple_animal/hostile/clown.dm
index b513c74e9d58a..a5883ce91efac 100644
--- a/code/modules/mob/living/simple_animal/hostile/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/clown.dm
@@ -29,7 +29,6 @@
del_on_death = 1
loot = list(/obj/effect/mob_spawn/human/clown/corpse)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 270
maxbodytemp = 370
unsuitable_atmos_damage = 10
@@ -56,7 +55,7 @@
. = ..()
if(banana_time && banana_time < world.time)
var/turf/T = get_turf(src)
- var/list/adjacent = T.GetAtmosAdjacentTurfs()
+ var/list/adjacent = T.get_atmos_adjacent_turfs()
new banana_type(pick(adjacent))
banana_time = world.time + rand(30,60)
diff --git a/code/modules/mob/living/simple_animal/hostile/cockroach.dm b/code/modules/mob/living/simple_animal/hostile/cockroach.dm
index c822268a7fe2d..d744d4a413c1e 100644
--- a/code/modules/mob/living/simple_animal/hostile/cockroach.dm
+++ b/code/modules/mob/living/simple_animal/hostile/cockroach.dm
@@ -7,7 +7,7 @@
maxHealth = 1
turns_per_move = 5
loot = list(/obj/effect/decal/cleanable/insectguts)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 270
maxbodytemp = INFINITY
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
@@ -23,7 +23,6 @@
melee_damage_upper = 0
obj_damage = 0
ventcrawler = VENTCRAWLER_ALWAYS
- gold_core_spawnable = FRIENDLY_SPAWN
verb_say = "chitters"
verb_ask = "chitters inquisitively"
verb_exclaim = "chitters loudly"
@@ -49,7 +48,6 @@
melee_damage_lower = 5
melee_damage_upper = 5
obj_damage = 20
- gold_core_spawnable = HOSTILE_SPAWN
projectilesound = 'sound/weapons/gun/pistol/shot.ogg'
projectiletype = /obj/projectile/glockroachbullet
casingtype = /obj/item/ammo_casing/glockroach
diff --git a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
index 57a33c2ee02a4..26f176d74fa5c 100644
--- a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
@@ -26,10 +26,9 @@
attack_verb_simple = "blink at"
attack_sound = 'sound/weapons/pierce.ogg'
movement_type = FLYING
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
- gold_core_spawnable = HOSTILE_SPAWN
faction = list("spooky")
del_on_death = 1
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index c9c2e131cc094..6959b9e61cd40 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -27,11 +27,10 @@
attack_sound = 'sound/hallucinations/growl1.ogg'
speak_emote = list("growls")
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
faction = list("faithless")
- gold_core_spawnable = HOSTILE_SPAWN
footstep_type = FOOTSTEP_MOB_SHOE
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 5e3e8d0b34d5c..fa15c57249e93 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -50,7 +50,6 @@
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
unique_name = 1
- gold_core_spawnable = HOSTILE_SPAWN
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
footstep_type = FOOTSTEP_MOB_CLAW
mob_size = MOB_SIZE_LARGE
@@ -122,7 +121,6 @@
var/datum/action/innate/spider/lay_eggs/lay_eggs
var/datum/action/innate/spider/set_directive/set_directive
var/static/list/consumed_mobs = list() //the refs of mobs that have been consumed by nurse spiders to lay eggs
- gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/hostile/poison/giant_spider/nurse/Initialize()
. = ..()
@@ -172,7 +170,6 @@
melee_damage_upper = 20
poison_per_bite = 5
move_to_delay = 5
- gold_core_spawnable = NO_SPAWN
//vipers are the rare variant of the hunter, no IMMEDIATE damage but so much poison medical care will be needed fast.
/mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper
@@ -205,7 +202,6 @@
move_to_delay = 8
speed = 9
status_flags = NONE
- gold_core_spawnable = NO_SPAWN
var/slowed_by_webs = FALSE
/mob/living/simple_animal/hostile/poison/giant_spider/tarantula/Moved(atom/oldloc, dir)
@@ -220,16 +216,15 @@
/mob/living/simple_animal/hostile/poison/giant_spider/ice //spiders dont usually like tempatures of 140 kelvin who knew
name = "giant ice spider"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
poison_type = /datum/reagent/consumable/frostoil
color = rgb(114,228,250)
- gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/hostile/poison/giant_spider/nurse/ice
name = "giant ice spider"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
poison_type = /datum/reagent/consumable/frostoil
@@ -237,12 +232,11 @@
/mob/living/simple_animal/hostile/poison/giant_spider/hunter/ice
name = "giant ice spider"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
poison_type = /datum/reagent/consumable/frostoil
color = rgb(114,228,250)
- gold_core_spawnable = NO_SPAWN
/mob/living/simple_animal/hostile/poison/giant_spider/handle_automated_action()
if(!..()) //AIStatus is off
diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm
index a175bb40fecaa..6a11507beea12 100644
--- a/code/modules/mob/living/simple_animal/hostile/goose.dm
+++ b/code/modules/mob/living/simple_animal/hostile/goose.dm
@@ -29,7 +29,6 @@
speak_emote = list("honks")
faction = list("neutral")
attack_same = TRUE
- gold_core_spawnable = HOSTILE_SPAWN
var/random_retaliate = TRUE
var/icon_vomit_start = "vomit_start"
var/icon_vomit = "vomit"
@@ -95,7 +94,6 @@
response_disarm_simple = "gently push aside"
response_harm_continuous = "kicks"
response_harm_simple = "kick"
- gold_core_spawnable = NO_SPAWN
random_retaliate = FALSE
var/vomiting = FALSE
var/vomitCoefficient = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
index 850ff235375fc..292a9fee3658e 100644
--- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
@@ -73,8 +73,6 @@
if(origin && (origin.current ? (origin.current.stat == DEAD) : origin.get_ghost()))
origin.transfer_to(M)
var/datum/antagonist/changeling/C = origin.has_antag_datum(/datum/antagonist/changeling)
- if(!C)
- C = origin.add_antag_datum(/datum/antagonist/changeling/xenobio)
if(C.can_absorb_dna(owner))
C.add_new_profile(owner)
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 431229fefc44c..9eb029b22ec17 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -1,29 +1,29 @@
-/obj/projectile/hivebotbullet
- damage = 10
- damage_type = BRUTE
-
/mob/living/simple_animal/hostile/hivebot
name = "hivebot"
- desc = "A small robot."
+ desc = "A human-sized automaton clad in the scrap of a dead world. Exposed circuitry sparks subtly as it analyzes the area around it."
icon = 'icons/mob/hivebot.dmi'
icon_state = "basic"
icon_living = "basic"
icon_dead = "basic"
gender = NEUTER
mob_biotypes = MOB_ROBOTIC
- health = 15
- maxHealth = 15
+ health = 35
+ maxHealth = 35
healable = 0
- melee_damage_lower = 2
- melee_damage_upper = 3
+ melee_damage_lower = 8
+ melee_damage_upper = 12
+
attack_verb_continuous = "claws"
attack_verb_simple = "claw"
attack_sound = 'sound/weapons/bladeslice.ogg'
+ casingtype = /obj/item/ammo_casing/c10mm
projectilesound = 'sound/weapons/gun/pistol/shot.ogg'
- projectiletype = /obj/projectile/hivebotbullet
+
+ armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 100, "fire" = 50, "acid" = 0)
+
faction = list("hivebot")
check_friendly_fire = 1
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
possible_a_intents = list(INTENT_HELP, INTENT_GRAB, INTENT_DISARM, INTENT_HARM)
minbodytemp = 0
verb_say = "states"
@@ -35,7 +35,16 @@
del_on_death = 1
minbodytemp = 0
maxbodytemp = 600
- loot = list(/obj/effect/decal/cleanable/robot_debris)
+ loot = list(
+ /obj/effect/decal/cleanable/robot_debris,
+ /obj/effect/spawner/random/waste/hivebot,
+ /obj/effect/spawner/random/waste/hivebot/part,
+ )
+
+ //yeah so it turns out that /simple_animal/hostile gets upset when you call say because say contains a sleep. so we have to do this on subtypes.
+ var/list/aggro_blurb = list("INFILTRATOR WITHIN AO!!", "TERMINATE HOSTILE!!", "DEFEND TERMINUS!!", "CODE 7-34!!")
+ var/aggro_blurb_chance = 10
+
var/alert_light
footstep_type = FOOTSTEP_MOB_CLAW
@@ -48,8 +57,9 @@
. = ..()
a_intent_change(INTENT_HARM)
update_icons()
- if(prob(5))
- say(pick("INTRUDER DETECTED!", "CODE 7-34.", "101010!!"), forced = type)
+ if(prob(aggro_blurb_chance))
+ say("[pick(aggro_blurb)]", forced = type)
+
/mob/living/simple_animal/hostile/hivebot/LoseAggro()
. = ..()
@@ -69,58 +79,107 @@
/mob/living/simple_animal/hostile/hivebot/death(gibbed)
do_sparks(3, TRUE, src)
- new /obj/effect/spawner/lootdrop/waste/hivebot(loc)
..(TRUE)
-/mob/living/simple_animal/hostile/hivebot/range
- name = "hivebot"
- desc = "A smallish robot, this one is armed!"
+/mob/living/simple_animal/hostile/hivebot/ranged
+ name = "combat hivebot"
+ desc = "A human-sized automaton clad in the scrap of a dead world. A weapon pivots around on its top, searching for a target to engage."
icon_state = "ranged"
icon_living = "ranged"
icon_dead = "ranged"
ranged = TRUE
retreat_distance = 5
minimum_distance = 5
-
-/mob/living/simple_animal/hostile/hivebot/range/rockplanet
- faction = list("mining", "hivebot")
-
-/mob/living/simple_animal/hostile/hivebot/rapid
- icon_state = "ranged"
- icon_living = "ranged"
- icon_dead = "ranged"
+ loot = list(
+ /obj/effect/decal/cleanable/robot_debris,
+ /obj/effect/spawner/random/waste/hivebot,
+ /obj/effect/spawner/random/waste/hivebot/part,
+ /obj/effect/spawner/random/waste/hivebot/part,
+ )
+
+/mob/living/simple_animal/hostile/hivebot/ranged/rapid
ranged = TRUE
rapid = 3
- retreat_distance = 5
- minimum_distance = 5
-
-/mob/living/simple_animal/hostile/hivebot/rapid/rockplanet
- faction = list("mining", "hivebot")
+ rapid_fire_delay = 4
+ casingtype = /obj/item/ammo_casing/c57x39mm
+ projectilesound = 'sound/weapons/gun/smg/sidewinder.ogg'
/mob/living/simple_animal/hostile/hivebot/strong
- name = "strong hivebot"
+ name = "heavy hivebot"
+ desc = "A towering scrap-clad monolith. Hatred radiates out from the sensors that adorn it, beams of subtle light coming from within its sparking core."
+ armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 100, "fire" = 50, "acid" = 0)
icon_state = "strong"
icon_living = "strong"
icon_dead = "strong"
- desc = "A robot, this one is armed and looks tough!"
health = 80
maxHealth = 80
ranged = TRUE
+ casingtype = /obj/item/ammo_casing/mm712x82
+ projectilesound = 'sound/weapons/gun/rifle/hydra.ogg'
+ melee_damage_lower = 12
+ melee_damage_upper = 20
+ move_to_delay = 10
+ loot = list(
+ /obj/effect/decal/cleanable/robot_debris,
+ /obj/effect/spawner/random/waste/hivebot/more,
+ /obj/effect/spawner/random/waste/hivebot/part/heavy,
+ /obj/effect/spawner/random/waste/hivebot/part,
+ /obj/effect/spawner/random/waste/hivebot/part,
+ )
+
+/mob/living/simple_animal/hostile/hivebot/defender //slave to the system
+ name = "core hivebot"
+ desc = "A massive, alien tower of metal and circuitry. Eyes adorn its body, each one casting a ray of electronic light in myriad directions. Slaved to its whim is a scrapped turret mounting, angrily glancing at the world around it."
+ armor = list("melee" = 40, "bullet" = 60, "laser" = 30, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 100, "fire" = 50, "acid" = 0)
+ icon_state = "strong"
+ icon_living = "strong"
+ icon_dead = "strong"
+ health = 120
+ maxHealth = 120
+ ranged = TRUE
+
+ casingtype = /obj/item/ammo_casing/mm712x82
+ projectilesound = 'sound/weapons/gun/rifle/hydra.ogg'
+ rapid = 3
+ rapid_fire_delay = 4
+
+ retreat_distance = 3
+ minimum_distance = 5
+
+ melee_damage_lower = 15
+ melee_damage_upper = 28
+
+ move_to_delay = 20
+
+ loot = list(
+ /obj/effect/decal/cleanable/robot_debris,
+ /obj/effect/spawner/random/waste/hivebot/more,
+ /obj/effect/spawner/random/waste/hivebot/part/superheavy,
+ /obj/effect/spawner/random/waste/hivebot/part/heavy,
+ /obj/effect/spawner/random/waste/hivebot/part/heavy,
+ )
+
+/mob/living/simple_animal/hostile/hivebot/defender/death(gibbed)
+ //once we get better sprites i want this to be like the claw's death. aka fucking cool.
+ radiation_pulse(src, 500)
+ explosion(src, 0,1,3,3,)
+ ..(TRUE)
-/mob/living/simple_animal/hostile/hivebot/strong/rockplanet
- faction = list("mining", "hivebot")
+
+/mob/living/simple_animal/hostile/hivebot/defender/Initialize(mapload)
+ . = ..()
+ transform *= 1.3
/mob/living/simple_animal/hostile/hivebot/mechanic
name = "hivebot mechanic"
icon_state = "strong"
icon_living = "strong"
icon_dead = "strong"
- desc = "A robot built for base upkeep, intended for use inside hivebot colonies."
+ desc = "A tidy yet discordant machine of scrap, adorned with analyzers, waldos, and touching eyes."
health = 60
maxHealth = 60
ranged = TRUE
rapid = 3
- gold_core_spawnable = HOSTILE_SPAWN
var/datum/action/innate/hivebot/foamwall/foam
/mob/living/simple_animal/hostile/hivebot/mechanic/Initialize(mapload)
@@ -173,43 +232,3 @@
return
new /obj/structure/foamedmetal(H.loc)
playsound(get_turf(H), 'sound/effects/extinguish.ogg', 50, TRUE, -1)
-
-
-/mob/living/simple_animal/hostile/hivebot/wasteplanet
- name = "hivebot"
- desc = "A smallish robot, this one is armed!"
- icon_state = "basic"
- icon_living = "basic"
- icon_dead = "basic"
- ranged = FALSE
- faction = list("mining", "hivebot")
- health = 30
- maxHealth = 30
- healable = 0
- melee_damage_lower = 5
- melee_damage_upper = 15
-
-
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged
- ranged = TRUE
- icon_state = "ranged"
- icon_living = "ranged"
- icon_dead = "ranged"
- ranged = TRUE
- retreat_distance = 5
- minimum_distance = 5
-
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid
- rapid = 3
-
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong
- name = "strong hivebot"
- icon_state = "strong"
- icon_living = "strong"
- icon_dead = "strong"
- desc = "A robot, this one is armed and looks tough!"
- health = 80
- maxHealth = 80
- ranged = TRUE
- retreat_distance = 5
- minimum_distance = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 70ce3f665babe..e12e86e47b009 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -18,8 +18,10 @@
var/projectiletype //set ONLY it and NULLIFY casingtype var, if we have ONLY projectile
var/projectilesound
var/casingtype //set ONLY it and NULLIFY projectiletype, if we have projectile IN CASING
- var/move_to_delay = 3 //delay for the automated movement.
+ ///delay for the automated movement.
+ var/move_to_delay = 3
var/list/friends = list()
+
var/list/emote_taunt = list()
var/taunt_chance = 0
@@ -33,7 +35,7 @@
var/check_friendly_fire = FALSE // Should the ranged mob check for friendlies when shooting
var/retreat_distance = null //If our mob runs from players when they're too close, set in tile distance. By default, mobs do not retreat.
var/minimum_distance = 1 //Minimum approach distance, so ranged mobs chase targets down, but still keep their distance set in tiles to the target, set higher to make mobs keep distance
-
+ var/shoot_point_blank = FALSE // If this mob will still shoot even in melee range.
//These vars are related to how mobs locate and target
var/robust_searching = 0 //By default, mobs have a simple searching method, set this to 1 for the more scrutinous searching (stat_attack, stat_exclusive, etc), should be disabled on most mobs
@@ -240,12 +242,12 @@
if(istype(the_target, /obj/machinery/porta_turret))
var/obj/machinery/porta_turret/P = the_target
- if(P.in_faction(src)) //Don't attack if the turret is in the same faction
- return FALSE
- if(P.has_cover &&!P.raised) //Don't attack invincible turrets
+ if(!(P.turret_flags & TURRET_FLAG_SHOOT_FAUNA)) //Don't attack turrets that won't shoot us
return FALSE
if(P.machine_stat & BROKEN) //Or turrets that are already broken
return FALSE
+ if(faction_check(P.faction, faction)) //Or turrets in the same faction
+ return FALSE
return TRUE
if(istype(the_target, /obj/machinery/drill))
@@ -315,7 +317,10 @@
Goto(target,move_to_delay,minimum_distance)
if(target)
if(isturf(target_from.loc) && target.Adjacent(target_from)) //If they're next to us, attack
- MeleeAction()
+ if(ranged && shoot_point_blank && ranged_cooldown <= world.time)
+ OpenFire(target)
+ else
+ MeleeAction()
else
if(rapid_melee > 1 && target_distance <= melee_queue_distance)
MeleeAction(FALSE)
@@ -366,9 +371,10 @@
/mob/living/simple_animal/hostile/proc/Aggro()
vision_range = aggro_vision_range
- if(target && emote_taunt.len && prob(taunt_chance))
- manual_emote("[pick(emote_taunt)] at [target].")
- taunt_chance = max(taunt_chance-7,2)
+ if(target)
+ if(emote_taunt.len && prob(taunt_chance))
+ manual_emote("[pick(emote_taunt)] at [target].")
+ taunt_chance = max(taunt_chance-7,2)
/mob/living/simple_animal/hostile/proc/LoseAggro()
@@ -698,3 +704,27 @@
if (length(initial(src.faction)) > 0)
src.faction += initial(src.faction)
src.faction += tag
+
+/mob/living/simple_animal/hostile/proc/fire_line(source, list/turfs, fire_source = "fire breath", ignite_turfs = FALSE, power = 4, flame_color = "red")
+ var/list/hit_list = list()
+ for(var/turf/T in turfs)
+ if(istype(T, /turf/closed))
+ break
+ new /obj/effect/hotspot(T)
+ T.hotspot_expose(700,50,1)
+ if(ignite_turfs)
+ T.IgniteTurf(power,flame_color)
+ for(var/mob/living/L in T.contents)
+ if((L in hit_list) || L == source)
+ continue
+ hit_list += L
+ L.adjustFireLoss(20)
+ to_chat(L, "You're hit by [source]'s [fire_source]!")
+
+ // deals damage to mechs
+ for(var/obj/mecha/M in T.contents)
+ if(M in hit_list)
+ continue
+ hit_list += M
+ M.take_damage(45, BRUTE, "melee", 1)
+ sleep(1.5)
diff --git a/code/modules/mob/living/simple_animal/hostile/human/cat_butcher.dm b/code/modules/mob/living/simple_animal/hostile/human/cat_butcher.dm
deleted file mode 100644
index 0f14f615e5b6f..0000000000000
--- a/code/modules/mob/living/simple_animal/hostile/human/cat_butcher.dm
+++ /dev/null
@@ -1,86 +0,0 @@
-/mob/living/simple_animal/hostile/human/cat_butcherer
- name = "Cat Surgeon"
- desc = "Feline genemod physiological modification surgery is outlawed in Nanotrasen-controlled sectors. This doctor doesn't seem to care, and thus, is wanted for several warcrimes."
- icon_state = "cat_butcher"
- icon_living = "cat_butcher"
- projectiletype = /obj/projectile/bullet/dart/tranq
- projectilesound = 'sound/items/syringeproj.ogg'
- ranged = TRUE
- ranged_message = "fires the syringe gun at"
- ranged_cooldown_time = 30
- speak_chance = 0
- stat_attack = HARD_CRIT
- melee_damage_lower = 15
- melee_damage_upper = 15
- attack_verb_continuous = "slashes at"
- attack_verb_simple = "slash at"
- attack_sound = 'sound/weapons/circsawhit.ogg'
- loot = list(/obj/effect/mob_spawn/human/corpse/cat_butcher, /obj/item/circular_saw, /obj/item/gun/syringe)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
- faction = list("hostile")
- check_friendly_fire = TRUE
- var/impatience = 0
-
-/mob/living/simple_animal/hostile/human/cat_butcherer/CanAttack(atom/the_target)
- if(iscarbon(target))
- var/mob/living/carbon/human/C = target
- if(C.getorgan(/obj/item/organ/ears/cat) && C.getorgan(/obj/item/organ/tail/cat) && C.has_trauma_type(/datum/brain_trauma/severe/pacifism))//he wont attack his creations
- if(C.stat >= UNCONSCIOUS && (!HAS_TRAIT(C, TRAIT_NOMETABOLISM) || !istype(C.dna.species, /datum/species/ipc)))//unless they need healing
- return ..()
- else
- return FALSE
- return ..()
-
-/mob/living/simple_animal/hostile/human/cat_butcherer/AttackingTarget()
- if(iscarbon(target))
- var/mob/living/carbon/human/L = target
- if(!L.getorgan(/obj/item/organ/ears/cat) && L.stat >= UNCONSCIOUS) //target doesnt have cat ears
- if(L.getorgan(/obj/item/organ/ears)) //slice off the old ears
- var/obj/item/organ/ears/ears = L.getorgan(/obj/item/organ/ears)
- visible_message("[src] slices off [L]'s ears!", "You slice [L]'s ears off.")
- ears.Remove(L)
- ears.forceMove(get_turf(L))
- else //implant new ears
- visible_message("[src] attaches a pair of cat ears to [L]!", "You attach a pair of cat ears to [L].")
- var/obj/item/organ/ears/cat/newears = new
- newears.Insert(L, drop_if_replaced = FALSE)
- return
- else if(!L.getorgan(/obj/item/organ/tail/cat) && L.stat >= UNCONSCIOUS)
- if(L.getorgan(/obj/item/organ/tail)) //cut off the tail if they have one already
- var/obj/item/organ/tail/tail = L.getorgan(/obj/item/organ/tail)
- visible_message("[src] severs [L]'s tail in one swift swipe!", "You sever [L]'s tail in one swift swipe.")
- tail.Remove(L)
- tail.forceMove(get_turf(L))
- else //put a cat tail on
- visible_message("[src] attaches a cat tail to [L]!", "You attach a tail to [L].")
- var/obj/item/organ/tail/cat/newtail = new
- newtail.Insert(L, drop_if_replaced = FALSE)
- return
- else if(!L.has_trauma_type(/datum/brain_trauma/severe/pacifism) && L.stat >= UNCONSCIOUS) //still does damage
- visible_message("[src] drills a hole in [L]'s skull!", "You pacify [L]. Another successful creation.")
- L.gain_trauma(/datum/brain_trauma/severe/pacifism, TRAUMA_RESILIENCE_SURGERY)
- say("I'm a genius!!")
- L.health += 20 //he heals a bit whenever he finishes
- else if(L.stat >= UNCONSCIOUS) //quickly heal them up and move on to our next target!
- visible_message("[src] injects [L] with an unknown medicine!", "You inject [L] with medicine.")
- L.SetSleeping(0, FALSE)
- L.SetUnconscious(0, FALSE)
- L.adjustOxyLoss(-50)// do CPR first
- if(L.blood_volume <= 500) //bandage them up and give em some blood if they're bleeding
- L.blood_volume += 30
- L.heal_bleeding(10)
- if(L.getBruteLoss() >= 50)// first, did we beat them into crit? if so, heal that
- var/healing = min(L.getBruteLoss(), 120)
- L.adjustBruteLoss(-healing)
- L.heal_bleeding(10)
- return
- else if(L.getFireLoss() >= 50) // are they still down from other damage? fix it, but not as fast as the burns
- var/healing = min(L.getFireLoss(), 50)
- L.adjustFireLoss(-healing)
- impatience += 50
- if(prob(impatience))
- FindTarget()//so we don't focus on some unconscious dude when we could get our eyes on the prize
- impatience = 0
- say("Bah!!")
- return
- return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
index d8b4af5344ead..3257e6440b9eb 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/human/frontier
- name = "Frontiersman"
- desc = "A frontiersman! A terrorist that would probably kill everyone without mercy."
+ name = "Frontiersman Shank"
+ desc = "A member of the brutal Frontiersman terrorist fleet! This one clutches a wicked-looking knife in nimble fingers, eager to relieve you of your innards."
icon_state = "frontiersmanmelee"
icon = 'icons/mob/simple_frontiersman.dmi'
icon_living = "frontiersmanmelee"
@@ -10,7 +10,6 @@
melee_damage_upper = 15
loot = list(/obj/effect/mob_spawn/human/corpse/frontier,
/obj/item/melee/knife/survival)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
faction = list(FACTION_ANTAG_FRONTIERSMEN)
footstep_type = FOOTSTEP_MOB_SHOE
@@ -18,13 +17,15 @@
icon_state = "frontiersmanmelee_mask"
icon_living = "frontiersmanmelee_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier,
- /obj/item/clothing/mask/gas/sechailer,
+ /obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen/engi)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
/mob/living/simple_animal/hostile/human/frontier/ranged
+ name = "Frontiersman Quickdraw"
+ desc = "A member of the brutal Frontiersman terrorist fleet! This one thumbs a slender revolver, stained chrome and a malicious smile glinting in the light."
icon_state = "frontiersmanranged"
icon_living = "frontiersmanranged"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
@@ -40,20 +41,59 @@
icon_living = "frontiersmanranged_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
/obj/item/gun/ballistic/revolver/shadow,
- /obj/item/clothing/mask/gas/sechailer,
+ /obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen/engi)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
/mob/living/simple_animal/hostile/human/frontier/ranged/internals/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
- /obj/item/clothing/mask/gas/sechailer,
+ /obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen/engi)
/mob/living/simple_animal/hostile/human/frontier/ranged/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)
+/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon
+ name = "Frontiersman Sawbones"
+ desc = "A member of the brutal Frontiersman terrorist fleet! They appear to be a \"doctor\" of some sort, nervously swinging about some kind of makeshift syringe launcher."
+ icon_state = "frontiersmansurgeon"
+ icon_living = "frontiersmansurgeon"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon,
+ /obj/item/melee/knife/survival,
+ /obj/item/gun/syringe)
+
+ minimum_distance = 1
+ retreat_distance = null
+ projectiletype = /obj/projectile/bullet/dart/tranq
+ projectilesound = 'sound/items/syringeproj.ogg'
+ casingtype = null
+ ranged_message = "fires the syringe gun at"
+ ranged_cooldown_time = 30
+ armor_base = /obj/item/clothing/suit/frontiersmen
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon/neuter
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon)
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon/internals
+ icon_state = "frontiersmansurgeon_mask"
+ icon_living = "frontiersmansurgeon_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon,
+ /obj/item/melee/knife/survival,
+ /obj/item/gun/syringe,
+ /obj/item/clothing/mask/breath,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/surgeon/internals/neuter
+ icon_state = "frontiersmansurgeon_mask"
+ icon_living = "frontiersmansurgeon_mask"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/surgeon,
+ /obj/item/clothing/mask/breath,
+ /obj/item/tank/internals/emergency_oxygen/engi)
+
/mob/living/simple_animal/hostile/human/frontier/ranged/mosin
+ name = "Frontiersman Sharpshot"
+ desc = "A member of the brutal Frontiersman terrorist fleet! This one confidently mills about with a long rifle slung over their shoulder."
icon_state = "frontiersmanrangedrifle"
icon_living = "frontiersmanrangedrifle"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
@@ -66,28 +106,29 @@
icon_living = "frontiersmanrangedrifle_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
/obj/item/gun/ballistic/rifle/illestren,
- /obj/item/clothing/mask/gas/sechailer,
+ /obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen/engi)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/internals/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
- /obj/item/clothing/mask/gas/sechailer,
+ /obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen/engi)
/mob/living/simple_animal/hostile/human/frontier/ranged/mosin/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper
+ name = "Frontiersman Doorkicker"
+ desc = "A member of the brutal Frontiersman terrorist fleet! Bedecked in military-grade armor, they swagger their shotgun about with a boldness uncommon even among other Frontiersmen."
icon_state = "frontiersmanrangedelite"
icon_living = "frontiersmanrangedelite"
- maxHealth = 170
- health = 170
projectilesound = 'sound/weapons/gun/shotgun/shot.ogg'
casingtype = /obj/item/ammo_casing/shotgun/buckshot
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/shotgun/brimstone)
+ armor_base = /obj/item/clothing/suit/armor/vest/frontier
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals
icon_state = "frontiersmanrangedelite_mask"
@@ -96,7 +137,7 @@
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals/neutered
@@ -107,7 +148,39 @@
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/flame
+ name = "Frontiersman Scorcher"
+ desc = "An ashen revenant wades through a sea of flames, mummified under twenty pounds of blackened asbestos fabric. Mirrored lenses glare inscrutably as they swing their instrument of destruction towards you. You should probably run."
+ icon_state = "frontiersmanflametrooper"
+ icon_living = "frontiersmanflametrooper"
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/flame,
+ /obj/item/flamethrower)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ maxbodytemp = 1000
+
+ minimum_distance = 1
+ retreat_distance = null
+ shoot_point_blank = TRUE
+ projectiletype = null
+ projectilesound = 'sound/weapons/gun/flamethrower/flamethrower1.ogg'
+ casingtype = null
+ armor_base = /obj/item/clothing/suit/armor/frontier/fireproof
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/flame/OpenFire()
+ var/turf/T = get_ranged_target_turf_direct(src, target, 4)
+ var/list/burn_turfs = getline(src, T) - get_turf(src)
+ visible_message("[src] [ranged_message] at [target.name]!")
+ playsound(src, projectilesound, 100, TRUE)
+ fire_line(src, burn_turfs, "flamethrower", TRUE, 10)
+ ranged_cooldown = world.time + ranged_cooldown_time
+
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/flame/neuter
+ loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/flame)
+
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm
+ name = "Frontiersman Gunner"
+ desc = "A member of the brutal Frontiersman terrorist fleet! This one could almost be mistaken for a real soldier by their assault rifle and armor, if it weren't for their swaggering demeanor."
icon_state = "frontiersmanrangedak47"
icon_living = "frontiersmanrangedak47"
projectilesound = 'sound/weapons/gun/rifle/skm.ogg'
@@ -116,18 +189,19 @@
casingtype = /obj/item/ammo_casing/a762_40
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/automatic/assault/skm)
+ armor_base = /obj/item/clothing/suit/armor/vest/frontier
-/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm/internals
icon_state = "frontiersmanrangedak47_mask"
icon_living = "frontiersmanrangedak47_mask"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/automatic/assault/skm,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
-/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals/neutered
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm/internals/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
@@ -136,6 +210,8 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle
+ name = "Frontiersman Crackshot"
+ desc = "A member of the brutal Frontiersman terrorist fleet! Compared to their allies, they stand a little straighter, laugh a little colder. Their long rifle has a regular series of scratches on the receiver."
icon_state = "frontiersmanrangedmosin"
icon_living = "frontiersmanrangedmosin"
@@ -143,6 +219,7 @@
/obj/item/gun/ballistic/rifle/illestren)
casingtype = /obj/item/ammo_casing/a8_50r
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'
+ armor_base = /obj/item/clothing/suit/armor/vest/frontier
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals
icon_state = "frontiersmanrangedmosin_mask"
@@ -151,7 +228,7 @@
/obj/item/gun/ballistic/rifle/illestren,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals/neutered
@@ -163,16 +240,17 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy
+ name = "Frontiersman Sweeper"
+ desc = "Unseen behind the mirror-visor of this heavily plated hardsuit, flinty eyes dream of cruelty. A mass of chrome and photonics swings your way, the soft whine of its motor a harbinger of iridescent death."
icon_state = "frontiersmanrangedminigun"
icon_living = "frontiersmanrangedminigun"
projectilesound = 'sound/weapons/laser4.ogg'
- maxHealth = 260
- health = 260
rapid = 6
rapid_fire_delay = 1.5
casingtype = null
projectiletype = /obj/projectile/beam/weak/penetrator
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy)
+ armor_base = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals
icon_state = "frontiersmanrangedminigun_mask"
@@ -180,11 +258,11 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
-/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals/neutered
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
@@ -193,16 +271,16 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless)
/mob/living/simple_animal/hostile/human/frontier/ranged/officer
- name = "Frontiersman Officer"
+ name = "Frontiersman Boss"
+ desc = "This Frontiersman moves with what could almost pass for discipline among the infamously ragtag terrorists. They leer at their underlings, one hand resting consciously over the machine pistol at their hip."
icon_state = "frontiersmanofficer"
icon_living = "frontiersmanofficer"
- maxHealth = 65
- health = 65
rapid = 4
projectilesound = 'sound/weapons/gun/pistol/mauler.ogg'
casingtype = /obj/item/ammo_casing/c9mm
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer,
/obj/item/gun/ballistic/automatic/pistol/mauler)
+ armor_base = /obj/item/clothing/suit/armor/frontier
/mob/living/simple_animal/hostile/human/frontier/ranged/officer/internals
icon_state = "frontiersmanofficer_mask"
@@ -211,7 +289,7 @@
/obj/item/gun/ballistic/automatic/pistol/mauler,
/obj/item/clothing/mask/gas,
/obj/item/tank/internals/emergency_oxygen/engi)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
/mob/living/simple_animal/hostile/human/frontier/ranged/officer/internals/neutered
diff --git a/code/modules/mob/living/simple_animal/hostile/human/human.dm b/code/modules/mob/living/simple_animal/hostile/human/human.dm
index 633bd40090e8f..1efe7c02b2613 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/human.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/human.dm
@@ -30,7 +30,6 @@
loot = list(/obj/effect/mob_spawn/human/corpse/damaged)
del_on_death = TRUE
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
minbodytemp = 180
status_flags = CANPUSH
@@ -39,3 +38,26 @@
footstep_type = FOOTSTEP_MOB_SHOE
faction = list("hermit")
+
+ ///Steals the armor datum from this type of armor
+ var/obj/item/clothing/armor_base
+
+/mob/living/simple_animal/hostile/human/Initialize()
+ . = ..()
+ if(ispath(armor_base, /obj/item/clothing))
+ //sigh. if only we could get the initial() value of list vars
+ var/obj/item/clothing/instance = new armor_base()
+ armor = instance.armor
+ qdel(instance)
+
+/mob/living/simple_animal/hostile/human/vv_edit_var(var_name, var_value)
+ switch(var_name)
+ if (NAMEOF(src, armor_base))
+ if(ispath(var_value, /obj/item/clothing))
+ var/obj/item/clothing/temp = new var_value
+ armor = temp.armor
+ qdel(temp)
+ datum_flags |= DF_VAR_EDITED
+ return TRUE
+ return FALSE
+ . = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm
index 6c1676d202abb..5898a9c75ea7a 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/nanotrasen.dm
@@ -7,10 +7,10 @@
stat_attack = HARD_CRIT
melee_damage_upper = 15
loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
faction = list(ROLE_DEATHSQUAD)
check_friendly_fire = TRUE
dodging = TRUE
+ armor_base = /obj/item/clothing/suit/armor/vest
/mob/living/simple_animal/hostile/human/nanotrasen/screaming
icon_state = "nanotrasen"
@@ -62,8 +62,6 @@
icon = 'icons/mob/simple_human.dmi'
icon_state = "nanotrasen_ert"
icon_living = "nanotrasen_ert"
- maxHealth = 150
- health = 150
melee_damage_lower = 13
melee_damage_upper = 18
ranged = TRUE
@@ -72,9 +70,10 @@
rapid_melee = 3
retreat_distance = 0
minimum_distance = 1
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
projectiletype = /obj/projectile/beam/laser
projectilesound = 'sound/weapons/laser.ogg'
loot = list(/obj/effect/gibspawner/human)
faction = list(ROLE_DEATHSQUAD)
+ armor_base = /obj/item/clothing/suit/space/hardsuit/ert/sec
diff --git a/code/modules/mob/living/simple_animal/hostile/human/pirate.dm b/code/modules/mob/living/simple_animal/hostile/human/pirate.dm
index df10cfa6a2b47..fd33a21fe0380 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/pirate.dm
@@ -5,10 +5,9 @@
icon_living = "piratemelee"
icon_dead = "pirate_dead"
speak_chance = 0
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
speak_emote = list("yarrs")
loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
- /obj/item/melee/transforming/energy/sword/saber/pirate)
+ /obj/item/melee/energy/sword/saber/pirate)
faction = list("pirate")
/mob/living/simple_animal/hostile/human/pirate/melee
@@ -31,9 +30,10 @@
icon_state = "piratespace"
icon_living = "piratespace"
icon_dead = "piratespace_dead"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
speed = 1
+ armor_base = /obj/item/clothing/suit/space
/mob/living/simple_animal/hostile/human/pirate/melee/space/Initialize()
. = ..()
@@ -71,9 +71,10 @@
icon_state = "piratespaceranged"
icon_living = "piratespaceranged"
icon_dead = "piratespaceranged_dead"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
speed = 1
+ armor_base = /obj/item/clothing/suit/space
/mob/living/simple_animal/hostile/human/pirate/ranged/space/Initialize()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
index 12a3c2b2604c4..4eac3878efa14 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/skeleton.dm
@@ -19,7 +19,7 @@
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/hallucinations/growl1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
unsuitable_atmos_damage = 10
stat_attack = HARD_CRIT
faction = list("skeleton")
diff --git a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
index ed356764271f0..cb90ebc348a60 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm
@@ -7,17 +7,17 @@
loot = list(
/obj/effect/mob_spawn/human/corpse/damaged/whitesands
)
+ armor_base = /obj/item/clothing/suit/hooded/survivor
+
+ speak_emote = list("breathes heavily.", "growls.", "sharply inhales.")
+ emote_hear = list("murmers.","grumbles.","whimpers.")
/mob/living/simple_animal/hostile/human/hermit/survivor/death(gibbed)
move_force = MOVE_FORCE_DEFAULT
move_resist = MOVE_RESIST_DEFAULT
pull_force = PULL_FORCE_DEFAULT
..()
- /*
- if(prob(15))
- new /obj/item/mob_trophy/shiny(loc)
- visible_message("You notice a glimmering nugget of shiny metal.")
- */
+
/mob/living/simple_animal/hostile/human/hermit/survivor
name = "Hermit Wanderer"
@@ -60,13 +60,28 @@
icon_living = "survivor_gunslinger"
projectilesound = 'sound/weapons/gun/smg/shot.ogg'
speed = 10
- rapid = 4
+ rapid = 3
rapid_fire_delay = 3
- casingtype = /obj/item/ammo_casing/a545_39/recycled
+ casingtype = /obj/item/ammo_casing/c46x30mm/recycled
loot = list(
/obj/effect/mob_spawn/human/corpse/damaged/whitesands/gunslinger,
)
+/mob/living/simple_animal/hostile/human/hermit/ranged/e11 // Intended for the e11_manufactory ruin.
+ name = "Hermit Trooper"
+ desc = "Quality weapons are hard to get by in the sandworlds, which forces many survivors to improvise with that they have. This one is hoping that an E-11 of all things will save his life."
+ icon_state = "survivor_e11"
+ icon_living = "survivor_e11"
+ projectilesound = 'sound/weapons/gun/laser/e-fire.ogg'
+ speed = 10
+ faction = list("eoehoma")
+ rapid_fire_delay = 1
+ casingtype = null
+ projectiletype = /obj/projectile/beam/laser/eoehoma/hermit
+ loot = list(
+ /obj/effect/mob_spawn/human/corpse/damaged/whitesands/e11,
+ )
+
//survivor corpses
/obj/effect/mob_spawn/human/corpse/damaged/whitesands
@@ -79,7 +94,7 @@
var/survivor_type //room for alternatives inside the fuckoff grade init.
/obj/effect/mob_spawn/human/corpse/damaged/whitesands/Initialize() //everything here should equal out to 100 for the sake of my sanity.
- mob_species = pickweight(list(
+ mob_species = pick_weight(list(
/datum/species/human = 50,
/datum/species/lizard = 20,
/datum/species/ipc = 10,
@@ -91,7 +106,7 @@
//to-do: learn how to make mobsprites for other survivors
//gloves are a tossup
- gloves = pickweight(list(
+ gloves = pick_weight(list(
/obj/item/clothing/gloves/color/black = 60,
/obj/item/clothing/gloves/explorer = 30,
/obj/item/clothing/gloves/explorer/old = 10
@@ -99,7 +114,7 @@
)
//bags are semi-random.
- back = pickweight(list(
+ back = pick_weight(list(
/obj/item/storage/backpack = 20,
/obj/item/storage/backpack/explorer = 20,
/obj/item/storage/backpack/satchel = 20,
@@ -111,7 +126,7 @@
//as are bag contents
backpack_contents = list()
if(prob(70))
- backpack_contents += pickweight(list( //these could stand to be expanded, right now they're just mildly modified miner ones, and I don't know how to plus that up.
+ backpack_contents += pick_weight(list( //these could stand to be expanded, right now they're just mildly modified miner ones, and I don't know how to plus that up.
/obj/item/soap = 10,
/obj/item/stack/marker_beacon/ten = 15,
/obj/item/mining_scanner = 5,
@@ -127,7 +142,7 @@
)
)
if(prob(70))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/stack/sheet/animalhide/goliath_hide = 20,
/obj/item/stack/marker_beacon/ten = 10,
/obj/item/mining_scanner = 20,
@@ -139,7 +154,7 @@
)
)
if(prob(70))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/stack/sheet/animalhide/goliath_hide = 5,
/obj/item/stack/marker_beacon/ten = 5,
/obj/item/mining_scanner = 5,
@@ -149,11 +164,11 @@
/obj/item/stack/sheet/sinew = 5,
/obj/item/stack/sheet/bone = 5,
/obj/item/melee/knife/combat = 3,
- /obj/item/reagent_containers/food/snacks/rationpack = 30
+ /obj/item/storage/ration/shredded_beef = 30
)
)
if (prob(15)) //mayhaps a medkit
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/storage/firstaid/regular = 50,
/obj/item/storage/firstaid/brute = 15,
/obj/item/storage/firstaid/medical = 15,
@@ -166,7 +181,7 @@
backpack_contents += /obj/item/reagent_containers/hypospray/medipen/survival
//masks
- mask = pickweight(list(
+ mask = pick_weight(list(
/obj/item/clothing/mask/gas = 40,
/obj/item/clothing/mask/gas/explorer = 20,
/obj/item/clothing/mask/gas/explorer/old = 20,
@@ -176,7 +191,7 @@
//the eyes are the window into the soul.
if(prob(70))
- glasses = pickweight(list(
+ glasses = pick_weight(list(
/obj/item/clothing/glasses/heat = 20,
/obj/item/clothing/glasses/cold = 20,
/obj/item/clothing/glasses/meson = 40,
@@ -188,7 +203,7 @@
if(prob(1)) //oh my god they can't hear the sandstorm coming they've got airpods in
ears = /obj/item/instrument/piano_synth/headphones/spacepods
else
- ears = pickweight(list(
+ ears = pick_weight(list(
/obj/item/radio/headset = 50,
/obj/item/radio/headset/alt = 50
)
@@ -197,17 +212,16 @@
switch(survivor_type)
if("survivor")
//uniforms are random to show varied backgrounds, but similar goal
- uniform = pickweight(list(
+ uniform = pick_weight(list(
/obj/item/clothing/under/color/random = 65,
/obj/item/clothing/under/rank/cargo/miner/lavaland = 10,
/obj/item/clothing/under/rank/prisoner = 10,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 5,
- /obj/item/clothing/under/color/khaki/buster = 5,
/obj/item/clothing/under/rank/cargo/miner = 5
)
)
//storage is semi-randomized, giving some variety
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/storage/belt/fannypack = 40,
/obj/item/storage/belt/mining = 20,
/obj/item/storage/belt/mining/alt = 15,
@@ -223,7 +237,7 @@
r_pocket = /obj/item/spacecash/bundle/smallrand
if("hunter")
- uniform = pickweight(list(
+ uniform = pick_weight(list(
/obj/item/clothing/under/color/random = 50,
/obj/item/clothing/under/rank/cargo/miner/lavaland = 25,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 15,
@@ -231,7 +245,7 @@
/obj/item/clothing/under/utility = 5
)
)
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/storage/belt/mining = 30,
/obj/item/storage/belt/fannypack = 20,
/obj/item/storage/belt/mining/alt = 15,
@@ -248,10 +262,10 @@
if(prob(20))
new /obj/item/gun/ballistic/rifle/polymer(loc)
else
- visible_message(span_warning("The hunter's weapon shatters as they impact the ground!"))
+ visible_message(span_warning("The hermit's weapon shatters as they impact the ground!"))
if("gunslinger")
- uniform = pickweight(list(
+ uniform = pick_weight(list(
/obj/item/clothing/under/rank/cargo/miner/lavaland = 35,
/obj/item/clothing/under/color/random = 25,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 15,
@@ -260,7 +274,7 @@
/obj/item/clothing/under/syndicate/combat = 5
)
)
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/storage/belt/mining = 30,
/obj/item/storage/belt/bandolier = 30,
/obj/item/storage/belt/military = 20,
@@ -272,12 +286,31 @@
if(prob(30))
shoes = /obj/item/clothing/shoes/combat //sometimes there are nicer shoes
if(prob(50))
- l_pocket = /obj/item/ammo_box/magazine/skm_545_39
+ l_pocket = /obj/item/ammo_box/magazine/skm_46_30/recycled
if(prob(20))
new /obj/item/gun/ballistic/automatic/smg/skm_carbine(loc)
else
- visible_message(span_warning("The gunslinger's weapon shatters as they impact the ground!"))
+ visible_message(span_warning("The hermit's weapon shatters as they impact the ground!"))
+ if("e11")
+ uniform = pick_weight(list(
+ /obj/item/clothing/under/rank/cargo/miner = 65,
+ /obj/item/clothing/under/color/random = 25,
+ /obj/item/clothing/under/rank/cargo/miner/lavaland/old = 10,
+ )
+ )
+ belt = pick_weight(list(
+ /obj/item/storage/belt/utility = 25,
+ /obj/item/storage/belt/mining = 15,
+ /obj/item/storage/belt/fannypack = 15,
+ /obj/item/storage/belt/mining/alt = 5,
+ )
+ )
+ shoes = /obj/item/clothing/shoes/workboots
+ if(prob(50)) // Hilarious, ain't it?
+ new /obj/item/gun/energy/e_gun/e11 (loc)
+ else
+ visible_message(span_warning("The trooper's weapon shatters as they impact the ground!"))
. = ..()
@@ -290,6 +323,9 @@
/obj/effect/mob_spawn/human/corpse/damaged/whitesands/gunslinger
survivor_type = "gunslinger"
+/obj/effect/mob_spawn/human/corpse/damaged/whitesands/e11
+ survivor_type = "e11"
+
//hold overs for any admin who may want to spawn their own survivor realmobs
/datum/outfit/whitesands
diff --git a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm
index a88a79610b60b..7e0f4a8b9c2c3 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm
@@ -6,13 +6,13 @@
/mob/living/simple_animal/hostile/human/syndicate
- name = "Ramzi Clique Operative"
- desc = "An ex-Syndicate pirate of the Ramzi Clique."
+ name = "Ramzi Clique Initiate"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Unfortunately for them, this one is unarmed."
icon_state = "syndicate"
icon_living = "syndicate"
speak_chance = 0
stat_attack = HARD_CRIT
- loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/clothing/neck/dogtag/ramzi)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
maxbodytemp = 400
unsuitable_atmos_damage = 15
@@ -20,19 +20,21 @@
check_friendly_fire = TRUE
dodging = TRUE
rapid_melee = 2
+ armor_base = /obj/item/clothing/suit/armor/vest
///////////////Melee////////////
/mob/living/simple_animal/hostile/human/syndicate/space
+ name = "Ramzi Clique Initiate"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Despite their armored hardsuit, this one is unarmed."
icon_state = "syndicate_space"
icon_living = "syndicate_space"
- name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
speed = 1
+ loot = list(/obj/item/clothing/neck/dogtag/ramzi)
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/space/Initialize()
. = ..()
@@ -40,18 +42,20 @@
set_light(4)
/mob/living/simple_animal/hostile/human/syndicate/space/stormtrooper
+ name = "Ramzi Clique Battlemaster"
+ desc = "A silhouette of obsidian glass stalks into view, empty hands clutching into armored fists. They are unarmed, and this is nearly a fair fight."
icon_state = "syndicate_stormtrooper"
icon_living = "syndicate_stormtrooper"
- name = "Ramzi Clique Assault Trooper"
- maxHealth = 250
- health = 250
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
/mob/living/simple_animal/hostile/human/syndicate/melee //dude with a knife and no shields
+ name = "Ramzi Clique Close Combatant"
+ desc = "A deserter from the Gorlex Marauders turned pirate. They hold a clean and razor-sharp knife with obvious training."
melee_damage_lower = 15
melee_damage_upper = 15
icon_state = "syndicate_knife"
icon_living = "syndicate_knife"
- loot = list(/obj/effect/gibspawner/human)
+ loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/neck/dogtag/ramzi)
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/weapons/bladeslice.ogg'
@@ -59,16 +63,15 @@
var/projectile_deflect_chance = 0
/mob/living/simple_animal/hostile/human/syndicate/melee/space
+ name = "Ramzi Clique Infiltrator"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Rusted hardsuit gauntlets hold a shard of polished steel in an veteran's guard."
icon_state = "syndicate_space_knife"
icon_living = "syndicate_space_knife"
- name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1000
speed = 1
- projectile_deflect_chance = 50
+ projectile_deflect_chance = 0
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/melee/space/Initialize()
. = ..()
@@ -76,14 +79,19 @@
set_light(4)
/mob/living/simple_animal/hostile/human/syndicate/melee/space/stormtrooper
+ name = "Ramzi Clique Assassin"
+ desc = "Wicked knifepoint tracks your every impulse. Clean, black armor plate glides across itself, bereft of all sound or resistance."
icon_state = "syndicate_stormtrooper_knife"
icon_living = "syndicate_stormtrooper_knife"
name = "Ramzi Clique Stormtrooper"
maxHealth = 250
health = 250
- projectile_deflect_chance = 50
+ projectile_deflect_chance = 0
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
/mob/living/simple_animal/hostile/human/syndicate/melee/sword
+ name = "Ramzi Clique Duelist"
+ desc = "A deserter from the Gorlex Marauders turned pirate. They hold a glaring energy sword at half-guard."
melee_damage_lower = 30
melee_damage_upper = 30
icon_state = "syndicate_sword"
@@ -95,7 +103,7 @@
light_color = COLOR_SOFT_RED
status_flags = 0
var/obj/effect/light_emitter/red_energy_sword/sord
- projectile_deflect_chance = 50
+ projectile_deflect_chance = 25
/mob/living/simple_animal/hostile/human/syndicate/melee/sword/Initialize()
. = ..()
@@ -112,16 +120,16 @@
return ..()
/mob/living/simple_animal/hostile/human/syndicate/melee/sword/space
+ name = "Ramzi Clique Duelist"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Their decayed hardsuit still obeys as they hold their energy sword in counterpoint to your approach."
icon_state = "syndicate_space_sword"
icon_living = "syndicate_space_sword"
- name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
speed = 1
- projectile_deflect_chance = 50
+ projectile_deflect_chance = 25
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/melee/sword/space/Initialize()
. = ..()
@@ -134,16 +142,18 @@
return ..()
/mob/living/simple_animal/hostile/human/syndicate/melee/sword/space/stormtrooper
+ name = "Ramzi Clique Blademaster"
+ desc = "Carmine bladelight glares furiously off the contours of a sleek, black armored suit. Their body betrays precious little as they glide in perfect conservation of motion from one stance to the next."
icon_state = "syndicate_stormtrooper_sword"
icon_living = "syndicate_stormtrooper_sword"
- name = "Ramzi Clique Stormtrooper"
- maxHealth = 250
- health = 250
projectile_deflect_chance = 50
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
///////////////Guns////////////
/mob/living/simple_animal/hostile/human/syndicate/ranged
+ name = "Ramzi Clique Operative"
+ desc = "A deserter from the Gorlex Marauders turned pirate. They warily glance around, a compact sidearm held at the ready."
ranged = 1
retreat_distance = 5
minimum_distance = 5
@@ -151,24 +161,24 @@
icon_living = "syndicate_pistol"
casingtype = /obj/item/ammo_casing/c10mm
projectilesound = 'sound/weapons/gun/pistol/shot.ogg'
- loot = list(/obj/effect/gibspawner/human)
+ loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/neck/dogtag/ramzi)
dodging = FALSE
rapid_melee = 1
/mob/living/simple_animal/hostile/human/syndicate/ranged/infiltrator //shuttle loan event
projectilesound = 'sound/weapons/gun/smg/shot_suppressed.ogg'
- loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, /obj/item/clothing/neck/dogtag/ramzi)
/mob/living/simple_animal/hostile/human/syndicate/ranged/space
+ name = "Ramzi Clique Operative"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Rusty gauntlets clutch a pocket pistol, the added bulk of their wrappings giving it a rather undersized appearance."
icon_state = "syndicate_space_pistol"
icon_living = "syndicate_space_pistol"
- name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
speed = 1
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/ranged/space/Initialize()
. = ..()
@@ -176,13 +186,15 @@
set_light(4)
/mob/living/simple_animal/hostile/human/syndicate/ranged/space/stormtrooper
+ name = "Ramzi Clique Pistolmaster" //I can't think of something better, sue me
+ desc = "Obsidian armor cradles a small handgun with sculptural grace. Its snub muzzle follows you before you even think to move."
icon_state = "syndicate_stormtrooper_pistol"
icon_living = "syndicate_stormtrooper_pistol"
- name = "Ramzi Clique Stormtrooper"
- maxHealth = 250
- health = 250
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg
+ name = "Ramzi Clique Commando"
+ desc = "A deserter from the Gorlex Marauders turned pirate. They scan the room with their submachinegun held at eye level, sweeping every corner."
rapid = 2
icon_state = "syndicate_smg"
icon_living = "syndicate_smg"
@@ -190,15 +202,15 @@
projectilesound = 'sound/weapons/gun/smg/shot.ogg'
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space
+ name = "Ramzi Clique Commando"
+ desc = "A deserter from the Gorlex Marauders turned pirate. Green hardsuit optics glint as they sweep their submachinegun across the room, scanning for threats."
icon_state = "syndicate_space_smg"
icon_living = "syndicate_space_smg"
- name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
speed = 1
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space/Initialize()
. = ..()
@@ -206,13 +218,15 @@
set_light(4)
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space/stormtrooper
+ name = "Ramzi Clique Shock Trooper"
+ desc = "Night-black armor traces the silhouette of a soldier equaled by precious few. Their Cobra SMG tracks you perfectly, a staccato bark of .45 already in its throat."
icon_state = "syndicate_stormtrooper_smg"
icon_living = "syndicate_stormtrooper_smg"
- name = "Ramzi Clique Stormtrooper"
- maxHealth = 250
- health = 250
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun
+ name = "Ramzi Clique Breacher"
+ desc = "A deserter from the Gorlex Marauders turned pirate. They move low and quickly, heavy combat shotgun at the ready."
rapid = 2
rapid_fire_delay = 6
minimum_distance = 3
@@ -221,15 +235,16 @@
casingtype = /obj/item/ammo_casing/shotgun/buckshot //buckshot fired in a two-round burst. This will two-tap unarmored players.
/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space
+ name = "Ramzi Clique Breacher"
+ desc = "A deserter from the Gorlex Marauders turned pirate. The unmistakeable bulk of a Bulldog shotgun graces the wrapped, patched hands of their aging hardsuit."
icon_state = "syndicate_space_shotgun"
icon_living = "syndicate_space_shotgun"
name = "Ramzi Clique Commando"
- maxHealth = 170
- health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
speed = 1
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space/Initialize()
. = ..()
@@ -237,15 +252,17 @@
set_light(4)
/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space/stormtrooper
+ name = "Ramzi Clique Executioner"
+ desc = "Ink and black glass poured into the shape of an armored commando, dripping menace with every step. Their combat shotgun follows you with lethal intent, promising a blizzard of buckshot in less than a blink."
icon_state = "syndicate_stormtrooper_shotgun"
icon_living = "syndicate_stormtrooper_shotgun"
- name = "Ramzi Clique Stormtrooper"
- maxHealth = 250
- health = 250
+ armor_base = /obj/item/clothing/suit/space/hardsuit/syndi
///////////////Misc////////////
/mob/living/simple_animal/hostile/human/syndicate/civilian
+ name = "Ramzi Clique Technician"
+ desc = "A deserter from the Gorlex Marauders turned pirate. This one is not only unarmed, but a coward as well."
minimum_distance = 10
retreat_distance = 10
obj_damage = 0
@@ -275,7 +292,7 @@
attack_verb_simple = "cut"
attack_sound = 'sound/weapons/bladeslice.ogg'
faction = list(ROLE_SYNDICATE)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1000
mob_size = MOB_SIZE_TINY
@@ -283,7 +300,6 @@
limb_destroyer = 1
speak_emote = list("states")
bubble_icon = "syndibot"
- gold_core_spawnable = HOSTILE_SPAWN
del_on_death = 1
deathmessage = "is smashed into pieces!"
diff --git a/code/modules/mob/living/simple_animal/hostile/human/zombie.dm b/code/modules/mob/living/simple_animal/hostile/human/zombie.dm
index 7a12465b98bb9..c70b459fb7b29 100644
--- a/code/modules/mob/living/simple_animal/hostile/human/zombie.dm
+++ b/code/modules/mob/living/simple_animal/hostile/human/zombie.dm
@@ -7,8 +7,6 @@
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
speak_chance = 0
stat_attack = HARD_CRIT //braains
- maxHealth = 100
- health = 100
harm_intent_damage = 5
melee_damage_lower = 21
melee_damage_upper = 21
@@ -16,7 +14,7 @@
attack_verb_simple = "bite"
attack_sound = 'sound/hallucinations/growl1.ogg'
a_intent = INTENT_HARM
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
status_flags = CANPUSH
loot = list()
@@ -41,6 +39,7 @@
//They have claws now.
O.r_hand = null
O.l_hand = null
+ armor_base = O.suit
var/icon/P = get_flat_human_icon("zombie_[zombiejob]", J , dummy_prefs, "zombie", outfit_override = O)
icon = P
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm b/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
index 32dc8d4bc8876..4a0970751d9b3 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/jungle
vision_range = 5
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
faction = list("jungle")
weather_immunities = list("acid")
obj_damage = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index 8b1de1c2b8a46..1b1dd1d72901a 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -28,4 +28,3 @@
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 150
maxbodytemp = 500
- gold_core_spawnable = HOSTILE_SPAWN
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 63519d29c7cd2..fc8cbbce6d8c8 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -42,7 +42,7 @@ Difficulty: Medium
pixel_x = -16
base_pixel_x = -16
//mob_trophy = /obj/item/mob_trophy/miner_eye
- loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator)
+ loot = list(/obj/item/melee/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator)
wander = FALSE
del_on_death = TRUE
blood_volume = BLOOD_VOLUME_NORMAL
@@ -50,7 +50,7 @@ Difficulty: Medium
achievement_type = /datum/award/achievement/boss/blood_miner_kill
crusher_achievement_type = /datum/award/achievement/boss/blood_miner_crusher
score_achievement_type = /datum/award/score/blood_miner_score
- var/obj/item/melee/transforming/cleaving_saw/miner/miner_saw
+ var/obj/item/melee/cleaving_saw/miner/miner_saw
var/time_until_next_transform = 0
var/dashing = FALSE
var/dash_cooldown = 15
@@ -107,11 +107,11 @@ Difficulty: Medium
shoot_ka()
transform_weapon()
-/obj/item/melee/transforming/cleaving_saw/miner //nerfed saw because it is very murdery
+/obj/item/melee/cleaving_saw/miner //nerfed saw because it is very murdery
force = 6
- force_on = 10
+ active_force = 10
-/obj/item/melee/transforming/cleaving_saw/miner/attack(mob/living/target, mob/living/carbon/human/user)
+/obj/item/melee/cleaving_saw/miner/attack(mob/living/target, mob/living/carbon/human/user)
target.add_stun_absorption("miner", 10, INFINITY)
..()
target.stun_absorption -= "miner"
@@ -248,14 +248,12 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/transform_weapon()
if(time_until_next_transform <= world.time)
miner_saw.transform_cooldown = 0
- miner_saw.transform_weapon(src, TRUE)
- if(!miner_saw.active)
- rapid_melee = 5 // 4 deci cooldown before changes, npcpool subsystem wait is 20, 20/4 = 5
- else
- rapid_melee = 3 // same thing but halved (slightly rounded up)
+ miner_saw.attack_self(src)
+ var/saw_open = HAS_TRAIT(miner_saw, TRAIT_TRANSFORM_ACTIVE)
+ rapid_melee = saw_open ? 3 : 5
transform_stop_attack = TRUE
- icon_state = "miner[miner_saw.active ? "_transformed":""]"
- icon_living = "miner[miner_saw.active ? "_transformed":""]"
+ icon_state = "miner[saw_open ? "_transformed":""]"
+ icon_living = "miner[saw_open ? "_transformed":""]"
time_until_next_transform = world.time + rand(50, 100)
/obj/effect/temp_visual/dir_setting/miner_death
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index ff06df9c6113d..a386758b8e6c9 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -659,7 +659,6 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box)
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
- gold_core_spawnable = HOSTILE_SPAWN
verb_say = "warps"
verb_ask = "floats inquisitively"
verb_exclaim = "zaps"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm
index c06c78068ce98..bf58092651725 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/cult_templar.dm
@@ -448,7 +448,7 @@
stop_automated_movement = 1
status_flags = CANPUSH
attack_sound = 'sound/magic/demon_attack1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
faction = list("cult")
maxHealth = 60
health = 60
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index b7a2f09126531..6a153adc54e0f 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -179,7 +179,7 @@ Difficulty: Medium
var/increment = 360 / spiral_count
for(var/j = 1 to spiral_count)
var/list/turfs = line_target(j * increment + i * increment / 2, range, src)
- INVOKE_ASYNC(src, PROC_REF(fire_line), turfs)
+ INVOKE_ASYNC(src, PROC_REF(dragon_fire_line), turfs)
SLEEP_CHECK_DEATH(25)
SetRecoveryTime(30)
@@ -250,11 +250,11 @@ Difficulty: Medium
var/range = 15
var/list/turfs = list()
turfs = line_target(-40, range, at)
- INVOKE_ASYNC(src, PROC_REF(fire_line), turfs)
+ INVOKE_ASYNC(src, PROC_REF(dragon_fire_line), turfs)
turfs = line_target(0, range, at)
- INVOKE_ASYNC(src, PROC_REF(fire_line), turfs)
+ INVOKE_ASYNC(src, PROC_REF(dragon_fire_line), turfs)
turfs = line_target(40, range, at)
- INVOKE_ASYNC(src, PROC_REF(fire_line), turfs)
+ INVOKE_ASYNC(src, PROC_REF(dragon_fire_line), turfs)
/mob/living/simple_animal/hostile/megafauna/dragon/proc/line_target(offset, range, atom/at = target)
if(!at)
@@ -268,32 +268,9 @@ Difficulty: Medium
T = check
return (getline(src, T) - get_turf(src))
-/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_line(list/turfs)
+/mob/living/simple_animal/hostile/megafauna/dragon/proc/dragon_fire_line(list/turfs)
SLEEP_CHECK_DEATH(0)
- dragon_fire_line(src, turfs)
-
-//fire line keeps going even if dragon is deleted
-/proc/dragon_fire_line(source, list/turfs)
- var/list/hit_list = list()
- for(var/turf/T in turfs)
- if(istype(T, /turf/closed))
- break
- new /obj/effect/hotspot(T)
- T.hotspot_expose(700,50,1)
- for(var/mob/living/L in T.contents)
- if(L in hit_list || L == source)
- continue
- hit_list += L
- L.adjustFireLoss(20)
- to_chat(L, "You're hit by [source]'s fire breath!")
-
- // deals damage to mechs
- for(var/obj/mecha/M in T.contents)
- if(M in hit_list)
- continue
- hit_list += M
- M.take_damage(45, BRUTE, "melee", 1)
- sleep(1.5)
+ fire_line(src, turfs)
/mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(lava_arena = FALSE, atom/movable/manual_target, swoop_cooldown = 30)
if(stat || swooping)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 37934c0367e50..c1cb46cb85e49 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -15,7 +15,7 @@
robust_searching = TRUE
ranged_ignores_vision = TRUE
stat_attack = DEAD
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
damage_coeff = list(BRUTE = 1, BURN = 0.5, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
minbodytemp = 0
maxbodytemp = INFINITY
@@ -86,7 +86,8 @@
..()
/mob/living/simple_animal/hostile/megafauna/proc/spawn_mob_trophy()
- loot += mob_trophy
+ if(mob_trophy)
+ loot += mob_trophy
/mob/living/simple_animal/hostile/megafauna/gib()
if(health > 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 0568533c1e0c4..7b8bb392f1f9a 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -23,7 +23,7 @@
speak_emote = list("creaks")
taunt_chance = 30
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
faction = list("mimic")
@@ -224,7 +224,7 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca
TrueGun = G
if(istype(G, /obj/item/gun/ballistic))
Pewgun = G
- var/obj/item/ammo_box/magazine/M = Pewgun.mag_type
+ var/obj/item/ammo_box/magazine/M = Pewgun.default_ammo_type
casingtype = initial(M.ammo_type)
if(istype(G, /obj/item/gun/energy))
Zapgun = G
@@ -267,102 +267,5 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca
icon_state = TrueGun.icon_state
icon_living = TrueGun.icon_state
-/mob/living/simple_animal/hostile/mimic/xenobio
- health = 210
- maxHealth = 210
- attack_verb_continuous = "bites"
- attack_verb_simple = "bite"
- speak_emote = list("clatters")
- gold_core_spawnable = HOSTILE_SPAWN
- var/opened = FALSE
- var/open_sound = 'sound/machines/crate_open.ogg'
- var/close_sound = 'sound/machines/crate_close.ogg'
- var/max_mob_size = MOB_SIZE_HUMAN
- var/locked = FALSE
- var/datum/action/innate/mimic/lock/lock
-
-/mob/living/simple_animal/hostile/mimic/xenobio/Initialize()
- . = ..()
- lock = new
- lock.Grant(src)
-
-/mob/living/simple_animal/hostile/mimic/xenobio/AttackingTarget()
- if(src == target)
- toggle_open()
- return
- return ..()
-
-/mob/living/simple_animal/hostile/mimic/xenobio/attack_hand(mob/living/carbon/human/M)
- . = ..()
- if(M.a_intent != "help")
- return
- toggle_open()
-
-/mob/living/simple_animal/hostile/mimic/xenobio/death()
- var/obj/structure/closet/crate/C = new(get_turf(src))
- // Put loot in crate
- for(var/atom/movable/AM as anything in src)
- AM.forceMove(C)
- return ..()
-
-/mob/living/simple_animal/hostile/mimic/xenobio/CanAllowThrough(atom/movable/mover, border_dir)
- . = ..()
- if(istype(mover, /obj/structure/closet))
- return FALSE
-
-/mob/living/simple_animal/hostile/mimic/xenobio/proc/toggle_open()
- if(locked)
- return
- if(!opened)
- density = FALSE
- opened = TRUE
- icon_state = "crateopen"
- playsound(src, open_sound, 50, TRUE)
- for(var/atom/movable/AM as anything in src)
- AM.forceMove(loc)
- else
- density = TRUE
- opened = FALSE
- icon_state = "crate"
- playsound(src, close_sound, 50, TRUE)
- for(var/atom/movable/AM in get_turf(src))
- if(insertion_allowed(AM))
- AM.forceMove(src)
-
-/mob/living/simple_animal/hostile/mimic/xenobio/proc/insertion_allowed(atom/movable/AM)
- if(ismob(AM))
- if(!isliving(AM)) //Don't let ghosts and such get trapped in the beast.
- return FALSE
- var/mob/living/L = AM
- if(L.anchored || L.buckled || L.incorporeal_move || L.has_buckled_mobs())
- return FALSE
- if(L.mob_size > MOB_SIZE_TINY) // Tiny mobs are treated as items.
- if(L.density || L.mob_size > max_mob_size)
- return FALSE
- L.stop_pulling()
-
- else if(istype(AM, /obj/structure/closet))
- return FALSE
- else if(isobj(AM))
- if(AM.anchored || AM.has_buckled_mobs())
- return FALSE
- else if(isitem(AM) && !HAS_TRAIT(AM, TRAIT_NODROP))
- return TRUE
- else
- return FALSE
- return TRUE
-
/datum/action/innate/mimic
background_icon_state = "bg_default"
-
-/datum/action/innate/mimic/lock
- name = "Lock/Unlock"
- desc = "Toggle preventing yourself from being opened or closed."
-
-/datum/action/innate/mimic/lock/Activate()
- var/mob/living/simple_animal/hostile/mimic/xenobio/M = owner
- M.locked = !M.locked
- if(!M.locked)
- to_chat(M, "You loosen up, allowing yourself to be opened and closed.")
- else
- to_chat(M, "You stiffen up, preventing anyone from opening or closing you.")
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
index b03363e956f14..c2a09fb80b65e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
@@ -32,7 +32,6 @@
attack_sound = 'sound/weapons/bladeslice.ogg'
aggro_vision_range = 9
turns_per_move = 5
- gold_core_spawnable = HOSTILE_SPAWN
loot = list(/obj/item/stack/ore/diamond{layer = ABOVE_MOB_LAYER},
/obj/item/stack/ore/diamond{layer = ABOVE_MOB_LAYER})
var/lava_drinker = TRUE
@@ -45,10 +44,10 @@
damage_type = BURN
nodamage = TRUE
flag = "energy"
- temperature = -50 // Cools you down! per hit!
+ temperature = -5 // Cools you down! per hit!
/obj/projectile/temp/basilisk/super
- temperature = -100
+ temperature = -20
damage = 5
nodamage = FALSE
@@ -56,7 +55,7 @@
. = ..()
if(isliving(target))
var/mob/living/living_target = target
- living_target.Jitter(5)
+ living_target.adjust_jitter(5)
/obj/projectile/temp/basilisk/heated
name = "energy blast"
@@ -229,7 +228,6 @@
robust_searching = 1
attack_same = TRUE // So we'll fight basilisks
//mob_trophy = /obj/item/mob_trophy/watcher_wing
- gold_core_spawnable = NO_SPAWN
loot = list()
butcher_results = list(/obj/item/stack/ore/diamond = 2, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/bone = 1)
lava_drinker = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm
index 769f6ce3d5fa9..6495b967fb88f 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm
@@ -242,7 +242,7 @@
/datum/reagent/brimdust/on_mob_life(mob/living/carbon/carbon, delta_time, times_fired)
. = ..()
carbon.adjustFireLoss((ispodperson(carbon) ? -1 : 1) * delta_time)
- carbon.adjust_bodytemperature(55 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, carbon.get_body_temp_normal())
+ carbon.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, carbon.get_body_temp_normal())
/datum/reagent/brimdust/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
index e4eb7122d3919..3377165ea3ea2 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
@@ -29,7 +29,6 @@
throw_message = "sinks in slowly, before being pushed out of "
deathmessage = "stops moving as green liquid oozes from the carcass!"
status_flags = CANPUSH
- gold_core_spawnable = HOSTILE_SPAWN
search_objects = 1
wanted_objects = list(
/obj/item/stack/ore/diamond,
@@ -45,10 +44,8 @@
/mob/living/simple_animal/hostile/asteroid/goldgrub/Initialize()
. = ..()
- var/i = rand(1,3)
- while(i)
+ for (var/i in 1 to rand(1, 3))
loot += pick(/obj/item/stack/ore/silver, /obj/item/stack/ore/gold, /obj/item/stack/ore/uranium, /obj/item/stack/ore/diamond)
- i--
spit = new
burrow = new
spit.Grant(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
index ee48ed624ee47..a6457306cda72 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
@@ -28,7 +28,6 @@
friendly_verb_simple = "pinch"
a_intent = INTENT_HELP
ventcrawler = VENTCRAWLER_ALWAYS
- gold_core_spawnable = FRIENDLY_SPAWN
stat_attack = HARD_CRIT
gender = NEUTER
stop_automated_movement = FALSE
@@ -43,12 +42,16 @@
animal_species = /mob/living/simple_animal/hostile/asteroid/gutlunch
childtype = list(/mob/living/simple_animal/hostile/asteroid/gutlunch/grublunch = 100)
+ var/mutable_appearance/gutlunch_full_overlay
+
wanted_objects = list(/obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/blood/gibs/, /obj/item/organ, /obj/item/reagent_containers/food/snacks/meat/slab)
/mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize()
. = ..()
- if(wanted_objects.len)
- AddComponent(/datum/component/udder, /obj/item/udder/gutlunch, CALLBACK(src, PROC_REF(regenerate_icons)), CALLBACK(src, PROC_REF(regenerate_icons)))
+ if(!length(wanted_objects))
+ return
+ AddComponent(/datum/component/udder, /obj/item/udder/gutlunch, CALLBACK(src, TYPE_PROC_REF(/atom/movable, update_overlays)), CALLBACK(src, TYPE_PROC_REF(/atom/movable, update_overlays)))
+ gutlunch_full_overlay = mutable_appearance(icon, "gl_full")
/mob/living/simple_animal/hostile/asteroid/gutlunch/CanAttack(atom/the_target) // Gutlunch-specific version of CanAttack to handle stupid stat_exclusive = true crap so we don't have to do it for literally every single simple_animal/hostile except the two that spawn in lavaland
if(isturf(the_target) || !the_target || the_target.type == /atom/movable/lighting_object) // bail out on invalids
@@ -72,14 +75,12 @@
return FALSE
-/mob/living/simple_animal/hostile/asteroid/gutlunch/regenerate_icons(new_udder_volume, max_udder_volume)
- cut_overlays()
- var/static/gutlunch_full_overlay
- if(isnull(gutlunch_full_overlay))
- gutlunch_full_overlay = iconstate2appearance(icon, "gl_full")
- if(new_udder_volume == max_udder_volume)
- add_overlay(gutlunch_full_overlay)
- ..()
+/mob/living/simple_animal/hostile/asteroid/gutlunch/update_overlays(new_udder_volume, max_udder_volume)
+ . = ..()
+ if(new_udder_volume != max_udder_volume)
+ return
+
+ . += gutlunch_full_overlay
//Male gutlunch. They're smaller and more colorful!
/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck
@@ -100,7 +101,6 @@
/mob/living/simple_animal/hostile/asteroid/gutlunch/grublunch
name = "grublunch"
wanted_objects = list() //They don't eat.
- gold_core_spawnable = NO_SPAWN
var/growth = 0
//Baby gutlunch
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index bd9133ffce20f..601c87498b61e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -51,7 +51,8 @@
return TRUE
/mob/living/simple_animal/hostile/asteroid/hivelord/spawn_mob_trophy()
- loot += mob_trophy //we don't butcher
+ if(mob_trophy)
+ loot += mob_trophy //we don't butcher
/mob/living/simple_animal/hostile/asteroid/hivelord/death(gibbed)
mouse_opacity = MOUSE_OPACITY_ICON
@@ -242,7 +243,8 @@
return //This will qdelete the legion.
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H)
- visible_message(span_warning("[name] burrows into the flesh of [H]!"))
+ visible_message(span_warning("[name] burrows into [H]!"))
+ to_chat(H, span_boldwarning("You feel something digging into your body..."))
if(H.stat != DEAD)
var/obj/item/organ/legion_skull/throwyouabone = new()
throwyouabone.Insert(H)
@@ -365,7 +367,7 @@
del_on_death = TRUE
sentience_type = SENTIENCE_BOSS
loot = list(/obj/item/organ/regenerative_core/legion = 3, /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 5, /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 5, /obj/effect/mob_spawn/human/corpse/damaged/legioninfested = 5)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = INFINITY
move_to_delay = 7
@@ -463,7 +465,7 @@
H.transform = H.transform.Scale(0.8, 1)//somehow dwarf squashing is borked when not roundstart. I hate WS code
/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/Initialize() //in an ideal world, these would generate, the legion would overlay over the corpse, and we'd get cool sprites
- mob_species = pickweight(list(
+ mob_species = pick_weight(list(
/datum/species/human = 50,
/datum/species/lizard = 20,
/datum/species/ipc = 10,
@@ -472,7 +474,7 @@
/datum/species/spider = 5
)
)
- var/type = pickweight(list(
+ var/type = pick_weight(list(
"Miner" = 40,
"Assistant" = 10,
"Engineer" = 5,
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
index 4869d4a95c1c3..c142ffddc106c 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
@@ -1,6 +1,6 @@
/datum/outfit/generic/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
- uniform = pickweight(list(
+ uniform = pick_weight(list(
/obj/item/clothing/under/utility = 5,
/obj/item/clothing/under/utility/skirt = 5,
/obj/item/clothing/under/color/black = 1,
@@ -17,11 +17,11 @@
/obj/item/clothing/under/suit/black = 1,
/obj/item/clothing/under/dress/sailor = 1,
/obj/item/clothing/under/dress/striped = 1,
- /obj/item/clothing/under/dress/skirt/blue = 1,
+ /obj/item/clothing/under/dress/skirt/color/blue = 1,
/obj/item/clothing/under/syndicate/tacticool = 1,
)
)
- suit = pickweight(list(
+ suit = pick_weight(list(
/obj/item/clothing/suit/hooded/wintercoat = 1,
/obj/item/clothing/suit/jacket = 1,
/obj/item/clothing/suit/jacket/leather = 1,
@@ -33,7 +33,7 @@
/obj/item/clothing/suit/toggle/hazard = 1,
)
)
- back = pickweight(list(
+ back = pick_weight(list(
/obj/item/storage/backpack = 1,
/obj/item/storage/backpack/satchel = 1,
/obj/item/storage/backpack/duffelbag = 1,
@@ -42,7 +42,7 @@
)
)
if (prob(10))
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/gun/ballistic/automatic/pistol/candor = 2,
/obj/item/gun/ballistic/automatic/pistol/commander = 1,
/obj/item/gun/ballistic/automatic/pistol/ringneck = 1,
@@ -51,13 +51,13 @@
)
)
if(prob(50))
- gloves = pickweight(list(
+ gloves = pick_weight(list(
/obj/item/clothing/gloves/color/black = 1,
/obj/item/clothing/gloves/fingerless = 1,
/obj/item/clothing/gloves/color/white = 1,
)
)
- shoes = pickweight(list(
+ shoes = pick_weight(list(
/obj/item/clothing/shoes/laceup = 1,
/obj/item/clothing/shoes/sandal = 1,
/obj/item/clothing/shoes/winterboots = 1,
@@ -69,7 +69,7 @@
)
)
if(prob(50))
- head = pickweight(list(
+ head = pick_weight(list(
/obj/item/clothing/head/beret = 3,
/obj/item/clothing/head/beret/grey = 3,
/obj/item/clothing/head/flatcap = 3,
@@ -83,7 +83,7 @@
)
)
if(prob(50))
- mask = pickweight(list(
+ mask = pick_weight(list(
/obj/item/clothing/mask/balaclava = 1,
/obj/item/clothing/mask/bandana/red = 1,
/obj/item/clothing/mask/gas = 3,
@@ -91,7 +91,7 @@
)
)
if(prob(25))
- neck = pickweight(list(
+ neck = pick_weight(list(
/obj/item/clothing/neck/scarf/red = 1,
/obj/item/clothing/neck/scarf/green = 1,
/obj/item/clothing/neck/scarf/darkblue = 1,
@@ -103,7 +103,7 @@
)
ears = pick(/obj/item/radio/headset, /obj/item/radio/headset/alt)
if(prob(50))
- glasses = pickweight(list(
+ glasses = pick_weight(list(
/obj/item/clothing/glasses/regular = 1,
/obj/item/clothing/glasses/regular/circle = 1,
/obj/item/clothing/glasses/regular/jamjar = 1,
@@ -121,7 +121,7 @@
l_pocket = pick(/obj/item/radio, /obj/item/flashlight)
id = /obj/item/card/id
backpack_contents = list()
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/dice/d20 = 1,
/obj/item/lipstick = 1,
/obj/item/clothing/mask/vape = 1,
@@ -151,14 +151,14 @@
/datum/outfit/generic/miner/pre_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(prob(75))
- uniform = pickweight(list(
+ uniform = pick_weight(list(
/obj/item/clothing/under/rank/cargo/miner/lavaland = 5,
/obj/item/clothing/under/rank/cargo/miner = 4,
/obj/item/clothing/under/rank/cargo/miner/lavaland/old = 1,
)
)
if(prob(25))
- suit = pickweight(list(
+ suit = pick_weight(list(
/obj/item/clothing/suit/hooded/explorer = 18,
/obj/item/clothing/suit/hooded/explorer/old = 1,
/obj/item/clothing/suit/hooded/cloak/goliath = 1
@@ -167,13 +167,13 @@
if(prob(75))
back = /obj/item/storage/backpack/explorer
if(prob(75))
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/storage/belt/mining = 2,
/obj/item/storage/belt/mining/alt = 2
)
)
else if(prob(75))
- belt = pickweight(list(
+ belt = pick_weight(list(
/obj/item/pickaxe = 16,
/obj/item/pickaxe/mini = 8,
/obj/item/pickaxe/silver = 4,
@@ -183,7 +183,7 @@
)
)
if(prob(75))
- gloves = pickweight(list(
+ gloves = pick_weight(list(
/obj/item/clothing/gloves/color/black = 9,
/obj/item/clothing/gloves/explorer/old = 1
)
@@ -191,7 +191,7 @@
if(prob(75))
shoes = /obj/item/clothing/shoes/workboots/mining
if(prob(75))
- mask = pickweight(list(
+ mask = pick_weight(list(
/obj/item/clothing/mask/gas/explorer = 9,
/obj/item/clothing/mask/gas/explorer/old = 1
)
@@ -199,7 +199,7 @@
if(prob(50))
glasses = /obj/item/clothing/glasses/meson
if(prob(50))
- r_pocket = pickweight(list(
+ r_pocket = pick_weight(list(
/obj/item/stack/marker_beacon = 20,
/obj/item/spacecash/bundle/smallrand = 7,
/obj/item/reagent_containers/hypospray/medipen/survival = 2,
@@ -207,7 +207,7 @@
)
)
if(prob(25))
- l_pocket = pickweight(list(
+ l_pocket = pick_weight(list(
/obj/item/spacecash/bundle/smallrand = 5,
/obj/item/reagent_containers/hypospray/medipen/survival = 2,
/obj/item/borg/upgrade/modkit/cooldown = 1
@@ -216,7 +216,7 @@
if(prob(75))
for(var/count in 1 to 3)
if(prob(70))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/borg/upgrade/modkit/damage = 1,
/obj/item/borg/upgrade/modkit/trigger_guard = 1,
/obj/item/soap/nanotrasen = 1,
@@ -236,7 +236,7 @@
)
if(prob(30))
backpack_contents += list(
- /obj/item/reagent_containers/hypospray/medipen/survival = pickweight(list(
+ /obj/item/reagent_containers/hypospray/medipen/survival = pick_weight(list(
1 = 3,
2 = 2,
3 = 1
@@ -245,7 +245,7 @@
)
else if (prob(75))
backpack_contents = list()
- back = pickweight(list(
+ back = pick_weight(list(
/obj/item/kinetic_crusher = 9,
/obj/item/kinetic_crusher/old = 1
)
@@ -276,7 +276,7 @@
back = /obj/item/melee/axe/fire
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/stack/tape/industrial/electrical = 1,
/obj/item/electronics/apc = 1,
/obj/item/multitool = 1,
@@ -305,7 +305,7 @@
else if (prob(75))
back = /obj/item/defibrillator/loaded
if(prob(75))
- belt = pickweight(list(/obj/item/storage/belt/medical = 5, /obj/item/defibrillator/compact/loaded = 1))
+ belt = pick_weight(list(/obj/item/storage/belt/medical = 5, /obj/item/defibrillator/compact/loaded = 1))
if(prob(75))
gloves = pick(/obj/item/clothing/gloves/color/white, /obj/item/clothing/gloves/color/latex/nitrile)
if(prob(75))
@@ -320,7 +320,7 @@
glasses = pick(/obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health/prescription)
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/reagent_containers/pill/patch/styptic = 5,
/obj/item/reagent_containers/pill/patch/silver_sulf = 5,
/obj/item/storage/firstaid/medical = 3,
@@ -365,7 +365,7 @@
neck = /obj/item/clothing/neck/tie/horrible
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/research_notes/loot/tiny = 3,
/obj/item/research_notes/loot/small = 3,
/obj/item/reagent_scanner = 3,
@@ -376,7 +376,7 @@
/obj/item/stock_parts/micro_laser/high = 2,
/obj/item/stock_parts/matter_bin/adv = 2,
/obj/item/survey_handheld = 1,
- /obj/item/weldingtool/experimental = 1,
+ /obj/item/weldingtool/electric = 1,
/obj/item/mmi/posibrain = 1,
/obj/item/reagent_containers/glass/beaker/plastic = 1,
/obj/item/organ/eyes/robotic/shield = 1,
@@ -408,7 +408,7 @@
ears = /obj/item/radio/headset/headset_cargo
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/spacecash/bundle/smallrand = 5,
/obj/item/ammo_box/magazine/illestren_a850r = 5,
/obj/item/ammo_box/magazine/zip_ammo_9mm = 5,
@@ -445,7 +445,7 @@
if(prob(75))
head = pick(/obj/item/clothing/head/helmet/sec, /obj/item/clothing/head/helmet/blueshirt, /obj/item/clothing/head/helmet/bulletproof)
if(prob(75))
- mask = /obj/item/clothing/mask/gas/sechailer
+ mask = /obj/item/clothing/mask/gas
if(prob(75))
ears = /obj/item/radio/headset/headset_sec
if(prob(75))
@@ -453,16 +453,16 @@
if(prob(75))
r_pocket = pick(/obj/item/flashlight/seclite, /obj/item/assembly/flash/handheld, /obj/item/restraints/handcuffs)
if(prob(50))
- suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg, /obj/item/gun/energy/e_gun/iot)
+ suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg)
for(var/i = 1 to 3)
if(prob(75))
- backpack_contents += pickweight(list(
+ backpack_contents += pick_weight(list(
/obj/item/restraints/handcuffs = 8,
/obj/item/assembly/flash/handheld = 5,
/obj/item/storage/box/evidence = 6,
/obj/item/flashlight/seclite = 4,
- /obj/item/ammo_box/c9mm/rubbershot = 3,
- /obj/item/ammo_box/c9mm = 1,
+ /obj/item/storage/box/ammo/c9mm_rubber = 3,
+ /obj/item/storage/box/ammo/c9mm = 1,
/obj/item/stock_parts/cell/gun = 3,
/obj/item/coin/antagtoken = 1,
/obj/item/grenade/stingbang = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
index 786cdaa809669..17f189080d756 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
@@ -45,7 +45,7 @@
name = "ice blast"
damage = 5
nodamage = FALSE
- temperature = -75
+ temperature = -2
/mob/living/simple_animal/hostile/asteroid/ice_demon/OpenFire()
// Sentient ice demons teleporting has been linked to server crashes
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm
index 7a4d8cb234c2f..8973b3ed18b54 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm
@@ -40,7 +40,7 @@
/mob/living/simple_animal/hostile/asteroid/ice_whelp/OpenFire()
var/turf/T = get_ranged_target_turf_direct(src, target, fire_range)
var/list/burn_turfs = getline(src, T) - get_turf(src)
- dragon_fire_line(src, burn_turfs)
+ fire_line(src, burn_turfs)
/mob/living/simple_animal/hostile/asteroid/ice_whelp/death(gibbed)
move_force = MOVE_FORCE_DEFAULT
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
index 6beb2f23b9e63..18be354c2652e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
@@ -1,7 +1,7 @@
//the base mining mob
/mob/living/simple_animal/hostile/asteroid
vision_range = 2
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
faction = list("mining")
weather_immunities = list("lava","ash")
obj_damage = 30
@@ -21,16 +21,8 @@
mob_size = MOB_SIZE_LARGE
var/icon_aggro = null
var/trophy_drop_mod = 25
- var/datum/armor/armor //WS edit - Whitesands
/mob/living/simple_animal/hostile/asteroid/Initialize(mapload)
- if (islist(armor)) //WS edit begin - Whitesands
- armor = getArmor(arglist(armor))
- else if (!armor)
- armor = getArmor()
- else if (!istype(armor, /datum/armor))
- stack_trace("Invalid type [armor.type] found in .armor during [src.type] Initialize()") //WS edit begin - Whitesands
-
. = ..()
apply_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
@@ -45,11 +37,6 @@
return
icon_state = icon_living
-/mob/living/simple_animal/hostile/asteroid/getarmor(def_zone, type) //WS edit begin - Whitesands
- if(armor)
- return armor.getRating(type)
- return 0 // If no armor //WS edit end
-
/mob/living/simple_animal/hostile/asteroid/bullet_act(obj/projectile/P)//Reduces damage from most projectiles to curb off-screen kills
if(!stat)
Aggro()
diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
index 25827781b4b85..b9d18e86d4b61 100644
--- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm
+++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
@@ -14,8 +14,7 @@
attack_sound = 'sound/weapons/bladeslice.ogg'
faction = list("nether")
speak_emote = list("screams")
- gold_core_spawnable = HOSTILE_SPAWN
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
var/phaser = TRUE
@@ -127,6 +126,7 @@
deathmessage = "wails as its form turns into a pulpy mush."
deathsound = 'sound/voice/hiss6.ogg'
phaser = FALSE
+ var/sound_prob = 1
/mob/living/simple_animal/hostile/netherworld/migo/asteroid
faction = list("mining")
@@ -148,7 +148,7 @@
..()
if(stat)
return
- if(prob(10))
+ if(prob(sound_prob))
var/chosen_sound = pick(migo_sounds)
playsound(src, chosen_sound, 50, TRUE)
@@ -158,7 +158,6 @@
icon_state = "blank-body"
icon_living = "blank-body"
icon_dead = "blank-dead"
- gold_core_spawnable = NO_SPAWN
health = 100
maxHealth = 100
melee_damage_lower = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
index cad59e7369b89..f957018dfad14 100644
--- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
@@ -25,7 +25,6 @@
attack_sound = 'sound/weapons/punch1.ogg'
ventcrawler = VENTCRAWLER_ALWAYS
unique_name = TRUE
- gold_core_spawnable = HOSTILE_SPAWN
faction = list("rat")
var/datum/action/cooldown/coffer
var/datum/action/cooldown/riot
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
index 4f671f37ac680..2a3c67f1d1880 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -36,7 +36,7 @@
//Space bats need no air to fly in.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
/mob/living/simple_animal/hostile/retaliate/bat/Initialize()
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index 75610b382cb3b..220f4dab979f8 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -29,7 +29,6 @@
del_on_death = 1
loot = list(/obj/effect/mob_spawn/human/clown/corpse)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 270
maxbodytemp = 370
unsuitable_atmos_damage = 10
@@ -56,7 +55,7 @@
. = ..()
if(banana_time && banana_time < world.time)
var/turf/T = get_turf(src)
- var/list/adjacent = T.GetAtmosAdjacentTurfs()
+ var/list/adjacent = T.get_atmos_adjacent_turfs()
new banana_type(pick(adjacent))
banana_time = world.time + rand(30,60)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
index e8bee6661a5ad..6c23f5cefe238 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
@@ -28,7 +28,6 @@
butcher_results = list(/obj/item/reagent_containers/food/snacks/nugget = 1)
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
- gold_core_spawnable = FRIENDLY_SPAWN
var/stepped_sound = 'sound/effects/huuu.ogg'
/mob/living/simple_animal/hostile/retaliate/frog/Initialize()
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
index 8b9d0d666bfba..a3da5b7c5be99 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
@@ -25,12 +25,11 @@
speak_emote = list("weeps")
deathmessage = "wails, disintegrating into a pile of ectoplasm!"
loot = list(/obj/item/ectoplasm)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
movement_type = FLYING
pressure_resistance = 300
- gold_core_spawnable = NO_SPAWN //too spooky for science
light_system = MOVABLE_LIGHT
light_range = 1 // same glowing as visible player ghosts
light_power = 2
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
index 80e5968cbc4d3..ce333d2ef002c 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
@@ -51,7 +51,6 @@
faction = list("nanotrasenprivate")
a_intent = INTENT_HARM
loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
status_flags = CANPUSH
search_objects = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
index 3375cd0a7269f..a40b9043ee673 100644
--- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
@@ -44,7 +44,7 @@
mouse_opacity = MOUSE_OPACITY_ICON
butcher_results = list(/obj/item/stack/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30)
deathmessage = "screeches as its wings turn to dust and it collapses on the floor, life estinguished."
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
maxbodytemp = 1500
faction = list("carp")
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index bac0b4b1d51ba..b4a70b9c304ca 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -28,7 +28,7 @@
attack_verb_simple = "claw"
attack_sound = 'sound/hallucinations/growl1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
minbodytemp = 0
faction = list("statue")
@@ -49,7 +49,6 @@
move_force = MOVE_FORCE_EXTREMELY_STRONG
move_resist = MOVE_FORCE_EXTREMELY_STRONG
pull_force = MOVE_FORCE_EXTREMELY_STRONG
- gold_core_spawnable = HOSTILE_SPAWN
var/cannot_be_seen = 1
var/mob/living/creator = null
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 41efc6993d9d4..69e0970e22640 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -40,7 +40,6 @@
deathmessage = "is hacked into pieces!"
loot = list(/obj/item/stack/sheet/mineral/wood)
- gold_core_spawnable = HOSTILE_SPAWN
del_on_death = 1
var/is_tree = TRUE
@@ -81,7 +80,7 @@
loot = list(/obj/item/stack/rods)
speak_emote = list("polls")
faction = list()
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
is_tree = FALSE
/mob/living/simple_animal/hostile/tree/festivus/attack_hand(mob/living/carbon/human/M)
diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
index 52ddcc72963a4..13d8dd57ba42b 100644
--- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
@@ -96,7 +96,7 @@
a_intent = INTENT_HARM
ranged_cooldown_time = 45
attack_sound = 'sound/weapons/bladeslice.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
unsuitable_atmos_damage = 0
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
faction = list("hostile","vines","plants")
diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
index b77436c09c893..be3242ed52524 100644
--- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
@@ -32,7 +32,6 @@
aggro_vision_range = 9
mob_size = MOB_SIZE_SMALL
environment_smash = ENVIRONMENT_SMASH_NONE
- gold_core_spawnable = HOSTILE_SPAWN
var/wumbo = 0
var/inflate_cooldown = 0
var/datum/action/innate/fugu/expand/E
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index bc22f78ae7a32..92b955d3a8412 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -64,7 +64,6 @@
friendly_verb_simple = "groom"
mob_size = MOB_SIZE_SMALL
movement_type = FLYING
- gold_core_spawnable = FRIENDLY_SPAWN
var/parrot_damage_upper = 10
var/parrot_state = PARROT_WANDER //Hunt for a perch when created
@@ -260,8 +259,8 @@
switch(ch)
if(RADIO_CHANNEL_NANOTRASEN)
available_channels.Add(RADIO_TOKEN_NANOTRASEN)
- if(RADIO_CHANNEL_COMMAND)
- available_channels.Add(RADIO_TOKEN_COMMAND)
+ if(RADIO_CHANNEL_EMERGENCY)
+ available_channels.Add(RADIO_TOKEN_EMERGENCY)
if(RADIO_CHANNEL_MINUTEMEN)
available_channels.Add(RADIO_TOKEN_MINUTEMEN)
if(RADIO_CHANNEL_INTEQ)
@@ -904,7 +903,6 @@
name = "Polly"
desc = "Polly the Parrot. An expert on quantum cracker theory."
speak = list("Polly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE")
- gold_core_spawnable = NO_SPAWN
speak_chance = 3
var/memory_saved = FALSE
var/rounds_survived = 0
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 3670e14a64051..a1a0886a2362b 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -59,7 +59,7 @@
///Atmos effect - Yes, you can make creatures that require plasma or co2 to survive. N2O is a trace gas and handled separately, hence why it isn't here. It'd be hard to add it. Hard and me don't mix (Yes, yes make all the dick jokes you want with that.) - Errorage
///Leaving something at 0 means it's off - has no maximum.
- var/list/atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ var/list/atmos_requirements = NORMAL_ATMOS_REQS
///This damage is taken when atmos doesn't fit all the requirements above.
var/unsuitable_atmos_damage = 2
@@ -86,7 +86,6 @@
///Set to 1 to allow breaking of crates,lockers,racks,tables; 2 for walls; 3 for Rwalls.
var/environment_smash = ENVIRONMENT_SMASH_NONE
-
///Hot simple_animal baby making vars.
var/list/childtype = null
var/next_scan_time = 0
@@ -98,8 +97,6 @@
var/obj/item/card/id/access_card = null
///In the event that you want to have a buffing effect on the mob, but don't want it to stack with other effects, any outside force that applies a buff to a simple mob should at least set this to 1, so we have something to check against.
var/buffed = 0
- ///If the mob can be spawned with a gold slime core. HOSTILE_SPAWN are spawned with plasma, FRIENDLY_SPAWN are spawned with blood.
- var/gold_core_spawnable = NO_SPAWN
var/datum/component/spawner/nest
@@ -143,8 +140,18 @@
///What kind of footstep this mob should have. Null if it shouldn't have any.
var/footstep_type
+ /// Base armor value on this mob for running armor checks
+ var/datum/armor/armor
+
+
/mob/living/simple_animal/Initialize(mapload)
. = ..()
+ if (islist(armor))
+ armor = getArmor(arglist(armor))
+ else if (!armor)
+ armor = getArmor()
+ else if (!istype(armor, /datum/armor))
+ stack_trace("Invalid type [armor.type] found in .armor during [src.type] Initialize()")
GLOB.simple_animals[AIStatus] += src
if(gender == PLURAL)
gender = pick(MALE,FEMALE)
@@ -173,6 +180,11 @@
return ..()
+/mob/living/simple_animal/getarmor(def_zone, type)
+ if(armor)
+ return armor.getRating(type)
+ return FALSE
+
/mob/living/simple_animal/attackby(obj/item/O, mob/user, params)
if(!is_type_in_list(O, food_type))
..()
@@ -466,7 +478,7 @@
return //we never mate when not alone, so just abort early
if(alone && partner && children < 3)
- var/childspawn = pickweight(childtype)
+ var/childspawn = pick_weight(childtype)
var/turf/target = get_turf(loc)
if(target)
return new childspawn(target)
@@ -630,30 +642,29 @@
GLOB.simple_animals[togglestatus] += list(src)
AIStatus = togglestatus
- var/virt_z = "[virtual_z()]"
+ var/virt_z = virtual_z()
if(!virt_z)
return
switch(togglestatus)
if(AI_Z_OFF)
- LAZYADDASSOCLIST(SSidlenpcpool.idle_mobs_by_virtual_level, virt_z, src)
-
+ LAZYADDASSOCLIST(SSidlenpcpool.idle_mobs_by_virtual_level, "[virt_z]", src)
else
- LAZYREMOVEASSOC(SSidlenpcpool.idle_mobs_by_virtual_level, virt_z, src)
+ LAZYREMOVEASSOC(SSidlenpcpool.idle_mobs_by_virtual_level, "[virt_z]", src)
/mob/living/simple_animal/proc/check_should_sleep()
if (pulledby || shouldwakeup)
toggle_ai(AI_ON)
return
- var/virt_z = "[virtual_z()]"
- if(!virt_z)
- return
- var/players_on_virtual_z = LAZYACCESS(SSmobs.players_by_virtual_z, virt_z)
- if(!length(players_on_virtual_z))
- toggle_ai(AI_Z_OFF)
- else if(AIStatus == AI_Z_OFF)
- toggle_ai(AI_ON)
+ var/virt_z = virtual_z()
+ var/players_on_virtual_z = 0
+ if(virt_z)
+ players_on_virtual_z = LAZYACCESS(SSmobs.players_by_virtual_z, "[virt_z]")
+ if(!length(players_on_virtual_z))
+ toggle_ai(AI_Z_OFF)
+ else if(AIStatus == AI_Z_OFF)
+ toggle_ai(AI_ON)
/mob/living/simple_animal/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
. = ..()
@@ -665,6 +676,7 @@
. = ..()
if(previous_virtual_z)
LAZYREMOVEASSOC(SSidlenpcpool.idle_mobs_by_virtual_level, "[previous_virtual_z]", src)
- toggle_ai(initial(AIStatus))
+ if(QDELETED(src))
+ return
if(new_virtual_z)
check_should_sleep()
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index b880704c9bf91..19eaa5a6f91d0 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -193,7 +193,7 @@
C.adjustCloneLoss(rand(2,4))
C.adjustToxLoss(rand(1,2))
- if(prob(10) && C.client)
+ if(prob(10) && C.client && !HAS_TRAIT(C, TRAIT_ANALGESIA))
to_chat(C, "[pick("You can feel your body becoming weak!", \
"You feel like you're about to die!", \
"You feel every part of your body screaming in agony!", \
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index cb4b769835632..ed502837dc9a6 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -24,7 +24,7 @@
bubble_icon = "slime"
initial_language_holder = /datum/language_holder/slime
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = IMMUNE_ATMOS_REQS
maxHealth = 150
health = 150
@@ -43,7 +43,6 @@
// for the sake of cleanliness, though, here they are.
status_flags = CANUNCONSCIOUS|CANPUSH
- var/cores = 1 // the number of /obj/item/slime_extract's the slime has left inside
var/mutation_chance = 30 // Chance of mutating, should be between 25 and 35
var/powerlevel = 0 // 1-10 controls how much electricity they are generating
@@ -71,7 +70,6 @@
///////////TIME FOR SUBSPECIES
var/colour = "grey"
- var/coretype = /obj/item/slime_extract/grey
var/list/slime_mutation[4]
var/static/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
@@ -79,13 +77,6 @@
"gold", "green", "adamantine", "oil", "light pink", "bluespace",
"cerulean", "sepia", "black", "pyrite")
- ///////////CORE-CROSSING CODE
-
- var/effectmod //What core modification is being used.
- var/crossbreed_modifier = 1 // modifies how many extracts are needed
- var/applied = 0 //How many extracts of the modtype have been applied.
-
-
/mob/living/simple_animal/slime/Initialize(mapload, new_colour="grey", new_is_adult=FALSE)
var/datum/action/innate/slime/feed/F = new
F.Grant(src)
@@ -119,8 +110,6 @@
colour = new_colour
update_name()
slime_mutation = mutation_table(colour)
- var/sanitizedcolour = replacetext(colour, " ", "")
- coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]")
regenerate_icons()
/mob/living/simple_animal/slime/update_name()
@@ -248,7 +237,7 @@
Feedon(Food)
return ..()
-/mob/living/simple_animal/slime/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
+/mob/living/simple_animal/slime/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, silent = FALSE, use_unequip_delay = FALSE)
return
/mob/living/simple_animal/slime/start_pulling(atom/movable/AM, state, force = move_force, supress_message = FALSE)
@@ -354,50 +343,9 @@
force_effect = round(W.force/2)
if(prob(10 + force_effect))
discipline_slime(user)
- if(istype(W, /obj/item/storage/bag/bio))
- var/obj/item/storage/P = W
- if(!effectmod)
- to_chat(user, "The slime is not currently being mutated.")
- return
- var/hasOutput = FALSE //Have we outputted text?
- var/hasFound = FALSE //Have we found an extract to be added?
- for(var/obj/item/slime_extract/S in P.contents)
- if(S.effectmod == effectmod)
- SEND_SIGNAL(P, COMSIG_TRY_STORAGE_TAKE, S, get_turf(src), TRUE)
- qdel(S)
- applied++
- hasFound = TRUE
- if(applied >= (SLIME_EXTRACT_CROSSING_REQUIRED * crossbreed_modifier))
- to_chat(user, "You feed the slime as many of the extracts from the bag as you can, and it mutates!")
- playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
- spawn_corecross()
- hasOutput = TRUE
- break
- if(!hasOutput)
- if(!hasFound)
- to_chat(user, "There are no extracts in the bag that this slime will accept!")
- else
- to_chat(user, "You feed the slime some extracts from the bag.")
- playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
return
..()
-/mob/living/simple_animal/slime/proc/spawn_corecross()
- var/static/list/crossbreeds = subtypesof(/obj/item/slimecross)
- visible_message("[src] shudders, its mutated core consuming the rest of its body!")
- playsound(src, 'sound/magic/smoke.ogg', 50, TRUE)
- var/crosspath
- for(var/X in crossbreeds)
- var/obj/item/slimecross/S = X
- if(initial(S.colour) == colour && initial(S.effect) == effectmod)
- crosspath = S
- break
- if(crosspath)
- new crosspath(loc)
- else
- visible_message("The mutated core shudders, and collapses into a puddle, unable to maintain its form.")
- qdel(src)
-
/mob/living/simple_animal/slime/proc/apply_water()
adjustBruteLoss(rand(15,20))
if(!client)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index a05c2e65688eb..eb3ee07a322bb 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -452,8 +452,6 @@
else
client.eye = client.mob
client.perspective = MOB_PERSPECTIVE
- else
- //Do nothing
else
//Reset to common defaults: mob if on turf, otherwise current loc
if(isturf(loc))
@@ -504,10 +502,13 @@
handle_eye_contact(examinify)
else
result = examinify.examine_more(src)
+
+ if(!LAZYLEN(result))
+ result = list(span_notice("You examine [examinify] closer, but find nothing of interest..."))
else
result = examinify.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist?
- if(result.len)
+ if(length(result))
for(var/i in 1 to (length(result) - 1))
result[i] += "\n"
@@ -537,9 +538,9 @@
visible_message(" [name] begins feeling around for \the [examined_thing.name]...")
/// how long it takes for the blind person to find the thing they're examining
- var/examine_delay_length = rand(1 SECONDS, 2 SECONDS)
+ var/examine_delay_length = rand(0.5 SECONDS, 1 SECONDS)
if(client?.recent_examines && client?.recent_examines[examined_thing]) //easier to find things we just touched
- examine_delay_length = 0.5 SECONDS
+ examine_delay_length = 0.25 SECONDS
else if(isobj(examined_thing))
examine_delay_length *= 1.5
else if(ismob(examined_thing) && examined_thing != src)
@@ -674,6 +675,9 @@
var/obj/item/I = get_active_held_item()
if(I)
+ if(I.pre_unique_action(src))
+ update_inv_hands()
+ return
I.unique_action(src)
update_inv_hands()
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index def2bde930e0e..9a2d1d60c0c37 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -92,7 +92,7 @@
var/drowsyness = 0//Carbon
/// Dizziness level of the mob
var/dizziness = 0//Carbon
- /// Jitteryness level of the mob
+ /// jitteryness level of the mob
var/jitteriness = 0//Carbon
/// Hunger level of the mob
var/nutrition = NUTRITION_LEVEL_START_MIN // randomised in Initialize
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index adb03f1962f4b..7848b9cbff0ab 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -77,7 +77,7 @@
if(prob(probability))
zone = check_zone(zone)
else
- zone = pickweight(list(BODY_ZONE_HEAD = 1, BODY_ZONE_CHEST = 1, BODY_ZONE_L_ARM = 4, BODY_ZONE_R_ARM = 4, BODY_ZONE_L_LEG = 4, BODY_ZONE_R_LEG = 4))
+ zone = pick_weight(list(BODY_ZONE_HEAD = 1, BODY_ZONE_CHEST = 1, BODY_ZONE_L_ARM = 4, BODY_ZONE_R_ARM = 4, BODY_ZONE_L_LEG = 4, BODY_ZONE_R_LEG = 4))
return zone
///Would this zone be above the neck
@@ -134,11 +134,6 @@
newletter = "oo"
else if(lowerletter == "c")
newletter = "k"
- if(rand(1, 20) == 20)
- if(newletter == " ")
- newletter = "...huuuhhh..."
- else if(newletter == ".")
- newletter = " *BURP*."
switch(rand(1, 20))
if(1)
newletter += "'"
@@ -147,7 +142,7 @@
if(20)
newletter += "[newletter][newletter]"
else
- // do nothing
+ EMPTY_BLOCK_GUARD
. += "[newletter]"
return sanitize(.)
@@ -192,7 +187,7 @@
if(5)
newletter = "glor"
else
- // do nothing
+ EMPTY_BLOCK_GUARD
. += newletter
return sanitize(.)
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
index 5dc04346255a5..6b82aa09770ea 100644
--- a/code/modules/mob/status_procs.dm
+++ b/code/modules/mob/status_procs.dm
@@ -4,8 +4,20 @@
// eye damage, eye_blind, eye_blurry, druggy, TRAIT_BLIND trait, and TRAIT_NEARSIGHT trait.
///Set the jitter of a mob
-/mob/proc/Jitter(amount)
+/mob/proc/set_jitter(amount)
jitteriness = max(jitteriness,amount,0)
+ return TRUE
+
+/mob/proc/adjust_jitter(amount, min = 0, max = 1000)
+ if((jitteriness+amount > max) && jitteriness+amount <= max*1.6)
+ jitteriness = max
+ return TRUE
+ if(jitteriness+amount < min && jitteriness+amount < min * 1.6)
+ jitteriness = min
+ return TRUE
+ jitteriness = clamp(jitteriness+amount, 0, max)
+ return TRUE
+
/**
* Set the dizzyness of a mob to a passed in amount
diff --git a/code/modules/mob_spawner/hivebot.dm b/code/modules/mob_spawner/hivebot.dm
index 630ed6f6f3c7d..61c3d477745b1 100644
--- a/code/modules/mob_spawner/hivebot.dm
+++ b/code/modules/mob_spawner/hivebot.dm
@@ -1,20 +1,21 @@
/obj/structure/spawner/hivebot
name = "hivebot fabricator"
- desc = "An active fabricator, creating hivebots out of resources from below the surface."
+ desc = "An active fabrication plant, electrical tendrils reaching into the ground searching for scrap metals, a hunger permeating the world around it."
icon = 'icons/obj/machines/bsm.dmi'
icon_state = "bsm_on"
- faction = list("mining")
+ faction = list("hivebot")
max_integrity = 250
mob_types = list(
- /mob/living/simple_animal/hostile/hivebot/wasteplanet = 40,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged = 40,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid = 10,
- /mob/living/simple_animal/hostile/hivebot/wasteplanet/strong = 5,
- /mob/living/simple_animal/hostile/hivebot/mechanic = 5
+ /mob/living/simple_animal/hostile/hivebot = 40,
+ /mob/living/simple_animal/hostile/hivebot/ranged = 40,
+ /mob/living/simple_animal/hostile/hivebot/ranged/rapid = 10,
+ /mob/living/simple_animal/hostile/hivebot/strong = 5,
+ /mob/living/simple_animal/hostile/hivebot/mechanic = 5,
+ /mob/living/simple_animal/hostile/hivebot/defender = 1,
)
- spawn_text = "crawls out of"
+ spawn_text = "emerges from within"
spawn_sound = list('sound/effects/suitstep2.ogg')
resistance_flags = FIRE_PROOF | LAVA_PROOF
var/obj/effect/light_emitter/hivespawner/emitted_light
@@ -34,7 +35,7 @@
/obj/structure/spawner/hivebot/proc/destroy_effect()
playsound(loc,'sound/effects/explosionfar.ogg', 200, TRUE)
- visible_message("[src] begins to rattle and shake, sparks flying off of it!")
+ visible_message(span_boldannounce("[src] begins to rattle and shake, sparks flying off of it!"))
/obj/structure/spawner/hivebot/proc/drop_loot()
@@ -42,7 +43,7 @@
smoke.set_up(2, loc)
smoke.start()
new /obj/effect/particle_effect/sparks(loc)
- new /obj/effect/spawner/lootdrop/waste/hivebot/beacon(loc)
+ new /obj/effect/spawner/random/waste/hivebot/beacon(loc)
/obj/effect/light_emitter/hivespawner
set_luminosity = 4
diff --git a/code/modules/mob_spawner/spawner_componet.dm b/code/modules/mob_spawner/spawner_componet.dm
index 8a904a5504c41..637423f0b1e06 100644
--- a/code/modules/mob_spawner/spawner_componet.dm
+++ b/code/modules/mob_spawner/spawner_componet.dm
@@ -114,7 +114,7 @@
spot = pick(peel)
else
spot = pick(circleviewturfs(origin, spawn_distance_max))
- var/chosen_mob_type = pickweight(mob_types)
+ var/chosen_mob_type = pick_weight(mob_types)
var/mob/living/simple_animal/L = new chosen_mob_type(spot)
L.flags_1 |= (P.flags_1 & ADMIN_SPAWNED_1)
spawned_mobs += L
diff --git a/code/modules/mod/mod_clothes.dm b/code/modules/mod/mod_clothes.dm
index 7a9e710c9382e..77bfcab43aca8 100644
--- a/code/modules/mod/mod_clothes.dm
+++ b/code/modules/mod/mod_clothes.dm
@@ -12,6 +12,12 @@
obj_flags = IMMUTABLE_SLOW
visor_flags = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|ALLOWINTERNALS
+ equipping_sound = null
+ unequipping_sound = null
+ equip_delay_self = null
+ strip_delay = null
+ equip_self_flags = null
+
/obj/item/clothing/suit/mod
name = "MOD chestplate"
desc = "A chestplate for a MODsuit."
@@ -26,6 +32,12 @@
cold_protection = CHEST|GROIN
obj_flags = IMMUTABLE_SLOW
+ equipping_sound = null
+ unequipping_sound = null
+ equip_delay_self = null
+ strip_delay = null
+ equip_self_flags = null
+
/obj/item/clothing/gloves/mod
name = "MOD gauntlets"
desc = "A pair of gauntlets for a MODsuit."
@@ -39,6 +51,12 @@
cold_protection = HANDS|ARMS
obj_flags = IMMUTABLE_SLOW
+ equipping_sound = null
+ unequipping_sound = null
+ equip_delay_self = null
+ strip_delay = null
+ equip_self_flags = null
+
/obj/item/clothing/shoes/mod
name = "MOD boots"
desc = "A pair of boots for a MODsuit."
@@ -54,3 +72,9 @@
supports_variations = DIGITIGRADE_VARIATION
can_be_tied = FALSE
visor_flags_inv = HIDESHOES
+
+ equipping_sound = null
+ unequipping_sound = null
+ equip_delay_self = null
+ strip_delay = null
+ equip_self_flags = null
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 0199662862f8c..5f6cfc4465e82 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -278,7 +278,7 @@
return
if(!wearer.incapacitated())
var/atom/movable/screen/inventory/hand/ui_hand = over_object
- if(wearer.putItemFromInventoryInHandIfPossible(src, ui_hand.held_index))
+ if(wearer.putItemFromInventoryInHandIfPossible(src, ui_hand.held_index, FALSE, TRUE))
add_fingerprint(usr)
return ..()
@@ -416,7 +416,7 @@
wearer.apply_damage(10 / severity, BURN, spread_damage=TRUE)
to_chat(wearer, span_danger("You feel [src] heat up from the EMP, burning you slightly."))
if(wearer.stat < UNCONSCIOUS && prob(10))
- wearer.emote("scream")
+ wearer.force_scream()
/*obj/item/mod/control/on_outfit_equip(mob/living/carbon/human/outfit_wearer, visuals_only, item_slot)
if(visuals_only)
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index 2e6325df919f3..4643fa9392068 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -682,7 +682,7 @@
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash,
/obj/item/melee/baton,
- /obj/item/melee/transforming/energy/sword,
+ /obj/item/melee/energy/sword,
/obj/item/shield/energy,
)
skins = list(
@@ -733,7 +733,7 @@
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash,
/obj/item/melee/baton,
- /obj/item/melee/transforming/energy/sword,
+ /obj/item/melee/energy/sword,
/obj/item/shield/energy,
)
skins = list(
@@ -947,7 +947,7 @@
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash,
/obj/item/melee/baton,
- /obj/item/melee/transforming/energy/sword,
+ /obj/item/melee/energy/sword,
/obj/item/shield/energy,
)
skins = list(
diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm
index e735654ef2c5e..dc0f595c19f25 100644
--- a/code/modules/mod/modules/modules_maint.dm
+++ b/code/modules/mod/modules/modules_maint.dm
@@ -47,7 +47,7 @@
if(!mod.wearer) //while there is a guaranteed user when on_wearer_exposed() fires, that isn't the same case for this proc
return
mod.wearer.visible_message("[src] inside [mod.wearer]'s [mod.name] snaps shut, mutilating the user inside!", span_userdanger("*SNAP*"))
- mod.wearer.emote("scream")
+ mod.wearer.force_scream()
playsound(mod.wearer, 'sound/effects/snap.ogg', 75, TRUE, frequency = 0.5)
playsound(mod.wearer, 'sound/effects/splat.ogg', 50, TRUE, frequency = 0.5)
mod.wearer.apply_damage(500, BRUTE, forced = TRUE, spread_damage = TRUE) //boggers, bogchamp, etc
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 9697cce45df36..9fd6fae027bac 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -6,11 +6,16 @@
desc = "A small portable microcomputer."
icon = 'icons/obj/machines/computer.dmi'
icon_state = "laptop"
- light_on = FALSE
integrity_failure = 0.5
max_integrity = 100
armor = list("melee" = 0, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
+ light_system = MOVABLE_LIGHT_DIRECTIONAL
+ light_range = 2.3
+ light_power = 0.6
+ light_color = "#FFFFFF"
+ light_on = FALSE
+
var/enabled = 0 // Whether the computer is turned on.
var/screen_on = 1 // Whether the computer is active/opened/it's screen is on.
var/device_theme = "ntos" // Sets the theme for the main menu, hardware config, and file browser apps. Overridden by certain non-NT devices.
@@ -43,9 +48,9 @@
var/list/idle_threads // Idle programs on background. They still receive process calls but can't be interacted with.
var/obj/physical = null // Object that represents our computer. It's used for Adjacent() and UI visibility checks.
- var/has_light = FALSE //If the computer has a flashlight/LED light/what-have-you installed
- var/comp_light_luminosity = 3 //The brightness of that light
- var/comp_light_color //The color of that light
+
+ /// If the computer has a flashlight/LED light/what-have-you installed
+ var/has_light = FALSE
/obj/item/modular_computer/Initialize()
@@ -53,7 +58,6 @@
START_PROCESSING(SSobj, src)
if(!physical)
physical = src
- comp_light_color = "#FFFFFF"
idle_threads = list()
update_appearance()
diff --git a/code/modules/modular_computers/computers/item/computer_ui.dm b/code/modules/modular_computers/computers/item/computer_ui.dm
index 4729117052b6d..bc44d93583d11 100644
--- a/code/modules/modular_computers/computers/item/computer_ui.dm
+++ b/code/modules/modular_computers/computers/item/computer_ui.dm
@@ -81,7 +81,7 @@
data["has_light"] = has_light
data["light_on"] = light_on
- data["comp_light_color"] = comp_light_color
+ data["comp_light_color"] = light_color
return data
@@ -166,14 +166,14 @@
return 1
if("PC_toggle_light")
+ if(!has_light)
+ return FALSE
set_light_on(!light_on)
- if(light_on)
- set_light(comp_light_luminosity, 1, comp_light_color)
- else
- set_light(0)
return TRUE
if("PC_light_color")
+ if(!has_light)
+ return FALSE
var/mob/user = usr
var/new_color
while(!new_color)
@@ -183,9 +183,7 @@
if(color_hex2num(new_color) < 200) //Colors too dark are rejected
to_chat(user, "That color is too dark! Choose a lighter one.")
new_color = null
- comp_light_color = new_color
set_light_color(new_color)
- update_light()
return TRUE
if("PC_Eject_Disk")
diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm
index f7a518d3568f4..2e7ce89d33b89 100644
--- a/code/modules/modular_computers/computers/item/laptop.dm
+++ b/code/modules/modular_computers/computers/item/laptop.dm
@@ -112,7 +112,10 @@
display_overlays = screen_on
update_appearance()
-
+/obj/item/modular_computer/laptop/examine_more(mob/user)
+ if(screen_on)
+ interact(user)
+ return ..()
// Laptop frame, starts empty and closed.
/obj/item/modular_computer/laptop/buildable
diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm
index 9931e70ca1ba7..2ff0f33a79e1d 100644
--- a/code/modules/modular_computers/computers/item/tablet.dm
+++ b/code/modules/modular_computers/computers/item/tablet.dm
@@ -12,7 +12,6 @@
steel_sheet_cost = 1
slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT
has_light = TRUE //LED flashlight!
- comp_light_luminosity = 2.3 //Same as the PDA
custom_materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) // WS Edit - Item Materials
var/has_variants = TRUE
var/finish_color = null
@@ -33,13 +32,13 @@
icon_state_menu = "assign"
w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_ID | ITEM_SLOT_BELT
- comp_light_luminosity = 6.3
+ light_range = 6.3
has_variants = FALSE
/// Given to Nuke Ops members.
/obj/item/modular_computer/tablet/nukeops
icon_state = "tablet-syndicate"
- comp_light_luminosity = 6.3
+ light_range = 6.3
has_variants = FALSE
device_theme = "syndicate"
light_color = COLOR_RED
@@ -61,7 +60,6 @@
icon_state_unpowered = "tablet-silicon"
base_icon_state = "tablet-silicon"
has_light = FALSE //tablet light button actually enables/disables the borg lamp
- comp_light_luminosity = 0
has_variants = FALSE
///Ref to the borg we're installed in. Set by the borg during our creation.
var/mob/living/silicon/robot/borgo
diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm
index b7f1a2f5d9121..e8a3b6e18527e 100644
--- a/code/modules/modular_computers/computers/machinery/modular_computer.dm
+++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm
@@ -85,6 +85,10 @@
else
return ..()
+/obj/machinery/modular_computer/examine_more(mob/user)
+ interact(user)
+ return ..()
+
// Process currently calls handle_power(), may be expanded in future if more things are added.
/obj/machinery/modular_computer/process()
if(cpu)
diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm
index b1ec3d3edc16f..5ad3a674e3342 100644
--- a/code/modules/modular_computers/laptop_vendor.dm
+++ b/code/modules/modular_computers/laptop_vendor.dm
@@ -254,7 +254,7 @@
var/obj/item/card/bank/ID = I
var/datum/bank_account/account = ID.registered_account
var/target_credits = total_price - credits
- if(!account.adjust_money(-target_credits, "laptop_vendor"))
+ if(!account.adjust_money(-target_credits, CREDIT_LOG_VENDOR_PURCHASE))
say("Insufficient credits on card to purchase!")
return
credits += target_credits
diff --git a/code/modules/movespeed/modifiers/items.dm b/code/modules/movespeed/modifiers/items.dm
index 4c967a58a7ec5..6759b8a47f46f 100644
--- a/code/modules/movespeed/modifiers/items.dm
+++ b/code/modules/movespeed/modifiers/items.dm
@@ -20,3 +20,6 @@
/datum/movespeed_modifier/sphere
multiplicative_slowdown = -0.5
+
+/datum/movespeed_modifier/equipping
+ multiplicative_slowdown = 1.5
diff --git a/code/modules/movespeed/modifiers/reagent.dm b/code/modules/movespeed/modifiers/reagent.dm
index ecf91d0760fa5..24108e6178d41 100644
--- a/code/modules/movespeed/modifiers/reagent.dm
+++ b/code/modules/movespeed/modifiers/reagent.dm
@@ -38,4 +38,4 @@
multiplicative_slowdown = -0.45
/datum/movespeed_modifier/reagent/shock_wine
- multiplicative_slowdown = -0.40
+ multiplicative_slowdown = -0.30
diff --git a/code/modules/movespeed/modifiers/status_effects.dm b/code/modules/movespeed/modifiers/status_effects.dm
deleted file mode 100644
index 25cbcd42e124d..0000000000000
--- a/code/modules/movespeed/modifiers/status_effects.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-/datum/movespeed_modifier/status_effect/bloodchill
- multiplicative_slowdown = 3
-
-/datum/movespeed_modifier/status_effect/bonechill
- multiplicative_slowdown = 3
-
-/datum/movespeed_modifier/status_effect/lightpink
- multiplicative_slowdown = -0.25
- blacklisted_movetypes = (FLYING|FLOATING)
-
-/datum/movespeed_modifier/status_effect/tarfoot
- multiplicative_slowdown = 0.5
- blacklisted_movetypes = (FLYING|FLOATING)
-
-/datum/movespeed_modifier/status_effect/sepia
- variable = TRUE
- blacklisted_movetypes = (FLYING|FLOATING)
diff --git a/code/modules/overmap/_overmap_datum.dm b/code/modules/overmap/_overmap_datum.dm
index 5244f28501884..cd6f31f17c889 100644
--- a/code/modules/overmap/_overmap_datum.dm
+++ b/code/modules/overmap/_overmap_datum.dm
@@ -65,7 +65,7 @@
Initialize(arglist(args))
-/datum/overmap/Destroy(force, ...)
+/datum/overmap/Destroy(force)
SSovermap.overmap_objects -= src
if(current_docking_ticket)
QDEL_NULL(current_docking_ticket)
diff --git a/code/modules/overmap/docking_ticket.dm b/code/modules/overmap/docking_ticket.dm
index 4e64650432462..c1ff60ae2304d 100644
--- a/code/modules/overmap/docking_ticket.dm
+++ b/code/modules/overmap/docking_ticket.dm
@@ -37,7 +37,7 @@
target.current_docking_ticket = src
-/datum/docking_ticket/Destroy(force, ...)
+/datum/docking_ticket/Destroy(force)
if(target)
target.current_docking_ticket = null
target = null
diff --git a/code/modules/overmap/helm.dm b/code/modules/overmap/helm.dm
index 3b825ce395244..efa0bc44c3e9c 100644
--- a/code/modules/overmap/helm.dm
+++ b/code/modules/overmap/helm.dm
@@ -360,7 +360,7 @@
// Unregister map objects
if(current_ship)
user.client?.clear_map(current_ship.token.map_name)
- if(current_ship.burn_direction > BURN_NONE && !length(concurrent_users) && !viewer) // If accelerating with nobody else to stop it
+ if(current_ship.burn_direction > BURN_NONE && !length(concurrent_users) && !viewer && is_living) // If accelerating with nobody else to stop it
say("Pilot absence detected, engaging acceleration safeties.")
current_ship.change_heading(BURN_NONE)
diff --git a/code/modules/overmap/missions.dm b/code/modules/overmap/missions.dm
index 0bc2c2f347225..570590e593d34 100644
--- a/code/modules/overmap/missions.dm
+++ b/code/modules/overmap/missions.dm
@@ -1,9 +1,12 @@
/datum/mission
var/name = "Mission"
var/desc = "Do something for me."
- var/value = 1000 /// The mission's payout.
- var/duration = 30 MINUTES /// The amount of time in which to complete the mission.
- var/weight = 0 /// The relative probability of this mission being selected. 0-weight missions are never selected.
+ /// The mission's payout.
+ var/value = 1000
+ /// The amount of time in which to complete the mission.
+ var/duration = 30 MINUTES
+ /// The relative probability of this mission being selected. 0-weight missions are never selected.
+ var/weight = 0
/// Should mission value scale proportionally to the deviation from the mission's base duration?
var/dur_value_scaling = TRUE
@@ -39,6 +42,7 @@
return ..()
/datum/mission/proc/accept(datum/overmap/ship/controlled/acceptor, turf/accept_loc)
+ SSblackbox.record_feedback("nested tally", "mission", 1, list(name, "accepted"))
accepted = TRUE
servant = acceptor
LAZYREMOVE(source_outpost.missions, src)
@@ -63,10 +67,17 @@
return ..()
/datum/mission/proc/turn_in()
- servant.ship_account.adjust_money(value, "mission")
+ if(QDELING(src))
+ return
+ SSblackbox.record_feedback("nested tally", "mission", 1, list(name, "succeeded"))
+ SSblackbox.record_feedback("nested tally", "mission", value, list(name, "payout"))
+ servant.ship_account.adjust_money(value, CREDIT_LOG_MISSION)
qdel(src)
/datum/mission/proc/give_up()
+ if(QDELING(src))
+ return
+ SSblackbox.record_feedback("nested tally", "mission", 1, list(name, "abandoned"))
qdel(src)
/datum/mission/proc/can_complete()
diff --git a/code/modules/overmap/missions/acquire_mission.dm b/code/modules/overmap/missions/acquire_mission.dm
index ea55beb001203..71bb5546fe031 100644
--- a/code/modules/overmap/missions/acquire_mission.dm
+++ b/code/modules/overmap/missions/acquire_mission.dm
@@ -104,7 +104,7 @@
/datum/mission/acquire/true_love/strange_crystal
name = "Strange crystal needed (urgent!!!)"
- value = 1000
+ value = 4000
weight = 1
objective_type = /obj/item/strange_crystal
@@ -172,40 +172,16 @@ Acquire: Anomaly
value = 1300
objective_type = /mob/living/simple_animal/hostile/asteroid/hivelord/legion
-/datum/mission/acquire/creature/ice_whelp
- name = "Capture an ice whelp"
- desc = "I require a live ice whelp for research purposes. Trap one within the given \
- Lifeform Containment Unit and return it to me and you will be paid handsomely."
- value = 1700
- weight = 2
- objective_type = /mob/living/simple_animal/hostile/asteroid/ice_whelp
-
/datum/mission/acquire/creature/migo
name = "Capture a live mi-go"
desc = "I require a live mi-go for research purposes. Trap one within the given \
Lifeform Containment Unit and return it to me and you will be paid handsomely."
- value = 1050
+ value = 1300
weight = 2
objective_type = /mob/living/simple_animal/hostile/netherworld/migo/asteroid
-/datum/mission/acquire/creature/floorbot
- name = "Detain a malfunctioning floorbot"
- desc = "I require a functional abandoned floorbot for \"research\" purposes. Trap one within \
- the given Lifeform Containment Unit and return it to me and you will be paid handsomely."
- value = 1450
- weight = 1
- objective_type = /mob/living/simple_animal/bot/floorbot/rockplanet
-
-/datum/mission/acquire/creature/firebot
- name = "Detain a malfunctioning firebot"
- desc = "I require a functional abandoned firebot for \"research\" purposes. Trap one within \
- the given Lifeform Containment Unit and return it to me and you will be paid handsomely."
- value = 1450
- weight = 1
- objective_type = /mob/living/simple_animal/bot/firebot/rockplanet
-
/*
- Acquire: Landmines
+ Acquire: Salvage
*/
/datum/mission/acquire/landmine
@@ -219,74 +195,66 @@ Acquire: Anomaly
objective_type = /obj/item/mine/pressure/explosive
num_wanted = 2
-/*
- Acquire: Fishing
-*/
-
-/datum/mission/acquire/aquarium
- name = "Fish needed for my aquarium"
- weight = 6
- value = 750
- duration = 60 MINUTES
- val_mod_range = 0.2
- container_type = /obj/item/storage/fish_case/mission
-
-/datum/mission/acquire/aquarium/New(...)
- objective_type = pick(/obj/item/fish/clownfish,
- /obj/item/fish/pufferfish,
- /obj/item/fish/cardinal,
- /obj/item/fish/greenchromis,
- /obj/item/fish/trout,
- /obj/item/fish/salmon,
- /obj/item/fish/dwarf_moonfish,
- /obj/item/fish/gunner_jellyfish,
- /obj/item/fish/plasmatetra,
- /obj/item/fish/catfish,
- /obj/item/fish/bass,
- /obj/item/fish/armorfish,
- /obj/item/fish/needlefish)
- desc = "My aquarium is sorely lacking in [initial(objective_type.name)], can you please bring one to me? \
- Don't worry about if it's alive or dead, I have methods."
- . = ..()
-
-/datum/mission/acquire/aquarium/rare
- name = "Rare fish needed for my aquarium!"
- weight = 1
- value = 1500
- val_mod_range = 0.3
-
-/datum/mission/acquire/aquarium/rare/New(...)
- . = ..()
- objective_type = pick(/obj/item/fish/lanternfish,
- /obj/item/fish/firefish,
- /obj/item/fish/donkfish)
- desc = "I seek to make my beloved aquarium truly spectacular, and to do this I need only the finest fish! \
- Bring me a [initial(objective_type.name)] and I will reward you handsomely."
-
-/datum/mission/acquire/aquarium/sabatoge
- name = "That bastard has had it good for too long!"
- weight = 1
+/datum/mission/acquire/bounty
+ name = "Hunt down Frontiersmen Dogtags"
+ desc = "CLIP has assigned us to offer out bounties to hunt down Frontiersman cells and turn in their dogtags. We'll reward you well."
+ weight = 4
value = 3000
duration = 100 MINUTES
+ dur_mod_range = 0.2
+ container_type = /obj/item/storage/toolbox/bounty/hunt
+ objective_type = /obj/item/clothing/neck/dogtag/frontier
+ num_wanted = 3
-/datum/mission/acquire/aquarium/sabatoge/New(...)
- . = ..()
- desc = "My arch-nemesis [pick("Rutherford","Baldwin","Anderson","Percival")] thinks his aquarium is so much better than mine, I'll show him! \
- Bring me an emulsijack, and make sure it's alive!"
- objective_type = pick(/obj/item/fish/emulsijack)
+/datum/mission/acquire/bounty/ramzi
+ name = "Hunt down Ramzi Clique Dogtags"
+ desc = "Gezena has assigned us to offer out bounties to hunt down Ramzi Clique outfits and turn in their dogtags. We'll reward you well."
+ weight = 3
+ value = 4000
+ duration = 120 MINUTES
+ dur_mod_range = 0.1
+ container_type = /obj/item/storage/toolbox/bounty/hunt
+ objective_type = /obj/item/clothing/neck/dogtag/ramzi
+ num_wanted = 3
+
+/datum/mission/acquire/salvage
+ name = "Deliver Protolathe"
+ desc = "The Nanotrasen Corporation is contracting out to have scientific equipment returned. Looking for a rare circuitboard (R&D Console, Protolathe, Circuit Imprinter) of any type."
+ weight = 2
+ value = 4000
+ duration = 120 MINUTES
+ dur_mod_range = 0.3
+ container_type = /obj/item/storage/toolbox/bounty/salvage
+ objective_type = /obj/item/circuitboard/machine/protolathe
+ num_wanted = 1
-/datum/mission/acquire/fish_cook
- name = "Fish needed for my meal"
+/datum/mission/acquire/salvage/console
+ name = "Deliver R&D Console"
+ desc = "The Nanotrasen Corporation is contracting out to have scientific equipment returned. Looking for a rare circuitboard (R&D Console, Protolathe, Circuit Imprinter) of any type."
weight = 3
- duration = 40 MINUTES
+ value = 2500
+ duration = 120 MINUTES
+ dur_mod_range = 0.3
+ container_type = /obj/item/storage/toolbox/bounty/salvage
+ objective_type = /obj/item/circuitboard/computer/rdconsole
+ num_wanted = 1
+
+/*
+ Acquire: Fishing
+*/
+
+/datum/mission/acquire/fish
+ name = "Fish needed for my meal"
+ weight = 2
+ duration = 60 MINUTES
val_mod_range = 0.2
objective_type = /obj/item/fish
- container_type = /obj/item/storage/fish_case/mission/big
+ container_type = /obj/item/storage/fish_case/mission
-/datum/mission/acquire/fish_cook/New(...)
+/datum/mission/acquire/fish/New(...)
num_wanted = rand(1,3)
desc = "I am a chef in need of [num_wanted] fish for my latest dish. Any fish will do, just make sure they're not filleted!"
- value = (250*num_wanted)
+ value = (500*num_wanted)
. = ..()
/datum/mission/acquire/fish/alive/atom_effective_count(atom/movable/target)
@@ -338,13 +306,9 @@ Acquire: Anomaly
/obj/item/storage/fish_case/mission
name = "fish delivery case"
- desc = "A stasis case that keeps fish alive during transportation, or at least stops them from becoming more dead."
-
-/obj/item/storage/fish_case/mission/big
- name = "large fish delivery case"
desc = "A specialized container for the delivering of large quatities of fish. Guarantees they stay fresh during delivery!."
-/obj/item/storage/fish_case/mission/big/ComponentInitialize()
+/obj/item/storage/fish_case/mission/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 3
diff --git a/code/modules/overmap/objects/dynamic_datum.dm b/code/modules/overmap/objects/dynamic_datum.dm
index 1ca28df922aac..ad7d5007ca6db 100644
--- a/code/modules/overmap/objects/dynamic_datum.dm
+++ b/code/modules/overmap/objects/dynamic_datum.dm
@@ -128,7 +128,7 @@
probabilities = list()
for(var/datum/planet_type/planet_type as anything in subtypesof(/datum/planet_type))
probabilities[initial(planet_type.planet)] = initial(planet_type.weight)
- planet = SSmapping.planet_types[force_encounter ? force_encounter : pickweightAllowZero(probabilities)]
+ planet = SSmapping.planet_types[force_encounter ? force_encounter : pick_weight_allow_zero(probabilities)]
if(planet.planet !=DYNAMIC_WORLD_ASTEROID && planet.planet != DYNAMIC_WORLD_SPACERUIN) //these aren't real planets
@@ -192,7 +192,7 @@
log_shuttle("[src] [REF(src)] LEVEL_INIT")
// use the ruin type in template if it exists, or pick from ruin list if IT exists; otherwise null
- var/selected_ruin = template || (ruin_type ? pickweightAllowZero(SSmapping.ruin_types_probabilities[ruin_type]) : null)
+ var/selected_ruin = template || (ruin_type ? pick_weight_allow_zero(SSmapping.ruin_types_probabilities[ruin_type]) : null)
var/list/dynamic_encounter_values = SSovermap.spawn_dynamic_encounter(src, selected_ruin)
if(!length(dynamic_encounter_values))
return FALSE
diff --git a/code/modules/overmap/objects/event_datum.dm b/code/modules/overmap/objects/event_datum.dm
index d798fd74778a7..6e1a40f40d97c 100644
--- a/code/modules/overmap/objects/event_datum.dm
+++ b/code/modules/overmap/objects/event_datum.dm
@@ -41,7 +41,7 @@
/datum/overmap/event/meteor
name = "asteroid field (moderate)"
desc = "An area of space rich with asteroids, going fast through here could prove dangerous"
- token_icon_state = "meteor1"
+ token_icon_state = "meteor_moderate1"
chance_to_affect = 15
spread_chance = 50
chain_rate = 4
@@ -55,10 +55,20 @@
/datum/overmap/event/meteor/Initialize(position, ...)
. = ..()
- token.icon_state = "meteor[rand(1, 4)]"
+ switch(type) //woop! this picks one of two icon states for the severity of the storm in overmap.dmi
+ if(/datum/overmap/event/meteor/minor)
+ token.icon_state = "meteor_minor[rand(1, 2)]"
+ if(/datum/overmap/event/meteor)
+ token.icon_state = "meteor_moderate[rand(1, 2)]"
+ if(/datum/overmap/event/meteor/major)
+ token.icon_state = "meteor_major[rand(1, 2)]"
+ else
+ token.icon_state = "meteor_moderate1"
token.color = "#a08444"
token.light_color = "#a08444"
token.update_appearance()
+ if(safe_speed)
+ token.desc += " You can safely navigate through this if your ship is travelling under [safe_speed] Gm/s."
/datum/overmap/event/meteor/apply_effect()
for(var/datum/overmap/ship/controlled/Ship in get_nearby_overmap_objects())
@@ -133,7 +143,7 @@
/datum/overmap/event/electric
name = "electrical storm (moderate)"
desc = "A spatial anomaly, an unfortunately common sight on the frontier. Disturbing it tends to lead to intense electrical discharges"
- token_icon_state = "electrical1"
+ token_icon_state = "electrical_moderate1"
chance_to_affect = 15
spread_chance = 30
chain_rate = 3
@@ -143,7 +153,16 @@
/datum/overmap/event/electric/Initialize(position, ...)
. = ..()
- token.icon_state = "electrical[rand(1, 4)]"
+ switch(type) //woop! this picks one of two icon states for the severity of the storm in overmap.dmi
+ if(/datum/overmap/event/electric/minor)
+ token.icon_state = "electrical_minor[rand(1, 2)]"
+ if(/datum/overmap/event/electric)
+ token.icon_state = "electrical_moderate[rand(1, 2)]"
+ if(/datum/overmap/event/electric/major)
+ token.icon_state = "electrical_major[rand(1, 2)]"
+ else
+ token.icon_state = "electrical_moderate1"
+
token.color = "#e8e85c"
token.light_color = "#e8e85c"
token.update_appearance()
@@ -218,7 +237,7 @@
/datum/overmap/event/meteor/carp
name = "carp migration (moderate)"
desc = "A migratory school of space carp. They travel at high speeds, and flying through them may cause them to impact your ship"
- token_icon_state = "carp1"
+ token_icon_state = "carp_moderate1"
chance_to_affect = 15
spread_chance = 50
chain_rate = 4
@@ -230,7 +249,16 @@
/datum/overmap/event/meteor/carp/Initialize(position, ...)
. = ..()
- token.icon_state = "carp[rand(1, 4)]"
+ switch(type) //woop! this picks one of two icon states for the severity of the storm in overmap.dmi
+ if(/datum/overmap/event/meteor/carp/minor)
+ token.icon_state = "carp_minor[rand(1, 2)]"
+ if(/datum/overmap/event/meteor/carp)
+ token.icon_state = "carp_moderate[rand(1, 2)]"
+ if(/datum/overmap/event/meteor/carp/major)
+ token.icon_state = "carp_major[rand(1, 2)]"
+ else
+ token.icon_state = "carp_moderate1"
+
token.color = "#7b1ca8"
token.light_color = "#7b1ca8"
token.update_icon()
@@ -238,7 +266,7 @@
/datum/overmap/event/meteor/carp/minor
name = "carp migration (minor)"
- token_icon_state = "carp1"
+ token_icon_state = "carp_moderate1"
chance_to_affect = 5
spread_chance = 25
chain_rate = 4
@@ -249,7 +277,7 @@
/datum/overmap/event/meteor/carp/major
name = "carp migration (major)"
- token_icon_state = "carp1"
+ token_icon_state = "carp_moderate1"
chance_to_affect = 25
spread_chance = 25
chain_rate = 4
@@ -263,7 +291,7 @@
/datum/overmap/event/meteor/dust
name = "dust cloud"
desc = "A cloud of spaceborne dust. Relatively harmless, unless you're travelling at relative speeds"
- token_icon_state = "carp1"
+ token_icon_state = "dust1"
chance_to_affect = 30
spread_chance = 50
chain_rate = 4
@@ -297,7 +325,7 @@
/datum/overmap/event/anomaly/affect_ship(datum/overmap/ship/controlled/S)
var/area/source_area = pick(S.shuttle_port.shuttle_areas)
var/source_object = pick(source_area.contents)
- new /obj/effect/spawner/lootdrop/anomaly/storm(get_turf(source_object))
+ new /obj/effect/spawner/random/anomaly/storm(get_turf(source_object))
for(var/mob/M as anything in GLOB.player_list)
if(S.shuttle_port.is_in_shuttle_bounds(M))
M.playsound_local(S.shuttle_port, 'sound/effects/bamf.ogg', 100)
diff --git a/code/modules/overmap/objects/outpost/outpost.dm b/code/modules/overmap/objects/outpost/outpost.dm
index 01a100022cbf8..09e1164917259 100644
--- a/code/modules/overmap/objects/outpost/outpost.dm
+++ b/code/modules/overmap/objects/outpost/outpost.dm
@@ -41,6 +41,12 @@
var/max_missions = 15
/// List of missions that can be accepted at this outpost. Missions which have been accepted are removed from this list.
var/list/datum/mission/missions
+ /// List of all of the things this outpost offers
+ var/list/supply_packs = list()
+ /// our 'Order number'
+ var/ordernum = 1
+ /// Our faction of the outpost
+ var/datum/faction/faction
/datum/overmap/outpost/Initialize(position, ...)
. = ..()
@@ -64,6 +70,7 @@
Rename(gen_outpost_name())
fill_missions()
+ populate_cargo()
addtimer(CALLBACK(src, PROC_REF(fill_missions)), 10 MINUTES, TIMER_STOPPABLE|TIMER_LOOP|TIMER_DELETE_ME)
/datum/overmap/outpost/Destroy(...)
@@ -139,6 +146,17 @@
var/datum/mission/M = new mission_type(src)
LAZYADD(missions, M)
+/datum/overmap/outpost/proc/populate_cargo()
+ ordernum = rand(1, 99000)
+
+ for(var/datum/supply_pack/current_pack as anything in subtypesof(/datum/supply_pack))
+ current_pack = new current_pack()
+ if(current_pack.faction)
+ current_pack.faction = new current_pack.faction()
+ if(!current_pack.contains)
+ continue
+ supply_packs += current_pack
+
/datum/overmap/outpost/proc/load_main_level()
if(!main_template)
CRASH("[src] ([src.type]) tried to load without a template!")
diff --git a/code/modules/overmap/objects/outpost/outpost_types.dm b/code/modules/overmap/objects/outpost/outpost_types.dm
index 044ff026c3962..32677d415aa7c 100644
--- a/code/modules/overmap/objects/outpost/outpost_types.dm
+++ b/code/modules/overmap/objects/outpost/outpost_types.dm
@@ -57,37 +57,6 @@
dock_width = 56
dock_height = 40
-/*
- Nanotrasen Ice Asteroid
-*/
-/datum/map_template/outpost/nt_asteroid
- name = "nanotrasen_asteroid"
-
-/datum/map_template/outpost/hangar/nt_asteroid_20x20
- name = "hangar/nt_asteroid_20x20"
- dock_width = 20
- dock_height = 20
-
-/datum/map_template/outpost/hangar/nt_asteroid_40x20
- name = "hangar/nt_asteroid_40x20"
- dock_width = 40
- dock_height = 20
-
-/datum/map_template/outpost/hangar/nt_asteroid_40x40
- name = "hangar/nt_asteroid_40x40"
- dock_width = 40
- dock_height = 40
-
-/datum/map_template/outpost/hangar/nt_asteroid_56x20
- name = "hangar/nt_asteroid_56x20"
- dock_width = 56
- dock_height = 20
-
-/datum/map_template/outpost/hangar/nt_asteroid_56x40
- name = "hangar/nt_asteroid_56x40"
- dock_width = 56
- dock_height = 40
-
/*
Nanotrasen Ice Planet
*/
@@ -128,20 +97,7 @@
main_template = /datum/map_template/outpost/indie_space
elevator_template = /datum/map_template/outpost/elevator_indie
// Uses "default" hangars (indie_space).
-/*
-/datum/overmap/outpost/nanotrasen_asteroid
- token_icon_state = "station_asteroid_0"
- main_template = /datum/map_template/outpost/nt_asteroid
- elevator_template = /datum/map_template/outpost/elevator_test
- // Using a second list of hangar templates.
- hangar_templates = list(
- /datum/map_template/outpost/hangar/nt_asteroid_20x20,
- /datum/map_template/outpost/hangar/nt_asteroid_40x20,
- /datum/map_template/outpost/hangar/nt_asteroid_40x40,
- /datum/map_template/outpost/hangar/nt_asteroid_56x20,
- /datum/map_template/outpost/hangar/nt_asteroid_56x40
- )
-*/
+
/datum/overmap/outpost/nanotrasen_ice
token_icon_state = "station_asteroid_0"
main_template = /datum/map_template/outpost/nanotrasen_ice
@@ -153,6 +109,7 @@
/datum/map_template/outpost/hangar/nt_ice_56x20,
/datum/map_template/outpost/hangar/nt_ice_56x40
)
+ faction = /datum/faction/nt
/datum/overmap/outpost/no_main_level // For example and adminspawn.
main_template = null
diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm
index efa4e36026c06..cdd86ae2b0b5b 100644
--- a/code/modules/overmap/ships/controlled_ship_datum.dm
+++ b/code/modules/overmap/ships/controlled_ship_datum.dm
@@ -78,6 +78,7 @@
return FALSE
message_admins("[key_name_admin(usr)] renamed vessel '[oldname]' to '[new_name]'")
log_admin("[key_name(src)] has renamed vessel '[oldname]' to '[new_name]'")
+ SSblackbox.record_feedback("text", "ship_renames", 1, new_name)
shuttle_port?.name = new_name
ship_account.account_holder = new_name
if(shipkey)
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index 0bf0a3eb51d31..c0b137ca23006 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -7,6 +7,7 @@
power_channel = AREA_USAGE_EQUIP
max_integrity = 100
pass_flags = PASSTABLE
+ pixel_y = 6
circuit = /obj/item/circuitboard/machine/fax
/// The unique ID by which the fax will build a list of existing faxes.
var/fax_id
@@ -31,7 +32,11 @@
/// List of types which should always be allowed to be faxed
var/static/list/allowed_types = list(
/obj/item/paper,
- /obj/item/photo
+ /obj/item/photo,
+ /obj/item/holochip,
+ /obj/item/folder/biscuit,
+ /obj/item/spacecash,
+ /obj/item/documents,
)
/// List of types which should be allowed to be faxed if hacked
var/static/list/exotic_types = list(
@@ -45,10 +50,7 @@
/obj/item/reagent_containers/food/snacks/raisincookie,
/obj/item/reagent_containers/food/snacks/pancakes,
/obj/item/throwing_star,
- /obj/item/spacecash,
- /obj/item/holochip,
/obj/item/card,
- /obj/item/folder/biscuit
)
/// Internal radio for announcing over comms
var/obj/item/radio/radio
@@ -65,6 +67,7 @@
list(fax_name = "Solarian Confederation Frontier Affairs", fax_id = "solgov", color = "teal", emag_needed = FALSE),
list(fax_name = "Roumain Council of Huntsmen", fax_id = "roumain", color = "brown", emag_needed = FALSE),
list(fax_name = "Confederated League Leadership", fax_id = "minutemen", color = "blue", emag_needed = FALSE),
+ list(fax_name = "PGF Military High Command", fax_id = "gezena", color = "olive", emag_needed = FALSE),
list(fax_name = "Syndicate Coalition Coordination Center", fax_id = "syndicate", color = "red", emag_needed = FALSE),
list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE)
)
@@ -558,6 +561,13 @@
list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE)
)
+/obj/machinery/fax/pgf
+ special_networks = list(
+ list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE),
+ list(fax_name = "PGF Military High Command", fax_id = "gezena", color = "olive", emag_needed = FALSE),
+ list(fax_name = "Frontiersmen Communications Quartermaster", fax_id = "frontiersmen", color = "black", emag_needed = TRUE)
+ )
+
/obj/machinery/fax/admin
name = "Central Command Fax Machine"
@@ -596,6 +606,11 @@
fax_name = "Saint-Roumain Council of Huntsmen"
admin_fax_id = "roumain"
+/obj/machinery/fax/admin/pgf
+ name = "PGF Military High Command Fax Machine"
+ fax_name = "PGF Military High Command"
+ admin_fax_id = "gezena"
+
/obj/machinery/fax/admin/frontiersmen
name = "old fax machine"
fax_name = "Frontiersmen Communications Quartermaster"
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index ad18b2bcd0b4c..71112e012f777 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -12,7 +12,9 @@
var/static/list/folder_insertables = typecacheof(list(
/obj/item/paper,
/obj/item/photo,
- /obj/item/documents
+ /obj/item/documents,
+ /obj/item/disk,
+ /obj/item/tape,
))
/obj/item/folder/Initialize()
diff --git a/code/modules/paperwork/folders_premade.dm b/code/modules/paperwork/folders_premade.dm
index 48b7cb7637853..e8f092f771617 100644
--- a/code/modules/paperwork/folders_premade.dm
+++ b/code/modules/paperwork/folders_premade.dm
@@ -61,6 +61,10 @@
/obj/item/folder/documents/syndicate/mining
document = /obj/item/documents/syndicate/mining
+/obj/item/folder/documents/syndicate/ngr
+ document = /obj/item/documents/syndicate/ngr
+ icon_state = "folder_ngr"
+
/obj/item/folder/documents/solgov
document = /obj/item/documents/solgov
desc = "A blue folder with a SolGov seal."
@@ -77,3 +81,15 @@
/obj/item/folder/suns/red
icon_state = "folder_sunsred" // i'm not sure why SUNS would need secret documents
+
+//pgf folders
+
+/obj/item/folder/pgf
+ desc = "A green folder with Pan Gezenan Federation iconography."
+ icon_state = "folder_pgf"
+
+/obj/item/folder/pgf/red
+ icon_state = "folder_pgfred"
+
+/obj/item/folder/pgf/blue
+ icon_state = "folder_pgfblue"
diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm
index 89cc40517a5fd..81c84d0b28f41 100644
--- a/code/modules/paperwork/paper_premade.dm
+++ b/code/modules/paperwork/paper_premade.dm
@@ -112,3 +112,12 @@
name = "URGENT!"
default_raw_text = "A hastily written note has been scribbled here...
Please use the ore redemption machine in the cargo office for smelting. PLEASE!
--The Research Staff"
+//////////// Ruins
+
+/obj/item/paper/crumpled/bloody/fluff/ruin/icemoon/cellar_warning
+ name = "\improper Scrawled Note"
+ default_raw_text = "
HEY! YOU.
Yeah. You. One of the Hunters got away and holed up in the cellar and set up a whole bunch of traps. Crazy asshole has already killed like four of our guys in the murder basement. So boss says keep the door sealed and let the prick starve.