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 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
kevinz000
|
e8ccf4b6d7
|
fix
|
2020-02-13 16:25:43 -07:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01: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 |
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
kevinz000
|
e771ea9066
|
Merge pull request #10374 from Trilbyspaceclone/patch-260
[s] Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
|
2020-01-01 22:07:18 -08:00 |
|
Trilbyspaceclone
|
c81d0e8b66
|
Update energy.dm
|
2019-12-31 05:25:12 -05:00 |
|
Ghommie
|
e1949b0131
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-23 19:02:20 +01:00 |
|
Ghommie
|
b75349bebf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-23 04:32:09 +01:00 |
|
Ghommie
|
9db79ff958
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-20 23:40:21 +01:00 |
|
Ghommie
|
3fcb7808fd
|
args
|
2019-12-13 02:30:17 +01:00 |
|
Linzolle
|
6c8dc1d294
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre-noise
|
2019-12-10 17:57:26 -06:00 |
|
Linzolle
|
bdd72fc797
|
make sound work?
|
2019-12-10 17:54:52 -06:00 |
|
Ghommie
|
414d4b7a90
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
|
2019-12-09 00:04:22 +01:00 |
|
Ghommie
|
542c9007ee
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-06 20:09:35 +01:00 |
|
Linzolle
|
19b004edab
|
update butchering
|
2019-12-01 14:35:11 -06: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
|
af0110db40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-11-27 21:16:20 +01:00 |
|
Ghommie
|
a52e292cc8
|
Ports "examine-code refactor"... part 1...
|
2019-11-19 03:28:06 +01:00 |
|
Ghommie
|
bddb437872
|
It works now.
|
2019-11-18 18:30:46 +01:00 |
|
Ghommie
|
6484eea339
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-11-15 00:36:50 +01:00 |
|
kevinz000
|
8f08e1017e
|
Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
|
2019-11-14 15:51:20 -07:00 |
|
Ghommie
|
09860d463f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-11-10 23:23:36 +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
|
065fbdf0cb
|
Fixing gibspawner runtimes, how gruesome...
|
2019-11-02 19:37:35 +01:00 |
|
Ghommie
|
5fcf5b1c5e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-10-29 13:38:16 +01:00 |
|
Ghommie
|
c1f84da39e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272
|
2019-10-25 12:26:17 +02:00 |
|
Ghommie
|
85b35433b2
|
Unmodularize Eutactic Blades.
|
2019-10-25 00:14:38 +02:00 |
|
Ghommie
|
2c578ca683
|
Ports move force and move resist, movement/pushing/pulling tweaks & co.
|
2019-10-24 18:01:46 +02:00 |
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
lolman360
|
04521551f0
|
one commit wonder
|
2019-10-08 19:46:28 +11:00 |
|
Ghommie
|
5e52c62f29
|
actual balance.
|
2019-09-17 03:41:53 +02:00 |
|
Ghommie
|
0d9b284784
|
unneeded variable, no gameplay changes.
|
2019-09-16 18:12:05 +02:00 |
|
Ghommie
|
ca95d39a46
|
Slowing down police baton and tele baton speed.
|
2019-09-16 17:47:22 +02:00 |
|
nik707
|
67f4276aab
|
Merge pull request #9104 from Sishen1542/tbaton
classic & telebaton no longer have attack delay
|
2019-09-02 18:35:56 -05:00 |
|
Sishen
|
6fab91046d
|
Update misc.dm
|
2019-08-15 13:04:28 -04:00 |
|
Sishen
|
ad91152c83
|
Update misc.dm
|
2019-08-14 17:08:33 -04:00 |
|
Sishen
|
f6baaf8c58
|
honk honk
|
2019-08-14 17:06:58 -04:00 |
|
Sishen
|
3e2f35b96c
|
nyoom
|
2019-08-11 04:04:01 -04:00 |
|
Ghommie
|
12c4fc139d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
|
2019-08-09 04:00:23 +02:00 |
|
Ghommie
|
991e4e8d41
|
Fixes and standarizes sword sheaths/scabbards overlays.
|
2019-07-31 02:43:40 +02: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 |
|