shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,929 Commits 5 Branches 0 Tags
828b5cdacf5fd446d992dbd8c0635aea81445b99
Commit Graph
31929 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Detective Google 828b5cdacf why was this backwards 2020-03-16 01:57:23 -05:00
Detective Google 815844accd corrects sechud requirement. 2020-03-16 01:48:29 -05:00
Detective Google 94f694e568 adds some hudpatches 
seemed like fun flavor, inspired by bay and a request.
 2020-03-16 01:44:26 -05:00
CitadelStationBot c08f264dd2 Automatic changelog generation for PR #11462 [ci skip] 2020-03-16 01:04:04 -05:00
kevinz000andGitHub fae84f9ee6 Merge pull request #11462 from Ghommie/Ghommie-cit621 
Fixing some bug reports.
 2020-03-15 23:03:59 -07:00
CitadelStationBot 1f77a95365 Automatic changelog generation for PR #11474 [ci skip] 2020-03-16 01:03:12 -05:00
kevinz000andGitHub f927793118 Merge pull request #11474 from kappa-sama/patch-17 
halves the firebeath mutation's cooldown to 1 minute from 2 minutes
 2020-03-15 23:03:10 -07:00
CitadelStationBot 5ec23eac8c Automatic changelog generation for PR #11472 [ci skip] 2020-03-16 01:02:45 -05:00
kevinz000andGitHub d083d029b2 Merge pull request #11472 from zeroisthebiggay/brigmedbayssaltpr 
Mission Objective Powergame Brig (box station brig rework)
 2020-03-15 23:02:43 -07:00
CitadelStationBot 80be870ebf Automatic changelog generation for PR #11475 [ci skip] 2020-03-15 19:57:57 -05:00
Seris02andGitHub 259bb03969 fixes the swapping of buttons (#11475) 2020-03-16 01:57:55 +01:00
ZeroMan 8da4521a91 and i hate lawyers 2020-03-15 16:16:49 -04: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
ZeroMan d1651e44cd Merge branch 'brigmedbayssaltpr' of https://github.com/zeroisthebiggay/Citadel-Station-13 into brigmedbayssaltpr 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-03-15 13:04:56 -04:00
ZeroMan 6968e94b06 and maybe it works 2020-03-15 12:58:33 -04:00
ZeroMan a1f4c0232e a i wanna die 2020-03-15 12:57:55 -04:00
ZeroMan 326602bc5a and renault breaks everything 2020-03-15 12:40:53 -04:00
ZeroMan 4341ecf168 and maybe travis dies 2020-03-15 12:16:59 -04:00
ZeroMan 715d199073 i am so confused 2020-03-15 12:16:30 -04:00
ZeroMan 227372270e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr 2020-03-15 12:13:51 -04:00
ZeroMan 107a9fa2d2 and map merge exists 2020-03-15 11:29:49 -04:00
ZeroMan 82b63081f6 a couple more tweaks 2020-03-15 11:28:57 -04: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
GhomandGitHub d8a6e9b94f Merge branch 'master' into Ghommie-cit621 2020-03-15 13:07:45 +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
ZeroMan edb63ed212 and torture my cocknballs 2020-03-15 01:50:40 -04:00
ZeroMan 7affa9956e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr 2020-03-15 01:37:26 -04:00
ZeroMan 74076eb351 and maybe thisll work 2020-03-15 01:23:23 -04: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
ZeroMan 99b189844e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-03-15 01:11:19 -04: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