Commit Graph

34788 Commits

Author SHA1 Message Date
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
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
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
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
Changelogs 549fee0624 Automatic changelog compile [ci skip] 2020-06-26 00:08:13 +00:00
Detective Google 57fca41e20 aeugh2 2020-06-25 15:22:11 -05:00
Detective Google 42ae6233db aeugh 2020-06-25 15:18:11 -05:00
Detective Google 5d99f68d8c stinky panda goes in the box 2020-06-25 14:57:41 -05:00
Detective Google f33586a4b5 coggers 2020-06-25 14:41:03 -05:00
CitadelStationBot 79a8be2c65 Automatic changelog generation for PR #12606 [ci skip] 2020-06-25 09:08:54 -05:00
Ghom a1f9a39289 Merge pull request #12606 from Citadel-Station-13/silicons-patch-5
fixes soap not cleaning blood
2020-06-25 16:08:51 +02:00
silicons 54c8d58e52 Update clown_items.dm 2020-06-24 23:20:51 -07:00
CitadelStationBot 7967424036 Automatic changelog generation for PR #12600 [ci skip] 2020-06-24 22:27:20 -05: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
b1tt3r1n0 a780b9037c Some edits to pouches, and something that can hold sheets.
Title. Vendor edits and a minor engineering addition for those who want to hold sheets and shit.
2020-06-24 23:07:56 -04:00
Changelogs 0b180bd1eb Automatic changelog compile [ci skip] 2020-06-25 00:08:04 +00:00
Detective Google a4c243331c aeugh 2020-06-24 17:25:39 -05:00
Detective Google e061f7f7ea piggyback carrying people is no longer comically slow 2020-06-24 17:10:41 -05:00
CitadelStationBot e3380c4f70 Automatic changelog generation for PR #12588 [ci skip] 2020-06-24 16:36:10 -05:00
Ghom 0f3cd7bbd8 Merge pull request #12588 from Citadel-Station-13/Linzolle-patch-1
organs now decay while dead again
2020-06-24 23:36:07 +02:00
CitadelStationBot d832ec14c6 Automatic changelog generation for PR #12599 [ci skip] 2020-06-24 16:35:15 -05:00