Commit Graph

20916 Commits

Author SHA1 Message Date
deathride58
0bf2cf0484 Adds a lfwb-inspired orbiting pixel + flashing outline animation to the sprint and combat buttons (toggleable via prefs) (#11623)
* Adds a flashing effect to the sprint and combat mode toggles (toggleable via prefs)

* Adds the ability to change the color of the hud toggle flash as well
2020-03-26 16:51:48 +01:00
Trilbyspaceclone
8bd238c87c Reblances flares, flashlights and eye-lights (#11404)
* Update flashlight.dm

* makes the torch be enlightend

* Update flashlight.dm

* Update code/game/objects/items/devices/flashlight.dm

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

* >makes atmo pipes small items >makes heavy duty flashlight lightweight > muh realism

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-26 16:49:49 +01:00
necromanceranne
b57ce2d7ff missed this with my last pr (#11619) 2020-03-26 01:01:34 +01:00
necromanceranne
26ec48f174 straight shooting guns (#11602) 2020-03-25 21:18:02 +01: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
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
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
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
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
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
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
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
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
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
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
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
Kraseo
0efa6fd065 gimme chokies uwu (#11601) 2020-03-24 20:58:41 +01: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
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
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
Trilbyspaceclone
f8147e5a85 Ports over Mortars and Pestles (#11546)
* 2 ports for the commit of 1!

ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086

* what if we didnt have that...

* Apply suggestions from code review

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-24 14:03:31 +01:00
Ghommie
97ad47f3fd Fixing an inconsistency with nuclear bombs exploding on station level space. 2020-03-23 22:40:02 +01:00
Ghommie
d336bcf259 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit632 2020-03-23 21:02:47 +01:00
kevinz000
ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
kevinz000
cc80d463b7 Merge pull request #11536 from Trilbyspaceclone/patch-316
Water and Unholy water tweaks
2020-03-23 10:40:19 -07:00
kevinz000
33317e20fe Merge pull request #11570 from zeroisthebiggay/contractorrandomitemspowergaming
moves sneaksuit to bundles, removes useless contractor items, adds sneaksuit to contractor pool of random items
2020-03-23 10:38:22 -07:00
kevinz000
3990b1f4c9 Merge pull request #11571 from Ghommie/Ghommie-cit635
Size preferences made configurable.
2020-03-23 10:37:54 -07:00
kevinz000
ddd00b1981 Merge pull request #11572 from DeltaFire15/clockies-vanguardstam
Clockie Vanguard Spell - rebalance for stamcombat
2020-03-23 10:37:42 -07:00
kevinz000
fbe77495e8 Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020
Porting Juices, Drinks, and Salami [READY]
2020-03-23 10:36:44 -07:00
kevinz000
dfec544d71 Merge pull request #11578 from Ghommie/Ghommie-cit636
Fixing owner not being set in mutation/on_aquiring.
2020-03-23 10:36:17 -07:00
kevinz000
57429493c6 Merge pull request #11581 from Ghommie/Ghommie-cit637
M/F body preferences.
2020-03-23 10:34:02 -07:00
kevinz000
9be09df036 Merge pull request #11582 from keronshb/ReverseRNGMiningBase
Reverses Random Mining Base Placement
2020-03-23 10:28:14 -07:00
Ghommie
fd9985fb27 Made votes obfuscation settings more robust. 2020-03-23 18:12:12 +01:00
kappa-sama
1d2264849e meh (#11584) 2020-03-23 15:50:53 +01:00
zeroisthebiggay
f5a96241ab sneaksuits are not fireproof (#11573)
* and i wanna die

* i decide to revert

* a a a a
2020-03-23 15:47:41 +01:00
Putnam3145
a5224b0b8b Merge pull request #11568 from Ghommie/Ghommie-cit634
Two runtimes, one fix.
2020-03-23 00:03:23 -07:00
Winter Flare
29576ee6a7 Travis Please 2020-03-22 20:34:38 -04:00
Winter Flare
0effeb6ed5 Ports Hyper Drinks
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
2020-03-22 19:33:50 -04:00
Ghommie
c798b31d6f bodyparts cache aaaaa. 2020-03-22 22:20:26 +01:00
keronshb
830f646383 Revert "Merge pull request #11225 from r4d6/Random-Mining"
This reverts commit ea5774e713.
2020-03-22 15:55:08 -04:00