Merge branch 'master' into placeholder

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -21,7 +21,7 @@
 
 	var/hibernate = 0 //Do we even process?
 	var/scrubbing = 1 //0 = siphoning, 1 = scrubbing
-	var/list/scrubbing_gas = list(GAS_CO2)
+	var/list/scrubbing_gas
 
 	var/panic = 0 //is this scrubber panicked?
 
@@ -52,6 +52,24 @@
 	if (frequency)
 		set_frequency(frequency)
 
+	if (!scrubbing_gas)
+		reset_scrubbing()
+
+/obj/machinery/atmospherics/unary/vent_scrubber/proc/reset_scrubbing()
+	if (initial(scrubbing_gas))
+		scrubbing_gas = initial(scrubbing_gas)
+	else
+		scrubbing_gas = list()
+		for (var/g in gas_data.gases)
+			if (g != GAS_OXYGEN && g != GAS_NITROGEN)
+				add_to_scrubbing(g)
+
+/obj/machinery/atmospherics/unary/vent_scrubber/proc/add_to_scrubbing(new_gas)
+	scrubbing_gas |= new_gas
+
+/obj/machinery/atmospherics/unary/vent_scrubber/proc/remove_from_scrubbing(old_gas)
+	scrubbing_gas -= old_gas
+
 /obj/machinery/atmospherics/unary/vent_scrubber/atmos_init()
 	..()
 	broadcast_status()
@@ -243,7 +261,7 @@
 		toggle += GAS_N2O
 	else if(signal.data["toggle_n2o_scrub"])
 		toggle += GAS_N2O
-	
+
 	if(!isnull(signal.data["h2_scrub"]) && text2num(signal.data["h2_scrub"]) != (GAS_HYDROGEN in scrubbing_gas))
 		toggle += GAS_HYDROGEN
 	else if(signal.data["toggle_h2_scrub"])

code/game/atoms_movable.dm

@@ -367,48 +367,6 @@
 	sleep(1)
 	animate(I, alpha = 0, transform = matrix(), time = 1)
 
-/atom/movable/proc/do_putdown_animation(atom/target, mob/user)
-	spawn()
-		if(QDELETED(src))
-			return
-		if(QDELETED(target))
-			return
-		if(QDELETED(user))
-			return
-		var/old_invisibility = invisibility // I don't know, it may be used. Basically turns the actual object invisible while the animation plays.
-		invisibility = 100
-		var/turf/old_turf = get_turf(user)
-		if(QDELETED(old_turf))
-			return
-		var/image/I = image(icon = src, loc = old_turf, layer = layer + 0.1)
-		I.transform = matrix() * 0
-		I.appearance_flags = (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|PIXEL_SCALE)
-		I.pixel_x = 0
-		I.pixel_y = 0
-		if (istype(target,/mob))
-			I.dir = target.dir
-
-		var/list/viewing = list()
-		for (var/mob/M in viewers(target))
-			if (M.client)
-				viewing |= M.client
-		flick_overlay(I, viewing, 4)
-
-		var/to_x = (target.x - old_turf.x) * 32 + pixel_x
-		var/to_y = (target.y - old_turf.y) * 32 + pixel_y
-		var/old_x = pixel_x
-		var/old_y = pixel_y
-		pixel_x = 0
-		pixel_y = 0
-
-		animate(I, pixel_x = to_x, pixel_y = to_y, time = 3, transform = matrix(), easing = CUBIC_EASING)
-		sleep(3)
-		if(QDELETED(src))
-			return
-		invisibility = old_invisibility
-		pixel_x = old_x
-		pixel_y = old_y
-
 /atom/movable/proc/simple_move_animation(atom/target)
 	set waitfor = FALSE
 

code/game/objects/items/weapons/chaplain_items.dm

@@ -4,6 +4,10 @@
 	name = "null rod"
 	desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of paranormal phenomenae."
 	icon = 'icons/obj/weapons.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/weapons/lefthand_nullrod.dmi',
+		slot_r_hand_str = 'icons/mob/items/weapons/righthand_nullrod.dmi',
+		)
 	icon_state = "nullrod"
 	item_state = "nullrod"
 	slot_flags = SLOT_BELT

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -216,7 +216,8 @@
 	new /obj/item/clothing/head/bandana/engineering(src)
 	new /obj/item/clothing/head/bandana/engineering(src)
 	new /obj/item/clothing/head/bandana/engineering(src)
-	return
+	new /obj/item/clothing/suit/storage/toggle/highvis(src)
+	new /obj/item/clothing/suit/storage/toggle/highvis(src)
 
 
 /obj/structure/closet/wardrobe/white

code/game/objects/structures/watercloset.dm

@@ -529,7 +529,7 @@
 	// Short of a rewrite, this is necessary to stop monkeycubes being washed.
 	else if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
 		return
-	else if(istype(O, /obj/item/mop))
+	else if(istype(O, /obj/item/mop) || istype(O, /obj/item/reagent_containers/glass/rag))
 		O.reagents.add_reagent(/decl/reagent/water, 5)
 		to_chat(user, SPAN_NOTICE("You wet \the [O] in \the [src]."))
 		playsound(loc, 'sound/effects/slosh.ogg', 25, 1)

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -44,6 +44,7 @@
 	jackets["flannel jacket, grey"] = /obj/item/clothing/suit/storage/toggle/flannel/gray
 	jackets["flannel jacket, purple"] = /obj/item/clothing/suit/storage/toggle/flannel/purple
 	jackets["flannel jacket, yellow"] = /obj/item/clothing/suit/storage/toggle/flannel/yellow
+	jackets["high visibility jacket"] = /obj/item/clothing/suit/storage/toggle/highvis
 	jackets["black vest"] = /obj/item/clothing/suit/storage/toggle/leather_vest
 	jackets["brown vest"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
 	jackets["leather coat"] = /obj/item/clothing/suit/storage/leathercoat

code/modules/clothing/suits/miscellaneous.dm

@@ -375,6 +375,15 @@
 	. = ..()
 	color = get_random_colour(lower = 150)
 
+/obj/item/clothing/suit/storage/toggle/highvis
+	name = "high visibility jacket"
+	desc = "A loose-fitting, high visibility jacket to help crew be recognizable in high traffic areas with large industrial equipment."
+	icon = 'icons/clothing/suits/highvis.dmi'
+	icon_state = "highvis"
+	item_state = "highvis"
+	body_parts_covered = UPPER_TORSO|ARMS
+	contained_sprite = TRUE
+
 /obj/item/clothing/suit/storage/toggle/track
 	name = "track jacket"
 	desc = "a track jacket, for the athletic."

code/modules/detectivework/tools/rag.dm

@@ -33,6 +33,7 @@
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
 	var/last_clean
 	var/clean_msg = FALSE
+	fragile = 0
 
 /obj/item/reagent_containers/glass/rag/Initialize()
 	. = ..()

code/modules/mob/inventory.dm

@@ -194,7 +194,6 @@ var/list/slot_equipment_priority = list( \
 		remove_from_mob(W)
 		if(!(W && W.loc))
 			return TRUE
-		W.do_putdown_animation(target, src)
 		W.forceMove(target)
 		update_icon()
 		return TRUE

code/modules/mob/living/carbon/human/update_icons.dm

@@ -325,12 +325,6 @@ There are several things that need to be remembered:
 			else
 				base_icon.Blend(temp, ICON_OVERLAY)
 
-			part.cut_additional_images(src)
-			var/list/add_images = part.get_additional_images(src)
-			if(add_images)
-				add_overlay(add_images, TRUE)
-		compile_overlays()
-
 		if(!(species.flags & NO_SCAN))
 			if(husk)
 				base_icon.ColorTone(husk_color_mod)
@@ -345,6 +339,14 @@ There are several things that need to be remembered:
 
 		SSicon_cache.human_icon_cache[icon_key] = base_icon
 
+	for(var/thing in organs)
+		var/obj/item/organ/external/part = thing
+		part.cut_additional_images(src)
+		var/list/add_images = part.get_additional_images(src)
+		if(add_images)
+			add_overlay(add_images, TRUE)
+	compile_overlays()
+
 	//END CACHED ICON GENERATION.
 	stand_icon.Blend(base_icon,ICON_OVERLAY)
 

code/modules/mob/living/silicon/robot/items/gripper.dm

@@ -112,7 +112,6 @@
 		if(wrapped.loc == src)
 			if(force_holder)
 				wrapped.force = force_holder
-			wrapped.do_putdown_animation(target, loc)
 			wrapped.forceMove(target)
 			force_holder = null
 		to_chat(loc, SPAN_NOTICE("You release \the [wrapped].")) // loc will always be the cyborg

code/modules/modular_computers/file_system/programs/generic/records.dm

@@ -141,6 +141,7 @@
 			VUEUI_SET_CHECK(data["allrecords"][R.id]["sex"], R.sex, ., data)
 			VUEUI_SET_CHECK(data["allrecords"][R.id]["age"], R.age, ., data)
 			VUEUI_SET_CHECK(data["allrecords"][R.id]["fingerprint"], R.fingerprint, ., data)
+			VUEUI_SET_CHECK(data["allrecords"][R.id]["has_notes"], (R.notes != "No notes found."), ., data)
 			if(R.medical)
 				VUEUI_SET_CHECK(data["allrecords"][R.id]["blood"], R.medical.blood_type, ., data)
 				VUEUI_SET_CHECK(data["allrecords"][R.id]["dna"], R.medical.blood_dna, ., data)

html/changelog.html

@@ -35,6 +35,29 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">25 January 2021</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removed the item dropping animations.</li>
+			</ul>
+			<h3 class="author">Geeves updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Ported high-vis jackets from Bay. Added two to the engineering wardrobe locker, and added it to the jacket selection in the suit loadout.</li>
+				<li class="bugfix">Fixes some parts of the revenant&#x27;s body not appearing.</li>
+				<li class="rscadd">Record programs now display some lines next to the person if they have custom filled records.</li>
+			</ul>
+			<h3 class="author">SierraKomodo updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Scrubbers now filter all non-air gasses by default, instead of jsut CO2.</li>
+			</ul>
+			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes Chaplain&#x27;s null weapon inhands.</li>
+				<li class="spellcheck">Fixes EMT Garage typos.</li>
+				<li class="bugfix">Fixes rags shattering and being unwettable in sinks.</li>
+				<li class="bugfix">Fixes invisible forensic tech vest.</li>
+			</ul>
+
 			<h2 class="date">24 January 2021</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -18050,3 +18050,19 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Dominian accent was removed and replaced with High Morozi and Vulgar Morozi.
   Wowzewow (Wezzy):
   - bugfix: Fixes invisible antenna sprites.
+2021-01-25:
+  Alberyk:
+  - rscdel: Removed the item dropping animations.
+  Geeves:
+  - rscadd: Ported high-vis jackets from Bay. Added two to the engineering wardrobe
+      locker, and added it to the jacket selection in the suit loadout.
+  - bugfix: Fixes some parts of the revenant's body not appearing.
+  - rscadd: Record programs now display some lines next to the person if they have
+      custom filled records.
+  SierraKomodo:
+  - tweak: Scrubbers now filter all non-air gasses by default, instead of jsut CO2.
+  Wowzewow (Wezzy):
+  - bugfix: Fixes Chaplain's null weapon inhands.
+  - spellcheck: Fixes EMT Garage typos.
+  - bugfix: Fixes rags shattering and being unwettable in sinks.
+  - bugfix: Fixes invisible forensic tech vest.

html/changelogs/skull132_fix_fringe.yml

@@ -1,3 +0,0 @@
-author: Skull132
-changes: []
-delte-after: true

maps/aurora/aurora-4_mainlevel.dmm

@@ -44243,7 +44243,7 @@
 /area/medical/first_responder)
 "bzX" = (
 /obj/machinery/door/airlock/glass_medical{
-	name = "First Responder Garge Access";
+	name = "First Responder Garage Access";
 	req_access = list(67)
 	},
 /obj/effect/floor_decal/corner/white/diagonal,
@@ -44678,7 +44678,7 @@
 /obj/machinery/door/blast/shutters{
 	dir = 8;
 	id = "firstrespondershutter";
-	name = "First Responder Garge Door"
+	name = "First Responder Garage Door"
 	},
 /turf/simulated/floor/plating,
 /area/medical/first_responder)
@@ -45041,7 +45041,7 @@
 	dir = 8
 	},
 /obj/machinery/camera/network/medbay{
-	c_tag = "Medical - First Responder Garge";
+	c_tag = "Medical - First Responder Garage";
 	dir = 1
 	},
 /turf/simulated/floor/plating,

vueui/src/components/view/records/list.vue

@@ -2,7 +2,7 @@
   <div>
     <vui-input-search style="display: block;" :input="records" v-model="filtered" :keys="['id', 'name', 'rank', 'sex', 'age', 'fingerprint', 'blood', 'dna']"/>
     <div v-for="record in filtered" :key="record.id">
-      <vui-button :params="{ setactive: record.id }" @click="state.activeview = state.defaultview" push-state>{{ record.id }}: {{ record.name }} ({{ record.rank }})</vui-button>
+      <vui-button :params="{ setactive: record.id }" :icon="record.has_notes ? 'align-justify' : null" @click="state.activeview = state.defaultview" push-state>{{ record.id }}: {{ record.name }} ({{ record.rank }})</vui-button>
     </div>
     <vui-button class="newrecord" :v-if="(editable & 1) > 0" :params="{ newrecord: 1 }" @click="state.activeview = state.defaultview" push-state>New Record</vui-button>
   </div>
@@ -29,4 +29,4 @@ export default {
 .newrecord {
   margin-top: 6px;
 }
-</style>
+</style>