silicons
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
silicons
692656b02d
Whew
2020-07-20 11:53:33 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
Lin
ba3dc6a73b
Merge pull request #12679 from silicons/unarmed_parry
...
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
silicons
93d669d205
Merge pull request #12759 from YakumoChen/hierophant-hugbox
...
set hierophant friendly fire check to on by default
2020-07-17 17:09:17 -07:00
silicons
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
silicons
e03948dcba
Merge pull request #12229 from Arturlang/TGUI-3.0
...
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
Artur
af65b626e3
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-16 15:56:08 +03:00
Letter N
819ca63456
https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing
2020-07-16 20:42:02 +08:00
Letter N
9575c52b13
https://github.com/tgstation/tgstation/pull/52059 - the forgotten part
2020-07-16 20:21:39 +08:00
silicons
6121cbd091
Merge pull request #12738 from timothyteakettle/travelling-traders
...
the travelling trader midround event
2020-07-15 08:50:20 -07:00
Artur
f5ee74803f
Updates minter to tg and the prereqs
2020-07-14 18:08:12 +03:00
Timothy Teakettle
8de062adbb
fix
2020-07-13 19:46:51 +01:00
YakumoChen
072b4b673f
set hierophant friendly fire to on by default
2020-07-13 09:40:58 +00:00
Timothy Teakettle
c1592ad162
more rewards
2020-07-11 23:27:29 +01:00
silicons
6cbab55ef8
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
Artur
280d3de6c3
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-07 18:37:45 +03: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
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
0779dd560e
More and more fixes.
2020-06-29 18:52:37 +02:00
Ghommie
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +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
kevinz000
445d94f335
haha whew
2020-06-17 21:32:10 -07:00
Detective Google
fa5bae14f1
no 100% chance doomsday :^)
2020-06-13 22:14:23 -05: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
Ghom
16dea7ceed
Revamped the paper wizard robes. ( #12348 )
...
* Better paper wizard robes.
* return value.
* ooo
* Aaa
* aaaa
2020-05-27 18:01:22 -07: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
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
Trilbyspaceclone
7337993d8e
Lavaland Gear Tweaks - Armor balancing ( #12270 )
...
* lava land tweaks
* Reverts Exo suit touches
5% isnt worth that much, so might as well give it back
* Update miscellaneous.dm
* Reverts the ERT based gear
2020-05-20 18:47:30 -07:00
Ghom
4c3dac467f
Mining inquisitor/berserker hardsuit nerf, slight drake armor buff. ( #12289 )
...
* Mining inquisitor/berserker hardsuit nerf, slight drake armor buff.
* Pretty unlikely you'll be hit by more than a handful spells in a single round.
* aaaa
* Update miscellaneous.dm
2020-05-18 16:55:40 -07:00
Ghom
9eccef2836
Porting "Personal interaction messages to simple animals" and more. ( #12268 )
...
* Porting "Personal interaction messages to simple animals" and more.
* Travis check.
* doc
* whoopsie.
* )
2020-05-18 04:46:57 -07:00
lolman360
93b26a787e
POCKET SAND ( #12263 )
...
* POCKET
* sAAAAAAAAAAAAAND
* compile
* fix 2
* eeeeeeeeeee
2020-05-17 17:08:21 -07:00
Ghommie
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
jjpark-kb
99425bbd88
Radial Mining Vendor Voucher ( #12246 )
2020-05-14 13:59:40 +02:00
Artur
dabdf16eac
Coonflict fiiixeeess
2020-05-13 12:56:17 +03:00
Artur
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
Ghommie
7fb96ab0cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-05-12 20:06:59 +02:00
kevinz000
992905846d
Merge pull request #12160 from Linzolle/cold-mining
...
Explorer's gear gives full-body cold resistance
2020-05-11 04:08:17 -07:00
kevinz000
1cf2311930
Merge pull request #12164 from Ghommie/Ghommie-cit733
...
Porting "Refactors language holder"
2020-05-10 14:16:42 -07:00
kevinz000
407b1c7447
Merge remote-tracking branch 'citadel/master' into projectiles_2
2020-05-08 23:32:01 -07:00
kevinz000
6d6239a8b4
kay
2020-05-08 22:59:51 -07:00
Ghommie
2858ddd90b
Porting "Refactors language holder"
2020-05-08 22:44:02 +02:00
Linzolle
24da94720b
cold res
2020-05-08 11:51:24 -05:00
