cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-22 08:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,413 Commits 2 Branches 1 Tag
3882ac24e7d55b51a13d5c0b11d161fc5867aa9e
Commit Graph

6413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CIB
60b2294e39 Merge pull request #1350 from CIB/master 
Moderator updates
 2012-06-21 22:03:52 -07:00
CIB
570d7ebfb3 Merge pull request #1351 from caelaislinn/master 
didn't seem to merge right last time. this should have fixed it
 2012-06-21 21:44:11 -07:00
caelaislinn
3210012cf9 slight artifact tweaks 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 14:31:15 +10:00
caelaislinn
c1561be2f8 readded missing file. somehow it unticked during a merge and didn't get pushed? 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 14:22:13 +10:00
CIB
09d035bcca Merge pull request #1348 from CIB/master 
Master controller crash debugging
 2012-06-21 19:20:10 -07:00
CIB
d074988ae3 Merge pull request #1347 from SkyMarshal/BugFixes 
Fix for cael's derp.  MAKE SURE YOU TICK YER FILES.
 2012-06-21 19:19:22 -07:00
SkyMarshal
dba2b81756 Fix for cael's derp. MAKE SURE YOU TICK YER FILES. 2012-06-21 18:10:15 -07:00
SkyMarshal
800c4a406a Merge pull request #1345 from SkyMarshal/BugFixes 
Traitor objective system update.  Ultralight update and speed boost.
 2012-06-21 18:05:16 -07:00
SkyMarshal
9418a1c8a6 Traitor objective system update. 2012-06-21 17:51:06 -07:00
SkyMarshal
f5ba6478fe Merge pull request #1342 from caelaislinn/master 
forgot changelong
 2012-06-21 14:40:08 -07:00
caelaislinn
31acca8dab changelog 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:38:54 +10:00
Mloc
9dc970ace7 Merge pull request #1341 from caelaislinn/master 
artifact additions
 2012-06-21 14:34:53 -07:00
caelaislinn
d619ad1a16 map updates 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:28:34 +10:00
caelaislinn
c6ae41d7dc slight bugfixes 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:26:14 +10:00
caelaislinn
124a511de1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-22 07:16:43 +10:00
caelaislinn
9d68386d53 new scientist alt-titles 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:13:45 +10:00
SkyMarshal
569cd2f0df Damned constants. Also: Moved more stuff into #defines. 2012-06-21 14:12:27 -07:00
Hawk-v3
7abb3d8244 Merge pull request #1340 from SkyMarshal/BugFixes 
UltraLight optimizations, removes derpy footprint code for now, moves access levels into #defines.
 2012-06-21 14:09:14 -07:00
caelaislinn
d50d166e24 added anomaly lab in research, added some floodlights on the mining base, cleaned up a bunch of cameras 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:04:24 +10:00
caelaislinn
797227e3ab cleaned up some cameras 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:03:55 +10:00
caelaislinn
fd0a501eff added new ore type which you can mine for artifacts, added new tool specifically for mining artifacts 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:03:28 +10:00
caelaislinn
854ca4c516 ported much of alfie's anomaly code from luna, cut down and bugfixed much of said code, added new findable artifacts, tweaked existing artifacts, added anomalous artifact analysis (more to come later, possibly) 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-22 07:02:56 +10:00
SkyMarshal
59b29b7eb4 Whoops! 2012-06-21 13:41:18 -07:00
SkyMarshal
730461840f UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun) 2012-06-21 13:35:34 -07:00
SkyMarshal
f39676cacb Removes the unfortunately derpy bloody footprints. 2012-06-21 11:10:05 -07:00
Miniature
938a24d5a9 Merge pull request #1338 from Miniature/master 
Commented out a bunch of reaction checks that never result in any reactions.
 2012-06-21 09:54:42 -07:00
Miniature
489999d8b7 Commented out a bunch of reaction checks that happened when reagents only decreased in volume, since there's no reactions that require less than a certain amount of reagent, and none that add new reagents when they decay (and that should be done with add_reagents, which does check for reactions anyway) 2012-06-22 02:21:19 +09:30
CIB
e2faf4b1a5 Added Asanadas to moderators.txt 2012-06-21 06:25:21 -07:00
SkyMarshal
2270ffedaf Merge pull request #1336 from SkyMarshal/BugFixes 
Fixes for UL bugginess
 2012-06-21 02:54:58 -07:00
SkyMarshal
580a83d334 Fixes for UL bugginess 2012-06-21 02:52:45 -07:00
SkyMarshal
43c10068e3 Merge pull request #1335 from SkyMarshal/BugFixes 
Air Alarms, ZAS fixes, Cycling Airlocks, UltraLight fixes
 2012-06-21 02:06:58 -07:00
SkyMarshal
5ea83f0abe Air alarm fixes, final part. Added in area atmos lockdown, proper overrides from the atmos control computer, cycling airlocks, and minor airflow/ZAS tweaks. 2012-06-21 02:06:05 -07:00
SkyMarshal
c2163b1f20 Atmos Alarms now work awesome. 2012-06-21 02:05:33 -07:00
SkyMarshal
5ac37c7a78 Final parts of the air alarm rewrite. 2012-06-21 02:05:33 -07:00
SkyMarshal
f953f78d73 WIP air alarms 2012-06-21 02:05:32 -07:00
SkyMarshal
94cd09fe4c Merge pull request #1328 from Miniature/master 
Made capwhatever not do damage to soghun
 2012-06-21 02:05:09 -07:00
SkyMarshal
33bfd09f09 Merge pull request #1332 from Abi79/master 
Raised the amount of toxloss humans get per tick and Cleaned up lighting.dm and boosted tube light a little.
 2012-06-21 02:04:25 -07:00
Albert Iordache
c3a65e0afc Cleaned up lighting.dm and boosted tube light a little. 2012-06-20 23:39:24 +03:00
Albert Iordache
2b9f6db9ce Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-20 23:38:34 +03:00
SkyMarshal
0e99a96ac1 Merge pull request #1331 from SkyMarshal/DetectiveWork 
Reduction of number of ul_Illuminate and ul_Extinguish calls. (@Miniature) Also fixed a bug with the SMES room lighting.
 2012-06-20 09:35:56 -07:00
SkyMarshal
61124c86a8 Reduction of number of ul_Illuminate and ul_Extinguish calls. (@Miniature) Also fixed a bug with the SMES room lighting. 2012-06-20 09:34:17 -07:00
Hawk-v3
74809cd01b Merge pull request #1330 from Hawk-v3/master 
Logging of uploads, for Abi
 2012-06-20 05:05:42 -07:00
Hawk-v3
37c0132f35 Abi's request 2012-06-20 13:05:06 +01:00
Hawk-v3
3aaf1d43f0 Merge pull request #1329 from Hawk-v3/master 
Upping the upload limit for sound files. Head said I could self-merge.
 2012-06-20 04:59:19 -07:00
Hawk-v3
631330a7f4 Upping the upload limit for sound files. 2012-06-20 12:41:14 +01:00
Miniature
79ad52d64d Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-20 20:28:06 +09:30
Albert Iordache
8d9671a1e7 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-20 11:02:59 +03:00
SkyMarshal
1775923676 infinite loop (?) fix. 2012-06-20 00:04:17 -07:00
SkyMarshal
26ddee6420 Merge pull request #1327 from SkyMarshal/DetectiveWork 
Fixes for Antiqua compilation and runtimes.
 2012-06-19 21:56:44 -07:00
SkyMarshal
4a3db27db0 DERP 2012-06-19 21:55:33 -07:00