cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,775 Commits 74 Branches 23 Tags
83ef93c41c8cd26d2d8b19dba4391d90bd32db33
Commit Graph

11747 Commits

Author SHA1 Message Date
Ccomp5950
83ef93c41c Merge pull request #4270 from Baystation12/master 
Merge master into Dev
 2014-01-11 18:18:03 -08:00
Mloc
df970c5d2d Merge pull request #4274 from SkyMarshal/airfixes 
Patches some logic holes in ZAS, specifically rebuilding and deletion.
 2014-01-11 11:56:43 -08:00
SkyMarshal
350c1500cf Patches some logic holes in ZAS, specifically rebuilding and deletion. Fixes #4273 2014-01-11 11:34:57 -07:00
Zuhayr
bd28c0c70b Merge pull request #4263 from Furlucis/master 
Talisman icon fix
 2014-01-11 07:54:22 -08:00
Zuhayr
2dd2ce8ed1 Merge pull request #4262 from Ccomp5950/mouse_runtime 
Runtime fix for people that jump back in their body before hitting respawn
 2014-01-11 07:53:51 -08:00
Ccomp5950
3d34567d56 Merge pull request #4269 from LightningIron/master 
Bugfixes
 2014-01-10 19:28:23 -08:00
LightningIron
b3bfc9684d Made APC modules cost 50m/50g from autolathe, on par with other engineering modules. 2014-01-10 20:58:20 -06:00
Ccomp5950
cbcd3d1468 Merge pull request #4265 from SkyMarshal/heatfix 
Heatfix
 2014-01-10 18:47:53 -08:00
LightningIron
cbd3f280af Forgot to include the /spray/ part of the chemsprayer path. 2014-01-10 20:43:27 -06:00
LightningIron
5119882536 Fixes #4286. 2014-01-10 20:36:20 -06:00
Zuhayr
adaccb3c3e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-11 10:45:57 +10:30
SkyMarshal
9cae391e0e Adds developer-level access to ZAS settings. 
Fixes bug which would always let heat move through doors.
 2014-01-10 16:48:16 -07:00
SkyMarshal
ccaef844bf Fixes derpiness with ZAS heat transfer. 2014-01-10 16:40:06 -07:00
SkyMarshal
890491da61 Fixes ZAS silliness with SoftDelete 2014-01-10 16:38:08 -07:00
Furlucis
4340e4a6b5 Talisman icon fix 
Makes talismans keep looking like talismans for more than a tick.
 2014-01-10 17:09:01 -05:00
Ccomp5950
bc6561b9e4 Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes. 
Who does that?  People that cause runtimes, that's who!

(Jerks)
 2014-01-10 15:59:40 -06:00
DJSnapshot
4219b597b6 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/customitems/item_defines.dm
 2014-01-10 13:52:07 -08:00
Mloc
6f01e97161 Merge pull request #4248 from Zuhayr/dev 
Dionaea changes (microwave recipe, holder procs) and resist verb.
 2014-01-10 13:47:46 -08:00
Mloc
efa5a600e3 Merge pull request #4252 from RKF45/ears 
Tiny objects on ears
 2014-01-10 13:47:10 -08:00
DJSnapshot
e524d2112f Merge pull request #4244 from LightningIron/master 
Ninja bugfixes/minor code cleaning/energy cost changes
 2014-01-10 13:42:42 -08:00
DJSnapshot
46c6145cf7 Made it so asay is not the same color as adminlogs. 2014-01-10 13:39:40 -08:00
DJSnapshot
f911f84bbd Replaces modwho and adminwho with staffwho. 
(Also, stealthfix.)
 2014-01-10 12:49:32 -08:00
Mloc-Argent
4c1e17649e Merge remote-tracking branch 'upstream/master' into dev 2014-01-10 20:07:47 +00:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist 
[TG] Optimized and refactored list2text, text2list, and replacetext.
 2014-01-10 11:55:33 -08:00
Zuhayr
38f47f5ae1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-10 21:27:15 +10:30
Zuhayr
65e6a79946 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-10 21:26:47 +10:30
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff 
[TG] Lots of small (and maybe not so small) changes from tg.
 2014-01-09 22:33:28 -08:00
Ccomp5950
2b57605738 Merge pull request #4253 from SkyMarshal/mining 
Fix for mining.
 2014-01-09 17:22:12 -08:00
SkyMarshal
8885ad630e Fix for mining. 
Fixes #4249
 2014-01-09 17:26:13 -07:00
RKF45
16cc421e34 Tiny objects on ears 2014-01-09 23:45:08 +01:00
DJSnapshot
418a4b3631 Merge pull request #4247 from Zuhayr/master 
Cryostorage fixes.
 2014-01-09 14:39:08 -08:00
RKF45
c47be94b42 Removes braindeath as IC term 2014-01-09 21:49:21 +01:00
Zuhayr
906768070f Resolved custom_items.dmi. 2014-01-10 04:15:21 +10:30
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
LightningIron
2c1f721749 Fixes #4221. 2014-01-09 11:37:48 -06:00
LightningIron
8c26c23157 Merge remote-tracking branch 'upstream/master' 2014-01-09 11:15:26 -06:00
Zuhayr
d3d6294ab0 Compile fix, ugh. 2014-01-10 03:07:17 +10:30
Zuhayr
331dd3e286 Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob. 2014-01-10 01:58:22 +10:30
Zuhayr
f311177654 Changed world loop to all_objective loop in cryopod check. Added all_objective add/remove procs to datum/objective. 2014-01-10 01:24:24 +10:30
Zuhayr
f23bb5e1fd Roasted diona, for ZomgPonies/Paradise. 2014-01-10 00:26:23 +10:30
Zuhayr
bef27e5bac Dionaea (or anything using a holder) can now be microwaved. Mmm-mm. 2014-01-10 00:07:26 +10:30
Zuhayr
35d8219bb6 Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine. 2014-01-09 23:57:20 +10:30
Zuhayr
f51c44cee9 Typo and compile fix. 2014-01-09 23:56:14 +10:30
Zuhayr
943554242a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-09 23:53:34 +10:30
Zuhayr
a81fd94db1 Objectives will now updated when the target enters cryostorage. 2014-01-09 22:59:16 +10:30
Zuhayr
54015ccdf4 Fixes some items remaining after the pod procs. 2014-01-09 22:06:26 +10:30
Zuhayr
70fe0e02cd Merge pull request #4245 from SkyMarshal/airfixes 
Lots of bugfixes.
 2014-01-09 02:47:20 -08:00
YotaXP
c6d820b04f Fixed a major bug. Improved speed further. 2014-01-09 10:25:48 +00:00
ZomgPonies
09c56a0930 BS12 compile fixes for Constructs 2014-01-09 04:49:16 -05:00
ZomgPonies
7829c13c36 Typo compile fix 2014-01-09 04:46:27 -05:00