Commit Graph

21073 Commits

Author SHA1 Message Date
CitadelStationBot
22b634fe61 Automatic changelog generation for PR #8549 [ci skip] 2019-06-08 03:23:33 -05:00
kevinz000
4050ba98eb Merge pull request #8549 from Trilbyspaceclone/patch-168
Fixes a unseen paper work exsplote
2019-06-08 01:23:31 -07:00
CitadelStationBot
876850b325 Automatic changelog generation for PR #8548 [ci skip] 2019-06-08 03:22:54 -05:00
kevinz000
1ad200fcf4 Merge pull request #8548 from dtfe3/dtfe3-loadout-schoolgirl
Schoolgirl outfits for the loadout menu
2019-06-08 01:22:52 -07:00
CitadelStationBot
d593d32ed4 Automatic changelog generation for PR #8547 [ci skip] 2019-06-08 03:22:18 -05:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
CitadelStationBot
a6d7e618f1 Automatic changelog generation for PR #8544 [ci skip] 2019-06-08 03:21:43 -05:00
kevinz000
88990f5ae0 Merge pull request #8544 from Trilbyspaceclone/patch-166
Makes ice cream vats and food carts buy-able via cargo
2019-06-08 01:21:41 -07:00
CitadelStationBot
6dfde9654f Automatic changelog generation for PR #8541 [ci skip] 2019-06-08 03:21:30 -05:00
kevinz000
a37bf5bfaf Merge pull request #8541 from Trilbyspaceclone/patch-164
Adds implanter and implanter cases to syndie surgery bags
2019-06-08 01:21:28 -07:00
CitadelStationBot
886978e46b Automatic changelog generation for PR #8540 [ci skip] 2019-06-08 03:17:06 -05:00
kevinz000
9edac9fc6c Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss
Rebalanced Ass Slapping
2019-06-08 01:17:04 -07:00
CitadelStationBot
457a6bcdc1 Automatic changelog generation for PR #8543 [ci skip] 2019-06-08 03:16:00 -05:00
kevinz000
a866ceb8a2 Merge pull request #8543 from Trilbyspaceclone/patch-165
Makes SNOWCONES!
2019-06-08 01:15:58 -07:00
CitadelStationBot
ba849b83af Automatic changelog generation for PR #8569 [ci skip] 2019-06-08 03:13:39 -05:00
kevinz000
cb16dd0fbf Merge pull request #8569 from dtfe3/dtfe3-ears-fox
Fox Ears layer tweak
2019-06-08 01:13:37 -07:00
kevinz000
e518d6e4b1 Merge pull request #8490 from SkullyRoberts/Heelys
Added toggle-able rainbow lightup shoes and functional heelys to maint loot
2019-06-08 01:12:57 -07:00
CitadelStationBot
92b5afab52 Automatic changelog generation for PR #8503 [ci skip] 2019-06-08 03:10:36 -05:00
kevinz000
f458828659 Merge pull request #8503 from Trilbyspaceclone/patch-159
Changing up the drills/picks/jackhammer a bit
2019-06-08 01:10:34 -07:00
CitadelStationBot
a0067193e6 Automatic changelog generation for PR #8501 [ci skip] 2019-06-08 03:10:13 -05:00
kevinz000
80aa303b4e Merge pull request #8501 from Trilbyspaceclone/boxen
Colored boxes, more box icons, and more craftable box types!
2019-06-08 01:10:11 -07:00
CitadelStationBot
642bfc1d91 Automatic changelog generation for PR #8494 [ci skip] 2019-06-08 03:09:28 -05:00
kevinz000
f201bd1508 Merge pull request #8494 from Trilbyspaceclone/ash_walker
Ash walker bone satchles.
2019-06-08 01:09:26 -07:00
CitadelStationBot
772ab1dc92 Automatic changelog generation for PR #8500 [ci skip] 2019-06-08 03:09:03 -05:00
kevinz000
487461fbda Merge pull request #8500 from Trilbyspaceclone/patch-158
Buffs stun slugs
2019-06-08 01:09:00 -07:00
kevinz000
e13efe26bd Merge pull request #8493 from Sishen1542/Oldstat
Fixes THAT Oldstation Tile
2019-06-08 01:08:44 -07:00
CitadelStationBot
10782559c5 Automatic changelog generation for PR #8414 [ci skip] 2019-06-08 03:08:02 -05:00
kevinz000
c8435a5658 Merge pull request #8414 from Trilbyspaceclone/MASON
New M.A.S.O.N rig
2019-06-08 01:08:00 -07:00
CitadelStationBot
57aa92b080 Automatic changelog generation for PR #8483 [ci skip] 2019-06-08 03:07:20 -05:00
kevinz000
3b24e05dd6 Merge pull request #8483 from Ghommie/Ghommie-cit23
Ports in combat gloves plus.
2019-06-08 01:07:18 -07:00
CitadelStationBot
24e836807d Automatic changelog generation for PR #8476 [ci skip] 2019-06-08 03:05:30 -05:00
kevinz000
61d0ac9993 Merge pull request #8476 from Trilbyspaceclone/patch-157
Tweaks/Buffs hierophant
2019-06-08 01:05:28 -07:00
kevinz000
7875ca73be Merge pull request #8444 from dtfe3/patch-1
CWC player requirement increase
2019-06-08 01:03:37 -07:00
CitadelStationBot
2e18e963fe Automatic changelog generation for PR #8432 [ci skip] 2019-06-08 03:03:03 -05:00
kevinz000
68ef76e09a Merge pull request #8432 from Ghommie/Ghommie-cit15
Buffs stunprods to not have a cooldown
2019-06-08 01:03:01 -07:00
CitadelStationBot
89d1d74d9d Automatic changelog generation for PR #8442 [ci skip] 2019-06-08 03:02:23 -05:00
kevinz000
c7f346a03c Merge pull request #8442 from Trilbyspaceclone/patch-139
Makes soviet clothing no longer need to be hacked AND emaged
2019-06-08 01:02:21 -07:00
kevinz000
31d77ef58e Merge pull request #8403 from Ghommie/Ghommie-cit12
Updating the .github folder guidelines.
2019-06-08 01:01:20 -07:00
CitadelStationBot
ef3c0cba63 Automatic changelog generation for PR #8391 [ci skip] 2019-06-08 03:00:43 -05:00
kevinz000
8c632bed6f Merge pull request #8391 from Trilbyspaceclone/patch-132
Gives pod lava land ruin a autolathen
2019-06-08 01:00:41 -07:00
CitadelStationBot
87023134e0 Automatic changelog generation for PR #8538 [ci skip] 2019-06-08 00:37:31 -05:00
deathride58
1dde6b90ae Merge pull request #8538 from dtfe3/dtfe3-hair-twintail
Hair - Long Twintails
2019-06-08 01:37:29 -04:00
deathride58
3051994c0e Merge pull request #8546 from Sishen1542/Plushies
Crew Plushies! Redtail, Annie, Paxton, Mason.
2019-06-08 01:10:25 -04:00
deathride58
7fcb46e0f6 Merge pull request #8468 from Citadel-Station-13/kevinz000-patch-41
buffs disabler 20-->25 shots firerate 2.5/s --> 3.33/s speed 412.5-->471.5 pixels/s
2019-06-08 01:09:52 -04:00
deathride58
8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
2019-06-08 01:07:56 -04:00
dtfe3
eb3e196953 Update mam_ears.dmi 2019-06-07 22:52:42 +02:00
CitadelStationBot
6ff01f39f3 Automatic changelog generation for PR #8236 [ci skip] 2019-06-07 11:46:02 -05:00
kevinz000
32c27be2b6 Merge pull request #8236 from deathride58/fuckatmos
[EXPERIMENTAL] Unomos - Listmos except gas mixtures only use one single list for gasses instead of 2 per gas + 1
2019-06-07 09:45:59 -07:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Trilbyspaceclone
a7fe2ca0ff paper work icons 2019-06-06 16:03:24 -04:00