shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,505 Commits 5 Branches 0 Tags
fa0080d8d65b930d513833e41b70a9208b2bb601
Commit Graph

1614 Commits

Author SHA1 Message Date
Putnam
fa0080d8d6 made climax with partner require EXPLICIT consent 2020-01-15 20:55:39 -08:00
Putnam
253a3a44ba moved "aphro" magic string to a define 2020-01-15 20:15:40 -08:00
Putnam
a1922a459e Moved Arousal tab stuff to IC tab 2020-01-15 20:14:23 -08:00
Putnam
d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
Hatterhat
7b322ff467 Merge branch 'master' into greytide-standard-uniform 2020-01-14 19:39:16 -06:00
Hatterhat
3622dd118b forgive me, grey jumpsuit entry 2020-01-14 19:38:11 -06:00
Xantholne
903e59d6ed Merge branch 'master' into xantholne-christmas03 2020-01-12 22:29:59 -07:00
Hatterhat
7fac15caeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform 2020-01-12 12:39:57 -06:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat
7216ae545c how the hell did that fall out 2020-01-11 16:08:51 -06:00
Hatterhat
47fd3823e8 staff assistant jumpsuit gang 2020-01-11 15:58:24 -06:00
Putnam
48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
Lin
fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing 
modular citadel file destruction but only slightly
 2020-01-11 00:30:58 +00:00
kevinz000
8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02 
Red Dead Redemption 2 but it's a crappy 2D space man game
 2020-01-10 14:01:06 -08:00
Lin
e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490 
Ports reagents id removal and typepath usage.
 2020-01-10 01:34:39 +00:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
 2020-01-10 01:31:20 +00:00
Unknown
6cc856d9af Loadout Menu 2020-01-08 22:44:04 -07:00
kappa-sama
d0cd6ae336 begone 2020-01-08 09:48:04 -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
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
Ghom
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
Trilbyspaceclone
e0e3f1547c Update fermi.dm 2020-01-04 18:09:51 -05:00
Ghom
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
Ghom
3d8c329223 Kevinz, pls 2020-01-04 13:52:17 +01:00
Trilbyspaceclone
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
Lin
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
Lin
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
kevinz000
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
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
kevinz000
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
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