Commit Graph

79 Commits

Author SHA1 Message Date
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
nik707
25c4a66842 adds some stuff 2018-10-10 19:28:55 -05:00
nik707
595d4c3504 Alternative Miner Suits (#7611)
* haha what the fuck this took like a solid 6 hours

* allows new suits to spawn on legion corpses.

* Update flags.dm

* Fix conflict maybe

* pls work

* im a big gay
2018-10-03 20:32:25 -07:00
Trilbyspaceclone
e494bbb3e3 Adds in other medical kits for miners to buy! (Nerfs brute treatment kit cost from 600 to 800 too) (#7553)
* Adds in other medical kits for miners to buy!(Buffs cost as well)

* Shit
2018-09-26 12:06:14 -07: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
Grandmother of 50
2fefc185d3 Equalizes Roundstart Mining Options (Removes some Advanced Scanners and Explorer Webbings) (#38153) 2018-06-20 02:43:42 -05:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07: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
Joan Lung
8e592f77a2 Improves mining voucher choices and minebots (#35633)
cl Joan
tweak: The crusher kit now includes an advanced mining scanner.
tweak: The resonator kit now includes webbing and a small extinguisher.
tweak: The minebot kit now includes a minebot passthrough kinetic accelerator module, which will cause kinetic accelerator shots to pass through minebots. The welding goggles have been replaced with a welding helmet, allowing you to wear mesons and still be able to repair the minebot without eye damage.
feature: You can now install kinetic accelerator modkits on minebots. Some exceptions may apply. Crowbar to remove modkits.
balance: Minebots now shoot 33% faster by default(3 seconds to 2). The minebot cooldown upgrade still produces a fire rate of 1 second.
balance: Minebots are now slightly less likely to sit in melee like idiots, and are now healed for 15 instead of 10 when welded.
balance: Sentient minebots are penalized; they cannot have armor and melee upgrades installed, and making them sentient will override those upgrades if they were installed. In addition, they move very slightly slower and have their kinetic accelerator's cooldown increased by 1 second.
/cl

the basic scanner sucks ass and nobody wants to use it, it's actually hilarious
also in those stats: minebot picked a mere 6 more times than the conscription kit, because it's an idiot drone, easy to accidentally hit, and did I mention how much it likes going into melee?

tbh it's quite possible the extra buffs aren't needed, just the passthrough module, but it's better to go a little too far rather than not far enough.
2018-02-19 22:08:34 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
vuonojenmustaturska
33f83e3274 Merge pull request #35152 from 81Denton/mining-vendor-conscript
Rearranges mining vendor items and code, adds conscription kit
2018-02-05 09:38:46 -06:00
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
deathride58
cffbbbbbd1 mapping to mining, preparing for mob folder 2018-01-04 00:55:01 -05:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
ShizCalev
9b2f07335a Makes the mining vendor give more verbose feedback 2017-09-27 15:45:19 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00