 kevinz000
|
95abaf6a6e
|
Merge pull request #8551 from Ghommie/Ghommie-cit30
Port paradise goonchat uridecode fix
|
2019-06-08 01:23:59 -07: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 |
|
|
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 |
|
|
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 |
|
|
kevinz000
|
9edac9fc6c
|
Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss
Rebalanced Ass Slapping
|
2019-06-08 01:17:04 -07:00 |
|
|
kevinz000
|
a866ceb8a2
|
Merge pull request #8543 from Trilbyspaceclone/patch-165
Makes SNOWCONES!
|
2019-06-08 01:15:58 -07: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 |
|
|
kevinz000
|
f201bd1508
|
Merge pull request #8494 from Trilbyspaceclone/ash_walker
Ash walker bone satchles.
|
2019-06-08 01:09:26 -07:00 |
|
|
kevinz000
|
487461fbda
|
Merge pull request #8500 from Trilbyspaceclone/patch-158
Buffs stun slugs
|
2019-06-08 01:09:00 -07: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 |
|
|
kevinz000
|
3b24e05dd6
|
Merge pull request #8483 from Ghommie/Ghommie-cit23
Ports in combat gloves plus.
|
2019-06-08 01:07:18 -07:00 |
|
|
kevinz000
|
61d0ac9993
|
Merge pull request #8476 from Trilbyspaceclone/patch-157
Tweaks/Buffs hierophant
|
2019-06-08 01:05:28 -07: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 |
|
|
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
|
8c632bed6f
|
Merge pull request #8391 from Trilbyspaceclone/patch-132
Gives pod lava land ruin a autolathen
|
2019-06-08 01:00:41 -07:00 |
|
|
deathride58
|
1dde6b90ae
|
Merge pull request #8538 from dtfe3/dtfe3-hair-twintail
Hair - Long Twintails
|
2019-06-08 01:37:29 -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 |
|
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
|
Ghommie
|
bdaab020f7
|
ports a fix.
|
2019-06-07 00:20:04 +02:00 |
|
|
Trilbyspaceclone
|
a7fe2ca0ff
|
paper work icons
|
2019-06-06 16:03:24 -04:00 |
|
|
Trilbyspaceclone
|
6fd83df81f
|
Update recipes.dm
|
2019-06-06 16:00:02 -04:00 |
|
|
Trilbyspaceclone
|
7f35a15020
|
Update packs.dm
|
2019-06-06 15:58:13 -04:00 |
|
|
Trilbyspaceclone
|
e2a3b855b8
|
Update order.dm
|
2019-06-06 15:56:27 -04:00 |
|
|
Trilbyspaceclone
|
4ef2b15c69
|
Update manifest.dm
|
2019-06-06 15:51:37 -04:00 |
|
|
Trilbyspaceclone
|
01e56cc00d
|
garmmer
|
2019-06-06 14:52:52 -04:00 |
|
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
|
kevinz000
|
31a942a63a
|
Merge pull request #8534 from dtfe3/dtfe3-pink-panties
Pink Panties
|
2019-06-06 06:52:57 -07:00 |
|
|
Ghommie
|
44358e054a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29
|
2019-06-06 15:24:31 +02:00 |
|
|
Ghommie
|
0e630680ba
|
forgot to pull from upstream. One second.
|
2019-06-06 15:20:27 +02:00 |
|
|
Trilbyspaceclone
|
5e68db7836
|
local files have commas, but I forgot to save
|
2019-06-05 22:22:50 -04:00 |
|
|
Trilbyspaceclone
|
3e98ed9553
|
Update packs.dm
|
2019-06-05 20:41:59 -04:00 |
|
|
Trilbyspaceclone
|
1b463c18b3
|
Update snacks_sandwichtoast.dm
|
2019-06-05 20:14:48 -04:00 |
|
|
Trilbyspaceclone
|
a9ded7a3eb
|
Add files via upload
|
2019-06-05 20:10:07 -04:00 |
|
|
Trilbyspaceclone
|
e5b538af71
|
Update recipes_frozen.dm
|
2019-06-05 20:09:21 -04:00 |
|
|
Trilbyspaceclone
|
762c509315
|
Update craft.dm
|
2019-06-05 20:07:25 -04:00 |
|
|
Trilbyspaceclone
|
b7a759017d
|
Add files via upload
|
2019-06-05 20:05:56 -04:00 |
|
|
Trilbyspaceclone
|
9b2991d0f2
|
Update recipes_misc.dm
|
2019-06-05 20:05:22 -04:00 |
|
|
Trilbyspaceclone
|
e922a0cb18
|
Update recipes_sandwich.dm
|
2019-06-05 20:04:40 -04:00 |
|
|
Trilbyspaceclone
|
b68565280e
|
Update snacks_other.dm
|
2019-06-05 20:02:22 -04:00 |
|
|
BurgerLua
|
8778349821
|
added
|
2019-06-05 11:43:28 -07:00 |
|
|
kevinz000
|
7decce3808
|
Merge pull request #8525 from Trilbyspaceclone/patch-161
Makes cookies loved by all
|
2019-06-05 11:35:22 -07:00 |
|
|
kevinz000
|
0d97361dea
|
Merge pull request #8430 from Trilbyspaceclone/bad_idea
Adds improvised 7.62 rifle
|
2019-06-05 11:31:10 -07:00 |
|
|
kevinz000
|
6e4a3c71f9
|
Merge pull request #8532 from Poojawa/WHYBYOND
Without this, everyone is broken
|
2019-06-05 11:30:09 -07:00 |
|
|
dtfe3
|
3de6e2d71a
|
twintails...
title
|
2019-06-05 19:41:23 +02:00 |
|
|
dtfe3
|
d1d0f38460
|
Revert "test"
|
2019-06-05 19:29:53 +02:00 |
|
|
deathride58
|
98304e4975
|
Merge pull request #8424 from Arturlang/CTRL-Alt-Click-port
Ctrl Alt Click on pipes, port from TG
|
2019-06-05 12:54:36 -04:00 |
|
|
dtfe3
|
2e47c973c6
|
Pink Panties
|
2019-06-05 16:15:38 +02:00 |
|
|
Poojawa
|
27ef3ce281
|
Without this, everyone is broken
|
2019-06-05 08:10:20 -05:00 |
|
|
Trilbyspaceclone
|
f6c7eeb4da
|
Update mining_tools.dm
|
2019-06-05 09:06:47 -04:00 |
|