Commit Graph

98 Commits

Author SHA1 Message Date
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
Trilbyspaceclone
dd36688e9a Update watercloset.dm 2020-02-29 03:31:42 -05:00
kevinz000
045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
TrilbySpaceClone
d138878e03 peace is an option
stops unneeded well violence
2020-02-24 12:18:49 -05:00
TrilbySpaceClone
bc94cf25ee it didnt 2020-02-24 11:49:27 -05:00
TrilbySpaceClone
a3917a1bbc huh that worked? 2020-02-24 11:47:06 -05:00
TrilbySpaceClone
525cedf16a this just works 2020-02-24 11:45:47 -05:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
kevinz000
e8ccf4b6d7 fix 2020-02-13 16:25:43 -07:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Ghom
3086b5eb38 boolean 2020-01-04 14:19:15 +01:00
chefferz
46feaf9663 Update watercloset.dm 2020-01-02 01:09:29 -05:00
Ghommie
57cecd2499 work 2019-12-25 06:54:44 +01:00
Ghommie
53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Poojawa
7e27c46c78 Fuck components 2019-10-22 00:33:58 -05:00
Poojawa
d7ab97dffc does some of the television's demands 2019-10-08 04:02:20 -05:00
Poojawa
f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
Poojawa
23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Poojawa
971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
kevinz000
15f1d48311 Update watercloset.dm 2018-08-14 22:01:38 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
kevinz000
9da197469b Fixes interaction AI stuff 2018-04-11 14:10:50 -05:00