cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Headcrabs can be spawned in the infestation event (#27692)

Browse Source 
* headcrabs in the infestation

* movable

* OOPS
This commit is contained in:
gurfan
2020-09-05 07:08:52 -05:00
committed by GitHub
parent e820a436fd
commit 25b33721fa
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
__DEFINES/setup.dm
View File

@@ -758,6 +758,7 @@ SEE_PIXELS 256
#define VERM_MUSHMEN 15 #define VERM_MUSHMEN 15
#define VERM_FROGS 14 #define VERM_FROGS 14
#define VERM_SNAILS 15 #define VERM_SNAILS 15
#define VERM_HEADCRABS 16
#define MONSTER_BEAR 0 #define MONSTER_BEAR 0

8
code/modules/events/infestation.dm
View File

@@ -51,7 +51,7 @@
var/max_number = 4 var/max_number = 4
vermin = pick(VERM_MICE, VERM_LIZARDS, VERM_SPIDERS, VERM_SLIMES, VERM_BATS, VERM_BORERS, VERM_MIMICS, VERM_ROACHES, VERM_GREMLINS, VERM_BEES, VERM_HORNETS, vermin = pick(VERM_MICE, VERM_LIZARDS, VERM_SPIDERS, VERM_SLIMES, VERM_BATS, VERM_BORERS, VERM_MIMICS, VERM_ROACHES, VERM_GREMLINS, VERM_BEES, VERM_HORNETS,
VERM_SYPHONER, VERM_GREMTIDE, VERM_CRABS, VERM_DIONA, VERM_MUSHMEN, VERM_FROGS, VERM_SNAILS) VERM_SYPHONER, VERM_GREMTIDE, VERM_CRABS, VERM_DIONA, VERM_MUSHMEN, VERM_FROGS, VERM_SNAILS, VERM_HEADCRABS)
if (override_vermin) if (override_vermin)
vermin = override_vermin vermin = override_vermin
@@ -124,6 +124,10 @@
spawn_types = /mob/living/simple_animal/snail spawn_types = /mob/living/simple_animal/snail
vermstring = "snails" vermstring = "snails"
max_number = 7 max_number = 7
if(VERM_HEADCRABS)
spawn_types = /obj/item/clothing/mask/facehugger/headcrab
vermstring = "headcrabs"
max_number = 12
var/number = rand(2, max_number) var/number = rand(2, max_number)
@@ -147,7 +151,7 @@
S.amount_grown = 0 S.amount_grown = 0
else else
var/spawn_type = pick(spawn_types) var/spawn_type = pick(spawn_types)
var/mob/M = new spawn_type(picked) var/atom/movable/M = new spawn_type(picked)
if(M.density) if(M.density)
valid -= picked valid -= picked
if(!valid.len) if(!valid.len)