shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,517 Commits 5 Branches 0 Tags
2d07daca491dc619aa41aea5166a4a8ac3d2c2cd
Commit Graph

3349 Commits

Author SHA1 Message Date
LetterJay
48dfeb5f7a Merge pull request #3821 from Citadel-Station-13/upstream-merge-32406 
[MIRROR] Refactors and improvements to xenobio slime processor
 2017-11-07 04:41:23 -06:00
LetterJay
78f8c4650c Merge pull request #3817 from Citadel-Station-13/upstream-merge-32402 
[MIRROR] Increased gas filter UI size
 2017-11-07 04:39:50 -06:00
LetterJay
1489019399 Merge pull request #3784 from Citadel-Station-13/upstream-merge-32260 
[MIRROR] Shapeshift tweaks.
 2017-11-07 03:50:05 -06:00
vuonojenmustaturska
cc438ea9b4 Refactors and improvements to xenobio slime processor (#32406) 
* Do not let your memes be dreams

* static lists for great justice

* Local man forgets to capitalize a word

* Slime processor no longer runtimes when processing food
 2017-11-05 04:32:07 -06:00
ACCount
ab7e8a96a3 Increased gas filter UI size (#32402) 2017-11-05 02:08:43 -06:00
LetterJay
c9a160ccc0 Merge pull request #3812 from Citadel-Station-13/upstream-merge-32377 
[MIRROR] Fixes energy katana dash toggle
 2017-11-04 22:54:44 -05:00
LetterJay
f1d3fb0334 Merge pull request #3811 from Citadel-Station-13/upstream-merge-32396 
[MIRROR] Hide already-downloaded programs from NTNet downloader
 2017-11-04 22:54:35 -05:00
LetterJay
52f45b998b Merge pull request #3809 from Citadel-Station-13/upstream-merge-32322 
[MIRROR] Frog masks [Feature] [ready]
 2017-11-04 22:54:23 -05:00
LetterJay
065dcb6eab Merge pull request #3806 from Citadel-Station-13/upstream-merge-32381 
[MIRROR] Restores buckling sanity.
 2017-11-04 22:53:54 -05:00
LetterJay
098806129e Merge pull request #3802 from Citadel-Station-13/upstream-merge-32380 
[MIRROR] Makes the shuttle beacon refuse to be placed over the map edge
 2017-11-04 22:53:40 -05:00
LetterJay
23c5e043e7 Merge pull request #3804 from Citadel-Station-13/upstream-merge-32341 
[MIRROR] Fixes a bug in single tank bomb assembly
 2017-11-04 22:52:59 -05:00
LetterJay
7d0ac85ec6 Merge pull request #3798 from Citadel-Station-13/upstream-merge-32316 
[MIRROR] Wall damage decal overhaul
 2017-11-04 22:50:29 -05:00
LetterJay
cf83d3410b Merge pull request #3797 from Citadel-Station-13/upstream-merge-32329 
[MIRROR] Some improvements on the holiday system
 2017-11-04 22:49:49 -05:00
LetterJay
4bf6f81fd9 Merge pull request #3793 from Citadel-Station-13/upstream-merge-32362 
[MIRROR] Improves hotspot code
 2017-11-04 22:48:34 -05:00
LetterJay
74706b1eea Merge pull request #3791 from Citadel-Station-13/upstream-merge-32367 
[MIRROR] Adds 'round' chat command
 2017-11-04 22:47:48 -05:00
LetterJay
39692c6134 Merge pull request #3790 from Citadel-Station-13/upstream-merge-32354 
[MIRROR] Woody golems get woody names.
 2017-11-04 22:47:34 -05:00
LetterJay
9b9aa323c5 Merge pull request #3789 from Citadel-Station-13/upstream-merge-32233 
[MIRROR] Allows cyborgs to perform limb augmentation
 2017-11-04 22:46:45 -05:00
LetterJay
b1c859b988 Merge pull request #3788 from Citadel-Station-13/upstream-merge-32327 
[MIRROR] Add off switch to holodeck
 2017-11-04 22:46:09 -05:00
LetterJay
dd32227946 Merge pull request #3786 from Citadel-Station-13/upstream-merge-32346 
[MIRROR] removes lesser drake crusher loot
 2017-11-04 22:45:17 -05:00
LetterJay
03a0057609 Merge pull request #3785 from Citadel-Station-13/upstream-merge-32384 
[MIRROR] Hopefully fixes guest accounts being able to log in
 2017-11-04 22:45:00 -05:00
LetterJay
110b0e0615 Update shapeshift.dm 2017-11-04 22:44:56 -05:00
LetterJay
113e3a5b53 Merge pull request #3783 from Citadel-Station-13/upstream-merge-32358 
[MIRROR] Dullahan Fixes
 2017-11-04 22:44:23 -05:00
LetterJay
6490ac4472 Merge pull request #3781 from Citadel-Station-13/upstream-merge-32338 
[MIRROR] Fixes hotspot runtime
 2017-11-04 22:41:42 -05:00
LetterJay
c3aa4c5929 Merge pull request #3778 from Citadel-Station-13/upstream-merge-32350 
[MIRROR] Fixes shuttle parallax again
 2017-11-04 22:33:30 -05:00
LetterJay
9c6a165de6 Merge pull request #3777 from Citadel-Station-13/upstream-merge-32347 
[MIRROR] Proper and improper macros are removed before sending to irc
 2017-11-04 22:32:15 -05:00
LetterJay
1c131962d4 Merge pull request #3745 from Citadel-Station-13/upstream-merge-32269 
[MIRROR] Makes enterTransit check canMove and sets mode to idle
 2017-11-04 22:31:17 -05:00
YPO
5d44770e8c Fixes energy katana dash toggle 2017-11-04 19:39:48 -05:00
Tad Hardesty
6581eb8526 Hide already-downloaded programs from NTNet downloader (#32396) 2017-11-04 18:02:13 -05:00
Mercenaryblue
a1532818bc Frog masks [Feature] [ready] 2017-11-04 15:17:31 -05:00
Leo
0af8cf0329 Merge pull request #32381 from AnturK/ridingdatumsneveragain 
Restores buckling sanity.
 2017-11-04 13:08:19 -05:00
ACCount
5d81ec7ba6 Fixes a bug in single tank bomb assembly (#32341) 2017-11-04 11:43:50 -05:00
Emmett Gaines
b36adfd640 No more map edge shuttle beacons (#32380) 2017-11-04 10:20:19 -05:00
nicbn
46c62b6293 overhaul (#32316) 2017-11-03 23:40:27 -05:00
tortellinitony
3772d722e2 Some improvements on the holiday system (#32329) 2017-11-03 23:37:16 -05:00
Leo
5ca11c1db3 Merge pull request #32362 from tgstation/Cyberboss-patch-2 
Improves hotspot code
 2017-11-03 17:39:30 -05:00
Leo
1db88cecb2 Merge pull request #32367 from tgstation/Cyberboss-patch-3 
Adds 'round' chat command
 2017-11-03 17:36:09 -05:00
Armhulen
056594114f Woody golems get woody names. (#32354) 
* ya, that'll do em.

* we all make mistakes

* heat signature is a great game

* it's aliiiiive

* caving: the commit
 2017-11-03 17:01:24 -05:00
swindly
4f04256e46 Allows cyborgs to perform limb augmentation (#32233) 
* allows organ storage bags to be used to augment limbs

* replaces hardcoded stuff with intiial()
 2017-11-03 15:55:12 -05:00
Tad Hardesty
2ad20f9a27 Add off switch to holodeck (#32327) 
"Holodeck - Offline" is now a selectable program and correctly reverts
the holodeck and uses no power.
 2017-11-03 15:55:03 -05:00
imsxz
a509a99b52 crusher loot fix (#32346) 2017-11-03 15:54:44 -05:00
Jordan Brown
b3bf2276ff Merge pull request #32384 from McBawbaggings/tgfix 
Hopefully fixes guest accounts being able to log in
 2017-11-03 15:54:36 -05:00
AnturK
b32f8dbba7 Shapeshift tweaks. 2017-11-03 15:54:28 -05:00
KorPhaeron
8f1d81f816 Dullahan Fixes (#32358) 
* Dullahan

* Fixes cyborg issue

* Fixes hearing issues
 2017-11-03 15:54:19 -05:00
oranges
1c60983624 Merge pull request #32338 from AnturK/hotspotfix 
Fixes hotspot runtime
 2017-11-03 15:54:02 -05:00
Emmett Gaines
b97e1741df fixes shuttle parallax again (#32350) 2017-11-03 15:53:34 -05:00
Leo
ada8ad0ead Proper and improper macros are removed before sending to irc (#32347) 
* Proper and improper macros are removed before sending to irc

* Removes leftover check
 2017-11-03 15:53:26 -05:00
LetterJay
33d861608a Merge pull request #3771 from Citadel-Station-13/upstream-merge-32219 
[MIRROR] Adds new canister sprites
 2017-11-03 00:16:08 -05:00
LetterJay
2fe152fcf4 Merge pull request #3766 from Citadel-Station-13/upstream-merge-32353 
[MIRROR] Fixes atmos.
 2017-11-03 00:14:16 -05:00
LetterJay
02a0da9c38 Merge pull request #3765 from Citadel-Station-13/upstream-merge-31640 
[MIRROR] [Ready]Ghosts can now Health Scan
 2017-11-03 00:13:58 -05:00
LetterJay
e43e73c0c1 Merge pull request #3764 from Citadel-Station-13/upstream-merge-32243 
[MIRROR] [s] New blob overminds off the station Z level are moved to the station
 2017-11-03 00:13:37 -05:00