Commit Graph

706 Commits

Author SHA1 Message Date
Chinsky
e3b02fc62f Merge pull request #7975 from mwerezak/fixes
Fixes #7958
2015-01-30 16:14:16 +03: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
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
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
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
Zuhayr
b073c03708 Added xenomorph exclusions to space suits and helmets. 2014-12-27 08:10:55 +10:30
Meyar
f84759ee5f Fixes DeathSquad helmet to be spaceproof once more. 2014-12-26 01:32:48 -05:00
Zuhayr
a5e30fae72 Fixes #7472 2014-12-16 18:24:01 +10:30
GinjaNinja32
f6b5edc130 Fixes error in rig voice-changer message 2014-12-15 05:39:00 +00:00
Zuhayr
02fefbff54 Fixes #7345 2014-12-13 22:37:22 +10:30
Zuhayr
9b51078fdf Fixes #7410 2014-12-13 21:57:51 +10:30
Zuhayr
cd096fd45b Merge pull request #7385 from Zuhayr/dev-freeze
Reverts colours and catwalks.
2014-12-13 12:25:13 +10:30
D Anzorge
fe32bdc9a2 Fix bug making it impossible to detach voidsuit boots 2014-12-12 11:50:11 -05:00
Segrain
2582ef02b8 Namefix. 2014-12-11 05:00:31 +03:00
Zuhayr
52152166b3 Wip fixing suit spints. 2014-12-10 18:49:32 +10:30
Zuhayr
39f303c50e Actually fixes hardsuit back icons. 2014-12-10 02:37:23 +10:30
Zuhayr
e80f59742d Fixes #7316 2014-12-10 00:56:26 +10:30
Zuhayr
7bc72fb836 Tidied up/fixed up the rig back icons. 2014-12-09 21:01:17 +10:30
Raptor1628
921249a335 Hardsuit Fixes
Should merge now, was missing the .dme. Fixes #7307. Adds helmet cameras
for ERT and nukeops. Fixes incorrect lighting overlays. Fixes a weird
sprite.
2014-12-08 19:12:39 -05:00
Raptor1628
75659ab66a Hardsuit Mark Two, more Hulabaloo
Adds all sprites for the nukeop and research hardsuit. Shuffles around
hardsuit spawns and gear so they make sense, especially for the ERT,
they still only have two hardsuits per department, but there are enough
magboots and vests for the people who need the regular armor. Added the
medical hardsuit and its attendant gear to the station hardsuit list.
Added all of the xenoarch gear to the hazmat hardsuit for Zuh. Moves
some suit storage things around as they were lost somewhere along the
way since I committed them. Moves the Hazard Suit custom item over to
hardsuit code to prep for them being buildable on station at some point.
For now has the same stats as a voidsuit, no modules, just drains power
and has some extra pretty sprites. Sending this over to dev freeze
because most of it is required for hardsuits to be nice and pretty for
master. Now compatible with latest fixes.
2014-12-07 21:25:08 -05:00
Zuhayr
b30be0a352 Fixes #7199 2014-12-07 22:13:31 +10:30
Zuhayr
be562e675c Actually fixes scanners. 2014-12-07 21:29:30 +10:30
Zuhayr
35f5bb16c9 Fixes #7188 2014-12-07 21:20:47 +10:30
Snapshot
867e69c770 Merge pull request #7210 from Zuhayr/dev
Fixes #7209
2014-12-02 17:23:19 -08:00
Loganbacca
3988b96459 Rig activate message fix
Electrowarfare and power sink modules weren't displaying the correct activate string message. Fixed both.
2014-12-02 22:24:00 +13:00
Loganbacca
9fb58d8568 Third rig UI pass
- Resized the initial ui window again
- Rewrote the modules section to a horizontal layout
2014-12-02 22:23:59 +13:00
Loganbacca
0f2b0b79bd Initial rig ui pass
- Narrowed UI window, we shouldn't need it this wide once I'm done
- Started converting html template to divs for easier formatting
2014-12-02 22:23:59 +13:00
Zuhayr
8e2b0978a8 Fixes #7209 2014-12-02 11:26:44 +10:30
Zuhayr
33406d6e47 Removing macros. 2014-12-02 02:51:14 +10:30
Zuhayr
42c6efbc61 Fixes most of #7206, fixes #7200, fixes #7184 2014-12-02 02:34:34 +10:30
Zuhayr
8240f14176 Fixes #7185, works on #7184 2014-12-01 23:55:03 +10:30
PsiOmegaDelta
e5c5209f7a Merge pull request #7183 from Zuhayr/dev
Hardsuit fixes.
2014-12-01 05:58:24 +01:00
Zuhayr
0903bd7fc5 Working on some suit bugs, attempted to fix the welding overlay issue with no success. 2014-12-01 01:51:52 +10:30
Zuhayr
9b5235016b Set the hazmat rig to use the medical rig icon for now. Woo placeholder sprites. 2014-11-30 23:50:54 +10:30