shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

82 Commits

Author SHA1 Message Date
Dap
19678119c5 Merge branch 'plasmatables' into plasmaglass-tables-spears 2019-08-28 14:55:01 -06:00
Dap
f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! 2019-08-25 21:38:04 -06:00
lolman360
d93fceec98 oops recipe time thanks pax 2019-08-17 12:15:17 +10:00
lolman360
ffad3cfe22 so i should really not have access to github but 2019-08-11 11:14:47 +10:00
lolman360
8d7f4a1385 duira 2019-08-10 21:43:28 +10:00
kevinz000
cd6699cfed Merge pull request #8660 from Trilbyspaceclone/Unmodular 
Ummodular a few files - Fixes Freelance Crate costs
 2019-08-05 00:47:28 -07:00
Trilbyspaceclone
3bad062c23 Merge branch 'master' into Unmodular 2019-08-05 00:04:44 -04:00
EgoSumStultus
4de05fc692 AAAAAAAAAAAAHHHHHHHHHHH 2019-08-02 06:48:14 -07:00
TrilbySpaceClone
606639ce23 part 1 fixing shit 2019-07-29 05:52:49 -04:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Trilbyspaceclone
2a78caa127 Merge branch 'master' into Unmodular 2019-07-14 18:27:37 -04:00
Trilbyspaceclone
e9f36b79bb Merge branch 'master' into meme_tools 2019-06-23 21:07:55 -04:00
Trilbyspaceclone
063fe4fdef Merge branch 'master' into Unmodular 2019-06-23 21:06:21 -04:00
kevinz000
e7331b3c98 Merge pull request #8571 from Thalpy/Dwarf 
Medical smartdarts.
 2019-06-23 06:24:10 -07:00
TrilbySpaseClone
51119ad6fd tools 2019-06-22 15:37:28 -04:00
Fermi
724ec93166 oops 2019-06-19 00:24:02 +01:00
Fermi
f5c98f5d57 Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf 2019-06-19 00:17:30 +01:00
Fermi
fe6296b58a Added crafting recipies as per Bhijin's request. 2019-06-19 00:17:18 +01:00
Ghom
95dc8084f1 Moving some tablecrafting recipes to the appropriate categories (#8658) 
* Moving some recipes to the appropriate categories

* Fixes the not-a-sandwich recipe being M.I.A.
 2019-06-17 11:18:49 -07:00
TrilbySpaseClone
b45c870ae4 Immodular 2019-06-16 19:58:49 -04:00
Thalpy
98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
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
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
kevinz000
0d97361dea Merge pull request #8430 from Trilbyspaceclone/bad_idea 
Adds improvised 7.62 rifle
 2019-06-05 11:31:10 -07:00
Fermi
bebaf8e7a8 Wheelchairs are apparently banned, we now have HOVERCHAIRS! 2019-06-01 18:17:49 +01: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
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
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
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
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