cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-24 09:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,219 Commits 26 Branches 2 Tags
fae76166c283f709d940bbd0abbff3710261ab3f
Commit Graph

549 Commits

Author SHA1 Message Date
variableundefined
74a7b7ad55 Merge pull request #11566 from Arkatos1/locked 
Action Buttons - Lockdown
 2019-07-09 18:22:40 +08:00
variableundefined
8dcccf220a Merge pull request #11125 from Quantum-M/editVampireMuzzle 
Vampire edits
 2019-07-09 18:15:42 +08:00
variableundefined
ac011e37d7 Merge pull request #11519 from Arkatos1/doll 
Clicking on a health doll icon will now check you for injuries
 2019-07-08 17:32:50 +08:00
B.A.L
9598e31a5c Grammer Edits 2019-06-13 18:02:58 -07:00
B.A.L
f71d1ef1f0 More work 2019-06-13 18:02:58 -07:00
variableundefined
0302a48780 Merge pull request #11521 from Arkatos1/splitfix 
Blob split consciousness fix
 2019-05-23 22:09:45 +08:00
Arkatos1
3b9c5eb3b9 better description 2019-05-21 23:09:40 +02:00
Arkatos1
fb8313308e added action button ability to lock or unlock them in place 2019-05-21 22:44:54 +02:00
Arkatos1
a78cf680de grammar fixes 2019-05-17 14:02:38 +02:00
Fox McCloud
238780cae6 Merge pull request #11511 from Markolie/lighting 
Make the lighting plane master respect client color and other lighting fixes
 2019-05-15 20:42:44 -04:00
Arkatos1
115f191084 blob split fix 2019-05-12 13:19:52 +02:00
Arkatos1
b478a96397 health doll examine 2019-05-11 17:41:27 +02:00
Mark van Alphen
5b14cf120d Make lighting plane master respect client color 2019-05-10 20:34:11 +02:00
Fox McCloud
3d90ccbfb7 nevermind, just generic fixes 2019-05-08 20:15:24 -04:00
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
variableundefined
64f3702e92 Merge pull request #11381 from Ty-Omaha/spam-2 
Moves admin AI warning to ATKLOG_ALL
 2019-04-30 13:04:11 +08:00
variableundefined
5b98e861f0 Merge pull request #11299 from Kyep/ssd_auto_cryo_option 
Better SSD management
 2019-04-30 11:29:49 +08:00
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
Ty-Omaha
2858553def k 2019-04-25 19:55:40 -04:00
Ty-Omaha
904fdc097b Update ai.dm 2019-04-25 19:53:30 -04:00
Arkatos1
25b44a598b Action Button QoL improvements 2019-04-24 20:41:33 +02:00
Mark van Alphen
c8277bd282 More darkness fixes 2019-04-24 02:35:53 +02:00
Mark van Alphen
9e9d72d2ae Darkness fixes 2019-04-24 00:47:55 +02:00
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
Fox McCloud
ff1edb1080 Merge pull request #11300 from Arkatos1/Ghost_Hud 
Adds Observer HUD buttons + Refactor of some ghost verbs
 2019-04-23 15:11:15 -04:00
Kyep
d61d8a3dc1 new feature: ssd warning system 2019-04-22 21:38:47 -07:00
Mark van Alphen
b79d3545e1 Enable viewing own mob in darkness 2019-04-22 23:28:48 +02:00
Mark van Alphen
affae89028 Attempt update to /tg/ lighting system 2019-04-22 19:55:41 +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
Arkatos1
424432d3c0 Code improvement 2019-04-13 23:15:45 +02:00
Arkatos1
065ebeff30 Adds Ghost HUD and refactors some ghost verbs 2019-04-13 22:56:09 +02:00
Arkatos1
56176727df Initial commit 2019-04-13 12:56:05 +02:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc 
# Conflicts:
#	code/game/objects/items.dm
 2019-04-07 19:54:14 -04:00
Fox McCloud
59bae1e02d electrocute_act is bugged 2019-04-06 22:51:42 -04:00
Fox McCloud
87f9ff92df no resists for you 2019-04-06 01:52:08 -04:00
Fox McCloud
29002efd98 Updates and Buffs Power Gloves 2019-04-06 01:38:02 -04: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
Arkatos1
5ad867eb78 Adds left click as a shortcut to expand blob, adds remove blob as a new shortcut, reshuffles shortcut to achieve parity with other codebases 2019-03-26 21:14:45 +01:00
Arkatos1
84f96ff52f New Blob UI! Ported from /TG/. Also adds new reorganized Blob Help verb to help out new players in playing Blob. 2019-03-25 18:35:54 +01:00
Fox McCloud
4f99cc91d3 Merge remote-tracking branch 'upstream/master' into goonchem-reagent-temperature 2019-03-22 14:07:46 -04:00
Fox McCloud
122c17a006 oh no fox lost it 2019-03-19 18:23:04 -04:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
joep van der velden
9631eef2aa Fixed the middle mouse exploit 2019-03-18 14:53:41 +01:00
Arkatos1
840929e0a8 Custom icons for Guardian action intents! 2019-03-13 19:23:27 +01:00
Arkatos1
f38f1a0a81 Adds intent UI for guardians 2019-03-12 16:14:07 +01:00
variableundefined
e19b61662f Merge pull request #10736 from datlo/ghettosurgeryfix 
Refactor surgery early cautery, add cyborg medical grip, misc surgery fix/changes
 2019-01-31 11:29:09 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00