36ffd3d6a8
More lines.
2019-09-01 03:35:36 +02:00
db3c36fd9a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-09-01 01:59:00 +02:00
85fc947dd7
Allows furranium grown from organic sources.
2019-08-30 20:44:39 +01:00
77eef5de6f
Heat plays a component now.
2019-08-30 20:42:22 +01:00
dca90db321
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-29 23:03:26 -05:00
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
bfd17d66cd
Merge pull request #9074 from Citadel-Station-13/donator_grouping
...
Donator grouping system
2019-08-29 18:31:23 -05:00
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
124d8503dc
Tests and fixes.
2019-08-29 00:12:16 +01:00
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
5d1cac62da
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-08-24 13:50:22 +02:00
1376791e7a
fixes the poly tgs command not working at all
2019-08-22 20:13:56 -04:00
bda3ac8745
blood dna is fixed, your ERP code is too
2019-08-20 07:41:50 -05:00
a0308a2760
Enables Poly phrases on tgs commands
2019-08-18 08:29:28 -05:00
569e33fdbc
Update human.dm
2019-08-17 05:55:47 -05:00
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -05:00
088bc484e3
Forensics re-destroyed, but better this time.
...
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
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
ce62780ba0
Merge pull request #9095 from fludd12/snowflake-b-gone
...
Un-snowflakes My Custom Item
2019-08-16 17:04:45 -07:00
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
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07:00
264cbf8108
reverts the add_blood back to add_blood_DNA
2019-08-15 12:49:10 -05:00
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05:00
017a3111ec
Yeah this is a much, much better way of doing it.
2019-08-15 08:37:10 -05:00
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
7879d1ce13
Merge pull request #9103 from Citadel-Station-13/atmosberet
...
Donator item
2019-08-14 15:44:24 -04:00
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
5a9b2bcad7
Added COORD
2019-08-12 05:10:46 +01:00
ae1191a469
Changes an oversight (and a unintended wah!)
2019-08-12 05:10:05 +01:00
75440a48c5
30 might be too much
2019-08-12 01:36:46 +01:00
10ca106f06
[TO TEST] Adds nuance to hatmium and SDGF explosions.
2019-08-12 01:36:21 +01:00
e30f72067e
Merge branch 'master' into NeuroFix
2019-08-12 00:00:28 +01:00
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
675c042958
Update __donator.dm
2019-08-11 08:38:13 -04:00
5dddb11773
Fixes handcuffs being impossible to actually resist out of
2019-08-11 08:37:00 -04:00
f17aea268c
Donator item
2019-08-11 01:07:20 -05:00
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
df136ab96c
lactation is now a preference
2019-08-10 23:28:16 -04:00
251ac24e02
[NEED TO TEST] {Preview} Fixes Neurotoxin and adjusts it's reaction.
2019-08-11 00:35:36 +01:00
5dc2124df0
Update custom_items.dm
2019-08-09 19:00:21 -04:00
eb9e6a041d
Ghommie's fix.
2019-08-09 12:17:54 +01:00
efe72ce973
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-08-09 06:47:27 +02:00
f76bb27127
Fixes some runtimes and removes a holodeck exploit
...
and a cleanup >.>;
2019-08-08 21:33:42 -05:00
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
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
9d3aa1f3b0
Removing a comment block I missed.
2019-08-08 18:28:47 +01:00
65473dc4ba
s
2019-08-07 13:18:45 -07:00
277971971f
s
2019-08-07 13:07:38 -07:00
99e95dcedf
Guess who forgot message admins
2019-08-07 18:57:38 +01:00
Ghommie