Commit Graph

129 Commits

Author SHA1 Message Date
Xhuis 7b5760f6d3 Merge remote-tracking branch 'remotes/upstream/master' into shadowling_1 2015-04-13 16:47:00 -04:00
Xhuis 9c752683ef Shadowling update one 2015-04-13 16:46:49 -04:00
AnturK 6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Swag McYolosteinen 853009f7e0 Merge pull request #8157 from Xhuis/shadowling_gamemode
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
Xhuis c9338f7212 Shadowling: RELEASE EDITION 2015-04-11 11:42:02 -04:00
Cheridan 94b8f0db16 Merge pull request #8733 from MrPerson/cold_slowdown_speedup
Reduces penalty to movespeed from being cold
2015-04-10 12:48:39 -05:00
phil235 8499413649 Makes living/verb/resist more object oriented.
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02:00
MrPerson e2d8b62620 Reduces penalty to movespeed from being cold
It kicks in at a lower body temp and the slowdown is less harsh. You move noticeably faster than space wind, which was the goal here.
2015-04-04 03:08:24 -07:00
Jordie b62eb672da Merge pull request #8618 from Xhuis/my_ears_they_bleed
Separates ship ambience and area ambience
2015-03-31 19:16:59 +11:00
Xhuis 932cac081a Separates ship ambience and area ambience 2015-03-29 14:49:59 -04:00
Sawu ab776cf014 Updates the NPCPool to current branch.
see #7012
* NPCPool will co-ordinate and organize all SNPCs, making them stronger and more intelligent.
* SNPCs can use the botPool system to co-ordinate and delegate with each other.
* SNPCs have been given factions to allow interoperability between certain types of SNPCs.
* Bots (machinery/bot) can use the system too for basic help and coordination.
2015-03-30 02:50:21 +11:00
Remie Richards 51a3a8b6aa Merge pull request #8535 from MrPerson/just_in_time_for_april_fools
Change holidays into datums
2015-03-26 16:46:02 +00:00
MrPerson ce13faed09 Change select holiday names to #defines 2015-03-25 15:01:06 -07:00
MrPerson 9910cf3fe3 Change holidays into datums
Holidays are now actual datums with procs and vars and everything.
Holidays run a proc called celebrate() when it's time to celebrate them. Currently none of them do anything but that should change, wink wink.
Holidays can now run for more than a day. The important ones, april fools, christmas, halloween, new years, and easter, all last at least a week. The idea is so people can celebrate christmas in game without having to, you know, actually play on fucking christmas. And also to put a time limit on how long stuff like the annoying spookoween closet skeletons will stick around so it doesn't overstay its welcome and become annoying as shit like last year.
The event SS now allows more than 1 holiday to run at a time. This matters for new years + christmas, easter + april fools, easter + 4/20, and any holiday that can happen on friday the 13th. The events get stored in a list that's only initialized if there's an active holiday so testing for potential holidays is still pretty easy.
Added more easter dates so we won't have to add more until 2040. The current batch run out in 2017.
2015-03-25 01:46:29 -07:00
Jordie fde0eecce8 Merge pull request #8456 from MrPerson/im_the_music_meisteeeeeeeeeeeeeer
Instrument tweaks
2015-03-25 16:29:29 +11:00
MrPerson 2fa6457130 Added a preference toggle for hearing musical instruments 2015-03-22 01:54:30 -07:00
Miauw 1b753dd1c5 Adds the comic sans span to the new system. 2015-03-18 21:09:36 +01:00
Miauw 1873143e63 Initial say cleanup commit. 2015-03-18 19:23:31 +01:00
Cheridan da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
Code cleanup
2015-03-15 01:55:39 -05:00
Cheridan 1027c7619c Merge pull request #8206 from RemieRichards/AILessProcessing
Hostile Mob AI Optimisation
2015-03-14 16:21:22 -05:00
MrPerson 9038fb15af Code cleanup
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
phil235 1eba7b694b Merge pull request #8134 from Miauw62/ghostradios
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-10 23:56:28 +01:00
Cheridan fbab136950 Merge pull request #8016 from RemieRichards/EmbeddingBalance
Embedded Item Balancing. Also fixes #8029
2015-03-09 02:03:18 -05:00
Remie Richards 643de0c922 Hostile mobs no longer run all their hostile targeting/hunting code if there is nobody (or item, for those that hunt items) near them, they simply move to a simpler loop that decides whether to let the main loop continue. 2015-03-07 18:46:02 +00:00
Miauw 82bc75c263 Moves chat toggles into their own variable. 2015-03-05 18:38:07 +01:00
Miauw d6eb8ec1fe Adds a toggle so ghosts can hear radio chatter more easily. 2015-03-03 13:26:45 +01:00
Mandurrrh 7865f56b1a Merge remote-tracking branch 'remotes/Upstream/master' into ghostpda
Conflicts:
	code/__DEFINES/preferences.dm
2015-03-02 11:46:07 -05:00
Mandurrrh da6d3fc2cd Creates a separate toggle for ghosts to see pda messages! 2015-03-02 10:57:25 -05:00
Remie Richards 679c63a8ea Merge pull request #7924 from Incoming5643/mulligan_rounds
Mulligan Rounds for Wizard/Blob/Malf
2015-02-28 21:27:18 +00:00
Remie Richards 1e8324c3c5 Exposes all embedding related multipliers as variables and definitions. Only items of throw_speed 4 or more can embed now, Explosions force their object to be thrown at 4, this throw_speed threshold is ON TOP of needing to be a can_embed() object. 2015-02-26 17:04:00 +00:00
Cheridan 2bf705deb8 Merge pull request #7884 from Incoming5643/layers4lizards
Added some layers so mutantrace sprites actually make sense
2015-02-26 01:47:40 -06:00
Incoming 081df302f5 Makes the "are too many people dead for this to be fun?" check more indicative of people who are actually playing
Adds a new toggle: Midround_antagonist that allows players to opt out of gaining antagonist through this system if they'd prefer. It defaults to on but is newbie safe because without any antagonist flags (which default to off), it won't place players into antagonist slots.
2015-02-24 18:17:07 -05:00
Iamgoofball 722c4cb1ef re-adds GOTTAGOFAST, renames the current gottagofast to IGNORESLOWDOWN, adds GOTTAGOREALLYFAST for meth 2015-02-23 19:35:58 -08:00
Incoming 6843562301 Added some layers to allow for accurate "3D" placement of otherwise obtrusive mob features like tails or weirdly shaped heads. In addition exosuits that hide the uniform will now also hide a lizards tail, and masks that hide the face will push a poor lizards nose in so we don't see it clipping out the front. of the damn thing. 2015-02-21 19:34:10 -05:00
Remie Richards 42fe551665 Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-02-19 18:16:33 +00:00
Incoming c2c015a91a Fixes conflicts, fixes casually worn uniforms looking weird 2015-02-15 13:07:06 -05:00
Remie Richards ab754b6182 Corrects all spellings of Embedds --> Embeds 2015-02-13 13:15:20 +00:00
Remie Richards 34ced43f45 Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars! 2015-02-13 12:59:02 +00:00
Incoming 6811835f41 Modifies the fitted var to allow for clothing that looks good with female uniform generation save for the dickpixel(tm), FEMALE_UNIFORM_TOP.
Reclassified uniforms as needed. Most uniforms can now get some sort of variation without any sort of visual weirdness.

Uniforms with "enhanced" chests continue to be excluded for that very reason, ironically.
2015-02-10 17:56:55 -05:00
dannno 54f1d333d7 Adds a slurring filter, replaces stutter filter where appropriate 2015-02-10 16:39:17 -05:00
Swag McYolosteinen 58648d267e Merge pull request #7271 from Incoming5643/Maybe_it_ran_out_of_gas
Shuttle Stranding
2015-01-27 17:55:26 +01:00
Deantwo 0e8156814f Font Define'ers Renamed
- Renamed font define'ers.
- Removed font duplicate define'ers.
2015-01-24 17:32:17 +01:00
Deantwo bfea67611e Pencode Changes Cleanup
- Moved the "parsepencode" proc from **newscaster.dm** and **PDA.dm** to
**text.dm** as a global proc.
- Made the "parsepencode" proc accept only a single agrument if desired.
- Removed the font constants from **newscaster.dm**, **PDA.dm**,
**paper.dm**, **paperbin.dm**, and **photocopier.dm**.
- Replaced aforementioned constants with define'ers in **misc.dm**.
2015-01-24 16:07:13 +01:00
Iamgoofball de12010e31 Fixes the font issues, removes 3 mutations R.I.P 2015-01-22 17:28:13 -08:00
Incoming d7bca48557 Shuttle stranding:
Removes fake recalls, the shuttle will arrive in rounds that usually would not allow shuttles (rev, malf, blob) but when the time comes for the shuttle to leave, it simply won't.

What this does:
-It gives a bonus ~8 minute delay to antag discovery on shuttle calls
-It punishes crews that call the shuttle at first sign of danger by:
--Rev: having the heads/potential converts huddle in predictable locations
--Blob/Malf: Distracting focus from the antag
-Gives a nice little OH SHIT moment when the shuttle doesn't launch

Essentially this turns shuttle calls into something you wouldn't attempt without confirmation of the round type, which is the opposite of how it functions currently.

Malf AIs also gain the ability to recall the shuttle to avoid the hard tell if they prefer.
2015-01-21 17:35:45 -05:00
tkdrg a274303404 Merge pull request #7006 from Incoming5643/hot_wiz_on_wiz
Magic Mania 1.84 Antag hud system for wizards
2015-01-21 15:34:25 -03:00
Remie Richards 96ac837b65 Merge pull request #6960 from Iamgoofball/goonetics
Added 2 new powers and 9 new disabilities from goon and /vg/!
2015-01-19 17:47:33 +00:00
Iamgoofball b64efc6b54 Adds 3 new disabilities 2015-01-17 18:55:41 -08:00
Incoming 071e2aee3c fixes conflicts
swaps appretice and wizard icons
2015-01-16 13:45:36 -05:00
phil235 7fc0bca4f8 Fix a typo and replace 7 with ZLEVEL_SPACEMAX. Making a ZLEVEL_ABANDONNEDTSAT define. 2015-01-14 14:24:18 +01:00