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

3764 Commits

Author SHA1 Message Date
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
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
deathride58
ab3c55ab23 replaces randomized wires with departmental wires (#6376) 2018-04-27 07:42:09 -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
vuonojenmustaturska
d6b48869d8 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436) 
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
 2018-04-27 07:37:15 -05:00
deathride58
532ccc412c Merge pull request #6532 from Citadel-Station-13/upstream-merge-37373 
[MIRROR] Fixes missing augmentation hands
 2018-04-27 09:42:46 +00:00
deathride58
52e35b230f Merge pull request #6529 from Citadel-Station-13/upstream-merge-37441 
[MIRROR] Analyzers show temperature in Kelvin as well as Celsius now
 2018-04-27 09:41:46 +00:00
deathride58
d972ecc891 Merge pull request #6523 from Citadel-Station-13/upstream-merge-37407 
[MIRROR] Removes Acid from Remaining Circuits
 2018-04-27 09:39:29 +00:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
deathride58
13c28b9ff1 Merge pull request #6513 from Citadel-Station-13/upstream-merge-37403 
[MIRROR] Adds grind_results to coins and diamonds
 2018-04-27 09:34:49 +00:00
deathride58
35e8ac1240 Merge pull request #6492 from Citadel-Station-13/upstream-merge-37364 
[MIRROR] Removes the ability for inducers and circuits to charge energy weapons.
 2018-04-27 09:21:07 +00:00
ShizCalev
9e3f99092f Fixes missing augmentation hands (#37373) 2018-04-27 02:42:13 -05:00
MrDoomBringer
18716c03a5 Analyzers show temperature in Kelvin as well as Celsius now (#37441) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* wew

* nicbn
 2018-04-27 02:28:21 -05:00
LetterJay
72ddaee4a3 Merge pull request #6502 from Citadel-Station-13/upstream-merge-37363 
[MIRROR] Makes radiation collectors buildable
 2018-04-27 00:10:52 -05:00
Jordan Brown
4838bfec4e Merge pull request #37407 from Fox-McCloud/circuits-reagents 
Removes Acid from Remaining Circuits
 2018-04-26 15:24:26 -05:00
deathride58
132ae3a657 what the fuck is this shitcode 2018-04-26 09:28:34 -04:00
Armhulen
17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
81Denton
d2885c84b7 adds grind_results to coins and diamonds (#37403) 2018-04-25 06:04:18 -05:00
Dax Dupont
d5c2d37e39 Makes radiation collectors buildable (#37363) 
* Makes radiation collectors buildable

* capitalism at it's finest

* a
 2018-04-24 07:13:16 -05:00
Jordan Brown
e52fafcbb7 Merge pull request #37364 from Jalleo/Inducer_change 
Removes the ability for inducers and circuits to charge energy weapons.
 2018-04-23 08:47:55 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
LetterJay
e97db8a33c Merge pull request #6481 from Citadel-Station-13/upstream-merge-37339 
[MIRROR] Fixes a lack of feedback when entering too many points for the gulag.
 2018-04-22 22:23:07 -05:00
LetterJay
fb267270ec Merge pull request #6478 from Citadel-Station-13/upstream-merge-37315 
[MIRROR] Gives beer and soda dispensers their own circuitboards and Design ID's
 2018-04-22 22:22:03 -05:00
LetterJay
7bf8b9654e Merge pull request #6473 from Citadel-Station-13/upstream-merge-37306 
[MIRROR] Fixes falsewall letting through air.
 2018-04-22 22:20:22 -05:00
Dax Dupont
af48fe9dcf Fixes a lack of feedback when entering too many points for the gulag. (#37339) 2018-04-22 19:42:47 -05:00
iksyp
e8698ab798 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315) 
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
 2018-04-22 19:19:51 -05:00
AnturK
1c390cbbc5 Fixes falsewall letting through air. (#37306) 
* Fixes falsewall letting through air.

* define
 2018-04-22 19:15:51 -05:00
Jordan Brown
70a0db6173 Merge pull request #37310 from Jalleo/apc_control_changes 
Fixes and optimises apc_control.dm a tad.
 2018-04-22 09:31:10 -05:00
LetterJay
2b70e9a3ae Merge pull request #6466 from Citadel-Station-13/upstream-merge-37312 
[MIRROR] [s] You can no longer buckle anchored mobs to things.
 2018-04-22 02:46:53 -05:00
LetterJay
3966683e17 Merge pull request #6460 from Citadel-Station-13/upstream-merge-37280 
[MIRROR] Removes random spawn
 2018-04-22 02:46:38 -05:00
LetterJay
930c9bf58c Merge pull request #6459 from Citadel-Station-13/upstream-merge-37281 
[MIRROR] Removes old decal system
 2018-04-22 02:46:25 -05:00
LetterJay
dc9b7d78f6 Merge pull request #6455 from Citadel-Station-13/upstream-merge-37282 
[MIRROR] Fixes capacitor not being consumed when building a gygax
 2018-04-22 02:45:32 -05:00
LetterJay
8cdbc9ef5e Merge pull request #6452 from Citadel-Station-13/upstream-merge-37268 
[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-22 02:44:56 -05:00
LetterJay
68a1d541b1 Merge pull request #6441 from Citadel-Station-13/upstream-merge-37223 
[MIRROR] Fixes some defines and value
 2018-04-22 02:43:26 -05:00
LetterJay
d0db0f0c85 Merge pull request #6436 from Citadel-Station-13/upstream-merge-37141 
[MIRROR] Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)"
 2018-04-22 02:41:57 -05:00
LetterJay
d2ce7da6cb Merge pull request #6453 from Citadel-Station-13/upstream-merge-37251 
[MIRROR] Adds new window spawners
 2018-04-22 02:35:09 -05:00
LetterJay
96a461e384 Merge pull request #6451 from Citadel-Station-13/upstream-merge-37218 
[MIRROR] Couple of fixes for situations involving mechas and the clock cult gamemode
 2018-04-22 02:34:53 -05:00
LetterJay
80f4522967 Merge pull request #6450 from Citadel-Station-13/upstream-merge-37252 
[MIRROR] Fixes lavaland syndie base rads + SSU compartment issues
 2018-04-22 02:34:03 -05:00
Jordan Brown
0586f69637 Merge pull request #37312 from DaxDupont/tendril 
[s] You can no longer buckle anchored mobs to things.
 2018-04-20 10:47:28 -05:00
AnturK
b0e97784da Removes random spawn (#37280) 2018-04-19 05:46:39 -05:00
Emmett Gaines
a465733b1c Removes old decal system (#37281) 2018-04-19 05:45:25 -05:00
AlexTheSysop42
19f315db9c Fixes capacitor not being consumed when building a gygax (#37282) 
* Comments out code to try to fix a bug

* protip: next time don't commit to master

* Fixes gygax construction not using the capacitor
 2018-04-18 15:46:25 -05:00
ShizCalev
79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -05:00
Jordan Brown
44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix 
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
 2018-04-18 11:34:06 -05:00
vuonojenmustaturska
32fe9d4fd6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218) 
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
 2018-04-18 09:33:31 -05:00
81Denton
7caad40e3f Fixes lavaland syndie base rads + SSU compartment issues (#37252) 
* radsuit SSU, syndie lava base rad protection

* re-adds missing combat gloves

* defines radsuit SSU name by the obj
 2018-04-18 07:02:10 -05:00
PKPenguin321
ddb6f7ebae Esword cig lighting messages fix (#37216) 
* fix esword cig lighting message

`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`

* fix desword cig lighting message

`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`

* check fix

* desword check fix

* suggested message replacement

* suggested message change desword
 2018-04-16 19:20:26 -05:00
AnturK
31efa96a01 Fixes some defines. (#37223) 2018-04-16 08:32:48 -05:00