Commit Graph
10155 Commits
Author SHA1 Message Date
Mloc-Argent eef12bf252 Fixes #3324.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-21 15:03:49 +01:00
Mloc 2288dc8abf Merge pull request #3318 from SkyMarshal/airfixes
Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring.
2013-07-14 16:12:53 -07:00
SkyMarshal 46f808edf4 Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring. Should still be verified on the live server before considered resolved. 2013-07-14 16:09:30 -07:00
Zuhayr 07b9c30354 Vox raid spawn fixes. 2013-07-13 16:23:13 -07:00
Zuhayr 7faf895563 Robots will now spawn fully equipped. 2013-07-13 04:35:50 -07:00
Zuhayr dbe4838d40 Purging the toddler as Lord Mloc commands. 2013-07-13 04:34:09 -07:00
Zuhayr 71f36969b8 Robot health buffs, addition of armour component. 2013-07-13 04:33:48 -07:00
Mloc 1af9a7bc60 Git, I shall never understand thee. Oh well. 2013-07-12 15:20:49 +01:00
Mloc-Argent b5c63c2a66 I have honestly no idea what happened there. Fucking git.
This reverts commit a2fddc0fc1.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-12 13:31:26 +01:00
Mloc-Argent c6a9bbc9fc Properly reverts Kida. (what a mess)
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-12 12:48:07 +01:00
Mloc-Argent 66a8536c94 Revert "Adds in the icon files for Kidan and fixes issue"
This reverts commit 9139a70d8c.
2013-07-12 12:22:58 +01:00
Mloc-Argent cf53dd7a10 Revert "Adds in the Kida"
This reverts commit a2fddc0fc1.
2013-07-12 12:22:35 +01:00
Zuhayr 6a714f3613 Merge pull request #3300 from Spamcat/master
meatfix revert
2013-07-12 01:26:34 -07:00
Spamcat c27f3efb8e Merge branch 'master' of github.com:Baystation12/Baystation12 2013-07-12 03:06:41 +04:00
Spamcat 4ceb12bb1c Revert "Quickfix for INFINIMEAT."
This reverts commit 654a83be9d.
2013-07-12 03:03:46 +04:00
Segrain b5b58e5ebe Runtime error fix. 2013-07-12 00:00:59 +03:00
Segrain f7b22fa911 Quickfix. 2013-07-11 23:14:56 +03:00
Cael_Aislinn e4b4486768 added a spawning guide to EFTPOS devices
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-07-12 03:40:38 +10:00
Cael_Aislinn 4421bede17 moved money accounts into a global list + removed db syncing (some procs could be global but left where they are for convenience), fixed an issue with latejoiners having no account, fixed a runtime
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-07-12 03:40:06 +10:00
Chinsky 67cc13751a Derp. 2013-07-11 02:09:01 +04:00
Mloc e820e28f78 Merge pull request #3292 from comma/master
Fixes
2013-07-10 14:36:32 -07:00
comma 47c6901df3 Fixes #3018
Should stop intercept report from trying to tell that wizards, ninjas and nuke operatives are trending to be crew members ( they are not ).
2013-07-11 01:30:16 +04:00
comma 81e22ea270 Fixes wires on air alarm not displaying cut status properly.
Fixes #3087
2013-07-11 00:59:44 +04:00
comma c791208efc Made deconstruction/construction possible. Added hints ot examine since icon is same during whole process. 2013-07-11 00:18:03 +04:00
Spamcat 10b0ef11ab Fixed #3290.
<_< you saw nothing >_>
2013-07-10 22:58:23 +04:00
comma 45e775f5e9 Standardized proc definitions in alarm code. 2013-07-10 22:49:10 +04:00
comma f1cfb96dab Fixes #3225. Adds separate toggle for LOOC.
Fixes #3285. Changes way hearers are found, so it includes pAIs now.
Also adds (R) in front of LOOC messages that are sent by mobs not in view, for admins/mods, since it's quite disorienting.
2013-07-10 22:39:27 +04:00
Spamcat fc294110cc Merge branch 'master' of github.com:Baystation12/Baystation12 2013-07-10 20:55:42 +04:00
Zuhayr a8a474bca9 Changed combat module to VV only pending rebalancing. 2013-07-10 07:20:06 -07:00
Segrain 21ac3e5954 Fix for #3286. 2013-07-09 21:08:31 +03:00
Segrain 46df500cd4 Fix for #3166. 2013-07-09 19:37:17 +03:00
Segrain a3d2a1e70f Fix for #3281. 2013-07-09 17:17:55 +03:00
Spamcat aa1310a44f Fixed a potential runtime and removed buggy mobs from gold slime's spawn list as per raven's request. 2013-07-09 13:40:04 +04:00
Segrain c5a1a69b5b Stealth/invisibility tweaks. 2013-07-09 05:06:29 +03:00
Segrain 14dbcad07d HUDs and visibility. 2013-07-09 04:53:34 +03:00
Segrain 72588c8c61 MedHUDs and virus2. 2013-07-09 04:51:09 +03:00
Mloc-Argent 75c8f6d76a Merge branch 'BEF-staging' 2013-07-08 23:28:22 +01:00
Chinsky 31fc09567f Merge pull request #3264 from Mloc/master
Small fixes
2013-07-06 14:59:13 -07:00
Zuhayr 78653b3175 Removes visible tallies from votes. 2013-07-07 02:42:28 -07:00
Zuhayr e9210b0701 Removed jobbanned and random pick drafting in understaffed modes, and implements voter-based forcedrafting. 2013-07-07 02:28:34 -07:00
Mloc-Argent 3ce4e2ad17 Fixes #2559
Changes Add-Note and Notes verb to be under the IC category, instead of OOC.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-06 22:20:13 +01:00
Mloc-Argent 94af89d0a2 Fixes #2091
Adds missing topic() code for page selection on player notes, properly alphabeticalizes.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-06 22:16:01 +01:00
Zuhayr b84697055f Embedded item string fix. 2013-07-07 00:07:18 -07:00
Zuhayr 587b2d8f24 Cyborg sprite selection fix. 2013-07-07 00:00:25 -07:00
Zuhayr ad07f5e9e5 Added procs for a custom item that were overlooked. 2013-07-06 23:53:59 -07:00
Zuhayr ee560d43da Allowed ties to use mask sprites if equipped to the face, for accessories like lockets. 2013-07-06 23:53:24 -07:00
Zuhayr 9a2ce35199 Commenting out ninja mode, as it is broken. 2013-07-06 21:53:11 -07:00
Segrain 82c3e6aa8c Fix for #3255. 2013-07-06 16:51:59 +03:00
Segrain 6804cf0518 Fix for #3254. 2013-07-06 16:50:01 +03:00
LordBraindeadandMloc-Argent 6f0ebc1bb5 changed how fire works
-fire switched to release energy by burning fuel and generating heat from that
- reorganzied the fire process in a saner manner
2013-07-05 19:56:53 +01:00