shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes some runtimes and removes a holodeck exploit

Browse Source 
and a cleanup >.>;
This commit is contained in:
Poojawa
2019-08-08 21:33:42 -05:00
parent ce064522fe
commit f76bb27127
10 changed files with 82 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/holo_effect.dm
+5 -5
View File
@@ -87,10 +87,10 @@
/obj/effect/holodeck_effect/mobspawner/pet
mobtype = list(
/mob/living/simple_animal/butterfly, /mob/living/simple_animal/chick/holo,
/mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten,
/mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/dog/corgi/puppy,
/mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/pet/fox)
/mob/living/simple_animal/butterfly/holo, /mob/living/simple_animal/chick/holo,
/mob/living/simple_animal/pet/cat/holo, /mob/living/simple_animal/pet/cat/kitten/holo,
/mob/living/simple_animal/pet/dog/corgi/holo, /mob/living/simple_animal/pet/dog/corgi/puppy/holo,
/mob/living/simple_animal/pet/dog/pug/holo, /mob/living/simple_animal/pet/fox/holo)
/obj/effect/holodeck_effect/mobspawner/bee
mobtype = /mob/living/simple_animal/hostile/poison/bees/toxin
@@ -100,7 +100,7 @@
/obj/effect/holodeck_effect/mobspawner/penguin
mobtype = /mob/living/simple_animal/pet/penguin/emperor
/obj/effect/holodeck_effect/mobspawner/penguin/Initialize()
if(prob(1))
mobtype = /mob/living/simple_animal/pet/penguin/emperor/shamebrero
code/modules/mob/living/simple_animal/simple_animal_vr.dm
+3
View File
@@ -9,6 +9,7 @@
var/list/prey_excludes = list() //For excluding people from being eaten.
var/voracious_chance = VORACIOUS_CHANCE //Mob AI Engagement probability when rolling between regular melee strike and a vore attempt, default 40%
var/holodeck = FALSE
// Vore belly interactions
// Most mobs are only going to have the one gut. Multi-gut set ups should refer to Ash Drake's dragon_vore.dm for set up.
@@ -49,6 +50,8 @@
// Simple animals have only one belly. This creates it (if it isn't already set up)
/mob/living/simple_animal/init_vore()
vore_init = TRUE
if(holodeck) //hacky dumbshit, but I can't get it to work right anyway
return
if(vore_organs.len)
return
if(no_vore) //If it can't vore, let's not give it a stomach.
code/modules/surgery/bodyparts/bodyparts.dm
+2 -1
View File
@@ -354,7 +354,8 @@
if("mam_body_markings" in S.default_features)
var/datum/sprite_accessory/Smark
Smark = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]
body_markings_icon = Smark.icon
if(Smark)
body_markings_icon = Smark.icon
if(H.dna.features.["mam_body_markings"] != "None")
body_markings = lowertext(H.dna.features.["mam_body_markings"])
auxmarking = lowertext(H.dna.features.["mam_body_markings"])