Fermi
|
713d849c03
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-19 21:02:30 +01:00 |
|
Fermi
|
38ed75dc68
|
Reverts sneaky pandas
|
2019-06-18 22:48:34 +01:00 |
|
Fermi
|
ade3a4bced
|
Fixes.
|
2019-06-18 19:06:26 +01:00 |
|
Fermi
|
d2a5e9ddfd
|
Makeup panda
|
2019-06-18 18:51:30 +01:00 |
|
Poojawa
|
bf991cd2da
|
Underwear overlays Gentials, can toggle each seperately (#8602)
* Gentials layered under underclothes
* screm
|
2019-06-17 11:20:25 -07:00 |
|
kevinz000
|
4f42d40681
|
Merge pull request #8507 from Thalpy/Wheelchairs
Adds Hoverchairs and the paraplegic trait.
|
2019-06-17 11:13:43 -07:00 |
|
Fermi
|
4526832e7d
|
I'm spending too much time trying to fix something rejected.
|
2019-06-17 15:16:45 +01:00 |
|
Fermi
|
d092dd1da0
|
Testing hypnoquirk
|
2019-06-17 12:47:23 +01:00 |
|
Thalpy
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +01:00 |
|
deathride58
|
7b329ae824
|
Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline
Fixes adrenaline (it didn't actually work). Replaces traitor/ling adrenal omnizine with regenjelly (3x faster, but lasts shorter too), reworks changeling adrenals to scale burst stamina heal rather than flat 100
|
2019-06-16 22:51:03 -04:00 |
|
deathride58
|
d0bc89353c
|
Merge pull request #8597 from Citadel-Station-13/kevinz000-patch-48
pacifists can now let people piggyback (grab_passive). admins now can proccall buckle_mob on humans in a way that bypasses piggyback code block
|
2019-06-16 22:50:15 -04:00 |
|
kevinz000
|
27333276de
|
Merge pull request #8570 from Trilbyspaceclone/patch-170
Ports origami skills for paper wiz loot
|
2019-06-16 19:40:01 -07:00 |
|
Thalpy
|
98fc55e9f8
|
Merge branch 'master' into Wheelchairs
|
2019-06-16 17:33:57 +01:00 |
|
deathride58
|
fdc0e4f957
|
Merge pull request #8611 from Poojawa/digitigrade-socks
Digitigrade socks
|
2019-06-14 20:50:05 -04:00 |
|
deathride58
|
b1f1b2a57d
|
Merge pull request #8609 from Poojawa/simple_mob_nomming-I-guess
Client check to possibly fix #8542
|
2019-06-14 20:49:28 -04:00 |
|
Fermi
|
7a66039f0c
|
Fixing merge errors.
Testmerge ready.
|
2019-06-14 21:55:17 +01:00 |
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
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 |
|
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
|
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 |
|
Ghommie
|
455332a717
|
movin back to the core when selecting a new display.
|
2019-06-07 04:20:15 +02:00 |
|