BongaTheProto
7146a5f2eb
Merge remote-tracking branch 'upstream/master'
2023-01-30 17:02:01 -05:00
SandPoot
8ae64b1bd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-29 19:16:50 -03:00
SandPoot
54641ce201
send
2023-01-23 20:44:28 -03:00
BongaTheProto
7b25cd111a
teh... donut...
...
complaints incoming
2022-10-03 22:58:32 -05:00
BongaTheProto
03f4c65fc4
Merge remote-tracking branch 'upstream/master'
2022-06-11 23:25:29 -05:00
SandPoot
07a4c5c12b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-11 04:54:12 -03:00
deathride58
f30c9406cc
randomization!
2022-06-09 15:29:48 -04:00
deathride58
2a720ce054
vocal barks - Fully customizable noises for talking!
2022-06-09 03:59:17 -04:00
SandPoot
282941ca5b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-31 00:21:11 -03:00
BlueWildrose
3687361ba5
Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) ( #15304 )
...
* Butts
* testicle fix + hidden is back
* updated booba
* prob bad idea actually thinking about icon states
* fuck
* this should be everything now
* SandPoot's suggestion
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* tguify that last option
* Revert "tguify that last option"
This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.
* Revert "Merge branch 'master' into cursingcitadel"
This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.
* Revert "Revert "Merge branch 'master' into cursingcitadel""
This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-03-30 20:06:00 -07:00
BongaTheProto
9ce527e068
Merge remote-tracking branch 'upstream/master'
2022-01-26 00:20:29 -05:00
SandPoot
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
BongaTheProto
69eec04a7d
It works as it is right now
...
yes
2021-12-11 02:08:53 -05:00
LetterN
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
Mosley
b40fa7f47e
Merge branch 'Sandstorm-Station:master' into master
2021-11-05 14:20:36 -05:00
SandPoot
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
Mosley1f
59b5447a29
Merge branch 'pr/3'
2021-11-04 20:43:45 -05:00
silicons
a32eabb7ae
fix
2021-10-29 22:44:01 -07:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
SandPoot
e3c17dc05e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-09 01:57:47 -03:00
keronshb
47078e9a85
Ports Hair Gradiants
2021-08-26 11:58:09 -04:00
SandPoot
03bdaad203
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-05-19 15:55:34 -03:00
Timothy Teakettle
ba71bb944a
im not crazy but this commit breaks 90% of the game
2021-05-05 18:11:05 +01:00
SandPoot
13e0116894
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-04-29 11:09:28 -03:00
SandPoot
e6c23728eb
upload files
2021-04-23 12:56:11 -03:00
SandPoot
4c73583f75
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-10-11 21:30:33 -03:00
Tupinambis
d2860b38c7
normalization
2020-10-01 18:46:31 -05:00
Tupinambis
113b84ab50
Ports arachnids from WaspStation
2020-09-30 15:10:17 -05:00
SandPoot
13834c4bef
Morrowinventory Port ( #75 )
2020-09-24 20:14:53 -03:00
Timothy Teakettle
f5300750b5
Revert "[TESTMERGE ONLY] FUCK"
2020-08-17 03:18:36 +01:00
silicons
4cd731ce11
Revert "cease your shitcode: cum edition"
2020-08-16 19:06:57 -07:00
timothyteakettle
1f240b883f
holy shit
2020-08-11 03:37:04 +01:00
Artur
7781296fb9
DNA CONSOLE FIX
2020-07-03 11:09:55 +03:00
kevinz000
b57e1c1e93
Rebindable Hotkeys ( #12138 )
...
* demodularize interface
* keybindings
* binds
* prefs
* loose ends
* globals
* changes
* s
* datum ref lists
* ok
* fixes
* fixes
* fix
* ok
* sigh
* sigh
* indicators
* let's play the move code around game
* let's play the i didn't comma my lists game
* let's play the indent game
* let's play hte spelling bee
* let's fail the spelling bee
* LET'S PLAY THe HOW HARd IS IT TO SPELL A PROC GAME
* let's play the bugfix game
* bugfixes
* improvements
* Update bindings_client.dm
* pixel shift
* A
* wups
2020-05-20 23:40:20 +02:00
Ghommie
202b517fa0
Fixing more issues.
2020-05-02 02:05:56 +02:00
Ghommie
523672b6a5
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 02:32:10 +02:00
Ghommie
983f369357
Little Holodeck refactor.
2020-04-12 01:49:25 +02:00
Ghommie
c9f02d97a1
Privates Visibility Preferences. Also Undergarments having a purpose.
2020-03-25 02:47:16 +01:00
Ghommie
6d4433dd77
Size preferences made configurable.
2020-03-22 01:07:51 +01:00
Ghom
485241a361
cleanup detail
2020-02-23 13:32:46 +01:00
Ghommie
2b740f9bad
[s] Fixing an issue with slot machines crashing the server.
2020-02-23 13:09:21 +01:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
Ghommie
f6adce72fb
Something about missing private sprites and their bad code.
2020-02-09 06:51:57 +01:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Ghommie
9f6d595ad5
Ouch
2019-11-22 05:08:58 +01:00
Ghommie
ee73806616
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit352
2019-11-21 09:18:14 +01:00
Ghommie
b48ddb99fc
Uplink items are now automatically sorted alphabetically. Fixed categories.
2019-11-14 02:56:26 +01:00
Ghommie
475303bd02
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-10-17 00:50:30 +02:00
r4d6
618f8f30c5
Update code/__HELPERS/global_lists.dm
...
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-10-10 21:09:09 -04:00
