cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 01:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,677 Commits 26 Branches 2 Tags
ed153d35665ddfab2df0f1a3df4a96048cebc426
Commit Graph

19576 Commits

Author SHA1 Message Date
Mark van Alphen
ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Mark van Alphen
1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02: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
ceceb9f3b3 Largely finish up beach ruin 2019-03-31 00:20:27 +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
Mark van Alphen
f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Mark van Alphen
2047825165 Finish up Lavaland map 2019-03-30 21:08:33 +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
c370e08233 Port the actual Lavaland map (and associated fixes) 2019-03-30 04:12:37 +01: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
1e2ff20683 Resolve startup issues: added missing configs, removed unused configs from example file and fix shuttle warning 2019-03-29 17:09:05 +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
bcd776cfe6 Merge pull request #11147 from Arkatos1/Bottle_of_Ooze 
New Wizard item - Bottle of Ooze!
 2019-03-29 20:29:02 +08:00
variableundefined
456320cbe0 Merge pull request #11144 from Fox-McCloud/chem-dispenser-refactor 
Chem Dispenser Refactor
 2019-03-29 20:28:14 +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
95982791c0 Merge pull request #11130 from Arkatos1/Blob_UI 
New Blob UI! [TG Port]
 2019-03-29 19:22:15 +08:00
variableundefined
19f3765095 Merge pull request #11110 from Mitchs98/xeno1 
Disallows xeno larva from pulling.
 2019-03-29 19:19:44 +08:00
variableundefined
5069a0175a Merge pull request #11106 from Mitchs98/food 
Adds Shrimp & Fish Skewers and Cheeseburgers.
 2019-03-29 19:18:15 +08: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
Arkatos1
57405b8dd1 Redundant objective line removed, improved descriptions 2019-03-28 01:18:17 +01:00
Arkatos1
df64907f6b Broken morph introduction into proper paragraphs for better readibility, minor description changes 2019-03-28 00:02:28 +01:00
Arkatos1
303f2b31cf Adds Bottle of Ooze for wizards, with custom icon 2019-03-27 19:55:55 +01:00
Arkatos1
095b1c25ea Code improvement 2019-03-27 15:22:09 +01:00
Fox McCloud
f00596fe81 oops 2019-03-26 18:54:28 -04:00
Fox McCloud
41c03e03d9 Chem Dispenser Refactor 2019-03-26 18:29:11 -04:00
Arkatos1
ea2cc23111 Added reagent description when blob does chemical reroll, adds complementary color to all reagents, marker now uses complementary colors of reagents, minor formatting 2019-03-26 20:51:06 +01:00
Arkatos1
c0b5359cbd Added descriptions to all blob reagents, and added them to the Blob Help. Reorganized Blob Help a little. 2019-03-26 18:38:09 +01: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
variableundefined
bbf19c1ae2 Merge pull request #11121 from farie82/diona-fix 
Diona nymphs are now eatable and punchable
 2019-03-25 22:39:10 +08:00
Fox McCloud
ae7a141d28 fixes smoke 2019-03-24 18:44:01 -04:00
joep van der velden
b24555ab64 Diona nymphs are now eatable and punchable 2019-03-24 21:46:45 +01:00
Fox McCloud
dd3d32d897 Reagent Garbage Collection Edge Case 2019-03-24 16:32:10 -04:00
variableundefined
6570c43e41 Merge pull request #11093 from Emanthealmighty/Collarchange 
Can now put a collar any animal that has gained sentience.
 2019-03-24 17:56:41 +08: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
variableundefined
7192280996 Merge pull request #11075 from AffectedArc07/alphabetisation-for-all 
Alphabetical preferences menu
 2019-03-24 17:51:50 +08:00
variableundefined
85ab7a8b06 Merge pull request #11065 from Fox-McCloud/pill-bottles-and-patch-packs 
[Goonchem] Pills, Bottles, Patches, and Pillbottles
 2019-03-24 17:51:00 +08:00
variableundefined
4ca33bb19d Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature 
[Goonchem] Reagent Temperature and Pyrotechnics
 2019-03-24 17:50:07 +08:00
Unknown
2d59383fff Disallows larva from pulling. 2019-03-23 21:19:59 -05:00
Unknown
2fc549ffcd Adds a few food. 2019-03-23 14:29:02 -05:00