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
kevinz000
0d0ee1cd46
Merge remote-tracking branch 'citadel/master' into storage_rework
2020-04-06 18:40:58 -07:00
kevinz000
154e145e25
storage
2020-04-06 18:40:20 -07: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
kevinz000
5e961e5e43
Merge pull request #11711 from Arturlang/skateboards_cool_again
...
Buffs skateboards
2020-04-04 07:15:29 -07:00
kevinz000
9a0f0cab65
Merge pull request #11724 from Ghommie/Ghommie-cit664
...
Stops one of the many monkey tricks with mob holders.
2020-04-04 07:10:24 -07:00
necromanceranne
cefd212a50
I hecc'd ( #11739 )
2020-04-04 14:59:10 +02:00
necromanceranne
333a3f7c0c
This was also not the right way to do this so these values may be slightly stronger overall but will mean hitting with that second punch is all the more critical.
2020-04-04 19:49:22 +11:00
necromanceranne
856eca772d
this is all still super broken
2020-04-04 18:05:02 +11:00
necromanceranne
71e19aead2
ports over my krav changes from tg and also hooked in pugilist gloves to summon equipment for cultists and gave all that shit a sprite ye
2020-04-04 16:29:29 +11:00
kevinz000
1987cc56a2
Merge pull request #11712 from Ghommie/Ghommie-cit661
...
Porting the mutation conflict system, and resizing quantum realm fix.
2020-04-03 21:58:58 -07:00
Lin
e8c33c411f
Merge pull request #11723 from Ghommie/Ghommie-cit663
...
Fixing three runtime errors.
2020-04-04 02:53:18 +00:00
necromanceranne
923486eb43
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-04 13:40:34 +11:00
kevinz000
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
...
Spellcasting element
2020-04-03 16:31:10 -07:00
Ghommie
9d97f1acda
Ports the VV Refactor by Kevinz.
2020-04-03 19:16:43 +02:00
necromanceranne
0c46c151f9
Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage.
2020-04-03 19:42:25 +11:00
Ghommie
1c81c8676b
Stops alopecia.
2020-04-03 00:33:38 +02:00
Ghommie
5a63eba57a
Stops a monky trick with mob holders.
2020-04-03 00:23:58 +02:00
Ghommie
58bc10bd31
Fixing three runtime errors.
2020-04-02 23:33:40 +02:00
Ghommie
45d1917f0f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-02 16:07:13 +02:00
Ghommie
519ebd5ed8
Porting the mutation conflict system, and resizing quantum realm fix.
2020-04-01 15:29:35 +02:00
Artur
881f8765f4
Stufffs
2020-04-01 15:29:40 +03:00
Artur
65ec9f3723
Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again
2020-04-01 13:03:06 +03:00
Artur
f40f07b033
[READY]Skateboard overhaul ( #45657 )
...
* skeet skeet
* scoot
* removes debug message
* merge conflict
* oopsie
* polish, new board types
* begone
* actioninja review
* passtable trait
* fixes indent
* dwarfism check
* check for existing flag
* check existing trait
* screwdriver returns FALSE
2020-04-01 12:05:27 +03:00
kevinz000
82c8710267
Merge pull request #11700 from kiwedespars/papermask
...
adds new cosmetic and craftable paper masks.
2020-04-01 01:03:14 -07:00
kevinz000
b5f1cbd3d0
Merge pull request #11683 from timothyteakettle/wrestling_holodeck
...
holodeck WRESTLING
2020-03-31 18:03:00 -07:00
Putnam3145
658701bf37
Various ghost role QoL; moving holding facility; removing energy net ( #11676 )
...
* Removed gay baby jail net from ninja
* Made a proper holding facility for syndicate contractors
* Made ghost role eligibility able to allow reghosting.
* Added a medibot to the holding facility.
* Added new comsigs to every other ghost proc
* Properly dummied out capture objective
2020-03-31 22:04:55 +02:00
Artur
a903752ff9
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-31 19:42:35 +03:00
kiwedespars
d825a10e58
makes the mask craftable
2020-03-31 01:51:14 -07:00
timothyteakettle
e2d02beedf
refactors the code to be less awful
...
i was told my code was bad so maybe its less bad now
2020-03-31 00:20:44 +01:00
Ghommie
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
Ghommie
5e5bc2a690
force push.
2020-03-29 17:01:05 +02:00
Timothy Teakettle
c6163e2349
this time it will work, right?
2020-03-29 15:02:36 +01:00
Timothy Teakettle
a68ce82060
woops
2020-03-29 14:13:16 +01:00
kevinz000
4eb2fb531a
Update sword_point.dm ( #11678 )
2020-03-29 15:03:08 +02:00
