PsiOmega
52e6f96dc7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-09 17:55:14 +01:00
Zuhayr
39f303c50e
Actually fixes hardsuit back icons.
2014-12-10 02:37:23 +10:30
Zuhayr
e80f59742d
Fixes #7316
2014-12-10 00:56:26 +10:30
PsiOmegaDelta
63a5d009c7
Merge pull request #7267 from GinjaNinja32/noise
...
Audible emote improvement, adds ability to emote over radio.
2014-12-09 11:54:57 +01:00
Zuhayr
7bc72fb836
Tidied up/fixed up the rig back icons.
2014-12-09 21:01:17 +10:30
Ccomp5950
d8fb78b711
Merge pull request #7326 from Raptor1628/dev-freeze
...
Hardsuit Fixes
2014-12-08 20:43:56 -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
sabiram
b27adda1c3
Potentially fixes white sundress
2014-12-08 14:30:03 -05:00
GinjaNinja32
681a6d21ea
Merge remote-tracking branch 'upstream/dev' into !
...
Conflicts:
code/modules/mob/hear_say.dm
2014-12-08 15:32:49 +00:00
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
GinjaNinja32
6a975a1e6a
Noise emotes
...
Conflicts:
code/modules/mob/living/carbon/brain/say.dm
2014-12-07 12:09:02 +00:00
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
35f5bb16c9
Fixes #7188
2014-12-07 21:20:47 +10:30
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
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
Zuhayr
8e2b0978a8
Fixes #7209
2014-12-02 11:26:44 +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
Zuhayr
855f75bd3c
Removed magboot stomp.
2014-12-01 20:03:08 +10:30
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
Zuhayr
0903bd7fc5
Working on some suit bugs, attempted to fix the welding overlay issue with no success.
2014-12-01 01:51:52 +10:30
Zuhayr
9b5235016b
Set the hazmat rig to use the medical rig icon for now. Woo placeholder sprites.
2014-11-30 23:50:54 +10:30
Zuhayr
3a312b4a03
Fixes #7179
2014-11-30 23:49:55 +10:30
Zuhayr
a5ee32d4ca
Fixes some colour macros, removes inactive jetpack icon for rigs.
2014-11-30 23:47:34 +10:30
Zuhayr
7703b0f4c0
Fixes #7186
2014-11-30 23:47:12 +10:30
Zuhayr
4c1ea8cd3a
Several hardsuit fixes.
2014-11-30 12:46:03 +10:30
Zuhayr
c7973e0ab2
Made suit boots children of magboots.
2014-11-30 11:12:15 +10:30
Zuhayr
1500dbd505
Fixes #7128
2014-11-30 10:52:35 +10:30
PsiOmega
c14411d979
Robots can now be rebuilt after destruction.
...
Robotic borgs now have a circuit which can be re-installed in a new chassi after the destruction of the original.
2014-11-27 08:58:29 +01:00
Zuhayr
4722c9a864
WIP on refactoring the context-based combat PR
2014-11-24 12:05:18 +10:30
PsiOmegaDelta
c8e00f3e20
Merge pull request #7089 from sabiram/dev
...
Moves my (sabirm)'s custom item to common loadout pool
2014-11-23 18:08:16 +01:00
PsiOmegaDelta
46a1a7c320
Merge pull request #7101 from MagmaRam/sprites
...
Adds inhand sprites for the captain's tunic and jacket
2014-11-23 12:05:45 +01:00
PsiOmegaDelta
d9aae79a32
Merge pull request #7008 from Zuhayr/spaceninjas
...
Hardsuit/voidsuit change, ninja refactor.
2014-11-22 09:30:54 +01:00
Ccomp5950
3ca02037ef
Merge pull request #7088 from mwerezak/skrell
...
Implements skrell changes for Searif
2014-11-22 03:23:41 -05:00
Zuhayr
1c35f8825b
Dummied out the AI movement code for a later project.
2014-11-22 08:04:06 +10:30
Zuhayr
05922375c5
Added the remaining missing icons (shitty codersprites, pls fix spriters)
2014-11-22 07:57:34 +10:30
Zuhayr
c8e8e663f9
Merge resolution.
2014-11-22 07:31:44 +10:30
MagmaRam
ee4ea4977c
Adds inhand sprites for the captain's tunic and jacket
2014-11-21 08:14:57 -05:00
PsiOmegaDelta
350273dea4
Merge pull request #7071 from Segrain/dev
...
Equipping custom loadout.
2014-11-21 08:03:24 +01:00
sabiram
bdf4905289
I am dumb
...
It is what it is.
2014-11-20 17:08:24 -05:00
sabiram
f5a196b930
Removes extra breaks
...
I am dumb
2014-11-20 16:26:31 -05:00
sabiram
5d461f4976
Custom item deleted and added to loadout pool
2014-11-20 16:18:35 -05:00
