Commit Graph

24553 Commits

Author SHA1 Message Date
Letter N 5727add7ab commit name 2020-08-13 11:41:33 +08:00
MrJWhit 20a9451b56 Update lizardpeople.dm 2020-08-12 21:35:36 -04:00
silicons b931b450ac Update nanite_cloud_controller.dm 2020-08-12 17:18:56 -07:00
silicons bb29d85983 Update nanite_programmer.dm 2020-08-12 17:18:40 -07:00
silicons cd95685eaa Update nanite_program_hub.dm 2020-08-12 17:18:06 -07:00
Timothy Teakettle e5d48e307a woops 2020-08-12 17:04:37 +01:00
Timothy Teakettle 82298fd56c yes 2020-08-12 17:03:23 +01:00
silicons d2773456f0 Update mob.dm 2020-08-12 08:33:06 -07:00
Letter N 1f2d9ca2ef jar moment 2020-08-12 19:35:24 +08:00
Letter N 191dee80b8 50% more fun! 2020-08-12 17:20:29 +08:00
Letter N 081f07e259 bye! 2020-08-12 16:38:36 +08:00
silicons 3e67fd11e8 Update chair.dm 2020-08-11 23:39:31 -07:00
lolman360 3aba9eb5a6 kee 2020-08-12 15:11:55 +10:00
silicons 569cef0e42 Update ethereal.dm 2020-08-11 17:05:32 -07:00
timothyteakettle 2a6490b60c yes 2020-08-12 00:47:06 +01:00
timothyteakettle cd8430a897 woops 2020-08-12 00:42:51 +01:00
timothyteakettle a2721b1ccd traits 2020-08-12 00:40:49 +01:00
silicons 130c3a9480 Merge pull request #13096 from Michiyamenotehifunana/possum
Ports Opossums from Desert Rose
2020-08-11 16:19:42 -07:00
Lin ddb3db5796 Merge pull request #13114 from Citadel-Station-13/silicons-patch-1
"it'll be fine Sables, nothing bad will happen if we remove the /mob blacklist from radiation"
2020-08-11 18:10:01 -05:00
lolman360 6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
ancientpower 99d73388f8 lets ghosts see the contents of closets 2020-08-11 16:40:03 -05:00
Hatterhat eeefc1cbaa heho woundies 2020-08-11 16:01:29 -05:00
Timothy Teakettle 45dae759df all the homies hate travis 2020-08-11 21:04:29 +01:00
Timothy Teakettle 4a2bbe66d6 Merge branch 'master' into cum 2020-08-11 18:30:30 +01:00
silicons 775fa046eb you can now use any typepath as an emoji :/obj/item/clothing/mask/joy: (#12808)
* Update emoji_parse.dm

* Update emoji_parse.dm
2020-08-11 14:17:35 +02:00
The0bserver 2b36c4dcdf Regis, I will fight you, the irish, and some tea 2020-08-11 05:52:48 -04:00
The0bserver 5c6c298547 COOL PLANT FACTS:GARLIC WAS IN GROWING.DMI 2020-08-11 05:14:02 -04:00
lolman360 8c70b56706 whoops 2020-08-11 19:04:59 +10:00
lolman360 472ef6165f imamurderer 2020-08-11 18:52:26 +10:00
silicons a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
silicons cf209939ea Merge pull request #13070 from kappa-sama/patch-40
lowers price of 2 borderline useless uplink items
2020-08-11 01:44:40 -07:00
silicons b16f920479 Merge pull request #13086 from ArchieBeepBoop/dev
Add Skulldog Snout
2020-08-11 01:44:29 -07:00
silicons e7d7b991d9 Merge pull request #13107 from DeltaFire15/warcrime-gun-armory-lock
The warcrime gun belongs in the armory
2020-08-11 01:44:07 -07:00
silicons 2d01c4db5b Merge pull request #13106 from zeroisthebiggay/cesuitgoclick
ce hardsuit no longer requires a jumpsuit to actually be fully radproof
2020-08-11 01:43:54 -07:00
silicons 16a556b367 Merge pull request #13101 from Detective-Google/funny
spelling
2020-08-11 01:43:35 -07:00
silicons df05c5ee4d Merge pull request #13089 from Putnam3145/fix-sprite-display
Demodularization + making certain sprite overlays less hilariously jank
2020-08-11 01:43:21 -07:00
silicons c1d8d1d439 Merge pull request #13090 from lolzalolka/lean
Added Burek to Space
2020-08-11 01:42:58 -07:00
silicons 23b235d6ed Update living_active_block.dm 2020-08-11 01:42:42 -07:00
silicons 5694923d89 Merge pull request #13095 from lolman360/liver
custom name/desc ring and necklace
2020-08-11 01:41:48 -07:00
silicons 035422ed7f Merge pull request #13098 from LetterN/ToS-component
Mafia Component
2020-08-11 01:41:13 -07:00
silicons 82824f9fb9 Merge pull request #13100 from lolzalolka/lean2
Suture/Mesh Crafting (take2)
2020-08-11 01:40:50 -07:00
lolman360 49948e77a4 SELLYOULOSE 2020-08-11 18:08:40 +10:00
Letter N ab7c560f6d revert 2020-08-11 16:04:18 +08:00
lolman360 f10053fe96 suture 2020-08-11 18:03:59 +10:00
lolman360 c699729250 lint 2020-08-11 17:53:51 +10:00
lolman360 740b4f3ecf WHOOPS 2020-08-11 17:50:30 +10:00
lolman360 6ec9a3c4bd craftable plunger 2020-08-11 17:38:16 +10:00
silicons 7bcbcda37b Update nanite_cloud_controller.dm 2020-08-11 00:37:44 -07:00
silicons 471d036881 Update nanite_programmer.dm 2020-08-11 00:35:53 -07:00
silicons e99414c3d4 Update nanite_program_hub.dm 2020-08-11 00:34:17 -07:00