Commit Graph

13651 Commits

Author SHA1 Message Date
Zuhayr
ecd7a09f2b Merge pull request #3150 from SkyMarshal/master
ZAS fixes, implements multi-tile doors (That work perfectly!)
2013-06-23 22:23:44 -07:00
Zuhayr
92d3ad54b7 Merge pull request #3149 from fauxki/bleeding-edge-freeze
Changelog - BEF
2013-06-23 22:22:27 -07:00
Segrain
0d6e49742a Typo fix. 2013-06-24 06:06:00 +03:00
SkyMarshal
702fea234a Forgot the files, doh! 2013-06-23 19:53:59 -07:00
SkyMarshal
6d2b9882e4 ZAS fixes, implements multi-tile doors (That work perfectly!)
That multi-tile firedoor needs love.  Lots of love. (It is missing a lot of icon states)
2013-06-23 19:49:42 -07:00
fauxtada
1b126bd1d5 Changelog - BEF
Whoopsie, forgot to do a changelog for all the map changes done for this merge~
2013-06-23 19:33:43 -07:00
Chinsky
b07734d618 Merge pull request #3148 from fauxki/bleeding-edge-freeze
Map Adjustments - BEF
2013-06-23 19:00:19 -07:00
fauxtada
b77ee1f06f Map Adjustments
- Maintence tunnel doors near xenobiology, plasma, and virology (in the join areas that are in the middle of the maintence tunnels) are now 0 access. This allows for easier access to maintence tunnels during rad storms. Additional standard access maintence tunnel doors have been added in these areas to block them out a little.
- Replaces secure storage area with Quarantine zone for infected patients.
- Shinks CMO office by one tile for more flow, also now CMO's office has less doors. Because.
- Who the hell put a rack in place of one of the major door leading into security? That's gone now.
- Put flares in the security closets. Fancy shiny red things!
- Messed around with floor tiling colors in medbay.
2013-06-23 18:50:18 -07:00
Chinsky
d3c6101775 Merge pull request #3144 from Kilakk/bleeding-edge-freeze
Crew manifests will now put alternate titles of jobs into their correct departments
2013-06-23 14:50:03 -07:00
Chinsky
c572473dee Merge pull request #3142 from Zuhayr/feature
Dartgun tweaks, vials.
2013-06-23 14:44:14 -07:00
Zuhayr
7a9b501bc0 Dartgun tweaks, vials. 2013-06-24 02:04:44 -07:00
Segrain
65731b232b Quickfix and changelog. 2013-06-23 20:52:19 +03:00
Segrain
7fec5309f7 Airlock construction update. 2013-06-23 20:42:58 +03:00
Segrain
1f7d39d99f Stacks update. 2013-06-23 20:31:55 +03:00
Kilakk
1bce99656c Fixes crew manifests showing alt titles as misc 2013-06-23 13:26:25 -04:00
Mloc
1d3b7d339a Merge pull request #3141 from CIB/bleeding-edge-freeze
Forgot icon for robot components.
2013-06-23 07:06:01 -07:00
cib
fded10c9a5 Forgot icon for robot components. 2013-06-23 12:18:46 +02:00
Chinsky
aa21bd7ed1 Merge pull request #3140 from Baystation12/bleeding-edge-freeze
Bleeding edge freeze
2013-06-23 00:24:25 -07:00
Chinsky
00ba02802e Merge pull request #3139 from comma/bleeding-edge-freeze
Bleeding edge freeze update with master
2013-06-23 00:23:18 -07:00
Chinsky
c9f6894163 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
2013-06-23 11:17:03 +04:00
Chinsky
4341fcb207 Merge pull request #3136 from meyar/master
Security missing blast doors
2013-06-22 22:58:18 -07:00
Chinsky
b4822e1600 Merge pull request #3126 from CIB/bleeding-edge-freeze
Implemented robot components(organs)
2013-06-22 22:58:04 -07:00
meyar
df30716233 Fixes missing blastdoors in security 2013-06-23 01:06:10 -04:00
Zuhayr
cfcc3dc689 Merge pull request #3134 from caelaislinn/master
Xenoarchaeology tweaks
2013-06-22 21:58:55 -07:00
Zuhayr
99bda2ed8d Merge pull request #3135 from meyar/bleeding-edge-freeze
Bleeding edge freeze
2013-06-22 21:57:48 -07:00
meyar
6f84917a58 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-23 00:17:13 -04:00
meyar
7647dbd9ab Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-23 00:16:57 -04:00
MisterBook
299d1b94d3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-22 22:06:43 -05:00
Cael Aislinn
c8fd18a637 changelog update
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:28:15 +10:00
Cael Aislinn
de91fba835 halved the length of xenoarch scans, scans actually shut down when they exceed the safety by too much
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:27:48 +10:00
Cael Aislinn
73cf13745d depth scanner should now properly show the responsive material of a find
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:25:41 +10:00
Cael Aislinn
6ccaae583f excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:25:16 +10:00
cib
3aa3da29be A few fixes to robot organs.
- Forgot .dme
- Made sure repairs and damage only work on installed modules.
- Removed is_functioning() because it was a silly proc to have.
2013-06-22 21:41:41 +02:00
Chinsky
6e09f90a24 Merge pull request #3127 from SkyMarshal/master
Maploader improved: Now loads faster by skipping space tiles and properly parses lists from the mapfile.
2013-06-22 07:21:58 -07:00
Chinsky
7e19adb045 Merge pull request #3129 from Zuhayr/master
Various fixes.
2013-06-22 07:15:58 -07:00
Zuhayr
f77d208d04 Fixes #3131 2013-06-22 22:19:52 -07:00
Zuhayr
146462cbc6 Fixes #2740 2013-06-22 21:55:22 -07:00
Zuhayr
513a9d7ee8 Fixes #3052 2013-06-22 20:22:19 -07:00
Zuhayr
be16c8eff3 Fixes #2957 2013-06-22 20:07:21 -07:00
Zuhayr
f59faa04a0 Fixes #3125 2013-06-22 17:50:18 -07:00
Zuhayr
82fd456c56 Merge pull request #3128 from Segrain/master
Chemistry: alcohol bugfix.
2013-06-22 05:20:07 -07:00
Chinsky
2a9be1a2aa Commented out blood/virus food reaction, that was about tg virus system. 2013-06-22 12:08:37 +04:00
Whitellama
83ab2c430b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-22 00:19:43 -07:00
Whitellama
424c9a0161 Space Ninja Gamemode Implementation 2013-06-22 00:19:32 -07:00
meyar
accc3447dd Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-22 02:29:26 -04:00
cib
b58326c8fa Implemented robot components(organs)
Features:
- You now have to open up a cyborg after constructing it and insert all the components
- Cyborgs have per-component damage rather than total damage.
- Too much damage can fry a component, making it non-functional
- Components consume power
- You can disable a component to save power
- Actuator component allows you to move
- Camera component allows you to see
- Comms component allows you to use :b
- Radio component allows you to use radio
- The same placeholder icon for all components
2013-06-22 07:11:02 +02:00
Segrain
618da8a7c4 Alcohol bugfixes. 2013-06-22 07:33:33 +03:00
SkyMarshal
9591c3773e Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.
beach.dmm is now unescapable.
Fixes #3114
2013-06-21 20:14:11 -07:00
Chinsky
173aee95dd Merge pull request #3123 from Jupotter/BEF
Fix the robotiscist preview in the char setup screen
2013-06-21 14:35:16 -07:00
Chinsky
edd3bc29e8 Merge pull request #3122 from AppleMaster/bleeding-edge-freeze
Vote changes.
2013-06-21 14:33:57 -07:00