Commit Graph
2240 Commits
Author SHA1 Message Date
DeltaFire abf825280b Modifies a bunch and adds rite support
Clockie implants don't get detected by medscanners, brass claws get combo aka bonus damage on consecutive attacks against the same target, spears have a check for now accidentally draining vitality, and rite support has been added via a special sigil, though as of now there only is the 'base' rite which should never actually exist / be casted
2020-08-02 21:43:41 +02:00
Timothy Teakettle 0bf9553eca hmm 2020-08-02 19:13:39 +01:00
Timothy Teakettle 289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
siliconsandGitHub 06f5ce6401 buffs shoving (#12925)
* ^w^

* ok

* ok
2020-08-02 18:30:09 +02:00
siliconsandGitHub f0a02c2c99 Update _storage.dm 2020-08-01 23:35:42 -07:00
zerothebigboy 34a8d8f798 a 2020-08-02 01:38:23 -04:00
Timothy Teakettle 7c8f03a81f new defines 2020-08-01 18:29:27 +01:00
siliconsandGitHub 2230a3665a Merge pull request #12965 from timothyteakettle/end-our-suffering
drastically lowers the damage-related benefits of combat mode
2020-08-01 03:33:43 -07:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
timothyteakettle caaedce6e2 end our suffering 2020-07-30 02:33:39 +01:00
Timothy Teakettle 31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00
timothyteakettle c15d0de20d subcategories work 2020-07-29 03:57:16 +01:00
LinandGitHub a5dd08a054 Merge pull request #12734 from silicons/shoelaces
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05: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
Timothy Teakettle 721e018aec loadout stuff 2020-07-28 22:52:00 +01:00
silicons 67b518bf42 experimental 2020-07-27 13:09:54 -07:00
siliconsandGitHub 20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb
tidies up species files
2020-07-26 22:52:00 -07:00
timothyteakettle 28bf5d2344 remove c 2020-07-26 23:15:56 +01:00
silicons 49070d732b ohhhhhhh boy 2020-07-26 15:10:08 -07:00
Timothy Teakettle 36d6246bc1 it is now harder to deal wounds 2020-07-26 18:54:57 +01:00
silicons 1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
timothyteakettle 3467bf3515 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-07-26 00:25:26 +01:00
Timothy Teakettle 8b2a92994f less rng reliance 2020-07-25 20:14:41 +01:00
Timothy TeakettleandGitHub 238af723bb makes insects specifically insects not flies 2020-07-25 18:14:12 +01:00
DeltaFire db823ac16c fixes the organ bitfields 2020-07-25 19:13:08 +02:00
silicons 33d5ba788b aight 2020-07-24 20:19:18 -07:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
timothyteakettle 060b3dcd04 im sorry moths 2020-07-24 03:27:44 +01:00
silicons 1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
Timothy TeakettleandGitHub ed8723e74e Merge branch 'master' into species-are-dumb 2020-07-23 22:15:10 +01:00
Timothy Teakettle 8f8aaee36c fixes up drinks 2020-07-23 22:09:14 +01:00
Timothy Teakettle 450509347a tidy species more 2020-07-23 21:57:32 +01:00
silicons d30acd5b09 smooth 2020-07-23 13:49:17 -07:00
LinandGitHub e14f5ff576 Merge pull request #12832 from Citadel-Station-13/overlays-experimental
do we want (probably) free memory savings trick question yes we do
2020-07-23 13:41:36 -05:00
LinandGitHub fbfd6286b5 Merge pull request #12849 from Citadel-Station-13/silicons-patch-43
raises max keybind command length to 32 so controller users don't get kicked
2020-07-23 13:30:31 -05:00
silicons db24df58a0 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:36:46 -07:00
siliconsandGitHub d520eaa0ad Merge pull request #12854 from Zandario/tipes
tipes
2020-07-23 10:26:55 -07:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
Keate Senior fafde35ee2 Fixes the Arks looping issue, and gives Ratvar new words when fighting
Also removes the grace period variable since the ark activates immediately now /shrug
2020-07-23 12:59:40 -04:00
silicons 703afec454 ok 2020-07-23 08:57:15 -07:00
Letter N 827a1ad523 the define 2020-07-22 10:12:33 +08:00
lolman360 0f1aa3c0ca 'lolman? did you test your code?'
no i did not ms. kevinz
2020-07-22 10:49:56 +10:00
silicons f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
Zandario bbf38c9898 tipes 2020-07-21 11:22:21 -05:00
siliconsandGitHub 5347b9f6a5 Update keybindings.dm 2020-07-20 21:33:03 -07:00
Timothy TeakettleandGitHub 75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
siliconsandGitHub 944a91e44d Update subsystems.dm 2020-07-20 15:55:41 -07:00
silicons 924309aab8 changeS 2020-07-20 11:11:12 -07:00