Xhuis
2a31e44d95
Adds framework for equip delays
2017-06-18 23:24:39 -04:00
Joan Lung
2672d88800
Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects ( #28524 )
2017-06-18 23:03:51 -03:00
Jordan Brown
ade54966dd
Merge pull request #28543 from ChangelingRain/trophyfix
...
Fixes crusher trophies not properly being added
2017-06-18 19:41:42 -04:00
kevinz000
ce39cd32de
Updates blender descriptions ( #28536 )
...
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
2017-06-18 14:08:41 -04:00
Jordan Brown
27d8a733a7
AGHH ( #28547 )
2017-06-18 10:59:52 -04:00
Expletive
1860e1a2ea
Paper frames, but with new sprites. ( #28452 )
...
* Paper frames, take two
* With entirely new sprites
* and basemap
* no directional doors also smoothing
* changes requested
* woops
* deconstruct -> Destroy
2017-06-18 10:45:35 -04:00
Jordan Brown
91d59af7c4
Merge pull request #28531 from Expletive/crayonpdas
...
Move the clown and mime's unique crayons to their PDAs.
2017-06-18 10:10:05 -04:00
bgobandit
5bc348c366
Adds traitor steal objective: the Supermatter Sliver. (Fixed) ( #27913 )
...
* Adds a new steal objective, the Supermatter Sliver.
* actually commits theft_tools honke
* i actually dk what this is
* fixes v1
* Supersmatter sliver requested changes
* you know what I fucking hate is unchecking shit
* please does this fix it fucking dme clown shit
* placates the cyberboss and the lziard
* fucking clownery
* I forgot to fucking check it
* Hope this fixes it
* will my children inherit this PR
* reeeeeeeeeeeeeeee
* Let's put this horse to rest now....
2017-06-17 22:32:38 -04:00
Jordan Brown
79cefc69d7
Merge pull request #28526 from RandomMarine/nothingmatters
...
Remember to test your PRs, kids! - Rebalances matter cartridge cost redux
2017-06-17 22:26:09 -04:00
Expletive
c2f57efccd
damn it github
2017-06-17 18:50:47 -07:00
Expletive
5eef7d52bc
Merge branch 'master' into crayonpdas
2017-06-17 18:39:18 -07:00
Joan Lung
790a7037e0
Fixes crusher trophies not properly being added
2017-06-17 19:52:48 -04:00
Jordan Brown
9aacee76d0
Merge pull request #28497 from Xhuis/tablet_examine_patch
...
Tablets with IDs in them now show the ID's name on examine
2017-06-17 17:55:37 -04:00
Joan Lung
35400d0682
The Hierophant is a little less chaotic and murdery on average ( #28490 )
2017-06-17 17:54:23 -04:00
Xhuis
9e74951f3f
Moves the first ID to the auth slot when possible
2017-06-17 17:49:45 -04:00
Jordan Brown
187ae0bd0e
Merge pull request #28419 from Expletive/pocketprotectors
...
Gives Pocket protectors to various nerdy jobs on the station.
2017-06-17 16:13:09 -04:00
Jordan Brown
53bb9f2388
Adds screaming for burns ( #28516 )
2017-06-17 16:53:29 -03:00
Joan Lung
f07435337c
Merge pull request #28435 from lzimann/typecaches
...
Changes a lot of is_type_in_list to use a typecache
2017-06-17 12:33:03 -04:00
Lzimann
42aa0dd3aa
Changes all the typecaches to the obj definition
2017-06-17 13:24:40 -03:00
Jordan Brown
0c22596eca
Fix some things assuming lighting corners existed ( #28511 )
2017-06-17 12:03:10 -03:00
Leo
0d6dcd0a51
Merge pull request #28499 from bgobandit/bandityoufuckingsuckatcoding
...
Fixes various bugs with photos and photo copying.
2017-06-17 09:36:30 -03:00
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
e5c22d527e
Move unique crayons
2017-06-16 21:27:39 -07:00
RandomMarine
eac372fff8
Actually do what #22687 tried
2017-06-16 18:29:47 -07: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
bgobandit
d3ec5bacf4
Fixes various bugs with photos and photo copying.
2017-06-15 22:18:10 -04: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
Xhuis
a776725c09
Tablets with IDs in them now register on examine
2017-06-15 20:15:58 -04: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
