MMMiracles
cde4df61ae
conFLICTS
2015-12-16 06:26:54 -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
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
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
a349a15469
Merge pull request #13552 from tkdrg/newnewnewnewnewnewnewnewnewnewcult
...
[Ready?] Cult Overhaul. Yep.
2015-12-16 06:07:20 +03: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
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
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
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
KorPhaeron
f32da8b449
jesus christ
2015-12-14 19:56:54 -06:00
KorPhaeron
884a3a0264
Fixes
2015-12-14 16:40:00 -06: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
xxalpha
e9e4ff735d
Added maintenance glass airlock and external glass airlock.
2015-12-14 00:48:01 +00:00
KorPhaeron
d8a37204e7
Makes burn_state use defines
2015-12-13 05:36:55 -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
Cheridan
5dcc208ee2
Merge pull request #13569 from KorPhaeron/low_layer
...
Fixes girders being on a low layer
2015-12-12 13:01:32 -06:00
Cheridan
45c06ae2cd
Merge pull request #13555 from bgobandit/sexyhonk
...
Buffs the sexy clown.
2015-12-12 13:00:46 -06:00
Cheridan
99e7506731
Merge pull request #13572 from KorPhaeron/creepy_crawly
...
Various Spider Fixes
2015-12-12 12:43:03 -06:00
MMMiracles
50db868f63
lets try that again
2015-12-11 22:54:07 -05:00
Nerd Lord
b274d3ddc5
Dualsabers will now make you flip only twice, instead of up to twelve times.
2015-12-11 18:33:00 -05:00
Cheridan
c641643c55
Merge pull request #13539 from KorPhaeron/dance_moves
...
Hitting someone with a dualsaber now has a chance to make you *flip
2015-12-11 17:27:42 -06:00
Cheridan
78093c0bf0
Merge pull request #13556 from bgobandit/matsagainfuckina
...
Adds mats/origin tech/burn_state to more items.
2015-12-11 17:13:42 -06:00
MMMiracles
b3d992a832
conflict fix
2015-12-11 16:21:18 -05:00
Razharas
a251002d6f
Merge pull request #13532 from Jalleo/pAI
...
Personal Artificial Intelligence Fix
2015-12-11 22:46:24 +03:00
Razharas
83bb88868c
Merge pull request #13153 from Jordie0608/arguablyallgunsareenergygunsandallbeamsareprojectiles
...
Unifies energy gun self charging
2015-12-11 22:38:07 +03:00
Cheridan
a002ca8917
Merge pull request #13542 from KorPhaeron/gigantic_epipens
...
Fixes small objects covering the entire tile after a fire
2015-12-11 07:23:00 -06:00
Cheridan
41709c7016
Merge pull request #13546 from KorPhaeron/RADIATION_PULSE_DETECTED
...
Removes rad pulse admin notice
2015-12-11 07:14:15 -06:00
KorPhaeron
44873907f4
More spider fixes
2015-12-11 04:42:04 -06:00
KorPhaeron
0ece383776
Fixes girders on low layer
2015-12-11 02:29:46 -06:00
Jordie0608
7719d8cb54
Merge branch 'master' of https://github.com/tgstation/-tg-station into arguablyallgunsareenergygunsandallbeamsareprojectiles
...
Conflicts:
code/modules/projectiles/guns/energy/laser.dm
2015-12-11 15:59:46 +11:00
Incoming
8ee40a1518
supermatter now reduces turf to base turf, and checks for base turf instead of space.
...
(in most settings, base turf IS space)
2015-12-10 19:46:35 -05:00
bgobandit
73471eb8b1
sexy clown is now a sexy object oriented clown
2015-12-10 19:19:03 -05:00
Incoming
a05e29b27e
Supermatter swords can no longer consume space itself to spam radiation at people.
2015-12-10 17:13:40 -05:00
bgobandit
984582f6ba
tweaks and shit
2015-12-10 15:48:22 -05:00
bgobandit
92d86dd369
Adds mats/origintech/burn_state to more items.
2015-12-10 15:32:28 -05:00
blah
844b10fa33
Whoops I left a debug
2015-12-10 14:42:43 +00:00
blah
acf95ccfd9
Fixes the pAI and removes the .gitignore issue that I caused from other stuff
2015-12-10 14:40:04 +00:00
KorPhaeron
1bcd8e57f2
Removes rad pulse admin notice
2015-12-10 04:26:56 -06:00
KorPhaeron
50e4e77250
Fixes UI stuff
2015-12-09 21:37:18 -06:00
KorPhaeron
56ecfaff68
Flip
2015-12-09 19:59:12 -06:00
blah
5fff63d62c
Changes pAI to have hearable_message() rather than visible_message() as that doesn’t work from inside objects
2015-12-09 20:04:54 +00:00
AnturK
6d63d5e234
Fixes doppler arrays
2015-12-09 20:06:14 +01:00
Cheridan
da3eba756d
Merge pull request #13463 from Incoming5643/a_placebo_effect
...
Adds glowcaps
2015-12-08 22:08:25 -06:00
MMMiracles
f222dfe36e
mostly final changes, wowzers
2015-12-08 21:20:31 -05:00
