shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,664 Commits 5 Branches 0 Tags
a7ec44bfccd29bbd9a96fd0d2fe8dbfadf42e72f
Commit Graph

310 Commits

Author SHA1 Message Date
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
modularized_suicide
f13426c5af many flashes?? 2018-01-07 02:07:39 -06:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay
d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967 
[MIRROR] Makes the decal component handle updating inventory icons
 2018-01-02 19:15:46 -06:00
LetterJay
c22e0dc862 Update chameleon.dm 2018-01-02 15:48:32 -06:00
Emmett Gaines
f581b2d94d Makes the decal component handle updating inventory icons 2018-01-02 15:18:31 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay
168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
LetterJay
d986ca1ee3 Merge pull request #4594 from Citadel-Station-13/upstream-merge-33911 
[MIRROR] Adds white and rainbow gloves to the gloves/color/random selection pool
 2018-01-01 04:26:56 -06:00
LetterJay
1463a442a5 Merge pull request #4596 from Citadel-Station-13/upstream-merge-33915 
[MIRROR] Removes suit sensors from bural garbs
 2018-01-01 04:25:37 -06:00
AnturK
bbca0afa37 Fixes thermals, also drops the see invisible from thermals. (#33950) 2017-12-31 06:30:34 -06:00
LetterJay
211f3942a6 Merge branch 'master' into upstream-merge-33930 2017-12-30 13:37:52 -06:00
LetterJay
c1c67ced1a Update color.dm 2017-12-30 13:37:30 -06:00
LetterJay
4d3b7ddcbd Update color.dm 2017-12-30 13:37:23 -06:00
Jordan Brown
d306c8fa62 Removes suit sensors from bural garbs (#33915) 
* Removes suit sensors from bural garbs

* Dew it right
 2017-12-29 21:36:35 -06:00
LetterJay
a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
oranges
a958de3d96 Fixes assistants spawning naked 2017-12-29 17:11:05 -06:00
ShizCalev
0c84651ec4 white and rainbow 2017-12-29 13:45:25 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
Jordan Brown
d38a4a2aa5 Merge pull request #33905 from ShizCalev/jumpsuit-fix 
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
 2017-12-29 10:10:30 -06:00
LetterJay
8a792d6ef6 more save points 2017-12-29 00:07:36 -06:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay
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
LetterJay
e51baed92e Update labcoat.dm 2017-12-26 05:27:01 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
coiax
11856db2fb Golems can wear labcoats 2017-12-18 21:22:38 -06:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
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
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
CitadelStationBot
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
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
Jordan Brown
04ea26f6ee Merge pull request #33444 from Dorsisdwarf/gloves 
Changes captain glove description
 2017-12-11 08:59:36 -06:00
FrozenGuy5
9b4396f7b6 Tweaks hardsuit's armor ratings (#33428) 2017-12-10 17:45:41 -06:00
oranges
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 Brown
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 Higgs
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
deathride58
507c862c7c Update hud.dm 2017-11-28 22:24:00 -05:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
LetterJay
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