PsiOmegaDelta
2fdf859122
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-25 08:20:13 +02:00
PsiOmegaDelta
713a7bd654
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/flashlight.dm
2015-08-25 08:12:39 +02:00
PsiOmegaDelta
e29f4eb3c1
Compilation and map merge fixes.
2015-08-24 10:45:08 +02:00
PsiOmegaDelta
9057655da6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/spacesuits/void/merc.dm
code/modules/clothing/spacesuits/void/void.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/girders.dm
code/modules/mob/living/carbon/human/human_damage.dm
2015-08-24 10:23:12 +02:00
Raptor1628
59c500d01b
Adds fourth security officer slot.
...
Discussed among admins, decision was made to make this change to master
and not dev. Approval from Virgil.
2015-08-23 13:20:41 -04:00
GinjaNinja32
35238b31f0
Merge remote-tracking branch 'upstream/dev' into shredder
2015-08-22 17:26:35 +01:00
GinjaNinja32
e057a914e5
Committing paper shredders for Minijar.
...
Original message follows.
Maps In Paper Shredders.
Thanks to Zuhayr for fixing my buggery with repo's.
2015-08-22 15:52:39 +01:00
GinjaNinja32
2341d2afa9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-22 15:28:49 +01:00
mwerezak
cfa8ab3fd0
Removes bear traps from the custodial closet, adds autolathe recipe
2015-08-22 02:31:19 -04:00
PsiOmegaDelta
921015d6f3
Fixes computers with custom icon states.
...
It broke the overlay system. Also makes the power monitoring computer use the overlay system.
2015-08-21 09:50:39 +02:00
Chinsky
e9595bfbb2
Merge pull request #10769 from PsiOmegaDelta/150820-PeekingUnderTheDoorSpring
...
Decals and door tiles.
2015-08-20 19:45:12 +03:00
PsiOmegaDelta
9f0a7ed5de
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-20 15:06:26 +02:00
PsiOmegaDelta
2ccc3eb5dd
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-20 14:59:40 +02:00
PsiOmegaDelta
3e4959045b
Fixes mercenaries having lost access to their own shuttle airlock.
2015-08-20 10:00:23 +02:00
PsiOmegaDelta
1fe088aa3e
Decals and door tiles.
...
Fixes 2 instances of bad tiles under doors. Fixes #10767 .
Adds some more decals in virology because I could
2015-08-20 09:55:38 +02:00
PsiOmega
c43ce91a99
Merge remote-tracking branch 'upstream/dev' into 150819-MoreDecalsBecauseYouLoveThem
2015-08-19 18:25:41 +02:00
PsiOmegaDelta
7241b59a70
Merge remote-tracking branch 'upstream/dev' into 150819-MoreDecalsBecauseYouLoveThem
2015-08-19 10:52:04 +02:00
PsiOmegaDelta
08cf595d62
Holodeck decals.
...
Spruces up the holodecks some more. Because unsimulated carpet turfs do not auto-generate carpet borders, there are now decals for this.
Also includes a minor decal addition between cargo and the HoP's office.
Also fixes pipes displaying over the floor in the dormitories, was holofloors instead of proper flooring.
2015-08-19 10:49:20 +02:00
GinjaNinja32
a9773207b2
Merge remote-tracking branch 'upstream/dev' into client_dir
2015-08-19 09:42:48 +01:00
GinjaNinja32
03166ab4e9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-19 07:17:03 +01:00
GinjaNinja32
894b559e29
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-19 07:04:40 +01:00
Kearel
f6b6a054c5
add medic helmet
2015-08-18 13:59:25 -05:00
GinjaNinja32
9f05c50a7c
Merge pull request #10732 from mwerezak/skipjack3
...
Fixes #10723
2015-08-18 18:51:37 +01:00
PsiOmega
c13bc00a90
Map merge conflict fixes.
2015-08-18 18:34:33 +02:00
PsiOmega
e92e819bd9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-18 18:29:01 +02:00
PsiOmega
75c7313c46
On merge changes and map conflict fixes.
2015-08-18 18:19:51 +02:00
PsiOmega
8138815dc3
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-08-18 18:05:16 +02:00
GinjaNinja32
111400505d
Conveyors, signs, door buttons and crematoriums will now rotate correctly with client.dir
2015-08-18 15:48:55 +01:00
mwerezak
b361f9ad12
Fixes #10723
2015-08-18 10:28:06 -04:00
GinjaNinja32
2d5e221906
Sleepers, body scanners, intercoms, sinks, stools and fire extinguisher cabinets will now rotate correctly with client.dir
2015-08-18 14:51:59 +01:00
GinjaNinja32
a5e975ce1c
Fix cables and windows; sleepers, cryopods and donut boxes will now rotate correctly with client.dir
2015-08-18 13:43:11 +01:00
PsiOmegaDelta
d64c2890af
Fixes merge conflicts and disconnected pipes.
2015-08-18 12:55:53 +02:00
PsiOmegaDelta
7106626176
Merge remote-tracking branch 'upstream/dev' into 150818-Decals
2015-08-18 12:39:38 +02:00
PsiOmegaDelta
1ce65e0aa8
Post-merge decal cleanup.
...
Misc decal additions and merge fixes on most Z-levels.
Crescent windows were all kinds of a mess for some reason. Replaced instances with a spawner instead.
Asteroid solars were all cramped with solid walls. Gave them more space to allow for at least some power production.
Fixes warning stripe corners on all Z-levels. To correct the following search replace can be used:
/obj/effect/floor_decal/industrial/warning/corner{dir = 8} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 5}
/obj/effect/floor_decal/industrial/warning/corner{dir = 1} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 8}
/obj/effect/floor_decal/industrial/warning/corner{dir = 5} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 1}
2015-08-18 12:33:49 +02:00
PsiOmegaDelta
cf9f9bf019
Replaces fake wood floor in the bar with real wood floor.
...
Fixes #10721 .
2015-08-18 10:33:18 +02:00
mwerezak
7c8c42137e
Fixes #10680
2015-08-18 02:54:13 -04:00
Ravensdale
dbc13c423b
Changes purple pipes to black
2015-08-17 23:45:57 -07:00
Zuhayr
45c7934219
Floor instance cleanup.
2015-08-18 13:58:32 -07:00
Zuhayr
a8dc3a282b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs
2015-08-18 12:06:53 -07:00
Zuhayr
0e4c2430d1
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-08-18 11:59:50 -07:00
Zuhayr
71214d859e
Merge with master.
2015-08-18 11:31:10 -07:00
Zuhayr
b9c95148fd
Merge pull request #10688 from GinjaNinja32/chemistry-medical-equipment
...
fix access artifacts from #9263
2015-08-17 04:06:06 -07:00
GinjaNinja32
7bdbb72731
Change all misc research doors and windoors to require one of access_tox or access_robotics, rather than only access_tox or access_research
2015-08-17 11:51:05 +01:00
PsiOmegaDelta
74b8f6c3be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-08-17 09:44:21 +02:00
PsiOmegaDelta
55bc41241f
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/setup.dm
2015-08-17 09:37:49 +02:00
PsiOmegaDelta
1dcdb423c7
Merge pull request #10685 from mwerezak/skipjack
...
Fixes
2015-08-17 06:56:50 +02:00
Zuhayr
84c778959a
Added proper gas turfs for atmos, remapped atmos turfs.
2015-08-16 18:18:04 -07:00
mwerezak
524548cc95
Fixes #10680
2015-08-16 14:58:27 -04:00
