Commit Graph

21084 Commits

Author SHA1 Message Date
necromanceranne a6bd6d23fe Some cleanup with help from rohesie, hopefully I figured it out 2020-04-06 12:28:14 +10:00
necromanceranne 38586c9d92 I feel like this is more fitting 2020-04-04 20:09:09 +11: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 4c051f70e8 fixes this too 2020-04-04 19:16:59 +11:00
necromanceranne bd5446e906 NYOOPS 2020-04-04 18:21:18 +11:00
necromanceranne fcb816675b not only am I blind I am also dumb 2020-04-04 18:20:17 +11:00
necromanceranne 856eca772d this is all still super broken 2020-04-04 18:05:02 +11:00
necromanceranne 7935eb8364 pretty sure this was brekaing stuff 2020-04-04 17:24:44 +11:00
necromanceranne c6e82382a3 I feel like messing with this is basically unnecessary 2020-04-04 16:51:32 +11:00
necromanceranne 8af29a178c Hooks up the chaplain null rod gloves to the choice of gloves 2020-04-04 16:42:37 +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
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
kevinz000 12d78dd7d8 Merge pull request #11329 from Ghommie/Ghommie-cit601
Made laser carbines and magrifles bulkier.
2020-04-03 16:30:47 -07:00
kevinz000 57fe91fafb Merge pull request #11596 from Feasel/patch-4
[Balance Pass] - Stunbaton (Because no one wants to do a single line …
2020-04-03 16:30:30 -07:00
Arturlang 598179553e Changes making cablecuffs to using cable in your hand, instead of a menu. (#11702)
* There we go

* Ghommie suggestions
2020-04-03 18:34:26 +02:00
Timothy Teakettle 0919737c21 fixes shadow emission (#11713) 2020-04-03 14:23:24 +02:00
Putnam3145 93feb0277a Further dynamic tweaks: "you can instamerge this time" edition (#11715)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

* Make roundstarts ignore current threat

It's not even calculated yet, so this is probably better.

* Minimum pop for chaotic/teamwork.

* More conveyance issues, removed superfluous threat costs

* More conveyance and tweaks

* Makes storyteller min players use all players instead of ready

* Lowered chaos weight with chaotic

* Blob now has correct cost

* Makes phylactery count for threat

* Makes random storyteller  have random threat level

* Made starting rulesets scale up with threat LEVEL

* Made "minor rulesets" never have lower weight

* Makes chaotic not forced.

* Made story about 25% less chaotic

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-04-03 14:23:08 +02:00
necromanceranne c5b55826b5 Punches land with the same consistency across races, punches cheaper, king hits are nastier (#11707)
* I think everyone should be landing punches now.

* brawling just got mathematical?

* pawnch harder get tired less this is a balance change now I guess

* nearly added instastun king hits, now stun punches are more rng

* I'm tired okay
2020-04-03 14:19:40 +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
necromanceranne b37dc1e322 Merge branch 'punch' into pawnch_2_the_pawnchening 2020-04-03 14:02:42 +11:00
necromanceranne e1a013bcb2 I'm tired okay 2020-04-03 11:30:00 +11:00
necromanceranne c481db2bfd nearly added instastun king hits, now stun punches are more rng 2020-04-03 11:25:29 +11:00
necromanceranne f26a9b948c pawnch harder get tired less this is a balance change now I guess 2020-04-03 10:50:26 +11:00
Putnam3145 ede3379a87 Merge pull request #11719 from Ghommie/Ghommie-cit662
Intellectual property infringment is not cool.
2020-04-02 06:18:41 -07:00
Ghommie e50fe8b061 Removing a trademark from the game. 2020-04-02 14:48:43 +02:00
Putnam3145 736ef2cb7c Merge pull request #11705 from Ghommie/Ghommie-cit659
It's past midnight, time for your runtime errors fixing.
2020-04-01 23:16:29 -07:00
Putnam3145 a9bfe00302 Merge pull request #11701 from Ghommie/Ghommie-cit657
Massive megafauna buff.
2020-04-01 20:54:32 -07:00
necromanceranne 13c474f2af brawling just got mathematical? 2020-04-01 22:05:22 +11: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
necromanceranne 157ef93c0b I think everyone should be landing punches now. 2020-04-01 15:12:59 +11:00
kevinz000 37625adb69 Merge pull request #11698 from Ghommie/Ghommie-cit656
The banishment of the floating disembodied phallus.
2020-03-31 18:04:28 -07:00
kevinz000 d2709af670 Merge pull request #11693 from Trilbyspaceclone/patch-327
Corrects OPS crate
2020-03-31 18:04:03 -07:00
kevinz000 a2372bb213 Merge pull request #11692 from Seris02/AAAAAAAAAAA
small improvement with color selections on character appearance menu
2020-03-31 18:03:49 -07:00
kevinz000 3fdb681ff5 Merge pull request #11685 from Ghommie/Ghommie-ci654
Ports "I got high and made a thing that was broke and 3 years, 2 months, 17 days later I get high and fix it."
2020-03-31 18:03:28 -07:00
kevinz000 b5f1cbd3d0 Merge pull request #11683 from timothyteakettle/wrestling_holodeck
holodeck WRESTLING
2020-03-31 18:03:00 -07:00
kevinz000 6bbc2c0db8 Merge pull request #11682 from Putnam3145/fix-sabotage
Sabotage objective tweaks
2020-03-31 18:02:24 -07:00
kevinz000 b3642a3470 Merge pull request #11681 from PersianXerxes/medicalTGUINext
TGUI Next in the Medbay
2020-03-31 18:02:11 -07:00
kevinz000 234dd9c439 Merge pull request #11669 from Ghommie/Ghommie-cit651
Ports "Fixes vault and high security door material exploit and tweaks high security door cost"
2020-03-31 18:00:02 -07:00
Ghom 5f128447f5 Update guardian.dm 2020-04-01 02:21:50 +02:00
Ghommie 5bae25c889 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit659 2020-04-01 00:49:13 +02:00
Ghommie 8bb98f92ca It's past midnight, time for your runtimes flattening. 2020-04-01 00:47:29 +02: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
Ghommie 021ebcec66 Massive megafauna buff. 2020-03-31 14:09:32 +02:00
Putnam3145 e63dc08e66 More dynamic fixes, AKA if Ghommie keeps merging without telling me I will maybe get irate (#11688)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

* Make roundstarts ignore current threat

It's not even calculated yet, so this is probably better.

* Minimum pop for chaotic/teamwork.

* More conveyance issues, removed superfluous threat costs

* More conveyance and tweaks

* Makes storyteller min players use all players instead of ready

* Lowered chaos weight with chaotic

* Blob now has correct cost

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-31 13:10:59 +02:00
kiwedespars d825a10e58 makes the mask craftable 2020-03-31 01:51:14 -07:00
kiwedespars 83abe07cb7 cobbling together the actual item 2020-03-31 01:49:29 -07:00
Ghom 993548ad0e Update emergency.dm 2020-03-31 04:18:35 +02:00
Trilbyspaceclone 29fc535da8 Update code/modules/cargo/packs/emergency.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-30 22:01:16 -04:00
Ghommie 4582e9cdf5 Oh. 2020-03-31 02:44:20 +02:00