 Fermi
|
f7655cad25
|
All compiling errors fixed, except for a few weird ones that I need help
|
2019-05-11 15:40:06 +01:00 |
|
|
Thalpy
|
926bd65392
|
Merge branch 'master' into FermiChem
|
2019-05-11 14:14:20 +01:00 |
|
|
BurgerLua
|
4aba11739b
|
Finishing touches.
|
2019-05-10 19:15:42 -07:00 |
|
|
BurgerLua
|
d97bf47b95
|
Added
|
2019-05-10 18:12:36 -07:00 |
|
|
Fermi
|
29d4a2fdde
|
Finished MCchem, now to fix compling errors.
|
2019-05-11 00:14:04 +01:00 |
|
|
Trilbyspaceclone
|
4c0caa3aae
|
Update toolbox.dm
|
2019-05-10 14:51:49 -04:00 |
|
|
Poojawa
|
fcdc748bf1
|
u h g. I hate this
|
2019-05-10 07:07:09 -05:00 |
|
|
Fermi
|
cb0e50be0a
|
Missed / in last pr
|
2019-05-10 03:12:28 +01:00 |
|
|
Fermi
|
ac8b7be45c
|
Merges old penis enlargement pills into prexisiting Fermichem ones. (master (#8319) by BurgerLUA)
|
2019-05-10 03:10:42 +01:00 |
|
|
Sishen
|
c3df1b354e
|
Satchel of holding
fashion creep
|
2019-05-09 20:44:07 -04:00 |
|
|
Poojawa
|
88831da8f4
|
it's the one part that I keep saying I just need to get around to
|
2019-05-09 14:43:05 -05:00 |
|
|
Poojawa
|
8af9c6fad9
|
duplicate definitions? really? wtf
|
2019-05-09 10:32:14 -05:00 |
|
|
Poojawa
|
3f6cd92d54
|
Ok this time all of them are nitpicked
|
2019-05-09 10:15:51 -05:00 |
|
|
Poojawa
|
0f02562b51
|
Fixes Xenomorph blood related travis errors
|
2019-05-09 09:59:34 -05:00 |
|
|
Poojawa
|
7b6a65ce3b
|
okay we're starting to pass our blood type to bloodmeme now
STILL JUST FUCKING FOOTSTEPS LEFT THO GOD FUCKING DAMNIT
|
2019-05-09 08:17:18 -05:00 |
|
|
dtfe3
|
0e0dff14b9
|
Increased music maxlines from 300 to 600
Allows players to play longer and more advanced songs on the instruments.
|
2019-05-09 14:10:43 +02:00 |
|
|
Poojawa
|
5ad532f723
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-05-09 03:08:54 -05:00 |
|
|
Poojawa
|
5a67114d33
|
get blood id is my foe now.
|
2019-05-08 04:53:51 -05:00 |
|
|
kevinz000
|
a7192734dd
|
Merge pull request #8323 from Trilbyspaceclone/inducer
Makes a new COMBAT inducer! - Admin only
|
2019-05-08 01:34:33 -07:00 |
|
|
Poojawa
|
69eca2ae4b
|
progress, just need to fiddle with footprints again
|
2019-05-07 13:23:49 -05:00 |
|
|
Poojawa
|
d14943d4b0
|
well we have footprints now, xenoblood back to blood subtype.
|
2019-05-07 05:29:45 -05:00 |
|
|
deathride58
|
a3317ffe89
|
Merge pull request #8280 from Citadel-Station-13/kevinz000-patch-43
ASIMOV: human being --> "person of a NT approved crew species"
|
2019-05-07 02:19:28 -04:00 |
|
|
deathride58
|
8abd98cec7
|
Merge pull request #8162 from Trilbyspaceclone/patch-87
[Ready] Makes Cursed Katana's be Cursed once more
|
2019-05-06 19:24:38 -04:00 |
|
|
Trilbyspaceclone
|
fda9883bae
|
Update inducer.dm
|
2019-05-06 14:48:16 -04:00 |
|
|
Poojawa
|
996662ebea
|
adjust and reset things
|
2019-05-06 04:35:09 -05:00 |
|
|
Poojawa
|
105b40a4f8
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-05-06 02:53:42 -05:00 |
|
|
Trilbyspaceclone
|
7d310f407b
|
Update inducer.dm
|
2019-05-05 06:50:22 -04:00 |
|
|
Trilbyspaceclone
|
642cad2bb2
|
Update inducer.dm
|
2019-05-05 06:40:07 -04:00 |
|
|
Ghommie
|
f13e48b014
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-05-04 19:39:41 +02:00 |
|
|
BurgerLua
|
1557c33008
|
Adds Penis Enlargement Pills
|
2019-05-02 14:55:04 -07:00 |
|
|
Useroth
|
5d8cf0cabe
|
Let's give adrenals the one more small touch of love.
|
2019-04-28 16:13:07 +02:00 |
|
|
Useroth
|
8ab82e0853
|
Fixed two leftovers from a feature that I will do in another PR.
|
2019-04-28 06:23:36 +02:00 |
|
|
Useroth
|
56b2e7150c
|
Back to the point of entry.
|
2019-04-28 06:21:03 +02:00 |
|
|
Useroth
|
41a8177f34
|
Adjustments v2.
|
2019-04-27 13:53:04 +02:00 |
|
|
Useroth
|
c1ffffa4f1
|
Adjustments.
|
2019-04-27 13:50:23 +02:00 |
|
|
Useroth
|
9c17845e0f
|
Buffed changeling adrenals too.
|
2019-04-26 21:34:50 +02:00 |
|
|
Useroth
|
3563fef4c0
|
Makes adrenals work pretty much like they used to pre combat rework.
|
2019-04-26 16:47:31 +02:00 |
|
|
kevinz000
|
5c54bacddb
|
Update AI_modules.dm
|
2019-04-23 16:02:47 -07:00 |
|
|
kevinz000
|
776b0fad4b
|
Update AI_modules.dm
|
2019-04-23 15:59:29 -07:00 |
|
|
kevinz000
|
64202b1444
|
Merge pull request #8247 from Poojawa/custom-race
Custom Species names
|
2019-04-22 21:41:31 -07:00 |
|
|
kevinz000
|
b5df78419a
|
Update holy_weapons.dm
|
2019-04-20 19:28:58 -07:00 |
|
|
Poojawa
|
6698d9646b
|
go away Travis
|
2019-04-17 06:32:42 -05:00 |
|
|
Poojawa
|
c65e551c07
|
makes travis shutup
|
2019-04-17 06:01:59 -05:00 |
|
|
Poojawa
|
a0b7c15e0d
|
whatever Travis, it isn't even enabled, fuck off
|
2019-04-17 04:52:39 -05:00 |
|
|
Poojawa
|
fe6407d00c
|
I need to do something else for a bit pending reviews
|
2019-04-17 04:33:56 -05:00 |
|
|
Poojawa
|
73098574b7
|
what to do when footprints are being a bitch.
why, we get rid of them :honk:
|
2019-04-17 01:18:21 -05:00 |
|
|
Trilbyspaceclone
|
ed608ac32c
|
Bhijn...
|
2019-04-16 20:26:24 -04:00 |
|
|
Trilbyspaceclone
|
df880c6723
|
Update PDA.dm
|
2019-04-16 16:07:52 -04:00 |
|
|
Trilbyspaceclone
|
1b970e7ce0
|
Update PDA.dm
|
2019-04-16 15:08:45 -04:00 |
|
|
Trilbyspaceclone
|
2b57db57ab
|
Update PDA.dm
|
2019-04-16 15:07:51 -04:00 |
|