Commit Graph

5627 Commits

Author SHA1 Message Date
Ispil
4c1bb073ff Fixes issue #2872, partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way. 2013-07-04 04:55:24 -07:00
Mloc-Argent
cf4bd39f6e Updated the linkage between the NanoTrasen IRC bot and the server.
- Server will now send adminhelps to the admin channel, with information if there is no admins online.
- Server will inform the admin channel if the last admin online logs out.
- When a round ends, the server will alert the main channel, supplying some statistics.
Additionally, laid the groundwork for an external scripts system.
This is fully configurable/togglable in the config.txt file.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-02 23:41:40 +01:00
Segrain
31e4487229 Fix for #2430. 2013-06-27 14:10:05 +03:00
Zuhayr
b41e92dc01 Fixes #2870 2013-06-27 07:01:42 -07:00
Zuhayr
2265e8e0b9 Fixes #2815 2013-06-24 21:55:21 -07:00
SkyMarshal
702fea234a Forgot the files, doh! 2013-06-23 19:53:59 -07:00
SkyMarshal
6d2b9882e4 ZAS fixes, implements multi-tile doors (That work perfectly!)
That multi-tile firedoor needs love.  Lots of love. (It is missing a lot of icon states)
2013-06-23 19:49:42 -07:00
Zuhayr
f77d208d04 Fixes #3131 2013-06-22 22:19:52 -07:00
Zuhayr
be16c8eff3 Fixes #2957 2013-06-22 20:07:21 -07:00
Zuhayr
f59faa04a0 Fixes #3125 2013-06-22 17:50:18 -07:00
Zuhayr
476c8f2fcd Fix for destroying alien walls with your bare hands. 2013-06-21 19:03:12 -07:00
Zuhayr
afece7e56e Fixes #3118 2013-06-21 15:07:31 -07:00
Zuhayr
d0267a07d2 Fixes #3106 2013-06-21 06:43:24 -07:00
Spamcat
654a83be9d Quickfix for INFINIMEAT. 2013-06-20 18:13:18 +04:00
SkyMarshal
453c0c741c Air alarm improvements. Adds Central Atmos Control and a buffer between server room and station.
Fixes #3074
Fixes #3069
Fixes #2909
2013-06-17 15:56:57 -07:00
Chinsky
e638540b4c Merge pull request #3041 from meyar/master
Emergency map fix: Security escape pod
2013-06-11 12:29:41 -07:00
meyar
f03f8c9b66 Disables debug(poorly made debug) verb for ERT. This -may- be behind my BEF fix, but I suck at git and can't exclude this because I am dumb :c 2013-06-11 15:25:59 -04:00
Chinsky
09d0bb7f8e Merge pull request #3039 from Furlucis/master
Typo fixes
2013-06-11 12:21:16 -07:00
Spamcat
076f4c9d9a Figured I should finally commit it, since exams are over now~
Radios start off by default. Should decrease the amount of tcomm lag.
2013-06-11 23:09:44 +04:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...")
Signed-off-by: Furlucis <Logman115@gmail.com>
2013-06-11 15:01:48 -04:00
meyar
38feb46839 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-11 15:00:22 -04:00
Chinsky
6dc2d9d2dc Merge pull request #3015 from comma/master
Fix
2013-06-10 11:50:50 -07:00
Chinsky
0f9b53ef09 Merge pull request #3016 from NicholasDV/tweaksAndFixes
Tweaks and fixes
2013-06-10 02:39:40 -07:00
Zuhayr
bc2db268cc Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning. 2013-06-10 17:16:54 -07:00
Zuhayr
38b44b2441 Items for wizard den, mental focus added to spellbook. 2013-06-10 14:56:47 -07:00
Zuhayr
85b945cfbf Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-10 14:42:46 -07:00
Chinsky
b50216cec6 Fixes #3017
Looks like will have to put speshul check back...
2013-06-09 19:54:43 +04:00
Chinsky
eaf6b64277 Compile fix. 2013-06-09 19:53:08 +04:00
NicholasDV
adde619a06 Fixes an issue in grammar!
Specifically, the way that it was coded made it so that the word
the would appear twice. There... really wasn't a way to fix that
in a way that would effect a lot more things, that I could find.
As a result, I simply reworded it so that it can work with or without
the word, 'the'.

closes #2771
2013-06-09 03:40:27 -04:00
Segrain
673f3ddb37 Fix for ordering hidden supplypacks. 2013-06-09 10:25:27 +03:00
meyar
128326ad1f Fixes Spec Op shuttle to old behavior (Pure port, no changes) 2013-06-09 01:03:09 -04:00
meyar
5e4b9ae917 Fixes autonomous ERT 2013-06-09 01:02:48 -04:00
cib
8c6b8add20 Weights the likelihood of command positions by your age.
For most head positions, a good age is between 25 and 60, with ages towards the middle of that being even better. 25 because I figure for stuff like research, engineer etc. they'll want someone with fresh knowledge. Captain's best age starts at 35 though, due to that being an "old geezer job".
2013-06-09 01:13:13 +02:00
Chinsky
7b0c4c85e8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
2013-06-08 07:59:57 +04:00
Chinsky
e40140be03 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
2013-06-08 05:55:42 +04:00
Chinsky
4118d183c1 No fun allowed.
Fixes some hilarious stool glitches.
2013-06-08 05:27:32 +04:00
Chinsky
76d1ddaa26 Merge pull request #2963 from Ravensdale/master
Robot bug fix, synthetic custom sprites update and a rune text tweak
2013-06-07 04:45:00 -07:00
jack-fractal
29bffb0c20 Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	html/changelog.html
2013-06-06 21:32:08 -04:00
jack-fractal
17b8a2dc8a - reverting a change I hadn't accounted for to the luminosity of the PDA's flashlight 2013-06-06 20:50:22 -04:00
jack-fractal
f4441b5019 refactoring the Stat function for silicon lifeforms
adding messenger functions to cyborgs and refactoring the AI's IM system
2013-06-06 20:46:46 -04:00
Chinsky
466f930e63 Merge pull request #2982 from Zuhayr/master
Vox icons, stuff from master.
2013-06-06 02:35:49 -07:00
Zuhayr
df75d25cb3 Map conflict, using BEF. 2013-06-06 10:40:22 +09:30
MisterBook
eab6f4fc44 Taser fix v.3.2
Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
2013-06-05 19:37:29 -05:00
Segrain
65893426ba Bumping into firelocks in exosuit. 2013-06-05 21:02:25 +03:00
Chinsky
57c1ebb285 Merge pull request #2977 from MagmaRam/master
Fix for security belts not holding all seven items sometimes
2013-06-05 06:21:47 -07:00
MagmaRam
ae697179c9 Fix for security belts not holding all seven items if the total combined w_class of the items is over 14. They should now be able to hold seven of any items that fit in them. 2013-06-05 20:14:11 +07:00
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
meyar
11ae345509 Nerfs the PDA flashlight to make the ACTUAL flashlight a viable option. 2013-06-04 18:34:43 -04:00
Spamcat
c5a57ccdc4 Runtime fixes, tweaks. 2013-06-04 16:25:41 +04:00
Spamcat
b15738d5d4 Compile fixes. 2013-06-04 15:17:04 +04:00