cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-05-13 02:10:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,584 Commits 13 Branches 2 Tags
a78cf680de5ea8bd2c8ebf36ed401b7338d88c0c
Commit Graph

219 Commits

Author SHA1 Message Date
Mark van Alphen 6d8ec82733 Fix dynamic lighting on shuttles 2019-05-04 05:51:13 +02:00
Mark van Alphen b5c322e00a Starlight/shuttle lighting fix 2019-05-04 04:30:13 +02:00
Mark van Alphen f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-05-04 03:07:36 +02:00
Mark van Alphen bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
Mark van Alphen ea517f153d Fix the steel_rain runtime again 2019-05-03 20:50:03 +02:00
Mark van Alphen 4c99f3913b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-05-03 20:31:41 +02:00
Fox McCloud 9d4928b37a Merge pull request #11450 from variableundefined/AIOptimization2 
AI Optimization, SNPC Removal 2.0
 2019-05-03 13:30:41 -04:00
Mark van Alphen d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
variableundefined b9acfe067d Merge pull request #11434 from TDSSS/sst-typo 
fixed typo in sst console
 2019-05-03 22:43:35 +08:00
variableundefined 6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
EvadableMoxie 5c2608330c Adds Nanotrasen Hospital ship, admin shuttle templates system. 2019-05-02 20:17:50 -04:00
TDSSS 93d6d7fd7b fixed typo 2019-05-02 05:32:05 +02:00
Mark van Alphen 0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
AffectedArc07 ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Mark van Alphen 5c1ac0cb82 Add mapload to shuttle computer Initialize 2019-04-01 23:30:40 +02:00
Mark van Alphen 55adce2fb1 Fix code review issues 2019-03-31 22:09:09 +02: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
variableundefined 682e7b453e Merge pull request #10948 from datlo/hijackprisonners 
Allow hijackers to take hostages
 2019-03-03 22:37:48 +08:00
datlo 8ec8081fcf removed commented code 2019-02-26 00:34:31 +00:00
datlo 24ef06d249 Allow hijackers to take hostages 2019-02-25 14:29:58 +00:00
datlo abdf1128cb restrict ERT shuttle to station zlevel 2019-02-11 17:06:49 +00:00
datlo cb6230f332 add ERT docker, map in changes 2019-02-11 16:58:24 +00:00
datlo 420eb1a51b fix camera being stuck in your shuttle 2019-02-11 14:15:39 +00:00
datlo 2393977c33 moar deconflicting 2019-02-11 13:47:09 +00:00
datlo c57ec440e1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into navconsoles2 
# Conflicts:
#	code/modules/shuttle/shuttle.dm
 2019-02-11 13:31:37 +00:00
datlo b27584d6e3 deconflicting 2019-02-11 13:30:39 +00:00
datlo 0805b89ea7 Update access denied message 
the old message would make you think you need a golem id or somethin
 2019-02-07 14:27:38 +00:00
datlo 3c42aa093f prevent navconsole from spying inside the station 2019-02-07 00:42:09 +00:00
datlo e27e334b91 add sprites by Ionward 2019-02-06 21:20:40 +00:00
datlo 91ef2d7be2 it's alive 2019-02-06 20:01:30 +00:00
datlo 912c6b0b9e asteroid claim improvements, golem ship security 
Add plating over asteroid tiles if you've claimed them

Asteroid walls can now be used to define rooms (still must be airtight)

Add golem check to the free golem ship
 2019-02-03 15:59:04 +00:00
datlo 74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
variableundefined 21cc9d882f Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE 
I JUST CONFLICTED EVERYTHING
 2019-01-31 11:03:33 +08:00
Alffd 110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
Aurorablade d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
variableundefined e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00
Aurorablade b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
void* 8b8cfdaadb Reworked discord interface to replace the IRC one completely 2019-01-06 18:00:28 +01:00
Kyep d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
Aurorablade 86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Kyep 14809873b1 removes docking request system, remaps shuttle, removes offstation docking port 2018-12-08 15:37:53 -08:00
datlo 0d62b7d07c Syndicate office functional, fix CC mech chargers 2018-12-07 14:45:52 +00:00
Certhic e3f852dff6 magic numbers 2018-11-16 15:32:49 +01:00
Purpose b2fc276158 Merge remote-tracking branch 'refs/remotes/origin/master' into smoothing-improvements 2018-10-13 21:34:04 +01:00
Desolate f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined 3667426fd5 Merge pull request #9772 from SamHPurp/mouse-opacity-define 
Creates mouse_opacity defines
 2018-10-09 08:25:55 +08:00
Purpose 4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
Citinited 9e04ff56ec Syndicate shuttles have unique circuitboards now 2018-10-08 22:43:00 +01:00
Purpose d335a5a4ce Subsystem created... works! 2018-10-06 20:05:02 +01:00
Desolate 4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00