cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 21:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,449 Commits 2 Branches 1 Tag
2e957c8b51749ff11e2a13fea79d3d0b7ff0fbcc
Commit Graph

14449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Aherne (Faerdan)
2e957c8b51 Updated the documentation for the ui_interact proc. 
Moved the client nanoclose verb into nanoexternal.dm.

Removed debug comments.
 2013-09-11 22:24:21 +01:00
Mark Aherne (Faerdan)
03bbea6f35 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-09-11 21:58:34 +01:00
Mark Aherne (Faerdan)
762baa490f Better documentation for the ui_interact proc. 2013-09-11 21:46:59 +01:00
Mark Aherne (Faerdan)
8a6094685a Minor fixes. Added Templates Guide (wip). 2013-09-11 21:27:54 +01:00
Chinsky
3b65251a8a Merge pull request #3663 from Faerdan/dev 
Documented Nano code.
 2013-09-09 22:33:03 -07:00
Mark Aherne (Faerdan)
447f0a2fe7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-09-09 22:43:09 +01:00
Mark Aherne (Faerdan)
901a3dae8e Documented Nano code. 2013-09-09 22:32:59 +01:00
Zuhayr
b10a0743b8 Merge pull request #3654 from Kilakk/dev 
Added vials, syringes, and proximity sensors to the autolathe
 2013-09-08 20:40:56 -07:00
Kilakk
0e08e80bb0 Changed syringes and vials to work correctly with the autolathe 2013-09-08 14:24:06 -04:00
Kilakk
eb19112ab4 Added vials, syringes, and proximity sensors to the autolathe 2013-09-08 14:23:20 -04:00
Zuhayr
c7942b7eaf Merge pull request #3651 from SkyMarshal/airfixes 
ZAS update, needs testing.
 2013-09-07 05:46:04 -07:00
SkyMarshal
9c87960852 Bluh. 2013-09-06 21:11:46 -07:00
SkyMarshal
301de25bae Fixes the not-considering-actual-geometry issue. 2013-09-06 21:07:34 -07:00
SkyMarshal
7d0c1f047a There we go, rebuilding works right now. Also has a slightly bugged verb that demonstrates how the rebuilding works, but you need to somehow prevent a zone from updating for it to show more than one "id" 2013-09-06 21:03:46 -07:00
SkyMarshal
1762c65640 man I am bad at this 2013-09-06 19:57:55 -07:00
SkyMarshal
057c8eeacd Fixed a minor derp. 2013-09-06 19:46:48 -07:00
SkyMarshal
5eb87a8b13 Use of two-pass connected component labeling to improve zone rebuilding 
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
 2013-09-06 19:10:29 -07:00
SkyMarshal
3b2da3238c Reduces processing of connections, zones now rely on the air properties of constituent turfs (they will adjust these properties when turfs are added or removed) 2013-09-06 15:41:50 -07:00
Chinsky
cafa176548 Merge pull request #3647 from SkyMarshal/patch-2 
ZAS fix, Stops lasertag guns from killing you if you shoot it into your mouth.
 2013-09-04 07:20:15 -07:00
SkyMarshal
99bf9db04c Fixes lastertag guns killing you if you stick it in your mouth. 2013-09-03 22:51:37 -07:00
Zuhayr
ee156376a3 Merge pull request #3645 from SkyMarshal/patch-1 
Fixes longstanding connection bug.
 2013-09-03 22:47:13 -07:00
Zuhayr
b0d7a95189 Merge pull request #3644 from DJSnapshot/master 
Gave mods dsay command and unique dsay identifier
 2013-09-03 22:46:39 -07:00
SkyMarshal
081356f21b Fixes longstanding connection bug. 2013-09-03 20:58:26 -07:00
SkyMarshal
e8f9d19c75 Completed ZAS rework. Needs testing, and consideration to make zones sleep. 2013-09-03 20:25:03 -07:00
SkyMarshal
073f462e1b WIP ZAS rework. 2013-09-03 20:25:02 -07:00
DJSnapshot
2c41ad1429 Gave Mods dsay command and unique dsay identifier 2013-09-03 14:10:21 -07:00
Mloc
cd4ef2ba2b Merge pull request #3640 from Zuhayr/dev 
Master fixes, Skrellian hardsuit fixes, language fixes.
 2013-09-03 11:50:16 -07:00
Zuhayr
24764131af Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-03 23:46:18 -07:00
Zuhayr
1b6d76f004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-09-03 23:46:04 -07:00
Zuhayr
3019942102 Minor language token fix. 2013-09-03 23:40:07 -07:00
Zuhayr
4e9e8e0e3d Fixes some Skrell hardsuit issues. 2013-09-03 23:38:46 -07:00
Zuhayr
9a5f544e8c Merge pull request #3638 from SkyMarshal/patch-1 
Temporary fix for ZAS processing twice per time interval.
 2013-09-03 05:33:34 -07:00
SkyMarshal
94fc06d0df Temporary fix for ZAS processing twice per time interval. 2013-09-03 00:41:46 -07:00
Zuhayr
f3631ba21e Added key to Check Languages. 2013-09-02 21:43:30 -07:00
Zuhayr
3f36adb002 Check Language verb. 2013-09-02 21:03:30 -07:00
Zuhayr
4d51f2e419 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-02 20:46:17 -07:00
Zuhayr
4bb1399f12 Merge pull request #3637 from Erthilo/dev 
Merge dev with master
 2013-09-02 17:40:19 -07:00
Erthilo
efddf297f4 More merge commits. 2013-09-02 23:43:38 +01:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Chinsky
33e17c6925 Merge pull request #3630 from Erthilo/dev 
Internal bleeding nerfed slightly, gas mask filters plasma and n2o, overdoses, lots of other tweaks
 2013-09-02 14:19:26 -07:00
Zuhayr
a8f0d5c4c2 Merged bullets.dm. 2013-09-02 14:16:53 -07:00
Chinsky
4cb945d921 Merge pull request #3636 from Mloc/fix 
Previous commit apparently got swallowed by the git monster.
 2013-09-02 14:10:00 -07:00
Mloc-Argent
2d97372967 That apparently didn't work so I have to put it in a .int. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-02 21:54:51 +01:00
Mloc-Argent
72d158143b Previous commit apparently got swallowed by the git monster. 
Turns off auto FILE_DIR in .dme, fixes compile error.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-02 21:50:58 +01:00
Erthilo
9e17473f62 Uncomments books. Generifies mentions of tg or baystation. 2013-09-02 18:24:11 +01:00
Erthilo
8f3d303e45 Bicaridine slows but does not stop internal bleeding. 2013-09-02 17:53:28 +01:00
Erthilo
88a45d3cbf Job whitelist fix. 2013-09-02 17:51:49 +01:00
Erthilo
9633dd9073 Alarm runtime fixes. 2013-09-02 17:45:38 +01:00
Erthilo
1e499d8994 Sleeper adjustments. Cannot inject over 20 units. 2013-09-02 17:45:24 +01:00
Erthilo
3662725155 Fixes for monkeycubes. 2013-09-02 17:44:47 +01:00