 Timothy TeakettleandGitHub
|
4a2bbe66d6
|
Merge branch 'master' into cum
|
2020-08-11 18:30:30 +01:00 |
|
|
CitadelStationBot
|
dc799858d1
|
Automatic changelog generation for PR #13126 [ci skip]
|
2020-08-11 10:48:31 -05:00 |
|
|
LinandGitHub
|
aede820e14
|
Merge pull request #13126 from Detective-Google/t-a-b-l-e
fixes the random fucking medbay tables that some dipshit left in the hallway on box
|
2020-08-11 10:48:28 -05:00 |
|
|
Detective Google
|
8976bea9a4
|
someone doesnt know how to fucking map edit
|
2020-08-11 10:35:52 -05:00 |
|
|
CitadelStationBot
|
45827bf241
|
Automatic changelog generation for PR #12808 [ci skip]
|
2020-08-11 07:17:39 -05:00 |
|
|
siliconsandGitHub
|
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 |
|
|
CitadelStationBot
|
402732db91
|
Automatic changelog generation for PR #13011 [ci skip]
|
2020-08-11 03:47:36 -05:00 |
|
|
siliconsandGitHub
|
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 |
|
|
CitadelStationBot
|
e49bf3978e
|
Automatic changelog generation for PR #13071 [ci skip]
|
2020-08-11 03:45:26 -05:00 |
|
|
siliconsandGitHub
|
c18b26efe9
|
Merge pull request #13071 from ancientpower/box-medbay-doors
Adds doors to the west of box medbay
|
2020-08-11 01:45:23 -07:00 |
|
|
CitadelStationBot
|
b61f64f164
|
Automatic changelog generation for PR #13070 [ci skip]
|
2020-08-11 03:44:43 -05:00 |
|
|
siliconsandGitHub
|
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 |
|
|
siliconsandGitHub
|
b16f920479
|
Merge pull request #13086 from ArchieBeepBoop/dev
Add Skulldog Snout
|
2020-08-11 01:44:29 -07:00 |
|
|
CitadelStationBot
|
c5ff609021
|
Automatic changelog generation for PR #13107 [ci skip]
|
2020-08-11 03:44:11 -05:00 |
|
|
siliconsandGitHub
|
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 |
|
|
CitadelStationBot
|
46528a0e92
|
Automatic changelog generation for PR #13106 [ci skip]
|
2020-08-11 03:43:58 -05:00 |
|
|
siliconsandGitHub
|
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 |
|
|
siliconsandGitHub
|
16a556b367
|
Merge pull request #13101 from Detective-Google/funny
spelling
|
2020-08-11 01:43:35 -07:00 |
|
|
CitadelStationBot
|
b7181d7cc2
|
Automatic changelog generation for PR #13089 [ci skip]
|
2020-08-11 03:43:24 -05:00 |
|
|
siliconsandGitHub
|
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 |
|
|
siliconsandGitHub
|
c1d8d1d439
|
Merge pull request #13090 from lolzalolka/lean
Added Burek to Space
|
2020-08-11 01:42:58 -07:00 |
|
|
CitadelStationBot
|
6d6b91e6df
|
Automatic changelog generation for PR #13095 [ci skip]
|
2020-08-11 03:41:51 -05:00 |
|
|
siliconsandGitHub
|
5694923d89
|
Merge pull request #13095 from lolman360/liver
custom name/desc ring and necklace
|
2020-08-11 01:41:48 -07:00 |
|
|
CitadelStationBot
|
37ee9f1c3c
|
Automatic changelog generation for PR #13098 [ci skip]
|
2020-08-11 03:41:29 -05:00 |
|
|
siliconsandGitHub
|
035422ed7f
|
Merge pull request #13098 from LetterN/ToS-component
Mafia Component
|
2020-08-11 01:41:13 -07:00 |
|
|
siliconsandGitHub
|
82824f9fb9
|
Merge pull request #13100 from lolzalolka/lean2
Suture/Mesh Crafting (take2)
|
2020-08-11 01:40:50 -07:00 |
|
|
CitadelStationBot
|
051ef9df87
|
Automatic changelog generation for PR #13120 [ci skip]
|
2020-08-11 03:40:37 -05:00 |
|
|
siliconsandGitHub
|
abf5d7070e
|
Merge pull request #13120 from LetterN/nyanite-fix-1
Fixes missing icon and handtele being fast
|
2020-08-11 01:40:34 -07:00 |
|
|
Letter N
|
ab7c560f6d
|
revert
|
2020-08-11 16:04:18 +08:00 |
|
|
Letter N
|
5845684a04
|
icongone
|
2020-08-11 15:56:27 +08:00 |
|
|
CitadelStationBot
|
fe0cfd3e6a
|
Automatic changelog generation for PR #13103 [ci skip]
|
2020-08-11 01:30:33 -05:00 |
|
|
siliconsandGitHub
|
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 |
|
|
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 |
|
|
CitadelStationBot
|
6c3a796e24
|
Automatic changelog generation for PR #13111 [ci skip]
|
2020-08-10 19:37:16 -05:00 |
|
|
siliconsandGitHub
|
718f2224ee
|
Merge pull request #13111 from zeroisthebiggay/okayspeedcodingisntgood
quickly fixes alteranate volaju to be more alternate and gives the quartermaster a blue sechud icon
|
2020-08-10 17:37:13 -07:00 |
|
|
Changelogs
|
6816dea891
|
Automatic changelog compile [ci skip]
|
2020-08-11 00:12:04 +00:00 |
|
|
zerothebigboy
|
3600da46e7
|
a
|
2020-08-10 18:25:05 -04:00 |
|
|
zerothebigboy
|
6e97e82f53
|
a
|
2020-08-10 18:09:20 -04:00 |
|
|
zerothebigboy
|
1a284709cc
|
a
|
2020-08-10 17:50:44 -04:00 |
|
|
zerothebigboy
|
40e07849ff
|
a
|
2020-08-10 17:50:38 -04: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 |
|
|
zerothebigboy
|
9baedbd904
|
a
|
2020-08-10 10:08:25 -04:00 |
|
|
zerothebigboy
|
cf75f7d4b6
|
a
|
2020-08-10 10:08:15 -04:00 |
|
|
Letter N
|
afe53992b5
|
miniump of 5, max of 12
|
2020-08-10 17:47:33 +08:00 |
|