Timothy Teakettle
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
Lin
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
Ghom
f946a157f4
Update mapping.dm
2020-07-27 14:54:46 +02:00
Ghom
7e18e7a7a8
Update mapping.dm
2020-07-27 14:52:05 +02:00
Ghommie
f1c242aadc
Fixing new bugs and stuff.
2020-07-27 14:16:01 +02:00
timothyteakettle
315e7e1f99
bugfixes
2020-07-24 23:49:15 +01:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
silicons
d30acd5b09
smooth
2020-07-23 13:49:17 -07:00
silicons
9222933d77
Merge pull request #12816 from timothyteakettle/wound-port
...
ports part 1 of tg wounds
2020-07-23 10:25:25 -07:00
Putnam
3faa9d6f13
Chat queue optimization.
...
To be exact, makes it only do the expensive text replacement when there's a client to receive the text.
2020-07-20 19:58:44 -07:00
Timothy Teakettle
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
Lin
f7355dde62
Merge pull request #12728 from silicons/vote
...
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
2020-07-20 18:17:45 -05:00
Timothy Teakettle
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
timothyteakettle
584e74590f
port1
2020-07-17 02:01:33 +01:00
silicons
e03948dcba
Merge pull request #12229 from Arturlang/TGUI-3.0
...
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
Letter N
2afab07b4a
https://github.com/tgstation/tgstation/pull/52255
2020-07-16 20:05:37 +08:00
Artur
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
silicons
08a6ef88e3
Merge pull request #12711 from LetterN/nerfs-cats
...
[s] Updates goonchat [ready]
2020-07-11 00:46:32 -07:00
silicons
630d65dfec
done
2020-07-10 00:08:53 -07:00
silicons
214b95445e
status panel
2020-07-09 23:59:51 -07:00
silicons
9c9c611285
ok
2020-07-09 23:34:35 -07:00
Putnam
a625d6562b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-07-08 22:02:03 -07:00
Letter N
45a3c47608
removes fun
2020-07-08 15:10:49 +08:00
Artur
7781296fb9
DNA CONSOLE FIX
2020-07-03 11:09:55 +03:00
Artur
365aadec54
Trying to fix the dna t
2020-07-03 00:55:18 +03:00
Artur
6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
Artur
20245f7319
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
Ghommie
9dc4b99620
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-30 00:49:06 +02:00
Putnam3145
ee2fedd4af
Merge pull request #12390 from Ghommie/Ghommie-cit800
...
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-06-29 12:44:33 -07:00
Ghom
a8046d072a
Merge pull request #12626 from Citadel-Station-13/silicons-patch-10
...
prevents duplicate chatboxes from typing indicators by inserting 28 macros into the basic macro sets that just trigger a nonsensical verb that does nothing
2020-06-29 19:27:07 +02:00
silicons
ced24b8931
Update input.dm
2020-06-27 01:39:34 -07:00
silicons
0e2f3d0f04
Update input.dm
2020-06-27 01:29:26 -07:00
Ghommie
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
Ghommie
ae053a9a08
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
2020-06-23 03:12:49 +02:00
Ghommie
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
Artur
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
Lin
2cd18f3dba
Merge pull request #12557 from silicons/life
...
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
2020-06-21 18:32:58 -05:00
Ghom
e31ce2edcf
Merge pull request #12414 from LetterN/asset-cache-thing
...
asset cache + better minimaps
2020-06-19 23:09:09 +02:00
kevinz000
445d94f335
haha whew
2020-06-17 21:32:10 -07:00
deathride58
1a40fa73fb
fixes an upstream oversight that completely bricks a downstream's atmos
2020-06-17 15:24:17 -04:00
Artur
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
Timothy Teakettle
14c9ab2ff1
ports tgs regal rats ( #12479 )
...
* port regal rats
* fix missing line
* royal rat goes after humans too
* okay dont let them attack people
* let them attack people but at less damage
* remove header
2020-06-09 03:28:00 -07:00
Artur
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
Ghom
0d7d2071ec
Merge pull request #12232 from Trilbyspaceclone/patch-379
...
Makes seed points take into acount more varables so that you can get more points!
2020-06-02 23:50:14 +02:00
Letter N
151df41d1c
asset cache + better minimaps
2020-05-31 16:15:09 +08:00
Artur
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
Ghommie
1bca74465f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 03:29:02 +02:00
Ghommie
e51ac4e745
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-05-29 17:58:35 +02:00
Ghom
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
Lin
ad57647e64
Merge pull request #12173 from kevinz000/projectiles_2
...
Refactors projectile speed to pixels per second
2020-05-24 21:21:41 +00:00
