cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 02:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,953 Commits 74 Branches 23 Tags
ced88e1569faa090b99eaf0bb241890c7e144344
Commit Graph

5069 Commits

Author SHA1 Message Date
Chinsky
ced88e1569 Ported HUD functionality. 
Sec HUDs showing brief of sec record.
Med HUDs changing status and showing brief of med record.
 2013-03-11 01:11:56 +04:00
Chinsky
611bd1c6e9 Removed ability to use radio while stunned again. 2013-03-11 00:38:16 +04:00
Chinsky
e60bef91bd Added indication for when someone speaks into radio. 2013-03-11 00:27:18 +04:00
ericgfwong@hotmail.com
6ac93ddd4d Added new descriptions to each of the rigs and gave them unique armor values. 
Medical PDAs should now have a green stripe

Fixed a misplaced /area/ issue in the Warden's office

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@5602 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-03-09 07:43:04 +04:00
Asanadas
4720f4f1ac SYNDICATE? WHAT SYNDICATE? 2013-03-06 18:14:27 -05:00
Asanadas
b82070ecd8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-06 18:10:47 -05:00
Christian Bielert
12215c588f Merge pull request #2483 from RavingManiac/bleeding-edge-freeze 
Syringestabbing
 2013-03-06 02:00:32 -08:00
Christian Bielert
f6efab34e0 Merge pull request #2479 from caelaislinn/bleeding-edge-freeze 
RUST updates, other
 2013-03-06 00:56:20 -08:00
RavingManiac
33d5e0944c Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-06 14:43:09 +08:00
Nanodesu
104cc5585d roro to slime fix 2013-03-06 05:59:21 +04:00
RavingManiac
c18999957f You can now stab people with syringes. This destroys the syringe, deals 7 brute damage and injects a random percentage of the syringe's contents into the target. 
Syringestabbing is blocked by shields. Armor on the targeted body part has a 50% chance of deflecting the syringe unless you are stabbing yourself.
 2013-03-06 00:39:29 +08:00
Cael_Aislinn
72ecd516c5 dropped grid check duration 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:45:26 +10:00
Cael_Aislinn
92517638bc removed double announcement for grid checks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:31:40 +10:00
Cael_Aislinn
c5f461e90d circulators and type 1 gens are now rotateable/moveable, also made the operation of gens/circs much more generalised to allow for greater flexibility in setup (this makes type 2 gens incompatible with the circs, but i'll update them later) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:28:57 +10:00
Cael_Aislinn
2933069ebe Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:23:16 +10:00
Cael_Aislinn
6f9542cd10 removed debug output for type 2 TEGs 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:06:43 +10:00
Cael_Aislinn
e511bf954e fixed icon + useability + construction issues for misc rust components, removed debug output for TEGs, made injectors no longer directwired 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:23:59 +10:00
cib
b25a6cb9bb Typofix 2013-03-05 04:25:21 +01:00
cib
aa4deb2b89 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 2013-03-04 12:20:38 +01:00
cib
65b8eafe8e Added internal organs. 
They can be hurt by their parent organ getting hurt.

Ruptured lungs are now represented as damage to the lungs internal organ.
 2013-03-04 12:19:12 +01:00
Zuhayr
6c15bb5bfa Forgot to update the emag code so that the bots explode. 2013-03-04 04:14:44 -08:00
Zuhayr
810c9bea70 Added verbs to spiderbot, tweaked access. 2013-03-04 03:26:52 -08:00
Christian Bielert
65ff5dc7f9 Merge pull request #2460 from Gamerofthegame/bleeding-edge-freeze 
Medical hardsuit changes
 2013-03-01 16:07:00 -08:00
Christian Bielert
a211b493c8 Merge pull request #2465 from Zuhayr/bleeding-edge-freeze 
Spiderbots and a bunch of commits from master.
 2013-03-01 16:05:17 -08:00
Zuhayr
3774b16839 Made spiderbots buildable, animated spiderbot sprites. 2013-03-02 02:15:39 -08:00
Zuhayr
ad47e954ce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:19 -08:00
Zuhayr
e17038636f Added spiderbots! Adminspawn only currently. They take an occupied MMI or posibrain, can crawl through vents and hide, shock people, and go 'beep'. 2013-03-01 14:28:58 -08:00
Jim "Apples"
2064f57dc0 Merge pull request #2464 from caelaislinn/bleeding-edge-freeze 
added an admin proc to check for any inactive players with custom items
 2013-03-01 07:22:21 -08:00
Zuhayr
15984f6a14 Fix for posibrains, modification to posibrain brainmob for admin use, updated posibrain sprites, addition of spiderbot sprites for a later project. 2013-03-01 01:38:32 -08:00
Cael_Aislinn
30a34bbc9f added an admin proc to check for any inactive players with custom items 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 19:15:27 +10:00
Spamcat
c9e657a4c6 Reloading spent casings in the revolver doesn't duplicate "This one is spent" message 
Fixed #2434.
 2013-02-28 17:07:20 +04:00
Spamcat
9894ce73d5 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-28 13:48:44 +04:00
Spamcat
c4c31fd657 You can now switch off cameras. 
Fixes #2394.
 2013-02-28 13:46:56 +04:00
Gamerofthegame
a2cfc456c0 Removes Medical's random slowdown and faulty coding. 2013-02-27 22:07:30 -05:00
Gamerofthegame
f3ba4e4ec6 Opens the ERT debug-command preset for actual use. 2013-02-26 21:25:48 -05:00
RavingManiac
e84d739fac Condensed capsaicin effects increased to pre-merge levels. 2013-02-26 12:58:44 +08:00
Christian Bielert
80b9257332 Merge pull request #2446 from Baystation12/BEF-staging 
Bef staging
 2013-02-25 09:58:25 -08:00
Chinsky
b143022084 Merge pull request #2445 from CIB/feature 
Fixed anti-depressants
 2013-02-25 09:44:18 -08:00
cib
19e176e2ff Fixed paroxetine. 2013-02-25 18:40:42 +01:00
cib
f2f2ce12ea Fixed citalopram. 2013-02-25 18:39:20 +01:00
Cael_Aislinn
cfa3916b95 new events (pda spam, trivial and mundane news items, lotto, hacker) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-26 03:02:24 +10:00
Chinsky
97b547d5d3 Merge pull request #2440 from Zuhayr/master 
Robot changes, Set Flavour verb.
 2013-02-25 01:19:08 -08:00
Zuhayr
36038d150c Returned Set Flavour Text to humans, added Set Pose and Set Flavour Text to robots. 2013-02-25 20:05:33 -08:00
Zuhayr
2381aa2dca Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain. 2013-02-25 19:48:00 -08:00
Cael_Aislinn
09dc10810f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-25 14:02:55 +10:00
Cael_Aislinn
fad9909b78 mice dont wander when asleep, they also snuffle (snore) occasionally 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:45:38 +10:00
Cael_Aislinn
fed198964f fixed ooc runtime, removed random space in adminpms, removed forced disabling of stat tracking >.> 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:45:13 +10:00
cib
721f15fb07 Fix issue #2433 
This should fix events not spawning.
 2013-02-24 20:39:36 +01:00
cib
975407edb4 Forgot antidepressants file. 2013-02-24 17:37:34 +01:00
Chinsky
83fdf57540 Merge branch 'feature' of https://github.com/CIB/Baystation12 into cibderp 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-02-24 20:29:59 +04:00