Ghommie
|
39e645b018
|
I knew using lazy helpers wouldn't have helped much.
|
2020-04-14 01:55:01 +02:00 |
|
Ghommie
|
42ff9b1d35
|
Final test, fixes and parent calls.
|
2020-04-14 01:23:26 +02:00 |
|
Ghommie
|
616d482cf6
|
Deleting poly clothes copypasta.
|
2020-04-13 22:51:46 +02:00 |
|
Ghommie
|
8c995dbad9
|
Making things work.
|
2020-04-13 19:16:55 +02:00 |
|
Ghommie
|
bfa006fac1
|
Fixing runtime errors.
|
2020-04-13 17:25:13 +02:00 |
|
Ghommie
|
db43f53ac4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 16:15:40 +02:00 |
|
Ghommie
|
0816512150
|
more work.
|
2020-04-13 16:09:52 +02:00 |
|
kevinz000
|
9f2ed092c5
|
Merge pull request #11275 from Citadel-Station-13/Ghommie-patch-6
Reenables the swarmers event.
|
2020-04-13 05:50:24 -07:00 |
|
kevinz000
|
6b6683846b
|
Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
|
2020-04-12 17:02:36 -07:00 |
|
kevinz000
|
f647fe92fa
|
Merge pull request #11810 from Citadel-Station-13/Ghommie-patch-4
Re-enables hulks.
|
2020-04-12 17:01:22 -07: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 |
|
kevinz000
|
d60932ca5d
|
Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
|
2020-04-12 16:16:37 -07:00 |
|
Ghom
|
fc58a34248
|
Merge pull request #11823 from Putnam3145/contam-buff
Bringing contamination back
|
2020-04-12 06:29:40 +02:00 |
|
Ghom
|
3f573fb611
|
Merge pull request #11814 from kappa-sama/patch-19
fixes stomping and increases Stam damage from krav
|
2020-04-12 06:24:57 +02:00 |
|
Ghom
|
28642ce39c
|
Merge pull request #11816 from necromanceranne/broke_dodging
fixes rising bass and sleeping carp not dodging
|
2020-04-12 06:23:47 +02:00 |
|
Putnam
|
a779ec2411
|
Makes contamination work (whoops)
|
2020-04-11 12:42:25 -07:00 |
|
Ghommie
|
31e0321808
|
Minor action datum refactor and spellcasting fix.
|
2020-04-11 16:53:08 +02:00 |
|
spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
necromanceranne
|
b6d079f91f
|
fixes rising bass and sleeping carp not dodging
|
2020-04-11 13:00:32 +10:00 |
|
kappa-sama
|
2afda4c216
|
forgot oop
|
2020-04-10 14:24:20 -04:00 |
|
kappa-sama
|
91726f340a
|
Update krav_maga.dm
|
2020-04-10 14:08:16 -04:00 |
|
Arturlang
|
b40fb55539
|
Fixes mesmerzie and makes it work better (#11785)
* Weh
* Mesmerize works a lot nicer now
|
2020-04-10 15:41:35 +02:00 |
|
Ghom
|
a38e6e88a0
|
Enables hulk smash.
|
2020-04-10 14:07:39 +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 |
|
Putnam3145
|
5078b5875a
|
Fixes my oldish badcode. (#11781)
|
2020-04-09 14:48:58 +02:00 |
|
kevinz000
|
7cb2057bb0
|
Merge pull request #11751 from Arturlang/kills_the_shitty_fix
TGUI Next vendors plus spritesheet port from TG
|
2020-04-09 03:53:08 -07:00 |
|
kevinz000
|
f60cf32562
|
Merge pull request #11775 from Trilbyspaceclone/frail-crafting
Frail crafting - Glass work additions and changes!
|
2020-04-09 02:41:01 -07:00 |
|
kevinz000
|
956a85ab34
|
Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
Punch Changes 2: The Quickening
|
2020-04-09 02:09:51 -07:00 |
|
necromanceranne
|
2becb6d74f
|
not really relevant given I literally decided to axe the mod
|
2020-04-09 00:44:01 +10:00 |
|
necromanceranne
|
ad09cb6790
|
This needs to go, there is just no way to reasonably have this mod as of the moment while it is basically giving a universal stamina discount.
|
2020-04-09 00:07:54 +10:00 |
|
necromanceranne
|
f0a738ef21
|
I'm sneaking in a nerf to scarp here shush shush
|
2020-04-08 22:53:51 +10:00 |
|
TrilbySpaceClone
|
b350436fbc
|
working
|
2020-04-07 18:31:23 -04:00 |
|
TrilbySpaceClone
|
e9d2e798a3
|
more glasswork
|
2020-04-07 17:58:23 -04:00 |
|
Lin
|
8379169b81
|
Merge pull request #11476 from kevinz000/shield_refactor
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
|
2020-04-07 20:47:15 +00:00 |
|
necromanceranne
|
353c6f1348
|
forgot this bit
|
2020-04-07 23:35:10 +10:00 |
|
kevinz000
|
8b2132317b
|
Ports a rewritten version of BAYSTRUMENTS (#11680)
* bay instruments
* k
* AAA
* remove that
* changes
* Update _instrument_key.dm
* safety nets
* @ghommie fixed
* volume
* Update item.dm
* Update item.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-04-07 15:21:50 +02:00 |
|
Putnam3145
|
dad6ddb042
|
Merge pull request #11764 from Ghommie/Ghommie-cit668
Fixing spellcasting and edge cases.
|
2020-04-07 02:50:24 -07:00 |
|
necromanceranne
|
b494aa3370
|
Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now
|
2020-04-07 17:51:25 +10:00 |
|
Timothy Teakettle
|
aabcfb580b
|
discounts rerolling is bad
|
2020-04-06 19:49:06 +01:00 |
|
Timothy Teakettle
|
864f9b3244
|
except this times its in the right order
|
2020-04-06 18:59:48 +01:00 |
|
Timothy Teakettle
|
e8002ee449
|
imagine if it compiled and was less bad
|
2020-04-06 17:45:19 +01:00 |
|
Timothy Teakettle
|
3b322b9f7c
|
population locked uplink items use current population
yay?
|
2020-04-06 17:34:34 +01:00 |
|
Ghommie
|
b92da66f04
|
Fixing spellcasting and edge cases.
|
2020-04-06 17:32:51 +02:00 |
|
necromanceranne
|
60c8aab520
|
the damage_roll proc needs to always be before check_streak
|
2020-04-06 16:51:26 +10:00 |
|
necromanceranne
|
ff4847b441
|
Adds the damage roll into a proc checked on each of the harm, disarm and grab acts and before a combo is complete, and also checks for whether we are in combat mode, lying down or if the target is in combat mode
|
2020-04-06 15:01:59 +10:00 |
|
necromanceranne
|
d1e77ab087
|
Merge branch 'master' into pawnch_2_the_pawnchening
|
2020-04-06 12:31:16 +10:00 |
|
necromanceranne
|
33a056b373
|
Merge branch 'master' into pawnch_2_the_pawnchening
|
2020-04-06 12:29:14 +10:00 |
|
necromanceranne
|
a6bd6d23fe
|
Some cleanup with help from rohesie, hopefully I figured it out
|
2020-04-06 12:28:14 +10:00 |
|
Artur
|
f26f0c2555
|
Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix
|
2020-04-05 18:21:50 +03:00 |
|
kevinz000
|
956c2a57bf
|
Merge pull request #11729 from Ghommie/Ghommie-cit666
Ports the VV Refactor by Kevinz.
|
2020-04-04 19:19:25 -07:00 |
|