shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,891 Commits 5 Branches 0 Tags
312ef1d9616b645ebb39c2ab58d71d42f3de8db5
Commit Graph
31891 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghommie 312ef1d961 Merge branch 'Ghommie-cit616' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:38:42 +01:00
Ghommie ea30b2fb1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:35:59 +01:00
CitadelStationBot 9a0f43cb89 Automatic changelog generation for PR #11477 [ci skip] 2020-03-15 14:54:26 -05:00
kevinz000andGitHub 339ea13e00 Update beam_rifle.dm (#11477) 2020-03-15 20:54:23 +01:00
kevinz000andGitHub 28a8f204ed Merge pull request #11479 from Ghommie/Ghommie-cit622 
Fixing some GetElement runtimes.
 2020-03-15 10:39:36 -07:00
Ghommie 5bfbcd0948 Fixing some GetElement runtimes. 2020-03-15 15:12:35 +01:00
kevinz000andGitHub b7c3ada3e5 nuclear fixes the blindness issue by making eye_blind() max() rather than add (#11438) 
* Update status_procs.dm

* Update status_procs.dm

* travis

* aight bet
 2020-03-15 13:08:52 +01:00
CitadelStationBot 685485acf9 Automatic changelog generation for PR #11290 [ci skip] 2020-03-15 03:35:34 -05:00
kevinz000andGitHub 2139bfdb5f Merge pull request #11290 from Putnam3145/traitor-types 
Traitor classes: a new paradigm.
 2020-03-15 01:35:30 -07:00
CitadelStationBot f91d30dae5 Automatic changelog generation for PR #11455 [ci skip] 2020-03-15 00:22:18 -05:00
kevinz000andGitHub 0b809dd9ec Merge pull request #11455 from Trilbyspaceclone/patch-309 
Nerfs paper work - Again
 2020-03-14 22:22:16 -07:00
CitadelStationBot 46d05053fd Automatic changelog generation for PR #11458 [ci skip] 2020-03-15 00:21:34 -05:00
kevinz000andGitHub 195a3b593b Merge pull request #11458 from Trilbyspaceclone/patch-310 
Buffs borg hypos - Anti-radiation addition
 2020-03-14 22:21:32 -07:00
kevinz000andGitHub a6cec97694 Merge pull request #11459 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimist-1.2.2 
Bump minimist from 1.2.0 to 1.2.2 in /tgui
 2020-03-14 22:20:55 -07:00
CitadelStationBot 3c5f382f62 Automatic changelog generation for PR #11467 [ci skip] 2020-03-15 00:11:24 -05:00
kevinz000andGitHub 4d79230f87 Merge pull request #11467 from Kraseo/i-love-spaceruins 
Adds a blacklist to contractor dropoff areas
 2020-03-14 22:11:21 -07:00
kevinz000andGitHub 2de1395e6b Merge pull request #11471 from Citadel-Station-13/Ghommie-patch-1 
Webedit fixing electrocute_act stuns.
 2020-03-14 21:49:36 -07:00
CitadelStationBot ad46096384 Automatic changelog generation for PR #11456 [ci skip] 2020-03-14 22:05:06 -05:00
bunny232andGitHub 23e9ecf97c Update BoxStation.dmm (#11456) 2020-03-15 04:05:04 +01:00
CitadelStationBot 59be47b911 Automatic changelog generation for PR #11466 [ci skip] 2020-03-14 22:04:53 -05:00
Seris02andGitHub bfd001d165 quirk fixes (#11466) 2020-03-15 04:04:50 +01:00
CitadelStationBot fe886fed47 Automatic changelog generation for PR #11460 [ci skip] 2020-03-14 22:04:38 -05:00
KraseoandGitHub bee11a2ee5 no i am not testing if mice can chew wires if they're in a stomach now shut the fuck up (#11460) 2020-03-15 04:04:35 +01:00
CitadelStationBot b66614635c Automatic changelog generation for PR #11464 [ci skip] 2020-03-14 22:04:08 -05:00
Putnam3145andGitHub 52e20cdadf Made server votes not subject to the cooldown (#11464) 2020-03-15 04:04:05 +01:00
CitadelStationBot 83b34a053b Automatic changelog generation for PR #11461 [ci skip] 2020-03-14 22:03:53 -05:00
KraseoandGitHub d34d46f00d i think you're a thief cause you stole my heart, stole my heart, trapped my soul like azura's star (#11461) 2020-03-15 04:03:50 +01:00
kevinz000andGitHub e73e1b03ec Revert "Stunbaton disarm mode also works on disarm intent now" (#11446) 2020-03-14 23:14:57 +01:00
GhomandGitHub 06d641b46a Webedit fixing electrocute_act stuns. 2020-03-14 21:19:09 +01:00
CitadelStationBot cda2ace252 Automatic changelog generation for PR #11450 [ci skip] 2020-03-14 11:12:15 -05:00
kevinz000andGitHub 7a27baa699 Merge pull request #11450 from zeroisthebiggay/timefornekerchiefsuwu 
ports ([READY] Allows bandannas to be worn as neckerchiefs. #40125) from TG code
 2020-03-14 09:12:12 -07:00
CitadelStationBot e343dde291 Automatic changelog generation for PR #11452 [ci skip] 2020-03-14 11:12:00 -05:00
kevinz000andGitHub d4131912e9 Merge pull request #11452 from Citadel-Station-13/Linzolle-patch-1 
make the CMO hypokit not literally worse than normal ones
 2020-03-14 09:11:58 -07:00
CitadelStationBot 3cc584a040 Automatic changelog generation for PR #11453 [ci skip] 2020-03-14 11:11:41 -05:00
kevinz000andGitHub 0953ec19e5 Merge pull request #11453 from necromanceranne/I_am_at_high_risk_of_stroke 
I'm pretty sure this was causing people to bleed out from light hits
 2020-03-14 09:11:38 -07:00
CitadelStationBot fe915189e4 Automatic changelog generation for PR #11436 [ci skip] 2020-03-14 11:11:15 -05:00
kevinz000andGitHub 5949e35bda Merge pull request #11436 from MrJWhit/kilostation-fixes-kevinz-edition 
Kilostation adjustments
 2020-03-14 09:11:12 -07:00
CitadelStationBot a858316bdb Automatic changelog generation for PR #11437 [ci skip] 2020-03-14 11:10:57 -05:00
kevinz000andGitHub a21458bba6 Merge pull request #11437 from keronshb/BlobBuffPort 
Ports Blob Buffs
 2020-03-14 09:10:54 -07:00
CitadelStationBot 46edd143e7 Automatic changelog generation for PR #11447 [ci skip] 2020-03-14 11:09:53 -05:00
kevinz000andGitHub 395fa32136 Merge pull request #11447 from Ghommie/Ghommie-cit618 
Porting datum components system updates.
 2020-03-14 09:09:50 -07:00
CitadelStationBot 09afc31673 Automatic changelog generation for PR #11448 [ci skip] 2020-03-14 11:09:14 -05:00
kevinz000andGitHub a35049fc94 Merge pull request #11448 from Ghommie/Ghommie-cit619 
Makes the autotransfer subsystem slightly more modulable.
 2020-03-14 09:09:11 -07:00
Kraseo f8a365490b FUCK² 2020-03-14 13:15:09 +01:00
Kraseo 3f44882c1a FUCK 2020-03-14 13:13:26 +01:00
Kraseo a2592483b5 hey did you know there's not one, not two, but three tiles on roid7.dmm that don't have /area/ruin/space but rather /area/ruin/unpowered? yeah i'm angry too 2020-03-14 13:07:13 +01:00
CitadelStationBot c8922547de Automatic changelog generation for PR #11451 [ci skip] 2020-03-13 20:49:28 -05:00
Putnam3145andGitHub d9dc91db1a More dynamic fixes (#11451) 
* Fixed wizard, malf AI

* changed memes typename to story

* Fixed a bunch of really weird execute/ready confusion

* Added dynamic requirement to wands.
 2020-03-14 02:49:25 +01:00
dependabot[bot]andGitHub 888cdbeaf6 Bump minimist from 1.2.0 to 1.2.2 in /tgui 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.2.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-13 23:43:45 +00:00
TrilbyspacecloneandGitHub 6993dfde2a Now stocked at your local robotics 2020-03-13 18:29:46 -04:00