Putnam3145
|
f0e51d666c
|
Merge pull request #13617 from timothyteakettle/loadout-json
loadout 2: electric boogaloo
|
2020-12-11 18:11:56 -08:00 |
|
DeltaFire
|
e1bf6b94f9
|
Merge pull request #13747 from MrJWhit/thicc-fuel-tanks
Porting to the /tg/ sprite changes, and functionality, of large reagent containers
|
2020-12-11 22:38:18 +01:00 |
|
Lin
|
c1fee8e5c4
|
Merge pull request #13739 from timothyteakettle/tongue-and-eyes
custom eyes and tongues now properly carry across cloning
|
2020-12-11 16:59:05 +00:00 |
|
Lin
|
4077537d45
|
Merge pull request #13734 from keronshb/Blobreflect-fix
Reflective Blob fix
|
2020-12-11 16:58:07 +00:00 |
|
MrJWhit
|
d10c9db8b2
|
Update reagent_dispenser.dm
|
2020-12-11 10:31:42 -05:00 |
|
DeltaFire
|
bece5971b8
|
Merge pull request #13745 from Arturlang/soulstone_references
Adds more sanity to construct soul returning
|
2020-12-11 00:42:30 +01:00 |
|
keronshb
|
07b56e1542
|
Adds new line
new line added
|
2020-12-10 15:29:13 -05:00 |
|
MrJWhit
|
477330197c
|
Huh we already had this
|
2020-12-10 01:14:43 -05:00 |
|
silicons
|
a4e6df8f9a
|
Merge pull request #13738 from DeltaFire15/heretic-tweaks
Updates the heretics gamemode with a bunch of changes from /tg/
|
2020-12-09 21:47:46 -07:00 |
|
silicons
|
821c3becc3
|
Merge pull request #13704 from Putnam3145/make-emotes-local
Makes emotes show up in the "local" filter with TGUI
|
2020-12-09 21:47:06 -07:00 |
|
tgstation-server
|
5b74596d72
|
Update TGS DMAPI
|
2020-12-10 00:47:22 +00:00 |
|
Artur
|
ef13b07dd4
|
Forgot this
|
2020-12-09 17:56:28 +02:00 |
|
Artur
|
827920dba7
|
Paranoid ramblings
|
2020-12-09 17:54:44 +02:00 |
|
Timothy Teakettle
|
132a3c9526
|
color non polychromic items
|
2020-12-08 19:29:34 +00:00 |
|
Lin
|
e38543ae48
|
Merge pull request #13736 from DeltaFire15/abductor-surgery-robotstuff
Makes the experimental organ replacement surgery work on robots
|
2020-12-07 23:18:35 +00:00 |
|
timothyteakettle
|
43df7462d5
|
copy from old species
|
2020-12-07 23:03:28 +00:00 |
|
DeltaFire
|
b186ec96ad
|
rune invisible to sillycones.
|
2020-12-07 22:19:30 +01:00 |
|
DeltaFire
|
73d3234882
|
buncha changes
|
2020-12-07 22:15:04 +01:00 |
|
DeltaFire
|
33e4486c53
|
Merge remote-tracking branch 'upstream/master' into heretic-tweaks
|
2020-12-07 21:18:11 +01:00 |
|
timothyteakettle
|
81eaa8a2b9
|
woops
|
2020-12-06 23:51:03 +00:00 |
|
timothyteakettle
|
16b98adb9f
|
no more debug
|
2020-12-06 23:40:00 +00:00 |
|
timothyteakettle
|
a84f1648f4
|
Update preferences_savefile.dm
|
2020-12-06 22:57:57 +00:00 |
|
Timothy Teakettle
|
e413fcb091
|
more fixes
|
2020-12-06 22:14:35 +00:00 |
|
Lin
|
d2949c64db
|
Merge pull request #13728 from Citadel-Station-13/silicons-patch-12
adds 8 save slots
|
2020-12-06 22:10:48 +00:00 |
|
Timothy Teakettle
|
53a434cfb1
|
suggested change
|
2020-12-06 20:07:50 +00:00 |
|
timothyteakettle
|
61cc33d995
|
Merge remote-tracking branch 'upstream/master' into loadout-json
|
2020-12-06 17:26:04 +00:00 |
|
timothyteakettle
|
0f540884eb
|
Merge branch 'master' into loadout-json
|
2020-12-06 17:24:24 +00:00 |
|
timothyteakettle
|
5566c00a69
|
fixes
|
2020-12-06 17:24:12 +00:00 |
|
DeltaFire
|
dd4f60a24b
|
*snap
|
2020-12-06 17:37:46 +01:00 |
|
timothyteakettle
|
a478da678e
|
bugfixes
|
2020-12-06 15:50:33 +00:00 |
|
Lin
|
3b6553899b
|
Merge pull request #13711 from DeltaFire15/medbot-synthetic-ignore
Medibots now only treat those they can actually treat
|
2020-12-06 06:36:28 +00:00 |
|
Lin
|
cbcf60ff76
|
Merge pull request #13733 from DeltaFire15/tail-entwine-fix
Tailcoilies fix
|
2020-12-06 06:12:57 +00:00 |
|
DeltaFire
|
663fff03c6
|
Merge pull request #13720 from timothyteakettle/podpeople-green-blood
podpeople have green blood but done correctly
|
2020-12-06 03:43:19 +01:00 |
|
keronshb
|
7b3a5198dc
|
Fixes blob reflection
|
2020-12-05 20:18:07 -05:00 |
|
timothyteakettle
|
cbbcc0c386
|
fix the migration
|
2020-12-06 00:16:56 +00:00 |
|
DeltaFire
|
0c4e9ca1c5
|
better phrasing
|
2020-12-05 02:56:03 +01:00 |
|
DeltaFire
|
f0c1890a65
|
fix
|
2020-12-05 02:48:33 +01:00 |
|
Lin
|
c2954d1d6f
|
Merge pull request #13727 from Citadel-Station-13/silicons-patch-11
no more typing indicators while dead
|
2020-12-04 22:52:04 +00:00 |
|
silicons
|
750f81920b
|
Merge pull request #13717 from TheObserver-sys/shuttlefix
Mining and Monastery Shuttle Fixes
|
2020-12-03 16:34:00 -07:00 |
|
silicons
|
b721cf3128
|
Update preferences.dm
|
2020-12-03 05:41:56 -07:00 |
|
silicons
|
31cf8842e4
|
Update death.dm
|
2020-12-02 23:45:18 -07:00 |
|
silicons
|
d43086572d
|
Update carbon.dm
|
2020-12-02 23:44:35 -07:00 |
|
silicons
|
c891a456e8
|
Update typing_indicator.dm
|
2020-12-02 23:43:00 -07:00 |
|
Putnam
|
809e270290
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into make-emotes-local
|
2020-12-02 08:16:22 -08:00 |
|
MrJWhit
|
19420a6274
|
moar crimmas
|
2020-12-01 04:08:39 -05:00 |
|
Timothy Teakettle
|
d0ebd6c2d8
|
green blood
|
2020-11-30 19:22:54 +00:00 |
|
DeltaFire
|
da3c28675a
|
Merge pull request #13714 from Citadel-Station-13/silicons-patch-10
fixes admin rank copy not transferring over exclude/can_edit_rights
|
2020-11-29 18:18:45 +01:00 |
|
DeltaFire
|
6bdb54117b
|
Merge pull request #13687 from Citadel-Station-13/silicons-patch-6
https://github.com/tgstation/tgstation/pull/54991 - tail intertwining
|
2020-11-29 18:13:12 +01:00 |
|
silicons
|
6bd13c9054
|
Merge pull request #13695 from shellspeed1/Better-Ling-change
Better version of ling change
|
2020-11-28 09:13:12 -07:00 |
|
silicons
|
0f9734b1f7
|
Merge pull request #13698 from timothyteakettle/communication-hotkeys
ports rebindable communication hotkeys from tg
|
2020-11-28 09:12:40 -07:00 |
|