Commit Graph

8676 Commits

Author SHA1 Message Date
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
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
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
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
Swag McYolosteinen e9f21c3b28 Merge pull request #8462 from xxalpha/cyberimplants
Cyber Implants Addendum
2015-03-21 13:38:27 +01:00
xxalpha 3888013a43 Changed flag list to flag var. 2015-03-21 12:24:27 +00:00
Swag McYolosteinen afa1b76cde Merge pull request #8190 from xxalpha/cyberimplants
Cybernetic Implants
2015-03-21 13:19:26 +01:00
xxalpha 920f97608a Fixed bugs. 2015-03-21 11:53:54 +00:00
GunHog 4659724851 Mini-Fix for flashlighting invalid helmets
I am going to expand on it later.
2015-03-21 02:52:05 -05:00
Iamgoofball 283170316d Fixes the zombie powder recipe 2015-03-21 00:09:06 -07:00
Razharas 2271499db7 Merge pull request #8058 from Iamgoofball/explosive
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
Iamgoofball 829045231b fixes shit 2015-03-20 23:41:55 -07:00
Jordie c4f7ee6196 Merge pull request #8233 from Iamgoofball/patch-44
Meth no longer breaks the space time continuum.
2015-03-21 17:23:55 +11:00
Iamgoofball 08b3f3b6d4 fixes descriptions 2015-03-20 22:26:05 -07:00