PsiOmegaDelta
1b64487f8d
More computer overlay changes.
...
Fixes #10764 and a couple other computers.
2015-08-20 08:38:43 +02:00
Ccomp5950
11eefbc4c9
Merge pull request #9856 from Hubblenaut/dev
...
Beret Resprites
2015-08-19 17:56:37 -04: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
f46fcfaf52
Adds more decals. Moving turfs now includes under/overlays.
2015-08-19 10:44:42 +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
GinjaNinja32
9f05c50a7c
Merge pull request #10732 from mwerezak/skipjack3
...
Fixes #10723
2015-08-18 18:51:37 +01: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
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
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
mwerezak
7c8c42137e
Fixes #10680
2015-08-18 02:54:13 -04:00
GinjaNinja32
5a5eb31e99
Barsigns now rotate correctly with client.dir, improved the code a bit
2015-08-18 07:18:13 +01:00
Zuhayr
80dbe49ee1
Removing unneeded defines.
2015-08-19 14:23:27 +09:30
Zuhayr
45c7934219
Floor instance cleanup.
2015-08-18 13:58:32 -07:00
Zuhayr
e3d9bc90e3
Added more colour defines, added functionality to the floor painter.
2015-08-18 13:41:04 -07:00
Zuhayr
ea56f3caa6
Minor cleanup of proxmove, changeturf, oldcode floors.
2015-08-18 12:13:52 -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
1b7f8d7be2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2015-08-18 11:32:46 -07:00
Zuhayr
71214d859e
Merge with master.
2015-08-18 11:31:10 -07:00
Zuhayr
f2b2f2a22c
Merge pull request #10711 from PsiOmegaDelta/150817-RandomShuttles
...
Admin level doors are now always of the secure variant.
2015-08-17 19:02:20 -07:00
Zuhayr
5cb06f2c00
Merge pull request #10716 from mwerezak/gamemode
...
Gamemode fixes
2015-08-17 18:50:58 -07:00
mwerezak
87da0d4eb5
Fixes missing ), "spam" class
2015-08-17 21:24:59 -04:00
mwerezak
3ea5bfb131
Makes error message print to admins instead of world
2015-08-17 21:12:40 -04:00
mwerezak
e84f693219
Fixes certain antag roles from being unspawnable
...
Fixes antag roles without certain flags from being unspawnable at round
start. Also adds more debug messages and feedback
2015-08-17 21:11:57 -04:00
mwerezak
e1f4551693
Fixes revs being unspawnable
...
The player has not been spawned yet how can they possibly be a
/mob/living/carbon/human? Also fixes spawning revs via traitor panel.
2015-08-17 21:04:23 -04:00
mwerezak
ef8e3a94a0
Fixes antag datum not respecting restricted_jobs depending on config
...
Fixes #10657
2015-08-17 21:00:22 -04:00
PsiOmega
439b976272
Admin level doors are now always of the secure variant.
...
Players keep finding ways to surprise.
2015-08-17 22:41:19 +02:00
PsiOmegaDelta
c82a0291e4
Utensil knives and spoons are no longer contraband.
...
After careful considerations by the council the law concerning Possession of a Controlled Utensil is finally abolished.
The Dinnerware vending machine now offer both utensil knives and spoons without first having to hack them.
2015-08-17 13:22:41 +02: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
Zuhayr
0e6a184f10
Merge pull request #10703 from GinjaNinja32/cryostorage
...
adds admin logs to cryostorage
2015-08-17 04:05:46 -07:00
GinjaNinja32
0c8a2b16e0
adds admin logs to cryostorage
2015-08-17 11:34:26 +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
GinjaNinja32
917f6f0250
Add Medical Equipment access to Chemists
2015-08-17 05:45:34 +01:00
Zuhayr
ac261213e9
Rewrites the floor painter.
2015-08-16 20:58:54 -07:00
Zuhayr
3f833f2b24
Reimplemented floor lights as a machine built at the autolathe.
2015-08-16 19:26:17 -07:00
Zuhayr
84c778959a
Added proper gas turfs for atmos, remapped atmos turfs.
2015-08-16 18:18:04 -07:00
Zuhayr
3b712adb5f
Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.
2015-08-16 17:51:19 -07:00
Zuhayr
23e9c7d4c9
Merge
2015-08-16 17:10:11 -07:00
mwerezak
f09b754a19
Fixes #10636
2015-08-16 15:20:59 -04:00
mwerezak
887a515483
Fixes #10659
2015-08-16 14:58:50 -04:00
mwerezak
524548cc95
Fixes #10680
2015-08-16 14:58:27 -04:00
Hubblenaut
d2e2574f07
Merge remote-tracking branch 'upstream/dev' into dev
2015-08-16 20:39:50 +02:00
