Chinsky
a265a9342b
Merge pull request #2661 from adammartinez271828/bleeding-edge-freeze
...
Updates to sun.dm and solar.dm
2013-04-16 16:15:05 -07:00
Chinsky
75814fc6e0
Merge pull request #2658 from SniperYeti/bleeding-edge-freeze
...
Custom item: Engineering Hat
2013-04-15 05:47:31 -07:00
Yeti
b3c9484398
Added Superboredguy's item: Engineering Hat
2013-04-13 14:32:11 -04:00
Chinsky
0ea501039b
Merge pull request #2655 from SniperYeti/bleeding-edge-freeze
...
Custom item: Old Camera
2013-04-13 01:03:20 -07:00
Chinsky
8c17d44757
Merge pull request #2651 from Spamcat/bleeding-edge-freeze
...
Emergency smooth movement fix.
2013-04-13 00:59:29 -07:00
Yeti
4928a3aa59
Custom item: Old Camera
2013-04-12 22:40:24 -04:00
Spamcat
7d6b903ed5
Fixed AI wiring.
...
Ravensdale, thanks for the heads-up.
2013-04-11 22:45:27 +04:00
Spamcat
13f34207e7
Emergency smooth movement fix.
...
Seriously, stop that. Or at least test the map before committing. And use maptools ffs. :/
2013-04-11 22:19:42 +04:00
Chinsky
97b10f69af
Merge pull request #2647 from RavingManiac/bleeding-edge-freeze
...
Sprites for narrow carpets altered to be less eye-meltingly baroque.
2013-04-10 02:57:57 -07:00
RavingManiac
c624f54721
Sprites for narrow carpets altered to be less eye-meltingly baroque.
2013-04-10 01:36:59 +08:00
Chinsky
fcf129b242
Merge pull request #2645 from fauxki/bleeding-edge-freeze
...
Bleeding edge freeze - Map Edits
2013-04-09 03:16:03 -07:00
fauxtada
62867f03f0
Map Changes:
...
- Replaced the boxing ring with a swimming pool. The holodeck already has a boxing ring setting, the other one is redundant.
- Apparently having two airlocks in the same time makes ZAS not work so well. I've edited as many double airlocks as I could find, but there's probably more.
- The Psych office is less ugly now. I can't really do anything about there being a see through door though. - No privacy for you!
- Violin has been moved to theatre storage.
2013-04-09 03:06:54 -07:00
fauxtada
efd65fe495
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-04-09 00:51:17 -07:00
Chinsky
0a736e7153
Merge pull request #2641 from SkyMarshal/master
...
Commit for Rowtree
2013-04-08 22:42:27 -07:00
SkyMarshal
b3a8621344
Committed for Rowtree.
2013-04-08 21:40:54 -07:00
Chinsky
91d6863a9a
Merge pull request #2639 from Jupotter/master
...
Allow Security and Medical HUD to add comment to their respective records
2013-04-08 20:38:09 -07:00
jupotter
12c7cfc88a
Allow sec hud to add comment to sec record
...
Add a direct [Add comment] link in the examine text
Add a comment in the record comment list, signed with the current
authentication of the HUD wearer
Add a [View comments log] link in the security record view from the
Security Hud
This list all the comments as on the security record computer
2013-04-08 14:13:58 +02:00
jupotter
4b9d14b564
Allow medical hud to add comment to medical record
...
Add a direct [Add comment] link in the examine text
Add a comment in the record comment list, signed with the current
authentication of the HUD wearer
Add a [View comments log] link in the medical record view from the
Medical Hud
This list all the comments as on the medical record computer
2013-04-08 14:12:57 +02:00
jupotter
bd52b3de32
Fix medical status change text from medical hud
2013-04-08 14:07:13 +02:00
Chinsky
b283a3cb86
Merge pull request #2634 from RavingManiac/bleeding-edge-freeze
...
Various map tweaks
2013-04-07 21:48:14 -07:00
Chinsky
8307ad6f16
Merge pull request #2638 from Asanadas/master
...
Rowtreestation v8
2013-04-07 21:48:04 -07:00
Asanadas
b4cd199e2b
Version 8, don't hate.
2013-04-07 19:07:43 -04:00
Christian Bielert
deaf4f4af0
Merge pull request #2637 from Asanadas/master
...
Rowtreestation v7
2013-04-07 13:56:03 -07:00
Asanadas
9caf1456a8
RowtreeStation.dmm v7
2013-04-07 15:44:30 -04:00
adammartinez271828
3b95bf2279
Updates to sun.dm and solar.dm
...
Improved solar manual tracking by switching sun.dm and solar.dm to run off of the same clock (world.time) and added several options to the solar generator control computer.
2013-04-07 10:17:41 -04:00
Chinsky
3e8f3ad582
Merge pull request #2635 from Asanadas/master
...
Map: tgstation.2.1.0.0.1.dmm Internal Affairs Spawn Fix (& SKRELL ARMS)
2013-04-07 04:53:22 -07:00
RavingManiac
830f08f31a
Space piano added to the bar.
2013-04-07 13:38:40 +08:00
Asanadas
45f3a876c8
Sprite fix for Skrell right arms and legs overlapping out of clothing.
2013-04-06 19:27:53 -04:00
Asanadas
b9682601d3
Emergency Internal Affairs round-start spawn fix. Also quickie zoning fix in the AI core.
2013-04-06 18:54:45 -04:00
RavingManiac
1878727417
Nuke outpost altered to have a functional meeting room. Nuke operatives spawn in outpost barracks.
...
Out-of-place tiles in research outpost replaced.
2013-04-06 21:11:59 +08:00
RavingManiac
d8e2857013
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-04-06 19:09:21 +08:00
Chinsky
296ccfff35
Merge pull request #2633 from Asanadas/master
...
Update for Rowtree
2013-04-05 21:41:34 -07:00
Asanadas
0c006b1737
Updating RowtreeStation.dmm.
2013-04-06 00:30:16 -04:00
Chinsky
4293e30fe4
Merge pull request #2628 from caelaislinn/bleeding-edge-freeze
...
Added two-way smart cycling airlocks
2013-04-05 21:30:01 -07:00
Cael_Aislinn
664ea3efa7
added two-way smart cycling airlocks
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-04-05 16:12:31 +10:00
Chinsky
e596bf2174
Merge pull request #2624 from Asanadas/master
...
Sprite: IA clothing prone fix
2013-04-04 19:16:56 -07:00
Hawk-v3
957c606231
Merge pull request #2625 from SkyMarshal/bugfixes
...
Fire apparently was ignoring fire/temperature resistant things, I was informed of a possible fix...
2013-04-04 17:20:00 -07:00
SkyMarshal
ef54f5566e
Fire apparently was ignoring fire/temperature resistant things, I was informed of a possible fix (commenting out the call to the FireBurn proc when you are in a tile with fire, thanks Nernums) and should hopefully resolve the issue.
2013-04-04 17:18:35 -07:00
Asanadas
6e6c2d9426
Alignment adjustment for IA clothing sprites.
2013-04-04 18:31:59 -04:00
RavingManiac
506d944f30
Nuke operatives now spawn in the outpost next to the syndicate shuttle. Outpost window widened a bit. Syndicate shuttle shutters are open at round start.
...
Glass door to the lobby added to the medbay reception desk.
2013-04-05 03:11:52 +08:00
Jim "Apples"
c9b20d1010
Merge pull request #2623 from SkyMarshal/bugfixes
...
Rowtree bugged me to commit this for him.
2013-04-04 12:09:49 -07:00
SkyMarshal
39d34ba841
Rowtree bugged me to commit this for him.
2013-04-04 11:07:10 -07:00
Jim "Apples"
c71d34ccda
Merge pull request #2622 from Spamcat/master
...
NRA Utopia
2013-04-04 09:35:15 -07:00
Spamcat
27d6785226
Utopia fixes.
...
by rowtree
2013-04-04 20:04:00 +04:00
Chinsky
c6a1fd75fa
Merge pull request #2621 from SkyMarshal/bugfixes
...
Reverts Cael's retard flailing. Do not fuck with zone sharing ratios... Also: Fixed fire.
2013-04-04 01:59:13 -07:00
SkyMarshal
06da479c97
Makes liquid fuel cleanable again. Got removed in last commit since all that was done was revert Cael's changes.
2013-04-04 01:50:59 -07:00
Chinsky
7d380cd510
Merge pull request #2619 from Asanadas/master
...
BEF Merge
2013-04-04 01:33:58 -07:00
Chinsky
9574aedab1
Merge pull request #2620 from Asanadas/master
...
Master into BEF
2013-04-04 01:33:53 -07:00
SkyMarshal
9b0c40756b
Fixed fire.
2013-04-04 01:29:23 -07:00
SkyMarshal
c97750f913
Reverts Cael's retard flailing. Do not fuck with zone sharing ratios unless you know what you are doing, as air movement then becomes quite chaotic and derpy. Should fix some issues with ZAS.
2013-04-04 00:30:15 -07:00
Chinsky