shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,116 Commits 5 Branches 0 Tags
231da023ec9c073f1644172794de8ef2dc43017e
Commit Graph

87 Commits

Author SHA1 Message Date
kevinz000
4050ba98eb Merge pull request #8549 from Trilbyspaceclone/patch-168 
Fixes a unseen paper work exsplote
 2019-06-08 01:23:31 -07:00
kevinz000
a866ceb8a2 Merge pull request #8543 from Trilbyspaceclone/patch-165 
Makes SNOWCONES!
 2019-06-08 01:15:58 -07:00
kevinz000
f201bd1508 Merge pull request #8494 from Trilbyspaceclone/ash_walker 
Ash walker bone satchles.
 2019-06-08 01:09:26 -07:00
Trilbyspaceclone
6fd83df81f Update recipes.dm 2019-06-06 16:00:02 -04:00
Trilbyspaceclone
762c509315 Update craft.dm 2019-06-05 20:07:25 -04:00
kevinz000
0d97361dea Merge pull request #8430 from Trilbyspaceclone/bad_idea 
Adds improvised 7.62 rifle
 2019-06-05 11:31:10 -07:00
Trilbyspaceclone
c73884aea4 huh... 2019-05-30 16:12:40 -04:00
Trilbyspaceclone
751b9adb53 Update recipes.dm 2019-05-30 16:10:10 -04:00
Trilbyspaceclone
689077a54d grammar 2019-05-27 04:57:10 -04:00
Trilbyspaceclone
a244bf33f7 Update recipes.dm 2019-05-27 04:39:06 -04:00
Trilbyspaceclone
180666f519 Update recipes.dm 2019-05-24 22:11:11 -04:00
BlackMajor
f94cbe94f6 Ports TG firebots 2019-05-24 23:58:39 +12:00
kevinz000
a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker 
[Ready]Makes a blue space bike horn HONK
 2019-05-20 23:40:17 -07:00
kevinz000
8b127387c6 Merge pull request #8344 from Trilbyspaceclone/patch-119 
Makes sushie fucken have its correct subcat so we can craft it
 2019-05-17 21:28:59 -07:00
kevinz000
20b27ea92c Merge pull request #8362 from dtfe3/jetpack-stuff 
Making the Improvised Jetpack recipe less confusing
 2019-05-17 21:27:55 -07:00
dtfe3
3ece75eb76 Makes the jetpack easier to craft 2019-05-16 15:30:46 +02:00
dtfe3
d228334cd5 Fix for the improvised jetpack 2019-05-16 15:19:59 +02:00
Trilbyspaceclone
41400ff94a Update recipes.dm 2019-05-12 21:54:18 -04:00
Trilbyspaceclone
90268dea1d Update recipes.dm 2019-05-12 21:17:28 -04:00
Trilbyspaceclone
2833dab538 le sigh 2019-05-11 14:49:51 -04:00
Trilbyspaceclone
460459a1dd Update craft.dm 2019-05-11 14:08:43 -04:00
Trilbyspaceclone
651a452ed0 Update recipes.dm 2019-05-10 14:50:44 -04:00
Trilbyspaceclone
7cb7471857 Update recipes.dm 2019-03-28 23:16:21 -04:00
Trilbyspaceclone
c2039e4b62 Update recipes.dm 2019-03-28 19:47:26 -04:00
deathride58
2b852a4dec Update code/modules/crafting/recipes.dm 
Finnnnneeeee

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-01-20 17:32:56 -05:00
Trilbyspaceclone
ba3826af5d Update recipes.dm 2019-01-11 18:23:31 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04: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
56bc188abb Merge pull request #37580 from 81Denton/craftable-hudsunglasses 
Craftable HUDsunglasses
 2018-05-01 15:35:22 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
Jordan Brown
4c97bc84e7 Merge pull request #36721 from GrayRachnid/fix-crafting-tools 
Fix crafting tools tooltips
 2018-04-01 22:02:46 -05:00
Davidj361
2b280caa9b Fixed table crafting with tools in surrounding area (#36786) 2018-03-31 06:15:08 -05:00
CitadelStationBot
2c93091caf [MIRROR] fixes "Drinking glass not updating when used in crafting" (#6058) 
* fix (#36580)

* fixes "Drinking glass not updating when used in crafting"
 2018-03-22 06:06:44 -05:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05: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
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06: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
ACCount
522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
Leo
a45d889fd6 Merge pull request #32891 from CosmicScientist/bolas 
Re-enables bolas in crafting
 2017-11-24 14:06:10 -06:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
deathride58
0f9a85e4d7 Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101 
[MIRROR] Refactor of catpeople mutant organs
 2017-11-21 21:16:31 +00:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
ACCount
eb54055278 Refactor of catpeople mutant organs 2017-11-01 21:38:06 -05:00
Mercenaryblue
16c2f8f4c7 Honkbots Tablecrafting 
You can now tablecraft Honkbots.
 2017-10-31 12:26:59 -05:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00