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
15,119 Commits 74 Branches 23 Tags
e110b51337ffb32a7f0490bd937e8d35b6ae5280
Commit Graph

11234 Commits

Author SHA1 Message Date
Cael Aislinn
d19b9bc3b7 fixes the issue with coolant being ineffective 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 22:27:23 +10:00
DJSnapshot
730c406015 Merge pull request #3839 from caelaislinn/xenoarchaeology 
Xenoarchaeology updates
 2013-10-28 22:36:08 -07:00
Nanai
ff6c2767b8 Paincrit rebalance. Adjusted all of the damage types, particularly burn, to more reasonable levels while buffing halloss. Made paincrit incredibly less blackscreen and replaced it with weaken procs in order to make it a bit more roleplay friendly. Increased shock levels will now also affect your aim. 2013-10-29 01:02:35 -04:00
Mloc-Argent
ff5e2496aa Fix for air alarms doing weird things on zones with low amounts of air. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-28 23:27:04 +00:00
DJSnapshot
fe6fda9e46 Merge pull request #3837 from Nanai/dev 
Decapitation Fixes, Head Reattachment Surgery
 2013-10-28 14:01:04 -07:00
MDReckless
5a8a629df7 Update drinkingglass.dm 2013-10-28 15:55:54 -04:00
Cael Aislinn
c419717255 tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:33:23 +10:00
Cael Aislinn
a4e5bad409 fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:10:17 +10:00
MDReckless
e6d42432ff Changed grape soda description 2013-10-28 15:03:30 -04:00
MDReckless
152d83d47c Update drinkingglass.dm 2013-10-28 15:02:14 -04:00
MDReckless
39d312e69d Removed grape juice from unneeded area 2013-10-28 15:00:21 -04:00
MDReckless
811a4b1aa9 Adds Grape Soda as a reagent 
Allows grape soda in a beaker and gives it color
 2013-10-28 14:57:08 -04:00
MDReckless
809a7faf58 Adding Grapes to the Juicer allow list 
Grapes grown from hydroponics can now be juiced
 2013-10-28 14:45:36 -04:00
MDReckless
67fcd2e6e4 Grape Soda 
Adds grape soda as a recipe
 2013-10-28 11:24:45 -04:00
DJSnapshot
524e3b3d2b Merge pull request #3835 from Kilakk/dev 
Added a new destination tagger sprite
 2013-10-28 07:38:00 -07:00
Nanai
504e49ffb2 Added a new surgery- Head reattachment, for the decapitationally challenged. Performed via retractor, fix-o-vein, hemostat, cautery, head. Fixed logs and messages for decapitated brain removal - No longer shows as the head cutting the head open, and no longer shows the debrainee as the debrainer to admins. 2013-10-28 07:57:24 -04:00
DJSnapshot
751aaa21f4 Merge pull request #3836 from Nanai/dev 
Miscellanities!
 2013-10-27 22:56:48 -07:00
Nanai
b4ea0491c8 Miscellanities: Fixing more broken fluff clothing articles, secondary stamp DMI updated, hemostats added to autolathe to frolick with it's fellows. 2013-10-28 01:46:31 -04:00
Kilakk
15f3e063ab Added a new destination tagger sprite 2013-10-27 22:57:40 -04:00
DJSnapshot
f020959710 Merge pull request #3833 from Nanai/dev 
Cyborg Alt Titles
 2013-10-27 17:34:35 -07:00
Nanai
87ac3c28f0 Added "Android" and "Robot" alt titles to cyborgs- They spawn with posibrains. Robot alt title waiting on an alt MMI/brain type from Ravensdale, but functions with posibrain right now. 2013-10-27 20:23:01 -04:00
DJSnapshot
6eedc4eb3f Merge pull request #3832 from Nanai/dev 
Custom item fixes, Supermatter Crates.
 2013-10-27 16:21:10 -07:00
Nanai
e4e1c66d4a Added a supermatter crate and supermatter shard crate, with appropriate CE-only open access for cargo. 2013-10-27 19:17:45 -04:00
DJSnapshot
a2ed948ae4 Merge pull request #3831 from Nanai/dev 
Guide/Manual addition, sprite fix!
 2013-10-27 15:35:33 -07:00
Mloc
979cf24ed7 Merge pull request #3823 from Iamgoofball/boozetaketwo 
Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker.
 2013-10-27 15:29:52 -07:00
Mloc
6bc10820d8 Merge pull request #3830 from DJSnapshot/master 
Seekrit update
 2013-10-27 15:29:42 -07:00
Nanai
ba15537f6b Added two new manuals by MagmaRam to the default engineering manual bookcase. 2013-10-27 18:25:25 -04:00
DJSnapshot
22cbb0fe17 Seekrit halloween update 2013-10-27 15:25:12 -07:00
Nanai
adc563db05 Added in two new manuals by Magmaram for atmospherics and EVA. 2013-10-27 18:24:30 -04:00
Nanai
88ef9a3be2 Fixed the absent/removed sprite on experimental welding tools. 2013-10-27 18:24:04 -04:00
Iamgoofball
3fa88bb7ff Fixed beakers not going into DNA scannners. 2013-10-27 13:13:26 -07:00
Iamgoofball
e58438cae8 Fixed the Glass.dm can_be_placed_into list. 2013-10-27 13:09:12 -07:00
Segrain
7ffafb657e Fix for acid pouring. 2013-10-27 21:56:08 +03:00
Segrain
93cfba21a7 Fix for #3826. 2013-10-27 21:55:08 +03:00
Segrain
9df65d4294 Merge remote-tracking branch 'upstream/master' into dev-freeze 2013-10-27 21:44:13 +03:00
Mloc
2a52e94d18 Hopefully. Hopefully was the key word. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-10-27 15:50:07 +00:00
Mloc
f99633e934 Merge pull request #3824 from DJSnapshot/dev-freeze 
small fix to autotransfer voting
 2013-10-27 05:10:23 -07:00
Mloc
a1fd865b1a (hopefully) Final fix for ZAS for 0.1.4. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-10-27 12:08:40 +00:00
Kilakk
8b4e5d07e6 Added vending machine stocking 
* Now with more del() than ever before
* Only works if you have the maintenance panel open
 2013-10-27 01:49:19 -04:00
DJSnapshot
aeff49f742 Small fix so voting isn't always shouting at you for not being an admin or mod. 2013-10-26 22:49:16 -07:00
Iamgoofball
7b1dd38d06 Removed a useless variable, and changed the lists modifications to use += and -= 2013-10-26 22:39:41 -07:00
Iamgoofball
f7ad7cbddb Actually added the new beakers. Yay for git. 2013-10-26 21:57:26 -07:00
Iamgoofball
cfbe1c6ad1 Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker. 2013-10-26 21:52:13 -07:00
Kilakk
aee7286e6f Merge remote-tracking branch 'upstream/master' into dev 2013-10-27 00:43:57 -04:00
Kilakk
91e440e26c Fixes #3801, C4 will no longer destroy the analyzer it's inside of 
Committed to dev-freeze because the fix doesn't work with the click code on master
 2013-10-27 00:42:11 -04:00
Kilakk
1ed2ea6ec2 Fiddling with cooldown times 2013-10-26 13:35:31 -04:00
Kilakk
2aae632786 Added the ability to send faxes between departments 2013-10-26 13:21:56 -04:00
Nanai
c9d8fa15ab Del rework, as requested. 2013-10-24 18:25:36 -04:00
Nanai
c9dea9b89d New working supermatter engine! Virgil and Skymarshal's work. Functional! Uguu! 2013-10-24 15:47:26 -04:00
Segrain
858df5ca64 Fix for #3804. 2013-10-24 19:16:54 +03:00