 Elizabeth Lavenza
|
0772450dbc
|
Port set_stat and COMSIG_MOB_STATCHANGE from TG
|
2024-04-13 20:00:29 -04:00 |
|
|
BongaTheProto
|
1e1fc329f8
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-13 14:12:39 -05:00 |
|
|
SandPoot
|
2e2528ee56
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-13 00:36:29 -03:00 |
|
|
SandPoot
|
ccbf3dc0dd
|
closet dor
|
2024-04-12 22:57:00 -03:00 |
|
|
BongaTheProto
|
b2e14a5393
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-03-24 17:02:38 -05:00 |
|
|
SandPoot
|
b76127c2d7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-15 19:21:39 -03:00 |
|
|
SandPoot
|
a65f323734
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
|
2024-03-08 19:10:22 -03:00 |
|
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
BongaTheProtoandGitHub
|
5fa6d54bb1
|
Update code/game/objects/structures/crates_lockers/closets/genpop.dm
|
2023-12-04 14:56:42 -05:00 |
|
|
BongaTheProtoandGitHub
|
fce4ddfbea
|
Update code/game/objects/structures/crates_lockers/closets/genpop.dm
|
2023-12-04 14:56:36 -05:00 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
Yawet330
|
2325928610
|
yippee
|
2023-11-29 16:49:36 +00:00 |
|
|
BongaTheProto
|
085bb06e94
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-16 14:32:38 -05:00 |
|
|
SandPoot
|
0b04af4b76
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-14 22:32:47 -03:00 |
|
|
SandPoot
|
3c7e79d384
|
do after update
|
2023-09-09 15:39:49 -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 |
|
|
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 |
|
|
Jerry Wester
|
0adf590336
|
Safeguard suit
|
2023-01-20 20:25:59 -07: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 |
|
|
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 |
|
|
Jerry WesterandGitHub
|
32a5d02434
|
Merge branch 'master' into modsuits
|
2022-12-13 19:18:24 -07:00 |
|
|
Jerry Wester
|
94bfa88ed9
|
add more platings
|
2022-12-13 19:14:43 -07:00 |
|
|
Jerry Wester
|
c2b7f8ae8c
|
add more platings
|
2022-12-13 16:55:12 -07:00 |
|
|
BongaTheProto
|
ee6823c69b
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-13 12:14:11 -05:00 |
|
|
SandPoot
|
f4b7513f10
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-12-13 01:35:33 -03:00 |
|
|
SandPoot
|
8911fe5e0b
|
clear em
|
2022-12-11 17:58:45 -03:00 |
|
|
BongaTheProto
|
9e980f825f
|
Merge remote-tracking branch 'upstream/master'
|
2022-08-01 17:19:36 -05:00 |
|
|
SandPoot
|
105251893d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-08-01 12:45:35 -03:00 |
|
|
siliconsandGitHub
|
eb7b3f706f
|
Update closets.dm
|
2022-07-28 16:17:46 -07:00 |
|
|
BongaTheProtoandGitHub
|
34c6184cd4
|
Merge pull request #378 from WoolyAypa/dumb4cum
|
2022-06-21 08:49:30 -07:00 |
|
|
BongaTheProto
|
0b89d8c778
|
Merge remote-tracking branch 'upstream/master'
|
2022-06-20 01:08:17 -05:00 |
|
|
SandPoot
|
25deceb75f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-06-19 23:02:20 -03:00 |
|
|
WoolyAypa
|
9c94cad910
|
modularization and removed the is_dumb4cum proc
|
2022-06-17 14:03:48 -03:00 |
|
|
WoolyAypa
|
af3df23c49
|
dumb4cum that is
|
2022-06-17 02:46:28 -03:00 |
|
|
|
9f37ed4d35
|
Update code/game/objects/structures/crates_lockers/closets/secure/security.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
|
2022-06-10 19:27:14 -05:00 |
|
|
TrojanCoyote
|
b4aa87431b
|
swap things around
tosses plate carrier into HoS locker, out of loadout options <3
|
2022-06-10 19:17:25 -05:00 |
|
|
BongaTheProto
|
6ada3f7c94
|
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
|
2022-04-18 21:36:14 -05:00 |
|