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
Putnam3145
42809d8b0c
Merge pull request #12416 from Ghommie/Ghommie-cit792
...
TGUI-next Check Skills menu.
2020-06-29 12:44:08 -07:00
Ghommie
fa25858fd7
Fix. :)
2020-06-29 21:31:24 +02: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
Lin
74a3f05c2a
Merge pull request #12608 from Citadel-Station-13/silicons-patch-5
...
maybe allows players to use !notify
2020-06-29 13:14:43 -05:00
Lin
0a59453ce6
Merge pull request #12605 from Citadel-Station-13/silicons-patch-4
...
adds line numbers to config errors
2020-06-29 13:12:25 -05:00
Ghom
a8046d072a
Merge pull request #12626 from Citadel-Station-13/silicons-patch-10
...
prevents duplicate chatboxes from typing indicators by inserting 28 macros into the basic macro sets that just trigger a nonsensical verb that does nothing
2020-06-29 19:27:07 +02:00
Ghom
8cc7b4fea0
Merge pull request #12643 from YakumoChen/master
...
Minor fix
2020-06-29 19:25:34 +02:00
Ghom
58e606b4f2
Merge pull request #12640 from Citadel-Station-13/silicons-patch-6
...
fixes independent bindings not registering keyups
2020-06-29 18:34:07 +02:00
Timothy Teakettle
9d134f4fc9
blood fix
2020-06-29 16:34:55 +01:00
YakumoChen
3b802ac062
actually stocks the new clothing
2020-06-29 13:38:36 +00:00
silicons
6265cb190b
Update bindings_client.dm
2020-06-29 05:04:28 -07:00
silicons
9697e1b946
Update bindings_client.dm
2020-06-29 04:42:58 -07:00
Ghommie
5307676317
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
2020-06-29 06:55:35 +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
Timothy Teakettle
d6cfd957ad
fix shoes
2020-06-28 17:26:50 +01:00
Timothy Teakettle
ae49152e10
fixes my stupid mistake
2020-06-28 17:05:30 +01:00
Ghommie
65ffadaa18
Few issues, solved.
2020-06-28 04:51:02 +02:00
Ghom
0d5888daf6
Merge pull request #12628 from Citadel-Station-13/silicons-patch-11
...
adds a __nan() proc to fetch a nan number because there's no other way to for debugging
2020-06-28 00:19:38 +02:00
silicons
2ab69c0170
Merge pull request #12603 from b1tt3r1n0/Pouches(again)
...
Some edits to pouches, and something that can hold sheets.
2020-06-27 14:54:57 -07: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
silicons
8b04fd70de
Merge pull request #12615 from Ghommie/Ghommie-cit821
...
Solving several issues.
2020-06-27 14:52:59 -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
silicons
0c4e1e7696
Update SDQL_2_wrappers.dm
2020-06-27 07:17:29 -07:00
silicons
ced24b8931
Update input.dm
2020-06-27 01:39:34 -07:00
silicons
0e2f3d0f04
Update input.dm
2020-06-27 01:29:26 -07:00
timothyteakettle
b94267e1e1
more spellchecks
2020-06-27 02:41:50 +01: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
silicons
13c2c335f4
Update chat_commands.dm
2020-06-26 10:50:09 -07:00
Ghom
c003904600
Update code/game/machinery/doors/door.dm
...
Co-authored-by: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com >
2020-06-26 19:14:20 +02:00
Ghommie
09ce081565
Based chicken simple mob reveals issue with code.
2020-06-26 19:11:23 +02:00
Ghommie
d1025b10cd
mh.
2020-06-26 18:49:20 +02:00
Ghommie
8f6b31c26e
Solving several issues.
2020-06-26 18:40:20 +02:00
Ghom
8672f2e819
Merge pull request #12610 from Detective-Google/resting
...
Lying down now respects the direction you're facing
2020-06-26 13:40:11 +02:00
silicons
a2a1ae3a2c
Merge pull request #12592 from timothyteakettle/felinids-nya-when-tabled
...
felinids nya when tabled
2020-06-25 18:33:34 -07: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
silicons
46acf770b4
Update roundend.dm
2020-06-25 14:00:37 -07:00
Detective Google
57fca41e20
aeugh2
2020-06-25 15:22:11 -05:00
Detective Google
5d99f68d8c
stinky panda goes in the box
2020-06-25 14:57:41 -05:00
silicons
54c8d58e52
Update clown_items.dm
2020-06-24 23:20:51 -07:00
silicons
9c70fa2136
Update configuration.dm
2020-06-24 20:40:57 -07:00
silicons
cd893c60a2
Merge pull request #12600 from Ghommie/Ghommie-cit820
...
Fixing the snore-pocalypse, and another not so critical issue.
2020-06-24 20:27:16 -07:00
