cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,078 Commits 2 Branches 1 Tag
6f45ff68c76d66a01b87b4f4bfae69d7ff63f7cc
Commit Graph

13078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chinsky
6f45ff68c7 Changes to effects: 
fixed indentation in some cases.
added feedback message to disorientation effect.
changed mucus virus transfer to proper proc
 2013-06-16 11:30:47 +04:00
Chinsky
5aa1170bd3 Changed isolator to be able to isolate any virus from sample. 2013-06-16 11:29:18 +04:00
Chinsky
934a25a172 Added antigen check to viri comparing proc. 2013-06-16 11:27:00 +04:00
Chinsky
fd13ff0d64 Merge branch 'vials' into viro 2013-06-16 11:22:15 +04:00
Chinsky
ca4c3869b9 Merge branch 'bleeding-edge-freeze' into vials 2013-06-16 11:20:45 +04:00
Chinsky
f052d8d972 Added boxes for vials. Usual and secure version(default to viro access) 
Changed vial lid sprite slightly.
 2013-06-16 11:20:32 +04:00
Chinsky
a76b87635e It only holds 15 units. 2013-06-15 15:54:43 +04:00
Chinsky
71e47fcd1c Added Local OOC verb. 
Visible to those in view and all admins.
 2013-06-15 15:36:55 +04:00
Jim "Apples"
6d1d50ed69 Merge pull request #3067 from NicholasDV/enhancementsAndFeatures 
Adds in the Kida
 2013-06-14 10:33:23 -07:00
Chinsky
d0eaeb89b9 Merge pull request #3070 from Baystation12/master 
Updating BEF with master
 2013-06-14 03:17:39 -07:00
Chinsky
a246caad63 Fixes unticked file. 
No idea why some files get randomly unticked.
 2013-06-14 14:17:12 +04:00
Chinsky
8aa377a09a Merge pull request #2920 from Jamini/bleeding-edge-freeze 
BEF - Farwa - Alien Monkies
 2013-06-14 03:13:05 -07:00
Chinsky
5993ce4be5 Merge pull request #3068 from SkyMarshal/airfixes 
Fixes a runtime involving ZAS zones lose their air datum.  (I have no fucking idea why that happens)
 2013-06-14 02:59:29 -07:00
Jamini
89766706fe Alien Monkeys - Farwa, Stok, Aenera 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-06-14 02:22:27 -04:00
NicholasDV
9139a70d8c Adds in the icon files for Kidan and fixes issue 
SkyMarshal caught a small issue, and I realized that I never did
include the kidan icon files. This is the fix!
 2013-06-14 00:06:45 -04:00
SkyMarshal
1f886448b6 Fixes a runtime involving ZAS zones lose their air datum. (I have no fucking idea why that happens) 
Fixes #3059
 2013-06-13 18:20:42 -07:00
NicholasDV
a2fddc0fc1 Adds in the Kida 
Adds in the Kida Race to all parts.
 2013-06-13 18:22:05 -04:00
Chinsky
f4fc9b40e8 Merge pull request #3065 from Asanadas/bleeding-edge-freeze 
Added Malsquando's colored suit to the hop's wardrobe locker.
 2013-06-13 07:23:51 -07:00
Asanadas
7479fd272c Added Malsquando's colored suit to the hop's wardrobe locker. 
Everything should be working correctly.
 2013-06-13 09:41:52 -04:00
Chinsky
152ddfd646 Merge pull request #3063 from Zuhayr/master 
Throwing weapon runtime fix.
 2013-06-12 23:04:40 -07:00
Zuhayr
1b230504f5 Runtime fix. 2013-06-13 15:57:41 -07:00
Zuhayr
4aa577bef3 Powered crossbows, sprites, ammo. 2013-06-13 15:31:47 -07:00
Zuhayr
13b4f0def9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-13 15:31:03 -07:00
Zuhayr
4928f56030 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-13 12:03:58 -07:00
Chinsky
3642f1829a Merge pull request #3062 from Zuhayr/master 
Crossbow, bolts, rods.
 2013-06-12 22:42:32 -07:00
Chinsky
88b96bb5fe Merge pull request #3060 from meyar/bleeding-edge-freeze 
Fixes an ERT mapping error
 2013-06-12 20:00:46 -07:00
meyar
e0513769ae Fixes an ERT mapping error 2013-06-12 22:56:54 -04:00
Chinsky
7c29fb3a71 Merge pull request #3058 from meyar/bleeding-edge-freeze 
Forgot some medkits for the syndiscum
 2013-06-12 19:00:01 -07:00
meyar
a4c94ab9db Forgot some medkits for the syndiscum 2013-06-12 21:56:36 -04:00
Chinsky
d4e3d24d70 Merge pull request #3057 from meyar/bleeding-edge-freeze 
ERT/Nuke bugs resolved. Mostly.
 2013-06-12 18:38:47 -07:00
meyar
526e098b00 Fixes what I dun fucked. 2013-06-12 21:37:39 -04:00
meyar
717413b9c8 Revert "ERT/Syndicate area updates, fixes some nuke mode bugs. Windoors added to the server rooms. Should keep the cold in." 
This reverts commit 62e5e3950a.

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-12 21:18:58 -04:00
meyar
f69d445fea Fixin' shit 2013-06-12 21:03:56 -04:00
meyar
4098cd9410 Fixes the player requirements, forgot to revert them from testing. 2013-06-12 20:52:49 -04:00
meyar
d9a4b116fc Enables the adminbuse ERT button 2013-06-12 20:47:30 -04:00
meyar
d965c23bd9 Removes the syndicate nuke agent last name system. 2013-06-12 20:46:59 -04:00
Chinsky
2fb638253d Merge pull request #3055 from Mordeth221/patch-1 
Cyborg Medical Hypo Changing Doctors Delight to Tricordrazine
 2013-06-12 17:27:39 -07:00
meyar
62e5e3950a ERT/Syndicate area updates, fixes some nuke mode bugs. Windoors added to the server rooms. Should keep the cold in. 2013-06-12 19:39:21 -04:00
meyar
3769ceff4f Fixes a conflict with auto-ERT 2013-06-12 19:37:57 -04:00
meyar
90e477ebfb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 17:24:54 -04:00
meyar
e259deba7c Actually calls the ERT proc on red alert now. Hurr. 2013-06-12 17:23:39 -04:00
Mordeth221
91bd0d453b Cyborg Medical Hypo Changing Doctors Delight to Tricordrazine 
Changing because they have the same effect, yet Doctors Delight causes people to get drunk/slurr words.
 2013-06-12 21:55:07 +02:00
Mloc
9536dbf0a0 Merge pull request #2980 from comma/newstuff 
Newstuff
 2013-06-12 12:13:50 -07:00
Chinsky
bb26c5a7cb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
 2013-06-12 23:11:28 +04:00
Chinsky
acd6500a58 Merge pull request #3051 from Vetinarix/bleeding-edge-freeze 
Medbay break room fix
 2013-06-12 10:39:11 -07:00
Vetinari
b2ac4b9617 Medbay break room fix 
There was no APC, ee gads!
 2013-06-13 00:08:41 +10:00
Chinsky
cb488afbfe Merge pull request #3050 from Vetinarix/bleeding-edge-freeze 
Medbay Remap RePull.
 2013-06-12 06:34:15 -07:00
Vetinari
3c0a424bb3 Medbay Remap post-ERT 
Medbay Overhaul, mapping post-ERT changes, recommit of previous files
due to computer derp.
 2013-06-12 23:27:36 +10:00
Chinsky
117860e21b Merge pull request #3047 from Zuhayr/master 
Embedded projectiles/pneumatic cannon.
 2013-06-12 03:46:44 -07:00
Zuhayr
91008c4d38 Amending a previous fix due to new ERT code from bef. 2013-06-12 20:47:04 -07:00