Ccomp5950
4d615fc294
Merge pull request #7271 from Segrain/dev-freeze
...
Dev-freeze fixes.
2014-12-08 20:40:02 -05: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
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
PsiOmegaDelta
79cd5f6430
Merge pull request #7251 from Loganbacca/implantfix
...
Implant fixes/cleanup
2014-12-07 22:05:14 +01:00
Zuhayr
a7d526f8b1
Fixes #7119
2014-12-08 03:51:21 +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
958eb62ed5
Refactors a lot of reused/redundant death code, fixes #7224
2014-12-07 17:18:56 +10:30
Zuhayr
2b525372f1
Fixes #7238
2014-12-07 11:52:29 +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
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
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
83a482a548
Makes secure airlock electronics available from the circuit imprinter
2014-12-04 13:28:26 -05:00
Amunak
e8c41b38f7
Fixed the message for admins when they use 'ghost'.
...
Just for clarity, because I'm bad at English. Props to Omega for the wording.
2014-12-04 12:58:32 +01:00
PsiOmega
1f9cb08102
Syndicate borg code refactoring.
...
Refactors the borg syndicate code to be more accessible to adminbus.
Syndicate borgs have a jetpack module.
Overrides canUseTopic() to limit what the Syndi-borg can interact.
Still has all access, may be more limited in the future if Bump() is refactored /tg/ style. Admins: Spawn with care.
2014-12-04 12:56:29 +01:00
Amunak
ab01b270a7
Added missing EOL in observer.dm
2014-12-04 11:51:31 +01:00
Amunak
39c6e3e431
Ghosts/observers now have the option to be anonymous in deadchat.
...
It is a ghost-time preference that doesn't get saved. Admins see anonymous ghosts with a * next to their key. People talking in dead bodies are now always seen only with the name of their body (admins see their keys with a ^).
2014-12-04 11:46:31 +01:00
Amunak
9fe0cdac28
Admins will now receive a prompt to use aghost when they use ghost.
...
It replaces the usual prompt that was irrelevant to admins anyway. Adds option for admins to aghost from the ghost prompt.
2014-12-04 11:35:04 +01:00
Loganbacca
fd53575658
Implant cases
...
- Adds freedom implant in glass case variant
- Changes implants created from protolathe to variants in glass cases
2014-12-04 20:48:45 +13:00
Ccomp5950
19bbc4a004
Merge pull request #7212 from Loganbacca/ducttape
...
Duct Tape
2014-12-02 20:32:04 -05:00
Ccomp5950
25224491ce
Merge pull request #7195 from PsiOmegaDelta/BloodDrive
...
Cargo can now order empty blood packs.
2014-12-02 20:31:04 -05:00
Ccomp5950
f1c77dcb16
Merge pull request #7190 from PsiOmegaDelta/Topic
...
Fixes exploit that lets AIs use machinery even after cameras are disabled.
2014-12-02 20:29:47 -05:00
Snapshot
867e69c770
Merge pull request #7210 from Zuhayr/dev
...
Fixes #7209
2014-12-02 17:23:19 -08:00
Snapshot
378936c1a3
Merge pull request #7211 from Loganbacca/rigui
...
Hardsuit NanoUI rewrite
2014-12-02 17:14:46 -08:00
PsiOmegaDelta
4582c0038b
Merge pull request #7205 from Mloc/bs12-setdir
...
refactor 'dir = ' into 'set_dir()'
2014-12-02 14:38:31 +01:00
Loganbacca
224b2f3899
Duct Tape
...
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
2014-12-02 23:17:45 +13:00
Loganbacca
3988b96459
Rig activate message fix
...
Electrowarfare and power sink modules weren't displaying the correct activate string message. Fixed both.
2014-12-02 22:24:00 +13:00
Loganbacca
9fb58d8568
Third rig UI pass
...
- Resized the initial ui window again
- Rewrote the modules section to a horizontal layout
2014-12-02 22:23:59 +13:00
Loganbacca
0f2b0b79bd
Initial rig ui pass
...
- Narrowed UI window, we shouldn't need it this wide once I'm done
- Started converting html template to divs for easier formatting
2014-12-02 22:23:59 +13:00
PsiOmegaDelta
b05c966b64
Merge pull request #7198 from atlantiscze/interactions
...
(mostly) silicon adjustments/features
2014-12-02 07:20:58 +01:00
PsiOmegaDelta
d6ea2b887a
Merge pull request #7201 from SparklySheep/patch-9
...
Adds pAI cards to the loadout.
2014-12-02 07:20:50 +01:00
Zuhayr
8e2b0978a8
Fixes #7209
2014-12-02 11:26:44 +10:30
