Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

2026-08-23 21:27:23 +01:00 · 2020-06-02 22:20:48 -03:00
parent c5f41e39ac d53dca7322
commit c5f4caffcc
83 changed files with 245176 additions and 352 deletions
@@ -23380,7 +23380,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -32
 	},
-/obj/item/paper/guides/cogstation/letter_sec,
+/obj/item/paper/fluff/cogstation/secsolars,
 /turf/open/floor/plasteel,
 /area/security/main)
 "aYJ" = (
@@ -27342,13 +27342,16 @@
 /turf/open/floor/plasteel,
 /area/security/courtroom)
 "bhA" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/delivery,
-/obj/structure/disposalpipe/trunk{
-	dir = 4
+/obj/item/stack/cable_coil/red,
+/obj/item/multitool,
+/obj/item/wrench,
+/obj/item/stack/sheet/metal/five{
+	pixel_x = 6;
+	pixel_y = -6
 	},
-/turf/open/floor/plasteel,
-/area/quartermaster/sorting)
+/obj/item/paper/fluff/cogstation/letter_arrd,
+/turf/open/floor/plating,
+/area/maintenance/disposal)
 "bhB" = (
 /obj/structure/table/wood,
 /obj/item/stack/packageWrap,
@@ -28343,6 +28346,7 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
+/obj/item/paper/guides/cogstation/letter_atmos,
 /turf/open/floor/plasteel/dark/corner{
 	dir = 1
 	},
@@ -34940,15 +34944,19 @@
 	},
 /area/maintenance/disposal)
 "bxz" = (
-/obj/item/stack/cable_coil/red,
-/obj/item/multitool,
-/obj/item/wrench,
-/obj/item/stack/sheet/metal/five{
-	pixel_x = 6;
-	pixel_y = -6
+/obj/effect/turf_decal/tile/yellow{
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/maintenance/disposal)
+/obj/machinery/computer/station_alert,
+/obj/structure/sign/poster/official/safety_eye_protection{
+	pixel_y = 32
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/item/paper/guides/cogstation/letter_eng,
+/turf/open/floor/plasteel,
+/area/engine/break_room)
 "bxA" = (
 /obj/machinery/announcement_system,
 /turf/open/floor/plasteel/dark,
@@ -43875,14 +43883,19 @@
 /turf/open/floor/plasteel/dark,
 /area/science/robotics/lab)
 "bQq" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/tile/yellow{
+	dir = 1
 	},
-/obj/effect/landmark/event_spawn,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 8
+/obj/effect/turf_decal/tile/yellow,
+/obj/structure/table/wood,
+/obj/machinery/airalarm{
+	pixel_y = 24
 	},
+/obj/item/modular_computer/laptop/preset/civilian,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/item/paper/guides/cogstation/letter_atmos,
 /turf/open/floor/plasteel,
 /area/engine/break_room)
 "bQr" = (
@@ -51737,27 +51750,17 @@
 /turf/open/floor/plasteel,
 /area/engine/atmos)
 "cfU" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/landmark/event_spawn,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/yellow,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/book/manual/wiki/cit/chem_recipies,
-/obj/item/book/manual/wiki/cit/chemistry{
-	pixel_x = 2;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/dropper,
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/chemistry)
+/obj/item/beacon,
+/turf/open/floor/plasteel,
+/area/engine/break_room)
 "cfV" = (
 /obj/machinery/door/airlock/external{
 	name = "Atmospherics External Airlock";
@@ -57026,18 +57029,18 @@
 /turf/open/floor/plasteel,
 /area/engine/break_room)
 "cqt" = (
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/delivery,
+/obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
-/obj/machinery/computer/station_alert,
-/obj/structure/sign/poster/official/safety_eye_protection{
-	pixel_y = 32
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
+/obj/structure/noticeboard/qm{
+	dir = 4;
+	icon_state = "nboard00";
+	pixel_x = -32
 	},
 /turf/open/floor/plasteel,
-/area/engine/break_room)
+/area/quartermaster/sorting)
 "cqu" = (
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
@@ -57106,20 +57109,28 @@
 /turf/open/floor/plasteel,
 /area/engine/break_room)
 "cqz" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
 /obj/effect/turf_decal/tile/yellow{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/yellow,
-/obj/structure/table/wood,
-/obj/machinery/airalarm{
-	pixel_y = 24
+/obj/item/clothing/gloves/color/latex,
+/obj/item/book/manual/wiki/cit/chem_recipies,
+/obj/item/book/manual/wiki/cit/chemistry{
+	pixel_x = 2;
+	pixel_y = -3
 	},
-/obj/item/modular_computer/laptop/preset/civilian,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/engine/break_room)
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
+/obj/item/paper/fluff/cogstation/chemists,
+/obj/item/reagent_containers/dropper,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
 "cqA" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -96465,7 +96476,7 @@ bBQ
 csV
 bIe
 bYB
-cfU
+cqz
 bIM
 cvt
 cmS
@@ -109285,7 +109296,7 @@ asR
 aSK
 aSr
 aeI
-cqt
+bxz
 bwP
 cBn
 cBH
@@ -110315,7 +110326,7 @@ aUf
 aeI
 bnp
 cmO
-bQq
+cfU
 cmm
 cri
 cdH
@@ -111598,7 +111609,7 @@ aRR
 cpj
 aSr
 aeI
-cqz
+bQq
 cqI
 bQM
 cdl
@@ -114945,7 +114956,7 @@ bbV
 bjf
 bkh
 blu
-bbV
+ciI
 ccZ
 cgs
 cxo
@@ -116742,7 +116753,7 @@ cPH
 bfU
 bFD
 bgO
-bhA
+cqt
 bUQ
 cvj
 cDg
@@ -117990,7 +118001,7 @@ bwb
 aMs
 cAb
 cAl
-bxz
+bhA
 bgP
 bzO
 caD
@@ -0,0 +1,224 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"c" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Arrivals Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"d" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"e" = (
+/obj/structure/closet/wardrobe/black,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"f" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"g" = (
+/obj/machinery/computer/arcade,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"h" = (
+/obj/structure/closet/wardrobe/grey,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"i" = (
+/obj/structure/closet/wardrobe/green,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"j" = (
+/obj/machinery/requests_console{
+	department = "Arrival shuttle";
+	name = "Arrivals Shuttle console";
+	pixel_y = 30
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"k" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"m" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/closet/wardrobe/mixed,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"n" = (
+/obj/docking_port/mobile/arrivals{
+	name = "Snaxi Arrivals Shuttle"
+	},
+/obj/structure/shuttle/engine/propulsion/burst/right{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"o" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular,
+/obj/machinery/light/small,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"p" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/emergency,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"q" = (
+/obj/machinery/light,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"r" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/arrival)
+"s" = (
+/obj/item/radio/intercom{
+	name = "Station Intercom (General)";
+	pixel_y = -29
+	},
+/obj/machinery/light,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"x" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"z" = (
+/obj/structure/shuttle/engine/propulsion/burst/right{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+
+(1,1,1) = {"
+a
+b
+d
+d
+d
+b
+a
+"}
+(2,1,1) = {"
+b
+b
+r
+r
+r
+b
+b
+"}
+(3,1,1) = {"
+b
+h
+f
+f
+f
+o
+b
+"}
+(4,1,1) = {"
+b
+i
+r
+r
+r
+p
+b
+"}
+(5,1,1) = {"
+b
+e
+f
+f
+f
+x
+b
+"}
+(6,1,1) = {"
+b
+m
+r
+r
+r
+q
+b
+"}
+(7,1,1) = {"
+d
+g
+f
+f
+f
+f
+d
+"}
+(8,1,1) = {"
+c
+f
+r
+r
+r
+f
+c
+"}
+(9,1,1) = {"
+c
+f
+f
+f
+f
+f
+c
+"}
+(10,1,1) = {"
+b
+j
+r
+r
+r
+s
+b
+"}
+(11,1,1) = {"
+b
+k
+k
+k
+k
+k
+b
+"}
+(12,1,1) = {"
+b
+z
+z
+n
+z
+z
+b
+"}
@@ -342,11 +342,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/eva)
-"aN" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/turf_decal/bot_white,
-/turf/open/floor/plasteel/dark,
-/area/shuttle/syndicate/eva)
 "aO" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
@@ -385,8 +380,9 @@
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/syndicate/eva)
 "aS" = (
-/obj/structure/tank_dispenser/oxygen,
 /obj/effect/turf_decal/bot_white,
+/obj/vehicle/ridden/atv/snowmobile,
+/obj/item/key,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/eva)
 "aT" = (
@@ -1172,15 +1168,37 @@
 	},
 /turf/closed/wall/r_wall/syndicate,
 /area/shuttle/syndicate/armory)
+"gZ" = (
+/obj/effect/turf_decal/bot_white,
+/obj/vehicle/ridden/atv/snowmobile,
+/obj/item/key,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/airlock)
 "pd" = (
 /obj/machinery/porta_turret/syndicate/shuttle{
 	dir = 5
 	},
 /turf/closed/wall/r_wall/syndicate,
 /area/shuttle/syndicate/bridge)
-"vv" = (
-/obj/structure/reagent_dispensers/fueltank,
+"qk" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
 /obj/effect/turf_decal/bot_white,
+/obj/vehicle/ridden/atv/snowmobile,
+/obj/item/key,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/airlock)
+"vv" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/eva)
 "In" = (
@@ -1195,6 +1213,14 @@
 	},
 /turf/closed/wall/r_wall/syndicate,
 /area/shuttle/syndicate/medical)
+"Sz" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/syndicate/armory)

 (1,1,1) = {"
 aa
@@ -1330,7 +1356,7 @@ ac
 ad
 aa
 ax
-aN
+aS
 aS
 aU
 aZ
@@ -1480,7 +1506,7 @@ ac
 In
 aa
 aB
-aO
+gZ
 aO
 aX
 bc
@@ -1505,7 +1531,7 @@ ac
 aa
 aa
 aB
-aP
+qk
 aP
 aP
 aP
@@ -1530,7 +1556,7 @@ aa
 aa
 aa
 aB
-aP
+qk
 aP
 aP
 aP
@@ -1587,7 +1613,7 @@ bd
 aB
 bm
 bB
-bG
+Sz
 bQ
 bX
 ci
@@ -0,0 +1,116 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/snowtaxi)
+"b" = (
+/obj/structure/shuttle/engine/propulsion/burst{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/fans/tiny/invisible,
+/turf/open/floor/plating,
+/area/shuttle/snowtaxi)
+"c" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Mining Shuttle Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/snowtaxi)
+"e" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/structure/fans/tiny/invisible,
+/turf/open/floor/plating,
+/area/shuttle/snowtaxi)
+"f" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/snowtaxi)
+"g" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Mining Shuttle Airlock"
+	},
+/obj/docking_port/mobile{
+	dwidth = 3;
+	height = 4;
+	id = "snow_taxi";
+	name = "snow taxi";
+	port_direction = 8;
+	width = 6
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/snowtaxi)
+"i" = (
+/obj/machinery/light,
+/obj/machinery/computer/shuttle/snow_taxi{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/snowtaxi)
+"j" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/snowtaxi)
+"k" = (
+/turf/open/floor/mineral/titanium,
+/area/shuttle/snowtaxi)
+"l" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/structure/fans/tiny/invisible,
+/turf/open/floor/plating/airless,
+/area/shuttle/snowtaxi)
+"u" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/snowtaxi)
+
+(1,1,1) = {"
+a
+e
+e
+a
+"}
+(2,1,1) = {"
+a
+f
+i
+a
+"}
+(3,1,1) = {"
+e
+u
+j
+l
+"}
+(4,1,1) = {"
+c
+k
+k
+g
+"}
+(5,1,1) = {"
+a
+u
+j
+a
+"}
+(6,1,1) = {"
+a
+b
+b
+a
+"}
@@ -0,0 +1 @@
+#define FORCE_MAP "_maps/snaxi.json"
@@ -0,0 +1,49 @@
+{
+   "map_name":"Snow Taxi",
+   "map_path":"map_files/Snaxi",
+   "map_file":[
+      "IcemoonUnderground_Below.dmm",
+      "IcemoonUnderground_Above.dmm",
+      "Snaxi.dmm"
+   ],
+   "station_ruin_budget":0,
+   "space_ruin_levels":0,
+   "space_empty_levels":0,
+   "shuttles":{
+      "cargo":"cargo_box",
+      "ferry":"ferry_fancy",
+      "whiteship":"whiteship_box",
+      "emergency":"emergency_box"
+   },
+   "traits":[
+      {
+         "Up":1,
+		 "Station":0,
+         "Mining":true,
+         "Linkage":null,
+         "Gravity":true,
+         "Ice Ruins Underground":true,
+         "Baseturf":"/turf/open/lava/plasma/ice_moon"
+      },
+      {
+         "Down":-1,
+         "Up":1,
+		 "Station":0,
+         "Mining":true,
+         "Linkage":null,
+         "Gravity":true,
+         "Ice Ruins Underground":true,
+         "Baseturf":"/turf/open/openspace/icemoon"
+      },
+      {
+         "Down":-1,
+         "Mining":true,
+         "Linkage":null,
+         "Gravity":true,
+         "Ice Ruins":true,
+         "Weather_Snowstorm":true,
+         "Baseturf":"/turf/open/floor/plating/asteroid/snow/icemoon"
+      }
+   ],
+   "minetype":"none"
+} 
@@ -61,10 +61,18 @@
 #define CHECK_STAMCRIT(mob)					((mob.combat_flags & COMBAT_FLAG_HARD_STAMCRIT)? HARD_STAMCRIT : ((mob.combat_flags & COMBAT_FLAG_SOFT_STAMCRIT)? SOFT_STAMCRIT : NOT_STAMCRIT))

 //stamina stuff
-#define STAMINA_SOFTCRIT					100 //softcrit for stamina damage. prevents standing up, prevents performing actions that cost stamina, etc, but doesn't force a rest or stop movement
-#define STAMINA_CRIT						140 //crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit
-#define STAMINA_SOFTCRIT_TRADITIONAL		0	//same as STAMINA_SOFTCRIT except for the more traditional health calculations
-#define STAMINA_CRIT_TRADITIONAL			-40 //ditto, but for STAMINA_CRIT
+///Threshold over which attacks start being hindered.
+#define STAMINA_NEAR_SOFTCRIT				90
+///softcrit for stamina damage. prevents standing up, some actions that cost stamina, etc, but doesn't force a rest or stop movement
+#define STAMINA_SOFTCRIT					100
+///sanity cap to prevent stamina actions (that are still performable) from sending you into crit.
+#define STAMINA_NEAR_CRIT					130
+///crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit
+#define STAMINA_CRIT						140
+///same as STAMINA_SOFTCRIT except for the more traditional health calculations
+#define STAMINA_SOFTCRIT_TRADITIONAL		0
+///ditto, but for STAMINA_CRIT
+#define STAMINA_CRIT_TRADITIONAL			-40

 #define CRAWLUNDER_DELAY							30 //Delay for crawling under a standing mob

@@ -182,6 +190,9 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define EGUN_SELFCHARGE 1
 #define EGUN_SELFCHARGE_BORG 2

+///Time to spend without clicking on other things required for your shots to become accurate.
+#define GUN_AIMING_TIME (2 SECONDS)
+
 //Object/Item sharpness
 #define IS_BLUNT			0
 #define IS_SHARP			1
@@ -249,6 +260,21 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define STAM_COST_W_CLASS_MULT		1.25
 #define STAM_COST_THROW_MULT		2

+///Multiplier of the (STAMINA_NEAR_CRIT - user current stamina loss) : (STAMINA_NEAR_CRIT - STAMINA_SOFTCRIT) ratio used in damage penalties when stam soft-critted.
+#define STAM_CRIT_ITEM_ATTACK_PENALTY	0.66
+/// changeNext_move penalty multiplier of the above.
+#define STAM_CRIT_ITEM_ATTACK_DELAY		1.75
+/// Damage penalty when fighting prone.
+#define LYING_DAMAGE_PENALTY			0.5
+/// Added delay when firing guns stam-softcritted. Summed with a hardset CLICK_CD_RANGE delay, similar to STAM_CRIT_DAMAGE_DELAY otherwise.
+#define STAM_CRIT_GUN_DELAY			2.75
+
+/**
+  * should the current-attack-damage be lower than the item force multiplied by this value,
+  * a "inefficiently" prefix will be added to the message.
+  */
+#define INEFFICIENT_ATTACK_MSG_THRESHOLD 0.7
+

 //bullet_act() return values
 #define BULLET_ACT_HIT				"HIT"		//It's a successful hit, whatever that means in the context of the thing it's hitting.
@@ -18,18 +18,29 @@
 // Flags for the item_flags var on /obj/item

 #define BEING_REMOVED						(1<<0)
-#define IN_INVENTORY						(1<<1)	//is this item equipped into an inventory slot or hand of a mob? used for tooltips
-#define FORCE_STRING_OVERRIDE				(1<<2)	//used for tooltips
-#define NEEDS_PERMIT						(1<<3)	//Used by security bots to determine if this item is safe for public use.
+///is this item equipped into an inventory slot or hand of a mob? used for tooltips
+#define IN_INVENTORY						(1<<1)
+///used for tooltips
+#define FORCE_STRING_OVERRIDE				(1<<2)
+///Used by security bots to determine if this item is safe for public use.
+#define NEEDS_PERMIT						(1<<3)
 #define SLOWS_WHILE_IN_HAND					(1<<4)
-#define NO_MAT_REDEMPTION					(1<<5)	//Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
-#define DROPDEL								(1<<6)	//When dropped, it calls qdel on itself
-#define NOBLUDGEON							(1<<7)	//when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
-#define ABSTRACT							(1<<8) 	//for all things that are technically items but used for various different stuff
-#define IMMUTABLE_SLOW          			(1<<9)	//When players should not be able to change the slowdown of the item (Speed potions, ect)
-#define SURGICAL_TOOL						(1<<10)	//Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
-#define NO_UNIFORM_REQUIRED					(1<<11) //Can be worn on certain slots (currently belt and id) that would otherwise require an uniform.
-#define NO_ATTACK_CHAIN_SOFT_STAMCRIT		(1<<12)		//Entirely blocks melee_attack_chain() if user is soft stamcritted. Uses getStaminaLoss() to check at this point in time. THIS DOES NOT BLOCK RANGED AFTERATTACK()S, ONLY MELEE RANGE AFTERATTACK()S.
+///Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
+#define NO_MAT_REDEMPTION					(1<<5)
+///When dropped, it calls qdel on itself
+#define DROPDEL								(1<<6)
+///when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
+#define NOBLUDGEON							(1<<7)
+///for all things that are technically items but used for various different stuff
+#define ABSTRACT							(1<<8)
+///When players should not be able to change the slowdown of the item (Speed potions, ect)
+#define IMMUTABLE_SLOW          			(1<<9)
+///Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
+#define SURGICAL_TOOL						(1<<10)
+///Can be worn on certain slots (currently belt and id) that would otherwise require an uniform.
+#define NO_UNIFORM_REQUIRED					(1<<11)
+///Damage when attacking people is not affected by combat mode.
+#define NO_COMBAT_MODE_FORCE_MODIFIER		(1<<12)

 // Flags for the clothing_flags var on /obj/item/clothing

@@ -21,6 +21,7 @@
 	next_move = world.time + ((num+next_move_adjust)*next_move_modifier)

 /mob/living/changeNext_move(num)
+	last_click_move = next_move
 	var/mod = next_move_modifier
 	var/adj = next_move_adjust
 	for(var/i in status_effects)
@@ -10,10 +10,6 @@
 /obj/item/proc/melee_attack_chain(mob/user, atom/target, params)
 	if(isliving(user))
 		var/mob/living/L = user
-		if(item_flags & NO_ATTACK_CHAIN_SOFT_STAMCRIT)
-			if(IS_STAMCRIT(L))
-				to_chat(L, "<span class='warning'>You are too exhausted to swing [src]!</span>")
-				return
 		if(!CHECK_MOBILITY(L, MOBILITY_USE))
 			to_chat(L, "<span class='warning'>You are unable to swing [src] right now!</span>")
 			return
@@ -59,8 +55,10 @@
 /mob/living/attackby(obj/item/I, mob/living/user, params)
 	if(..())
 		return TRUE
-	user.changeNext_move(CLICK_CD_MELEE)
-	return I.attack(src, user)
+	I.attack_delay_done = FALSE //Should be set TRUE in pre_attacked_by()
+	. = I.attack(src, user)
+	if(!I.attack_delay_done) //Otherwise, pre_attacked_by() should handle it.
+		user.changeNext_move(I.click_delay)

 /obj/item/proc/attack(mob/living/M, mob/living/user)
 	if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user) & COMPONENT_ITEM_NO_ATTACK)
@@ -68,11 +66,6 @@
 	SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user)
 	if(item_flags & NOBLUDGEON)
 		return
-
-	if(IS_STAMCRIT(user)) // CIT CHANGE - makes it impossible to attack in stamina softcrit
-		to_chat(user, "<span class='warning'>You're too exhausted.</span>") // CIT CHANGE - ditto
-		return // CIT CHANGE - ditto
-
 	if(force && damtype != STAMINA && HAS_TRAIT(user, TRAIT_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
 		return
@@ -91,7 +84,9 @@
 	log_combat(user, M, "attacked", src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
 	add_fingerprint(user)

-	user.adjustStaminaLossBuffered(getweight(user, STAM_COST_ATTACK_MOB_MULT))//CIT CHANGE - makes attacking things cause stamina loss
+	var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT) //CIT CHANGE - makes attacking things cause stamina loss
+	if(weight)
+		user.adjustStaminaLossBuffered(weight)

 //the equivalent of the standard version of attack() but for object targets.
 /obj/item/proc/attack_obj(obj/O, mob/living/user)
@@ -99,13 +94,12 @@
 		return
 	if(item_flags & NOBLUDGEON)
 		return
-	if(IS_STAMCRIT(user)) // CIT CHANGE - makes it impossible to attack in stamina softcrit
-		to_chat(user, "<span class='warning'>You're too exhausted.</span>") // CIT CHANGE - ditto
-		return // CIT CHANGE - ditto
-	user.adjustStaminaLossBuffered(getweight(user, STAM_COST_ATTACK_OBJ_MULT))//CIT CHANGE - makes attacking things cause stamina loss
-	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(O)
-	O.attacked_by(src, user)
+	if(!O.attacked_by(src, user))
+		user.changeNext_move(click_delay)
+	var/weight = getweight(user, STAM_COST_ATTACK_OBJ_MULT)
+	if(weight)
+		user.adjustStaminaLossBuffered(weight)//CIT CHANGE - makes attacking things cause stamina loss

 /atom/movable/proc/attacked_by()
 	return
@@ -113,9 +107,18 @@
 /obj/attacked_by(obj/item/I, mob/living/user)
 	var/totitemdamage = I.force
 	var/bad_trait
-	if(!SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		totitemdamage *= 0.5
+
+	var/stamloss = user.getStaminaLoss()
+	var/next_move_mult = 1
+	if(stamloss > STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do.
+		var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_ITEM_ATTACK_PENALTY
+		totitemdamage *= 1 - penalty
+		next_move_mult += penalty*STAM_CRIT_ITEM_ATTACK_DELAY
+	user.changeNext_move(I.click_delay*next_move_mult)
+
+	if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
 		bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
+
 	if(I.used_skills && user.mind)
 		if(totitemdamage)
 			totitemdamage = user.mind.item_action_skills_mod(I, totitemdamage, I.skill_difficulty, SKILL_ATTACK_OBJ, bad_trait)
@@ -123,17 +126,19 @@
 			if(!(I.used_skills[skill] & SKILL_TRAIN_ATTACK_OBJ))
 				continue
 			user.mind.auto_gain_experience(skill, I.skill_gain)
+
 	if(totitemdamage)
 		visible_message("<span class='danger'>[user] has hit [src] with [I]!</span>", null, null, COMBAT_MESSAGE_RANGE)
 		//only witnesses close by and the victim see a hit message.
 		log_combat(user, src, "attacked", I)
 	take_damage(totitemdamage, I.damtype, "melee", 1)
+	return TRUE

 /mob/living/attacked_by(obj/item/I, mob/living/user)
 	var/totitemdamage = pre_attacked_by(I, user)
 	if((user != src) && mob_run_block(I, totitemdamage, "the [I.name]", ATTACK_TYPE_MELEE, I.armour_penetration, user, null, null) & BLOCK_SUCCESS)
 		return FALSE
-	send_item_attack_message(I, user)
+	send_item_attack_message(I, user, null, totitemdamage)
 	I.do_stagger_action(src, user, totitemdamage)
 	if(I.force)
 		apply_damage(totitemdamage, I.damtype)
@@ -149,19 +154,37 @@
 /mob/living/simple_animal/attacked_by(obj/item/I, mob/living/user)
 	if(I.force < force_threshold || I.damtype == STAMINA)
 		playsound(loc, 'sound/weapons/tap.ogg', I.get_clamped_volume(), 1, -1)
+		user.changeNext_move(I.click_delay) //pre_attacked_by not called
 	else
 		return ..()

 /mob/living/proc/pre_attacked_by(obj/item/I, mob/living/user)
 	. = I.force
+	if(!.)
+		return
+
+	var/stamloss = user.getStaminaLoss()
+	var/stam_mobility_mult = 1
+	var/next_move_mult = 1
+	if(stamloss > STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do.
+		var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_ITEM_ATTACK_PENALTY
+		stam_mobility_mult -= penalty
+		next_move_mult += penalty*STAM_CRIT_ITEM_ATTACK_DELAY
+	if(stam_mobility_mult > LYING_DAMAGE_PENALTY && !CHECK_MOBILITY(user, MOBILITY_STAND)) //damage penalty for fighting prone, doesn't stack with the above.
+		stam_mobility_mult = LYING_DAMAGE_PENALTY
+	. *= stam_mobility_mult
+	user.changeNext_move(I.click_delay*next_move_mult)
+	I.attack_delay_done = TRUE
+
 	var/bad_trait
-	if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		. *= 0.5
-		bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
-	if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		. *= 1.5
-	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
-		. *= 0.5
+	if(!(I.item_flags & NO_COMBAT_MODE_FORCE_MODIFIER))
+		if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
+			bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
+			if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE))
+				. *= 0.5
+		else if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
+			. *= 1.5
+
 	if(!user.mind || !I.used_skills)
 		return
 	if(.)
@@ -171,7 +194,6 @@
 			continue
 		user.mind.auto_gain_experience(skill, I.skill_gain)

-
 // Proximity_flag is 1 if this afterattack was called on something adjacent, in your square, or on your person.
 // Click parameters is the params string from byond Click() code, see that documentation.
 /obj/item/proc/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
@@ -185,10 +207,12 @@
 		else
 			return clamp(w_class * 6, 10, 100) // Multiply the item's weight class by 6, then clamp the value between 10 and 100

-/mob/living/proc/send_item_attack_message(obj/item/I, mob/living/user, hit_area)
+/mob/living/proc/send_item_attack_message(obj/item/I, mob/living/user, hit_area, current_force)
 	var/message_verb = "attacked"
 	if(I.attack_verb && I.attack_verb.len)
 		message_verb = "[pick(I.attack_verb)]"
+	if(current_force < I.force * INEFFICIENT_ATTACK_MSG_THRESHOLD)
+		message_verb = "inefficiently [message_verb]"
 	else if(!I.force)
 		return
 	var/message_hit_area = ""
@@ -215,6 +239,8 @@
 		bad_trait = SKILL_COMBAT_MODE
 	if(used_skills && user.mind)
 		. = user.mind.item_action_skills_mod(src, ., skill_difficulty, trait, bad_trait, FALSE)
+	var/total_health = user.getStaminaLoss()
+	. = clamp(., 0, STAMINA_NEAR_CRIT - total_health)

 /// How long this staggers for. 0 and negatives supported.
 /obj/item/proc/melee_stagger_duration(force_override)
@@ -307,7 +307,11 @@ SUBSYSTEM_DEF(research)
 	for(var/A in subtypesof(/obj/item/seeds))
 		var/obj/item/seeds/S = A
 		var/list/L = list()
-		L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(S.rarity) * 2
+		//First we get are yield and rarity and times it by two
+		//Then we subtract production and maturation, making it so faster growing plants are better for RnD
+		//Then we add in lifespan and potency,
+		//A basic seed can be worth 268 points if its the best it can be.
+		L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(S.rarity) * 2 + initial(S.yield) * 2 - initial(S.maturation) - initial(S.production) + initial(S.lifespan) + initial(S.potency)
 		techweb_point_items[S] = L

 	return ..()
@@ -25,7 +25,7 @@

 	var/mob/living/owner = parent
 	if(owner.stat != DEAD)
-		START_PROCESSING(SSdcs, src)
+		START_PROCESSING(SSobj, src)

 	RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, .proc/add_event)
 	RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event)
@@ -40,12 +40,12 @@
 		hud.show_hud(hud.hud_version)

 /datum/component/mood/Destroy()
-	STOP_PROCESSING(SSdcs, src)
+	STOP_PROCESSING(SSobj, src)
 	unmodify_hud()
 	return ..()

 /datum/component/mood/proc/stop_processing()
-	STOP_PROCESSING(SSdcs, src)
+	STOP_PROCESSING(SSobj, src)

 /datum/component/mood/proc/print_mood(mob/user)
 	var/msg = "<span class='info'>*---------*\n<EM>Your current mood</EM>\n"
@@ -138,7 +138,7 @@
 		else
 			screen_obj.icon_state = "mood[mood_level]"

-/datum/component/mood/process() //Called on SSdcs process
+/datum/component/mood/process() //Called on SSobj process
 	if(QDELETED(parent)) // workaround to an obnoxious sneaky periodical runtime.
 		qdel(src)
 		return
@@ -345,7 +345,7 @@

 ///Called when parent is revived.
 /datum/component/mood/proc/on_revive(datum/source, full_heal)
-	START_PROCESSING(SSdcs, src)
+	START_PROCESSING(SSobj, src)
 	if(!full_heal)
 		return
 	remove_temp_moods()
@@ -57,7 +57,7 @@
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
 		/obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/magrifle/pistol,
-		/obj/item/toy/plush/snakeplushie
+		/obj/item/toy/plush/snakeplushie, /obj/item/gun/energy/e_gun/mini
 		))

 /datum/component/storage/concrete/pockets/shoes/clown/Initialize()
@@ -68,7 +68,7 @@
 		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
-		/obj/item/firing_pin, /obj/item/bikehorn, /obj/item/gun/ballistic/automatic/pistol))
+		/obj/item/firing_pin, /obj/item/bikehorn, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/energy/e_gun/mini))

 /datum/component/storage/concrete/pockets/pocketprotector
 	max_items = 3
@@ -4,7 +4,7 @@
 	var/list/user_by_item = list()

 /datum/element/earhealing/New()
-	START_PROCESSING(SSdcs, src)
+	START_PROCESSING(SSobj, src)

 /datum/element/earhealing/Attach(datum/target)
 	. = ..()
@@ -0,0 +1,81 @@
+/datum/element/photosynthesis
+	element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH
+	id_arg_index = 2
+	///how much brute damage (or integrity, for objects) is healed (taken if positive) at maximum luminosity. (if lum_minus were 0)
+	var/light_bruteheal = -1
+	///how much burn damage is restored/taken at maximum luminosity. Mobs only.
+	var/light_burnheal = -1
+	///how much tox damage is restored/taken at maximum luminosity. Mobs only.
+	var/light_toxheal = -1
+	///how much oxy damage is restored/taken at maximum luminosity. Mobs only.
+	var/light_oxyheal = -1
+	///how nutrition recovery/expenses factor, not affected by bonus_lum and malus_lum. Mobs only.
+	var/light_nutrition_gain = 4
+	///A value subtracted to the lum count, which allows targets to wilt or heal in the darkness.
+	var/lum_minus = 0.5
+	///the minimum lum count over which where the target damage is adjusted.
+	var/bonus_lum = 0.2
+	///the maximum lum count under which the target damage is inversely adjusted.
+	var/malus_lum = 0
+	///List of atoms this element is attached to. Doubles as a multiplier if the same element is attached multiple times to a target multiple times.
+	var/list/attached_atoms
+
+/datum/element/photosynthesis/Attach(datum/target, brute = -1, burn = -1, tox = -1, oxy = -1, nutri = 4, minus = 0.5, bonus = 0.2, malus = 0)
+	. = ..()
+	if(. == ELEMENT_INCOMPATIBLE || !(isliving(target) || (isobj(target) && light_bruteheal)))
+		return ELEMENT_INCOMPATIBLE
+	light_bruteheal = brute
+	light_burnheal = burn
+	light_toxheal = tox
+	light_oxyheal = oxy
+	light_nutrition_gain = nutri
+	lum_minus = minus
+	bonus_lum = bonus
+	malus_lum = malus
+
+	if(!attached_atoms)
+		attached_atoms = list()
+		START_PROCESSING(SSobj, src)
+	attached_atoms[target]++
+
+/datum/element/photosynthesis/Detach(datum/target)
+	attached_atoms[target]--
+	if(!attached_atoms[target])
+		attached_atoms -= target
+		if(!length(attached_atoms))
+			STOP_PROCESSING(SSobj, src)
+			attached_atoms = null
+	return ..()
+
+/datum/element/photosynthesis/process()
+	for(var/A in attached_atoms)
+		var/atom/movable/AM = A
+		var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
+		if(isturf(AM.loc)) //else, there's considered to be no light
+			var/turf/T = AM.loc
+			light_amount = (T.get_lumcount() - lum_minus)
+
+		if(isliving(AM))
+			var/mob/living/L = AM
+			if(L.stat == DEAD)
+				continue
+			if(light_nutrition_gain)
+				L.adjust_nutrition(light_amount * light_nutrition_gain * attached_atoms[AM], NUTRITION_LEVEL_FULL)
+			if(light_amount > bonus_lum || light_amount < malus_lum)
+				var/mult = ((light_amount > bonus_lum) ? 1 : -1) * attached_atoms[AM]
+				if(light_bruteheal)
+					L.adjustBruteLoss(light_bruteheal * mult)
+				if(light_burnheal)
+					L.adjustFireLoss(light_burnheal * mult)
+				if(light_toxheal)
+					L.adjustToxLoss(light_toxheal * mult)
+				if(light_oxyheal)
+					L.adjustOxyLoss(light_oxyheal * mult)
+
+		else if(light_amount > bonus_lum || light_amount < malus_lum)
+			var/obj/O = AM
+			var/damage = light_bruteheal * ((light_amount > bonus_lum) ? 1 : -1) * attached_atoms[AM]
+			if(damage < 0 && O.obj_integrity < O.max_integrity)
+				O.obj_integrity = min(O.obj_integrity + damage, O.max_integrity) //Till we get a obj heal proc...
+			else
+				O.take_damage(damage, BRUTE, FALSE, FALSE, null, 100)
@@ -170,6 +170,11 @@
 	port_id = "snowdin"
 	can_be_bought = FALSE

+/datum/map_template/shuttle/snow_taxi
+	port_id = "snow"
+	can_be_bought = FALSE
+	suffix = "taxi"
+
 // Shuttles start here:

 /datum/map_template/shuttle/emergency/backup
@@ -557,6 +562,10 @@
 	suffix = "cog"
 	name = "arrival shuttle (Cog)"

+/datum/map_template/shuttle/arrival/snaxi
+	suffix = "snaxi"
+	name = "arrival shuttle (Snaxi)"
+
 /datum/map_template/shuttle/aux_base/default
 	suffix = "default"
 	name = "auxilliary base (Default)"
@@ -191,7 +191,7 @@
 /datum/mind/proc/skill_html_readout()
 	var/list/out = list("<center><h1>Skills</h1></center><hr>")
 	out += "<table style=\"width:100%\"><tr><th><b>Skill</b><th><b>Value</b></tr>"
-	for(var/path in skill_holder.skills|skill_holder.skill_value_mods|skill_holder.skill_level_mods)
+	for(var/path in GLOB.skill_datums)
 		var/datum/skill/S = GLOB.skill_datums[path]
 		var/skill_value = get_skill_value(path)
 		var/skill_level = get_skill_level(path, round = TRUE)
@@ -18,7 +18,7 @@

 	area_type = /area
 	protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
-	/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison, /area/ruin, /area/space/nearstation)
+	/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison, /area/ruin, /area/space/nearstation, /area/icemoon)
 	target_trait = ZTRAIT_STATION

 	immunity_type = "rad"
@@ -200,4 +200,7 @@
 	name = "Tiny Freighter"

 /area/shuttle/caravan/freighter3
-	name = "Tiny Freighter"
+	name = "Tiny Freighter"
+
+/area/shuttle/snowtaxi
+	name = "Snow Taxi"
@@ -147,7 +147,7 @@

 /obj/machinery/dominator/attacked_by(obj/item/I, mob/living/user)
 	add_fingerprint(user)
-	..()
+	return ..()

 /obj/machinery/dominator/attack_hand(mob/user)
 	if(operating || (stat & BROKEN))
@@ -36,7 +36,7 @@
 	targetitem = /obj/item/gun/energy/e_gun/hos
 	difficulty = 10
 	excludefromjob = list("Head Of Security")
-	altitems = list(/obj/item/gun/ballistic/revolver/mws)
+	altitems = list(/obj/item/gun/ballistic/revolver/mws, /obj/item/choice_beacon/hosgun) //We now look for eather the alt verson of the hos gun or the beacon picker.

 /datum/objective_item/steal/handtele
 	name = "a hand teleporter."
@@ -71,7 +71,7 @@
 		return ..()

 /obj/machinery/porta_turret_cover/attacked_by(obj/item/I, mob/user)
-	parent_turret.attacked_by(I, user)
+	return parent_turret.attacked_by(I, user)

 /obj/machinery/porta_turret_cover/attack_alien(mob/living/carbon/alien/humanoid/user)
 	parent_turret.attack_alien(user)
@@ -100,44 +100,61 @@
 	eat(AM)
 	. = ..()

-/obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE)
+/obj/machinery/recycler/proc/eat(atom/AM0)
 	if(stat & (BROKEN|NOPOWER) || safety_mode)
 		return

 	var/list/to_eat

-	to_eat = AM0.GetAllContentsIgnoring(GLOB.typecache_mob)
+	to_eat = list(AM0)

 	var/items_recycled = 0
+	var/buzz = FALSE
 	for(var/i in to_eat)
 		var/atom/movable/AM = i
+		if(QDELETED(AM))
+			continue
 		var/obj/item/bodypart/head/as_head = AM
 		var/obj/item/mmi/as_mmi = AM
-		var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || isbrain(AM) || istype(AM, /obj/item/dullahan_relay)
+		var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /obj/item/dullahan_relay)
 		if(brain_holder)
-			emergency_stop(AM)
-		else if(isliving(AM))
-			if((obj_flags & EMAGGED)||((!allowed(AM))&&(!ishuman(AM))))
-				crush_living(AM)
+			if(obj_flags & EMAGGED)
+				continue
 			else
 				emergency_stop(AM)
+				return
+		else if(isliving(AM))
+			if((obj_flags & EMAGGED)||((!allowed(AM))&&(!ishuman(AM))))
+				to_eat += crush_living(AM)
+			else
+				emergency_stop(AM)
+				return
 		else if(isitem(AM))
 			var/obj/O = AM
 			if(O.resistance_flags & INDESTRUCTIBLE)
-				playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
+				buzz = TRUE
 				O.forceMove(loc)
 			else
-				recycle_item(AM)
+				to_eat += recycle_item(AM)
 				items_recycled++
 		else
-			playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
+			buzz = TRUE
 			AM.forceMove(loc)

-	if(items_recycled && sound)
+	if(items_recycled)
 		playsound(src, item_recycle_sound, 50, 1)
+	if(buzz)
+		playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)

 /obj/machinery/recycler/proc/recycle_item(obj/item/I)

+	. = list()
+	for(var/A in I)
+		var/atom/movable/AM = A
+		AM.forceMove(loc)
+		if(AM.loc == loc)
+			. += AM
+
 	I.forceMove(loc)
 	var/obj/item/grown/log/L = I
 	if(istype(L))
@@ -172,6 +189,7 @@

 /obj/machinery/recycler/proc/crush_living(mob/living/L)

+	. = list()
 	L.forceMove(loc)

 	if(issilicon(L))
@@ -193,7 +211,7 @@
 	if(eat_victim_items)
 		for(var/obj/item/I in L.get_equipped_items(TRUE))
 			if(L.dropItemToGround(I))
-				eat(I, sound=FALSE)
+				. += I

 	// Instantly lie down, also go unconscious from the pain, before you die.
 	L.Unconscious(100)
@@ -5,44 +5,42 @@
 	var/base_icon
 	var/looky_helpy = TRUE

-/datum/component/construction/mecha/examine(mob/user)
+/datum/component/construction/mecha/examine(datum/source, mob/user, list/examine_list)
 	. = ..()
 	if(looky_helpy)
 		switch(steps[index]["key"])
 			if(TOOL_WRENCH)
-				. += "<span class='notice'>The mech could be <b>wrenched</b> into place.</span>"
+				examine_list += "<span class='notice'>The mech could be <b>wrenched</b> into place.</span>"
 			if(TOOL_SCREWDRIVER)
-				. += "<span class='notice'>The mech could be <b>screwed</b> into place.</span>"
+				examine_list += "<span class='notice'>The mech could be <b>screwed</b> into place.</span>"
 			if(TOOL_WIRECUTTER)
-				. += "<span class='notice'>The mech wires could be <b>trimmed</b> into place.</span>"
+				examine_list += "<span class='notice'>The mech wires could be <b>trimmed</b> into place.</span>"
 			if(/obj/item/stack/cable_coil)
-				. += "<span class='notice'>The mech could use some <b>wiring</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use some <b>wiring</b>.</span>"
 			if(/obj/item/circuitboard)
-				. += "<span class='notice'>The mech could use a type of<b>circuitboard</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use a type of<b>circuitboard</b>.</span>"
 			if(/obj/item/stock_parts/scanning_module)
-				. += "<span class='notice'>The mech could use a <b>scanning stock part</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use a <b>scanning stock part</b>.</span>"
 			if(/obj/item/stock_parts/capacitor)
-				. += "<span class='notice'>The mech could use a <b>power based stock part</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use a <b>power based stock part</b>.</span>"
 			if(/obj/item/stock_parts/cell)
-				. += "<span class='notice'>The mech could use a <b>power source</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use a <b>power source</b>.</span>"
 			if(/obj/item/stack/sheet/metal)
-				. += "<span class='notice'>The mech could use some <b>sheets of metal</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use some <b>sheets of metal</b>.</span>"
 			if(/obj/item/stack/sheet/plasteel)
-				. += "<span class='notice'>The mech could use some <b>sheets of strong steel</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use some <b>sheets of strong steel</b>.</span>"
 			if(/obj/item/bikehorn)
-				. += "<span class='notice'>HONK IT!.</span>"
+				examine_list += "<span class='notice'>HONK IT!.</span>"
 			if(/obj/item/clothing/mask/gas/clown_hat)
-				. += "<span class='notice'>GIVE IT CLOWN MAKEUP HONK!.</span>"
+				examine_list += "<span class='notice'>GIVE IT CLOWN MAKEUP HONK!.</span>"
 			if(/obj/item/clothing/shoes/clown_shoes)
-				. += "<span class='notice'>GIVE IT GOOFY SHOES HONK HONK!.</span>"
+				examine_list += "<span class='notice'>GIVE IT GOOFY SHOES HONK HONK!.</span>"
 			if(/obj/item/mecha_parts/part)
-				. += "<span class='notice'>The mech could use a mech <b>part</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use a mech <b>part</b>.</span>"
 			if(/obj/item/stack/ore/bluespace_crystal)
-				. += "<span class='notice'>The mech could use a <b>crystal</b> of sorts.</span>"
+				examine_list += "<span class='notice'>The mech could use a <b>crystal</b> of sorts.</span>"
 			if(/obj/item/assembly/signaler/anomaly)
-				. += "<span class='notice'>The mech could use a <b>anomaly</b> of sorts.</span>"
-			else
-				return
+				examine_list += "<span class='notice'>The mech could use a <b>anomaly</b> of sorts.</span>"

 /datum/component/construction/mecha/spawn_result()
 	if(!result)
@@ -284,7 +284,7 @@

 /obj/mecha/attacked_by(obj/item/I, mob/living/user)
 	mecha_log_message("Attacked by [I]. Attacker - [user]")
-	..()
+	return ..()

 /obj/mecha/proc/mech_toxin_damage(mob/living/target)
 	playsound(src, 'sound/effects/spray2.ogg', 50, 1)
@@ -95,6 +95,56 @@
 	icon_state = "warden_gaze"
 	duration = 3

+/obj/effect/temp_visual/ratvar/volt_hit
+	name = "volt blast"
+	layer = ABOVE_MOB_LAYER
+	duration = 8
+	icon_state = "volt_hit"
+	light_range = 1.5
+	light_power = 2
+	light_color = LIGHT_COLOR_ORANGE
+	var/mob/user
+	var/damage = 20
+
+/obj/effect/temp_visual/ratvar/volt_hit/Initialize(mapload, caster)
+	. = ..()
+	user = caster
+	if(user)
+		var/matrix/M = new
+		M.Turn(Get_Angle(src, user))
+		transform = M
+	INVOKE_ASYNC(src, .proc/volthit)
+
+/obj/effect/temp_visual/ratvar/volt_hit/proc/volthit()
+	if(user)
+		Beam(get_turf(user), "volt_ray", time=duration, maxdistance=8, beam_type=/obj/effect/ebeam/volt_ray)
+	var/hit_amount = 0
+	var/turf/T = get_turf(src)
+	for(var/mob/living/L in T)
+		if(is_servant_of_ratvar(L))
+			continue
+		var/obj/item/I = L.anti_magic_check()
+		if(I)
+			L.visible_message("<span class='warning'>Strange energy flows into [L]'s [I.name]!</span>", \
+			"<span class='userdanger'>Your [I.name] shields you from [src]!</span>")
+			continue
+		L.visible_message("<span class='warning'>[L] is struck by a [name]!</span>", "<span class='userdanger'>You're struck by a [name]!</span>")
+		L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", "laser", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
+		log_combat(user, L, "struck with a volt blast")
+		hit_amount++
+	for(var/obj/mecha/M in T)
+		if(M.occupant)
+			if(is_servant_of_ratvar(M.occupant))
+				continue
+			to_chat(M.occupant, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
+		M.visible_message("<span class='warning'>[M] is struck by a [name]!</span>")
+		M.take_damage(damage, BURN, 0, 0)
+		hit_amount++
+	if(hit_amount)
+		playsound(src, 'sound/machines/defib_zap.ogg', damage*hit_amount, 1, -1)
+	else
+		playsound(src, "sparks", 50, 1)
+
 /obj/effect/temp_visual/ratvar/ocular_warden/Initialize()
 	. = ..()
 	pixel_x = rand(-8, 8)
@@ -55,6 +55,15 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	/// How long, in deciseconds, this staggers for, if null it will autocalculate from w_class and force. Unlike total mass this supports 0 and negatives.
 	var/stagger_force

+	/**
+	  * Set FALSE and then checked at the end of on mob/living/attackby(), set TRUE on living/pre_attacked_by().
+	  * Should it be FALSE by the end of the item/attack(), that means the item overrode the standard attack behaviour
+	  * and the user still needs the delay applied. We can't be using return values since that'll stop afterattack() from being triggered.
+	  */
+	var/attack_delay_done = FALSE
+	///next_move click/attack delay of this item.
+	var/click_delay = CLICK_CD_MELEE
+
 	var/slot_flags = 0		//This is used to determine on which slots an item can fit.
 	pass_flags = PASSTABLE
 	pressure_resistance = 4
@@ -65,7 +65,7 @@
 	. = ..()
 	AddElement(/datum/element/update_icon_blocker)

-/obj/item/gun/energy/chrono_gun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/energy/chrono_gun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	if(field)
 		field_disconnect(field)
 	..()
@@ -293,6 +293,10 @@
 	name = "Mining Shuttle (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/mining

+/obj/item/circuitboard/computer/snow_taxi
+	name = "Snow Taxi (Computer Board)"
+	build_path = /obj/machinery/computer/shuttle/snow_taxi
+
 /obj/item/circuitboard/computer/white_ship
 	name = "White Ship (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/white_ship
@@ -273,6 +273,10 @@
 	light_color = "#37FFF7"
 	actions_types = list()

+/obj/item/melee/transforming/energy/sword/cx/Initialize()
+	icon_state_on = icon_state
+	return ..()
+
 /obj/item/melee/transforming/energy/sword/cx/ComponentInitialize()
 	. = ..()
 	AddElement(/datum/element/update_icon_updates_onmob)
@@ -290,6 +294,7 @@
 	if(!supress_message_text)
 		to_chat(user, "<span class='notice'>[src] [active ? "is now active":"can now be concealed"].</span>")

+
 /obj/item/melee/transforming/energy/sword/cx/update_overlays()
 	. = ..()
 	var/mutable_appearance/blade_overlay = mutable_appearance(icon, "cxsword_blade")
@@ -6,6 +6,7 @@
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
 	flags_1 = CONDUCT_1
+	item_flags = NEEDS_PERMIT | NO_COMBAT_MODE_FORCE_MODIFIER //To avoid ambushing and oneshotting healthy crewmembers on force setting 3.
 	attack_verb = list("whacked", "fisted", "power-punched")
 	force = 20
 	throwforce = 10
@@ -13,7 +14,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40)
 	resistance_flags = FIRE_PROOF
-	var/click_delay = 1.5
+	click_delay = CLICK_CD_MELEE * 1.5
 	var/fisto_setting = 1
 	var/gasperfist = 3
 	var/obj/item/tank/internals/tank = null //Tank used for the gauntlet's piston-ram.
@@ -70,42 +71,46 @@


 /obj/item/melee/powerfist/attack(mob/living/target, mob/living/user)
-    if(!tank)
-        to_chat(user, "<span class='warning'>\The [src] can't operate without a source of gas!</span>")
-        return
-    var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
-    var/turf/T = get_turf(src)
-    if(!T)
-        return
-    T.assume_air(gasused)
-    T.air_update_turf()
-    if(!gasused)
-        to_chat(user, "<span class='warning'>\The [src]'s tank is empty!</span>")
-        target.apply_damage((force / 5), BRUTE)
-        playsound(loc, 'sound/weapons/punch1.ogg', 50, 1)
-        target.visible_message("<span class='danger'>[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
-            "<span class='userdanger'>[user]'s punches you!</span>")
-        return
-    if(gasused.total_moles() < gasperfist * fisto_setting)
-        to_chat(user, "<span class='warning'>\The [src]'s piston-ram lets out a weak hiss, it needs more gas!</span>")
-        playsound(loc, 'sound/weapons/punch4.ogg', 50, 1)
-        target.apply_damage((force / 2), BRUTE)
-        target.visible_message("<span class='danger'>[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
-            "<span class='userdanger'>[user]'s punch strikes with force!</span>")
-        return
-    target.apply_damage(force * fisto_setting, BRUTE)
-    target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
-        "<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
-    new /obj/effect/temp_visual/kinetic_blast(target.loc)
-    playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
-    playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
+	if(HAS_TRAIT(user, TRAIT_PACIFISM))
+		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
+		return FALSE
+	if(!tank)
+		to_chat(user, "<span class='warning'>\The [src] can't operate without a source of gas!</span>")
+		return FALSE
+	var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
+	var/turf/T = get_turf(src)
+	if(!T)
+		return FALSE
+	var/totalitemdamage = target.pre_attacked_by(src, user)
+	T.assume_air(gasused)
+	T.air_update_turf()
+	if(!gasused)
+		to_chat(user, "<span class='warning'>\The [src]'s tank is empty!</span>")
+		target.apply_damage((totalitemdamage / 5), BRUTE)
+		playsound(loc, 'sound/weapons/punch1.ogg', 50, 1)
+		target.visible_message("<span class='danger'>[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
+		"<span class='userdanger'>[user]'s punches you!</span>")
+		return
+	if(gasused.total_moles() < gasperfist * fisto_setting)
+		to_chat(user, "<span class='warning'>\The [src]'s piston-ram lets out a weak hiss, it needs more gas!</span>")
+		playsound(loc, 'sound/weapons/punch4.ogg', 50, 1)
+		target.apply_damage((totalitemdamage / 2), BRUTE)
+		target.visible_message("<span class='danger'>[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
+			"<span class='userdanger'>[user]'s punch strikes with force!</span>")
+		return
+	target.apply_damage(totalitemdamage * fisto_setting, BRUTE)
+	target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
+		"<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
+	new /obj/effect/temp_visual/kinetic_blast(target.loc)
+	playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
+	playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)

-    var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
+	var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
+	target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2))

-    target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2))
+	log_combat(user, target, "power fisted", src)

-    log_combat(user, target, "power fisted", src)
-
-    user.changeNext_move(CLICK_CD_MELEE * click_delay)
-
-    return
+	var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT)
+	if(weight)
+		user.adjustStaminaLossBuffered(weight)
+	return TRUE
@@ -141,7 +141,7 @@
 /obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user)
 	var/interrupt = common_baton_melee(M, user, FALSE)
 	if(!interrupt)
-		..()
+		return ..()

 /obj/item/melee/baton/alt_pre_attack(atom/A, mob/living/user, params)
 	. = common_baton_melee(A, user, TRUE)		//return true (attackchain interrupt) if this also returns true. no harm-disarming.
@@ -154,7 +154,7 @@
 	if(turned_on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
 		clowning_around(user)
 	if(IS_STAMCRIT(user))			//CIT CHANGE - makes it impossible to baton in stamina softcrit
-		to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")
+		to_chat(user, "<span class='danger'>You're too exhausted to use [src] properly.</span>")
 		return TRUE
 	if(ishuman(M))
 		var/mob/living/carbon/human/L = M
@@ -835,11 +835,11 @@

 /obj/item/toy/cards/deck/update_icon_state()
 	switch(cards.len)
-		if(INFINITY to original_size/2)
+		if(original_size*0.5 to INFINITY)
 			icon_state = "deck_[deckstyle]_full"
-		if(original_size/2 to  original_size/4)
+		if(original_size*0.25 to original_size*0.5)
 			icon_state = "deck_[deckstyle]_half"
-		if(original_size/4 to 1)
+		if(1 to original_size*0.25)
 			icon_state = "deck_[deckstyle]_low"
 		else
 			icon_state = "deck_[deckstyle]_empty"
@@ -1176,14 +1176,13 @@

 /obj/item/twohanded/electrostaff/attack(mob/living/target, mob/living/user)
 	if(IS_STAMCRIT(user))//CIT CHANGE - makes it impossible to baton in stamina softcrit
-		to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")//CIT CHANGE - ditto
+		to_chat(user, "<span class='danger'>You're too exhausted to use [src] properly.</span>")//CIT CHANGE - ditto
 		return //CIT CHANGE - ditto
 	if(on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
 		clowning_around(user)			//ouch!
 		return
 	if(iscyborg(target))
-		..()
-		return
+		return ..()
 	if(target.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, null) & BLOCK_SUCCESS) //No message; run_block() handles that
 		playsound(target, 'sound/weapons/genhit.ogg', 50, 1)
 		return FALSE
@@ -185,3 +185,16 @@
 	desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
 	icon = 'icons/turf/walls/hierophant_wall.dmi'
 	icon_state = "wall"
+	
+/turf/closed/indestructible/rock/glacierrock
+	name = "unaturally hard ice wall"
+	desc = "Ice, hardened over thousands of years, you're not breaking through this." 
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "snow_rock"
+	
+/turf/closed/indestructible/rock/glacierrock/blue
+	name = "blue ice wall"
+	desc = "The incredible compressive forces that formed this sturdy ice wall gave it a blue color." 
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "ice"
+	canSmoothWith = list(/turf/closed/indestructible/rock/glacierrock/blue)
@@ -135,6 +135,29 @@

 	return TRUE

+//For the Volt Void scripture, fires a ray of energy at a target location
+/obj/effect/proc_holder/slab/volt
+	ranged_mousepointer = 'icons/effects/volt_target.dmi'
+
+/obj/effect/proc_holder/slab/volt/InterceptClickOn(mob/living/caller, params, atom/target)
+	if(target == slab || ..()) //we can't cancel
+		return TRUE
+
+	var/turf/T = ranged_ability_user.loc
+	if(!isturf(T))
+		return TRUE
+
+	if(target in view(7, get_turf(ranged_ability_user)))
+		successful = TRUE
+		ranged_ability_user.visible_message("<span class='warning'>[ranged_ability_user] fires a ray of energy at [target]!</span>", "<span class='nzcrentr'>You fire a volt ray at [target].</span>")
+		playsound(ranged_ability_user, 'sound/effects/light_flicker.ogg', 50, 1)
+		T = get_turf(target)
+		new/obj/effect/temp_visual/ratvar/volt_hit(T, ranged_ability_user)
+		log_combat(ranged_ability_user, T, "fired a volt ray")
+		remove_ranged_ability()
+
+	return TRUE
+
 //For the Kindle scripture; stuns and mutes a target non-servant.
 /obj/effect/proc_holder/slab/kindle
 	ranged_mousepointer = 'icons/effects/volt_target.dmi'
@@ -263,3 +263,160 @@
 		duration = max(duration, 100)
 	return slab.procure_gateway(invoker, duration, portal_uses)

+
+//Mending Mantra: Channeled for up to ten times over twenty seconds to repair structures and heal allies
+/datum/clockwork_scripture/channeled/mending_mantra
+	descname = "Channeled, Area Healing and Repair"
+	name = "Mending Mantra"
+	desc = "Repairs nearby structures and constructs. Servants wearing clockwork armor will also be healed. Channeled every two seconds for a maximum of twenty seconds."
+	chant_invocations = list("Mend our dents!", "Heal our scratches!", "Repair our gears!")
+	chant_amount = 10
+	chant_interval = 20
+	power_cost = 400
+	usage_tip = "This is a very effective way to rapidly reinforce a base after an attack."
+	tier = SCRIPTURE_SCRIPT
+	primary_component = VANGUARD_COGWHEEL
+	sort_priority = 7
+	quickbind = TRUE
+	quickbind_desc = "Repairs nearby structures and constructs. Servants wearing clockwork armor will also be healed.<br><b>Maximum 10 chants.</b>"
+	var/heal_attempts = 4
+	var/heal_amount = 2.5
+	var/static/list/damage_heal_order = list(BRUTE, BURN, OXY)
+	var/static/list/heal_finish_messages = list("There, all mended!", "Try not to get too damaged.", "No more dents and scratches for you!", "Champions never die.", "All patched up.", \
+	"Ah, child, it's okay now.", "Pain is temporary.", "What you do for the Justiciar is eternal.", "Bear this for me.", "Be strong, child.", "Please, be careful!", \
+	"If you die, you will be remembered.")
+	var/static/list/heal_target_typecache = typecacheof(list(
+	/obj/structure/destructible/clockwork,
+	/obj/machinery/door/airlock/clockwork,
+	/obj/machinery/door/window/clockwork,
+	/obj/structure/window/reinforced/clockwork,
+	/obj/structure/table/reinforced/brass))
+	var/static/list/ratvarian_armor_typecache = typecacheof(list(
+	/obj/item/clothing/suit/armor/clockwork,
+	/obj/item/clothing/head/helmet/clockwork,
+	/obj/item/clothing/gloves/clockwork,
+	/obj/item/clothing/shoes/clockwork))
+
+/datum/clockwork_scripture/channeled/mending_mantra/chant_effects(chant_number)
+	var/turf/T
+	for(var/atom/movable/M in range(7, invoker))
+		if(isliving(M))
+			if(isclockmob(M) || istype(M, /mob/living/simple_animal/drone/cogscarab))
+				var/mob/living/simple_animal/S = M
+				if(S.health == S.maxHealth || S.stat == DEAD)
+					continue
+				T = get_turf(M)
+				for(var/i in 1 to heal_attempts)
+					if(S.health < S.maxHealth)
+						S.adjustHealth(-heal_amount)
+						new /obj/effect/temp_visual/heal(T, "#1E8CE1")
+						if(i == heal_attempts && S.health >= S.maxHealth) //we finished healing on the last tick, give them the message
+							to_chat(S, "<span class='inathneq'>\"[text2ratvar(pick(heal_finish_messages))]\"</span>")
+							break
+					else
+						to_chat(S, "<span class='inathneq'>\"[text2ratvar(pick(heal_finish_messages))]\"</span>")
+						break
+			else if(issilicon(M))
+				var/mob/living/silicon/S = M
+				if(S.health == S.maxHealth || S.stat == DEAD || !is_servant_of_ratvar(S))
+					continue
+				T = get_turf(M)
+				for(var/i in 1 to heal_attempts)
+					if(S.health < S.maxHealth)
+						S.heal_ordered_damage(heal_amount, damage_heal_order)
+						new /obj/effect/temp_visual/heal(T, "#1E8CE1")
+						if(i == heal_attempts && S.health >= S.maxHealth)
+							to_chat(S, "<span class='inathneq'>\"[text2ratvar(pick(heal_finish_messages))]\"</span>")
+							break
+					else
+						to_chat(S, "<span class='inathneq'>\"[text2ratvar(pick(heal_finish_messages))]\"</span>")
+						break
+			else if(ishuman(M))
+				var/mob/living/carbon/human/H = M
+				if(H.health == H.maxHealth || H.stat == DEAD || !is_servant_of_ratvar(H))
+					continue
+				T = get_turf(M)
+				var/heal_ticks = 0 //one heal tick for each piece of ratvarian armor worn
+				var/obj/item/I = H.get_item_by_slot(SLOT_WEAR_SUIT)
+				if(is_type_in_typecache(I, ratvarian_armor_typecache))
+					heal_ticks++
+				I = H.get_item_by_slot(SLOT_HEAD)
+				if(is_type_in_typecache(I, ratvarian_armor_typecache))
+					heal_ticks++
+				I = H.get_item_by_slot(SLOT_GLOVES)
+				if(is_type_in_typecache(I, ratvarian_armor_typecache))
+					heal_ticks++
+				I = H.get_item_by_slot(SLOT_SHOES)
+				if(is_type_in_typecache(I, ratvarian_armor_typecache))
+					heal_ticks++
+				if(heal_ticks)
+					for(var/i in 1 to heal_ticks)
+						if(H.health < H.maxHealth)
+							H.heal_ordered_damage(heal_amount, damage_heal_order)
+							new /obj/effect/temp_visual/heal(T, "#1E8CE1")
+							if(i == heal_ticks && H.health >= H.maxHealth)
+								to_chat(H, "<span class='inathneq'>\"[text2ratvar(pick(heal_finish_messages))]\"</span>")
+								break
+						else
+							to_chat(H, "<span class='inathneq'>\"[text2ratvar(pick(heal_finish_messages))]\"</span>")
+							break
+		else if(is_type_in_typecache(M, heal_target_typecache))
+			var/obj/structure/destructible/clockwork/C = M
+			if(C.obj_integrity == C.max_integrity || (istype(C) && !C.can_be_repaired))
+				continue
+			T = get_turf(M)
+			for(var/i in 1 to heal_attempts)
+				if(C.obj_integrity < C.max_integrity)
+					C.obj_integrity = min(C.obj_integrity + 5, C.max_integrity)
+					C.update_icon()
+					new /obj/effect/temp_visual/heal(T, "#1E8CE1")
+				else
+					break
+	new /obj/effect/temp_visual/ratvar/mending_mantra(get_turf(invoker))
+	return TRUE
+
+//Volt Blaster: Channeled for up to five times over ten seconds to fire up to five rays of energy at target locations.
+/datum/clockwork_scripture/channeled/volt_blaster
+	descname = "Channeled, Targeted Energy Blasts"
+	name = "Volt Blaster"
+	desc = "Allows you to fire five energy rays at target locations. Channeled every fourth of a second for a maximum of ten seconds."
+	channel_time = 30
+	invocations = list("Amperage...", "...grant me your power!")
+	chant_invocations = list("Use charge to kill!", "Slay with power!", "Hunt with energy!")
+	chant_amount = 5
+	chant_interval = 4
+	power_cost = 500
+	usage_tip = "Though it requires you to stand still, this scripture can do massive damage."
+	tier = SCRIPTURE_SCRIPT
+	primary_component = HIEROPHANT_ANSIBLE
+	sort_priority = 10
+	quickbind = TRUE
+	quickbind_desc = "Allows you to fire energy rays at target locations.<br><b>Maximum 5 chants.</b>"
+	var/static/list/nzcrentr_insults = list("You're not very good at aiming.", "You hunt badly.", "What a waste of energy.", "Almost funny to watch.",
+	"Boss says </span><span class='heavy_brass'>\"Click something, you idiot!\"</span><span class='nzcrentr'>.", "Stop wasting power if you can't aim.")
+
+/datum/clockwork_scripture/channeled/volt_blaster/chant_effects(chant_number)
+	slab.busy = null
+	var/datum/clockwork_scripture/ranged_ability/volt_ray/ray = new
+	ray.slab = slab
+	ray.invoker = invoker
+	var/turf/T = get_turf(invoker)
+	if(!ray.run_scripture() && slab && invoker)
+		if(can_recite() && T == get_turf(invoker))
+			to_chat(invoker, "<span class='nzcrentr'>\"[text2ratvar(pick(nzcrentr_insults))]\"</span>")
+		else
+			return FALSE
+	return TRUE
+
+/obj/effect/ebeam/volt_ray
+	name = "volt_ray"
+	layer = LYING_MOB_LAYER
+
+/datum/clockwork_scripture/ranged_ability/volt_ray
+	name = "Volt Ray"
+	slab_overlay = "volt"
+	allow_mobility = FALSE
+	ranged_type = /obj/effect/proc_holder/slab/volt
+	ranged_message = "<span class='nzcrentr_small'><i>You charge the clockwork slab with shocking might.</i>\n\
+	<b>Left-click a target to fire, quickly!</b></span>"
+	timeout_time = 20
@@ -343,7 +343,7 @@
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "disintegrate"
 	item_state = null
-	item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL | NO_ATTACK_CHAIN_SOFT_STAMCRIT
+	item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL

 	w_class = WEIGHT_CLASS_HUGE
 	throwforce = 0
@@ -118,22 +118,10 @@


 /mob/living/carbon/true_devil/attacked_by(obj/item/I, mob/living/user, def_zone)
-	var/weakness = check_weakness(I, user)
-	apply_damage(I.force * weakness, I.damtype, def_zone)
-	var/message_verb = ""
-	if(I.attack_verb && I.attack_verb.len)
-		message_verb = "[pick(I.attack_verb)]"
-	else if(I.force)
-		message_verb = "attacked"
-
-	var/attack_message = "[src] has been [message_verb] with [I]."
-	if(user)
-		user.do_attack_animation(src)
-		if(user in viewers(src, null))
-			attack_message = "[user] has [message_verb] [src] with [I]!"
-	if(message_verb)
-		visible_message("<span class='danger'>[attack_message]</span>",
-		"<span class='userdanger'>[attack_message]</span>", null, COMBAT_MESSAGE_RANGE)
+	var/totitemdamage = pre_attacked_by(I, user)
+	totitemdamage *= check_weakness(I, user)
+	apply_damage(totitemdamage, I.damtype, def_zone)
+	send_item_attack_message(I, user, null, totitemdamage)
 	return TRUE

 /mob/living/carbon/true_devil/singularity_act()
@@ -66,6 +66,16 @@
 	crate_name = "shaft miner starter kit"
 	crate_type = /obj/structure/closet/crate/secure

+/datum/supply_pack/service/snowmobile
+	name = "Snowmobile kit"
+	desc = "trapped on a frigid wasteland? need to get around fast? purchase a refurbished snowmobile, with a FREE 10 microsecond warranty!"
+	cost = 1500 // 1000 points cheaper than ATV
+	contains = list(/obj/vehicle/ridden/atv/snowmobile = 1,
+			/obj/item/key = 1,
+			/obj/item/clothing/mask/gas/explorer = 1)
+	crate_name = "Snowmobile kit"
+	crate_type = /obj/structure/closet/crate/large
+
 //////////////////////////////////////////////////////////////////////////////
 /////////////////////// Chef, Botanist, Bartender ////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -2576,8 +2576,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						current_tab = text2num(href_list["tab"])
 	if(href_list["preference"] == "gear")
 		if(href_list["clear_loadout"])
-			LAZYCLEARLIST(chosen_gear)
-			gear_points = initial(gear_points)
+			chosen_gear = list()
+			gear_points = CONFIG_GET(number/initial_gear_points)
 			save_preferences()
 		if(href_list["select_category"])
 			for(var/i in GLOB.loadout_items)
@@ -2589,7 +2589,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				return
 			var/toggle = text2num(href_list["toggle_gear"])
 			if(!toggle && (G.type in chosen_gear))//toggling off and the item effectively is in chosen gear)
-				LAZYREMOVE(chosen_gear, G.type)
+				chosen_gear -= G.type
 				gear_points += initial(G.cost)
 			else if(toggle && (!(is_type_in_ref_list(G, chosen_gear))))
 				if(!is_loadout_slot_available(G.category))
@@ -2599,7 +2599,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					to_chat(user, "<span class='danger'>This is an item intended for donator use only. You are not authorized to use this item.</span>")
 					return
 				if(gear_points >= initial(G.cost))
-					LAZYADD(chosen_gear, G.type)
+					chosen_gear += G.type
 					gear_points -= initial(G.cost)

 	ShowChoices(user)
@@ -434,3 +434,4 @@
 	desc = "A symbol of discipline, honor, and lots and lots of removal of some type of skewered food."
 	icon_state = "russobluecamohat"
 	item_state = "russobluecamohat"
+	dynamic_hair_suffix = ""
@@ -40,9 +40,6 @@
 		return ..()
 	return ..()

-/obj/item/holo/esword/attack(target as mob, mob/user as mob)
-	..()
-
 /obj/item/holo/esword/Initialize()
 	. = ..()
 	saber_color = pick("red","blue","green","purple")
@@ -205,6 +205,11 @@
 	popup.set_content(dat)
 	popup.open()

+/obj/machinery/biogenerator/AltClick(mob/living/user)
+	. = ..()
+	if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		detach(user)
+
 /obj/machinery/biogenerator/proc/activate()
 	if (usr.stat != CONSCIOUS)
 		return
@@ -293,9 +298,9 @@
 	update_icon()
 	return .

-/obj/machinery/biogenerator/proc/detach()
+/obj/machinery/biogenerator/proc/detach(mob/living/user)
 	if(beaker)
-		beaker.forceMove(drop_location())
+		user.put_in_hands(beaker)
 		beaker = null
 		update_icon()

@@ -310,7 +315,7 @@
 		updateUsrDialog()

 	else if(href_list["detach"])
-		detach()
+		detach(usr)
 		updateUsrDialog()

 	else if(href_list["create"])
@@ -189,6 +189,26 @@
 	name = "Coffee House"
 	icon_state = "hair_coffeehouse"

+/datum/sprite_accessory/hair/cornrows1
+	name = "Cornrows"
+	icon_state = "hair_cornrows"
+
+/datum/sprite_accessory/hair/cornrows2
+	name = "Cornrows 2"
+	icon_state = "hair_cornrows2"
+
+/datum/sprite_accessory/hair/cornrowbun
+	name = "Cornrow Bun"
+	icon_state = "hair_cornrowbun"
+
+/datum/sprite_accessory/hair/cornrowbraid
+	name = "Cornrow Braid"
+	icon_state = "hair_cornrowbraid"
+
+/datum/sprite_accessory/hair/cornrowdualtail
+	name = "Cornrow Tail"
+	icon_state = "hair_cornrowtail"
+
 /datum/sprite_accessory/hair/country
 	name = "Country"
 	icon_state = "hair_country"
@@ -280,25 +280,15 @@
 	. = ..()
 	C.faction |= "plants"
 	C.faction |= "vines"
+	C.AddElement(/datum/element/photosynthesis)

 /datum/species/golem/wood/on_species_loss(mob/living/carbon/C)
 	. = ..()
 	C.faction -= "plants"
 	C.faction -= "vines"
+	C.RemoveElement(/datum/element/photosynthesis)

 /datum/species/golem/wood/spec_life(mob/living/carbon/human/H)
-	if(H.stat == DEAD)
-		return
-	var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
-	if(isturf(H.loc)) //else, there's considered to be no light
-		var/turf/T = H.loc
-		light_amount = min(1,T.get_lumcount()) - 0.5
-		H.adjust_nutrition(light_amount * 4, NUTRITION_LEVEL_FULL)
-		if(light_amount > 0.2) //if there's enough light, heal
-			H.heal_overall_damage(1,1)
-			H.adjustToxLoss(-1)
-			H.adjustOxyLoss(-1)
-
 	if(H.nutrition < NUTRITION_LEVEL_STARVING + 50)
 		H.take_overall_damage(2,0)

@@ -14,34 +14,24 @@
 	liked_food = VEGETABLES | FRUIT | GRAIN
 	species_language_holder = /datum/language_holder/sylvan
 	var/light_nutrition_gain_factor = 4
-	var/light_toxheal = 1
-	var/light_oxyheal = 1
-	var/light_burnheal = 1
-	var/light_bruteheal = 1
+	var/light_toxheal = -1
+	var/light_oxyheal = -1
+	var/light_burnheal = -1
+	var/light_bruteheal = -1

 /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
 	C.faction |= "plants"
 	C.faction |= "vines"
+	C.AddElement(/datum/element/photosynthesis, light_bruteheal, light_burnheal, light_toxheal, light_oxyheal, light_nutrition_gain_factor)

 /datum/species/pod/on_species_loss(mob/living/carbon/C)
 	. = ..()
 	C.faction -= "plants"
 	C.faction -= "vines"
+	C.RemoveElement(/datum/element/photosynthesis, light_bruteheal, light_burnheal, light_toxheal, light_oxyheal, light_nutrition_gain_factor)

 /datum/species/pod/spec_life(mob/living/carbon/human/H)
-	if(H.stat == DEAD)
-		return
-	var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
-	if(isturf(H.loc)) //else, there's considered to be no light
-		var/turf/T = H.loc
-		light_amount = min(1,T.get_lumcount()) - 0.5
-		H.adjust_nutrition(light_amount * light_nutrition_gain_factor, NUTRITION_LEVEL_FULL)
-		if(light_amount > 0.2) //if there's enough light, heal
-			H.heal_overall_damage(light_bruteheal, light_burnheal)
-			H.adjustToxLoss(-light_toxheal)
-			H.adjustOxyLoss(-light_oxyheal)
-
 	if(H.nutrition < NUTRITION_LEVEL_STARVING + 50)
 		H.take_overall_damage(2,0)

@@ -77,9 +67,9 @@
 	mutant_bodyparts = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs")
 	limbs_id = "pod"
 	light_nutrition_gain_factor = 3
-	light_bruteheal = 0.2
-	light_burnheal = 0.2
-	light_toxheal = 0.7
+	light_bruteheal = -0.2
+	light_burnheal = -0.2
+	light_toxheal = -0.7

 /datum/species/pod/pseudo_weak/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
@@ -15,16 +15,13 @@
 	dangerous_existence = 1
 	mutanteyes = /obj/item/organ/eyes/night_vision

+/datum/species/shadow/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+	. = ..()
+	C.AddElement(/datum/element/photosynthesis, 1, 1, 0, 0, 0, 0, SHADOW_SPECIES_LIGHT_THRESHOLD, SHADOW_SPECIES_LIGHT_THRESHOLD)

-/datum/species/shadow/spec_life(mob/living/carbon/human/H)
-	var/turf/T = H.loc
-	if(istype(T))
-		var/light_amount = T.get_lumcount()
-
-		if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD) //if there's enough light, start dying
-			H.take_overall_damage(1,1)
-		else if (light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) //heal in the dark
-			H.heal_overall_damage(1,1)
+/datum/species/shadow/on_species_loss(mob/living/carbon/C)
+	. = ..()
+	C.RemoveElement(/datum/element/photosynthesis, 1, 1, 0, 0, 0, 0, SHADOW_SPECIES_LIGHT_THRESHOLD, SHADOW_SPECIES_LIGHT_THRESHOLD)

 /datum/species/shadow/check_roundstart_eligible()
 	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
@@ -8,6 +8,8 @@

 	typing_indicator_enabled = TRUE

+	var/last_click_move = 0 // Stores the previous next_move value.
+
 	var/resize = 1 //Badminnery resize
 	var/lastattacker = null
 	var/lastattackerckey = null
@@ -105,6 +105,7 @@ IGNORE_PROC_IF_NOT_TARGET(attack_slime)

 /mob/living/simple_animal/hostile/asteroid/curseblob/attacked_by(obj/item/I, mob/living/L)
 	if(L != set_target)
+		L.changeNext_move(I.click_delay) //pre_attacked_by not called
 		return
 	return ..()

@@ -15,7 +15,7 @@
 	throw_speed = 3
 	throw_range = 5
 	force = 5
-	item_flags = NEEDS_PERMIT | NO_ATTACK_CHAIN_SOFT_STAMCRIT
+	item_flags = NEEDS_PERMIT
 	attack_verb = list("struck", "hit", "bashed")

 	var/fire_sound = "gunshot"
@@ -140,12 +140,13 @@
 	to_chat(user, "<span class='danger'>*click*</span>")
 	playsound(src, "gun_dry_fire", 30, 1)

-/obj/item/gun/proc/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
+/obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0)
 	if(recoil)
 		shake_camera(user, recoil + 1, recoil)

-	if(isliving(user)) //CIT CHANGE - makes gun recoil cause staminaloss
-		user.adjustStaminaLossBuffered(getstamcost(user)*(firing && burst_size >= 2 ? 1/burst_size : 1)) //CIT CHANGE - ditto
+	if(stam_cost) //CIT CHANGE - makes gun recoil cause staminaloss
+		var/safe_cost = clamp(stam_cost, 0, STAMINA_NEAR_CRIT - user.getStaminaLoss())*(firing && burst_size >= 2 ? 1/burst_size : 1)
+		user.adjustStaminaLossBuffered(safe_cost) //CIT CHANGE - ditto

 	if(suppressed)
 		playsound(user, fire_sound, 10, 1)
@@ -172,9 +173,10 @@
 		return
 	if(firing)
 		return
-	if(IS_STAMCRIT(user))			//respect stamina softcrit
-		to_chat(user, "<span class='warning'>You are too exhausted to fire [src]!</span>")
-		return
+	var/stamloss = user.getStaminaLoss()
+	if(stamloss >= STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do.
+		var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_GUN_DELAY
+		user.changeNext_move(CLICK_CD_RANGE+(CLICK_CD_RANGE*penalty))
 	if(flag) //It's adjacent, is the user, or is on the user's person
 		if(target in user.contents) //can't shoot stuff inside us.
 			return
@@ -216,7 +218,7 @@
 	var/loop_counter = 0

 	if(user)
-		bonus_spread += getinaccuracy(user) //CIT CHANGE - adds bonus spread while not aiming
+		bonus_spread = getinaccuracy(user, bonus_spread, stamloss) //CIT CHANGE - adds bonus spread while not aiming
 	if(ishuman(user) && user.a_intent == INTENT_HARM && weapon_weight <= WEAPON_LIGHT)
 		var/mob/living/carbon/human/H = user
 		for(var/obj/item/gun/G in H.held_items)
@@ -225,9 +227,11 @@
 			else if(G.can_trigger_gun(user))
 				bonus_spread += 24 * G.weapon_weight * G.dualwield_spread_mult
 				loop_counter++
-				addtimer(CALLBACK(G, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread), loop_counter)
+				var/stam_cost = G.getstamcost(user)
+				addtimer(CALLBACK(G, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread, stam_cost), loop_counter)

-	process_fire(target, user, TRUE, params, null, bonus_spread)
+	var/stam_cost = getstamcost(user)
+	process_fire(target, user, TRUE, params, null, bonus_spread, stam_cost)

 /obj/item/gun/can_trigger_gun(mob/living/user)
 	. = ..()
@@ -258,21 +262,21 @@
 /obj/item/gun/proc/on_cooldown()
 	return busy_action || firing || ((last_fire + fire_delay) > world.time)

-/obj/item/gun/proc/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/proc/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	add_fingerprint(user)

 	if(on_cooldown())
 		return
 	firing = TRUE
-	. = do_fire(target, user, message, params, zone_override, bonus_spread)
+	. = do_fire(target, user, message, params, zone_override, bonus_spread, stam_cost)
 	firing = FALSE
 	last_fire = world.time

 	if(user)
 		user.update_inv_hands()
-		SEND_SIGNAL(user, COMSIG_LIVING_GUN_PROCESS_FIRE, target, params, zone_override)
+		SEND_SIGNAL(user, COMSIG_LIVING_GUN_PROCESS_FIRE, target, params, zone_override, bonus_spread, stam_cost)

-/obj/item/gun/proc/do_fire(atom/target, mob/living/user, message = TRUE, params, zone_override = "", bonus_spread = 0)
+/obj/item/gun/proc/do_fire(atom/target, mob/living/user, message = TRUE, params, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	var/sprd = 0
 	var/randomized_gun_spread = 0
 	var/rand_spr = rand()
@@ -290,7 +294,7 @@
 			sleep(burst_shot_delay)
 			if(QDELETED(src))
 				break
-			do_burst_shot(user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i)
+			do_burst_shot(user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i, stam_cost)
 	else
 		if(chambered)
 			sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread))
@@ -300,9 +304,9 @@
 				return
 			else
 				if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
-					shoot_live_shot(user, 1, target, message)
+					shoot_live_shot(user, 1, target, message, stam_cost)
 				else
-					shoot_live_shot(user, 0, target, message)
+					shoot_live_shot(user, 0, target, message, stam_cost)
 		else
 			shoot_with_empty_chamber(user)
 			return
@@ -312,7 +316,7 @@
 	SSblackbox.record_feedback("tally", "gun_fired", 1, type)
 	return TRUE

-/obj/item/gun/proc/do_burst_shot(mob/living/user, atom/target, message = TRUE, params=null, zone_override = "", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0)
+/obj/item/gun/proc/do_burst_shot(mob/living/user, atom/target, message = TRUE, params=null, zone_override = "", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0, stam_cost = 0)
 	if(!user || !firing)
 		firing = FALSE
 		return FALSE
@@ -336,9 +340,9 @@
 			return FALSE
 		else
 			if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
-				shoot_live_shot(user, 1, target, message)
+				shoot_live_shot(user, 1, target, message, stam_cost)
 			else
-				shoot_live_shot(user, 0, target, message)
+				shoot_live_shot(user, 0, target, message, stam_cost)
 			if (iteration >= burst_size)
 				firing = FALSE
 	else
@@ -349,20 +353,21 @@
 	update_icon()
 	return TRUE

-/obj/item/gun/attack(mob/M as mob, mob/user)
+/obj/item/gun/attack(mob/living/M, mob/user)
 	if(user.a_intent == INTENT_HARM) //Flogging
 		if(bayonet)
 			M.attackby(bayonet, user)
+			attack_delay_done = TRUE
 			return
 		else
 			return ..()
-	return
+	attack_delay_done = TRUE //we are firing the gun, not bashing people with its butt.

 /obj/item/gun/attack_obj(obj/O, mob/user)
 	if(user.a_intent == INTENT_HARM)
 		if(bayonet)
 			O.attackby(bayonet, user)
-			return
+			return TRUE
 	return ..()

 /obj/item/gun/attackby(obj/item/I, mob/user, params)
@@ -498,7 +503,7 @@
 	if(chambered && chambered.BB)
 		chambered.BB.damage *= 5

-	process_fire(target, user, TRUE, params)
+	process_fire(target, user, TRUE, params, stam_cost = getstamcost(user))

 /obj/item/gun/proc/unlock() //used in summon guns and as a convience for admins
 	if(pin)
@@ -566,7 +571,25 @@
 		chambered = null
 		update_icon()

-/obj/item/gun/proc/getinaccuracy(mob/user)
-	if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		return ((weapon_weight * 25) * inaccuracy_modifier)
-	return 0
+/obj/item/gun/proc/getinaccuracy(mob/living/user, bonus_spread, stamloss)
+	if(inaccuracy_modifier == 0)
+		return bonus_spread
+	var/base_inaccuracy = weapon_weight * 25 * inaccuracy_modifier
+	var/aiming_delay = 0 //Otherwise aiming would be meaningless for slower guns such as sniper rifles and launchers.
+	if(fire_delay)
+		var/penalty = (last_fire + GUN_AIMING_TIME + fire_delay) - world.time
+		if(penalty > 0) //Yet we only penalize users firing it multiple times in a haste. fire_delay isn't necessarily cumbersomeness.
+			aiming_delay = penalty
+	if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE)) //To be removed in favor of something less tactless later.
+		base_inaccuracy /= 1.5
+	if(stamloss > STAMINA_NEAR_SOFTCRIT) //This can null out the above bonus.
+		base_inaccuracy *= 1 + (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*0.5
+	var/mult = max((GUN_AIMING_TIME + aiming_delay + user.last_click_move - world.time)/GUN_AIMING_TIME, -0.5) //Yes, there is a bonus for taking time aiming.
+	if(mult < 0) //accurate weapons should provide a proper bonus with negative inaccuracy. the opposite is true too.
+		mult *= 1/inaccuracy_modifier
+	return max(bonus_spread + (base_inaccuracy * mult), 0) //no negative spread.
+
+/obj/item/gun/proc/getstamcost(mob/living/carbon/user)
+	. = recoil
+	if(user && !user.has_gravity())
+		. = recoil*5
@@ -365,7 +365,7 @@
 	can_unsuppress = TRUE
 	can_suppress = TRUE
 	w_class = WEIGHT_CLASS_NORMAL
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.5
 	zoomable = TRUE
 	zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
 	zoom_out_amt = 13
@@ -130,7 +130,7 @@
 	else
 		qdel(src)

-/obj/item/gun/ballistic/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/ballistic/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	if(ammo_pack)
 		if(ammo_pack.overheat < ammo_pack.overheat_max)
 			ammo_pack.overheat += burst_size
@@ -6,7 +6,7 @@
 	name = "grenade launcher"
 	icon_state = "dshotgun-sawn"
 	item_state = "gun"
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.5
 	mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
 	fire_sound = 'sound/weapons/grenadelaunch.ogg'
 	w_class = WEIGHT_CLASS_NORMAL
@@ -87,7 +87,7 @@
 	pin = /obj/item/firing_pin/implant/pindicate
 	burst_size = 1
 	fire_delay = 0
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.25
 	casing_ejector = FALSE
 	weapon_weight = WEAPON_HEAVY
 	magazine_wording = "rocket"
@@ -14,7 +14,7 @@
 	spread = 0
 	recoil = 0.1
 	casing_ejector = FALSE
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.15
 	dualwield_spread_mult = 1.4
 	weapon_weight = WEAPON_MEDIUM
 	w_class = WEIGHT_CLASS_BULKY
@@ -46,7 +46,7 @@
 		return 0
 	. = ..()

-/obj/item/gun/ballistic/automatic/magrifle/shoot_live_shot()
+/obj/item/gun/ballistic/automatic/magrifle/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0)
 	var/obj/item/ammo_casing/caseless/magnetic/shot = chambered
 	cell.use(shot.energy_cost)
 	. = ..()
@@ -102,7 +102,7 @@
 	. = ..()
 	safe_calibers = magazine.caliber

-/obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	if(chambered && !(chambered.caliber in safe_calibers))
 		if(prob(70 - (magazine.ammo_count() * 10)))	//minimum probability of 10, maximum of 60
 			playsound(user, fire_sound, 50, 1)
@@ -242,7 +242,7 @@
 		user.visible_message("<span class='danger'>*click*</span>")
 		playsound(src, "gun_dry_fire", 30, 1)

-/obj/item/gun/ballistic/revolver/russian/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/ballistic/revolver/russian/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	add_fingerprint(user)
 	playsound(src, "gun_dry_fire", 30, TRUE)
 	user.visible_message("<span class='danger'>[user.name] tries to fire \the [src] at the same time, but only succeeds at looking like an idiot.</span>", "<span class='danger'>\The [src]'s anti-combat mechanism prevents you from firing it at the same time!</span>")
@@ -116,7 +116,7 @@
 	icon_state = "moistnugget"
 	item_state = "moistnugget"
 	slot_flags = 0 //no ITEM_SLOT_BACK sprite, alas
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.5
 	mag_type = /obj/item/ammo_box/magazine/internal/boltaction
 	var/bolt_open = FALSE
 	can_bayonet = TRUE
@@ -191,7 +191,7 @@
 /obj/item/gun/ballistic/shotgun/boltaction/enchanted/attack_self()
 	return

-/obj/item/gun/ballistic/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
+/obj/item/gun/ballistic/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0)
 	..()
 	if(guns_left)
 		var/obj/item/gun/ballistic/shotgun/boltaction/enchanted/GUN = new gun_type
@@ -205,7 +205,7 @@

 // Automatic Shotguns//

-/obj/item/gun/ballistic/shotgun/automatic/shoot_live_shot(mob/living/user as mob|obj)
+/obj/item/gun/ballistic/shotgun/automatic/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0)
 	..()
 	src.pump(user)

@@ -127,12 +127,12 @@
 	chambered = null //either way, released the prepared shot
 	recharge_newshot() //try to charge a new shot

-/obj/item/gun/energy/do_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/energy/do_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	if(!chambered && can_shoot())
 		process_chamber()	// If the gun was drained and then recharged, load a new shot.
 	return ..()

-/obj/item/gun/energy/do_burst_shot(mob/living/user, atom/target, message = TRUE, params = null, zone_override="", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0)
+/obj/item/gun/energy/do_burst_shot(mob/living/user, atom/target, message = TRUE, params = null, zone_override="", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0, stam_cost = 0)
 	if(!chambered && can_shoot())
 		process_chamber()	// Ditto.
 	return ..()
@@ -237,7 +237,7 @@
 		return FALSE
 	return TRUE

-/obj/item/gun/energy/dueling/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread)
+/obj/item/gun/energy/dueling/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread = 0, stam_cost = 0)
 	if(duel.state == DUEL_READY)
 		duel.confirmations[src] = TRUE
 		to_chat(user,"<span class='notice'>You confirm your readiness.</span>")
@@ -110,7 +110,7 @@
 		fail_tick--
 	..()

-/obj/item/gun/energy/e_gun/nuclear/shoot_live_shot()
+/obj/item/gun/energy/e_gun/nuclear/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0)
 	failcheck()
 	update_icon()
 	..()
@@ -60,6 +60,12 @@
 	else
 		cut_overlays()

+/obj/item/gun/energy/kinetic_accelerator/getinaccuracy(mob/living/user, bonus_spread, stamloss)
+	var/old_fire_delay = fire_delay //It's pretty irrelevant tbh but whatever.
+	fire_delay = overheat_time
+	. = ..()
+	fire_delay = old_fire_delay
+
 /obj/item/gun/energy/kinetic_accelerator/examine(mob/user)
 	. = ..()
 	if(max_mod_capacity)
@@ -128,7 +134,7 @@
 	if(!holds_charge)
 		empty()

-/obj/item/gun/energy/kinetic_accelerator/shoot_live_shot()
+/obj/item/gun/energy/kinetic_accelerator/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0)
 	. = ..()
 	attempt_reload()

@@ -207,6 +213,12 @@
 		var/obj/item/gun/energy/kinetic_accelerator/KA = loc
 		KA.modify_projectile(BB)

+/obj/item/gun/energy/kinetic_accelerator/getstamcost(mob/living/carbon/user)
+	if(user && !lavaland_equipment_pressure_check(get_turf(user)))
+		return 0
+	else
+		return ..()
+
 //Projectiles
 /obj/item/projectile/kinetic
 	name = "kinetic force"
@@ -62,7 +62,7 @@
 	slot_flags = ITEM_SLOT_BACK
 	w_class = WEIGHT_CLASS_BULKY
 	weapon_weight = WEAPON_MEDIUM
-	inaccuracy_modifier = 0.5
+	inaccuracy_modifier = 0.7
 	force = 10
 	throwforce = 10
 	cell_type = /obj/item/stock_parts/cell/lascarbine
@@ -89,7 +89,7 @@
 	suppressed = TRUE
 	ammo_type = list(/obj/item/ammo_casing/energy/bolt)
 	weapon_weight = WEAPON_LIGHT
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.25
 	obj_flags = 0
 	overheat_time = 20
 	holds_charge = TRUE
@@ -126,7 +126,7 @@
 	attack_verb = list("attacked", "slashed", "cut", "sliced")
 	force = 12
 	sharpness = IS_SHARP
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.25
 	can_charge = 0

 	heat = 3800
@@ -182,7 +182,7 @@
 	item_state = null
 	icon_state = "wormhole_projector"
 	pin = null
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.25
 	var/obj/effect/portal/p_blue
 	var/obj/effect/portal/p_orange
 	var/atmos_link = FALSE
@@ -318,7 +318,7 @@
 	icon_state = "emitter_carbine"
 	force = 12
 	w_class = WEIGHT_CLASS_SMALL
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.25
 	cell_type = /obj/item/stock_parts/cell/super
 	ammo_type = list(/obj/item/ammo_casing/energy/emitter)

@@ -45,7 +45,7 @@
 	/obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball,
 	/obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage, /obj/item/projectile/magic/locker)

-/obj/item/gun/magic/staff/chaos/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/magic/staff/chaos/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	chambered.projectile_type = pick(allowed_projectile_types)
 	. = ..()

@@ -9,7 +9,7 @@
 	throw_speed = 3
 	throw_range = 7
 	force = 4
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.25
 	custom_materials = list(/datum/material/iron=2000)
 	clumsy_check = FALSE
 	fire_sound = 'sound/items/syringeproj.ogg'
@@ -31,7 +31,7 @@
 /obj/item/gun/grenadelauncher/can_shoot()
 	return grenades.len

-/obj/item/gun/grenadelauncher/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/grenadelauncher/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	user.visible_message("<span class='danger'>[user] fired a grenade!</span>", \
 						"<span class='danger'>You fire the grenade launcher!</span>")
 	var/obj/item/grenade/F = grenades[1] //Now with less copypasta!
@@ -41,7 +41,7 @@
 		on_beam_release(current_target)
 	current_target = null

-/obj/item/gun/medbeam/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/medbeam/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	if(isliving(user))
 		add_fingerprint(user)

@@ -7,7 +7,7 @@
 	throw_speed = 3
 	throw_range = 7
 	force = 4
-	inaccuracy_modifier = 0
+	inaccuracy_modifier = 0.25
 	custom_materials = list(/datum/material/iron=2000)
 	clumsy_check = 0
 	fire_sound = 'sound/items/syringeproj.ogg'
@@ -160,7 +160,7 @@
 	item_state = "blowgun"
 	fire_sound = 'sound/items/syringeproj.ogg'

-/obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	visible_message("<span class='danger'>[user] starts aiming with a blowgun!</span>")
 	if(do_after(user, 25, target = src))
 		user.adjustStaminaLoss(20)
@@ -272,7 +272,7 @@
 			return TRUE

 	var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
-	if(check_zone(def_zone) != BODY_ZONE_CHEST)
+	if(def_zone && check_zone(def_zone) != BODY_ZONE_CHEST)
 		def_zone = ran_zone(def_zone, max(100-(7*distance), 5) * zone_accuracy_factor) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use.

 	if(isturf(A) && hitsound_wall)
@@ -213,6 +213,11 @@
 			for(var/datum/reagent/R in beaker.reagents.reagent_list)
 				. += "<span class='notice'>- [R.volume] units of [R.name].</span>"

+/obj/machinery/reagentgrinder/AltClick(mob/user)
+	. = ..()
+	if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		replace_beaker(user)
+
 /obj/machinery/reagentgrinder/proc/eject(mob/user)
 	for(var/i in holdingitems)
 		var/obj/item/O = i
@@ -0,0 +1,7 @@
+/obj/machinery/computer/shuttle/snow_taxi
+	name = "snow taxi console"
+	desc = "Used to direct the snow taxi."
+	circuit = /obj/item/circuitboard/computer/snow_taxi
+	shuttleId = "snow_taxi"
+	possible_destinations = "snaxi_nw;snaxi_ne;snaxi_s"
+	no_destination_swap = TRUE
@@ -285,7 +285,7 @@
 		if(status == BODYPART_ORGANIC)
 			icon = base_bp_icon || DEFAULT_BODYPART_ICON_ORGANIC
 		else if(status == BODYPART_ROBOTIC)
-			icon = base_bp_icon || DEFAULT_BODYPART_ICON_ROBOTIC
+			icon = DEFAULT_BODYPART_ICON_ROBOTIC

 	if(owner)
 		owner.updatehealth()
@@ -60,3 +60,23 @@
 				turret.pixel_x = 12
 				turret.pixel_y = 4
 				turret.layer = OBJ_LAYER
+
+/obj/vehicle/ridden/atv/snowmobile
+	name = "snowmobile"
+	desc = "a tracked vehicle designed for use in the snow, it looks like it would have difficulty moving elsewhere, however."
+	icon_state = "snowmobile"
+
+/obj/vehicle/ridden/atv/snowmobile/Moved()
+	. = ..()
+	var/static/list/snow_typecache = typecacheof(list(/turf/open/floor/plating/asteroid/snow/icemoon, /turf/open/floor/plating/snowed/smoothed/icemoon))
+	var/datum/component/riding/E = LoadComponent(/datum/component/riding)
+	if(snow_typecache[loc.type])
+		E.vehicle_move_delay = 1
+	else
+		E.vehicle_move_delay = 2
+
+/obj/vehicle/ridden/atv/snowmobile/snowcurity
+	name = "security snowmobile"
+	desc = "for when you want to look like even more of a tool than riding a secway."
+	icon_state = "snowcurity"
+	key_type = /obj/item/key/security
@@ -51,10 +51,10 @@

 /obj/vehicle/sealed/car/attacked_by(obj/item/I, mob/living/user)
 	if(!I.force)
-		return
+		return FALSE
 	if(occupants[user])
 		to_chat(user, "<span class='notice'>Your attack bounces off of the car's padded interior.</span>")
-		return
+		return FALSE
 	return ..()

 /obj/vehicle/sealed/car/attack_hand(mob/living/user)
@@ -40,6 +40,10 @@ map icebox
 	minplayers 25
 endmap

+map snaxi
+	minplayers 25
+endmap
+
 map runtimestation
 endmap

@@ -1,11 +0,0 @@
-/obj/item/gun/proc/getstamcost(mob/living/carbon/user)
-	if(user && user.has_gravity())
-		return recoil
-	else
-		return recoil*5
-
-/obj/item/gun/energy/kinetic_accelerator/getstamcost(mob/living/carbon/user)
-	if(user && !lavaland_equipment_pressure_check(get_turf(user)))
-		return 0
-	else
-		return ..()
@@ -537,6 +537,7 @@
 #include "code\datums\elements\forced_gravity.dm"
 #include "code\datums\elements\ghost_role_eligibility.dm"
 #include "code\datums\elements\mob_holder.dm"
+#include "code\datums\elements\photosynthesis.dm"
 #include "code\datums\elements\polychromic.dm"
 #include "code\datums\elements\scavenging.dm"
 #include "code\datums\elements\snail_crawl.dm"
@@ -3138,6 +3139,7 @@
 #include "code\modules\shuttle\ripple.dm"
 #include "code\modules\shuttle\shuttle.dm"
 #include "code\modules\shuttle\shuttle_rotate.dm"
+#include "code\modules\shuttle\snaxi.dm"
 #include "code\modules\shuttle\special.dm"
 #include "code\modules\shuttle\supply.dm"
 #include "code\modules\shuttle\syndicate.dm"
@@ -3406,7 +3408,6 @@
 #include "modular_citadel\code\modules\mob\living\carbon\reindex_screams.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\human\human.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\human\human_defense.dm"
-#include "modular_citadel\code\modules\projectiles\gun.dm"
 #include "modular_citadel\code\modules\projectiles\ammunition\caseless.dm"
 #include "modular_citadel\code\modules\projectiles\ammunition\ballistic\smg\smg.dm"
 #include "modular_citadel\code\modules\projectiles\boxes_magazines\ammo_boxes.dm"