Commit Graph

67 Commits

Author SHA1 Message Date
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
mwerezak
d65ec62dcb Fixes #9493 2015-05-26 22:49:16 -04:00
PsiOmega
e74c0e65bf Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/power_cells.dm
2015-05-22 08:26:13 +02:00
mwerezak
e23f5e7e06 Fixes hardsuit shocking 2015-05-18 20:09:31 -04:00
Zuhayr
325bd42c66 Fixes #9233 2015-05-15 23:37:52 +09:30
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
08fa1193ce Adds Hardsuit Module tab.
Allows one to (de)activate, engage, select and change module charges from the  	"Hardsuit Modules" tab panel.
Basic idea similar to spells.
2015-04-16 08:54:04 +02:00
PsiOmega
49d3f0fcf7 Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen 2015-04-10 15:49:36 +02:00
PsiOmega
1ba8dcbca9 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/vending.dm
2015-04-10 15:25:34 +02:00
PsiOmega
e37c5c22d4 Refactors NanoUI interaction (again)
Takes NanoUI interaction code and splits it into more manageable modules.

The default handler that checks distances, camera coverage, etc., etc.
Admin NanoUI windows now only check for admin rights, ignoring sight, distance, and anything else.
ERT/mercenary appearance changer now remains open for as long as the mob remains on the admin Z-level.
PDAs and uplinks now require that you keep the item somewhere in your main inventory (or contents to be precise). Hands or ears are fine, inside bags are not.
Rig suits also check that they are in the operator's inventory or that the synthetic operator is somewhere within the suit's contents (recursively).
2015-04-10 11:19:38 +02:00
GinjaNinja32
7483b9fcb2 Fixes hardsuits completely breaking all the time 2015-04-09 13:58:10 +01:00
PsiOmega
8e55ad8114 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/mob.dm
2015-04-03 09:33:05 +02:00
Zuhayr
1070a8f63c Adds weedkiller smoke checks to hydro trays and spreading plants. 2015-04-01 07:25:09 -07:00
Zuhayr
63a2fc6bff Fixes #8682 2015-04-01 07:05:58 -07:00
Zuhayr
c0887333bc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-03-27 11:13:53 +10:30
Zuhayr
dda3fc8f02 Merge pull request #8469 from mwerezak/robot-emp
Reduces the effect of EMP on robot power cells, some other things
2015-03-26 19:00:39 +10:30
PsiOmegaDelta
89965420bb Merge pull request #8603 from Baystation12/dev-freeze
Dev freeze
2015-03-24 14:00:57 +01:00
Zuhayr
45f28d5372 Fixes #8485 2015-03-24 13:20:24 +10:30
mwerezak
dc1f05a9da Tweaks rig emp effect, breach_threshold 2015-03-23 02:49:34 -04:00
Chinsky
c837505e8b Merge pull request #8328 from PsiOmegaDelta/LessIsMore
Cleans up access handling.
2015-03-03 10:21:16 +03:00
PsiOmega
318f5e1a92 Cleans up access handling. 2015-03-02 18:55:03 +01:00
mwerezak
8d1a92a0f5 Hardsuit tweaks
Spider fang blade uses power faster.
Light hardsuits (minus ninja suit) have voidsuit-level breach thresholds.
If the suit is malfunctioning when it runs out of power then you will need someone to cut you out.
2015-02-28 14:04:53 -05:00
mwerezak
a026922115 More hardsuit fixes, ion rifle fix
Fixes modules being usable when destroyed.
Fixes charge display for fractional charge values.
Fixes ion rifles EMPing themselves.
2015-02-28 04:15:29 -05:00
mwerezak
7dd82f8763 Merge remote-tracking branch 'upstream/dev-freeze' into backup
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
2015-02-28 03:39:38 -05:00
mwerezak
55a3b94995 Hardsuit adjustments, fixes
Default inherited offline_slowdown set to 3, as most hardsuits use this
value. ERT no longer get rad immunity, they have enough advantages -
instead only ERT engineers get that.
ERT engineer gauntlets are also now insulated, allowing them to do
wiring work in space.
Fixed a compile error.
Fixed mounted laser cannons taking too long to recharge.
2015-02-28 03:36:00 -05:00
mwerezak
a8c315ad52 Updates rig emp_act
EMPing hardsuits drains a bit of charge. Module damage is dealt to
damaged modules first. Various other adjustments.
2015-02-28 03:17:47 -05:00
PsiOmega
7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm
2015-02-27 09:06:48 +01:00
mwerezak
d06b2a0a12 EMP briefly blocks switching/engaging modules 2015-02-26 00:05:04 -05:00
mwerezak
31e8babb9f Fixes rig emp severity class handling 2015-02-21 13:15:23 -05:00
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
Zuhayr
131fc38e42 Fixes #7861 (partial), #7957, #7940 2015-01-29 10:53:32 +10:30
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
47a3afb5af Fixes remainder of #7287 2014-12-31 20:15:53 +10:30
Zuhayr
d1a98cf844 Fixes #7574 2014-12-30 15:56:34 +10:30
Zuhayr
a5e30fae72 Fixes #7472 2014-12-16 18:24:01 +10:30
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
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
7bc72fb836 Tidied up/fixed up the rig back icons. 2014-12-09 21:01:17 +10:30
Snapshot
867e69c770 Merge pull request #7210 from Zuhayr/dev
Fixes #7209
2014-12-02 17:23:19 -08: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