 siliconsandGitHub
|
f611fee193
|
mecha are no longer immune to goliath tentacles (#13172)
* Update goliath.dm
* Update goliath.dm
* Update goliath.dm
|
2020-08-26 13:06:53 +02:00 |
|
|
siliconsandGitHub
|
1608214156
|
gives vortex blasts 50% armor pen vs mechas (#13171)
* Update hierophant.dm
* Update hierophant.dm
* Update hierophant.dm
|
2020-08-25 22:17:36 +02:00 |
|
|
siliconsandGitHub
|
188bb13272
|
Merge pull request #13181 from Putnam3145/dynnamic
Dynamic: tweaks and fixes: the reckoning
|
2020-08-22 15:22:19 -07:00 |
|
|
siliconsandGitHub
|
7737e76b32
|
Merge pull request #13224 from Ghommie/Ghommie-cit835
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-22 15:19:07 -07:00 |
|
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
|
Timothy TeakettleandGitHub
|
f5300750b5
|
Revert "[TESTMERGE ONLY] FUCK"
|
2020-08-17 03:18:36 +01:00 |
|
|
siliconsandGitHub
|
4cd731ce11
|
Revert "cease your shitcode: cum edition"
|
2020-08-16 19:06:57 -07:00 |
|
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
|
silicons
|
b56742beb5
|
Merge branch 'pr-13110'
|
2020-08-16 18:40:23 -07:00 |
|
|
Putnam
|
f54d272b11
|
Yet more dynamic tweaks.
|
2020-08-15 23:38:21 -07:00 |
|
|
siliconsandGitHub
|
130c3a9480
|
Merge pull request #13096 from Michiyamenotehifunana/possum
Ports Opossums from Desert Rose
|
2020-08-11 16:19:42 -07:00 |
|
|
kiwedespars
|
3bd2f73449
|
travis
|
2020-08-10 21:37:50 -07: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 |
|
|
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 |
|
|
siliconsandGitHub
|
a950adc0df
|
Update regalrat.dm (#13076)
|
2020-08-09 14:49:10 +02:00 |
|
|
Michiyamenotehifunana
|
9b6156ad81
|
Ports opposums
Everything stolen from Desert Rose, including sprites. All credits to whoever made it there.
|
2020-08-09 16:35:12 +08:00 |
|
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
|
LinandGitHub
|
0ff5c90fc8
|
Merge pull request #12969 from silicons/e
someone asked i code holoparasites playing music so here we are???
|
2020-08-05 19:48:37 -05:00 |
|
|
siliconsandGitHub
|
b2052a16cb
|
Merge pull request #13008 from zeroisthebiggay/powercreepislife
nukies can buy holoparasites not including support ones
|
2020-08-05 15:13:13 -07:00 |
|
|
Letter N
|
454baea55f
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-04 09:31:34 +08:00 |
|
|
siliconsandGitHub
|
a4132c04ea
|
Merge pull request #12894 from timothyteakettle/wounds-part-2
port of wounds part 2
|
2020-08-03 14:43:07 -07:00 |
|
|
Letter N
|
b30607b759
|
ayys update - ordering shit
|
2020-08-03 21:37:11 +08:00 |
|
|
Letter N
|
9a9e3ffef5
|
fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category.
|
2020-08-03 21:14:17 +08:00 |
|
|
zerothebigboy
|
d3cfa47d65
|
a
|
2020-08-02 22:27:42 -04:00 |
|
|
zerothebigboy
|
2d4127a9a7
|
a
|
2020-08-02 22:26:45 -04:00 |
|
|
zerothebigboy
|
35c5c2f4cd
|
a
|
2020-08-02 22:17:44 -04:00 |
|
|
silicons
|
25d1fb761a
|
Merge remote-tracking branch 'citadel/master' into killer_queen
|
2020-08-01 20:51:38 -07:00 |
|
|
siliconsandGitHub
|
3a773809b6
|
Update guardian.dm
|
2020-07-31 00:22:46 -07:00 |
|
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
|
Letter N
|
0805265412
|
yet another batch. MAJOR: APC
|
2020-07-30 12:54:53 +08:00 |
|
|
silicons
|
b8522a2ae0
|
ok
|
2020-07-29 20:04:47 -07:00 |
|
|
Timothy TeakettleandGitHub
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
|
LinandGitHub
|
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 |
|
|
silicons
|
c87c2bd850
|
smh
|
2020-07-28 12:31:35 -07:00 |
|
|
silicons
|
78b6a60e80
|
oh
|
2020-07-28 12:25:27 -07:00 |
|
|
silicons
|
4ab175d812
|
sigh
|
2020-07-28 12:10:34 -07:00 |
|
|
silicons
|
c720e800df
|
whew!
|
2020-07-28 12:08:02 -07:00 |
|
|
silicons
|
ffcfd21613
|
fix
|
2020-07-27 14:24:10 -07:00 |
|
|
silicons
|
5bf4afcade
|
sigh
|
2020-07-27 14:09:37 -07:00 |
|
|
silicons
|
67b518bf42
|
experimental
|
2020-07-27 13:09:54 -07:00 |
|
|
LinandGitHub
|
8aa20d10b8
|
Merge pull request #12863 from Citadel-Station-13/clownops
clown mobss are now allied to each other and clownops are now allied to clown mobs
|
2020-07-26 17:51:00 -05:00 |
|
|
silicons
|
7d7f40ce90
|
fixes
|
2020-07-26 14:56:03 -07:00 |
|
|
silicons
|
1990f75957
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-25 23:46:27 -07:00 |
|
|
silicons
|
44d3a0aa27
|
fixes
|
2020-07-24 20:37:02 -07:00 |
|
|
timothyteakettle
|
e273d327bd
|
yeah
|
2020-07-25 01:11:04 +01:00 |
|
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
|
nik707andGitHub
|
6117b7d81e
|
Merge pull request #12879 from timothyteakettle/let-bots-wear-hats
beepsky replaces THREAT_LEVEL with the actual threat
|
2020-07-23 20:11:57 -05:00 |
|
|
timothyteakettle
|
adc4c76be7
|
fix
|
2020-07-24 02:00:22 +01:00 |
|
|
timothyteakettle
|
332dae9ee1
|
beepsky now replaces THREAT_LEVEL with the threat
|
2020-07-24 01:31:07 +01:00 |
|