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-15 12:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,182 Commits 55 Branches 0 Tags
cd5317d1375d6e4efc901b807b9f52f52460699b
Commit Graph

302 Commits

Author SHA1 Message Date
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
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
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
deathride58
146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 
[MIRROR] [s] Hallucinations 4.0
 2018-05-17 18:12:57 +00:00
ShizCalev
394fbf09e3 Fixes vent_clog bad chem id runtime (#37887) 
* Fixes vent_clog bad chem id runtime

* sodiumchloride
 2018-05-17 10:56:35 -05:00
XDTM
ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
vuonojenmustaturska
0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
Jordan Brown
dc9ce0cc6f Merge pull request #37590 from 81Denton/cargo-categories 
Reorganizes cargo's big "miscellaneous supplies" category
 2018-05-01 15:37:54 -05:00
Jordan Brown
8f1bb462ad Merge pull request #37554 from DaxDupont/vents 
Adds some more reagents to clogged vents
 2018-04-30 12:46:58 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -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
KorPhaeron
ec080ab80b Paperwork Error Event (#37443) 
* Paperwork Error Event

* Condense the proc

* Properly calls set_overflow_role
 2018-04-27 00:58:24 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
kachnov
03c9996bc4 Fixes Kudzu growing in space (#36701) 
* initial commit

* adds a macro

* a small change

* Update spacevine.dm
 2018-04-19 03:13:47 -05:00
Jordan Brown
f52f0f9f33 Reduces aurora caelus weight to that of meteors 2018-04-13 09:02:28 -05:00