Commit Graph

6438 Commits

Author SHA1 Message Date
KorPhaeron 0e6a99f4fb Bugfix 2015-10-28 16:58:35 -05:00
Incoming 48313206d5 Merge branch 'master' of https://github.com/tgstation/-tg-station into slime_time_live 2015-10-28 17:36:55 -04:00
Cheridan f7175c19a2 Merge pull request #12660 from RemieRichards/ShoulderParrots
Player Parrots can now sit on a Human's shoulders.
2015-10-28 16:35:36 -05:00
GunHog 3c24ac8fe8 XENO MEAT FOR EVERYBODY!!
- Greatly increased the meatiness of Xeno royals!
2015-10-28 15:42:41 -05:00
kingofkosmos 2c0f178e31 Embedded object -alert can be clicked to remove the object.
When handcuffed, a handcuffed-alert appears and clicking it is the same as clicking on resist. Same with legcuffing.
Moving in a Suit Storage Unit or welded/locked locker or morgue tray is now the equivalent of pressing resist.
2015-10-28 21:10:50 +02:00
MrPerson 2f9c5b38f0 Removes the unused lastarea mob var
I think it was used for ambience music a long time ago.
2015-10-28 04:25:18 -07:00
GunHog 3255334cdb Sprites and fixes
- New sprites by WJohn! Yay!
- Fixes borg cells not updating
2015-10-28 00:31:32 -05:00
GunHog 1e6d8753ef Small trails fix
Derp
2015-10-27 22:55:54 -05:00
GunHog 1e25dab29f New Xeno Sprites!
- Added new Xeno sprites by WJohn!
- New blood trails!
- New Xeno blood and gibs!
- Removed walk/run mode from Xenos.
- Alien sneaking is now an action button, small delay when sneaking.
- Fixed NPC xenos missing sprites
2015-10-27 22:32:06 -05:00
Nerd Lord 33f898f06f Adds perfect souls tracker to stat panel. 2015-10-27 22:20:25 -04:00
Razharas 9357602233 Merge pull request #12665 from tkdrg/ghost_medsechuds
[READY] Adds a ghost on-screen HUD
2015-10-28 05:19:19 +03:00
Nerd Lord 0160622bdc BARA REDUCTION 2015-10-27 22:12:38 -04:00
Nerd Lord f4589c75f3 Fixes instant draining, also buffs revenant abilities to compensate for new health system. 2015-10-27 22:10:35 -04:00
Tkdrg dd20530f0e Adds ghost alerts.
Adds ghost alerts for revival (cloning, MMIs, nar-sie, drones, etc).
2015-10-27 23:07:41 -03:00
Razharas e3c87713d5 Merge pull request #12668 from Shadowlight213/Syndiemobblock
Syndicate melee mob tweaks.
2015-10-28 02:45:52 +03:00
Tkdrg a87af40beb Adds ghost sec/med huds. Adds new ghost HUD icons
Thank you Razharas for the icons.
2015-10-27 14:32:46 -03:00
Razharas a821bb86d7 Merge pull request #12671 from MrStonedOne/patch-51
Fixes arrivals shuttle getting destroyed breaking observing.
2015-10-27 18:34:14 +03:00
Razharas 0ab03947e6 Merge pull request #12647 from tkdrg/o_o
Adds googly eyes for animated mimics
2015-10-27 18:30:28 +03:00
KorPhaeron 51004877d2 Cloneloss 2015-10-27 05:13:09 -05:00
KorPhaeron e51845a457 Typing is hard 2015-10-27 03:49:31 -05:00
KorPhaeron 44cbf04cdb Lets err on the side of weak to guns actually 2015-10-27 03:49:18 -05:00
KorPhaeron 03ad586cb8 No instant heals 2015-10-27 03:45:35 -05:00
Jordie b22e0801a8 Merge pull request #12539 from KorPhaeron/pillshere
Zombies
2015-10-27 19:38:39 +11:00
KorPhaeron 926c0be367 Less health 2015-10-27 03:14:37 -05:00
KorPhaeron 8a40ddc7d8 Forgot a line 2015-10-27 02:37:24 -05:00
KorPhaeron e2e9be42b8 Zombie fixes 2015-10-27 02:35:00 -05:00
Cheridan 856164ecf4 Merge pull request #12659 from Anonus/catbuff
Cat buff: There's cat hair in the vents!
2015-10-26 21:04:21 -05:00
Tkdrg 1ca8237dba Readds ghost verbs. Makes the ghost HUD togglable 2015-10-26 22:57:08 -03:00
Shadowlight213 ed11271a3a Removes redundant code 2015-10-26 18:11:42 -07:00
Cheridan 4ded0027ea Merge pull request #12649 from Incoming5643/why_cant_I_hold_all_these_hands
Fixes dropable bloodcrawl hands
2015-10-26 16:46:20 -05:00
Razharas 39d861cf44 Merge pull request #12043 from kingofkosmos/firescreenalert
Screen alert for being on fire
2015-10-26 19:17:40 +03:00
Remie Richards a0e79284a1 Shoulder Parrots no longer provide immunity to Slimes, rofl. 2015-10-26 14:51:51 +00:00
Kyle Spier-Swenson 2f149c7361 adds span class to failed to teleport warning 2015-10-26 05:35:10 -07:00
Kyle Spier-Swenson 38bae5f833 Fixes arrivals shuttle getting destroyed breaking observing. 2015-10-26 05:31:16 -07:00
Shadowlight213 a1c5385e38 Re-adds ranged block 2015-10-26 00:54:22 -07:00
Shadowlight213 f11b9ef0a4 Removes melee syndicate block chance as it was snowflake and buggy, and increased their health to compensate. 2015-10-26 00:29:28 -07:00
Tkdrg 8e775a18ff Adds a ghost on-screen HUD
Removes the ghost verbs and adds an on-screen HUD.
2015-10-26 03:22:29 -03:00
KorPhaeron 49dfb52cea Parasites 2015-10-25 21:42:47 -05:00
Remie Richards 234c3b76fb Player Parrots can now sit on Human's shoulders. 2015-10-26 02:33:44 +00:00
Nerd Lord 6b0ecfed4b Buffs cats. Cats can now ventcrawl, walk over tables, take less damage from lacking air(and will thus survive longer in boxes with radiation) and can live in slightly higher and lower temperatures. 2015-10-25 22:16:25 -04:00
Razharas 2a075688d8 Merge pull request #12566 from AnturK/isitaplane
Makes is_type helpers inline
2015-10-26 03:22:42 +03:00
Remie Richards c51d719dd9 Merge pull request #12618 from blobbernaut/Blobbernaut
Fixes cloaks; Allows more item slots to have armor (such as shoes and gloves)
2015-10-26 00:11:13 +00:00
Razharas 4a5edd6498 Merge pull request #12638 from SuperSayu/jobs_txt
Should fix loading from jobs.txt
2015-10-26 03:08:07 +03:00
Razharas 5c94edc8f6 Merge pull request #12441 from xxalpha/swiss_cheese
Adds a very small chance of mice chewing power cables.
2015-10-26 03:04:23 +03:00
Remie Richards b99ecdfbe0 Merge pull request #12597 from AnturK/atoningmycodingsins
Action Button Minor Rework Cleanup
2015-10-25 23:02:59 +00:00
Incoming d594ed34d6 [readding the heat/cold modifiers] 2015-10-25 16:54:57 -04:00
Incoming aad61cb567 Merge branch 'master' of https://github.com/tgstation/-tg-station into slime_time_live
Conflicts:
	code/modules/mob/living/carbon/human/species_types.dm
2015-10-25 16:51:25 -04:00
as334 f116ba5c32 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-10-25 15:39:42 -04:00
Cheridan ed9b0c35c6 Merge pull request #12612 from phil235/BugFixBoogalooI
bugfixes: bloodcrawl, losebreath, wintercoat, and more
2015-10-25 14:19:11 -05:00
Incoming 0ce740fa94 Fixes dropable bloodcrawl hands, you need both of these when the item is something you keep in your hands. 2015-10-25 14:39:59 -04:00