16c89da587
Merge pull request #8485 from Trilbyspaceclone/plushies
...
More plushies - Reece Trilby Bhijn Box Justin
2019-05-31 17:55:37 -07:00
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
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
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
027ee1e596
Update plushes.dm
2019-05-29 16:40:41 -04:00
e8036a8a9b
Merge pull request #8439 from Ghommie/Ghommie-cit18
...
stunbaton status rework.
2019-05-27 14:08:52 -07:00
37aa491fa5
removes emp downtime, Kev's request.
2019-05-27 02:30:03 +02:00
a47a7b31ba
more leniency.
2019-05-26 06:56:02 +02:00
cfa53d53f1
updating old teleprods.
2019-05-26 06:49:58 +02:00
288f97dd13
further tweaking.
2019-05-26 06:38:04 +02:00
7289d8a999
tweaking.
2019-05-26 06:31:25 +02:00
9b2ab8fc2a
21 minutes sounds, I don't really wanna overly punish.
2019-05-26 05:21:17 +02:00
e61942cba9
it will approx take 18-19 minutes now.
2019-05-26 05:18:07 +02:00
28c435134b
stunbaton emp & status tweaks
2019-05-26 04:52:05 +02:00
070e43ca64
Update sheet_types.dm
2019-05-25 17:58:33 -04:00
b6590cd9e9
Update boxes.dm
2019-05-25 17:54:57 -04:00
ed974bdcde
Update sheet_types.dm
2019-05-25 17:18:40 -04:00
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
e8742a4937
Merge pull request #8402 from CdrCross/AdvDefibProofread
...
Defibrillator Upgrades Proofread
2019-05-25 11:17:34 -07:00
f94cbe94f6
Ports TG firebots
2019-05-24 23:58:39 +12:00
ed23f9834a
Update jetpack.dm
2019-05-22 22:19:32 -04:00
e47598be8b
Update jetpack.dm
2019-05-22 18:39:51 -04: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
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
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
c9f6b02a0e
Update briefcase.dm
2019-05-12 21:23:40 -04: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
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
4aba11739b
Finishing touches.
2019-05-10 19:15:42 -07:00
d97bf47b95
Added
2019-05-10 18:12:36 -07:00
4c0caa3aae
Update toolbox.dm
2019-05-10 14:51:49 -04:00
c3df1b354e
Satchel of holding
...
fashion creep
2019-05-09 20:44:07 -04:00
a7192734dd
Merge pull request #8323 from Trilbyspaceclone/inducer
...
Makes a new COMBAT inducer! - Admin only
2019-05-08 01:34:33 -07:00
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
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
fda9883bae
Update inducer.dm
2019-05-06 14:48:16 -04:00
7d310f407b
Update inducer.dm
2019-05-05 06:50:22 -04:00
642cad2bb2
Update inducer.dm
2019-05-05 06:40:07 -04:00
1557c33008
Adds Penis Enlargement Pills
2019-05-02 14:55:04 -07:00
5d8cf0cabe
Let's give adrenals the one more small touch of love.
2019-04-28 16:13:07 +02:00
kevinz000