3113074bfb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-08 02:55:32 -05:00
fbaa8d355f
Update dynamic.dm
2019-10-02 02:39:58 -04:00
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
f0afc9c490
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-13 12:59:15 -05:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
dab0829da8
normalizes head roles not rolling the more common antags (wiz is kept)
2019-09-06 04:50:20 -04:00
8fdb1c59d5
Update dynamic_rulesets_roundstart.dm
2019-08-18 21:16:07 -04:00
2ad94dccac
Update dynamic_rulesets_roundstart.dm
2019-08-18 21:11:16 -04:00
d74b46c7f7
some updates thanks to thechosenevilone
2019-08-17 11:10:09 -04:00
d496e16dde
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 19:14:41 -05:00
4ba3d851ed
IT JUST WORKS
2019-08-09 00:46:14 -04:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
9ec56077b6
Merge pull request #8908 from Ghommie/Ghommie-cit142
...
Fixes Zelus flasks a bit.
2019-08-05 00:54:43 -07:00
a105ba4bb6
Merge pull request #8774 from Sishen1542/monkeycult
...
Removes the human check from cap/chap mind on cult conversion.
2019-08-05 00:47:04 -07:00
1893a8f319
correctly copy/pasta's the chaplain stuff
2019-08-01 11:14:50 -05:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
218cbe2dbc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-31 19:09:35 -05:00
8c63ea7b6d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-26 17:36:46 -05:00
712790ba5b
Update objective_items.dm
2019-07-25 04:15:57 -04:00
8c93e48a01
Merge pull request #8896 from Bapldap/patch-1
...
Updates Blood Brother
2019-07-20 11:51:54 -07:00
75a8cbcc39
Makes Zelus flasks a subtype of bottle.
2019-07-16 15:39:30 +02:00
2fec4a51b0
Update traitor_bro.dm
2019-07-15 13:26:21 -05:00
da8b43f054
Merge pull request #8785 from Trilbyspaceclone/Just_Smile!
...
Makes Clowns and HonkMother Chaplins smile!
2019-07-14 14:11:09 -07:00
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
bd3f9bddf7
Updates Blood Brother
...
Restricts jobs such as captain and security at roundstart for bloodbrother.
2019-07-14 13:54:32 -05:00
b153294a24
Merge pull request #8857 from Ghommie/Ghoomie-cit127
...
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
d53d11de6b
Apply suggestions from code review
...
Grammer and such
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-07-10 18:21:03 -04:00
54c28b19af
Zelus indeed
2019-07-10 02:29:42 -04:00
ba7c24a0ec
Refactoring underwear to allow custom color preferences.
2019-07-09 23:25:54 +02:00
05a55bcb30
Update clock_cult.dm
2019-07-02 17:24:46 -04:00
688fabfffc
Honk
2019-06-29 21:03:38 -04:00
ccf64fe9c9
fix per ghoms request
2019-06-28 13:16:52 -04:00
f19a3541a3
cleans up runtimes
2019-06-16 19:30:14 -05:00
762a3e3c02
Ports revised job backend from TG
2019-06-16 18:45:26 -05:00
04a1c7ada4
Energy net and capture objective tweak.
2019-06-13 15:27:54 +02:00
ab565d2483
Merge pull request #8547 from Ghommie/Ghommie-cit29
...
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
3b24e05dd6
Merge pull request #8483 from Ghommie/Ghommie-cit23
...
Ports in combat gloves plus.
2019-06-08 01:07:18 -07:00
7875ca73be
Merge pull request #8444 from dtfe3/patch-1
...
CWC player requirement increase
2019-06-08 01:03:37 -07:00
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
8fbc25ad77
Ports in combat gloves plus.
2019-05-29 16:35:56 +02:00
f56960ff88
Fract said max 35
2019-05-27 00:39:48 +02:00
38a6c1f917
Decreased the increase from 45 to 40
2019-05-27 00:22:50 +02:00
745df721ba
CWC player requirement increase
...
Player requirement increase from 30 to 45
well basically most people dislike CWC in lowpop and it's generally unbalanced during lowpop so let's just not have it happen during lowpop. Easy fix!
2019-05-26 23:20:27 +02:00
0f02562b51
Fixes Xenomorph blood related travis errors
2019-05-09 09:59:34 -05:00
d14943d4b0
well we have footprints now, xenoblood back to blood subtype.
2019-05-07 05:29:45 -05:00
f244d3fdca
system's mostly working
...
need to polish out the get_blood_dna_list runtime
2019-04-16 11:30:36 -05:00
8b75240d89
fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive
2019-04-11 17:07:11 -04:00
03a174d21f
compile fixes except we're memes still
...
why yes, I'm making the bloods all subtypes of each other at this point. I should probably change the way stuff is colored. but, meh. effort.
2019-04-07 08:54:05 -05:00
5e6e651869
eh fuck it revs can stay
2019-03-16 15:50:42 -07:00
Poojawa