silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
Timothy Teakettle
|
0c99b53c05
|
eyes
|
2020-10-03 23:22:53 +01:00 |
|
silicons
|
1586625e6b
|
Merge pull request #12960 from timothyteakettle/loadout-you-say
loadout changes part 1: adds subcategories to the loadout
|
2020-08-06 21:59:13 -07:00 |
|
Timothy Teakettle
|
b5a16d8945
|
MORE CLOTHES
|
2020-07-29 18:20:46 +01:00 |
|
silicons
|
1990f75957
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-25 23:46:27 -07:00 |
|
silicons
|
d946998fb9
|
Merge pull request #12857 from timothyteakettle/let-bots-wear-hats
adds deep beepsky lore to the game in the form of hats
|
2020-07-23 16:18:17 -07:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
silicons
|
9222933d77
|
Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
|
2020-07-23 10:25:25 -07:00 |
|
timothyteakettle
|
a155f24253
|
let santa hat go on
|
2020-07-22 16:53:51 +01:00 |
|
timothyteakettle
|
ed1e8c4221
|
support for masks
|
2020-07-22 15:43:58 +01:00 |
|
silicons
|
744b6d6b48
|
Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
|
2020-07-21 19:20:52 -07:00 |
|
timothyteakettle
|
3a520bba3f
|
more hats
|
2020-07-21 23:45:04 +01:00 |
|
Timothy Teakettle
|
5c88253f93
|
lots more hats
|
2020-07-21 22:58:13 +01:00 |
|
zerothebigboy
|
fb35248e3b
|
a
|
2020-07-21 02:24:22 -04:00 |
|
timothyteakettle
|
3e0403a7e9
|
BEEPSKY FASHION
|
2020-07-21 02:22:42 +01:00 |
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
silicons
|
26fee48cec
|
Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
|
2020-06-29 14:18:10 -07:00 |
|
Putnam3145
|
ee2fedd4af
|
Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-06-29 12:44:33 -07:00 |
|
Ghommie
|
0779dd560e
|
More and more fixes.
|
2020-06-29 18:52:37 +02:00 |
|
Ghommie
|
ae053a9a08
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
|
2020-06-23 03:12:49 +02:00 |
|
Anonymous
|
9e7b884e86
|
Adds remaining TOSOrvikepi
|
2020-06-21 13:25:23 +03:00 |
|
Anonymous
|
45dab7fa66
|
Kepi and Orvilike Kepi
|
2020-06-20 22:52:33 +03:00 |
|
Timothy Teakettle
|
3811fcbcf1
|
some fixes
|
2020-06-15 21:30:14 +01:00 |
|
Timothy Teakettle
|
d7bce8aec0
|
ports some events
|
2020-06-15 20:22:40 +01:00 |
|
Ghom
|
8cb15f9279
|
Actually Balanced and Standardized Vendor Prices. (#12495)
|
2020-06-09 22:22:53 -07:00 |
|
Lin
|
5e37d3ef3b
|
Merge pull request #12430 from Ghommie/Ghommie-cit811
Fixing various icons problems with some clothings.
|
2020-06-03 20:23:16 +00:00 |
|
Ghom
|
d53dca7322
|
Fixing just a couple issues. (#12417)
|
2020-06-02 15:30:22 -07:00 |
|
Ghommie
|
1a9484cf2e
|
Fixing missing clothing icons etc.
|
2020-06-02 17:43:31 +02:00 |
|
Ghommie
|
e51ac4e745
|
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-05-29 17:58:35 +02:00 |
|
Ghom
|
ab5d65a454
|
Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
|
2020-05-24 13:05:15 -07:00 |
|
Ghommie
|
7fb96ab0cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-05-12 20:06:59 +02:00 |
|
Ghommie
|
e8a0ea5acc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit731
|
2020-05-11 00:34:22 +02:00 |
|
Suicidalpickles
|
2d9aac8f31
|
cakehat cat wearing a cakehat while patting a cak (#12166)
fix
|
2020-05-09 00:40:07 +02:00 |
|
Ghommie
|
90bf157f5e
|
Fixing some runtimes and issues.
|
2020-05-08 17:17:33 +02:00 |
|
Ghommie
|
b383066e57
|
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
|
2020-05-02 00:00:49 +02:00 |
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
Ghommie
|
42ff9b1d35
|
Final test, fixes and parent calls.
|
2020-04-14 01:23:26 +02:00 |
|
Ghommie
|
05a954f000
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 02:01:01 +02:00 |
|
Ghommie
|
7c1e5aa2c9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
|
2020-04-09 15:46:19 +02:00 |
|
Artur
|
c402c6dc30
|
Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/
|
2020-04-06 13:24:52 +03:00 |
|
Artur
|
7da4ad5694
|
Damned title doesnt want to show up
|
2020-04-03 10:29:07 +03:00 |
|
Ghommie
|
2bf6d888bd
|
Ports "Obliterates item_color: new washing machine functionality edition"
|
2020-03-30 18:31:26 +02:00 |
|
Ghommie
|
c3faf94d8f
|
WIP
|
2020-03-30 05:29:39 +02:00 |
|
zeroisthebiggay
|
f5a96241ab
|
sneaksuits are not fireproof (#11573)
* and i wanna die
* i decide to revert
* a a a a
|
2020-03-23 15:47:41 +01:00 |
|
ZeroMan
|
35a4d71a54
|
im sorry little one
|
2020-03-19 21:59:14 -04:00 |
|
Putnam3145
|
480eb32c68
|
Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
|
2020-03-11 17:01:13 -07:00 |
|
Ghommie
|
27a7f754c4
|
Fix runtimes some more.
|
2020-03-10 22:40:06 +01:00 |
|