shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,391 Commits 5 Branches 0 Tags
b69b19eb534bfa4c324cf8d65a6aba7ca696d240
Commit Graph
32391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000 b69b19eb53 runtimes 2020-03-29 20:59:52 -07:00
kevinz000 03d87f6bdc Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-29 20:44:49 -07:00
CitadelStationBot 02d32d17c2 Automatic changelog generation for PR #11660 [ci skip] 2020-03-29 22:42:45 -05:00
kevinz000andGitHub 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
CitadelStationBot c1355c0df8 Automatic changelog generation for PR #11631 [ci skip] 2020-03-29 22:42:13 -05:00
kevinz000andGitHub 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
KathrinBailey b6202ad5a5 Gives shutters glass so the close proc doesn't change opacity 2020-03-30 02:36:27 +01:00
KathrinBailey 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
KathrinBailey 3f800c179c map merged should be no conflicts? 2020-03-30 01:08:45 +01:00
KathrinBailey 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
KathrinBailey b52f8148cb Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework 2020-03-30 00:32:31 +01:00
KathrinBailey b3750207e9 Merge Conflicts 
Changes redone.
 2020-03-30 00:11:34 +01:00
deathride58andGitHub d1d090ae6f adds a length check for if the assigned targets list spontaneously deletes itself 2020-03-29 11:54:49 -04:00
CitadelStationBot c6889ad8ee Automatic changelog generation for PR #11675 [ci skip] 2020-03-29 10:45:04 -05:00
necromanceranneandGitHub 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
CitadelStationBot 41557d4dbf Automatic changelog generation for PR #11673 [ci skip] 2020-03-29 10:22:06 -05:00
necromanceranneandGitHub aa01c30656 Removes some weapons and crates that shouldn't have been added, like, ever (#11673) 2020-03-29 17:22:03 +02:00
CitadelStationBot 8a2baea426 Automatic changelog generation for PR #11674 [ci skip] 2020-03-29 10:20:41 -05:00
necromanceranneandGitHub cd9a782d9f Double-barreled shotgun and their children now can be used with off-hand weapons (#11674) 2020-03-29 17:20:39 +02:00
CitadelStationBot 701187451d Automatic changelog generation for PR #11671 [ci skip] 2020-03-29 10:19:29 -05:00
necromanceranneandGitHub 02a8104c3b Makes taserslugs actually tasers, makes mech scattershot not a oneshot (#11671) 2020-03-29 17:19:27 +02:00
CitadelStationBot 71daf03699 Automatic changelog generation for PR #11672 [ci skip] 2020-03-29 10:17:00 -05:00
necromanceranneandGitHub 3ddfbe0e29 Null Crate removal (#11672) 2020-03-29 17:16:58 +02:00
CitadelStationBot e3e6f38285 Automatic changelog generation for PR #11679 [ci skip] 2020-03-29 10:09:28 -05:00
kevinz000andGitHub 49416886a1 Update turf.dm (#11679) 2020-03-29 17:09:26 +02:00
kevinz000andGitHub 4eb2fb531a Update sword_point.dm (#11678) 2020-03-29 15:03:08 +02:00
CitadelStationBot 2c39b14f5c Automatic changelog generation for PR #11656 [ci skip] 2020-03-28 21:06:12 -05:00
LinandGitHub 659873979f Merge pull request #11656 from Xantholne/bumbleswakeup 
Bumbles my man, you gotta stop sleeping for more than 8 hours it's bad for your health
 2020-03-29 02:06:09 +00:00
CitadelStationBot c314703d38 Automatic changelog generation for PR #11606 [ci skip] 2020-03-28 20:53:34 -05:00
TrilbyspacecloneGitHubGhom
 		942034df51 Makes a few space ruins hard spawn (#11606) 
* Update space.dm

* off with the sawed-in-half ruin

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-29 03:53:31 +02:00
CitadelStationBot 2c3ca418ef Automatic changelog generation for PR #11653 [ci skip] 2020-03-28 18:02:10 -05:00
kevinz000andGitHub 9595df3e18 Merge pull request #11653 from zeroisthebiggay/holoparsiteportsarefunny 
ports tg holoparasite customizations
 2020-03-28 16:02:08 -07:00
kevinz000andGitHub 6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650 
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
 2020-03-28 16:00:48 -07:00
CitadelStationBot 8d7276b150 Automatic changelog generation for PR #11651 [ci skip] 2020-03-28 18:00:11 -05:00
kevinz000andGitHub 0aebf68df0 Merge pull request #11651 from zeroisthebiggay/donotreviveme 
ghosts can now DNR
 2020-03-28 16:00:08 -07:00
kevinz000andGitHub 9797089f0c Merge pull request #11650 from Ghommie/Ghommie-cit649 
Ports "Adds spam prevention to clients"
 2020-03-28 15:59:40 -07:00
CitadelStationBot 13abb29d7f Automatic changelog generation for PR #11649 [ci skip] 2020-03-28 17:59:13 -05:00
kevinz000andGitHub 015371800c Merge pull request #11649 from Ghommie/Ghommie-cit648 
infiltrator sneaky boots fix.
 2020-03-28 15:59:10 -07:00
CitadelStationBot 7247904c1b Automatic changelog generation for PR #11645 [ci skip] 2020-03-28 17:58:58 -05:00
kevinz000andGitHub dd90d21f93 Merge pull request #11645 from Trilbyspaceclone/vaild 
Et tu?
 2020-03-28 15:58:56 -07:00
kevinz000andGitHub cf24117c77 Merge pull request #11639 from Citadel-Station-13/Ghommie-patch-1 
Makes Envy knife amongst other dna disguise shenanigeans actually update the gender.
 2020-03-28 15:58:29 -07:00
CitadelStationBot 30a0544d0e Automatic changelog generation for PR #11636 [ci skip] 2020-03-28 17:58:17 -05:00
kevinz000andGitHub 938ad42735 Merge pull request #11636 from Trilbyspaceclone/patch-325 
Medical Mechs syringe gun now innately know more healing chems
 2020-03-28 15:58:14 -07:00
CitadelStationBot 954dd2f45d Automatic changelog generation for PR #11642 [ci skip] 2020-03-28 08:46:40 -05:00
Putnam3145GitHubGhom
 		8a620b0ebc More dynamic rework: help I wasn't done (#11642) 
* 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.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-28 14:46:37 +01:00
Putnam3145andGitHub 44f1b770df Merge pull request #11648 from Ghommie/Ghommie-cit647 
one line fix to a box mapping issue
 2020-03-28 01:35:06 -07:00
kevinz000 c39dd52b5f Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-27 21:32:40 -07:00
deathride58 354ca22c9a Makes contractor targets actually show up in the traitor panel 2020-03-28 00:28:44 -04:00
kevinz000andGitHub eb84d426e1 Merge pull request #11634 from Ghommie/Ghommie-cit645 
Fixing a couple issues with sofas.
 2020-03-27 21:25:31 -07:00
CitadelStationBot 6c770df8ec Automatic changelog generation for PR #11629 [ci skip] 2020-03-27 23:23:57 -05:00