Commit Graph

10555 Commits

Author SHA1 Message Date
Xhuis
df9e581df0 Shadowling update 4 2015-08-27 19:29:33 -04:00
Cheridan
d6d036e50f Merge pull request #11355 from Aranclanos/xenohallucination
Fixes a runtime where the xeno hallucination fails to find a vent to …
2015-08-25 11:22:28 -05:00
Cheridan
227f8cf058 Merge pull request #11335 from phil235/DelToQdelBugFixes
Some bugfixes with qdel
2015-08-24 08:36:42 -05:00
phil235
9f3ce51604 Merge pull request #11293 from Aranclanos/watchlist
Fixes the watchlist edit option not working at all
2015-08-24 14:06:18 +02:00
phil235
eaf4f6b33e Merge pull request #11321 from Jordie0608/comebacktousrevenant
Stops mindless revenants from despawning
2015-08-24 13:39:45 +02:00
phil235
5c23677b77 Merge pull request #11316 from KorPhaeron/escapingfood
Slaughter Demon Fix
2015-08-24 13:33:30 +02:00
Aranclanos
a9b555d57e Fixes a runtime where the xeno hallucination fails to find a vent to spawn the alien. 2015-08-24 05:11:36 -03:00
Cheridan
1cc34a8298 Merge pull request #11306 from Aranclanos/hatlessdog
Fixes a runtime caused when interacting with a hat-less Ian
2015-08-23 21:48:39 -05:00
Cheridan
f37e9873d1 Merge pull request #11307 from MrStonedOne/patch-31
Fixes spawn revenant triggering WAY too often.
2015-08-23 20:27:30 -05:00
Cheridan
99f73bc856 Merge pull request #11248 from RemieRichards/electrocution_animation
Adds an animation to being electrocuted, like in cartoons!
2015-08-23 18:22:00 -05:00
Cheridan
cc151d3216 Merge pull request #11305 from Aranclanos/ninjastealth
Fixes ninja stealth not working at all
2015-08-23 18:11:55 -05:00
phil235
bf6b830fb0 Fixes action button not updating correctly sometimes (b/c the change from del to qdel means the button wasn't null after Removal which fucks with the action update procs)
Fixes infinite loop when deleting a camera mob.(Destroy calls qdel which calls Destroy)
2015-08-23 14:47:44 +02:00
Jordie0608
68a28e5ac2 stops mindless revenants from despawning 2015-08-22 18:58:10 +10:00
Remie Richards
1f1e539279 Merge pull request #11243 from Ergovisavi/puff_puff
Adds "Wumborian Fugu" hostile mob
2015-08-22 02:58:12 +01:00
KorPhaeron
73aac62ce6 Changed wording 2015-08-21 18:14:33 -05:00
KorPhaeron
43a151ae4e Fix 2015-08-21 18:14:00 -05:00
Kyle Spier-Swenson
9f953a2816 Fixes spawn relevant triggering WAY too often.
20, as an event weighting, happens twice as often as rad storm, a 10 weighted event.

Its way too much. I put it to 7 weight, halfway between rad storm (10) and meteor storm (5)
2015-08-20 23:45:13 -07:00
Aranclanos
db57f5834b Fixes a runtime caused when interacting with a hat-less Ian 2015-08-20 22:34:03 -03:00
Aranclanos
62c9fc6368 Fixes ninja stealth not working at all 2015-08-20 21:44:56 -03:00
Aranclanos
5655379866 Fixes the watchlist edit option not working at all 2015-08-20 08:11:48 -03:00
Kyle Spier-Swenson
37bd15dd1b adds some sane sorting to sql notes. 2015-08-19 08:36:22 -07:00
Remie Richards
ca91b43f0a Merge pull request #11258 from Anonus/spoopyghosts
Fixes a bunch of revenant stuff, again.
2015-08-19 16:15:03 +01:00
Nerd Lord
a1b557ab02 Harvest ability is dead and gone, just click them, nerd. 2015-08-19 11:06:37 -04:00
Jordie
a5c274cbc7 Merge pull request #11262 from KorPhaeron/standproud
Guardian Updates
2015-08-19 19:53:13 +10:00
Swag McYolosteinen
825b5794c7 Merge pull request #11239 from Firecage/del2qdel
del() to qdel()
2015-08-19 11:50:24 +02:00
KorPhaeron
4fd1b7f20f Merge branch 'standproud' of https://github.com/KorPhaeron/kortg into standproud 2015-08-19 04:38:26 -05:00
KorPhaeron
bac3cc0b6d Changelog 2015-08-19 04:38:11 -05:00
Jordie
bdd6a75382 Merge pull request #11119 from phil235/VaporizeMethodReaction
reagents reaction() now has more application method
2015-08-19 19:23:17 +10:00
Jordie
4463c59849 Merge pull request #11221 from Core0verload/spawnpanel
Spawn panel improvements
2015-08-19 19:01:15 +10:00
Jordie
6d5a0ade7f Merge pull request #11259 from Aranclanos/disposalstuff
Some disposal fixes
2015-08-19 18:59:32 +10:00
Jordie
6ad79827dd Merge pull request #11260 from KorPhaeron/xenobiofix
Fixes guardians spawning in xenobio
2015-08-19 18:59:13 +10:00
Jordie
5e430b3384 span4cheri 2015-08-19 17:18:13 +10:00
Jordie0608
c2d7dff564 Merge branch 'master' of https://github.com/tgstation/-tg-station into despitebestattemptsthedeweydecimalsystemhasnotyetbeenadaptedtoworkwithsql
Conflicts:
	README.md
2015-08-19 15:27:26 +10:00
Jordie0608
5be606c18e injection fixes 2015-08-19 15:09:59 +10:00
Kyle Spier-Swenson
8f1c084d23 Fixes pulling bug that led to FUN!
QUICK MERGE, MAJOR FUN REMOVAL.
2015-08-18 21:12:08 -07:00
Remie Richards
271b7344f5 Merge pull request #11045 from KorPhaeron/survivalpod
Survivalpod
2015-08-18 20:50:18 +01:00
Remie Richards
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
Remie Richards
1595538788 Merge pull request #11244 from Aranclanos/mimicranged
some mimic ranged mob fixes
2015-08-18 20:38:55 +01:00
Remie Richards
b70dfb8ece Merge pull request #11189 from phil235/JanicartFixes
Slipping while buckled, some fixes
2015-08-18 20:26:36 +01:00
Remie Richards
f77047b640 Merge pull request #11185 from Cheridan/brycepaxsbrain
Logging Syntax Improvement
2015-08-18 20:24:42 +01:00
Remie Richards
3891e67d8d Merge pull request #11162 from Core0verload/rnd-implants
RnD update
2015-08-18 20:20:12 +01:00
Nerd Lord
da15c99460 Wait shit that shouldn't be indented~ 2015-08-18 14:09:58 -04:00
Nerd Lord
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
KorPhaeron
ba3ec31deb Toggle fixes 2015-08-18 12:15:40 -05:00
Nerd Lord
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
Nerd Lord
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
KorPhaeron
0f6a9ba19b Fix 2015-08-18 05:04:57 -05:00
KorPhaeron
30ce209f8d Guardian Updates 2015-08-18 04:31:46 -05:00
KorPhaeron
60715b1659 On second thought I'm removing scout anyway 2015-08-18 04:20:09 -05:00
KorPhaeron
54a32d21c2 Comma 2015-08-18 02:21:08 -05:00