Commit Graph

21 Commits

Author SHA1 Message Date
DeltaFire
13beddd42b nanogel time 2021-01-12 23:02:44 +01:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
lolman360
17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
Timothy Teakettle
93b4570f8d more changes 2020-07-17 23:23:47 +01:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghommie
b2a20d5438 reducing some prices as training wheel. 2020-05-03 05:37:04 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
kappa-sama
f69c67cf5c tabs 2020-01-08 17:03:48 -05:00
kappa-sama
ceea7cd021 moves these over too 2020-01-08 16:47:22 -05:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Fermi
10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
Thalpy
1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
Trilbyspaceclone
7c59349ad3 Update medical.dm 2019-06-09 12:02:16 -04:00
Fermi
f44b9048af Added to vendors/tech. 2019-06-08 01:00:51 +01:00
Fermi
f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -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
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
CitadelStationBot
bd3d76b8d3 [MIRROR] Modularises vending machines (#6050)
* Modularises vending machines

* Update vending_items.dm
2018-03-22 06:10:17 -05:00