Zuhayr
ff2c23714f
Bunch of diona nymph tweaks/fixes.
2014-12-09 20:52:41 +10:30
PsiOmegaDelta
f9e59d430b
Merge pull request #7329 from mwerezak/talisman
...
Adds image for cult talismans
2014-12-09 07:26:10 +01:00
Ccomp5950
6ade2b46a0
Merge pull request #7282 from mwerezak/tape-roll
...
Adds tape rolls to the tool storage spawner list
2014-12-08 20:46:58 -05:00
mwerezak
81890c968e
Adds image for cult talismans
...
So they aren't blank when examined.
2014-12-08 20:45:15 -05:00
Ccomp5950
d8fb78b711
Merge pull request #7326 from Raptor1628/dev-freeze
...
Hardsuit Fixes
2014-12-08 20:43:56 -05:00
Ccomp5950
0b56714123
Merge pull request #7321 from GinjaNinja32/cryothing
...
Cryo computer is now walkable.
2014-12-08 20:43:38 -05:00
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
Raptor1628
921249a335
Hardsuit Fixes
...
Should merge now, was missing the .dme. Fixes #7307 . Adds helmet cameras
for ERT and nukeops. Fixes incorrect lighting overlays. Fixes a weird
sprite.
2014-12-08 19:12:39 -05:00
GinjaNinja32
362af29cbc
Fixes #7320
2014-12-08 20:11:07 +00:00
sabiram
b27adda1c3
Potentially fixes white sundress
2014-12-08 14:30:03 -05:00
Mloc
17476b5e3d
Merge pull request #7313 from GinjaNinja32/viro
...
Fix virologists spawning without jumpsuits, IDs or PDAs. Fixes #7312 .
2014-12-08 18:51:14 +00:00
GinjaNinja32
eb2a62c11b
Fix virologists spawning without jumpsuits, IDs or PDAs. Fixes #7312 .
2014-12-08 18:48:14 +00:00
PsiOmegaDelta
3819bc6f27
Merge pull request #7305 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2014-12-08 17:50:30 +01: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
PsiOmegaDelta
a817ef8953
Merge pull request #7302 from Zuhayr/master
...
Fixes #7301 , merge ASAP
2014-12-08 17:08:16 +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
Zuhayr
499c30f8aa
Merge pull request #7296 from Mloc/bs12-arrgh
...
fix some misplaced set_dir()s
2014-12-08 20:54:51 +10:30
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
Zuhayr
f34803ac33
Merge pull request #7281 from mwerezak/nukeops-airlock
...
Fixes #7279
2014-12-08 19:52:23 +10:30
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
mwerezak
d506eca89a
Adds tape rolls to the tool storage spawner list
2014-12-08 00:15:27 -05:00
mwerezak
52d0604001
Fixes #7279
2014-12-08 00:13:16 -05:00
Zuhayr
1245bb6291
Merge pull request #7273 from Zuhayr/dev-freeze
...
Dev freeze
2014-12-08 13:02:43 +10:30
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
d6640771b1
Merge pull request #7265 from Zuhayr/dev-freeze
...
Dev-freeze fixes.
2014-12-07 19:39:40 -05: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