shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
182 Commits
Author SHA1 Message Date
TrilbyspacecloneandGitHub 98b714ab40 Lewd stuffs 
`Oh no`
 2018-11-03 21:51:18 -04:00
TrilbyspacecloneandGitHub 7e333b5aa7 Many goodies 2018-11-03 21:22:44 -04:00
deathride58GitHubTrilbyspaceclone
 		a4188756c3 Okie 
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2018-10-30 16:53:58 -04:00
TrilbyspacecloneandGitHub 70e9f5205f Sigh 2018-10-23 15:24:58 -04:00
TrilbyspacecloneandGitHub e1f0b364e1 Removes a spare thingy 2018-10-23 15:09:23 -04:00
TrilbyspacecloneandGitHub 429bcaca2c Fixes what Bejihn wanted and followed the sitcky at the top 
"// If you add something to this list, please group it by type and sort it alphabetically instead of just jamming it in like an animal"
 2018-10-23 15:07:13 -04:00
TrilbyspacecloneandGitHub b8654e0ac7 But why tho? 2018-10-14 10:06:31 -04:00
TrilbyspacecloneandGitHub f514978815 Fixed 2018-10-14 09:57:31 -04:00
TrilbyspacecloneandGitHub 3e60464bed Adds memes 2018-10-13 23:56:47 -04:00
Poojawa 2905299386 hotfixes to cargopods 2018-09-22 03:45:26 -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
81Dentonandletterjay 023f53a470 Improves cargo shuttle/firefighting foam descs (#38927) 
* Improves cargo shuttle/firefighting foam descs

* oof
 2018-07-06 09:42:33 -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
Tlaltecuhtliandletterjay 01eb1bc7fe [READY] better contraband crates (#38321) 
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
 2018-06-21 18:52:15 -05:00
Tlaltecuhtliandletterjay 1a42719d80 Advanced foam extinguisers (#38270) 
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
 2018-06-18 09:38:07 -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
Tlaltecuhtliandletterjay 4a8df6a701 Bring gender equality to Corgi crates (#37748) 
* brings gender equality on /tg/station
* what if this works
 2018-05-10 19:57:20 -05:00
Jordan BrownandCitadelStationBot dc9ce0cc6f Merge pull request #37590 from 81Denton/cargo-categories 
Reorganizes cargo's big "miscellaneous supplies" category
 2018-05-01 15:37:54 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
deathride58andGitHub 1f9d19a92a Merge pull request #6349 from Citadel-Station-13/upstream-merge-36983 
[MIRROR] Provides more control over uplink surplus chances.
 2018-04-11 21:34:56 +00:00
DentonandCitadelStationBot 04f7fc5788 adds tesla coil crate 2018-04-11 14:57:30 -05:00
Grandmother of 50andCitadelStationBot 43e0079981 Provides more control over uplink surplus chances. (#36983) 
Cant wait for the epic balance prs that people will fight in
 2018-04-11 05:16:32 -05:00
ArmhulenandCitadelStationBot 2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
CitadelStationBotandPoojawa 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 455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBotandPoojawa 69405b9561 [MIRROR] Allows admins to easily spawn cargo crates (#5786) 
* makes cargo spawning easy (#36094)

* Allows admins to easily spawn cargo crates
 2018-03-04 07:45:18 -06:00
CitadelStationBotandPoojawa b198e943e9 [MIRROR] Rearranges cargo packs (#5750) 
* Rearranges cargo packs

* update packs.dm
 2018-03-02 20:06:35 -06:00
CitadelStationBotandPoojawa 4f983ae337 [MIRROR] Crab Rockets (#5719) 
* Crab Rockets

* fixes mirror bot's shit

* ...github wtf
 2018-02-27 05:28:17 -06:00
deathride58andGitHub dac26732e2 Update packs.dm 2018-02-18 18:32:00 -05:00
YPOQandCitadelStationBot e975cd3629 Fixes bicycle riding 2018-02-18 11:34:21 -06:00
deathride58andGitHub be212dd736 Update packs.dm 2018-02-07 14:09:28 -05:00
Ashe HiggsandCitadelStationBot cf66c8c79c Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates 2018-02-07 04:52:27 -06:00
CitadelStationBotandPoojawa b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333) 
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
 2018-02-06 18:24:51 -06:00
CitadelStationBotandPoojawa e16db54c67 [MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic (#5297) 
* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm
 2018-02-05 04:42:13 -06:00
CitadelStationBotandPoojawa 43ee34838f [MIRROR] Adds pineapples to botany, and Hawaiian pizza (#5260) 
* Adds pineapples to botany, and Hawaiian pizza

* Update packs.dm
 2018-02-05 03:00:22 -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
orangesandCitadelStationBot 1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
Jordan BrownandCitadelStationBot f3fd81af24 Adds games vendor resupply crate 2017-12-06 22:53:21 -06:00
kevinz000andCitadelStationBot 66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
deathride58andGitHub b9f42c299b Merge pull request #4152 from Citadel-Station-13/upstream-merge-33134 
[MIRROR] Removes "machine prototypes"
 2017-11-30 04:46:25 +00:00
ShizCalevandCitadelStationBot 48c66093fc Fixes big band music crate (#33138) 2017-11-28 19:02:54 -06:00
ACCountandCitadelStationBot 0ad637388f Removes "machine prototypes" 2017-11-28 06:28:15 -06:00
as334andCitadelStationBot eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
CitadelStationBotandPoojawa 2c78f7122c [MIRROR] Adds some new plushies (#2866) 
* Adds some new plushies

* Update packs.dm
 2017-09-22 22:31:07 -05:00
CitadelStationBotandPoojawa 8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847) 
* New squeaky datum and plushes

* Update bananashoes.dm
 2017-09-22 19:43:56 -05:00
Kerbin-FiberandCitadelStationBot d158ec9528 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter 2017-09-10 03:43:09 -05:00
kevinz000 5f5065eb46 kek 2017-08-29 09:59:57 -07:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00