Putnam
de4e65c467
Savefile conversion for inesct
2020-01-15 20:13:09 -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
Artur
e3d3f7b750
Ported
2020-01-13 13:20:55 +02:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Ghom
3a72d1f434
Merge pull request #10495 from Citadel-Station-13/kevinz000-patch-12
...
allow guests to use looc
2020-01-11 15:09:37 +01: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
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
kevinz000
dfce4ea75f
Update looc.dm
2020-01-09 09:30:49 -08:00
Putnam
32043a9062
whoops forgot permaboner
2020-01-06 01:14:00 -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
Ghom
e18244671f
Merge pull request #10350 from Putnam3145/dojo-ghostrole
...
Ghost cafe quality-of-life, plus making ghost role eligibility an element
2020-01-05 23:05:13 +01:00
Putnam
adf87c7595
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
2020-01-02 22:52:24 -08:00
kevinz000
094d225874
Merge remote-tracking branch 'citadel/master' into michael_labs
2019-12-31 19:54:01 -08:00
kevinz000
c222ea0bb3
Merge pull request #10356 from deathride58/sprintprefs
...
Adds space to sprint and toggle sprint as preferences
2019-12-31 19:29:47 -08:00
nik707
8a4e44758f
Merge pull request #10165 from Ghommie/Ghommie-cit456
...
Minor underwear fixes and tweaks.
2019-12-30 18:28:48 -06:00
Putnam
71fcd23f1f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
2019-12-30 13:31:15 -08:00
Putnam
d78ebd15f3
amazing.
2019-12-30 12:38:38 -08:00
deathride58
5c9c9d9566
Adds space to sprint and toggle sprint as preferences
2019-12-30 15:32:15 -05: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
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
Putnam
418e4c21ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
2019-12-30 01:56:59 -08:00
Putnam
90ebbdfdb9
elements are so good. they're so good
2019-12-30 00:53:03 -08:00
kevinz000
24e3b88a34
Merge remote-tracking branch 'citadel/master' into michael_labs
2019-12-30 00:32:25 -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
Putnam3145
640419eed5
Merge pull request #10343 from Ghommie/Ghommie-cit494
...
[s] Fixes anti-ghost-role vars a little.
2019-12-29 20:54:55 -08:00
Ghommie
0ab817c208
[s] Fixes ghost anti-ghostrole timers a little.
2019-12-29 22:22:20 +01:00
Seris02
3d3407363c
auto ooc
2019-12-29 18:48:00 +08:00
Ghommie
ab34faa41d
fix taur
2019-12-24 02:01:45 +01:00
shellspeed1
1875ea3f58
new wings and fluff
2019-12-21 23:47:41 -08:00
Putnam
ef360838da
errors
2019-12-20 14:50:08 -08:00
Putnam
c810145fc1
also adds aphrodisiacs, slaps, all hypno as prefs
2019-12-20 14:47:09 -08:00
Ghom
a398b7c413
Merge pull request #10200 from Citadel-Station-13/kevinz000-patch-125
...
Adds 8 character save slots
2019-12-20 22:55:22 +01:00
Putnam
f2b46f0951
ROBUST OPTING MECHANICS
2019-12-19 11:14:02 -08:00
Putnam
9ec2c8a7f1
MKUltra made double opt-in
2019-12-19 09:54:34 -08:00
Ghommie
ba851d55b6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456
2019-12-18 19:42:41 +01:00
kevinz000
932bdfd325
kay
2019-12-15 21:57:22 -07:00
kevinz000
b4bd2cbb5c
Update preferences.dm
2019-12-15 20:20:04 -07:00
kevinz000
5f27103641
god FUCK you icons
2019-12-15 17:30:30 -07:00
kevinz000
a4ffef5b1f
Typos
2019-12-15 00:36:20 -07:00
kevinz000
586dcb6f81
welp i got lazy
2019-12-15 00:15:32 -07:00
kevinz000
4970675467
s
2019-12-15 00:06:11 -07:00
Ghommie
b39ae815f3
Porting several quirks code updates.
2019-12-13 16:12:04 +01:00
Ghommie
c098d497ad
Minor underwear fixes and tweaks.
2019-12-13 06:50:14 +01:00
Ghommie
3545f10137
Fixing character setup preview icons.
2019-12-12 17:04:14 +01:00
Putnam3145
c54523e324
Merge pull request #9629 from Citadel-Station-13/kevinz000-patch-87
...
can we not tell all the nonantags that antagonist ooc is enabled please
2019-12-09 13:25:37 -08:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
Lin
e954cec58c
Merge pull request #9898 from Ghommie/Ghommie-cit387
...
Dreamchecker compatibility changes, part 3.
2019-11-23 05:52:44 +00:00
GrayRachnid
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
Lin
1ddb9935ff
Merge pull request #9530 from Ghommie/Ghommie-cit245
...
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
