cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-20 15:12:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,651 Commits 2 Branches 1 Tag
fe0e1ecfb65efbdd1069affe77a73c048a39f02c
Commit Graph

13651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chinsky
fa2b46ce9c Merge pull request #3035 from CIB/feature 
New configuration option: external resource download
 2013-06-11 12:33:16 -07:00
Chinsky
3c56e6dacb Merge pull request #3043 from Baystation12/master 
Fix for pods
 2013-06-11 12:32:47 -07:00
Chinsky
e638540b4c Merge pull request #3041 from meyar/master 
Emergency map fix: Security escape pod
 2013-06-11 12:29:41 -07:00
cib
13b16bcd69 Added extra message when downloading external resources. 2013-06-11 21:28:59 +02:00
cib
4e0c68b88a Added a configuration option that allows putting the .rsc on external servers. 2013-06-11 21:28:59 +02:00
meyar
f03f8c9b66 Disables debug(poorly made debug) verb for ERT. This -may- be behind my BEF fix, but I suck at git and can't exclude this because I am dumb :c 2013-06-11 15:25:59 -04:00
Chinsky
bd3879da2e Merge pull request #3040 from Baystation12/master 
hurka durka master update
 2013-06-11 12:25:56 -07:00
Chinsky
09d0bb7f8e Merge pull request #3039 from Furlucis/master 
Typo fixes
 2013-06-11 12:21:16 -07:00
Chinsky
362aa26a1e Merge pull request #3038 from Spamcat/master 
Antilag 2: electric boogaloo
 2013-06-11 12:20:38 -07:00
Zuhayr
c57f2bb137 Polished off some pneumatic cannon bugs. All done. 2013-06-11 12:19:20 -07:00
meyar
010122b189 Emergency fix for security escape pod 2013-06-11 15:13:26 -04:00
Spamcat
076f4c9d9a Figured I should finally commit it, since exams are over now~ 
Radios start off by default. Should decrease the amount of tcomm lag.
 2013-06-11 23:09:44 +04:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...") 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 15:01:48 -04:00
meyar
38feb46839 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-11 15:00:22 -04:00
Zuhayr
de2b8b8087 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-11 11:51:48 -07:00
Chinsky
8108dd6416 Merge pull request #2994 from Giacomand/AI_announcement_BEF 
AI voice announcement system. Type in words to create vocal sentences.
 2013-06-11 08:30:55 -07:00
Chinsky
1d97bd76f4 Merge pull request #3020 from jack-fractal/bleeding-edge-freeze 
Random Objects and Randomized Tool Storage
 2013-06-11 08:29:19 -07:00
Chinsky
ceafae3381 Merge pull request #3034 from Furlucis/master 
Jungle Runtime fix
 2013-06-11 08:26:43 -07:00
Zuhayr
c8f2ee9326 Removed a debug string. 2013-06-11 01:35:30 -07:00
Zuhayr
045a90167c Vox sprite fixes. 2013-06-11 01:32:07 -07:00
Zuhayr
96d9a41ea7 Pneumatic cannon sprites, gas loss code. 2013-06-11 00:57:15 -07:00
Furlucis
a60dcf473b Fixed a runtime error where one thing would sometimes try to handle an empty list. Some chance that will still make a jungle map fail to work right, though. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 03:18:03 -04:00
Zuhayr
8c79c4147e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-10 22:36:01 -07:00
Zuhayr
0fb234d6a4 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-10 22:35:42 -07:00
Zuhayr
98d31e9191 Preliminary work for pneumatic cannons (WIP, no sprites, broken gun) 2013-06-10 22:35:01 -07:00
jack-fractal
aa0d42f552 - removing unnecessary map changes using the maptools 2013-06-11 00:54:14 -04:00
jack-fractal
e3fd232741 - removing yellow and black gloves from the randomized tech storage object 
- adding toolbelts
- rebuilding changes to map
 2013-06-11 00:52:32 -04:00
jack-fractal
245713418f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-11 00:29:10 -04:00
meyar
b483665356 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-10 23:17:47 -04:00
Chinsky
bb95425628 Merge pull request #3030 from SkyMarshal/airfixes 
Fixes a derp in the sanity checking.
 2013-06-10 19:45:37 -07:00
Chinsky
c906628349 Merge pull request #3031 from Baystation12/master 
Updating BEF with master
 2013-06-10 19:45:24 -07:00
Chinsky
fb4582e282 Merge pull request #3029 from fauxki/master 
Master Map Fixes
 2013-06-10 19:44:56 -07:00
fauxtada
d65759a98b Master Map Fixes 
- Opps, fixed bar doors.
- And the floating glass at the swimming hole.
 2013-06-10 19:40:53 -07:00
SkyMarshal
1739ff6fec God, I am not awake. 2013-06-10 19:40:39 -07:00
Chinsky
569e160546 Merge pull request #3028 from Zuhayr/master 
Pneumatic cannon, vox sprite fixes, commits from master.
 2013-06-10 19:25:54 -07:00
Chinsky
fda687ec00 Merge pull request #3027 from SkyMarshal/airfixes 
Fixes for ZAS issues.
 2013-06-10 19:02:06 -07:00
SkyMarshal
df73aabf83 Fixes for ZAS issues. 
Fixes #2996
Fixes #3023
 2013-06-10 18:49:41 -07:00
Kilakk
a1665e0080 Adds Xenobiologist spawnpoints 
* Xenobiologist has two spawns in .. xenobiology
* Former xenobio scientist spawn moved to R&D lab
 2013-06-10 21:46:38 -04:00
Kilakk
333163dc01 Reconfigured the job prefs panel to look nicer 
Thanks Deccy for pointing out a one pixel difference
 2013-06-10 21:45:50 -04:00
Kilakk
32b0ad2dfa Adds "Xenobiologist" as its own separate job 2013-06-10 21:45:07 -04:00
Zuhayr
cbb36ce24f Added ability for tanks to be held on vox suits. 2013-06-10 18:08:25 -07:00
Zuhayr
630db203f9 Oxygen toxicity fix. Whoops. 2013-06-10 17:50:15 -07:00
Zuhayr
bc2db268cc Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning. 2013-06-10 17:16:54 -07:00
Zuhayr
38b44b2441 Items for wizard den, mental focus added to spellbook. 2013-06-10 14:56:47 -07:00
Zuhayr
85b945cfbf Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-10 14:42:46 -07:00
Chinsky
6dc2d9d2dc Merge pull request #3015 from comma/master 
Fix
 2013-06-10 11:50:50 -07:00
Chinsky
4403e0728e Merge pull request #3000 from Baystation12/BEF-staging 
Bef staging
 2013-06-10 02:54:22 -07:00
Chinsky
54b835f0d7 Merge pull request #3022 from Baystation12/bleeding-edge-freeze 
Bleeding edge freeze
 2013-06-10 02:53:51 -07:00
Chinsky
a252ca3943 Merge pull request #3019 from misterbook/bleeding-edge-freeze 
Bleeding edge freeze
 2013-06-10 02:51:19 -07:00
Chinsky
0f9b53ef09 Merge pull request #3016 from NicholasDV/tweaksAndFixes 
Tweaks and fixes
 2013-06-10 02:39:40 -07:00