cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,810 Commits 74 Branches 23 Tags
abc2e6b96b21ff1f5514ece83fc7d19fab619e7a
Commit Graph

2912 Commits

Author SHA1 Message Date
Mloc
6e65bc2558 Merge branch 'master' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-01 21:12:43 +01:00
Mloc
dd0e13c8fd Compile fix. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-06-01 21:11:41 +01:00
Mloc
73f0b22c42 Merge branch 'master' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-01 20:34:24 +01:00
cib
af8e3a9192 Fixed the issue of missing when hitting yourself. 2013-06-01 18:11:24 +02:00
Mloc
77832af5ae Merge pull request #2940 from comma/whistle 
Whistle
 2013-06-01 07:45:56 -07:00
Chinsky
88f5a2a3b5 Added this sound as emote to borgs. 2013-06-01 17:20:13 +04:00
Chinsky
3bbb250749 Added bloody footprints. 2013-06-01 14:30:05 +04:00
Chinsky
89fff29db1 Showed that huge proc in /atom what polymorphism' is. 
Now instead of huge condition line it's handled where it was supposed to be handled.
 2013-06-01 12:24:43 +04:00
Chinsky
b2aeed8fba Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-01 08:26:43 +04:00
MisterBook
606a510168 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-31 22:58:01 -05:00
Chinsky
4794fc4d1e Merge pull request #2933 from Furlucis/master 
Fixes and tweaks for Obscure, Reveal and Seer runes, plus some amount of floundering around with git
 2013-05-31 20:09:10 -07:00
Chinsky
de4f4e4788 Merge pull request #2927 from Baystation12/master 
Merging master to BEF
 2013-05-31 19:49:13 -07:00
Chinsky
e630d11cea Merge branch 'master' into bleeding-edge-freeze 2013-06-01 04:35:30 +04:00
Chinsky
1030ddd8db Whoopsie! 
So awkward.
 2013-06-01 04:34:04 +04:00
Furlucis
0f9a1fe71c Fixes and a few tweaks to Obscure, Seer, and Reveal runes. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-05-31 19:42:27 -04:00
MisterBook
25d5600d19 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772

Attempting to merge with BEF
 2013-05-31 00:21:48 -05:00
MisterBook
06b7700086 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
 2013-05-31 00:09:00 -05:00
jupotter
0cc16379ec Do not let a mind in a posibrain if not searching 
Should fix the robot split-personality bug
 2013-05-30 13:55:44 +02:00
jupotter
73a9958f29 Do not change both key and ckey 
Changing both the key and the ckey causes issues #2856 and #2803
 2013-05-30 13:51:40 +02:00
Andrew Carroll
97836acb56 Add station time to AI, new_player Status tab 2013-05-30 04:38:18 -04:00
Mloc
4eb113341d Merge pull request #2871 from ciiol/bs-rtag 
Fix radio keys localization.
 2013-05-29 14:26:03 -07:00
Erthilo
3312490691 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-29 11:22:40 +01:00
Chinsky
40e63cbe32 Merge pull request #2885 from Ravensdale/master 
Cyborg sprites
 2013-05-28 22:17:13 -07:00
Erthilo
01ef589293 Fixes everyone being able to understand everyone else. 2013-05-28 23:53:49 +01:00
Ravensdale
62e43f2abf re-adding an accidentally deleted line 2013-05-28 12:07:22 -07:00
Ravensdale
b42aa26c1a Gives more sprites for cyborgs to use. 2013-05-28 11:13:33 -07:00
Ciiol
e7127b8343 Fix radio keys localization. 
Add cyrillic analogs of xeno language keys, just as other channel prefixes.
 2013-05-27 16:34:39 +06:00
Mloc
5f580c8417 Merge pull request #2855 from VitrescentTortoise/bleeding-edge-freeze 
Resizes lobby manifest window & Cult chant edit
 2013-05-26 14:57:33 -07:00
Mloc
420354d1dc Merge pull request #2860 from CIB/master 
Fix to event no-repetition code
 2013-05-26 11:40:42 -07:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2013-05-26 20:43:22 +02:00
Chinsky
c78f47c795 Merge branch 'bleeding-edge-freeze' into tentacles 2013-05-26 05:02:34 +04:00
Chinsky
13e2d8d793 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-26 05:02:07 +04:00
VitrescentTortoise
6f6731dab0 Resizes lobby manifest window 2013-05-25 16:53:07 -07:00
VitrescentTortoise
827e85c4c3 Properly sets husks' names to unknown 2013-05-25 16:00:22 -07:00
Erthilo
e2ea94d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-25 22:16:29 +01:00
Erthilo
4028172c98 Fixes mutantrace languages appearing as unknown for observers and also appearing as says rather than race specific word. 2013-05-25 22:09:41 +01:00
Erthilo
c2b84e0985 Fixes mutantraces (soghun, skrell, tajaran) losing languages when cloned. 2013-05-25 22:08:57 +01:00
Chinsky
e197799c46 Fixes #2830 
Applied Walter0o's fix to silicon namepicking locking up job spawn on roundstart.
 2013-05-25 13:34:24 +04:00
Chinsky
30d93bd7d2 Fixed indentation derp. 
I guess it was a dream when I saw it compiling.
 2013-05-24 01:02:52 +04:00
Chinsky
665aaea722 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into tentacles 2013-05-24 00:43:33 +04:00
Chinsky
629022f7b0 Fixes #2836 
Winners do not use space drugs.
Fixes LSD giving you an ability to escape death once.
Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death().
My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200.
 2013-05-23 15:06:37 +04:00
Chinsky
317cbd8438 Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	baystation12.dme
 2013-05-22 16:51:41 +04:00
Chinsky
1ca42d0c88 Fixed some sharp stuff not being recognized as such. 
That lead to knives bruising people you stab, for example.
 2013-05-22 12:55:15 +04:00
Chinsky
8b01f8bcc3 Finished up tentacle abominations. 
Clone damage will cause body parts to mutate.
The more damage you have, the more chance to get a sweet tentacle.
Healing works other way, the less damage you have, the more chance to unmutate it.
Healing all the damage fixes everything.
 2013-05-21 05:40:00 +04:00
Chinsky
7806915619 Added organ mutations. 
Only have sprites for humans yet.
Added is_usable() proc that checks for both limb missing or being a tentacle
 2013-05-19 17:56:29 +04:00
cib
f5b0b52b6c Added stasis bag. 
This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.
 2013-05-19 07:48:43 +02:00
cib
38cdb4d4f5 Most mobs can emote now. 
Also added CSS to say, so that you can tell apart "say" and "me say"
 2013-05-18 18:17:28 +02:00
cib
48b78ea758 Re-added latespawn. 
Used in autotraitor and RP-revolution.
 2013-05-18 11:06:19 +02:00
Mloc
5faabba7fb Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-16 12:21:55 +01:00
Spamcat
0fb651e873 Fixed glasses 
Fixes #2742
 2013-05-16 00:11:57 +04:00