Commit Graph

21429 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
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
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
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
c27c3298af Merge pull request #28488 from Cyberboss/patch-122
Removes delay from AddEmploymentContract
2017-06-16 14:45:01 -03: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
bgobandit
17e07eca8d Examining an ore box you are adjacent to shows its contents. (#28206) 2017-06-15 22:25:58 -03:00
Tacolizard
f2b8227ebf VIVA 2017-06-15 13:24:58 -07:00
Jordan Brown
451ab28ed4 Removes delay from AddEmploymentContract 2017-06-15 09:18:43 -04: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
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
87e4afc73d Fixes ExportService running even when not using TGS3 2017-06-14 13:05:25 -04: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
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
Leo
0a4a7e26c7 Merge pull request #28406 from ChangelingRain/loggingtweak
Makes cyborg module change logging not awful
2017-06-13 21:43:13 -03:00
Leo
7ec5c0e5d3 Merge pull request #28255 from optimumtact/revert-28229-revert-28170-observerspeep
Players cannot observe before PREGAME is reached, Version 2
2017-06-13 21:42:09 -03:00
Joan Lung
0e29560b9e Merge pull request #28404 from Expletive/fancymedalbox
Medal lockboxes are now fancy, and will accurately represent their contents.
2017-06-13 20:40:51 -04:00
Joan Lung
f0af213d5a Merge pull request #28403 from Cyberboss/ServiceNotification
Game will now let the service know whenever it reboots
2017-06-13 20:39:45 -04:00
Robustin
bfa572b186 Makes Zombies 2 spooky (#27984)
* stun limit

* Update zombies.dm

* True extent of my laziness revealed

* 4

* moaning

* actual code
2017-06-13 19:12:18 -05:00
food
89b99407c4 Fixes high luminosity eyes 2017-06-13 19:41:20 -04:00
Lzimann
cfc63e0c4d Comma 2017-06-13 16:12:28 -03:00
Lzimann
98f5574fc5 Readds some preference toggles to admins 2017-06-13 12:30:50 -03:00
Joan Lung
298b68e550 Merge pull request #28367 from Cyberboss/patch-123
Fixes admin being unable to see each other's PMs
2017-06-13 10:58:39 -04:00
Jordan Brown
150ad99696 Fix tag ordering 2017-06-13 10:44:33 -04:00
Cruix
13e4f6cf6a Refactored advanced camera consoles (#28360)
* Updated advanced camera consoles to be more generic

* Renamed /obj/machinery/computer/camera_advanced/proc/EjectUser() to /obj/machinery/computer/camera_advanced/remove_eye_control()
2017-06-13 15:20:17 +02:00
Jordie0608
0e520e5b4b fixes panic bunker age check 2017-06-13 23:08:27 +10:00
AnturK
ed2d7e07ee Makes vv log show intended change instead of result (#28348) 2017-06-13 09:17:26 -03:00
Joan Lung
e74d0fdc50 Tweaks kinetic accelerator modkit effect ordering (#28359) 2017-06-13 09:15:38 -03:00
kevinz000
7bb7ef5a04 Create repair.dm 2017-06-13 04:58:22 -07:00
Jordan Brown
3396cc9579 Fix issues with timestop effect (#28374) 2017-06-13 10:00:10 +02:00
Jordan Brown
be4a20978d Fixes MC panel Location not working while inside containers (#28368)
* Fixes MC panel Location not working while inside containers

* No S

* Create mob.dm
2017-06-13 09:44:58 +02:00
Jordan Brown
3059bc45ac Fixes buildmode help text (#28363)
* Fixes buildmode help text

* Fix
2017-06-13 09:29:17 +02:00