Melichior
53db2cbcd1
Fixed 'in' precedence errors.
2015-12-29 17:16:09 -07: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
326937efc6
Merge branch 'guns_and_guns_and_more_guns' of https://github.com/Incoming5643/-tg-station into guns_and_guns_and_more_guns
...
# Conflicts:
# code/game/gamemodes/wizard/rightandwrong.dm
2015-12-28 20:50:50 -05: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
tkdrg
42efa497fc
Merge pull request #13907 from optimumtact/meatyores
...
Reduce count of meteors
2015-12-28 19:08:11 -03: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
28cacc55c7
Merge pull request #14099 from AnturK/crayonstuff
...
Adds buffered writing mode to crayons/spray cans.
2015-12-28 18:47:47 -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
tkdrg
50ab7b824b
Merge pull request #14094 from KorPhaeron/pda
...
PDA messages now have a (F) link for ghosts
2015-12-28 18:24:01 -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
Kyle Spier-Swenson
34daa84e79
FIXES DO_MOB FUCKING UP THE SERVER
2015-12-28 10:44:31 -08:00
Kyle Spier-Swenson
c3d1c92d64
Fix certain progress bars counting down vs counting up.
...
I never hit save when i did this fix before pr-ing this. =\
2015-12-28 10:39:44 -08:00
tkdrg
eed4e4e5fe
Merge pull request #13860 from LanCartwright/plasmaknucklesandwich
...
Fixes Plasma Fist fighting style
2015-12-28 14:37:46 -03:00
tkdrg
e88bf4e2b5
Merge pull request #14084 from MrStonedOne/GOOOOOF
...
Upgrades do_after and progress bars.
2015-12-28 14:35:34 -03:00
Kyle Spier-Swenson
695afcc94e
removes last_move checks from do_after/do_mob
...
it ticks at 1ds now, the cases where you could move and come back are rare, and require the server to be running at 21fps or higher and you have perfect lag and timing.
2015-12-28 09:21:45 -08:00
LanCartwright
a4977e3e2d
fixes drunk typo
2015-12-28 17:06:27 +00:00
tkdrg
555fc6671a
Merge pull request #14093 from KorPhaeron/TK
...
Fixes throwing anchored objects with TK
2015-12-28 13:37:44 -03:00
KorPhaeron
f312f65aad
anti-infinite loop
2015-12-28 09:38:41 -06:00
KorPhaeron
b99ad60d52
Removes area proc properly
2015-12-28 09:31:37 -06:00
KorPhaeron
d4dd3adccb
Removes updates to area proc
2015-12-28 09:30:28 -06:00
KorPhaeron
f0def4cb4c
Forgot to remove undef
2015-12-28 09:26:41 -06:00
KorPhaeron
9d9bd85350
Removes ruin stuff from MC
2015-12-28 09:26:06 -06:00
KorPhaeron
249dc92ade
Remove deepspace define
2015-12-28 09:24:21 -06:00
LanCartwright
b4c9dc60eb
Update martial.dm
2015-12-28 13:59:07 +00:00
KorPhaeron
f314b99777
Fixes timestop loops
2015-12-28 05:30:26 -06:00
AnturK
47a7a9656c
Makes the write default to current buffer
2015-12-28 11:17:40 +01:00
tkdrg
50a92d5152
Merge pull request #14115 from neersighted/hotfix
...
Fix NanoUI and \improper for real
2015-12-28 03:43:11 -03:00
Bjorn Neergaard
d542163e66
Fix NanoUI and \improper for real
2015-12-28 00:18:43 -06:00
tkdrg
10867c4aa2
Merge pull request #14069 from Bawhoppen/czechgnades
...
Makes concussion grenade explosion smaller
2015-12-28 01:49:43 -03:00
Lularian
32ca87bc9c
lets hope
2015-12-27 22:01:22 -06:00
tkdrg
8e53597bea
Merge pull request #14081 from tgstation/RemieRichards-FREE_PERFORMANCE
...
ATMOS SPEED ZOOM ZOOM WEEE Optimises two loops that Dunc missed.
2015-12-28 00:58:29 -03:00
Incoming5643
95dbce902f
whoooooooops
2015-12-27 22:13:05 -05:00
Incoming
42f13b9fe7
Whoops
2015-12-27 21:58:53 -05: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
AnturK
8962334555
Adds buffered writing mode to crayons/spray cans.
2015-12-27 20:52:23 +01:00
tkdrg
dd10637e08
Merge pull request #14065 from AnturK/humanimals
...
Adds helper for creating human looking simple animals
2015-12-27 14:34:31 -03:00
Kyle Spier-Swenson
0c4a26df4e
Update mobs.dm
2015-12-27 09:23:05 -08:00
tkdrg
f6db2f4ac9
Merge pull request #14067 from AnturK/mulecratefix
...
Fixes mulebot crates
2015-12-27 14:21:47 -03: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
