cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-28 02:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,458 Commits 55 Branches 0 Tags
5a63eba57a0b09dfb32b96ce465c64d753343b8d
Commit Graph

21044 Commits

Author SHA1 Message Date
Ghommie
5a63eba57a Stops a monky trick with mob holders. 2020-04-03 00:23:58 +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
Putnam3145
a9bfe00302 Merge pull request #11701 from Ghommie/Ghommie-cit657 
Massive megafauna buff.
 2020-04-01 20:54:32 -07: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
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
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
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
Lin
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
kappa-sama
2eda92ed73 yeah (#11668) 2020-03-30 17:52:31 +02:00
Trilbyspaceclone
5a10b1cc8f Imagine correcting nothing 2020-03-30 05:53:16 -04:00
Seris02
5095eee659 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into AAAAAAAAAAA 2020-03-30 17:37:47 +08:00
Seris02
63f033e46a FUCKING INFURIATING ME ALL THIS TIME 2020-03-30 17:30:08 +08:00
kevinz000
877b7f699e Update syndicate_contract.dm 2020-03-29 23:40:52 -07:00
kevinz000
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
KathrinBailey
b6202ad5a5 Gives shutters glass so the close proc doesn't change opacity 2020-03-30 02:36:27 +01:00
Ghommie
0bb93c3fa6 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-29 19:20:30 +02:00
deathride58
d1d090ae6f adds a length check for if the assigned targets list spontaneously deletes itself 2020-03-29 11:54:49 -04:00
necromanceranne
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
necromanceranne
aa01c30656 Removes some weapons and crates that shouldn't have been added, like, ever (#11673) 2020-03-29 17:22:03 +02:00
necromanceranne
cd9a782d9f Double-barreled shotgun and their children now can be used with off-hand weapons (#11674) 2020-03-29 17:20:39 +02:00
necromanceranne
02a8104c3b Makes taserslugs actually tasers, makes mech scattershot not a oneshot (#11671) 2020-03-29 17:19:27 +02:00
necromanceranne
3ddfbe0e29 Null Crate removal (#11672) 2020-03-29 17:16:58 +02:00
kevinz000
49416886a1 Update turf.dm (#11679) 2020-03-29 17:09:26 +02:00
Timothy Teakettle
c6163e2349 this time it will work, right? 2020-03-29 15:02:36 +01: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
Timothy Teakettle
a68ce82060 woops 2020-03-29 14:13:16 +01:00