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
14,682 Commits 74 Branches 23 Tags
14ee1bccbb12bf9c85e859df1cf5ac2a328ae10c
Commit Graph

14682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Segrain
14ee1bccbb Fix for #3770. 2013-10-13 23:04:46 +03:00
Chinsky
a12366c83d Merge pull request #3765 from Segrain/dev 
Dev bugfixes.
 2013-10-13 04:45:03 -07:00
Segrain
21718c5bac Fix for #3764. 2013-10-13 03:44:43 +03:00
Segrain
bcba722bbd Fix for #3763. 2013-10-13 03:44:17 +03:00
Segrain
f725215857 Missing verbs. 2013-10-13 03:43:06 +03:00
Segrain
da0716adb3 Merge remote-tracking branch 'upstream/master' into dev 2013-10-13 03:33:26 +03:00
Mloc
8daadf7385 Merge pull request #3762 from Segrain/master 
Small mechafix.
 2013-10-12 11:56:51 -07:00
Segrain
f2bbc60d51 Order fix. 2013-10-12 21:19:54 +03:00
Segrain
b39dfc5229 Smallfix. 2013-10-12 19:49:29 +03:00
Mloc
5e4f389e6f Merge pull request #3725 from comma/lockdown 
Lockdown
 2013-10-12 06:46:36 -07:00
Mloc
4867a9e89a Merge pull request #3761 from Segrain/master 
Mecha bugfixes.
 2013-10-12 04:26:17 -07:00
Segrain
77748f1116 Mecha weapons. 2013-10-12 14:41:24 +03:00
Segrain
34a6735ef8 ERT mecha beacons. 2013-10-12 14:31:12 +03:00
Chinsky
fb0fb4da6a Merge pull request #3759 from Baystation12/dev-freeze 
freeze -> dev
 2013-10-11 11:41:06 -07:00
Chinsky
46601a6efa Merge pull request #3758 from Baystation12/master 
master -> freeze
 2013-10-11 11:40:17 -07:00
Mloc
1b9e5c81ea Merge pull request #3756 from comma/tableflip 
Tableflips & cover system
 2013-10-11 11:36:31 -07:00
Mloc
23793b2c74 Merge pull request #3757 from comma/coathanger 
Coat rack
 2013-10-11 11:35:16 -07:00
Chinsky
01512e571b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into lockdown 
Conflicts:
	code/game/machinery/doors/firedoor.dm
 2013-10-11 22:29:59 +04:00
Chinsky
05bb07375e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into coathanger 2013-10-11 22:22:08 +04:00
Chinsky
a18fbaac1d Cover system. 
Tables now give some cover from bullets and beams.
Standing behind the table gives you 20% chance of table taking the hit instead.
Flipped table gives +20%, but only if bullet comes from the side it faces. Otherwise no cover is provided at all.
Lying on the floor gives +20%.

Table takes half of damage human would, and breaks down after its health goes to zero.
Reinforced talbes have double the health, wooden ones - half.
 2013-10-11 22:17:45 +04:00
Mloc
a585114cd7 Merge pull request #3755 from Kilakk/master 
Fixes #3753, the fax machine no longer turns invisible when dragged around
 2013-10-11 10:31:49 -07:00
Mloc
de60181934 Merge pull request #3754 from jack-fractal/master 
Fixing changeling stasis power and admin healing effect to heal organ damage
 2013-10-11 10:31:39 -07:00
jack-fractal
6ecab0bc36 - implementing Mloc's suggestions. 
- fixing the changelog
 2013-10-11 13:29:33 -04:00
Kilakk
dc7f8a1ec4 Fixes #3753 2013-10-11 12:46:08 -04:00
jack-fractal
32c3f27675 * adding a 'rejuvinate' function to organs that fixes all types of damage 
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
 2013-10-11 12:39:54 -04:00
Mloc
9a3d6ac129 Merge pull request #3752 from Segrain/dev 
Dev map.
 2013-10-11 05:32:09 -07:00
Segrain
eb9a337d07 Merge remote-tracking branch 'upstream/master' into dev 2013-10-11 12:44:44 +03:00
Segrain
81cf97c105 New sprite. 2013-10-11 12:43:22 +03:00
Segrain
1127e9d8ac Postmerge mapfix. 2013-10-11 12:30:30 +03:00
Chinsky
973dc25fda Merge pull request #3749 from Segrain/master 
Smallfixes.
 2013-10-11 00:16:46 -07:00
Segrain
367c1cf4f4 Better check. 2013-10-11 11:10:27 +03:00
Segrain
3d6791df81 Fix for pockets. 2013-10-11 10:22:58 +03:00
Segrain
775d723f68 Typecheck. 2013-10-11 10:21:14 +03:00
Segrain
7ea98f6d79 Examining fix. 2013-10-11 10:19:58 +03:00
Segrain
464fc22fa5 Missing verb. 2013-10-11 10:18:43 +03:00
Segrain
17f38e109d Missing language. 2013-10-11 10:16:46 +03:00
Segrain
8be67352ea Typo fix. 2013-10-11 10:16:00 +03:00
Segrain
a4793fd208 Typo fix. 2013-10-11 10:08:04 +03:00
Chinsky
fadc121dac Can flip weakened reinforced table now too. 2013-10-11 10:52:24 +04:00
Chinsky
2416cccf48 Merge pull request #3750 from Baystation12/master 
Master -> Dev-freeze
 2013-10-10 23:42:20 -07:00
Chinsky
c30693dfcf Flipped tables now have 20% chance to take damage instead of whatever is behind them. 2013-10-11 02:48:41 +04:00
Chinsky
daba423428 Tableflips! 
You can now flip non-reinforced straight, 1-tile wide tables.
Complete with ugly codersprites for flipped tables.
 2013-10-11 02:13:59 +04:00
Chinsky
e1d2dd4aa1 Coat racks. Can hold either labcoat or detective coat. 2013-10-10 15:33:02 +04:00
Chinsky
2cf2031dcd Merge branch 'master' into coathanger 2013-10-10 14:58:13 +04:00
Mloc
5d9764e7cc Merge pull request #3747 from comma/master 
Applied Arancalos fix for firedoors, no more process for them
 2013-10-10 03:48:20 -07:00
Chinsky
032d69742f Derp 2013-10-10 14:46:22 +04:00
Chinsky
b78141e413 Merge branch 'dev' into coathanger 2013-10-10 14:42:42 +04:00
Chinsky
a24d8938c5 Merge pull request #3748 from comma/dev 
Merged dev-freeze into dev
 2013-10-10 03:39:25 -07:00
Chinsky
29ea7f0d3a Merge branch 'dev-freeze' into dev 
Conflicts:
	html/changelog.html
	maps/tgstation2.dmm
 2013-10-10 14:37:41 +04:00
Chinsky
7f62dfc5b1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/robot.dm
	code/setup.dm
 2013-10-10 14:30:34 +04:00