Commit Graph

9108 Commits

Author SHA1 Message Date
Mark van Alphen
57366118af Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 2019-04-01 17:55:37 +02:00
variableundefined
b0f64016a9 Merge pull request #11158 from Fox-McCloud/delayed-gibbing
Makes Delayed Gibbing a Proc
2019-04-01 23:07:17 +08:00
Mark van Alphen
ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Fox McCloud
d2ba5fc08f Fixes Medical and Syndicate Borg Lacking Handheld Defibs 2019-03-31 07:24:36 -04:00
Mark van Alphen
bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00
Mark van Alphen
a05b37c5ca General Lavaland fixes, add Hierophant ruin 2019-03-31 01:12:10 +01:00
Mark van Alphen
45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
2019-03-30 22:55:09 +01:00
Ty-Omaha
337c4fad56 Stops ghosts from having ZZZ bubbles 2019-03-30 10:12:14 -04:00
Mark van Alphen
e1b18e07c6 Fix temporary visuals 2019-03-30 06:15:07 +01:00
Mark van Alphen
7149dd6aad Goliath improvements 2019-03-30 05:20:27 +01:00
Fox McCloud
49d2dab9ee Fixes Decapping 2019-03-30 00:00:00 -04:00
Mark van Alphen
f0dab66ebc Further turf updates, add Necropolis/boss turfs 2019-03-30 01:24:03 +01:00
Mark van Alphen
2091a431bb Split mining mob files 2019-03-29 23:55:54 +01:00
Mark van Alphen
fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Mark van Alphen
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
variableundefined
e6ef2e9bbc Merge pull request #11151 from Fox-McCloud/suicide-refactor
Suicide Refactor
2019-03-29 20:49:18 +08:00
variableundefined
78281ca05b Merge pull request #11138 from ingles98/plasma_golem_log
Plasma Golems now report to the admins after they explode (Also logs it)
2019-03-29 19:25:07 +08:00
variableundefined
19f3765095 Merge pull request #11110 from Mitchs98/xeno1
Disallows xeno larva from pulling.
2019-03-29 19:19:44 +08:00
Fox McCloud
35758db699 Makes Delayed Gibbing a Proc 2019-03-28 20:34:20 -04:00
Fox McCloud
a5403c192a fixed errors 2019-03-28 17:54:39 -04:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
Filipe Reis
729a311569 Plasma Golems now report to the admins after they explode (Also logs it) 2019-03-26 15:11:14 +00:00
joep van der velden
b24555ab64 Diona nymphs are now eatable and punchable 2019-03-24 21:46:45 +01:00
variableundefined
0081bfcb04 Merge pull request #11094 from Emanthealmighty/Terrorspiderchange
Terror Spiders can no longer be offered sentience potions.
2019-03-24 17:56:02 +08:00
variableundefined
ec46fdc510 Merge pull request #11090 from Tails2091/Animal_Sounds
Added Emotes and Sounds to Corgis and Cats. Moved Animal Sounds to Creature Folder.
2019-03-24 17:55:01 +08:00
Unknown
2d59383fff Disallows larva from pulling. 2019-03-23 21:19:59 -05:00
joep van der velden
5e14214e7b adsf 2019-03-23 16:15:08 +01:00
variableundefined
64c0cf7a0b Merge pull request #11074 from farie82/refactor-pickup-and-fix-bomb
Refactored pickup code and fixed the bomb guardian bug
2019-03-23 20:04:15 +08:00
Fox McCloud
4f99cc91d3 Merge remote-tracking branch 'upstream/master' into goonchem-reagent-temperature 2019-03-22 14:07:46 -04:00
Eman
9cf063d6ef Terror Spiders can no longer be offered sentience potions.
Gateway mission terror spiders can currently be effortlessly gibbed by giving them a sentience potion and waiting for them to "become sentient", except that when that happens, they explode. Easily abusable, eh? This commit changes this.
2019-03-22 17:07:42 +01:00
variableundefined
1a59687c7a Merge pull request #11091 from Mitchs98/Dionaname
Fixes Diona Naming for ID's.
2019-03-22 17:56:21 +08:00
variableundefined
d6c31bc580 Merge pull request #11043 from UmeFuu/UmeFuu-Hairs
Ume fuu hairs
2019-03-22 17:42:48 +08:00
Unknown
40237e7067 Capitalizes all parts of Diona Name
Fixes Diona Naming for ID's.
2019-03-22 02:37:41 -05:00
Fox McCloud
85b9fe2ebe lower fire damage 2019-03-21 16:28:46 -04:00
Tails2091
46e550d025 Cat and Mouse choose from emote_hear list 2019-03-21 14:41:35 -04:00
Tails2091
a34f1054ce Add Cat/Corgi emotes and sounds
Organized creature sounds into creature sound folder.
2019-03-21 14:35:00 -04:00
Fox McCloud
eedc8afa8e reagents mob temp 2019-03-19 14:58:53 -04:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
joep van der velden
e83a7131cc Refactored pickup code and fixed the bug 2019-03-18 16:42:44 +01:00
joep van der velden
675ef68422 uses move resist now 2019-03-17 14:41:31 +01:00
variableundefined
c7b560f842 Merge pull request #11045 from Kyep/ventcrawl_buckle
Fixes buckled ventcrawl
2019-03-17 15:23:16 +08:00
variableundefined
efa369162c Merge pull request #10853 from Ty-Omaha/ssd-miasma
SSD Miasma
2019-03-16 09:22:46 +08:00
Kyep
ca773c32dc Fixes ventcrawl while buckled to something 2019-03-15 03:33:48 -07:00
UmeFuu
81ec0cfe8c Adds new hairs (code)
What does this PR do:
Adds about eleven new hairs, some of them are edits from other hairs requested by some people, credits to the original spriter/s
2019-03-14 04:37:38 -03:00
variableundefined
6a2067f9c4 Merge pull request #10795 from Quantum-M/alienOrgans
[Ready for Review]Adds different looking organs to each species, some blood color changes, and MMI changes
2019-03-14 15:04:29 +08:00
Couls
379735e899 Consistency fixes 2019-03-12 18:58:50 -04:00
variableundefined
bd87257e73 Merge pull request #11012 from Tails2091/simple-help
Adds Missing simple_animal Emote Help Text
2019-03-10 09:07:51 +08:00
Tails2091
8eadbdcd59 Adds missing simple_animal help text 2019-03-09 17:57:05 -05:00