cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,738 Commits 74 Branches 23 Tags
070cb50f8df7cc68c2286f56dab414f0ead33cf1
Commit Graph

5809 Commits

Author SHA1 Message Date
Erthilo
070cb50f8d PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too. 2013-08-11 17:13:58 +01:00
Zuhayr
29ad858ed4 Fixes the weird inertia behavior of cuffed/dragged people in space. 2013-08-11 23:52:46 -07:00
Zuhayr
2ce91a3fbc Commented out gold slime core reactions. 2013-08-10 18:19:41 -07:00
Zuhayr
cfc7dc73d9 Merge pull request #3465 from DJSnapshot/new_player 
Changes to new_player.dm
 2013-08-08 16:08:31 -07:00
DJSnapshot
0feea48cf8 Changed observe button warning to reflect 30 minute wait time. 2013-08-08 14:32:44 -07:00
Akai Alonkai
2db7beb19c Removed Z-up function from Client/Center() 
Turns out this was allowing mecha to travel semi-unrestricted upwards
through z-levels, including to Central Command and the Away Mission.
 2013-08-06 10:46:23 -04:00
Mloc-Argent
dd303f9f82 Fixes for virology machinery. 
Browser UI properly updates on click and on process()
Dishincubator now properly removes radiation (again)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-06 11:59:50 +01:00
Segrain
0a4e4310fd Fix for #3432. 2013-08-06 01:32:34 +03:00
Zuhayr
9176d56b56 Merge pull request #3434 from Mloc/master 
Made IRCbot's password and host a config option.
 2013-08-05 14:19:00 -07:00
Mloc-Argent
9a5a1dc82c Made IRCbot's password and host a config option. 
Added a hook to send a message to the bot when a round starts.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-05 14:07:06 +01:00
Segrain
440b37dcf4 Fix for #3430. 2013-08-05 03:06:31 +03:00
comma
e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm
 2013-08-04 01:40:32 +04:00
Mloc
0091294204 Merge pull request #3418 from comma/dev-freeze 
Fixed monkeys not getting space rabies via syringes.
 2013-08-03 14:08:57 -07:00
comma
747c71096e Fixed monkeys not getting space rabies via syringes. 2013-08-04 00:32:37 +04:00
Segrain
d21a29dc09 Runtime error fix. 2013-08-02 19:09:54 +03:00
Segrain
fb4552f394 Fix for #3383. Again. 2013-08-01 17:15:16 +03:00
Segrain
2e2cca058c Fix for #3406. 2013-08-01 17:11:12 +03:00
Segrain
578a020c8b Fix for #3392. 2013-07-30 12:15:12 +03:00
Zuhayr
a39aff3471 Removed a very very redundant check in the ablative armour code. Thanks Segrain. 2013-07-29 12:51:20 -07:00
Zuhayr
5adc32cf8e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-29 12:15:23 -07:00
Zuhayr
b1ac1d58f9 Fixes #3383 2013-07-29 12:15:04 -07:00
Segrain
ea320dca67 Conflict fix? 2013-07-29 08:15:54 +03:00
Segrain
da2786891a Fix for #3337. 2013-07-29 08:12:02 +03:00
Segrain
fdce68fe66 Magboots fix. 2013-07-28 14:31:23 +03:00
Zuhayr
1670ed8051 Fixes sprite reset issue for cyborgs, adds combat sprite to Secborg sprite choices. 2013-07-27 01:08:27 -07:00
Zuhayr
37aef47198 Nerfed the combat borg. Laser instead of cannon, cannon instead of plasma rifle. Added red alert check to crisis mode. 2013-07-27 00:48:50 -07:00
SkyMarshal
72c331bfa7 Several ZAS fixes. 
Adds insulation to doors, modifiable by admins from the ZAS setting panel.
Fixes a logic error with connections.  (I am dumb some days)
Improves the runtime detection and reporting.
Improves "zone info" debug verb.
 2013-07-25 21:34:12 -07:00
Segrain
cf4f9ba054 Typo fix, retractor step bugfix. 2013-07-25 03:06:06 +03:00
Mloc-Argent
09db9f1ff0 Nerfed snoring frequency. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-23 23:38:49 +01:00
Mloc-Argent
e7f38be3b4 Beakers and other glass containers now hide their contents, only showing the amount. 
Additionally, they can be labeled with a pen, up to a max of 10 characters.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 17:38:34 +01:00
Mloc-Argent
8421cd44df Upped the capacity of Eleanor Stone/RKF's custom teapot item to 150 units, by request. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 17:37:39 +01:00
Mloc-Argent
bdaabaec46 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2013-07-22 14:42:50 +01:00
Chinsky
a344010db4 Merge pull request #3330 from Kilakk/master 
Compile fix (read: I'm an idiot)
 2013-07-21 18:50:12 -07:00
Kilakk
d369b9ffff Compile fix (read: I'm an idiot) 2013-07-21 19:49:30 -04:00
Chinsky
f9b6ef3593 Merge pull request #3328 from Mloc/master 
Bugfixes.
 2013-07-21 16:42:29 -07:00
Kilakk
e9483415d3 Fixes #3326 - uncommented admin-ERT verb 2013-07-21 19:38:32 -04:00
Mloc-Argent
f0e0951c1c Fixes #3230. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 00:18:24 +01:00
Mloc-Argent
e4b67a3466 Fixes #3104. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-21 16:55:30 +01:00
Mloc-Argent
adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:38:00 +01:00
Mloc-Argent
f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01:00
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
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
71f36969b8 Robot health buffs, addition of armour component. 2013-07-13 04:33:48 -07:00
Mloc
1af9a7bc60 Git, I shall never understand thee. Oh well. 2013-07-12 15:20:49 +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
c6a9bbc9fc Properly reverts Kida. (what a mess) 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 12:48:07 +01: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
Segrain
b5b58e5ebe Runtime error fix. 2013-07-12 00:00:59 +03:00