silicons
|
08f251a88c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-27 10:44:51 -07:00 |
|
Artur
|
724b34f55d
|
https://github.com/tgstation/tgstation/pull/54710
|
2021-06-16 00:44:32 +03:00 |
|
silicons
|
66dde6f9ea
|
woo
|
2021-06-14 14:00:02 -07:00 |
|
silicons
|
01e0fa16fe
|
it works.
|
2021-06-14 13:52:48 -07:00 |
|
DrPainis
|
055c191e7e
|
replaces diarrhea with mustard
yes
|
2021-04-09 00:55:08 -04:00 |
|
Blue Wildrose
|
b363cdd5ca
|
fixes puddles, cultism checks, spellchecks
|
2021-04-01 04:29:35 -07:00 |
|
Blue Wildrose
|
3a37cc6325
|
Some sensory detail
|
2021-03-20 06:37:37 -07:00 |
|
Letter N
|
f87aa0ac5b
|
toast. And DiscoFox™️
|
2021-02-08 18:46:05 +08:00 |
|
Timothy Teakettle
|
d0ebd6c2d8
|
green blood
|
2020-11-30 19:22:54 +00:00 |
|
Letter N
|
8d70e21239
|
the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it.
|
2020-08-20 19:40:47 +08:00 |
|
Letter N
|
3b7bca28b3
|
Functional* code
|
2020-08-20 13:50:33 +08:00 |
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
Letter N
|
a19e306137
|
less redtext - updates anomalies
|
2020-08-03 20:53:36 +08:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
silicons
|
484da28600
|
Merge branch 'master' into shoelaces
|
2020-07-16 17:31:41 -07:00 |
|
silicons
|
8d5d194a26
|
hahahahaha
|
2020-07-11 00:30:56 -07: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 |
|
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
|
9a9e76664f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-05-30 22:47:13 +02: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 |
|
Rohesie
|
5ab8d41d9a
|
horns (#12384)
|
2020-05-30 03:25:27 +02:00 |
|
Ghommie
|
a7934f3f88
|
event.
|
2020-05-29 18:58:34 +02: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 |
|
Ghommie
|
a84e7bcecc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-05-24 04:00:51 +02:00 |
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|
Ghom
|
335f5a37b9
|
Plane adjustments on several low layer objects. (#12286)
|
2020-05-17 17:02:57 -07:00 |
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
Artur
|
5b7d9a9008
|
Merge conflict fix
|
2020-05-13 12:37:18 +03:00 |
|
kevinz000
|
6d6239a8b4
|
kay
|
2020-05-08 22:59:51 -07:00 |
|
Ghommie
|
3de0e545c0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-05-05 05:44:55 +02:00 |
|
Ghommie
|
42d7d57ad6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698
|
2020-05-02 19:17:48 +02:00 |
|
Ghommie
|
c38c1755cd
|
Done, tested, too many options.
|
2020-05-02 19:05:41 +02:00 |
|
Ghommie
|
cd642aff73
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-05-01 22:12:00 +02:00 |
|
Ghommie
|
e0a51903a1
|
Not yet implemented design security level requirements.
|
2020-04-24 00:51:04 +02:00 |
|
Artur
|
f97f264fb7
|
Fixing more stuff
Mint machine compile fixes and the syndicate contractor program.
|
2020-04-23 20:09:42 +03:00 |
|
Ghommie
|
e9bf432a0d
|
Scavenging element.
|
2020-04-22 03:30:40 +02:00 |
|
Ghommie
|
586966ea51
|
General refactor for some snowflake bodyparts procs and taurs.
|
2020-04-16 03:37:52 +02:00 |
|
necromanceranne
|
8af29a178c
|
Hooks up the chaplain null rod gloves to the choice of gloves
|
2020-04-04 16:42:37 +11:00 |
|
Ghommie
|
97ad47f3fd
|
Fixing an inconsistency with nuclear bombs exploding on station level space.
|
2020-03-23 22:40:02 +01:00 |
|
Ghommie
|
5d6eb6f24b
|
Patches some awful integrated circuit examiner runtime errors.
|
2020-03-06 14:56:49 +01:00 |
|
Ghommie
|
0d67e81ad5
|
Yo.
|
2020-02-23 13:18:16 +01:00 |
|
Seris02
|
c95bb9f8db
|
FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES hallucination (#10857)
* FUCK SHIT I'M NAKED IS THIS A DREAM OR REAL FUCK FUCK WHERE ARE MY CLOTHES????
* fix
* no more getflaticon dabdabdabdabdabdabdab
* tada
|
2020-02-16 07:31:30 +01:00 |
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
kevinz000
|
884ea59d63
|
fix logic
|
2020-01-12 18:38:22 -08:00 |
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
kevinz000
|
8725ffe916
|
Merge remote-tracking branch 'citadel/master' into nightshift_1
|
2020-01-10 06:12:59 -08:00 |
|