 Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
BongaTheProto
|
e87e828638
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-25 22:47:02 -05:00 |
|
|
SandPoot
|
ef186347ca
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-23 18:56:20 -03:00 |
|
|
SandPoot
|
19ee7f8bd2
|
some hints
|
2023-07-19 20:51:25 -03:00 |
|
|
BongaTheProto
|
c72c8c145d
|
Merge branch 'master' into pr/623
|
2023-05-06 18:45:19 -05:00 |
|
|
BongaTheProto
|
5116acad15
|
Merge remote-tracking branch 'upstream/master'
|
2023-05-06 18:31:55 -05:00 |
|
|
SandPoot
|
7038059ab5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-05-06 10:47:06 -03:00 |
|
|
Jerry WesterandKrissKr0ss
|
31e87bc2d7
|
Safeguard suit
|
2023-05-01 00:26:56 -05:00 |
|
|
Jerry WesterandKrissKr0ss
|
22309324dc
|
whitespace should not be syntax grrr
|
2023-05-01 00:23:09 -05:00 |
|
|
Jerry WesterandKrissKr0ss
|
8271cf9bc1
|
move rescue plating to CMO locker
|
2023-05-01 00:22:59 -05:00 |
|
|
KrissKr0ss
|
66aa1cb05c
|
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
|
2023-05-01 00:16:20 -05:00 |
|
|
BongaTheProto
|
525741658b
|
shaft beast? Like hype beast but with cocks?
|
2023-04-23 13:55:45 -05:00 |
|
|
BongaTheProto
|
017c235b4f
|
Merge remote-tracking branch 'upstream/master'
|
2023-03-14 17:43:38 -05:00 |
|
|
SandPoot
|
faae67a3eb
|
rotat
|
2023-03-14 15:13:51 -03:00 |
|
|
SandPoot
|
f1eb8fe54f
|
rotat
|
2023-03-14 15:06:18 -03:00 |
|
|
BongaTheProtoandGitHub
|
151306bb69
|
Merge pull request #733 from LeDrascol/overhaul-quirk-dumb4cum
Modularize Dumb For Cum quirk
|
2023-02-24 18:32:18 -05:00 |
|
|
BongaTheProto
|
acf6b87535
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-24 01:39:26 -05:00 |
|
|
SandPoot
|
f0dcf824a7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-24 01:59:45 -03:00 |
|
|
SandPoot
|
d287fc25ca
|
poosh
|
2023-02-21 01:55:49 -03:00 |
|
|
Darius
|
86b4f6c6ec
|
Merge branch 'master' into overhaul-quirk-dumb4cum
|
2023-02-19 20:23:16 -05:00 |
|
|
Jerry Wester
|
1d9569e4f5
|
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into modsuits
|
2023-02-16 20:37:45 -07:00 |
|
|
BongaTheProto
|
972df3f711
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-16 16:30:59 -05:00 |
|
|
SandPoot
|
072087ec14
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-15 20:22:44 -03:00 |
|
|
Timothy TeakettleandGitHub
|
71de9c13e3
|
Merge pull request #15962 from SandPoot/contextual-screentips
Contextual screentips -- Screentips now show you what items/objects can do
|
2023-02-15 23:04:54 +00:00 |
|
|
BongaTheProtoandGitHub
|
d9d617bf8d
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-02-10 16:53:13 -05:00 |
|
|
SandPoot
|
65c38e9828
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-10 02:18:08 -03:00 |
|
|
SandPoot
|
8ea39f9cf4
|
helpers
|
2023-02-10 00:39:04 -03:00 |
|
|
SandPoot
|
4491abc2d7
|
updates to most recent version and puts intent hints!
|
2023-02-09 02:20:02 -03:00 |
|
|
SandPoot
|
1b1154260c
|
correct everything and some intention based checks
|
2023-02-08 02:17:57 -03:00 |
|
|
SandPoot
|
5052f836e7
|
the stuff
|
2023-02-06 19:54:54 -03:00 |
|
|
Darius
|
f2cf15c590
|
Refactor Dumb For Cum quirk
This commit makes the following changes
- Adds comments
- Adds trait TRAIT_DUMB_CUM
- Adds mood quirk flag
- Adds quirk removal code
- Removes non-modular edits
- Renames trait TRAIT_DUMB4CUM to TRAIT_DUMB_CUM_CRAVE
- Removes interaction blocks
- Removes useless return functions
- Updates flavor text
- Updates variable names
- Changes reagent process to check for trait before triggering uncrave
- Changes on_spawn event to add event
|
2023-02-02 17:21:54 -05:00 |
|
|
SandPoot
|
ed06e686e1
|
pushies.
|
2023-01-31 16:40:17 -03:00 |
|
|
Jerry Wester
|
0adf590336
|
Safeguard suit
|
2023-01-20 20:25:59 -07:00 |
|
|
Jerry Wester
|
ccc6fb0870
|
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into modsuits
|
2023-01-20 17:10:49 -07:00 |
|
|
|
9098fbee8d
|
Update code/game/objects/structures/electricchair.dm
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
|
2023-01-15 03:01:03 +00:00 |
|
|
Casper
|
ae399d1d7c
|
Fixes e-chair and shockkit runtimes.
|
2023-01-14 22:13:00 +00:00 |
|
|
Jerry Wester
|
549482770c
|
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into modsuits
|
2023-01-09 22:42:25 -07:00 |
|
|
SandPoot
|
d743096f8a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-09 17:50:19 -03:00 |
|
|
Jerry WesterandGitHub
|
ae347f3399
|
Revert "MODsuits"
|
2023-01-08 17:30:26 -07:00 |
|
|
SandPoot
|
82eff346c7
|
Merge Upstream
|
2023-01-07 22:52:22 -03:00 |
|
|
siliconsandGitHub
|
23327fa268
|
Merge pull request #15894 from JerryWester/modsuits
MODsuits
|
2023-01-07 14:07:28 -08:00 |
|
|
Jerry Wester
|
63aa6294dd
|
whitespace should not be syntax grrr
|
2023-01-07 06:41:05 -07:00 |
|
|
Jerry Wester
|
21b0a9d222
|
move rescue plating to CMO locker
|
2023-01-07 06:23:53 -07:00 |
|
|
Jerry Wester
|
b1b4f96053
|
fix hilbert analyzer in RD locker
|
2022-12-17 20:10:41 -07:00 |
|
|
BongaTheProto
|
a04476b38d
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-16 20:39:53 -05:00 |
|
|
SandPoot
|
011dd2e817
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-12-16 16:47:19 -03:00 |
|
|
LinandGitHub
|
7d0c3df2ad
|
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
|
2022-12-14 19:07:59 -07:00 |
|
|
Jerry WesterandGitHub
|
32a5d02434
|
Merge branch 'master' into modsuits
|
2022-12-13 19:18:24 -07:00 |
|
|
Jerry Wester
|
19428e2579
|
revert bag dumping changes
|
2022-12-13 19:15:07 -07:00 |
|
|
Jerry Wester
|
94bfa88ed9
|
add more platings
|
2022-12-13 19:14:43 -07:00 |
|