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
Ghommie
0779dd560e
More and more fixes.
2020-06-29 18:52:37 +02:00
Timothy Teakettle
70a2238f04
more pet carrier changes
2020-06-29 17:43:16 +01: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
d6a7f91b81
Update autobunker.dm
2020-06-29 04:45:05 -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
timothyteakettle
2e4c5e322d
tray and jar
2020-06-29 02:49:31 +01: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
Ghommie
2f5d351d70
Just ups stamina cost for bashing people.
2020-06-28 18:47:55 +02: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
Ghommie
6e90560173
Nerfs natural stamina recovery outside of stam-crit.
2020-06-28 02:40:16 +02:00
Ghom
a2a2476243
Update shaft_miner.dm
2020-06-28 02:03:35 +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
kappa-sama
548fabfb2d
viscera cleanup detail
2020-06-27 18:21:22 -04:00
kappa-sama
fec2d1aded
someone call the janitor
2020-06-27 18:21:01 -04:00
kappa-sama
bf6a1b3de4
cleanup crew
2020-06-27 18:20:40 -04:00
kappa-sama
5787a75dee
node
2020-06-27 18:20:13 -04:00
kappa-sama
d98175d947
decal painter to lathe
2020-06-27 18:19:49 -04: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
kappa-sama
61caf7dde2
spraycan
2020-06-27 18:15:20 -04:00
kappa-sama
579727d41d
spraycans
2020-06-27 18:14:20 -04:00
kappa-sama
a96bd52c91
airlock painting
2020-06-27 18:13:09 -04: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
L
3aefc8ae10
tg changes
2020-06-27 07:01:19 -03: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
silicons
30a4bb5683
Update client_procs.dm
2020-06-27 01:20:15 -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