Commit Graph

3138 Commits

Author SHA1 Message Date
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
PsiOmega
e096bc9770 Map Fixes and Additions
Removes a number of random supply and scrubber pipes.
Reconnects disconnected scrubber sections in medbay.
Fixes APC issues in the bar/library maintenance area.
Installs chinkey's new tinted windows in the HoP's office, mental health office, and the three patient cells, using both the id and id-less methods according to need.
2015-02-10 10:16:47 +01:00
PsiOmegaDelta
79aacd9f30 Merge pull request #8081 from comma/maximumtrinkets
Accessories update.
2015-02-10 06:51:30 +01:00
Raptor1628
80c508e644 Pipe move 2015-02-09 08:00:16 -05:00
Raptor1628
76f4001cc1 Paramedic Job Fixed
Adds Paramedic job as outlined on the forums. Reduces MD access to EVA,
adds some minor EMT clothing stuff, and fixes #8020 and the medgreen
armband while I was piddling around in sprites.
EMT alt title and indent fixed.

Now less broken.

![](http://i.imgur.com/vOSoJy0.png)
2015-02-08 17:23:02 -05:00
PsiOmega
f0c30d2f16 Corrects multiple conflicts in engineering, where areas had changed paths or been replaced. 2015-02-08 20:50:45 +01:00
PsiOmega
91b971b223 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-08 20:29:03 +01:00
Chinsky
30de86c081 Accessories update.
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
mwerezak
f328170b00 Adds two boxes of shotgun shells to the armoury 2015-02-06 20:24:31 -05:00
GinjaNinja32
ef197fb995 Two fixes
Fixes airless turf in Fore Starboard Solar Control causing minor atmos alert at roundstart
Fixes clean_map_git.sh being set non-executable and using non-sh-compatible features with #!/bin/sh
2015-02-06 16:04:37 +00:00
Chinsky
3ea720fd9d Buttons refactoring. Introduced wonders of inheritance, cutting down on inconsistencies and copypaste. 2015-02-06 09:53:05 +03:00
Neerti
22ac05f9a0 Turns out, a new path isn't needed in the first place, and the bugs I found was me being dumb. Isn't that just grand?
Reverts the /nolatejoin path.
2015-02-05 16:41:00 -05:00
Atlantiscze
449446475a Changes mapped SMES RCON tags
- RCON Tags on mapped-in SMESs have been changed. This, when combined with previous commit makes RCON console UI more organised.
- New tags are in format "Solar - Aft Port", "Substation - Medical", "Outpost - Research", etc. Therefore relevant entries are usually listed together.
- Comparation: http://i.imgur.com/C83vXpQ.png
2015-02-05 00:34:15 +01:00
Neerti
6567c68ecb Merge remote-tracking branch 'remotes/upstream/dev' into 1_30_2015_new_shuttle 2015-02-04 13:34:48 -05:00
Neerti
13d8bd47e7 Adds subtype of the AI core structure to disallow latejoining.
Fixes a bug where carding an AI would free open a slot.
Adds cameras and holopads to the shuttle and a few areas at Centcom.
Adds check to AI's Life() to make sure it won't die in areas which have magical free power.
Adds subtype of oxygen canister, which starts off very cold.  This is meant to replace the freezer on Centcom, and for the emergency shuttle's cryo.
2015-02-04 13:29:55 -05:00
Ravensdale
88b1700cc5 jfdsikopfrjsapojfgdsika;fjksdl 2015-02-04 09:44:45 -08:00
Ravensdale
7d502aa255 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 07:40:20 -08:00
Chinsky
f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
Chinsky
f1c5c9d08d Merge pull request #7680 from Skully71/chancespawn
Add a chance spawn object to enable spawning a given object at chance
2015-02-04 18:14:31 +03:00
RavingManiac
a197c22562 Added viewport allowing view of engine radiators from engine chamber. Can be closed with shutters. 2015-02-04 22:44:50 +08:00
Skully71
5ea73a73fa Reworked the arrival foyer to work with random single objects 2015-02-04 15:20:35 +01:00
Ravensdale
fcb2770004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 05:15:23 -08:00
RavingManiac
38d62a278a Holodeck code moved to modules, holo-object code put in separate file. Holodeck expanded from 5x10 to 10x10. Holodeck areas updated accordingly. Holodeck courtroom added. Holodeck gravity can now be toggled. Reduced stun-time from gravity turning on. Changed the thunk() message a bit. Window-doors can now be deleted silently.
Changelog updated.
2015-02-04 20:05:43 +08:00
Zuhayr
11ec632c22 Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap 2015-02-04 11:03:44 +10:30
Ravensdale
1bf2786d71 Fix map conflict 2015-02-03 15:29:31 -08:00
Ravensdale
84fa5379c5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-03 15:18:27 -08:00
Ravensdale
050db2c650 Maptool 2015-02-03 14:51:06 -08:00
Ravensdale
2e275d7e5e Area cleanup part 1: Engineering Department 2015-02-03 14:50:11 -08:00
Neerti
ac0ba03260 Merge remote-tracking branch 'remotes/upstream/dev' into 1_30_2015_new_shuttle 2015-02-03 15:39:49 -05:00
Kelenius
9edb5751fb Adds tobacco and maps in drying racks 2015-02-03 22:24:49 +03:00
Kelenius
536388978f Conflict fix 2015-02-03 20:57:16 +03:00
Kelenius
0e7ed6aef4 Merge branch 'dev' into ofDryingAndRacks 2015-02-03 20:51:27 +03:00
GinjaNinja32
05532fd330 Merge remote-tracking branch 'upstream/dev' into supply 2015-02-03 17:22:10 +00:00
GinjaNinja32
444c7c71f3 Maps in floor painter in engineering workshop, makes it and pipe painters orderable from Cargo 2015-02-03 17:19:45 +00:00
Neerti
e86103de0d Adds expanded transfer/escape shuttle, resizes areas for fit correctly. 2015-02-03 12:12:22 -05:00
Chinsky
fb929a9688 Merge pull request #7796 from Kelenius/ofVendorsAndSeeds
Replaces seed vendors with seed storages
2015-02-03 18:10:57 +03:00
PsiOmega
a57cd8c380 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 14:51:54 +01:00
PsiOmega
5c41f24183 Cleans up exodus-2.dmm. 2015-02-03 14:35:45 +01:00
SkyMarshal
7c1b70af93 Removes jungle 2015-02-03 04:01:16 -07:00
PsiOmega
6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01:00
Chinsky
19f288e22e Merge pull request #8005 from Ccomp5950/fixes123
Misc Fixes:  Removes ahelp categories / robotics maint door.
2015-02-01 18:13:08 +03:00
Zuhayr
d6b03ea768 Merge pull request #7974 from mwerezak/ert
ERT adjustment and fixes
2015-02-01 20:47:40 +10:30
ccomp5950
bbe2abd677 Robitics maint relabled to be maint and set to proper access.
Fixes #8004
2015-01-31 19:49:25 -05:00
PsiOmega
2433c8f4bd Isolation Cell Fixes
Fixes bad door/button tags. Some fool, certainly not me, had done some copy pasting.

The vent/scrubbers in each cell now form loops, allowing for easy temperature changes without emptying the scrubber contents into a canister.
Most importantly this saves on power because a canister no longer has to be pumped full with super-heated gases, reducing the risk of an early power failure on the outpost.
2015-01-30 19:08:24 +01:00
PsiOmega
d8cc340374 Fixes #7965.
Shuffles around some of the warden's equipment, adds a bunch of missing power cables in the brig.
2015-01-29 09:42:22 +01:00
mwerezak
849e968924 ERT adjustment and fixes
Removes the mounted laser cannon from the ERT hardsuits and instead
provides a single cannon for the team.
Moves the sidearms out to the other ert stations to make it more clear
that they may be used by other ERT roles.
Fixes rechargers now working in Centcom areas.
2015-01-28 13:11:04 -05:00
Ravensdale
ec49c8b305 Replaces magic freezers with H/E pipes 2015-01-25 02:03:12 -08:00
Zuhayr
cd494cdef1 Added masking turf for asteroid field, fixed issues with distribution map. Replaced asteroid field with mask turf. 2015-01-23 13:40:05 +10:30
PsiOmega
d5b469e4c5 Fixes #7913.
Replaces disposal junction with a simple bent section.
2015-01-22 13:41:06 +01:00
PsiOmega
b139001d8c Fixes #7875.
Currently cryopods require a control computer to be in the same area as themselves to be found, thus there is now a computer in the brig.
Also made the bedroom dorms symmetrical again.
2015-01-19 08:43:15 +01:00