Bjorn Neergaard
f52cf6fd2a
Improve Attack animations
...
Ported my own animations from Bay.
Also improved code for /atom/movable/do_attack_animation.
2015-11-28 21:29:24 -06:00
PKPenguin321
8e09b00f2c
Merged upstream
2015-11-28 15:49:41 -08:00
duncathan salt
123994bf8d
Merge pull request #13290 from neersighted/nanoui_update
...
Fix up NanoUI states; add snowflake for Drones
2015-11-28 16:42:19 -06:00
Bjorn Neergaard
959b96b16d
Fix up NanoUI states; add snowflake for Drones
...
Drones are simple_animals?! Why?!
This should let drones use all the things. They have to be nearby,
though.
2015-11-28 12:27:42 -05:00
Razharas
e715e1cc57
Merge pull request #13195 from neersighted/nanoui_update
...
[WIP|DNM] Update NanoUI
2015-11-28 14:17:49 +03:00
Bjorn Neergaard
6005d54d40
Update NanoUI to use the asset_cache system
...
Also move a bunch of folders around.
2015-11-28 00:56:30 -05:00
Bjorn Neergaard
2feedfa009
Update Cryo, NanoUI states, add new contains() helper
2015-11-27 21:21:52 -05:00
Dorsisdwarf
592553354f
Merge pull request #12899 from TechnoAlchemisto/master
...
Makes cloaks into Exosuits as god(I) intended.v2
2015-11-27 22:22:47 +00:00
Remie Richards
53c7f8920b
Merge pull request #13260 from KorPhaeron/godwillsit
...
Updated Templar Armour
2015-11-27 21:00:58 +00:00
Remie Richards
b6209e4508
Merge pull request #13139 from AnturK/XXXFREEINSULATEDSWITHEVERYPURCHASEXXX
...
Adds Send To All to Lawyer/Captain cartridges
2015-11-27 20:58:03 +00:00
Remie Richards
cce47616c0
Merge pull request #13217 from AnturK/shuttlelight
...
Makes shuttle turf copy use proper helper.
2015-11-27 20:56:55 +00:00
Remie Richards
f55246e5c0
Merge pull request #12987 from AnturK/turrets
...
Removes gun_turret type and makes turret controls buildable
2015-11-27 20:52:59 +00:00
Remie Richards
62d301bfe5
Merge pull request #12998 from YotaXP/drone-fixes
...
Allows drones to use 'pick up' and watertanks
2015-11-27 20:38:23 +00:00
Bjorn Neergaard
5f108eef4e
Merge remote-tracking branch 'tgstation/master' into nanoui_update
2015-11-27 15:31:35 -05:00
Bjorn Neergaard
b897fb6d72
Fix NanoUIs flashing, update Tanks, Solars, and Canisters
2015-11-27 15:30:18 -05:00
KorPhaeron
49ad07b58c
Aligns helmet properly
2015-11-27 14:28:44 -06:00
Remie Richards
efd06ba92f
Merge pull request #13165 from Menshin/login_runtimes_fix
...
Fixes login runtimes for round start observers
2015-11-27 20:14:49 +00:00
Remie Richards
fdede51a09
Merge pull request #12954 from MMMiracles/spookycaves
...
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
KorPhaeron
86e98947c3
Updated Templar Armour
2015-11-27 14:01:25 -06:00
duncathan salt
383e77db8a
Merge pull request #13220 from KorPhaeron/godwillsit
...
Adds knight armour
2015-11-27 13:58:08 -06:00
KorPhaeron
79550bf8ac
Updated sprites
2015-11-27 13:34:23 -06:00
phil235
c88a975c0e
Merge pull request #13242 from Anonus/colorsfix
...
Fixes revenant blight not resetting mutantrace colors properly
2015-11-27 18:05:47 +01:00
phil235
da0ba3659f
Merge pull request #13239 from AnturK/animalbots
...
Simple Animal Bots - Beepsky strikes back.
2015-11-27 17:37:59 +01:00
AnturK
2ae759486c
Fixes
2015-11-27 17:15:55 +01:00
Bjorn Neergaard
83a2d64b25
Update NanoUI Javascript libraries, SMES UI
2015-11-27 01:13:30 -05:00
Bjorn Neergaard
6a6262d6b2
Finish refactor/retooling of NanoUI core
...
Also:
* Fix NanoUI on IE11+
* Add missing files (oops!)
2015-11-26 22:17:53 -05:00
PKPenguin321
cf29721672
fixes conflicts, adds the ability to remove the crystal from the prod via using it when no cell is attached
2015-11-26 18:28:12 -08:00
PKPenguin321
7e640d3463
Merge branch 'master' of https://github.com/tgstation/-tg-station into teleprods
2015-11-26 17:42:59 -08:00
Cheridan
762568255d
Merge pull request #13102 from bgobandit/newmininggear
...
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
2015-11-26 18:11:26 -06:00
AnturK
e36853d7c9
Convert bots to simple animals - Updated 7.0
2015-11-26 22:06:07 +01:00
Razharas
1192aff396
Merge pull request #13205 from JJRcop/i12051
...
Makes golems immune to electric shock again
2015-11-26 23:38:33 +03:00
Bjorn Neergaard
9ce7bf442e
Further UI Improvements
...
Finish redesign of APC and Air Alarm
2015-11-26 12:41:16 -05:00
MMMiracles
0576bc9a0e
final changes, everything works oh boy.
2015-11-26 10:54:21 -05:00
Nerd Lord
a1e74ef1ba
Fixes revenant blight not resetting mutantrace colors properly.
...
Also updates revenant tips.
2015-11-26 10:04:43 -05:00
Bjorn Neergaard
94e114fee7
Correct several oversights
2015-11-26 07:11:32 -05:00
Bjorn Neergaard
588a170c8d
Fix NanoUI debug verb
2015-11-26 07:11:32 -05:00
Bjorn Neergaard
1a44e3d851
Refactor NanoUI API
...
Also update NanoUI-using code to the new API.
2015-11-26 07:11:31 -05:00
Bjorn Neergaard
5e9c0adc3b
Add NanoUI debug verb
...
A quick tool that helps me reload templates.
Also refactor NanoUI resource code a bit.
2015-11-26 07:11:29 -05:00
Bjorn Neergaard
a1bae60b25
Remove Bay's minimap-generating code.
...
We have our own in the crew computer we will use.
2015-11-26 07:11:28 -05:00
Bjorn Neergaard
56e359efb8
Refactor JSON
...
* Move into seperate module
* Use aboslute pathing
2015-11-26 07:11:28 -05:00
Bjorn Neergaard
4e5edf396a
Update NanoUI
...
* Update NanoUI to the latest version, ported from Baystation12
* Update the Air Alarm UI
* Make changes to subsystems and some machines to make the new NanoUI
work
2015-11-26 07:11:27 -05:00
Aranclanos
be5d864640
Merge pull request #13176 from neersighted/borg_toner
...
Make Cyborg Toner refillable by Rechargers.
2015-11-26 08:32:39 -03:00
Aranclanos
64b7ec13da
Merge pull request #13206 from JJRcop/i12121
...
Fixes camera taking pictures when you try to put them on a table
2015-11-26 07:09:58 -03:00
MMMiracles
2d94b0ff9b
feedback changes:
...
added more loot
nerfed the spawn rates and health of the spawners
widened the paths of some areas for lava passages
added a medbay area to the first level incase of stupid people not coming prepared
added 2 mining rigsuits, may be difficult to get though
fixed(?) issues with dicklys drilling ladders and basalt floors causing issues
2015-11-25 23:24:42 -05:00
PKPenguin321
10f9e4af4f
adds teleprods, a way to make them with bluespace crystals and a stunprod, and a tablecrafting recipe
2015-11-25 18:36:09 -08:00
MMMiracles
ef7dc5c6b2
rip hole, map is ready.
...
added spawners for all mining mobs.
2015-11-25 18:32:05 -05:00
YotaXP
9fe9c2faa4
Remove side effects from Character Setup
2015-11-25 18:06:05 -05:00
KorPhaeron
c8f3ca728f
Adds Knight Armour
2015-11-25 15:46:54 -06:00
AnturK
d71e310390
Makes shuttle turf copy use proper helper.
2015-11-25 21:19:36 +01:00
Kyle Spier-Swenson
17d67bbf67
Fixes clients sometimes not getting verbs for a while
2015-11-25 10:28:30 -08:00
