Commit Graph

13931 Commits

Author SHA1 Message Date
Poojawa
38dbdf1a48 Gives Ninjas back their Weeb speech modification 2019-06-06 21:55:35 -05:00
Ghommie
f8903a871e Another episode of "fixing that stupid map edge bug again". 2019-06-07 04:55:05 +02: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
c5f79c9da8 Fine i'll put it back in tools then, will that make you happy? 2019-06-07 12:30:34 +12: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
000b930811 Added Medolier (needs sprite) 2019-06-07 00:19:28 +01: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
Trilbyspaceclone
a7fe2ca0ff paper work icons 2019-06-06 16:03:24 -04:00
Sishen
b9b219d561 adds redtail 2019-06-06 16:01:40 -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
Sishen
cf3002a392 slimeplush 2019-06-06 05:14:01 -04: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
7f8886f6e9 Update construction.dm 2019-06-05 20:06:37 -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
Trilbyspaceclone
03132569a7 Update backpack.dm 2019-06-05 15:54:51 -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
kevinz000
2c84d75ae6 Merge pull request #8528 from Poojawa/marking-mysteries
Fixes prosthetic invisible hands, improves female markings
2019-06-05 02:02:40 -07:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
2019-06-05 01:55:19 -07:00