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

April sync (#360)

Browse Source 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
This commit is contained in:
Poojawa
2017-04-13 23:37:00 -05:00
committed by GitHub
parent cdc32c98fa
commit 7e9b96a00f
1322 changed files with 174827 additions and 23888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/slime/death.dm
+3 -3
View File
@@ -26,8 +26,8 @@
update_canmove()
if(ticker && ticker.mode)
ticker.mode.check_win()
if(SSticker && SSticker.mode)
SSticker.mode.check_win()
return ..(gibbed)
@@ -37,7 +37,7 @@
/mob/living/simple_animal/slime/Destroy()
for(var/obj/machinery/computer/camera_advanced/xenobio/X in machines)
for(var/obj/machinery/computer/camera_advanced/xenobio/X in GLOB.machines)
if(src in X.stored_slimes)
X.stored_slimes -= src
return ..()
code/modules/mob/living/simple_animal/slime/life.dm
+2 -2
View File
@@ -383,7 +383,7 @@
if (holding_still)
holding_still = max(holding_still - hungry, 0)
else if(canmove && isturf(loc) && prob(50))
step(src, pick(cardinal))
step(src, pick(GLOB.cardinal))
else
if(holding_still)
@@ -391,7 +391,7 @@
else if (docile && pulledby)
holding_still = 10
else if(canmove && isturf(loc) && prob(33))
step(src, pick(cardinal))
step(src, pick(GLOB.cardinal))
else if(!AIproc)
INVOKE_ASYNC(src, .proc/AIprocess)
code/modules/mob/living/simple_animal/slime/powers.dm
-2
View File
@@ -170,8 +170,6 @@
var/mob/living/simple_animal/slime/new_slime = pick(babies)
new_slime.a_intent = INTENT_HARM
new_slime.languages_spoken = languages_spoken
new_slime.languages_understood = languages_understood
if(src.mind)
src.mind.transfer_to(new_slime)
else
code/modules/mob/living/simple_animal/slime/slime.dm
+9 -12
View File
@@ -1,9 +1,3 @@
var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
"blue", "dark blue", "dark purple", "yellow", "silver", "pink", "red",
"gold", "green", "adamantine", "oil", "light pink", "bluespace",
"cerulean", "sepia", "black", "pyrite")
/mob/living/simple_animal/slime
name = "grey baby slime (123)"
icon = 'icons/mob/slimes.dmi'
@@ -13,8 +7,6 @@ var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
gender = NEUTER
var/is_adult = 0
var/docile = 0
languages_spoken = SLIME | HUMAN
languages_understood = SLIME | HUMAN
faction = list("slime","neutral")
harm_intent_damage = 5
@@ -43,8 +35,6 @@ var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
verb_exclaim = "telepathically cries"
verb_yell = "telephatically cries"
devourable = 1
// canstun and canweaken don't affect slimes because they ignore stun and weakened variables
// for the sake of cleanliness, though, here they are.
status_flags = CANPARALYSE|CANPUSH
@@ -80,6 +70,11 @@ var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
var/coretype = /obj/item/slime_extract/grey
var/list/slime_mutation[4]
var/static/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
"blue", "dark blue", "dark purple", "yellow", "silver", "pink", "red",
"gold", "green", "adamantine", "oil", "light pink", "bluespace",
"cerulean", "sepia", "black", "pyrite")
/mob/living/simple_animal/slime/Initialize(mapload, new_colour="grey", new_is_adult=FALSE)
var/datum/action/innate/slime/feed/F = new
F.Grant(src)
@@ -96,6 +91,7 @@ var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
E.Grant(src)
create_reagents(100)
set_colour(new_colour)
grant_language(/datum/language/slime)
..()
/mob/living/simple_animal/slime/proc/set_colour(new_colour)
@@ -250,7 +246,8 @@ var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
M.updatehealth()
/mob/living/simple_animal/slime/attack_animal(mob/living/simple_animal/M)
if(..())
. = ..()
if(.)
attacked += 10
@@ -425,4 +422,4 @@ var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
return 3
/mob/living/simple_animal/slime/random/Initialize(mapload, new_colour, new_is_adult)
. = ..(mapload, pick(slime_colours), prob(50))
. = ..(mapload, pick(slime_colours), prob(50))