cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-29 03:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,617 Commits 55 Branches 0 Tags
f76737dc0472ac901b245453b3d96c2ab8ec687a
Commit Graph

434 Commits

Author SHA1 Message Date
kevinz000
294e1e48d2 Merge pull request #8659 from Ghommie/Ghommie-cit57 
ports "Componentizes orbiting"
 2019-06-23 06:50:32 -07: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
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
kevinz000
698adb7c7d Merge pull request #8056 from deathride58/tegnerf 
Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe
 2019-03-10 13:48:42 -07:00
Trilbyspaceclone
1d28a3b035 Update port_gen.dm 2019-03-04 20:52:02 -05:00
Ghommie
e9e9075800 unironically applying Kev's suggestion 2019-03-03 01:09:16 +01:00
deathride58
2a0c4ed526 Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe 2019-02-27 02:58:59 -05:00
nik707
f5382b4ff6 absolutely tested 2019-01-13 02:04:46 -06:00
kevinz000
f140d56b43 Update coil.dm 2018-12-31 23:41:01 -08:00
Poojawa
21d31c5763 Gives APCs inherent damage resistance/deflection 2018-10-05 15:30:51 -05:00
Poojawa
e847f5bb33 Increases APC health and damage resistance values 2018-10-05 15:26:10 -05:00
deathride58
0ce450eab8 tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory 2018-10-02 19:36:21 -04:00
Poojawa
c6b53bb31b update on lock status 2018-09-22 04:06:28 -05:00
Poojawa
bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes 
Also adds new buildmode
 2018-09-13 22:55:11 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
cee8da4fdb Merge pull request #7173 from Citadel-Station-13/kevinz000-patch-11 
readds tesla coil deathtraps
 2018-07-06 01:37:42 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
ee0bef443e Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796 
[MIRROR] Fixes emitter runtime
 2018-07-01 09:39:43 -05:00
ShizCalev
6c89362f60 Fixes emitter runtime (#38796) 
fire() was already handled at 199-204
 2018-07-01 05:44:10 -05:00
Dennok
58f634db63 deconstructable-TEG (#38656) 
Make TEG deconstructable.
 2018-07-01 05:41:53 -05:00
kevinz000
97531c61ff Update coil.dm 2018-06-18 12:04:19 -07:00
81Denton
9b1f891a29 Cleans up supermatter related varedits (#38540) 
* Cleans up supermatter related varedits

* reee

* fakecrystal
 2018-06-18 09:38:16 -05:00
LetterJay
87cc0e6c6f Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360 
[MIRROR] Cleans up some logging
 2018-06-12 07:41:10 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
oranges
ffd705c8d7 Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay 
Replace area-wide fire overlay with reddening the lights
 2018-06-11 22:29:10 -05:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
CitadelStationBot
fed04c4fba [MIRROR] Borgs can now toggle rad collectors (#6927) 
* Borgs can now toggle rad collectors (#38100)

* Borgs can now toggle rad collectors
 2018-05-27 17:16:15 -07:00