f6f4c946e6
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-05-22 00:08:13 -05:00
82d308eb5e
Defibrillator Upgrades Proofread
...
My first ever contribution to Citadel, and first ever real GitHub Commit. This PR is a simple exercise in fixing and standardising some flavour text across Trilby's otherwise excellent defibrillator upgrades. (PR#8173)
No stats or gameplay elements have been adjusted.
2019-05-21 23:37:28 +02:00
2b668a8b7c
activated = FALSE
2019-05-21 23:12:23 +02:00
ab9bde1b15
reverts Lily.
2019-05-21 22:55:49 +02:00
20124c24ec
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-05-21 22:48:59 +02:00
5e4bbb0d02
Awaken, code.
2019-05-21 22:45:59 +02:00
84016ed3ef
Here we go.
2019-05-21 12:30:44 -04:00
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
55dca0bd41
Merge pull request #8139 from Trilbyspaceclone/patch-82
...
Makes mind shields bomb proof
2019-05-21 00:00:28 -07:00
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
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
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
d8579b2e2d
Merge pull request #8372 from Poojawa/paws-of-life-needs-more-fixing
...
Unfucks borg defibs
2019-05-19 12:47:03 -07:00
03f129fa6e
More changes
2019-05-19 07:29:09 -04:00
de841761b2
Charter apostrophes fixed, too
2019-05-18 16:19:25 +02:00
eb717645bd
M.emote("scream")
2019-05-17 05:16:53 -05:00
751166cfbe
Unfucks borg defibs
2019-05-17 04:59:53 -05:00
50bdbcc46f
Merge branch 'master' into kevinz000-patch-41
2019-05-17 00:29:31 -04:00
7712b51fd0
Tweaks n' shit.
2019-05-17 04:49:39 +02:00
b5b54c9f9f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-05-17 02:17:18 +02:00
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
77abf6a179
just need the stupid component to work properly now
2019-05-14 02:36:23 -05:00
c9f6b02a0e
Update briefcase.dm
2019-05-12 21:23:40 -04:00
49a2f3cc63
I don't even fucking know anymore
2019-05-12 06:31:02 -05:00
ad5418f0a1
as it turns out, Creatures don't have minds
2019-05-12 04:43:52 -05:00
1a047c0068
I think I got it.
...
Also gibs should be better too.
2019-05-12 04:06:35 -05:00
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
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
9b135ed56b
Merge pull request #8338 from Sishen1542/satchel-holding
...
Satchel of Holding!
2019-05-11 22:14:15 -07:00
4276f53338
Merge pull request #8341 from Trilbyspaceclone/golden
...
Golden toolboxes.
2019-05-11 22:13:18 -07:00
ddad7a173d
All compiling errors fixed!! I did it!!
2019-05-11 15:47:58 +01:00
f7655cad25
All compiling errors fixed, except for a few weird ones that I need help
2019-05-11 15:40:06 +01:00
926bd65392
Merge branch 'master' into FermiChem
2019-05-11 14:14:20 +01:00
4aba11739b
Finishing touches.
2019-05-10 19:15:42 -07:00
d97bf47b95
Added
2019-05-10 18:12:36 -07:00
29d4a2fdde
Finished MCchem, now to fix compling errors.
2019-05-11 00:14:04 +01:00
4c0caa3aae
Update toolbox.dm
2019-05-10 14:51:49 -04:00
fcdc748bf1
u h g. I hate this
2019-05-10 07:07:09 -05:00
cb0e50be0a
Missed / in last pr
2019-05-10 03:12:28 +01:00
ac8b7be45c
Merges old penis enlargement pills into prexisiting Fermichem ones. (master ( #8319 ) by BurgerLUA)
2019-05-10 03:10:42 +01:00
c3df1b354e
Satchel of holding
...
fashion creep
2019-05-09 20:44:07 -04:00
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
8af9c6fad9
duplicate definitions? really? wtf
2019-05-09 10:32:14 -05:00
3f6cd92d54
Ok this time all of them are nitpicked
2019-05-09 10:15:51 -05:00
0f02562b51
Fixes Xenomorph blood related travis errors
2019-05-09 09:59:34 -05:00
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
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
5ad532f723
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-05-09 03:08:54 -05:00
5a67114d33
get blood id is my foe now.
2019-05-08 04:53:51 -05:00
a7192734dd
Merge pull request #8323 from Trilbyspaceclone/inducer
...
Makes a new COMBAT inducer! - Admin only
2019-05-08 01:34:33 -07:00
Poojawa