Poojawa
|
971ddef989
|
reverts forensics components. If I can't figure it out, MURDER IT
|
2019-05-22 04:10:29 -05:00 |
|
Poojawa
|
f6f4c946e6
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-05-22 00:08:13 -05:00 |
|
deathride58
|
d40d9791c4
|
Merge pull request #8271 from Citadel-Station-13/kevinz000-patch-41
the chaplain can now choose a weakened Eutactic energy sword as a holy weapon
|
2019-05-21 08:06:21 -04:00 |
|
kevinz000
|
55dca0bd41
|
Merge pull request #8139 from Trilbyspaceclone/patch-82
Makes mind shields bomb proof
|
2019-05-21 00:00:28 -07:00 |
|
kevinz000
|
b2c873edc0
|
Merge pull request #8371 from Useroth/desword
A weight tweak to d-esword and baseball bat, to make them catch up with the stamina rework.
|
2019-05-20 23:56:10 -07:00 |
|
kevinz000
|
dc548c06b5
|
Merge pull request #8293 from Useroth/ninja-adrenals
Adrenal implant, as well as ling and ninja adrenals buff (or rather, making them function like pre-rework (or even slightly better))
|
2019-05-20 23:40:52 -07:00 |
|
kevinz000
|
3ae9661866
|
Merge pull request #8390 from CalamaBanana/station-charter-apostrophes
Captain's Charter no longer turns apostrophes into "'", too
|
2019-05-20 23:32:50 -07:00 |
|
kevinz000
|
d8579b2e2d
|
Merge pull request #8372 from Poojawa/paws-of-life-needs-more-fixing
Unfucks borg defibs
|
2019-05-19 12:47:03 -07:00 |
|
CalamaBanana
|
de841761b2
|
Charter apostrophes fixed, too
|
2019-05-18 16:19:25 +02:00 |
|
Poojawa
|
eb717645bd
|
M.emote("scream")
|
2019-05-17 05:16:53 -05:00 |
|
Poojawa
|
751166cfbe
|
Unfucks borg defibs
|
2019-05-17 04:59:53 -05:00 |
|
deathride58
|
50bdbcc46f
|
Merge branch 'master' into kevinz000-patch-41
|
2019-05-17 00:29:31 -04:00 |
|
Useroth
|
7712b51fd0
|
Tweaks n' shit.
|
2019-05-17 04:49:39 +02:00 |
|
Poojawa
|
0f6677b956
|
Blood colors happens to footprints now.
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
|
2019-05-16 08:23:53 -05:00 |
|
Poojawa
|
77abf6a179
|
just need the stupid component to work properly now
|
2019-05-14 02:36:23 -05:00 |
|
Trilbyspaceclone
|
c9f6b02a0e
|
Update briefcase.dm
|
2019-05-12 21:23:40 -04:00 |
|
Poojawa
|
49a2f3cc63
|
I don't even fucking know anymore
|
2019-05-12 06:31:02 -05:00 |
|
Poojawa
|
ad5418f0a1
|
as it turns out, Creatures don't have minds
|
2019-05-12 04:43:52 -05:00 |
|
Poojawa
|
1a047c0068
|
I think I got it.
Also gibs should be better too.
|
2019-05-12 04:06:35 -05:00 |
|
kevinz000
|
4f12a762f3
|
Merge pull request #8342 from BurgerLUA/Cult-Improvements-and-Fixes
Adds EMP Defensive Traps to Clockcult
|
2019-05-11 22:19:46 -07:00 |
|
kevinz000
|
cd87e81a6a
|
Merge pull request #8334 from dtfe3/music-maxlines-increase
Increased music maxlines from 300 to 600
|
2019-05-11 22:17:08 -07:00 |
|
kevinz000
|
9b135ed56b
|
Merge pull request #8338 from Sishen1542/satchel-holding
Satchel of Holding!
|
2019-05-11 22:14:15 -07:00 |
|
kevinz000
|
4276f53338
|
Merge pull request #8341 from Trilbyspaceclone/golden
Golden toolboxes.
|
2019-05-11 22:13:18 -07:00 |
|
BurgerLua
|
4aba11739b
|
Finishing touches.
|
2019-05-10 19:15:42 -07:00 |
|
BurgerLua
|
d97bf47b95
|
Added
|
2019-05-10 18:12:36 -07: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 |
|
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 |
|
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 |
|