6543b5c1e9
Merge pull request #8461 from Iamgoofball/patch-45
...
Fixes the zombie powder recipe
2015-03-23 08:39:16 -05:00
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
efdbdef49f
Fix mistake in bottle hitting message.
2015-03-23 14:27:52 +01:00
f1b40bf6ae
fixes sodium thiopental bottle
2015-03-22 20:19:21 -07:00
b69d08593e
Correct errors spotted by Razharas
2015-03-22 18:50:59 -05:00
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
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
53e40ec315
Merge pull request #8427 from Cheridan/day3_collars
...
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
e5c3d421db
Adds renaming, Adds collars to pet crates
2015-03-22 13:16:30 -05:00
521820f289
Makes the white dress a suit.
2015-03-22 19:13:15 +01:00
e5637301ba
Adds a jester suit and a white dress, both by Nienhaus.
2015-03-22 19:12:25 +01:00
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
9486248553
Merge pull request #8440 from dannno/coperite
...
GAR GLASSES
2015-03-22 12:05:21 -05:00
187a6fdd20
resprites forensic scanner, cargo tagger, and rped
2015-03-22 11:54:26 -05:00
5bf9366bab
Removes spaces causing inconsistent indentation error
2015-03-22 13:01:08 +01:00
ef156368ca
Re-adds forcesay
2015-03-22 12:34:55 +01:00
434265afa0
Reagent Decals 2: Black Powder Boogaloo
2015-03-22 02:04:31 -07:00
2fa6457130
Added a preference toggle for hearing musical instruments
2015-03-22 01:54:30 -07:00
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
94de5c997e
Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights
...
Attachable Seclite & Camera to Helmet
2015-03-22 16:56:11 +11:00
18d55956a7
Update Chemistry-Machinery.dm
2015-03-21 22:37:55 -05:00
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
5261040cdf
Update Chemistry-Machinery.dm
2015-03-21 19:23:37 -05:00
cdefe65ae2
Update Chemistry-Machinery.dm
2015-03-21 18:50:28 -05:00
568c088dd0
Update machine_designs.dm
...
Added Chem Master Board to circuit Imprinter
2015-03-21 18:23:36 -05:00
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
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
98f9916317
Yet more work on slime procs and life subprocs.
2015-03-21 20:44:32 +01:00
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
7f6871c233
Fixes conflicts and commits
2015-03-21 12:47:25 -04:00
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
daa1bdf856
More work on slime procs.
2015-03-21 16:37:37 +01:00
e9f21c3b28
Merge pull request #8462 from xxalpha/cyberimplants
...
Cyber Implants Addendum
2015-03-21 13:38:27 +01:00
3888013a43
Changed flag list to flag var.
2015-03-21 12:24:27 +00:00
afa1b76cde
Merge pull request #8190 from xxalpha/cyberimplants
...
Cybernetic Implants
2015-03-21 13:19:26 +01:00
920f97608a
Fixed bugs.
2015-03-21 11:53:54 +00:00
4659724851
Mini-Fix for flashlighting invalid helmets
...
I am going to expand on it later.
2015-03-21 02:52:05 -05:00
283170316d
Fixes the zombie powder recipe
2015-03-21 00:09:06 -07:00
2271499db7
Merge pull request #8058 from Iamgoofball/explosive
...
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
829045231b
fixes shit
2015-03-20 23:41:55 -07:00
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
08b3f3b6d4
fixes descriptions
2015-03-20 22:26:05 -07:00
819422bc3e
Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay
...
MIAUW VON SAYCODE 3: RISE OF THE SPANS
2015-03-21 05:05:37 +00:00
a2cb917473
initro tweaks
2015-03-20 22:03:03 -07:00
65b0bf7a14
new colors for smoke, flash, and sonic powder
2015-03-20 21:12:20 -07:00
26c407ec91
removes outdated comments
2015-03-20 20:17:19 -07:00
88a38cf884
embedding for gar glasses
2015-03-20 22:31:20 -04:00
c474035261
*Retires Departmental Uprising to the land of admin only access like its brother fake explosion before it *Changes the mechanics of recasting summon events to only reduce the upper limit of the time between event casts (-1 minute each additional cast) as opposed to touching the lower limit as well, which led to events every 15/30 seconds which, while certainly a scene, I admit was a bit much. Casting summon events 5, 6, or 7 times will now at worst result in an event every minute.
...
*If a wizard round mulligans, summon events will turn off if it was used. Remember that in wizard mulligans any apprentices will need to be dead too.
2015-03-20 21:04:33 -04:00
902e50f6b2
Added inbuilt jetpack to syndicate hardsuit.
2015-03-21 00:46:39 +00:00
d9921411b8
Changed anti-drop implant emp_act(). Added designs to mech fabricator.
2015-03-21 00:17:27 +00:00
Cheridan
phil235
Iamgoofball
Pennwick
Fayrik
Razharas
Swag McYolosteinen
Cheridan
Nienhaus
pudl
MrPerson
Jordie
GunHog
Szunti
Xhuis
xxalpha
Remie Richards
dannno
Incoming