shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,716 Commits 5 Branches 0 Tags
a3ae942c1d76d56ee9d38eac90ea4ffcec695b48
Commit Graph
1155 Commits
Author SHA1 Message Date
FermiandFermi a3ae942c1d Okay.. I think this fixes it all. 2019-09-21 11:13:20 +01:00
FermiandFermi 15d36cbaa1 I need to stop leaving .dm files open in dreammaker. 2019-09-21 09:37:54 +01:00
FermiandFermi a08c1229d6 OKAY now I'm done I think. 2019-09-21 09:31:53 +01:00
FermiandFermi 4b44b31aa3 Okay, feature done 2019-09-21 08:24:46 +01:00
ThalpyandGitHub 79011190c1 Merge branch 'master' into tg-Organ-port 2019-09-19 21:26:42 +01:00
FermiandFermi a398f64b66 Okay 2019-09-19 15:33:40 +01:00
FermiandFermi 08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
FermiandFermi 587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
FermiandFermi 107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
FermiandFermi dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. 2019-09-18 23:57:21 +01:00
FermiandFermi c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa 344ccaf20d cleans up some other species related stuff, unmodularizes some code 2019-09-13 22:18:53 -05:00
Poojawa 9376bfb44d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 12:56:57 -05:00
kevinz000andGitHub 63d2273a75 Merge pull request #9220 from Thalpy/Catnip-Furranium 
Allows Furranium grown from organic sources.
 2019-09-13 10:41:07 -07:00
Poojawa 9561819fb7 Fixes Horn coloration issues, allows mammals to choose their meat type 
Because reasons I guess.
 2019-09-13 10:58:04 -05:00
Poojawa 94afbbd560 Adding Horn colors, multiple-select legs, and species squash 
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
 2019-09-11 17:46:17 -05:00
ThalpyandGitHub f50e84a20c Merge branch 'master' into NeuroFix 2019-09-11 16:24:00 +01:00
BlackMajor 0b581a1ded Merge branch 'master' into Doggo-sit 2019-09-10 11:02:57 +12:00
FermiandFermi 033057d380 OOPS 2019-09-08 02:55:40 +01:00
BlackMajor fbc2d3c8fe Ports dogborg sprites from RP to main 
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
 2019-09-06 01:23:53 +12:00
nik707andGitHub dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox 
Adds the Male AI vox voice.
 2019-09-02 18:27:03 -05:00
Fermi 85fc947dd7 Allows furranium grown from organic sources. 2019-08-30 20:44:39 +01:00
nik707andGitHub dfdbb23d99 Merge pull request #9178 from deathride58/polyfix 
fixes the poly tgs command not working at all
 2019-08-29 19:45:11 -05:00
nik707andGitHub bfd17d66cd Merge pull request #9074 from Citadel-Station-13/donator_grouping 
Donator grouping system
 2019-08-29 18:31:23 -05:00
Fermi 124d8503dc Tests and fixes. 2019-08-29 00:12:16 +01:00
Ghommie 24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
deathride58 1376791e7a fixes the poly tgs command not working at all 2019-08-22 20:13:56 -04:00
Poojawa a0308a2760 Enables Poly phrases on tgs commands 2019-08-18 08:29:28 -05:00
kevinz000andGitHub 9071917e72 Merge pull request #9088 from Poojawa/blurry-runtimes 
Fixes some runtimes and removes a holodeck exploit
 2019-08-16 17:05:21 -07:00
kevinz000andGitHub ce62780ba0 Merge pull request #9095 from fludd12/snowflake-b-gone 
Un-snowflakes My Custom Item
 2019-08-16 17:04:45 -07:00
kevinz000andGitHub 97306ff53c Merge pull request #9107 from deathride58/fixesarest 
Fixes handcuffs being impossible to actually resist out of
 2019-08-16 16:57:36 -07:00
kevinz000 fb2971e3e6 Merge remote-tracking branch 'origin/master' into donator_grouping 2019-08-15 14:40:44 -07:00
Poojawa 017a3111ec Yeah this is a much, much better way of doing it. 2019-08-15 08:37:10 -05:00
Poojawa 3de3f511cf Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes 2019-08-15 08:24:55 -05:00
deathride58andGitHub 7879d1ce13 Merge pull request #9103 from Citadel-Station-13/atmosberet 
Donator item
 2019-08-14 15:44:24 -04:00
deathride58andGitHub 2406254faa Merge pull request #9100 from cebutris/got-milk 
Breasts no longer lactate by default, Lactation is now a preference
 2019-08-14 15:40:53 -04:00
Fermi 5a9b2bcad7 Added COORD 2019-08-12 05:10:46 +01:00
Fermi ae1191a469 Changes an oversight (and a unintended wah!) 2019-08-12 05:10:05 +01:00
Fermi e30f72067e Merge branch 'master' into NeuroFix 2019-08-12 00:00:28 +01:00
kevinz000andGitHub 123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151 
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
 2019-08-11 10:12:20 -07:00
deathride58andGitHub 675c042958 Update __donator.dm 2019-08-11 08:38:13 -04:00
deathride58 5dddb11773 Fixes handcuffs being impossible to actually resist out of 2019-08-11 08:37:00 -04:00
Jay f17aea268c Donator item 2019-08-11 01:07:20 -05:00
Cebutris df136ab96c lactation is now a preference 2019-08-10 23:28:16 -04:00
Fermi 251ac24e02 [NEED TO TEST] {Preview} Fixes Neurotoxin and adjusts it's reaction. 2019-08-11 00:35:36 +01:00
Fel 5dc2124df0 Update custom_items.dm 2019-08-09 19:00:21 -04:00
Fermi eb9e6a041d Ghommie's fix. 2019-08-09 12:17:54 +01:00
Poojawa f76bb27127 Fixes some runtimes and removes a holodeck exploit 
and a cleanup >.>;
 2019-08-08 21:33:42 -05:00
Ghommie 12c4fc139d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-08-09 04:00:23 +02:00
Fermi 9d3aa1f3b0 Removing a comment block I missed. 2019-08-08 18:28:47 +01:00