Zuhayr
3c66bd3920
Merge resolution.
2014-12-08 13:01:04 +10:30
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
Chinsky
92a88b8a23
Merge pull request #7243 from mwerezak/h2h
...
Unarmed attacks
2014-12-06 04:23:23 +03:00
mwerezak
032308fb9d
Fixes #7213 restoring unarmed damage to previous values, adjusts unarmed attack logs.
...
Unarmed attack messages no longer assume every attack verb ends with -ed.
2014-12-05 18:10:39 -05:00
GinjaNinja32
e8eb73a3c4
Fixes invisible slimes
2014-12-05 20:50:33 +00:00
PsiOmega
d400f9d174
Encrpytion!
...
This misspelling was about to drive me insane.
2014-12-05 20:27:28 +01:00
Zuhayr
93805d5742
Merge pull request #7225 from PsiOmegaDelta/SyndiBorg
...
Syndicate borg code refactoring.
2014-12-05 23:37:31 +10:30
PsiOmegaDelta
422ff9b39e
Merge pull request #7236 from mwerezak/ops-docking
...
Remaps the nuke ops shuttle for station docking
2014-12-05 13:57:31 +01:00
Zuhayr
d5c5418384
Merge pull request #7226 from Amunak/chat-shenanigans
...
Minor changes for ghosts, added verb to remain anonymous
2014-12-05 23:26:11 +10:30
PsiOmega
4a0536bca7
Fixes #7233 .
...
Making sure the skills list is always initiated, even when not created as a player mob.
2014-12-05 11:55:16 +01:00
mwerezak
5b1f7695e3
Remaps the nuke ops shuttle for station docking
...
Adjusts the shuttle to incorporate a nice, 2-tile wide docking hatch.
Drops the viro/xenobio docking arm.
Adds a button so that the teleporter blast door can be operated
independently of the airlock blast door.
Fixes some leftover arrivals area just hanging around in space.
Adds a poster specifically for the nuke ops shuttle.
2014-12-05 01:17:17 -05:00
mwerezak
3dc947806f
Cameras now use the broken circuitboard item as well.
2014-12-04 17:16:56 -05:00
mwerezak
89cef05a19
Merge remote-tracking branch 'upstream/dev' into secure-airlock
2014-12-04 17:15:27 -05:00
mwerezak
674817ff0b
The wire datum UI now indicates if the wires have been randomized.
2014-12-04 16:49:18 -05:00
mwerezak
58f227ec69
Cleans up airlock electronics
...
Removes the icon_state hack
Moves airlock electronics creation into it's own proc.
Moved airlock creation from a door assembly to airlock/New()
2014-12-04 16:40:27 -05:00
mwerezak
83a482a548
Makes secure airlock electronics available from the circuit imprinter
2014-12-04 13:28:26 -05:00
PsiOmega
201d2f42a3
Merge remote-tracking branch 'upstream/dev' into Beds
2014-12-04 14:12:54 +01:00
