Fox-McCloud
9fd8718bc7
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 19:31:07 -05:00
Fox McCloud
3e375fdb4a
Merge pull request #6158 from FreeStylaLT/tube_OCD
...
Fixes triggering AI Sat tube misalignment
2017-01-26 08:04:21 -05:00
Fox-McCloud
0bcf798bb3
minor map fix
2017-01-26 07:13:06 -05:00
Fox-McCloud
5c828db250
fixes, comfrey, and aloe
2017-01-23 05:25:42 -05:00
Fox-McCloud
11adbc37d5
metastation
2017-01-22 22:28:18 -05:00
Fox-McCloud
032ffff5c6
box station
2017-01-22 22:04:52 -05:00
Fox-McCloud
5b643dd6b1
secondary maps
2017-01-22 21:08:54 -05:00
Aurorablade
90b5177f4e
Rawr
2017-01-14 01:48:44 -05:00
FreeStylaLT
427df53a0a
why did no one report this
2017-01-13 12:53:18 +02:00
Crazy Lemon
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
Crazylemon64
ec0f13d41e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2017-01-06 05:01:43 -08:00
Crazy Lemon
018dfd2b09
Merge pull request #6055 from Norgad/meta-fixes
...
Metastation Fixes
2017-01-02 12:08:38 -08:00
Crazy Lemon
eb992d8803
Merge pull request #6048 from Norgad/aisatareas
...
Fixes misaligned areas on the cyberiad
2017-01-01 03:37:19 -08:00
Norgad
9ce032736e
Wow, even more, thanks
...
<3
2017-01-02 00:30:58 +13:00
Norgad
fa76daf5ff
Fixes stuff
...
wowie
2017-01-02 00:23:25 +13:00
Norgad
81def99c9b
Fixes those darn areas
...
wow, merge this
2016-12-31 20:23:31 +13:00
Crazy Lemon
31edef28b4
Merge pull request #6009 from Norgad/metaareas
...
Fixes Misaligned Areas on Metastation
2016-12-30 23:06:43 -08:00
Aurorablade
ad980feb99
WHY
2016-12-31 00:53:27 -05:00
Fox-McCloud
e965a71356
Cyborg Cryo Fix
2016-12-30 19:26:02 -05:00
FalseIncarnate
953302cee5
Re-maps the battle terminals
2016-12-29 21:28:35 -05:00
Aurorablade
490eb5eb85
Crazy shit is afoot...trying to fix..
2016-12-29 20:05:09 -05:00
Aurorablade
e1fc32ebbe
i forgot to map merge....
2016-12-29 17:48:21 -05:00
Aurorablade
40333e6fe2
derpppppp
2016-12-29 17:31:10 -05:00
Aurorablade
1bc3fee0b4
derp
2016-12-29 17:11:17 -05:00
Aurorablade
992a6f7920
oatcg
2016-12-29 11:55:19 -05:00
Aurorablade
fc71122914
fixes
...
Barring any errent merge conflict fixing fuckery.
2016-12-29 11:39:18 -05:00
Aurorablade
e25ddf8329
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI
2016-12-24 00:18:40 -05:00
Aurorablade
a652ec1434
makes the old shuttle timplete more shy.
2016-12-23 23:59:39 -05:00
Markolie
6f5a1433c3
Disable alerts on ruin APC's
2016-12-23 19:11:26 +01:00
Norgad
aa9d348dcc
Appeases Fox
...
</3
2016-12-21 13:14:08 +13:00
Norgad
5f9e41be00
Fixes misaligned areas
...
<3
2016-12-20 21:56:19 +13:00
Aurorablade
d34494c043
template adjustments
2016-12-13 16:43:08 -05:00
Aurorablade
a53a716bd2
....Well i fixed IKEA shuttles anyway....
...
now just to fix docking templates without force docking it.
2016-12-05 22:07:54 -05:00
Fox-McCloud
7a55ec18fc
Merge remote-tracking branch 'upstream/master' into food-rework
2016-12-05 12:40:32 -05:00
Aurorablade
2dc1a48f35
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-12-01 22:38:35 -05:00
Aurorablade
1ef41f38f7
khhaaannnnnn
2016-12-01 22:38:04 -05:00
Aurorablade
03fa8b4775
urgh why
2016-12-01 22:30:55 -05:00
Aurorablade
0a6c001a5d
CONFLICTTTSSSSSSSSSSSSSSS KHAAANNNNNNN
2016-12-01 22:25:48 -05:00
Fox-McCloud
a1b8205fdd
food
2016-11-29 08:45:46 -05:00
KasparoVy
9737e80266
Resolves Mapping issue with Surgery. Each OR is now its own area.
...
Fixes situations where pressing the light switch in one area would turn
on/off the lights for both.
2016-11-27 20:03:00 -05:00
FreeStylaLT
b24b02a456
my arch nemesis - doors, second only to tables
2016-11-11 14:20:06 +02:00
Fox McCloud
cb652e62ad
Merge pull request #5832 from Twinmold93/fr_power
...
Fixes (Missing) Wiring + Vent and Scrubber (Paramedic)
2016-11-06 22:18:32 -05:00
Fox McCloud
288483ee52
Merge pull request #5838 from Markolie/grammarnazi
...
Fixes
2016-11-05 01:12:41 -04:00
Markolie
2b97929fab
Maint area fix
2016-11-04 16:12:16 +01:00
Twinmold
5d8a10815b
Paramedic Vent & Scrubber + Missing Medbay Wire
...
Adds a vent and scrubber to the paramedic's room, as it seems to be the
only small room on the station missing either/both of these. Also adds
the missing wire underneath the recovery ward door just above the
surgery rooms.
:cl:Twinmold
Add: Vent and scrubber to paramedic's room.
Fixes: Missing medical wire under recovery ward door.
/🆑
2016-11-02 02:36:53 -05:00
Twinmold
670eaf6888
Fixes Wire to Firing Range APC
...
Simple fix... Would have fixed it with the other PR had I been aware of
the issue. If there are other mapping issues as well, I can include them
to this PR just so we have fewer PRs filling up the space for mapping
fixes.
:cl:Twinmold
Fix: Wiring to brig firing range now a node instead of a curved wire.
/🆑
2016-11-01 03:35:36 -05:00
Twinmold
de920a0ae5
Fixes Missing Scrubber Pipe Behind Medical
...
So... Why was there a missing pipe in the scrubber line?
Fixes #5830
:cl:Twinmold
Fix: Scrubber pipe missing segment behind the operating theatres.
/🆑
2016-11-01 02:01:51 -05:00
Twinmold
284e853f7e
Fixes Fake Blood Sample on Hotel Cleaver
...
The blood sample of the cleaver in the cult room in the space hotel has
an unlisted blood sample, causing a runtime when scanned by the
detective's scanner, breaking said scanner. This fixes the variable by
turning it into a proper list without changing the underlying value. As
such, it does give 1e+009 as the readout, but otherwise works
appropriately with no runtime.
:cl:Twinmold
Fix: Fixes a runtime issue caused by using the detective's scanner on
the space hotel cleaver.
/🆑
2016-10-29 04:09:23 -05:00
Markolie
bc50f58428
Remove obsolete /hos safe from MetaStation
2016-10-27 16:18:44 +02:00
Markolie
16adf62319
Fix wildwest wall
2016-10-21 23:11:13 +02:00
