Commit Graph

24553 Commits

Author SHA1 Message Date
lolman360 6e2bb79834 Update medipenrefill.dm 2020-08-11 17:32:44 +10:00
lolman360 f977ac7180 e e e ee ee 2020-08-11 17:08:21 +10: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
lolman360 c18f0defd8 medi8el 2020-08-11 16:44:08 +10: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
kiwedespars 3bd2f73449 travis 2020-08-10 21:37:50 -07:00
kiwedespars 4750b41b99 do you think i could really get away with this 2020-08-10 21:18:03 -07:00
silicons c45ad3af6e Update revenant.dm 2020-08-10 21:14:20 -07:00
kiwedespars cac77ec121 probably important right now for admin-given heretics to receive equipment. 2020-08-10 21:06:15 -07:00
kiwedespars 036c7dbe39 Merge remote-tracking branch 'upstream/master' into heretics 2020-08-10 21:05:56 -07:00
kiwedespars 415e2556f9 descriptions, conflict, and actually puts requirements for the gamemode. 2020-08-10 20:59:51 -07:00
Letter N 7008dac8dd what if the maps aren't causing runtims 2020-08-11 11:49:25 +08:00
kiwedespars c09960c48f woops fixed sacrificing, husks people instead of gibbing now. 2020-08-10 20:00:42 -07: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
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07: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
Hatterhat 8370a31942 funny adminspawn wound bullets 2020-08-10 12:12:32 -05: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
Michiyamenotehifunana 0f274d5891 Fixes some code anomalies
Adds newline to possum code, reverts var invalidation in kilostation's pets
2020-08-10 09:40:23 +08:00
lolman360 1b35e02554 eee 2020-08-10 11:21:24 +10:00
lolman360 c160d73265 ee 2020-08-10 10:40:30 +10:00
lolman360 900b0b068a linter take 3
love u putnam
2020-08-10 10:38:53 +10:00
lolman360 d9c198825b linter 2: 2020-08-10 10:29:17 +10:00
lolman360 6c4c3e4255 lint! 2020-08-10 09:47:55 +10:00
lolman360 a44afad849 Update autohydro.dm 2020-08-10 08:26:06 +10:00
Detective Google bbe32ab412 lmao 2020-08-09 16:36:58 -05:00
chrisbbbbbbb 758d540c9e Suture/Mesh Crafting 2020-08-09 20:33:40 +02:00
chrisbbbbbbb fcb7ec8f2c Revert "suture crafting stuff"
This reverts commit 885013a8b8.
2020-08-09 20:17:59 +02:00
chrisbbbbbbb e8ac70696f new food idk? 2020-08-09 18:58:32 +02:00
ArchieBeepBoop 950c8fb8be Merge pull request #2 from ArchieBeepBoop/master
Update Dev Branch
2020-08-09 13:23:25 -03:00
silicons 4da1d0b73c Update human_defense.dm (#13002) 2020-08-09 16:06:53 +02:00