cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-28 01:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12671 from Verkister/patch-113

Browse Source 
Makes mobs not spawn with id unless defined so
This commit is contained in:
Casey
2022-04-06 17:27:53 -04:00
committed by GitHub
parent 4784eb723c e706322e6b
commit 95a8dcf4f1
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/living/simple_mob/simple_mob.dm
View File

@@ -164,15 +164,17 @@
var/limb_icon_key
var/understands_common = TRUE //VOREStation Edit - Makes it so that simplemobs can understand galcomm without being able to speak it.
var/heal_countdown = 5 //VOREStation Edit - A cooldown ticker for passive healing
var/obj/item/weapon/card/id/mobcard = null
var/list/mobcard_access = list()
var/obj/item/weapon/card/id/mobcard = null //VOREStation Edit
var/list/mobcard_access = list() //VOREStation Edit
var/mobcard_provided = FALSE //VOREStation Edit
/mob/living/simple_mob/Initialize()
verbs -= /mob/verb/observe
health = maxHealth
mobcard = new /obj/item/weapon/card/id(src)
mobcard.access = mobcard_access.Copy()
if(mobcard_provided) //VOREStation Edit
mobcard = new /obj/item/weapon/card/id(src)
mobcard.access = mobcard_access.Copy()
for(var/L in has_langs)
languages |= GLOB.all_languages[L]
@@ -311,4 +313,4 @@
D.open()
else
..()
//Vorestation Add End
//Vorestation Add End

2
code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
View File

@@ -44,6 +44,8 @@
friendly = list("hugs")
see_in_dark = 8
mobcard_provided = TRUE
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug)
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/catslug
say_list_type = /datum/say_list/catslug