shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,498 Commits 5 Branches 0 Tags
cbf02e76a44ef04652df87ab0c4e68e720183e21
Commit Graph

462 Commits

Author SHA1 Message Date
kevinz000
9805e1b5fb Merge pull request #9458 from Ghommie/Ghommie-cit228 
Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler.
 2019-10-11 12:04:49 -07:00
kevinz000
0f74a735cb Merge pull request #9412 from Ghommie/Ghommie-cit213 
Ports "Makes supermatter melt walls if it finds itself in one"
 2019-10-10 02:21:32 -07:00
Ghommie
689136fe94 Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler. 2019-10-09 23:07:39 +02:00
Ghommie
1c2f2617d8 Ports "Makes supermatter melt walls if it finds itself in one" 2019-10-04 22:44:40 +02:00
Poojawa
a8e16ce27e APC UI autoupdates properly 2019-10-03 14:00:17 -05:00
kevinz000
5562db4ed4 Merge pull request #8914 from Ghommie/Ghommie-cit147 
Updating spraycans and crayons.
 2019-09-28 00:20:42 -07:00
deathride58
d0840074b5 PER MINUTE 2019-09-26 13:44:56 -04:00
deathride58
b3cd0859cd Rad collector tweaks - Makes point production use all stored power every process cycle, clears up examine text, makes the gas touching more obvious 2019-09-26 13:39:47 -04:00
Ghommie
277f031143 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-20 02:27:39 +02:00
nik707
d8dee76d28 Merge pull request #9222 from Citadel-Station-13/kevinz000-patch-80 
TK dusting now uses the proper removal procs to prevent bugs
 2019-09-04 20:14:06 -05:00
Ghommie
9ec97579bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-03 21:08:09 +02:00
nik707
44c15897c7 Merge pull request #9209 from Sishen1542/ass-ass-ass 
Adds support for trit, bz, and pluox to the SM
 2019-09-02 18:37:42 -05:00
kevinz000
64b29e9e1f Update supermatter.dm 2019-08-30 15:22:58 -07:00
kevinz000
975b55e26d Update singularity.dm 2019-08-30 15:19:30 -07:00
kevinz000
a3917a81b0 Update energy_ball.dm 2019-08-30 15:18:22 -07:00
kevinz000
bc74ce110a Update energy_ball.dm 2019-08-30 15:17:23 -07:00
Sishen
07a2d19c34 Update supermatter.dm 2019-08-28 23:58:27 -04:00
Sishen
c664032e85 Update supermatter.dm 2019-08-28 02:23:24 -04:00
Ghommie
b818b1eedd Updating spraycans and crayons code. 2019-07-17 15:45:48 +02:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Ghommie
b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +02:00
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
Sishen
2047d86095 Update emitter.dm 2019-06-30 15:33:34 -04:00
kevinz000
294e1e48d2 Merge pull request #8659 from Ghommie/Ghommie-cit57 
ports "Componentizes orbiting"
 2019-06-23 06:50:32 -07:00
Ghommie
d5279c8373 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-17 09:51:22 +02:00
Ghommie
b2d82bd1f1 Applying upstream fixes. 2019-06-17 00:27:07 +02:00
Ghommie
b782226900 ports "Componentizes orbiting" 2019-06-17 00:19:57 +02:00
Ghommie
a3c2ed0b52 fixes. 2019-06-15 02:19:57 +02:00
Ghommie
4cc7636da1 fixing more. 2019-06-12 22:50:09 +02:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 
Ports in the container_type to reagents flags refactor.
 2019-06-08 01:26:28 -07:00
kevinz000
aca85123be Merge pull request #8555 from Ghommie/Ghommie-cit32 
Updates radials, makes RCD and RCL use em.
 2019-06-08 01:25:37 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie
a6fcac55d4 Makes it compile. 2019-06-07 04:05:27 +02:00
Ghommie
5a69499927 Hol up, unrelated PR time, atomization. 2019-06-07 01:32:15 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie
af2598035a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-05 19:32:17 +02:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
kevinz000
a96e414d2f Merge pull request #8486 from BlackMajor/Ooga 
Supermatter no longer works while inside of a turf.
 2019-05-31 17:40:30 -07:00
BlackMajor
0d06605662 Supermatter eats the closed turf it's inside. 
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
 2019-05-30 16:17:33 +12:00
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
Trilbyspaceclone
997df62724 Update cell.dm 2019-04-26 00:46:09 -04:00
deathride58
41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58
2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58
8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
deathride58
36119e007d Properly fixes igniters by increasing the max hotspot expose temperature of sparks to 700 2019-03-15 16:49:10 -04:00
Ragolution
b0ccfbc1b4 Revert "Merge pull request #8089 from Trilbyspaceclone/patch-70" 
This reverts commit 6ed81162b3, reversing
changes made to 6aaee476c8.
 2019-03-12 14:28:54 -04:00