zeroisthebiggay
|
72cb19eb3f
|
Update space.dm
|
2021-09-24 19:15:32 -04:00 |
|
zeroisthebiggay
|
c633c95919
|
Update space.dm
|
2021-09-24 18:35:49 -04:00 |
|
zerothebigboy
|
c6ce359cda
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# tgstation.dme
|
2021-09-19 15:23:52 -04:00 |
|
Timothy Teakettle
|
1665a45a5e
|
expunged
|
2021-09-17 16:26:22 +01:00 |
|
Timothy Teakettle
|
e2df9fec47
|
indentation
|
2021-09-17 12:26:11 +01:00 |
|
Timothy Teakettle
|
1ab63a69c5
|
Update mild.dm
|
2021-09-17 12:17:53 +01:00 |
|
zerothebigboy
|
68e2eb1d7a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
|
2021-09-10 12:12:57 -04:00 |
|
silicons
|
fd785c6abf
|
Merge pull request #15063 from zeroisthebiggay/intern
ports various tg armor resprites and some such
|
2021-09-10 00:16:54 -07:00 |
|
silicons
|
4836f222d0
|
Merge pull request #15097 from LetterN/generic-housekeeping-pr
Generic syncs
|
2021-09-10 00:16:25 -07:00 |
|
zerothebigboy
|
5a8a069cd6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/mob/clothing/suit_digi.dmi
# icons/obj/clothing/suits.dmi
|
2021-09-09 04:49:30 -04:00 |
|
silicons
|
69bd477a72
|
Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
|
2021-09-08 20:41:00 -07:00 |
|
LetterN
|
aca22e913b
|
reftrack ae
|
2021-09-08 10:26:48 +08:00 |
|
LetterN
|
6739e349a0
|
heretics LOVES this - Also ian's birthday!
|
2021-09-08 09:50:07 +08:00 |
|
LetterN
|
e203abb25c
|
generic controller update
|
2021-09-08 09:10:28 +08:00 |
|
zerothebigboy
|
3c23a09b56
|
bannedforbeingcringeist
|
2021-09-07 21:10:24 -04:00 |
|
Putnam3145
|
ae90ec541b
|
Normalizes planet atmos some
|
2021-09-06 20:00:32 -07:00 |
|
Lin
|
9b888c7b01
|
Merge pull request #15059 from timothyteakettle/language-fixies
fixes losing your additional language upon changing species
|
2021-09-02 16:37:43 -05:00 |
|
zerothebigboy
|
9f4f099880
|
gommit
|
2021-09-02 03:05:23 -04:00 |
|
timothyteakettle
|
f827d33497
|
Update dna.dm
|
2021-09-01 18:19:37 +01:00 |
|
timothyteakettle
|
a33a7ed249
|
fix
|
2021-09-01 17:54:14 +01:00 |
|
Cognition
|
d18e5e7c25
|
fixes waddling ruining character size
|
2021-08-27 21:15:37 -07:00 |
|
silicons
|
d427c43b7b
|
Merge pull request #15032 from keronshb/itemhighlight
Ports Inventory Outlines
|
2021-08-26 21:41:25 -07:00 |
|
silicons
|
13130b3ee6
|
Merge pull request #15015 from keronshb/gremlinport
Gremlin Port
|
2021-08-26 21:40:59 -07:00 |
|
silicons
|
841ff4f81c
|
Merge pull request #15011 from Putnam3145/lavaland-random-atmos
Port of randomized planet atmos
|
2021-08-26 21:39:23 -07:00 |
|
keronshb
|
47078e9a85
|
Ports Hair Gradiants
|
2021-08-26 11:58:09 -04:00 |
|
Lin
|
3f8895e41d
|
Merge pull request #15031 from zeroisthebiggay/patch-16
undoes more Trillby™ Spelling™
|
2021-08-22 13:19:59 -05:00 |
|
keronshb
|
7070a848b6
|
Item Highlight Port
|
2021-08-22 00:21:06 -04:00 |
|
zeroisthebiggay
|
7b7541b77e
|
Update glassware.dm
|
2021-08-21 05:51:02 -04:00 |
|
zeroisthebiggay
|
efc5598263
|
Update code/datums/components/crafting/glassware/lens_crafting.dm
Co-authored-by: MarinaGryphon <jadebishop.2562@gmail.com>
|
2021-08-20 21:55:54 -04:00 |
|
zeroisthebiggay
|
42964392e3
|
Update lens_crafting.dm
|
2021-08-19 23:39:05 -04:00 |
|
zerothebigboy
|
06181f51ae
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# code/modules/ninja/suit/suit.dm
|
2021-08-19 21:55:22 -04:00 |
|
keronshb
|
1b43c5b1ae
|
Merge remote-tracking branch 'upstream/master' into gremlinport
|
2021-08-17 09:03:09 -04:00 |
|
keronshb
|
45aed7a218
|
Gremlins
|
2021-08-15 23:48:24 -04:00 |
|
silicons
|
f4658b49b1
|
Merge pull request #14991 from bunny232/master
Polyvitiligo now actually does something instead of making you a crayon eater.
|
2021-08-15 00:20:35 -07:00 |
|
Putnam3145
|
ff52c241f4
|
Procedural planet atmos
|
2021-08-14 21:13:45 -07:00 |
|
silicons
|
51dbc8e21f
|
Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
|
2021-08-11 02:54:49 -07:00 |
|
bunny232
|
f3363c7b4e
|
Update skin.dm
|
2021-08-08 09:05:47 -04:00 |
|
bunny232
|
50cf7a85f8
|
Merge pull request #2 from Citadel-Station-13/master
a
|
2021-08-08 08:51:58 -04:00 |
|
silicons
|
59e541d2e7
|
Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
|
2021-08-08 04:06:18 -07:00 |
|
bunny232
|
891824182b
|
Merge pull request #1 from Citadel-Station-13/master
a
|
2021-08-04 19:41:56 -04:00 |
|
Artur
|
5acd7fef2d
|
makes salglu not deadly
|
2021-08-02 21:54:47 +03:00 |
|
silicons
|
c5438c73be
|
Merge pull request #14879 from WanderingFox95/WanderingFox95-IcemoonRuinsOnLavaland
[Review/Testmerge] Icemoon Ruins but on Lavaland!
|
2021-07-29 22:39:42 -07:00 |
|
Artur
|
4b2bffdff0
|
Actually makes it work by /obj/screen --> /atom/movable/screen
|
2021-07-29 14:06:18 +03:00 |
|
Artur
|
82ccfc40dc
|
/obj/screen --> /atom/movable/screen
|
2021-07-29 13:57:19 +03:00 |
|
Artur
|
30016f38a8
|
compiles
|
2021-07-28 02:13:57 +03:00 |
|
Artur
|
3100f98b90
|
https://github.com/tgstation/tgstation/pull/57915
|
2021-07-28 02:13:57 +03:00 |
|
Putnam3145
|
f1560cb807
|
fixing a bunch of unit test/runtime issues
|
2021-07-25 18:40:11 -07:00 |
|
Artur
|
2adfbea215
|
Merge remote-tracking branch 'origin/master' into fake_blood
|
2021-07-23 18:50:09 +03:00 |
|
bunny232
|
c7a7346939
|
monophobia nerf
|
2021-07-19 07:36:22 -04:00 |
|
silicons
|
3070f178e0
|
Merge remote-tracking branch 'citadel/master' into combat_patches_1
|
2021-07-18 15:12:52 -07:00 |
|