Commit Graph

5780 Commits

Author SHA1 Message Date
Segrain
c2712dd9d3 Fix for #3410. 2013-08-01 20:58:35 +03:00
Segrain
8021250804 Type mismatch fix. 2013-07-31 10:32:19 +03:00
Erthilo
89ffc92168 Fixes text errors in ghost manifest runes and newscasters with apostrophes. 2013-07-30 22:36:42 +01:00
Erthilo
9bbf43407f Fixes Gravitational Catapult not detaching. 2013-07-30 20:06:37 +01:00
Segrain
24bc26fd13 Fix for table/computer cross-detection. 2013-07-30 19:13:42 +03:00
meyar
1498c5748e Camera's got lost in the shuffle. 2013-07-29 04:34:28 -04:00
meyar
de0c032486 Turns two ERT files into one. Also fixes the ERT admin button being bork. 2013-07-29 03:45:49 -04:00
Zuhayr
c09d07bb82 Added tool steps to manually remove the bolts on a deployed nuclear weapon. 2013-07-27 00:09:19 -07:00
Segrain
85f82219ba Fix for #3345. 2013-07-25 03:03:14 +03:00
Zuhayr
15f0853ea2 Merge pull request #3331 from BcTpe4HbIu/airalarm_fix
Airalarm fix
2013-07-22 04:04:00 -07:00
Igor Golubkov
3889716dd6 Fix Issue #3327 2013-07-22 10:26:48 +04:00
Mloc-Argent
c135d19b66 Partial fix for #2284.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-21 17:05:10 +01:00
Mloc-Argent
eef12bf252 Fixes #3324.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-21 15:03:49 +01:00
Zuhayr
dbe4838d40 Purging the toddler as Lord Mloc commands. 2013-07-13 04:34:09 -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
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
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
Segrain
46df500cd4 Fix for #3166. 2013-07-09 19:37:17 +03:00
Segrain
c5a1a69b5b Stealth/invisibility tweaks. 2013-07-09 05:06:29 +03:00
Segrain
72588c8c61 MedHUDs and virus2. 2013-07-09 04:51:09 +03: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
Zuhayr
9a2ce35199 Commenting out ninja mode, as it is broken. 2013-07-06 21:53:11 -07:00
LordBraindead
ff912e132b readjusted composition of syndie bombs
set them to produce a 1-2-5 explosion for the fire changes
2013-07-05 19:55:28 +01:00
Zuhayr
8f596f5fc1 Air alarm runtime fix. 2013-07-05 22:32:37 -07:00
Zuhayr
d04514e9ad Partial fix for #3087 2013-07-05 17:04:08 -07:00
Zuhayr
a1be7e431c Merge pull request #3245 from Zuhayr/feature
SkyMarshal's ZAS fixes from bef.
2013-07-04 23:14:04 -07:00
Zuhayr
dba4eb5eb2 Merge branch 'airfixes' of https://www.github.com/SkyMarshal/Baystation12 2013-07-05 16:14:38 -07:00
Zuhayr
15de508b49 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-04 23:29:48 -07:00
Zuhayr
1750f1e631 Merge pull request #3244 from Ispil/Staging
Fixes issue #3240. The order for visible_message is visible, person, aud...
2013-07-04 23:09:44 -07:00
Ispil
255408c026 Fixes issue #3240. The order for visible_message is visible, person, audible. Here, visible and person were reversed. 2013-07-04 21:13:33 -07:00
SkyMarshal
efd3d83e78 Reverts my firechanges, also air alarms now have a temperature regulation capacity. 2013-07-04 20:55:59 -07:00
Zuhayr
2c6e0e2bcc Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-07-04 20:32:24 -07:00
SkyMarshal
87f576fb64 ZAS and alarm fixes. 2013-07-04 20:22:19 -07:00
Zuhayr
681fcb2881 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-07-04 15:26:06 -07:00
Zuhayr
db650d3757 Config merge. 2013-07-04 14:39:46 -07:00
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
Zuhayr
a90fd2b4bb Merge pull request #3233 from Ispil/Bleeding-Edge-Freeze
Removes the ability to create anything HONK-related in the mech fabricat...
2013-07-04 00:36:51 -07:00
Ispil
8c6c03c9d6 Removes the ability to create anything HONK-related in the mech fabricator. Also removes the ability to add bananium, due to it thus being pointless to add due to the one thing it can build being removed. Note that everything is commented out, not deleted. 2013-07-04 00:28:40 -07:00
Zuhayr
b4695d3d74 Merge pull request #3232 from Ravensdale/master
Custom synthetic sprites and minor bugfixes
2013-07-03 22:21:15 -07:00
Ravensdale
9aedfa8b23 Bugfix: Fixes mining borg's radio to the supply frequency since mining frequency no longer exists.
Feature: Introduces and adjusts code for cyborg and AI custom sprites

Cleanup: Streamlined the AI core selection code. Could probably be even cleaner but it's good for now.
2013-07-03 21:24:25 -07:00
Zuhayr
969cb820a0 Merge pull request #3229 from Segrain/bleeding-edge-freeze
Records access for cyborgs.
2013-07-03 01:52:44 -07:00
Segrain
66265e2689 Recordskeeping update. 2013-07-03 05:55:18 +03:00
Ispil
88791eec5c Makes the Crew Manifest default on all PDAs, and removes the access_manifest variable from cartridges. Also moves the manifest function into the PDA code, instead of cartridge code. 2013-07-02 19:14:10 -07:00