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
923486eb43
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-04 13:40:34 +11:00
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
...
Spellcasting element
2020-04-03 16:31:10 -07:00
12d78dd7d8
Merge pull request #11329 from Ghommie/Ghommie-cit601
...
Made laser carbines and magrifles bulkier.
2020-04-03 16:30:47 -07:00
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
0919737c21
fixes shadow emission ( #11713 )
2020-04-03 14:23:24 +02:00
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
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
b37dc1e322
Merge branch 'punch' into pawnch_2_the_pawnchening
2020-04-03 14:02:42 +11:00
e1a013bcb2
I'm tired okay
2020-04-03 11:30:00 +11:00
c481db2bfd
nearly added instastun king hits, now stun punches are more rng
2020-04-03 11:25:29 +11:00
f26a9b948c
pawnch harder get tired less this is a balance change now I guess
2020-04-03 10:50:26 +11:00
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
a9bfe00302
Merge pull request #11701 from Ghommie/Ghommie-cit657
...
Massive megafauna buff.
2020-04-01 20:54:32 -07:00
13c474f2af
brawling just got mathematical?
2020-04-01 22:05:22 +11:00
82c8710267
Merge pull request #11700 from kiwedespars/papermask
...
adds new cosmetic and craftable paper masks.
2020-04-01 01:03:14 -07:00
157ef93c0b
I think everyone should be landing punches now.
2020-04-01 15:12:59 +11:00
37625adb69
Merge pull request #11698 from Ghommie/Ghommie-cit656
...
The banishment of the floating disembodied phallus.
2020-03-31 18:04:28 -07:00
d2709af670
Merge pull request #11693 from Trilbyspaceclone/patch-327
...
Corrects OPS crate
2020-03-31 18:04:03 -07:00
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
b3642a3470
Merge pull request #11681 from PersianXerxes/medicalTGUINext
...
TGUI Next in the Medbay
2020-03-31 18:02:11 -07:00
5f128447f5
Update guardian.dm
2020-04-01 02:21:50 +02:00
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
8bb98f92ca
It's past midnight, time for your runtimes flattening.
2020-04-01 00:47:29 +02:00
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
021ebcec66
Massive megafauna buff.
2020-03-31 14:09:32 +02:00
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
83abe07cb7
cobbling together the actual item
2020-03-31 01:49:29 -07:00
993548ad0e
Update emergency.dm
2020-03-31 04:18:35 +02:00
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
4582e9cdf5
Oh.
2020-03-31 02:44:20 +02:00
e26b43d80b
The banishment of the floating disembodied phallus.
2020-03-31 02:40:28 +02:00
2521aa4973
Merge pull request #11677 from actioninja/wooow-glow
...
Better glowing lights
2020-03-30 14:50:36 -07:00
6e140f003c
cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside ( #11691 )
...
* Update cloning.dm
* Update traits.dm
* Update life.dm
* Update code/__DEFINES/traits.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-30 23:24:51 +02:00
4eaf8882f3
Merge pull request #11670 from Citadel-Station-13/Ghommie-patch-2
...
fixing no grav limbless slowdown
2020-03-30 19:57:14 +00:00
2eda92ed73
yeah ( #11668 )
2020-03-30 17:52:31 +02:00
5a10b1cc8f
Imagine correcting nothing
2020-03-30 05:53:16 -04:00
5095eee659
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into AAAAAAAAAAA
2020-03-30 17:37:47 +08:00
63f033e46a
FUCKING INFURIATING ME ALL THIS TIME
2020-03-30 17:30:08 +08:00
877b7f699e
Update syndicate_contract.dm
2020-03-29 23:40:52 -07:00
0cee7c9675
Merge pull request #11660 from deathride58/fuckcontractors
...
Quick and dirty PR to make contractor targets actually show up in the traitor panel
2020-03-29 20:42:43 -07:00
d1d090ae6f
adds a length check for if the assigned targets list spontaneously deletes itself
2020-03-29 11:54:49 -04:00
a4313ee101
Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink ( #11675 )
2020-03-29 17:45:01 +02:00
aa01c30656
Removes some weapons and crates that shouldn't have been added, like, ever ( #11673 )
2020-03-29 17:22:03 +02:00
cd9a782d9f
Double-barreled shotgun and their children now can be used with off-hand weapons ( #11674 )
2020-03-29 17:20:39 +02:00
02a8104c3b
Makes taserslugs actually tasers, makes mech scattershot not a oneshot ( #11671 )
2020-03-29 17:19:27 +02:00
3ddfbe0e29
Null Crate removal ( #11672 )
2020-03-29 17:16:58 +02:00
304b2c68bf
Finished, after a way too long break!
2020-03-29 09:36:40 -04:00
0bc6a3d4b6
Updating
...
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into medicalTGUINext
2020-03-29 08:35:15 -04:00
abde27c098
layer changes
2020-03-28 23:50:08 -07:00
necromanceranne