Commit Graph

4249 Commits

Author SHA1 Message Date
kevinz000
9595df3e18 Merge pull request #11653 from zeroisthebiggay/holoparsiteportsarefunny
ports tg holoparasite customizations
2020-03-28 16:02:08 -07:00
kevinz000
6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-28 16:00:48 -07:00
ZeroMan
9f6c97c63f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into donotreviveme 2020-03-27 22:10:42 -04:00
ZeroMan
6e6d8b5098 didnt port this properly 2020-03-27 22:07:48 -04:00
ZeroMan
dba359cbaa commit not alive immediately 2020-03-27 20:51:04 -04:00
Putnam3145
b5c4124d7a Merge pull request #11638 from Ghommie/Ghommie-cit646
Moderately unoriginal PR title about runtime errors.
2020-03-27 17:12:49 -07:00
ZeroMan
54bce5ecc6 i am hol horse 2020-03-27 18:23:18 -04:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
ZeroMan
7b34ebc9b5 commit not alive immediately 2020-03-27 17:13:45 -04:00
Putnam3145
47c0cc8057 Merge pull request #11633 from Citadel-Station-13/Ghommie-patch-5
Blacklists unsynthetizable reagents from botany bees.
2020-03-26 18:53:44 -07:00
Lin
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
Ghommie
3c42e9eefd Moderately unoriginal PR title about runtime errors. 2020-03-26 23:22:51 +01:00
kevinz000
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
kevinz000
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
Ghom
4e531518c3 Update bees.dm 2020-03-26 17:20:57 +01:00
Ghom
38c37d75a3 Update bees.dm 2020-03-26 17:15:45 +01:00
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
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
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
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
Ghom
e4550efb39 Fixing creamed snout overlay a second time. 2020-03-25 17:45:11 +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
monster860
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
Ghom
edfc77fc2a Fixes cold movespeed slowdown affecting floating mobs (no gravity). 2020-03-25 04:18:01 +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
3c548a3819 YES OFFICER I DO HAVE A DEADLY WEAPON THESE HANDS 2020-03-25 08:33:23 +11:00
Kraseo
0efa6fd065 gimme chokies uwu (#11601) 2020-03-24 20:58:41 +01:00
Ghommie
54cdae148d Removes uncompiled flightsuit code leftovers and bad hooks. 2020-03-24 20:28:13 +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
3990b1f4c9 Merge pull request #11571 from Ghommie/Ghommie-cit635
Size preferences made configurable.
2020-03-23 10:37:54 -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
kappa-sama
1d2264849e meh (#11584) 2020-03-23 15:50:53 +01:00
Ghommie
c798b31d6f bodyparts cache aaaaa. 2020-03-22 22:20:26 +01:00
Ghommie
76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Ghommie
3c2cb76792 Fixing owner not being set in mutation/on_aquiring. 2020-03-22 15:23:05 +01:00
Xantholne
71fc6bc693 Fixes bumbles resting (#11564)
* Fixes bumbles resting

* Update code/modules/mob/living/simple_animal/friendly/bumbles.dm

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

* Update bumbles.dm

* Update bumbles.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-22 13:12:14 +01:00
Putnam3145
368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549)
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
2020-03-22 13:02:23 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie
6d4433dd77 Size preferences made configurable. 2020-03-22 01:07:51 +01:00
kevinz000
c7e634b8c8 Merge pull request #11565 from Citadel-Station-13/Ghommie-patch-1
Fixing permanent slapstick comedy creamed overlay.
2020-03-21 10:30:12 -07:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
* 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

* i hate you

* wrong button

* k

* ok

* bet

* 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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-21 16:04:26 +01:00
Trilbyspaceclone
2bfc9b8ef8 Gutlunchs now like to eat bodys a bit more! (#11545)
* Update gutlunch.dm

* hey what if we didnt just port a semi fix...
2020-03-21 15:07:32 +01:00
Ghom
cf4f7a705d Update human.dm 2020-03-21 14:52:16 +01:00
ZeroMan
93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
2020-03-21 02:17:13 -04:00