Commit Graph

173 Commits

Author SHA1 Message Date
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
nik707
dd62a9ca87 Merge pull request #10084 from Hatterhat/i-dont-test-my-code
i dont make good code
2019-12-19 14:10:18 -06:00
Putnam3145
cfe35ce2fd Merge pull request #10167 from Ghommie/Ghommie-cit458
Fixing some not safe for work oddity.
2019-12-17 11:52:41 -08:00
Ghommie
221291f525 Fixing some not safe for work oddity. 2019-12-13 08:02:39 +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
Hatterhat
d1bfe3d840 i hate 2019-12-06 21:43:15 -06:00
Ghommie
238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
kevinz000
6b53845f06 Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
2019-11-26 16:01:48 -07:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Fermi
614a462176 Revert "Revert "Merge remote-tracking branch 'upstream/master'""
This reverts commit 1509d9d183.
2019-11-24 03:33:02 +00:00
Fermi
ba4fa1ef67 Revert "PLASE"
This reverts commit 8af225e6e3.
2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0 Revert "Revert "PLASE""
This reverts commit 00601a0c87.
2019-11-24 03:04:52 +00:00
Fermi
1df097b8ed Revert "Revert "hark""
This reverts commit f4b54f15d2.
2019-11-24 03:04:31 +00:00
Fermi
f03b90f2e2 Revert "Revert "I can't spell""
This reverts commit 3d713b6c96.
2019-11-24 03:04:30 +00:00
Fermi
994c01c8ec Revert "Revert "Trust your insincts""
This reverts commit 82c3e3cd9d.
2019-11-24 03:04:23 +00:00
Fermi
1509d9d183 Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
2019-11-24 03:04:13 +00:00
Fermi
c8b206a4cf Revert "pls"
This reverts commit 8c97511871.
2019-11-24 03:04:04 +00:00
Fermi
4c1c257035 Revert "Revert "pls""
This reverts commit b23f2a4460.
2019-11-24 03:02:21 +00:00
Fermi
9eaed4ea8e Revert "pls2"
This reverts commit 0eb635b908.
2019-11-24 03:02:04 +00:00
Fermi
0eb635b908 pls2
ugh
2019-11-24 02:52:17 +00:00
Fermi
b23f2a4460 Revert "pls"
This reverts commit 8c97511871.
2019-11-24 02:49:20 +00:00
Fermi
8c97511871 pls
ugh
2019-11-24 02:47:52 +00:00
Fermi
135608551f Merge remote-tracking branch 'upstream/master' 2019-11-24 02:45:28 +00:00
Fermi
82c3e3cd9d Revert "Trust your insincts"
This reverts commit 7a605b4ba6.
2019-11-24 02:44:52 +00:00
Fermi
3d713b6c96 Revert "I can't spell"
This reverts commit 0fed6d49e4.
2019-11-24 02:44:28 +00:00
Fermi
f4b54f15d2 Revert "hark"
This reverts commit 89bcb00ef1.
2019-11-24 02:44:19 +00:00
Fermi
00601a0c87 Revert "PLASE"
This reverts commit 8af225e6e3.
2019-11-24 02:44:00 +00:00
Fermi
8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
Fermi
89bcb00ef1 hark 2019-11-23 00:54:40 +00:00
Fermi
0fed6d49e4 I can't spell 2019-11-23 00:32:33 +00:00
Fermi
7a605b4ba6 Trust your insincts 2019-11-23 00:16:34 +00:00
Fermi
b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie
358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
ce0ba51b61 Fixing schlongs and death. 2019-10-25 12:52:32 +02:00
Ghommie
6bd0b85e54 I'd rather add a redundant get_held_index_of_item(I) than allow it to render privates over and over again. 2019-10-03 19:32:11 +02:00
Ghommie
59e6ed7014 inventory.dm is a mess too. 2019-10-03 19:09:47 +02:00
Ghommie
a65b4d0b1c hopefully a performance improvement to stop genitalia from having to update everytime. 2019-10-03 19:08:11 +02:00
Ghommie
7c77f2d2e3 testing... 2019-10-03 08:57:35 +02:00
Ghommie
6dbac16c74 Sanitizing the fermis code biohazard. 2019-10-03 04:31:11 +02:00
Fermi
018ebc32ae All that remains is MK testing. 2019-09-08 02:46:43 +01:00
Fermi
d90b4769f1 MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes. 2019-09-05 22:30:53 +01:00
Fermi
7890ad08d5 what is this 2019-09-03 20:30:21 +01:00
Ghommie
e66b95b9c9 More lines of code rewriting fermis' mess. 2019-09-01 05:58:57 +02:00
Ghommie
36ffd3d6a8 More lines. 2019-09-01 03:35:36 +02:00
Ghommie
2a7b802957 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-08-29 21:01:23 +02:00