shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,883 Commits 5 Branches 0 Tags
ca285046b0699142ceca74414ddbd95f5d171abf
Commit Graph
287 Commits
Author SHA1 Message Date
LetterJayandGitHub 7be17b6f12 Merge pull request #4447 from Citadel-Station-13/upstream-merge-33639 
[MIRROR] Golems can wear labcoats
 2017-12-26 07:38:06 -06:00
LetterJayandGitHub e51baed92e Update labcoat.dm 2017-12-26 05:27:01 -06:00
LetterJayandGitHub ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
LetterJayandGitHub 92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJayandGitHub 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
coiaxandCitadelStationBot 11856db2fb Golems can wear labcoats 2017-12-18 21:22:38 -06:00
XDTMandCitadelStationBot 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
Emmett GainesandCitadelStationBot f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
vuonojenmustaturskaandCitadelStationBot fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
vuonojenmustaturskaandCitadelStationBot 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
CitadelStationBotandkevinz000 cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
AnturKandCitadelStationBot 6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
Jordan BrownandCitadelStationBot 04ea26f6ee Merge pull request #33444 from Dorsisdwarf/gloves 
Changes captain glove description
 2017-12-11 08:59:36 -06:00
FrozenGuy5andCitadelStationBot 9b4396f7b6 Tweaks hardsuit's armor ratings (#33428) 2017-12-10 17:45:41 -06:00
orangesandCitadelStationBot 30143ee601 Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE 
[READY]Fixes beam rifles and flightsuits
 2017-12-10 15:19:18 -06:00
deathride58 742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
 2017-12-08 19:58:41 -05:00
Jordan BrownandCitadelStationBot 8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen 
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 10:35:23 -06:00
Ashe HiggsandCitadelStationBot 7b3c2862d3 Stethoscope defibrillation checking (#33234) 2017-12-05 03:22:48 -06:00
deathride58 f57e02ce95 Merge branch 'master' into donoritemmodularization 2017-12-04 20:17:02 -05:00
deathride58andGitHub 507c862c7c Update hud.dm 2017-11-28 22:24:00 -05:00
CruixandCitadelStationBot b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
ShizCalevandCitadelStationBot 2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
LetterJayandGitHub eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
deathride58 8d39fb9dce merges https://github.com/tgstation/tgstation/pull/32678 2017-11-22 17:40:25 -05:00
deathride58 b6630b41d1 merges #3877 proper 2017-11-22 17:37:22 -05:00
deathride58andGitHub 3b1067ba7a Update pants.dm 2017-11-22 14:56:26 -05:00
deathride58andGitHub c5adadc5d1 Update engineering.dm 2017-11-22 14:54:01 -05:00
deathride58andGitHub 5d2c5add1f Update color.dm 2017-11-22 14:50:37 -05:00
deathride58andGitHub b24c9335b3 Update jobs.dm 2017-11-22 14:48:35 -05:00
deathride58andGitHub 5e6e725666 Update color.dm 2017-11-22 14:47:15 -05:00
deathride58andGitHub 2dbe3e3b82 Update chameleon.dm 2017-11-22 14:46:06 -05:00
ShizCalevandCitadelStationBot 6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
deathride58andGitHub 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Jordan BrownandCitadelStationBot 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
JordieandCitadelStationBot 5bb8a1b962 Merge pull request #32853 from KorPhaeron/purple 
Fixes purple bartender clothes
 2017-11-19 22:55:03 -06:00
deathride58andGitHub eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
CitadelStationBotandkevinz000 0beef30fb7 Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! (#3993) 2017-11-17 19:02:40 -08:00
JordieandCitadelStationBot b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
orangesandCitadelStationBot 952fa2a0f2 Fix conflicts between helmet/mech HUDs and HUD glasses 2017-11-16 15:39:15 -06:00
LetterJayandGitHub 1939e96bb6 Merge branch 'master' into upstream-merge-32183 2017-11-15 10:22:40 -06:00
orangesandCitadelStationBot 43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
LetterJayandGitHub 14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LeoandCitadelStationBot 64d0c4711f Merge pull request #32583 from Iamgoofball/patch-334 
Frog masks no longer have a sound
 2017-11-11 14:31:37 -06:00
swindlyandCitadelStationBot 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJayandGitHub ea44e4a1d9 Merge pull request #3857 from Citadel-Station-13/upstream-merge-32489 
[MIRROR] Global vest lists
 2017-11-08 02:21:36 -06:00
ShizCalevandCitadelStationBot 5f5f313551 Global vest lists (#32489) 
* Global vest lists

* revised coat

* Fixed duped proc
 2017-11-07 23:57:57 -06:00
kevinz000andCitadelStationBot 3253087a0d Makes flightsuits far more vulnerable to EMPs (#32430) 2017-11-07 10:39:42 -06:00