Commit Graph

6153 Commits

Author SHA1 Message Date
Chinsky
6ef40ee7a7 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
2013-05-22 21:35:50 +04:00
Chinsky
317cbd8438 Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	baystation12.dme
2013-05-22 16:51:41 +04:00
Chinsky
bdb16b1f99 Renamed bruise pack back to gauze.
STAY LIKE THAT.
2013-05-22 14:05:53 +04:00
Mloc
80b8a5e70f Merge master.
Signed-off-by: Mloc <colmohici@gmail.com>
2013-05-22 10:53:29 +01:00
SkyMarshal
6c8b0c23dc Small fixes, updated changelog. 2013-05-21 23:12:47 -07:00
SkyMarshal
39df196edc Fixed disposal issue.
Delayed Jungle setup until after air master initializes
Master controller now properly ceases atmos simulation if runtimes occur (and are detected).
Cleanup more ZAS stuff.  FEA_system.dm, ZAS/ZAS_Turfs.dm, ZAS_Zones.dm.
Canisters now autoconnect to portables connectors on creation.   (Fixes airlocks not having attached canisters)
Doors can now be made which respect directional door types (e.g. windoors and directional firelocks) and is handled better.
2013-05-21 23:12:47 -07:00
Chinsky
4885a08b27 Added 5 TC uplink to RevHeads. 2013-05-21 19:24:53 +04:00
Chinsky
1b0c6b942a NOW IT COMPILES.
Incomplete rename.
2013-05-21 18:08:28 +04:00
meyar
ebe2e26ed3 Fixes the Syndicate nuke shuttle airlock (In that it cycles now)
Re-added external airlock access to the traitor ID card, restoring lost functionality.
Fixed the ERT radio. It now works.
2013-05-19 05:00:06 -04:00
cib
f5b0b52b6c Added stasis bag.
This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.
2013-05-19 07:48:43 +02:00
cib
fc20393b60 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	baystation12.dme
2013-05-19 05:54:14 +02:00
cib
8cfc395232 Added community-made newsfeeds.
Yay!
2013-05-18 23:20:20 +02:00
cib
d7cc42e588 Added wallrot event.
Also some updates to changelog.
2013-05-18 21:55:02 +02:00
cib
8b43fec262 Balance change to suspect list.
Antagonists now have a HIGHER chance to be suspected. Simultanously, traitors and other uplink users get another +4 TC and a warning if they are suspected.
2013-05-18 15:21:14 +02:00
Chinsky
6c062dc05c Merge pull request #2793 from meyar/master
Fixin' the traitor ID
2013-05-18 06:11:46 -07:00
meyar
cd5f0885ff Adds ERT radio
Makes the ERT frequency accessable
2013-05-18 09:06:36 -04:00
faux
6e85a3ed42 Master Bug Fixes
- Fixes wall under maintenance tunnel door.
- Fixes AAAAHHHHHHHRRG psych office pressure issue.
- Fixes some names and DMIs on some items. (in theory)
2013-05-18 05:57:21 -07:00
cib
22ea35cb8f Added command reports to RP rev. 2013-05-18 14:18:11 +02:00
cib
335565cba7 Made RP rev use a different news story. 2013-05-18 13:10:07 +02:00
cib
be197afc77 Added system for newscaster events.
This way people can write stories, separated into several pieces, which will be announced through the newscasters over the course of the round.
2013-05-18 13:06:16 +02:00
meyar
c170f57ba7 Returns lost functionality to the traitor ID, letting a traitor re-forge their ID more than once. 2013-05-18 06:48:01 -04:00
cib
48b78ea758 Re-added latespawn.
Used in autotraitor and RP-revolution.
2013-05-18 11:06:19 +02:00
Chinsky
7b723bfb82 Merge pull request #2762 from Baystation12/bleeding-edge-freeze
BEF merge [waitabit]
2013-05-16 18:30:10 -07:00
SkyMarshal
5884f24f6a Adjusting air alarm settings.
"Scrubbing" is the default mode
"Panic" empties the room
"Fill" turns off the scrubbers and activates the vents in an effort to replace lost air
"Cycle" will trigger first a panic siphon then a fill mode in order to empty a room of contaminants before refilling it from the supply pipes
"Replacement" will turn on the panic siphon while continuing to add air into the room
"Off" will disable all attached devices. (This is useful for breached areas)
2013-05-16 17:29:58 -07:00
Mloc
5faabba7fb Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
2013-05-16 12:21:55 +01:00
Chinsky
4f35f581c0 Merge pull request #2768 from SkyMarshal/bleeding-edge-freeze
Air alarm fix, atmos control computer fix, item description fix.
2013-05-15 14:37:07 -07:00
SkyMarshal
6e2879dc74 Made an oopsie 2013-05-15 14:36:32 -07:00
SkyMarshal
88a65b63e4 Fixes air alarms going off if the upper bounds were set to disabled.
Fixes atmos control computer displaying some air alarms in unreadable yellow
Fixes a text error in item descriptions.
2013-05-15 14:31:31 -07:00
Mloc
5b177df027 Merge pull request #2766 from SkyMarshal/bleeding-edge-freeze
Fixes air alarms freezing station an hour into round.
2013-05-15 13:29:15 -07:00
SkyMarshal
a1bc5d6cf0 Fixes air alarms freezing station an hour into round. 2013-05-15 13:28:27 -07:00
Chinsky
917ce079ab Merge pull request #2763 from fauxki/bleeding-edge-freeze
Quick Fixes - BEF
2013-05-15 11:35:15 -07:00
fauxtada
2b9130b00f Quick Fixes
- Changed access to security washroom so detective can go in.
- Removed wall that was under maintence tunnel door.
- Fixed writerer's custom item. AGAIN. .. Because they can't decide what character they want it on.
- Added saloon dress to bar closet.
2013-05-15 11:26:26 -07:00
Laurence Reading
374e950a32 Removing reverselist() from all bot pathing
As with my previous commit, reverselist() is causing problems in bot
pathing, it is unnecessary. Bot pathing only worked when reverselist()
was doing nothing.
2013-05-15 16:50:24 +01:00
Laurence Reading
8230214833 Fixed MULEbot pathing
MULEbot was simply reversing the path before trying to follow it, Also
added a null check.
2013-05-15 10:34:09 +01:00
cib
bb06a18c33 Reduced chance for changeling to be listed as suspect.
Better than discussing this forever.
2013-05-14 21:12:47 +02:00
Cael_Aislinn
749d3eeaa0 transit pods should reverse direction when they reach the end of the tube
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-14 13:10:28 +10:00
cib
d12c3f9cf3 Added a missing linebreak. 2013-05-14 00:58:49 +02:00
cib
28b40c3693 New command reports that aren't stupid.
It will give you a list of suspects, which uses a lot of randomization to gather up anti-NT guys, actual antags, and random people.
2013-05-14 00:39:29 +02:00
fauxtada
5b2f03db10 Map Fixes - BEF
- adjusts the piping and flooring panels in the new security wing.
- fixes the piping around the new eva since they lead to nowhere.
- adjusted the medbay lobby a bit, added a second chair behind the front desk.
- added in a xenos closet. has unathi items / wooden sandals in it currently. still need to sprite up the tajaran and skrell items.
2013-05-11 09:33:45 -07:00
Mloc
e77e905c00 Merge pull request #2745 from comma/bleeding-edge-freeze
Sec Wing remap
2013-05-11 02:18:15 -07:00
Mloc
52583c53b2 Merge pull request #2744 from Spamcat/bef
fixes
2013-05-11 02:16:47 -07:00
Chinsky
61cf1b279d Security wing remap. 2013-05-10 16:05:23 +04:00
Spamcat
17269494ef fixed #2737 2013-05-08 15:13:28 +04:00
Spamcat
0decd3b078 Air alarm runtimes.
fixed #2717
2013-05-08 15:12:25 +04:00
Mloc-Argent
849ec5052a Fix for compiling on case sensitive filesystems.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-05-06 16:09:10 +01:00
Mloc-Argent
27759f47df Merged master into BEF.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-05-06 15:43:50 +01:00
fauxtada
cdb3466cd9 may or may not fix issue of missing sprite for captain's uniform jacket. 2013-05-02 03:19:23 -07:00
fauxtada
fed2bfcedc fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me. 2013-05-02 02:00:04 -07:00
Spamcat
ef368a6756 Returned Lamarr.
... which can be used as internals. Shh, let it be our secret...
#2583
2013-04-30 16:59:38 +04:00
Spamcat
0acd40326f Increased pill bottle capacity to 14 pills (2 rows).
Also fixed #2714.
2013-04-30 15:44:31 +04:00