Commit Graph

12749 Commits

Author SHA1 Message Date
KorPhaeron
3d74978881 Uses get_turf 2016-01-04 19:40:01 -06:00
KorPhaeron
55ceabae3e SMES fix 2016-01-01 13:29:11 -06:00
tkdrg
e57b43276d Merge pull request #14134 from GunHog/In_This_Episode_Gun_Hog_Teaches_MATH!
Fixes Abductor event
2015-12-29 22:51:17 -03:00
Razharas
fd0738aff8 Merge pull request #14125 from KorPhaeron/gold_grub
Gold grub fix
2015-12-30 00:38:06 +03:00
Cheridan
a40b732fe4 Merge pull request #13943 from tkdrg/abos
Checking antagonists will now message admins
2015-12-29 15:02:00 -06:00
duncathan salt
42d10a22d3 Merge pull request #13926 from Bawhoppen/czechmilitary
Tactical Gear + small changes
2015-12-29 20:43:14 +01:00
tkdrg
5930ee0d66 Merge pull request #13588 from Lo6a4evskiy/quick-equip-refactor
Refactor quick-equip verb
2015-12-29 14:26:48 -03:00
Lo6a4evskiy
6080a8fa96 Fix buckets with liquid not quick equipping 2015-12-29 18:20:42 +04:00
Lo6a4evskiy
ab6fb1ab36 Refactor using slot_equipment_priority 2015-12-29 17:59:56 +04:00
Remie Richards
ae2ef83fc6 Merge pull request #14062 from tkdrg/jesusFUCK
[s]Fixes secbot construction dupe
2015-12-29 07:06:19 +00:00
Remie Richards
dcea576585 Merge pull request #14063 from tkdrg/you_are_now_breathing_manually
Manual bans will now add notes automatically
2015-12-29 07:05:53 +00:00
Remie Richards
7ae7fa0d88 Merge pull request #14113 from tkdrg/DUPES
Adds a "dupe marked datum" option to Game Panel
2015-12-29 07:04:14 +00:00
GunHog
834242b808 Fixes Abductor event
18,0000 deciseconds = 300 minutes, not 30!
2015-12-28 20:08:26 -06:00
tkdrg
dc0c056fc9 Merge pull request #14109 from Incoming5643/guns_and_guns_and_more_guns
Summon Guns 2016
2015-12-28 22:58:47 -03:00
Incoming
b7ecdf6a2f Adds scatter lasers to the drop list
Changes it so scatter lasers start in scatter mode to drive home the point

CODING STANDARDS
2015-12-28 20:47:32 -05:00
tkdrg
a3533519ea Merge pull request #13995 from KorPhaeron/tokiwotomare
Timestop fixes
2015-12-28 19:44:08 -03:00
tkdrg
2d990ea834 Merge pull request #14076 from RemieRichards/VehicleFramework
Simple Vehicle Framework
2015-12-28 19:41:59 -03:00
Remie Richards
db6f01bf5e Formalises Path Compatibility 2015-12-28 22:20:33 +00:00
KorPhaeron
afdf68858d gold_grub 2015-12-28 15:48:38 -06:00
tkdrg
75df8a35e0 Merge pull request #14102 from KorPhaeron/foam
Unrestricted foam force weapons for admin spawn
2015-12-28 18:47:59 -03:00
tkdrg
7090e124dd Merge pull request #13802 from KorPhaeron/random_ruin
Random ruins for space/lavaland [ready for review]
2015-12-28 18:40:13 -03:00
duncathan salt
b943109a02 Merge pull request #13905 from KorPhaeron/weather
Weather datums [WIP]
2015-12-28 22:06:31 +01:00
duncathan salt
0aca78f381 Merge pull request #14100 from Anonus/blobberno
Blobbernauts can no longer smash walls.
2015-12-28 22:04:11 +01:00
tkdrg
e88bf4e2b5 Merge pull request #14084 from MrStonedOne/GOOOOOF
Upgrades do_after and progress bars.
2015-12-28 14:35:34 -03:00
KorPhaeron
f312f65aad anti-infinite loop 2015-12-28 09:38:41 -06:00
KorPhaeron
f314b99777 Fixes timestop loops 2015-12-28 05:30:26 -06:00
Bjorn Neergaard
d542163e66 Fix NanoUI and \improper for real 2015-12-28 00:18:43 -06:00
Tkdrg
a87ea29c84 Adds a "dupe marked datum" option to Game Panel
Useful when something bugs out in-game and you want to test it without
fucking the original up, or maybe if you want to spam some varedited
item quickly.
2015-12-28 01:45:33 -03:00
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
KorPhaeron
ccf44431fa Foam force 2015-12-27 15:41:20 -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
Nerd Lord
87fb506966 Blobbernauts can no longer smash walls.
You know why.
Blobbernauts also get a more accurate description when spawned.
2015-12-27 15:44:18 -05: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
MrStonedOne
5f68bedcd1 Upgrades do_after and progress bars 2015-12-26 21:04:19 -08:00
Remie Richards
3c9c6e5c19 Fixes ATV speed and name, improves janicart cleaning code by using Moved() vs a Move() override. 2015-12-26 23:16:39 +00:00
Remie Richards
bd22fc8c6d Converted janicarts into a simple to use vehicle framework with customisable speed, converted all existing vehicles to the new framework, added a atv type with a turret on it. 2015-12-26 22:54:15 +00: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