Commit Graph

43 Commits

Author SHA1 Message Date
Nerrathiel
84f1f32ad5 Ai trader box removal V2 (#6904)
Second attempt at removing boxes from merchants - due to wrong checksum for travis had to revert everything and try again. Hope I didn't fuck up again. All the feedback from previous PR should be accounted for.
2019-08-30 22:07:35 +03:00
Alberyk
2824a51cf0 Adds more depth to citizenship and religion choices at the character setup (#6785)
This pr adds some depth to the citizenship and religion choices at the character setup.
Citizenship will now affect your loadout and mission as a consular officer.
Religion will now affect your chaplain's religion name, bible name and sprite.
Selecting any option will bring a small lore pop up for citizenship and religion choices.
2019-08-16 19:16:20 +03:00
Nerrathiel
ae86b7b8b5 Merchant code adjustments (#6791) 2019-08-04 21:14:24 +02:00
Alberyk
b0e6ece48b Gun update: the end of the space cold war (#6742)
-replaces the sprites of the guns that were pretty much justreferences to guns in real life, like the uzi and the dragunov, with new future sprites made by kyres
-adds the hand cannon
-makes some guns cheaper at the merchant
-fixes a broken message with the prank guns
-added a small animation when someone is hit by a blaster projectile
2019-07-24 21:31:09 +03:00
ParadoxSpace
6916089d4e Replaces Mice w/ Rats (#6625) 2019-07-06 00:03:35 +02:00
fernerr
77c262e9a2 Security and Central command uniforms sprite overhaul (#6560) 2019-06-18 00:28:53 +02:00
Dwago
b8108a945c More Bug Fixes (#6106)
Fixes #6079
Fixes #3803
Fixes #6088
Fixes #5930
Fixes #3072
Fixes #3986
2019-03-18 09:03:15 +02:00
Alberyk
15bfb052d7 Martial arts improvements and additions (#6094)
-adds framework for weapons based martial arts, implementing a very basic swordsmanship
-makes the martial art books more modular
-fixes some minor issues with some of the martial art code
-adds amohdan swordsmen gear, to be used in a future event/sold by the merchant
- fixes #6083
2019-03-10 23:38:00 +02:00
Alberyk
ed0297a697 The Tau Ceti Foreign Legion (#5779)
This pr adds the Tau Ceti Foreign Legion, at the request of the lore team, to replace/be an alternative to the ert.
2018-12-30 12:06:21 +01:00
Alberyk
68104f9f02 Merchant fix (#5728)
-fixes #4967 
-fixes #5667
2018-12-08 22:57:48 +01:00
Mykhailo Bykhovtsev
a43e3fc66e Bugfixes (#5682)
Wanted to fix one bug, but couldn't stop.

- Farmbot now have harvesting animation. 

- Farmbots no longer have two water tanks inside of them, that was causing them to use hidden water tank and not let it be refilled. Fixes #5677 

- Farmbots now will wait for weedlevel to be 5 or higher, that is when the alarm is triggered. And call `update_icon()` when it is done. Otherwise people wouldn't notice if they were killing weeds

- Vending machine now accept only items of the same type as defined in their product list. So you can no longer insert cult's ritual knife into Dinnerware. Fixes #5671 

- Merchants cannot by generic mech's weapon, it was replaced with UT AC 2 and Scatterbox. Fixes #5675 

- Ghosts cannot be teleported by telescience. Fixes #5688
2018-12-04 19:48:59 +01:00
Alberyk
b124885215 Custom items 02/12 (#5692)
Adds the following items:

-Stainless Steel Fork - Vedai'Kwia Xizal - conspiir
-Tokash Ancestral Spear - Suvek Tokash - evandorf
-Ghostly Board - Klavdiya Tikhomirov - alberyk
-Clawed Arm & Jacket - Diamond with Flaw - burgerbb

Removes make's antenna and change his coat to be a proper poncho.

This pra also has some changes, such as two bugfixes; one that prevents runtimes from adding new robotic limbs, and another that prevents dionaea arms from being regenerated if there is an arm present, and removing admin and species only related limbs from the fabricator, such as the hk limbs.
2018-12-03 10:20:32 +01:00
Alberyk
3485f05668 Small merchant and sword sprites changes (#5584)
-tweaks some of the merchant's grammar
-fixes the antique shop missing the zweihander like it was supossed to have and the padded cap
-adds belt sprites to the claymore and dao, made by dronz
2018-11-15 20:13:37 +01:00
Werner
0feedab118 Leyon Changes (#5200)
The Leyon Pistol has been changed to be closer to the original vision of it.
It is loaded via a special 10mm speedloader, however loading it takes some time.

Each gun (when ordered via cargo) will ship with a speedloader.
The speedloaders itself can not be ordered, but 10mm ammunition boxes can which can be used to restock the speedloaders or load the gun directly.

Reduces the price for the gun at the merchants from 1500 to 500 credits
And makes additional ammo boxes purchaseable

Also changes the path name of the 10mm ammo/mags/... to be consistent with the standard pathing for ammo
Adds additional messages if you can not load a gun with a single cartridge (currently it fails silently)
2018-09-16 00:46:52 +03:00
Alberyk
530b9102db Adds ouija boards and magic eightballs (#5238)
Both items taken from the tgstation.

Magic eightballs allow you to ask a question, picking up a random answer. Or they might ask the dead on the deadchat, if it is a haunted one.

The ouija board allows some possible limited communication with the ghosts, however anyone else can move the planchette, allowing people to mess with other person as well.
2018-09-15 01:00:09 +02:00
Alberyk
277843f887 Merchant changes. (#5177)
-adds the changes suggested in this thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11795
-renames the department jackets to look better in the examine
-reduces the price of toy guns and sets a price for vehicles in the worth list
2018-08-30 21:59:39 +03:00
Alberyk
bf467f2fcd August bugfixes (#5096)
-removes the shotgun magazines things, not done properly by #5010
-fixes more secret chems showing up on cargo warehouse
-removes rainbow slime core, since there is no way you can get it, from the bounties
-fix the adhomian bread recipe
-removes the mining drone ore hunting behavior, which just ended with them falling down holes and other dumb things
-fixes #5097 by removing the bluespace leak ruin, since the bluespace walls had some bizarre interaction with simulated turfs in the asteroid, besides just pushing half of the loots into walls
2018-08-07 09:01:42 +03:00
Werner
f1c7c4e091 Ports TGs System of Cargo Rewards and Bounties (#4998)
This Ports TGs System of Cargo Rewards and Bounties.
It also changes the paths of some of the foods (to be easier to use with the bounites)
It integrates the bounty application into the cargo control app
The cargo control app can now print invoices for orders and shipments
https://forums.aurorastation.org/viewtopic.php?f=21&t=11529
2018-08-04 21:34:18 +02:00
Alberyk
047c3a4c83 Gun update 2018: mk II (#5010)
-removes the shotgun magazines, moving their sprites to the boxes instead
-shotguns boxes should now all have eight shotgun shells, up from seven
-added incendiary and emp shotgun shells boxes
-added the baindolier, a belt that can hold up to 16 shotgun slugs
-fixed a bug with unloading the pocket rifle
-added empty sprites for the uzi and a different loaded gyro pistol icon
-updates some gun related merchant lists a bit
-adds the weapon suggested by this thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11486
2018-08-02 01:01:26 +02:00
Alberyk
914c690fdb Adds another unathi clothing option (#5004)
Adds the uniform suggested by this thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11270

Also, an unathi piece of body armor and helmet. All sprites were made by dronz.
2018-08-02 00:30:18 +02:00
Alberyk
b142056c0f Merchant related fixes and tweaks (#4891)
-fixes an exploit to allowed merchants to make dash money due to how the pet trader worked, it should now sell all mudane animals and buy only rare ones
-removed some items that could not be moved from the merchant list
2018-06-26 23:17:05 +03:00
BurgerLUA
9da929d4a1 Custom Kinetic Accelerators (#4802)
This is honestly one of my biggest and most ambitious projects. I hope people are happy with this.

Custom kinetic accelerators are special, customizable mining weapons that are meant to give a sense of progression, and a sense of pride and accomplishment while mining. Each custom KA is made up of 3 or 4 parts:

The Frame (5 to choose from)
The Cell (5 to choose from, +1 traitor)
The Barrel (5 to choose from, +1 traitor)
The Upgrade Chip (7 to choose from, +1 traitor)
The sprites change with each addon, they are truly dynamic and there are so many combinations of parts that a miner can have. You can have several different builds for each desired mining style, it's quite a robust system.

You can have a KA that shoots slowly, but delivers high-penetrating shots that go through several walls of rock. You can have a KA that shoots REALLY fast, but precisely destroys 1 rock at a time. You can have an absolute canon of a beast, that destroys rocks in a 3 tile radius around it.

The parts can be obtained via research, via abandoned crates, or via RNG in the cargo warehouse. There are some custom KAs that spawn on the raider's ship, on the mercs ship, and a laser one on the merc's headquarters. That laser one can also be bought from the traitor uplink as well.

ERT get a class 4 KA for use in special operations, if they choose to use it.
2018-06-17 23:02:42 +03:00
Alberyk
d44ff1363b "Fix bayonets!" (#4872)
This pr adds bayonets, knives that you can attach to some rifles. When attacking someone in melee with the rifle, you will attack your target with the bayonet instead of the rifle itself. Sprites are from tg and baystation.

Also, fixes the vintage rifle having no in hand sprites
2018-06-16 16:46:42 +03:00
Alberyk
2116c17961 Adds the icelance rifle (#4804)
This pr adds the icelance rifle, a tajaran energy weapon. It has the capacity of three regular laser blasts, but it can be recharged manually by rotating a crank on it. You can buy it from the merchant or get it as a raider.

Thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11215

Sound is from https://freesound.org/people/kikuchiyo/sounds/214851/

Sprites were made by dronz.
2018-06-05 22:26:20 +03:00
skull132
674cd94714 Merge branch 'master' into development
# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-5_interstitial.dmm
2018-05-13 19:19:52 +03:00
BurgerLUA
aad698be53 Mental Medication Additions (#4648)
The less controversial tweaks
Tweaked the metabolism rate of mental medication to reflect their intended values. Reduced the dosage threshold to suppress traumas to reflect their intended values.

Syringe (drugs) now contains truth serum.

Cardox is now slightly poisonous, and can directly remove phoron from blood when consumed. Cardox can now remove phoron in the air when applied to turfs.

A secure box of loyalty implants, hextrasenil pills, and cardox grenades are now located in the vault.

The vault now contains some misc emergency gear that a head of staff can access in case of a dire situation. Current gear are loyalty implants, expensive cardox grenades, and Hextrasenil pills.
2018-05-13 17:39:56 +03:00
Alberyk
94a1af3577 Custom items 08/05 (#4698)
Adds the following items:

-Dull Headwraps - JIX - kyres1
-Dull Robes - JIX - kyres1
-Titanium Faceplate - IRD - kyres1
-BARON's Dice - BARON - iamcrystalclear
-Vasili Mine Zippo - Nikit Vasili - simontheminer
-O.R.B. cyborg sprites
-COFFIN SENTINEL cyborg sprites

Other changes:
Removes Muhawir's wallet at the player request. Delete pointless items, that were just bloat since they had no custom sprite or function of their own, and implement them with the config. Also, adds support for weighted dices, since this was needed for an item.
2018-05-09 23:56:35 +03:00
Lohikar
da3af646d6 Bolt-action refactor (#4667)
Makes bolt-action rifles a child of pump-action shotguns again to remove some shared code.
2018-05-02 21:24:32 +03:00
Alberyk
cad0bb1584 Adds more ancient warfare to spessmen (#4325)
This prs adds some new melee weapons, besides some sprites fixes and changes.

-adds pikes and friends, sprited by thegreatjorge, weapons that can attack two titles away from the target
-adds the zweihander at fowl's request
-adds explosive spears, that you can craft by using a grenade on a spear, they will explode when throw or when you attack someone
-adds a whip, that can disarm people by attacking their hands and arms
2018-03-10 17:18:15 +02:00
BurgerLUA
bb87563e6d The k'ois nerf to end all k'ois nerfs (#4304)
Overview
K'ois bars are now replaced with a less dangerous variant with the same name. These K'ois bars do not cause medical nightmares to occur, however the dangerous ones are moved to the "contraband" section of the vending machine and can be vended for free.

New Chemicals
Unfiltered K'ois can still be found in K'ois spores. They can be filtered by grinding them up and adding Cardox . Cooking recipes are untouched, and still contain unfiltered K'ois.

Platinum can now be put into reagent form by grinding up platinum.

Cardox is a new chemical designed by nanotrasen that eliminates liquid phoron. It can be made by mixing Platinum, Sterilzine, and Carbon.
2018-03-03 00:34:48 +02:00
skull132
1e973b2d6a Merge branch 'master' into development
# Conflicts:
#	code/modules/multiz/movement.dm
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-6_surface.dmm
2018-01-21 23:51:44 +02:00
Ron
842f20e137 Bug Fixes (#4076)
Fixes #4074
Fixes #4047
Fixes #4005
Fixes #3995
Fixes #3953
Fixes #3855
Fixes #3426
2018-01-14 22:14:11 +02:00
Ezuo
79ff21654a Removes the lambda battery from the merchant trader list (#4093) 2018-01-09 09:49:42 -06:00
Alberyk
b58a3037c1 Some small fixes and tweaks (#3933) 2017-12-08 17:10:02 -06:00
skull132
7dc02be204 Merge branch 'master' into development
# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
2017-11-11 20:57:28 +02:00
WrongEnd
73a10d20e2 Adds pranks, jukes, and anal retentive bolt action rifles (#3664) 2017-11-10 23:53:01 -06:00
Alberyk
36b6642c83 Fixes merchants making a lot of money with little effort (#3815)
This should fix merchants getting insane ammounts of credits due to plasma.

Also, fix an issue with a vampire message check.
2017-11-05 12:50:45 +02:00
Alberyk
2d52377ad8 Fixes the merchant job showing up in the id's console (#3737) 2017-10-29 13:17:07 +02:00
Alberyk
ff67db51c9 Fixes messed up belt_mirror sprites, bag missing sprite and merchant mecha weapons (#3712)
-fixes #3707
-fixes #3711
-fixes the science courier bag having no sprite
-fixes a lot of items being brown by accident
2017-10-20 14:18:39 +03:00
TheGreatJorge
0aff2d8785 Coloured lighting & related stuff (#3555)
Makes all light tubes & bulbs have colour according to the light they emit. There are 6 preset colours: RGB CMY. Any other color is possible by simply changing the already present brightness_color variable. This PR makes it so it actually changes the color of the item and wall object too.
    Added two new colour defines used only along with preset coloured lights.
    Coloured lights are only obtainable by random maintenace loot, cargo spawn or trader.
    Added box of randomly mixed light colours and box for every preset light colour.
    Removed two sets of redundant defines.
    Converted light item New() to Initialize() (hopefully correctly).
    Made couple tiny tweaks to the lights code.

EDIT, 7. Oct 2017:

    When you hit light machinery or item with paint, it will change it's brightness_color var, instead of the color var.
    Paint buckets can now paint items and people again.
    You can now wash paint off by spraying yourself with fire extinguisher or otherwise covering yourself in water.

EDIT, 8. Oct 2017:

    Removed one apparently unused global list.
    Converted pain bucket New to Initialize and changed it's pathing style.
    Shower can now wash paint too.
    Fixed paint bucket sprites to be bit more dynamic and fixed the in hand sprite. Also added bucket lid.
2017-10-10 18:46:24 +02:00
Alberyk
62f142e215 Gun update; new icons, more guns and better code organization (#3434)
-ports some gun and gun mechanics from polaris and bay such as the Lemant revolver, capguns sprites
-collapses svd.dm and scout_sniper.dm into sniper.dm
-renames boltaction.dm to rifle.dm
2017-09-18 22:22:09 +03:00
Alberyk
d1c3a58c87 Adds the merchant station, the shuttle and the station's dock (#3254)
This pr adds the second essential part of the merchant's implementation, mapping the merchant's shuttle, base and the dock. And more merchant related fixes and tweaks.
2017-08-13 23:31:50 +03:00
Alberyk
b4fa4a8b3a Baystation12 merchant port (#3155)
Port of the merchant mechanics from baystation12.
All of the trader, prices and most essential system are done, as well the job datum and the like. Mapping the shuttle, the base and a new dock will be done in a later pr.
Also adds phazon construction and several other items used in this pr.
The chance of the merchant slow being open at round start can be changed via the config, it is 20% by default.
2017-08-04 21:36:04 +03:00