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
271b7344f5
Merge pull request #11045 from KorPhaeron/survivalpod
...
Survivalpod
2015-08-18 20:50:18 +01: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
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
552a534a27
Merge pull request #11242 from Firecage/SyndicateCarbine
...
This fixes the Syndicate Carbine.
2015-08-17 23:51:53 -05: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
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
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
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
5539689f3a
Merge pull request #11043 from KorPhaeron/moreweebshit
...
Timestop for Wizards
2015-08-16 11:04:47 +02: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
8a4f8a4482
Revert "Adds 15-force edaggers that look and function like pens when off."
2015-08-16 00:36:08 +02:00
df758d2fff
Merge pull request #11146 from MMMiracles/biomemes
...
Revamps Bioterror Darts
2015-08-15 22:47:00 +02:00
bc6ffdcf31
Merge pull request #11194 from Aranclanos/wabbajack
...
The staff of change projectile will qdel the mob instead of manually …
2015-08-15 22:28:27 +02:00
06b94738fa
Merge pull request #11182 from Miauw62/death
...
Makes patches not work on dead people.
2015-08-15 16:17:24 +02:00
907031df61
Merge pull request #11202 from Miauw62/alanedaggerpoe
...
Adds 15-force edaggers that look and function like pens when off.
2015-08-15 16:16:30 +02:00
9e2c59ca24
debug fix
2015-08-15 22:34:18 +10:00
e2d3488f7f
database notes
2015-08-15 22:24:24 +10:00
23011e0906
changelog
2015-08-15 13:22:02 +03:00
7a6afb6889
Merge pull request #11046 from KorPhaeron/escape
...
Midround Escape Pod Launch
2015-08-15 01:26:44 -05:00
9d5981c3b2
Actually fixed
2015-08-14 22:44:34 -05:00
72e5d917e8
Merge pull request #11144 from Aranclanos/cryotubeee
...
Fixes mobs not getting the gas mixture from cryotubes to change their…
2015-08-14 21:31:20 -05:00
54d91dd632
Fixed
2015-08-14 20:12:47 -05:00
58ce07405a
Merge pull request #11111 from GunHog/AIshuttlecallfix
...
Fixes the AI's shuttle call prompt lacking a 'Cancel' button.
2015-08-14 17:42:09 -05:00
6b091e0cb6
Merge pull request #11086 from freerealestate/rcdrebalance
...
Rebalances RCD construction costs around metal construction menu costs
2015-08-14 15:14:25 +02:00
37dc7e0e3c
Adds 15-force edaggers that look and function like pens when off.
2015-08-14 14:07:10 +02:00
91e56c0bac
Makes some reagents not work on dead mobs instead of patches not working.
2015-08-14 12:37:32 +02:00
531334087e
Merge pull request #11181 from Miauw62/sch-e-slch-schsch-schshc-sc-hschsch-schs-hcshchschschschschshcshshch-schsh-cshcsh-chschsch-s-chschscsh-cshcshcsh
...
Fixes ranged stuns causing slurring.
2015-08-14 11:15:41 +02:00
ca98ac5151
The staff of change projectile will qdel the mob instead of manually deleting it.
...
Added a warning for when the mob controller removes a null from the mob list.
2015-08-13 21:40:00 -03:00
b4499ec2ef
Revenant event now triggers. We're goin for it, we are.
...
I don't actually know if the event works properly concerning triggering with too few dead mobs but it should work in most cases so ¯\ _(ツ) _/¯
2015-08-13 20:03:42 -04:00
2194e352a9
Revenant "steal essence" objective now actually possible without doing literally nothing, also no longer runtimes. It was doubly impossible, really.
2015-08-13 19:05:04 -04:00
3855e58112
Revenants no longer get spacewinded, defile murders the shit out of windows(two casts to kill rwindows, from like 6)
2015-08-13 18:07:56 -04:00
1cee0d3014
Fixes slipping on water while riding janicart.
...
The handle_slip() now also handles cases where the mob is buckled. If you are buckled and slip on lube (or something that ignores
galoshes) you get unbuckled and stunned and the buckle object moves one step (no slides unlike when unbuckled).
You can thus slip on lube while buckled to a chair or a roller bed.
Fixes getting hit by abstract held items when slipping.
Fixes janicart rider getting hit twice by bullets.
Removing the STEP constant var in slipping code, it's no more used.
Fixes carbon/slip() not returning the correct value.
Changed var/obj/structure/stool/bed/buckled to var/obj/buckled since buckled can now technically be any obj.
Removes hacky unbuckling/buckling in bed/Move()
2015-08-13 23:49:02 +02:00
561f884ea9
Defile now actually emags bots properly. The code for bot emagging is dongs.
2015-08-13 17:44:50 -04:00
f463b3b69b
Buffs the fuck out of revenants. Also cleans some stuff up a little.
2015-08-13 15:49:54 -04:00
4e82bc056e
Fixes def_zone not being logged, maybe
2015-08-13 12:31:10 -05:00
5979ffdec7
Logging Syntax Improvement
2015-08-13 12:14:14 -05:00
46b519309e
Merge pull request #11058 from Core0verload/surgery-organs-part2
...
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
ced06e1a2c
Fix
2015-08-13 09:11:19 -06:00
Jordie0608
Kyle Spier-Swenson
Remie Richards
Cheridan
Nerd Lord
Aranclanos
Firecage
KorPhaeron
phil235
c0
Swag McYolosteinen
phil235