cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,586 Commits 55 Branches 0 Tags
d89bc85ae72ea90a690c012ca5201ce4ada3d4ee
Commit Graph

1113 Commits

Author SHA1 Message Date
Lin
cef0226b0b Merge pull request #14244 from silicons/botany_logging 
streamlining botany logging, adds english_list_assoc
 2021-02-15 14:22:36 -06:00
silicons
d28411b4a3 Update _lists.dm 2021-02-13 20:31:34 -07:00
silicons
6941f2a183 woops 2021-02-13 20:01:48 -07:00
silicons
4a0adc49f6 mod 2021-02-13 20:00:28 -07:00
silicons
77f4e08727 AAAAAAAAA 2021-02-13 18:57:30 -07:00
timothyteakettle
a9170aae93 Update priority_announce.dm 2021-02-06 17:42:37 +00:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
MrJWhit
c642f77c81 Weeeeeeee 2021-01-22 19:49:04 -05:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons
ecd3e6188d Update unsorted.dm 2021-01-14 19:30:13 -07:00
silicons
faf210ead0 Update unsorted.dm 2021-01-14 18:36:00 -07:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Putnam3145
5cde6e0157 Merge pull request #13871 from silicons/debris 
Merry Christmas - GIVING JANITORS A JOB
 2021-01-08 00:26:52 -08:00
uomo91
6b0435e7b5 Port. 2021-01-01 00:46:47 -06:00
silicons
e91b3b7a81 Merge pull request #13916 from timothyteakettle/better-holoforms 
reverts the removal of the holoform verb because kevin likes it
 2020-12-30 14:45:23 -07:00
Timothy Teakettle
5bc7c5a448 revert 2020-12-30 02:21:30 +00:00
Letter N
f28363ae56 code quality 2020-12-29 11:12:56 +08:00
silicons
0c87c3b0e0 fiX 2020-12-28 12:15:55 -08:00
Letter N
792c9ad752 actualy important because of glidesize 2020-12-23 14:16:29 +08:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
DeltaFire
65c14cf289 Merge pull request #13537 from silicons/permissions 
support update for event manager permissions
 2020-12-22 16:12:03 +01:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
2966f985a3 rustg updates& makes shit work 2020-12-21 21:06:45 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates 
ports colormates from rp/vorestation
 2020-12-20 18:14:48 +00:00
silicons
0fae2d4cc9 Update shell.dm 2020-12-17 19:39:55 -07:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
Timothy Teakettle
866220aefb better cooldown 2020-12-13 02:33:57 +00:00
Timothy Teakettle
85b6248f48 remove the second check 2020-12-13 02:32:09 +00:00
timothyteakettle
76b291c0b5 action 2020-12-13 01:16:25 +00:00
Timothy Teakettle
7dfb097bcc close enough 2020-12-12 23:48:21 +00:00
timothyteakettle
3a017d1173 it works 2020-12-12 01:49:50 +00:00
Timothy Teakettle
99f50addc7 wip 2020-12-11 20:35:37 +00:00
silicons
3f4702a99c done 2020-12-11 05:52:09 -07:00
silicons
90608e8cfd ok 2020-12-11 05:21:27 -07:00
silicons
599a1f0419 fix 2020-12-11 05:06:44 -07:00
silicons
76e7caad33 colormates 2020-12-11 04:54:30 -07:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Putnam3145
6b536c23c7 Merge pull request #13480 from Citadel-Station-13/silicons-patch-7 
[OH GOD TESTMERGE THIS FIRST] another microoptimization to GetAllContents() because microoptimizations are fun
 2020-10-07 15:09:26 -07:00
Putnam3145
ec091f9f99 Merge pull request #13453 from Citadel-Station-13/silicons-patch-5 
microoptimization to get rad contents
 2020-10-07 15:08:32 -07:00
silicons
8e83dcd697 event permissions 2020-10-07 14:43:53 -07:00
Letter N
9819e90b30 all done 2020-10-05 20:08:55 +08:00
Tupinambis
d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis
f1bc1ccafb Merge branch 'master' into spooder 
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
 2020-10-01 17:10:42 -05:00
silicons
cfddef7769 Update unsorted.dm 2020-10-01 14:13:01 -07:00
silicons
6ac175f5b1 Update unsorted.dm 2020-10-01 02:47:44 -07:00
silicons
fd520349db Update radiation.dm 2020-10-01 02:46:04 -07:00