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
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
Spamcat
d0236394ef
Client, mind, big difference...
2013-07-01 20:02:42 +04:00
Spamcat
11e27c5999
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops
...
Conflicts:
code/game/gamemodes/objective.dm
2013-07-01 19:49:29 +04:00
Spamcat
10ee1fbcfe
World loops 2: Electric Boogaloo.
2013-07-01 19:43:56 +04:00
Zuhayr
e3696a13e9
Redundancy fix.
2013-07-01 19:51:03 -07:00
Zuhayr
3fb62273f7
Custom item.
2013-07-01 19:21:49 -07:00
Zuhayr
a332bd86d2
Fixes #3209
2013-07-01 19:10:26 -07:00
Whitellama
99a317cf07
Removed debug outputs
2013-06-30 20:08:46 -07:00
Whitellama
6d8654eb7a
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-06-30 20:02:36 -07:00
MisterBook
2661f8e8ea
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-29 23:06:39 -05:00
MisterBook
b9fb3538b1
Pulled the teeth out of bees. Less damage, will not attack you unless they are pissed off (And then, only when the target of their rage has disappeared). Will no longer murder you from seven tiles away. Bio defenses lowered - having only a helmet means they can't get to 30% of your body. Only a suit means they can't get to 70% of your body. Full coverage? Full protection. All spacesuits have bio armor, so covers pressure sealed suits too.
...
Turned down halloss regen. Added flashing pain and an owie message when you get shot by tasers. Feel that agony.
2013-06-29 23:05:06 -05:00
jack-fractal
00db60fa95
This submission modifies the bodybag.dm file to prevent the parent class (bodybag) from having to know about it's child class (cryobag).
...
This also removes redundant defines from cryobag class.
2013-06-29 16:49:48 -04:00
Zuhayr
6fc787ff73
Fixes #3201
2013-06-29 18:09:35 -07:00
Zuhayr
3192323c19
Fixes #3200
2013-06-29 16:57:08 -07:00
Zuhayr
1d28bb7cb3
Message tweaks.
2013-06-28 15:55:41 -07:00
Zuhayr
c7bbc3c9b3
Changelog.
2013-06-28 15:53:50 -07:00
Zuhayr
665bdd16ab
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-28 15:50:07 -07:00
Whitellama
f9b01a09cc
Removed debug outputs and fixed double-forging of ninja objectives
2013-06-27 18:52:00 -07:00
Zuhayr
58bf2d218c
Bandages and ointment cannot be used through space suits.
2013-06-27 18:02:10 -07:00
Segrain
4bcae3a06b
Examine() update.
2013-06-28 03:33:06 +03:00
Segrain
31e4487229
Fix for #2430 .
2013-06-27 14:10:05 +03:00
Zuhayr
304be1fe41
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-27 07:27:38 -07:00
Whitellama
ca74c8ab44
Raised required players of ninja gamemode (no longer 1, for debug)
2013-06-26 17:08:08 -07:00
Whitellama
90eaca1e53
WIP Ninja GM junk
2013-06-26 16:30:24 -07:00
Zuhayr
b41e92dc01
Fixes #2870
2013-06-27 07:01:42 -07:00
Whitellama
bf953679c7
No more placeholder antags, and WIP space ninja gamemode stuff
2013-06-25 16:49:53 -07:00
Whitellama
41c8e8fe3f
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-25 16:47:15 -07:00
Zuhayr
a877a2a9a8
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-25 23:55:01 -07:00
cib
b0cabba481
Fixed a severe bug with robot components.
...
There were several desyncs between robot.cell and robot.components["power cell"].installed, leading to very annoying bugs.
2013-06-25 15:00:58 +02:00
Segrain
29903c46e3
Quickfix for multitile doors.
2013-06-25 11:40:01 +03:00
Whitellama
f3224bba2e
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-24 21:48:33 -07:00
