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
9cf6a315b7
Advanced Darkness
2015-12-28 15:25:42 -06:00
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
b943109a02
Merge pull request #13905 from KorPhaeron/weather
...
Weather datums [WIP]
2015-12-28 22:06:31 +01:00
0aca78f381
Merge pull request #14100 from Anonus/blobberno
...
Blobbernauts can no longer smash walls.
2015-12-28 22:04:11 +01:00
0b314ef649
Multiverse
2015-12-28 14:47:44 -06:00
dca91323a4
Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework
...
Conflicts:
code/datums/mind.dm
code/game/gamemodes/antag_spawner.dm
code/game/gamemodes/objective.dm
data/mode.txt
2015-12-28 12:40:51 -08:00
cfe47257b2
Makes martial arts reset combos on target change.
2015-12-28 21:33:40 +01:00
cc9c5768ca
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
code/datums/gas_mixture.dm
2015-12-28 13:59:16 -06:00
aa2840015b
Merge branch 'listmos' of https://github.com/MrStonedOne/-tg-station into MrStonedOne-listmos
...
Conflicts:
code/datums/gas_mixture.dm
2015-12-28 13:40:27 -06:00
a64b68f76c
caches gases in more procs
2015-12-28 13:32:49 -06:00
5115807a55
fixes listmos a bit
2015-12-28 11:23:15 -08:00
cdd5be39be
valentines are actually examinable honk
2015-12-28 13:52:34 -05:00
34daa84e79
FIXES DO_MOB FUCKING UP THE SERVER
2015-12-28 10:44:31 -08:00
caf002c4cf
fixes travis, even more valentimes
2015-12-28 13:39:47 -05:00
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
60e533d21e
fewer memes so sad :(
2015-12-28 12:46:14 -05:00
eed4e4e5fe
Merge pull request #13860 from LanCartwright/plasmaknucklesandwich
...
Fixes Plasma Fist fighting style
2015-12-28 14:37:46 -03:00
e88bf4e2b5
Merge pull request #14084 from MrStonedOne/GOOOOOF
...
Upgrades do_after and progress bars.
2015-12-28 14:35:34 -03:00
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
a4977e3e2d
fixes drunk typo
2015-12-28 17:06:27 +00:00
555fc6671a
Merge pull request #14093 from KorPhaeron/TK
...
Fixes throwing anchored objects with TK
2015-12-28 13:37:44 -03:00
f312f65aad
anti-infinite loop
2015-12-28 09:38:41 -06:00
b99ad60d52
Removes area proc properly
2015-12-28 09:31:37 -06:00
d4dd3adccb
Removes updates to area proc
2015-12-28 09:30:28 -06:00
f0def4cb4c
Forgot to remove undef
2015-12-28 09:26:41 -06:00
9d9bd85350
Removes ruin stuff from MC
2015-12-28 09:26:06 -06:00
249dc92ade
Remove deepspace define
2015-12-28 09:24:21 -06:00
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
b4c9dc60eb
Update martial.dm
2015-12-28 13:59:07 +00:00
f314b99777
Fixes timestop loops
2015-12-28 05:30:26 -06:00
47a7a9656c
Makes the write default to current buffer
2015-12-28 11:17:40 +01:00
50a92d5152
Merge pull request #14115 from neersighted/hotfix
...
Fix NanoUI and \improper for real
2015-12-28 03:43:11 -03:00
d542163e66
Fix NanoUI and \improper for real
2015-12-28 00:18:43 -06:00
bc7c25429d
More cult tweaks
...
Shuttle will no longer launch after the large shell is placed.
Summoning Nar-Sie will no longer red alert.
Fixes an edge case with trying to summon shell after nar-sie is out.
Fixes #14042
Fixes #14043
2015-12-28 01:55:04 -03:00
10867c4aa2
Merge pull request #14069 from Bawhoppen/czechgnades
...
Makes concussion grenade explosion smaller
2015-12-28 01:49:43 -03:00
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
32ca87bc9c
lets hope
2015-12-27 22:01:22 -06:00
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
fbd1175dd9
Increased the buff slightly, has a larger weak explosion now.
2015-12-27 22:51:46 -05:00
1135a271f5
nothing works here
2015-12-28 03:46:27 +00:00
95dbce902f
whoooooooops
2015-12-27 22:13:05 -05:00
108719015d
preliminary optimizations to listmos
2015-12-27 21:11:45 -06:00
42f13b9fe7
Whoops
2015-12-27 21:58:53 -05:00
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
f10b0d4ef4
ravuis
2015-12-28 02:36:59 +00:00
d80a8542c3
gotta sstop drinking and doing karaoke
2015-12-28 02:29:54 +00:00
c20c8c0359
Update tuberculosis.dm
2015-12-28 02:20:19 +00:00
fd65c9a6fd
removes commented code
2015-12-27 20:19:35 -06:00
84c2ae3678
now now I'm drunkl
2015-12-28 02:18:50 +00:00
tkdrg
KorPhaeron
duncathan salt
AndrewJacksonThe2nd
AnturK
MrStonedOne
bgobandit
LanCartwright
KorPhaeron
Bjorn Neergaard
Lularian
Buggy123
Incoming5643
Incoming