b4e01ac82c
Fixes widescreen pref regression ( #5822 )
2018-03-05 16:12:35 -06:00
b663cc7381
Automatic changelog generation for PR #5815 [ci skip]
2018-03-05 15:21:02 -06:00
a2e6253f00
[MIRROR] Disease antagonist ( #5815 )
...
* Disease antagonist
* Update mobs.dm
* can I go to sleep yet
2018-03-05 15:20:59 -06:00
766b85908e
[MIRROR] Adds the Ancient Cloning Lab ruin ( #5814 )
...
* Adds the Ancient Cloning Lab ruin
* fixes conflicts
2018-03-05 15:20:49 -06:00
032511a03e
[MIRROR] Added a cooldown to being shown hud images ( #5810 )
...
* Merge pull request #36144 from Cruix/hud_images_cd
Added a cooldown to being shown hud images
* Added a cooldown to being shown hud images
2018-03-05 15:02:10 -06:00
3569152bf8
[MIRROR] Cleans up save file update code. ( #5816 )
...
* Cleans up save file update code.
* fixes merge issue
2018-03-05 14:44:18 -06:00
f746366c36
Automatic changelog generation for PR #5821 [ci skip]
2018-03-05 14:38:32 -06:00
848b12db64
[MIRROR] [READY]Hostile mobs can attack assemblies ( #5821 )
...
* [READY]Hostile mobs can attack assemblies (#36157 )
* new fenotype
* attack
* Update items.dm
* Update assemblies.dm
* Update assemblies.dm
* Update items.dm
* [READY]Hostile mobs can attack assemblies
2018-03-05 14:38:30 -06:00
c72201e605
[MIRROR] Splits projectiles into different files for readability ( #5800 )
...
* Splits projectiles into different files for readability
* Update tgstation.dme
* I love how the dme cleans itself up
2018-03-05 14:13:08 -06:00
6a688f2588
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2018-03-05 13:25:04 -06:00
214e008e3d
cleans out AutoChangeLogs, good christ
2018-03-05 13:25:01 -06:00
df11e970f7
Automatic changelog generation for PR #5788 [ci skip]
2018-03-05 13:23:30 -06:00
30a4705c01
[MIRROR] Clean up all sorts of crap, mostly defines ( #5788 )
...
* Clean up all sorts of crap, mostly defines
* fixes compile errors
2018-03-05 13:23:28 -06:00
c6aab4b38b
Automatic changelog generation for PR #5813 [ci skip]
2018-03-05 13:02:10 -06:00
892b3b4307
[MIRROR] Allows the auxbase camera console to place airlocks on fans ( #5813 )
...
* Allows the auxbase camera console to place airlocks on fans (#35975 )
* - Allows the aux base rcd to commit the same atrocities as the regular rcd
- Rids us of another value that does nothing
* first and only webeditor commit
* Allows the auxbase camera console to place airlocks on fans
2018-03-05 13:02:08 -06:00
c8107c52cc
[MIRROR] Adjusts fire priorities of flightpacks, research, networks, and fields. ( #5809 )
...
* Adjusts fire priorities of flightpacks, research, networks, and fields. (#36129 )
* Fire priorities
* research lower not higher
* Don't need to keep timing if it's automatically compensating for missed ticks.
* Spelling
* spelling
* Adjusts fire priorities of flightpacks, research, networks, and fields.
2018-03-05 13:01:49 -06:00
506337a0cf
Automatic changelog generation for PR #5808 [ci skip]
2018-03-05 13:01:21 -06:00
2a161f4727
[MIRROR] Fix brains in MMIs being unable to pilot mechs ( #5808 )
...
* Merge pull request #36128 from AutomaticFrenzy/patch/brainmech
Fix brains in MMIs being unable to pilot mechs
* Fix brains in MMIs being unable to pilot mechs
2018-03-05 13:01:18 -06:00
fe37e351bc
[MIRROR] Updates RuntimeStation to make testing faster ( #5807 )
...
* Merge pull request #36120 from XDTM/RuntimeFuntime
Updates RuntimeStation to make testing faster
* Updates RuntimeStation to make testing faster
2018-03-05 13:00:50 -06:00
6deeaab1f9
Automatic changelog generation for PR #5792 [ci skip]
2018-03-05 12:37:43 -06:00
de97c9653a
[MIRROR] SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD ( #5792 )
...
* SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD
* Update fitness.dm
* fixes compile issue
2018-03-05 12:37:40 -06:00
5374393635
[MIRROR] Removes the devils var ( #5819 )
...
* Merge pull request #36175 from tgstation/Cyberboss-patch-1
Removes the devils var
* Removes the devils var
2018-03-05 12:34:28 -06:00
6134f79a26
[MIRROR] Converts several species traits into generic traits ( #5710 )
...
* Converts several species traits into generic traits
* Update traits.dm
* Update mousetrap.dm
* Update corporate.dm
* Update jellypeople.dm
* snowflake fix
2018-03-05 12:34:01 -06:00
536537a0a4
Automatic changelog generation for PR #5738 [ci skip]
2018-03-05 12:33:26 -06:00
841a4199af
Removes MediHound's Noncon Vore ( #5738 )
...
* Removes MediHound's Noncon Vore
MediHound once again respects vore preferences, as intended.
To make up for this, they now receive a unique cyborg hypospray with fewer reagents, increased energy costs, and no ability to upgrade.
* Moves Preference Check to New Sleeper-Specific Variable, Buffs Hypo
Rather than using target.devourable, MediHounds now check for a new target.sleeperable preference, which defaults to TRUE.
Also, removed the custom HoundHypo. MediHounds will now get the full borg hypospray.
* Removes unnecessary 5th port code
* Breaks the patch for Bhijn's viewing pleasure
DNM etc
* Still not fixed
* Fixes it again.
MediHound sleeper preference is now a game preference toggle, rather than a vore panel toggle.
MediHounds will not be able to ingest SSD or catatonic players.
2018-03-05 12:33:23 -06:00
1a3f6a7e9b
Automatic changelog generation for PR #5811 [ci skip]
2018-03-05 12:30:32 -06:00
fef85c1eb3
[MIRROR] Fix nightshift skipping certain maint APCs ( #5811 )
...
* Merge pull request #36082 from AutomaticFrenzy/patch/nightshift-fix
Fix nightshift skipping certain maint APCs
* Fix nightshift skipping certain maint APCs
2018-03-05 12:30:29 -06:00
1a4d8b94a1
[MIRROR] Halves server file access cooldowns ( #5812 )
...
* Halves server file access cooldowns (#36139 )
* Lets me actually browse logs properly
* admins get to spam harder
* Halves server file access cooldowns
2018-03-05 12:29:50 -06:00
4b59a31a58
Merge pull request #5805 from Citadel-Station-13/upstream-merge-35894
...
[MIRROR] Refactors construction datums into components
2018-03-05 03:18:21 +00:00
318481e62d
Merge pull request #5804 from Citadel-Station-13/upstream-merge-36095
...
[MIRROR] Makes blood rage more clear
2018-03-05 03:17:54 +00:00
1d661181a9
Automatic changelog generation for PR #5802 [ci skip]
2018-03-04 21:17:17 -06:00
164185d84f
Merge pull request #5802 from Citadel-Station-13/upstream-merge-36125
...
[MIRROR] Makes Delta chem fridge more accessible
2018-03-05 03:17:15 +00:00
38e87270da
Automatic changelog generation for PR #5801 [ci skip]
2018-03-04 21:16:51 -06:00
d720adf672
Merge pull request #5801 from Citadel-Station-13/upstream-merge-35895
...
[MIRROR] Fixes Guardian Spirits not being able to move in stopped time along with their user.
2018-03-05 03:16:48 +00:00
4476d559bd
Automatic changelog generation for PR #5799 [ci skip]
2018-03-04 20:46:27 -06:00
8c7d0b2d5d
Merge pull request #5799 from Citadel-Station-13/upstream-merge-36019
...
[MIRROR] Fixes tinfoil hats and lengthens the time for someone else to put it on
2018-03-05 02:46:25 +00:00
aeb89e43f0
Automatic changelog generation for PR #5798 [ci skip]
2018-03-04 20:46:02 -06:00
fe25e77586
Merge pull request #5798 from Citadel-Station-13/upstream-merge-36116
...
[MIRROR] Implants that grant spells to their owners, for adminbus
2018-03-05 02:45:59 +00:00
3a8e526609
Automatic changelog generation for PR #5797 [ci skip]
2018-03-04 20:45:36 -06:00
fc4612fe93
Merge pull request #5797 from Citadel-Station-13/upstream-merge-36071
...
[MIRROR] Advanced roasting sticks, for cooking sausages
2018-03-05 02:45:33 +00:00
5f742c446e
Merge pull request #5796 from Citadel-Station-13/upstream-merge-36108
...
[MIRROR] better addresses the gas miner active turf issue
2018-03-05 02:44:49 +00:00
e41bf8a21e
Automatic changelog generation for PR #5794 [ci skip]
2018-03-04 20:44:12 -06:00
aac73b7880
Merge pull request #5794 from Citadel-Station-13/upstream-merge-36001
...
[MIRROR] Removes 'release all' buttons from ORM
2018-03-05 02:44:10 +00:00
effbae0876
Merge pull request #5793 from Citadel-Station-13/upstream-merge-36110
...
[MIRROR] Prevents history from repeating itself
2018-03-05 02:43:47 +00:00
a853b6fc7d
Merge pull request #5791 from Citadel-Station-13/upstream-merge-36057
...
[MIRROR] Fixes transforming weapons runtiming due to no butchering component
2018-03-05 02:43:07 +00:00
bed120d202
Merge pull request #5790 from Citadel-Station-13/upstream-merge-36111
...
[MIRROR] MC panel now shows world.time
2018-03-05 02:42:49 +00:00
2117e8ecb0
recompiles tgui
2018-03-04 20:16:10 -06:00
e6f9c2ca49
Refactors construction datums into components
2018-03-04 17:52:15 -06:00
07e3c61067
Refactors construction datums into components ( #35894 )
2018-03-04 17:52:14 -06:00
ba9308c374
Makes blood rage more clear
2018-03-04 17:33:44 -06:00
deathride58