cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 09:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,144 Commits 74 Branches 23 Tags
4bcb2a14714cbb5f03b8ed1a42ea0799d0eb03f9
Commit Graph

9292 Commits

Author SHA1 Message Date
Spamcat
4bcb2a1471 NRA Utopia. 
Comitting for Rowtree.
 2013-04-01 17:43:30 +04:00
Spamcat
866a1c5feb Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-31 21:03:43 +04:00
Asanadas
f3d605abe3 De-Culting and you! Null Rods re-receive the ability to de-cult cultists, and a tiny desc change. Holy Water also has the chance to de-cult on metabolism, but less of a chance than the null rod. Holy Water may need some balance adjustments, will watch it in the future. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2013-03-27 19:45:40 -04:00
Spamcat
3270b9cadf Spiderbots drop held items when destroyed and show them when examined. 2013-03-21 16:01:09 +04:00
Asanadas
0a21e8a4f4 Whoops spelled internal affairs wrong. This pretty much overwrites the lawyer job with an Internal Affairs Agent, made to Cajoes guidelines to the best of my ability. New suit, messed up PDA, and loyalty implanted / answering to the captain to maybe they'll have more pull on the server. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2013-03-21 02:59:29 -04:00
Christian Bielert
21de1ca08a Merge pull request #2564 from Spamcat/bleeding-edge-freeze 
BEF fixes
 2013-03-18 11:42:56 -07:00
Spamcat
1758bf8314 Fixed spiderbots grabbing items out of reach. 2013-03-18 19:54:03 +04:00
Christian Bielert
05f4aba49f Merge pull request #2560 from nan0desu/for-upstream 
Fix runtime while electrocuting slimes
 2013-03-18 08:44:41 -07:00
Spamcat
4036ee3732 Fixed dem closets. 2013-03-18 18:37:57 +04:00
Spamcat
e417ad2ec7 Fixed ghosts hearing whispers. 2013-03-18 18:03:53 +04:00
Spamcat
5e2c921933 Fixed nanopaste messages. 
(and some my shitcode)
 2013-03-18 18:01:51 +04:00
Nanodesu
83cc8a2b6c Fix typos in brain surgery 2013-03-18 13:32:13 +04:00
Nanodesu
e93e0cb0df Fix runtime while electrocuting slime 2013-03-18 13:17:45 +04:00
cib
7fbc86da5a Vendors now charge money. 
Swipe your ID card and enter PIN to pay.
 2013-03-17 15:56:43 +01:00
cib
57955dbf6a Fixed toxloss messages. 
Also added anti-spam checks to custom_pain
 2013-03-16 15:48:50 +01:00
Christian Bielert
14a96f77ab Merge pull request #2539 from comma/organ 
Organ code restructuring
 2013-03-16 07:10:40 -07:00
Chinsky
97b126b8ab Merge pull request #2516 from caelaislinn/xenoarch 
Xenoarchaeology Update
 2013-03-16 03:10:16 -07:00
cib
d1572585d8 Removed crew transfer from comms console. 
Crew transfer is meant to be OOC, not IC.
 2013-03-15 15:53:46 +01:00
cib
ae53c1e2d4 Shuttle doors now lock on transit. 2013-03-15 15:50:55 +01:00
Chinsky
8ec33904dc Moved ruptured lung effects into lung processing 2013-03-15 18:28:44 +04:00
Cael_Aislinn
435ceda41f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:37:35 +10:00
Cael_Aislinn
74d0608278 made research shuttle consoles buildable, removed a debug thing for analysis machines 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:06:22 +10:00
Cael_Aislinn
1b0c83cb76 renamed a bunch of areas, naming tweaks elsewhere, added some custom mapplaced obj definitions 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:05:27 +10:00
cib
cbc019d279 No more burning your hands off on 200C lightbulbs. 2013-03-15 00:53:50 +01:00
RavingManiac
585fed0005 Intercom canhear_range reverted to 2. 
Intercom in interrogation observation room shifted to cover the whole room.
 2013-03-15 02:19:58 +08:00
Chinsky
38a8246994 Moved code for injecting and taking blood to separate procs. 
Removed special case for blood from regent transferring proc.
Fixed humans spawning as limbles torsos.
 2013-03-14 20:18:37 +04:00
Cael_Aislinn
d8fbd0b2cc tweaked some names 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 01:09:02 +10:00
Cael_Aislinn
3c745a1ee2 added some storage boxes + gearbelt 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 01:03:01 +10:00
Cael_Aislinn
bf216021fc added/cleaned up research outpost areas (inc iconstates), moved area definitions to separate file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 01:02:23 +10:00
Christian Bielert
cd3cc0a362 Merge pull request #2531 from Jamini/bleeding-edge-freeze 
Minor changes to access.
 2013-03-14 07:00:44 -07:00
Chinsky
13b6b2f61b Moved organ and blood code to module folder. 
Moved most organ and blood procs to that folder.
Refactored handle_organs a little.
Added comments in some places.
 2013-03-14 11:52:53 +04:00
Chinsky
28290d4852 Fixes issue with 0 toxloss giving people worst pain message. 2013-03-14 08:56:13 +04:00
Chinsky
f36ebe3b9d Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-14 05:07:14 +04:00
Chinsky
f2f042c904 Merge branch 'surgery' into bleeding-edge-freeze 2013-03-14 05:06:02 +04:00
Chinsky
7ac3f65f1a Merge branch 'nanopaste' into bleeding-edge-freeze 2013-03-14 05:05:43 +04:00
Chinsky
f8ae612991 Open incisions in surgery now bleed until closed or clamped. 2013-03-14 04:23:07 +04:00
Chinsky
4c7f1f21d9 Merge pull request #2525 from CIB/feature 
Crew transfer votes now have a bias depending on how far into the round.
 2013-03-13 16:35:16 -07:00
cib
bb0ed9a2ab Toxloss now causes pain. 2013-03-13 17:04:02 +01:00
cib
3d1aa9c428 Moved the time from which crew transfer factor is > 1 up by an hour. 2013-03-13 10:58:28 +01:00
Chinsky
b906a22192 Syndicate? Whozzat? 2013-03-13 06:38:32 +04:00
Chinsky
468defbdfb Made virus crate have virus2 again. 2013-03-13 06:15:56 +04:00
Chinsky
a2e2c373ef Added new item - nanopaste. 
Researchable by RnD (materials and engineering tech), used to repair robots and robolimbs more efficiently (twice as fast and both damage types at once).
 2013-03-13 05:57:53 +04:00
Jamini
c03465882d Unbolted upload, minor modifications to atmos to make it a little more effeciant and easy to use, returned CE access to the AI core, adjusted the manifest display so Roboticists do not show twice. 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-03-12 17:52:37 -04:00
Chinsky
8eea0abef4 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-12 08:48:40 +04:00
Chinsky
564e6b2f9b Merge branch 'gun' into bleeding-edge-freeze 2013-03-12 08:46:07 +04:00
Chinsky
c351bc1a33 Getting hit by bullet will shake camera. 2013-03-12 08:43:42 +04:00
Chinsky
a4581cc1d8 Derp, accidentally deleted OD for chloral way back. 
( c4997a34f1 )
Fixed now.
 2013-03-12 08:40:47 +04:00
cib
0a37535d37 Crew transfer votes now have a bias depending on how far into the round. 
Untested so far.
 2013-03-12 02:17:53 +01:00
Chinsky
4f58416332 Merge pull request #2522 from RavingManiac/bleeding-edge-freeze 
Intercom tweaked and notice boards added
 2013-03-11 17:15:11 -07:00
Christian Bielert
817996cd09 Merge pull request #2519 from comma/bleeding-edge-freeze 
Small things and SNEAKING IN TG COMMITS.
 2013-03-11 15:54:24 -07:00