From 2ebcd89c53925adf8d38909c192d86d0d0b373dc Mon Sep 17 00:00:00 2001 From: Chemlight Date: Fri, 5 Feb 2021 01:09:11 -0800 Subject: [PATCH 1/2] Bundle of stuff Number one, put the size chems on the blacklist for silver slime etracts, or rather just get_random_drink proc Second removed nurse spiders from gold slime extracts, it gets waaaaaay too crazy the times I've seen ghosts get control of off spring spider (children of the servent of the creator don't need to listen). Third from popular request, gives syndicate agents the ability to buy chameleon kits. --- code/__HELPERS/unsorted.dm | 4 ++++ code/modules/mob/living/simple_animal/hostile/giant_spider.dm | 1 + code/modules/uplink/uplink_items.dm | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index f487f656..6b035dbc 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1505,6 +1505,10 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) var/list/blocked = list(/obj/item/reagent_containers/food/drinks/soda_cans, /obj/item/reagent_containers/food/drinks/bottle ) + blocked |= typesof(/obj/item/reagent_containers/food/drinks/prospacillin, + /obj/item/reagent_containers/food/drinks/diminicillin + ) + return pick(subtypesof(/obj/item/reagent_containers/food/drinks) - blocked) //For these two procs refs MUST be ref = TRUE format like typecaches! diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index cbce16fa..887a91b2 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -106,6 +106,7 @@ melee_damage_lower = 5 melee_damage_upper = 10 poison_per_bite = 3 + gold_core_spawnable = NO_SPAWN var/atom/movable/cocoon_target var/fed = 0 var/obj/effect/proc_holder/wrap/wrap diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index cbb6a24e..f7a618fe 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1181,7 +1181,6 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes Due to budget cuts, the shoes don't provide protection against slipping." item = /obj/item/storage/box/syndie_kit/chameleon cost = 2 - exclude_modes = list(/datum/game_mode/nuclear) /datum/uplink_item/stealthy_tools/chameleon_proj name = "Chameleon Projector" From 7d5e2d889b53a376a3bd81d052e9072bcf2f3a0f Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Sat, 6 Feb 2021 01:24:47 +0000 Subject: [PATCH 2/2] Extremely small fix --- code/datums/traits/good.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 0db5deb4..32b8490d 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -297,7 +297,7 @@ M.remove_language(/datum/language/slime) /datum/quirk/tajaspeaker - name = "Siik Tajr speaker" + name = "Siik'Tajr speaker" desc = "Due to your time spent around Tajaran, you can speak their native tongue!" value = 1 gain_text = "You feel sensitive to mrowls and your tongue curls comfortably."