silicons
|
1a800cc470
|
modifications
|
2021-06-07 19:40:16 -07:00 |
|
silicons
|
40f2c06f2e
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-07 16:47:11 -07:00 |
|
shellspeed1
|
e4e5d8f5cd
|
adds an pod for projects
|
2021-05-17 00:59:10 -07:00 |
|
silicons
|
1585d1c2be
|
fixes
|
2021-04-26 23:32:33 -07:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
Ghommie
|
90c4cb2022
|
Here I fix a few issues.
|
2020-10-25 14:50:42 +01:00 |
|
Hatterhat
|
4195f96876
|
glaive daggers squashed
|
2020-10-03 14:32:19 -05:00 |
|
timothyteakettle
|
d2f4d675a4
|
fuck
|
2020-09-10 03:55:24 +01:00 |
|
Timothy Teakettle
|
f1cd94fc97
|
emp rework
|
2020-09-09 23:14:06 +01:00 |
|
silicons
|
9e204f167f
|
Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
Miner Loot Shuffle MK III
|
2020-09-06 01:58:46 -07:00 |
|
silicons
|
7b50b22c7b
|
Merge pull request #13244 from lolman360/AnPrimAssistants
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
|
2020-09-05 02:20:11 -07:00 |
|
Ghommie
|
dc9b024fae
|
Blemishes begone.
|
2020-09-02 19:16:16 +02:00 |
|
Trilbyspaceclone
|
c4885d81f3
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-27 03:41:14 -04:00 |
|
lolman360
|
f2a7c2599d
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-24 09:36:36 +10:00 |
|
silicons
|
a8ee36fe85
|
fixes wormhole jaunters and makes them no longer collide with bohs/other bluespace teleportation disruptors (#13209)
* Update wormhole_jaunter.dm
* Update wormhole_jaunter.dm
|
2020-08-23 21:00:07 +02:00 |
|
lolman360
|
bda2c740ba
|
Merge branch 'master' into AnPrimAssistants
|
2020-08-21 11:08:13 +10:00 |
|
lolman360
|
7ca4fa2f55
|
compilies/??
|
2020-08-15 17:09:12 +10:00 |
|
lolman360
|
0bc79b82eb
|
ABDCE
|
2020-08-14 20:18:55 +10:00 |
|
Hatterhat
|
d5b788a655
|
shortparry window restored, glaive parry req wield
|
2020-08-12 23:33:59 -05:00 |
|
Trilbyspaceclone
|
1b61a5feb2
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-12 15:10:37 -04:00 |
|
Hatterhat
|
e95dcba705
|
price nerf, tweaks, aprc
|
2020-08-08 12:17:56 -05:00 |
|
Hatterhat
|
9a862b10e1
|
the perfect parry update
|
2020-08-08 10:47:43 -05:00 |
|
Hatterhat
|
fd8f3781cc
|
test commit please ignore
|
2020-08-07 17:03:38 -05:00 |
|
Hatterhat
|
c227fc7546
|
wait, shit
|
2020-08-07 16:56:53 -05:00 |
|
TrilbySpaceClone
|
3ae10ac826
|
update?
|
2020-08-06 13:09:41 -04:00 |
|
silicons
|
4720fedce9
|
Merge pull request #13003 from Hatterhat/crusher-glaive
Proto-Kinetic Glaives - a crusher reskin
|
2020-08-05 15:25:48 -07:00 |
|
Hatterhat
|
4df9efb076
|
heho attack text
|
2020-08-04 00:29:30 -05:00 |
|
Trilbyspaceclone
|
e1e6198140
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-03 10:53:08 -04:00 |
|
Hatterhat
|
ccee254546
|
proof of concept: crusherglaive - squashed
|
2020-08-02 12:30:14 -05:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01: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 |
|
Hatterhat
|
14fba6a056
|
funny parry sticks
|
2020-07-24 21:19:01 -05:00 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
silicons
|
2f11fb6a8b
|
ok
|
2020-07-21 11:59:39 -07:00 |
|
Timothy Teakettle
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
silicons
|
267186a5d3
|
Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
|
2020-07-20 16:15:38 -07:00 |
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
Timothy Teakettle
|
93b4570f8d
|
more changes
|
2020-07-17 23:23:47 +01:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
Cirno
|
020da9fa07
|
i hope this works
|
2020-07-04 15:47:38 -03:00 |
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|