shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,161 Commits 5 Branches 0 Tags
d9c368a2a4e859979f44f683ea16d5dae2236765
Commit Graph

6045 Commits

Author SHA1 Message Date
Jordan Brown
d9c368a2a4 Merge pull request #37562 from AutomaticFrenzy/patch/corpse-runtimes 
Fix runtimes in corpse code due to mob_spawners becoming null
 2018-04-30 21:19:22 -05:00
LetterJay
94bebc33a0 Merge pull request #6590 from Citadel-Station-13/upstream-merge-37494 
[MIRROR] [s] Small tweaks and fixes a edgecase with machine construction
 2018-04-30 11:03:33 -05:00
LetterJay
34ce5380d6 Merge pull request #6589 from Citadel-Station-13/upstream-merge-37500 
[MIRROR] Removed /obj/item/asteroid path
 2018-04-30 11:03:16 -05:00
LetterJay
372e363257 Merge pull request #6588 from Citadel-Station-13/upstream-merge-37437 
[MIRROR] Fixes circuits being able to detect ghosts and fix pinless guns
 2018-04-30 11:02:58 -05:00
LetterJay
fcb1261c13 Merge pull request #6586 from Citadel-Station-13/upstream-merge-37503 
[MIRROR] Fixes Blast Cannon
 2018-04-30 11:02:16 -05:00
LetterJay
6885655022 Merge pull request #6585 from Citadel-Station-13/upstream-merge-37544 
[MIRROR] Adds a 2.5 second fire delay to beam rifles
 2018-04-30 10:21:06 -05:00
LetterJay
794d078dff Merge pull request #6584 from Citadel-Station-13/upstream-merge-37489 
[MIRROR] [s] Fixes the fryer shrinking the size of objects
 2018-04-30 10:20:53 -05:00
LetterJay
b493bfe89f Merge pull request #6582 from Citadel-Station-13/upstream-merge-37496 
[MIRROR] IC weapon mechanism only works when assembly is on turf
 2018-04-30 10:11:54 -05:00
LetterJay
e2ef2ee0f3 Merge pull request #6583 from Citadel-Station-13/upstream-merge-37498 
[MIRROR] Fixes glass stack explosion act
 2018-04-30 09:43:13 -05:00
Jalleo
987cce76ed [s] Small tweaks and fixes a edgecase with machine construction (#37494) 
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
 2018-04-30 05:00:24 -05:00
ShizCalev
3160d7771d Removed /obj/item/asteroid path (#37500) 
* Cleans up some item paths

* removed kebab
 2018-04-30 04:57:09 -05:00
kevinz000
7feea76eee Fixes circuits being able to detect ghosts and fix pinless guns (#37437) 
* Circuit exploit fixes

* Update input.dm
 2018-04-30 04:55:55 -05:00
Fox McCloud
e2328a122e Fixes Blast Cannon (#37503) 
* Fixes Blast Cannon

* no magic numbers

* tweak
 2018-04-30 04:53:32 -05:00
kevinz000
3ba3d5fb5e beam rifle delay (#37544) 2018-04-30 04:53:21 -05:00
ShizCalev
948f34406a [s] Fixes the fryer shrinking the size of objects (#37489) 
* Fixes the fryer shrinking the size of objects

* few more vars
 2018-04-30 04:52:08 -05:00
ShizCalev
5adabb4b91 Fixes glass stack explosion act (#37498) 2018-04-30 04:50:55 -05:00
Evsey Antonovich
6df3ffcddf IC weapons only works on turfs (#37496) 2018-04-30 01:31:06 -05:00
Mickyan
01e4304326 Makes nutrition level show up on self-inspect (#37509) 
* Makes nutrition level shows up on self-inspect

* Changed to switch statement, edited flavor text
 2018-04-30 00:17:59 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
oranges
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
Tad Hardesty
ed7b8e7128 Fix grammar when cleaning things with the damp rag 2018-04-29 14:27:51 -05:00
iksyp
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
ShizCalev
1478e17fea Fixes invisible turtleneck alt state 2018-04-29 10:04:52 -05:00
LetterJay
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
LetterJay
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
LetterJay
89ffa04958 Merge pull request #6542 from Citadel-Station-13/upstream-merge-37442 
[MIRROR] Fixes jumpToNullSpace
 2018-04-29 02:24:52 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
as334
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
81Denton
b368ab377b fixes obj descs and adds new ones (#37483) 2018-04-27 13:21:08 -05:00
Dax Dupont
4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
ShizCalev
c9ac7ab2a1 Fixes being unable to place a Robotic Factory (#37479) 2018-04-27 13:12:15 -05:00
Emmett Gaines
b866e62673 Fixes jumpToNullSpace (#37442) 
woops
 2018-04-27 13:05:44 -05:00
Dax Dupont
df3c160d0c Makes clogged vents scale, and way less powerful. (#37385) 
* Makes clogged vents scale, and way less powerful.

* tweaked numbers
 2018-04-27 13:05:36 -05:00
Emmett Gaines
620c1fcbb8 set waitfor in final countdown (#37453) 2018-04-27 13:02:09 -05:00
AnturK
b8bb30d3de Removes some unused code. (#37449) 2018-04-27 10:33:10 -05:00
deathride58
d2fbb671ba Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498) 
* adjuststaminabuffer() now drains borg cells, borgs can now sprint, removes aiming down sights, combat mode now makes you face your cursor

* forgot to ctrl+s here
 2018-04-27 07:41:31 -07:00
deathride58
862898526d Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276) 
* adds gamemode/gamemode vote obfuscation, redesigns hub entry

* ternaries: the easiest way to obfuscate your code to the point where even you can't read it

* FUCK

* changes the inaccuracy chance from 1/10 to 1/5
 2018-04-27 07:40:45 -07:00
deathride58
681bbb1bb0 Adds follow link to admin LOOC messages (#6378) 
* adds follow link to looc messages shown to admins

* fixes
 2018-04-27 07:39:01 -07:00
oranges
ce31767862 Merge pull request #37482 from vuonojenmustaturska/bluepot 
Fixes slime pressurization potion attempting to apply multiple times
 2018-04-27 08:12:10 -05:00