diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm index 0e7f3830ca..73a18ec292 100644 --- a/code/modules/mob/living/simple_mob/simple_mob.dm +++ b/code/modules/mob/living/simple_mob/simple_mob.dm @@ -167,6 +167,7 @@ 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 +<<<<<<< HEAD var/obj/item/weapon/card/id/mobcard = null //VOREStation Edit var/list/mobcard_access = list() //VOREStation Edit var/mobcard_provided = FALSE //VOREStation Edit @@ -175,14 +176,18 @@ var/injury_level = 0 // What our injury level is. Rather than being the flat damage, this is the amount added to various delays to simulate injuries in a manner as lightweight as possible. var/threshold = 0.6 // When we start slowing down. Configure this setting per-mob. Default is 60% // CHOMPStation Add End +======= + var/list/myid_access = list() //VOREStation Edit + var/ID_provided = FALSE //VOREStation Edit +>>>>>>> ea195721df... Merge pull request #14790 from MisterGrimm/miscfixesandchanges /mob/living/simple_mob/Initialize() verbs -= /mob/verb/observe health = maxHealth - if(mobcard_provided) //VOREStation Edit - mobcard = new /obj/item/weapon/card/id(src) - mobcard.access = mobcard_access.Copy() + if(ID_provided) //VOREStation Edit + myid = new /obj/item/weapon/card/id(src) + myid.access = myid_access.Copy() for(var/L in has_langs) languages |= GLOB.all_languages[L] @@ -324,6 +329,7 @@ /decl/mob_organ_names var/list/hit_zones = list("body") //When in doubt, it's probably got a body. +<<<<<<< HEAD //VOREStation Add Start For allowing mobs with ID's door access /mob/living/simple_mob/Bump(var/atom/A) @@ -352,3 +358,5 @@ . = ..() // Calling parent here, actually updating our mob on how hurt we are. // CHOMPStation Add End +======= +>>>>>>> ea195721df... Merge pull request #14790 from MisterGrimm/miscfixesandchanges diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index e8dda60768..88b1bea96d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -44,7 +44,7 @@ friendly = list("hugs") see_in_dark = 8 - mobcard_provided = TRUE + ID_provided = TRUE catalogue_data = list(/datum/category_item/catalogue/fauna/catslug) ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/catslug @@ -428,7 +428,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/engislug) holder_type = /obj/item/weapon/holder/catslug/custom/engislug say_list_type = /datum/say_list/catslug/custom/engislug - mobcard_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_construction, access_atmospherics) + myid_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_construction, access_atmospherics) siemens_coefficient = 0 //Noodly fella's gone and built up an immunity from many small shocks minbodytemp = 200 @@ -545,7 +545,7 @@ "bio" = 0, "rad" = 0 ) //Similarly, \some\ armour values for a smidge more survivability compared to other catslugs. - mobcard_access = list(access_security, access_sec_doors, access_forensics_lockers, access_maint_tunnels) + myid_access = list(access_security, access_sec_doors, access_forensics_lockers, access_maint_tunnels) /datum/say_list/catslug/custom/gatslug speak = list("Have any flashbangs?", "Valids!", "Heard spiders?", "What is that?", "Freeze!", "What are you doing?", "How did you get here?", "Red alert means big bangsticks.", "No being naughty now.", "WAOW!", "Who ate all the donuts?") @@ -582,7 +582,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/medislug) holder_type = /obj/item/weapon/holder/catslug/custom/medislug say_list_type = /datum/say_list/catslug/custom/medislug - mobcard_access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) + myid_access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) /datum/say_list/catslug/custom/medislug speak = list("Have any osteodaxon?", "What is that?", "Suit sensors!", "What are you doing?", "How did you get here?", "Put a mask on!", "No smoking!", "WAOW!", "Stop getting blood everywhere!", "WHERE IN MAINT?") @@ -618,7 +618,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/scienceslug) holder_type = /obj/item/weapon/holder/catslug/custom/scienceslug say_list_type = /datum/say_list/catslug/custom/scienceslug - mobcard_access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch) + myid_access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch) /datum/say_list/catslug/custom/scienceslug @@ -656,7 +656,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/cargoslug) holder_type = /obj/item/weapon/holder/catslug/custom/cargoslug say_list_type = /datum/say_list/catslug/custom/cargoslug - mobcard_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station) + myid_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station) /datum/say_list/catslug/custom/cargoslug speak = list("Disposals is not for slip and slide.", "What is that?", "Stamp those manifests!", "What are you doing?", "How did you get here?", "Can order pizza crate?", "WAOW!", "Where are all of our materials?", "Got glubbs?") @@ -695,7 +695,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/capslug) holder_type = /obj/item/weapon/holder/catslug/custom/capslug say_list_type = /datum/say_list/catslug/custom/capslug - mobcard_access = list(access_maint_tunnels) //The all_station_access part below adds onto this. + myid_access = list(access_maint_tunnels) //The all_station_access part below adds onto this. /datum/say_list/catslug/custom/capslug speak = list("How open big glass box with shiny inside?.", "What is that?", "Respect my authority!", "What are you doing?", "How did you get here?", "Fax for yellow-shirts!", "WAOW!", "Why is that console blinking and clicking?", "Do we need to call for ERT?", "Have been called comdom before, not sure why they thought I was a balloon.") @@ -710,7 +710,7 @@ mob_radio.ks2type = /obj/item/device/encryptionkey/heads/captain //Might not be able to speak, but the catslug can listen. mob_radio.keyslot2 = new /obj/item/device/encryptionkey/heads/captain(mob_radio) mob_radio.recalculateChannels(1) - mobcard.access |= get_all_station_access() + myid.access |= get_all_station_access() //============================================================================= //Admin-spawn only catslugs below - Expect overpowered things & silliness below @@ -727,7 +727,7 @@ icon_dead = "deathslug_dead" catalogue_data = list(/datum/category_item/catalogue/fauna/catslug) //So they don't get the spaceslug's cataloguer entry say_list_type = /datum/say_list/catslug //Similarly, so they don't get the spaceslug's speech lines. - mobcard_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage) + myid_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage) maxHealth = 100 //Tough noodles health = 100 taser_kill = 0 @@ -752,7 +752,7 @@ . = ..() mob_radio = new /obj/item/device/radio/headset/mob_headset(src) mob_radio.frequency = DTH_FREQ //Can't tell if bugged, deathsquad freq in general seems broken - mobcard.access |= get_all_station_access() + myid.access |= get_all_station_access() //Syndicate catslug /mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/syndislug @@ -765,7 +765,7 @@ icon_dead = "syndislug_dead" catalogue_data = list(/datum/category_item/catalogue/fauna/catslug) say_list_type = /datum/say_list/catslug - mobcard_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks) + myid_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks) faction = "syndicate" maxHealth = 100 //Tough noodles health = 100 @@ -797,7 +797,7 @@ mob_radio.ks2type = /obj/item/device/encryptionkey/syndicate mob_radio.keyslot2 = new /obj/item/device/encryptionkey/syndicate(mob_radio) mob_radio.recalculateChannels(1) - mobcard.access |= get_all_station_access() + myid.access |= get_all_station_access() //ERT catslug /mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/responseslug @@ -810,7 +810,7 @@ icon_dead = "responseslug_dead" catalogue_data = list(/datum/category_item/catalogue/fauna/catslug) say_list_type = /datum/say_list/catslug - mobcard_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage) + myid_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage) maxHealth = 100 //Tough noodles health = 100 taser_kill = 0 @@ -841,7 +841,7 @@ mob_radio.ks2type = /obj/item/device/encryptionkey/ert mob_radio.keyslot2 = new /obj/item/device/encryptionkey/ert(mob_radio) mob_radio.recalculateChannels(1) - mobcard.access |= get_all_station_access() + myid.access |= get_all_station_access() //Pilot Catslug diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index effd283c13..0acc4626b1 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -69,7 +69,7 @@ var/list/ventcrawl_machinery = list( return 1 if(isanimal(src)) var/mob/living/simple_mob/S = src - if(carried_item == S.mobcard) //VOREStation Edit + if(carried_item == S.myid) //VOREStation Edit return 1 //VOREStation Edit //Try to find it in our allowed list (istype includes subtypes) var/listed = FALSE