BlackMajor
|
373afcf09e
|
Merge pull request #12 from Citadel-Station-13/master
Update master
|
2019-10-03 19:05:17 +13:00 |
|
CitadelStationBot
|
f6c80ddc48
|
Automatic changelog generation for PR #9365 [ci skip]
|
2019-10-02 02:06:16 -05:00 |
|
kevinz000
|
08ed166c08
|
Merge pull request #9365 from Ghommie/Ghommie-cit211
Fixing an issue with DNA scanners maintenance hatches with sleeper code updates.
|
2019-10-02 00:06:13 -07:00 |
|
CitadelStationBot
|
1bf46e2152
|
Automatic changelog generation for PR #9373 [ci skip]
|
2019-10-02 02:02:07 -05:00 |
|
kevinz000
|
1aac0942e9
|
Merge pull request #9373 from Trilbyspaceclone/beepalm
Beebalm and Honeybalm plants
|
2019-10-02 00:02:05 -07:00 |
|
kevinz000
|
af9336edde
|
Merge pull request #9366 from Raptorizer/MelonSeedBuff
Equalized the power of the melon seed.
|
2019-10-02 00:01:05 -07:00 |
|
kevinz000
|
a177e5a457
|
Merge pull request #9364 from Ghommie/Ghommie-cit206
Fixing the blood cult radial menu unholy flask option's icon.
|
2019-10-01 23:59:49 -07:00 |
|
CitadelStationBot
|
7320863b52
|
Automatic changelog generation for PR #9380 [ci skip]
|
2019-10-02 01:58:29 -05:00 |
|
kevinz000
|
657321e36b
|
Merge pull request #9380 from Ghommie/Ghommie_cit212
refactoring and fixing altdisarm() exploits (ergo pushing people over directional windows etc).
|
2019-10-01 23:58:27 -07:00 |
|
Ghommie
|
d245a9d28d
|
addendum
|
2019-10-02 00:42:19 +02:00 |
|
Ghommie
|
2a84162c59
|
incorrect number of macro arguments
|
2019-10-02 00:38:58 +02:00 |
|
Ghommie
|
81fc0c1b32
|
more foolproofing.
|
2019-10-02 00:37:02 +02:00 |
|
Ghommie
|
e635a05d16
|
errors.
|
2019-10-01 23:43:38 +02:00 |
|
Ghommie
|
d2300765b2
|
adjacency checks.
|
2019-10-01 23:16:47 +02:00 |
|
Ghommie
|
cfcd325778
|
reworking the shoving people action.
|
2019-10-01 23:13:08 +02:00 |
|
Ghommie
|
340f8498a3
|
Fixes some more issues with shoving people.
|
2019-10-01 22:11:41 +02:00 |
|
deathride58
|
35b54f9b53
|
Merge pull request #9376 from Citadel-Station-13/flightgoggles
Flight Goggles - Donator
|
2019-10-01 13:43:06 -04:00 |
|
CitadelStationBot
|
96bd6ecc06
|
Automatic changelog generation for PR #9367 [ci skip]
|
2019-10-01 02:12:34 -05:00 |
|
kevinz000
|
250c6ed986
|
Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
|
2019-10-01 00:12:32 -07:00 |
|
Jay
|
e0b8d28386
|
donator item
|
2019-09-30 22:16:27 -05:00 |
|
TrilbySpaceClone
|
3f893195bf
|
tested!
|
2019-09-30 11:42:07 -04:00 |
|
Poojawa
|
9bd6f83034
|
Applies rad_flags to a lot of common items + bluespace bags
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
|
2019-09-28 03:22:17 -05:00 |
|
Poojawa
|
30e6445c0a
|
Suit Storage now purges radation contamination
|
2019-09-28 03:18:31 -05:00 |
|
Poojawa
|
041a4b4ed1
|
Corrects scanner measurment information
|
2019-09-28 03:18:00 -05:00 |
|
CitadelStationBot
|
0301683ae1
|
Automatic changelog generation for PR #9189 [ci skip]
|
2019-09-28 02:40:05 -05:00 |
|
kevinz000
|
6e55fec7bd
|
Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
|
2019-09-28 00:40:02 -07:00 |
|
CitadelStationBot
|
99f61ec835
|
Automatic changelog generation for PR #9191 [ci skip]
|
2019-09-28 02:38:10 -05:00 |
|
kevinz000
|
0febc1977a
|
Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
|
2019-09-28 00:38:08 -07:00 |
|
CitadelStationBot
|
fb26944a42
|
Automatic changelog generation for PR #9267 [ci skip]
|
2019-09-28 02:28:45 -05:00 |
|
kevinz000
|
7c3036f027
|
Merge pull request #9267 from Tupinambis/EngineeringCriticalFix
Gives the Endivend Upgraded RCDs by default, instead of Autolathe ones.
|
2019-09-28 00:28:43 -07:00 |
|
CitadelStationBot
|
d5e9492d2b
|
Automatic changelog generation for PR #9336 [ci skip]
|
2019-09-28 02:26:53 -05:00 |
|
kevinz000
|
8d9520ee58
|
Merge pull request #9336 from Thalpy/beakerpH_tweaks
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
|
2019-09-28 00:26:51 -07:00 |
|
CitadelStationBot
|
19c56620e7
|
Automatic changelog generation for PR #9321 [ci skip]
|
2019-09-28 02:24:17 -05:00 |
|
kevinz000
|
426104021e
|
Merge pull request #9321 from Linzolle/bloodrites
some cult fixes + cult qol
|
2019-09-28 00:24:15 -07:00 |
|
CitadelStationBot
|
91483cfa0c
|
Automatic changelog generation for PR #9322 [ci skip]
|
2019-09-28 02:23:51 -05:00 |
|
kevinz000
|
6b33e3bd0b
|
Merge pull request #9322 from Sishen1542/cult
blood cult conversion no longer requires consent
|
2019-09-28 00:23:48 -07:00 |
|
CitadelStationBot
|
e2e68889bb
|
Automatic changelog generation for PR #9326 [ci skip]
|
2019-09-28 02:23:33 -05:00 |
|
kevinz000
|
cbe6a54531
|
Merge pull request #9326 from YakumoChen/radioactive-paperweight
Advanced energy guns glow more
|
2019-09-28 00:23:31 -07:00 |
|
CitadelStationBot
|
4fb397dee7
|
Automatic changelog generation for PR #9349 [ci skip]
|
2019-09-28 02:22:40 -05:00 |
|
kevinz000
|
d7d4e3cbe2
|
Merge pull request #9349 from Ghommie/Ghommie-cit210
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
|
2019-09-28 00:22:38 -07:00 |
|
CitadelStationBot
|
f0cd9bf796
|
Automatic changelog generation for PR #9320 [ci skip]
|
2019-09-28 02:22:15 -05:00 |
|
kevinz000
|
cc64b8e0a4
|
Merge pull request #9320 from Ghommie/Ghommie-cit200
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
|
2019-09-28 00:22:13 -07:00 |
|
CitadelStationBot
|
a4792d4197
|
Automatic changelog generation for PR #9317 [ci skip]
|
2019-09-28 02:21:49 -05:00 |
|
kevinz000
|
3ce5b318ca
|
Merge pull request #9317 from Ghommie/Ghommie-cit199
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
|
2019-09-28 00:21:47 -07:00 |
|
CitadelStationBot
|
d7c9a15cab
|
Automatic changelog generation for PR #8914 [ci skip]
|
2019-09-28 02:20:44 -05:00 |
|
kevinz000
|
5562db4ed4
|
Merge pull request #8914 from Ghommie/Ghommie-cit147
Updating spraycans and crayons.
|
2019-09-28 00:20:42 -07:00 |
|
CitadelStationBot
|
8747b47b65
|
Automatic changelog generation for PR #9344 [ci skip]
|
2019-09-28 02:15:29 -05:00 |
|
kevinz000
|
b28e65637e
|
Merge pull request #9344 from Ghommie/Ghommie-cit208
Makes abandoned crates less prone to explosions.
|
2019-09-28 00:15:27 -07:00 |
|
CitadelStationBot
|
c2c23ed172
|
Automatic changelog generation for PR #9359 [ci skip]
|
2019-09-28 02:14:49 -05:00 |
|
kevinz000
|
1b295c8501
|
Merge pull request #9359 from deathride58/fuckstoredpower
Rad collector tweaks - Reverts point production to its original behavior, clears up examine text
|
2019-09-28 00:14:47 -07:00 |
|