silicons
|
178fe9cf55
|
Merge pull request #14253 from keronshb/eutactic_blade_restoration
Hyperblade restored to uplink
|
2021-02-22 13:10:21 -07: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 |
|
keronshb
|
d87ac38e58
|
Eutactic Blade Restoration + Hyperblade
Brings the Eutatic Blade back to the traitor uplink, same for the Hyperblade.
|
2021-02-15 21:36:47 -05:00 |
|
Hatterhat
|
96e55d6233
|
the last bit
|
2020-10-07 17:50:21 -05:00 |
|
Hatterhat
|
9928a172d0
|
initial commit - sabres
|
2020-10-06 21:58:59 -05:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
silicons
|
69335bae0e
|
buff
|
2020-07-26 17:20:21 -07:00 |
|
silicons
|
0b17c761e7
|
whew
|
2020-07-26 17:11:23 -07:00 |
|
silicons
|
3ab4b62dc1
|
huh
|
2020-07-26 17:03:52 -07:00 |
|
silicons
|
279b3e7aed
|
fix
|
2020-07-26 16:52:16 -07:00 |
|
silicons
|
349874e512
|
haha
|
2020-07-26 16:49:47 -07:00 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
Timothy Teakettle
|
7fbfb4ad0e
|
Merge remote-tracking branch 'upstream/master' into embed-changes
|
2020-06-15 22:48:26 +01:00 |
|
Timothy Teakettle
|
95b8cd3956
|
first port
|
2020-06-10 20:33:01 +01:00 |
|
kevinz000
|
1a9787a9c2
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-06-02 21:49:43 -07:00 |
|
Ghom
|
d7954ca077
|
Yet another PR fixing some issues. (#12424)
|
2020-06-02 15:29:01 -07:00 |
|
kevinz000
|
1214c99a34
|
is this a good idea
|
2020-05-30 01:46:43 -07:00 |
|
kevinz000
|
b74d465b6c
|
fix
|
2020-05-30 01:22:09 -07:00 |
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
Ghommie
|
05a954f000
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 02:01:01 +02:00 |
|
Ghommie
|
7c1e5aa2c9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
|
2020-04-09 15:46:19 +02:00 |
|
Ghommie
|
c3faf94d8f
|
WIP
|
2020-03-30 05:29:39 +02:00 |
|
kevinz000
|
6af9c54da5
|
better
|
2020-03-16 04:59:55 -07:00 |
|
kevinz000
|
644273beca
|
k
|
2020-03-16 04:09:25 -07:00 |
|
kevinz000
|
d32bff7815
|
return list
|
2020-03-16 03:35:10 -07:00 |
|
kevinz000
|
703fca5f90
|
add owner argument
|
2020-03-16 03:24:19 -07:00 |
|
kevinz000
|
9ead492bb0
|
changes
|
2020-03-16 00:28:18 -07:00 |
|
Ghommie
|
2b4b626fac
|
support for items that switch states through update_icon.
|
2020-03-10 16:55:30 +01:00 |
|
Ghom
|
7c8b490cb3
|
Update energy.dm
|
2020-03-04 16:40:28 +01:00 |
|
kevinz000
|
0cf7f2e882
|
Update energy.dm
|
2020-03-03 21:07:24 -07:00 |
|
kevinz000
|
93d91b1808
|
Merge remote-tracking branch 'citadel/master' into sword_point
|
2020-02-28 13:39:56 -07:00 |
|
kevinz000
|
8ef68fa36b
|
En garde!
|
2020-02-28 13:35:41 -07:00 |
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
kevinz000
|
e8ccf4b6d7
|
fix
|
2020-02-13 16:25:43 -07:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
Trilbyspaceclone
|
c81d0e8b66
|
Update energy.dm
|
2019-12-31 05:25:12 -05:00 |
|
Ghommie
|
3fcb7808fd
|
args
|
2019-12-13 02:30:17 +01:00 |
|
Ghommie
|
3b8aebbbc2
|
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
|
2019-11-29 00:40:16 +01:00 |
|
Ghommie
|
a52e292cc8
|
Ports "examine-code refactor"... part 1...
|
2019-11-19 03:28:06 +01:00 |
|
Ghommie
|
a650e1e411
|
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
|
2019-11-05 05:37:28 +01:00 |
|
Ghommie
|
85b35433b2
|
Unmodularize Eutactic Blades.
|
2019-10-25 00:14:38 +02:00 |
|
lolman360
|
04521551f0
|
one commit wonder
|
2019-10-08 19:46:28 +11:00 |
|
Ghom
|
85f87b6679
|
Update code/game/objects/items/melee/energy.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-07-20 21:26:18 +02:00 |
|
Ghommie
|
b87442e633
|
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
|
2019-07-19 20:09:16 +02:00 |
|
ShizCalev
|
b5a95e9da8
|
Makes more messages pronoun sensitive
|
2018-05-03 17:46:25 -05:00 |
|
kevinz000
|
3369c804b2
|
Kills off /obj/item/device (#6561)
|
2018-04-30 00:06:58 -05:00 |
|