Commit Graph

15989 Commits

Author SHA1 Message Date
dannno 3254142b21 adds hammer and gavel 2015-03-22 20:22:27 -04: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
Incoming f9a0a85cd4 The station will drop out of delta if the malf dies in a mulligan 2015-03-22 14:21:25 -04: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
phil235 1430962c40 Fixes default airlock not dropping any door assembly when deconstructed. 2015-03-22 18:42:27 +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
xxalpha 973f374276 Fixed the C4 being planted on the DA. 2015-03-22 16:26:58 +00: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
Iamgoofball 434265afa0 Reagent Decals 2: Black Powder Boogaloo 2015-03-22 02:04:31 -07: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
Incoming5643 f56a294f7a missed a testing change, whoops! 2015-03-21 21:58:29 -04:00
Incoming 5d35200567 Fixes a big old mistake in mulligan antag that made extended mulligans WAY too common
Hard defines double agents and traitorchan to be possible since there were some indication that inheriting the var wasn't working right

When mulligan decides to quit the admins will get a blurb as to why it quit.
2015-03-21 21:49:22 -04: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 bded834d9e Update constructable_frame.dm
Added Chem master build path.
2015-03-21 18:30:36 -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
phil235 98f9916317 Yet more work on slime procs and life subprocs. 2015-03-21 20:44:32 +01: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
phil235 daa1bdf856 More work on slime procs. 2015-03-21 16:37:37 +01:00
Remie Richards 7bd2fad5a8 Adds getPixelDistance()
Adds a proc for finding the distance between two atoms, in pixels
2015-03-21 12:40:30 +00:00
Swag McYolosteinen e9f21c3b28 Merge pull request #8462 from xxalpha/cyberimplants
Cyber Implants Addendum
2015-03-21 13:38:27 +01:00
xxalpha 29e441f3ad Finished changing permanent_sight_flags. 2015-03-21 12:28:25 +00: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 5d1155e09e Merge pull request #8435 from Zelacks/ChemImplantGuiFix
Chemical implant action button fix
2015-03-21 17:25:08 +11:00
Jordie d622ea496c Merge pull request #8437 from Razharas/TurfFire
Fixes fires in the walls
2015-03-21 17:24:53 +11:00
Jordie 13fdc0e0cb Merge pull request #8299 from tgstation/RemieRichards-poolingUpdate
Makes PlaceInPool() call Destroy() on the atom
2015-03-21 17:24:17 +11: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
Jordie d496fe241f Merge pull request #8228 from Xhuis/orion_trail_emag
Adds an emag mode to the Orion Trail game
2015-03-21 17:23:44 +11:00