Commit Graph

1158 Commits

Author SHA1 Message Date
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
timothyteakettle
69e9a94829 prioritise clients 2021-02-21 00:18:25 +00:00
Letter N
501d33cddd agony 2021-02-19 10:32:24 +08:00
Letter N
7b24456e2d does not exist 2021-02-16 20:33:46 +08:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
Letter N
834e4730b3 not existing 2021-02-09 15:44:49 +08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
Timothy Teakettle
938b924a37 yes 2021-01-28 11:12:27 +00:00
Timothy Teakettle
8569c40ce5 Update adminpm.dm 2021-01-21 22:23:48 +00:00
Timothy Teakettle
401e6a7690 test 2021-01-21 20:17:25 +00:00
silicons
e680d58a03 fixes 2021-01-09 14:56:29 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Artur
9e16df56aa Ding for prayers 2021-01-04 23:23:55 +02:00
Letter N
ce5ab2f3a4 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-28 09:35:58 +08:00
silicons
017db3de90 Update topic.dm 2020-12-26 11:05:18 -07:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
Letter N
47a3afff54 DB stickies 2020-12-23 16:50:48 +08:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
DeltaFire
c37bb9cc2a Merge pull request #13842 from Citadel-Station-13/silicons-patch-35
deletes a tiny segment of dead code
2020-12-22 17:56:13 +01:00
DeltaFire
0b7f7178f9 Merge pull request #13843 from Citadel-Station-13/silicons-patch-36
allows varediting of admin stealthname
2020-12-22 17:55:37 +01:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
DeltaFire
65c14cf289 Merge pull request #13537 from silicons/permissions
support update for event manager permissions
2020-12-22 16:12:03 +01:00
silicons
5715ea97ce Update holder2.dm 2020-12-21 21:52:44 -07:00
silicons
458f0e4491 Update deadsay.dm 2020-12-21 21:51:52 -07:00
Letter N
2966f985a3 rustg updates& makes shit work 2020-12-21 21:06:45 +08:00
silicons
78cf8389ba Update code/modules/admin/sql_message_system.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2020-12-20 10:32:50 -07:00
silicons
e87cc27803 modifications 2020-12-15 07:21:06 -07:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
silicons
5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00
silicons
07d8e72125 fix 2020-12-12 11:19:45 -07:00
silicons
24c09edd03 stuff 2020-12-12 11:12:45 -07:00
silicons
45a7c68da1 wow 2020-12-11 15:05:00 -07:00
Linzolle
3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
silicons
46baf7372d Update permissionedit.dm 2020-11-25 22:47:25 -07:00
uomo91
cfaa988217 Merge master and fix newline conflict. 2020-11-19 17:12:19 -06:00
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
uomo91
6b85ab5c01 Individual logging code. 2020-11-16 01:40:48 -06:00
DeltaFire
3e19557e8f and more fixes. 2020-11-14 19:38:39 +01:00
DeltaFire
152a57be77 and another 2020-11-14 19:31:26 +01:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
DeltaFire
76fe1a77bc Merge remote-tracking branch 'upstream/master' into system-corruption 2020-11-13 01:00:50 +01:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
DeltaFire
f1178a65a0 admin edit thingy
admins can edit both normal toxdamage and corruption
2020-11-01 22:04:28 +01:00
Delams-The-SM
52abbbf247 Fixes matrix color radomisation in /proc/randomize_human (#13599) 2020-10-25 13:07:46 +01:00
silicons
6c7b34748b Update sql_message_system.dm 2020-10-12 12:32:37 -07:00
silicons
30b711aecb Update sql_message_system.dm 2020-10-12 02:38:43 -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