Commit Graph

19000 Commits

Author SHA1 Message Date
deathride58
fb704afb61 makes gloves of the northstar restore 2/3 of the stamina used up by harm intent punches on empty stam buffers (#7770) 2018-11-28 19:47:34 -08:00
deathride58
e4467fb8d5 Merge pull request #7769 from BlackMajor/test
Adds a peep emote.
2018-11-28 18:10:54 -05:00
BlackMajor
fb446cdfa4 Adds a peep
yep.
2018-11-26 23:16:34 +13:00
CitadelStationBot
c6f14553f0 Automatic changelog generation for PR #7754 [ci skip] 2018-11-26 04:10:12 -06:00
nik707
60828a2da0 Merge pull request #7754 from deathride58/fixesghostrolesforreal
actually fixes ghost role spawners leaving null entries in mob_spawners
2018-11-26 04:10:10 -06:00
CitadelStationBot
dc7ceff845 Automatic changelog generation for PR #7756 [ci skip] 2018-11-26 04:09:52 -06:00
nik707
640cfdc60c Merge pull request #7756 from deathride58/fixedkitchengun
readds the kitchen gun sprite (fixes the kitchen gun being invisible)
2018-11-26 04:09:48 -06:00
deathride58
d9b6979dff Merge pull request #7761 from Trilbyspaceclone/patch-11
Buffs Highlander stam
2018-11-25 07:18:27 -05:00
deathride58
0be6ce420a Merge pull request #7757 from Trilbyspaceclone/patch-9
Wallets can now hold valentine cards
2018-11-25 07:17:49 -05:00
deathride58
6699d2fce6 Merge pull request #7718 from Citadel-Station-13/kevinz000-patch-13
adds proper facename/coordinates to R&D logs
2018-11-25 07:17:03 -05:00
deathride58
d0e913efe5 Merge pull request #7764 from Citadel-Station-13/donator-corgi
Adds Corgi Suit for a donator
2018-11-24 15:41:41 -05:00
LetterJay
a363007ad5 donator corgi 2018-11-24 13:26:17 -06:00
Trilbyspaceclone
b0a9bab300 Buffs Highlander stam 2018-11-24 00:09:41 -05:00
nik707
fd2e9ad5c0 Merge pull request #7753 from Trilbyspaceclone/Trilbyspaceclonepatch-6
Makes skeletal no longer KPA proof, but Pirate skeletal are still do to being Free or something
2018-11-23 15:12:19 -06:00
nik707
fd45662aaf Merge pull request #7746 from Citadel-Station-13/kevinz000-patch-9
"Why did I set piercing to two instead of one" and other miscellaneous beam rifle rebalances
2018-11-23 15:10:13 -06:00
CitadelStationBot
2926c2e9bd Automatic changelog generation for PR #7752 [ci skip] 2018-11-23 15:05:57 -06:00
nik707
489d565f2f Merge pull request #7752 from deathride58/fixesstealthboxes
ports tgstation/tgstation#40260 (fixes stealth implants)
2018-11-23 15:05:55 -06:00
CitadelStationBot
f38ee02d42 Automatic changelog generation for PR #7748 [ci skip] 2018-11-23 15:05:47 -06:00
nik707
1110a9449a Merge pull request #7748 from deathride58/buffedcacti
buffs lavaland's cacti just a smidge by increasing the amount of vitfro they have by 1.5x (4 > 6)
2018-11-23 15:05:45 -06:00
nik707
df2048ef6b Merge pull request #7745 from Citadel-Station-13/kevinz000-patch-7
Fixes nanite Metabolic Synthesis
2018-11-23 15:05:02 -06:00
CitadelStationBot
6de12f3045 Automatic changelog generation for PR #7751 [ci skip] 2018-11-21 16:50:35 -06:00
nik707
08c29563ab Merge pull request #7751 from deathride58/clickstambartoshowstam
clicking your stamina bar will now show your staminaloss and info regarding your stamina buffer
2018-11-21 16:50:28 -06:00
CitadelStationBot
31054482ac Automatic changelog generation for PR #7750 [ci skip] 2018-11-21 15:38:16 -06:00
nik707
7cd129dc1a Merge pull request #7750 from deathride58/skintonedgenitals
Fixes the "genitals use skintone" option not appearing in the character appearance menu
2018-11-21 15:38:14 -06:00
Trilbyspaceclone
12e43ea5f3 Update wallets.dm 2018-11-21 02:44:59 -05:00
Trilbyspaceclone
5435fa4cba make triv rethink 2018-11-21 02:44:49 -05:00
Trilbyspaceclone
e5a0b8d677 Wallets can hold valentine cards 2018-11-21 02:00:23 -05:00
deathride58
4e88980cf5 readds the kitchen gun sprite (fixes the kitchen gun being invisible) 2018-11-21 01:56:20 -05:00
Trilbyspaceclone
bf4f9197dd So we can see them 2018-11-20 22:34:11 -05:00
deathride58
73ae6badb6 actually fixes ghost role spawners leaving null entries in mob_spawners 2018-11-20 22:24:47 -05:00
nik707
59dc18d904 Merge pull request #7637 from Trilbyspaceclone/Slimey_points
[READY] More Slime core deconstruction, now with Cross bread slime cores! (Best Grammar! 100% ready for merging PDM!!)
2018-11-20 19:49:25 -06:00
nik707
bea7b2a09f Merge pull request #7698 from Trilbyspaceclone/Cargo_memes_1
[Ready] More riot gear, cap pen and more!
2018-11-20 19:14:59 -06:00
Trilbyspaceclone
cd7ae39e04 Readdes skeles 2018-11-20 20:06:48 -05:00
Trilbyspaceclone
f3f314ea6e Yarr 2018-11-20 20:05:31 -05:00
Trilbyspaceclone
810f7f186d Headset sorrow 2018-11-20 19:37:13 -05:00
nik707
82f03774c5 Merge pull request #7684 from Trilbyspaceclone/master
[Ready]Silly Tips
2018-11-20 18:31:16 -06:00
deathride58
cfaa0041b9 ports tgstation/tgstation#40260 2018-11-20 19:28:32 -05:00
Trilbyspaceclone
66b5f06514 Grammar 2018-11-20 16:39:01 -05:00
Trilbyspaceclone
c411c6671a truns 2018-11-20 16:35:33 -05:00
deathride58
4afb9d9243 And again, it just, it just works 2018-11-20 13:31:32 -05:00
CitadelStationBot
36f3317306 Automatic changelog generation for PR #7742 [ci skip] 2018-11-20 12:14:13 -06:00
nik707
54506f6b2c Merge pull request #7742 from deathride58/yallnwahsdontevensmokeweed
Y'all n'wahs aint even smoke - adds skooma
2018-11-20 12:14:09 -06:00
deathride58
a8ed954f3b fixes the calc for stamina buffer usage 2018-11-20 10:06:08 -05:00
deathride58
2247bc8466 clicking your stamina bar will now show your stamina 2018-11-20 10:02:36 -05:00
deathride58
125b653cf8 fixes genitals use skintone not showing up in the character appearance menu 2018-11-20 09:15:32 -05:00
deathride58
9158d323a5 buffs lavaland's cacti just a smidge by increasing the amount of vitfro they have by 1.5x (4 > 6) 2018-11-20 06:19:27 -05:00
CitadelStationBot
2257d56b5b Automatic changelog generation for PR #7741 [ci skip] 2018-11-20 00:05:46 -06:00
nik707
251ff760ee Merge pull request #7741 from deathride58/defaultautofitviewport
Makes auto fit viewport enabled by default for new players
2018-11-20 00:05:43 -06:00
kevinz000
79b4d5f663 Update beam_rifle.dm 2018-11-19 20:24:21 -08:00
kevinz000
8418eadc5b Update rdconsole.dm 2018-11-19 20:11:29 -08:00