Commit Graph

19 Commits

Author SHA1 Message Date
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