From 9256a1d0536885198eea8bcf8de5dabb4c989dd4 Mon Sep 17 00:00:00 2001
From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com>
Date: Thu, 1 Feb 2024 22:12:16 -0800
Subject: [PATCH 01/18] Sets Evil Seedling TC cost to 2 (From 8), removes the
 ability for Seedlings to have multiple harvests. (#1043)

## About The Pull Request

Sets Evil Seedling TC cost to 2 (From 8), removes the ability for
Seedlings to have multiple harvests.

## Why It's Good For The Game

The last time someone made an army of seedlings, the station ended up
having 107% time dilation due to pathing/garbage collection runtimes.

The second last time someone made an army of seedlings, the person got
an antag permaban for wiping out the entirety of security and storming
command.

I think the maximum seedlings someone should have at any given time is
four seedlings, so this is why the TC cost was divided by 4. Of course,
traitors can buy more seedlings if they want to but this will put a dent
in their TC budget.

## Proof Of Testing

It came to me in a dream.

## Changelog

:cl: BurgerBB
del:  Removes the ability for Seedlings to have multiple harvests.
balance: Sets Evil Seedling TC cost to 2 (From 8),
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---
 modular_zubbers/code/modules/hydroponics/plant_genes.dm | 6 ++++++
 modular_zubbers/code/modules/uplink/uplink_items/job.dm | 3 +++
 tgstation.dme                                           | 1 +
 3 files changed, 10 insertions(+)
 create mode 100644 modular_zubbers/code/modules/uplink/uplink_items/job.dm

diff --git a/modular_zubbers/code/modules/hydroponics/plant_genes.dm b/modular_zubbers/code/modules/hydroponics/plant_genes.dm
index ab567776505da..67584d3e4e0ba 100644
--- a/modular_zubbers/code/modules/hydroponics/plant_genes.dm
+++ b/modular_zubbers/code/modules/hydroponics/plant_genes.dm
@@ -7,6 +7,12 @@
 /datum/plant_gene/trait/backfire
 	mutability_flags = PLANT_GENE_GRAFTABLE //Making this mutatable causes bugs and linters to fail.
 
+/datum/plant_gene/trait/repeated_harvest/New(...)
+	seed_blacklist += /obj/item/seeds/seedling
+	seed_blacklist += /obj/item/seeds/seedling/evil
+	. = ..()
+
+
 /*
  * Returns the formatted name of the plant gene.
  *
diff --git a/modular_zubbers/code/modules/uplink/uplink_items/job.dm b/modular_zubbers/code/modules/uplink/uplink_items/job.dm
new file mode 100644
index 0000000000000..c7ae3bf4ae101
--- /dev/null
+++ b/modular_zubbers/code/modules/uplink/uplink_items/job.dm
@@ -0,0 +1,3 @@
+/datum/uplink_item/role_restricted/evil_seedling
+	desc = "A rare seed we have recovered that grows into a dangerous species that will aid you with your tasks! <b>Note that this cannot be used with the Perennial Growth trait!</b>"
+	cost = 2
diff --git a/tgstation.dme b/tgstation.dme
index 9903a9fc25c40..6ccca2cf136ae 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8380,6 +8380,7 @@
 #include "modular_zubbers\code\modules\synths\code\bodyparts\internal_computer\internal_computer.dm"
 #include "modular_zubbers\code\modules\synths\code\designs\exofab_designs.dm"
 #include "modular_zubbers\code\modules\traitor\goal_overrides.dm"
+#include "modular_zubbers\code\modules\uplink\uplink_items\job.dm"
 #include "modular_zubbers\code\modules\vending\halloween_chocolate.dm"
 #include "modular_zubbers\code\modules\vending\megaseed.dm"
 #include "modular_zubbers\maps\biodome\area.dm"

From ea7348aa4f945ebd2d02260dd93ab34fd7f2a0b3 Mon Sep 17 00:00:00 2001
From: Cursor <102828457+theselfish@users.noreply.github.com>
Date: Fri, 2 Feb 2024 06:15:51 +0000
Subject: [PATCH 02/18] [Donator] Carrot Bag (#1041)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Donator stuff.
If this isn't how this is done here, shout.

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

Money good for server and funny lil items good for me.

1/3.
Still need sprites for the other two.

## Proof Of Testing


![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/33b24944-df9a-4b80-8832-114255ec3e46)

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Donator item.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com>
---
 .../loadouts/loadout_items/loadout_datum_toys.dm  |  5 +++++
 .../code/modules/~donator/choicebeacon.dm         | 15 +++++++++++++++
 tgstation.dme                                     |  1 +
 3 files changed, 21 insertions(+)
 create mode 100644 modular_zubbers/code/modules/~donator/choicebeacon.dm

diff --git a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm
index 4c56105db4d4a..bc4d1a3e7a4c7 100644
--- a/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm
+++ b/modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_toys.dm
@@ -43,3 +43,8 @@
 /datum/loadout_item/toys/xenomaidplush
 	name = "Xenomorph Maid Plushie"
 	item_path = /obj/item/toy/plush/xenoplush/xenomaidplush
+
+/datum/loadout_item/toys/carrotbag
+	name = "Carrot Bag"
+	item_path = /obj/item/sbeacondrop/carrot
+	ckeywhitelist = list("slippyjoe")
diff --git a/modular_zubbers/code/modules/~donator/choicebeacon.dm b/modular_zubbers/code/modules/~donator/choicebeacon.dm
new file mode 100644
index 0000000000000..f60925e082b97
--- /dev/null
+++ b/modular_zubbers/code/modules/~donator/choicebeacon.dm
@@ -0,0 +1,15 @@
+/obj/item/sbeacondrop/carrot
+	name = "carrot phone"
+	icon = 'icons/obj/antags/syndicate_tools.dmi'
+	icon_state = "suspiciousphone"
+	desc = "A cell phone with an in-coming call from someone simply labelled 'Lady Jab'. A small sticker on the back notes that any calls to French overlords will incur a 5 credit service charge."
+	w_class = WEIGHT_CLASS_SMALL
+	droptype = /obj/item/storage/backpack/satchel/bunnysatchel
+
+/obj/item/sbeacondrop/carrot/attack_self(mob/user)
+	if(user)
+		to_chat(user, span_notice("Thank you for choosing the Jab TM for your clothing purchase!"))
+		new droptype( user.loc )
+		playsound(src, 'sound/creatures/mousesqueek.ogg', 100, TRUE, TRUE)
+		qdel(src)
+	return
diff --git a/tgstation.dme b/tgstation.dme
index 6ccca2cf136ae..aae4129a8a74f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8383,6 +8383,7 @@
 #include "modular_zubbers\code\modules\uplink\uplink_items\job.dm"
 #include "modular_zubbers\code\modules\vending\halloween_chocolate.dm"
 #include "modular_zubbers\code\modules\vending\megaseed.dm"
+#include "modular_zubbers\code\modules\~donator\choicebeacon.dm"
 #include "modular_zubbers\maps\biodome\area.dm"
 #include "modular_zubbers\maps\biodome\beach.dm"
 #include "modular_zubbers\maps\biodome\decoration.dm"

From e6bd7fdbc5fc892631d1e900d16656a08388bcf3 Mon Sep 17 00:00:00 2001
From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com>
Date: Thu, 1 Feb 2024 22:17:34 -0800
Subject: [PATCH 03/18] Nerfs Crab17 because I lost my life savings once (#865)

## About The Pull Request

The Crab17 uplink item cannot spawn in surplus crates, nor can it be
discounted.

## Why It's Good For The Game

The Crab17, while a fun addition, is kind of getting annoying fast
(nearly purchased every round to the point where people unironically
metagame it if they know who is traitor). To discourage overusage, it
cannot spawn in surplus bundles, nor can it be discounted.


## Changelog

:cl: BurgerBB
balance: The Crab17 uplink item cannot spawn in surplus crates, nor can
it be discounted.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

---------

Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
---
 .../code/modules/uplink/uplink_items/device_tools.dm           | 3 +++
 tgstation.dme                                                  | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 modular_zubbers/code/modules/uplink/uplink_items/device_tools.dm

diff --git a/modular_zubbers/code/modules/uplink/uplink_items/device_tools.dm b/modular_zubbers/code/modules/uplink/uplink_items/device_tools.dm
new file mode 100644
index 0000000000000..79a5899aa8d65
--- /dev/null
+++ b/modular_zubbers/code/modules/uplink/uplink_items/device_tools.dm
@@ -0,0 +1,3 @@
+/datum/uplink_item/device_tools/suspiciousphone
+	surplus = 0
+	cant_discount = TRUE
diff --git a/tgstation.dme b/tgstation.dme
index aae4129a8a74f..69a141c5b8546 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8380,6 +8380,7 @@
 #include "modular_zubbers\code\modules\synths\code\bodyparts\internal_computer\internal_computer.dm"
 #include "modular_zubbers\code\modules\synths\code\designs\exofab_designs.dm"
 #include "modular_zubbers\code\modules\traitor\goal_overrides.dm"
+#include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\job.dm"
 #include "modular_zubbers\code\modules\vending\halloween_chocolate.dm"
 #include "modular_zubbers\code\modules\vending\megaseed.dm"

From 807d0d2e4d939f97d3c355aa07edce7e7c686e44 Mon Sep 17 00:00:00 2001
From: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Date: Fri, 2 Feb 2024 07:18:08 +0100
Subject: [PATCH 04/18] Secmed tweaks (#988)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Secmeds now get their own special HUDs, in both regular and protected
variants.

Secmed headset is now a bowman

Secmed locker bloat compacted into a garment bag

## Why It's Good For The Game

Secmeds are frankly a bit lacking in their equipment. This should help
them a bit.


## Proof Of Testing


![image](https://github.com/Bubberstation/Bubberstation/assets/49160555/73971322-6666-4a3a-87da-5e3dc9b2c6d2)

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Secmed huds are now available for security medics
add: Secmed headset upgraded into a bowman
image: Icons for secmed huds and secmed headset
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

---------

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
---
 .../secmed/icons/secmed_equipment.dmi         | Bin 0 -> 622 bytes
 .../security/secmed}/secmed_clothes.dm        |   0
 .../security/secmed}/security_medic.dm        |  73 ++++++++++++++----
 tgstation.dme                                 |   4 +-
 4 files changed, 60 insertions(+), 17 deletions(-)
 create mode 100644 modular_zubbers/modules/security/secmed/icons/secmed_equipment.dmi
 rename modular_zubbers/{code/modules/sec_haul/code/security_medic => modules/security/secmed}/secmed_clothes.dm (100%)
 rename modular_zubbers/{code/modules/sec_haul/code/security_medic => modules/security/secmed}/security_medic.dm (69%)

diff --git a/modular_zubbers/modules/security/secmed/icons/secmed_equipment.dmi b/modular_zubbers/modules/security/secmed/icons/secmed_equipment.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..91c915e5fd6582e2331fbf7c8c68b88a9d6c15c3
GIT binary patch
literal 622
zcmV-!0+IcRP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0001WP)t-sz`(#J
zB_%E_EaWLHH8?>=LP9(_IT#oiA0H@JS65bAV|ROlPEJlTGBQX=NLiJ-C@3gLc9cWW
z<m2Z5VE^|drQSh7L1cCRP;cxVkL)y4>_0z0Nl8f*5EB;{7r?;45)u+MF8@eH|8rsg
zSXfvuFE1n{B(b>HJOBUy0d!JMQvg8b*k%9#0DO8>Sad{Xb7OL8aCB*JZU6vyoKseC
za&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AX6zL
zH8G_)wM2=FGbOXA7${=M#hF%=n41b=Bh;0q5Tho(peVm2HMt}er)p&dS3ei9QvpgE
zGSK~ddQboW0Ut?3K~z|U?UUVdgCGz_Swz9#T4U5m;?So0{*PEzZEgY~p}p#Gyx1Aw
zJG+BQNZ`K#Kq>u2UZ*MO$Gbm;UE)3)8T)TR3Qri={ZgFZ1<=*tB_J{8lb8_Bxy!(W
zZHFcaPt(+45Ls>-VI|>3QEJ0uL2eiDswm$a1}5^zDuAl0-)obgIUL&dc+~lfWs&s~
zphH1n6tr#A4;jlHf(`}6z2J0en!X>#RbYP&Af>F&CIK0cab%Z^V0HoFQkL>;zC(dY
zfz^<ors+0A_r%{|GTdf({1w;@TVH_5anKGR-swOf5D5IBG<#8A`H#=5RBQQ?J_e=p
zvu=)gsXXRT*Lj}RRu)AnTzb*4%xW#mg4M^M_VQvb5D5Gc-=?<`a&;$hs{jB107*qo
IM6N<$f<MRzdH?_b

literal 0
HcmV?d00001

diff --git a/modular_zubbers/code/modules/sec_haul/code/security_medic/secmed_clothes.dm b/modular_zubbers/modules/security/secmed/secmed_clothes.dm
similarity index 100%
rename from modular_zubbers/code/modules/sec_haul/code/security_medic/secmed_clothes.dm
rename to modular_zubbers/modules/security/secmed/secmed_clothes.dm
diff --git a/modular_zubbers/code/modules/sec_haul/code/security_medic/security_medic.dm b/modular_zubbers/modules/security/secmed/security_medic.dm
similarity index 69%
rename from modular_zubbers/code/modules/sec_haul/code/security_medic/security_medic.dm
rename to modular_zubbers/modules/security/secmed/security_medic.dm
index c12e2cac8df9a..a1f43d322ac37 100644
--- a/modular_zubbers/code/modules/sec_haul/code/security_medic/security_medic.dm
+++ b/modular_zubbers/modules/security/secmed/security_medic.dm
@@ -52,7 +52,7 @@
 	uniform = /obj/item/clothing/under/rank/security/peacekeeper/security_medic
 	gloves = /obj/item/clothing/gloves/latex/nitrile
 	shoes = /obj/item/clothing/shoes/jackboots/sec
-	glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+	glasses = /obj/item/clothing/glasses/hud/secmed
 	suit = /obj/item/clothing/suit/armor/vest/peacekeeper/security_medic
 	l_hand = /obj/item/storage/medkit/brute
 	head = /obj/item/clothing/head/beret/sec/peacekeeper/security_medic
@@ -84,32 +84,75 @@
 	channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SECURITY = 1)
 
 /obj/item/radio/headset/headset_medsec
-	name = "medical-security radio headset"
-	desc = "Used to hear how many security officers need to be stiched back together."
-	icon_state = "sec_headset"
+	name = "security medic's bowman headset"
+	desc = "Used to hear how many security officers need to be stitched back together."
+	icon = 'modular_zubbers/modules/security/secmed/icons/secmed_equipment.dmi'
+	icon_state = "headset"
 	keyslot = new /obj/item/encryptionkey/headset_medsec
 
+/obj/item/radio/headset/headset_medsec/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS))
+
+/obj/item/clothing/glasses/hud/secmed
+	name = "security-medical HUD"
+	desc = "The choice for security medics all across the sector, provides advanced medical and simplified security readings."
+	icon = 'modular_zubbers/modules/security/secmed/icons/secmed_equipment.dmi'
+	icon_state = "hud"
+	worn_icon_state = "healthhud"
+	hud_type = DATA_HUD_MEDICAL_ADVANCED
+	clothing_traits = list(TRAIT_MEDICAL_HUD)
+
+/obj/item/clothing/glasses/hud/secmed/equipped(mob/living/carbon/human/user, slot)
+	. = ..()
+	if(!(slot & ITEM_SLOT_EYES))
+		return
+	// Extra hud because the bloody code doesn't support multihuds yet. I'll probably add multihud support soon enough. If you see this I didn't. ~Waterpig
+	var/datum/atom_hud/extra_hud = GLOB.huds[DATA_HUD_SECURITY_BASIC]
+	extra_hud.show_to(user)
+
+/obj/item/clothing/glasses/hud/secmed/dropped(mob/living/carbon/human/user)
+	. = ..()
+	if(!istype(user) || user.glasses != src)
+		return
+	var/datum/atom_hud/extra_hud = GLOB.huds[DATA_HUD_SECURITY_BASIC]
+	extra_hud.hide_from(user)
+
+/obj/item/clothing/glasses/hud/secmed/sunglasses
+	name = "security-medical HUD sunglasses"
+	icon_state = "hud_protected"
+	worn_icon_state = "sunhudsec"
+	flash_protect = FLASH_PROTECTION_SENSITIVE
+	flags_cover = GLASSESCOVERSEYES
+
+/obj/item/storage/bag/garment/secmed
+	name = "Security medic's garment bag"
+	desc = "A bag containing extra clothing for the security medic"
+
+/obj/item/storage/bag/garment/secmed/PopulateContents()
+	. = ..()
+	new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic(src)
+	new /obj/item/clothing/suit/hazardvest/security_medic(src)
+	new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue(src)
+	new /obj/item/clothing/suit/hazardvest/security_medic/blue(src)
+	new /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic(src)
+	new /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec(src)
+	new /obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate(src)
+	new /obj/item/clothing/under/rank/security/peacekeeper/security_medic(src)
+	new /obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt(src)
+
 /obj/structure/closet/secure_closet/security_medic
 	name = "security medic's locker"
 	req_access = list(ACCESS_BRIG)
 	icon = 'modular_zubbers/icons/obj/closets/secmed_closet.dmi'
 	icon_state = "secmed"
 
-
-
 /obj/structure/closet/secure_closet/security_medic/PopulateContents()
 	..()
-	new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic(src)
-	new /obj/item/clothing/suit/hazardvest/security_medic(src)
-	new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue(src)
-	new /obj/item/clothing/suit/hazardvest/security_medic/blue(src)
-	new /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic(src)
 	new /obj/item/radio/headset/headset_medsec(src)
+	new /obj/item/clothing/glasses/hud/secmed/sunglasses(src)
 	new /obj/item/storage/medkit/emergency(src)
 	new /obj/item/clothing/suit/jacket/straight_jacket(src)
 	new /obj/item/storage/belt/medical(src)
 	new /obj/item/storage/belt/security/medic/full(src)
-	new /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec(src)
-	new /obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate(src)
-	new /obj/item/clothing/under/rank/security/peacekeeper/security_medic(src)
-	new /obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt(src)
+	new /obj/item/storage/bag/garment/secmed(src)
diff --git a/tgstation.dme b/tgstation.dme
index 69a141c5b8546..c51ea3887034a 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8363,8 +8363,6 @@
 #include "modular_zubbers\code\modules\research\designs\medical_designs.dm"
 #include "modular_zubbers\code\modules\research\designs\misc_designs.dm"
 #include "modular_zubbers\code\modules\research\techweb\all_nodes.dm"
-#include "modular_zubbers\code\modules\sec_haul\code\security_medic\secmed_clothes.dm"
-#include "modular_zubbers\code\modules\sec_haul\code\security_medic\security_medic.dm"
 #include "modular_zubbers\code\modules\security_levels\security_level_datums.dm"
 #include "modular_zubbers\code\modules\spells\spell_types\disabled_spells.dm"
 #include "modular_zubbers\code\modules\spells\spell_types\nerfed_spells.dm"
@@ -8484,6 +8482,8 @@
 #include "modular_zubbers\modules\quirks\code\negative_quirks\sensitive_snout.dm"
 #include "modular_zubbers\modules\quirks\code\neutral_quirks\hungry.dm"
 #include "modular_zubbers\modules\quirks\code\neutral_quirks\waddle.dm"
+#include "modular_zubbers\modules\security\secmed\secmed_clothes.dm"
+#include "modular_zubbers\modules\security\secmed\security_medic.dm"
 #include "modular_zubbers\modules\space_background\parallax.dm"
 #include "modular_zubbers\modules\space_background\turf_space.dm"
 #include "modular_zubbers\modules\synths\code\bodyparts\internal_computer\internal_computer.dm"

From 06478164b97b52338136a92889c5da890abc4992 Mon Sep 17 00:00:00 2001
From: xXPawnStarrXx <53197594+xXPawnStarrXx@users.noreply.github.com>
Date: Fri, 2 Feb 2024 06:18:39 +0000
Subject: [PATCH 05/18] Prisoner bounties (#1036)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds 14 bounties for prisoners and the framework for people to add more.
Most being plants and easy crafts.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game
Gives people behind bars something to do and maybe some cash to grease
palms with, you just gotta get someone to get a console for you.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Proof Of Testing

![image](https://github.com/Bubberstation/Bubberstation/assets/53197594/bb674d4c-1f03-46d2-8db4-4d5514f2506d)

<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Added new bounties for inmates.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---
 code/__DEFINES/~~bubber_defines/economy.dm    |   1 +
 code/modules/cargo/bounty.dm                  |   2 +
 code/modules/jobs/job_types/prisoner.dm       |   1 +
 .../code/modules/cargo/bounties/prisoner.dm   | 105 ++++++++++++++++++
 tgstation.dme                                 |   1 +
 5 files changed, 110 insertions(+)
 create mode 100644 modular_zubbers/code/modules/cargo/bounties/prisoner.dm

diff --git a/code/__DEFINES/~~bubber_defines/economy.dm b/code/__DEFINES/~~bubber_defines/economy.dm
index 8a47b4c8a4a06..bdf8d4201be93 100644
--- a/code/__DEFINES/~~bubber_defines/economy.dm
+++ b/code/__DEFINES/~~bubber_defines/economy.dm
@@ -1,2 +1,3 @@
 //Defines that set what kind of civilian bounties should be applied mid-round.
 #define CIV_JOB_SMITH 21 //By making this higher we avoid having to maintain this value if more bounties are added upstream
+#define CIV_JOB_PRISONER 22 //Basically restricted assistant bounties
diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm
index f0843cb3ec2f5..4a9f313af4a44 100644
--- a/code/modules/cargo/bounty.dm
+++ b/code/modules/cargo/bounty.dm
@@ -80,6 +80,8 @@
 			//BUBBER EDIT START
 			if(CIV_JOB_SMITH)
 				chosen_type = pick(subtypesof(/datum/bounty/item/blacksmith))
+			if(CIV_JOB_PRISONER)
+				chosen_type = pick(subtypesof(/datum/bounty/item/prisoner))
 			//BUBBER EDIT END
 		bounty_ref = new chosen_type
 		if(bounty_ref.can_get())
diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm
index 4e49507864a74..68fa354c47a32 100644
--- a/code/modules/jobs/job_types/prisoner.dm
+++ b/code/modules/jobs/job_types/prisoner.dm
@@ -7,6 +7,7 @@
 	spawn_positions = 2
 	supervisors = "the security team"
 	exp_granted_type = EXP_TYPE_CREW
+	bounty_types = CIV_JOB_PRISONER
 	paycheck = PAYCHECK_LOWER
 	config_tag = "PRISONER"
 
diff --git a/modular_zubbers/code/modules/cargo/bounties/prisoner.dm b/modular_zubbers/code/modules/cargo/bounties/prisoner.dm
new file mode 100644
index 0000000000000..a4b60536e08ae
--- /dev/null
+++ b/modular_zubbers/code/modules/cargo/bounties/prisoner.dm
@@ -0,0 +1,105 @@
+/datum/bounty/item/prisoner/soap
+	name = "Soap"
+	description = "One of the janitors lost theirs, send them some."
+	reward = CARGO_CRATE_VALUE * 4
+	required_count = 2
+	wanted_types = list(/obj/item/soap = TRUE)
+
+/datum/bounty/item/prisoner/baseball_bat
+	name = "Baseball Bat"
+	description = "Baseball fever is going on at CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream."
+	reward = CARGO_CRATE_VALUE * 4
+	required_count = 5
+	wanted_types = list(/obj/item/melee/baseball_bat = TRUE)
+
+/datum/bounty/item/prisoner/monkey_hide
+	name = "Monkey Hide"
+	description = "One of the scientists at CentCom is interested in testing products on monkey skin. Your mission is to acquire monkey's hide and ship it."
+	reward = CARGO_CRATE_VALUE * 3
+	wanted_types = list(/obj/item/stack/sheet/animalhide/monkey = TRUE)
+
+/datum/bounty/item/prisoner/poppy
+	name = "Poppies"
+	description = "Stop asking questions, send the flowers, get paid. INMATE!"
+	reward = CARGO_CRATE_VALUE * 2
+	required_count = 3
+	wanted_types = list(/obj/item/food/grown/poppy = TRUE)
+	include_subtypes = FALSE
+
+/datum/bounty/item/prisoner/lilly
+	name = "Lillies"
+	description = "Stop asking questions, send the flowers, get paid. INMATE!"
+	reward = CARGO_CRATE_VALUE * 3
+	required_count = 3
+	wanted_types = list(/obj/item/food/grown/poppy/lily = TRUE)
+	include_subtypes = FALSE
+
+/datum/bounty/item/prisoner/geranium
+	name = "Geraniums"
+	description = "Stop asking questions, send the flowers, get paid. INMATE!"
+	reward = CARGO_CRATE_VALUE * 3
+	required_count = 3
+	wanted_types = list(/obj/item/food/grown/poppy/geranium = TRUE)
+	include_subtypes = FALSE
+
+/datum/bounty/item/prisoner/tomatoes
+	name = "Tomatoes"
+	description = "Stop asking questions, send the fruits, get paid. INMATE!"
+	reward = CARGO_CRATE_VALUE * 3
+	required_count = 5
+	wanted_types = list(/obj/item/food/grown/tomato = TRUE)
+	include_subtypes = FALSE
+
+/datum/bounty/item/prisoner/carrots
+	name = "Carrots"
+	description = "Stop asking questions, send the fruits, get paid. INMATE!"
+	reward = CARGO_CRATE_VALUE * 3
+	required_count = 5
+	wanted_types = list(/obj/item/food/grown/carrot = TRUE)
+	include_subtypes = FALSE
+
+/datum/bounty/item/prisoner/onion
+	name = "Onions"
+	description = "Stop asking questions, send the fruits, get paid. INMATE!"
+	reward = CARGO_CRATE_VALUE * 3
+	required_count = 5
+	wanted_types = list(/obj/item/food/grown/onion = TRUE)
+	include_subtypes = FALSE
+
+/datum/bounty/item/prisoner/apples
+	name = "Apples"
+	description = "Stop asking questions, send the fruits, get paid. INMATE!"
+	reward = CARGO_CRATE_VALUE * 3
+	required_count = 5
+	wanted_types = list(/obj/item/food/grown/apple = TRUE)
+	include_subtypes = FALSE
+
+/datum/bounty/item/prisoner/grapes
+	name = "Grapes"
+	description = "Stop asking questions, send the fruits, get paid. INMATE!"
+	reward = CARGO_CRATE_VALUE * 3
+	required_count = 5
+	wanted_types = list(/obj/item/food/grown/grapes = TRUE)
+	include_subtypes = FALSE
+
+/datum/bounty/item/prisoner/corn
+	name = "Ears of Corn"
+	description = "Stop asking questions, send the fruits, get paid. INMATE!"
+	reward = CARGO_CRATE_VALUE * 3
+	required_count = 5
+	wanted_types = list(/obj/item/food/grown/corn = TRUE)
+	include_subtypes = FALSE
+
+/datum/bounty/item/prisoner/monkey_cubes
+	name = "Monkey Cubes"
+	description = "Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes."
+	reward = CARGO_CRATE_VALUE * 4
+	required_count = 3
+	wanted_types = list(/obj/item/food/monkeycube = TRUE)
+
+/datum/bounty/item/prisoner/paper_bin
+	name = "Paper Bins"
+	description = "Our accounting division is all out of paper. We need a new shipment immediately."
+	reward = CARGO_CRATE_VALUE * 5
+	required_count = 5
+	wanted_types = list(/obj/item/paper_bin = TRUE)
diff --git a/tgstation.dme b/tgstation.dme
index c51ea3887034a..783c76becf45a 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8225,6 +8225,7 @@
 #include "modular_zubbers\code\modules\borer_hud\borer.dm"
 #include "modular_zubbers\code\modules\bsrpd\code\bsrpd.dm"
 #include "modular_zubbers\code\modules\cargo\bounties\blacksmith.dm"
+#include "modular_zubbers\code\modules\cargo\bounties\prisoner.dm"
 #include "modular_zubbers\code\modules\cargo\exports\weapons.dm"
 #include "modular_zubbers\code\modules\cargo\packs\contraband.dm"
 #include "modular_zubbers\code\modules\cargo\packs\goodies.dm"

From 93639e66c6718bd68dba0900547e6fecc5b9d7f1 Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 07:24:41 +0100
Subject: [PATCH 06/18] Automatic changelog for PR #860 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-860.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-860.yml

diff --git a/html/changelogs/AutoChangeLog-pr-860.yml b/html/changelogs/AutoChangeLog-pr-860.yml
new file mode 100644
index 0000000000000..617334362b949
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-860.yml
@@ -0,0 +1,4 @@
+author: "BurgerBB"
+delete-after: True
+changes:
+  - rscadd: "Organs that rot now create miasma. Note that miasma emissions will stop once the organ is fully decayed."
\ No newline at end of file

From fc69fba45ac3f4c6a47fd3954dee66b462b0e3d9 Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 07:27:19 +0100
Subject: [PATCH 07/18] Automatic changelog for PR #993 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-993.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-993.yml

diff --git a/html/changelogs/AutoChangeLog-pr-993.yml b/html/changelogs/AutoChangeLog-pr-993.yml
new file mode 100644
index 0000000000000..bae88e4fe463f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-993.yml
@@ -0,0 +1,4 @@
+author: "nevimer"
+delete-after: True
+changes:
+  - rscadd: "Malf AI Doomsday now makes a tidal wave of explosions from APC's."
\ No newline at end of file

From 4fbd01cce0cff45c9a122c79d1a6a6653c93b01f Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 07:35:56 +0100
Subject: [PATCH 08/18] Automatic changelog for PR #1085 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1085.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1085.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1085.yml b/html/changelogs/AutoChangeLog-pr-1085.yml
new file mode 100644
index 0000000000000..180b2e428e542
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1085.yml
@@ -0,0 +1,4 @@
+author: "nikothedude"
+delete-after: True
+changes:
+  - spellcheck: "The nobility dresscoat has been reflavored to not be nobility"
\ No newline at end of file

From 667c77f13b6c7ab16b067e722ef03e65c6772b31 Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 07:57:01 +0100
Subject: [PATCH 09/18] Automatic changelog for PR #1054 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1054.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1054.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1054.yml b/html/changelogs/AutoChangeLog-pr-1054.yml
new file mode 100644
index 0000000000000..f90a48852b9a6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1054.yml
@@ -0,0 +1,7 @@
+author: "pixelkitty286"
+delete-after: True
+changes:
+  - rscadd: "Door sounds from Citrp"
+  - qol: "Better door sounds"
+  - sound: "added door sound files in modular sounds folder"
+  - code_imp: "Disabled skyrat's door sound over rides in airlock.dm"
\ No newline at end of file

From 70460db1c8ce17855c3ecde63aec8ffb4d289c03 Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 07:57:31 +0100
Subject: [PATCH 10/18] Automatic changelog for PR #1043 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1043.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1043.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1043.yml b/html/changelogs/AutoChangeLog-pr-1043.yml
new file mode 100644
index 0000000000000..78ead36cc04bc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1043.yml
@@ -0,0 +1,5 @@
+author: "BurgerBB"
+delete-after: True
+changes:
+  - rscdel: " Removes the ability for Seedlings to have multiple harvests."
+  - balance: "Sets Evil Seedling TC cost to 2 (From 8),"
\ No newline at end of file

From fbe056c8de9a9d661143caea0ddb8d30f7c9ee17 Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 07:58:59 +0100
Subject: [PATCH 11/18] Automatic changelog for PR #1041 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1041.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1041.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1041.yml b/html/changelogs/AutoChangeLog-pr-1041.yml
new file mode 100644
index 0000000000000..a20ab2ff88635
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1041.yml
@@ -0,0 +1,4 @@
+author: "theselfish"
+delete-after: True
+changes:
+  - rscadd: "Donator item."
\ No newline at end of file

From 15848fc2b7fecab28d04223529825d3ec6f1f2f8 Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 08:01:19 +0100
Subject: [PATCH 12/18] Automatic changelog for PR #865 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-865.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-865.yml

diff --git a/html/changelogs/AutoChangeLog-pr-865.yml b/html/changelogs/AutoChangeLog-pr-865.yml
new file mode 100644
index 0000000000000..e99d23ad8bca9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-865.yml
@@ -0,0 +1,4 @@
+author: "BurgerBB"
+delete-after: True
+changes:
+  - balance: "The Crab17 uplink item cannot spawn in surplus crates, nor can it be discounted."
\ No newline at end of file

From f84506828ed1aac70dbb299487de5295a053091f Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 08:01:52 +0100
Subject: [PATCH 13/18] Automatic changelog for PR #988 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-988.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-988.yml

diff --git a/html/changelogs/AutoChangeLog-pr-988.yml b/html/changelogs/AutoChangeLog-pr-988.yml
new file mode 100644
index 0000000000000..beb9a3192fc49
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-988.yml
@@ -0,0 +1,6 @@
+author: "Majkl-J"
+delete-after: True
+changes:
+  - rscadd: "Secmed huds are now available for security medics"
+  - rscadd: "Secmed headset upgraded into a bowman"
+  - image: "Icons for secmed huds and secmed headset"
\ No newline at end of file

From cb66074735e5c9685bc63c1c8dd6dc016a1b1b6d Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 08:02:18 +0100
Subject: [PATCH 14/18] Automatic changelog for PR #1036 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1036.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1036.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1036.yml b/html/changelogs/AutoChangeLog-pr-1036.yml
new file mode 100644
index 0000000000000..9c04ec2025910
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1036.yml
@@ -0,0 +1,4 @@
+author: "xXPawnStarrXx"
+delete-after: True
+changes:
+  - rscadd: "Added new bounties for inmates."
\ No newline at end of file

From ceabe514ec5907fa25d875546cb783bd7b53a4c1 Mon Sep 17 00:00:00 2001
From: Nitha <132854285+NithaIsTired@users.noreply.github.com>
Date: Fri, 2 Feb 2024 10:03:51 -0300
Subject: [PATCH 15/18] Adds the borg deathsound to synths (#1099)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

It is indeed exactly what it sounds.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game
Adds more immersion to the game (to be fair all of the species should
have a custom death sound but I don't make them).
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Proof Of Testing
Yes.
<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Synths now scream in agony when they die.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---
 modular_zubbers/modules/synths/death_sound.dm | 2 ++
 tgstation.dme                                 | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 modular_zubbers/modules/synths/death_sound.dm

diff --git a/modular_zubbers/modules/synths/death_sound.dm b/modular_zubbers/modules/synths/death_sound.dm
new file mode 100644
index 0000000000000..65bd00136dc9d
--- /dev/null
+++ b/modular_zubbers/modules/synths/death_sound.dm
@@ -0,0 +1,2 @@
+/datum/species/synthetic
+  death_sound = 'sound/voice/borg_deathsound.ogg'
diff --git a/tgstation.dme b/tgstation.dme
index 783c76becf45a..8a031dcdbb6c1 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8487,6 +8487,7 @@
 #include "modular_zubbers\modules\security\secmed\security_medic.dm"
 #include "modular_zubbers\modules\space_background\parallax.dm"
 #include "modular_zubbers\modules\space_background\turf_space.dm"
+#include "modular_zubbers\modules\synths\death_sound.dm"
 #include "modular_zubbers\modules\synths\code\bodyparts\internal_computer\internal_computer.dm"
 #include "modular_zubbers\modules\tesh-vali_augments\code\__DEFINES\research\research_categories.dm"
 #include "modular_zubbers\modules\tesh-vali_augments\code\modules\research\designs\mechfabricator_designs.dm"

From c67f76cbf61a3177dfc8dbc77faf5f0e28d6b91f Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 14:04:14 +0100
Subject: [PATCH 16/18] Automatic changelog for PR #1099 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1099.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1099.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1099.yml b/html/changelogs/AutoChangeLog-pr-1099.yml
new file mode 100644
index 0000000000000..9b442e9a8dbd4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1099.yml
@@ -0,0 +1,4 @@
+author: "NithaIsTired"
+delete-after: True
+changes:
+  - rscadd: "Synths now scream in agony when they die."
\ No newline at end of file

From e586dc1866990f3722ef8c18e2ea6e374e232a06 Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:57:06 +0100
Subject: [PATCH 17/18] Automatic changelog for PR #1101 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1101.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1101.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1101.yml b/html/changelogs/AutoChangeLog-pr-1101.yml
new file mode 100644
index 0000000000000..2b0bb3807c558
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1101.yml
@@ -0,0 +1,7 @@
+author: "Swiftfeather"
+delete-after: True
+changes:
+  - rscdel: "Door sounds from Citrp"
+  - qol: "better door sounds"
+  - sound: "changed sound back to better original airlock sound"
+  - code_imp: "re enables skyrat's door sound override"
\ No newline at end of file

From dccc7d64e702c8d04e4d5970300122d39467f749 Mon Sep 17 00:00:00 2001
From: nevimer <77420409+nevimer@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:48:02 -0500
Subject: [PATCH 18/18] Add Bloodsuckers to Screenshots Test

---
 .../screenshot_antag_icons_bloodsucker.png       | Bin 0 -> 1579 bytes
 ...creenshot_antag_icons_bloodsuckerlatejoin.png | Bin 0 -> 1579 bytes
 ...creenshot_antag_icons_bloodsuckermidround.png | Bin 0 -> 1579 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsucker.png
 create mode 100644 code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsuckerlatejoin.png
 create mode 100644 code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsuckermidround.png

diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsucker.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsucker.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3899287eb1d9da6f7d32b81532bbc7b2ff22f6d
GIT binary patch
literal 1579
zcmY+Ec~lZu6vi>qvINvJF_%PhH%Bd3%q`a>ToAR%rO7;#qlOD^<x;t$WK%MR;4&W5
zEG1CPrP3C~B8|ezEhNPaQ_~=cF=Mbfb<Vu=d+)w~?tSO`?t8Du59tZov3Cam004P=
zxdlk$$<4W4PP$HAPqmeXKh6b)VBMmUA`_$IvC){b06-cU6%?PCEE1yPS3gf1`y4QS
zF~CAm(dMrXzMnE>A&j2+QPI>xyr}`NK?KY2Vm!`A*(X3HR;8@0!xm*(jFWB^I&Ft=
z%1J0#Y?N%Uld7z0gs&N(>KSw&0t@g00Aw?~-CP3G$V=p7XF}1t`!V{0H_=!5h<uM=
z820aEr8Z;&%&0F9eW~}-QKi6JUucRazPjet1}Fp^b$40GF{7KPvT+d`HQJ~B&(t>R
zKyT`~T{#3J&c<|G5^X5wxOSdg>=w*~+K>d3Y&JJ|UX(CPPWsp>3X7B~{{N_nrbnlq
zJd8jh-%_4uW@g5PcS+do#;_&uyTyk9CY?^YjK|ZcYz`-GMl4R}-MIEoto3-yM|p^!
zoZKe$GpBSlkxX0PMpXd@8)pLYpOj%rGjnsY-aEg3y}-|QSj{8!h!=N7RM`o?7K22;
zowgdGD*Vhhva1O%;i&PJ#<>myW9WWb3vXpy$gz){X(XPwPHCSrj`2l`LOPrA1)mML
zDb;qX-(aJC&H|u=vl?_0qVueb<uVGH5ns|)Z5#hm@T;2W!-x9~>Ovws54o01Urbkz
zxUkI-2sGUFluiQsv~#rQ!@TR7G{A!5CoqwurRy#O>z}Z+SM3F*D5hP7lI~O;F(zbh
z{dvN};QZ6X+Hm9--M4*XVI*s-ujCu2UNOg?`&13fY6|pL08u9aQClD`MQ*jrIH;a-
z5p^w$#xPheXP%913^WEwD1L_8TR8}+F;cb$fNmr>RU!{^Vv38KG7k~ypJ<O<>TfTO
zMa{Uc-rFy(d<}s>?ljyp^|XQ;JOq|ql-Wc+<9G7(6GVPnWZiV=eVgalQZVSanEi_?
zks=bwztxhYzh<&<iNf-_I$D*T>%spt50xqIe-7F={BHK%shL|rJVMd%oi6pJPkLHf
z46|@*B5NKxw4v7xDRk^+G0S__FY>hv2~8RLjNnObkw-d7!G~nAKkvJJQU`e_5b$!Z
z#ZEJbT2jTr1g^h1RLNqk<EgyJ)HFogu$EGPZ$*d-3ZD=`hYo0_5!zUYjwkH2HYV1e
zUBDkC5zo3$*WK~Xz5=w?Hosum4LTCBqabc1-Cbenaw<0D_zQ=mPK_8zSMqHFcUM>5
zBG`mG+LOcg=na3#dRAhu=ZLDTtZYlH5Dr2ktCU)2ZM-_{*||rJezZ!Bn~z?H!{air
zy$ieX>kWUE6PI0R0@x8_Ld2hgXa+Q?Zh<k^0`1Ns6}GPF+NHXi8dzgB_0&_NkXKDo
zEUvQ1{OEd;8~BSvs`k5Ju$TTd>unC6r<yDnq54DXWv!2~2D%Or4rH$o@mZQ+GIos9
zwC-0mw@o+El`tRUntDCM=6?I*>VyNmbFyVgQxD7`BLHdJzwEg*-z`b2FW}FMLNCYj
zIDP21^>3bq60>!?NW!&sup?a~bP~o_G}<e~;pPGzF*Dz`OCb5K_mA})HW?f=uiVE~
z{&^c#n>94Y*h|ej)5pcS7H;p5L67bhX87YfZ%o2*4o-o6nc-$#@O_j*6<VWx=I!C(
z><7FikvAT{<@?iPv?~VcpxyZlFkH5{fKW1`eolS#Q1a3IoQ@NA&A1`D4mykL>+NN4
zh#aV8VfTn{k#Z@egbHfuZmk*xg-uE@cG?xGr9i{$W~>j>G?^ZB+M*+OG<rt07t^o#
z(YK_3T%29xvC-o`K_rn{KV7()&*Ui?3N<&j{3wAyIlk<`;QN^xja#3pPy>zo#;{c@
z4IP-gvbOPs0jm;=*({xEyg+l8QOiO~06F|_`#_Rw#Uez@>KpKfj{QLedmU9`N<%)|
zAG3Z^r8>NJ&HSJxoVBnMNZfs1KMZ)SAob3+bMYqNj}sTZ0yAcbo?&tjr_GPh+a2jf
IaXoqIU-QW5LjV8(

literal 0
HcmV?d00001

diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsuckerlatejoin.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsuckerlatejoin.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3899287eb1d9da6f7d32b81532bbc7b2ff22f6d
GIT binary patch
literal 1579
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
IaXoqIU-QW5LjV8(

literal 0
HcmV?d00001

diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsuckermidround.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsuckermidround.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3899287eb1d9da6f7d32b81532bbc7b2ff22f6d
GIT binary patch
literal 1579
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
IaXoqIU-QW5LjV8(

literal 0
HcmV?d00001