Commit Graph

9278 Commits

Author SHA1 Message Date
Trilbyspaceclone
bc6b967fb2 Update paperplane.dm 2019-06-07 18:34:30 -04:00
Trilbyspaceclone
79a456a0ac Update carbon_defense.dm 2019-06-07 18:29:42 -04:00
SkullyRoberts
5a9269db73 removed duplicate hides_bulges 2019-06-07 12:56:25 -04:00
SkullyRoberts
1a5c487e22 Ported the nudity permit from RP and made it a loadout option 2019-06-07 12:37:37 -04:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie
56be73f7e0 Lord Travis Hath Spoken. 2019-06-07 07:44:33 +02:00
Ghommie
92e925f1f7 Stuff to fix, fools to blame. 2019-06-07 07:14:24 +02:00
Ghommie
4d5332346e Compiling was too slow. 2019-06-07 06:37:03 +02:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Poojawa
38dbdf1a48 Gives Ninjas back their Weeb speech modification 2019-06-06 21:55:35 -05:00
Ghommie
455332a717 movin back to the core when selecting a new display. 2019-06-07 04:20:15 +02:00
Ghommie
a6fcac55d4 Makes it compile. 2019-06-07 04:05:27 +02:00
Ghommie
0b53df47de Enough clowning around. 2019-06-07 03:22:26 +02:00
BlackMajor
21fd11718a Bundled glue in with compression kit PR 2019-06-07 12:00:06 +12:00
Poojawa
67eb76b360 clarifies a few things 2019-06-06 18:56:26 -05:00
Ghommie
5a69499927 Hol up, unrelated PR time, atomization. 2019-06-07 01:32:15 +02:00
Fermi
2888e1b30b Dartgun functions as intended. 2019-06-07 00:12:11 +01:00
Ghommie
ef7fb47e17 port fixaloo. 2019-06-07 00:41:19 +02:00
Fermi
1a42c017ac DEBUG 2019-06-06 23:23:53 +01:00
Ghommie
bdaab020f7 ports a fix. 2019-06-07 00:20:04 +02:00
Fermi
05067463c5 Missed a comment. 2019-06-06 23:02:14 +01:00
Fermi
83666abfea Small text edits and tightening up of self MKU OD. 2019-06-06 22:56:59 +01: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
Ghommie
af2598035a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-05 19:32:17 +02:00
dtfe3
d1d0f38460 Revert "test" 2019-06-05 19:29:53 +02:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00