aaecaefd31
Automatic changelog generation for PR #11683 [ci skip]
2020-03-31 20:03:02 -05:00
b5f1cbd3d0
Merge pull request #11683 from timothyteakettle/wrestling_holodeck
...
holodeck WRESTLING
2020-03-31 18:03:00 -07:00
0c5fd95e56
Automatic changelog generation for PR #11682 [ci skip]
2020-03-31 20:02:27 -05:00
6bbc2c0db8
Merge pull request #11682 from Putnam3145/fix-sabotage
...
Sabotage objective tweaks
2020-03-31 18:02:24 -07:00
5cb4a08f2a
Automatic changelog generation for PR #11681 [ci skip]
2020-03-31 20:02:14 -05:00
b3642a3470
Merge pull request #11681 from PersianXerxes/medicalTGUINext
...
TGUI Next in the Medbay
2020-03-31 18:02:11 -07:00
52242258eb
Automatic changelog generation for PR #11669 [ci skip]
2020-03-31 20:00:05 -05:00
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
7a0912c2e6
Merge pull request #11689 from Citadel-Station-13/Ghommie-patch-1
...
Bump up rust-g version to 0.4.3
2020-03-31 17:55:27 -07:00
3e15f9f128
Automatic changelog generation for PR #11676 [ci skip]
2020-03-31 15:04:58 -05: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
01b30b4ebb
Automatic changelog generation for PR #11688 [ci skip]
2020-03-31 06:11:02 -05: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
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
abc4b5d331
Automatic changelog generation for PR #11677 [ci skip]
2020-03-30 16:50:38 -05:00
2521aa4973
Merge pull request #11677 from actioninja/wooow-glow
...
Better glowing lights
2020-03-30 14:50:36 -07:00
994712193e
Automatic changelog generation for PR #11691 [ci skip]
2020-03-30 16:24:54 -05: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
15ca26f263
Merge pull request #11684 from Ghommie/Ghommie-cit653
...
Bumps up dreamchecker version
2020-03-30 11:29:41 -07:00
43ca451b59
Automatic changelog generation for PR #11663 [ci skip]
2020-03-30 10:54:12 -05:00
0f32cbaa31
28 days ago ( #11663 )
2020-03-30 17:54:09 +02:00
08101604a5
Automatic changelog generation for PR #11668 [ci skip]
2020-03-30 10:52:34 -05:00
2eda92ed73
yeah ( #11668 )
2020-03-30 17:52:31 +02:00
41904dccaf
Merge pull request #11690 from Citadel-Station-13/kevinz000-patch-1
...
changes 60 * 4 * 10 to 4 MINUTES because this hurts to read
2020-03-30 03:04:04 -07:00
877b7f699e
Update syndicate_contract.dm
2020-03-29 23:40:52 -07:00
02d32d17c2
Automatic changelog generation for PR #11660 [ci skip]
2020-03-29 22:42:45 -05: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
c1355c0df8
Automatic changelog generation for PR #11631 [ci skip]
2020-03-29 22:42:13 -05:00
8847fd4210
Merge pull request #11631 from KathrinBailey/Kat'sBoxRework
...
Adds radiation shuttters and new posters to maps; fixes (new?) bugs; fixes windowed shutter.
2020-03-29 20:42:11 -07:00
1f2778a4b0
FUCK I FORGOT IT WAS A BUGGED ONE
2020-03-30 05:34:47 +02:00
3a10f57b3a
Update dependencies.sh
2020-03-30 05:26:16 +02:00
b6202ad5a5
Gives shutters glass so the close proc doesn't change opacity
2020-03-30 02:36:27 +01:00
f4d304bfcf
I FORGOT TO RE-ADD HOOCHMASTER AGAIN
...
HOW COULD I DO THIS poor hoochmaster I am so so sorry this is the second time I am sorry bartender mains.
2020-03-30 01:29:44 +01:00
3f800c179c
map merged should be no conflicts?
2020-03-30 01:08:45 +01:00
d27c802859
wait so I literally copied from master and did stuff again and it has merge conflicts, do not merge until another commit goes through
2020-03-30 00:44:59 +01:00
b52f8148cb
Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework
2020-03-30 00:32:31 +01:00
b3750207e9
Merge Conflicts
...
Changes redone.
2020-03-30 00:11:34 +01:00
c9aea0b725
Bumps up dreamchecker version (possible incoming warnings from the linter)
2020-03-29 18:10:54 +02:00
d1d090ae6f
adds a length check for if the assigned targets list spontaneously deletes itself
2020-03-29 11:54:49 -04:00
c6889ad8ee
Automatic changelog generation for PR #11675 [ci skip]
2020-03-29 10:45:04 -05: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
41557d4dbf
Automatic changelog generation for PR #11673 [ci skip]
2020-03-29 10:22:06 -05:00
aa01c30656
Removes some weapons and crates that shouldn't have been added, like, ever ( #11673 )
2020-03-29 17:22:03 +02:00
8a2baea426
Automatic changelog generation for PR #11674 [ci skip]
2020-03-29 10:20:41 -05: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
701187451d
Automatic changelog generation for PR #11671 [ci skip]
2020-03-29 10:19:29 -05:00
02a8104c3b
Makes taserslugs actually tasers, makes mech scattershot not a oneshot ( #11671 )
2020-03-29 17:19:27 +02:00
71daf03699
Automatic changelog generation for PR #11672 [ci skip]
2020-03-29 10:17:00 -05:00
3ddfbe0e29
Null Crate removal ( #11672 )
2020-03-29 17:16:58 +02:00
CitadelStationBot