Commit Graph

24385 Commits

Author SHA1 Message Date
ancientpower
99d73388f8 lets ghosts see the contents of closets 2020-08-11 16:40:03 -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
Letter N
ab7c560f6d revert 2020-08-11 16:04:18 +08: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
The0bserver
66de3b5a4f Garlic, you will have a harvest state 2020-08-11 03:03:36 -04:00
The0bserver
d20a9bcf21 Initial Commit: Weed less awful. Garlic visible 2020-08-11 02:45:45 -04:00
silicons
5814eba033 Merge pull request #13103 from Hatterhat/oops-all-parries
funny timestop katana is less funny and more gameplay oriented
2020-08-10 23:30:30 -07:00
silicons
c45ad3af6e Update revenant.dm 2020-08-10 21:14:20 -07:00
Letter N
7008dac8dd what if the maps aren't causing runtims 2020-08-11 11:49:25 +08:00
timothyteakettle
b9efa05ec4 double FUCK 2020-08-11 03:40:41 +01:00
timothyteakettle
84a8585055 FUCK 2020-08-11 03:38:25 +01:00
timothyteakettle
1f240b883f holy shit 2020-08-11 03:37:04 +01:00
Timothy Teakettle
ef3b0fd936 no need for this repetition 2020-08-10 21:47:59 +01:00
Timothy Teakettle
24557c415c i said CEASE 2020-08-10 21:42:52 +01:00
Timothy Teakettle
033fe553e8 cease your shitcode 2020-08-10 21:41:06 +01:00
DeltaFire
0f27a89e5d yeah this belongs into the armory
Hellgun single pack
goodies > armory
2020-08-10 18:41:56 +02:00
Hatterhat
f4f8812318 whitespace (tm) 2020-08-10 11:30:36 -05:00
Hatterhat
4610908b8e Merge branch 'master' into parries-but-dumber 2020-08-10 11:29:27 -05:00
zerothebigboy
9baedbd904 a 2020-08-10 10:08:25 -04:00
zerothebigboy
cf75f7d4b6 a 2020-08-10 10:08:15 -04:00
silicons
375f740d8b sigh 2020-08-10 04:52:33 -07:00
Letter N
afe53992b5 miniump of 5, max of 12 2020-08-10 17:47:33 +08:00
silicons
05290c85f3 Merge pull request #13094 from Hatterhat/tc-theft-patch
PDA Uplinks Can Now Siphon Pens
2020-08-10 02:30:11 -07:00
silicons
ef2c024fbe Merge pull request #13093 from kappa-sama/patch-41
Tracer's a human, not a changeling.
2020-08-10 02:29:58 -07:00
silicons
3795bcf2d0 Merge pull request #13097 from zeroisthebiggay/yessalthairpr
Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because
2020-08-10 02:29:47 -07:00
Letter N
c70f1510e6 fairly sure mmo mafia is not a thing and i'm lazy 2020-08-10 16:00:38 +08:00
Letter N
ec57c24a71 endgame 2020-08-10 13:10:40 +08:00
Hatterhat
301adc6769 ung 2020-08-09 23:58:12 -05:00
Letter N
a4040ace26 hewwo have you tried to work? 2020-08-10 10:50:07 +08:00
Hatterhat
ff49790ac9 radius/force/blockchance nerf 2020-08-09 21:27:57 -05:00