Commit Graph

2005 Commits

Author SHA1 Message Date
Mark van Alphen
e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	paradise.dme
2019-04-26 22:58:56 +02:00
variableundefined
4b9bac327e Merge pull request #11364 from Fox-McCloud/death-of-object-processing
Kills off Object and Fast Object Processes
2019-04-26 08:11:48 +08:00
Fox McCloud
ce0b2c5828 Merge pull request #11367 from farie82/juice-fix
fixed orange juice and doctordelight not working on ingestion
2019-04-24 13:54:56 -04:00
joep van der velden
b19d460909 fixed orange juice and doctordelight 2019-04-24 13:03:22 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
variableundefined
03a5ee47b8 Merge pull request #11292 from farie82/puke-refactor
Refactors puke to make it less lag inducing
2019-04-23 19:45:01 +08:00
variableundefined
b738f9a92f Merge pull request #11283 from Fox-McCloud/emote-refactor
Emote Refactor
2019-04-23 19:44:26 +08:00
Mark van Alphen
7687bf85ca Proper meth 2019-04-22 23:43:47 +02:00
Mark van Alphen
c58b7de171 fentanyl --> meth 2019-04-22 23:43:05 +02:00
Mark van Alphen
3285efd36c Final lighting updates 2019-04-22 22:43:21 +02:00
Mark van Alphen
ab7fb176f6 Opacity fix, re-add rotatium 2019-04-22 22:04:31 +02:00
Mark van Alphen
d66d0e3203 Area invisibility fix 2019-04-22 21:06:33 +02:00
Mark van Alphen
64f8300c2d Switch to preference toggle for ambient occlusion 2019-04-21 18:11:10 +02:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor
Refactors Electrocution
2019-04-16 19:47:42 +08:00
joep van der velden
9166de2a3d puke update 2019-04-13 10:56:30 +02:00
Fox McCloud
964bf03697 icy floors 2019-04-13 04:44:25 -04:00
joep van der velden
55282f15d6 less puke related lag 2019-04-12 22:58:11 +02:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Crazy Lemon
6c4eb66da8 Merge pull request #11282 from Fox-McCloud/atmos-defines
Atmos Define Cleanup + Plasma Tweaks
2019-04-10 22:18:52 -07:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Fox McCloud
c536c55b28 Emote Refactor 2019-04-10 15:42:12 -04:00
variableundefined
c6b8daa9b1 Merge pull request #11227 from Fox-McCloud/sr-update
Minor Strange Reagent Tweaks
2019-04-10 10:47:40 +08:00
variableundefined
aee2f6772e Merge pull request #11217 from Fox-McCloud/reagent-bodytemp
Tweaks Reagent Bodytemp Interaction
2019-04-10 10:42:31 +08:00
Fox McCloud
42a6f4ef30 tweak 2019-04-09 11:32:21 -04:00
variableundefined
ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks
[Goonchem] Reagent tweaks
2019-04-07 21:22:18 +08:00
Fox McCloud
8e0f0906a3 Merge remote-tracking branch 'upstream/master' into sr-update 2019-04-06 19:58:12 -04:00
Crazy Lemon
f6227ab2f8 Merge pull request #11223 from Fox-McCloud/fix-teslium
Fixes Teslium Being Unmakeable
2019-04-06 00:25:56 -07:00
Fox McCloud
7d5e09d97d Fixes Reagents Not Updating 2019-04-05 02:22:10 -04: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
Fox McCloud
6710530450 Tweaks Reagent Bodytemp Interaction 2019-04-02 23:40:55 -04:00
variableundefined
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
variableundefined
bb14880f66 Merge pull request #11198 from Fox-McCloud/Ohhhhhhhhhhhhhh-sssssshiiittttt-antttttssssss
OHHHH SHITTTT ANTTTSSS
2019-04-02 18:26:26 +08:00
Fox McCloud
2bbba89480 Merge pull request #11169 from Arkatos1/Blob_QoL_Update
Blob QoL Update and Rebalance
2019-04-01 18:11:37 -04: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
variableundefined
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
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
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
variableundefined
456320cbe0 Merge pull request #11144 from Fox-McCloud/chem-dispenser-refactor
Chem Dispenser Refactor
2019-03-29 20:28:14 +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
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