bgobandit
a2241e0f6f
Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag
...
Conflicts:
code/modules/client/preferences.dm
icons/mob/head.dmi
tgstation.dme
2015-12-17 20:12:32 -05:00
Cheridan
a973a2518b
Merge pull request #13585 from KorPhaeron/reactive_expansion
...
Reactive mechanics expansion and shooting grenades/flamethrowers out of peoples hands
2015-12-17 17:05:53 -06:00
PKPenguin321
40941c636d
necklaces again
...
round three let's go
2015-12-16 20:47:00 -08:00
KorPhaeron
a5fb122f49
The Mulligan
...
A syringe which completely randomizes your name and appearance.
Traitor only, and in the spy bundle.
2015-12-17 00:14:18 -03:00
oranges
134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
KorPhaeron
99018c9930
Grenade/flamethrower blocking
2015-12-16 16:14:30 -06:00
AnturK
c6140c1c61
Adds Chemical Backpack
2015-12-16 12:11:26 +01: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
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
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
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
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
KorPhaeron
f1a254fc27
Ups the chance a bit, makes it actually work
2015-12-12 17:16:35 -06:00
KorPhaeron
1f09a14f58
Merge remote-tracking branch 'refs/remotes/tgstation/master' into reactive_expansion
...
# Conflicts:
# code/modules/mob/living/carbon/human/human_defense.dm
2015-12-12 01:12:59 -06:00
KorPhaeron
09c95d9551
Grenades, flamethrowers, better shields
2015-12-12 00:34:04 -06:00
bgobandit
5fa93e0e55
Adds the re-attachment of tails. Adds the attachment of tails to humans. Adds lizard clubs, liz o' nine tails and lizard cloche hats.
2015-12-11 19:03:09 -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
KorPhaeron
36c45e0247
Starting work, I'll finish this later maybe
2015-12-11 00:53:17 -06: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
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
KorPhaeron
50e4e77250
Fixes UI stuff
2015-12-09 21:37:18 -06:00
KorPhaeron
56ecfaff68
Flip
2015-12-09 19:59:12 -06:00
duncathan salt
bea8d35ff5
Merge pull request #13437 from neersighted/clickable_stats
...
Refactor MC/Failsafe/add Subsystems
2015-12-07 19:58:46 -06:00
duncathan salt
0472592b97
Merge pull request #13327 from KorPhaeron/reactive
...
check_shields() refactor
2015-12-07 19:58:17 -06:00
Remie Richards
91c4d1bef8
Merge pull request #13440 from octareenroon91/patch-32
...
Give wallets merged access of all IDs inside.
2015-12-07 17:37:44 +00:00
octareenroon91
5646f0eb5b
syntax error
2015-12-05 18:42:50 -06:00
MrStonedOne
9fa4288b08
Makes everything that used spawn () throw_at use throw_at_fast
2015-12-05 16:40:52 -08:00
octareenroon91
3c75d78f84
Use a list instead of net_id
...
reduce excess calls to update_icon()
2015-12-05 16:35:41 -06:00
Bjorn Neergaard
34b717afb4
radio_controller -> SSradio, SSbp -> SSnpc
2015-12-04 22:25:24 -06:00
octareenroon91
544295c563
define proc/refreshID
2015-12-04 03:42:54 -06:00
octareenroon91
f3f61367da
Give wallets merged access of all IDs inside.
2015-12-04 03:16:43 -06:00
Cheridan
dd768b9046
Merge pull request #13369 from neersighted/caps
...
Capitals for Tank logging
2015-12-02 19:09:30 -06:00
Cheridan
f634890457
Merge pull request #13335 from Incoming5643/fudge_dice
...
Fudge dice
2015-12-02 16:40:25 -06:00
duncathan salt
fd5423e0cc
Merge pull request #13340 from KorPhaeron/oxy_tank
...
Internals start at 16 pressure
2015-12-02 14:16:29 -06:00
Bjorn Neergaard
b7ad1452ed
Caps for Tank logging
2015-12-01 18:48:35 -05:00
duncathan salt
d616885241
Merge pull request #13338 from Incoming5643/tis_the_season_for_horrible_manual_placement
...
[Touching all the maps oh god] The reason for the season
2015-12-01 15:15:49 -06:00
Incoming
42da16a003
adds swankcookie's snowman stuff to the gifts that will spawn on christmas should the trees exist which hopefully they will!
2015-11-30 19:21:53 -05:00
