Commit Graph

120 Commits

Author SHA1 Message Date
Hatterhat
50a0991ce3 minor point dupe kill 2022-12-26 12:00:54 -06:00
Hatterhat
bab984be30 i hate runtimestation i hate runtimestation 2022-10-31 11:50:54 -05:00
shellspeed1
142c07c51d Merge branch 'master' into premium-kas-for-borgs 2022-09-23 17:00:02 -07:00
shellspeed1
2d90e0ab33 readds the premium ka but for borgs 2022-09-17 19:03:03 -07:00
shellspeed1
22d22447d2 removes the premium KA 2022-09-17 06:36:49 -07:00
shellspeed1
d7a2f14298 fixes and ka 2022-09-17 03:46:24 -07:00
silicons
4a6358d2f4 Merge pull request #15806 from shellspeed1/new-mining-pods
Penthouse pod rework plus new garden pod.
2022-08-26 10:18:13 -07:00
shellspeed1
d175b4d247 capitalization stuff 2022-08-24 15:13:19 -07:00
shellspeed1
f030d0038f New garden pod 2022-08-21 05:00:26 -07:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
DeltaFire
6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
Hatterhat
5dbadffe6b wait a fucking second 2021-10-23 18:15:20 -05:00
Hatterhat
21f88e9711 sounb 2021-10-23 17:47:31 -05:00
Hatterhat
73bbe4f694 igons 2021-10-23 17:47:06 -05:00
Hatterhat
4559b680fd whoops 2021-10-22 22:07:10 -05:00
Hatterhat
7fb3666f43 funny hands gaming 2021-10-22 22:05:18 -05:00
shellspeed1
f52385ca46 all the stuff to add pod to code 2021-06-27 03:39:13 -07:00
shellspeed1
e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
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