Commit Graph

7485 Commits

Author SHA1 Message Date
kevinz000
d149ce47a6 ok 2020-04-09 21:31:35 -07:00
kevinz000
857716c473 k 2020-04-09 09:30:28 -07:00
kevinz000
e6f98fa270 compile 2020-04-09 09:16:46 -07:00
kevinz000
a888c7c29a continue 2020-04-09 02:52:32 -07: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
kevinz000
ec237331a4 Merge pull request #11743 from Citadel-Station-13/Ghommie-patch-2-1
Lil minesweeper edge case.
2020-04-06 15:48:50 -07:00
kevinz000
a53096bdbf Merge pull request #11745 from Trilbyspaceclone/hide_and_seak
Atomic PR 1 or 2 - Toilet Loot!
2020-04-06 15:47:39 -07:00
kevinz000
a80e6712b9 Merge pull request #11749 from Putnam3145/organ-conveyance
Changed how scanners show organ damage.
2020-04-06 15:46:49 -07:00
Putnam
443af96126 Changed how scanners show organ damage. 2020-04-05 03:25:04 -07: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
nik707
09c8bd40ec Merge pull request #11575 from EmeraldSundisk/coggers
as of yet unfinished, being added in the background for ease of further development
2020-04-04 13:18:07 -05:00
Trilbyspaceclone
32b98cce44 rip funny commit
//We care about you Skyrats!
2020-04-04 10:38:11 -04:00
Trilbyspaceclone
99bf1da408 your to you 2020-04-04 10:37:37 -04:00
Kraseo
70859170c7 basically i fucking hate map merge conflicts 2020-04-04 16:32:45 +02:00
kevinz000
5e961e5e43 Merge pull request #11711 from Arturlang/skateboards_cool_again
Buffs skateboards
2020-04-04 07:15:29 -07:00
TrilbySpaceClone
10ca01cc95 effort 2020-04-04 09:30:24 -04:00
Ghom
e2d2f5a4ad Update minesweeper.dm 2020-04-04 14:04:47 +02:00
Ghom
3c9a9136b5 Update minesweeper.dm 2020-04-04 13:46:21 +02:00
kevinz000
010ddb2bfb Merge pull request #11706 from Ghommie/Ghommie-cit660
Minesweeper armageddon improvements
2020-04-03 21:55:16 -07:00
kevinz000
413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616
Spellcasting element
2020-04-03 16:31:10 -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
Ghommie
9d97f1acda Ports the VV Refactor by Kevinz. 2020-04-03 19:16:43 +02: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
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
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
Artur
65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur
4de14fbdf7 Finnishing touches 2020-04-01 12:59: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
Ghommie
73c52c0c6e Accurate minefield. 2020-04-01 05:19:29 +02:00
Ghommie
04c8cb09a4 out of bounds coordinates sanity 2020-04-01 04:41:21 +02:00
Ghommie
736760ac06 Minesweeper oopsies etcetera. 2020-04-01 04:39:36 +02: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
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
Kraseo
a8759b048e smashes the tyranny of public mining 2020-03-31 23:32:15 +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
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
kevinz000
2521aa4973 Merge pull request #11677 from actioninja/wooow-glow
Better glowing lights
2020-03-30 14:50:36 -07:00
kevinz000
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
KathrinBailey
b6202ad5a5 Gives shutters glass so the close proc doesn't change opacity 2020-03-30 02:36:27 +01:00
kevinz000
49416886a1 Update turf.dm (#11679) 2020-03-29 17:09:26 +02:00
Putnam
32b8af693d Makes AI-hacked-law sabotage only run if there's AI 2020-03-29 06:52:44 -07:00
Putnam
569d7aac6f Removes integrity sabotage 2020-03-29 06:52:21 -07:00
Persi
304b2c68bf Finished, after a way too long break! 2020-03-29 09:36:40 -04:00