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,447 Commits 74 Branches 23 Tags
add3ed71c0892ea69e8dc22de0a74c60d0ffb27b
Commit Graph

6151 Commits

Author SHA1 Message Date
Mloc-Argent
e2e747fa0a Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev 2013-08-13 22:21:09 +01:00
meyar
551fee16eb Removes nook awps stunlock. Nerfs SAW back to where it should be, 25 damage, not 60. Fuckin' SAW. 2013-08-13 16:51:48 -04:00
meyar
e74782bbdb Unfucks pepper spray. IT ACTUALLY DOES THINGS NOW. KO spray replaced with stun/weaken. 2013-08-13 16:51:15 -04:00
Lethal Ghost
68e9e5d924 Very very old bug. 
From Russia with love
 2013-08-13 23:31:55 +06:00
Zuhayr
bbfe26bde8 Merge pull request #3503 from Mloc/master 
Fully reverts clickdelay change.
 2013-08-13 05:20:35 -07:00
Mloc-Argent
71bdaa1698 Fully reverts clickdelay change. 
It was immensely buggy with certain mobs, and server lag all but negated the benefits.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-13 13:10:09 +01:00
Segrain
3ba5c3e450 Compile fix. 2013-08-13 13:47:22 +03:00
Segrain
2de41230c9 Merge remote-tracking branch 'upstream/master' 2013-08-13 13:41:24 +03:00
Segrain
6122d50ce0 Reverting to as advertised. 2013-08-13 09:25:28 +03:00
Chinsky
52397321b2 Merge pull request #3502 from Zuhayr/master 
Compile fix.
 2013-08-12 22:36:51 -07:00
Zuhayr
b820ce2fe6 Compile fix. 2013-08-13 15:36:05 -07:00
Zuhayr
b10fe26a9e Typo fix. 2013-08-13 15:18:45 -07:00
Zuhayr
98510b3b01 Added the ability for worms to secrete useful chemicals. 2013-08-13 15:06:11 -07:00
Zuhayr
4f3f3d6eff Added vent crawl, hiding and table passing to brain slugs. 2013-08-13 14:55:29 -07:00
Zuhayr
b131d22717 Fixes Check Antagonists for Heist mode. 2013-08-13 14:26:39 -07:00
Zuhayr
254cef453a Added a preferences switch for diona. 2013-08-13 14:16:07 -07:00
Chinsky
bcb1ced44a Merge pull request #3500 from Zuhayr/master 
Borer, plantman and Heist fixes.
 2013-08-12 22:19:14 -07:00
Erthilo
1228ba8a25 Allows autoinjectors to be refilled. 2013-08-12 21:17:16 +01:00
Zuhayr
5476ae192d Attempting to reduce incidence of clickspam against mobs. 2013-08-12 22:44:57 -07:00
Zuhayr
82a4dedf5d Snowflake check for Soghun. FIX THE WHITELIST THING, HEAD. 2013-08-12 21:17:38 -07:00
Zuhayr
b3e184ad0a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-12 00:10:12 -07:00
Zuhayr
eec6c16de6 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-08-12 00:09:17 -07:00
Zuhayr
e748fdeb0c Merge pull request #3488 from Baystation12/dev-freeze 
Dev freeze
 2013-08-11 22:00:01 -07:00
Zuhayr
bcad5a787d Fixed listing of unrelated creatures when infesting. 2013-08-12 14:46:03 -07:00
Zuhayr
5ecee57a2c Fixed failure to remove borer verbs on successful resist. 2013-08-12 14:45:42 -07:00
Zuhayr
b23c685221 Borer surgery fix. 2013-08-12 13:44:51 -07:00
Zuhayr
5f0515fb50 Further borer tweaks. 2013-08-12 13:36:21 -07:00
Zuhayr
16e976035f Cortical borer fixes. 2013-08-12 11:50:14 -07:00
Segrain
eb55fb2da2 Revive fix. 2013-08-12 05:30:39 +03:00
Zuhayr
375437a6cf Changelog merge. I hate the changelog. 2013-08-12 11:20:41 -07:00
Erthilo
070cb50f8d PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too. 2013-08-11 17:13:58 +01:00
Mloc-Argent
7ba1638e11 Fixed some mob clicks. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-11 15:52:48 +01:00
Zuhayr
29ad858ed4 Fixes the weird inertia behavior of cuffed/dragged people in space. 2013-08-11 23:52:46 -07:00
Zuhayr
e04a5a6ce6 Added language name to speech. 2013-08-10 22:57:36 -07:00
Zuhayr
a8c892a938 Fixes Heist check_antag verb. 2013-08-11 14:03:46 -07:00
Zuhayr
6e81952c20 Moved language flag defines to setup.dm. 2013-08-10 21:00:32 -07:00
Zuhayr
bc4ac1d4ee Language choice changes. 2013-08-10 21:00:15 -07:00
Zuhayr
790b384669 Expanding the language list. 2013-08-10 19:39:10 -07:00
Zuhayr
69fd8da6db Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-10 18:30:27 -07:00
Zuhayr
2ce91a3fbc Commented out gold slime core reactions. 2013-08-10 18:19:41 -07:00
Zuhayr
857cce2da5 Brainloss emoting tweak. 2013-08-10 13:22:35 -07:00
Zuhayr
6c266e08e4 Fixed double worms, lowered chance of emoting. 2013-08-10 13:15:30 -07:00
Zuhayr
4c26922e7b Compile fix. 2013-08-10 12:36:23 -07:00
Zuhayr
9ee5d58ca6 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-08-10 12:24:33 -07:00
Zuhayr
23947fd2c8 Added cumulative brainloss for borer infestations. 2013-08-10 01:20:36 -07:00
Zuhayr
02d1a4740f Brainslug language translation for hosts. 2013-08-10 00:17:11 -07:00
Zuhayr
c14c74472e Additional cortex borer verbs, reproduction. 2013-08-09 19:40:43 -07:00
Chinsky
b259913e10 Merge pull request #3468 from Zuhayr/feature 
Removed hair option with missing sprite.
 2013-08-09 18:51:08 -07:00
Zuhayr
1146676491 Minor adjustment to release_control() proc. 2013-08-09 18:16:10 -07:00
Zuhayr
7aa8d00e70 Borer removal, control, release of control, host death. 2013-08-09 18:10:55 -07:00