Commit Graph

801 Commits

Author SHA1 Message Date
mwerezak 5b5e16916f Replaces text expressions with macros 2015-02-12 01:55:12 -05:00
PsiOmegaDelta 79aacd9f30 Merge pull request #8081 from comma/maximumtrinkets
Accessories update.
2015-02-10 06:51:30 +01:00
Raptor1628 76f4001cc1 Paramedic Job Fixed
Adds Paramedic job as outlined on the forums. Reduces MD access to EVA,
adds some minor EMT clothing stuff, and fixes #8020 and the medgreen
armband while I was piddling around in sprites.
EMT alt title and indent fixed.

Now less broken.

![](http://i.imgur.com/vOSoJy0.png)
2015-02-08 17:23:02 -05:00
Chinsky de3e81657d Added moar sanity. 2015-02-08 12:45:50 +03:00
Chinsky 30de86c081 Accessories update.
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
unknown 39b467c9da New bullet types, projectile rewrite
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
Chinsky 4f541758c6 Merge pull request #8003 from Jamini/dev
Added Tajran, Lizardfiend, and Slugfiendian depiction transformations for the CE rig
2015-02-04 18:17:32 +03:00
Zuhayr 0091aca22c Merge with dev. 2015-02-04 11:05:35 +10:30
Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
2015-02-04 04:44:09 +06:00
Chinsky 71b19d5d8f Stupid typo & missing constants 2015-02-03 18:44:26 +03:00
Chinsky 1c3b1087dd Merge pull request #7582 from Zuhayr/richard
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
Chinsky 81e40aa542 Merge pull request #7794 from sabiram/dev
Adds approved custom item to common loadout pool
2015-02-03 18:09:32 +03:00
SkyMarshal 8898689c5d Cleared out my WIP folder. 2015-02-03 03:20:42 -07:00
Zuhayr d6b03ea768 Merge pull request #7974 from mwerezak/ert
ERT adjustment and fixes
2015-02-01 20:47:40 +10:30
Jamini b20c1ca900 Added Unathi and Skrellian sprite varients to the advanced voidsuit.
Signed-off-by: Jamini <mobiousjami@gmail.com>
2015-01-31 13:34:17 -05:00
Jamini 07fb3b05d4 Added Advanced Voicesuit sprites for Tajara
Signed-off-by: Jamini <mobiousjami@gmail.com>
2015-01-31 13:34:16 -05:00
Chinsky a5219535f6 Merge pull request #7997 from mwerezak/fixes
Fixes voidsuit attachment deployment not checking mob_can_equip()
2015-01-31 09:25:16 +03:00
mwerezak f8d79ef62a Gives sec ERT hardsuits mounted eguns
Also relocates mounted gun code.
2015-01-31 01:00:36 -05:00
mwerezak 75e0458102 Fixes voidsuit attachment deployment not checking mob_can_equip() 2015-01-30 22:02:07 -05:00
Jamini 683963f1ec Changed prefix on gloves modified for alien use from "Mangled" to "Modified". Removed stungloves.dm on request of Zuhayr.
Signed-off-by: Jamini <mobiousjami@gmail.com>
2015-01-30 18:22:58 -05:00
Chinsky b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
Chinsky e3b02fc62f Merge pull request #7975 from mwerezak/fixes
Fixes #7958
2015-01-30 16:14:16 +03:00
unknown 0c82682578 Clothing that does not use species restrictions no longer gains species restrictions when refit. 2015-01-29 13:20:38 -05:00
Zuhayr 131fc38e42 Fixes #7861 (partial), #7957, #7940 2015-01-29 10:53:32 +10:30
mwerezak 0ebe28dbea Fixes #7958 2015-01-28 13:19:01 -05:00
mwerezak 849e968924 ERT adjustment and fixes
Removes the mounted laser cannon from the ERT hardsuits and instead
provides a single cannon for the team.
Moves the sidearms out to the other ert stations to make it more clear
that they may be used by other ERT roles.
Fixes rechargers now working in Centcom areas.
2015-01-28 13:11:04 -05:00
sabiram 9497afa402 Recoloured spite 2015-01-26 18:40:13 -05:00
Kelenius 10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
unknown 7590bbac99 Infection chance proc improvements
Instead of magic type bits, the infection protection value of clothing is mostly based on it's bio armor value, which is much more flexible. Also gloves and shoes to contribute to protection values, and adjusts surgical mask bio protection.
Hardsuits gain voidsuit level bio protection, when sealed.
Wearing a face mask helps prevent others from catching airborne diseases.
Also fixes #7909
2015-01-22 11:10:57 -05:00
Zuhayr 5e7133dd08 Converted baseball bats to twohanded weapons. 2015-01-20 19:14:38 +10:30
Zulker Nayeen Nahiyan 490027405a Merge remote-tracking branch 'origin/dev' into dev
Conflicts:
	code/modules/virus2/helpers.dm
2015-01-19 02:15:38 +06:00
mwerezak 812b9d3348 Fixes body_parts_covered not updating when rolling jumpsuits 2015-01-14 22:38:52 -05:00
sabiram 66ab6bffba Adds my approved custom item (baystation12.net/forums/viewtopic.php?p=255276) to the common loadout pool. 2015-01-10 22:55:29 -05:00
Zulker Nayeen Nahiyan 203a7f1092 Fix compile error, remove Pi etc. from maths.dm and re-add them in setup.dm, fix bittest macros formatting to allow searching
`maths.dm`:
	Removed `var/const`s `E`, `Pi`, `Sqrt2`.

`setup.dm`:
	Re-added `PI` here, and added `Sqrt2`, `E` as macros.
	  The reason for this is that macros have a performance improvement over `var/const`s.

`lists.dm`
	Changed the formatting of the `BITTEST(...)` etc. macros so that they can be found by
	  searching for `#define BITTEST`

`rig.dm`:
	Fixed unknown variable error resulting from the usage if `STOPSPRESSUREDMAGE`
	  which was renamed to `STOPPRESSUREDAMAGE` in one of my earlier commits.

Others:
	Replaced constant variable `Pi` usage, with macro `PI`.
2015-01-10 03:14:48 +06:00
Zulker Nayeen Nahiyan 935448c098 Merge branch origin/dev into dev 2015-01-10 02:25:26 +06:00
Zulker Nayeen Nahiyan b6ab0b64c0 Cleanup global.dm and setup.dm, fix typos in the other files
`code/setup.dm`:
	Fixed large amounts of indenting.
	Fixed large numbers of comments and their clarity.
	Added parentheses to macros using expressions.
	Added FIXME for unused duplicated macros, without certainty of their requirement.
	Removed some duplicate macros present. (`BRUTE`, `BURN`, etc.)
	Removed macro `PI`, and replaced instances of its use with `var/const/Pi` from `maths.dm`

`code/global.dm`:
	Fixed large amounts of indenting, added newlines to long single-lined list definitions.
	Slightly clarified comments.
2015-01-10 02:01:55 +06:00
Zuhayr fd311a412f Fixes #7742. 2015-01-09 08:58:11 +10:30
Tramziller 29a0ae2ad6 Response to #7686 2015-01-06 21:48:56 +01:00
Zuhayr e07a14c0ea Made bomber jacket/hoodies toggleable, added black hoodie. 2015-01-06 01:35:45 +10:30
Zuhayr 5afb55815e Fixes #7601 2015-01-01 23:15:34 +10:30
Zuhayr cdfa2a5205 Merge pull request #7586 from Zuhayr/dev-freeze
Fixes the remainder of #7567, plus other fixes.
2014-12-31 22:48:39 +10:30
Zuhayr 47a3afb5af Fixes remainder of #7287 2014-12-31 20:15:53 +10:30
Chinsky fe403d013b Merge pull request #7583 from atlantiscze/cellrate-hardsuit-stuff
Hardsuit Powersink Adjustments
2014-12-31 08:17:20 +03:00
Atlantiscze 3c41d77b1a Optimalisations 2014-12-31 01:53:53 +01:00
Zuhayr eb6fc63a7b Fixes #7564 and buffs the dead man's switch explosion radius (#7567). 2014-12-30 16:11:25 +10:30
Zuhayr d1a98cf844 Fixes #7574 2014-12-30 15:56:34 +10:30
Zuhayr 09ba7a67f8 Fixes #7563 2014-12-30 15:56:14 +10:30
Atlantiscze 7ceade9320 Typo Fix 2014-12-29 20:47:20 +01:00
Atlantiscze 90a83c19cf Hardsuit powersink module now uses CELLRATE properly
- Adds CELLRATE (and SMESRATE for SMESs) into drain_power proc.
- Adds "amount" parameter to drain power proc, sets the powersink module to 40kW draw (80 cell charge/s), which should correspond with normal cell recharger.
- Removes drain_power from all machinery, and adds drain_power to machinery/power. This means you can only drain from machines that have something to do with wiring or electricity.
2014-12-29 20:40:57 +01:00
Zuhayr c7f0d7cfc7 Merge resolution. 2014-12-30 05:52:59 +10:30