Commit Graph

69 Commits

Author SHA1 Message Date
Alberyk
d62e533792 trader 2020-04-22 13:53:03 -03:00
Alberyk
1649ee1290 couple of stuff. 2020-04-22 13:52:51 -03:00
Alberyk
60552d11c4 fixes stuff, i guess. 2020-04-22 13:17:19 -03:00
Alberyk
8463300224 Cold War Arc Release: Hearts of Plasteel Edition (#8585) 2020-04-05 16:31:56 +02:00
Wowzewow (Wezzy)
b9b42f4f8f Janitor, hydroponics and medical inhands (#8456) 2020-03-21 13:36:49 +01:00
YourFatherFigure
4e08b21e68 Varsity jacket overhaul (#8329)
Replaced old varsity jackets with new sprites and gave them pockets.
2020-02-26 20:06:07 +01:00
mikomyazaki
21f348ec57 Adds a unit test to check for any missing initial icon states (#8332) 2020-02-23 02:43:12 -03:00
Geeves
476d9c676b Mining Drone Tweaks (#8262) 2020-02-20 18:54:43 +01:00
Wowzewow (Wezzy)
d8e3620761 a bunch of small bugfixes and tweaks (#8091) 2020-01-30 23:54:23 +01:00
Matt Atlas
409ad05b69 Nerfs the Cyndie Kate merchant. (#8083)
Right now you can trade some really easy to get items for really dumb bullshit. Look at this:

A single telecrystal = any of these: energy axe, lwap, combat mech, merc rig, force gloves, A SYNDICATE CYBORG.
2020-01-27 14:00:56 -03:00
Geeves
e8f2747c1c Suit Cooler Adjustments (#8012) 2020-01-17 15:52:59 +01:00
Alberyk
1910c1defb Mandatory yearly gun pr: 2020 edition (#8001)
-adds the harpoon gun, to the merchant list and as a raider weapon
-adds the foldable shotgun, to merchant list and as a raider weapon
-adds a new sprite and firing sound for the silenced pistol, giving it to the dpra consular as well
-makes harpoons better as a throwing weapon
-tweaks some guns' names
2020-01-15 17:51:36 -03:00
Geeves
bead18d3f1 Revolution Improvements (#7878)
- Added a new category to the traitor uplink, which is only available to revolutionaries.

- Head Revolutionaries now spawn with an uplink that has 50 TC, they also get an alert telling them to not abuse it.

- Revamped the drill dropper into a generic orbital dropper, capable of dropping ANY sort of item you wish it to.

- Added a Mech orbital dropper. Added an Armory orbital dropper.

- Made loyalty implants display their text correctly when they implant someone.

- Added aggression implants, which makes whoever it is implanted into extremely aggressive. Quite useful for starting a revolution.

- Added some description_antag to mercenary cipherkeys, informing the reader that the mercenary radio key is :t.

- Added a gear crate (not for mercs) which is just six syndicate softsuits. Useful in a pinch.
2020-01-08 18:45:58 -03:00
Wowzewow (Wezzy)
e7f2e27e90 Adds inhand sprites to shoes. (#7762)
So, well, you can see yourself holding shoes.

SO MUCH IMMERSION WHOA
2019-12-25 22:43:45 +02:00
Ferner
188544b748 Merge branch 'master' into 191217-sprites_mecha
# Conflicts:
#	code/game/objects/items/paintkit.dm
2019-12-21 23:26:22 +01:00
Alberyk
038a4ac86b Tajaran update: the war to end all wars edition (#7638)
-changes how the tajara species handles citizenship in game: you now have to pick one of the three factions, this also enables consular officers for them
-adds a new var to the species: default_citizenship, which citizenship should be the default one for that species, so you can have species that can't get biesel citizenship as their main one
-adds a bunch of loadout options to the tajaran section
-restricts tajara from being necropolis contractors
2019-12-21 12:58:34 +02:00
Ferner
4c1c978e67 Removes the non-functional paint kits 2019-12-20 21:37:04 +01:00
Matt Atlas
df0cd6189a Brainmed Update (#7502)
gamer time.
2019-12-10 20:41:15 +02:00
Wowzewow (Wezzy)
a9ffb38f39 New money sprites (#7576) 2019-12-08 11:44:39 +01:00
SueTheCake
84794c6e65 Mechs 3: Electric Boogaloo (#7486) 2019-11-25 23:04:19 +01:00
Alberyk
beb35d6fd3 Adds two away missions ghost roles (#7450) 2019-11-21 20:55:59 +01:00
Matt Atlas
5da2a9c24b Splits organs into organ/internal (#7441) 2019-11-20 23:07:10 +01:00
Werner
af16a489a6 Removes Weapons (#7415)
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
2019-11-16 18:36:13 +01:00
Alberyk
2f96cbdbfb Adds a couple of new jacket options (#7353)
Adds the items suggested at this topic: https://forums.aurorastation.org/topic/12978-aurora-style-upgrade-jackets-jeans-etc
2019-11-10 12:40:25 +02:00
alsoandanswer
9553d94bad Refactors , resprites and rebrands RCDs (#6985) 2019-09-24 01:07:11 +04:00
Nerrathiel
0ce18a64d0 Simple Merchant Changes (#6958) 2019-09-10 23:01:53 +02:00
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