Commit Graph

7015 Commits

Author SHA1 Message Date
bgobandit 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
Joan Lung 4442614741 Merge pull request #17642 from Shadowlight213/cleanbest
Fixes to bot scanning improvements.
2016-05-17 23:59:13 -04:00
Robustin f02fb50825 Adds Hivemind Link (#17618)
Adds Hivemind Link ability to changelings
2016-05-17 20:42:44 +01:00
AnturK 7a3d270889 Merge pull request #17615 from lordpidey/paperFix
Adds literacy check to reading and writing papers.
2016-05-17 20:29:36 +02:00
Cheridan 33161a3814 Merge pull request #17690 from KorPhaeron/named
Removes named zombies from gold core spawn
2016-05-17 11:08:09 -05:00
Incoming5643 f14f624b8d Fixes invisible slimefolk (#17733) 2016-05-16 21:15:22 -05:00
Joan Lung ef81fcb544 Merge pull request #17700 from coiax/i-require-nutrients
Refactors need_nutrition into NOHUNGER specflag
2016-05-16 16:37:11 -04:00
Joan Lung f1f5f73922 Merge pull request #17661 from GunHog/Borgie_Law_Fix
Fixes directly uploading laws to borgs
2016-05-16 11:01:33 -04:00
Shadowlight213 7abc28cf9f Improves bot stacking resolution 2016-05-15 21:17:04 -07:00
Joan Lung d1307bfac7 Merge pull request #17656 from KorPhaeron/swoop_cooldown
[s] Fixes infinite swoop exploit
2016-05-15 20:40:57 -04:00
Jack Edge 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
bgobandit 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
Incoming5643 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
KorPhaeron 599e4e4503 Removes named zombies from gold core spawn 2016-05-15 11:11:11 -05:00
AnturK e61e6c7aab Merge pull request #17422 from nullbear/blood-transfusion-fix
Blood Type Refactor
2016-05-15 14:55:34 +02:00
Robustin bb0194802f Ends traitorling + snowflake rules, totally unrelated to #17618 (#17620)
* Snowflek-b-gone

* Traitorling gone
2016-05-14 17:13:00 -05:00
GunHog 9786c614c1 Fixes directly uploading laws to borgs
- Borgs without a mind do not accept attempts to relaw them.
- Fixes law board's install() proc being fed incorrect arguments.
2016-05-14 12:16:22 -05:00
KorPhaeron 32a90e3a55 Swoop Cooldown 2016-05-14 06:21:20 -05:00
Shadowlight213 b217bce30f Dont actually need this now. 2016-05-13 18:05:34 -07:00
Shadowlight213 fd6b3dc953 Makes the improved bot scanning code actually work for more than floorbots!
Add some more checks to hopefully prevent bot stacking.
2016-05-13 17:57:51 -07:00
Joan Lung 8b656d2603 Merge pull request #17284 from MMMiracles/spookyjookie
Lavaland Ruins
2016-05-13 20:22:56 -04:00
Shaps cbc7a8b654 Fixes announcement prefs, fixes SOUND_ANNOUNCEMENTS (#17626)
* Actually fixes announcements the right way

* Flips the SOUND_ANNOUNCEMENTS bitflag so that having it means you hear announcements

* Updates the save file version
2016-05-14 00:55:50 +02:00
Joan Lung c79c7f0d86 Merge pull request #17619 from phil235/FixRnDThrow
Fix bundle. experimentor, rnd machines, mob throwing
2016-05-13 17:36:51 -04:00
Razharas b46de70537 Makes dismemberment more adjustable (#17587)
* Makes dismemberment more adjustable

Makes dismemberment more adjustable
Items now return chance for dismemberment
Bodyparts now decide if they are dismemberable or not by the specific
item
Items now decide what sound to play on dismemberment
No balance changes here

* Owner into H

Owner into H
2016-05-13 20:27:06 +02:00
AnturK 2133f8b66e Merge pull request #17580 from phil235/FixHugGender
Fixes hugging message
2016-05-13 19:28:55 +02:00
Jordie c66c8b9f63 Merge pull request #17531 from Shadowlight213/cleanbetter
Improves bot scanning
2016-05-13 14:16:23 +10:00
Joan Lung bfbb76df0b Merge pull request #17477 from KorPhaeron/hugbox
Makes drakes more hugbox
2016-05-12 20:04:45 -04:00
phil235 a49e4cf87d Fixes experimentor having no sprite when panel open.
Fixes panel opening deconnecting the wrong rnd console
Fixes not being able to throw mobs.
2016-05-12 21:37:18 +02:00
Mike Long 33ce83b9ac Adds literacy check to reading and writing papers.
Fixes #12277
Fixes #17561
2016-05-12 13:42:48 -04:00
KorPhaeron eae335e281 Forgot a commit 2016-05-12 03:51:56 -05:00
KorPhaeron ec5291471d Removes warning 2016-05-12 03:42:31 -05:00
KorPhaeron ce293fe6da Dragon Fixes 2016-05-12 03:25:36 -05:00
Shadowlight213 a2aa7c6a0e Fix 2016-05-11 21:39:02 -07:00
phil235 55821bb92c Message when hugging someone now uses the gender neutral term "them". This fixes being able to tell someone's gender even when they wear clothes hiding their identity. 2016-05-11 23:56:01 +02:00
Cheridan 58319051dd Merge pull request #17558 from phil235/WashingFix
Fixes washing machine
2016-05-11 16:29:06 -05:00
Shadowlight213 320bb39eba Removes abductor ability to use guns. (#17515)
* Removes abductor ability to use guns.
Removes agent starting out with an alien blaster

* removes comment

* Makes Abductors able to use alien pistol

Alien pistol now has ALLOW_ALL trigger guard to overcome abductor's
natural NOGUN.

Pistol now starts in the backpack, and the wondertool on the belt.

In addition:
 - Replace multiple copies of IsAbductor() with a single isabductor()
   proc in code/__HELPERS/mobs.dm
 - Adds icon for alien firing pin
 - Adds abductor span for ayylien communication
2016-05-11 20:28:52 +01:00
Joan Lung 60237bbb31 Merge pull request #17548 from coiax/fix-17497
Fix #17497; moves bardrone from map to drone types
2016-05-11 09:29:55 -04:00
Jordie be58aedcff Merge pull request #17549 from ChangelingRain/spaceshade
Shades can move in space
2016-05-11 22:59:28 +10:00
Nerd Lord 930b9ba91b sanity? 2016-05-11 08:44:33 -04:00
Jack Edge edc47a564a Switches the naming booleans around 2016-05-11 12:56:02 +01:00
Cheridan 915535e69e Merge pull request #17514 from KorPhaeron/explosion
Explosive dismemberment fix
2016-05-10 20:30:34 -05:00
bgobandit 3762c90630 Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-05-10 17:17:11 -04:00
phil235 1b24cc7e6a Moved crayon code out of toys.dm and into crayons.dm
Fixes being able to throw kinetic grabs.
Fixes washing machine code being shit. Also fixes clothes coloring via washing machine being broken.
2016-05-10 22:53:47 +02:00
Jack Edge 0b0d922f98 Moved Bardrone into drone types 2016-05-10 21:00:11 +01:00
Nerd Lord 36504eb571 shades in spaaaace 2016-05-10 07:39:13 -04:00
Jack Edge 7bb60725bb Fixes #17497
Drones now have numbers by default unless specified otherwise.
2016-05-10 12:09:29 +01:00
Jordie d9bd933f4e Merge pull request #17494 from coiax/die-facehugger-bug
Fixes facehugger related equipping issue
2016-05-10 18:50:15 +10:00
Shadowlight213 8112079ff5 Fixes 2016-05-09 23:06:41 -07:00
bgobandit 8d1a1fe432 Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-05-10 01:14:44 -04:00
Shadowlight213 ff581bc902 Changes 2016-05-09 21:28:57 -07:00