 Unknown
|
6cc856d9af
|
Loadout Menu
|
2020-01-08 22:44:04 -07:00 |
|
|
Putnam
|
244d46ee41
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-08 17:08:01 -08:00 |
|
|
kappa-samaandGitHub
|
ff3370d382
|
bye
|
2020-01-08 16:50:49 -05:00 |
|
|
kappa-samaandGitHub
|
87698297fb
|
bye bye
|
2020-01-08 16:47:28 -05:00 |
|
|
kappa-samaandGitHub
|
a4da8a2dc4
|
bye
|
2020-01-08 16:37:38 -05:00 |
|
|
kappa-samaandGitHub
|
ba20618bd0
|
this file does literally nothing
|
2020-01-08 10:00:33 -05:00 |
|
|
kappa-samaandGitHub
|
d0cd6ae336
|
begone
|
2020-01-08 09:48:04 -05:00 |
|
|
kappa-samaandGitHub
|
3dac4e568d
|
begone
|
2020-01-08 09:45:49 -05:00 |
|
|
Putnam
|
c9fa4bc4eb
|
whoops that wasn't working
|
2020-01-07 17:37:03 -08:00 |
|
|
Putnam
|
8fd7a3db8b
|
added back climax with partner
|
2020-01-07 17:27:34 -08:00 |
|
|
Putnam
|
cd35e516ac
|
back by popular demand: maso/nympho
|
2020-01-07 17:01:14 -08:00 |
|
|
TrilbyspacecloneandGitHub
|
f7aa4f3050
|
Merge branch 'master' into glassware
|
2020-01-06 23:55:44 -05:00 |
|
|
LinandGitHub
|
718d4a080d
|
Merge pull request #9878 from Ghommie/Ghommie-cit382
Unmodularize several machinery and structures
|
2020-01-07 00:31:24 +00:00 |
|
|
Putnam
|
32043a9062
|
whoops forgot permaboner
|
2020-01-06 01:14:00 -08:00 |
|
|
Putnam
|
218e701fa9
|
whoops forgot update appearance
|
2020-01-05 21:48:04 -08:00 |
|
|
Putnam
|
e7684f5df7
|
whoops forgot to use sensitivity
|
2020-01-05 19:29:23 -08:00 |
|
|
Putnam
|
fba7a8abb0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-05 19:12:28 -08:00 |
|
|
Putnam
|
d75a525b3c
|
let's fix arousal huh
|
2020-01-05 19:10:48 -08:00 |
|
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
|
GhomandGitHub
|
0e74c94d8c
|
Merge pull request #10278 from Trilbyspaceclone/patch-248
Fixes Fermi plushie reaction. Removes carbonation of caramel
|
2020-01-05 15:17:14 +01:00 |
|
|
TrilbyspacecloneandGitHub
|
e0e3f1547c
|
Update fermi.dm
|
2020-01-04 18:09:51 -05:00 |
|
|
GhomandGitHub
|
499907f9b7
|
Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
|
2020-01-04 14:07:25 +01:00 |
|
|
GhomandGitHub
|
3d8c329223
|
Kevinz, pls
|
2020-01-04 13:52:17 +01:00 |
|
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
|
TrilbyspacecloneandGitHub
|
f06e20234b
|
Hey guess who looked all over and got told were these files are
|
2020-01-04 06:17:49 -05:00 |
|
|
Ghommie
|
f5b251db66
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-03 18:24:39 +01:00 |
|
|
TrilbyspacecloneandGitHub
|
2931cb6757
|
Merge branch 'master' into glassware
|
2020-01-02 20:30:20 -05:00 |
|
|
LinandGitHub
|
b1ccd512db
|
Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2020-01-03 00:00:51 +00:00 |
|
|
Ghommie
|
4d06d231f8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-02 17:49:01 +01:00 |
|
|
Unknown
|
0b02439b08
|
Puts an end to the Christmas Menace
|
2020-01-02 03:53:04 -07:00 |
|
|
kevinz000
|
094d225874
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-31 19:54:01 -08:00 |
|
|
LinandGitHub
|
b651bbcdb3
|
Merge branch 'master' into Ghommie-cit367
|
2019-12-31 22:37:59 +00:00 |
|
|
kevinz000
|
f920e7b73c
|
changes
|
2019-12-31 10:08:14 -08:00 |
|
|
Ghommie
|
80e716eeaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-30 18:14:47 +01:00 |
|
|
Ghommie
|
62cf03272d
|
work.
|
2019-12-30 16:22:05 +01:00 |
|
|
Ghommie
|
49f1176170
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-30 16:06:16 +01:00 |
|
|
Seris02
|
9653dc470b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc
|
2019-12-30 22:48:39 +08:00 |
|
|
kevinz000
|
24e3b88a34
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-30 00:32:25 -08:00 |
|
|
kevinz000andGitHub
|
7e5729ffaf
|
Merge pull request #10168 from Ghommie/Ghommie-cit459
Allows ghost mentors to orbit around the target instead of setting their view to theirs.
|
2019-12-30 00:17:46 -08:00 |
|
|
kevinz000andGitHub
|
74edd7b13f
|
Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
|
2019-12-30 00:09:18 -08:00 |
|
|
kevinz000andGitHub
|
3f4594d78e
|
Merge pull request #10312 from Commandersand/prayfornoconflictslel
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
|
2019-12-30 00:07:32 -08:00 |
|
|
deathride58
|
1b6359a175
|
[experimental] Buffs the stamina buffer by making it recharge for free.
|
2019-12-29 20:18:52 -05:00 |
|
|
Ghommie
|
edd05cebea
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-30 00:28:36 +01:00 |
|
|
Seris02
|
3d3407363c
|
auto ooc
|
2019-12-29 18:48:00 +08:00 |
|
|
Ghommie
|
7837688426
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-28 23:41:10 +01:00 |
|
|
Ghommie
|
37441437d1
|
a
|
2019-12-28 23:02:28 +01:00 |
|
|
kevinz000andGitHub
|
f14448109d
|
Update sprint.dm
|
2019-12-28 01:34:29 -08:00 |
|
|
kevinz000andGitHub
|
a7323fa424
|
Update stamina.dm
|
2019-12-28 01:33:39 -08:00 |
|
|
LinandGitHub
|
d562a5ba27
|
Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
|
2019-12-28 04:07:03 +00:00 |
|
|
Commandersand
|
60905cc09b
|
loadout
|
2019-12-27 12:44:08 -06:00 |
|