Commit Graph

8686 Commits

Author SHA1 Message Date
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
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
Jordie a86b757d93 Merge pull request #8291 from Xhuis/nerf_thermal_vision
Nerfs changeling augmented eyesight
2015-03-26 13:01:25 +11: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
MrPerson ce13faed09 Change select holiday names to #defines 2015-03-25 15:01:06 -07: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
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
Cheridan beacf0cf4a Merge pull request #8349 from MrPerson/qdel_reagents_hopefully
Fix reagent garbage collection hopefully
2015-03-23 08:55:11 -05:00
Cheridan 6543b5c1e9 Merge pull request #8461 from Iamgoofball/patch-45
Fixes the zombie powder recipe
2015-03-23 08:39:16 -05:00
Cheridan 773dd84211 Merge pull request #8452 from Incoming5643/when_shit_gets_too_popular_death_must_follow
Magic Mania 1.87: Summon Events Settles Down And Starts A Family
2015-03-23 08:36:04 -05:00
phil235 efdbdef49f Fix mistake in bottle hitting message. 2015-03-23 14:27:52 +01:00
Iamgoofball f1b40bf6ae fixes sodium thiopental bottle 2015-03-22 20:19:21 -07:00
Pennwick b69d08593e Correct errors spotted by Razharas 2015-03-22 18:50:59 -05:00
Fayrik 117d9d11cd Riot darts are now available to Nuke ops and Traitors. And I am SO done with this. 2015-03-22 22:11:56 +00:00
Razharas 6baed3a0e5 Merge pull request #8464 from Szunti/patch-1
prob() with rand() is the same as a plain prob()
2015-03-23 00:27:47 +03:00
Swag McYolosteinen 53e40ec315 Merge pull request #8427 from Cheridan/day3_collars
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
Cheridan e5c3d421db Adds renaming, Adds collars to pet crates 2015-03-22 13:16:30 -05:00
Miauw 521820f289 Makes the white dress a suit. 2015-03-22 19:13:15 +01:00
Miauw e5637301ba Adds a jester suit and a white dress, both by Nienhaus. 2015-03-22 19:12:25 +01:00
Miauw ba2a1c8f19 Adds a verb_exclaim var. Fixes #8478.
Also makes saymods transmitted through the radio system for upcoming NTSL integration.
2015-03-22 18:55:59 +01:00
Nienhaus 9486248553 Merge pull request #8440 from dannno/coperite
GAR GLASSES
2015-03-22 12:05:21 -05:00
pudl 187a6fdd20 resprites forensic scanner, cargo tagger, and rped 2015-03-22 11:54:26 -05:00
Swag McYolosteinen 5bf9366bab Removes spaces causing inconsistent indentation error 2015-03-22 13:01:08 +01:00
Swag McYolosteinen ef156368ca Re-adds forcesay 2015-03-22 12:34:55 +01:00
MrPerson 2fa6457130 Added a preference toggle for hearing musical instruments 2015-03-22 01:54:30 -07:00
MrPerson 9229f72573 Fix up certain chemicals to not overwrite Del(). Meh.
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
2015-03-21 23:04:53 -07:00
Jordie 94de5c997e Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights
Attachable Seclite & Camera to Helmet
2015-03-22 16:56:11 +11:00
Pennwick 18d55956a7 Update Chemistry-Machinery.dm 2015-03-21 22:37:55 -05:00
Razharas a67d8339b7 Merge pull request #8414 from phil235/TablecraftVarietyFix
Fixes not being able to tablecraft recipes using differen kinds of an item
2015-03-22 05:32:43 +03:00
Pennwick 5261040cdf Update Chemistry-Machinery.dm 2015-03-21 19:23:37 -05:00
Pennwick cdefe65ae2 Update Chemistry-Machinery.dm 2015-03-21 18:50:28 -05:00
Pennwick 568c088dd0 Update machine_designs.dm
Added Chem Master Board to circuit Imprinter
2015-03-21 18:23:36 -05:00
Pennwick 5873aff8de Update Chemistry-Machinery.dm
Added a constructable Chem Master 2999. Unlike the 3000 it cannot be wrenched and drug around.
2015-03-21 17:47:37 -05:00
GunHog 31c5e648f4 Secbots now require Sec helmets
Only Sec helmets with a camera and no flashlight can be used to create a
securitron assembly.
2015-03-21 17:10:55 -05:00
Szunti 01c18eadca Replaced prob(rand(A,B)) with prob((A+B)/2).
They are the same probability.
Rounded to integers where the values were literals.
2015-03-21 19:12:16 +01:00
Xhuis 7f6871c233 Fixes conflicts and commits 2015-03-21 12:47:25 -04:00
Fayrik 0173c7af6e Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.) 2015-03-21 16:18:32 +00:00