 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 |
|
|
silicons
|
dafa444240
|
Merge pull request #13041 from Ludox235/more-abductee-shit
No murderbone please
|
2020-08-06 19:35:31 -07:00 |
|
|
kappa-sama
|
905710b0be
|
worth
|
2020-08-06 20:58:11 -04:00 |
|
|
Ludox
|
d4f76917e4
|
No murderbone please
|
2020-08-06 02:52:29 +02:00 |
|
|
timothyteakettle
|
8360bb1a7f
|
section 2
|
2020-07-24 23:44:57 +01:00 |
|
|
Ludox
|
401d7b14b5
|
Get that shit off my screen
Who tought this was a good idea for fuck sake
|
2020-07-21 10:18:39 +02:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
|
Ghom
|
b280c0f550
|
Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
|
2020-06-29 21:13:06 +02:00 |
|
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01:00 |
|
|
Ragolution
|
2739937a44
|
By request and by request only.
|
2020-06-26 15:09:19 -04:00 |
|
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
|
Timothy Teakettle
|
d7bce8aec0
|
ports some events
|
2020-06-15 20:22:40 +01:00 |
|
|
Artur
|
19f215477e
|
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
|
2020-05-30 18:52:02 +03:00 |
|
|
Trilbyspaceclone
|
02f467654e
|
Adds a few more usefull tips (#12266)
* Update tips.txt
* Update tips.txt
|
2020-05-24 13:05:47 -07:00 |
|
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|
|
Trilbyspaceclone
|
fcb2b58664
|
Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112)
* Misstake are now
* Still dosnt all work
* no more range upgrade it just dosnt work
* bithell
* a this
|
2020-05-20 19:03:20 -07:00 |
|
|
Artur
|
5b7d9a9008
|
Merge conflict fix
|
2020-05-13 12:37:18 +03:00 |
|
|
Putnam3145
|
e36bd50ad9
|
Makes G gluid calcs only happen when it's required (#12095)
* Made G fluid calcs only happen on moment it's required.
* whoops
* Update modular_citadel/code/modules/arousal/organs/testicles.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-04 05:08:01 +02:00 |
|