Commit Graph

239 Commits

Author SHA1 Message Date
silicons 2c8d362dd5 Merge pull request #15133 from zeroisthebiggay/patch-21
the timeframely tips update
2021-09-19 11:10:28 -07:00
zeroisthebiggay 86c8129935 Update sillytips.txt 2021-09-19 14:08:32 -04:00
zeroisthebiggay 932b0a5770 Update traumas.json 2021-09-13 08:23:48 -04:00
zeroisthebiggay 49be91467d Update traumas.json 2021-09-13 00:39:36 -04:00
zeroisthebiggay a33093ceb3 Update traumas.json 2021-09-13 00:38:57 -04:00
zeroisthebiggay 8999bc7c34 Update traumas.json 2021-09-13 00:36:46 -04:00
zeroisthebiggay 1616c496f6 Update sillytips.txt 2021-09-13 00:05:33 -04:00
zeroisthebiggay ce6a2c05f0 Update sillytips.txt 2021-09-13 00:03:13 -04:00
zeroisthebiggay c395068006 Update sillytips.txt 2021-09-13 00:01:32 -04:00
zeroisthebiggay 3e2bd8f256 Update tips.txt 2021-09-13 00:00:52 -04:00
zeroisthebiggay 333340fa02 Update sillytips.txt 2021-09-13 00:00:22 -04:00
zeroisthebiggay 5b0af1c5d1 Update tips.txt 2021-09-12 23:47:32 -04:00
zeroisthebiggay 0fd3ca1e3e Update tips.txt 2021-09-04 01:42:12 -04:00
Timothy Teakettle 1303f4b9ae Update tips.txt 2021-06-12 15:34:58 +01:00
LetterN 74c00d17f8 let's be [redacted], its really in t his year 2021-03-31 09:43:15 +08:00
Blue Wildrose 3a37cc6325 Some sensory detail 2021-03-20 06:37:37 -07:00
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
MrJWhit 1811aeaeba Update tips.txt 2021-01-13 18:43:14 -05:00
DeltaFire 9636901707 Merge pull request #13841 from Citadel-Station-13/silicons-patch-34
deletes an unused file
2020-12-22 17:57:13 +01:00
DeltaFire bd50d65218 Merge pull request #13839 from Citadel-Station-13/silicons-patch-32-1
small tip of the round update
2020-12-22 17:44:57 +01:00
silicons c341c2448c Delete admin_nicknames.txt 2020-12-21 21:50:57 -07:00
silicons d5ea33a224 Update sillytips.txt 2020-12-21 21:48:53 -07:00
silicons 9ad59c00c2 Update tips.txt 2020-12-21 21:46:59 -07:00
silicons ea21151462 LF 2020-12-20 18:55:45 -07: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 1f82e8985c Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
2020-10-01 12:15:49 -07:00
The0bserver 7c695409d0 Okay, we went back in time. Maybe this will work? 2020-10-01 06:40:09 -04:00
Tupinambis 905633148b names 2020-09-30 19:06:09 -05:00
MrJWhit 3df117cd22 Update traumas.json
Haha whoops
2020-09-12 02:35:08 -04:00
MrJWhit 9a89fa498b Update traumas.json 2020-09-12 02:32:17 -04:00
lolman360 931e48a994 this is funnier 2020-08-25 10:12:53 +10:00
lolman360 8a499e6ba7 kek 2020-08-25 10:10:53 +10:00
Letter N 8de7717b52 wounds moment 2020-08-19 11:01:38 +08:00
silicons 59f2d1ea75 Merge branch '13142' 2020-08-16 18:47:07 -07:00
zeroisthebiggay af27cc651a Update sillytips.txt
mekhi has been moved
2020-08-14 01:39:25 -04:00
zeroisthebiggay 3840a4ea55 Update tips.txt
mekhi is getting oved
2020-08-14 01:38:10 -04:00
zeroisthebiggay ea5ac4a742 Update tips.txt
no gamer word sorry
2020-08-14 01:27:06 -04:00
zeroisthebiggay 19599b8745 Update tips.txt
holy shit im retarded
2020-08-14 01:23:27 -04:00
zerothebigboy ff73a5f3c0 a 2020-08-14 01:15:06 -04:00
zerothebigboy 3fdafcc8db a 2020-08-14 01:11:53 -04:00
zerothebigboy a4e410256d a 2020-08-14 01:09:36 -04:00
zerothebigboy e65b17dd01 a 2020-08-14 01:07:52 -04:00
zerothebigboy 4e79a553ff a 2020-08-13 23:57:11 -04:00
zerothebigboy a3deabf4af a 2020-08-13 23:48:46 -04:00
zerothebigboy 0e2f561c92 a 2020-08-13 23:35:03 -04:00
zerothebigboy a301c2238b a 2020-08-13 23:24:37 -04:00
ancientpower b917280956 adds a lobby track 2020-08-12 21:43:42 -05:00
silicons 0ff1d152a1 Update traumas.json (#13050) 2020-08-09 15:47:23 +02:00
silicons 70c22d55af Merge pull request #13051 from kappa-sama/patch-38
juice spilled
2020-08-09 05:43:59 -07:00
Putnam 9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00