Commit Graph

34817 Commits

Author SHA1 Message Date
Ghommie
fa25858fd7 Fix. :) 2020-06-29 21:31:24 +02: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
Changelogs
53a9dd560b Automatic changelog compile [ci skip] 2020-06-29 00:09:07 +00:00
silicons
9b7690d90c Merge pull request #12633 from Ghommie/Ghommie-cit824
Few issues, solved.
2020-06-28 12:53:54 -07:00
CitadelStationBot
cf53a3d38d Automatic changelog generation for PR #12637 [ci skip] 2020-06-28 14:53:39 -05: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
CitadelStationBot
6e242914d1 Automatic changelog generation for PR #12611 [ci skip] 2020-06-27 22:01:31 -05:00
Ghom
9e29ae97af Merge pull request #12611 from b1tt3r1n0/fucksdgf
Fuck abuse of mechanics, fermi chem edition.
2020-06-28 05:01:28 +02:00
Ghommie
65ffadaa18 Few issues, solved. 2020-06-28 04:51:02 +02:00
Changelogs
2af7bed457 Automatic changelog compile [ci skip] 2020-06-28 00:08:42 +00: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
CitadelStationBot
74a2377bc1 Automatic changelog generation for PR #12603 [ci skip] 2020-06-27 16:55:00 -05: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
CitadelStationBot
5d1e806bdc Automatic changelog generation for PR #12601 [ci skip] 2020-06-27 16:54:47 -05: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
CitadelStationBot
a1934f5280 Automatic changelog generation for PR #12607 [ci skip] 2020-06-27 16:54:34 -05:00
silicons
e51bee9649 Merge pull request #12607 from Detective-Google/cog-2
cog fixes round 2
2020-06-27 14:54:31 -07:00
CitadelStationBot
24fa9e2887 Automatic changelog generation for PR #12591 [ci skip] 2020-06-27 16:53:55 -05:00
silicons
7115df73f7 Merge pull request #12591 from MrJWhit/snow-snaxi-update
Snow Snaxi update
2020-06-27 14:53:52 -07:00
CitadelStationBot
0b2e7aa441 Automatic changelog generation for PR #12596 [ci skip] 2020-06-27 16:53:32 -05: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
CitadelStationBot
a66fc1db07 Automatic changelog generation for PR #12615 [ci skip] 2020-06-27 16:53:04 -05:00
silicons
8b04fd70de Merge pull request #12615 from Ghommie/Ghommie-cit821
Solving several issues.
2020-06-27 14:52:59 -07:00
CitadelStationBot
4e52d51cc7 Automatic changelog generation for PR #12619 [ci skip] 2020-06-27 15:14:21 -05: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
CitadelStationBot
0970234483 Automatic changelog generation for PR #12627 [ci skip] 2020-06-27 08:53:40 -05:00
silicons
3dbc10bced Merge pull request #12627 from Putnam3145/song-by-jimmy-buffet
[S] You can save the whales, you can save the toads
2020-06-27 06:53:37 -07:00
Putnam
e407ca754f You can save the whales, you can save the toads
but i don't care if the...
2020-06-27 06:42:27 -07:00
BlackMajor
e3ed6ead49 Merge pull request #12618 from Ragolution/clapclap-done
By request and by request only. Adds new brain Trauma message. @BlackMajor
2020-06-27 17:10:48 +12:00
silicons
3c4d3791a4 Update life.dm 2020-06-26 17:21:20 -07:00
Changelogs
6dc290a192 Automatic changelog compile [ci skip] 2020-06-27 00:08:12 +00:00
Timothy Teakettle
9c9868438c some fixes 2020-06-26 22:49:43 +01:00
Ghom
fe021f2dc8 Merge pull request #12616 from Citadel-Station-13/silicons-patch-6
fixes duplicate @ in notify
2020-06-26 21:52:20 +02:00
Timothy Teakettle
334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
Ragolution
2739937a44 By request and by request only. 2020-06-26 15:09:19 -04: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
CitadelStationBot
7f563c24fd Automatic changelog generation for PR #12610 [ci skip] 2020-06-26 06:40:15 -05: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
CitadelStationBot
a83a543bdf Automatic changelog generation for PR #12592 [ci skip] 2020-06-25 20:33:37 -05: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
b1tt3r1n0
38153a2cbe Fuck abuse of mechanics, fermi chem edition. 2020-06-25 21:20:58 -04: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