Commit Graph
32275 Commits
Author SHA1 Message Date
LinandGitHub d907a4948b Merge pull request #11615 from Citadel-Station-13/Ghommie-patch-3
Fixing creamed snout overlay a second time.
2020-03-26 17:57:50 -05:00
CitadelStationBot 265f67a825 Automatic changelog generation for PR #11607 [ci skip] 2020-03-26 15:24:29 -05:00
kevinz000andGitHub b32e6c3b5b Merge pull request #11607 from Ghommie/Ghommie-cit642
Adds privates visibility preferences. Also underwear now fulfills its purpose.
2020-03-26 13:24:26 -07:00
kevinz000andGitHub 3eca22350a Merge pull request #11608 from Citadel-Station-13/Ghommie-patch-1
Fixes cold movespeed slowdown affecting floating mobs (no gravity).
2020-03-26 13:24:06 -07:00
CitadelStationBot ae2facc017 Automatic changelog generation for PR #11623 [ci skip] 2020-03-26 10:51:50 -05:00
deathride58andGitHub 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
CitadelStationBot 9ab89ddcea Automatic changelog generation for PR #11404 [ci skip] 2020-03-26 10:49:52 -05:00
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
CitadelStationBot 02f7aff680 Automatic changelog generation for PR #11630 [ci skip] 2020-03-26 09:45:33 -05:00
bunny232andGitHub 4199792576 Boxstation secmos is no longer connected to the scrubber loop (#11630)
* Update BoxStation.dmm

* Update BoxStation.dmm
2020-03-26 15:45:30 +01:00
CitadelStationBot 005d7ace31 Automatic changelog generation for PR #11619 [ci skip] 2020-03-25 19:01:36 -05:00
necromanceranneandGitHub 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
necromanceranneandGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
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
GhomandGitHub e4550efb39 Fixing creamed snout overlay a second time. 2020-03-25 17:45:11 +01:00
CitadelStationBot 66c3f6e1be Automatic changelog generation for PR #11515 [ci skip] 2020-03-25 11:40:41 -05:00
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
Ghommie ddf4d759bd Now locally tested too and it works fine. 2020-03-25 17:25:23 +01:00
Ghommie c05d2c1572 Making it actually work. 2020-03-25 17:08:09 +01:00
CitadelStationBot 6f9e9d0be7 Automatic changelog generation for PR #11610 [ci skip] 2020-03-25 08:29:35 -05:00
necromanceranneandGitHub 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-GoogleandGitHub 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
monster860andGitHub 927852a93a Make the no-ass-slap message actually display (#11612) 2020-03-25 12:56:57 +01:00
Ghommie c6b4b5f686 lazy fix before I go to sleep. 2020-03-25 05:17:09 +01:00
GhomandGitHub edfc77fc2a Fixes cold movespeed slowdown affecting floating mobs (no gravity). 2020-03-25 04:18:01 +01:00
CitadelStationBot b8ef114bcc Automatic changelog generation for PR #11594 [ci skip] 2020-03-24 22:05:16 -05:00
KraseoandGitHub 8d6f2fbab5 this was a bad idea (#11594) 2020-03-25 04:05:14 +01:00
Ghommie c1e13a83fb Boom. 2020-03-25 03:35:29 +01:00
Ghommie f3b6b2f8e4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit642 2020-03-25 02:49:02 +01:00
Ghommie c9f02d97a1 Privates Visibility Preferences. Also Undergarments having a purpose. 2020-03-25 02:47:16 +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