6754b794b1
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-20 22:59:17 -07:00
570f6e8a66
Plastitanium Rapier: Sleepy Edition ( #11507 )
...
* knockout rapier, improved sprites
* it's a rapier not a foil those aren't synonyms
* whoops
* needs it's shanking sound
* Put a stamina loss threshold onto the swords slep so you need at least two hits to proc the sleep. Don't get stabbed more than once!
* Update items_and_weapons.dmi
* Removes chat spam and also frankly it doesn't need drowzy on top
2020-03-20 16:07:04 +01:00
7fdbcc55c6
s
2020-03-16 11:12:10 -07:00
6af9c54da5
better
2020-03-16 04:59:55 -07:00
644273beca
k
2020-03-16 04:09:25 -07:00
d32bff7815
return list
2020-03-16 03:35:10 -07:00
703fca5f90
add owner argument
2020-03-16 03:24:19 -07:00
9ead492bb0
changes
2020-03-16 00:28:18 -07:00
4d0677daa9
s
2020-03-14 21:48:23 -07:00
2113b63428
o boy
2020-03-14 21:42:23 -07:00
2b4b626fac
support for items that switch states through update_icon.
2020-03-10 16:55:30 +01:00
1c5aa2f933
Merge pull request #11377 from Kraseo/contractor-fixes
...
Some contractor adjustments & fixes
2020-03-09 00:26:54 +01:00
a5ef41c0fc
adjust numbers, fix shuttle dropoffs
2020-03-07 20:31:49 +01:00
a669e87db1
Merge branch 'master' into gc_debugging
2020-03-06 10:14:19 -07:00
93d995eb18
k
2020-03-06 10:13:11 -07:00
ad20fb1a0e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-06 11:58:11 +01:00
16d6ba9e21
Merge pull request #11323 from Ghommie/Ghommie-cit600
...
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
2e35c09dec
Merge pull request #10451 from kevinz000/mobility_flags
...
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
7c8b490cb3
Update energy.dm
2020-03-04 16:40:28 +01:00
f2c8a7cd6f
Porting a couple material datums code updates and fixes.
2020-03-04 15:59:46 +01:00
0cf7f2e882
Update energy.dm
2020-03-03 21:07:24 -07:00
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
41e4de9287
fixes telebatons runtiming and not being able to be extended
2020-03-02 02:47:21 +01:00
7206e5ee6e
nearly forgot these as well
2020-03-01 23:31:14 +01:00
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
ab48a6fa16
part 3: do people even read commit logs
2020-03-01 19:14:05 +01:00
93d91b1808
Merge remote-tracking branch 'citadel/master' into sword_point
2020-02-28 13:39:56 -07:00
8ef68fa36b
En garde!
2020-02-28 13:35:41 -07:00
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
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
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07:00
e8ccf4b6d7
fix
2020-02-13 16:25:43 -07:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
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
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
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
02fbbd4f95
Ouch.
2020-01-12 16:54:08 +01:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
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
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
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
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
c81d0e8b66
Update energy.dm
2019-12-31 05:25:12 -05:00
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
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
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
3fcb7808fd
args
2019-12-13 02:30:17 +01:00
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
kevinz000