MMMiracles
cde4df61ae
conFLICTS
2015-12-16 06:26:54 -05:00
MMMiracles
aedb522c7d
wake me up
2015-12-16 06:09:01 -05:00
Jordie
ab2f151773
Merge pull request #13581 from Anonus/flipless
...
Dualsabers will now make you flip only twice, instead of up to twelve times.
2015-12-16 22:01:28 +11:00
Jordie
9ea34b4931
Merge pull request #13645 from bgobandit/aicamerafix
...
AIs with wireless disabled will no longer be able to read papers held up to cameras.
2015-12-16 21:37:03 +11:00
Jordie
6032c3957b
Merge pull request #13644 from bgobandit/fixedtoys
...
FIXES CHRISTMAS
2015-12-16 21:35:23 +11:00
Jordie
b8925a1b49
Merge pull request #13621 from xxalpha/airlox
...
Added maintenance glass airlock and external glass airlock.
2015-12-16 21:34:24 +11:00
tkdrg
a2aee48ece
Merge pull request #13609 from AnturK/runtimes
...
Fixes for few runtime errors
2015-12-16 04:15:21 -03:00
Tkdrg
277effe056
Merge branch 'Shadowlight213-Syndiesecure' into master
2015-12-16 03:12:46 -03:00
Shadowlight213
89189b720e
Changes to use defines
2015-12-16 03:02:03 -03:00
Razharas
9dac032681
Merge pull request #13507 from neersighted/nanoui_compat
...
NanoUI 3.0!
2015-12-16 07:43:29 +03:00
Bjorn Neergaard
da4842dddf
Make NanoUI resistant to Topic spoofs
...
Move Topic() into a NanoUI-specific ui_act proc
Update to @YotaXP's latest JSON code.
Return focus to the mapwindow if a key is pressed in a NanoUI.
2015-12-15 22:37:52 -06:00
Razharas
a50f7806c3
Merge pull request #13653 from Anonus/dontpulsemebro
...
Changes blob pulsing significantly plus a few more blob fixes
2015-12-16 07:13:21 +03:00
Razharas
a349a15469
Merge pull request #13552 from tkdrg/newnewnewnewnewnewnewnewnewnewcult
...
[Ready?] Cult Overhaul. Yep.
2015-12-16 06:07:20 +03:00
MMMiracles
88414e5502
woops
2015-12-15 20:25:02 -05:00
duncathan salt
b9b76ddef1
Merge pull request #13640 from KorPhaeron/nuclear_challenge
...
Optional challenge mode for Nuke Ops
2015-12-15 19:17:07 -05:00
MMMiracles
55ebaf3bdb
snow stuff i guess
2015-12-15 17:33:34 -05:00
Nerd Lord
d98ff20efb
the the blob no longer
2015-12-15 17:21:41 -05:00
KorPhaeron
f06d69ef5e
A bit more telecrystals
2015-12-15 16:02:58 -06:00
MMMiracles
392ca2a505
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
2015-12-15 16:54:22 -05:00
MMMiracles
d07f300063
i did things
2015-12-15 16:46:24 -05:00
Nerd Lord
e8d7c8b6d5
code cleaning
2015-12-15 16:08:54 -05:00
Bjorn Neergaard
88ed7623fc
Re-organize nanoui.dm
2015-12-15 14:26:19 -06:00
Bjorn Neergaard
47b727a23e
Rework how NanoUI handles Topic()
...
Also, add the ability to winset and the like, all from Javascript
2015-12-15 13:12:35 -06:00
Bjorn Neergaard
5678dfcbd1
Prefix everything with 'nanoui' to avoid conflicts
2015-12-15 13:12:33 -06:00
Bjorn Neergaard
f089428e63
Coffeescript; Bower; Gulp; asset_cache
...
We now write frontend code in Coffeescript, alongside our LESS.
PostCSS adds hacks to make CSS work on old versions of IE.
Bower is used to manage dependencies.
Gulp is used to build the code.
Images are dropped in favor of SVG or CSS effects.
NanoUI is now a 'simple' asset in the asset_cache
2015-12-15 13:09:51 -06:00
Bjorn Neergaard
8fdfa08e58
Port NanoUI styles to LESS
2015-12-15 13:08:27 -06:00
Bjorn Neergaard
a0c54eba97
Begin rewrite of NanoUI frontend.
...
* Remove jQuery in favor of polyfills.
* Make NanoUI work with IE8-IE11
* Upstream doT
* Change NanoUI template syntax
* Event driven code
2015-12-15 13:07:11 -06:00
phil235
b656d84480
Merge pull request #13616 from xxalpha/airlocking
...
Fixes a specific airlock animation case.
2015-12-15 14:19:31 +01:00
Tkdrg
8ead3e8628
Cult Overhaul
...
Cult is awful, so let's try to improve it. Idea by KorPhaeron. I also
took some inspiration from adrix89's sacrifice cult, so credits to him.
Also thanks a lot specially to MrPerson and Iamgoofball for helping
me brainstorm this, and Joan for the sprites for the summoning orb,
the large nar-sie shell, and the new cult antag hud.
Basically, we remove conversion, and turn cult into a magic version of
nuke, with a small team of stealth elite cultists that have to build a
base in the station and sacrifice people in order to build an army of
constructs and get materials to eventually summon Nar-Sie.
Stun talismans and conversion are gone. Nar-Sie is now the only
objective. Sacrifice runes now provide summoning orbs, which you can use
to drop a large shell. Insert enough orbs in the shell and you trigger a
Delta. Defend the shell for 3 minutes and Nar-sie will arise. This shell
is bombproof and singularityproof. It may be summoned up to three times
if destroyed, but you will have to start from the beginning sac-wise.
Runes are now RNG. Each cultist only gets 50% of the runes. Inspiration
is basically The Binding of Isaac here (thank you MrPerson for this!).
Furthermore, many old runes were merged/removed and other new ones were
added. Almost all were massively rebalanced. Cult now also has a
stealthy ritual dagger with high bleeding and throw effects.
2015-12-15 04:59:31 -03:00
Nerd Lord
6ad8d63c1d
No stealing other people's resource nodes, shitface.
2015-12-14 21:32:44 -05:00
Nerd Lord
2e71b5e122
Changes blob pulsing to use ultra_range and orange.
...
Blobs now properly remember their overmind and get color from it predictably.
Oh god, I hope I did this right.
2015-12-14 21:05:03 -05:00
duncathan salt
7481afe9fe
Merge pull request #13651 from KorPhaeron/fire_defines
...
Everything is fire
2015-12-14 20:03:48 -06:00
KorPhaeron
f32da8b449
jesus christ
2015-12-14 19:56:54 -06:00
KorPhaeron
249c8a8789
No teleporter nonsense
2015-12-14 19:38:21 -06:00
duncathan salt
7df19dedb9
Merge pull request #13647 from KorPhaeron/fire_defines
...
[s] Buckling a mob to a comfy chair will no longer set them on fire
2015-12-14 19:16:37 -06:00
KorPhaeron
884a3a0264
Fixes
2015-12-14 16:40:00 -06:00
bgobandit
e79301c304
dead AIs too
2015-12-14 14:50:35 -05:00
bgobandit
112cf3c96c
AIs with wireless disabled can no longer interact with papers held up to cameras.
2015-12-14 14:47:32 -05:00
bgobandit
a1634f2b51
Santa will no longer deliver the parent types of action figures. Certain action figures will now play appropriate sounds.
2015-12-14 14:32:27 -05:00
Cheridan
2a6a63253b
Merge pull request #13608 from KorPhaeron/fire_defines
...
Makes burn_state use defines
2015-12-14 10:44:10 -06:00
KorPhaeron
316be423a5
Merge remote-tracking branch 'refs/remotes/tgstation/master' into nuclear_challenge
...
# Conflicts:
# code/game/machinery/computer/syndicate_shuttle.dm
2015-12-14 05:48:09 -06:00
KorPhaeron
a6194f4725
Adds an optional challenge mode to nuclear operatives
2015-12-14 05:40:19 -06:00
Cheridan
ff2bc4d022
Merge pull request #13529 from KorPhaeron/tele_ops
...
Ops can't fly to abandoned satellite or derelict
2015-12-13 20:58:40 -06:00
xxalpha
e9e4ff735d
Added maintenance glass airlock and external glass airlock.
2015-12-14 00:48:01 +00:00
xxalpha
4278334f09
Fixes airlock animation on a specific case.
2015-12-13 22:42:27 +00:00
AnturK
2c9adb12f3
Fixes spell logging runtime
...
Fixes lava runtime
Fixes mecha ore scanner runtime
Fixes crayon writing runtime
Fixes latejoin headrev runtime
2015-12-13 15:04:12 +01:00
KorPhaeron
d8a37204e7
Makes burn_state use defines
2015-12-13 05:36:55 -06:00
Cheridan
1019b057c5
Merge pull request #13557 from bgobandit/nanomedfix
...
Wall-mounted nanomeds no longer have more contents than the Nanomed Plus.
2015-12-13 00:04:25 -06:00
Cheridan
6a9a5c820e
Merge pull request #13560 from Incoming5643/and_as_the_sword_looked_upon_the_infinite_cosmos_it_knew_it_just_had_to_try_and_fuck_everything_up
...
Supermatter swords and the infinite void
2015-12-12 23:22:48 -06:00
duncathan salt
e97f647158
Merge pull request #13499 from AnturK/turretfix
...
Fixes syndicate turrets shooting after breaking
2015-12-12 14:54:19 -06:00
