PsiOmegaDelta
a0a09c04e4
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
2015-08-20 14:09:07 +02:00
Zuhayr
c8b6813426
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
...
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
Zuhayr
fd007cdea0
Merge pull request #10765 from PsiOmegaDelta/150820-ComputerOverlays
...
More computer overlay changes.
2015-08-20 19:18:13 +09:30
GinjaNinja32
dc35b0e717
fix wonky diagonal inputs
2015-08-20 09:42:48 +01:00
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
mwerezak
0d9ef708d5
Merge pull request #9905 from GinjaNinja32/jumpskirt
...
Adds SilveryFerret's Robotics Jumpskirt as a general custom loadout item
2015-08-18 16:55:47 -04:00
GinjaNinja32
f950ded9af
Merge pull request #10737 from PsiOmegaDelta/150818-RealFunny
...
Another Hurt/Harm fix.
2015-08-18 18:52:09 +01:00
GinjaNinja32
9f05c50a7c
Merge pull request #10732 from mwerezak/skipjack3
...
Fixes #10723
2015-08-18 18:51:37 +01:00
GinjaNinja32
1957029890
HUD cleanup, human/monkey HUD now turns correctly with client.dir
2015-08-18 18:21:25 +01:00
PsiOmega
0d10d53b65
Another Hurt/Harm fix.
...
Apparently clicking the intents directly or cycling through them updates the icons differently. Nice.
2015-08-18 18:41:24 +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
912f689e51
Diagonal, ctrl+dir, and alt+dir actions are now consistent with client.dir
2015-08-18 16:05:37 +01: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
Kelenius
cf78446463
Fixes #10730
2015-08-18 16:10:25 +03: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
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
Kelenius
afc5414ed9
Removes a few outdated mob mentions. Fixes a few things. Almost definitely fixes #7570 .
2015-08-18 10:48:22 +03: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
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
a896991657
Even comments need matching spans for Travis to pass.
2015-08-18 11:55:43 -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
GinjaNinja32
29be304c89
Merge pull request #10640 from Karolis2011/map_capture
...
Added map capture tool
2015-08-18 02:51:56 +01:00
Zuhayr
b6e7d33f3d
Merge pull request #10715 from GinjaNinja32/irc
...
Adds settable rank to IRC messages, changes it so non-admins can see …
2015-08-17 18:51:53 -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
GinjaNinja32
f0c8db3d0f
Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs
2015-08-18 02:16:50 +01: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
dadc6e4b77
Adds logging for admin spawning antags
2015-08-17 21:10:24 -04:00
