Commit Graph

32259 Commits

Author SHA1 Message Date
KathrinBailey
b3750207e9 Merge Conflicts
Changes redone.
2020-03-30 00:11:34 +01:00
KathrinBailey
52138696d0 PROTO KINETIC dream CRUSHER
oh yeah give me all the shutters daddy
2020-03-26 13:08:37 +00:00
CitadelStationBot
005d7ace31 Automatic changelog generation for PR #11619 [ci skip] 2020-03-25 19:01:36 -05:00
necromanceranne
b57ce2d7ff missed this with my last pr (#11619) 2020-03-26 01:01:34 +01:00
CitadelStationBot
c986d440b6 Automatic changelog generation for PR #11602 [ci skip] 2020-03-25 15:18:05 -05:00
necromanceranne
26ec48f174 straight shooting guns (#11602) 2020-03-25 21:18:02 +01:00
CitadelStationBot
f7fe294742 Automatic changelog generation for PR #11555 [ci skip] 2020-03-25 15:16:38 -05:00
kevinz000
0f4444b567 Nerfs piggyback and fireman carrying (#11555)
* ok

* daze duration increased, MOBILITY_USE now has.. a use.

* k

* @ghommie
2020-03-25 21:16:35 +01:00
CitadelStationBot
bfe6199d3c Automatic changelog generation for PR #11605 [ci skip] 2020-03-25 14:23:10 -05:00
kevinz000
4d43f2bdf9 Merge pull request #11605 from necromanceranne/ONLY_TRUST_YOUR_FISTS
PUNCHING: YOU SHOULD BE SCREAMING EDITION
2020-03-25 12:23:08 -07:00
CitadelStationBot
c3194d0238 Automatic changelog generation for PR #11603 [ci skip] 2020-03-25 14:22:44 -05:00
kevinz000
388e6d46df Merge pull request #11603 from KathrinBailey/Kat-Furniture
Kat Shutter Balancing & Sprite Updates: COVID-19 Shut-In Edition
2020-03-25 12:22:42 -07:00
CitadelStationBot
96e197f086 Automatic changelog generation for PR #11600 [ci skip] 2020-03-25 14:20:20 -05:00
kevinz000
6464c2470a Merge pull request #11600 from Ghommie/Ghommie-cit641
Removes dead flightsuit code leftovers and bad hook.
2020-03-25 12:20:17 -07:00
CitadelStationBot
8d0d70b92c Automatic changelog generation for PR #11598 [ci skip] 2020-03-25 14:19:40 -05:00
kevinz000
d2e98679f4 Merge pull request #11598 from Ghommie/Ghommie-cit640
Fixes crafting hud icon overlapping the second pocket on 1:1 screen mode.
2020-03-25 12:19:37 -07:00
CitadelStationBot
ea0bf97a81 Automatic changelog generation for PR #11592 [ci skip] 2020-03-25 14:19:17 -05:00
kevinz000
f41e5655d8 Merge pull request #11592 from Ghommie/Ghommie-cit639
Fixing an inconsistency with nuclear bombs exploding on station level space.
2020-03-25 12:19:15 -07:00
CitadelStationBot
866d80eb3d Automatic changelog generation for PR #11589 [ci skip] 2020-03-25 14:18:52 -05:00
kevinz000
8d87ed7b64 Merge pull request #11589 from Ghommie/Ghommie-cit638
Made votes obfuscation settings more robust, including them in custom votes.
2020-03-25 12:18:50 -07:00
kevinz000
46e3267d4c Merge pull request #11557 from Ghommie/Ghommie-cit632
Removes species default_features variable.
2020-03-25 12:16:40 -07:00
CitadelStationBot
bae145b392 Automatic changelog generation for PR #11443 [ci skip] 2020-03-25 12:37:45 -05:00
kevinz000
cbb5d52ca1 Melee Stagger (#11443)
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* wack

* animation is now shorter

* linter save me

* i hate you

* k

* k

* k

* i hate you

* wrong button

* k

* ok

* bet

* bet

* bet

* Update item_attack.dm

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

* fix

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-25 18:37:39 +01:00
CitadelStationBot
66c3f6e1be Automatic changelog generation for PR #11515 [ci skip] 2020-03-25 11:40:41 -05:00
Putnam3145
3d8084709b A dynamic rework: target threat levels (#11515)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-25 17:40:37 +01:00
CitadelStationBot
6f9e9d0be7 Automatic changelog generation for PR #11610 [ci skip] 2020-03-25 08:29:35 -05:00
necromanceranne
84f37092fe Prevents being able to fire a russian revolver in your off-hand while dual-wielding. (#11610) 2020-03-25 14:29:32 +01:00
CitadelStationBot
79b408c389 Automatic changelog generation for PR #11595 [ci skip] 2020-03-25 08:17:46 -05:00
Detective-Google
912ec5806d Bringing Our shotguns up to (TG)snuff (#11595)
* Makes Citadel shotguns match TG shotgun fire delay

* Makes Riot + Combat shotguns require two hands to fire

* also makes the 2handed change apply to double barrels and improvs.
2020-03-25 14:17:43 +01:00
monster860
927852a93a Make the no-ass-slap message actually display (#11612) 2020-03-25 12:56:57 +01:00
CitadelStationBot
b8ef114bcc Automatic changelog generation for PR #11594 [ci skip] 2020-03-24 22:05:16 -05:00
Kraseo
8d6f2fbab5 this was a bad idea (#11594) 2020-03-25 04:05:14 +01:00
necromanceranne
2b66eadc5e OW MY LIMBS HURT MORE FROM STAMINA DAMAGE 2020-03-25 09:54:46 +11:00
necromanceranne
8ebfe4885a Merge branch 'ONLY_TRUST_YOUR_FISTS' of https://github.com/necromanceranne/Citadel-Station-13 into ONLY_TRUST_YOUR_FISTS 2020-03-25 09:08:25 +11:00
necromanceranne
5341bdf008 BOXERS CAN ONLY KNOCK OUT OTHER BOXERS 2020-03-25 09:08:15 +11:00
necromanceranne
c0029612a3 SO YOU DON'T HAVE HORRIBLE MATH PROBLEMS 2020-03-25 08:53:30 +11:00
necromanceranne
3c548a3819 YES OFFICER I DO HAVE A DEADLY WEAPON THESE HANDS 2020-03-25 08:33:23 +11:00
KathrinBailey
134d861fd7 KAT SHUTTERS ALL OF THE STUFF
Checked: Animations timings, the buttons in-game (they open and close), the radiation insulation (rad shutters don't block rads once open but do once closed, 0.2x multiplier to rads). Animations all play and the shutters actually open and close.
2020-03-24 20:13:48 +00:00
CitadelStationBot
8434670d21 Automatic changelog generation for PR #11601 [ci skip] 2020-03-24 14:58:44 -05:00
Kraseo
0efa6fd065 gimme chokies uwu (#11601) 2020-03-24 20:58:41 +01:00
Ghommie
ed5a4a0528 damnit. 2020-03-24 20:46:30 +01:00
CitadelStationBot
60a88beb70 Automatic changelog generation for PR #11590 [ci skip] 2020-03-24 14:39:49 -05:00
Timothy Teakettle
62d1a1f734 cook now gets to choose their ingredient box + sushi ingredient box (#11590)
* Update miscellaneous.dm

* Update cook.dm

* fixes some bugs

* i broke something again and now fix it

* fixes remote, edits ingredient box contents

* even more wildcard items

who doesn't love eggs, grapes and various kinds of human meat? (skeleton meat is a thing for some reason, and thus it goes. IN THE LIST.)

* removes a random newline

* adds a newline to the end of the file i accidentally removed

* why was there a newline here too
2020-03-24 20:39:46 +01:00
CitadelStationBot
3fd418295e Automatic changelog generation for PR #11591 [ci skip] 2020-03-24 14:34:04 -05:00
zeroisthebiggay
82396c33cf i made an oops (#11591) 2020-03-24 20:34:01 +01:00
Ghommie
54cdae148d Removes uncompiled flightsuit code leftovers and bad hooks. 2020-03-24 20:28:13 +01:00
CitadelStationBot
5089190c83 Automatic changelog generation for PR #11580 [ci skip] 2020-03-24 14:03:52 -05:00
Timothy Teakettle
b789cd246a frying changes with bad chems (#11580)
* Update toxin_reagents.dm

* Update snacks_bread.dm

* Update toxin_reagents.dm
2020-03-24 20:03:49 +01:00
Ghommie
a2b2e08e31 Fixes crafting hud icon overlapping the second pocket on 1:1 screen mode. 2020-03-24 17:53:53 +01:00
CitadelStationBot
ebb10d766e Automatic changelog generation for PR #11546 [ci skip] 2020-03-24 08:03:34 -05:00