Incoming
|
5a10810df7
|
Adds a buttload of guns to summon guns to bring it up to speed for 2016. I intentionally skipped any guns that had enough stopping power to OHKO a spessman from full health.
adds a gun proc, Unlock() that automatically swaps whatever pin the gun has for a generic electronic one.
|
2015-12-27 21:55:53 -05:00 |
|
tkdrg
|
1dec16cbb9
|
Merge pull request #13936 from Shadowlight213/AdminAIToggle2
Makes Admin AI interaction a logged toggle. Take 2
|
2015-12-27 22:01:01 -03:00 |
|
Bjorn Neergaard
|
65a2c50908
|
Properly encode NanoUI JSON...
This is right, not the last fix. The '+' in BYOND scientific notation was becoming a space.
|
2015-12-27 15:49:38 -06:00 |
|
Bjorn Neergaard
|
54e801776d
|
Revert "Make JSON.stringify encode numbers properly"
This reverts commit f4600644ec.
|
2015-12-27 15:45:48 -06:00 |
|
Bjorn Neergaard
|
f4600644ec
|
Make JSON.stringify encode numbers properly
JSON doesn't allow scientific/exponential notation...
Fixes #14098
|
2015-12-27 15:19:24 -06:00 |
|
tkdrg
|
50bcb521f5
|
Merge pull request #14056 from neersighted/nano_tweaks
Nano Tweaks
|
2015-12-27 14:20:52 -03:00 |
|
Bjorn Neergaard
|
32c7cbc78a
|
topic_state -> nano_state
|
2015-12-27 11:04:25 -06:00 |
|
Bjorn Neergaard
|
a173cc01f6
|
Fix NanoUIs not transfering when the owner ghosts (or reenters)
|
2015-12-27 10:56:48 -06:00 |
|
duncathan salt
|
421a19d576
|
Merge pull request #13963 from KorPhaeron/lava_land_turfs
Lavaland Turfs
|
2015-12-27 17:38:09 +01:00 |
|
Bjorn Neergaard
|
75f26e18ac
|
Shrink NanoUI by removing library; tidy up code
|
2015-12-27 09:25:39 -06:00 |
|
tkdrg
|
b11c942842
|
Merge pull request #14057 from markressler/test
added new medicine reagent, haloperidol.
|
2015-12-27 05:05:43 -03:00 |
|
Incoming
|
649fa1cdeb
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into #verifyvenuz
# Conflicts:
# icons/obj/guns/projectile.dmi
|
2015-12-26 14:19:58 -05:00 |
|
Bjorn Neergaard
|
0cb8d73e93
|
Fix NanoUI runtimes when data is null; touch up code
|
2015-12-26 11:00:50 -06:00 |
|
Bjorn Neergaard
|
ffc6abb223
|
Clean up NanoUI code style
|
2015-12-26 09:57:34 -06:00 |
|
markressler
|
372e6d2c51
|
deleted src check
|
2015-12-26 12:55:31 -03:00 |
|
markressler
|
c2c58263ba
|
fixed description.
|
2015-12-26 12:51:28 -03:00 |
|
markressler
|
6896c63676
|
updated damage values and description.
|
2015-12-26 12:47:42 -03:00 |
|
Cheridan
|
236670dd13
|
Merge pull request #13941 from Buggy123/master
Makes Salicyclic Acid useful
|
2015-12-26 09:27:12 -06:00 |
|
phil235
|
68ab5f72ee
|
Merge pull request #14061 from tkdrg/fuckme
Fixes indentation in cockroach death()
|
2015-12-26 14:54:30 +01:00 |
|
tkdrg
|
c64430a0fd
|
Merge pull request #13996 from AnturK/fixfixfix
Minor fixes
|
2015-12-26 10:23:21 -03:00 |
|
tkdrg
|
b689055016
|
Merge pull request #13986 from KorPhaeron/illusion
Fixes illusions running about on their face
|
2015-12-26 10:16:45 -03:00 |
|
AnturK
|
72bc9591a2
|
This is bit better.
|
2015-12-26 14:10:09 +01:00 |
|
KorPhaeron
|
bcdc028c3b
|
Initial transform
|
2015-12-26 07:06:57 -06:00 |
|
Tkdrg
|
42cd502626
|
Fixes indentation in cockroach death()
Thanks @phil235 !
|
2015-12-26 09:33:56 -03:00 |
|
markressler
|
1534406d92
|
added new medicine reagent, haloperidol.
|
2015-12-26 05:31:46 -03:00 |
|
tkdrg
|
d4cc57041b
|
Merge pull request #14029 from PKPenguin321/patch-6
Fixes some EZ issues
|
2015-12-26 04:42:51 -03:00 |
|
tkdrg
|
6314572c46
|
Merge pull request #13991 from Jordie0608/thepinatateacheskidsvitalessonsabouthowviolenceisrewarding
Generalises simple animal loot drops and removes copypasta
|
2015-12-26 04:34:27 -03:00 |
|
Bjorn Neergaard
|
7d5487c169
|
Tweak ghost NanoUI interaction code; touchup frontend
Resolves #14044
|
2015-12-26 01:21:58 -06:00 |
|
Bjorn Neergaard
|
1e951d9fcf
|
Rework NanoUI frontend to be lighter; fix drag/resize jitter
|
2015-12-26 01:21:57 -06:00 |
|
Bjorn Neergaard
|
7132c5bd8d
|
Cache NanoUI HTML
|
2015-12-26 01:21:57 -06:00 |
|
Bjorn Neergaard
|
2b5ea04485
|
Compile HTML as another asset; improve loading spinner
|
2015-12-26 01:21:56 -06:00 |
|
Bjorn Neergaard
|
d42a111d93
|
Drop Javascript library to get even smaller
|
2015-12-26 01:21:56 -06:00 |
|
Jordie
|
0ee6c6acd0
|
readds layer hack for mining mob loot
|
2015-12-26 15:50:54 +11:00 |
|
tkdrg
|
9e7c05e557
|
Merge pull request #14000 from KorPhaeron/pamphlet
Fixes away mission pamphlet desc
|
2015-12-25 21:07:21 -03:00 |
|
KorPhaeron
|
fad47ae801
|
missing space
|
2015-12-25 17:33:33 -06:00 |
|
tkdrg
|
0a4b99e2ec
|
Merge pull request #13985 from bgobandit/bugfixesandshit
Fixes some minor bugs and adds minor feedback.
|
2015-12-25 18:24:25 -03:00 |
|
tkdrg
|
db2b8a34d4
|
Merge pull request #14004 from MrStonedOne/patch-103
fixes flashes being stupid on emp.
|
2015-12-25 15:15:27 -03:00 |
|
tkdrg
|
1180d1f007
|
Merge pull request #13987 from KorPhaeron/mekhi
[s]Fixes being able to trigger your own reactive armour with thrown objects
|
2015-12-25 15:06:30 -03:00 |
|
tkdrg
|
b8767bea04
|
Merge pull request #14003 from KorPhaeron/stand_names
Fixes guardians/parasites always being named "Guardian Spirit" after they die
|
2015-12-25 14:14:56 -03:00 |
|
tkdrg
|
3f29b78b1d
|
Merge pull request #13994 from KorPhaeron/cryo
Fixes cryoxadone description typo
|
2015-12-25 14:13:34 -03:00 |
|
tkdrg
|
20e6285c85
|
Merge pull request #13989 from KorPhaeron/spider_fixes
Spider fixes
|
2015-12-25 14:11:51 -03:00 |
|
tkdrg
|
72830909c6
|
Merge pull request #13984 from AndrewJacksonThe2nd/teslameme
TESLA 4.0: less laggy edition
|
2015-12-25 14:09:36 -03:00 |
|
Cheridan
|
c5e305c6f1
|
Merge pull request #13951 from hornygranny/eall
fixes tesla engine being called energy eall
|
2015-12-25 06:37:17 -06:00 |
|
Jordie
|
18181d2ac4
|
Merge pull request #13981 from tkdrg/gololem
Adds xeno golems to admin log
|
2015-12-25 16:02:17 +11:00 |
|
Incoming5643
|
7c28017be5
|
changes the desc to be more referencing
|
2015-12-24 23:39:41 -05:00 |
|
Incoming
|
f4a07cab95
|
Adds the golden revolver. Shakes the screen like a bastard and sounds really painful, but only does normal revolver damage.
A little easter egg weapon for a game you should have played.
Will be added to summon guns at some point
|
2015-12-24 22:36:20 -05:00 |
|
PKPenguin321
|
93aa422c2a
|
fixes statue.dm
anotha one
|
2015-12-24 19:33:50 -08:00 |
|
tkdrg
|
e8fdbd911e
|
Merge pull request #13972 from Anonus/blobbernaut
Rebalances blobbernaut creation
|
2015-12-25 00:16:57 -03:00 |
|
tkdrg
|
d0ac4427c2
|
Merge pull request #13861 from Incoming5643/once_again_kors_fix_to_a_wizard_mechanic_has_forced_my_hand
Objects created by the staff of animation eventually revert if there's no one to attack
|
2015-12-25 00:14:42 -03:00 |
|
tkdrg
|
e3fbe54fb2
|
Merge pull request #13957 from Incoming5643/what_do_you_mean_its_a_metaphor
Bonus drops from killing beepsky
|
2015-12-25 00:03:25 -03:00 |
|