shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,686 Commits 5 Branches 0 Tags
a34a7ba5d4e2dc8bb20201b5cb8e4bea2f4abc51
Commit Graph

217 Commits

Author SHA1 Message Date
Timothy Teakettle
38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Timothy Teakettle
8ec5672b85 tonne of fixes 2020-06-10 21:14:08 +01:00
Timothy Teakettle
95b8cd3956 first port 2020-06-10 20:33:01 +01: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
MrJWhit
1c7e9b7512 Adds more cogstation paperwork, for future use (#12225) 
* Extra cogstation papers

* Hopefully fixes HTML issues

* Extra quotation mark, maybe that'll get it
 2020-05-16 07:38:42 -07:00
kevinz000
d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655 
Ports "Obliterates item_color: new washing machine functionality edition"
 2020-04-12 16:16:37 -07:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08: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
nik707
09c8bd40ec Merge pull request #11575 from EmeraldSundisk/coggers 
as of yet unfinished, being added in the background for ease of further development
 2020-04-04 13:18:07 -05:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
kevinz000
57429493c6 Merge pull request #11581 from Ghommie/Ghommie-cit637 
M/F body preferences.
 2020-03-23 10:34:02 -07:00
Ghommie
76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Ghommie
7747c84b71 Two runtimes, one fix. 2020-03-21 23:23:31 +01:00
Trilbyspaceclone
581c537fba Update pen.dm (#11533) 2020-03-20 02:38:52 +01:00
EmeraldSundisk
6855d2d9a4 Let's try this again. 2020-03-18 14:29:34 -07:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
kevinz000
56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
kevinz000
3e77952652 Merge pull request #11216 from Putnam3145/rename-logging 
[S] Adds rename logging
 2020-02-24 02:27:27 -07:00
Putnam
f7e0eb43f8 Adds rename logging 2020-02-23 22:53:20 -08:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie
7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00
kevinz000
611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Ghommie
856ef236f3 Further runtime fixes by AnturK. 2020-01-24 23:01:30 +01:00
Ghommie
56d31b0c8c neuter/plural gender fixes. 2020-01-23 22:50:30 +01:00
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07: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
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01: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
e1949b0131 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-23 19:02:20 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie
9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2019-12-10 23:52:31 +00:00
Putnam3145
beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429 
Fixes some means of eyes blindness not working, removes legacy code.
 2019-12-09 12:40:37 -08:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +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
238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00
Linzolle
efbc85cb40 couple fxies 2019-12-01 15:39:55 -06:00
Linzolle
19b004edab update butchering 2019-12-01 14:35:11 -06:00