b5c4124d7a
Merge pull request #11638 from Ghommie/Ghommie-cit646
...
Moderately unoriginal PR title about runtime errors.
2020-03-27 17:12:49 -07:00
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
3c42e9eefd
Moderately unoriginal PR title about runtime errors.
2020-03-26 23:22:51 +01:00
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
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
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
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
46e3267d4c
Merge pull request #11557 from Ghommie/Ghommie-cit632
...
Removes species default_features variable.
2020-03-25 12:16:40 -07: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
e4550efb39
Fixing creamed snout overlay a second time.
2020-03-25 17:45:11 +01:00
927852a93a
Make the no-ass-slap message actually display ( #11612 )
2020-03-25 12:56:57 +01:00
c6b4b5f686
lazy fix before I go to sleep.
2020-03-25 05:17:09 +01:00
edfc77fc2a
Fixes cold movespeed slowdown affecting floating mobs (no gravity).
2020-03-25 04:18:01 +01:00
c9f02d97a1
Privates Visibility Preferences. Also Undergarments having a purpose.
2020-03-25 02:47:16 +01:00
3c548a3819
YES OFFICER I DO HAVE A DEADLY WEAPON THESE HANDS
2020-03-25 08:33:23 +11:00
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
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
3990b1f4c9
Merge pull request #11571 from Ghommie/Ghommie-cit635
...
Size preferences made configurable.
2020-03-23 10:37:54 -07:00
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
c798b31d6f
bodyparts cache aaaaa.
2020-03-22 22:20:26 +01:00
76ff0d4931
M/F body preferences.
2020-03-22 19:47:48 +01:00
3c2cb76792
Fixing owner not being set in mutation/on_aquiring.
2020-03-22 15:23:05 +01:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
6d4433dd77
Size preferences made configurable.
2020-03-22 01:07:51 +01:00
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
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
cf4f7a705d
Update human.dm
2020-03-21 14:52:16 +01:00
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
26e2ec92ca
Removes species default_features variable.
2020-03-21 02:04:57 +01:00
35a4d71a54
im sorry little one
2020-03-19 21:59:14 -04:00
8b0600a7fa
Merge pull request #11527 from Ghommie/Ghommie-cit628
...
More bug reports yee'd their last haw.
2020-03-19 18:56:32 -07:00
32975bf509
More bug reports yee'd their last haw.
2020-03-18 23:43:23 +01:00
b062c76ca7
Merge pull request #11485 from Ghommie/Ghommie-cit625
...
Fixing a little issue with the musician trait etcetera.
2020-03-16 13:23:25 -07:00
ffb2e65c17
why I hate byond ( #11496 )
2020-03-16 17:20:51 +01:00
5e5bdec85d
More runtime errors.
2020-03-16 01:55:02 +01:00
06d641b46a
Webedit fixing electrocute_act stuns.
2020-03-14 21:19:09 +01:00
0953ec19e5
Merge pull request #11453 from necromanceranne/I_am_at_high_risk_of_stroke
...
I'm pretty sure this was causing people to bleed out from light hits
2020-03-14 09:11:38 -07:00
49c0aba205
bleeding out from a toolbox smack is not cool gamers
2020-03-14 04:25:12 +11:00
0876a1eef6
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
54713dc1e4
Merge pull request #11408 from necromanceranne/sleeping_carp_port
...
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
2020-03-11 17:26:33 -07:00
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
480eb32c68
Merge pull request #11418 from Ghommie/Ghommie-cit615
...
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
f7674067d2
Merge pull request #11421 from Citadel-Station-13/kevinz000-patch-2
...
Fixes the "blind while not unconscious bug", alternatively, "if in doubt, assume something is coded in the worst possible way and is held together by duct tape and prayers"
2020-03-11 13:17:47 +01:00
46823a127b
Merge pull request #11335 from Ghommie/Ghommie-cit604
...
Made flavor texts into an element datum, appliable to every atom.
2020-03-10 17:26:20 -07:00
c4f59b0b83
Update life.dm
2020-03-10 17:18:01 -07:00
bb1480a369
Update carbon.dm
2020-03-10 17:16:33 -07:00
f5fd4733e1
Merge pull request #11411 from Citadel-Station-13/Ghommie-patch-1
...
Webedit touching the MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING speed modifier: Citadel Edition.
2020-03-10 17:14:51 -07:00
27a7f754c4
Fix runtimes some more.
2020-03-10 22:40:06 +01:00
424a3d9668
Merge pull request #11399 from Seris02/lizardtailfixes
...
normalising wagging tail names for a very specific bug fix
2020-03-10 16:59:55 +01:00
c86124f8ed
Update human.dm
2020-03-10 14:34:17 +01:00
Putnam3145