4c47a7cf5e
Merge remote-tracking branch 'tgstation/master'
2015-08-27 20:02:02 -04:00
1f1e539279
Merge pull request #11243 from Ergovisavi/puff_puff
...
Adds "Wumborian Fugu" hostile mob
2015-08-22 02:58:12 +01:00
37bd15dd1b
adds some sane sorting to sql notes.
2015-08-19 08:36:22 -07:00
ca91b43f0a
Merge pull request #11258 from Anonus/spoopyghosts
...
Fixes a bunch of revenant stuff, again.
2015-08-19 16:15:03 +01:00
a1b557ab02
Harvest ability is dead and gone, just click them, nerd.
2015-08-19 11:06:37 -04:00
a5c274cbc7
Merge pull request #11262 from KorPhaeron/standproud
...
Guardian Updates
2015-08-19 19:53:13 +10:00
825b5794c7
Merge pull request #11239 from Firecage/del2qdel
...
del() to qdel()
2015-08-19 11:50:24 +02:00
4fd1b7f20f
Merge branch 'standproud' of https://github.com/KorPhaeron/kortg into standproud
2015-08-19 04:38:26 -05:00
bac3cc0b6d
Changelog
2015-08-19 04:38:11 -05:00
bdd6a75382
Merge pull request #11119 from phil235/VaporizeMethodReaction
...
reagents reaction() now has more application method
2015-08-19 19:23:17 +10:00
4463c59849
Merge pull request #11221 from Core0verload/spawnpanel
...
Spawn panel improvements
2015-08-19 19:01:15 +10:00
6d5a0ade7f
Merge pull request #11259 from Aranclanos/disposalstuff
...
Some disposal fixes
2015-08-19 18:59:32 +10:00
6ad79827dd
Merge pull request #11260 from KorPhaeron/xenobiofix
...
Fixes guardians spawning in xenobio
2015-08-19 18:59:13 +10:00
5e430b3384
span4cheri
2015-08-19 17:18:13 +10:00
c2d7dff564
Merge branch 'master' of https://github.com/tgstation/-tg-station into despitebestattemptsthedeweydecimalsystemhasnotyetbeenadaptedtoworkwithsql
...
Conflicts:
README.md
2015-08-19 15:27:26 +10:00
5be606c18e
injection fixes
2015-08-19 15:09:59 +10:00
8f1c084d23
Fixes pulling bug that led to FUN!
...
QUICK MERGE, MAJOR FUN REMOVAL.
2015-08-18 21:12:08 -07:00
928d7e874d
For you Scones [Telesci stuff moved to Tele Sec.]
...
but I still have a crush on pap sooo >.>
2015-08-18 19:28:40 -04:00
294762c370
Merge remote-tracking branch 'tgstation/master'
2015-08-18 15:53:08 -04:00
c6887a3b5e
Merge branch 'master' of https://github.com/ExcessiveUseOfCobblestone/-tg-station
2015-08-18 15:51:42 -04:00
271b7344f5
Merge pull request #11045 from KorPhaeron/survivalpod
...
Survivalpod
2015-08-18 20:50:18 +01:00
e800add01b
OK WE FIXED IT BOYS
...
fuck the DME amirite
2015-08-18 15:50:09 -04:00
01bf5472eb
Revert "Moves Cloning Machines/Comps to Medical Section"
...
This reverts commit 98561a60c1
2015-08-18 15:45:51 -04:00
f7fff52b33
Merge remote-tracking branch 'tgstation/master'
2015-08-18 15:39:48 -04:00
f2cf448d4e
Merge pull request #11245 from Aranclanos/alienfacehuggerhud
...
Fixes the alien hud icon for infected people not appearing.
2015-08-18 20:39:33 +01:00
2425ae3195
Merge pull request #2 from tgstation/master
...
Merge
2015-08-18 15:39:26 -04:00
1595538788
Merge pull request #11244 from Aranclanos/mimicranged
...
some mimic ranged mob fixes
2015-08-18 20:38:55 +01:00
b70dfb8ece
Merge pull request #11189 from phil235/JanicartFixes
...
Slipping while buckled, some fixes
2015-08-18 20:26:36 +01:00
f77047b640
Merge pull request #11185 from Cheridan/brycepaxsbrain
...
Logging Syntax Improvement
2015-08-18 20:24:42 +01:00
3891e67d8d
Merge pull request #11162 from Core0verload/rnd-implants
...
RnD update
2015-08-18 20:20:12 +01:00
da15c99460
Wait shit that shouldn't be indented~
2015-08-18 14:09:58 -04:00
46c69b442b
Fixes xhuis's shit. Also fixes a bug where you would use essence if you tried to use an ability while inhibited.
2015-08-18 13:27:35 -04:00
ba3ec31deb
Toggle fixes
2015-08-18 12:15:40 -05:00
4034361789
Malfunction now uses empulse instead of copypasta code.
...
Reduces how much power gets drained from the APC when a machine is EMPed; right now, four machines could fully discharge an APC.
Obeys the Remie, no unneeded src.
Slightly upped the stun on defile and overload light(go slower, revenants!)
2015-08-18 12:55:42 -04:00
2c8389c340
YOU SPEAK, I OBEY. Fixes the stuff, as ordered, at least hopefully in the right way.
...
Tweaks Malfunction a bit to reduce the chance of random emagging; it'll mostly be emp_act now.
2015-08-18 11:50:23 -04:00
0f6a9ba19b
Fix
2015-08-18 05:04:57 -05:00
30ce209f8d
Guardian Updates
2015-08-18 04:31:46 -05:00
60715b1659
On second thought I'm removing scout anyway
2015-08-18 04:20:09 -05:00
54a32d21c2
Comma
2015-08-18 02:21:08 -05:00
c4fad66eb4
Update Chemistry-Recipes.dm
2015-08-18 02:05:41 -05:00
1d9bf04edc
Adds a Destroy() for the disposal pipe trunk.
...
Fixes vent_gas() from the disposal holder from trying to update the air while GCed
2015-08-18 03:02:09 -03:00
552a534a27
Merge pull request #11242 from Firecage/SyndicateCarbine
...
This fixes the Syndicate Carbine.
2015-08-17 23:51:53 -05:00
735a5bc5a1
there was no bug here
2015-08-17 23:24:45 -04:00
eb30a83028
Splits defile into two abilities, Defile and Malfunction. Harvest now can be activated by clicking the target while in range.
...
Defile affects a 7x7 area, damaging windows, tiring humans, and corrupting tiles.
Malfunction affects a 9x9 area, emagging bots, disabling cyborgs, and emping or emagging machines.
Defile and Overload Lights now briefly stun you so you can't just trigger and run instantly.
Fixed a bunch of Harvest bugs.
2015-08-17 23:11:16 -04:00
f4791fa6c4
REVENANTS MILDLY LESS COMMON.
...
I'm not all that surprised they were too common, I set this pretty generously.
2015-08-17 18:51:09 -04:00
526dec8222
Merge remote-tracking branch 'tgstation/master'
2015-08-17 16:58:09 -04:00
24513cca20
More wumborian fugu nonsense, forces dead simple mobs to drop their targets, collapse emote causes stamina damage
...
Swaps the inflation proc for a verb, for fugu player support
2015-08-17 00:06:59 -07:00
e4b21e30d3
autoconvert notes to sql procs
2015-08-17 15:24:50 +10:00
0dbc04d6a7
Fixes the alien hud icon for infected people not appearing.
...
If a mob is infected by a changeling egg, aliens won't get the hud icon.
2015-08-16 21:34:53 -03:00
45e484f072
Mimic ranged crates will spawn as their parent if they are not created by a staff of animation.
...
Cleans a bit mimic.dm, copypaste and some bad code (like spawning some projectile types just to get a variable)
2015-08-16 20:26:45 -03:00
ExcessiveUseOfCobblestone
Remie Richards
Kyle Spier-Swenson
Nerd Lord
Jordie
Swag McYolosteinen
KorPhaeron
Aranclanos
Cheridan
Ergovisavi