shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,847 Commits 5 Branches 0 Tags
e339bcd2ca8a7c7d8ee2662bd73dcce95f02452b
Commit Graph

163 Commits

Author SHA1 Message Date
Redtail
e339bcd2ca Added a new carpet 
Worked on adding a new carpet.  It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
 2018-12-01 20:21:18 -06:00
deathride58
a4188756c3 Okie 
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2018-10-30 16:53:58 -04:00
Trilbyspaceclone
70e9f5205f Sigh 2018-10-23 15:24:58 -04:00
Trilbyspaceclone
e1f0b364e1 Removes a spare thingy 2018-10-23 15:09:23 -04:00
Trilbyspaceclone
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
Trilbyspaceclone
b8654e0ac7 But why tho? 2018-10-14 10:06:31 -04:00
Trilbyspaceclone
f514978815 Fixed 2018-10-14 09:57:31 -04:00
Trilbyspaceclone
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
f03ac27664 (0,0,0,0) (0,0,0,0) (0,0,0,0) (0,0,0,0) (0,0,0,0) 2018-09-21 14:30:40 -05:00
Poojawa
d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes 
Also adds new buildmode
 2018-09-13 22:55:11 -05:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05: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
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Tlaltecuhtli
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
Tlaltecuhtli
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
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
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
Tlaltecuhtli
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
Tlaltecuhtli
51b6a296d3 fixes a money loop 
🆑 
fix: fixes a possible money exploit
/🆑

why: if you buy the barrier crate, open it, spam all the grenades in vertical mode u ll get more money that the crate is worth
before: 4 grenades -> 12 barriers * 375 credits -> 4500 + 500 (crate) + 200 (manifest) -> 5200 which is a +3200 net gain
now:  4 grenades -> 12 barriers * 100 credits -> 1200+ 500 (crate) + 200 (manifest) -> 1900 which is a -100 net loss
 2018-05-09 13:40:13 -05: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
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
LetterJay
a4bc2c0b95 Merge pull request #6500 from Citadel-Station-13/upstream-merge-37398 
[MIRROR] Fixes cargo scanner being invis.
 2018-04-27 00:09:17 -05:00
Dax Dupont
a88caf87aa Fixes cargo scanner being invis. 2018-04-23 18:28:41 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
MrDoomBringer
846aa734e8 fixes fuckup in expressconsole preventing packs being ordered when credits are low (#37239) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* fixes my errors
 2018-04-16 19:14:08 -05:00
deathride58
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
Denton
04f7fc5788 adds tesla coil crate 2018-04-11 14:57:30 -05:00
Grandmother of 50
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
LetterJay
f7be23e78a Merge branch 'master' into upstream-merge-36442 2018-04-01 19:50:37 -05:00
MrDoomBringer
efb3dceb32 Fixes the cargo Express Console's description [wtf why is there a sprites tag] (#36765) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* mfw the space jews finally leave the drop pod buisiness

gimme gimme the gee bee pee

the fuck ahaha
 2018-03-28 13:38:04 -05:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -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
455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBot
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
CitadelStationBot
b198e943e9 [MIRROR] Rearranges cargo packs (#5750) 
* Rearranges cargo packs

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

* fixes mirror bot's shit

* ...github wtf
 2018-02-27 05:28:17 -06:00
deathride58
dac26732e2 Update packs.dm 2018-02-18 18:32:00 -05:00
YPOQ
e975cd3629 Fixes bicycle riding 2018-02-18 11:34:21 -06:00
deathride58
be212dd736 Update packs.dm 2018-02-07 14:09:28 -05:00
Ashe Higgs
cf66c8c79c Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates 2018-02-07 04:52:27 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327) 
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
 2018-02-06 19:06:31 -06:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
cc2d5bfc07 [MIRROR] Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#5283) 
* Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#35249)

* yaga

* node change

* okay cobby

* Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs
 2018-02-04 23:18:18 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00