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 |
|
lolman360
|
f10053fe96
|
suture
|
2020-08-11 18:03:59 +10:00 |
|
lolman360
|
c699729250
|
lint
|
2020-08-11 17:53:51 +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 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|