Commit Graph

32459 Commits

Author SHA1 Message Date
Ghom
37b6aa9897 Update dwarves.dm 2020-04-03 05:31:37 +02:00
Ghommie
4ef42ba6b1 Dwarfy message spam QoL. 2020-04-03 05:16:17 +02:00
CitadelStationBot
431722e34d Automatic changelog generation for PR #11719 [ci skip] 2020-04-02 08:18:43 -05: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
CitadelStationBot
47f1c15fd8 Automatic changelog generation for PR #11708 [ci skip] 2020-04-02 07:25:37 -05:00
Seris02
4902d5ab4e makes sergal markings better (#11708) 2020-04-02 14:25:34 +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
CitadelStationBot
e32d4f9713 Automatic changelog generation for PR #11701 [ci skip] 2020-04-01 22:54:35 -05:00
Putnam3145
a9bfe00302 Merge pull request #11701 from Ghommie/Ghommie-cit657
Massive megafauna buff.
2020-04-01 20:54:32 -07:00
CitadelStationBot
53d0cb765f Automatic changelog generation for PR #11604 [ci skip] 2020-04-01 09:19:13 -05:00
dapnee
6f4281b4b8 Even More fixes to Lambda (#11604)
* Update lambda.dmm

even MORE fixes

* Update lambda.dmm

some more vents in maintenance, air canisters, and mystery coin

* Update lambda.dmm

more shit

* darn you ghommie

hopefully fixes conflicts

* Create lambda.dmm

okay, let's try this

* Update lambda.dmm

fingers crossed
2020-04-01 16:19:10 +02:00
CitadelStationBot
c13541b15c Automatic changelog generation for PR #11700 [ci skip] 2020-04-01 03:03:17 -05: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
CitadelStationBot
99263f1957 Automatic changelog generation for PR #11698 [ci skip] 2020-03-31 20:04:31 -05: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
CitadelStationBot
9efc69d229 Automatic changelog generation for PR #11693 [ci skip] 2020-03-31 20:04:06 -05:00
kevinz000
d2709af670 Merge pull request #11693 from Trilbyspaceclone/patch-327
Corrects OPS crate
2020-03-31 18:04:03 -07:00
CitadelStationBot
ade6bf363b Automatic changelog generation for PR #11692 [ci skip] 2020-03-31 20:03:51 -05: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
CitadelStationBot
aaecaefd31 Automatic changelog generation for PR #11683 [ci skip] 2020-03-31 20:03:02 -05:00
kevinz000
b5f1cbd3d0 Merge pull request #11683 from timothyteakettle/wrestling_holodeck
holodeck WRESTLING
2020-03-31 18:03:00 -07:00
CitadelStationBot
0c5fd95e56 Automatic changelog generation for PR #11682 [ci skip] 2020-03-31 20:02:27 -05:00
kevinz000
6bbc2c0db8 Merge pull request #11682 from Putnam3145/fix-sabotage
Sabotage objective tweaks
2020-03-31 18:02:24 -07:00
CitadelStationBot
5cb4a08f2a Automatic changelog generation for PR #11681 [ci skip] 2020-03-31 20:02:14 -05:00
kevinz000
b3642a3470 Merge pull request #11681 from PersianXerxes/medicalTGUINext
TGUI Next in the Medbay
2020-03-31 18:02:11 -07:00
CitadelStationBot
52242258eb Automatic changelog generation for PR #11669 [ci skip] 2020-03-31 20:00:05 -05: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
kevinz000
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
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
CitadelStationBot
3e15f9f128 Automatic changelog generation for PR #11676 [ci skip] 2020-03-31 15:04:58 -05: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
CitadelStationBot
01b30b4ebb Automatic changelog generation for PR #11688 [ci skip] 2020-03-31 06:11:02 -05: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
kiwedespars
24d9045679 papermask sprites bigger edition 2020-03-31 01:47:43 -07:00
kiwedespars
c9e1d480e9 Add files via upload 2020-03-31 01:20:53 -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
Ghommie
e26b43d80b The banishment of the floating disembodied phallus. 2020-03-31 02:40:28 +02: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
CitadelStationBot
abc4b5d331 Automatic changelog generation for PR #11677 [ci skip] 2020-03-30 16:50:38 -05:00
kevinz000
2521aa4973 Merge pull request #11677 from actioninja/wooow-glow
Better glowing lights
2020-03-30 14:50:36 -07:00
CitadelStationBot
994712193e Automatic changelog generation for PR #11691 [ci skip] 2020-03-30 16:24:54 -05:00