shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,449 Commits 5 Branches 0 Tags
e23bacdf6b33f06b09563a625e39e5591b2b1dae
Commit Graph
32449 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Artur e23bacdf6b Icons 2020-04-01 13:03:31 +03: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 dce23a40af God i wish i could auto merge icons 2020-04-01 12:05:53 +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
CitadelStationBot c13541b15c Automatic changelog generation for PR #11700 [ci skip] 2020-04-01 03:03:17 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
CitadelStationBot 3e15f9f128 Automatic changelog generation for PR #11676 [ci skip] 2020-03-31 15:04:58 -05:00
Putnam3145andGitHub 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
CitadelStationBot 01b30b4ebb Automatic changelog generation for PR #11688 [ci skip] 2020-03-31 06:11:02 -05:00
Putnam3145GitHubGhom
 		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
kiwedesparsandGitHub d825a10e58 makes the mask craftable 2020-03-31 01:51:14 -07:00
kiwedesparsandGitHub 83abe07cb7 cobbling together the actual item 2020-03-31 01:49:29 -07:00
kiwedesparsandGitHub 24d9045679 papermask sprites bigger edition 2020-03-31 01:47:43 -07:00
kiwedesparsandGitHub c9e1d480e9 Add files via upload 2020-03-31 01:20:53 -07:00
GhomandGitHub 993548ad0e Update emergency.dm 2020-03-31 04:18:35 +02:00
TrilbyspacecloneGitHubGhom
 		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
kevinz000andGitHub 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
kevinz000GitHubGhom
 		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
LinandGitHub 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
kevinz000andGitHub 15ca26f263 Merge pull request #11684 from Ghommie/Ghommie-cit653 
Bumps up dreamchecker version
 2020-03-30 11:29:41 -07:00
CitadelStationBot 43ca451b59 Automatic changelog generation for PR #11663 [ci skip] 2020-03-30 10:54:12 -05:00
TrilbyspacecloneandGitHub 0f32cbaa31 28 days ago (#11663) 2020-03-30 17:54:09 +02:00
CitadelStationBot 08101604a5 Automatic changelog generation for PR #11668 [ci skip] 2020-03-30 10:52:34 -05:00
kappa-samaandGitHub 2eda92ed73 yeah (#11668) 2020-03-30 17:52:31 +02:00
Putnam3145andGitHub 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
TrilbyspacecloneandGitHub 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