cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,889 Commits 74 Branches 23 Tags
f7dd1b69aa7d6325935e559259a19a3f407d1d00
Commit Graph

11083 Commits

Author SHA1 Message Date
Chinsky
6a2c91196a Merge pull request #3771 from Mloc/newzasfix 
Small work on making zones wake up on geometry changes.
 2013-10-14 02:12:12 -07:00
Mloc
87037847ce Merge pull request #3773 from Aranclanos/EmitterBeams 
Duplicates the speed of the gameticker!
 2013-10-13 14:06:03 -07:00
Aranclanos
9af5c85c58 Duplicates the speed of the gameticker! 
The emtiter beams were holding back the gameticker, 0.3 seconds per beam, now the sleep() is replaced with a spawn() instead.

This will add lag due to everything being faster.
 2013-10-13 17:11:39 -03:00
Segrain
14ee1bccbb Fix for #3770. 2013-10-13 23:04:46 +03:00
Mloc-Argent
24994ec752 Small work on making zones wake up on geometry changes. 
Also added sleeping for zones with unsimulated tiles; unfortunately it probably won't happen for ages due to a dichotomy paradox.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-13 19:44:12 +01:00
Michael Johnson
e285ffd698 Fixed respawn timer issues 2013-10-13 10:35:15 -04: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
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
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
Mloc
1b9e5c81ea Merge pull request #3756 from comma/tableflip 
Tableflips & cover system
 2013-10-11 11:36:31 -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
jack-fractal
6ecab0bc36 - implementing Mloc's suggestions. 
- fixing the changelog
 2013-10-11 13:29:33 -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
Segrain
eb9a337d07 Merge remote-tracking branch 'upstream/master' into dev 2013-10-11 12:44:44 +03: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
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
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
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
Chinsky
6e07981e67 Applied Arancalos fix for firedoors, no more process for them 2013-10-10 14:14:48 +04:00
Mloc
3821fb2ab3 Merge pull request #3745 from comma/ghosts 
Fancy ghosts!
 2013-10-10 03:06:40 -07:00
Chinsky
cf69a5797d WIP coat rack 2013-10-10 13:49:42 +04:00
Chinsky
b96f9ef650 Merge pull request #3744 from Baystation12/dev-freeze 
BYOND AKBAR
 2013-10-10 02:45:45 -07:00
Mloc
c35261f0fd Much better solution to the zone geometry bug. 
Adds a unsim_check_directions var to simulated turfs, which is similar in use to air_check_directions but points to unsimulated or space tiles instead of open air tiles.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-10-10 10:25:20 +01:00
Mloc
6466d17736 Fix for ChangeTurf and update_air_properties not handling geometry changes correctly. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-10-09 12:49:50 +01:00
Chinsky
3c7c715e06 Merge pull request #3727 from fauxki/dev 
Dev - Lightswitches for Medbay / Beach Holodeck Update
 2013-10-08 21:23:42 -07:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 22:01:16 +01:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:27:39 +01:00
Chinsky
7555dd0f0b Merge branch 'master' into dev 
Conflicts:
	code/setup.dm
 2013-10-08 15:16:57 +04:00