Artur
|
9020e59aa0
|
kevinz fix
|
2020-07-31 04:32:46 +03:00 |
|
silicons
|
6b87f5c87a
|
Update syndicate.dm
|
2020-07-30 17:29:36 -07:00 |
|
silicons
|
c178e53e2a
|
Update syndicate.dm
|
2020-07-30 17:25:39 -07:00 |
|
Artur
|
2e3922d08e
|
Merge remote-tracking branch 'origin/master' into bloodsucker_life
|
2020-07-31 02:07:14 +03:00 |
|
Artur
|
b22ffd6b6e
|
Makes it properly work
|
2020-07-31 02:07:03 +03:00 |
|
Auris456852
|
03cff55017
|
Adds roboticist cartridge to the PDA vendor.
|
2020-07-30 23:31:31 +03:00 |
|
MrJWhit
|
2a23f88438
|
Whoopsie
|
2020-07-30 12:44:44 -04:00 |
|
MrJWhit
|
249cb136ef
|
Reworks abducotr spawn text
|
2020-07-30 12:38:30 -04:00 |
|
Letter N
|
e40470f553
|
h. Updates NTOS, and axes p2p filetransfer!
|
2020-07-30 20:54:13 +08:00 |
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
Letter N
|
894ea242b4
|
asset cache update. may fuck shit up
|
2020-07-30 14:28:01 +08:00 |
|
Letter N
|
782e3c2ffb
|
copypaste phase complete, major:vendies
|
2020-07-30 14:17:35 +08:00 |
|
Letter N
|
10fefca674
|
another batch. MAJOR: chem_master, pandemic
|
2020-07-30 14:06:20 +08:00 |
|
Letter N
|
0805265412
|
yet another batch. MAJOR: APC
|
2020-07-30 12:54:53 +08:00 |
|
kappa-sama
|
6356084fe9
|
this
|
2020-07-29 23:36:27 -04:00 |
|
silicons
|
ba0c77a8bd
|
fix
|
2020-07-29 20:13:39 -07:00 |
|
silicons
|
b8522a2ae0
|
ok
|
2020-07-29 20:04:47 -07:00 |
|
silicons
|
f02bc4a572
|
Update toy.dm
|
2020-07-29 19:49:11 -07:00 |
|
Unknown
|
16722c47c3
|
CentCom Galactic Ban DB
|
2020-07-29 21:39:58 -05:00 |
|
timothyteakettle
|
caaedce6e2
|
end our suffering
|
2020-07-30 02:33:39 +01:00 |
|
timothyteakettle
|
55be55ce0f
|
Revert "end our suffering"
This reverts commit 4e1fcc4e08.
|
2020-07-30 02:29:13 +01:00 |
|
timothyteakettle
|
4e1fcc4e08
|
end our suffering
|
2020-07-30 02:28:53 +01:00 |
|
timothyteakettle
|
940fe8240d
|
monkey blood fix
|
2020-07-30 01:57:09 +01:00 |
|
Seris02
|
0772d6687f
|
ghost chilis fixed
|
2020-07-30 08:01:25 +08:00 |
|
silicons
|
c60e595d99
|
Merge pull request #12955 from Arturlang/bloodsucker_life
Plugs bloodsucker LifeTick into BiologicalLife
|
2020-07-29 14:02:22 -07:00 |
|
Lin
|
41a711ff01
|
Merge pull request #12959 from Citadel-Station-13/AAAAAAA
FIXES LINTER ON MASTER
|
2020-07-29 15:59:20 -05:00 |
|
Timothy Teakettle
|
f901aa9d42
|
travis work
|
2020-07-29 21:48:47 +01:00 |
|
Lin
|
a7fe7f1317
|
Merge pull request #12953 from Adelphon/pog
Adds Camo To AutoDrobe (fix)
|
2020-07-29 15:48:45 -05:00 |
|
silicons
|
90d3cff53f
|
Merge remote-tracking branch 'citadel/master' into 12742
|
2020-07-29 11:53:59 -07:00 |
|
silicons
|
ad3092d883
|
Merge branch 'master' into AAAAAAA
|
2020-07-29 11:13:33 -07:00 |
|
Timothy Teakettle
|
9a9993c7be
|
yep
|
2020-07-29 19:00:06 +01:00 |
|
Timothy Teakettle
|
d5ac2dcd74
|
debug remove
|
2020-07-29 18:26:35 +01:00 |
|
Timothy Teakettle
|
b5a16d8945
|
MORE CLOTHES
|
2020-07-29 18:20:46 +01:00 |
|
Timothy Teakettle
|
31963b32a4
|
subcategories cool
|
2020-07-29 17:14:07 +01:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
silicons
|
a9e84df7f4
|
fix
|
2020-07-29 01:17:39 -07:00 |
|
silicons
|
bc823b544f
|
sigh
|
2020-07-29 01:17:16 -07:00 |
|
silicons
|
e4148fe4ad
|
Merge remote-tracking branch 'citadel/master' into 12742
|
2020-07-29 01:11:11 -07:00 |
|
silicons
|
9ff94e019b
|
Merge pull request #12924 from SiliconMain/analyzer
Ports long range atmos analyzer from skyrat
|
2020-07-29 01:09:48 -07:00 |
|
Letter N
|
5d4bb48628
|
another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator
|
2020-07-29 15:10:01 +08:00 |
|
silicons
|
78312c23bf
|
sigh
|
2020-07-28 21:53:07 -07:00 |
|
Keate Senior
|
1416fd08dc
|
updates clockwork armor /what is magic defense even for i don't get it/
|
2020-07-29 00:15:11 -04:00 |
|
Keate Senior
|
5284fbbec0
|
various fixes to make the PR not conflict with clickdelays probably
|
2020-07-28 23:52:13 -04:00 |
|
Lin
|
bbffd41d55
|
Merge pull request #12883 from Citadel-Station-13/silicons-patch-49
beam rifles are now practical in emitters
|
2020-07-28 22:05:39 -05:00 |
|
timothyteakettle
|
c15d0de20d
|
subcategories work
|
2020-07-29 03:57:16 +01:00 |
|
Lin
|
a5dd08a054
|
Merge pull request #12734 from silicons/shoelaces
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
|
2020-07-28 21:51:43 -05:00 |
|
Lin
|
81a7542aa6
|
Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
|
2020-07-28 21:51:10 -05:00 |
|
Lin
|
ae02a7348c
|
Merge pull request #12929 from Citadel-Station-13/silicons-patch-59
silicons (and all other nonhuman mobs) can now block (with the right items)
|
2020-07-28 21:48:14 -05:00 |
|
Lin
|
e8ab87c396
|
Merge pull request #12928 from Citadel-Station-13/silicons-patch-58
silicons (and any other nonhuman mob) can now parry
|
2020-07-28 21:48:03 -05:00 |
|
Lin
|
91dc8b96d0
|
Merge pull request #12932 from silicons/ok_2
perfect parries with an energy sword now reflect projectiles back at their shooter
|
2020-07-28 21:45:53 -05:00 |
|