cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-19 22:51:40 +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
LordBraindead
08d2e22220 fire update 
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
 2013-07-14 21:20:45 +02:00
Mloc
cfe45f9271 Merge pull request #3310 from Zuhayr/master 
Vox fixes.
 2013-07-13 03:03:12 -07:00
Zuhayr
07b9c30354 Vox raid spawn fixes. 2013-07-13 16:23:13 -07:00
Zuhayr
7faf895563 Robots will now spawn fully equipped. 2013-07-13 04:35:50 -07:00
Zuhayr
dbe4838d40 Purging the toddler as Lord Mloc commands. 2013-07-13 04:34:09 -07:00
Zuhayr
71f36969b8 Robot health buffs, addition of armour component. 2013-07-13 04:33:48 -07:00
Chinsky
6c6b305f8f Merge pull request #3309 from fauxki/master 
Master - Map Fixes
 2013-07-13 01:42:44 -07:00
fauxtada
85f4403ac2 Master Map Fixes 
- Properly aligns doors in AI core and Gateway room.
- Fixes issue with engineering pod getting it's nose cut off by moving it to the correct transit zone.
 2013-07-13 00:36:48 -07:00
Mloc
836aab6378 Merge pull request #3307 from Zuhayr/master 
Robot fixes, removal of toddler item.
 2013-07-12 11:36:27 -07:00
Mloc
1af9a7bc60 Git, I shall never understand thee. Oh well. 2013-07-12 15:20:49 +01:00
Mloc-Argent
cac7a5420e Merge branch 'master' of github.com:Baystation12/Baystation12 2013-07-12 13:32:36 +01:00
Mloc-Argent
b5c63c2a66 I have honestly no idea what happened there. Fucking git. 
This reverts commit a2fddc0fc1.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 13:31:26 +01:00
Mloc-Argent
c3c84614b8 Update MOTD for new bugtracker link. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 13:10:48 +01:00
Mloc-Argent
c6a9bbc9fc Properly reverts Kida. (what a mess) 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 12:48:07 +01:00
Zuhayr
29cb9efa04 Merge pull request #3306 from Mloc/master 
Update MOTD for new bugtracker link.
 2013-07-12 04:15:13 -07:00
Zuhayr
84829a0a35 Merge pull request #3305 from Mloc/master 
Properly reverts Kida.
 2013-07-12 03:51:00 -07:00
Zuhayr
17ff989194 Merge pull request #3304 from Mloc/master 
Removes Kida
 2013-07-12 03:32:10 -07:00
Mloc-Argent
66a8536c94 Revert "Adds in the icon files for Kidan and fixes issue" 
This reverts commit 9139a70d8c.
 2013-07-12 12:22:58 +01:00
Mloc-Argent
cf53dd7a10 Revert "Adds in the Kida" 
This reverts commit a2fddc0fc1.
 2013-07-12 12:22:35 +01:00
Zuhayr
6a714f3613 Merge pull request #3300 from Spamcat/master 
meatfix revert
 2013-07-12 01:26:34 -07:00
Zuhayr
97eddd0898 Merge pull request #3299 from Segrain/master 
Runtime error fixes for random events.
 2013-07-12 01:26:10 -07:00
Spamcat
c27f3efb8e Merge branch 'master' of github.com:Baystation12/Baystation12 2013-07-12 03:06:41 +04:00
Spamcat
4ceb12bb1c Revert "Quickfix for INFINIMEAT." 
This reverts commit 654a83be9d.
 2013-07-12 03:03:46 +04:00
Segrain
b5b58e5ebe Runtime error fix. 2013-07-12 00:00:59 +03:00
Segrain
f7b22fa911 Quickfix. 2013-07-11 23:14:56 +03:00
Zuhayr
c9eeaa804a Merge pull request #3298 from caelaislinn/master 
EFTPOS tweaks and fixes
 2013-07-11 11:28:56 -07:00
Cael_Aislinn
e4b4486768 added a spawning guide to EFTPOS devices 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-07-12 03:40:38 +10:00
Cael_Aislinn
4421bede17 moved money accounts into a global list + removed db syncing (some procs could be global but left where they are for convenience), fixed an issue with latejoiners having no account, fixed a runtime 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-07-12 03:40:06 +10:00
Zuhayr
b777ae4bac Merge pull request #3275 from comma/viro 
Virology changes
 2013-07-10 22:18:42 -07:00
comma
da35278439 Merge remote-tracking branch 'remotes/origin/bleeding-edge-freeze' into viro 
Conflicts:
	html/changelog.html
 2013-07-11 02:53:58 +04:00
comma
aaa1228e11 Changelog. 2013-07-11 02:52:36 +04:00
Chinsky
67cc13751a Derp. 2013-07-11 02:09:01 +04:00
Mloc
e820e28f78 Merge pull request #3292 from comma/master 
Fixes
 2013-07-10 14:36:32 -07:00
comma
47c6901df3 Fixes #3018 
Should stop intercept report from trying to tell that wizards, ninjas and nuke operatives are trending to be crew members ( they are not ).
 2013-07-11 01:30:16 +04:00
comma
81e22ea270 Fixes wires on air alarm not displaying cut status properly. 
Fixes #3087
 2013-07-11 00:59:44 +04:00
comma
c791208efc Made deconstruction/construction possible. Added hints ot examine since icon is same during whole process. 2013-07-11 00:18:03 +04:00
Mloc
9ab1cc0d85 Merge pull request #3291 from Spamcat/master 
Small fixes
 2013-07-10 12:01:43 -07:00
Spamcat
10b0ef11ab Fixed #3290. 
<_< you saw nothing >_>
 2013-07-10 22:58:23 +04:00
comma
45e775f5e9 Standardized proc definitions in alarm code. 2013-07-10 22:49:10 +04:00
comma
f1cfb96dab Fixes #3225. Adds separate toggle for LOOC. 
Fixes #3285. Changes way hearers are found, so it includes pAIs now.
Also adds (R) in front of LOOC messages that are sent by mobs not in view, for admins/mods, since it's quite disorienting.
 2013-07-10 22:39:27 +04:00
comma
bdaeb2c6fb Adds fire delay to all weapons (except automatics). 
For most weapons it is only slightly bigger than clicking own delay, but still can see difference between revolver and SMG.
Shotungs do not get special delay because they are slow as they are anyway.
Biggest delays go to laser cannon (40 damage per shot) and pulse rifle, ~2 seconds for one shot.
 2013-07-10 21:19:21 +04:00
Spamcat
8e1ffe69de This one isn't used currently and is only confusing people. 2013-07-10 21:06:35 +04:00
Spamcat
fc294110cc Merge branch 'master' of github.com:Baystation12/Baystation12 2013-07-10 20:55:42 +04:00
Albert Iordache
db744e36e7 Merge pull request #3288 from Zuhayr/master 
Combat adminspawn-only fix.
 2013-07-09 14:22:28 -07:00
Zuhayr
a8a474bca9 Changed combat module to VV only pending rebalancing. 2013-07-10 07:20:06 -07:00
Zuhayr
e6cb871544 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-10 07:15:52 -07:00
comma
1a03079a66 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into viro 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-07-09 23:08:41 +04:00
Mloc
0091073003 Merge pull request #3282 from Segrain/master 
Bugfixes.
 2013-07-09 11:01:45 -07:00
Segrain
21ac3e5954 Fix for #3286. 2013-07-09 21:08:31 +03:00
Segrain
46df500cd4 Fix for #3166. 2013-07-09 19:37:17 +03:00