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/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." 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"