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-13 11:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,617 Commits 55 Branches 0 Tags
f76737dc0472ac901b245453b3d96c2ab8ec687a
Commit Graph

317 Commits

Author SHA1 Message Date
unknown
80eb813a07 RD can now suplex a rod. Good fucking luck. 2019-06-11 18:53:17 +03: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
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
Trilbyspaceclone
fb6eca8d46 How did this even compile? 2019-05-22 21:28:16 -04:00
Trilbyspaceclone
717398213b Update pirates.dm 2019-05-22 18:52:15 -04:00
kevinz000
50b6a610e9 Merge pull request #8303 from BurgerLUA/Vent-Clog-Fixes-And-Additions 
Vent Clog Event Rebalance and Improvements
 2019-05-17 21:27:32 -07:00
BurgerLua
8b935b9abf Reverts cooking change, adds safety checks. 2019-05-09 21:10:44 -07:00
deathride58
5e2a9669d1 Merge pull request #8285 from Citadel-Station-13/kevinz000-patch-45 
vent_clog event now respects vent welding
 2019-05-06 22:08:43 -04:00
BurgerLua
4aaab992f5 Removed frost oil and spray tan, deep fried items now no longer delete themselves when consumed. 2019-04-30 11:53:48 -07:00
BurgerLua
0d7c4c89d3 actually lets not have this 2019-04-28 19:47:12 -07:00
BurgerLua
5357724de7 Rebalanced vent clog events. 2019-04-28 19:44:50 -07:00
kevinz000
766a119696 Update vent_clog.dm 2019-04-25 04:14:35 -07:00
BurgerLua
b0a93cf790 retweaked the event instead of removing it 2019-04-23 11:51:00 -07:00
BurgerLua
97fb78d07e Reworked the Vent Clog event to shoot out smoke instead of foam; also made the foam shoot out one at a time over a long period of time to prevent lag. 2019-04-18 18:00:19 -07:00
deathride58
41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -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
kevinz000
50b64e8174 Merge pull request #8178 from Trilbyspaceclone/patch-91 
Makes a new shuttle loan! - Delta locked crates
 2019-04-02 05:51:05 -07:00
Trilbyspaceclone
18247f28ae Update shuttle_loan.dm 2019-03-28 23:35:11 -04:00
Trilbyspaceclone
7a533ffcb7 Update shuttle_loan.dm 2019-03-28 21:22:40 -04:00
Trilbyspaceclone
a0f5015b01 Update shuttle_loan.dm 2019-03-28 17:05:24 -04:00
Ragolution
ee9368cadb why does ghomme help us 
is it because he feels bad for us
real deepthink
 2019-03-20 20:08:07 -04:00
Ragolution
793a8c5c44 QoL naming changes 
It's MY CODE NOW, TRILBY. YOU CAN'ST STOPP ME
 2019-03-20 01:42:18 -04:00
Ragolution
81ba8ff40b Update vent_clog.dm 
Works locally, like this. Fuck if I know.
 2019-03-19 23:55:37 -04:00
MediHound
737c0c7700 Update ion_storm.dm (#7980) 
* Update ion_storm.dm

* Update ion_storm.dm
 2019-02-08 02:13:14 -08:00
kevinz000
ab5681e3c8 Update brand_intelligence.dm 2019-01-10 03:00:40 -08:00
kevinz000
ba24207f86 Update devil.dm 2019-01-01 00:06:13 -08:00
nik707
2852daa27d Merge pull request #7815 from Trilbyspaceclone/Reece 
New admin buttens for Reece
 2018-12-14 21:05:13 -06:00
Trilbyspaceclone
170a843288 recheck 2018-12-09 19:20:02 -05:00
Trilbyspaceclone
63ad6f1175 Update vent_clog.dm 2018-12-09 15:15:23 -05:00
Tupinambis
2e0cb266de Makes all ion references to "humans" reference to "crew" instead. 2018-10-27 21:01:03 -05:00
Poojawa
91620218e4 some cherrypicked TG fixes and tweaks 2018-10-12 05:37:36 -05:00
Poojawa
1a2460ed28 Continous update intergration until being merged 
Also tgui fixes/updates
 2018-09-15 00:37:29 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Jordan Brown
888b04427c Merge pull request #38683 from AnturK/anomalyfix 
Fixes anomaly area selection.
 2018-06-25 09:18:40 -05:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
Tad Hardesty
221e539eb8 Fix item fortification scrolls stacking (#38551) 2018-06-18 09:36:27 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -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
1ce820d2ed [MIRROR] Adds action features to the metastation beerkeg-nukes (#6925) 
* Adds action features to the metastation beerkeg-nukes (#38084)

* Hottomonkulu Pyynö mos kyren hepität. Nerse marentaat aluturnate.

* Masennoo sum keuron väkeltäät vassem Pyynö er borsalitaat Urmas.

* Tarnatat kuulor ustanitat vernes heuremasso seurutik Pyynör kanervo mahkatosimos. Atti ivakhan nutiv.

* Surmustulet nasnas kyhille nes viuhuntut sepelitör arnisansatin.

* Adds action features to the metastation beerkeg-nukes

* Test 1

* Test 2

* Test 3
 2018-05-27 19:32:09 -07:00
LetterJay
7caef42502 Merge pull request #6899 from Citadel-Station-13/upstream-merge-37993 
[MIRROR] Adds two saferChems for vent clogs.
 2018-05-26 18:38:19 -05:00
Jordan Brown
7fe11dc952 Merge pull request #37993 from DaxDupont/more-juice 
Adds two saferChems for vent clogs.
 2018-05-25 10:54:20 -05:00
vuonojenmustaturska
1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017) 
* henk

* iseffect
 2018-05-25 07:38:01 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJay
6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 
[MIRROR] Uppercases slot defines.
 2018-05-21 11:23:02 -05:00
81Denton
1c51f32b31 Remove skewium from saferChems (#37925) 2018-05-21 03:57:05 -05:00