 kevinz000andGitHub
|
102d68a243
|
Merge pull request #8518 from Ghommie/Ghommie-cit27
Fixes and updates pod's emergency suits storage.
|
2019-06-05 01:41:23 -07:00 |
|
|
kevinz000andGitHub
|
52b189dc98
|
Merge pull request #8502 from Sishen1542/meatyors
Meteor Sats not exclusive to station goal
|
2019-06-05 01:40:50 -07:00 |
|
|
CitadelStationBot
|
60ab3b54d5
|
Automatic changelog generation for PR #8524 [ci skip]
|
2019-06-05 03:40:31 -05:00 |
|
|
kevinz000andGitHub
|
58bdac6965
|
Merge pull request #8524 from BurgerLUA/Ass-Blast-USA
Adds a trait that makes you immune to ass slapping: BUNS OF STEEL.
|
2019-06-05 01:40:28 -07:00 |
|
|
kevinz000andGitHub
|
81ba2011d3
|
Merge pull request #8510 from Sishen1542/ghostmanbad
Subtle 2: No Ghost Boogaloo
|
2019-06-05 01:32:42 -07:00 |
|
|
CitadelStationBot
|
5d397fafda
|
Automatic changelog generation for PR #8515 [ci skip]
|
2019-06-03 16:51:15 -05:00 |
|
|
deathride58andGitHub
|
b95b14d033
|
Merge pull request #8515 from Ghommie/Ghommie-cit25
Fixes stunbatons' icons not properly updating on cell fiddling, plus cell maxcharge leniency.
|
2019-06-03 17:51:13 -04:00 |
|
|
BurgerLua
|
ed7d0575b2
|
Ass Blast USA
|
2019-06-03 14:40:57 -07:00 |
|
|
kevinz000andGitHub
|
fc1611d86a
|
Merge pull request #8426 from Sishen1542/sloom-hnngh
Slimespeak!
|
2019-06-03 00:51:36 -07:00 |
|
|
Ghommie
|
472d7ef8cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27
|
2019-06-02 19:03:34 +02:00 |
|
|
Ghommie
|
da4ce71ba3
|
alphabetic index, you silly brainfrying wonks.
|
2019-06-02 19:02:16 +02:00 |
|
|
Ghommie
|
73e279dada
|
excessive parenthesis wrapping.
|
2019-06-02 18:29:43 +02:00 |
|
|
Ghommie
|
d6e54bf237
|
Fixes and updates pod's emergency suits storage.
|
2019-06-02 18:28:30 +02:00 |
|
|
Ghommie
|
ae5d68c6f9
|
Fixes stunbatons' icons not properly updating on cell removal, and more cell charge leniency.
|
2019-06-02 13:24:03 +02:00 |
|
|
Sishen
|
9347ad57b1
|
sneaky erp
|
2019-06-01 20:20:55 -04:00 |
|
|
Sishen
|
9aaeed6f81
|
Update packs.dm
|
2019-06-01 19:46:09 -04:00 |
|
|
CitadelStationBot
|
6e6a1f4615
|
Automatic changelog generation for PR #8473 [ci skip]
|
2019-05-31 21:23:05 -05:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
UserothandGitHub
|
a46312ede6
|
Update godhand.dm
|
2019-06-01 04:20:27 +02:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
UserothandGitHub
|
8af39b8da7
|
Update godhand.dm
|
2019-06-01 04:16:37 +02:00 |
|
|
Sishen
|
5dde4555cc
|
lmao2crate
|
2019-05-31 21:11:39 -04:00 |
|
|
CitadelStationBot
|
c390c3e58f
|
Automatic changelog generation for PR #8434 [ci skip]
|
2019-05-31 20:00:49 -05:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
4224606c5f
|
Merge pull request #8452 from Trilbyspaceclone/patch-147
Makes mulligan cost only 3
|
2019-05-31 17:50:59 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
14d763bd1d
|
Merge pull request #8459 from Trilbyspaceclone/patch-153
Syndicate Sentience Potion costing 2 from 4
|
2019-05-31 17:46:44 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|