Commit Graph

8983 Commits

Author SHA1 Message Date
Cheridan 17067d9021 Merge pull request #8508 from phil235/SlimeAnimal
Life refactor and slime as animal
2015-03-27 13:38:16 -05:00
Sawu 094e974798 * Adds some delicious easter food (Mammi, Chocolate Bunnies, Hot cross buns and Brioche)
* Fixes invisible suits
* Adds rabbit ears to the egg drops.
2015-03-27 23:14:33 +11:00
Remie Richards 0ad2cea133 Fire spreads evenly between 2 mobs when they MobBump() or Cross() each other. 2015-03-27 11:22:39 +00:00
Sawu ca38dfae9e Fixes a wrong name. (Copypasta is bad) 2015-03-27 20:56:30 +11:00
Sawu c208a467fc Easter is Out!
*Chickens have been refactored to be entirely interchangeable
*Rabbits have been added, they will bounce around and place eggs, even in space!
*A Rabbit Suit has been added, and can be won from opening easter eggs!
*A Easter Basket spawns in the tunnels, allowing for easy carry of Easter Eggs!
*Easter Eggs will spawn in maintenance
*Easter Baskets also spawn in maintenance.
2015-03-27 20:52:24 +11:00
Incoming 50ec2f3224 Makes the ability for wizards to use summon guns, summon magic, and summon events a config option 2015-03-27 01:32:28 -04:00
ACCount12 e37121d750 ntstation mining update 2015-03-27 15:47:01 +12:00
pudl 0964979a90 bitch says she wanna keep her throat warm 2015-03-26 21:16:25 -05:00
dannno a1138dbc37 MONKEY SKEDADDLE 2: WEEOO WEEOO WEEOO
- loop slightly improved
- added alternate WEEOO helmet
2015-03-26 19:14:38 -04:00
phil235 f8bd5a4259 Adds a temporary fix to the conflict with metastation map.
Small fix in simple_animal life subproc.
2015-03-26 18:55:05 +01: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
Remie Richards 5b20448e2b Monkeys can now wear hats! Monkeys can now also wear all masks, instead of the select few they had icons for (which have been removed, since they are no longer needed) 2015-03-26 15:23:52 +00:00
GunHog e0e2cdd985 Fixes #8541
Fixes https://github.com/tgstation/-tg-station/issues/8541
Hardsuit helmets and other toggles should now work properly.
2015-03-26 09:37:09 -05:00
Jordie0608 4beac828e2 removes old player panel 2015-03-26 17:30:16 +11:00
MrPerson 6881ac8c1d Disallow doing surgery on yourself
This doesn't solve the fact you can lie down with stuff in your hand (which isn't a bug imo) but it does stop people from cutting their brains out or giving themselves plastic surgery.
Fixes #4001
2015-03-25 22:17:03 -07:00
pudl 4c51941e6e reverts an accidental change 2015-03-25 21:12:25 -05:00
tedward1337 83961b85c9 Adds a new button for admins with +fun to push. Sends bluespace artillery to the station at the whim of God. 2015-03-25 22:03:45 -04:00
Jordie a86b757d93 Merge pull request #8291 from Xhuis/nerf_thermal_vision
Nerfs changeling augmented eyesight
2015-03-26 13:01:25 +11:00
phil235 7a1232012b Fixes more merge conflicts 2015-03-26 02:52:04 +01:00
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
phil235 92b0f9f4cd Adding a changelog.
Some work on death() procs of many animals.
Replacing most istype(XYZ, mob/living/simple_animal/slime) by isslime(XYZ).
Some work on slime feeding procs.
Made simple animal aliens see in the dark like regular aliens (in case somone wants to control one).
2015-03-26 02:23:39 +01:00
Jordie 31a808aa6d Merge pull request #8509 from Iamgoofball/spin
Adds object spinning when thrown and *flip
2015-03-26 12:02:53 +11:00
pudl 69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
MrPerson ce13faed09 Change select holiday names to #defines 2015-03-25 15:01:06 -07:00
GunHog da2108891a NTSL Expansion
Enables NTSL to read and set four radio span classes to messages.
Also enables NTSL to set each of the say modification verbs to custom
values.

-Broadcast() proc of NTSL now accepts 5 additional parameters - spans
and each of the Say verbs.
2015-03-25 16:22:21 -05:00
Szunti 0147d669f8 Added night vision to mining mobs. 2015-03-25 21:36:01 +01:00
WJohn 2173b7b2db Merge pull request #8485 from pudl/resprite
resprites the forensic scanner, cargo tagger, and the RPED
2015-03-25 14:56:51 -04: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 0e57fc6941 Merge pull request #8488 from Miauw62/whatsthedifferenceanyway
Adds a verb_exclaim var. Fixes #8478.
2015-03-25 16:31:16 +11:00
Jordie ff90e1599c Merge pull request #8320 from AnturK/headcrabs
Adds Headcrabs!
2015-03-25 16:31:00 +11:00
Jordie 9a217503aa Merge pull request #8451 from Fayrik/FoamForceFuckYeah
Foam force fuck yeah!
2015-03-25 16:30:42 +11:00
Jordie c5e5d36244 Merge pull request #8506 from phil235/BottleHitMsgFix
Fix mistake in bottle hitting message.
2015-03-25 16:30:08 +11:00
Jordie 66ab60d5e1 Merge pull request #8476 from Pennwick/master
Adds Chem Master board
2015-03-25 16:29:41 +11:00
Jordie fde0eecce8 Merge pull request #8456 from MrPerson/im_the_music_meisteeeeeeeeeeeeeer
Instrument tweaks
2015-03-25 16:29:29 +11:00
dannno 1ec9fed228 weeoo noise loop 2015-03-24 17:42:20 -04:00
dannno 39aaea6f28 WEEOO NOISE 2015-03-24 15:41:59 -04:00
MrPerson b6c71dc50d Effect pooling
obj/effect/effect all pool themselves.
PoolOrNew() can now be passed a type and a list instead of a type and a location. In that case, the list will be passed to New() via arglist().
RCD's now delete their spark system and properly garbage collect.
2015-03-24 11:44:49 -07:00
dannno 4a4762c696 WEEEOOOO WEEEEOOO WEEEOOO 2015-03-24 14:32:20 -04:00
AnturK eadfecd552 - Makes body_egg parent for alien embryos/changeling eggs 2015-03-24 17:54:20 +01:00
AnturK 88f2eda81e - Headcrabs
- Changelog & Name

- Description
- Removes debug message
- Fixes cavity surgery removal

Oops

- Headslug sprites courtesy of ZyloWalsh
- Squash
2015-03-24 12:53:13 +01:00
Jordie 59af7cfd42 Merge pull request #8323 from Mandurrrh/miningborgupgrade
Adds a cyborg upgrade module for the satchel of holding.
2015-03-24 16:40:52 +11:00
hornygranny 979d308f49 Merge pull request #8497 from Iamgoofball/patch-46
fixes sodium thiopental bottle
2015-03-23 16:34:01 -07:00
hornygranny 1b16960f31 Merge pull request #8481 from Miauw62/agqgdoqio
Re-adds forcesay
2015-03-23 16:32:37 -07:00
hornygranny 2e04be734f Merge pull request #8449 from MrPerson/feature_removal_5
Remove xylophone skeleton ribcage playing
2015-03-23 15:10:11 -07:00
Iamgoofball dc2bf262e6 Adds object spinning when thrown and *flip 2015-03-23 13:46:23 -07:00
phil235 b78ce020e7 fixing more stuff 2015-03-23 19:47:39 +01:00
phil235 17fb919020 More fixes 2015-03-23 17:11:07 +01:00
phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
phil235 7aa21179e0 small adjustments 2015-03-23 16:34:48 +01:00
Cheridan beacf0cf4a Merge pull request #8349 from MrPerson/qdel_reagents_hopefully
Fix reagent garbage collection hopefully
2015-03-23 08:55:11 -05:00