Ghommie
e61942cba9
it will approx take 18-19 minutes now.
2019-05-26 05:18:07 +02:00
Ghommie
28c435134b
stunbaton emp & status tweaks
2019-05-26 04:52:05 +02:00
Ghom
b2eea5e3f4
Sorry, web edit because I didn't commit the ?.
2019-05-26 04:11:52 +02:00
Ghommie
2fe1431db6
Applying suggestion, ?. so no theorical runtime.
2019-05-26 03:40:48 +02:00
Fermi
91f10442cf
Merge branch 'pr/12'
2019-05-26 02:05:48 +01:00
Trilbyspaceclone
070e43ca64
Update sheet_types.dm
2019-05-25 17:58:33 -04:00
Trilbyspaceclone
b6590cd9e9
Update boxes.dm
2019-05-25 17:54:57 -04:00
Trilbyspaceclone
ed974bdcde
Update sheet_types.dm
2019-05-25 17:18:40 -04:00
Trilbyspaceclone
a2f825d45b
Merge branch 'master' into patch-135
2019-05-25 16:12:37 -04:00
Trilbyspaceclone
12994f7a59
Update jetpack.dm
2019-05-25 16:11:33 -04:00
Trilbyspaceclone
915e41e5e6
Update jetpack.dm
2019-05-25 16:08:19 -04:00
deathride58
4fc31f6322
Merge branch 'master' into fuckatmos
2019-05-25 15:34:06 -04:00
kevinz000
90a3199315
Merge pull request #8417 from Trilbyspaceclone/patch-136
...
Gives space queen's men void jet packs + tweeks
2019-05-25 11:34:55 -07:00
kevinz000
e8742a4937
Merge pull request #8402 from CdrCross/AdvDefibProofread
...
Defibrillator Upgrades Proofread
2019-05-25 11:17:34 -07:00
Ghommie
521c371253
actually, let's just halve it, won't be an issue I suppose.
2019-05-25 07:44:45 +02:00
Ghommie
34cad3786b
Reduces stunprod's delay.
2019-05-25 07:35:48 +02:00
BlackMajor
f94cbe94f6
Ports TG firebots
2019-05-24 23:58:39 +12:00
JTGSZ
38ad6785a0
Over-reduced the item costs a bit too much.
...
Lets do it in tiny increments until It plays somewhat unpredictably for all sides.
2019-05-23 01:42:00 -04:00
JTGSZ
080b29de79
Solves a few things.
2019-05-23 00:40:57 -04:00
Trilbyspaceclone
ed23f9834a
Update jetpack.dm
2019-05-22 22:19:32 -04:00
Trilbyspaceclone
e47598be8b
Update jetpack.dm
2019-05-22 18:39:51 -04:00
Fermi
f932fadfc6
Blood commit.
2019-05-22 18:46:46 +01:00
Poojawa
4324d08f32
aaaaAAAAAAAA
...
NOW WHY DO I HAVE INFINITE FOOTPRINTS AAAAAAAAAAAAA
2019-05-22 04:52:21 -05:00
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
CdrCross
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
Ghommie
2b668a8b7c
activated = FALSE
2019-05-21 23:12:23 +02:00
Ghommie
ab9bde1b15
reverts Lily.
2019-05-21 22:55:49 +02:00
Ghommie
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
Ghommie
5e4bbb0d02
Awaken, code.
2019-05-21 22:45:59 +02:00
JTGSZ
84016ed3ef
Here we go.
2019-05-21 12:30:44 -04: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
JTGSZ
03f129fa6e
More changes
2019-05-19 07:29:09 -04: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
Ghommie
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
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
