Fermi
228ab5b7c9
+Acute hepatic pharmacokinesis. (untested, will test with alterations)CC
2019-06-05 00:23:42 +01:00
Fermi
a5b3ec7939
Acid changes.
2019-06-02 22:38:55 +01:00
Fermi
e58a94bcc7
Merge remote-tracking branch 'upstream/master'
2019-06-01 03:12:38 +01:00
kevinz000
8b27926fee
Merge pull request #8463 from Trilbyspaceclone/metal_shields
...
Makeshift Metal shield crafting
2019-05-31 18:00:12 -07:00
kevinz000
2a5bbfdafc
Merge pull request #8482 from Ghommie/Ghommie-cit22
...
fixes pacifism eyestabbing, better this time.
2019-05-31 17:59:33 -07:00
kevinz000
16c89da587
Merge pull request #8485 from Trilbyspaceclone/plushies
...
More plushies - Reece Trilby Bhijn Box Justin
2019-05-31 17:55:37 -07:00
kevinz000
a96e414d2f
Merge pull request #8486 from BlackMajor/Ooga
...
Supermatter no longer works while inside of a turf.
2019-05-31 17:40:30 -07:00
Fermi
1461f46292
Added a catch to prevent acid from being rascals.
2019-05-31 03:12:00 +01:00
Trilbyspaceclone
a6e85a63ba
Update code/game/objects/items/plushes.dm
...
Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com >
2019-05-30 11:14:31 -04:00
BlackMajor
0d06605662
Supermatter eats the closed turf it's inside.
...
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
2019-05-30 16:17:33 +12:00
Trilbyspaceclone
027ee1e596
Update plushes.dm
2019-05-29 16:40:41 -04:00
Ghommie
bcf1072399
fixes eyestabbing, better this time.
2019-05-29 10:08:00 +02:00
Fermi
ae35366e97
Some fixes before bed.
2019-05-29 05:41:12 +01:00
Fermi
91cfd8e052
Before say component remove.
2019-05-29 03:01:47 +01:00
Trilbyspaceclone
7a17ca381b
tweaks
2019-05-27 21:58:09 -04:00
kevinz000
e8036a8a9b
Merge pull request #8439 from Ghommie/Ghommie-cit18
...
stunbaton status rework.
2019-05-27 14:08:52 -07:00
Trilbyspaceclone
6633ff4533
grammar
2019-05-27 04:47:56 -04:00
Trilbyspaceclone
f2ee85371d
Update shields.dm
2019-05-27 04:40:47 -04:00
Ghommie
37aa491fa5
removes emp downtime, Kev's request.
2019-05-27 02:30:03 +02:00
Ghommie
a47a7b31ba
more leniency.
2019-05-26 06:56:02 +02:00
Ghommie
cfa53d53f1
updating old teleprods.
2019-05-26 06:49:58 +02:00
Ghommie
288f97dd13
further tweaking.
2019-05-26 06:38:04 +02:00
Ghommie
7289d8a999
tweaking.
2019-05-26 06:31:25 +02:00
Ghommie
9b2ab8fc2a
21 minutes sounds, I don't really wanna overly punish.
2019-05-26 05:21:17 +02:00
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
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
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
BlackMajor
f94cbe94f6
Ports TG firebots
2019-05-24 23:58:39 +12: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
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
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
Trilbyspaceclone
c9f6b02a0e
Update briefcase.dm
2019-05-12 21:23:40 -04: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
