Merge remote-tracking branch 'upstream/master'

code/__HELPERS/_lists.dm

@@ -614,7 +614,7 @@
 		used_key_list[input_key] = 1
 	return input_key
 
-#if DM_VERSION > 513
+#if DM_VERSION > 514
 #error Remie said that lummox was adding a way to get a lists
 #error contents via list.values, if that is true remove this
 #error otherwise, update the version and bug lummox

code/game/objects/items/pet_carrier.dm

@@ -328,6 +328,9 @@
 		REMOVE_TRAIT(occupant, TRAIT_RESISTHIGHPRESSURE, "bluespace_container_resist_high_pressure")
 		REMOVE_TRAIT(occupant, TRAIT_RESISTLOWPRESSURE, "bluespace_container_resist_low_pressure")
 	name = initial(name)
+	if(iscarbon(occupant))
+		to_chat(occupant, "You pop out of the [src], slightly dazed!")
+		occupant.Stun(5 SECONDS)
 
 /obj/item/pet_carrier/bluespace/return_air()
 	if(!occupant_gas_supply)

code/game/objects/items/storage/secure.dm

@@ -164,11 +164,15 @@
 /obj/item/storage/secure/briefcase/hos/mws_pack_hos/PopulateContents()
 	new /obj/item/gun/ballistic/revolver/mws(src)
 	new /obj/item/ammo_box/magazine/mws_mag(src)
+	new /obj/item/ammo_box/magazine/mws_mag(src)
 	new /obj/item/ammo_casing/mws_batt/lethal(src)
 	new /obj/item/ammo_casing/mws_batt/lethal(src)
+	new /obj/item/ammo_casing/mws_batt/lethal(src)
+	new /obj/item/ammo_casing/mws_batt/stun(src)
 	new /obj/item/ammo_casing/mws_batt/stun(src)
 	new /obj/item/ammo_casing/mws_batt/stun(src)
 	new /obj/item/ammo_casing/mws_batt/ion(src)
+	new /obj/item/ammo_casing/mws_batt/taser(src)
 
 /obj/item/storage/secure/briefcase/hos/multiphase_box
 	name = "\improper X-01 Multiphase energy gun box"

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -358,7 +358,7 @@
 		/datum/gas/oxygen = 20,
 		/datum/gas/nitrogen = 20,
 		/datum/gas/nitrous_oxide = 5,
-		"TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*400
+		"TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*25
 	)
 
 /datum/gas_reaction/nitrylformation/react(datum/gas_mixture/air)
@@ -369,8 +369,8 @@
 	var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY
 	if ((air.get_moles(/datum/gas/oxygen) - heat_efficency < 0 )|| (air.get_moles(/datum/gas/nitrogen) - heat_efficency < 0)) //Shouldn't produce gas from nothing.
 		return NO_REACTION
-	air.adjust_moles(/datum/gas/oxygen, heat_efficency)
-	air.adjust_moles(/datum/gas/nitrogen, heat_efficency)
+	air.adjust_moles(/datum/gas/oxygen, -heat_efficency)
+	air.adjust_moles(/datum/gas/nitrogen, -heat_efficency)
 	air.adjust_moles(/datum/gas/nitryl, heat_efficency*2)
 
 	if(energy_used > 0)
@@ -499,7 +499,7 @@
 	min_requirements = list(
 		/datum/gas/nitrogen = 10,
 		/datum/gas/tritium = 5,
-		"TEMP" = 5000000)
+		"ENER" = NOBLIUM_FORMATION_ENERGY)
 
 /datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air)
 	var/old_heat_capacity = air.heat_capacity()

code/modules/events/brain_trauma.dm

@@ -27,6 +27,7 @@
 		if(!is_station_level(H.z))
 			continue
 		traumatize(H)
+		announce_to_ghosts(H)
 		break
 
 /datum/round_event/brain_trauma/proc/traumatize(mob/living/carbon/human/H)

code/modules/projectiles/boxes_magazines/external/rechargable.dm

@@ -94,14 +94,15 @@
 /obj/item/ammo_casing/mws_batt/lethal
 	name = "'MWS' microbattery - LETHAL"
 	type_color = "#bf3d3d"
-	type_name = "<span class='lethal'>LETHAL</span>"
+	type_name = "<span class='lethal'>LASE</span>"
 	projectile_type = /obj/item/projectile/beam
 
 /obj/item/ammo_casing/mws_batt/stun
-	name = "'MWS' microbattery - STUN"
+	name = "'MWS' microbattery - DISABLER"
 	type_color = "#0f81bc"
-	type_name = "<span class='stun'>STUN</span>"
+	type_name = "<span class='stun'>DISABLE</span>"
 	projectile_type = /obj/item/projectile/beam/disabler
+	e_cost = 60  //gives it 10 disabler shots in line with literally all other eguns.
 
 /obj/item/ammo_casing/mws_batt/xray
 	name = "'MWS' microbattery - XRAY"
@@ -114,3 +115,9 @@
 	type_color = "#d084d6"
 	type_name = "<span class='ion'>ION</span>"
 	projectile_type = /obj/item/projectile/ion
+
+/obj/item/ammo_casing/mws_batt/taser
+	name = "'MWS' microbattery - TASER"
+	type_color = "#e5ff00"
+	type_name = "<span class='stun'>TASE</span>"
+	projectile_type = /obj/item/projectile/energy/electrode/security

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -339,7 +339,9 @@
 	slot_flags = null
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
 	sawn_desc = "I'm just here for the gasoline."
-	unique_reskin = null
+	unique_reskin = list("Default" = "ishotgun",
+						"Cobbled" = "old_ishotgun"
+						)
 	var/slung = FALSE
 
 /obj/item/gun/ballistic/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
@@ -390,16 +392,12 @@
 // ---------- Code originally from VoreStation ----------
 /obj/item/gun/ballistic/revolver/mws
 	name = "MWS-01 'Big Iron'"
-	desc = "Modular Weapons System"
-
+	desc = "Modular Weapon System-01, does fit on your hip."
 	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "mws"
-
-	fire_sound = 'sound/weapons/Taser.ogg'
-
+	fire_sound = 'sound/weapons/MWSfire.ogg' //i spent 1 hour making a cool sound but byond just compresses it to shit so have this instead >:(
 	mag_type = /obj/item/ammo_box/magazine/mws_mag
 	spawnwithmagazine = FALSE
-
 	recoil = 0
 
 	var/charge_sections = 6

html/changelog.html

@@ -50,6 +50,31 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">07 March 2021</h2>
+			<h3 class="author">Hatterhat updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">You can now reskin your improvised shotguns.</li>
+				<li class="rscadd">The spontaneous brain trauma event now announces to ghosts whoever got funnied upon.</li>
+				<li class="imageadd">Ports EikoBiko's cat tail sprite.</li>
+			</ul>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">nitryl now consumes oxygen/nitrogen instead of generating them</li>
+				<li class="balance">Hyper-nob and nitryl are easier to make.</li>
+			</ul>
+			<h3 class="author">dzahlus updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added taser microbattery for MWS-01</li>
+				<li class="tweak">tweaked MWS-01 beacondrop to have more batteries</li>
+				<li class="balance">rebalanced MWS-01 disabler battery to fire 10 shots</li>
+				<li class="soundadd">added unique sound to the MWS-01</li>
+				<li class="spellcheck">fixed Modula Weapons System to "Modular Weapon System"</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">exiting a bluespace jar through any means, hardstuns you for 5 seconds</li>
+			</ul>
+
 			<h2 class="date">05 March 2021</h2>
 			<h3 class="author">Putnam3145 updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -28676,3 +28676,20 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Minesweeper can no longer be made to lag the server on purpose
   keronshb:
   - tweak: Prevents heat from going through reinforced plasma glass.
+2021-03-07:
+  Hatterhat:
+  - rscadd: You can now reskin your improvised shotguns.
+  - rscadd: The spontaneous brain trauma event now announces to ghosts whoever got
+      funnied upon.
+  - imageadd: Ports EikoBiko's cat tail sprite.
+  Putnam3145:
+  - bugfix: nitryl now consumes oxygen/nitrogen instead of generating them
+  - balance: Hyper-nob and nitryl are easier to make.
+  dzahlus:
+  - rscadd: Added taser microbattery for MWS-01
+  - tweak: tweaked MWS-01 beacondrop to have more batteries
+  - balance: rebalanced MWS-01 disabler battery to fire 10 shots
+  - soundadd: added unique sound to the MWS-01
+  - spellcheck: fixed Modula Weapons System to "Modular Weapon System"
+  timothyteakettle:
+  - balance: exiting a bluespace jar through any means, hardstuns you for 5 seconds