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
Satile1
61ef0f337e
Hotel Radio channel! Mapping fixes and flavour
2023-05-25 17:09:21 +01: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 Wester and KrissKr0ss
44c029176c
remove signals_atom_movable.dm, revert jetpack
2023-05-01 00:19:48 -05:00
KrissKr0ss
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
KeplerWasTaken
1e71db0b70
removed distasteful symbols
2023-04-17 22:27:46 +02:00
BongaTheProto
57a7a516e6
Merge remote-tracking branch 'upstream/master'
2023-03-06 22:43:10 -05:00
SandPoot
d63c2ebdd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-03-05 12:35:35 -03:00
silicons and GitHub
6efd3098d4
Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo
...
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
2023-03-04 23:36:36 -08:00
Darius
d48025140b
Merge branch 'master' into overhaul-quirk-dumb4cum
2023-02-23 00:37:04 -05:00
BongaTheProto
2151624f10
Merge remote-tracking branch 'upstream/master'
2023-02-22 19:14:08 -05:00
SandPoot and SandPoot
2bdec078d7
Merge pull request #311 from Sandstorm-Station/duct-piping
...
Several duct pipe fixes/qol
2023-02-21 16:44:35 -03:00
SandPoot
c9055c4d65
minor issue
2023-02-21 16:34:10 -03:00
SandPoot
e0c8419cdd
deal with duct pipes
2023-02-21 16:09:35 -03:00
Darius
86b4f6c6ec
Merge branch 'master' into overhaul-quirk-dumb4cum
2023-02-19 20:23:16 -05: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
SandPoot and GitHub
2bf781580e
Merge branch 'master' into new-decal-painter
2023-02-15 20:06:29 -03:00
Timothy Teakettle and GitHub
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
BongaTheProto
0cfe8e33eb
Merge remote-tracking branch 'upstream/master'
2023-02-12 21:42:34 -05:00
SandPoot
2b8a20bae2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-12 22:59:51 -03:00
Timothy Teakettle and GitHub
5f6e204866
Merge pull request #15940 from squib-bot/fermichemwork
...
Re-Adding Bounty Consoles
2023-02-11 00:06:37 +00:00
SandPoot
78c28a40c7
sneaky hint about reskinning
2023-02-09 02:54:31 -03:00
SandPoot
4491abc2d7
updates to most recent version and puts intent hints!
2023-02-09 02:20:02 -03:00
Darius
bcf5904b6c
Merge branch 'master' into overhaul-quirk-dumb4cum
2023-02-08 21:49:37 -05:00
SandPoot
1b1154260c
correct everything and some intention based checks
2023-02-08 02:17:57 -03:00
SandPoot
b955bc222b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter
2023-02-06 20:24:35 -03:00
BongaTheProto
9e9f9915fa
Merge remote-tracking branch 'upstream/master'
2023-02-03 17:23:22 -05:00
SandPoot
996e472f80
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-03 18:53:29 -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
zerothebigboy
091d9ec00f
good
2023-01-30 00:01:22 -05:00
zerothebigboy
b8bc94ba13
man
2023-01-29 00:49:55 -05:00
SandPoot
44913d5fff
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter
2023-01-28 01:20:26 -03:00
SandPoot
c60f36a42b
files
2023-01-28 01:10:49 -03:00
BongaTheProto
21c3abdfb7
Merge remote-tracking branch 'upstream/master'
2023-01-18 04:20:45 -05:00
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03:00
President of Shit PRS
d063144713
Re-Adding Bounty Consoles
...
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
2023-01-14 02:01:12 +00:00
Timothy Teakettle and GitHub
35d01aa0f4
Merge pull request #15918 from LeDrascol/port-heirloom-update
...
[PORT] Non-global heirloom definitions
2023-01-12 23:39:41 +00:00
BongaTheProto
86a005b590
Merge remote-tracking branch 'upstream/master'
2023-01-11 12:51:40 -05:00
SandPoot
03304ba2c8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-10 22:50:16 -03:00
Timothy Teakettle and GitHub
c8fc27fc9c
Merge pull request #15930 from SandPoot/reskinning
...
Update to reskinning
2023-01-11 01:00:35 +00:00
SandPoot
3b8d102fac
puts pda in the system to remove shitcode
2023-01-10 20:02:12 -03:00
SandPoot
cf51a4dce9
dusting off
2023-01-10 18:32:49 -03:00
BongaTheProto
d6aa3acbd4
Merge remote-tracking branch 'upstream/master'
2023-01-09 17:08:06 -05:00
BongaTheProto
ab9d691f1a
Merge remote-tracking branch 'upstream/master'
2023-01-09 16:59:38 -05:00
Tsurupeta