diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm index df159aeb16d..8ade101cd0a 100644 --- a/code/game/antagonist/station/cultist.dm +++ b/code/game/antagonist/station/cultist.dm @@ -32,6 +32,8 @@ var/datum/antagonist/cultist/cult initial_spawn_req = 4 initial_spawn_target = 6 antaghud_indicator = "hudcultist" + + faction = "cult" var/allow_narsie = 1 var/datum/mind/sacrifice_target diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index f57322c47a1..a53f5c0365e 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -686,6 +686,9 @@ var/list/datum/absorbed_dna/hivemind_bank = list() if(!(T in view(changeling.sting_range))) return if(!sting_can_reach(T, changeling.sting_range)) return if(!changeling_power(required_chems)) return + if(T.isSynthetic()) + src << "[T] is not compatible with our biology." + return changeling.chem_charges -= required_chems changeling.sting_range = 1 diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 96b9e2302e1..a8ab73d5b1d 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -17,19 +17,6 @@ desc = "A forge used in crafting the unholy weapons used by the armies of Nar-Sie" icon_state = "forge" - - - - - - - - - - - - - /* Cult pylons can be used as arcane defensive turrets. @@ -58,6 +45,7 @@ Explosives Ablative armour */ + /obj/structure/cult/pylon name = "Pylon" desc = "A floating crystal that hums with an unearthly energy" @@ -693,4 +681,4 @@ /obj/effect/testtrans/New() ..() spawn(10) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm index 1efaea7d4f3..bb970735e15 100644 --- a/code/modules/cargo/randomstock.dm +++ b/code/modules/cargo/randomstock.dm @@ -1002,55 +1002,6 @@ var/list/global/random_stock_large = list( var/type = pick(paints) new type(L) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - //Uncommon items below here //============================================================= //============================================================= @@ -1442,53 +1393,6 @@ var/list/global/random_stock_large = list( new /obj/random/coin(L) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - //Rare items below here: //============================================================= //============================================================= @@ -1632,59 +1536,6 @@ var/list/global/random_stock_large = list( new type(L) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - //Large items go below here //============================================================= //============================================================= diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 0ebb659c50f..4f8e69479e7 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -244,7 +244,7 @@ item_state = "bigsunglasses" /obj/item/clothing/glasses/sunglasses/sechud - name = "HUDSunglasses" + name = "HUDsunglasses" desc = "Sunglasses with a HUD." icon_state = "sunhud" diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm index b4fa8cd9ee0..d48ae765843 100644 --- a/code/modules/projectiles/guns/projectile/improvised.dm +++ b/code/modules/projectiles/guns/projectile/improvised.dm @@ -126,7 +126,7 @@ //ghetto handgun, sprites by datberry /obj/item/weapon/gun/projectile/improvised_handgun - name = "\improper improvised handgun" + name = "improvised handgun" desc = "A common sight in an amateur's workshop, a simple yet effective assembly made to chamber and fire .45 Rounds." max_shells = 7 recoil = 2 diff --git a/code/modules/projectiles/guns/projectile/scout_sniper.dm b/code/modules/projectiles/guns/projectile/scout_sniper.dm index 14791703b46..582883b8aa7 100644 --- a/code/modules/projectiles/guns/projectile/scout_sniper.dm +++ b/code/modules/projectiles/guns/projectile/scout_sniper.dm @@ -15,7 +15,7 @@ ammo_type = /obj/item/ammo_casing/a556/ap magazine_type = /obj/item/ammo_magazine/a556/ap allowed_magazines = list(/obj/item/ammo_magazine/a556, /obj/item/ammo_magazine/a556/ap) - accuracy = -2 + accuracy = -4 scoped_accuracy = 3 recoil_wielded = 2 accuracy_wielded = 0 diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index c0b2e1d23f9..7e42c2eded8 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1170,7 +1170,7 @@ bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/muffin - name = "Muffin" + name = "muffin" desc = "A delicious and spongy little cake" icon_state = "muffin" filling_color = "#E0CF9B" @@ -2328,7 +2328,7 @@ bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/carrotfries - name = "Carrot Fries" + name = "carrot fries" desc = "Tasty fries from fresh Carrots." icon_state = "carrotfries" trash = /obj/item/trash/plate