Commit Graph

36899 Commits

Author SHA1 Message Date
Leo
82d2e68b89 Merge pull request #28503 from Expletive/fix-28500
Fixes #28500 : Cryo cells properly compare to a mob's max health
2017-06-17 09:36:06 -03:00
bgobandit
ed01357edd This month's spelling fix PR (#28502) 2017-06-17 09:35:30 -03:00
Leo
eaaf16536a Merge pull request #28510 from tgstation/RemieRichards-passenger_dirs
Allows fine control over rider/passenger direction in vehicles
2017-06-17 09:33:41 -03:00
Lan
98ed543423 Adds Penguins, and Penguins to Winter Wonderland (#28454) 2017-06-17 09:32:28 -03:00
Expletive
fe73e0e920 Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen. (#28382) 2017-06-16 22:12:10 -03:00
Joan Lung
7075379930 Merge pull request #28495 from Tacolizard/patch-2
Removes tech requirement from flashes
2017-06-16 17:25:37 -04:00
QualityVan
a7af10eb56 Adds onions (#28414) 2017-06-16 18:22:31 -03:00
ExcessiveUseOfCobblestone
8a5c7989b5 Cult Master is now given a Suffix in Check Antags (#28445)
* Create player_panel.dm

* does the leoz
2017-06-16 17:09:03 -04:00
ShizCalev
6bfe73cc57 Adjusted atmos device layers + added new pipe subtypes (#28466) 2017-06-16 17:25:02 -03:00
Joan Lung
e995c777bd Makes the messages for Sentinel's Compromise removing holy water more accurate (#28429) 2017-06-16 17:20:22 -03:00
Ashe Higgs
88d3ef2fe8 Hand drill, jaws of life, and emitter grammar tweaks (#28493) 2017-06-16 17:18:56 -03:00
Mike Long
3ddef57ecf Vomit fix (#28492) 2017-06-16 17:18:19 -03:00
Joan Lung
56337d7252 Cultists must be human to run for Cult Master status (#28473) 2017-06-16 14:53:15 -03:00
Leo
a95aa5443f Merge pull request #28395 from Thunder12345/genuinecatproducts
Adds genuine cat fur products
2017-06-16 14:51:03 -03:00
Leo
8f8d0d557e Merge pull request #28483 from Jordie0608/masteɾ
Prevents negative tempban duration
2017-06-16 14:47:34 -03:00
Jordan Brown
aef58f9bf6 Events now check conditions again after admin delay (#28485) 2017-06-16 14:46:27 -03:00
Leo
65b7f252fc Merge pull request #28487 from Steelpoint/hosrdlocktwo
Head of Security/Research Director fluff items now below standard equipment. Ver 2
2017-06-16 14:45:37 -03:00
Leo
c27c3298af Merge pull request #28488 from Cyberboss/patch-122
Removes delay from AddEmploymentContract
2017-06-16 14:45:01 -03:00
Remie Richards
995c5cf145 Allows fine control over rider/passenger direction in vehicles
+ Fixes rider dirs not being set at all.
2017-06-16 10:19:42 +01:00
Expletive
459bd50139 Fix #28500 2017-06-15 19:54:34 -07:00
Leo
85a8b4bd06 Merge pull request #28468 from Cyberboss/patch-126
Fixes ExportService running even when not using TGS3
2017-06-15 23:00:36 -03:00
bgobandit
f69423b362 Welder sprites properly update upon refilling at a fueltank. (#28457) 2017-06-15 22:49:31 -03:00
Leo
c840d2bc0d Merge pull request #28465 from Cyberboss/patch-123
Fixes a documentation typo
2017-06-15 22:48:20 -03:00
Leo
da08532f0a Merge pull request #28469 from Cyberboss/TimerWarnings
Adds warning for misuse of deltimer
2017-06-15 22:47:58 -03:00
bgobandit
17e07eca8d Examining an ore box you are adjacent to shows its contents. (#28206) 2017-06-15 22:25:58 -03:00
Joan Lung
5508678098 Fixes Geis counting dead servants (#28477)
* Fixes Geis counting dead servants

* slightly more better
2017-06-15 20:55:21 -04:00
bgobandit
7255ab5be6 Knocked-over chairs have materials. (#28456)
* Chair items have mats

* numbers
2017-06-15 19:48:03 -05:00
Robustin
ad25367887 inducer fix (#28464) 2017-06-15 19:03:44 -05:00
Tacolizard
f2b8227ebf VIVA 2017-06-15 13:24:58 -07:00
Leo
dd8fdd10bb Merge pull request #28451 from bgobandit/brigsentences
Reduces default brig times to be consistent with suggested policy.
2017-06-15 10:56:24 -03:00
Jordan Brown
be17cf33ef Blackbox no longer records data after round ends (#28390) 2017-06-15 10:48:01 -03:00
Jordan Brown
451ab28ed4 Removes delay from AddEmploymentContract 2017-06-15 09:18:43 -04:00
Steelpoint
4e25fd93ac InitialCommit 2017-06-15 21:10:44 +08:00
Jordie0608
d9a63c392a prevents negative tempban duration 2017-06-15 17:02:00 +10:00
Jordan Brown
d8efde7585 Fix problems with a hallucination's Initialize (#28373)
* Fix problems with a hallucination's Initialize

* wow im dumb

* Create Hallucination.dm

* Create Hallucination.dm
2017-06-15 00:18:15 -04:00
Joan Lung
7a2f047dee Merge pull request #28434 from Cyberboss/BuckleFix
Fixes things getting unbuckled in nullspace
2017-06-14 21:57:35 -04:00
Leo
b42d274344 Merge pull request #28425 from kevinz000/patch-221
Fixes badmin repair mapgen module for real this time
2017-06-14 22:54:02 -03:00
Joan Lung
fc6c88f1d5 Merge pull request #28449 from Really-Good-Soda-Flavor/eys
Fixes high luminosity eyes
2017-06-14 21:53:32 -04:00
Joan Lung
bc8185c0bb Merge pull request #28430 from lzimann/prefs
Readds some preference toggles to admins
2017-06-14 21:51:02 -04:00
Jordan Brown
a8dffe5eb2 Adds warning for misuse of deltimer 2017-06-14 16:07:29 -04:00
Jordan Brown
87e4afc73d Fixes ExportService running even when not using TGS3 2017-06-14 13:05:25 -04:00
Jordan Brown
6aeaf4564a Fixes a documentation typo 2017-06-14 12:41:02 -04:00
kevinz000
b6a4a32633 Adds a check_tick to pneumatic cannon examine (#28345) 2017-06-14 09:59:40 -03:00
Leo
24f3e67dd8 Merge pull request #28421 from kevinz000/patch-220
fixes beam rifle flick aim exploit
2017-06-14 09:57:37 -03:00
Leo
52e1a79d34 Merge pull request #28427 from Jordie0608/ifyouhaveawhitelistandblacklistinonefileisthatagraylistfile
Fixes panic bunker age check
2017-06-14 09:55:36 -03:00
Kyle Spier-Swenson
f46092cda9 Revert "Makes cyborg module change logging not awful" (#28458) 2017-06-14 06:44:39 -05:00
Joan Lung
56e391561b Merge pull request #28413 from optimumtact/cellulardestruction
Fix runtime in inducer emp act
2017-06-13 22:22:30 -04:00
Joan Lung
c9a8eedb61 Merge pull request #28412 from optimumtact/tochatforimages
Fixes a to_chat runtime, adds macro for sending images
2017-06-13 22:22:17 -04:00
Joan Lung
7cebb6d20b Merge pull request #28411 from optimumtact/aiscanmove
ore coin crossed runtime fix
2017-06-13 22:01:48 -04:00
Joan Lung
3315c4c311 People converted to clockcult will actually have their world turn yellow briefly, matching the messages (#28397) 2017-06-13 21:47:29 -03:00