cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 09:38:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
2934 Commits
Author SHA1 Message Date
Mark van Alphen a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Fox McCloud 43355ca694 tweak 2019-04-04 05:16:42 -04:00
Fox McCloud 282350fb71 Tweaks Foam and Pyrotechnics 2019-04-04 05:06:39 -04:00
Fox McCloud 7455ca11d1 Minor Strange Reagent Tweaks 2019-04-03 23:03:20 -04:00
Fox McCloud 9929a9468d Fixes Teslium Being Unmakeable 2019-04-03 13:37:16 -04:00
Mark van Alphen 19b923c999 Ash Walker/Gutlunch fixes. Glass containers now do not splash on help intent, for milking. 2019-04-03 17:24:55 +02:00
Fox McCloud 6710530450 Tweaks Reagent Bodytemp Interaction 2019-04-02 23:40:55 -04:00
variableundefinedandGitHub a552137e07 Merge pull request #11190 from Fox-McCloud/flash-sonic-bang 
Flash Powder, Sonic Powder, and Flashbang Refactor
 2019-04-02 20:33:17 +08:00
variableundefinedandGitHub bb14880f66 Merge pull request #11198 from Fox-McCloud/Ohhhhhhhhhhhhhh-sssssshiiittttt-antttttssssss 
OHHHH SHITTTT ANTTTSSS
 2019-04-02 18:26:26 +08:00
Mark van Alphen 500675be77 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/structures/safe.dm
 2019-04-02 00:54:49 +02:00
Fox McCloudandGitHub 2bbba89480 Merge pull request #11169 from Arkatos1/Blob_QoL_Update 
Blob QoL Update and Rebalance
 2019-04-01 18:11:37 -04:00
Mark van AlphenAffectedArc07CornMyCob
 		f75de97c6e Port over Corn and affected's work on Lavaland 
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
 2019-04-01 23:41:32 +02:00
Mark van Alphen 57366118af Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 2019-04-01 17:55:37 +02:00
variableundefinedandGitHub b0f64016a9 Merge pull request #11158 from Fox-McCloud/delayed-gibbing 
Makes Delayed Gibbing a Proc
 2019-04-01 23:07:17 +08:00
variableundefinedandGitHub 06a9770ae4 Merge pull request #11157 from Fox-McCloud/chem-master-refactor 
ChemMaster Refactor
 2019-04-01 23:06:42 +08:00
Fox McCloud 6fadf083d7 OHHHH SHITTTT ANTTTSSS 2019-04-01 01:27:49 -04: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 ac78e8479e abstract camera mobs 2019-03-31 03:48:47 -04:00
Fox McCloud cbcc4aab45 Flash Powder, Sonic Powder, and Flashbang Refactor 2019-03-31 03:29:27 -04:00
Mark van Alphen ceceb9f3b3 Largely finish up beach ruin 2019-03-31 00:20:27 +01:00
Arkatos1 8669ea1716 Removed Dark Matter for real, improved descriptions and added Blob Overminds to Check Antagonists verb 2019-03-30 15:00:12 +01:00
Arkatos1 a22d31f350 Complete Blob UI, Blob mobs now use complementary colors, special blob tiles refund, node requirement verb, minor refactors, remove shortcut improvement, dark matter removed from blob reagents, custom icons 2019-03-30 02:16:30 +01:00
variableundefinedandGitHub 456320cbe0 Merge pull request #11144 from Fox-McCloud/chem-dispenser-refactor 
Chem Dispenser Refactor
 2019-03-29 20:28:14 +08:00
variableundefinedandGitHub 95982791c0 Merge pull request #11130 from Arkatos1/Blob_UI 
New Blob UI! [TG Port]
 2019-03-29 19:22:15 +08:00
Fox McCloud 35758db699 Makes Delayed Gibbing a Proc 2019-03-28 20:34:20 -04:00
Fox McCloud be1a2b4452 ChemMaster Refactor 2019-03-28 19:41:17 -04:00
Fox McCloud d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04: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
Fox McCloud ae7a141d28 fixes smoke 2019-03-24 18:44:01 -04:00
Fox McCloud dd3d32d897 Reagent Garbage Collection Edge Case 2019-03-24 16:32:10 -04:00
variableundefinedandGitHub 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
variableundefinedandGitHub 4ca33bb19d Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature 
[Goonchem] Reagent Temperature and Pyrotechnics
 2019-03-24 17:50:07 +08:00
variableundefinedandGitHub 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 f14359a0dd effects fixes smoke layer 2019-03-22 14:33:36 -04:00
Fox McCloud 4f99cc91d3 Merge remote-tracking branch 'upstream/master' into goonchem-reagent-temperature 2019-03-22 14:07:46 -04:00
variableundefinedandGitHub eee376ba0d Merge pull request #11052 from Fox-McCloud/goon-smoke 
[Goonchem] Implements Goon Smoke
 2019-03-22 17:45:11 +08:00
Fox McCloud aba98f6cb2 fake hotspots 2019-03-20 17:11:30 -04:00
Fox McCloud 23954aece6 that's a lot of fire 2019-03-20 00:19:12 -04:00
Fox McCloud 122c17a006 oh no fox lost it 2019-03-19 18:23:04 -04:00
Fox McCloud eedc8afa8e reagents mob temp 2019-03-19 14:58:53 -04:00
Fox McCloud ea752e7191 safety 2019-03-19 03:10:47 -04:00
Fox McCloud de09634df1 fixes black powder 2019-03-19 01:53:30 -04:00
Fox McCloud e98f1b36e2 this for now 2019-03-19 00:15:59 -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