b94ce1968b
Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
...
Conflicts:
_maps/map_files/MetaStation/MetaStation.dmm
2016-05-18 03:13:37 -04:00
4442614741
Merge pull request #17642 from Shadowlight213/cleanbest
...
Fixes to bot scanning improvements.
2016-05-17 23:59:13 -04:00
b4b93bd561
Adds new objective for devils to have X people on station be sintouched. ( #17616 )
...
* Adds new objective for devils to have X people on station be sintouched.
Adds spell that causes nearby humans to be sintouched.
Drastically lowers chances of codex gigas sintouching it's reader.
* Fixes a runtime.
2016-05-17 21:37:08 +01:00
f02fb50825
Adds Hivemind Link ( #17618 )
...
Adds Hivemind Link ability to changelings
2016-05-17 20:42:44 +01:00
39df917efa
Merge pull request #17708 from RemieRichards/RemieTriesTGUI
...
Updates the Mech Bay Power Control Console to have a TGUI interface.
2016-05-17 14:36:15 -05:00
9941125e34
Merge pull request #17691 from ChangelingRain/nukable
...
[s] Fixes nuke disc respawn failing
2016-05-17 21:32:15 +02:00
81a10a300e
Merge pull request #17633 from phil235/FingerPrince
...
[s] Changes how hidden fingerprints (for admin use) work.
2016-05-17 20:49:37 +02:00
7a3d270889
Merge pull request #17615 from lordpidey/paperFix
...
Adds literacy check to reading and writing papers.
2016-05-17 20:29:36 +02:00
3e2811908f
Merge pull request #17635 from MrStonedOne/patch-199
...
Tesla rebalance
2016-05-17 11:11:28 -05:00
33161a3814
Merge pull request #17690 from KorPhaeron/named
...
Removes named zombies from gold core spawn
2016-05-17 11:08:09 -05:00
ab3e1eb32e
[s] Suicides are now logged. ( #17636 )
...
* Suicides are now logged.
* Specifing job of the mob who committed suicide.
2016-05-16 22:11:23 -05:00
8b3a4a1570
Makes map placed broken grilles act normally. ( #17678 )
...
* Adds proper mapstart broken grilles
* Adds proper mapstart broken grilles
2016-05-16 22:10:01 -05:00
31bd194f55
Merge pull request #17731 from KorPhaeron/bone
...
Bone Armor Sprites
2016-05-16 21:51:30 -05:00
f14f624b8d
Fixes invisible slimefolk ( #17733 )
2016-05-16 21:15:22 -05:00
f5d58c3f72
Unborks the greentext being too greentextful ( #17699 )
...
* Unborks the greentext being too greentextful
* W H O O P S
2016-05-16 20:35:33 -05:00
34a7a89df1
Bone Sprites
2016-05-16 19:35:36 -05:00
3400cf690d
[s] Simple animals can no longer drag-drop people into cryo or sleepers. ( #17689 )
...
* Simple animals can no longer drag-drop people into cryo or sleepers.
* Changed sleeper/cryo fix to use IsAdvancedToolUser()
2016-05-16 18:47:52 -05:00
8b78034d1d
Update paper.dm
...
One line change to use usr.incapacitated() instead of several checks.
2016-05-16 17:45:14 -04:00
ef81fcb544
Merge pull request #17700 from coiax/i-require-nutrients
...
Refactors need_nutrition into NOHUNGER specflag
2016-05-16 16:37:11 -04:00
561bdd08ad
Dead cultists no longer show up in the target list for 'Summon Cultist' ( #17664 )
2016-05-16 10:04:27 -05:00
dd2c91ca64
two tiny fixes ( #17658 )
2016-05-16 10:03:57 -05:00
f1f5f73922
Merge pull request #17661 from GunHog/Borgie_Law_Fix
...
Fixes directly uploading laws to borgs
2016-05-16 11:01:33 -04:00
8353ac925f
Merge pull request #17562 from Robustin/travelmode
...
Reverts ye olde Cult Pop. Scaling Nerf
2016-05-16 10:58:37 -04:00
ca2f8ae419
Merge pull request #17667 from MrStonedOne/patch-201
...
Map changing will now delay round end until it finishes
2016-05-16 10:57:16 -04:00
5cce6a6d50
eliminates a hard tell in microlaser desc ( #17669 )
2016-05-16 09:48:40 -05:00
7abc28cf9f
Improves bot stacking resolution
2016-05-15 21:17:04 -07:00
2b646e2c0f
Updates the Mech Bay Power Control Console to have a TGUI interface.
2016-05-16 02:24:41 +01:00
d1307bfac7
Merge pull request #17656 from KorPhaeron/swoop_cooldown
...
[s] Fixes infinite swoop exploit
2016-05-15 20:40:57 -04:00
feb02815ad
Fixes #17665 , abductor event finds people now ( #17686 )
2016-05-15 19:40:04 -05:00
b31040fc0d
Merge pull request #17666 from Razharas/Fixes
...
Fixes attacking blobs that should be unreachable behind other blobs
2016-05-15 18:40:05 -04:00
f5b3f3647f
Refactors need_nutrition into NOHUNGER specflag
...
Current human species that don't need to eat:
- Plasmamen
- Skeletons
- Agents
They now have the NOHUNGER specflag, which means their nutrition does
not decay like a baseline human's; no change in behaviour.
2016-05-15 22:36:36 +01:00
eaf93e34cd
Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
...
Conflicts:
_maps/map_files/MetaStation/MetaStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-05-15 17:19:14 -04:00
01ce91bf6d
Specflag'd Dismemberment ( #17469 )
...
* Adds NODISMEMBER to the species specflags to remove the var. It's not DISMEMBER because that's the default expectation and specflags need to be manually set for every race.
Merges RESISTHEAT and RESISTCOLD into RESISTTEMP. Every situation where one occurred the other did as well. It also doesn't make thermodynamic sense that something good at one wouldn't be good at the other anyways.
* T H E S E A R E N O T B I T F L A G S
2016-05-15 22:05:42 +02:00
b16c055bd3
Merge pull request #17526 from Incoming5643/patch-3
...
Mulligan patchwork fix to the newer disemboided blob overminds
2016-05-15 12:44:12 -04:00
7d045c4428
Merge pull request #17622 from Robustin/ruserious
...
Removes Nar-Sie from portal storm event
2016-05-15 12:43:01 -04:00
c65e98bd88
it took me 10 minutes to fix this and a few months for someone to tell me what the bug was
2016-05-15 12:17:32 -04:00
599e4e4503
Removes named zombies from gold core spawn
2016-05-15 11:11:11 -05:00
a9b26391e9
Merge pull request #17654 from coiax/fix-17624
...
Fix #17624 ; shuttle loan checks for banned items
2016-05-15 14:59:42 +02:00
562559e2d8
Merge pull request #17652 from coiax/fix-17651
...
Fixes #17651 ; missing limbs needed for message
2016-05-15 14:58:24 +02:00
e61e6c7aab
Merge pull request #17422 from nullbear/blood-transfusion-fix
...
Blood Type Refactor
2016-05-15 14:55:34 +02:00
c6cad13d0e
Merge pull request #17682 from optimumtact/patch-1
...
Improve chatter regex to prevent infinite loop
2016-05-15 18:25:06 +10:00
c0fc836e3e
Readd pick to generate_messages for skeleton
...
This causes it to pick a list instead of a message
2016-05-15 20:17:47 +12:00
4a365aecdd
improve chatter regex to prevent infinite loop
...
R.find can be called repeatedly to update the R.groups and will return 0 if no match is found
2016-05-15 20:12:17 +12:00
5e7e773681
Makes it actually see the further away grounding rods.
2016-05-14 17:50:29 -07:00
0a839f7461
swat mask now hides hair ( #17675 )
2016-05-14 19:24:39 -05:00
9f57bca8f7
Adds two alternate shuttles ( #17592 )
...
* I got the results of the test back - I definitely have breast cancer.
* aaaaaa
* need help translating shuttle code, will pay in shitcode
* fixes
* Update emergency_imfedupwiththisworld.dmm
* Removes copyright infringement
* Update shuttles.dm
2016-05-14 19:06:25 -05:00
4c89a3a863
Merge pull request #17639 from Iamgoofball/patch-40
...
Removes shitty shoehorned references.
2016-05-14 18:45:32 -05:00
c2336cc8c9
Cult runes no longer cover the entire tile ( #17641 )
2016-05-14 18:41:44 -05:00
febfc859a8
Fixes cults converting things they shouldn't be able to ( #17640 )
...
* Fixes cults converting things they shouldn't be able to
* comment correction
* no message
* it is, actually
2016-05-14 18:40:29 -05:00
076fc0df79
Adds Bone Weaponry ( #17672 )
...
* Adds Bone Weaponry
Adds Bone Spears, Axes, and Daggers, all craftable.
* '''Balance'''
I listen to the suggestions of others.
* Fixes
2016-05-14 18:31:36 -05:00
bgobandit
Joan Lung
lordpidey
Robustin
Cheridan
AnturK
phil235
RandomMarine
Incoming5643
KorPhaeron
Cruix
PKPenguin321
Shadowlight213
Remie Richards
coiax
Jordie
oranges
Kyle Spier-Swenson
Iamgoofball
TehZombehz