Commit Graph

2496 Commits

Author SHA1 Message Date
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
necromanceranne 353c6f1348 forgot this bit 2020-04-07 23:35:10 +10: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
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
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 519ebd5ed8 Porting the mutation conflict system, and resizing quantum realm fix. 2020-04-01 15:29:35 +02: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
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
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
Trilbyspaceclone 942034df51 Makes a few space ruins hard spawn (#11606)
* Update space.dm

* off with the sawed-in-half ruin

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-29 03:53:31 +02:00
timothyteakettle b89a6b0398 makes everything work 2020-03-29 02:44:44 +01:00
timothyteakettle 5afe5aab3f fixes the map, adds subtype of martial art 2020-03-29 00:46:18 +00:00
kevinz000 6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-28 16:00:48 -07:00
kevinz000 cf24117c77 Merge pull request #11639 from Citadel-Station-13/Ghommie-patch-1
Makes Envy knife amongst other dna disguise shenanigeans actually update the gender.
2020-03-28 15:58:29 -07:00
Ghom 09608dee5f Update split_personality.dm 2020-03-28 03:30:36 +01:00
kevinz000 06bc8073cb Merge pull request #11614 from Citadel-Station-13/Ghommie-patch-2
Quick webedit fixing an issue with the split personality.
2020-03-27 16:32:29 -07:00
Ghommie 41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Putnam3145 1a6107a518 Removed nymphomania, plus code cleanup (#11641) 2020-03-27 14:03:05 +01:00
kevinz000 0c60294c0f does the quirky thing where a beam with origin/target in a container doesn't cut the map in half because byond is quirky and things inside things are x/y/z=0 (#11585)
* Update beam.dm

* god i hate this

* Update beam.dm

* ok

* touching kevinz PR in an inappropriate way.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-27 00:21:10 +01:00
Lin 76e4d0e0db Merge pull request #11622 from Ghommie/Ghommie-cit643
Antags such as wizard and nuke ops are now flavorless. Also closet megafauna fix.
2020-03-26 18:06:50 -05:00
Ghom 1eb25e4880 Update dna.dm 2020-03-26 23:56:01 +01:00
Ghommie 1642903ab3 Spares the official because they don't have their name replaced. 2020-03-25 23:46:27 +01:00
Ghommie 4a01e59623 Signals things. 2020-03-25 23:36:31 +01:00