Ccomp5950
628f040f00
Merge pull request #7318 from sabiram/patch-1
...
Potentially fixes white sundress
2014-12-08 20:43:25 -05:00
Ccomp5950
4d615fc294
Merge pull request #7271 from Segrain/dev-freeze
...
Dev-freeze fixes.
2014-12-08 20:40:02 -05:00
sabiram
b27adda1c3
Potentially fixes white sundress
2014-12-08 14:30:03 -05:00
GinjaNinja32
eb2a62c11b
Fix virologists spawning without jumpsuits, IDs or PDAs. Fixes #7312 .
2014-12-08 18:48:14 +00:00
PsiOmega
4d6d74b859
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/portable_turret.dm
2014-12-08 17:37:42 +01:00
Zuhayr
a2d3a0055e
Fixes #7301
2014-12-09 02:35:46 +10:30
Mloc
efe78df3ff
Merge pull request #7299 from Loganbacca/freezefix
...
Fixes omni-filters not working
2014-12-08 13:17:36 +00:00
Loganbacca
92c81aa958
Fixes omni-filters not working
2014-12-09 01:15:10 +13:00
Mloc
83f2a5ba5a
fix some misplaced set_dir()s
...
fixes part of #7284
fixes #7288
fixes one of #7287
Signed-off-by: Mloc <colmohici@gmail.com >
2014-12-08 10:09:09 +00:00
Segrain
7f1b5f0603
Fix for #7285 .
2014-12-08 11:20:46 +03:00
PsiOmegaDelta
e66f5ed765
Merge pull request #7272 from Raptor1628/dev-freeze
...
Hardsuit Mark Two, more Hulabaloo
2014-12-08 06:45:11 +01:00
Zuhayr
3c66bd3920
Merge resolution.
2014-12-08 13:01:04 +10:30
Raptor1628
75659ab66a
Hardsuit Mark Two, more Hulabaloo
...
Adds all sprites for the nukeop and research hardsuit. Shuffles around
hardsuit spawns and gear so they make sense, especially for the ERT,
they still only have two hardsuits per department, but there are enough
magboots and vests for the people who need the regular armor. Added the
medical hardsuit and its attendant gear to the station hardsuit list.
Added all of the xenoarch gear to the hazmat hardsuit for Zuh. Moves
some suit storage things around as they were lost somewhere along the
way since I committed them. Moves the Hazard Suit custom item over to
hardsuit code to prep for them being buildable on station at some point.
For now has the same stats as a voidsuit, no modules, just drains power
and has some extra pretty sprites. Sending this over to dev freeze
because most of it is required for hardsuits to be nice and pretty for
master. Now compatible with latest fixes.
2014-12-07 21:25:08 -05:00
Segrain
e0ab31756d
Fix for double definition.
2014-12-08 04:01:00 +03:00
Segrain
639c61721b
Fix for #7261 .
2014-12-08 03:58:42 +03:00
Segrain
aa575b446a
Fix for #7260 .
2014-12-08 03:57:02 +03:00
Ccomp5950
b4becaa587
Merge pull request #7264 from Zuhayr/master
...
Fixes, death refactor.
2014-12-07 19:38:21 -05:00
Zuhayr
b556609e27
Replaces some macros.
2014-12-08 10:34:36 +10:30
PsiOmegaDelta
5b6d3ab55a
Merge pull request #7263 from mwerezak/hydrotray
...
Fixes atoms with no flags set being walkable
2014-12-07 22:06:10 +01:00
PsiOmegaDelta
79cd5f6430
Merge pull request #7251 from Loganbacca/implantfix
...
Implant fixes/cleanup
2014-12-07 22:05:14 +01:00
PsiOmegaDelta
a0117facef
Merge pull request #7256 from mwerezak/shuttle
...
Makes forced launch handled by shuttle/process()
2014-12-07 22:02:36 +01:00
Zuhayr
dfca49c900
Fixes #7105
2014-12-08 05:14:04 +10:30
Zuhayr
1211360118
Fixes #6974
2014-12-08 05:00:54 +10:30
Zuhayr
17a8c59ff9
Fixes #7151
2014-12-08 04:37:07 +10:30
Zuhayr
7ff46d64fb
Fixes #7162 . Eject ID verb for laptops is still busted though.
2014-12-08 04:22:56 +10:30
Zuhayr
a7d526f8b1
Fixes #7119
2014-12-08 03:51:21 +10:30
Zuhayr
74db269c40
Fixes #7266
2014-12-08 03:51:01 +10:30
Zuhayr
1176510fb2
Amendments to previous commit.
2014-12-08 03:29:03 +10:30
Zuhayr
b30be0a352
Fixes #7199
2014-12-07 22:13:31 +10:30
Zuhayr
be562e675c
Actually fixes scanners.
2014-12-07 21:29:30 +10:30
Zuhayr
0fe2159f86
Fixes #7092
2014-12-07 21:21:00 +10:30
Zuhayr
35f5bb16c9
Fixes #7188
2014-12-07 21:20:47 +10:30
Zuhayr
e4a332c5b6
Fixes #7262
2014-12-07 21:20:24 +10:30
Zuhayr
a7ce13f49d
Fixes #7223 and #6966 , adds inhand and suit sprites for nymphs.
2014-12-07 20:44:11 +10:30
Zuhayr
117dd18284
Adjusted ninja spawn proc to check rig internals.
2014-12-07 20:13:59 +10:30
Zuhayr
3715dd6817
Shuffling some items around to ensure spawn
2014-12-07 20:01:43 +10:30
Zuhayr
54ba518762
Fixes #7253
2014-12-07 18:51:20 +10:30
Zuhayr
958eb62ed5
Refactors a lot of reused/redundant death code, fixes #7224
2014-12-07 17:18:56 +10:30
mwerezak
3002de4b50
Fixes atoms with no flags being walkable
...
Fixes atoms that have no flags set allowing movement into them
regardless of CanPass().
2014-12-07 00:59:07 -05:00
Zuhayr
2b525372f1
Fixes #7238
2014-12-07 11:52:29 +10:30
Zuhayr
1dc68e22bc
Merge pull request #7258 from Baystation12/master
...
Updating dev-freeze from master.
2014-12-07 11:28:27 +10:30
mwerezak
550e5f63ea
Makes forced launch handled by shuttle/process()
...
Forced launches are now run by the shuttle controller through process()
instead of in a separate 'thread' launched from the ui.
2014-12-06 18:07:21 -05:00
Segrain
8df3e41788
Fix for #7204 .
2014-12-06 18:08:12 +03:00
Segrain
bb4f81e443
Fix for #7232 .
2014-12-06 18:01:31 +03:00
Loganbacca
b3e0cc98cd
Implantcase cleanup
...
- Removed unnecessary icon definitions
- Cleaned up name formatting
- Removed colons
- Added variants for existing implants
2014-12-06 16:20:16 +13:00
Loganbacca
ad6828e70a
Update implantcase.dm to absolute paths
2014-12-06 16:17:07 +13:00
GinjaNinja32
95c2b09c94
Fix num2hex()'s handling of zero
2014-12-06 02:20:11 +00:00
Zuhayr
ba1f4a8f03
Merge pull request #7248 from Baystation12/master
...
Master into dev.
2014-12-06 12:18:13 +10:30
Chinsky
60fcda13e7
Merge pull request #7241 from GinjaNinja32/slimefix
...
Fixes invisible slimes.
2014-12-06 04:23:43 +03:00
Chinsky
91cbd95838
Merge pull request #7237 from PsiOmegaDelta/PunchTheKeysForGodsSake
...
Fixes #7233 .
2014-12-06 04:23:31 +03:00
