129 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
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
SandPoot
3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SpiWat
386a7480a7 Tweenty -> Twenty
Spelling.
2022-01-31 19:12:00 -05:00
LetterN
1fc778f70a soundloop fix. also it gets deleted (woo) 2021-10-30 13:16:31 +08:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
necromanceranne
6ebc911937 Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge. 2021-03-16 04:48:55 +11:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N
834e4730b3 not existing 2021-02-09 15:44:49 +08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
Putnam
29213bbcbe ok i guess it has to be initialize 2020-10-02 17:39:53 -07:00
Putnam
3b21c31872 Makes water closet loot work and not cause bad GC bugs. 2020-10-02 16:56:21 -07:00
silicons
526d257410 fix 2020-07-20 11:48:08 -07:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons
55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
silicons
26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
2020-06-29 14:18:10 -07:00
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
2020-06-29 21:13:06 +02:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghom
77a6511cc7 Fixing two issues. (#12481) 2020-06-09 03:26:19 -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
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
2020-05-24 13:05:15 -07:00
Ghom
863ecf6627 Update watercloset.dm 2020-04-12 07:17:50 +02:00
Ghom
501b4f0e3e Update watercloset.dm 2020-04-12 06:42:08 +02:00
TrilbySpaceClone
05582f567f ? 2020-04-07 09:11:20 -04:00
TrilbySpaceClone
3907a3739c Merge branch 'found_and_hidden' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into found_and_hidden 2020-04-07 07:35:31 -04:00
Trilbyspaceclone
def93f14fb Update watercloset.dm 2020-04-07 03:40:00 -04:00
Trilbyspaceclone
a6e07e5427 Merge branch 'master' into found_and_hidden 2020-04-07 03:37:09 -04:00
TrilbySpaceClone
15d9c9f0ae Revert "Revert "effort""
This reverts commit c3aaf27aa2.
2020-04-04 11:01:21 -04:00
Trilbyspaceclone
32b98cce44 rip funny commit
//We care about you Skyrats!
2020-04-04 10:38:11 -04:00
TrilbySpaceClone
c3aaf27aa2 Revert "effort"
This reverts commit 10ca01cc95.
2020-04-04 10:23:14 -04:00
TrilbySpaceClone
62509ab4a9 the mapping side 2020-04-04 10:16:43 -04:00
TrilbySpaceClone
10ca01cc95 effort 2020-04-04 09:30:24 -04:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
Ghom
f24c7fb142 Merge pull request #11222 from Trilbyspaceclone/ashwalkers
Ashwalkers now can make a well, got their livestock back and more!
2020-03-06 13:48:03 +01:00
Ghom
859cde2065 Update watercloset.dm 2020-03-06 05:43:31 +01:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
KathrinBailey
97733e464d ghommie change and armrest bug fix 2020-03-04 01:35:00 +00:00
KathrinBailey
d817442f02 It works!
Everything works now.
2020-03-01 13:42:14 +00:00