shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,119 Commits 5 Branches 0 Tags
8bb3a4ec75096ed505d3523f33228448bdfbeef4
Commit Graph
16119 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
YakumoChenandCitadelStationBot 8bb3a4ec75 Readds BZ Cannisters for Xenobiology (#37481) 
* update BoxStation.dmm

Adds BZ to Xeno

* Update DeltaStation2.dmm

adds BZ to Xeno

* Update MetaStation.dmm

Updates Meta's Xeno with BZ

* Update PubbyStation.dmm

Adds BZ to Pubby's Xeno
 2018-04-30 01:12:22 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
LetterJayandGitHub ab3035a4ea Update .travis.yml 2018-04-29 18:58:35 -05:00
deathride58andGitHub 6f13d2c2e9 Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380 
[MIRROR] Refactors and fixes RPEDs
 2018-04-29 22:45:28 +00:00
deathride58andGitHub e66e348d5c Merge pull request #6572 from Citadel-Station-13/upstream-merge-37535 
[MIRROR] Fixes gas fusion power not being taken into account
 2018-04-29 22:33:37 +00:00
deathride58andGitHub 41e4851500 Merge pull request #6569 from Citadel-Station-13/upstream-merge-37559 
[MIRROR] Fix grammar when cleaning things with the damp rag
 2018-04-29 22:33:07 +00:00
deathride58andGitHub 483bcc66d5 Merge pull request #6563 from Citadel-Station-13/upstream-merge-37485 
[MIRROR] Condenses a check
 2018-04-29 22:30:41 +00:00
deathride58andGitHub 6ae31ccf69 Merge pull request #6564 from Citadel-Station-13/upstream-merge-37514 
[MIRROR] Fixes invisible turtleneck alt state
 2018-04-29 22:30:12 +00:00
deathride58andGitHub 7c27c97256 Merge pull request #6567 from Citadel-Station-13/upstream-merge-37511 
[MIRROR] fixes a pacifism kill through crushing firelocks!
 2018-04-29 22:29:44 +00:00
deathride58andGitHub a966874bed Merge pull request #6568 from Citadel-Station-13/upstream-merge-37506 
[MIRROR] Makes pacifists able to use .50BMG Soporific Rounds
 2018-04-29 22:29:12 +00:00
deathride58andGitHub c8fbc20f24 Merge pull request #6570 from Citadel-Station-13/upstream-merge-37410 
[MIRROR] [syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh
 2018-04-29 22:28:42 +00:00
CitadelStationBot 51eb05b7bd Fixes gas fusion power not being taken into account 2018-04-29 17:18:30 -05:00
orangesandCitadelStationBot 187f27983c Merge pull request #37535 from cyclowns/fusion-fix 
Fixes gas fusion power not being taken into account
 2018-04-29 17:18:30 -05:00
LetterJayandGitHub 07ddf358c7 Merge pull request #6571 from Citadel-Station-13/upstream-merge-37504 
[MIRROR] Removes an unnecessary file causing github security warnings on tgui, also updates/downgrades some dependencies to ensure a build
 2018-04-29 16:43:49 -05:00
vuonojenmustaturskaandCitadelStationBot c33ab6221b Removes an unnecessary file causing github security warnings on tgui, also updates/downgrades some dependencies to ensure a build 2018-04-29 15:56:51 -05:00
CitadelStationBot 0660d49768 [syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh 2018-04-29 15:21:02 -05:00
kevinz000andCitadelStationBot fe8e1cd61c [syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh (#37410) 
* paradox

* fine, byond.

* src.
 2018-04-29 15:21:02 -05:00
CitadelStationBot 969e93f0f7 Fix grammar when cleaning things with the damp rag 2018-04-29 14:27:51 -05:00
Tad HardestyandCitadelStationBot ed7b8e7128 Fix grammar when cleaning things with the damp rag 2018-04-29 14:27:51 -05:00
CitadelStationBot d65abac646 Makes pacifists able to use .50BMG Soporific Rounds 2018-04-29 10:11:43 -05:00
iksypandCitadelStationBot ba4f3c0698 Makes pacifists able to use .50BMG Soporific Rounds (#37506) 
* non lethal .50BMG

* no more spaghetti sauce?

I havent actually tested this
 2018-04-29 10:11:42 -05:00
CitadelStationBot 70ed56cb24 fixes a pacifism kill through crushing firelocks! 2018-04-29 10:09:29 -05:00
ArmhulenandCitadelStationBot 814dc3f811 fixes a pacifism kill through crushing firelocks! (#37511) 
* fix!

* ORANGES LOOK AWAY

* thanks maintainer
 2018-04-29 10:09:29 -05:00
CitadelStationBot a3f938ffcc Fixes invisible turtleneck alt state 2018-04-29 10:04:52 -05:00
ShizCalevandCitadelStationBot 1478e17fea Fixes invisible turtleneck alt state 2018-04-29 10:04:52 -05:00
CitadelStationBot ac160be09a Condenses a check 2018-04-29 10:03:39 -05:00
Jordan BrownandCitadelStationBot 62d6329f56 Condenses a check 2018-04-29 10:03:39 -05:00
LetterJayandGitHub c287c3a84c Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483 
[MIRROR] Fixes obj descs and adds missing ones
 2018-04-29 02:29:44 -05:00
LetterJayandGitHub 71b362e41e Merge pull request #6547 from Citadel-Station-13/upstream-merge-37473 
[MIRROR] Lets quantum pads be used by sillycones properly.
 2018-04-29 02:29:05 -05:00
LetterJayandGitHub ab8355968c Update rped.dm 2018-04-29 02:28:43 -05:00
LetterJayandGitHub f606430d2b Merge pull request #6545 from Citadel-Station-13/upstream-merge-37478 
[MIRROR] [s] Fixes turret exploits
 2018-04-29 02:28:14 -05:00
LetterJayandGitHub c11c2ba70f Merge pull request #6544 from Citadel-Station-13/upstream-merge-37479 
[MIRROR] Fixes being unable to place a Robotic Factory if it failed to place after the prompt
 2018-04-29 02:25:37 -05:00
LetterJayandGitHub 53ee2ab0a9 Merge pull request #6543 from Citadel-Station-13/upstream-merge-37465 
[MIRROR] Adds logging for PDA explosions
 2018-04-29 02:25:10 -05:00
LetterJayandGitHub 89ffa04958 Merge pull request #6542 from Citadel-Station-13/upstream-merge-37442 
[MIRROR] Fixes jumpToNullSpace
 2018-04-29 02:24:52 -05:00
LetterJayandGitHub eddeff9c34 Merge pull request #6541 from Citadel-Station-13/upstream-merge-37385 
[MIRROR] Makes clogged vents scale, and way less powerful.
 2018-04-29 02:24:30 -05:00
LetterJayandGitHub 44f966d0eb Merge pull request #6540 from Citadel-Station-13/upstream-merge-37461 
[MIRROR] Removes the signals on process procs
 2018-04-29 02:24:04 -05:00
LetterJayandGitHub e8fdaa1a43 Merge pull request #6539 from Citadel-Station-13/upstream-merge-37453 
[MIRROR] set waitfor in final countdown
 2018-04-29 02:21:56 -05:00
LetterJayandGitHub 480882de58 Merge pull request #6538 from Citadel-Station-13/upstream-merge-37449 
[MIRROR] Removes some unused code.
 2018-04-29 02:21:31 -05:00
LetterJayandGitHub 261e7fa1c1 Merge pull request #6537 from Citadel-Station-13/upstream-merge-37482 
[MIRROR] Fixes slime pressurization potion attempting to apply multiple times
 2018-04-29 02:21:07 -05:00
LetterJayandGitHub 0bca7362e3 Merge pull request #6511 from Citadel-Station-13/upstream-merge-37389 
[MIRROR] Removes redundant COMPONENT_INCOMPATIBLE crashes
 2018-04-29 02:20:25 -05:00
LetterJayandGitHub 57270f84d9 Merge pull request #6493 from Citadel-Station-13/upstream-merge-37299 
[MIRROR] Fixes ghosts being unable to see into nonadjacent bags
 2018-04-29 02:19:14 -05:00
LetterJayandGitHub 803d3b59fd Merge pull request #6556 from Citadel-Station-13/upstream-merge-37497 
[MIRROR] Replaces a / with * as per Contributing.md [bscrystal.dm]
 2018-04-28 14:07:24 -05:00
LetterJayandGitHub b565ef9171 Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384 
[MIRROR] Re-adds and reworks fusion.
 2018-04-28 14:07:08 -05:00
LetterJayandGitHub 811cc06188 Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436 
[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with
 2018-04-28 01:36:04 -05:00
LetterJayandGitHub ec1a16fed0 Merge pull request #6535 from Citadel-Station-13/upstream-merge-37480 
[MIRROR] Fixes pineapple pizza not actually tasting like pineapple
 2018-04-28 01:35:41 -05:00
LetterJayandGitHub d10dcf7cd7 Merge pull request #6534 from Citadel-Station-13/upstream-merge-37445 
[MIRROR] you can now print tools using the integrated circuit printer again
 2018-04-28 01:34:59 -05:00
CitadelStationBot f33c47db7b Re-adds and reworks fusion. 2018-04-28 01:01:47 -05:00
as334andCitadelStationBot 9b36d6c4d9 Re-adds and reworks fusion. (#37384) 
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
 2018-04-28 01:01:47 -05:00
CitadelStationBot 7cefdbb489 Replaces a / with * as per Contributing.md [bscrystal.dm] 2018-04-27 21:22:00 -05:00
orangesandCitadelStationBot 74a483d350 Merge pull request #37497 from ExcessiveUseOfCobblestone/patch-42 
Replaces a / with * as per Contributing.md [bscrystal.dm]
 2018-04-27 21:21:59 -05:00