shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,276 Commits 5 Branches 0 Tags
c947dfdca5b1fd0cef47cd3facbbdcd71ebcbf41
Commit Graph

102 Commits

Author SHA1 Message Date
Hatterhat
4195f96876 glaive daggers squashed 2020-10-03 14:32:19 -05:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4 
TGUI4 port
 2020-08-09 05:46:21 -07:00
Hatterhat
e95dcba705 price nerf, tweaks, aprc 2020-08-08 12:17:56 -05:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Hatterhat
ccee254546 proof of concept: crusherglaive - squashed 2020-08-02 12:30:14 -05:00
Letter N
0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
jjpark-kb
99425bbd88 Radial Mining Vendor Voucher (#12246) 2020-05-14 13:59:40 +02:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Trilbyspaceclone
1472ea31a0 oops all the missing commas 2020-05-08 07:19:03 -04:00
Trilbyspaceclone
b5010c5cfc Update machine_vending.dm 2020-05-08 06:49:26 -04: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
TrilbySpaceClone
25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie
ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
Putnam
60f819465c what. what. what. what. what. 2020-02-18 18:30:15 -08:00
Hatterhat
2006ccf4ef nicc you buffoon you never adjusted the hood type 2020-01-11 00:12:52 -06:00
Hatterhat
940efc0c1c holy shit i hope this compiles 2019-12-26 01:46:04 -06:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
skoglol
c1e84774ac one-hand shit 2019-09-20 17:28:44 -05:00
Sishen
ffa574b1be Update machine_vending.dm 2019-08-11 13:17:55 -04:00
Sishen
f1bc6e42c8 Update machine_vending.dm 2019-08-11 13:10:14 -04:00
Sishen
f59b60e83a QOL OOGA BOOGA 2019-08-08 01:11:20 -04:00
Poojawa
9374e83e7d fixes armor plate oversight 2019-05-01 00:05:14 -05:00
Trilbyspaceclone
ff29ade943 Hairly request 2019-04-23 12:09:58 -04:00
Trilbyspaceclone
31f3a16777 *No gps* 2019-04-23 02:43:23 -04:00
Trilbyspaceclone
dbdd37430a Kev requests... 2019-04-23 02:42:18 -04:00
Trilbyspaceclone
6dc8faf533 Update machine_vending.dm 2019-04-20 14:08:25 -04:00
Trilbyspaceclone
769102ed9c Update machine_vending.dm 2019-04-20 14:04:40 -04:00
Poojawa
fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Trilbyspaceclone
6c69ebcd77 Update machine_vending.dm 2019-03-21 19:45:32 -04:00
Trilbyspaceclone
d1d5371761 Update machine_vending.dm 2019-03-21 17:58:40 -04:00
Trilbyspaceclone
ddc8bfbfb7 Update machine_vending.dm 2019-03-21 17:33:23 -04:00
Trilbyspaceclone
c5dfc6f8cf Update machine_vending.dm 2019-03-21 17:14:16 -04:00
Trilbyspaceclone
5d34c7ef6e Update machine_vending.dm 2019-03-21 16:34:18 -04:00
Trilbyspaceclone
94a905f420 Update machine_vending.dm 2019-03-21 16:15:30 -04:00
Trilbyspaceclone
e2497cdcf5 Update machine_vending.dm 2019-03-21 16:07:27 -04:00
Trilbyspaceclone
4b42443dea Update machine_vending.dm 2019-03-21 16:04:35 -04:00
Trilbyspaceclone
cecf7e251f Update machine_vending.dm 2019-03-05 00:06:33 -05:00
Trilbyspaceclone
0b0bfbac10 Update machine_vending.dm 2019-03-04 23:48:12 -05:00
Trilbyspaceclone
5255a31e3d Update machine_vending.dm 2019-03-04 23:46:42 -05:00
Trilbyspaceclone
6a4ce07c0b Update machine_vending.dm 2019-03-04 23:27:38 -05:00
Ignari-Coldstorm
aa57d42d6c Fixes duplicate medipen. 
Fixes a duplicate medipen showing up in vendor list.
 2018-12-17 20:28:04 -06:00
Ignari-Coldstorm
9c16527cd4 Mining Vendor and PPKA changes! (#7817) 
* Mining Vendor and PPKA changes!

Adjusted the prices on a couple items as well as added in the pocket extinguisher to the vendor. Adjusted the Premium Proto-Kinetic Accelerator to have one less range.

* Update machine_vending.dm
 2018-12-16 03:56:21 -08:00
deathride58
6c5694ce0c Merge pull request #7780 from Ignari-Coldstorm/Premium-KPA 
Adds a new PKA to the mining Vendor
 2018-12-03 11:20:37 -05:00
Ignari_Coldstorm
747f5a0a4e Update machine_vending.dm 2018-12-01 17:57:04 -06:00
nik707
04bacde07d adds the gasmasks lol im fucking dumb 2018-10-21 00:20:31 -05:00