Commit Graph

20825 Commits

Author SHA1 Message Date
Trilbyspaceclone
d6486e2f6c Update resonator.dm 2019-05-31 23:13:31 -04:00
Trilbyspaceclone
78822d2e42 Update resonator.dm 2019-05-31 23:06:08 -04:00
CitadelStationBot
6e6a1f4615 Automatic changelog generation for PR #8473 [ci skip] 2019-05-31 21:23:05 -05:00
kevinz000
70bad08f95 Merge pull request #8473 from Useroth/clown-fu
[MERGE READY] Taeclowndo. Because Clowns deserve to have their own martial art too.
2019-05-31 19:23:03 -07:00
Useroth
a46312ede6 Update godhand.dm 2019-06-01 04:20:27 +02:00
kevinz000
e63f9f385b Merge pull request #8359 from Useroth/pneumatic-and-stun-buff
[MERGE READY]Reduces the complexity of the two new circuits: pneumatic cannon and stunner.
2019-05-31 19:18:53 -07:00
Useroth
8af39b8da7 Update godhand.dm 2019-06-01 04:16:37 +02:00
CitadelStationBot
c390c3e58f Automatic changelog generation for PR #8434 [ci skip] 2019-05-31 20:00:49 -05:00
kevinz000
32f6427cf1 Merge pull request #8434 from Ghommie/Ghommie-cit16
I'm tired of my pulls on horizontal spacemen breaking off because of crawling delays.
2019-05-31 18:00:47 -07:00
CitadelStationBot
65320d1eec Automatic changelog generation for PR #8463 [ci skip] 2019-05-31 20:00:14 -05:00
kevinz000
8b27926fee Merge pull request #8463 from Trilbyspaceclone/metal_shields
Makeshift Metal shield crafting
2019-05-31 18:00:12 -07:00
CitadelStationBot
8b69d7e710 Automatic changelog generation for PR #8482 [ci skip] 2019-05-31 19:59:35 -05: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
CitadelStationBot
877bca1637 Automatic changelog generation for PR #8495 [ci skip] 2019-05-31 19:59:11 -05:00
kevinz000
140e065525 Merge pull request #8495 from BurgerLUA/Anti-Obese
Obesity is now a warning instead of a notice.
2019-05-31 17:59:09 -07:00
CitadelStationBot
89d655aada Automatic changelog generation for PR #8477 [ci skip] 2019-05-31 19:58:50 -05:00
kevinz000
59e88e0808 Merge pull request #8477 from deathride58/portsnerditems
Ports the zulie cloak and blackredgold coat donor items from RP
2019-05-31 17:58:48 -07:00
CitadelStationBot
8ae11fa336 Automatic changelog generation for PR #8485 [ci skip] 2019-05-31 19:55:40 -05: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
CitadelStationBot
067f062a90 Automatic changelog generation for PR #8449 [ci skip] 2019-05-31 19:52:42 -05:00
kevinz000
7507831ffa Merge pull request #8449 from Trilbyspaceclone/patch-144
Makes PDA bomb cart cost 5 not 6
2019-05-31 17:52:40 -07:00
CitadelStationBot
1bb525aefe Automatic changelog generation for PR #8453 [ci skip] 2019-05-31 19:52:28 -05:00
kevinz000
c645d2129f Merge pull request #8453 from Trilbyspaceclone/patch-148
Tuberculosis 12tc - > 8tc
2019-05-31 17:52:25 -07:00
CitadelStationBot
f72db86dad Automatic changelog generation for PR #8452 [ci skip] 2019-05-31 19:51:01 -05:00
kevinz000
4224606c5f Merge pull request #8452 from Trilbyspaceclone/patch-147
Makes mulligan cost only 3
2019-05-31 17:50:59 -07:00
kevinz000
61f9c2edcd Merge pull request #8461 from Trilbyspaceclone/patch-155
Makes golden toolboxes cost 3 not 5
2019-05-31 17:47:08 -07:00
CitadelStationBot
3c06b98170 Automatic changelog generation for PR #8459 [ci skip] 2019-05-31 19:46:46 -05:00
kevinz000
14d763bd1d Merge pull request #8459 from Trilbyspaceclone/patch-153
Syndicate Sentience Potion costing 2 from 4
2019-05-31 17:46:44 -07:00
kevinz000
8c6d8eb20b Merge pull request #8471 from Sishen1542/buttslol
Butt slaps fix & Masochism! (fixed)
2019-05-31 17:45:07 -07:00
CitadelStationBot
401fd5c354 Automatic changelog generation for PR #8466 [ci skip] 2019-05-31 19:44:41 -05:00
kevinz000
07d3b0361c Merge pull request #8466 from Poojawa/vis-overlay-insolence
Fixes atmos and station alert consoles not updating visually
2019-05-31 17:44:39 -07:00
kevinz000
854eb129f6 Merge pull request #8462 from Trilbyspaceclone/patch-156
Makes brainwash disks cost 3 tc not 5
2019-05-31 17:43:53 -07:00
CitadelStationBot
8c9faeef54 Automatic changelog generation for PR #8436 [ci skip] 2019-05-31 19:43:24 -05:00
kevinz000
1efdfd38e0 Merge pull request #8436 from Trilbyspaceclone/patch-137
Allows bio genes to make synth meat
2019-05-31 17:43:22 -07:00
CitadelStationBot
7ab61db8b2 Automatic changelog generation for PR #8470 [ci skip] 2019-05-31 19:42:30 -05:00
kevinz000
f678741a0e Merge pull request #8470 from Ghommie/Ghommie-cit19
Undunks pepper spray & teargas.
2019-05-31 17:42:28 -07:00
kevinz000
ca16cd9467 Merge pull request #8488 from Trilbyspaceclone/ERT_SUITS
[Ready] High alarm ERT suits
2019-05-31 17:41:39 -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
BurgerLua
5dc3542f90 added 2019-05-30 15:49:53 -07:00
CitadelStationBot
a6a54219fe Automatic changelog generation for PR #8295 [ci skip] 2019-05-30 13:12:38 -05:00
kevinz000
f5b3484e92 Merge pull request #8295 from Trilbyspaceclone/T_T
[Ready] Nerfs(Not really) Engi printing and organized many designs
2019-05-30 11:12:35 -07:00
Trilbyspaceclone
a8ec60d9c1 Update miscellaneous.dm 2019-05-30 13:51:55 -04:00
deathride58
9e35f91706 suggested changes from asky 2019-05-30 13:18:05 -04:00
Trilbyspaceclone
59d0360fa6 Add files via upload 2019-05-30 12:17:21 -04:00
Trilbyspaceclone
a3bf322f3d Delete suit.dmi 2019-05-30 12:17:00 -04:00
Trilbyspaceclone
bd327f9541 Add files via upload 2019-05-30 12:04:10 -04:00
Trilbyspaceclone
aa1859f6f1 Delete suit.dmi 2019-05-30 12:03:58 -04:00
Trilbyspaceclone
a4fc312b15 Add files via upload 2019-05-30 12:00:24 -04:00
Trilbyspaceclone
d6c954689f Delete suits.dmi 2019-05-30 11:58:32 -04:00
Trilbyspaceclone
39700503f9 Update miscellaneous.dm 2019-05-30 11:40:37 -04:00