2940f0efa5
Update code/game/objects/items/storage/firstaid.dm
...
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com >
2020-07-10 02:35:42 -04:00
2553ef6dd8
Am I finally free?
2020-07-05 00:46:56 -03:00
bd289d0edb
more map changes...
2020-07-05 00:08:33 -03:00
c2ba973c88
Merge remote-tracking branch 'origin' into emi
2020-07-04 15:59:47 -03:00
020da9fa07
i hope this works
2020-07-04 15:47:38 -03:00
03d79a1b65
I think this changed pills?
2020-06-29 18:52:21 -03:00
bfbe472114
Merge pull request #12587 from Ragolution/peachesnz
...
Peachening 2 Even with Master Boogaloo
2020-06-29 14:22:32 -07:00
2d6035c84f
Automatic changelog generation for PR #12645 [ci skip]
2020-06-29 16:18:15 -05:00
26fee48cec
Merge pull request #12645 from Ghommie/Ghommie-cit825
...
More and more fixes.
2020-06-29 14:18:10 -07:00
fdd8fec4ef
Automatic changelog generation for PR #12390 [ci skip]
2020-06-29 14:44:36 -05:00
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
62b4c54064
Automatic changelog generation for PR #12416 [ci skip]
2020-06-29 14:44:11 -05:00
42809d8b0c
Merge pull request #12416 from Ghommie/Ghommie-cit792
...
TGUI-next Check Skills menu.
2020-06-29 12:44:08 -07:00
fa25858fd7
Fix. :)
2020-06-29 21:31:24 +02:00
9930244aae
Automatic changelog generation for PR #12622 [ci skip]
2020-06-29 14:13:09 -05:00
b280c0f550
Merge pull request #12622 from timothyteakettle/grammar-fixes
...
big batch of spelling/grammar corrections
2020-06-29 21:13:06 +02:00
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
4484b1b7d6
Automatic changelog generation for PR #12605 [ci skip]
2020-06-29 13:12:29 -05:00
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
29e4f1ee09
Automatic changelog generation for PR #12595 [ci skip]
2020-06-29 13:11:42 -05:00
1966c6daca
Merge pull request #12595 from silicons/squish
...
*squish
2020-06-29 13:11:38 -05:00
a3f275a804
Automatic changelog generation for PR #12623 [ci skip]
2020-06-29 12:30:52 -05:00
a749dab2b2
Merge pull request #12623 from Citadel-Station-13/silicons-patch-7
...
i would appreciate it if outgoing mentorpms didn't sear my eyes out of my head
2020-06-29 19:30:49 +02:00
7c1328a4ca
Automatic changelog generation for PR #12626 [ci skip]
2020-06-29 12:27:10 -05:00
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
8cc7b4fea0
Merge pull request #12643 from YakumoChen/master
...
Minor fix
2020-06-29 19:25:34 +02:00
bda7eada3d
Icons for later.
2020-06-29 19:23:52 +02:00
0779dd560e
More and more fixes.
2020-06-29 18:52:37 +02:00
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
5967a552bf
Automatic changelog generation for PR #12644 [ci skip]
2020-06-29 11:29:11 -05:00
3264ece150
Merge pull request #12644 from timothyteakettle/more-blood-fixes
...
simple mob blood is no longer white
2020-06-29 18:29:07 +02:00
9d134f4fc9
blood fix
2020-06-29 16:34:55 +01:00
3b802ac062
actually stocks the new clothing
2020-06-29 13:38:36 +00:00
2f3f823997
Merge pull request #2 from Citadel-Station-13/master
...
k
2020-06-29 09:37:22 -04:00
6265cb190b
Update bindings_client.dm
2020-06-29 05:04:28 -07:00
9697e1b946
Update bindings_client.dm
2020-06-29 04:42:58 -07:00
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
53a9dd560b
Automatic changelog compile [ci skip]
2020-06-29 00:09:07 +00:00
9b7690d90c
Merge pull request #12633 from Ghommie/Ghommie-cit824
...
Few issues, solved.
2020-06-28 12:53:54 -07:00
cf53a3d38d
Automatic changelog generation for PR #12637 [ci skip]
2020-06-28 14:53:39 -05:00
abbbda15ef
Merge pull request #12637 from timothyteakettle/fixes-my-dumb-mistakes
...
fixes slime blood colour
2020-06-28 12:53:36 -07:00
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
d6cfd957ad
fix shoes
2020-06-28 17:26:50 +01:00
ae49152e10
fixes my stupid mistake
2020-06-28 17:05:30 +01:00
6e242914d1
Automatic changelog generation for PR #12611 [ci skip]
2020-06-27 22:01:31 -05:00
9e29ae97af
Merge pull request #12611 from b1tt3r1n0/fucksdgf
...
Fuck abuse of mechanics, fermi chem edition.
2020-06-28 05:01:28 +02:00
65ffadaa18
Few issues, solved.
2020-06-28 04:51:02 +02:00
2af7bed457
Automatic changelog compile [ci skip]
2020-06-28 00:08:42 +00:00
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
74a2377bc1
Automatic changelog generation for PR #12603 [ci skip]
2020-06-27 16:55:00 -05:00
Chiirno