Merge branch 'Citadel-Station-13:master' into wingport

code/__DEFINES/atmospherics.dm

@@ -160,6 +160,9 @@
 //SNOSTATION
 #define ICEMOON_DEFAULT_ATMOS "ICEMOON_ATMOS"
 
+//FESTIVESTATION
+#define FESTIVE_ATMOS "o2=22;n2=82;TEMP=266" //this goes here right putnam??
+
 //ATMOSIA GAS MONITOR TAGS
 #define ATMOS_GAS_MONITOR_INPUT_O2 "o2_in"
 #define ATMOS_GAS_MONITOR_OUTPUT_O2 "o2_out"

code/controllers/subsystem/air.dm

@@ -405,7 +405,7 @@ SUBSYSTEM_DEF(air)
 		eq_cooldown += (1-delay_threshold) * (cost_equalize / total_thread_time) * 2
 		if(eq_cooldown > 0.5)
 			equalize_enabled = FALSE
-		excited_group_pressure_goal = max(0,excited_group_pressure_goal_target * (1 - delay_threshold))
+		excited_group_pressure_goal = max(0,excited_group_pressure_goal_target * delay_threshold)
 
 
 /datum/controller/subsystem/air/proc/process_turfs(resumed = 0)

code/controllers/subsystem/research.dm

@@ -346,12 +346,13 @@ SUBSYSTEM_DEF(research)
 		for(var/i in bitcoins)
 			bitcoins[i] *= income_time_difference / 10
 		science_tech.add_point_list(bitcoins)
-		if(!length(science_tech.last_bitcoins))
-			science_tech.last_bitcoins = science_tech.research_points
-		for(var/i in science_tech.last_bitcoins)
+		var/list/income = science_tech.commit_income()
+		for(var/i in income)
 			var/old_weighted = science_tech.last_bitcoins[i] * (1 MINUTES - income_time_difference)
-			var/new_weighted = science_tech.research_points[i] * income_time_difference
-			science_tech.last_bitcoins[i] = round((old_weighted + new_weighted) / (1 MINUTES))
+			var/new_weighted = income[i] * income_time_difference
+			science_tech.last_bitcoins[i] = (old_weighted + new_weighted) / (1 MINUTES)
+	else
+		science_tech.last_bitcoins = bitcoins.Copy()
 	last_income = world.time
 
 /datum/controller/subsystem/research/proc/calculate_server_coefficient()	//Diminishing returns.

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -1,19 +1,3 @@
-/datum/crafting_recipe/pin_removal
-	name = "Pin Removal"
-	result = /obj/item/gun
-	reqs = list(/obj/item/gun = 1)
-	parts = list(/obj/item/gun = 1)
-	tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
-	time = 50
-	category = CAT_WEAPONRY
-	subcategory = CAT_OTHER
-
-/datum/crafting_recipe/pin_removal/check_requirements(mob/user, list/collected_requirements)
-	var/obj/item/gun/G = collected_requirements[/obj/item/gun][1]
-	if (G.no_pin_required || !G.pin)
-		return FALSE
-	return TRUE
-
 /datum/crafting_recipe/strobeshield
 	name = "Strobe Shield"
 	result = /obj/item/shield/riot/flash

code/game/objects/items.dm

@@ -331,6 +331,9 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	return ..()
 
 /obj/item/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
+	. = ..()
+	if(.)
+		return
 	if(!user)
 		return
 	if(anchored)
@@ -340,6 +343,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 			to_chat(user, "<span class='warning'>You are unable to unequip that while wearing other garments over it!</span>")
 			return FALSE
 
+	. = TRUE
+
 	if(resistance_flags & ON_FIRE)
 		var/mob/living/carbon/C = user
 		var/can_handle_hot = FALSE
@@ -374,6 +379,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 
 	//If the item is in a storage item, take it out
 	SEND_SIGNAL(loc, COMSIG_TRY_STORAGE_TAKE, src, user.loc, TRUE)
+	if(QDELETED(src)) //moving it out of the storage to the floor destroyed it.
+		return
 
 	if(throwing)
 		throwing.finalize(FALSE)
@@ -386,6 +393,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	add_fingerprint(user)
 	if(!user.put_in_active_hand(src, FALSE, FALSE))
 		user.dropItemToGround(src)
+		return TRUE
 
 /obj/item/proc/allow_attack_hand_drop(mob/user)
 	return TRUE

code/game/turfs/simulated/floor/plating/dirt.dm

@@ -19,3 +19,11 @@
 
 /turf/open/floor/plating/dirt/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
 	return
+
+/turf/open/floor/plating/dirt/space
+	baseturfs = /turf/baseturf_bottom
+	planetary_atmos = FALSE
+	desc = "Upon closer examination there's plating beneath the dirt."
+
+/turf/open/floor/plating/dirt/space/airless
+	initial_gas_mix = AIRLESS_ATMOS

code/modules/assembly/assembly.dm

@@ -34,14 +34,16 @@
 
 /obj/item/assembly/proc/on_attach()
 
-/obj/item/assembly/proc/on_detach() //call this when detaching it from a device. handles any special functions that need to be updated ex post facto
+///Call this when detaching it from a device. handles any special functions that need to be updated ex post facto
+/obj/item/assembly/proc/on_detach()
 	if(!holder)
 		return FALSE
 	forceMove(holder.drop_location())
 	holder = null
 	return TRUE
 
-/obj/item/assembly/proc/holder_movement()							//Called when the holder is moved
+///Called when the holder is moved
+/obj/item/assembly/proc/holder_movement()
 	if(!holder)
 		return FALSE
 	setDir(holder.dir)
@@ -53,7 +55,6 @@
 		return FALSE
 	return TRUE
 
-
 //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
 /obj/item/assembly/proc/pulsed(radio = FALSE)
 	if(wire_type & WIRE_RECEIVE)
@@ -62,7 +63,6 @@
 		INVOKE_ASYNC(src, .proc/activate)
 	return TRUE
 
-
 //Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
 /obj/item/assembly/proc/pulse(radio = FALSE)
 	if(connected && wire_type)
@@ -74,7 +74,6 @@
 		holder.process_activation(src, 0, 1)
 	return TRUE
 
-
 // What the device does when turned on
 /obj/item/assembly/proc/activate()
 	if(QDELETED(src) || !secured || (next_activate > world.time))
@@ -82,13 +81,11 @@
 	next_activate = world.time + activate_cooldown
 	return TRUE
 
-
 /obj/item/assembly/proc/toggle_secure()
 	secured = !secured
 	update_icon()
 	return secured
 
-
 /obj/item/assembly/attackby(obj/item/W, mob/user, params)
 	if(isassembly(W))
 		var/obj/item/assembly/A = W
@@ -115,7 +112,6 @@
 	. = ..()
 	. += "<span class='notice'>\The [src] [secured? "is secured and ready to be used!" : "can be attached to other things."]</span>"
 
-
 /obj/item/assembly/attack_self(mob/user)
 	if(!user)
 		return FALSE
@@ -125,3 +121,11 @@
 
 /obj/item/assembly/interact(mob/user)
 	return ui_interact(user)
+
+/obj/item/assembly/ui_host(mob/user)
+	if(holder)
+		return holder
+	return src
+
+/obj/item/assembly/ui_state(mob/user)
+	return GLOB.hands_state

code/modules/assembly/holder.dm

@@ -88,14 +88,14 @@
 	if(a_right)
 		a_right.dropped(user)
 
-/obj/item/assembly_holder/on_attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess
+/obj/item/assembly_holder/on_attack_hand(user, act_intent)//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess
 	. = ..()
 	if(.)
 		return
 	if(a_left)
-		a_left.attack_hand()
+		a_left.attack_hand(user, act_intent)
 	if(a_right)
-		a_right.attack_hand()
+		a_right.attack_hand(user, act_intent)
 
 /obj/item/assembly_holder/screwdriver_act(mob/user, obj/item/tool)
 	if(..())

code/modules/clothing/clothing.dm

@@ -21,8 +21,6 @@
 	var/active_sound = null
 	var/toggle_cooldown = null
 	var/cooldown = 0
-	var/obj/item/flashlight/F = null
-	var/can_flashlight = 0
 
 	var/blocks_shove_knockdown = FALSE //Whether wearing the clothing item blocks the ability for shove to knock down.
 

code/modules/clothing/head/helmet.dm

@@ -16,17 +16,47 @@
 
 	dog_fashion = /datum/dog_fashion/head/helmet
 
+	var/can_flashlight = FALSE //if a flashlight can be mounted. if it has a flashlight and this is false, it is permanently attached.
+	var/obj/item/flashlight/seclite/attached_light
+	var/datum/action/item_action/toggle_helmet_flashlight/alight
+
+/obj/item/clothing/head/helmet/Initialize(mapload)
+	. = ..()
+	if(attached_light)
+		alight = new(src)
+
 /obj/item/clothing/head/helmet/ComponentInitialize()
 	. = ..()
 	AddComponent(/datum/component/wearertargeting/earprotection, list(SLOT_HEAD))
 
+/obj/item/clothing/head/helmet/examine(mob/user)
+	. = ..()
+	if(attached_light)
+		. += "It has \a [attached_light] [can_flashlight ? "" : "permanently "]mounted on it."
+		if(can_flashlight)
+			. += "<span class='info'>[attached_light] looks like it can be <b>unscrewed</b> from [src].</span>"
+	else if(can_flashlight)
+		. += "It has a mounting point for a <b>seclite</b>."
+
+/obj/item/clothing/head/helmet/Destroy()
+	QDEL_NULL(attached_light)
+	return ..()
+
+/obj/item/clothing/head/helmet/handle_atom_del(atom/A)
+	if(A == attached_light)
+		attached_light = null
+		update_helmlight()
+		update_icon()
+		QDEL_NULL(alight)
+	return ..()
+
 /obj/item/clothing/head/helmet/sec
 	can_flashlight = 1
 
 /obj/item/clothing/head/helmet/sec/attackby(obj/item/I, mob/user, params)
 	if(issignaler(I))
 		var/obj/item/assembly/signaler/S = I
-		if(F) //Has a flashlight. Player must remove it, else it will be lost forever.
+		if(attached_light) //Has a flashlight. Player must remove it, else it will be lost forever.
 			to_chat(user, "<span class='warning'>The mounted flashlight is in the way, remove it first!</span>")
 			return
 
@@ -280,8 +310,8 @@
 
 /obj/item/clothing/head/helmet/update_icon_state()
 	var/state = "[initial(icon_state)]"
-	if(F)
-		if(F.on)
+	if(attached_light)
+		if(attached_light.on)
 			state += "-flight-on" //"helmet-flight-on" // "helmet-cam-flight-on"
 		else
 			state += "-flight" //etc.
@@ -289,7 +319,7 @@
 	icon_state = state
 
 /obj/item/clothing/head/helmet/ui_action_click(mob/user, action)
-	if(istype(action, /datum/action/item_action/toggle_helmet_flashlight))
+	if(istype(action, alight))
 		toggle_helmlight()
 	else
 		..()
@@ -297,60 +327,60 @@
 /obj/item/clothing/head/helmet/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/flashlight/seclite))
 		var/obj/item/flashlight/seclite/S = I
-		if(can_flashlight)
-			if(!F)
-				if(!user.transferItemToLoc(S, src))
-					return
-				to_chat(user, "<span class='notice'>You click [S] into place on [src].</span>")
-				if(S.on)
-					set_light(0)
-				F = S
-				update_icon()
-				update_helmlight(user)
-				verbs += /obj/item/clothing/head/helmet/proc/toggle_helmlight
-				var/datum/action/A = new /datum/action/item_action/toggle_helmet_flashlight(src)
-				if(loc == user)
-					A.Grant(user)
+		if(can_flashlight && !attached_light)
+			if(!user.transferItemToLoc(S, src))
+				return
+			to_chat(user, "<span class='notice'>You click [S] into place on [src].</span>")
+			if(S.on)
+				set_light(0)
+			attached_light = S
+			update_icon()
+			update_helmlight()
+			alight = new(src)
+			if(loc == user)
+				alight.Grant(user)
 		return
-
-	if(I.tool_behaviour == TOOL_SCREWDRIVER)
-		if(F)
-			for(var/obj/item/flashlight/seclite/S in src)
-				to_chat(user, "<span class='notice'>You unscrew the seclite from [src].</span>")
-				F = null
-				S.forceMove(user.drop_location())
-				update_helmlight(user)
-				S.update_brightness(user)
-				update_icon()
-				usr.update_inv_head()
-				verbs -= /obj/item/clothing/head/helmet/proc/toggle_helmlight
-			for(var/datum/action/item_action/toggle_helmet_flashlight/THL in actions)
-				qdel(THL)
-			return
-
 	return ..()
 
+/obj/item/clothing/head/helmet/screwdriver_act(mob/living/user, obj/item/I)
+	..()
+	if(can_flashlight && attached_light) //if it has a light but can_flashlight is false, the light is permanently attached.
+		I.play_tool_sound(src)
+		to_chat(user, "<span class='notice'>You unscrew [attached_light] from [src].</span>")
+		attached_light.forceMove(drop_location())
+		if(Adjacent(user) && !issilicon(user))
+			user.put_in_hands(attached_light)
+
+		var/obj/item/flashlight/removed_light = attached_light
+		attached_light = null
+		update_helmlight()
+		removed_light.update_brightness(user)
+		update_icon()
+		user.update_inv_head()
+		QDEL_NULL(alight)
+		return TRUE
+
 /obj/item/clothing/head/helmet/proc/toggle_helmlight()
 	set name = "Toggle Helmetlight"
 	set category = "Object"
 	set desc = "Click to toggle your helmet's attached flashlight."
 
-	if(!F)
+	if(!attached_light)
 		return
 
 	var/mob/user = usr
 	if(user.incapacitated())
 		return
-	F.on = !F.on
-	to_chat(user, "<span class='notice'>You toggle the helmetlight [F.on ? "on":"off"].</span>")
+	attached_light.on = !attached_light.on
+	to_chat(user, "<span class='notice'>You toggle the helmet-light [attached_light.on ? "on":"off"].</span>")
 
 	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
 	update_helmlight(user)
 
 /obj/item/clothing/head/helmet/proc/update_helmlight(mob/user = null)
-	if(F)
-		if(F.on)
-			set_light(F.brightness_on, F.flashlight_power, F.light_color)
+	if(attached_light)
+		if(attached_light.on)
+			set_light(attached_light.brightness_on, attached_light.flashlight_power, attached_light.light_color)
 		else
 			set_light(0)
 		update_icon()

code/modules/events/_event.dm

@@ -1,4 +1,4 @@
-#define RANDOM_EVENT_ADMIN_INTERVENTION_TIME 10
+#define RANDOM_EVENT_ADMIN_INTERVENTION_TIME 30
 
 //this datum is used by the events controller to dictate how it selects events
 /datum/round_event_control

code/modules/projectiles/gun.dm

@@ -1,5 +1,6 @@
 
 #define DUALWIELD_PENALTY_EXTRA_MULTIPLIER 1.4
+#define FIRING_PIN_REMOVAL_DELAY 50
 
 /obj/item/gun
 	name = "gun"
@@ -63,7 +64,7 @@
 	var/obj/item/firing_pin/pin = /obj/item/firing_pin //standard firing pin for most guns
 	var/no_pin_required = FALSE //whether the gun can be fired without a pin
 
-	var/obj/item/flashlight/gun_light
+	var/obj/item/flashlight/seclite/gun_light
 	var/can_flashlight = FALSE
 	var/gunlight_state = "flight"
 	var/obj/item/kitchen/knife/bayonet
@@ -115,23 +116,28 @@
 		QDEL_NULL(chambered)
 	return ..()
 
-/obj/item/gun/CheckParts(list/parts_list)
-	..()
-	var/obj/item/gun/G = locate(/obj/item/gun) in contents
-	if(G)
-		G.forceMove(loc)
-		QDEL_NULL(G.pin)
-		visible_message("[G] can now fit a new pin, but the old one was destroyed in the process.", null, null, 3)
-		qdel(src)
-
 /obj/item/gun/examine(mob/user)
 	. = ..()
-	if(no_pin_required)
-		return
-	if(pin)
-		. += "It has \a [pin] installed."
-	else
-		. += "It doesn't have a firing pin installed, and won't fire."
+	if(!no_pin_required)
+		if(pin)
+			. += "It has \a [pin] installed."
+			. += "<span class='info'>[pin] looks like it could be removed with some <b>tools</b>.</span>"
+		else
+			. += "It doesn't have a firing pin installed, and won't fire."
+
+	if(gun_light)
+		. += "It has \a [gun_light] [can_flashlight ? "" : "permanently "]mounted on it."
+		if(can_flashlight) //if it has a light and this is false, the light is permanent.
+			. += "<span class='info'>[gun_light] looks like it can be <b>unscrewed</b> from [src].</span>"
+	else if(can_flashlight)
+		. += "It has a mounting point for a <b>seclite</b>."
+
+	if(bayonet)
+		. += "It has \a [bayonet] [can_bayonet ? "" : "permanently "]affixed to it."
+		if(can_bayonet) //if it has a bayonet and this is false, the bayonet is permanent.
+			. += "<span class='info'>[bayonet] looks like it can be <b>unscrewed</b> from [src].</span>"
+	else if(can_bayonet)
+		. += "It has a <b>bayonet</b> lug on it."
 
 /obj/item/gun/equipped(mob/living/user, slot)
 	. = ..()
@@ -239,7 +245,7 @@
 				return
 
 	if(weapon_weight == WEAPON_HEAVY && user.get_inactive_held_item())
-		to_chat(user, "<span class='userdanger'>You need both hands free to fire \the [src]!</span>")
+		to_chat(user, "<span class='userdanger'>You need both hands free to fire [src]!</span>")
 		return
 
 	user.DelayNextAction()
@@ -417,12 +423,12 @@
 		if(!gun_light)
 			if(!user.transferItemToLoc(I, src))
 				return
-			to_chat(user, "<span class='notice'>You click \the [S] into place on \the [src].</span>")
+			to_chat(user, "<span class='notice'>You click [S] into place on [src].</span>")
 			if(S.on)
 				set_light(0)
-			gun_light = S
+			set_gun_light(S)
 			update_gunlight(user)
-			alight = new /datum/action/item_action/toggle_gunlight(src)
+			alight = new(src)
 			if(loc == user)
 				alight.Grant(user)
 	else if(istype(I, /obj/item/kitchen/knife))
@@ -431,27 +437,133 @@
 			return ..()
 		if(!user.transferItemToLoc(I, src))
 			return
-		to_chat(user, "<span class='notice'>You attach \the [K] to the front of \the [src].</span>")
+		to_chat(user, "<span class='notice'>You attach [K] to [src]'s bayonet lug.</span>")
 		bayonet = K
 		update_icon()
-	else if(I.tool_behaviour == TOOL_SCREWDRIVER)
-		if(gun_light)
-			var/obj/item/flashlight/seclite/S = gun_light
-			to_chat(user, "<span class='notice'>You unscrew the seclite from \the [src].</span>")
-			gun_light = null
-			S.forceMove(get_turf(user))
-			update_gunlight(user)
-			S.update_brightness(user)
-			QDEL_NULL(alight)
-		if(bayonet)
-			to_chat(user, "<span class='notice'>You unscrew the bayonet from \the [src].</span>")
-			var/obj/item/kitchen/knife/K = bayonet
-			K.forceMove(get_turf(user))
-			bayonet = null
-			update_icon()
 	else
 		return ..()
 
+/obj/item/gun/screwdriver_act(mob/living/user, obj/item/I)
+	. = ..()
+	if(.)
+		return
+	if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return
+	if((can_flashlight && gun_light) && (can_bayonet && bayonet)) //give them a choice instead of removing both
+		var/list/possible_items = list(gun_light, bayonet)
+		var/obj/item/item_to_remove = input(user, "Select an attachment to remove", "Attachment Removal") as null|obj in possible_items
+		if(!item_to_remove || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+			return
+		return remove_gun_attachment(user, I, item_to_remove)
+
+	else if(gun_light && can_flashlight) //if it has a gun_light and can_flashlight is false, the flashlight is permanently attached.
+		return remove_gun_attachment(user, I, gun_light, "unscrewed")
+
+	else if(bayonet && can_bayonet) //if it has a bayonet, and the bayonet can be removed
+		return remove_gun_attachment(user, I, bayonet, "unfix")
+
+	else if(pin && user.is_holding(src))
+		user.visible_message(span_warning("[user] attempts to remove [pin] from [src] with [I]."),
+		span_notice("You attempt to remove [pin] from [src]. (It will take [DisplayTimeText(FIRING_PIN_REMOVAL_DELAY)].)"), null, 3)
+		if(I.use_tool(src, user, FIRING_PIN_REMOVAL_DELAY, volume = 50))
+			if(!pin) //check to see if the pin is still there, or we can spam messages by clicking multiple times during the tool delay
+				return
+			user.visible_message(span_notice("[pin] is pried out of [src] by [user], destroying the pin in the process."),
+								span_warning("You pry [pin] out with [I], destroying the pin in the process."), null, 3)
+			QDEL_NULL(pin)
+			return TRUE
+
+/obj/item/gun/welder_act(mob/living/user, obj/item/I)
+	. = ..()
+	if(.)
+		return
+	if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return
+	if(pin && user.is_holding(src))
+		user.visible_message(span_warning("[user] attempts to remove [pin] from [src] with [I]."),
+		span_notice("You attempt to remove [pin] from [src]. (It will take [DisplayTimeText(FIRING_PIN_REMOVAL_DELAY)].)"), null, 3)
+		if(I.use_tool(src, user, FIRING_PIN_REMOVAL_DELAY, 5, volume = 50))
+			if(!pin) //check to see if the pin is still there, or we can spam messages by clicking multiple times during the tool delay
+				return
+			user.visible_message(span_notice("[pin] is spliced out of [src] by [user], melting part of the pin in the process."),
+								span_warning("You splice [pin] out of [src] with [I], melting part of the pin in the process."), null, 3)
+			QDEL_NULL(pin)
+			return TRUE
+
+/obj/item/gun/wirecutter_act(mob/living/user, obj/item/I)
+	. = ..()
+	if(.)
+		return
+	if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return
+	if(pin && user.is_holding(src))
+		user.visible_message(span_warning("[user] attempts to remove [pin] from [src] with [I]."),
+		span_notice("You attempt to remove [pin] from [src]. (It will take [DisplayTimeText(FIRING_PIN_REMOVAL_DELAY)].)"), null, 3)
+		if(I.use_tool(src, user, FIRING_PIN_REMOVAL_DELAY, volume = 50))
+			if(!pin) //check to see if the pin is still there, or we can spam messages by clicking multiple times during the tool delay
+				return
+			user.visible_message(span_notice("[pin] is ripped out of [src] by [user], mangling the pin in the process."),
+								span_warning("You rip [pin] out of [src] with [I], mangling the pin in the process."), null, 3)
+			QDEL_NULL(pin)
+			return TRUE
+
+/obj/item/gun/proc/remove_gun_attachment(mob/living/user, obj/item/tool_item, obj/item/item_to_remove, removal_verb)
+	if(tool_item)
+		tool_item.play_tool_sound(src)
+	to_chat(user, span_notice("You [removal_verb ? removal_verb : "remove"] [item_to_remove] from [src]."))
+	item_to_remove.forceMove(drop_location())
+
+	if(Adjacent(user) && !issilicon(user))
+		user.put_in_hands(item_to_remove)
+
+	if(item_to_remove == bayonet)
+		return clear_bayonet()
+	else if(item_to_remove == gun_light)
+		return clear_gunlight()
+
+/obj/item/gun/proc/clear_bayonet()
+	if(!bayonet)
+		return
+	bayonet = null
+	update_appearance()
+	return TRUE
+
+/obj/item/gun/proc/clear_gunlight()
+	if(!gun_light)
+		return
+	var/obj/item/flashlight/seclite/removed_light = gun_light
+	set_gun_light(null)
+	update_gunlight()
+	removed_light.update_brightness()
+	QDEL_NULL(alight)
+	return TRUE
+
+/**
+ * Swaps the gun's seclight, dropping the old seclight if it has not been qdel'd.
+ *
+ * Returns the former gun_light that has now been replaced by this proc.
+ * Arguments:
+ * * new_light - The new light to attach to the weapon. Can be null, which will mean the old light is removed with no replacement.
+ */
+/obj/item/gun/proc/set_gun_light(obj/item/flashlight/seclite/new_light)
+	// Doesn't look like this should ever happen? We're replacing our old light with our old light?
+	if(gun_light == new_light)
+		CRASH("Tried to set a new gun light when the old gun light was also the new gun light.")
+
+	. = gun_light
+
+	// If there's an old gun light that isn't being QDELETED, detatch and drop it to the floor.
+	if(!QDELETED(gun_light))
+		if(gun_light.loc == src)
+			gun_light.forceMove(get_turf(src))
+
+	// If there's a new gun light to be added, attach and move it to the gun.
+	if(new_light)
+		if(new_light.loc != src)
+			new_light.forceMove(src)
+
+	gun_light = new_light
+
 /obj/item/gun/ui_action_click(mob/user, action)
 	if(istype(action, /datum/action/item_action/toggle_scope_zoom))
 		zoom(user, user.dir)
@@ -606,9 +718,16 @@
 		user.client.view_size.zoomIn()
 
 /obj/item/gun/handle_atom_del(atom/A)
+	if(A == pin)
+		pin = null
 	if(A == chambered)
 		chambered = null
 		update_icon()
+	if(A == bayonet)
+		clear_bayonet()
+	if(A == gun_light)
+		clear_gunlight()
+	return ..()
 
 /obj/item/gun/proc/getinaccuracy(mob/living/user, bonus_spread, stamloss)
 	return 0		// Replacement TBD: Exponential curved aim instability system.
@@ -642,3 +761,6 @@
 	. = recoil
 	if(user && !user.has_gravity())
 		. = recoil*5
+
+#undef FIRING_PIN_REMOVAL_DELAY
+#undef DUALWIELD_PENALTY_EXTRA_MULTIPLIER

code/modules/reagents/chemistry/machinery/chem_synthesizer.dm

@@ -53,10 +53,10 @@
 				return
 			beaker = new /obj/item/reagent_containers/glass/beaker/bluespace(src)
 			visible_message("<span class='notice'>[src] dispenses a bluespace beaker.</span>")
-		if("amount")
-			var/input = text2num(params["amount"])
+		if("synth_amount")
+			var/input = text2num(params["synth_amount"])
 			if(input)
-				amount = input
+				amount = max(input, 0)
 	update_icon()
 
 /obj/machinery/chem_dispenser/chem_synthesizer/proc/find_reagent(input)

code/modules/research/techweb/_techweb.dm

@@ -19,6 +19,7 @@
 	var/list/research_logs = list()								//IC logs.
 	var/largest_bomb_value = 0
 	var/organization = "Third-Party"							//Organization name, used for display.
+	var/list/next_income = list()								//To be applied on the next passive techweb income
 	var/list/last_bitcoins = list()								//Current per-second production, used for display only.
 	var/list/discovered_mutations = list()                           //Mutations discovered by genetics, this way they are shared and cant be destroyed by destroying a single console
 	var/list/tiers = list()										//Assoc list, id = number, 1 is available, 2 is all reqs are 1, so on
@@ -105,10 +106,15 @@
 		V.rescan_views()
 		V.updateUsrDialog()
 
-/datum/techweb/proc/add_point_list(list/pointlist)
-	for(var/i in pointlist)
-		if(SSresearch.point_types[i] && pointlist[i] > 0)
-			research_points[i] += pointlist[i]
+/datum/techweb/proc/add_point_list(list/pointlist, income = TRUE)
+	if(income) // i DO NOT TRUST byond to optimize this way properly
+		for(var/i in pointlist)
+			if(SSresearch.point_types[i] && pointlist[i] > 0)
+				next_income[i] += pointlist[i]
+	else
+		for(var/i in pointlist)
+			if(SSresearch.point_types[i] && pointlist[i] > 0)
+				research_points[i] += pointlist[i]
 
 /datum/techweb/proc/add_points_all(amount)
 	var/list/l = SSresearch.point_types.Copy()
@@ -116,6 +122,12 @@
 		l[i] = amount
 	add_point_list(l)
 
+/datum/techweb/proc/commit_income()
+	. = next_income.Copy()
+	add_point_list(next_income, income = FALSE)
+	for(var/i in next_income)
+		next_income[i] = 0
+
 /datum/techweb/proc/remove_point_list(list/pointlist)
 	for(var/i in pointlist)
 		if(SSresearch.point_types[i] && pointlist[i] > 0)
@@ -170,16 +182,22 @@
 /datum/techweb/proc/get_researched_nodes()
 	return researched_nodes - hidden_nodes
 
-/datum/techweb/proc/add_point_type(type, amount)
+/datum/techweb/proc/add_point_type(type, amount, income = TRUE)
 	if(!SSresearch.point_types[type] || (amount <= 0))
 		return FALSE
-	research_points[type] += amount
+	if(income)
+		next_income[type] += amount
+	else
+		research_points[type] += amount
 	return TRUE
 
-/datum/techweb/proc/modify_point_type(type, amount)
+/datum/techweb/proc/modify_point_type(type, amount, income = TRUE)
 	if(!SSresearch.point_types[type])
 		return FALSE
-	research_points[type] = max(0, research_points[type] + amount)
+	if(income && amount > 0)
+		next_income[type] += amount
+	else
+		research_points[type] = max(0, research_points[type] + amount)
 	return TRUE
 
 /datum/techweb/proc/remove_point_type(type, amount)

html/changelog.html

@@ -50,6 +50,51 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">29 December 2021</h2>
+			<h3 class="author">TripleShades updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">(Festive Station) Fixes</li>
+				<li class="rscadd">Readds the cold to Festive Station tweak: (Festive Station) Fixes</li>
+				<li class="rscadd">(Pubby) Cautery??? I think this is leftover but nobody has touched Pubby since me so it's fine probably</li>
+			</ul>
+
+			<h2 class="date">23 December 2021</h2>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Atmos group processing heuristic no longer does opposite of intent</li>
+			</ul>
+
+			<h2 class="date">21 December 2021</h2>
+			<h3 class="author">ShizCalev updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed an issue where you were able to remove flashlights/bayonets that were supposed to be permanently attached to a gun.</li>
+				<li class="bugfix">Fixed an issue where you were unable to remove flashlights & bayonets from certain weapons.</li>
+				<li class="bugfix">Fixed a potential issue where adding a flashlight to your helmet would've caused you to lose other action buttons.</li>
+				<li class="bugfix">Fixed a issue where guns with multiple action buttons would break all but one of those action buttons. tweak: If you have both a bayonet and a flashlight attached to your gun, you'll now be given a prompt on which you'd like to remove when using a screwdriver on it. tweak: Hacking a firing pin out of a gun is no longer done via a crafting menu - you can now do it by simply holding the gun in your hand and clicking it with a welder/screwdriver/wirecutters.</li>
+			</ul>
+
+			<h2 class="date">17 December 2021</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">The time for admins to cancel events is 30 seconds again.</li>
+			</ul>
+			<h3 class="author">SandPoot updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes assembly holders.</li>
+			</ul>
+
+			<h2 class="date">13 December 2021</h2>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Per-minute science output fixed</li>
+			</ul>
+
+			<h2 class="date">12 December 2021</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Linters should no longer complain about afterattack sleeps.</li>
+			</ul>
+
 			<h2 class="date">11 December 2021</h2>
 			<h3 class="author">SandPoot updated:</h3>
 			<ul class="changes bgimages16">
@@ -362,80 +407,6 @@
 				<li class="balance">-20 Wound bonus for Hyper Eu</li>
 				<li class="bugfix">Fixes hyper eu's slowdown when it's not wielded</li>
 			</ul>
-
-			<h2 class="date">26 October 2021</h2>
-			<h3 class="author">WanderingFox95 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">bone anvils and bone ingots</li>
-				<li class="imageadd">bone anvil sprites</li>
-			</ul>
-
-			<h2 class="date">25 October 2021</h2>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Vent pumps can now be set to siphoning via the air alarm UI</li>
-			</ul>
-			<h3 class="author">keronshb updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">10k pirate spending money</li>
-			</ul>
-
-			<h2 class="date">22 October 2021</h2>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Ashwalker lungs more aggressively attempt to be safe on lavaland</li>
-			</ul>
-			<h3 class="author">WanderingFox95 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed the wielded sprites not showing up properly.</li>
-				<li class="bugfix">fixed a runtime in the bark box vendor</li>
-				<li class="imageadd">added a missing tennis ball sprite</li>
-			</ul>
-
-			<h2 class="date">20 October 2021</h2>
-			<h3 class="author">Putnam3145 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Removed a panic from auxmos</li>
-				<li class="bugfix">Properly implemented hysteresis on heat exchanger processing</li>
-			</ul>
-
-			<h2 class="date">16 October 2021</h2>
-			<h3 class="author">Ryll/Shaps updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Asay now supports pings (via using @[adminckey])</li>
-			</ul>
-			<h3 class="author">SandPoot updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">If a gamemode fails to load too many times, a safe gamemode will be loaded instead.</li>
-				<li class="code_imp">Dynamic is no longer hardcoded, and you can now set a gamemode to be forced in the configs.</li>
-				<li class="bugfix">Equip delays are a bit less weird now, only relevant for coders/people who use straight jackets... on themself, since that's the only thing that uses it right now.</li>
-				<li class="bugfix">Toggling arousal will properly update your sprite.</li>
-				<li class="bugfix">That also means no spam when moving it in your hands.</li>
-			</ul>
-			<h3 class="author">WanderingFox95 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Removes the quick attack loop (like TG did it)</li>
-			</ul>
-			<h3 class="author">dapnee updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">BEPIS to science tweak: moved the courtroom</li>
-			</ul>
-			<h3 class="author">keronshb updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds the fat dart cigarette and to vendors</li>
-				<li class="imageadd">Adds the sprites for the fat dart</li>
-			</ul>
-
-			<h2 class="date">13 October 2021</h2>
-			<h3 class="author">Hatterhat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Contraband dealers are now embracing their inner Old Space Westerner. Look for the Old West Surplus Crate on your mildly-hacked cargo console today.</li>
-			</ul>
-			<h3 class="author">MrJWhit updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds more fire-saftey closets and trashpiles to boxstation</li>
-				<li class="rscadd">Adds trashpiles to delta.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -30392,3 +30392,37 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       too hot even though their body temperature is the same as it.
   - balance: The warm pool is no longer nearly boiling and the cool pool no longer
       goes below 0C.
+2021-12-12:
+  DeltaFire15:
+  - bugfix: Linters should no longer complain about afterattack sleeps.
+2021-12-13:
+  Putnam3145:
+  - bugfix: Per-minute science output fixed
+2021-12-17:
+  DeltaFire15:
+  - bugfix: The time for admins to cancel events is 30 seconds again.
+  SandPoot:
+  - bugfix: Fixes assembly holders.
+2021-12-21:
+  ShizCalev:
+  - bugfix: Fixed an issue where you were able to remove flashlights/bayonets that
+      were supposed to be permanently attached to a gun.
+  - bugfix: Fixed an issue where you were unable to remove flashlights & bayonets
+      from certain weapons.
+  - bugfix: Fixed a potential issue where adding a flashlight to your helmet would've
+      caused you to lose other action buttons.
+  - bugfix: 'Fixed a issue where guns with multiple action buttons would break all
+      but one of those action buttons. tweak: If you have both a bayonet and a flashlight
+      attached to your gun, you''ll now be given a prompt on which you''d like to
+      remove when using a screwdriver on it. tweak: Hacking a firing pin out of a
+      gun is no longer done via a crafting menu - you can now do it by simply holding
+      the gun in your hand and clicking it with a welder/screwdriver/wirecutters.'
+2021-12-23:
+  Putnam3145:
+  - bugfix: Atmos group processing heuristic no longer does opposite of intent
+2021-12-29:
+  TripleShades:
+  - rscadd: (Festive Station) Fixes
+  - rscadd: 'Readds the cold to Festive Station tweak: (Festive Station) Fixes'
+  - rscadd: (Pubby) Cautery??? I think this is leftover but nobody has touched Pubby
+      since me so it's fine probably

html/changelogs/AutoChangeLog-pr-15421.yml

@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes: 
-  - bugfix: "Linters should no longer complain about afterattack sleeps."

modular_citadel/code/modules/festive/turfs.dm

@@ -9,7 +9,9 @@
 	light_color = "#00111a" //The light can technically cycle on a timer worldwide, but no daynight cycle.
 	baseturfs = /turf/open/floor/grass/snow/edina //If we explode or die somehow, we just make more! Ahahaha!!!
 	tiled_dirt = 0 //NO TILESMOOTHING DIRT/DIRT SPAWNS OR SOME SHIT
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS //DO NOT FREEZE EVERYONE TO DEATH ON CHRISTMAS
+	//initial_gas_mix = OPENTURF_DEFAULT_ATMOS //DO NOT FREEZE EVERYONE TO DEATH ON CHRISTMAS
+	initial_gas_mix = FESTIVE_ATMOS
+	planetary_atmos = 1	//Uses new!!! planetmos wow!!! maybe?
 
 //lets people build
 /turf/open/floor/grass/snow/edina/attackby(obj/item/C, mob/user, params)
@@ -38,6 +40,13 @@
 	icon_state = "unsmooth"
 	smooth = SMOOTH_MORE | SMOOTH_BORDER
 	canSmoothWith = list(/turf/open/floor/festive/cobblestone)
+	initial_gas_mix = FESTIVE_ATMOS
+	planetary_atmos = 1
+
+/turf/open/floor/festive/cobblestone/safe	//this is literally cobblestone but safe for inside use because I don't want to fuck with aesthetics
+	baseturfs = /turf/open/floor/festive/cobblestone/safe
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	planetary_atmos = FALSE
 
 /turf/open/floor/festive/sidewalk
 	name = "sidewalk"
@@ -46,6 +55,8 @@
 	icon_state = "unsmooth"
 	smooth = SMOOTH_MORE | SMOOTH_BORDER
 	canSmoothWith = list(/turf/open/floor/festive/sidewalk)
+	initial_gas_mix = FESTIVE_ATMOS
+	planetary_atmos = 1
 
 /turf/open/floor/festive/alleyway
 	name = "alleyway bricks"
@@ -54,6 +65,13 @@
 	icon_state = "unsmooth"
 	smooth = SMOOTH_MORE | SMOOTH_BORDER
 	canSmoothWith = list(/turf/open/floor/festive/alleyway, /turf/open/floor/festive/white_alleyway)
+	initial_gas_mix = FESTIVE_ATMOS
+	planetary_atmos = 1
+
+/turf/open/floor/festive/alleyway/safe	//this is literally alleyway but safe for inside use because I don't want to fuck with aesthetics
+	baseturfs = /turf/open/floor/festive/alleyway/safe
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	planetary_atmos = FALSE
 
 /turf/open/floor/festive/white_alleyway
 	name = "alleyway bricks"
@@ -62,6 +80,8 @@
 	icon_state = "unsmooth"
 	smooth = SMOOTH_MORE | SMOOTH_BORDER
 	canSmoothWith = list(/turf/open/floor/festive/alleyway, /turf/open/floor/festive/white_alleyway)
+	initial_gas_mix = FESTIVE_ATMOS
+	planetary_atmos = 1
 
 /turf/open/floor/festive/trainplatform
 	name = "trainplatform"
@@ -70,6 +90,13 @@
 	icon_state = "unsmooth"
 	smooth = SMOOTH_MORE | SMOOTH_BORDER
 	canSmoothWith = list(/turf/open/floor/festive/trainplatform)
+	initial_gas_mix = FESTIVE_ATMOS
+	planetary_atmos = 1
+
+/turf/open/floor/festive/trainplatform/safe	//this is literally train platform but safe for inside use because I don't want to remap the strip club
+	baseturfs = /turf/open/floor/festive/trainplatform/safe
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	planetary_atmos = FALSE
 
 /turf/open/floor/festive/stairs/stairsnorth
 	name = "stairs north"

modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm

@@ -169,17 +169,17 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 						if(21)
 							to_chat(M, "<span class='notice'>You feel the synethic cells rest uncomfortably within your body as they start to pulse and grow rapidly.</span>")
 						if(22 to 29)
-							M.adjust_nutrition(M.nutrition/10)
+							M.adjust_nutrition(10)
 						if(30)
 							to_chat(M, "<span class='notice'>You feel the synethic cells grow and expand within yourself, bloating your body outwards.</span>")
 						if(31 to 49)
-							M.adjust_nutrition(M.nutrition/5)
+							M.adjust_nutrition(20)
 						if(50)
 							to_chat(M, "<span class='notice'>The synthetic cells begin to merge with your body, it feels like your body is made of a viscous water, making your movements difficult.</span>")
 							M.action_cooldown_mod += 4//If this makes you fast then please fix it, it should make you slow!!
 							//candidates = pollGhostCandidates("Do you want to play as a clone of [M.name] and do you agree to respect their character and act in a similar manner to them? I swear to god if you diddle them I will be very disapointed in you. ", "FermiClone", null, ROLE_SENTIENCE, 300) // see poll_ignore.dm, should allow admins to ban greifers or bullies
 						if(51 to 79)
-							M.adjust_nutrition(M.nutrition/2)
+							M.adjust_nutrition(50)
 						if(80)
 							to_chat(M, "<span class='notice'>The cells begin to precipitate outwards of your body, you feel like you'll split soon...</span>")
 							if (M.nutrition < 20000)

tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js

@@ -33,8 +33,8 @@ export const ChemDebugSynthesizer = (props, context) => {
                 maxValue={beakerMaxVolume}
                 step={1}
                 stepPixelSize={2}
-                onChange={(e, value) => act('amount', {
-                  amount: value,
+                onChange={(e, value) => act('synth_amount', {
+                  synth_amount: value,
                 })} />
               <Button
                 icon="plus"