Timothy Teakettle
|
76fe9c7f4c
|
swap cooldown and cooldown check lines
|
2020-12-13 02:34:52 +00:00 |
|
Timothy Teakettle
|
866220aefb
|
better cooldown
|
2020-12-13 02:33:57 +00:00 |
|
Timothy Teakettle
|
85b6248f48
|
remove the second check
|
2020-12-13 02:32:09 +00:00 |
|
silicons
|
0d63fc9cf4
|
Update shuttles.dm
|
2020-12-12 19:02:56 -07:00 |
|
silicons
|
66403e3a9e
|
Merge pull request #13713 from timothyteakettle/alt-click-gas-mask
all gas masks (but welding + glass) can be alt clicked to show/hide identity
|
2020-12-12 18:53:13 -07:00 |
|
timothyteakettle
|
76b291c0b5
|
action
|
2020-12-13 01:16:25 +00:00 |
|
Timothy Teakettle
|
7dfb097bcc
|
close enough
|
2020-12-12 23:48:21 +00:00 |
|
Lin
|
0d95172bef
|
Merge pull request #13749 from Citadel-Station-13/silicons-patch-7
fixes nonsensical verb
|
2020-12-12 20:00:41 +00:00 |
|
silicons
|
07d8e72125
|
fix
|
2020-12-12 11:19:45 -07:00 |
|
silicons
|
24c09edd03
|
stuff
|
2020-12-12 11:12:45 -07:00 |
|
silicons
|
ab9d26285c
|
Update dna.dm
|
2020-12-12 10:13:17 -07:00 |
|
silicons
|
abf950ee17
|
Update dna.dm
|
2020-12-12 02:49:27 -07:00 |
|
silicons
|
4b20d26d2b
|
Merge remote-tracking branch 'citadel/master' into colormates
|
2020-12-12 01:56:37 -07:00 |
|
silicons
|
c2727ca278
|
Merge pull request #13743 from Linzolle/thunderdome
thunderdome entertainment monitors fix + stuff
|
2020-12-12 01:55:53 -07:00 |
|
silicons
|
fab40166d3
|
Merge pull request #13737 from qwertyquerty/flash
Flash the screen on climax
|
2020-12-12 01:52:17 -07:00 |
|
silicons
|
c00fb31da8
|
Update dna.dm
|
2020-12-12 01:47:23 -07:00 |
|
Putnam3145
|
f0e51d666c
|
Merge pull request #13617 from timothyteakettle/loadout-json
loadout 2: electric boogaloo
|
2020-12-11 18:11:56 -08:00 |
|
timothyteakettle
|
3a017d1173
|
it works
|
2020-12-12 01:49:50 +00:00 |
|
silicons
|
60f9e97ce5
|
test
|
2020-12-11 17:31:27 -07:00 |
|
silicons
|
45a7c68da1
|
wow
|
2020-12-11 15:05:00 -07: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 |
|
Timothy Teakettle
|
99f50addc7
|
wip
|
2020-12-11 20:35:37 +00:00 |
|
Timothy Teakettle
|
45b22b2855
|
final touches
|
2020-12-11 19:41:56 +00: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 |
|
silicons
|
3f4702a99c
|
done
|
2020-12-11 05:52:09 -07:00 |
|
silicons
|
e27c843296
|
fixes
|
2020-12-11 05:35:57 -07:00 |
|
silicons
|
90608e8cfd
|
ok
|
2020-12-11 05:21:27 -07:00 |
|
silicons
|
c70d7a24e0
|
fixes
|
2020-12-11 05:14:38 -07:00 |
|
silicons
|
317f33b4e5
|
fixes
|
2020-12-11 05:14:23 -07:00 |
|
silicons
|
13391d2af6
|
fix
|
2020-12-11 05:09:29 -07:00 |
|
silicons
|
599a1f0419
|
fix
|
2020-12-11 05:06:44 -07:00 |
|
silicons
|
76e7caad33
|
colormates
|
2020-12-11 04:54:30 -07:00 |
|
silicons
|
e252e073a1
|
Update stamina_combat.dm
|
2020-12-11 03:06:29 -07:00 |
|
silicons
|
1153f30b63
|
Update carbon.dm
|
2020-12-11 02:26:52 -07:00 |
|
silicons
|
34f2a94d1b
|
Update combat.dm
|
2020-12-11 02:23:26 -07:00 |
|
silicons
|
3891095a21
|
Update say.dm
|
2020-12-11 01:58:39 -07:00 |
|
timothyteakettle
|
d1003c206a
|
debug
|
2020-12-11 01:57:09 +00: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 |
|
Timothy Teakettle
|
62b5430985
|
yes
|
2020-12-10 21:53:20 +00:00 |
|
silicons
|
8af8063e73
|
Update input.dm
|
2020-12-10 13:39:22 -07: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 |
|
timothyteakettle
|
73542f6688
|
Update new_player.dm
|
2020-12-09 17:49:52 +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 |
|