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
5681bbbd9b
Updates human species to use update_color(), fixing humans not flashing black for the duration of the electrocution animation. Minor restructuring of redundant lines in update_icons.dm
2015-08-17 14:16:05 +01:00
f2f97006cd
Adds an animation to being electrocuted, like in cartoons! Adds some arguments to mutant bodypart icon procs to correctly render them in black for the duration of the animation.
2015-08-17 13:06:04 +01: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
99234185de
first pass of cleanup
...
makes simple pipes more OOP
adjusts defines; puts them in __DEFINES/atmospherics.dm
adds DEVICE_TYPE_LOOP define, which is used in a bunch of the for loops
2015-08-16 23:10:57 -06: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
2ee2c8513e
This fixes the Syndicate Carbine.
2015-08-17 00:51:23 +02:00
89f79a1397
Hopefully fixes #11238 by removing the strike code, overload lights now causes sparks, window to put someone into a revenant increased to 10 seconds.
2015-08-16 18:36:12 -04:00
bf13763e3b
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel
2015-08-16 23:34:03 +02:00
dfae1e0b53
Changes a lot of del() to qdel()
2015-08-16 23:33:22 +02:00
f6aa26ae75
Merge pull request #11187 from Anonus/atleastthiswon'tconflict
...
Buffs revenants a whole bunch so they're less terrible to play
2015-08-16 21:19:55 +01:00
2e4a5844f0
PROPER FIX: CHECK
...
MAX(0, ESSENCE): CHECK
2015-08-16 16:16:46 -04:00
fece9cf524
I forgot how my own code worked
2015-08-16 10:49:51 -05:00
f64f1e2967
Reverts the revert properly instead of unreverting it unproperly.
2015-08-16 12:55:09 +02:00
e8c39e2d07
Merge branch 'master' of https://github.com/tgstation/-tg-station into alanedaggerpoe
...
Conflicts:
code/modules/paperwork/pen.dm
2015-08-16 12:00:04 +02:00
efb5226784
ayy lmao i forgot that pens overwrite attack()
2015-08-16 11:54:47 +02:00
5539689f3a
Merge pull request #11043 from KorPhaeron/moreweebshit
...
Timestop for Wizards
2015-08-16 11:04:47 +02:00
b130f4958d
Simplify the math a bit on gliding
...
Rounding now happens after calculations instead of before. The delay is also unrounded.
2015-08-15 22:28:42 -07:00
0abd08cb92
Did it the way Phil wanted it
2015-08-15 22:00:15 -05:00
dcee74e952
Fixed the src.loc stuff
2015-08-15 21:41:19 -05:00
6d6fcddc67
Edits Required Tech
2015-08-15 19:15:32 -04:00
ExcessiveUseOfCobblestone
Remie Richards
Nerd Lord
KorPhaeron
Aranclanos
Cheridan
Ergovisavi
Jordie0608
duncathan
Firecage
Miauw
phil235
MrPerson