Commit Graph

9354 Commits

Author SHA1 Message Date
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
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
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
Zuhayr
17f32c3ab3 Replacing a loop with the older code. 2014-12-02 02:58:26 +10:30
Zuhayr
33406d6e47 Removing macros. 2014-12-02 02:51:14 +10:30
Zuhayr
42c6efbc61 Fixes most of #7206, fixes #7200, fixes #7184 2014-12-02 02:34:34 +10:30
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
Zuhayr
8240f14176 Fixes #7185, works on #7184 2014-12-01 23:55:03 +10:30
PsiOmegaDelta
a1a66870ca Merge pull request #7203 from Zuhayr/unarmed
Refactoring the context-based combat PR v2
2014-12-01 11:17:14 +01:00
Zuhayr
487117a0ae Reverting a now unneeded var change. 2014-12-01 20:42:32 +10:30
Zuhayr
bee0b9d23d Tweaks after testing. 2014-12-01 20:20:30 +10:30
Zuhayr
d65ead4f7e Changed \red to span in unarmed_attack.dm. 2014-12-01 20:10:27 +10:30
Zuhayr
0ae473b6ea Removed antag role buffs. 2014-12-01 20:06:43 +10:30
Zuhayr
855f75bd3c Removed magboot stomp. 2014-12-01 20:03:08 +10:30
PsiOmegaDelta
e18d5f51f9 Merge pull request #7172 from Neerti/11_29_14_minor_borg_drone_changes
Minor changes to drone borg sprite.
2014-12-01 06:46:46 +01:00
PsiOmegaDelta
651008b822 Merge pull request #7176 from Amunak/super-patch
Supermatter fixes, code cleanup and refactoring. Shards don't announce anything.
2014-12-01 06:46:28 +01:00
SparklySheep
f8bc1708af Lowered to 2 points. 2014-11-30 23:20:24 -06:00
SparklySheep
0a43dd0860 Adds pAI cards to the loadout. 2014-11-30 23:12:04 -06:00
Zuhayr
016a9d8ba2 Merge branch 'unarmed' of https://github.com/Zuhayr/Baystation12 into unarmed 2014-12-01 15:33:07 +10:30
PsiOmegaDelta
e5c5209f7a Merge pull request #7183 from Zuhayr/dev
Hardsuit fixes.
2014-12-01 05:58:24 +01:00
Atlantiscze
64f9a502f9 Mining robot module upgrade
- Mining cyborgs can now properly work with drills.
- Mining cyborgs have received ore scanner, crowbar, and limited version of magnetic gripper.
- Mining cyborgs can now swap power cells inside mining drills, as well as upgrade them if provided better parts.
- As a bonus, cyborgs can now see how much ore is in ore boxes (because it makes sense that cyborg which mined ton of ore can check how much ore it mined)
2014-12-01 05:11:35 +01:00
Atlantiscze
166288293b Cyborg Atmospherics Tools!
- Matter Decompiler now clears unused pipe assemblies. Long gone are the times where cyborgs couldn't remove old pipe parts.
- Engineering and Construction cyborgs now have pipe painter tool, which allows them to paint pipes properly.
2014-12-01 03:39:36 +01:00