Commit Graph

16568 Commits

Author SHA1 Message Date
Winter Flare
c31ca96e87 Rebalanced Meat Crate 2019-12-02 16:21:48 -05:00
Winter Flare
89aa08837f Updated Access, Bluespace Trash (again). Fixes
Updated Engineering and Medical hardsuits to require access for their applicable departments.

Moved Virus Containment into it's proper file.

Put Bluespace Trashbag back in the advanced sanitation crate.

Spellcheck.
2019-12-01 05:12:14 -05:00
Winter Flare
66114f9c37 Removed Power Tools, Tweaked EF Crate
Removed Power Tool Crate

Made exotic footwear non-contraband, and increased price.
2019-11-30 00:49:14 -05:00
Winter Flare
a524ca6f18 Spellchecking and Crate balance.
Integrated #9939 spellchecking.

Rebalanced Emergency Medical Supplies, EMS Lite, and advanced janitorial crate. (Also added to Advanced Janitorial and Power Tools crate that they require access.)
2019-11-29 16:54:04 -05:00
Winter Flare
ee55170b3f Fixed Meat Crates 2019-11-28 18:30:43 -05:00
Winter Flare
6a4c959b0a Added more crates. 2019-11-24 19:05:03 -05:00
Winter Flare
386dd6aa8a Made Medical Emergency Crate Drop-Pod only.
Trill made me do it.
2019-11-22 06:44:59 -05:00
Winter Flare
05b22caaa3 Added 12 new crates, fixed issues raised in #9901
Remake of previous PR that I broke due to inexperiance.
Added 12 new crates to cargo.
Re-ordered some some of the crates.
2019-11-22 02:37:57 -05:00
Lin
522a664f55 Merge pull request #9887 from Ghommie/Ghommie-cit385
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-22 02:39:29 +00:00
Lin
1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
Lin
3979079fde Merge pull request #9518 from Ghommie/Ghommie-cit243
Ports "You can now click on objects and mobs below flaps and signs"
2019-11-22 01:36:47 +00:00
Lin
c2d182d50d Merge pull request #9823 from Seris02/wintergalorefix
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
2019-11-22 01:16:35 +00:00
Lin
2412bad483 Merge pull request #9889 from GrayRachnid/fixgoldbox
Fixes gold toolbox inhand sprite having the wrong name
2019-11-22 01:14:39 +00:00
kevinz000
c22ae596fc Merge pull request #9880 from Putnam3145/meteor-random-fix
Makes sure every dynamic-triggered event isn't random on dynamic
2019-11-20 22:12:42 -07:00
kevinz000
1efd3ae395 Merge pull request #9866 from Useroth/tatorstrangeseeds
Adds strange seeds as a buyable traitor botanist item.
2019-11-20 22:09:53 -07:00
kevinz000
61c759f7a2 Merge pull request #9865 from Useroth/bagsort
Glitchfix. Prevents storage bags from changing the order of their numbered contents when items are removed.
2019-11-20 22:09:22 -07:00
kevinz000
30aefd050a Merge pull request #9868 from Ghommie/Ghommie-cit376
Fixes superlube waterflower.
2019-11-20 22:08:54 -07:00
Seris02
60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-21 13:08:23 +08:00
nik707
8d363b8e9d Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85
adds poll ignore for magical antagonists
2019-11-20 23:03:39 -06:00
kevinz000
42de0d5ebe Merge pull request #9831 from Putnam3145/dynamic-nukeops-pop-fix
Makes dynamic nukeops population scaling more like secret
2019-11-20 22:01:49 -07:00
nik707
0300927974 Merge pull request #9487 from Citadel-Station-13/spooky
adds an easy way for admins to force enable halloween races without the rest of halloween's code
2019-11-20 23:00:09 -06:00
nik707
56d2c0edad Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107
buffs bluespace apprentice (targeted teleport --> blink)
2019-11-20 22:55:21 -06:00
kevinz000
540a57b518 Merge pull request #9828 from Putnam3145/dynamic-meteor-nonrepeat
Makes meteor not repeatable in dynamic.
2019-11-20 21:53:05 -07:00
nik707
28190bc168 Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109
emagged medibots now murder the everloving fuck out of slimepeople
2019-11-20 22:52:11 -06:00
nik707
df11e75414 Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110
fixes a bug with rnd multiprinting
2019-11-20 22:51:32 -06:00
nik707
6d889e66c4 Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111
Is it the time of year to buff disablers again?
2019-11-20 22:51:11 -06:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
kevinz000
c503e564db Merge pull request #9873 from Ghommie/Ghommie-cit378
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
2019-11-20 21:48:41 -07:00
kevinz000
4b41a70e13 Merge pull request #9875 from Putnam3145/required-candidates-works-now
Makes from-ghosts rulesets cancel if fewer than required candidates
2019-11-20 21:47:48 -07:00
kevinz000
47888bd208 Merge pull request #9877 from Ghommie/Ghommie-cit381
Unmodularize pAI holo-chassis icons.
2019-11-20 21:47:00 -07:00
kevinz000
f82dd255dc Merge pull request #9869 from Hatterhat/ayy-dna-manip
what if i gave botanists the ability to get the fancy alien dna manipulator. haha, just kidding. ...unless?
2019-11-20 21:46:37 -07:00
kevinz000
95951add5c Merge pull request #9870 from Ghommie/Ghommie-cit377
Moves some clockie paper info to the right file.
2019-11-20 21:43:35 -07:00
GrayRachnid
4ae76cf1d9 WHY
D
2019-11-20 23:11:46 -05:00
GrayRachnid
48d1bd1160 fixes goldbox 2019-11-20 18:47:35 -05:00
Ghommie
920eba0b03 ayy 2019-11-20 21:41:59 +01:00
Ghommie
84d1315a05 heck. 2019-11-20 21:33:35 +01:00
Ghommie
16d850ecfc chain stunning yay 2019-11-20 21:17:31 +01:00
Ghommie
236f22096a run 2019-11-20 21:13:08 +01:00
Ghommie
2fddf343ad Run 2019-11-20 21:12:44 +01:00
Ghommie
67a48e0417 typo 2019-11-20 21:03:27 +01:00
Ghommie
aab7ad192b Martial arts pacifism fixes and boxing buff, more ported pacifist fixes. 2019-11-20 21:00:17 +01:00
Useroth
e2c8efa824 Oopsie. I need to stop committing code without comipiling. 2019-11-20 15:36:55 +01:00
Useroth
2a8152c835 Applied suggestions. 2019-11-20 15:15:10 +01:00
Putnam
0d297e92c7 read words 2019-11-19 22:02:06 -08:00
Putnam
f7361c2059 Made sure every dynamic-controlled event doesn't randomly trigger on dynamic. 2019-11-19 21:58:55 -08:00
Ghommie
75ac087988 Unmodularize pAI holo-chassis icons. 2019-11-20 05:54:00 +01:00
kevinz000
20bcca0398 Merge pull request #9852 from Ghommie/Ghommie-cit369
Fixing some wizard den teleportation issues.
2019-11-19 21:39:20 -07:00
kevinz000
34a8dc5962 Merge pull request #9850 from Ghommie/Ghommie-cit368
fixing a few minor issues with console frames building.
2019-11-19 21:38:58 -07:00
kevinz000
7503366524 Merge pull request #9853 from Ghommie/Ghommie-cit370
Adds a few extra cardboard cutout variants.
2019-11-19 21:38:32 -07:00
kevinz000
67abc4ff03 Merge pull request #9855 from Ghommie/Ghommie-cit371
Fixing suit store overlays
2019-11-19 21:38:22 -07:00