cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 18:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,798 Commits 26 Branches 2 Tags
ec4add0ebfa3a02003fc6abfb801a88dfdca56e8
Commit Graph

453 Commits

Author SHA1 Message Date
Fox-McCloud
084ed30446 more fixes and features 2017-01-25 01:04:01 -05:00
Fox-McCloud
706347fd84 even more work 2017-01-22 08:11:31 -05:00
Fox-McCloud
10c0e734c3 more work 2017-01-22 01:46:48 -05:00
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Aurorablade
5a07759c97 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie 2017-01-11 23:41:06 -05:00
Crazylemon64
66f2d40afa Giant Spiders no longer clog up the Alien role channel 2017-01-09 13:38:34 -08:00
Aurorablade
155464b3a0 brain.exe had caused a critcal error and shut down 2017-01-07 01:03:46 -05:00
Aurorablade
0e35706c00 damn.... 2017-01-06 23:32:17 -05:00
Aurorablade
fc71122914 fixes 
Barring any errent merge conflict fixing fuckery.
 2016-12-29 11:39:18 -05:00
Aurorablade
98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 
# Conflicts:
#	code/game/machinery/doors/airlock.dm
 2016-12-29 11:01:43 -05:00
Aurorablade
dd75048969 well hopefully last conflict fix with shuttle merger 2016-12-29 10:33:48 -05:00
Aurorablade
e25ddf8329 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-24 00:18:40 -05:00
Fox-McCloud
4b1bfe33ff Wall Rot Effect Refactor 2016-12-14 13:12:10 -05:00
Aurorablade
0bb62ebb36 everything works thanks to our tiger overlords.. 2016-12-12 23:59:37 -05:00
Kyep
49956eb241 Tiger request 2016-12-10 16:58:54 -08:00
Kyep
440d9fa3f2 Fixes xenomorph walls taking damage from disablers 2016-12-09 23:10:28 -08:00
Aurorablade
2dc1a48f35 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-12-01 22:38:35 -05:00
Aurorablade
5d392b36a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-11-15 15:30:36 -05:00
Fox-McCloud
fcc20ac6bc BSA Tweaks 2016-11-09 22:36:03 -05:00
Aurorablade
23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Fox McCloud
911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul 
Ports over the status effect unification from the extreme refactor
 2016-10-30 22:40:24 -04:00
Aurorablade
d4361171e5 EVERYONE OUT OF THE POOL 2016-10-29 23:43:28 -04:00
Fox McCloud
66027032a4 Merge pull request #5821 from Markolie/ertfixes 
ERT fixes
 2016-10-27 10:30:23 -04:00
Markolie
f27f72e61b ERT fixes 2016-10-26 03:05:51 +02:00
Markolie
1c89bcb28e Fix spiderling remains being draggable 2016-10-25 18:43:06 +02:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Aurorablade
2c104adaf3 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-09-01 00:43:50 -04:00
Aurorablade
65d1c781c8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-26 21:54:56 -04:00
Crazylemon64
16dd4e9d21 Moves many uses of log_to_dd to log_runtime, to make the output 
more visible at runtime, to someone who isn't watching DD first-hand
 2016-08-24 09:55:19 -07:00
Crazylemon64
b633cf53af Moves from log_debug to log_runtime for non-fatal abberant states 2016-08-23 17:03:52 -07:00
Aurorablade
080c02af87 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-23 00:53:31 -04:00
TheDZD
610c10977f Merge pull request #5482 from Fox-McCloud/kinetic-smasher 
Kinetic Crusher
 2016-08-19 20:11:28 -04:00
Aurorablade
ec3d8c67a5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-19 01:01:19 -04:00
Aurorablade
811170f58f Updates 2016-08-18 04:08:31 -04:00
Ar3nn
b77d200603 ..() the second 2016-08-17 21:51:37 -04:00
Ar3nn
57b65483f9 ..() 2016-08-17 21:40:53 -04:00
Ar3nn
f702a9feae One more refactor 2016-08-17 21:10:49 -04:00
Fox-McCloud
1f364c1bcf Kinetic Smasher 2016-08-17 20:31:37 -04:00
Ar3nn
ff467b984e Oops 2016-08-17 12:26:31 -04:00
Ar3nn
45e5e7b837 Come at it from a better angle 2016-08-17 00:30:25 -04:00
Aurorablade
47dc3a3051 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-16 02:23:20 -04:00
Aurorablade
39924a55fd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-11 02:01:41 -04:00
Crazylemon64
1b93ce9b8b Merge branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation 2016-08-10 11:02:05 -07:00
Aurorablade
5e90dd83ed Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-09 02:43:27 -04:00
Fox-McCloud
340d397382 Wormhole Event Fix, Portal GC Fix 2016-08-08 09:03:30 -04:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
Fox-McCloud
5533c36af3 Field Generator Cleanup, Singularity Fixes, 2016-08-03 17:17:04 -04:00
Crazylemon64
7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Krausus
dba8af8ab5 Removes dels and unused code that contains dels 2016-08-02 01:33:19 -04:00
Crazylemon64
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00