silicons
|
58e26c540c
|
merge from master
|
2020-07-20 10:18:44 -07:00 |
|
silicons
|
7c5d4f863d
|
click cd breakout
|
2020-07-18 18:10:21 -07:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
Arturlang
|
92ed5d3201
|
Merge branch 'master' into TGUI-3.0
|
2020-07-16 15:59:37 +03:00 |
|
nik707
|
fa8a6dd3e1
|
Merge pull request #12788 from silicons/gasmixture_vv
"""user-friendly""" vv handling for new c++ atmos gas mixtures
|
2020-07-16 01:19:20 -05:00 |
|
timothyteakettle
|
03bd806c73
|
pickle
|
2020-07-16 02:51:07 +01:00 |
|
silicons
|
6fbd7914f5
|
stuff
|
2020-07-15 16:58:44 -07:00 |
|
Artur
|
f5ee74803f
|
Updates minter to tg and the prereqs
|
2020-07-14 18:08:12 +03:00 |
|
Artur
|
d0f1a805e4
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-14 16:15:48 +03:00 |
|
Lin
|
1b3112528c
|
Merge pull request #12746 from silicons/react
chemical reactions now have priority - "the first grenade helped with the revenant and the second blew up the evacuation shuttle"
|
2020-07-13 11:28:52 -05:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
silicons
|
fbbb5f7ea8
|
Merge pull request #12678 from Ghommie/Ghommie-cit831
Updating rust-g dependencies to 0.4.4
|
2020-07-12 08:23:29 -07:00 |
|
silicons
|
72c5c2234e
|
ok
|
2020-07-12 05:15:55 -07:00 |
|
Lin
|
955d9fa0cc
|
Merge pull request #12624 from Citadel-Station-13/policy
policy configuration & support hooks for clone memory disorder
|
2020-07-11 16:40:38 -05:00 |
|
silicons
|
4f4c6b85bf
|
Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
|
2020-07-11 00:14:47 -07:00 |
|
Artur
|
9de8483bcf
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-09 22:14:20 +03:00 |
|
Timothy Teakettle
|
02f46322ad
|
port examine
|
2020-07-09 18:32:45 +01:00 |
|
Putnam
|
9b955e5d03
|
gotta replace all of them actually
|
2020-07-09 03:19:52 -07:00 |
|
Putnam
|
7cf4a55496
|
at least it'll fail better this time
|
2020-07-09 02:18:08 -07:00 |
|
Putnam
|
196261296e
|
probably fixes travis
|
2020-07-09 01:40:39 -07:00 |
|
Putnam
|
aefdf9eef7
|
duplicate REVERSE_DIR
|
2020-07-09 01:38:17 -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 |
|
Artur
|
e12d690d3f
|
hopefulyl fixes cloning!?!?
|
2020-07-08 23:54:00 +03:00 |
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
silicons
|
bd8cc4791f
|
whew
|
2020-07-07 21:02:23 -07:00 |
|
Lin
|
33f56fd168
|
Merge pull request #12694 from Ghommie/Ghommie-cit833
mowing down experimental cloner copypasta.
|
2020-07-07 13:23:25 -05:00 |
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
Ghom
|
e7d19f512e
|
Merge pull request #12397 from Rohesie/cooldown
Ports TGMC timer cooldowns
|
2020-07-06 22:54:58 +02:00 |
|
Ghommie
|
562b57095d
|
mowing down the experimental cloner copypasta.
|
2020-07-05 03:04:53 +02:00 |
|
Lin
|
d04b335d1a
|
Merge pull request #12652 from silicons/cool
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
|
2020-07-04 14:12:43 -05:00 |
|
silicons
|
a738d52740
|
oh god oh FUCK
|
2020-07-03 00:11:09 -07:00 |
|
Ghommie
|
8afcea6026
|
ok
|
2020-07-03 08:55:21 +02:00 |
|
Ghommie
|
cdebccf38f
|
downgrading for now till I port cyberboss linux tgs4 docker hack and the end of BSQL.
Gosh please work, I'm dead tired.
|
2020-07-03 08:41:42 +02:00 |
|
Ghommie
|
e3b470f5d3
|
Alright, I don't want to deal with path shenanigans right now.
|
2020-07-03 08:15:29 +02:00 |
|
Ghommie
|
0c206ed3fa
|
Updating rust-g dependencies to 0.4.5
|
2020-07-03 06:17:14 +02:00 |
|
Ghommie
|
f5ffd7d2a9
|
Easing fine tuning of the system.
|
2020-07-03 03:00:33 +02:00 |
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
silicons
|
cbad654371
|
Merge pull request #12632 from Ghommie/Ghommie-cit823
Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size
|
2020-07-02 01:44:09 -07:00 |
|
silicons
|
e2975a44a1
|
Merge branch 'master' into policy
|
2020-07-02 01:23:19 -07:00 |
|
silicons
|
3b3a3ad44e
|
nayser
|
2020-06-29 23:37:51 -07: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 |
|
silicons
|
26fee48cec
|
Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
|
2020-06-29 14:18:10 -07: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 |
|
Ghommie
|
0779dd560e
|
More and more fixes.
|
2020-06-29 18:52:37 +02:00 |
|
silicons
|
7b101a801c
|
Update configuration.dm
|
2020-06-29 04:55:22 -07:00 |
|
Ghommie
|
5307676317
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
|
2020-06-29 06:55:35 +02:00 |
|
Ghommie
|
2f5d351d70
|
Just ups stamina cost for bashing people.
|
2020-06-28 18:47:55 +02:00 |
|
Ghommie
|
6e90560173
|
Nerfs natural stamina recovery outside of stam-crit.
|
2020-06-28 02:40:16 +02:00 |
|
silicons
|
5c10370326
|
Merge pull request #12601 from Detective-Google/piggyback
piggyback carrying people is no longer comically slow
|
2020-06-27 14:54:44 -07:00 |
|