Incoming5643
72a5c2d604
why am I editing in the browser this is terrible
2015-12-21 01:11:29 -05:00
Incoming5643
cda01d1457
he's right
2015-12-21 01:10:37 -05:00
Incoming
1e7fcd3e9f
unbricks the rpgloot event.
...
fixes a rare issue with the imposter event.
2015-12-20 01:15:03 -05:00
tkdrg
14916b0cf9
Merge pull request #13629 from MMMiracles/1handed
...
L6 SAW changes
2015-12-18 20:29:16 -03:00
Cheridan
fe066f39b4
Merge pull request #13744 from hornygranny/proccalllogging
...
admin messages for proc calls
2015-12-18 16:03:35 -06:00
MMMiracles
ef2ac1b0c8
CONflicts
2015-12-18 16:34:06 -05:00
tkdrg
b9ebbb6ed6
Merge pull request #13729 from KorPhaeron/admin_items
...
Grey Tide + Tesla Armor
2015-12-18 18:01:38 -03:00
Remie Richards
2e06e88a10
Corrects invalid button in Prefs
2015-12-18 20:12:57 +00:00
KorPhaeron
2601154d63
Slightly better replicate chance for illusions
2015-12-18 14:02:27 -06:00
KorPhaeron
5b0777e2b4
Faction copy
2015-12-18 13:57:25 -06:00
tkdrg
84d26ecc4d
Merge pull request #13730 from KorPhaeron/boss_get_down_a_sniper
...
Penetrator rounds for sniper rifles
2015-12-18 15:43:29 -03:00
Remie Richards
5a53b5294d
Properly adds Pentagon orbits.
2015-12-18 16:17:49 +00:00
Remie Richards
7bab23de9b
Adds pentagon as a possible orbit type
2015-12-18 16:12:45 +00:00
Remie Richards
163c84344b
Orbit improvements:
...
* Orbit is now less reliant on Animate(), for most ghosts this means 36 calls to Animate, vs the previous INFINITE, for those of you with potato computers, this should ease the pain and crashing.
* Orbits can now be something different to circles!
* Ghosts Byond Members can now choose between orbits! (Circle, Triangle, Square, Hexagon)
2015-12-18 16:12:42 +00:00
tkdrg
b92224b95b
Merge pull request #13728 from KorPhaeron/burning_singulo
...
Lava proofing
2015-12-18 03:49:55 -03:00
tkdrg
0047f6e96b
Merge pull request #13561 from bgobandit/lizcannotwag
...
Adds the surgical severing/reattachment of lizard tails, AND MORE!
2015-12-18 01:15:20 -03:00
tkdrg
77928440e2
Merge pull request #13571 from KorPhaeron/gate_destruction
...
Gateway/singularity interaction fix
2015-12-18 00:23:23 -03:00
KorPhaeron
2e57936f94
Fixes gateway interaction
2015-12-17 21:12:30 -06:00
MMMiracles
6c2731b22b
conflicts are dumb tbh
2015-12-17 21:17:06 -05:00
MMMiracles
ba5bc90d75
just gonna not
2015-12-17 21:11:06 -05:00
MMMiracles
68edcb4c2b
Merge branch '1handed' of https://github.com/MMMiracles/-tg-station into 1handed
2015-12-17 21:08:52 -05:00
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
tkdrg
f93aac3cab
Merge pull request #13687 from Buggy123/master
...
Reduces cooldown of the Bluespace Artillery on the space battle away mission
2015-12-17 20:25:25 -03:00
tkdrg
32330eddb4
Merge pull request #13698 from MrStonedOne/patch-87
...
Cleans up turf/get_lumcount
2015-12-17 20:22:09 -03: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
hornygranny
f57031ce4a
both proc call verbs will now alert admins when used in addition to being logged
...
fixes #13707
2015-12-17 14:21:04 -08:00
Buggy123
292e5ea424
Update bluespaceartillery.dm
2015-12-17 17:16:59 -05:00
tkdrg
1fe9883e67
Merge pull request #13706 from Anonus/slipblob
...
New blob chemicals plus tweaks to old blob chemicals
2015-12-17 18:36:52 -03:00
Cheridan
0ff7f1b27f
Merge pull request #13674 from AnturK/whynot
...
Adds two CA mapGenerators
2015-12-17 14:46:58 -06:00
Razharas
451ed902bb
Merge pull request #13704 from LatD/exosuit-fab
...
Gives low tech requirements for 4 roundstart mech items
2015-12-17 23:21:05 +03:00
tkdrg
6bebbb67b3
Merge pull request #13559 from bgobandit/emptysyringes
...
Empty syringes no longer appear to have a fill.
2015-12-17 17:18:13 -03:00
bgobandit
fd94cbdad2
uses Clamp() now
2015-12-17 14:39:13 -05:00
Cheridan
c94a83ce40
Merge pull request #13694 from tkdrg/fokkenlaight
...
Fixes broken logic in light update()
2015-12-17 13:30:53 -06:00
tkdrg
c342c28e2f
Merge pull request #13703 from neersighted/nano_reduction
...
NanoUI Reduction
2015-12-17 15:07:45 -03:00
tkdrg
197b4d58ea
Merge pull request #13693 from MrStonedOne/patch-86
...
Properly fixes resin exploit
2015-12-17 15:01:22 -03:00
Razharas
3dccbbc87a
Merge pull request #13658 from tkdrg/jamp
...
Adds a Follow/Jump to link to the VV dropdown
2015-12-17 20:53:19 +03:00
Bjorn Neergaard
332cc5af71
Re-organize NanoUI procs
2015-12-17 10:18:00 -06:00
Bjorn Neergaard
1284f0596c
Fix NanoUIs when the title includes a single quote
2015-12-17 10:17:59 -06:00
Bjorn Neergaard
487942a09c
Reduce NanoUI size by hosting fonts externally
...
Also resize Cryo to be more compact
2015-12-17 10:15:13 -06:00
Bjorn Neergaard
b00f19e8ee
Compile NanoUI into two files
2015-12-17 10:15:11 -06:00
Bjorn Neergaard
15681a727e
Combine NanoUI CSS into one file.
2015-12-17 10:12:07 -06:00
AnturK
711abc4ecf
Adds two CA mapGenerators
2015-12-17 11:45:27 +01:00
KorPhaeron
df74fae945
Penetrator rounds
2015-12-17 02:05:34 -06:00
KorPhaeron
af6f8c04a6
Admin items
2015-12-17 01:57:08 -06:00
KorPhaeron
d564e1e2f3
Lava proofing
2015-12-17 01:48:11 -06:00
KorPhaeron
5ee7c1a0b4
Fixes gateway checks
2015-12-17 01:45:09 -06:00
tkdrg
20f2140fea
Merge pull request #13724 from PKPenguin321/bling-really-really-really-never-dies
...
necklaces again
2015-12-17 03:41:36 -03:00
Cheridan
4f647f1693
Merge pull request #13684 from MMMiracles/idedplsnerf
...
Gives ranged syndicate mobs no-stamina variant bullets (i died please nerf)
2015-12-16 23:40:03 -06:00
PKPenguin321
40941c636d
necklaces again
...
round three let's go
2015-12-16 20:47:00 -08:00
Tkdrg
abb0cd663c
Adds a Follow/Jump to link to the VV dropdown
...
Some good QoL for debugging stuff.
2015-12-17 00:45:16 -03:00