 kevinz000
|
98491cd2f8
|
Merge pull request #8504 from Trilbyspaceclone/patch-160
buffs resonator
|
2019-06-05 01:49:11 -07:00 |
|
|
CitadelStationBot
|
8dc5619369
|
Automatic changelog generation for PR #8506 [ci skip]
|
2019-06-05 03:44:07 -05:00 |
|
|
kevinz000
|
cd38a29449
|
Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals
Ports RP's deer taur and adds Elven ears to mammals
|
2019-06-05 01:44:05 -07:00 |
|
|
CitadelStationBot
|
1eef9b39e3
|
Automatic changelog generation for PR #8517 [ci skip]
|
2019-06-05 03:42:50 -05:00 |
|
|
kevinz000
|
adbbb2944a
|
Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess
Adds visible balls and multi-breasts
|
2019-06-05 01:42:48 -07:00 |
|
|
CitadelStationBot
|
73fe37ada0
|
Automatic changelog generation for PR #8518 [ci skip]
|
2019-06-05 03:41:25 -05:00 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
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 |
|
|
deathride58
|
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 |
|
|
kevinz000
|
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 |
|
|
Poojawa
|
d4abb85641
|
Update preferences.dm
|
2019-06-02 09:40:18 -05:00 |
|
|
Poojawa
|
25458fad63
|
I refuse to eat crow.
|
2019-06-02 08:40:51 -05:00 |
|
|
Poojawa
|
69b1373209
|
compile testing and tweaks
|
2019-06-02 08:06:16 -05:00 |
|
|
Poojawa
|
1cfaf62a75
|
multi-boobies sprited
|
2019-06-02 07:47:37 -05: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 |
|
|
Poojawa
|
818ec19561
|
Working as intended, fixed a few other missing sprites
Started groundwork for multi-breasts and hidden balls.
|
2019-06-02 04:44:57 -05:00 |
|
|
Poojawa
|
17ad519f24
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess
|
2019-06-02 03:00:46 -05: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 |
|
|
CalamaBanana
|
a37f84fb9b
|
Ports RP Deer taur and adds Elf Ears to Mammals
Ports RP Deer taur and adds Elf Ears to Mammals
|
2019-06-01 17:28:17 +02:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|