 Fermi
|
b51a9e70e5
|
Fix for pHbooklet.
|
2019-06-13 01:13:47 +01:00 |
|
|
Trilbyspaceclone
|
207b12e47a
|
Update custom_items.dm
|
2019-06-11 19:11:15 -04:00 |
|
|
TrilbySpaseClone
|
7f3e2dd28b
|
Kimono
Adds blue Kimono for SFox63
|
2019-06-11 18:00:08 -04:00 |
|
|
kevinz000
|
54b3568319
|
Merge pull request #8599 from Poojawa/pacifistic-vore
Pacifists can nom things now, but not feed to others
|
2019-06-11 11:13:01 -07:00 |
|
|
Ghommie
|
3cbe9cf6b0
|
componentization part 1: "The flawed theorical code"
|
2019-06-10 22:37:38 +02:00 |
|
|
Sishen
|
661f064a03
|
Update _medical.dm
|
2019-06-10 08:15:44 -04:00 |
|
|
Sishen
|
30e77035da
|
Update _medical.dm
|
2019-06-10 07:51:54 -04:00 |
|
|
AnalWerewolf
|
8337692650
|
Merge branch 'master' into Fritz-cute
|
2019-06-10 15:15:41 +10:00 |
|
|
Poojawa
|
69cefb604b
|
just need to fine tweak gibs and we're gucci
|
2019-06-09 11:10:23 -05:00 |
|
|
Trilbyspaceclone
|
5c8f7b326f
|
Update _medical.dm
|
2019-06-09 12:00:46 -04:00 |
|
|
Sishen
|
7b48c8899d
|
loadoutsahoy
|
2019-06-09 11:21:41 -04:00 |
|
|
Poojawa
|
80659a540b
|
Update modular_citadel/code/modules/arousal/organs/testicles.dm
I guess
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-06-09 09:59:31 -05:00 |
|
|
Poojawa
|
3f1b7e4dd6
|
Pacifists can nom things now, but not feed to others
|
2019-06-09 02:23:53 -05:00 |
|
|
Poojawa
|
6bdf5f585a
|
fixes testicle runtimes
|
2019-06-09 00:49:40 -05:00 |
|
|
kevinz000
|
be9a551eea
|
Merge pull request #8566 from Ghommie/Ghommie-cit39
Different combat mode message if user is on help intent.
|
2019-06-08 12:05:17 -07:00 |
|
|
Ghommie
|
480ee9a9da
|
Reskinnable PDAs.
|
2019-06-08 19:55:47 +02:00 |
|
|
Ghommie
|
53d5ad5820
|
no exclamation point.
|
2019-06-08 14:45:26 +02:00 |
|
|
Ghommie
|
fc536dcfe4
|
Urist McSpaceman goes vigilant!
Urist McSpaceman seems attentive!
Urist McSpaceman looks alert!
|
2019-06-08 14:44:40 +02: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
|
1ad200fcf4
|
Merge pull request #8548 from dtfe3/dtfe3-loadout-schoolgirl
Schoolgirl outfits for the loadout menu
|
2019-06-08 01:22:52 -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 |
|
|
Ghommie
|
57246b5c4f
|
No combat mode message if user is on help intent.
|
2019-06-07 19:36:09 +02: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 |
|
|
AnalWerewolf
|
4ff12eebd0
|
he bork and he woof
|
2019-06-07 18:10:22 +10: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 |
|
|
Fermi
|
83666abfea
|
Small text edits and tightening up of self MKU OD.
|
2019-06-06 22:56:59 +01:00 |
|
|
dtfe3
|
0b1da3f025
|
Update uniform.dm
|
2019-06-06 20:50:14 +02:00 |
|
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +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 |
|
|
Ghommie
|
0513f3464a
|
one
|
2019-06-05 19:20:25 +02:00 |
|
|
Poojawa
|
11d10d3805
|
fuckit, I'm just gunna wholesale port from baycode I guess
|
2019-06-05 04:55:36 -05:00 |
|
|
kevinz000
|
cd38a29449
|
Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals
Ports RP's deer taur and adds Elven ears to mammals
|
2019-06-05 01:44:05 -07:00 |
|
|
Fermi
|
228ab5b7c9
|
+Acute hepatic pharmacokinesis. (untested, will test with alterations)CC
|
2019-06-05 00:23:42 +01:00 |
|
|
Poojawa
|
1f1f951924
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-06-03 05:35:52 -05:00 |
|
|
Fermi
|
255aa60441
|
Final pooj changes.
|
2019-06-02 22:57:50 +01:00 |
|
|
Fermi
|
0eec1ed3f3
|
Pooj changes.
|
2019-06-02 22:49:04 +01:00 |
|
|
Poojawa
|
25458fad63
|
I refuse to eat crow.
|
2019-06-02 08:40:51 -05:00 |
|
|
Poojawa
|
69b1373209
|
compile testing and tweaks
|
2019-06-02 08:06:16 -05:00 |
|
|
Poojawa
|
818ec19561
|
Working as intended, fixed a few other missing sprites
Started groundwork for multi-breasts and hidden balls.
|
2019-06-02 04:44:57 -05:00 |
|
|
Poojawa
|
17ad519f24
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess
|
2019-06-02 03:00:46 -05:00 |
|
|
CalamaBanana
|
a37f84fb9b
|
Ports RP Deer taur and adds Elf Ears to Mammals
Ports RP Deer taur and adds Elf Ears to Mammals
|
2019-06-01 17:28:17 +02:00 |
|
|
Fermi
|
40aa231b64
|
Made MKUltra's OD on self turn the player into a narcissist.
|
2019-06-01 04:31:34 +01:00 |
|
|
Fermi
|
e58a94bcc7
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-01 03:12:38 +01:00 |
|
|
Fermi
|
01c3f66f7c
|
Great, merge conflicts.
|
2019-06-01 02:42:55 +01:00 |
|
|
Fermi
|
2eceb6f57b
|
Added a cybernetic tongue and sprites. Fixed furranium.
|
2019-06-01 01:28:52 +01:00 |
|
|
Fermi
|
e1577111a0
|
TO BE TESTED: Added the ability for slimes to make MKUltra.
|
2019-05-31 05:09:07 +01:00 |
|
|
Fermi
|
1244b848bf
|
Compile safe.
|
2019-05-31 04:29:35 +01:00 |
|
|
Fermi
|
adeffe0c47
|
Fixed lungs.
|
2019-05-31 04:16:18 +01:00 |
|