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 2026-08-21 19:57:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
56 Commits
Author SHA1 Message Date
Putnam3145 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Putnam3145 629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
siliconsandGitHub 431acd9d5c Merge pull request #14820 from qweq12yt/more-cargo-stuff 
[FIX] Some cargo related fixes
 2021-06-13 15:15:20 -07:00
qweq12yt 584dce4a80 updating comments 2021-06-11 01:34:19 -03:00
qweq12yt 0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
keronshb 25fe97e8fe Lets Disposal pipes work on the cargo shuttle again 
Silly removal.
 2021-05-29 13:21:23 -04:00
qweq12yt b97a38f125 todo comment 
hopefully i will be able to do it in the future, or someone else will implement it
 2021-03-31 00:55:14 -03:00
qweq12yt 04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -03:00
LetterN 86b8bbf727 no more free shipping 2021-03-21 21:44:04 +08:00
Ghommie ad6b835e8b Linter. 2020-06-08 08:12:29 +02:00
Ghommie 495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghommie 0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
Ghommie 7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
Ghommie 4b090f938c ok 2020-01-15 20:51:36 +01:00
kevinz000andGitHub f39d12527d Update supply.dm 2019-12-21 23:50:59 -08:00
kevinz000andGitHub d9cd90c3c5 Update supply.dm 2019-12-16 11:31:03 -07:00
TrilbySpaceClone 6e328ea1b1 art of the deal 2019-11-11 07:26:12 -05:00
Ghommie f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
Fermi ffa717e8d7 Prevents Eigenlockers from teleporting people to CC via cargoshuttle. 2019-08-04 19:39:14 +01:00
Ghommie ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
81Dentonandletterjay 1336a555d4 Disables knockdown/throw on supply shuttle docking (#38932) 2018-07-06 11:37:18 -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 Brownandletterjay c86a8ce23e Merge pull request #38709 from AutomaticFrenzy/patch/export-mechs 
Fix being unable to export mechs
 2018-06-25 14:12:24 -05:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58andkevinz000 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
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58andGitHub a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055 
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
 2018-03-09 19:25:12 +00:00
kevinz000andCitadelStationBot 91ac70a73e RND TECHWEBS: TECHFABS (#36055) 
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
 2018-03-07 21:11:56 -06:00
Dax DupontandCitadelStationBot 72e3ffa562 Beacons are no longer radios (#36070) 
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
 2018-03-07 14:43:25 -06:00
vuonojenmustaturskaandCitadelStationBot 0d40303254 Merge pull request #35558 from praisenarsie/patch-28 
fulton pack not allowed on supply shuttle
 2018-02-12 09:07:02 -06:00
PoojawaandGitHub 03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
Tad HardestyandCitadelStationBot 0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
Emmett GainesandCitadelStationBot 8cf30a65fb dock() re-organization 2017-12-18 21:23:58 -06:00
CitadelStationBotandkevinz000 cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
JordieandCitadelStationBot b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
ShizCalevandCitadelStationBot 92ec5c11ab Fixes being able to sell camera mobs to CentCom (#31306) 
* Fixes being able to sell camera mobs to CENTCOM

* Did it Ninja's way.
 2017-10-07 19:13:28 -05:00
CitadelStationBotandPoojawa 82d0aae420 [MIRROR] Changes shuttle port direction var from an angle to a dir (#2613) 
* Changes shuttle port direction var from an angle to a dir

* actually ports the directions

* Update shuttle.dm

* how
 2017-09-13 20:39:55 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
PoojawaandGitHub 3a76fdc2e9 Update supply.dm 2017-09-04 21:26:19 -05:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot c3329f1b84 Portals do not go on supply shuttles 2017-07-26 15:44:51 -05:00
CitadelStationBotandkevinz000 7bb4ff2d2a Fixes yet another supply shuttle issue (#2105) 2017-07-24 04:07:21 -07:00
CitadelStationBotandkevinz000 e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot e57a753701 Exporting mechs! 2017-06-25 11:35:00 -05:00
CitadelStationBot 01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -05:00
CitadelStationBot bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00