Letter N
9a9e3ffef5
fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category.
2020-08-03 21:14:17 +08:00
Letter N
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
Letter N
5d4bb48628
another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator
2020-07-29 15:10:01 +08:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
silicons
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
silicons
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
Artur
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
Ghom
a41f40503d
More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. ( #12347 )
...
* A more lenient soft stamina crit.
* Yea, your shots are gonna go straight toh.
* accuracy whacks (leaves the bow as is for now).
* Fixing stam penalties calculations, spread the range.
* aaaaaah
* 1.4 seconds delay vs 1.2
* Thanks, linter.
* Missed one.
2020-06-02 15:22:06 -07:00
Artur
3c973816d1
Ports https://github.com/tgstation/tgstation/pull/51125/
2020-05-27 12:48:25 +03:00
Artur
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03: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
Artur
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
Ghommie
f62aaddb1d
Fixing some runtimes with kevinz skills and holodeck hotspots.
2020-05-01 23:22:23 +02:00
Artur
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
kevinz000
ae27bf90e4
Merge pull request #11846 from Putnam3145/vore-optimization
...
Optimizing vore + commenting out simplemob vore (sorry)
2020-04-19 16:45:44 -07:00
Putnam
33039f9962
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization
2020-04-17 18:56:26 -07:00
Ghommie
523672b6a5
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 02:32:10 +02:00
Putnam
1e8fffbf0b
Replaced all the extraneous flags with bitflags
2020-04-13 16:47:43 -07:00
Ghom
609eb190e0
Update area_copy.dm
2020-04-13 03:29:07 +02:00
kevinz000
e962afedfa
Merge pull request #11825 from Ghommie/Ghommie-cit674
...
Little Holodeck refactor.
2020-04-12 17:03:11 -07:00
Ghommie
983f369357
Little Holodeck refactor.
2020-04-12 01:49:25 +02:00
Ghommie
7c1e5aa2c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-09 15:46:19 +02:00
Ghommie
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
kevinz000
6af9c54da5
better
2020-03-16 04:59:55 -07:00
kevinz000
94db06509c
slight desword reflect meme buff
2020-03-16 03:50:26 -07:00
Ghommie
ad4d290ea7
WIP
2020-03-08 19:26:01 +01:00
kevinz000
d376b99af6
Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2
...
Fixing a little issue with the Holodeck's Kobayashi Maru phaser
2020-03-06 00:19:51 -07:00
Ghom
beef891789
Update area_copy.dm
2020-03-03 15:12:54 +01:00
Ghom
490ad4373d
Update area_copy.dm
2020-03-03 15:12:06 +01:00
Ghom
edc53770ea
Update area_copy.dm
2020-03-03 15:05:32 +01:00
kevinz000
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
Seris02
74be93a8cc
hasSiliconAccessInArea vars change
2020-01-21 11:44:49 +08:00
Seris02
a100f9382e
better, there, happy now github
2020-01-20 14:51:53 +08:00
kevinz000
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
Seris02
04b34ec8ed
hijack implant
2020-01-18 18:04:31 +08:00
kevinz000
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07: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
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
kevinz000
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
Ghommie
686a76dd1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-04 13:35:05 +01:00
Lin
f7b91f9b65
Merge pull request #10238 from Ghommie/Ghommie-cit478
...
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Ghommie
8566e2396d
Brings in some mapping code updates.
2019-12-19 00:44:14 +01:00
Ghommie
80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
Ghommie
542c9007ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-06 20:09:35 +01:00
Ghommie
641ddebed1
Ports "Uses defines for turf atmos"
2019-11-17 03:19:35 +01:00
Ghommie
6484eea339
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-15 00:36:50 +01:00
kevinz000
6909857e04
Merge pull request #9632 from Ghommie/Ghommie-cit281
...
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
Ghommie
1e49ce76d3
Dreamchecker compatibility changes, part 1.
2019-11-10 20:48:30 +01:00
Ghommie
a2f9aaf899
Porting "Adjacent Atmos subsystem revival"
2019-10-28 17:04:31 +01:00
Ghommie
2c578ca683
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2019-10-24 18:01:46 +02:00
