Commit Graph

4810 Commits

Author SHA1 Message Date
silicons
cee15792b7 ok 2020-07-07 07:25:10 -07:00
Lin
d04b335d1a Merge pull request #12652 from silicons/cool
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
2020-07-04 14:12:43 -05:00
silicons
c10350f10e Merge pull request #12677 from Ghommie/Ghommie-cit830
Fixes items' skills list keys missing associated traits and improves modulability a little.
2020-07-04 00:12:37 -07:00
silicons
dbf88a1408 Merge pull request #12676 from Ghommie/Ghommie-cit829
Improvements to the recent clothing menu toggle hardsuit helmet feature.
2020-07-04 00:12:29 -07:00
silicons
a61e22de71 Merge pull request #12675 from Ghommie/Ghommie-cit828
Fixing (un)equip penalties from obscured inv slots.
2020-07-04 00:12:04 -07:00
Ghommie
e3b1ca4942 Linter. 2020-07-03 19:57:38 +02:00
Ghommie
bde80eb1fb Fixing obscured inventory slots (un)equip block, for real. 2020-07-03 19:02:20 +02:00
silicons
d85edbf8fb ok 2020-07-03 02:15:06 -07:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Ghommie
92c846fdbf Improvements to the recent clothing menu toggle hardsuit helmet feature. 2020-07-03 01:08:28 +02:00
Ghom
50716ee393 Merge pull request #12668 from Arturlang/strip_menu_helmet
Hardsuit strip menu helmet toggle
2020-07-03 00:41:03 +02:00
Ghommie
6fc584518a Fixing (un)equip penalties from obscured inv slots. 2020-07-03 00:07:30 +02:00
silicons
3f1119fcdb Merge pull request #12630 from Ghommie/Ghommie-cit822
You can't (un)equip garments on/from obscured inventory slots anymore.
2020-07-02 01:44:59 -07:00
silicons
cbad654371 Merge pull request #12632 from Ghommie/Ghommie-cit823
Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size
2020-07-02 01:44:09 -07:00
Artur
582d672109 Hardsuit strip menu helmet toggle 2020-07-02 01:31:15 +03:00
silicons
f03343b516 fix 2020-06-30 05:19:50 -07:00
silicons
2039496739 groan 2020-06-30 03:05:15 -07:00
silicons
9756431612 Spelling 2020-06-29 23:52:18 -07:00
silicons
7a2818d657 fix 2020-06-29 23:45:18 -07:00
silicons
6a91ce8416 fix 2020-06-29 23:43:53 -07:00
silicons
ee34f37ac2 fix 2020-06-29 23:41:53 -07:00
silicons
3b3a3ad44e nayser 2020-06-29 23:37:51 -07:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
silicons
52953cae4d Merge pull request #12598 from timothyteakettle/improves-char-customization
speech options on char customization, small skeleton changes
2020-06-29 14:47:25 -07:00
Timothy Teakettle
a7c905dfe9 handles skeletons better 2020-06-29 22:37:04 +01:00
silicons
26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
2020-06-29 14:18:10 -07:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-06-29 12:44:33 -07:00
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
2020-06-29 21:13:06 +02:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
silicons
9b7690d90c Merge pull request #12633 from Ghommie/Ghommie-cit824
Few issues, solved.
2020-06-28 12:53:54 -07:00
silicons
abbbda15ef Merge pull request #12637 from timothyteakettle/fixes-my-dumb-mistakes
fixes slime blood colour
2020-06-28 12:53:36 -07:00
Lin
f1aedce87b Merge pull request #12621 from Citadel-Station-13/silicons-patch-6
fixes a few things with the new Life()
2020-06-28 13:36:55 -05:00
Ghommie
436c41d343 Forgot about this. 2020-06-28 19:33:22 +02:00
Timothy Teakettle
d6cfd957ad fix shoes 2020-06-28 17:26:50 +01:00
Ghommie
65ffadaa18 Few issues, solved. 2020-06-28 04:51:02 +02:00
Ghommie
6e90560173 Nerfs natural stamina recovery outside of stam-crit. 2020-06-28 02:40:16 +02:00
Ghommie
86241dbe8d ah 2020-06-28 01:15:36 +02:00
Ghommie
a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
silicons
5c10370326 Merge pull request #12601 from Detective-Google/piggyback
piggyback carrying people is no longer comically slow
2020-06-27 14:54:44 -07:00
silicons
e51bee9649 Merge pull request #12607 from Detective-Google/cog-2
cog fixes round 2
2020-06-27 14:54:31 -07:00
silicons
45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
2020-06-27 14:53:28 -07:00
Ghom
58778f2e6e Merge pull request #12619 from timothyteakettle/what-if-blood-didnt-suck
slimes blood colour is their body colour
2020-06-27 22:14:17 +02:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
silicons
3c4d3791a4 Update life.dm 2020-06-26 17:21:20 -07:00
Timothy Teakettle
9c9868438c some fixes 2020-06-26 22:49:43 +01:00
Timothy Teakettle
334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
Detective-Google
8998373241 Update code/modules/mob/living/living_mobility.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-25 19:58:41 -05:00
Detective Google
ea5b155057 lying down now isnt random 2020-06-25 19:39:37 -05:00
Detective Google
5d99f68d8c stinky panda goes in the box 2020-06-25 14:57:41 -05:00
Detective Google
a4c243331c aeugh 2020-06-24 17:25:39 -05:00