shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,325 Commits 5 Branches 0 Tags
091d9ec00f186052b87bd65125e896f78faefe38
Commit Graph

57 Commits

Author SHA1 Message Date
Lin
7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song 
Solves some harddels
 2022-12-12 19:11:49 -07:00
SandPoot
8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
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
586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145
629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
Letter N
a43309a097 shuttle pog 2021-03-05 22:26:55 +08:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
DeltaFire
e37790a997 fix 2021-01-07 00:23:18 +01:00
Letter N
5b63f0acce fix fix fix^2 2020-08-07 15:15:34 +08:00
Letter N
5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator 2020-07-29 15:10:01 +08:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghommie
2eb3089ccb Certain packs (mostly armory/security) can not be privately bought anymore. 2020-05-17 23:38:26 +02:00
Artur
dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur
120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and 
And fixes to make stuff work
 2020-04-23 17:36:13 +03:00
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie
e0d219650f Ready for testing. 2020-04-21 01:26:34 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Artur
d937ded07c Fixes points 2020-01-30 18:54:39 +01:00
Artur
6619ac41c8 *PANIC* 2020-01-25 22:07:57 +02:00
Artur
8b21a60ac9 MF Line endings 2020-01-20 14:09:22 +02:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
c20bc123ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336 2019-11-15 01:10:39 +01:00
kevinz000
4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2019-11-14 16:00:45 -07:00
Ghommie
63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
TrilbySpaceClone
6e328ea1b1 art of the deal 2019-11-11 07:26:12 -05:00
Ghommie
592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01: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
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
81Denton
023f53a470 Improves cargo shuttle/firefighting foam descs (#38927) 
* Improves cargo shuttle/firefighting foam descs

* oof
 2018-07-06 09:42:33 -05:00
CitadelStationBot
544d7bcaf4 [MIRROR] Adds descriptions to all cargo orders! (#5917) 
* Adds descriptions to all cargo orders!

* recompiles tgui
 2018-03-12 07:39:38 -05:00
Poojawa
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
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
oranges
43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
LetterJay
ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
LetterJay
f2c011a37b Update console.dm 2017-08-14 18:55:25 -05:00
CitadelStationBot
4d19a89519 Removes a great amount of machinery copypasta with circuitboards. 2017-08-09 19:24:19 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
d21766956e [MIRROR] Cleaned up some emag_acts (#2018) 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-15 13:17:56 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -05:00