Commit Graph

138 Commits

Author SHA1 Message Date
evilew 10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
SandPoot dc08550162 push 2024-08-25 04:38:03 -03:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Putnam3145 67f2dad1d7 stop stealing the furniture from my house 2022-09-28 12:41:56 -07:00
silicons 93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00
Putnam3145 d95f5729cc wow i forgot some extremely important updates haha 2022-09-18 16:27:48 -07:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
DeltaFire 6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
silicons 186b552103 merge 2021-10-29 21:50:58 -07:00
Putnam f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
Blue Wildrose 99a1991e0a Messages admins of certain holodeck actions 2021-02-15 19:55:05 -07:00
Putnam d1277ad7b2 Updated auxmos (see desc)
1. All callbacks are now auxmos-side, using new auxcallbacks.
2. Heat processing is now paused for and has been optimized by making it have fewer callbacks.
2020-12-10 12:03:28 -08:00
Putnam 30fb673670 Superconductivity is gone. Only rustmos now. 2020-11-17 02:35:10 -08:00
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