Skip to content

Commit 1c2d4da

Browse files
committedJan 22, 2024
Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update
2 parents 6b15dec + 62d30b2 commit 1c2d4da

File tree

111 files changed

+2556
-2515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+2556
-2515
lines changed
 

‎code/__defines/chemistry.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
// Chemistry lists.
5050
var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate.
5151
var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "bliss", "stoxin", "ambrosia_extract") // Decrease heart rate.
52-
var/list/heartstopper = list("potassium_chlorophoride", "zombie_powder") // This stops the heart.
52+
var/list/heartstopper = list("potassium_chlorophoride", "zombiepowder") // This stops the heart.
5353
var/list/cheartstopper = list("potassium_chloride") // This stops the heart when overdose is met. -- c = conditional
5454

5555
#define MAX_PILL_SPRITE 24 //max icon state of the pill sprites

‎code/_helpers/global_lists_vr.dm

-2
Original file line numberDiff line numberDiff line change
@@ -665,9 +665,7 @@ var/global/list/xenobio_gold_mobs_hostile = list(
665665
/mob/living/simple_mob/animal/giant_spider/webslinger,
666666
/mob/living/simple_mob/animal/giant_spider/phorogenic,
667667
/mob/living/simple_mob/animal/giant_spider/carrier,
668-
/mob/living/simple_mob/animal/giant_spider/nurse,
669668
/mob/living/simple_mob/animal/giant_spider/ion,
670-
/mob/living/simple_mob/animal/giant_spider/nurse/queen,
671669
/mob/living/simple_mob/animal/sif/diyaab,
672670
/mob/living/simple_mob/animal/sif/duck,
673671
/mob/living/simple_mob/animal/sif/frostfly,

0 commit comments

Comments
 (0)
Please sign in to comment.