Commit Graph

3394 Commits

Author SHA1 Message Date
Fermi
0f5d47c03f Velvet speech reconfig. 2019-06-13 06:51:11 +01:00
Fermi
378af882d3 Ramping up to logging and a few more fixes. 2019-06-13 05:51:28 +01:00
Fermi
eab52a51e6 Fixed compile errors. 2019-06-13 03:05:34 +01:00
Fermi
3368d3d98b Fixed taste.dm 2019-06-13 02:32:42 +01:00
Fermi
5e4ced1a60 Sorta changes to say.dm 2019-06-13 02:26:04 +01:00
Fermi
70734b705a Forgot to commit to blood. 2019-06-13 02:01:42 +01:00
Fermi
9effbb1e33 Removed increase/decrease blood var. 2019-06-13 01:58:26 +01:00
unknown
b90d344afc It works. It just works. 2019-06-12 01:10:21 +03:00
Poojawa
26855d0698 Gibs spawn correctly. Just need to figure out the overlays now 2019-06-11 04:33:38 -05:00
Ghommie
507e7f0366 part 1.1 2019-06-10 22:45:51 +02:00
Ghommie
3cbe9cf6b0 componentization part 1: "The flawed theorical code" 2019-06-10 22:37:38 +02:00
Poojawa
d8dbad6e2e Digitigrade socks 2019-06-10 04:47:07 -05:00
Poojawa
17629d4feb client check I guess 2019-06-10 03:28:56 -05:00
kevinz000
8ba3609a4d god why fuck 2019-06-10 00:07:04 -07:00
Poojawa
69cefb604b just need to fine tweak gibs and we're gucci 2019-06-09 11:10:23 -05:00
Poojawa
3f1b7e4dd6 Pacifists can nom things now, but not feed to others 2019-06-09 02:23:53 -05:00
kevinz000
b534f57374 Update human.dm 2019-06-08 23:44:27 -07:00
kevinz000
1cf5e24b4d Update human.dm 2019-06-08 23:23:21 -07:00
kevinz000
88240ca06c Merge remote-tracking branch 'origin/master' into changeling_adrenaline 2019-06-08 19:45:19 -07:00
kevinz000
ec9ae5348f Merge remote-tracking branch 'origin/master' into kevinz000-patch-48 2019-06-08 19:10:59 -07:00
kevinz000
752a5835df Merge remote-tracking branch 'origin/master' into changeling_adrenaline 2019-06-08 18:31:37 -07:00
kevinz000
c3db9a3cd9 stuff 2019-06-08 18:22:37 -07:00
kevinz000
1a07f304c9 Update examine.dm 2019-06-08 17:32:36 -07:00
kevinz000
5cf0a9e67f Update carbon_defense.dm 2019-06-08 17:30:50 -07:00
Thalpy
628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01:00
kevinz000
d28754cb4d Merge pull request #8560 from Ghommie/Ghommie-cit37
Ports in the fix against hitting oneself with one's own thrown items.
2019-06-08 01:27:43 -07:00
kevinz000
1488af1a52 Merge pull request #8554 from Ghommie/Ghommie-cit33
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
2019-06-08 01:24:59 -07:00
kevinz000
eb1c767ab7 Merge pull request #8553 from Poojawa/ghost-erp
Clarifies a few things about subtler and how it should be used
2019-06-08 01:24:36 -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
9edac9fc6c Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss
Rebalanced Ass Slapping
2019-06-08 01:17:04 -07:00
kevinz000
61d0ac9993 Merge pull request #8476 from Trilbyspaceclone/patch-157
Tweaks/Buffs hierophant
2019-06-08 01:05:28 -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
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
Trilbyspaceclone
79a456a0ac Update carbon_defense.dm 2019-06-07 18:29:42 -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
Poojawa
c2cf8b28df KISS principal 2019-06-06 21:35:50 -05:00
Ghommie
455332a717 movin back to the core when selecting a new display. 2019-06-07 04:20:15 +02:00
Ghommie
0b53df47de Enough clowning around. 2019-06-07 03:22:26 +02:00
Poojawa
2e42656b6d Revert "lel"
This reverts commit 9e01a078ec.
2019-06-06 19:40:08 -05:00
Poojawa
6b82c985ae Revert "fuckit, I'm just gunna wholesale port from baycode I guess"
This reverts commit 11d10d3805.
2019-06-06 19:39:22 -05:00
Poojawa
67eb76b360 clarifies a few things 2019-06-06 18:56:26 -05: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
BurgerLua
8778349821 added 2019-06-05 11:43:28 -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