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
6,821 Commits 74 Branches 23 Tags
7cc57deb17cac3d12448ec106b67dacabcd02209
Commit Graph

5117 Commits

Author SHA1 Message Date
Mloc
7cc57deb17 Merge pull request #1544 from TurboCamel/master 
Finish commenting out collectible crate
 2012-07-29 08:37:02 -07:00
Mloc
b34aae0c05 Merge pull request #1542 from comma/master 
Fix for admin rejuv
 2012-07-29 08:32:05 -07:00
TurboCamel
6abb7b6e8d Finished commenting out collectible hat crate 
Sorry, my previous submission left an undefined variable because the collectible hat crate *still* wasn't completely commented out. This should fix the problem.
 2012-07-29 10:30:21 -05:00
comma
60f87cf538 Fix for admin rejuv breaking examine 2012-07-29 19:30:07 +04:00
Albert Iordache
4f5bdc6c64 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-07-29 15:50:44 +03:00
Mloc
fe4de6ac07 Merge pull request #1537 from TurboCamel/master 
Fixed bugs with power control module supply pack and collectible hat crate
 2012-07-29 05:50:14 -07:00
Albert Iordache
8a340237c6 Merge branch 'master' of https://github.com/comma/Baystation12 into comma-master 
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm
 2012-07-29 15:49:56 +03:00
comma
b2522daa5d Surgery bugs. 
Stopped attacking patient during head surgery with hemostat.
Was caused by try_bone_surgery called twice in code.
Removed one redunant call.

Fixed runtimes during face surgery.
Null organ was caused by not being 'mouth' organ there.
Made it select 'head' as affected organ.
 2012-07-29 08:21:37 +04:00
CIB
35b1e7efd6 Experimental change to speed up atmos 
Kudos to /tg/
 2012-07-29 03:29:45 +03:00
TurboCamel
5734a2df15 Fix PCM supplies, finished removing hat crate 
Power Control Module supplies are now called APC and Airlock Electronics crate, as you get one box each of power control modules and airlock circuit boards. It also ought to be under the engineering heading, so I moved it there. 

Also, someone had incompletely removed the collectible hat crate. You could still order it but nothing would arrive, so I finished commenting it out.
 2012-07-28 17:07:39 -05:00
TurboCamel
b40704a2fe Added airlock electronics box 2012-07-28 16:41:57 -05:00
TurboCamel
005b5ec1e5 Added new circuit boxes 
Added power control module box and airlock electronics box.
 2012-07-28 16:37:17 -05:00
CIB
2d333b743c Merge pull request #1532 from headswe/master 
Firedoors are now "emergency shutters" and have a new sprite.
 2012-07-28 09:33:13 -07:00
Head
ee6c81dc47 Firedoors are now "emergency shutters" and have a new sprite. 2012-07-28 18:30:57 +02:00
Head
7ae24d3d36 Added nullcheck to mind.dm 2012-07-28 18:05:32 +02:00
CIB
cae467ce39 Merge pull request #1531 from headswe/master 
Fixes a few runtime errors
 2012-07-28 08:55:22 -07:00
Head
f814d99249 Added condition to the rest of the code in effect_system.dm 2012-07-28 17:53:13 +02:00
Head
04fac7a528 Fix for the fix!, God i hate byond code. 2012-07-28 17:46:25 +02:00
Head
3a1f30ece4 A few fixes. 2012-07-28 17:16:22 +02:00
CIB
63e826d119 Derp, edited the wrong variable 2012-07-28 17:01:20 +03:00
CIB
c1ec998c1f Fix power outage problems, take 2 2012-07-28 16:59:59 +03:00
CIB
c4b21c61f7 Quickfix for station losing power in less than 10 minutes 2012-07-28 16:50:10 +03:00
CIB
1952a6fc3a Lighting now turns off before equipment 2012-07-28 16:46:54 +03:00
Mloc
2569bb1d83 Merge pull request #1530 from caelaislinn/master 
tgstation.dmm mapfixes, antiqua.dmm engine updates, R-UST updates
 2012-07-28 04:42:03 -07:00
Cael_Aislinn
09687957d9 particles should actually dmg properly, instead of error. cant believe this didnt come up earlier 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-28 21:40:07 +10:00
Albert Iordache
8fada000e7 Fixed a ZAS/Processing.dm runtime error 2012-07-28 10:34:24 +03:00
Cael_Aislinn
bd4ce09264 remove debug output 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-28 17:27:27 +10:00
Albert Iordache
3cf5cb0d3d Merge pull request #1522 from caelaislinn/powerchanges 
powerchanges
 2012-07-28 00:23:27 -07:00
Cael_Aislinn
760e86c4b0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-28 17:19:35 +10:00
Cael_Aislinn
1d002bb361 additional tweaks to r-ust 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-28 17:19:17 +10:00
Cael_Aislinn
c9b4fdbaef tweaks to shield generators, added shield generator to the admin shuttle (would have added it to other shuttles, but most are too small) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-28 13:15:02 +10:00
Cael_Aislinn
6a713bc18b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-27 21:42:03 +10:00
SkyMarshal
62dcb7be1b Adds caching to dummy objects, seems to work great. 2012-07-26 17:14:31 -07:00
SkyMarshal
54ce48fb9d Connections no longer are deleted when a door closes, instead persisting until merged or a wall is built there or something. Better runtime detection, and no more searching through world for fires to process. 2012-07-26 15:33:21 -07:00
SkyMarshal
af2af9d6b2 Attempted fix for ZAS possibly crashing BYOND, removed special case for Cryo from human life as it is already handled by cryo's return_air() proc, made breathing in superheated gas burn you a wee bit. 2012-07-26 12:10:16 -07:00
SkyMarshal
c5f2df0aeb ZAS fixes. 2012-07-26 11:56:00 -07:00
CIB
23e263e851 This hopefully fixes death-cryo 2012-07-26 20:22:54 +03:00
Cael_Aislinn
be5820dd51 revert power changes, moved them to a separate branch 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-27 02:22:03 +10:00
Cael_Aislinn
ca4979313a Merge branch 'master' of github.com:caelaislinn/Baystation12 2012-07-27 02:06:33 +10:00
Cael_Aislinn
0e6939de85 multiple R-UST tweaks and slight updates. this should fix any (all?) known outstanding bugs. i also modified values to be a bit more gameplay sensible (max average output on standard operating levels is ~150-200k per gen) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-27 02:04:44 +10:00
Cael_Aislinn
c214db907a layout tweaks to rust, main change is the addition of two smaller cooling arrays. 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-27 02:02:19 +10:00
Albert Iordache
0b8a75d6f9 Players who've disabled OOC no longer hear admins 2012-07-26 15:55:04 +03:00
Albert Iordache
9187ad48d6 Because atmos techs also get two pairs of magboots now, I removed them from the steal objective list 2012-07-26 12:25:33 +03:00
Cael_Aislinn
8e9c2670be reduced smes starting power to 50% 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-26 19:23:28 +10:00
Cael_Aislinn
353396f2cc tripled default computer power usage, tripled default machinery power usage (both active and idle), doubled emp power drain, tripled SMES starting power (from 30% to 90%) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-26 18:54:46 +10:00
Albert Iordache
26c90f045c Made the rad event a bit more dangerous. 2012-07-26 01:05:49 +03:00
Albert Iordache
f5a641211f Merge pull request #1514 from SkyMarshal/master 
ZAS is now even more reliable, being capable of working properly in all situations I was able to throw at it.  Increases specific heat of all normal gases to increase sensitivity of players to heat differences.
 2012-07-25 11:33:56 -07:00
Albert Iordache
8000b92b76 Merge pull request #1518 from caelaislinn/master 
missing security cam network
 2012-07-25 11:27:44 -07:00
Albert Iordache
6b2a3531df Moved magboots from fire closets to atmos wardrobes 2012-07-25 21:26:56 +03:00
CIB
113d4c67bf Update code/modules/mob/living/parasite/meme.dm 
Meme: Dumped the cost of Thought from 150 to 50
 2012-07-25 20:33:25 +03:00